Linux on the Nintendo GameCube and Wii

Update of /cvsroot/gc-linux/linux/drivers/usb/host
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29988/drivers/usb/host

Modified Files:
	Kconfig 
Added Files:
	ehci-hcd.c ehci.h ohci-hcd.c ohci-q.c ohci.h 
Log Message:
Forward to v.2.6.30.


--- NEW FILE: ohci-q.c ---
/*
 * OHCI HCD (Host Controller Driver) for USB.
 *
 * (C) Copyright 1999 Roman Weissgaerber <weissg@...>
 * (C) Copyright 2000-2002 David Brownell <dbrownell@...>
 *
 * This file is licenced under the GPL.
 */

#include <linux/irq.h>

static void urb_free_priv (struct ohci_hcd *hc, urb_priv_t *urb_priv)
{
	int		last = urb_priv->length - 1;

	if (last >= 0) {
		int		i;
		struct td	*td;

[...1090 lines suppressed...]
/*
 * Process normal completions (error or success) and clean the schedules.
 *
 * This is the main path for handing urbs back to drivers.  The only other
 * normal path is finish_unlinks(), which unlinks URBs using ed_rm_list,
 * instead of scanning the (re-reversed) donelist as this does.  There's
 * an abnormal path too, handling a quirk in some Compaq silicon:  URBs
 * with TDs that appear to be orphaned are directly reclaimed.
 */
static void
dl_done_list (struct ohci_hcd *ohci)
{
	struct td	*td = dl_reverse_done_list (ohci);

	while (td) {
		struct td	*td_next = td->next_dl_td;
		takeback_td(ohci, td);
		td = td_next;
	}
}

--- NEW FILE: ehci.h ---
/*
 * Copyright (c) 2001-2002 by David Brownell
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License as published by the
 * Free Software Foundation; either version 2 of the License, or (at your
 * option) any later version.
 *
 * This program is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 * for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software Foundation,
 * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */

#ifndef __LINUX_EHCI_HCD_H
#define __LINUX_EHCI_HCD_H

/* definitions used for the EHCI driver */

/*
 * __hc32 and __hc16 are "Host Controller" types, they may be equivalent to
 * __leXX (normally) or __beXX (given EHCI_BIG_ENDIAN_DESC), depending on
 * the host controller implementation.
 *
 * To facilitate the strongest possible byte-order checking from "sparse"
 * and so on, we use __leXX unless that's not practical.
 */
#ifdef CONFIG_USB_EHCI_BIG_ENDIAN_DESC
typedef __u32 __bitwise __hc32;
typedef __u16 __bitwise __hc16;
#else
#define __hc32	__le32
#define __hc16	__le16
#endif

/* statistics can be kept for for tuning/monitoring */
struct ehci_stats {
	/* irq usage */
	unsigned long		normal;
	unsigned long		error;
	unsigned long		reclaim;
	unsigned long		lost_iaa;

	/* termination of urbs from core */
	unsigned long		complete;
	unsigned long		unlink;
};

/* ehci_hcd->lock guards shared data against other CPUs:
 *   ehci_hcd:	async, reclaim, periodic (and shadow), ...
 *   usb_host_endpoint: hcpriv
 *   ehci_qh:	qh_next, qtd_list
 *   ehci_qtd:	qtd_list
 *
 * Also, hold this lock when talking to HC registers or
 * when updating hw_* fields in shared qh/qtd/... structures.
 */

#define	EHCI_MAX_ROOT_PORTS	15		/* see HCS_N_PORTS */

struct ehci_hcd {			/* one per controller */
	/* glue to PCI and HCD framework */
	struct ehci_caps __iomem *caps;
	struct ehci_regs __iomem *regs;
	struct ehci_dbg_port __iomem *debug;

	__u32			hcs_params;	/* cached register copy */
	spinlock_t		lock;

	/* async schedule support */
	struct ehci_qh		*async;
	struct ehci_qh		*reclaim;
	unsigned		scanning : 1;

	/* periodic schedule support */
#define	DEFAULT_I_TDPS		1024		/* some HCs can do less */
	unsigned		periodic_size;
	__hc32			*periodic;	/* hw periodic table */
	dma_addr_t		periodic_dma;
	unsigned		i_thresh;	/* uframes HC might cache */

	union ehci_shadow	*pshadow;	/* mirror hw periodic table */
	int			next_uframe;	/* scan periodic, start here */
	unsigned		periodic_sched;	/* periodic activity count */

	/* list of itds completed while clock_frame was still active */
	struct list_head	cached_itd_list;
	unsigned		clock_frame;

	/* per root hub port */
	unsigned long		reset_done [EHCI_MAX_ROOT_PORTS];

	/* bit vectors (one bit per port) */
	unsigned long		bus_suspended;		/* which ports were
			already suspended at the start of a bus suspend */
	unsigned long		companion_ports;	/* which ports are
			dedicated to the companion controller */
	unsigned long		owned_ports;		/* which ports are
			owned by the companion during a bus suspend */
	unsigned long		port_c_suspend;		/* which ports have
			the change-suspend feature turned on */
	unsigned long		suspended_ports;	/* which ports are
			suspended */

	/* per-HC memory pools (could be per-bus, but ...) */
	struct dma_pool		*qh_pool;	/* qh per active urb */
	struct dma_pool		*qtd_pool;	/* one or more per qh */
	struct dma_pool		*itd_pool;	/* itd per iso urb */
	struct dma_pool		*sitd_pool;	/* sitd per split iso urb */

	struct timer_list	iaa_watchdog;
	struct timer_list	watchdog;
	unsigned long		actions;
	unsigned		stamp;
	unsigned long		next_statechange;
	u32			command;

	/* SILICON QUIRKS */
	unsigned		no_selective_suspend:1;
	unsigned		has_fsl_port_bug:1; /* FreeScale */
	unsigned		big_endian_mmio:1;
	unsigned		big_endian_desc:1;
	unsigned		has_amcc_usb23:1;

	/* required for usb32 quirk */
	#define OHCI_CTRL_HCFS          (3 << 6)
	#define OHCI_USB_OPER           (2 << 6)
	#define OHCI_USB_SUSPEND        (3 << 6)

	#define OHCI_HCCTRL_OFFSET      0x4
	#define OHCI_HCCTRL_LEN         0x4
	__hc32			*ohci_hcctrl_reg;

	u8			sbrn;		/* packed release number */

	/* irq statistics */
#ifdef EHCI_STATS
	struct ehci_stats	stats;
#	define COUNT(x) do { (x)++; } while (0)
#else
#	define COUNT(x) do {} while (0)
#endif

	/* debug files */
#ifdef DEBUG
	struct dentry		*debug_dir;
	struct dentry		*debug_async;
	struct dentry		*debug_periodic;
	struct dentry		*debug_registers;
#endif
};

/* convert between an HCD pointer and the corresponding EHCI_HCD */
static inline struct ehci_hcd *hcd_to_ehci (struct usb_hcd *hcd)
{
	return (struct ehci_hcd *) (hcd->hcd_priv);
}
static inline struct usb_hcd *ehci_to_hcd (struct ehci_hcd *ehci)
{
	return container_of ((void *) ehci, struct usb_hcd, hcd_priv);
}


static inline void
iaa_watchdog_start(struct ehci_hcd *ehci)
{
	WARN_ON(timer_pending(&ehci->iaa_watchdog));
	mod_timer(&ehci->iaa_watchdog,
			jiffies + msecs_to_jiffies(EHCI_IAA_MSECS));
}

static inline void iaa_watchdog_done(struct ehci_hcd *ehci)
{
	del_timer(&ehci->iaa_watchdog);
}

enum ehci_timer_action {
	TIMER_IO_WATCHDOG,
	TIMER_ASYNC_SHRINK,
	TIMER_ASYNC_OFF,
};

static inline void
timer_action_done (struct ehci_hcd *ehci, enum ehci_timer_action action)
{
	clear_bit (action, &ehci->actions);
}

static void free_cached_itd_list(struct ehci_hcd *ehci);

/*-------------------------------------------------------------------------*/

#include <linux/usb/ehci_def.h>

/*-------------------------------------------------------------------------*/

#define	QTD_NEXT(ehci, dma)	cpu_to_hc32(ehci, (u32)dma)

/*
 * EHCI Specification 0.95 Section 3.5
 * QTD: describe data transfer components (buffer, direction, ...)
 * See Fig 3-6 "Queue Element Transfer Descriptor Block Diagram".
 *
 * These are associated only with "QH" (Queue Head) structures,
 * used with control, bulk, and interrupt transfers.
 */
struct ehci_qtd {
	/* first part defined by EHCI spec */
	__hc32			hw_next;	/* see EHCI 3.5.1 */
	__hc32			hw_alt_next;    /* see EHCI 3.5.2 */
	__hc32			hw_token;       /* see EHCI 3.5.3 */
#define	QTD_TOGGLE	(1 << 31)	/* data toggle */
#define	QTD_LENGTH(tok)	(((tok)>>16) & 0x7fff)
#define	QTD_IOC		(1 << 15)	/* interrupt on complete */
#define	QTD_CERR(tok)	(((tok)>>10) & 0x3)
#define	QTD_PID(tok)	(((tok)>>8) & 0x3)
#define	QTD_STS_ACTIVE	(1 << 7)	/* HC may execute this */
#define	QTD_STS_HALT	(1 << 6)	/* halted on error */
#define	QTD_STS_DBE	(1 << 5)	/* data buffer error (in HC) */
#define	QTD_STS_BABBLE	(1 << 4)	/* device was babbling (qtd halted) */
#define	QTD_STS_XACT	(1 << 3)	/* device gave illegal response */
#define	QTD_STS_MMF	(1 << 2)	/* incomplete split transaction */
#define	QTD_STS_STS	(1 << 1)	/* split transaction state */
#define	QTD_STS_PING	(1 << 0)	/* issue PING? */

#define ACTIVE_BIT(ehci)	cpu_to_hc32(ehci, QTD_STS_ACTIVE)
#define HALT_BIT(ehci)		cpu_to_hc32(ehci, QTD_STS_HALT)
#define STATUS_BIT(ehci)	cpu_to_hc32(ehci, QTD_STS_STS)

	__hc32			hw_buf [5];        /* see EHCI 3.5.4 */
	__hc32			hw_buf_hi [5];        /* Appendix B */

	/* the rest is HCD-private */
	dma_addr_t		qtd_dma;		/* qtd address */
	struct list_head	qtd_list;		/* sw qtd list */
	struct urb		*urb;			/* qtd's urb */
	size_t			length;			/* length of buffer */
} __attribute__ ((aligned (32)));

/* mask NakCnt+T in qh->hw_alt_next */
#define QTD_MASK(ehci)	cpu_to_hc32 (ehci, ~0x1f)

#define IS_SHORT_READ(token) (QTD_LENGTH (token) != 0 && QTD_PID (token) == 1)

/*-------------------------------------------------------------------------*/

/* type tag from {qh,itd,sitd,fstn}->hw_next */
#define Q_NEXT_TYPE(ehci,dma)	((dma) & cpu_to_hc32(ehci, 3 << 1))

/*
 * Now the following defines are not converted using the
 * cpu_to_le32() macro anymore, since we have to support
 * "dynamic" switching between be and le support, so that the driver
 * can be used on one system with SoC EHCI controller using big-endian
 * descriptors as well as a normal little-endian PCI EHCI controller.
 */
/* values for that type tag */
#define Q_TYPE_ITD	(0 << 1)
#define Q_TYPE_QH	(1 << 1)
#define Q_TYPE_SITD	(2 << 1)
#define Q_TYPE_FSTN	(3 << 1)

/* next async queue entry, or pointer to interrupt/periodic QH */
#define QH_NEXT(ehci,dma)	(cpu_to_hc32(ehci, (((u32)dma)&~0x01f)|Q_TYPE_QH))

/* for periodic/async schedules and qtd lists, mark end of list */
#define EHCI_LIST_END(ehci)	cpu_to_hc32(ehci, 1) /* "null pointer" to hw */

/*
 * Entries in periodic shadow table are pointers to one of four kinds
 * of data structure.  That's dictated by the hardware; a type tag is
 * encoded in the low bits of the hardware's periodic schedule.  Use
 * Q_NEXT_TYPE to get the tag.
 *
 * For entries in the async schedule, the type tag always says "qh".
 */
union ehci_shadow {
	struct ehci_qh		*qh;		/* Q_TYPE_QH */
	struct ehci_itd		*itd;		/* Q_TYPE_ITD */
	struct ehci_sitd	*sitd;		/* Q_TYPE_SITD */
	struct ehci_fstn	*fstn;		/* Q_TYPE_FSTN */
	__hc32			*hw_next;	/* (all types) */
	void			*ptr;
};

/*-------------------------------------------------------------------------*/

/*
 * EHCI Specification 0.95 Section 3.6
 * QH: describes control/bulk/interrupt endpoints
 * See Fig 3-7 "Queue Head Structure Layout".
 *
 * These appear in both the async and (for interrupt) periodic schedules.
 */

struct ehci_qh {
	/* first part defined by EHCI spec */
	__hc32			hw_next;	/* see EHCI 3.6.1 */
	__hc32			hw_info1;       /* see EHCI 3.6.2 */
#define	QH_HEAD		0x00008000
	__hc32			hw_info2;        /* see EHCI 3.6.2 */
#define	QH_SMASK	0x000000ff
#define	QH_CMASK	0x0000ff00
#define	QH_HUBADDR	0x007f0000
#define	QH_HUBPORT	0x3f800000
#define	QH_MULT		0xc0000000
	__hc32			hw_current;	/* qtd list - see EHCI 3.6.4 */

	/* qtd overlay (hardware parts of a struct ehci_qtd) */
	__hc32			hw_qtd_next;
	__hc32			hw_alt_next;
	__hc32			hw_token;
	__hc32			hw_buf [5];
	__hc32			hw_buf_hi [5];

	/* the rest is HCD-private */
	dma_addr_t		qh_dma;		/* address of qh */
	union ehci_shadow	qh_next;	/* ptr to qh; or periodic */
	struct list_head	qtd_list;	/* sw qtd list */
	struct ehci_qtd		*dummy;
	struct ehci_qh		*reclaim;	/* next to reclaim */

	struct ehci_hcd		*ehci;

	/*
	 * Do NOT use atomic operations for QH refcounting. On some CPUs
	 * (PPC7448 for example), atomic operations cannot be performed on
	 * memory that is cache-inhibited (i.e. being used for DMA).
	 * Spinlocks are used to protect all QH fields.
	 */
	u32			refcount;
	unsigned		stamp;

	u8			qh_state;
#define	QH_STATE_LINKED		1		/* HC sees this */
#define	QH_STATE_UNLINK		2		/* HC may still see this */
#define	QH_STATE_IDLE		3		/* HC doesn't see this */
#define	QH_STATE_UNLINK_WAIT	4		/* LINKED and on reclaim q */
#define	QH_STATE_COMPLETING	5		/* don't touch token.HALT */

	u8			xacterrs;	/* XactErr retry counter */
#define	QH_XACTERR_MAX		32		/* XactErr retry limit */

	/* periodic schedule info */
	u8			usecs;		/* intr bandwidth */
	u8			gap_uf;		/* uframes split/csplit gap */
	u8			c_usecs;	/* ... split completion bw */
	u16			tt_usecs;	/* tt downstream bandwidth */
	unsigned short		period;		/* polling interval */
	unsigned short		start;		/* where polling starts */
#define NO_FRAME ((unsigned short)~0)			/* pick new start */
	struct usb_device	*dev;		/* access to TT */
} __attribute__ ((aligned (32)));

/*-------------------------------------------------------------------------*/

/* description of one iso transaction (up to 3 KB data if highspeed) */
struct ehci_iso_packet {
	/* These will be copied to iTD when scheduling */
	u64			bufp;		/* itd->hw_bufp{,_hi}[pg] |= */
	__hc32			transaction;	/* itd->hw_transaction[i] |= */
	u8			cross;		/* buf crosses pages */
	/* for full speed OUT splits */
	u32			buf1;
};

/* temporary schedule data for packets from iso urbs (both speeds)
 * each packet is one logical usb transaction to the device (not TT),
 * beginning at stream->next_uframe
 */
struct ehci_iso_sched {
	struct list_head	td_list;
	unsigned		span;
	struct ehci_iso_packet	packet [0];
};

/*
 * ehci_iso_stream - groups all (s)itds for this endpoint.
 * acts like a qh would, if EHCI had them for ISO.
 */
struct ehci_iso_stream {
	/* first two fields match QH, but info1 == 0 */
	__hc32			hw_next;
	__hc32			hw_info1;

	u32			refcount;
	u8			bEndpointAddress;
	u8			highspeed;
	u16			depth;		/* depth in uframes */
	struct list_head	td_list;	/* queued itds/sitds */
	struct list_head	free_list;	/* list of unused itds/sitds */
	struct usb_device	*udev;
	struct usb_host_endpoint *ep;

	/* output of (re)scheduling */
	unsigned long		start;		/* jiffies */
	unsigned long		rescheduled;
	int			next_uframe;
	__hc32			splits;

	/* the rest is derived from the endpoint descriptor,
	 * trusting urb->interval == f(epdesc->bInterval) and
	 * including the extra info for hw_bufp[0..2]
	 */
	u8			usecs, c_usecs;
	u16			interval;
	u16			tt_usecs;
	u16			maxp;
	u16			raw_mask;
	unsigned		bandwidth;

	/* This is used to initialize iTD's hw_bufp fields */
	__hc32			buf0;
	__hc32			buf1;
	__hc32			buf2;

	/* this is used to initialize sITD's tt info */
	__hc32			address;
};

/*-------------------------------------------------------------------------*/

/*
 * EHCI Specification 0.95 Section 3.3
 * Fig 3-4 "Isochronous Transaction Descriptor (iTD)"
 *
 * Schedule records for high speed iso xfers
 */
struct ehci_itd {
	/* first part defined by EHCI spec */
	__hc32			hw_next;           /* see EHCI 3.3.1 */
	__hc32			hw_transaction [8]; /* see EHCI 3.3.2 */
#define EHCI_ISOC_ACTIVE        (1<<31)        /* activate transfer this slot */
#define EHCI_ISOC_BUF_ERR       (1<<30)        /* Data buffer error */
#define EHCI_ISOC_BABBLE        (1<<29)        /* babble detected */
#define EHCI_ISOC_XACTERR       (1<<28)        /* XactErr - transaction error */
#define	EHCI_ITD_LENGTH(tok)	(((tok)>>16) & 0x0fff)
#define	EHCI_ITD_IOC		(1 << 15)	/* interrupt on complete */

#define ITD_ACTIVE(ehci)	cpu_to_hc32(ehci, EHCI_ISOC_ACTIVE)

	__hc32			hw_bufp [7];	/* see EHCI 3.3.3 */
	__hc32			hw_bufp_hi [7];	/* Appendix B */

	/* the rest is HCD-private */
	dma_addr_t		itd_dma;	/* for this itd */
	union ehci_shadow	itd_next;	/* ptr to periodic q entry */

	struct urb		*urb;
	struct ehci_iso_stream	*stream;	/* endpoint's queue */
	struct list_head	itd_list;	/* list of stream's itds */

	/* any/all hw_transactions here may be used by that urb */
	unsigned		frame;		/* where scheduled */
	unsigned		pg;
	unsigned		index[8];	/* in urb->iso_frame_desc */
} __attribute__ ((aligned (32)));

/*-------------------------------------------------------------------------*/

/*
 * EHCI Specification 0.95 Section 3.4
 * siTD, aka split-transaction isochronous Transfer Descriptor
 *       ... describe full speed iso xfers through TT in hubs
 * see Figure 3-5 "Split-transaction Isochronous Transaction Descriptor (siTD)
 */
struct ehci_sitd {
	/* first part defined by EHCI spec */
	__hc32			hw_next;
/* uses bit field macros above - see EHCI 0.95 Table 3-8 */
	__hc32			hw_fullspeed_ep;	/* EHCI table 3-9 */
	__hc32			hw_uframe;		/* EHCI table 3-10 */
	__hc32			hw_results;		/* EHCI table 3-11 */
#define	SITD_IOC	(1 << 31)	/* interrupt on completion */
#define	SITD_PAGE	(1 << 30)	/* buffer 0/1 */
#define	SITD_LENGTH(x)	(0x3ff & ((x)>>16))
#define	SITD_STS_ACTIVE	(1 << 7)	/* HC may execute this */
#define	SITD_STS_ERR	(1 << 6)	/* error from TT */
#define	SITD_STS_DBE	(1 << 5)	/* data buffer error (in HC) */
#define	SITD_STS_BABBLE	(1 << 4)	/* device was babbling */
#define	SITD_STS_XACT	(1 << 3)	/* illegal IN response */
#define	SITD_STS_MMF	(1 << 2)	/* incomplete split transaction */
#define	SITD_STS_STS	(1 << 1)	/* split transaction state */

#define SITD_ACTIVE(ehci)	cpu_to_hc32(ehci, SITD_STS_ACTIVE)

	__hc32			hw_buf [2];		/* EHCI table 3-12 */
	__hc32			hw_backpointer;		/* EHCI table 3-13 */
	__hc32			hw_buf_hi [2];		/* Appendix B */

	/* the rest is HCD-private */
	dma_addr_t		sitd_dma;
	union ehci_shadow	sitd_next;	/* ptr to periodic q entry */

	struct urb		*urb;
	struct ehci_iso_stream	*stream;	/* endpoint's queue */
	struct list_head	sitd_list;	/* list of stream's sitds */
	unsigned		frame;
	unsigned		index;
} __attribute__ ((aligned (32)));

/*-------------------------------------------------------------------------*/

/*
 * EHCI Specification 0.96 Section 3.7
 * Periodic Frame Span Traversal Node (FSTN)
 *
 * Manages split interrupt transactions (using TT) that span frame boundaries
 * into uframes 0/1; see 4.12.2.2.  In those uframes, a "save place" FSTN
 * makes the HC jump (back) to a QH to scan for fs/ls QH completions until
 * it hits a "restore" FSTN; then it returns to finish other uframe 0/1 work.
 */
struct ehci_fstn {
	__hc32			hw_next;	/* any periodic q entry */
	__hc32			hw_prev;	/* qh or EHCI_LIST_END */

	/* the rest is HCD-private */
	dma_addr_t		fstn_dma;
	union ehci_shadow	fstn_next;	/* ptr to periodic q entry */
} __attribute__ ((aligned (32)));

/*-------------------------------------------------------------------------*/

#ifdef CONFIG_USB_EHCI_ROOT_HUB_TT

/*
 * Some EHCI controllers have a Transaction Translator built into the
 * root hub. This is a non-standard feature.  Each controller will need
 * to add code to the following inline functions, and call them as
 * needed (mostly in root hub code).
 */

#define	ehci_is_TDI(e)			(ehci_to_hcd(e)->has_tt)

/* Returns the speed of a device attached to a port on the root hub. */
static inline unsigned int
ehci_port_speed(struct ehci_hcd *ehci, unsigned int portsc)
{
	if (ehci_is_TDI(ehci)) {
		switch ((portsc>>26)&3) {
		case 0:
			return 0;
		case 1:
			return (1<<USB_PORT_FEAT_LOWSPEED);
		case 2:
		default:
			return (1<<USB_PORT_FEAT_HIGHSPEED);
		}
	}
	return (1<<USB_PORT_FEAT_HIGHSPEED);
}

#else

#define	ehci_is_TDI(e)			(0)

#define	ehci_port_speed(ehci, portsc)	(1<<USB_PORT_FEAT_HIGHSPEED)
#endif

/*-------------------------------------------------------------------------*/

#ifdef CONFIG_PPC_83xx
/* Some Freescale processors have an erratum in which the TT
 * port number in the queue head was 0..N-1 instead of 1..N.
 */
#define	ehci_has_fsl_portno_bug(e)		((e)->has_fsl_port_bug)
#else
#define	ehci_has_fsl_portno_bug(e)		(0)
#endif

/*
 * While most USB host controllers implement their registers in
 * little-endian format, a minority (celleb companion chip) implement
 * them in big endian format.
 *
 * This attempts to support either format at compile time without a
 * runtime penalty, or both formats with the additional overhead
 * of checking a flag bit.
 */

#ifdef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO
#define ehci_big_endian_mmio(e)		((e)->big_endian_mmio)
#else
#define ehci_big_endian_mmio(e)		0
#endif

/*
 * Big-endian read/write functions are arch-specific.
 * Other arches can be added if/when they're needed.
 */
#if defined(CONFIG_ARM) && defined(CONFIG_ARCH_IXP4XX)
#define readl_be(addr)		__raw_readl((__force unsigned *)addr)
#define writel_be(val, addr)	__raw_writel(val, (__force unsigned *)addr)
#endif

static inline unsigned int ehci_readl(const struct ehci_hcd *ehci,
		__u32 __iomem * regs)
{
#ifdef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO
	return ehci_big_endian_mmio(ehci) ?
		readl_be(regs) :
		readl(regs);
#else
	return readl(regs);
#endif
}

static inline void ehci_writel(const struct ehci_hcd *ehci,
		const unsigned int val, __u32 __iomem *regs)
{
#ifdef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO
	ehci_big_endian_mmio(ehci) ?
		writel_be(val, regs) :
		writel(val, regs);
#else
	writel(val, regs);
#endif
}

/*
 * On certain ppc-44x SoC there is a HW issue, that could only worked around with
 * explicit suspend/operate of OHCI. This function hereby makes sense only on that arch.
 * Other common bits are dependant on has_amcc_usb23 quirk flag.
 */
#ifdef CONFIG_44x
static inline void set_ohci_hcfs(struct ehci_hcd *ehci, int operational)
{
	u32 hc_control;

	hc_control = (readl_be(ehci->ohci_hcctrl_reg) & ~OHCI_CTRL_HCFS);
	if (operational)
		hc_control |= OHCI_USB_OPER;
	else
		hc_control |= OHCI_USB_SUSPEND;

	writel_be(hc_control, ehci->ohci_hcctrl_reg);
	(void) readl_be(ehci->ohci_hcctrl_reg);
}
#else
static inline void set_ohci_hcfs(struct ehci_hcd *ehci, int operational)
{ }
#endif

/*-------------------------------------------------------------------------*/

/*
 * The AMCC 440EPx not only implements its EHCI registers in big-endian
 * format, but also its DMA data structures (descriptors).
 *
 * EHCI controllers accessed through PCI work normally (little-endian
 * everywhere), so we won't bother supporting a BE-only mode for now.
 */
#ifdef CONFIG_USB_EHCI_BIG_ENDIAN_DESC
#define ehci_big_endian_desc(e)		((e)->big_endian_desc)

/* cpu to ehci */
static inline __hc32 cpu_to_hc32 (const struct ehci_hcd *ehci, const u32 x)
{
	return ehci_big_endian_desc(ehci)
		? (__force __hc32)cpu_to_be32(x)
		: (__force __hc32)cpu_to_le32(x);
}

/* ehci to cpu */
static inline u32 hc32_to_cpu (const struct ehci_hcd *ehci, const __hc32 x)
{
	return ehci_big_endian_desc(ehci)
		? be32_to_cpu((__force __be32)x)
		: le32_to_cpu((__force __le32)x);
}

static inline u32 hc32_to_cpup (const struct ehci_hcd *ehci, const __hc32 *x)
{
	return ehci_big_endian_desc(ehci)
		? be32_to_cpup((__force __be32 *)x)
		: le32_to_cpup((__force __le32 *)x);
}

#else

/* cpu to ehci */
static inline __hc32 cpu_to_hc32 (const struct ehci_hcd *ehci, const u32 x)
{
	return cpu_to_le32(x);
}

/* ehci to cpu */
static inline u32 hc32_to_cpu (const struct ehci_hcd *ehci, const __hc32 x)
{
	return le32_to_cpu(x);
}

static inline u32 hc32_to_cpup (const struct ehci_hcd *ehci, const __hc32 *x)
{
	return le32_to_cpup(x);
}

#endif

/*-------------------------------------------------------------------------*/

#ifndef DEBUG
#define STUB_DEBUG_FILES
#endif	/* DEBUG */

/*-------------------------------------------------------------------------*/

#endif /* __LINUX_EHCI_HCD_H */

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/usb/host/Kconfig,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Kconfig	25 Oct 2009 18:33:47 -0000	1.7
--- Kconfig	25 Oct 2009 18:45:36 -0000	1.8
***************
*** 25,32 ****
  	  "high speed" (480 Mbit/sec, 60 Mbyte/sec) host controller hardware.
  	  If your USB host controller supports USB 2.0, you will likely want to
! 	  configure this Host Controller Driver.  At the time of this writing, 
! 	  the primary implementation of EHCI is a chip from NEC, widely available
! 	  in add-on PCI cards, but implementations are in the works from other 
! 	  vendors including Intel and Philips.  Motherboard support is appearing.
  
  	  EHCI controllers are packaged with "companion" host controllers (OHCI
--- 25,29 ----
  	  "high speed" (480 Mbit/sec, 60 Mbyte/sec) host controller hardware.
  	  If your USB host controller supports USB 2.0, you will likely want to
! 	  configure this Host Controller Driver.
  
  	  EHCI controllers are packaged with "companion" host controllers (OHCI
***************
*** 124,128 ****
  config USB_ISP1760_HCD
  	tristate "ISP 1760 HCD support"
! 	depends on USB && EXPERIMENTAL && (PCI || PPC_OF)
  	---help---
  	  The ISP1760 chip is a USB 2.0 host controller.
--- 121,125 ----
  config USB_ISP1760_HCD
  	tristate "ISP 1760 HCD support"
! 	depends on USB && EXPERIMENTAL
  	---help---
  	  The ISP1760 chip is a USB 2.0 host controller.

--- NEW FILE: ohci.h ---
/*
 * OHCI HCD (Host Controller Driver) for USB.
 *
 * (C) Copyright 1999 Roman Weissgaerber <weissg@...>
 * (C) Copyright 2000-2002 David Brownell <dbrownell@...>
 *
 * This file is licenced under the GPL.
 */

/*
 * __hc32 and __hc16 are "Host Controller" types, they may be equivalent to
 * __leXX (normally) or __beXX (given OHCI_BIG_ENDIAN), depending on the
 * host controller implementation.
 */
typedef __u32 __bitwise __hc32;
typedef __u16 __bitwise __hc16;

/*
 * OHCI Endpoint Descriptor (ED) ... holds TD queue
 * See OHCI spec, section 4.2
 *
 * This is a "Queue Head" for those transfers, which is why
 * both EHCI and UHCI call similar structures a "QH".
 */
struct ed {
	/* first fields are hardware-specified */
	__hc32			hwINFO;      /* endpoint config bitmap */
	/* info bits defined by hcd */
#define ED_DEQUEUE	(1 << 27)
	/* info bits defined by the hardware */
#define ED_ISO		(1 << 15)
#define ED_SKIP		(1 << 14)
#define ED_LOWSPEED	(1 << 13)
#define ED_OUT		(0x01 << 11)
#define ED_IN		(0x02 << 11)
	__hc32			hwTailP;	/* tail of TD list */
	__hc32			hwHeadP;	/* head of TD list (hc r/w) */
#define ED_C		(0x02)			/* toggle carry */
#define ED_H		(0x01)			/* halted */
	__hc32			hwNextED;	/* next ED in list */

	/* rest are purely for the driver's use */
	dma_addr_t		dma;		/* addr of ED */
	struct td		*dummy;		/* next TD to activate */

	/* host's view of schedule */
	struct ed		*ed_next;	/* on schedule or rm_list */
	struct ed		*ed_prev;	/* for non-interrupt EDs */
	struct list_head	td_list;	/* "shadow list" of our TDs */

	/* create --> IDLE --> OPER --> ... --> IDLE --> destroy
	 * usually:  OPER --> UNLINK --> (IDLE | OPER) --> ...
	 */
	u8			state;		/* ED_{IDLE,UNLINK,OPER} */
#define ED_IDLE		0x00		/* NOT linked to HC */
#define ED_UNLINK	0x01		/* being unlinked from hc */
#define ED_OPER		0x02		/* IS linked to hc */

	u8			type;		/* PIPE_{BULK,...} */

	/* periodic scheduling params (for intr and iso) */
	u8			branch;
	u16			interval;
	u16			load;
	u16			last_iso;	/* iso only */

	/* HC may see EDs on rm_list until next frame (frame_no == tick) */
	u16			tick;
} __attribute__ ((aligned(16)));

#define ED_MASK	((u32)~0x0f)		/* strip hw status in low addr bits */


/*
 * OHCI Transfer Descriptor (TD) ... one per transfer segment
 * See OHCI spec, sections 4.3.1 (general = control/bulk/interrupt)
 * and 4.3.2 (iso)
 */
struct td {
	/* first fields are hardware-specified */
	__hc32		hwINFO;		/* transfer info bitmask */

	/* hwINFO bits for both general and iso tds: */
#define TD_CC       0xf0000000			/* condition code */
#define TD_CC_GET(td_p) ((td_p >>28) & 0x0f)
//#define TD_CC_SET(td_p, cc) (td_p) = ((td_p) & 0x0fffffff) | (((cc) & 0x0f) << 28)
#define TD_DI       0x00E00000			/* frames before interrupt */
#define TD_DI_SET(X) (((X) & 0x07)<< 21)
	/* these two bits are available for definition/use by HCDs in both
	 * general and iso tds ... others are available for only one type
	 */
#define TD_DONE     0x00020000			/* retired to donelist */
#define TD_ISO      0x00010000			/* copy of ED_ISO */

	/* hwINFO bits for general tds: */
#define TD_EC       0x0C000000			/* error count */
#define TD_T        0x03000000			/* data toggle state */
#define TD_T_DATA0  0x02000000				/* DATA0 */
#define TD_T_DATA1  0x03000000				/* DATA1 */
#define TD_T_TOGGLE 0x00000000				/* uses ED_C */
#define TD_DP       0x00180000			/* direction/pid */
#define TD_DP_SETUP 0x00000000			/* SETUP pid */
#define TD_DP_IN    0x00100000				/* IN pid */
#define TD_DP_OUT   0x00080000				/* OUT pid */
							/* 0x00180000 rsvd */
#define TD_R        0x00040000			/* round: short packets OK? */

	/* (no hwINFO #defines yet for iso tds) */

	__hc32		hwCBP;		/* Current Buffer Pointer (or 0) */
	__hc32		hwNextTD;	/* Next TD Pointer */
	__hc32		hwBE;		/* Memory Buffer End Pointer */

	/* PSW is only for ISO.  Only 1 PSW entry is used, but on
	 * big-endian PPC hardware that's the second entry.
	 */
#define MAXPSW	2
	__hc16		hwPSW [MAXPSW];

	/* rest are purely for the driver's use */
	__u8		index;
	struct ed	*ed;
	struct td	*td_hash;	/* dma-->td hashtable */
	struct td	*next_dl_td;
	struct urb	*urb;

	dma_addr_t	td_dma;		/* addr of this TD */
	dma_addr_t	data_dma;	/* addr of data it points to */

	struct list_head td_list;	/* "shadow list", TDs on same ED */
} __attribute__ ((aligned(32)));	/* c/b/i need 16; only iso needs 32 */

#define TD_MASK	((u32)~0x1f)		/* strip hw status in low addr bits */

/*
 * Hardware transfer status codes -- CC from td->hwINFO or td->hwPSW
 */
#define TD_CC_NOERROR      0x00
#define TD_CC_CRC          0x01
#define TD_CC_BITSTUFFING  0x02
#define TD_CC_DATATOGGLEM  0x03
#define TD_CC_STALL        0x04
#define TD_DEVNOTRESP      0x05
#define TD_PIDCHECKFAIL    0x06
#define TD_UNEXPECTEDPID   0x07
#define TD_DATAOVERRUN     0x08
#define TD_DATAUNDERRUN    0x09
    /* 0x0A, 0x0B reserved for hardware */
#define TD_BUFFEROVERRUN   0x0C
#define TD_BUFFERUNDERRUN  0x0D
    /* 0x0E, 0x0F reserved for HCD */
#define TD_NOTACCESSED     0x0F


/* map OHCI TD status codes (CC) to errno values */
static const int cc_to_error [16] = {
	/* No  Error  */               0,
	/* CRC Error  */               -EILSEQ,
	/* Bit Stuff  */               -EPROTO,
	/* Data Togg  */               -EILSEQ,
	/* Stall      */               -EPIPE,
	/* DevNotResp */               -ETIME,
	/* PIDCheck   */               -EPROTO,
	/* UnExpPID   */               -EPROTO,
	/* DataOver   */               -EOVERFLOW,
	/* DataUnder  */               -EREMOTEIO,
	/* (for hw)   */               -EIO,
	/* (for hw)   */               -EIO,
	/* BufferOver */               -ECOMM,
	/* BuffUnder  */               -ENOSR,
	/* (for HCD)  */               -EALREADY,
	/* (for HCD)  */               -EALREADY
};


/*
 * The HCCA (Host Controller Communications Area) is a 256 byte
 * structure defined section 4.4.1 of the OHCI spec. The HC is
 * told the base address of it.  It must be 256-byte aligned.
 */
struct ohci_hcca {
#define NUM_INTS 32
	__hc32	int_table [NUM_INTS];	/* periodic schedule */

	/*
	 * OHCI defines u16 frame_no, followed by u16 zero pad.
	 * Since some processors can't do 16 bit bus accesses,
	 * portable access must be a 32 bits wide.
	 */
	__hc32	frame_no;		/* current frame number */
	__hc32	done_head;		/* info returned for an interrupt */
	u8	reserved_for_hc [116];
	u8	what [4];		/* spec only identifies 252 bytes :) */
} __attribute__ ((aligned(256)));

/*
 * This is the structure of the OHCI controller's memory mapped I/O region.
 * You must use readl() and writel() (in <asm/io.h>) to access these fields!!
 * Layout is in section 7 (and appendix B) of the spec.
 */
struct ohci_regs {
	/* control and status registers (section 7.1) */
	__hc32	revision;
	__hc32	control;
	__hc32	cmdstatus;
	__hc32	intrstatus;
	__hc32	intrenable;
	__hc32	intrdisable;

	/* memory pointers (section 7.2) */
	__hc32	hcca;
	__hc32	ed_periodcurrent;
	__hc32	ed_controlhead;
	__hc32	ed_controlcurrent;
	__hc32	ed_bulkhead;
	__hc32	ed_bulkcurrent;
	__hc32	donehead;

	/* frame counters (section 7.3) */
	__hc32	fminterval;
	__hc32	fmremaining;
	__hc32	fmnumber;
	__hc32	periodicstart;
	__hc32	lsthresh;

	/* Root hub ports (section 7.4) */
	struct	ohci_roothub_regs {
		__hc32	a;
		__hc32	b;
		__hc32	status;
#define MAX_ROOT_PORTS	15	/* maximum OHCI root hub ports (RH_A_NDP) */
		__hc32	portstatus [MAX_ROOT_PORTS];
	} roothub;

	/* and optional "legacy support" registers (appendix B) at 0x0100 */

} __attribute__ ((aligned(32)));


/* OHCI CONTROL AND STATUS REGISTER MASKS */

/*
 * HcControl (control) register masks
 */
#define OHCI_CTRL_CBSR	(3 << 0)	/* control/bulk service ratio */
#define OHCI_CTRL_PLE	(1 << 2)	/* periodic list enable */
#define OHCI_CTRL_IE	(1 << 3)	/* isochronous enable */
#define OHCI_CTRL_CLE	(1 << 4)	/* control list enable */
#define OHCI_CTRL_BLE	(1 << 5)	/* bulk list enable */
#define OHCI_CTRL_HCFS	(3 << 6)	/* host controller functional state */
#define OHCI_CTRL_IR	(1 << 8)	/* interrupt routing */
#define OHCI_CTRL_RWC	(1 << 9)	/* remote wakeup connected */
#define OHCI_CTRL_RWE	(1 << 10)	/* remote wakeup enable */

/* pre-shifted values for HCFS */
#	define OHCI_USB_RESET	(0 << 6)
#	define OHCI_USB_RESUME	(1 << 6)
#	define OHCI_USB_OPER	(2 << 6)
#	define OHCI_USB_SUSPEND	(3 << 6)

/*
 * HcCommandStatus (cmdstatus) register masks
 */
#define OHCI_HCR	(1 << 0)	/* host controller reset */
#define OHCI_CLF	(1 << 1)	/* control list filled */
#define OHCI_BLF	(1 << 2)	/* bulk list filled */
#define OHCI_OCR	(1 << 3)	/* ownership change request */
#define OHCI_SOC	(3 << 16)	/* scheduling overrun count */

/*
 * masks used with interrupt registers:
 * HcInterruptStatus (intrstatus)
 * HcInterruptEnable (intrenable)
 * HcInterruptDisable (intrdisable)
 */
#define OHCI_INTR_SO	(1 << 0)	/* scheduling overrun */
#define OHCI_INTR_WDH	(1 << 1)	/* writeback of done_head */
#define OHCI_INTR_SF	(1 << 2)	/* start frame */
#define OHCI_INTR_RD	(1 << 3)	/* resume detect */
#define OHCI_INTR_UE	(1 << 4)	/* unrecoverable error */
#define OHCI_INTR_FNO	(1 << 5)	/* frame number overflow */
#define OHCI_INTR_RHSC	(1 << 6)	/* root hub status change */
#define OHCI_INTR_OC	(1 << 30)	/* ownership change */
#define OHCI_INTR_MIE	(1 << 31)	/* master interrupt enable */


/* OHCI ROOT HUB REGISTER MASKS */

/* roothub.portstatus [i] bits */
#define RH_PS_CCS            0x00000001		/* current connect status */
#define RH_PS_PES            0x00000002		/* port enable status*/
#define RH_PS_PSS            0x00000004		/* port suspend status */
#define RH_PS_POCI           0x00000008		/* port over current indicator */
#define RH_PS_PRS            0x00000010		/* port reset status */
#define RH_PS_PPS            0x00000100		/* port power status */
#define RH_PS_LSDA           0x00000200		/* low speed device attached */
#define RH_PS_CSC            0x00010000		/* connect status change */
#define RH_PS_PESC           0x00020000		/* port enable status change */
#define RH_PS_PSSC           0x00040000		/* port suspend status change */
#define RH_PS_OCIC           0x00080000		/* over current indicator change */
#define RH_PS_PRSC           0x00100000		/* port reset status change */

/* roothub.status bits */
#define RH_HS_LPS	     0x00000001		/* local power status */
#define RH_HS_OCI	     0x00000002		/* over current indicator */
#define RH_HS_DRWE	     0x00008000		/* device remote wakeup enable */
#define RH_HS_LPSC	     0x00010000		/* local power status change */
#define RH_HS_OCIC	     0x00020000		/* over current indicator change */
#define RH_HS_CRWE	     0x80000000		/* clear remote wakeup enable */

/* roothub.b masks */
#define RH_B_DR		0x0000ffff		/* device removable flags */
#define RH_B_PPCM	0xffff0000		/* port power control mask */

/* roothub.a masks */
#define	RH_A_NDP	(0xff << 0)		/* number of downstream ports */
#define	RH_A_PSM	(1 << 8)		/* power switching mode */
#define	RH_A_NPS	(1 << 9)		/* no power switching */
#define	RH_A_DT		(1 << 10)		/* device type (mbz) */
#define	RH_A_OCPM	(1 << 11)		/* over current protection mode */
#define	RH_A_NOCP	(1 << 12)		/* no over current protection */
#define	RH_A_POTPGT	(0xff << 24)		/* power on to power good time */


/* hcd-private per-urb state */
typedef struct urb_priv {
	struct ed		*ed;
	u16			length;		// # tds in this request
	u16			td_cnt;		// tds already serviced
	struct list_head	pending;
	struct td		*td [0];	// all TDs in this request

} urb_priv_t;

#define TD_HASH_SIZE    64    /* power'o'two */
// sizeof (struct td) ~= 64 == 2^6 ...
#define TD_HASH_FUNC(td_dma) ((td_dma ^ (td_dma >> 6)) % TD_HASH_SIZE)


/*
 * This is the full ohci controller description
 *
 * Note how the "proper" USB information is just
 * a subset of what the full implementation needs. (Linus)
 */

struct ohci_hcd {
	spinlock_t		lock;

	/*
	 * I/O memory used to communicate with the HC (dma-consistent)
	 */
	struct ohci_regs __iomem *regs;

	/*
	 * main memory used to communicate with the HC (dma-consistent).
	 * hcd adds to schedule for a live hc any time, but removals finish
	 * only at the start of the next frame.
	 */
	struct ohci_hcca	*hcca;
	dma_addr_t		hcca_dma;

	struct ed		*ed_rm_list;		/* to be removed */

	struct ed		*ed_bulktail;		/* last in bulk list */
	struct ed		*ed_controltail;	/* last in ctrl list */
	struct ed		*periodic [NUM_INTS];	/* shadow int_table */

	/*
	 * OTG controllers and transceivers need software interaction;
	 * other external transceivers should be software-transparent
	 */
	struct otg_transceiver	*transceiver;
	void (*start_hnp)(struct ohci_hcd *ohci);

	/*
	 * memory management for queue data structures
	 */
	struct dma_pool		*td_cache;
	struct dma_pool		*ed_cache;
	struct td		*td_hash [TD_HASH_SIZE];
	struct list_head	pending;

	/*
	 * driver state
	 */
	int			num_ports;
	int			load [NUM_INTS];
	u32			hc_control;	/* copy of hc control reg */
	unsigned long		next_statechange;	/* suspend/resume */
	u32			fminterval;		/* saved register */
	unsigned		autostop:1;	/* rh auto stopping/stopped */

	unsigned long		flags;		/* for HC bugs */
#define	OHCI_QUIRK_AMD756	0x01			/* erratum #4 */
#define	OHCI_QUIRK_SUPERIO	0x02			/* natsemi */
#define	OHCI_QUIRK_INITRESET	0x04			/* SiS, OPTi, ... */
#define	OHCI_QUIRK_BE_DESC	0x08			/* BE descriptors */
#define	OHCI_QUIRK_BE_MMIO	0x10			/* BE registers */
#define	OHCI_QUIRK_ZFMICRO	0x20			/* Compaq ZFMicro chipset*/
#define	OHCI_QUIRK_NEC		0x40			/* lost interrupts */
#define	OHCI_QUIRK_FRAME_NO	0x80			/* no big endian frame_no shift */
#define	OHCI_QUIRK_HUB_POWER	0x100			/* distrust firmware power/oc setup */
#define	OHCI_QUIRK_AMD_ISO	0x200			/* ISO transfers*/
	// there are also chip quirks/bugs in init logic

	struct work_struct	nec_work;	/* Worker for NEC quirk */

	/* Needed for ZF Micro quirk */
	struct timer_list	unlink_watchdog;
	unsigned		eds_scheduled;
	struct ed		*ed_to_check;
	unsigned		zf_delay;

#ifdef DEBUG
	struct dentry		*debug_dir;
	struct dentry		*debug_async;
	struct dentry		*debug_periodic;
	struct dentry		*debug_registers;
#endif
};

#ifdef CONFIG_PCI
static inline int quirk_nec(struct ohci_hcd *ohci)
{
	return ohci->flags & OHCI_QUIRK_NEC;
}
static inline int quirk_zfmicro(struct ohci_hcd *ohci)
{
	return ohci->flags & OHCI_QUIRK_ZFMICRO;
}
static inline int quirk_amdiso(struct ohci_hcd *ohci)
{
	return ohci->flags & OHCI_QUIRK_AMD_ISO;
}
#else
static inline int quirk_nec(struct ohci_hcd *ohci)
{
	return 0;
}
static inline int quirk_zfmicro(struct ohci_hcd *ohci)
{
	return 0;
}
static inline int quirk_amdiso(struct ohci_hcd *ohci)
{
	return 0;
}
#endif

/* convert between an hcd pointer and the corresponding ohci_hcd */
static inline struct ohci_hcd *hcd_to_ohci (struct usb_hcd *hcd)
{
	return (struct ohci_hcd *) (hcd->hcd_priv);
}
static inline struct usb_hcd *ohci_to_hcd (const struct ohci_hcd *ohci)
{
	return container_of ((void *) ohci, struct usb_hcd, hcd_priv);
}

/*-------------------------------------------------------------------------*/

#ifndef DEBUG
#define STUB_DEBUG_FILES
#endif	/* DEBUG */

#define ohci_dbg(ohci, fmt, args...) \
	dev_dbg (ohci_to_hcd(ohci)->self.controller , fmt , ## args )
#define ohci_err(ohci, fmt, args...) \
	dev_err (ohci_to_hcd(ohci)->self.controller , fmt , ## args )
#define ohci_info(ohci, fmt, args...) \
	dev_info (ohci_to_hcd(ohci)->self.controller , fmt , ## args )
#define ohci_warn(ohci, fmt, args...) \
	dev_warn (ohci_to_hcd(ohci)->self.controller , fmt , ## args )

#ifdef OHCI_VERBOSE_DEBUG
#	define ohci_vdbg ohci_dbg
#else
#	define ohci_vdbg(ohci, fmt, args...) do { } while (0)
#endif

/*-------------------------------------------------------------------------*/

/*
 * While most USB host controllers implement their registers and
 * in-memory communication descriptors in little-endian format,
 * a minority (notably the IBM STB04XXX and the Motorola MPC5200
 * processors) implement them in big endian format.
 *
 * In addition some more exotic implementations like the Toshiba
 * Spider (aka SCC) cell southbridge are "mixed" endian, that is,
 * they have a different endianness for registers vs. in-memory
 * descriptors.
 *
 * This attempts to support either format at compile time without a
 * runtime penalty, or both formats with the additional overhead
 * of checking a flag bit.
 *
 * That leads to some tricky Kconfig rules howevber. There are
 * different defaults based on some arch/ppc platforms, though
 * the basic rules are:
 *
 * Controller type              Kconfig options needed
 * ---------------              ----------------------
 * little endian                CONFIG_USB_OHCI_LITTLE_ENDIAN
 *
 * fully big endian             CONFIG_USB_OHCI_BIG_ENDIAN_DESC _and_
 *                              CONFIG_USB_OHCI_BIG_ENDIAN_MMIO
 *
 * mixed endian                 CONFIG_USB_OHCI_LITTLE_ENDIAN _and_
 *                              CONFIG_USB_OHCI_BIG_ENDIAN_{MMIO,DESC}
 *
 * (If you have a mixed endian controller, you -must- also define
 * CONFIG_USB_OHCI_LITTLE_ENDIAN or things will not work when building
 * both your mixed endian and a fully big endian controller support in
 * the same kernel image).
 */

#ifdef CONFIG_USB_OHCI_BIG_ENDIAN_DESC
#ifdef CONFIG_USB_OHCI_LITTLE_ENDIAN
#define big_endian_desc(ohci)	(ohci->flags & OHCI_QUIRK_BE_DESC)
#else
#define big_endian_desc(ohci)	1		/* only big endian */
#endif
#else
#define big_endian_desc(ohci)	0		/* only little endian */
#endif

#ifdef CONFIG_USB_OHCI_BIG_ENDIAN_MMIO
#ifdef CONFIG_USB_OHCI_LITTLE_ENDIAN
#define big_endian_mmio(ohci)	(ohci->flags & OHCI_QUIRK_BE_MMIO)
#else
#define big_endian_mmio(ohci)	1		/* only big endian */
#endif
#else
#define big_endian_mmio(ohci)	0		/* only little endian */
#endif

/*
 * Big-endian read/write functions are arch-specific.
 * Other arches can be added if/when they're needed.
 *
 */
static inline unsigned int _ohci_readl (const struct ohci_hcd *ohci,
					__hc32 __iomem * regs)
{
#ifdef CONFIG_USB_OHCI_BIG_ENDIAN_MMIO
	return big_endian_mmio(ohci) ?
		readl_be (regs) :
		readl (regs);
#else
	return readl (regs);
#endif
}

static inline void _ohci_writel (const struct ohci_hcd *ohci,
				 const unsigned int val, __hc32 __iomem *regs)
{
#ifdef CONFIG_USB_OHCI_BIG_ENDIAN_MMIO
	big_endian_mmio(ohci) ?
		writel_be (val, regs) :
		writel (val, regs);
#else
		writel (val, regs);
#endif
}

#ifdef CONFIG_ARCH_LH7A404
/* Marc Singer: at the time this code was written, the LH7A404
 * had a problem reading the USB host registers.  This
 * implementation of the ohci_readl function performs the read
 * twice as a work-around.
 */
#define ohci_readl(o,r)		(_ohci_readl(o,r),_ohci_readl(o,r))
#define ohci_writel(o,v,r)	_ohci_writel(o,v,r)
#else
#define ohci_readl(o,r)		_ohci_readl(o,r)
#define ohci_writel(o,v,r)	_ohci_writel(o,v,r)
#endif


/*-------------------------------------------------------------------------*/

/* cpu to ohci */
static inline __hc16 cpu_to_hc16 (const struct ohci_hcd *ohci, const u16 x)
{
	return big_endian_desc(ohci) ?
		(__force __hc16)cpu_to_be16(x) :
		(__force __hc16)cpu_to_le16(x);
}

static inline __hc16 cpu_to_hc16p (const struct ohci_hcd *ohci, const u16 *x)
{
	return big_endian_desc(ohci) ?
		cpu_to_be16p(x) :
		cpu_to_le16p(x);
}

static inline __hc32 cpu_to_hc32 (const struct ohci_hcd *ohci, const u32 x)
{
	return big_endian_desc(ohci) ?
		(__force __hc32)cpu_to_be32(x) :
		(__force __hc32)cpu_to_le32(x);
}

static inline __hc32 cpu_to_hc32p (const struct ohci_hcd *ohci, const u32 *x)
{
	return big_endian_desc(ohci) ?
		cpu_to_be32p(x) :
		cpu_to_le32p(x);
}

/* ohci to cpu */
static inline u16 hc16_to_cpu (const struct ohci_hcd *ohci, const __hc16 x)
{
	return big_endian_desc(ohci) ?
		be16_to_cpu((__force __be16)x) :
		le16_to_cpu((__force __le16)x);
}

static inline u16 hc16_to_cpup (const struct ohci_hcd *ohci, const __hc16 *x)
{
	return big_endian_desc(ohci) ?
		be16_to_cpup((__force __be16 *)x) :
		le16_to_cpup((__force __le16 *)x);
}

static inline u32 hc32_to_cpu (const struct ohci_hcd *ohci, const __hc32 x)
{
	return big_endian_desc(ohci) ?
		be32_to_cpu((__force __be32)x) :
		le32_to_cpu((__force __le32)x);
}

static inline u32 hc32_to_cpup (const struct ohci_hcd *ohci, const __hc32 *x)
{
	return big_endian_desc(ohci) ?
		be32_to_cpup((__force __be32 *)x) :
		le32_to_cpup((__force __le32 *)x);
}

/*-------------------------------------------------------------------------*/

/* HCCA frame number is 16 bits, but is accessed as 32 bits since not all
 * hardware handles 16 bit reads.  That creates a different confusion on
 * some big-endian SOC implementations.  Same thing happens with PSW access.
 */

#ifdef CONFIG_PPC_MPC52xx
#define big_endian_frame_no_quirk(ohci)	(ohci->flags & OHCI_QUIRK_FRAME_NO)
#else
#define big_endian_frame_no_quirk(ohci)	0
#endif

static inline u16 ohci_frame_no(const struct ohci_hcd *ohci)
{
	u32 tmp;
	if (big_endian_desc(ohci)) {
		tmp = be32_to_cpup((__force __be32 *)&ohci->hcca->frame_no);
		if (!big_endian_frame_no_quirk(ohci))
			tmp >>= 16;
	} else
		tmp = le32_to_cpup((__force __le32 *)&ohci->hcca->frame_no);

	return (u16)tmp;
}

static inline __hc16 *ohci_hwPSWp(const struct ohci_hcd *ohci,
                                 const struct td *td, int index)
{
	return (__hc16 *)(big_endian_desc(ohci) ?
			&td->hwPSW[index ^ 1] : &td->hwPSW[index]);
}

static inline u16 ohci_hwPSW(const struct ohci_hcd *ohci,
                               const struct td *td, int index)
{
	return hc16_to_cpup(ohci, ohci_hwPSWp(ohci, td, index));
}

/*-------------------------------------------------------------------------*/

static inline void disable (struct ohci_hcd *ohci)
{
	ohci_to_hcd(ohci)->state = HC_STATE_HALT;
}

#define	FI			0x2edf		/* 12000 bits per frame (-1) */
#define	FSMP(fi)		(0x7fff & ((6 * ((fi) - 210)) / 7))
#define	FIT			(1 << 31)
#define LSTHRESH		0x628		/* lowspeed bit threshold */

static inline void periodic_reinit (struct ohci_hcd *ohci)
{
	u32	fi = ohci->fminterval & 0x03fff;
	u32	fit = ohci_readl(ohci, &ohci->regs->fminterval) & FIT;

	ohci_writel (ohci, (fit ^ FIT) | ohci->fminterval,
						&ohci->regs->fminterval);
	ohci_writel (ohci, ((9 * fi) / 10) & 0x3fff,
						&ohci->regs->periodicstart);
}

/* AMD-756 (D2 rev) reports corrupt register contents in some cases.
 * The erratum (#4) description is incorrect.  AMD's workaround waits
 * till some bits (mostly reserved) are clear; ok for all revs.
 */
#define read_roothub(hc, register, mask) ({ \
	u32 temp = ohci_readl (hc, &hc->regs->roothub.register); \
	if (temp == -1) \
		disable (hc); \
	else if (hc->flags & OHCI_QUIRK_AMD756) \
		while (temp & mask) \
			temp = ohci_readl (hc, &hc->regs->roothub.register); \
	temp; })

static inline u32 roothub_a (struct ohci_hcd *hc)
	{ return read_roothub (hc, a, 0xfc0fe000); }
static inline u32 roothub_b (struct ohci_hcd *hc)
	{ return ohci_readl (hc, &hc->regs->roothub.b); }
static inline u32 roothub_status (struct ohci_hcd *hc)
	{ return ohci_readl (hc, &hc->regs->roothub.status); }
static inline u32 roothub_portstatus (struct ohci_hcd *hc, int i)
	{ return read_roothub (hc, portstatus [i], 0xffe0fce0); }

--- NEW FILE: ohci-hcd.c ---
/*
 * OHCI HCD (Host Controller Driver) for USB.
 *
 * (C) Copyright 1999 Roman Weissgaerber <weissg@...>
 * (C) Copyright 2000-2004 David Brownell <dbrownell@...>
 *
 * [ Initialisation is based on Linus'  ]
 * [ uhci code and gregs ohci fragments ]
 * [ (C) Copyright 1999 Linus Torvalds  ]
 * [ (C) Copyright 1999 Gregory P. Smith]
 *
 *
 * OHCI is the main "non-Intel/VIA" standard for USB 1.1 host controller
 * interfaces (though some non-x86 Intel chips use it).  It supports
 * smarter hardware than UHCI.  A download link for the spec available
 * through the http://www.usb.org website.
 *
 * This file is licenced under the GPL.
 */
[...1202 lines suppressed...]
#endif
#ifdef SA1111_DRIVER
	sa1111_driver_unregister(&SA1111_DRIVER);
#endif
#ifdef OF_PLATFORM_DRIVER
	of_unregister_platform_driver(&OF_PLATFORM_DRIVER);
#endif
#ifdef PLATFORM_DRIVER
	platform_driver_unregister(&PLATFORM_DRIVER);
#endif
#ifdef PS3_SYSTEM_BUS_DRIVER
	ps3_ohci_driver_unregister(&PS3_SYSTEM_BUS_DRIVER);
#endif
#ifdef DEBUG
	debugfs_remove(ohci_debug_root);
#endif
	clear_bit(USB_OHCI_LOADED, &usb_hcds_loaded);
}
module_exit(ohci_hcd_mod_exit);


--- NEW FILE: ehci-hcd.c ---
/*
 * Copyright (c) 2000-2004 by David Brownell
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License as published by the
 * Free Software Foundation; either version 2 of the License, or (at your
 * option) any later version.
 *
 * This program is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 * for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software Foundation,
 * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */

#include <linux/module.h>
[...1139 lines suppressed...]
{
#ifdef OF_PLATFORM_DRIVER
	of_unregister_platform_driver(&OF_PLATFORM_DRIVER);
#endif
#ifdef PLATFORM_DRIVER
	platform_driver_unregister(&PLATFORM_DRIVER);
#endif
#ifdef PCI_DRIVER
	pci_unregister_driver(&PCI_DRIVER);
#endif
#ifdef PS3_SYSTEM_BUS_DRIVER
	ps3_ehci_driver_unregister(&PS3_SYSTEM_BUS_DRIVER);
#endif
#ifdef DEBUG
	debugfs_remove(ehci_debug_root);
#endif
	clear_bit(USB_EHCI_LOADED, &usb_hcds_loaded);
}
module_exit(ehci_hcd_cleanup);

Update of /cvsroot/gc-linux/linux/arch/powerpc/kernel
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/arch/powerpc/kernel

Modified Files:
	cputable.c dma.c head_32.S udbg.c 
Log Message:
Merge gc-linux-v2.6.31.


Index: udbg.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/kernel/udbg.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** udbg.c	25 Oct 2009 18:53:45 -0000	1.8
--- udbg.c	25 Oct 2009 18:59:27 -0000	1.9
***************
*** 61,64 ****
--- 61,66 ----
  #elif defined(CONFIG_PPC_EARLY_DEBUG_CPM)
  	udbg_init_cpm();
+ #elif defined(CONFIG_PPC_EARLY_DEBUG_USBGECKO)
+ 	udbg_init_usbgecko();
  #endif
  

Index: dma.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/kernel/dma.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dma.c	25 Oct 2009 18:56:55 -0000	1.4
--- dma.c	25 Oct 2009 18:59:27 -0000	1.5
***************
*** 34,37 ****
--- 34,40 ----
  	void *ret;
  #ifdef CONFIG_NOT_COHERENT_CACHE
+ 	if (dma_alloc_from_coherent(dev, size, dma_handle, &ret))
+ 		return ret;
+ 
  	ret = __dma_alloc_coherent(dev, size, dma_handle, flag);
  	if (ret == NULL)
***************
*** 61,64 ****
--- 64,69 ----
  {
  #ifdef CONFIG_NOT_COHERENT_CACHE
+ 	if (dma_release_from_coherent(dev, get_order(size), vaddr))
+ 		return;
  	__dma_free_coherent(size, vaddr);
  #else

Index: head_32.S
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/kernel/head_32.S,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** head_32.S	25 Oct 2009 18:56:55 -0000	1.13
--- head_32.S	25 Oct 2009 18:59:27 -0000	1.14
***************
*** 165,168 ****
--- 165,171 ----
  	bl	setup_cpm_bat
  #endif
+ #ifdef CONFIG_PPC_EARLY_DEBUG_USBGECKO
+ 	bl	setup_usbgecko_bat
+ #endif
  
  /*
***************
*** 1204,1207 ****
--- 1207,1228 ----
  #endif
  
+ #ifdef CONFIG_PPC_EARLY_DEBUG_USBGECKO
+ setup_usbgecko_bat:
+ 	/* prepare a BAT for early io */
+ 	lis	r8, 0x0c00
+ 	ori	r8, r8, 0x002a	/* uncached, guarded ,rw */
+ 	lis	r11, 0xcc00
+ 	ori	r11, r11, 0x3	/* 128K */
+ #ifdef CONFIG_WII
+ 	oris	r8, r8, 0x0100
+ 	oris	r11, r11, 0x0100
+ #endif
+ 	mtspr	SPRN_DBAT1L, r8
+ 	mtspr	SPRN_DBAT1U, r11
+ 	sync
+ 	isync
+ 	blr
+ #endif
+ 
  #ifdef CONFIG_8260
  /* Jump into the system reset for the rom.

Index: cputable.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/kernel/cputable.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** cputable.c	25 Oct 2009 18:56:55 -0000	1.12
--- cputable.c	25 Oct 2009 18:59:27 -0000	1.13
***************
*** 693,701 ****
  		.platform		= "ppc750",
  	},
! 	{	/* 750CL */
! 		.pvr_mask		= 0xfffff0f0,
! 		.pvr_value		= 0x00087010,
! 		.cpu_name		= "750CL",
! 		.cpu_features		= CPU_FTRS_750CL,
  		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,
  		.mmu_features		= MMU_FTR_HPTE_TABLE | MMU_FTR_USE_HIGH_BATS,
--- 693,701 ----
  		.platform		= "ppc750",
  	},
! 	{	/* 745/755 */
! 		.pvr_mask		= 0xfffff000,
! 		.pvr_value		= 0x00083000,
! 		.cpu_name		= "745/755",
! 		.cpu_features		= CPU_FTRS_750,
  		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,
  		.mmu_features		= MMU_FTR_HPTE_TABLE | MMU_FTR_USE_HIGH_BATS,
***************
*** 708,718 ****
  		.platform		= "ppc750",
  	},
! 	{	/* 745/755 */
! 		.pvr_mask		= 0xfffff000,
! 		.pvr_value		= 0x00083000,
! 		.cpu_name		= "745/755",
! 		.cpu_features		= CPU_FTRS_750,
  		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,
! 		.mmu_features		= MMU_FTR_HPTE_TABLE,
  		.icache_bsize		= 32,
  		.dcache_bsize		= 32,
--- 708,718 ----
  		.platform		= "ppc750",
  	},
! 	{	/* 750CL (and "Broadway") */
! 		.pvr_mask		= 0xfffff0e0,
! 		.pvr_value		= 0x00087000,
! 		.cpu_name		= "750CL",
! 		.cpu_features		= CPU_FTRS_750CL,
  		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,
! 		.mmu_features		= MMU_FTR_HPTE_TABLE | MMU_FTR_USE_HIGH_BATS,
  		.icache_bsize		= 32,
  		.dcache_bsize		= 32,

Update of /cvsroot/gc-linux/linux/kernel
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/kernel

Modified Files:
	kexec.c 
Log Message:
Merge gc-linux-v2.6.31.


Index: kexec.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/kernel/kexec.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** kexec.c	25 Oct 2009 18:56:56 -0000	1.4
--- kexec.c	25 Oct 2009 18:59:28 -0000	1.5
***************
*** 581,590 ****
  
  
! static int kimage_add_page(struct kimage *image, unsigned long page)
  {
  	int result;
  
  	page &= PAGE_MASK;
! 	result = kimage_add_entry(image, page | IND_SOURCE);
  	if (result == 0)
  		image->destination += PAGE_SIZE;
--- 581,591 ----
  
  
! static inline int kimage_add_page_with_flags(struct kimage *image,
! 					     unsigned long page, int flags)
  {
  	int result;
  
  	page &= PAGE_MASK;
! 	result = kimage_add_entry(image, page | (flags & ~PAGE_MASK));
  	if (result == 0)
  		image->destination += PAGE_SIZE;
***************
*** 593,596 ****
--- 594,607 ----
  }
  
+ static int kimage_add_page(struct kimage *image, unsigned long page)
+ {
+ 	return kimage_add_page_with_flags(image, page, IND_SOURCE);
+ }
+ 
+ static int kimage_add_page_noalloc(struct kimage *image, unsigned long page)
+ {
+ 	return kimage_add_page_with_flags(image, page, IND_SOURCE|IND_NOALLOC);
+ }
+ 
  
  static void kimage_free_extra_pages(struct kimage *image)
***************
*** 611,614 ****
--- 622,646 ----
  }
  
+ int kimage_add_preserved_region(struct kimage *image, unsigned long to,
+ 				       unsigned long from, int length)
+ {
+ 	int result = 0;
+ 
+ 	if (length > 0) {
+ 		result = kimage_set_destination(image, to);
+ 		if (result < 0)
+ 			goto out;
+ 		while (length > 0) {
+ 			result = kimage_add_page_noalloc(image, from);
+ 			if (result < 0)
+ 				goto out;
+ 			from += PAGE_SIZE;
+ 			length -= PAGE_SIZE;
+ 		}
+ 	}
+ out:
+ 	return result;
+ }
+ 
  #define for_each_kimage_entry(image, ptr, entry) \
  	for (ptr = &image->head; (entry = *ptr) && !(entry & IND_DONE); \
***************
*** 642,648 ****
  			 */
  			ind = entry;
  		}
- 		else if (entry & IND_SOURCE)
- 			kimage_free_entry(entry);
  	}
  	/* Free the final indirection page */
--- 674,682 ----
  			 */
  			ind = entry;
+ 		} else if (entry & IND_SOURCE) {
+ 			/* free only entries that we really allocated */
+ 			if (!(entry & IND_NOALLOC))
+ 				kimage_free_entry(entry);
  		}
  	}
  	/* Free the final indirection page */

Update of /cvsroot/gc-linux/linux/drivers/misc
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/misc

Modified Files:
	Kconfig Makefile gcn-mi.c 
Log Message:
Merge gc-linux-v2.6.31.


Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/misc/Kconfig,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Kconfig	25 Oct 2009 18:56:56 -0000	1.20
--- Kconfig	25 Oct 2009 18:59:28 -0000	1.21
***************
*** 56,59 ****
--- 56,81 ----
  	  interval timing.
  
+ config GAMECUBE_GQR
+ 	tristate "Nintendo GameCube/Wii Graphic Quantization Registers (GQR)"
+ 	depends on GAMECUBE_COMMON
+ 	help
+           This option enables device driver support for the Gekko/Broadway
+ 	  processors' Graphic Quantization Registers.
+ 	  These registers are used with the psql and psqst instructions.
+ 	  The registers will appear in /proc/sys/gqr.
+ 
+ config GAMECUBE_MI
+ 	tristate "Nintendo GameCube Memory Interface (MI)"
+ 	depends on GAMECUBE
+ 	help
+ 	  If you say yes to this option, support will be included for the
+ 	  Memory Interface (MI) of the Nintendo GameCube.
+ 
+ 	  The MI allows one to setup up to four protected memory regions,
+ 	  catching invalid accesses to them. The MI catches out of bounds
+ 	  memory accesses too.
+ 
+ 	  If in doubt, say N here.
+ 
  config IBM_ASM
  	tristate "Device driver for IBM RSA service processor"

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/misc/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Makefile	25 Oct 2009 18:56:56 -0000	1.16
--- Makefile	25 Oct 2009 18:59:28 -0000	1.17
***************
*** 21,24 ****
--- 21,26 ----
  obj-$(CONFIG_ISL29003)		+= isl29003.o
  obj-$(CONFIG_C2PORT)		+= c2port/
+ obj-$(CONFIG_GAMECUBE_GQR)	+= gcn-gqr.o
+ obj-$(CONFIG_GAMECUBE_MI)	+= gcn-mi.o
  obj-y				+= eeprom/
  obj-y				+= cb710/

Index: gcn-mi.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/misc/gcn-mi.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gcn-mi.c	1 Feb 2009 18:29:35 -0000	1.9
--- gcn-mi.c	25 Oct 2009 18:59:28 -0000	1.10
***************
*** 208,215 ****
  
  #ifdef CONFIG_PROC_FS
  	struct platform_device *pdev = to_platform_device(device);
! 	priv->proc_file = create_proc_read_entry(pdev->dev.bus_id, 0444, NULL,
  						 mi_proc_read, priv);
! 	priv->proc_file->owner = THIS_MODULE;
  #endif /* CONFIG_PROC_FS */
  
--- 208,217 ----
  
  #ifdef CONFIG_PROC_FS
+ 	{
  	struct platform_device *pdev = to_platform_device(device);
! 	priv->proc_file = create_proc_read_entry(dev_name(&pdev->dev),
! 						 0444, NULL,
  						 mi_proc_read, priv);
! 	}
  #endif /* CONFIG_PROC_FS */
  
***************
*** 240,244 ****
  #ifdef CONFIG_PROC_FS
  	struct platform_device *pdev = to_platform_device(priv->device);
! 	remove_proc_entry(pdev->dev.bus_id, NULL);
  #endif /* CONFIG_PROC_FS */
  
--- 242,246 ----
  #ifdef CONFIG_PROC_FS
  	struct platform_device *pdev = to_platform_device(priv->device);
! 	remove_proc_entry(dev_name(&pdev->dev), NULL);
  #endif /* CONFIG_PROC_FS */

Update of /cvsroot/gc-linux/linux/drivers/i2c/busses
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/i2c/busses

Modified Files:
	Kconfig Makefile i2c-gpio.c 
Log Message:
Merge gc-linux-v2.6.31.


Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/i2c/busses/Kconfig,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Kconfig	25 Oct 2009 18:56:56 -0000	1.8
--- Kconfig	25 Oct 2009 18:59:28 -0000	1.9
***************
*** 337,348 ****
  	  will be called i2c-designware.
  
! config I2C_GPIO
! 	tristate "GPIO-based bitbanging I2C"
  	depends on GENERIC_GPIO
  	select I2C_ALGOBIT
  	help
  	  This is a very simple bitbanging I2C driver utilizing the
  	  arch-neutral GPIO API to control the SCL and SDA lines.
  
  config I2C_HIGHLANDER
  	tristate "Highlander FPGA SMBus interface"
--- 337,360 ----
  	  will be called i2c-designware.
  
! config I2C_GPIO_COMMON
! 	tristate
  	depends on GENERIC_GPIO
  	select I2C_ALGOBIT
+ 	default n
+ 
+ config I2C_GPIO
+ 	tristate "GPIO-based bitbanging I2C"
+ 	select I2C_GPIO_COMMON
  	help
  	  This is a very simple bitbanging I2C driver utilizing the
  	  arch-neutral GPIO API to control the SCL and SDA lines.
  
+ config I2C_GPIO_OF
+ 	tristate "GPIO-based bitbanging I2C driver with OF bindings"
+ 	select I2C_GPIO_COMMON
+ 	help
+ 	  This option allows the declaration of GPIO-based I2C devices
+ 	  using a device tree source.
+ 
  config I2C_HIGHLANDER
  	tristate "Highlander FPGA SMBus interface"

Index: i2c-gpio.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/i2c/busses/i2c-gpio.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** i2c-gpio.c	25 Oct 2009 18:53:45 -0000	1.5
--- i2c-gpio.c	25 Oct 2009 18:59:28 -0000	1.6
***************
*** 8,87 ****
   * published by the Free Software Foundation.
   */
- #include <linux/i2c.h>
- #include <linux/i2c-algo-bit.h>
- #include <linux/i2c-gpio.h>
- #include <linux/init.h>
- #include <linux/module.h>
- #include <linux/platform_device.h>
- 
- #include <asm/gpio.h>
- 
- /* Toggle SDA by changing the direction of the pin */
- static void i2c_gpio_setsda_dir(void *data, int state)
- {
- 	struct i2c_gpio_platform_data *pdata = data;
- 
- 	if (state)
- 		gpio_direction_input(pdata->sda_pin);
- 	else
- 		gpio_direction_output(pdata->sda_pin, 0);
- }
- 
- /*
-  * Toggle SDA by changing the output value of the pin. This is only
-  * valid for pins configured as open drain (i.e. setting the value
-  * high effectively turns off the output driver.)
-  */
- static void i2c_gpio_setsda_val(void *data, int state)
- {
- 	struct i2c_gpio_platform_data *pdata = data;
  
! 	gpio_set_value(pdata->sda_pin, state);
! }
! 
! /* Toggle SCL by changing the direction of the pin. */
! static void i2c_gpio_setscl_dir(void *data, int state)
! {
! 	struct i2c_gpio_platform_data *pdata = data;
  
! 	if (state)
! 		gpio_direction_input(pdata->scl_pin);
! 	else
! 		gpio_direction_output(pdata->scl_pin, 0);
! }
  
  /*
!  * Toggle SCL by changing the output value of the pin. This is used
!  * for pins that are configured as open drain and for output-only
!  * pins. The latter case will break the i2c protocol, but it will
!  * often work in practice.
   */
- static void i2c_gpio_setscl_val(void *data, int state)
- {
- 	struct i2c_gpio_platform_data *pdata = data;
- 
- 	gpio_set_value(pdata->scl_pin, state);
- }
- 
- static int i2c_gpio_getsda(void *data)
- {
- 	struct i2c_gpio_platform_data *pdata = data;
- 
- 	return gpio_get_value(pdata->sda_pin);
- }
- 
- static int i2c_gpio_getscl(void *data)
- {
- 	struct i2c_gpio_platform_data *pdata = data;
- 
- 	return gpio_get_value(pdata->scl_pin);
- }
  
  static int __devinit i2c_gpio_probe(struct platform_device *pdev)
  {
  	struct i2c_gpio_platform_data *pdata;
- 	struct i2c_algo_bit_data *bit_data;
  	struct i2c_adapter *adap;
! 	int ret;
  
  	pdata = pdev->dev.platform_data;
--- 8,27 ----
   * published by the Free Software Foundation.
   */
  
! #include "i2c-gpio-common.h"
  
! #include <linux/init.h>
! #include <linux/platform_device.h>
  
  /*
!  * Platform bindings.
!  *
   */
  
  static int __devinit i2c_gpio_probe(struct platform_device *pdev)
  {
  	struct i2c_gpio_platform_data *pdata;
  	struct i2c_adapter *adap;
! 	int error;
  
  	pdata = pdev->dev.platform_data;
***************
*** 89,192 ****
  		return -ENXIO;
  
! 	ret = -ENOMEM;
! 	adap = kzalloc(sizeof(struct i2c_adapter), GFP_KERNEL);
  	if (!adap)
  		goto err_alloc_adap;
! 	bit_data = kzalloc(sizeof(struct i2c_algo_bit_data), GFP_KERNEL);
! 	if (!bit_data)
! 		goto err_alloc_bit_data;
! 
! 	ret = gpio_request(pdata->sda_pin, "sda");
! 	if (ret)
! 		goto err_request_sda;
! 	ret = gpio_request(pdata->scl_pin, "scl");
! 	if (ret)
! 		goto err_request_scl;
! 
! 	if (pdata->sda_is_open_drain) {
! 		gpio_direction_output(pdata->sda_pin, 1);
! 		bit_data->setsda = i2c_gpio_setsda_val;
! 	} else {
! 		gpio_direction_input(pdata->sda_pin);
! 		bit_data->setsda = i2c_gpio_setsda_dir;
! 	}
! 
! 	if (pdata->scl_is_open_drain || pdata->scl_is_output_only) {
! 		gpio_direction_output(pdata->scl_pin, 1);
! 		bit_data->setscl = i2c_gpio_setscl_val;
! 	} else {
! 		gpio_direction_input(pdata->scl_pin);
! 		bit_data->setscl = i2c_gpio_setscl_dir;
! 	}
! 
! 	if (!pdata->scl_is_output_only)
! 		bit_data->getscl = i2c_gpio_getscl;
! 	bit_data->getsda = i2c_gpio_getsda;
! 
! 	if (pdata->udelay)
! 		bit_data->udelay = pdata->udelay;
! 	else if (pdata->scl_is_output_only)
! 		bit_data->udelay = 50;			/* 10 kHz */
! 	else
! 		bit_data->udelay = 5;			/* 100 kHz */
! 
! 	if (pdata->timeout)
! 		bit_data->timeout = pdata->timeout;
! 	else
! 		bit_data->timeout = HZ / 10;		/* 100 ms */
! 
! 	bit_data->data = pdata;
! 
! 	adap->owner = THIS_MODULE;
! 	snprintf(adap->name, sizeof(adap->name), "i2c-gpio%d", pdev->id);
! 	adap->algo_data = bit_data;
! 	adap->class = I2C_CLASS_HWMON | I2C_CLASS_SPD;
! 	adap->dev.parent = &pdev->dev;
! 
! 	/*
! 	 * If "dev->id" is negative we consider it as zero.
! 	 * The reason to do so is to avoid sysfs names that only make
! 	 * sense when there are multiple adapters.
! 	 */
! 	adap->nr = (pdev->id != -1) ? pdev->id : 0;
! 	ret = i2c_bit_add_numbered_bus(adap);
! 	if (ret)
! 		goto err_add_bus;
  
  	platform_set_drvdata(pdev, adap);
  
- 	dev_info(&pdev->dev, "using pins %u (SDA) and %u (SCL%s)\n",
- 		 pdata->sda_pin, pdata->scl_pin,
- 		 pdata->scl_is_output_only
- 		 ? ", no clock stretching" : "");
- 
  	return 0;
  
! err_add_bus:
! 	gpio_free(pdata->scl_pin);
! err_request_scl:
! 	gpio_free(pdata->sda_pin);
! err_request_sda:
! 	kfree(bit_data);
! err_alloc_bit_data:
  	kfree(adap);
  err_alloc_adap:
! 	return ret;
  }
  
  static int __devexit i2c_gpio_remove(struct platform_device *pdev)
  {
- 	struct i2c_gpio_platform_data *pdata;
  	struct i2c_adapter *adap;
  
  	adap = platform_get_drvdata(pdev);
  	pdata = pdev->dev.platform_data;
  
! 	i2c_del_adapter(adap);
! 	gpio_free(pdata->scl_pin);
! 	gpio_free(pdata->sda_pin);
! 	kfree(adap->algo_data);
  	kfree(adap);
- 
  	return 0;
  }
--- 29,61 ----
  		return -ENXIO;
  
! 	error = -ENOMEM;
! 	adap = kzalloc(sizeof(*adap), GFP_KERNEL);
  	if (!adap)
  		goto err_alloc_adap;
! 	error = i2c_gpio_adapter_probe(adap, pdata, &pdev->dev, pdev->id,
! 				       THIS_MODULE);
! 	if (error)
! 		goto err_probe;
  
  	platform_set_drvdata(pdev, adap);
  
  	return 0;
  
! err_probe:
  	kfree(adap);
  err_alloc_adap:
! 	return error;
  }
  
  static int __devexit i2c_gpio_remove(struct platform_device *pdev)
  {
  	struct i2c_adapter *adap;
+ 	struct i2c_gpio_platform_data *pdata;
  
  	adap = platform_get_drvdata(pdev);
  	pdata = pdev->dev.platform_data;
  
! 	i2c_gpio_adapter_remove(adap, pdata);
  	kfree(adap);
  	return 0;
  }
***************
*** 203,213 ****
  static int __init i2c_gpio_init(void)
  {
! 	int ret;
  
! 	ret = platform_driver_register(&i2c_gpio_driver);
! 	if (ret)
! 		printk(KERN_ERR "i2c-gpio: probe failed: %d\n", ret);
  
! 	return ret;
  }
  module_init(i2c_gpio_init);
--- 72,82 ----
  static int __init i2c_gpio_init(void)
  {
! 	int error;
  
! 	error = platform_driver_register(&i2c_gpio_driver);
! 	if (error)
! 		printk(KERN_ERR "i2c-gpio: registration failed (%d)\n", error);
  
! 	return error;
  }
  module_init(i2c_gpio_init);

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/i2c/busses/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile	25 Oct 2009 18:56:56 -0000	1.8
--- Makefile	25 Oct 2009 18:59:28 -0000	1.9
***************
*** 32,36 ****
--- 32,38 ----
  obj-$(CONFIG_I2C_DAVINCI)	+= i2c-davinci.o
  obj-$(CONFIG_I2C_DESIGNWARE)	+= i2c-designware.o
+ obj-$(CONFIG_I2C_GPIO_COMMON)	+= i2c-gpio-common.o
  obj-$(CONFIG_I2C_GPIO)		+= i2c-gpio.o
+ obj-$(CONFIG_I2C_GPIO_OF)	+= i2c-gpio-of.o
  obj-$(CONFIG_I2C_HIGHLANDER)	+= i2c-highlander.o
  obj-$(CONFIG_I2C_IBM_IIC)	+= i2c-ibm_iic.o

Update of /cvsroot/gc-linux/linux/include/asm-generic
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/include/asm-generic

Modified Files:
	gpio.h 
Log Message:
Merge gc-linux-v2.6.31.


Index: gpio.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/asm-generic/gpio.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gpio.h	25 Oct 2009 18:53:46 -0000	1.6
--- gpio.h	25 Oct 2009 18:59:28 -0000	1.7
***************
*** 119,122 ****
--- 119,123 ----
  extern int gpio_direction_input(unsigned gpio);
  extern int gpio_direction_output(unsigned gpio, int value);
+ extern int gpio_direction_is_output(unsigned gpio);
  
  extern int gpio_get_value_cansleep(unsigned gpio);

Update of /cvsroot/gc-linux/linux/drivers/usb/host
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/usb/host

Modified Files:
	Kconfig Makefile ehci-hcd.c ehci.h ohci-hcd.c ohci-q.c ohci.h 
Log Message:
Merge gc-linux-v2.6.31.


Index: ohci-q.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/usb/host/ohci-q.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ohci-q.c	25 Oct 2009 18:53:45 -0000	1.3
--- ohci-q.c	25 Oct 2009 18:59:28 -0000	1.4
***************
*** 616,619 ****
--- 616,622 ----
  		/* FALLTHROUGH */
  	case PIPE_BULK:
+ 		if (ohci->flags & OHCI_QUIRK_WII)
+ 			ohci_mipc_bulk_quirk(ohci);
+ 
  		info = is_out
  			? TD_T_TOGGLE | TD_CC | TD_DP_OUT
***************
*** 647,650 ****
--- 650,656 ----
  	 */
  	case PIPE_CONTROL:
+ 		if (ohci->flags & OHCI_QUIRK_WII)
+ 			ohci_mipc_control_quirk(ohci);
+ 
  		info = TD_CC | TD_DP_SETUP | TD_T_DATA0;
  		td_fill (ohci, info, urb->setup_dma, 8, urb, cnt++);

Index: ehci.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/usb/host/ehci.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ehci.h	25 Oct 2009 18:56:56 -0000	1.4
--- ehci.h	25 Oct 2009 18:59:28 -0000	1.5
***************
*** 38,41 ****
--- 38,62 ----
  #endif
  
+ /*
+  * Some platforms have weird constraints when accessing memory.
+  *
+  * For example, the Nintendo Wii video game console is unable to perform
+  * non-32 bit writes to non-cached memory for its second block of 64MB of RAM.
+  * As this platform also requires CONFIG_NOT_COHERENT, all memory allocated
+  * using the dma memory allocation functions can only be written using
+  * 32-bit accesses.
+  *
+  * Because of this constraint, as a workaround, we make sure that all
+  * fields in struct ehci_qh (which is allocated from a dma pool) are
+  * always 32 bit fields.
+  * Note that the remaining structs allocated from dma-able memory are already
+  * 32 bit fields.
+  */
+ #ifdef CONFIG_USB_EHCI_HCD_MIPC
+ #define ehci_fld(type)	u32
+ #else
+ #define ehci_fld(type)	type
+ #endif
+ 
  /* statistics can be kept for for tuning/monitoring */
  struct ehci_stats {
***************
*** 337,341 ****
  	unsigned		stamp;
  
! 	u8			qh_state;
  #define	QH_STATE_LINKED		1		/* HC sees this */
  #define	QH_STATE_UNLINK		2		/* HC may still see this */
--- 358,362 ----
  	unsigned		stamp;
  
! 	ehci_fld(u8)		qh_state;
  #define	QH_STATE_LINKED		1		/* HC sees this */
  #define	QH_STATE_UNLINK		2		/* HC may still see this */
***************
*** 344,357 ****
  #define	QH_STATE_COMPLETING	5		/* don't touch token.HALT */
  
! 	u8			xacterrs;	/* XactErr retry counter */
  #define	QH_XACTERR_MAX		32		/* XactErr retry limit */
  
  	/* periodic schedule info */
! 	u8			usecs;		/* intr bandwidth */
! 	u8			gap_uf;		/* uframes split/csplit gap */
! 	u8			c_usecs;	/* ... split completion bw */
! 	u16			tt_usecs;	/* tt downstream bandwidth */
! 	unsigned short		period;		/* polling interval */
! 	unsigned short		start;		/* where polling starts */
  #define NO_FRAME ((unsigned short)~0)			/* pick new start */
  
--- 365,378 ----
  #define	QH_STATE_COMPLETING	5		/* don't touch token.HALT */
  
! 	ehci_fld(u8)		xacterrs;	/* XactErr retry counter */
  #define	QH_XACTERR_MAX		32		/* XactErr retry limit */
  
  	/* periodic schedule info */
! 	ehci_fld(u8)		usecs;		/* intr bandwidth */
! 	ehci_fld(u8)		gap_uf;		/* uframes split/csplit gap */
! 	ehci_fld(u8)		c_usecs;	/* ... split completion bw */
! 	ehci_fld(u16)		tt_usecs;	/* tt downstream bandwidth */
! 	ehci_fld(unsigned short)	period;	/* polling interval */
! 	ehci_fld(unsigned short)	start;	/* where polling starts */
  #define NO_FRAME ((unsigned short)~0)			/* pick new start */
  
***************
*** 592,595 ****
--- 613,634 ----
  #endif
  
+ #ifdef CONFIG_USB_EHCI_HCD_MIPC
+ 
+ #include <asm/starlet-mini.h>
+ 
+ static inline unsigned int ehci_readl(const struct ehci_hcd *ehci,
+ 				      __u32 __iomem *regs)
+ {
+ 	return mipc_in_be32(regs);
+ }
+ 
+ static inline void ehci_writel(const struct ehci_hcd *ehci,
+ 			       const unsigned int val, __u32 __iomem *regs)
+ {
+ 	mipc_out_be32(regs, val);
+ }
+ 
+ #else
+ 
  /*
   * Big-endian read/write functions are arch-specific.
***************
*** 625,628 ****
--- 664,669 ----
  }
  
+ #endif /* CONFIG_USB_EHCI_HCD_MIPC */
+ 
  /*
   * On certain ppc-44x SoC there is a HW issue, that could only worked around with

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/usb/host/Kconfig,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Kconfig	25 Oct 2009 18:56:56 -0000	1.11
--- Kconfig	25 Oct 2009 18:59:28 -0000	1.12
***************
*** 114,117 ****
--- 114,125 ----
  	  OpenFirmware platform bus.
  
+ config USB_EHCI_HCD_MIPC
+ 	bool "Nintendo Wii EHCI USB controller support via 'mini'"
+ 	depends on USB_EHCI_HCD && STARLET_MINI
+ 	default y
+ 	---help---
+ 	  Say Y here to support the EHCI USB controller found in the
+ 	  Nintendo Wii video game console.
+ 
  config USB_OXU210HP_HCD
  	tristate "OXU210HP HCD support"
***************
*** 204,207 ****
--- 212,224 ----
  	default USB_OHCI_HCD_PPC_OF_BE || USB_OHCI_HCD_PPC_OF_LE
  
+ config USB_OHCI_HCD_MIPC
+ 	bool "Nintendo Wii OHCI USB controller support via 'mini'"
+ 	depends on USB_OHCI_HCD && STARLET_MINI
+ 	select USB_OHCI_LITTLE_ENDIAN
+ 	default y
+ 	---help---
+ 	  Say Y here to support the OHCI USB controller found in the
+ 	  Nintendo Wii video game console.
+ 
  config USB_OHCI_HCD_PCI
  	bool "OHCI support for PCI-bus USB controllers"
***************
*** 344,347 ****
--- 361,383 ----
  	   SH7366, SH7723 and SH7724 processors.
  
+ config USB_WII_HCD
+ 	tristate "Nintendo Wii HCD support"
+ 	depends on USB && STARLET_IOS && !HIGHMEM && EXPERIMENTAL
+ 	help
+ 	  The Nintendo Wii includes a USB 1.1 host controller that can be
+ 	  accessed through the API provided by the starlet subsystem.
+ 
+ 	  Enable this option if you plan to use the internal Nintendo Wii
+ 	  bluetooth dongle or any USB peripheral connected to the external
+ 	  ports.
+ 
+ 	  USB devices using isochronous transfers are not supported.
+ 	  Use of USB hubs is partially supported.
+ 
+ 	  Use completely at you own risk. If unsure, say N.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called rvl-sthcd.
+ 
  config USB_WHCI_HCD
  	tristate "Wireless USB Host Controller Interface (WHCI) driver (EXPERIMENTAL)"

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/usb/host/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile	25 Oct 2009 18:56:56 -0000	1.8
--- Makefile	25 Oct 2009 18:59:28 -0000	1.9
***************
*** 31,33 ****
--- 31,34 ----
  obj-$(CONFIG_USB_R8A66597_HCD)	+= r8a66597-hcd.o
  obj-$(CONFIG_USB_ISP1760_HCD)	+= isp1760.o
+ obj-$(CONFIG_USB_WII_HCD)	+= rvl-sthcd.o
  obj-$(CONFIG_USB_HWA_HCD)	+= hwa-hc.o

Index: ohci.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/usb/host/ohci.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ohci.h	25 Oct 2009 18:53:45 -0000	1.3
--- ohci.h	25 Oct 2009 18:59:28 -0000	1.4
***************
*** 17,20 ****
--- 17,42 ----
  
  /*
+  * Some platforms have weird constraints when accessing memory.
+  *
+  * For example, the Nintendo Wii video game console is unable to perform
+  * non-32 bit writes to non-cached memory for its second block of 64MB of RAM.
+  * As this platform also requires CONFIG_NOT_COHERENT_CACHE, all memory
+  * allocated using the dma memory allocation functions can only be written
+  * using 32-bit accesses.
+  *
+  * Because of this constraint, as a workaround, we make sure that all
+  * fields in struct ed and td (which are allocated from dma pools) are
+  * always 32 bit fields.
+  * Note that the remaining structs allocated from dma-able memory are already
+  * 32 bit fields.
+  */
+ #ifdef CONFIG_USB_OHCI_HCD_MIPC
+ #define ohci_fld(type)  u32
+ #else
+ #define ohci_fld(type)  type
+ #endif
+ 
+ 
+ /*
   * OHCI Endpoint Descriptor (ED) ... holds TD queue
   * See OHCI spec, section 4.2
***************
*** 52,70 ****
  	 * usually:  OPER --> UNLINK --> (IDLE | OPER) --> ...
  	 */
! 	u8			state;		/* ED_{IDLE,UNLINK,OPER} */
  #define ED_IDLE		0x00		/* NOT linked to HC */
  #define ED_UNLINK	0x01		/* being unlinked from hc */
  #define ED_OPER		0x02		/* IS linked to hc */
  
! 	u8			type;		/* PIPE_{BULK,...} */
  
  	/* periodic scheduling params (for intr and iso) */
! 	u8			branch;
! 	u16			interval;
! 	u16			load;
! 	u16			last_iso;	/* iso only */
  
  	/* HC may see EDs on rm_list until next frame (frame_no == tick) */
! 	u16			tick;
  } __attribute__ ((aligned(16)));
  
--- 74,92 ----
  	 * usually:  OPER --> UNLINK --> (IDLE | OPER) --> ...
  	 */
! 	ohci_fld(u8)		state;		/* ED_{IDLE,UNLINK,OPER} */
  #define ED_IDLE		0x00		/* NOT linked to HC */
  #define ED_UNLINK	0x01		/* being unlinked from hc */
  #define ED_OPER		0x02		/* IS linked to hc */
  
! 	ohci_fld(u8)		type;		/* PIPE_{BULK,...} */
  
  	/* periodic scheduling params (for intr and iso) */
! 	ohci_fld(u8)		branch;
! 	ohci_fld(u16)		interval;
! 	ohci_fld(u16)		load;
! 	ohci_fld(u16)		last_iso;	/* iso only */
  
  	/* HC may see EDs on rm_list until next frame (frame_no == tick) */
! 	ohci_fld(u16)		tick;
  } __attribute__ ((aligned(16)));
  
***************
*** 119,123 ****
  
  	/* rest are purely for the driver's use */
! 	__u8		index;
  	struct ed	*ed;
  	struct td	*td_hash;	/* dma-->td hashtable */
--- 141,145 ----
  
  	/* rest are purely for the driver's use */
! 	ohci_fld(__u8)	index;
  	struct ed	*ed;
  	struct td	*td_hash;	/* dma-->td hashtable */
***************
*** 403,406 ****
--- 425,429 ----
  #define	OHCI_QUIRK_HUB_POWER	0x100			/* distrust firmware power/oc setup */
  #define	OHCI_QUIRK_AMD_ISO	0x200			/* ISO transfers*/
+ #define	OHCI_QUIRK_WII		0x400			/* Hollywood chipset */
  	// there are also chip quirks/bugs in init logic
  
***************
*** 537,540 ****
--- 560,594 ----
  #endif
  
+ #ifdef CONFIG_USB_OHCI_HCD_MIPC
+ 
+ #include <asm/starlet-mini.h>
+ 
+ static inline unsigned int _ohci_readl(const struct ohci_hcd *ohci,
+ 				       __hc32 __iomem *regs)
+ {
+ 	return mipc_in_be32(regs);
+ }
+ 
+ static inline void _ohci_writel(const struct ohci_hcd *ohci,
+ 				const unsigned int val, __hc32 __iomem *regs)
+ {
+ 	mipc_out_be32(regs, val);
+ }
+ 
+ extern void ohci_mipc_control_quirk(struct ohci_hcd *ohci);
+ extern void ohci_mipc_bulk_quirk(struct ohci_hcd *ohci);
+ 
+ #else
+ 
+ static inline void ohci_mipc_control_quirk(struct ohci_hcd *ohci)
+ {
+ 	return;
+ }
+ 
+ static inline void ohci_mipc_bulk_quirk(struct ohci_hcd *ohci)
+ {
+ 	return;
+ }
+ 
  /*
   * Big-endian read/write functions are arch-specific.
***************
*** 566,569 ****
--- 620,625 ----
  }
  
+ #endif /* CONFIG_USB_OHCI_HCD_MIPC */
+ 
  #ifdef CONFIG_ARCH_LH7A404
  /* Marc Singer: at the time this code was written, the LH7A404

Index: ohci-hcd.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/usb/host/ohci-hcd.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ohci-hcd.c	25 Oct 2009 18:56:56 -0000	1.4
--- ohci-hcd.c	25 Oct 2009 18:59:28 -0000	1.5
***************
*** 1062,1065 ****
--- 1062,1070 ----
  #endif
  
+ #ifdef CONFIG_USB_OHCI_HCD_MIPC
+ #include "ohci-mipc.c"
+ #define OF_PLATFORM_DRIVER	ohci_hcd_mipc_driver
+ #endif
+ 
  #ifdef CONFIG_PPC_PS3
  #include "ohci-ps3.c"

Index: ehci-hcd.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/usb/host/ehci-hcd.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ehci-hcd.c	25 Oct 2009 18:56:56 -0000	1.4
--- ehci-hcd.c	25 Oct 2009 18:59:28 -0000	1.5
***************
*** 1108,1111 ****
--- 1108,1116 ----
  #endif
  
+ #ifdef CONFIG_USB_EHCI_HCD_MIPC
+ #include "ehci-mipc.c"
+ #define OF_PLATFORM_DRIVER	ehci_hcd_mipc_driver
+ #endif
+ 
  #ifdef CONFIG_PLAT_ORION
  #include "ehci-orion.c"

Update of /cvsroot/gc-linux/linux/drivers/net
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/net

Modified Files:
	Kconfig Makefile gcn-bba.c 
Log Message:
Merge gc-linux-v2.6.31.


Index: gcn-bba.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/gcn-bba.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** gcn-bba.c	25 Oct 2009 18:50:27 -0000	1.19
--- gcn-bba.c	25 Oct 2009 18:59:28 -0000	1.20
***************
*** 350,357 ****
  		packet_len:12,
  		next_packet_ptr:12;
! #else
  	__u32	next_packet_ptr:12,
  		packet_len:12,
  		status:8;
  #endif
  } __attribute((packed));
--- 350,359 ----
  		packet_len:12,
  		next_packet_ptr:12;
! #elif defined(__LITTLE_ENDIAN_BITFIELD)
  	__u32	next_packet_ptr:12,
  		packet_len:12,
  		status:8;
+ #else
+ #error "Unsupported byte order."
  #endif
  } __attribute((packed));
***************
*** 717,721 ****
  
  		/* move read pointer to next packet */
! 		bba_out12(BBA_RRP, rrp = descr.next_packet_ptr);
  
  		/* get write pointer and continue */
--- 719,724 ----
  
  		/* move read pointer to next packet */
! 		rrp = descr.next_packet_ptr;
! 		bba_out12(BBA_RRP, rrp);
  
  		/* get write pointer and continue */
***************
*** 1089,1092 ****
--- 1092,1105 ----
  }
  
+ static const struct net_device_ops bba_netdev_ops = {
+ 	.ndo_open		= bba_open,
+ 	.ndo_stop		= bba_close,
+ 	.ndo_start_xmit		= bba_start_xmit,
+ 	.ndo_get_stats		= bba_get_stats,
+ 	.ndo_change_mtu		= eth_change_mtu,
+ 	.ndo_validate_addr	= eth_validate_addr,
+ 	.ndo_set_mac_address	= eth_mac_addr,
+ };
+ 
  /*
   * Initializes a BroadBand Adapter device.
***************
*** 1111,1118 ****
  
  	/* network device hooks */
! 	dev->open = bba_open;
! 	dev->stop = bba_close;
! 	dev->hard_start_xmit = bba_start_xmit;
! 	dev->get_stats = bba_get_stats;
  
  	priv = netdev_priv(dev);
--- 1124,1128 ----
  
  	/* network device hooks */
! 	dev->netdev_ops = &bba_netdev_ops;
  
  	priv = netdev_priv(dev);

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** Makefile	25 Oct 2009 18:56:56 -0000	1.37
--- Makefile	25 Oct 2009 18:59:28 -0000	1.38
***************
*** 242,245 ****
--- 242,246 ----
  obj-$(CONFIG_ENC28J60) += enc28j60.o
  obj-$(CONFIG_ETHOC) += ethoc.o
+ obj-$(CONFIG_GAMECUBE_BBA) += gcn-bba.o
  
  obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** Kconfig	25 Oct 2009 18:56:56 -0000	1.43
--- Kconfig	25 Oct 2009 18:59:28 -0000	1.44
***************
*** 271,274 ****
--- 271,283 ----
  	  will be called bmac.
  
+ config GAMECUBE_BBA
+ 	tristate "Nintendo GameCube ethernet BroadBand Adapter (BBA)"
+ 	depends on GAMECUBE_EXI && GAMECUBE
+ 	help
+ 	  Say Y here to add ethernet support for the Broadband Adapter (BBA).
+ 
+ 	  To compile this driver as a module, choose M here: the module
+ 	  will be called gcn-bba.
+ 
  config ARIADNE
  	tristate "Ariadne support"

Update of /cvsroot/gc-linux/linux/drivers/gpio
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/gpio

Modified Files:
	gpiolib.c 
Log Message:
Merge gc-linux-v2.6.31.


Index: gpiolib.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/gpio/gpiolib.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gpiolib.c	25 Oct 2009 18:53:45 -0000	1.6
--- gpiolib.c	25 Oct 2009 18:59:28 -0000	1.7
***************
*** 1006,1009 ****
--- 1006,1027 ----
  EXPORT_SYMBOL_GPL(gpio_direction_output);
  
+ /**
+  * gpio_direction_is_output - tell if a gpio is configured as an output
+  * @gpio: gpio in question
+  *
+  * Returns a negative errno if the given gpio is not valid.
+  * Returns a positive non-zero if the gpio is configured as an output.
+  * Returns zero otherwise.
+  */
+ int gpio_direction_is_output(unsigned gpio)
+ {
+ 	struct gpio_desc *desc = &gpio_desc[gpio];
+ 
+ 	if (!gpio_is_valid(gpio))
+ 		return -EINVAL;
+ 
+ 	return test_bit(FLAG_IS_OUT, &desc->flags);
+ }
+ EXPORT_SYMBOL_GPL(gpio_direction_is_output);
  
  /* I/O calls are only valid after configuration completed; the relevant

Update of /cvsroot/gc-linux/linux/drivers/block
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/block

Modified Files:
	Kconfig Makefile gcn-aram.c gcn-sd.c rvl-mem2.c rvl-stsd.c 
Log Message:
Merge gc-linux-v2.6.31.


Index: gcn-aram.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-aram.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** gcn-aram.c	2 Mar 2009 18:50:14 -0000	1.20
--- gcn-aram.c	25 Oct 2009 18:59:27 -0000	1.21
***************
*** 89,93 ****
   */
  struct aram_drvdata {
! 	spinlock_t			lock;
  
  	spinlock_t			io_lock;
--- 89,93 ----
   */
  struct aram_drvdata {
! 	spinlock_t			queue_lock;
  
  	spinlock_t			io_lock;
***************
*** 99,103 ****
  	struct request_queue		*queue;
  
! 	struct request			*req;
  	dma_addr_t			dma_addr;
  	size_t				dma_len;
--- 99,103 ----
  	struct request_queue		*queue;
  
! 	struct request			*req;	/* protected by ->io_lock */
  	dma_addr_t			dma_addr;
  	size_t				dma_len;
***************
*** 169,190 ****
  	out_be16(csr_reg, csr);
  
! 	/* pick up current request being serviced */
  	req = drvdata->req;
  	drvdata->req = NULL;
! 
! 	spin_unlock_irqrestore(&drvdata->io_lock, flags);
! 
! 	if (req) {
! 		__blk_end_request(req, 0, req->current_nr_sectors << 9);
  		dma_unmap_single(drvdata->dev,
  				 drvdata->dma_addr, drvdata->dma_len,
  				 rq_dir_to_dma_dir(req));
! 		spin_lock(&drvdata->lock);
! 		blk_start_queue(drvdata->queue);
! 		spin_unlock(&drvdata->lock);
! 	} else {
  		drv_printk(KERN_ERR, "ignoring interrupt, no request\n");
  	}
  
  	return IRQ_HANDLED;
  }
--- 169,195 ----
  	out_be16(csr_reg, csr);
  
! 	/* pick up request in service */
  	req = drvdata->req;
  	drvdata->req = NULL;
! 	if (drvdata->dma_len) {
  		dma_unmap_single(drvdata->dev,
  				 drvdata->dma_addr, drvdata->dma_len,
  				 rq_dir_to_dma_dir(req));
! 		drvdata->dma_len = 0;
! 	}
! 
! 	spin_unlock_irqrestore(&drvdata->io_lock, flags);
! 
! 	if (!req) {
  		drv_printk(KERN_ERR, "ignoring interrupt, no request\n");
+ 		goto out;
  	}
  
+ 	spin_lock(&drvdata->queue_lock);
+ 	__blk_end_request_cur(req, 0);
+ 	blk_start_queue(drvdata->queue);
+ 	spin_unlock(&drvdata->queue_lock);
+ 
+ out:
  	return IRQ_HANDLED;
  }
***************
*** 197,251 ****
  	size_t len;
  	unsigned long flags;
  
! 	req = elv_next_request(q);
  	while (req) {
  		spin_lock_irqsave(&drvdata->io_lock, flags);
- 
- 		/* we schedule a single request each time */
  		if (drvdata->req) {
- 			spin_unlock_irqrestore(&drvdata->io_lock, flags);
  			blk_stop_queue(q);
- 			break;
- 		}
- 
- 		blkdev_dequeue_request(req);
- 
- 		/* ignore requests that we can't handle */
- 		if (!blk_fs_request(req)) {
  			spin_unlock_irqrestore(&drvdata->io_lock, flags);
! 			continue;
  		}
  
! 		/* store the request being handled */
! 		drvdata->req = req;
! 		blk_stop_queue(q);
  
! 		spin_unlock_irqrestore(&drvdata->io_lock, flags);
  
  		/* calculate the ARAM address and length */
! 		aram_addr = req->sector << 9;
! 		len = req->current_nr_sectors << 9;
  
  		/* give up if the request goes out of bounds */
  		if (aram_addr + len > ARAM_BUFFERSIZE) {
  			drv_printk(KERN_ERR, "bad access: block=%lu,"
! 				   " size=%u\n", (unsigned long)req->sector,
  				    len);
! 			/* XXX correct? the request is already dequeued */
! 			end_request(req, 0);
! 			continue;
  		}
  
! 		BUG_ON(req->nr_phys_segments != 1);
  
! 		/* perform DMA mappings */
  		drvdata->dma_len = len;
  		drvdata->dma_addr = dma_map_single(drvdata->dev,
  						   req->buffer, len,
  						   rq_dir_to_dma_dir(req));
- 
- 		/* start the DMA transfer */
  		aram_start_dma_transfer(drvdata, aram_addr);
  		break;
  	}
  }
--- 202,250 ----
  	size_t len;
  	unsigned long flags;
+ 	int error;
  
! 	req = blk_peek_request(q);
  	while (req) {
  		spin_lock_irqsave(&drvdata->io_lock, flags);
  		if (drvdata->req) {
  			blk_stop_queue(q);
  			spin_unlock_irqrestore(&drvdata->io_lock, flags);
! 			break;
  		}
  
! 		blk_start_request(req);
! 		error = -EIO;
  
! 		if (!blk_fs_request(req))
! 			goto done;
  
  		/* calculate the ARAM address and length */
! 		aram_addr = blk_rq_pos(req) << 9;
! 		len = blk_rq_cur_bytes(req);
  
  		/* give up if the request goes out of bounds */
  		if (aram_addr + len > ARAM_BUFFERSIZE) {
  			drv_printk(KERN_ERR, "bad access: block=%lu,"
! 				   " size=%u\n", (unsigned long)blk_rq_pos(req),
  				    len);
! 			goto done;
  		}
  
! 		drvdata->req = req;
! 		spin_unlock_irqrestore(&drvdata->io_lock, flags);
  
! 		/* perform DMA mappings and start the transfer */
  		drvdata->dma_len = len;
  		drvdata->dma_addr = dma_map_single(drvdata->dev,
  						   req->buffer, len,
  						   rq_dir_to_dma_dir(req));
  		aram_start_dma_transfer(drvdata, aram_addr);
+ 
+ 		/* one request at a time */
  		break;
+ 	done:
+ 		spin_unlock_irqrestore(&drvdata->io_lock, flags);
+ 		if (!__blk_end_request_cur(req, error))
+ 			req = blk_peek_request(q);
  	}
  }
***************
*** 262,266 ****
  	int retval = 0;
  
! 	spin_lock_irqsave(&drvdata->lock, flags);
  
  	/* only allow a minor of 0 to be opened */
--- 261,265 ----
  	int retval = 0;
  
! 	spin_lock_irqsave(&drvdata->queue_lock, flags);
  
  	/* only allow a minor of 0 to be opened */
***************
*** 283,287 ****
  
  out:
! 	spin_unlock_irqrestore(&drvdata->lock, flags);
  	return retval;
  }
--- 282,286 ----
  
  out:
! 	spin_unlock_irqrestore(&drvdata->queue_lock, flags);
  	return retval;
  }
***************
*** 292,301 ****
  	unsigned long flags;
  
! 	spin_lock_irqsave(&drvdata->lock, flags);
  	if (drvdata->ref_count > 0)
  		drvdata->ref_count--;
  	else
  		drvdata->ref_count = 0;
! 	spin_unlock_irqrestore(&drvdata->lock, flags);
  
  	return 0;
--- 291,300 ----
  	unsigned long flags;
  
! 	spin_lock_irqsave(&drvdata->queue_lock, flags);
  	if (drvdata->ref_count > 0)
  		drvdata->ref_count--;
  	else
  		drvdata->ref_count = 0;
! 	spin_unlock_irqrestore(&drvdata->queue_lock, flags);
  
  	return 0;
***************
*** 336,346 ****
  
  	retval = -ENOMEM;
! 	spin_lock_init(&drvdata->lock);
  	spin_lock_init(&drvdata->io_lock);
! 	queue = blk_init_queue(aram_do_request, &drvdata->lock);
  	if (!queue)
  		goto err_blk_init_queue;
  
! 	blk_queue_hardsect_size(queue, ARAM_SECTOR_SIZE);
  	blk_queue_dma_alignment(queue, ARAM_DMA_ALIGN);
  	blk_queue_max_phys_segments(queue, 1);
--- 335,345 ----
  
  	retval = -ENOMEM;
! 	spin_lock_init(&drvdata->queue_lock);
  	spin_lock_init(&drvdata->io_lock);
! 	queue = blk_init_queue(aram_do_request, &drvdata->queue_lock);
  	if (!queue)
  		goto err_blk_init_queue;
  
! 	blk_queue_logical_block_size(queue, ARAM_SECTOR_SIZE);
  	blk_queue_dma_alignment(queue, ARAM_DMA_ALIGN);
  	blk_queue_max_phys_segments(queue, 1);

Index: gcn-sd.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-sd.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** gcn-sd.c	2 Mar 2009 18:48:17 -0000	1.17
--- gcn-sd.c	25 Oct 2009 18:59:27 -0000	1.18
***************
*** 1091,1095 ****
  	 */
  
! 	start = req->sector << KERNEL_SECTOR_SHIFT;
  #if 0
  	nr_blocks = req->current_nr_sectors >>
--- 1091,1095 ----
  	 */
  
! 	start = blk_rq_pos(req) << KERNEL_SECTOR_SHIFT;
  #if 0
  	nr_blocks = req->current_nr_sectors >>
***************
*** 1097,1101 ****
  	block_len = 1 << host->card.csd.read_blkbits;
  #else
! 	nr_blocks = req->current_nr_sectors;
  	block_len = 1 << KERNEL_SECTOR_SHIFT;
  #endif
--- 1097,1101 ----
  	block_len = 1 << host->card.csd.read_blkbits;
  #else
! 	nr_blocks = blk_rq_cur_sectors(req);
  	block_len = 1 << KERNEL_SECTOR_SHIFT;
  #endif
***************
*** 1135,1140 ****
  
  	/* kernel sectors and card write blocks are both 512 bytes long */
! 	start = req->sector << KERNEL_SECTOR_SHIFT;
! 	nr_blocks = req->current_nr_sectors;
  	block_len = 1 << KERNEL_SECTOR_SHIFT;
  
--- 1135,1140 ----
  
  	/* kernel sectors and card write blocks are both 512 bytes long */
! 	start = blk_rq_pos(req) << KERNEL_SECTOR_SHIFT;
! 	nr_blocks = blk_rq_cur_sectors(req);
  	block_len = 1 << KERNEL_SECTOR_SHIFT;
  
***************
*** 1160,1164 ****
   *  <0 in case of error.
   *  0  if request passes the checks
-  *  >0 if request can be ignored
   */
  static int sd_check_request(struct sd_host *host, struct request *req)
--- 1160,1163 ----
***************
*** 1166,1169 ****
--- 1165,1171 ----
  	unsigned long nr_sectors;
  
+ 	if (!blk_fs_request(req))
+ 		return -EIO;
+ 
  	if (test_bit(__SD_MEDIA_CHANGED, &host->flags)) {
  		sd_printk(KERN_ERR, "media changed, aborting\n");
***************
*** 1177,1188 ****
  
  	/* keep our reads within limits */
! 	if (req->sector + req->current_nr_sectors > nr_sectors) {
  		sd_printk(KERN_ERR, "reading past end, aborting\n");
  		return -EINVAL;
  	}
  
- 	if (!blk_fs_request(req))
- 		return 1;
- 
  	return 0;
  }
--- 1179,1187 ----
  
  	/* keep our reads within limits */
! 	if (blk_rq_pos(req) + blk_rq_cur_sectors(req) > nr_sectors) {
  		sd_printk(KERN_ERR, "reading past end, aborting\n");
  		return -EINVAL;
  	}
  
  	return 0;
  }
***************
*** 1193,1212 ****
  static int sd_do_request(struct sd_host *host, struct request *req)
  {
! 	int retval;
  
! 	retval = sd_check_request(host, req);
! 	if (retval)
! 		return 0;
  
  	switch (rq_data_dir(req)) {
  	case WRITE:
! 		retval = sd_write_request(host, req);
  		break;
  	case READ:
! 		retval = sd_read_request(host, req);
  		break;
  	}
  
! 	return retval;
  }
  
--- 1192,1215 ----
  static int sd_do_request(struct sd_host *host, struct request *req)
  {
! 	int nr_sectors = 0;
! 	int error;
  
! 	error = sd_check_request(host, req);
! 	if (error) {
! 		nr_sectors = error;
! 		goto out;
! 	}
  
  	switch (rq_data_dir(req)) {
  	case WRITE:
! 		nr_sectors = sd_write_request(host, req);
  		break;
  	case READ:
! 		nr_sectors = sd_read_request(host, req);
  		break;
  	}
  
! out:
! 	return nr_sectors;
  }
  
***************
*** 1240,1244 ****
  		spin_lock_irqsave(&host->queue_lock, flags);
  		if (!blk_queue_plugged(host->queue))
! 			req = elv_next_request(host->queue);
  		spin_unlock_irqrestore(&host->queue_lock, flags);
  
--- 1243,1247 ----
  		spin_lock_irqsave(&host->queue_lock, flags);
  		if (!blk_queue_plugged(host->queue))
! 			req = blk_fetch_request(host->queue);
  		spin_unlock_irqrestore(&host->queue_lock, flags);
  
***************
*** 1402,1406 ****
  
  	/* inform the block layer about various sizes */
! 	blk_queue_hardsect_size(host->queue, 1 << KERNEL_SECTOR_SHIFT);
  	set_capacity(host->disk, host->card.csd.capacity <<
  			 (host->card.csd.read_blkbits - KERNEL_SECTOR_SHIFT));
--- 1405,1409 ----
  
  	/* inform the block layer about various sizes */
! 	blk_queue_logical_block_size(host->queue, 1 << KERNEL_SECTOR_SHIFT);
  	set_capacity(host->disk, host->card.csd.capacity <<
  			 (host->card.csd.read_blkbits - KERNEL_SECTOR_SHIFT));

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/Kconfig,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** Kconfig	25 Oct 2009 18:56:56 -0000	1.41
--- Kconfig	25 Oct 2009 18:59:27 -0000	1.42
***************
*** 64,67 ****
--- 64,132 ----
  	  module will be called z2ram.
  
+ config GAMECUBE_SD
+ 	tristate "Nintendo GameCube/Wii MMC/SD card"
+ 	depends on GAMECUBE_EXI
+ 	help
+ 	  This enables support for using SD and MMC cards through
+ 	  the Nintendo SD Card Adapter (DOL-019) or compatible hardware.
+ 
+ 	  You probably want to compile FAT support, and the required
+ 	  codepages, or mount will complain. See Filesystems -> DOS/FAT/NT
+ 	  filesystems and Filesystems -> Native Language Support
+ 
+ 	  Say Y if you want to include this driver in the kernel.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called gcn-sd.
+ 
+ config GAMECUBE_ARAM
+ 	tristate "Nintendo GameCube Auxiliary RAM (ARAM)"
+ 	depends on GAMECUBE
+ 	help
+ 	  This enables support for using the 16MB of ARAM found in the
+ 	  Nintendo GameCube as a block device.
+ 	  Say Y if you want to include this driver in the kernel.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called gcn-aram.
+ 
+ config GAMECUBE_DI
+ 	tristate "Nintendo GameCube Disk Interface (DI)"
+ 	depends on GAMECUBE
+ 	help
+ 	  This enables support for using the DVD drive unit found
+ 	  in the Nintendo GameCube.
+ 	  Say Y if you want to include this driver in the kernel.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called gcn-di.
+ 
+ config WII_MEM2
+ 	tristate "Nintendo Wii MEM2"
+ 	depends on WII
+ 	help
+ 	  This enables support for using the MEM2 found in the
+ 	  Nintendo Wii as a block device.
+ 	  Say Y if you want to include this driver in the kernel.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called rvl-mem2.
+ 
+ config WII_SD
+ 	tristate "Nintendo Wii front slot MMC/SD"
+ 	depends on STARLET_IOS
+ 	help
+ 	  This enables support for MMC/SD cards using the front SD card
+ 	  slot of the Nintendo Wii.
+ 
+ 	  You probably want to compile FAT support, and the required
+ 	  codepages, or mount will complain. See Filesystems -> DOS/FAT/NT
+ 	  filesystems and Filesystems -> Native Language Support
+ 
+ 	  Say Y if you want to include this driver in the kernel.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called rvl-stsd.
+ 
  config BLK_DEV_XD
  	tristate "XT hard disk support"

Index: rvl-mem2.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/rvl-mem2.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** rvl-mem2.c	25 Oct 2009 18:50:27 -0000	1.7
--- rvl-mem2.c	25 Oct 2009 18:59:28 -0000	1.8
***************
*** 73,108 ****
  	int error;
  
! 	req = elv_next_request(q);
  	while (req) {
! 		if (blk_fs_request(req)) {
! 			/* calculate the MEM2 address and length */
! 			mem2_addr = req->sector << 9;
! 			len = req->current_nr_sectors << 9;
  
! 			/* give up if the request goes out of bounds */
! 			if (mem2_addr + len > drvdata->size) {
! 				drv_printk(KERN_ERR, "bad access: block=%lu,"
! 					    " size=%u\n",
! 					    (unsigned long)req->sector, len);
! 				error = -EIO;
! 			} else {
! 				switch (rq_data_dir(req)) {
! 				case READ:
! 					memcpy(req->buffer,
! 					       drvdata->io_base + mem2_addr,
! 					       len);
! 					break;
! 				case WRITE:
! 					memcpy(drvdata->io_base + mem2_addr,
! 					       req->buffer, len);
! 					break;
! 				}
! 				error = 0;
! 			}
! 			__blk_end_request(req, error, len);
! 		} else {
! 			end_request(req, 0);
  		}
! 		req = elv_next_request(q);
  	}
  }
--- 73,108 ----
  	int error;
  
! 	req = blk_fetch_request(q);
  	while (req) {
! 		error = -EIO;
  
! 		if (!blk_fs_request(req))
! 			goto done;
! 
! 		/* calculate the MEM2 address and length */
! 		mem2_addr = blk_rq_pos(req) << 9;
! 		len = blk_rq_cur_bytes(req);
! 
! 		/* give up if the request goes out of bounds */
! 		if (mem2_addr + len > drvdata->size) {
! 			drv_printk(KERN_ERR, "bad access: block=%lu,"
! 				   " size=%zu\n",
! 				   (unsigned long)blk_rq_pos(req), len);
! 			goto done;
  		}
! 
! 		switch (rq_data_dir(req)) {
! 		case READ:
! 			memcpy(req->buffer, drvdata->io_base + mem2_addr, len);
! 			break;
! 		case WRITE:
! 			memcpy(drvdata->io_base + mem2_addr, req->buffer, len);
! 			break;
! 		}
! 		error = 0;
! 
! 	done:
! 		if (!__blk_end_request_cur(req, error));
! 			req = blk_fetch_request(q);
  	}
  }
***************
*** 198,202 ****
  		goto err_blk_init_queue;
  
! 	blk_queue_hardsect_size(queue, MEM2_SECTOR_SIZE);
  	blk_queue_max_phys_segments(queue, 1);
  	blk_queue_max_hw_segments(queue, 1);
--- 198,202 ----
  		goto err_blk_init_queue;
  
! 	blk_queue_logical_block_size(queue, MEM2_SECTOR_SIZE);
  	blk_queue_max_phys_segments(queue, 1);
  	blk_queue_max_hw_segments(queue, 1);

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/Makefile,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** Makefile	25 Oct 2009 18:56:56 -0000	1.29
--- Makefile	25 Oct 2009 18:59:27 -0000	1.30
***************
*** 14,17 ****
--- 14,22 ----
  obj-$(CONFIG_ATARI_FLOPPY)	+= ataflop.o
  obj-$(CONFIG_AMIGA_Z2RAM)	+= z2ram.o
+ obj-$(CONFIG_GAMECUBE_SD)	+= gcn-sd.o
+ obj-$(CONFIG_GAMECUBE_ARAM)	+= gcn-aram.o
+ obj-$(CONFIG_GAMECUBE_DI)	+= gcn-di/
+ obj-$(CONFIG_WII_MEM2)		+= rvl-mem2.o
+ obj-$(CONFIG_WII_SD)		+= rvl-stsd.o
  obj-$(CONFIG_BLK_DEV_RAM)	+= brd.o
  obj-$(CONFIG_BLK_DEV_LOOP)	+= loop.o

Index: rvl-stsd.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/rvl-stsd.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** rvl-stsd.c	25 Oct 2009 18:50:27 -0000	1.8
--- rvl-stsd.c	25 Oct 2009 18:59:28 -0000	1.9
***************
*** 1724,1734 ****
  }
  
- /*
-  * Returns >0 if a request should be dispatched.
-  */
  static int stsd_check_request(struct stsd_host *host, struct request *req)
  {
  	unsigned long nr_sectors;
  
  	if (test_bit(__STSD_MEDIA_CHANGED, &host->flags)) {
  		drv_printk(KERN_ERR, "media changed, aborting\n");
--- 1724,1734 ----
  }
  
  static int stsd_check_request(struct stsd_host *host, struct request *req)
  {
  	unsigned long nr_sectors;
  
+ 	if (!blk_fs_request(req))
+ 		return -EIO;
+ 
  	if (test_bit(__STSD_MEDIA_CHANGED, &host->flags)) {
  		drv_printk(KERN_ERR, "media changed, aborting\n");
***************
*** 1742,1754 ****
  
  	/* keep our reads within limits */
! 	if (req->sector + req->current_nr_sectors > nr_sectors) {
  		drv_printk(KERN_ERR, "reading past end, aborting\n");
  		return -EINVAL;
  	}
  
! 	if (!blk_fs_request(req))
! 		return 0;
! 
! 	return 1;
  }
  
--- 1742,1751 ----
  
  	/* keep our reads within limits */
! 	if (blk_rq_pos(req) + blk_rq_cur_sectors(req) > nr_sectors) {
  		drv_printk(KERN_ERR, "reading past end, aborting\n");
  		return -EINVAL;
  	}
  
! 	return 0;
  }
  
***************
*** 1758,1774 ****
  	unsigned long start;
  	int write;
- 	int uptodate;
  	int error;
  
! 	uptodate = stsd_check_request(host, req);
! 	if (uptodate <= 0)
! 		return uptodate;
  
  	write = (rq_data_dir(req) == READ) ? 0 : 1;
  
! 	start = req->sector;
  	if (!stsd_card_is_sdhc(host))
  		start <<= KERNEL_SECTOR_SHIFT;
! 	nr_blocks = req->current_nr_sectors;
  
  	error = stsd_do_block_transfer(host, write,
--- 1755,1770 ----
  	unsigned long start;
  	int write;
  	int error;
  
! 	error = stsd_check_request(host, req);
! 	if (error)
! 		goto out;
  
  	write = (rq_data_dir(req) == READ) ? 0 : 1;
  
! 	start = blk_rq_pos(req);
  	if (!stsd_card_is_sdhc(host))
  		start <<= KERNEL_SECTOR_SHIFT;
! 	nr_blocks = blk_rq_cur_sectors(req);
  
  	error = stsd_do_block_transfer(host, write,
***************
*** 1778,1781 ****
--- 1774,1778 ----
  		    error, error, start);
  
+ out:
  	return error;
  }
***************
*** 1797,1801 ****
  		spin_lock_irqsave(&host->queue_lock, flags);
  		if (!blk_queue_plugged(host->queue))
! 			req = elv_next_request(host->queue);
  		spin_unlock_irqrestore(&host->queue_lock, flags);
  
--- 1794,1798 ----
  		spin_lock_irqsave(&host->queue_lock, flags);
  		if (!blk_queue_plugged(host->queue))
! 			req = blk_fetch_request(host->queue);
  		spin_unlock_irqrestore(&host->queue_lock, flags);
  
***************
*** 1814,1818 ****
  
  		spin_lock_irqsave(&host->queue_lock, flags);
! 		__blk_end_request(req, error, blk_rq_bytes(req));
  		spin_unlock_irqrestore(&host->queue_lock, flags);
  	}
--- 1811,1815 ----
  
  		spin_lock_irqsave(&host->queue_lock, flags);
! 		__blk_end_request_cur(req, error);
  		spin_unlock_irqrestore(&host->queue_lock, flags);
  	}
***************
*** 1825,1829 ****
  {
  	struct stsd_host *host = q->queuedata;
- 
  	wake_up_process(host->io_thread);
  }
--- 1822,1825 ----
***************
*** 1959,1963 ****
  
  	/* inform the block layer about various sizes */
! 	blk_queue_hardsect_size(host->queue, KERNEL_SECTOR_SIZE);
  	set_capacity(host->disk, host->card.csd.capacity <<
  			 (host->card.csd.read_blkbits - KERNEL_SECTOR_SHIFT));
--- 1955,1959 ----
  
  	/* inform the block layer about various sizes */
! 	blk_queue_logical_block_size(host->queue, KERNEL_SECTOR_SIZE);
  	set_capacity(host->disk, host->card.csd.capacity <<
  			 (host->card.csd.read_blkbits - KERNEL_SECTOR_SHIFT));

Update of /cvsroot/gc-linux/linux/drivers/video/logo
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/video/logo

Modified Files:
	Kconfig Makefile logo.c 
Log Message:
Merge gc-linux-v2.6.31.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Makefile	25 Oct 2009 18:56:56 -0000	1.11
--- Makefile	25 Oct 2009 18:59:28 -0000	1.12
***************
*** 8,11 ****
--- 8,12 ----
  obj-$(CONFIG_LOGO_BLACKFIN_VGA16)	+= logo_blackfin_vga16.o
  obj-$(CONFIG_LOGO_DEC_CLUT224)		+= logo_dec_clut224.o
+ obj-$(CONFIG_LOGO_GAMECUBE_CLUT224)	+= logo_gcn_clut224.o
  obj-$(CONFIG_LOGO_MAC_CLUT224)		+= logo_mac_clut224.o
  obj-$(CONFIG_LOGO_PARISC_CLUT224)	+= logo_parisc_clut224.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/Kconfig,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Kconfig	25 Oct 2009 18:53:46 -0000	1.11
--- Kconfig	25 Oct 2009 18:59:28 -0000	1.12
***************
*** 43,46 ****
--- 43,51 ----
  	default y
  
+ config LOGO_GAMECUBE_CLUT224
+ 	bool "224-color GameCube Linux logo"
+ 	depends on GAMECUBE
+ 	default y
+ 
  config LOGO_MAC_CLUT224
  	bool "224-color Macintosh Linux logo"

Index: logo.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/logo.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** logo.c	25 Oct 2009 18:56:56 -0000	1.11
--- logo.c	25 Oct 2009 18:59:28 -0000	1.12
***************
*** 76,79 ****
--- 76,83 ----
  		logo = &logo_dec_clut224;
  #endif
+ #ifdef CONFIG_LOGO_GAMECUBE_CLUT224
+ 		/* GameCube Linux logo */
+ 		logo = &logo_gcn_clut224;
+ #endif
  #ifdef CONFIG_LOGO_MAC_CLUT224
  		/* Macintosh Linux logo on m68k */

Update of /cvsroot/gc-linux/linux/arch/powerpc/boot
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/arch/powerpc/boot

Modified Files:
	Makefile wrapper 
Log Message:
Merge gc-linux-v2.6.31.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/boot/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Makefile	25 Oct 2009 18:53:45 -0000	1.12
--- Makefile	25 Oct 2009 18:59:27 -0000	1.13
***************
*** 66,70 ****
  		4xx.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c cuboot.c bamboo.c \
  		cpm-serial.c stdlib.c mpc52xx-psc.c planetcore.c uartlite.c \
! 		fsl-soc.c mpc8xx.c pq2.c
  src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c \
  		cuboot-ebony.c treeboot-ebony.c prpmc2800.c \
--- 66,70 ----
  		4xx.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c cuboot.c bamboo.c \
  		cpm-serial.c stdlib.c mpc52xx-psc.c planetcore.c uartlite.c \
! 		fsl-soc.c mpc8xx.c pq2.c ugecon.c
  src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c \
  		cuboot-ebony.c treeboot-ebony.c prpmc2800.c \
***************
*** 76,80 ****
  		cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \
  		virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \
! 		cuboot-acadia.c cuboot-amigaone.c
  src-boot := $(src-wlib) $(src-plat) empty.c
  
--- 76,80 ----
  		cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \
  		virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \
! 		cuboot-acadia.c cuboot-amigaone.c gamecube.c wii.c
  src-boot := $(src-wlib) $(src-plat) empty.c
  
***************
*** 253,256 ****
--- 253,258 ----
  image-$(CONFIG_MPC7448HPC2)		+= cuImage.mpc7448hpc2
  image-$(CONFIG_PPC_C2K)			+= cuImage.c2k
+ image-$(CONFIG_GAMECUBE)		+= dtbImage.gamecube
+ image-$(CONFIG_WII)			+= dtbImage.wii
  
  # Board port in arch/powerpc/platform/amigaone/Kconfig

Index: wrapper
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/boot/wrapper,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wrapper	25 Oct 2009 18:56:55 -0000	1.4
--- wrapper	25 Oct 2009 18:59:27 -0000	1.5
***************
*** 230,233 ****
--- 230,236 ----
      platformo=$object/cuboot-85xx.o
      ;;
+ wii|gamecube)
+     link_address='0x500000'
+     ;;
  esac

Update of /cvsroot/gc-linux/linux/arch/powerpc/platforms
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/arch/powerpc/platforms

Modified Files:
	Kconfig.cputype 
Log Message:
Merge gc-linux-v2.6.31.


Index: Kconfig.cputype
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/platforms/Kconfig.cputype,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Kconfig.cputype	25 Oct 2009 18:56:56 -0000	1.12
--- Kconfig.cputype	25 Oct 2009 18:59:27 -0000	1.13
***************
*** 285,289 ****
  config NOT_COHERENT_CACHE
  	bool
! 	depends on 4xx || 8xx || E200 || PPC_MPC512x
  	default y
  
--- 285,289 ----
  config NOT_COHERENT_CACHE
  	bool
! 	depends on 4xx || 8xx || E200 || PPC_MPC512x || GAMECUBE_COMMON
  	default y

Update of /cvsroot/gc-linux/linux/arch/powerpc
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/arch/powerpc

Modified Files:
	Kconfig Kconfig.debug 
Log Message:
Merge gc-linux-v2.6.31.


Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/Kconfig,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Kconfig	25 Oct 2009 18:56:55 -0000	1.12
--- Kconfig	25 Oct 2009 18:59:27 -0000	1.13
***************
*** 670,674 ****
  	bool "PCI support" if PPC_PCI_CHOICE
  	default y if !40x && !CPM2 && !8xx && !PPC_83xx \
! 		&& !PPC_85xx && !PPC_86xx
  	default PCI_PERMEDIA if !4xx && !CPM2 && !8xx
  	default PCI_QSPAN if !4xx && !CPM2 && 8xx
--- 670,674 ----
  	bool "PCI support" if PPC_PCI_CHOICE
  	default y if !40x && !CPM2 && !8xx && !PPC_83xx \
! 		&& !PPC_85xx && !PPC_86xx && !GAMECUBE_COMMON
  	default PCI_PERMEDIA if !4xx && !CPM2 && !8xx
  	default PCI_QSPAN if !4xx && !CPM2 && 8xx

Index: Kconfig.debug
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/Kconfig.debug,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Kconfig.debug	25 Oct 2009 18:56:55 -0000	1.11
--- Kconfig.debug	25 Oct 2009 18:59:27 -0000	1.12
***************
*** 255,258 ****
--- 255,266 ----
  	  has run, and set up the CPM in a particular way.
  
+ config PPC_EARLY_DEBUG_USBGECKO
+ 	bool "Early debugging through the USB Gecko adapter"
+ 	depends on GAMECUBE_COMMON
+ 	select USBGECKO_UDBG
+ 	help
+ 	  Select this to enable early debugging for Nintendo GameCube/Wii
+ 	  consoles via an external USB Gecko adapter.
+ 
  endchoice

Update of /cvsroot/gc-linux/linux/drivers/serial
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/serial

Modified Files:
	Kconfig Makefile 
Log Message:
Merge gc-linux-v2.6.31.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/serial/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Makefile	25 Oct 2009 18:56:56 -0000	1.11
--- Makefile	25 Oct 2009 18:59:28 -0000	1.12
***************
*** 80,81 ****
--- 80,82 ----
  obj-$(CONFIG_SERIAL_QE) += ucc_uart.o
  obj-$(CONFIG_SERIAL_TIMBERDALE)	+= timbuart.o
+ obj-$(CONFIG_SERIAL_USBGECKO) += usbgecko.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/serial/Kconfig,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Kconfig	25 Oct 2009 18:56:56 -0000	1.12
--- Kconfig	25 Oct 2009 18:59:28 -0000	1.13
***************
*** 1452,1454 ****
--- 1452,1467 ----
  	Add support for UART controller on timberdale.
  
+ config SERIAL_USBGECKO
+ 	bool "USBGecko adapter on the Nintendo GameCube/Wii"
+ 	depends on GAMECUBE_EXI
+ 	select SERIAL_CORE
+ 	help
+ 	  This is a driver for the USB Gecko adapter for the Nintendo GameCube
+ 	  and Wii gaming consoles. It provides a console and a tty interface.
+ 
+ 	  If you have an adapter like this, say Y here, otherwise say N.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called usbgecko.
+ 
  endmenu

Update of /cvsroot/gc-linux/linux/sound/ppc
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/sound/ppc

Modified Files:
	Kconfig Makefile gcn-ai.c gcn-mic.c 
Log Message:
Merge gc-linux-v2.6.31.


Index: gcn-mic.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/sound/ppc/gcn-mic.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gcn-mic.c	1 Feb 2009 18:29:35 -0000	1.9
--- gcn-mic.c	25 Oct 2009 18:59:28 -0000	1.10
***************
*** 613,618 ****
  DBG("enter\n");
  
! 	card = snd_card_new(index, id, THIS_MODULE, 0);
! 	if (!card) {
  		mic_printk(KERN_ERR, "unable to create sound card\n");
  		goto err_card;
--- 613,618 ----
  DBG("enter\n");
  
! 	retval = snd_card_create(index, id, THIS_MODULE, 0, &card);
! 	if (retval < 0) {
  		mic_printk(KERN_ERR, "unable to create sound card\n");
  		goto err_card;

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/sound/ppc/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Makefile	25 Oct 2009 18:53:46 -0000	1.12
--- Makefile	25 Oct 2009 18:59:28 -0000	1.13
***************
*** 5,10 ****
--- 5,13 ----
  
  snd-powermac-objs := powermac.o pmac.o awacs.o burgundy.o daca.o tumbler.o keywest.o beep.o
+ snd-gcn-objs := gcn-ai.o
  
  # Toplevel Module Dependency
  obj-$(CONFIG_SND_POWERMAC)	+= snd-powermac.o
  obj-$(CONFIG_SND_PS3)		+= snd_ps3.o
+ obj-$(CONFIG_SND_GAMECUBE)	+= snd-gcn.o
+ obj-$(CONFIG_SND_GAMECUBE_MIC)	+= gcn-mic.o

Index: gcn-ai.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/sound/ppc/gcn-ai.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** gcn-ai.c	1 Feb 2009 18:29:35 -0000	1.14
--- gcn-ai.c	25 Oct 2009 18:59:28 -0000	1.15
***************
*** 486,491 ****
  	int retval;
  
! 	card = snd_card_new(index, id, THIS_MODULE, sizeof(struct snd_gcn));
! 	if (!card) {
  		drv_printk(KERN_ERR, "failed to allocate card\n");
  		return -ENOMEM;
--- 486,491 ----
  	int retval;
  
! 	retval = snd_card_create(index, id, THIS_MODULE, sizeof(struct snd_gcn), &card);
! 	if (retval < 0) {
  		drv_printk(KERN_ERR, "failed to allocate card\n");
  		return -ENOMEM;

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/sound/ppc/Kconfig,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Kconfig	25 Oct 2009 18:53:46 -0000	1.21
--- Kconfig	25 Oct 2009 18:59:28 -0000	1.22
***************
*** 50,52 ****
--- 50,70 ----
  	default "2000"
  
+ config SND_GAMECUBE
+ 	tristate "Nintendo GameCube/Wii"
+ 	depends on SND && GAMECUBE_COMMON
+ 	help
+ 	  Say Y here to include support for audio on the Nintendo GameCube/Wii.
+ 
+ 	  To compile this driver as a module, choose M here: the module
+ 	  will be called snd-gcn.
+ 
+ config SND_GAMECUBE_MIC
+ 	tristate "Nintendo GameCube Microphone (DOL-022)"
+ 	depends on SND && GAMECUBE_EXI && EXPERIMENTAL
+ 	help
+ 	  If you say yes to this option, support will be included for the
+ 	  Nintendo GameCube Microphone (DOL-022).
+ 
+ 	  If in doubt, say N here.
+ 
  endif	# SND_PPC

Update of /cvsroot/gc-linux/linux/drivers/video
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/video

Modified Files:
	Kconfig Makefile 
Log Message:
Merge gc-linux-v2.6.31.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/Makefile,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** Makefile	25 Oct 2009 18:56:56 -0000	1.35
--- Makefile	25 Oct 2009 18:59:28 -0000	1.36
***************
*** 127,130 ****
--- 127,131 ----
  obj-$(CONFIG_FB_CARMINE)          += carminefb.o
  obj-$(CONFIG_FB_MB862XX)	  += mb862xx/
+ obj-$(CONFIG_FB_GAMECUBE)	  += gcnfb.o
  
  # Platform or fallback drivers go here

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/Kconfig,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** Kconfig	25 Oct 2009 18:56:56 -0000	1.39
--- Kconfig	25 Oct 2009 18:59:28 -0000	1.40
***************
*** 1669,1672 ****
--- 1669,1691 ----
  endchoice
  
+ config FB_GAMECUBE
+ 	bool "Nintendo GameCube/Wii frame buffer"
+ 	depends on FB && GAMECUBE_COMMON
+ 	select FB_CFB_FILLRECT
+ 	select FB_CFB_COPYAREA
+ 	select FB_CFB_IMAGEBLIT
+ 	help
+ 	  This is the frame buffer device driver for the Nintendo GameCube.
+ 
+ config WII_AVE_RVL
+ 	bool "Nintendo Wii audio/video encoder support"
+ 	depends on FB_GAMECUBE && WII
+ 	select I2C_GPIO
+ 	select I2C
+ 	default y
+ 	help
+ 	  Say Y here to support the audio/video encoder found in the
+ 	  Nintendo Wii video game console.
+ 
  config FB_AU1100
  	bool "Au1100 LCD Driver"

Update of /cvsroot/gc-linux/linux/drivers
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers

Modified Files:
	Kconfig Makefile 
Log Message:
Merge gc-linux-v2.6.31.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/Makefile,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** Makefile	25 Oct 2009 18:56:56 -0000	1.33
--- Makefile	25 Oct 2009 18:59:27 -0000	1.34
***************
*** 104,107 ****
--- 104,109 ----
  obj-$(CONFIG_HID)		+= hid/
  obj-$(CONFIG_PPC_PS3)		+= ps3/
+ obj-$(CONFIG_GAMECUBE_EXI)	+= exi/
+ obj-$(CONFIG_GAMECUBE_SI)	+= input/si/
  obj-$(CONFIG_OF)		+= of/
  obj-$(CONFIG_SSB)		+= ssb/

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/Kconfig,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Kconfig	25 Oct 2009 18:56:56 -0000	1.9
--- Kconfig	25 Oct 2009 18:59:27 -0000	1.10
***************
*** 51,54 ****
--- 51,56 ----
  source "drivers/i2c/Kconfig"
  
+ source "drivers/exi/Kconfig"
+ 
  source "drivers/spi/Kconfig"

Update of /cvsroot/gc-linux/linux/include/linux
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/include/linux

Modified Files:
	fb.h gpio.h i2c-gpio.h kexec.h linux_logo.h 
Log Message:
Merge gc-linux-v2.6.31.


Index: linux_logo.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/linux_logo.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** linux_logo.h	25 Oct 2009 18:56:56 -0000	1.1
--- linux_logo.h	25 Oct 2009 18:59:28 -0000	1.2
***************
*** 39,42 ****
--- 39,43 ----
  extern const struct linux_logo logo_blackfin_clut224;
  extern const struct linux_logo logo_dec_clut224;
+ extern const struct linux_logo logo_gcn_clut224;
  extern const struct linux_logo logo_mac_clut224;
  extern const struct linux_logo logo_parisc_clut224;

Index: gpio.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/gpio.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gpio.h	25 Oct 2009 18:53:46 -0000	1.5
--- gpio.h	25 Oct 2009 18:59:28 -0000	1.6
***************
*** 50,53 ****
--- 50,58 ----
  }
  
+ static inline int gpio_direction_is_output(unsigned gpio)
+ {
+ 	return -EINVAL;
+ }
+ 
  static inline int gpio_get_value(unsigned gpio)
  {

Index: i2c-gpio.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/i2c-gpio.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** i2c-gpio.h	25 Oct 2009 18:53:46 -0000	1.5
--- i2c-gpio.h	25 Oct 2009 18:59:28 -0000	1.6
***************
*** 34,37 ****
--- 34,38 ----
  	unsigned int	scl_is_open_drain:1;
  	unsigned int	scl_is_output_only:1;
+ 	unsigned int	sda_enforce_dir:1;
  };
  

Index: kexec.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/kexec.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** kexec.h	25 Oct 2009 18:53:46 -0000	1.3
--- kexec.h	25 Oct 2009 18:59:28 -0000	1.4
***************
*** 53,60 ****
  
  typedef unsigned long kimage_entry_t;
! #define IND_DESTINATION  0x1
! #define IND_INDIRECTION  0x2
! #define IND_DONE         0x4
! #define IND_SOURCE       0x8
  
  #define KEXEC_SEGMENT_MAX 16
--- 53,61 ----
  
  typedef unsigned long kimage_entry_t;
! #define IND_DESTINATION  0x01
! #define IND_INDIRECTION  0x02
! #define IND_DONE         0x04
! #define IND_SOURCE       0x08
! #define IND_NOALLOC      0x10 /* special case for memory preserving code */
  
  #define KEXEC_SEGMENT_MAX 16
***************
*** 126,129 ****
--- 127,132 ----
  extern struct page *kimage_alloc_control_pages(struct kimage *image,
  						unsigned int order);
+ extern int kimage_add_preserved_region(struct kimage *image, unsigned long to,
+ 				       unsigned long from, int length);
  extern void crash_kexec(struct pt_regs *);
  int kexec_should_crash(struct task_struct *);

Index: fb.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/fb.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** fb.h	25 Oct 2009 18:56:56 -0000	1.37
--- fb.h	25 Oct 2009 18:59:28 -0000	1.38
***************
*** 39,42 ****
--- 39,47 ----
  #define FBIOGET_DISPINFO        0x4618
  
+ #define FBIOWAITRETRACE         0x4619
+ #define FBIOWAITPEFINISH        0x4620
+ #define FBIOVIRTTOPHYS          0x4621
+ #define FBIOFLIP                0x4622
+ #define FBIOFLIPHACK            0x4623 /* libsdl */
  
  #define FB_TYPE_PACKED_PIXELS		0	/* Packed Pixels	*/
***************
*** 913,917 ****
  #define fb_writeb __raw_writeb
  #define fb_writew __raw_writew
! #define fb_writel __raw_writel
  #define fb_writeq __raw_writeq
  #define fb_memset memset_io
--- 918,928 ----
  #define fb_writeb __raw_writeb
  #define fb_writew __raw_writew
! #ifndef CONFIG_FB_GAMECUBE	/* XXX Why? O' why? */
! #  define fb_writel __raw_writel
! #else
!    extern unsigned int vifb_writel(unsigned int, void *);
! #  define fb_writel(b, addr) vifb_writel(b, addr)
! #  define fb_writel_real(b, addr) (*(/*volatile*/ u32 __iomem *)(addr) = (b))
! #endif
  #define fb_writeq __raw_writeq
  #define fb_memset memset_io

Update of /cvsroot/gc-linux/linux/drivers/rtc
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/rtc

Modified Files:
	Kconfig Makefile 
Log Message:
Merge gc-linux-v2.6.31.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/rtc/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Makefile	25 Oct 2009 18:56:56 -0000	1.11
--- Makefile	25 Oct 2009 18:59:28 -0000	1.12
***************
*** 40,43 ****
--- 40,44 ----
  obj-$(CONFIG_RTC_DRV_EP93XX)	+= rtc-ep93xx.o
  obj-$(CONFIG_RTC_DRV_FM3130)	+= rtc-fm3130.o
+ obj-$(CONFIG_RTC_DRV_GCN)	+= rtc-gcn.o
  obj-$(CONFIG_RTC_DRV_ISL1208)	+= rtc-isl1208.o
  obj-$(CONFIG_RTC_DRV_M41T80)	+= rtc-m41t80.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/rtc/Kconfig,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Kconfig	25 Oct 2009 18:56:56 -0000	1.11
--- Kconfig	25 Oct 2009 18:59:28 -0000	1.12
***************
*** 536,539 ****
--- 536,549 ----
  	  NXP PCF50633 used in embedded systems.
  
+ config RTC_DRV_GCN
+ 	bool "Nintendo GameCube/Wii Real Time Clock and SRAM"
+ 	depends on GAMECUBE_EXI
+ 	default y
+ 	help
+ 	  If you say yes to this option, support will be included for the
+ 	  Real Time Clock and SRAM of the Nintendo GameCube/Wii.
+ 
+ 	  If in doubt, say Y here.
+ 
  comment "on-CPU RTC drivers"

Update of /cvsroot/gc-linux/linux/drivers/usb
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/usb

Modified Files:
	Kconfig Makefile 
Log Message:
Merge gc-linux-v2.6.31.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/usb/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile	25 Oct 2009 18:56:56 -0000	1.9
--- Makefile	25 Oct 2009 18:59:28 -0000	1.10
***************
*** 19,22 ****
--- 19,23 ----
  obj-$(CONFIG_USB_U132_HCD)	+= host/
  obj-$(CONFIG_USB_R8A66597_HCD)	+= host/
+ obj-$(CONFIG_USB_WII_HCD)	+= host/
  obj-$(CONFIG_USB_HWA_HCD)	+= host/
  obj-$(CONFIG_USB_ISP1760_HCD)	+= host/

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/usb/Kconfig,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Kconfig	25 Oct 2009 18:56:56 -0000	1.10
--- Kconfig	25 Oct 2009 18:59:28 -0000	1.11
***************
*** 24,27 ****
--- 24,29 ----
  	default y if SUPERH				# r8a66597-hcd
  	default y if MICROBLAZE
+ 	default y if WII				# rvl-sthcd
+ 	default y if STARLET_IOS			# rvl-sthcd
  	default PCI

Update of /cvsroot/gc-linux/linux/drivers/net/usb
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/net/usb

Modified Files:
	usbnet.c 
Log Message:
Merge gc-linux-v2.6.31.


Index: usbnet.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/usb/usbnet.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** usbnet.c	25 Oct 2009 18:56:56 -0000	1.8
--- usbnet.c	25 Oct 2009 18:59:28 -0000	1.9
***************
*** 547,551 ****
--- 547,553 ----
  		// during some PM-driven resume scenarios,
  		// these (async) unlinks complete immediately
+ 		spin_unlock(&q->lock);
  		retval = usb_unlink_urb (urb);
+ 		spin_lock(&q->lock);
  		if (retval != -EINPROGRESS && retval != 0)
  			devdbg (dev, "unlink urb err, %d", retval);

Update of /cvsroot/gc-linux/linux/drivers/input/keyboard
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/input/keyboard

Modified Files:
	Kconfig Makefile 
Log Message:
Merge gc-linux-v2.6.31.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/input/keyboard/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Makefile	25 Oct 2009 18:56:56 -0000	1.11
--- Makefile	25 Oct 2009 18:59:28 -0000	1.12
***************
*** 32,33 ****
--- 32,34 ----
  obj-$(CONFIG_KEYBOARD_TOSA)		+= tosakbd.o
  obj-$(CONFIG_KEYBOARD_XTKBD)		+= xtkbd.o
+ obj-$(CONFIG_KEYBOARD_WII)		+= rvl-stkbd.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/input/keyboard/Kconfig,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Kconfig	25 Oct 2009 18:56:56 -0000	1.15
--- Kconfig	25 Oct 2009 18:59:28 -0000	1.16
***************
*** 311,314 ****
--- 311,325 ----
  	  module will be called sunkbd.
  
+ config KEYBOARD_WII
+ 	tristate "Nintendo Wii USB keyboard IOS glue"
+ 	depends on (STARLET_IOS && !USB)
+ 	help
+ 	  Say Y here if you have a Nintendo Wii console running Linux and have
+ 	  a keyboard attached to one of its USB ports.
+ 	  This driver uses the IOS interface glue to access the USB keyboard.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called rvl-stkbd.
+ 
  config KEYBOARD_SH_KEYSC
  	tristate "SuperH KEYSC keypad support"

Update of /cvsroot/gc-linux/linux/arch/powerpc/platforms/embedded6xx
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/arch/powerpc/platforms/embedded6xx

Modified Files:
	Kconfig Makefile 
Log Message:
Merge gc-linux-v2.6.31.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/platforms/embedded6xx/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Makefile	25 Oct 2009 18:53:45 -0000	1.11
--- Makefile	25 Oct 2009 18:59:27 -0000	1.12
***************
*** 8,9 ****
--- 8,20 ----
  obj-$(CONFIG_PPC_PRPMC2800)	+= prpmc2800.o
  obj-$(CONFIG_PPC_C2K)		+= c2k.o
+ obj-$(CONFIG_GAMECUBE)		+= gamecube.o gamecube_dev.o
+ obj-$(CONFIG_WII)		+= wii.o wii_dev.o
+ obj-$(CONFIG_WII_GPIO)		+= starlet-gpio.o
+ obj-$(CONFIG_STARLET_MINI)	+= starlet-mipc.o
+ obj-$(CONFIG_STARLET_IOS)	+= starlet-ipc.o starlet-malloc.o \
+ 					starlet-stm.o starlet-es.o
+ obj-$(CONFIG_FLIPPER_PIC)	+= flipper-pic.o
+ obj-$(CONFIG_HOLLYWOOD_PIC)	+= hollywood-pic.o
+ obj-$(CONFIG_USBGECKO_UDBG)	+= usbgecko_udbg.o
+ obj-$(CONFIG_GAMECUBE_VIDEO_UDBG)	+= gcnvi_udbg.o
+ obj-$(CONFIG_GAMECUBE_RSW)	+= gcn-rsw.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/platforms/embedded6xx/Kconfig,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Kconfig	25 Oct 2009 18:53:45 -0000	1.11
--- Kconfig	25 Oct 2009 18:59:27 -0000	1.12
***************
*** 91,92 ****
--- 91,198 ----
  	bool "Enable MPC10x store gathering"
  	depends on MPC10X_BRIDGE
+ 
+ config GAMECUBE
+ 	bool "Nintendo-GameCube"
+ 	depends on EMBEDDED6xx
+ 	select GAMECUBE_COMMON
+ 	help
+ 	  Select GAMECUBE if configuring for the Nintendo GameCube.
+ 	  More information at: <http://gc-linux.sourceforge.net/>
+ 
+ config WII
+ 	bool "Nintendo-Wii"
+ 	depends on EMBEDDED6xx
+ 	select GAMECUBE_COMMON
+ 	select PPC_LIB_RHEAP if STARLET_IOS
+ 	select USB_ARCH_HAS_EHCI if STARLET_MINI
+ 	select USB_ARCH_HAS_OHCI if STARLET_MINI
+ 	select HAVE_GENERIC_DMA_COHERENT
+ 	help
+ 	  Select WII if configuring for the Nintendo Wii.
+ 	  More information at: <http://gc-linux.sourceforge.net/>
+ 
+ config STARLET_IOS
+ 	bool "Nintendo Wii Starlet IOS support"
+ 	depends on WII
+ 	default y
+ 
+ config STARLET_MINI
+ 	bool "Team Twiizers 'mini' firmware support"
+ 	depends on WII && EXPERIMENTAL
+ 	default y
+ 
+ config FLIPPER_PIC
+ 	bool
+ 	depends on GAMECUBE_COMMON
+ 	default y
+ 
+ config HOLLYWOOD_PIC
+ 	bool
+ 	depends on STARLET_MINI
+ 	default y
+ 
+ config GAMECUBE_COMMON
+ 	bool
+ 	select NOT_COHERENT_CACHE
+ 	select FLIPPER_PIC
+ 	default n
+ 
+ config GAMECUBE_UDBG
+ 	bool "Nintendo GameCube/Wii udbg support"
+ 	depends on GAMECUBE_COMMON
+ 	default n
+ 	help
+ 	  If you say yes to this option, you will be able to choose between
+ 	  several udbg drivers available for the Nintendo GameCube/Wii.
+ 
+ 	  If in doubt, say N here.
+ 
+ choice
+ 	prompt "Nintendo GameCube/Wii udbg drivers"
+ 	depends on GAMECUBE_UDBG
+ 
+ config USBGECKO_UDBG
+ 	bool "USB Gecko udbg console for the Nintendo GameCube/Wii"
+ 	help
+ 	  If you say yes to this option, support will be included for the
+ 	  USB Gecko adapter as an udbg console.
+ 	  The USB Gecko is a EXI to USB Serial converter that can be plugged
+ 	  into a memcard slot in the Nintendo GameCube/Wii.
+ 
+ 	  This driver bypasses the EXI layer completely.
+ 
+ 	  If in doubt, say N here.
+ 
+ config GAMECUBE_VIDEO_UDBG
+ 	bool "Nintendo GameCube/Wii framebuffer udbg console"
+ 	select FONTS
+ 	select FONT_8x16
+ 	help
+ 	  If you say yes to this option, support will be included for a
+ 	  framebuffer based udbg console for the Nintendo GameCube/Wii.
+ 
+ 	  If in doubt, say N here.
+ 
+ endchoice
+ 
+ config GAMECUBE_RSW
+ 	bool "Nintendo GameCube/Wii reset switch/button"
+ 	depends on GAMECUBE_COMMON
+ 	default y
+ 	help
+ 	  If you say yes to this option, support will be included for the
+ 	  reset switch/button of the Nintendo GameCube/Wii.
+ 
+ 	  If in doubt, say Y here.
+ 
+ config WII_GPIO
+ 	bool "Nintendo Wii GPIO support"
+ 	depends on GPIOLIB
+ 	default y
+ 	help
+ 	  If you say yes to this option, support will be included for the
+ 	  Nintendo Wii GPIO lines that control, for example, the sensor
+ 	  bar IR leds, the front led, or the eject switch of the disk unit.
+ 
+ 	  If in doubt, say Y here.
+

Update of /cvsroot/gc-linux/linux/arch/powerpc/configs
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/arch/powerpc/configs

Modified Files:
	gamecube_defconfig wii_defconfig 
Log Message:
Merge gc-linux-v2.6.31.


Index: wii_defconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/configs/wii_defconfig,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** wii_defconfig	25 Oct 2009 18:50:26 -0000	1.12
--- wii_defconfig	25 Oct 2009 18:59:27 -0000	1.13
***************
*** 1,6 ****
  #
  # Automatically generated make config: don't edit
! # Linux kernel version: 2.6.30
! # Fri Jun 26 21:19:27 2009
  #
  # CONFIG_PPC64 is not set
--- 1,6 ----
  #
  # Automatically generated make config: don't edit
! # Linux kernel version: 2.6.31
! # Sun Sep 20 17:14:35 2009
  #
  # CONFIG_PPC64 is not set
***************
*** 9,13 ****
  # Processor support
  #
! CONFIG_6xx=y
  # CONFIG_PPC_85xx is not set
  # CONFIG_PPC_8xx is not set
--- 9,13 ----
  # Processor support
  #
! CONFIG_PPC_BOOK3S_32=y
  # CONFIG_PPC_85xx is not set
  # CONFIG_PPC_8xx is not set
***************
*** 16,19 ****
--- 16,20 ----
  # CONFIG_E200 is not set
  CONFIG_PPC_BOOK3S=y
+ CONFIG_6xx=y
  CONFIG_PPC_FPU=y
  # CONFIG_ALTIVEC is not set
***************
*** 21,24 ****
--- 22,27 ----
  CONFIG_PPC_STD_MMU_32=y
  # CONFIG_PPC_MM_SLICES is not set
+ CONFIG_PPC_HAVE_PMU_SUPPORT=y
+ CONFIG_PPC_PERF_CTRS=y
  # CONFIG_SMP is not set
  CONFIG_NOT_COHERENT_CACHE=y
***************
*** 32,44 ****
  CONFIG_GENERIC_CLOCKEVENTS=y
  CONFIG_GENERIC_HARDIRQS=y
  # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
  CONFIG_IRQ_PER_CPU=y
  CONFIG_STACKTRACE_SUPPORT=y
  CONFIG_HAVE_LATENCYTOP_SUPPORT=y
  CONFIG_LOCKDEP_SUPPORT=y
  CONFIG_RWSEM_XCHGADD_ALGORITHM=y
  CONFIG_ARCH_HAS_ILOG2_U32=y
  CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
  CONFIG_GENERIC_FIND_NEXT_BIT=y
  CONFIG_GENERIC_GPIO=y
--- 35,48 ----
  CONFIG_GENERIC_CLOCKEVENTS=y
  CONFIG_GENERIC_HARDIRQS=y
+ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
  # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
  CONFIG_IRQ_PER_CPU=y
  CONFIG_STACKTRACE_SUPPORT=y
  CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
  CONFIG_LOCKDEP_SUPPORT=y
  CONFIG_RWSEM_XCHGADD_ALGORITHM=y
  CONFIG_ARCH_HAS_ILOG2_U32=y
  CONFIG_GENERIC_HWEIGHT=y
  CONFIG_GENERIC_FIND_NEXT_BIT=y
  CONFIG_GENERIC_GPIO=y
***************
*** 61,64 ****
--- 65,69 ----
  CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
  CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+ CONFIG_CONSTRUCTORS=y
  
  #
***************
*** 113,117 ****
  CONFIG_KALLSYMS_ALL=y
  # CONFIG_KALLSYMS_EXTRA_PASS is not set
- # CONFIG_STRIP_ASM_SYMS is not set
  CONFIG_HOTPLUG=y
  CONFIG_PRINTK=y
--- 118,121 ----
***************
*** 126,130 ****
--- 130,142 ----
  CONFIG_SHMEM=y
  CONFIG_AIO=y
+ CONFIG_HAVE_PERF_COUNTERS=y
+ 
+ #
+ # Performance Counters
+ #
+ CONFIG_PERF_COUNTERS=y
+ CONFIG_EVENT_PROFILE=y
  # CONFIG_VM_EVENT_COUNTERS is not set
+ # CONFIG_STRIP_ASM_SYMS is not set
  CONFIG_COMPAT_BRK=y
  CONFIG_SLAB=y
***************
*** 141,144 ****
--- 153,161 ----
  CONFIG_HAVE_KRETPROBES=y
  CONFIG_HAVE_ARCH_TRACEHOOK=y
+ 
+ #
+ # GCOV-based kernel profiling
+ #
+ # CONFIG_GCOV_KERNEL is not set
  # CONFIG_SLOW_WORK is not set
  CONFIG_HAVE_GENERIC_DMA_COHERENT=y
***************
*** 153,157 ****
  # CONFIG_MODULE_SRCVERSION_ALL is not set
  CONFIG_BLOCK=y
! CONFIG_LBD=y
  # CONFIG_BLK_DEV_BSG is not set
  # CONFIG_BLK_DEV_INTEGRITY is not set
--- 170,174 ----
  # CONFIG_MODULE_SRCVERSION_ALL is not set
  CONFIG_BLOCK=y
! CONFIG_LBDAF=y
  # CONFIG_BLK_DEV_BSG is not set
  # CONFIG_BLK_DEV_INTEGRITY is not set
***************
*** 241,244 ****
--- 258,262 ----
  CONFIG_BINFMT_MISC=m
  # CONFIG_IOMMU_HELPER is not set
+ # CONFIG_SWIOTLB is not set
  CONFIG_PPC_NEED_DMA_SYNC_OPS=y
  CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
***************
*** 262,268 ****
  CONFIG_BOUNCE=y
  CONFIG_VIRT_TO_BUS=y
- CONFIG_UNEVICTABLE_LRU=y
  CONFIG_HAVE_MLOCK=y
  CONFIG_HAVE_MLOCKED_PAGE_BIT=y
  CONFIG_PPC_4K_PAGES=y
  # CONFIG_PPC_16K_PAGES is not set
--- 280,286 ----
  CONFIG_BOUNCE=y
  CONFIG_VIRT_TO_BUS=y
  CONFIG_HAVE_MLOCK=y
  CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
  CONFIG_PPC_4K_PAGES=y
  # CONFIG_PPC_16K_PAGES is not set
***************
*** 358,361 ****
--- 376,380 ----
  # CONFIG_WAN_ROUTER is not set
  # CONFIG_PHONET is not set
+ # CONFIG_IEEE802154 is not set
  # CONFIG_NET_SCHED is not set
  # CONFIG_DCB is not set
***************
*** 391,399 ****
  # CONFIG_AF_RXRPC is not set
  CONFIG_WIRELESS=y
! # CONFIG_CFG80211 is not set
  CONFIG_WIRELESS_OLD_REGULATORY=y
! # CONFIG_WIRELESS_EXT is not set
  # CONFIG_LIB80211 is not set
! # CONFIG_MAC80211 is not set
  # CONFIG_WIMAX is not set
  # CONFIG_RFKILL is not set
--- 410,435 ----
  # CONFIG_AF_RXRPC is not set
  CONFIG_WIRELESS=y
! CONFIG_CFG80211=y
! # CONFIG_CFG80211_REG_DEBUG is not set
! # CONFIG_CFG80211_DEBUGFS is not set
  CONFIG_WIRELESS_OLD_REGULATORY=y
! CONFIG_WIRELESS_EXT=y
! CONFIG_WIRELESS_EXT_SYSFS=y
  # CONFIG_LIB80211 is not set
! CONFIG_MAC80211=y
! CONFIG_MAC80211_DEFAULT_PS=y
! CONFIG_MAC80211_DEFAULT_PS_VALUE=1
! 
! #
! # Rate control algorithm selection
! #
! # CONFIG_MAC80211_RC_PID is not set
! CONFIG_MAC80211_RC_MINSTREL=y
! # CONFIG_MAC80211_RC_DEFAULT_PID is not set
! CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
! CONFIG_MAC80211_RC_DEFAULT="minstrel"
! # CONFIG_MAC80211_LEDS is not set
! # CONFIG_MAC80211_DEBUGFS is not set
! # CONFIG_MAC80211_DEBUG_MENU is not set
  # CONFIG_WIMAX is not set
  # CONFIG_RFKILL is not set
***************
*** 449,452 ****
--- 485,489 ----
  # CONFIG_EEPROM_AT24 is not set
  # CONFIG_EEPROM_LEGACY is not set
+ # CONFIG_EEPROM_MAX6875 is not set
  # CONFIG_EEPROM_93CX6 is not set
  CONFIG_HAVE_IDE=y
***************
*** 472,479 ****
  # CONFIG_CHR_DEV_SG is not set
  # CONFIG_CHR_DEV_SCH is not set
- 
- #
- # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
- #
  CONFIG_SCSI_MULTI_LUN=y
  # CONFIG_SCSI_CONSTANTS is not set
--- 509,512 ----
***************
*** 501,505 ****
  # CONFIG_MACINTOSH_DRIVERS is not set
  CONFIG_NETDEVICES=y
- CONFIG_COMPAT_NET_DEV_OPS=y
  # CONFIG_DUMMY is not set
  # CONFIG_BONDING is not set
--- 534,537 ----
***************
*** 521,524 ****
--- 553,557 ----
  # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
  # CONFIG_B44 is not set
+ # CONFIG_KS8842 is not set
  # CONFIG_NETDEV_1000 is not set
  # CONFIG_NETDEV_10000 is not set
***************
*** 554,557 ****
--- 587,591 ----
  # CONFIG_USB_NET_CDC_SUBSET is not set
  # CONFIG_USB_NET_ZAURUS is not set
+ # CONFIG_USB_NET_INT51X1 is not set
  # CONFIG_WAN is not set
  # CONFIG_PPP is not set
***************
*** 586,595 ****
  CONFIG_INPUT_KEYBOARD=y
  # CONFIG_KEYBOARD_ATKBD is not set
- # CONFIG_KEYBOARD_SUNKBD is not set
  # CONFIG_KEYBOARD_LKKBD is not set
! # CONFIG_KEYBOARD_XTKBD is not set
  # CONFIG_KEYBOARD_NEWTON is not set
  # CONFIG_KEYBOARD_STOWAWAY is not set
! # CONFIG_KEYBOARD_GPIO is not set
  CONFIG_INPUT_MOUSE=y
  # CONFIG_MOUSE_PS2 is not set
--- 620,630 ----
  CONFIG_INPUT_KEYBOARD=y
  # CONFIG_KEYBOARD_ATKBD is not set
  # CONFIG_KEYBOARD_LKKBD is not set
! # CONFIG_KEYBOARD_GPIO is not set
! # CONFIG_KEYBOARD_MATRIX is not set
  # CONFIG_KEYBOARD_NEWTON is not set
  # CONFIG_KEYBOARD_STOWAWAY is not set
! # CONFIG_KEYBOARD_SUNKBD is not set
! # CONFIG_KEYBOARD_XTKBD is not set
  CONFIG_INPUT_MOUSE=y
  # CONFIG_MOUSE_PS2 is not set
***************
*** 599,602 ****
--- 634,638 ----
  # CONFIG_MOUSE_VSXXXAA is not set
  # CONFIG_MOUSE_GPIO is not set
+ # CONFIG_MOUSE_SYNAPTICS_I2C is not set
  CONFIG_INPUT_JOYSTICK=y
  # CONFIG_JOYSTICK_ANALOG is not set
***************
*** 717,721 ****
  # CONFIG_PCF8575 is not set
  # CONFIG_SENSORS_PCA9539 is not set
- # CONFIG_SENSORS_MAX6875 is not set
  # CONFIG_SENSORS_TSL2550 is not set
  # CONFIG_I2C_DEBUG_CORE is not set
--- 753,756 ----
***************
*** 729,732 ****
--- 764,772 ----
  CONFIG_GAMECUBE_EXI=y
  # CONFIG_SPI is not set
+ 
+ #
+ # PPS support
+ #
+ # CONFIG_PPS is not set
  CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
  CONFIG_GPIOLIB=y
***************
*** 779,799 ****
  # CONFIG_MFD_WM8350_I2C is not set
  # CONFIG_MFD_PCF50633 is not set
  # CONFIG_REGULATOR is not set
! 
! #
! # Multimedia devices
! #
! 
! #
! # Multimedia core support
! #
! # CONFIG_VIDEO_DEV is not set
! # CONFIG_DVB_CORE is not set
! # CONFIG_VIDEO_MEDIA is not set
! 
! #
! # Multimedia drivers
! #
! # CONFIG_DAB is not set
  
  #
--- 819,825 ----
  # CONFIG_MFD_WM8350_I2C is not set
  # CONFIG_MFD_PCF50633 is not set
+ # CONFIG_AB3100_CORE is not set
  # CONFIG_REGULATOR is not set
! # CONFIG_MEDIA_SUPPORT is not set
  
  #
***************
*** 872,875 ****
--- 898,906 ----
  # CONFIG_SND_VERBOSE_PRINTK is not set
  # CONFIG_SND_DEBUG is not set
+ CONFIG_SND_RAWMIDI_SEQ=y
+ # CONFIG_SND_OPL3_LIB_SEQ is not set
+ # CONFIG_SND_OPL4_LIB_SEQ is not set
+ # CONFIG_SND_SBAWE_SEQ is not set
+ # CONFIG_SND_EMU10K1_SEQ is not set
  CONFIG_SND_DRIVERS=y
  # CONFIG_SND_DUMMY is not set
***************
*** 909,913 ****
  CONFIG_HID_CHICONY=m
  CONFIG_HID_CYPRESS=m
! CONFIG_DRAGONRISE_FF=m
  CONFIG_HID_EZKEY=m
  CONFIG_HID_KYE=m
--- 940,945 ----
  CONFIG_HID_CHICONY=m
  CONFIG_HID_CYPRESS=m
! CONFIG_HID_DRAGONRISE=m
! CONFIG_DRAGONRISE_FF=y
  CONFIG_HID_EZKEY=m
  CONFIG_HID_KYE=m
***************
*** 926,933 ****
  CONFIG_HID_SONY=m
  CONFIG_HID_SUNPLUS=m
  # CONFIG_GREENASIA_FF is not set
  # CONFIG_HID_TOPSEED is not set
! CONFIG_THRUSTMASTER_FF=m
! CONFIG_ZEROPLUS_FF=m
  CONFIG_USB_SUPPORT=y
  CONFIG_USB_ARCH_HAS_HCD=y
--- 958,971 ----
  CONFIG_HID_SONY=m
  CONFIG_HID_SUNPLUS=m
+ CONFIG_HID_GREENASIA=m
  # CONFIG_GREENASIA_FF is not set
+ CONFIG_HID_SMARTJOYPLUS=m
+ CONFIG_SMARTJOYPLUS_FF=y
  # CONFIG_HID_TOPSEED is not set
! CONFIG_HID_THRUSTMASTER=m
! CONFIG_THRUSTMASTER_FF=y
! CONFIG_HID_WACOM=m
! CONFIG_HID_ZEROPLUS=m
! CONFIG_ZEROPLUS_FF=y
  CONFIG_USB_SUPPORT=y
  CONFIG_USB_ARCH_HAS_HCD=y
***************
*** 964,967 ****
--- 1002,1007 ----
  # CONFIG_USB_ISP1760_HCD is not set
  CONFIG_USB_OHCI_HCD=y
+ # CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set
+ # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
  # CONFIG_USB_OHCI_HCD_PPC_OF is not set
  CONFIG_USB_OHCI_HCD_MIPC=y
***************
*** 1064,1067 ****
--- 1104,1108 ----
  CONFIG_MMC_SDHCI_IO_ACCESSORS=y
  # CONFIG_MMC_SDHCI_OF is not set
+ # CONFIG_MMC_SDHCI_PLTFM is not set
  CONFIG_MMC_SDHCI_MIPC=y
  # CONFIG_MMC_WBSD is not set
***************
*** 1101,1104 ****
--- 1142,1146 ----
  # CONFIG_RTC_DRV_FM3130 is not set
  # CONFIG_RTC_DRV_RX8581 is not set
+ # CONFIG_RTC_DRV_RX8025 is not set
  
  #
***************
*** 1129,1132 ****
--- 1171,1178 ----
  # CONFIG_AUXDISPLAY is not set
  # CONFIG_UIO is not set
+ 
+ #
+ # TI VLYNQ
+ #
  # CONFIG_STAGING is not set
  
***************
*** 1146,1154 ****
  # CONFIG_JFS_FS is not set
  # CONFIG_FS_POSIX_ACL is not set
- CONFIG_FILE_LOCKING=y
  # CONFIG_XFS_FS is not set
  # CONFIG_GFS2_FS is not set
  # CONFIG_OCFS2_FS is not set
  # CONFIG_BTRFS_FS is not set
  CONFIG_DNOTIFY=y
  CONFIG_INOTIFY=y
--- 1192,1201 ----
  # CONFIG_JFS_FS is not set
  # CONFIG_FS_POSIX_ACL is not set
  # CONFIG_XFS_FS is not set
  # CONFIG_GFS2_FS is not set
  # CONFIG_OCFS2_FS is not set
  # CONFIG_BTRFS_FS is not set
+ CONFIG_FILE_LOCKING=y
+ CONFIG_FSNOTIFY=y
  CONFIG_DNOTIFY=y
  CONFIG_INOTIFY=y
***************
*** 1227,1231 ****
  # CONFIG_RPCSEC_GSS_SPKM3 is not set
  # CONFIG_SMB_FS is not set
! # CONFIG_CIFS is not set
  # CONFIG_NCP_FS is not set
  # CONFIG_CODA_FS is not set
--- 1274,1283 ----
  # CONFIG_RPCSEC_GSS_SPKM3 is not set
  # CONFIG_SMB_FS is not set
! CONFIG_CIFS=m
! # CONFIG_CIFS_STATS is not set
! # CONFIG_CIFS_WEAK_PW_HASH is not set
! # CONFIG_CIFS_XATTR is not set
! # CONFIG_CIFS_DEBUG2 is not set
! # CONFIG_CIFS_EXPERIMENTAL is not set
  # CONFIG_NCP_FS is not set
  # CONFIG_CODA_FS is not set
***************
*** 1299,1302 ****
--- 1351,1355 ----
  CONFIG_HAVE_LMB=y
  CONFIG_NLATTR=y
+ CONFIG_GENERIC_ATOMIC64=y
  
  #
***************
*** 1319,1330 ****
  CONFIG_SCHED_DEBUG=y
  CONFIG_SCHEDSTATS=y
! CONFIG_TIMER_STATS=y
  # CONFIG_DEBUG_OBJECTS is not set
  # CONFIG_DEBUG_SLAB is not set
  # CONFIG_DEBUG_RT_MUTEXES is not set
  # CONFIG_RT_MUTEX_TESTER is not set
  CONFIG_DEBUG_SPINLOCK=y
! # CONFIG_DEBUG_MUTEXES is not set
! # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
  # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
  CONFIG_STACKTRACE=y
--- 1372,1387 ----
  CONFIG_SCHED_DEBUG=y
  CONFIG_SCHEDSTATS=y
! # CONFIG_TIMER_STATS is not set
  # CONFIG_DEBUG_OBJECTS is not set
  # CONFIG_DEBUG_SLAB is not set
+ CONFIG_DEBUG_PREEMPT=y
  # CONFIG_DEBUG_RT_MUTEXES is not set
  # CONFIG_RT_MUTEX_TESTER is not set
  CONFIG_DEBUG_SPINLOCK=y
! CONFIG_DEBUG_MUTEXES=y
! # CONFIG_DEBUG_LOCK_ALLOC is not set
! # CONFIG_PROVE_LOCKING is not set
! # CONFIG_LOCK_STAT is not set
! CONFIG_DEBUG_SPINLOCK_SLEEP=y
  # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
  CONFIG_STACKTRACE=y
***************
*** 1338,1342 ****
  # CONFIG_DEBUG_SG is not set
  # CONFIG_DEBUG_NOTIFIERS is not set
- # CONFIG_BOOT_PRINTK_DELAY is not set
  # CONFIG_RCU_TORTURE_TEST is not set
  # CONFIG_RCU_CPU_STALL_DETECTOR is not set
--- 1395,1398 ----
***************
*** 1352,1369 ****
  CONFIG_HAVE_DYNAMIC_FTRACE=y
  CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
  CONFIG_RING_BUFFER=y
  CONFIG_TRACING=y
  CONFIG_TRACING_SUPPORT=y
! 
! #
! # Tracers
! #
  # CONFIG_FUNCTION_TRACER is not set
  # CONFIG_PREEMPT_TRACER is not set
! # CONFIG_SCHED_TRACER is not set
! CONFIG_CONTEXT_SWITCH_TRACER=y
! # CONFIG_EVENT_TRACER is not set
  CONFIG_BOOT_TRACER=y
! # CONFIG_TRACE_BRANCH_PROFILING is not set
  # CONFIG_STACK_TRACER is not set
  # CONFIG_KMEMTRACE is not set
--- 1408,1427 ----
  CONFIG_HAVE_DYNAMIC_FTRACE=y
  CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+ CONFIG_TRACER_MAX_TRACE=y
  CONFIG_RING_BUFFER=y
+ CONFIG_EVENT_TRACING=y
+ CONFIG_CONTEXT_SWITCH_TRACER=y
  CONFIG_TRACING=y
+ CONFIG_GENERIC_TRACER=y
  CONFIG_TRACING_SUPPORT=y
! CONFIG_FTRACE=y
  # CONFIG_FUNCTION_TRACER is not set
+ # CONFIG_IRQSOFF_TRACER is not set
  # CONFIG_PREEMPT_TRACER is not set
! CONFIG_SCHED_TRACER=y
  CONFIG_BOOT_TRACER=y
! CONFIG_BRANCH_PROFILE_NONE=y
! # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
! # CONFIG_PROFILE_ALL_BRANCHES is not set
  # CONFIG_STACK_TRACER is not set
  # CONFIG_KMEMTRACE is not set
***************
*** 1371,1381 ****
--- 1429,1444 ----
  # CONFIG_BLK_DEV_IO_TRACE is not set
  # CONFIG_FTRACE_STARTUP_TEST is not set
+ # CONFIG_RING_BUFFER_BENCHMARK is not set
  # CONFIG_DYNAMIC_DEBUG is not set
  # CONFIG_SAMPLES is not set
  CONFIG_HAVE_ARCH_KGDB=y
  # CONFIG_KGDB is not set
+ # CONFIG_KMEMCHECK is not set
+ # CONFIG_PPC_DISABLE_WERROR is not set
+ CONFIG_PPC_WERROR=y
  CONFIG_PRINT_STACK_DEPTH=64
  # CONFIG_DEBUG_STACKOVERFLOW is not set
  # CONFIG_DEBUG_STACK_USAGE is not set
+ # CONFIG_PPC_EMULATED_STATS is not set
  # CONFIG_CODE_PATCHING_SELFTEST is not set
  # CONFIG_FTR_FIXUP_SELFTEST is not set
***************
*** 1407,1411 ****
  # CONFIG_SECURITYFS is not set
  # CONFIG_SECURITY_FILE_CAPABILITIES is not set
! # CONFIG_CRYPTO is not set
  # CONFIG_PPC_CLOCK is not set
  CONFIG_PPC_LIB_RHEAP=y
--- 1470,1568 ----
  # CONFIG_SECURITYFS is not set
  # CONFIG_SECURITY_FILE_CAPABILITIES is not set
! CONFIG_CRYPTO=y
! 
! #
! # Crypto core or helper
! #
! # CONFIG_CRYPTO_FIPS is not set
! CONFIG_CRYPTO_ALGAPI=y
! CONFIG_CRYPTO_ALGAPI2=y
! CONFIG_CRYPTO_AEAD2=y
! CONFIG_CRYPTO_BLKCIPHER=y
! CONFIG_CRYPTO_BLKCIPHER2=y
! CONFIG_CRYPTO_HASH2=y
! CONFIG_CRYPTO_RNG2=y
! CONFIG_CRYPTO_PCOMP=y
! CONFIG_CRYPTO_MANAGER=y
! CONFIG_CRYPTO_MANAGER2=y
! # CONFIG_CRYPTO_GF128MUL is not set
! # CONFIG_CRYPTO_NULL is not set
! CONFIG_CRYPTO_WORKQUEUE=y
! # CONFIG_CRYPTO_CRYPTD is not set
! # CONFIG_CRYPTO_AUTHENC is not set
! # CONFIG_CRYPTO_TEST is not set
! 
! #
! # Authenticated Encryption with Associated Data
! #
! # CONFIG_CRYPTO_CCM is not set
! # CONFIG_CRYPTO_GCM is not set
! # CONFIG_CRYPTO_SEQIV is not set
! 
! #
! # Block modes
! #
! # CONFIG_CRYPTO_CBC is not set
! # CONFIG_CRYPTO_CTR is not set
! # CONFIG_CRYPTO_CTS is not set
! CONFIG_CRYPTO_ECB=y
! # CONFIG_CRYPTO_LRW is not set
! # CONFIG_CRYPTO_PCBC is not set
! # CONFIG_CRYPTO_XTS is not set
! 
! #
! # Hash modes
! #
! # CONFIG_CRYPTO_HMAC is not set
! # CONFIG_CRYPTO_XCBC is not set
! 
! #
! # Digest
! #
! # CONFIG_CRYPTO_CRC32C is not set
! # CONFIG_CRYPTO_MD4 is not set
! # CONFIG_CRYPTO_MD5 is not set
! # CONFIG_CRYPTO_MICHAEL_MIC is not set
! # CONFIG_CRYPTO_RMD128 is not set
! # CONFIG_CRYPTO_RMD160 is not set
! # CONFIG_CRYPTO_RMD256 is not set
! # CONFIG_CRYPTO_RMD320 is not set
! # CONFIG_CRYPTO_SHA1 is not set
! # CONFIG_CRYPTO_SHA256 is not set
! # CONFIG_CRYPTO_SHA512 is not set
! # CONFIG_CRYPTO_TGR192 is not set
! # CONFIG_CRYPTO_WP512 is not set
! 
! #
! # Ciphers
! #
! CONFIG_CRYPTO_AES=y
! # CONFIG_CRYPTO_ANUBIS is not set
! CONFIG_CRYPTO_ARC4=y
! # CONFIG_CRYPTO_BLOWFISH is not set
! # CONFIG_CRYPTO_CAMELLIA is not set
! # CONFIG_CRYPTO_CAST5 is not set
! # CONFIG_CRYPTO_CAST6 is not set
! # CONFIG_CRYPTO_DES is not set
! # CONFIG_CRYPTO_FCRYPT is not set
! # CONFIG_CRYPTO_KHAZAD is not set
! # CONFIG_CRYPTO_SALSA20 is not set
! # CONFIG_CRYPTO_SEED is not set
! # CONFIG_CRYPTO_SERPENT is not set
! # CONFIG_CRYPTO_TEA is not set
! # CONFIG_CRYPTO_TWOFISH is not set
! 
! #
! # Compression
! #
! # CONFIG_CRYPTO_DEFLATE is not set
! # CONFIG_CRYPTO_ZLIB is not set
! # CONFIG_CRYPTO_LZO is not set
! 
! #
! # Random Number Generation
! #
! # CONFIG_CRYPTO_ANSI_CPRNG is not set
! # CONFIG_CRYPTO_HW is not set
  # CONFIG_PPC_CLOCK is not set
  CONFIG_PPC_LIB_RHEAP=y

Index: gamecube_defconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/configs/gamecube_defconfig,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** gamecube_defconfig	28 Mar 2009 20:44:19 -0000	1.7
--- gamecube_defconfig	25 Oct 2009 18:59:27 -0000	1.8
***************
*** 1,6 ****
  #
  # Automatically generated make config: don't edit
! # Linux kernel version: 2.6.29
! # Sat Mar 28 19:52:22 2009
  #
  # CONFIG_PPC64 is not set
--- 1,6 ----
  #
  # Automatically generated make config: don't edit
! # Linux kernel version: 2.6.31
! # Sun Sep 20 17:00:48 2009
  #
  # CONFIG_PPC64 is not set
***************
*** 9,13 ****
  # Processor support
  #
! CONFIG_6xx=y
  # CONFIG_PPC_85xx is not set
  # CONFIG_PPC_8xx is not set
--- 9,13 ----
  # Processor support
  #
! CONFIG_PPC_BOOK3S_32=y
  # CONFIG_PPC_85xx is not set
  # CONFIG_PPC_8xx is not set
***************
*** 15,18 ****
--- 15,20 ----
  # CONFIG_44x is not set
  # CONFIG_E200 is not set
+ CONFIG_PPC_BOOK3S=y
+ CONFIG_6xx=y
  CONFIG_PPC_FPU=y
  # CONFIG_ALTIVEC is not set
***************
*** 20,23 ****
--- 22,27 ----
  CONFIG_PPC_STD_MMU_32=y
  # CONFIG_PPC_MM_SLICES is not set
+ CONFIG_PPC_HAVE_PMU_SUPPORT=y
+ CONFIG_PPC_PERF_CTRS=y
  # CONFIG_SMP is not set
  CONFIG_NOT_COHERENT_CACHE=y
***************
*** 31,43 ****
  CONFIG_GENERIC_CLOCKEVENTS=y
  CONFIG_GENERIC_HARDIRQS=y
  # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
  CONFIG_IRQ_PER_CPU=y
  CONFIG_STACKTRACE_SUPPORT=y
  CONFIG_HAVE_LATENCYTOP_SUPPORT=y
  CONFIG_LOCKDEP_SUPPORT=y
  CONFIG_RWSEM_XCHGADD_ALGORITHM=y
  CONFIG_ARCH_HAS_ILOG2_U32=y
  CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
  CONFIG_GENERIC_FIND_NEXT_BIT=y
  # CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--- 35,48 ----
  CONFIG_GENERIC_CLOCKEVENTS=y
  CONFIG_GENERIC_HARDIRQS=y
+ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
  # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
  CONFIG_IRQ_PER_CPU=y
  CONFIG_STACKTRACE_SUPPORT=y
  CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
  CONFIG_LOCKDEP_SUPPORT=y
  CONFIG_RWSEM_XCHGADD_ALGORITHM=y
  CONFIG_ARCH_HAS_ILOG2_U32=y
  CONFIG_GENERIC_HWEIGHT=y
  CONFIG_GENERIC_FIND_NEXT_BIT=y
  # CONFIG_ARCH_NO_VIRT_TO_BUS is not set
***************
*** 53,60 ****
--- 58,68 ----
  CONFIG_AUDIT_ARCH=y
  CONFIG_GENERIC_BUG=y
+ CONFIG_DTC=y
  # CONFIG_DEFAULT_UIMAGE is not set
  # CONFIG_PPC_DCR_NATIVE is not set
  # CONFIG_PPC_DCR_MMIO is not set
+ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
  CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+ CONFIG_CONSTRUCTORS=y
  
  #
***************
*** 98,101 ****
--- 106,112 ----
  CONFIG_BLK_DEV_INITRD=y
  CONFIG_INITRAMFS_SOURCE=""
+ CONFIG_RD_GZIP=y
+ # CONFIG_RD_BZIP2 is not set
+ # CONFIG_RD_LZMA is not set
  # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
  CONFIG_SYSCTL=y
***************
*** 118,122 ****
--- 129,141 ----
  CONFIG_SHMEM=y
  CONFIG_AIO=y
+ CONFIG_HAVE_PERF_COUNTERS=y
+ 
+ #
+ # Performance Counters
+ #
+ CONFIG_PERF_COUNTERS=y
+ CONFIG_EVENT_PROFILE=y
  # CONFIG_VM_EVENT_COUNTERS is not set
+ # CONFIG_STRIP_ASM_SYMS is not set
  CONFIG_COMPAT_BRK=y
  CONFIG_SLAB=y
***************
*** 133,136 ****
--- 152,161 ----
  CONFIG_HAVE_KRETPROBES=y
  CONFIG_HAVE_ARCH_TRACEHOOK=y
+ 
+ #
+ # GCOV-based kernel profiling
+ #
+ # CONFIG_GCOV_KERNEL is not set
+ # CONFIG_SLOW_WORK is not set
  # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
  CONFIG_SLABINFO=y
***************
*** 144,149 ****
  # CONFIG_MODULE_SRCVERSION_ALL is not set
  CONFIG_BLOCK=y
! CONFIG_LBD=y
! # CONFIG_BLK_DEV_IO_TRACE is not set
  # CONFIG_BLK_DEV_BSG is not set
  # CONFIG_BLK_DEV_INTEGRITY is not set
--- 169,173 ----
  # CONFIG_MODULE_SRCVERSION_ALL is not set
  CONFIG_BLOCK=y
! CONFIG_LBDAF=y
  # CONFIG_BLK_DEV_BSG is not set
  # CONFIG_BLK_DEV_INTEGRITY is not set
***************
*** 166,171 ****
  # Platform support
  #
- CONFIG_PPC_MULTIPLATFORM=y
- CONFIG_CLASSIC32=y
  # CONFIG_PPC_CHRP is not set
  # CONFIG_MPC5121_ADS is not set
--- 190,193 ----
***************
*** 194,197 ****
--- 216,221 ----
  # CONFIG_GAMECUBE_VIDEO_UDBG is not set
  CONFIG_GAMECUBE_RSW=y
+ # CONFIG_AMIGAONE is not set
+ # CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set
  # CONFIG_IPIC is not set
  # CONFIG_MPIC is not set
***************
*** 229,232 ****
--- 253,257 ----
  CONFIG_BINFMT_MISC=m
  # CONFIG_IOMMU_HELPER is not set
+ # CONFIG_SWIOTLB is not set
  CONFIG_PPC_NEED_DMA_SYNC_OPS=y
  CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
***************
*** 250,257 ****
  CONFIG_BOUNCE=y
  CONFIG_VIRT_TO_BUS=y
! CONFIG_UNEVICTABLE_LRU=y
  CONFIG_PPC_4K_PAGES=y
  # CONFIG_PPC_16K_PAGES is not set
  # CONFIG_PPC_64K_PAGES is not set
  CONFIG_FORCE_MAX_ZONEORDER=11
  CONFIG_PROC_DEVICETREE=y
--- 275,285 ----
  CONFIG_BOUNCE=y
  CONFIG_VIRT_TO_BUS=y
! CONFIG_HAVE_MLOCK=y
! CONFIG_HAVE_MLOCKED_PAGE_BIT=y
! CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
  CONFIG_PPC_4K_PAGES=y
  # CONFIG_PPC_16K_PAGES is not set
  # CONFIG_PPC_64K_PAGES is not set
+ # CONFIG_PPC_256K_PAGES is not set
  CONFIG_FORCE_MAX_ZONEORDER=11
  CONFIG_PROC_DEVICETREE=y
***************
*** 287,292 ****
  # CONFIG_TASK_SIZE_BOOL is not set
  CONFIG_TASK_SIZE=0xc0000000
- # CONFIG_CONSISTENT_START_BOOL is not set
- CONFIG_CONSISTENT_START=0xff100000
  # CONFIG_CONSISTENT_SIZE_BOOL is not set
  CONFIG_CONSISTENT_SIZE=0x00200000
--- 315,318 ----
***************
*** 296,300 ****
  # Networking options
  #
- CONFIG_COMPAT_NET_DEV_OPS=y
  CONFIG_PACKET=y
  # CONFIG_PACKET_MMAP is not set
--- 322,325 ----
***************
*** 307,311 ****
  CONFIG_IP_PNP=y
  CONFIG_IP_PNP_DHCP=y
! CONFIG_IP_PNP_BOOTP=y
  CONFIG_IP_PNP_RARP=y
  # CONFIG_NET_IPIP is not set
--- 332,336 ----
  CONFIG_IP_PNP=y
  CONFIG_IP_PNP_DHCP=y
! # CONFIG_IP_PNP_BOOTP is not set
  CONFIG_IP_PNP_RARP=y
  # CONFIG_NET_IPIP is not set
***************
*** 345,348 ****
--- 370,375 ----
  # CONFIG_ECONET is not set
  # CONFIG_WAN_ROUTER is not set
+ # CONFIG_PHONET is not set
+ # CONFIG_IEEE802154 is not set
  # CONFIG_NET_SCHED is not set
  # CONFIG_DCB is not set
***************
*** 352,355 ****
--- 379,383 ----
  #
  # CONFIG_NET_PKTGEN is not set
+ # CONFIG_NET_DROP_MONITOR is not set
  # CONFIG_HAMRADIO is not set
  # CONFIG_CAN is not set
***************
*** 357,361 ****
  # CONFIG_BT is not set
  # CONFIG_AF_RXRPC is not set
- # CONFIG_PHONET is not set
  # CONFIG_WIRELESS is not set
  # CONFIG_WIMAX is not set
--- 385,388 ----
***************
*** 398,403 ****
  # CONFIG_BLK_DEV_HD is not set
  CONFIG_MISC_DEVICES=y
! CONFIG_GAMECUBE_GQR=y
! # CONFIG_GAMECUBE_MI is not set
  # CONFIG_ENCLOSURE_SERVICES is not set
  # CONFIG_C2PORT is not set
--- 425,430 ----
  # CONFIG_BLK_DEV_HD is not set
  CONFIG_MISC_DEVICES=y
! CONFIG_GAMECUBE_GQR=m
! CONFIG_GAMECUBE_MI=m
  # CONFIG_ENCLOSURE_SERVICES is not set
  # CONFIG_C2PORT is not set
***************
*** 431,434 ****
--- 458,462 ----
  # CONFIG_MII is not set
  CONFIG_GAMECUBE_BBA=y
+ # CONFIG_ETHOC is not set
  # CONFIG_DNET is not set
  # CONFIG_IBM_NEW_EMAC_ZMII is not set
***************
*** 440,443 ****
--- 468,472 ----
  # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
  # CONFIG_B44 is not set
+ # CONFIG_KS8842 is not set
  # CONFIG_NETDEV_1000 is not set
  # CONFIG_NETDEV_10000 is not set
***************
*** 448,452 ****
  # CONFIG_WLAN_PRE80211 is not set
  # CONFIG_WLAN_80211 is not set
- # CONFIG_IWLWIFI_LEDS is not set
  
  #
--- 477,480 ----
***************
*** 466,470 ****
  #
  CONFIG_INPUT=y
! # CONFIG_INPUT_FF_MEMLESS is not set
  # CONFIG_INPUT_POLLDEV is not set
  
--- 494,498 ----
  #
  CONFIG_INPUT=y
! CONFIG_INPUT_FF_MEMLESS=m
  # CONFIG_INPUT_POLLDEV is not set
  
***************
*** 482,490 ****
  CONFIG_INPUT_KEYBOARD=y
  # CONFIG_KEYBOARD_ATKBD is not set
- # CONFIG_KEYBOARD_SUNKBD is not set
  # CONFIG_KEYBOARD_LKKBD is not set
- # CONFIG_KEYBOARD_XTKBD is not set
  # CONFIG_KEYBOARD_NEWTON is not set
  # CONFIG_KEYBOARD_STOWAWAY is not set
  # CONFIG_INPUT_MOUSE is not set
  CONFIG_INPUT_JOYSTICK=y
--- 510,518 ----
  CONFIG_INPUT_KEYBOARD=y
  # CONFIG_KEYBOARD_ATKBD is not set
  # CONFIG_KEYBOARD_LKKBD is not set
  # CONFIG_KEYBOARD_NEWTON is not set
  # CONFIG_KEYBOARD_STOWAWAY is not set
+ # CONFIG_KEYBOARD_SUNKBD is not set
+ # CONFIG_KEYBOARD_XTKBD is not set
  # CONFIG_INPUT_MOUSE is not set
  CONFIG_INPUT_JOYSTICK=y
***************
*** 564,567 ****
--- 592,600 ----
  CONFIG_GAMECUBE_EXI=y
  # CONFIG_SPI is not set
+ 
+ #
+ # PPS support
+ #
+ # CONFIG_PPS is not set
  CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
  # CONFIG_GPIOLIB is not set
***************
*** 587,606 ****
  # CONFIG_MFD_TMIO is not set
  # CONFIG_REGULATOR is not set
! 
! #
! # Multimedia devices
! #
! 
! #
! # Multimedia core support
! #
! # CONFIG_VIDEO_DEV is not set
! # CONFIG_DVB_CORE is not set
! # CONFIG_VIDEO_MEDIA is not set
! 
! #
! # Multimedia drivers
! #
! # CONFIG_DAB is not set
  
  #
--- 620,624 ----
  # CONFIG_MFD_TMIO is not set
  # CONFIG_REGULATOR is not set
! # CONFIG_MEDIA_SUPPORT is not set
  
  #
***************
*** 639,642 ****
--- 657,661 ----
  # CONFIG_FB_METRONOME is not set
  # CONFIG_FB_MB862XX is not set
+ # CONFIG_FB_BROADSHEET is not set
  # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
  
***************
*** 679,682 ****
--- 698,706 ----
  # CONFIG_SND_VERBOSE_PRINTK is not set
  # CONFIG_SND_DEBUG is not set
+ # CONFIG_SND_RAWMIDI_SEQ is not set
+ # CONFIG_SND_OPL3_LIB_SEQ is not set
+ # CONFIG_SND_OPL4_LIB_SEQ is not set
+ # CONFIG_SND_SBAWE_SEQ is not set
+ # CONFIG_SND_EMU10K1_SEQ is not set
  CONFIG_SND_DRIVERS=y
  # CONFIG_SND_DUMMY is not set
***************
*** 699,703 ****
  # Special HID drivers
  #
- CONFIG_HID_COMPAT=y
  # CONFIG_USB_SUPPORT is not set
  # CONFIG_MMC is not set
--- 723,726 ----
***************
*** 744,750 ****
  # on-CPU RTC drivers
  #
! # CONFIG_RTC_DRV_PPC is not set
  # CONFIG_DMADEVICES is not set
  # CONFIG_UIO is not set
  # CONFIG_STAGING is not set
  
--- 767,778 ----
  # on-CPU RTC drivers
  #
! CONFIG_RTC_DRV_GENERIC=y
  # CONFIG_DMADEVICES is not set
+ # CONFIG_AUXDISPLAY is not set
  # CONFIG_UIO is not set
+ 
+ #
+ # TI VLYNQ
+ #
  # CONFIG_STAGING is not set
  
***************
*** 756,759 ****
--- 784,788 ----
  # CONFIG_EXT2_FS_XIP is not set
  CONFIG_EXT3_FS=y
+ # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
  # CONFIG_EXT3_FS_XATTR is not set
  # CONFIG_EXT4_FS is not set
***************
*** 763,771 ****
  # CONFIG_JFS_FS is not set
  # CONFIG_FS_POSIX_ACL is not set
- CONFIG_FILE_LOCKING=y
  # CONFIG_XFS_FS is not set
  # CONFIG_GFS2_FS is not set
  # CONFIG_OCFS2_FS is not set
  # CONFIG_BTRFS_FS is not set
  CONFIG_DNOTIFY=y
  CONFIG_INOTIFY=y
--- 792,801 ----
  # CONFIG_JFS_FS is not set
  # CONFIG_FS_POSIX_ACL is not set
  # CONFIG_XFS_FS is not set
  # CONFIG_GFS2_FS is not set
  # CONFIG_OCFS2_FS is not set
  # CONFIG_BTRFS_FS is not set
+ CONFIG_FILE_LOCKING=y
+ CONFIG_FSNOTIFY=y
  CONFIG_DNOTIFY=y
  CONFIG_INOTIFY=y
***************
*** 777,780 ****
--- 807,815 ----
  
  #
+ # Caches
+ #
+ # CONFIG_FSCACHE is not set
+ 
+ #
  # CD-ROM/DVD Filesystems
  #
***************
*** 824,827 ****
--- 859,863 ----
  # CONFIG_SYSV_FS is not set
  # CONFIG_UFS_FS is not set
+ # CONFIG_NILFS2_FS is not set
  CONFIG_NETWORK_FILESYSTEMS=y
  CONFIG_NFS_FS=y
***************
*** 835,839 ****
  CONFIG_NFS_COMMON=y
  CONFIG_SUNRPC=y
- # CONFIG_SUNRPC_REGISTER_V4 is not set
  # CONFIG_RPCSEC_GSS_KRB5 is not set
  # CONFIG_RPCSEC_GSS_SPKM3 is not set
--- 871,874 ----
***************
*** 895,898 ****
--- 930,934 ----
  # CONFIG_NLS_UTF8 is not set
  # CONFIG_DLM is not set
+ CONFIG_BINARY_PRINTF=y
  
  #
***************
*** 908,921 ****
  # CONFIG_CRC7 is not set
  # CONFIG_LIBCRC32C is not set
! CONFIG_PLIST=y
  CONFIG_HAS_IOMEM=y
  CONFIG_HAS_IOPORT=y
  CONFIG_HAS_DMA=y
  CONFIG_HAVE_LMB=y
  
  #
  # Kernel hacking
  #
! # CONFIG_PRINTK_TIME is not set
  CONFIG_ENABLE_WARN_DEPRECATED=y
  CONFIG_ENABLE_MUST_CHECK=y
--- 944,960 ----
  # CONFIG_CRC7 is not set
  # CONFIG_LIBCRC32C is not set
! CONFIG_ZLIB_INFLATE=y
! CONFIG_DECOMPRESS_GZIP=y
  CONFIG_HAS_IOMEM=y
  CONFIG_HAS_IOPORT=y
  CONFIG_HAS_DMA=y
  CONFIG_HAVE_LMB=y
+ CONFIG_NLATTR=y
+ CONFIG_GENERIC_ATOMIC64=y
  
  #
  # Kernel hacking
  #
! CONFIG_PRINTK_TIME=y
  CONFIG_ENABLE_WARN_DEPRECATED=y
  CONFIG_ENABLE_MUST_CHECK=y
***************
*** 930,933 ****
--- 969,973 ----
  # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
  CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+ # CONFIG_DETECT_HUNG_TASK is not set
  CONFIG_SCHED_DEBUG=y
  CONFIG_SCHEDSTATS=y
***************
*** 935,943 ****
  # CONFIG_DEBUG_OBJECTS is not set
  # CONFIG_DEBUG_SLAB is not set
  # CONFIG_DEBUG_RT_MUTEXES is not set
  # CONFIG_RT_MUTEX_TESTER is not set
  CONFIG_DEBUG_SPINLOCK=y
  CONFIG_DEBUG_MUTEXES=y
! # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
  # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
  CONFIG_STACKTRACE=y
--- 975,987 ----
  # CONFIG_DEBUG_OBJECTS is not set
  # CONFIG_DEBUG_SLAB is not set
+ CONFIG_DEBUG_PREEMPT=y
  # CONFIG_DEBUG_RT_MUTEXES is not set
  # CONFIG_RT_MUTEX_TESTER is not set
  CONFIG_DEBUG_SPINLOCK=y
  CONFIG_DEBUG_MUTEXES=y
! # CONFIG_DEBUG_LOCK_ALLOC is not set
! # CONFIG_PROVE_LOCKING is not set
! # CONFIG_LOCK_STAT is not set
! CONFIG_DEBUG_SPINLOCK_SLEEP=y
  # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
  CONFIG_STACKTRACE=y
***************
*** 951,955 ****
  # CONFIG_DEBUG_SG is not set
  # CONFIG_DEBUG_NOTIFIERS is not set
- # CONFIG_BOOT_PRINTK_DELAY is not set
  # CONFIG_RCU_TORTURE_TEST is not set
  # CONFIG_RCU_CPU_STALL_DETECTOR is not set
--- 995,998 ----
***************
*** 959,987 ****
  CONFIG_LATENCYTOP=y
  CONFIG_SYSCTL_SYSCALL_CHECK=y
  CONFIG_NOP_TRACER=y
  CONFIG_HAVE_FUNCTION_TRACER=y
  CONFIG_HAVE_DYNAMIC_FTRACE=y
  CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
  CONFIG_RING_BUFFER=y
  CONFIG_TRACING=y
! 
! #
! # Tracers
! #
  # CONFIG_FUNCTION_TRACER is not set
  # CONFIG_PREEMPT_TRACER is not set
! # CONFIG_SCHED_TRACER is not set
! CONFIG_CONTEXT_SWITCH_TRACER=y
  CONFIG_BOOT_TRACER=y
! # CONFIG_TRACE_BRANCH_PROFILING is not set
  # CONFIG_STACK_TRACER is not set
! # CONFIG_DYNAMIC_PRINTK_DEBUG is not set
  # CONFIG_SAMPLES is not set
  CONFIG_HAVE_ARCH_KGDB=y
  # CONFIG_KGDB is not set
  CONFIG_PRINT_STACK_DEPTH=64
  # CONFIG_DEBUG_STACKOVERFLOW is not set
  # CONFIG_DEBUG_STACK_USAGE is not set
! # CONFIG_DEBUG_PAGEALLOC is not set
  # CONFIG_CODE_PATCHING_SELFTEST is not set
  # CONFIG_FTR_FIXUP_SELFTEST is not set
--- 1002,1044 ----
  CONFIG_LATENCYTOP=y
  CONFIG_SYSCTL_SYSCALL_CHECK=y
+ # CONFIG_DEBUG_PAGEALLOC is not set
  CONFIG_NOP_TRACER=y
  CONFIG_HAVE_FUNCTION_TRACER=y
+ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
  CONFIG_HAVE_DYNAMIC_FTRACE=y
  CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+ CONFIG_TRACER_MAX_TRACE=y
  CONFIG_RING_BUFFER=y
+ CONFIG_EVENT_TRACING=y
+ CONFIG_CONTEXT_SWITCH_TRACER=y
  CONFIG_TRACING=y
! CONFIG_GENERIC_TRACER=y
! CONFIG_TRACING_SUPPORT=y
! CONFIG_FTRACE=y
  # CONFIG_FUNCTION_TRACER is not set
+ # CONFIG_IRQSOFF_TRACER is not set
  # CONFIG_PREEMPT_TRACER is not set
! CONFIG_SCHED_TRACER=y
  CONFIG_BOOT_TRACER=y
! CONFIG_BRANCH_PROFILE_NONE=y
! # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
! # CONFIG_PROFILE_ALL_BRANCHES is not set
  # CONFIG_STACK_TRACER is not set
! # CONFIG_KMEMTRACE is not set
! # CONFIG_WORKQUEUE_TRACER is not set
! # CONFIG_BLK_DEV_IO_TRACE is not set
! # CONFIG_FTRACE_STARTUP_TEST is not set
! # CONFIG_RING_BUFFER_BENCHMARK is not set
! # CONFIG_DYNAMIC_DEBUG is not set
  # CONFIG_SAMPLES is not set
  CONFIG_HAVE_ARCH_KGDB=y
  # CONFIG_KGDB is not set
+ # CONFIG_KMEMCHECK is not set
+ # CONFIG_PPC_DISABLE_WERROR is not set
+ CONFIG_PPC_WERROR=y
  CONFIG_PRINT_STACK_DEPTH=64
  # CONFIG_DEBUG_STACKOVERFLOW is not set
  # CONFIG_DEBUG_STACK_USAGE is not set
! # CONFIG_PPC_EMULATED_STATS is not set
  # CONFIG_CODE_PATCHING_SELFTEST is not set
  # CONFIG_FTR_FIXUP_SELFTEST is not set