linux-mips-commits — CVS Commit Patches

[Linux-mips-commits]eBay-Erinnerung an unsere Umfrage: Ihre Meinung ist uns wichtig

[eBay R. <eba...@cc...>]

Hallo eBay-Mitglied,

Wir haben Sie letzte Woche gebeten, an unserer Online-Umfrage zur Kundenz=
ufriedenheit teilzunehmen, die Satmetrix Systems im Auftrag von eBay durc=
hf=FChrt. Wir hoffen, dass weiterhin daran interessiert sind, an dieser U=
mfrage teilzunehmen. Wir sind der =DCberzeugung, dass der beste Weg unser=
en Service zu verbessern, darin besteht, auf die Mitglieder der eBay-Geme=
inschaft zu h=F6ren.

Ihre Angaben werden vertraulich behandelt und ausschlie=DFlich dazu verwe=
ndet, die Qualit=E4t unserer Serviceleistungen zu verbessern.

Um an der Umfrage teilzunehmen, klicken Sie bitte auf die nachstehende In=
ternetadresse. Sollte dies nicht funktionieren, kopieren Sie die gesamte =
Internetadresse in das Adressfeld Ihres Browsers.

http://survey.ccsurvey.com/ebay0401a/surveyge.pl?fjx67897tg

Vielen Dank f=FCr Ihre Mitarbeit!

eBay International AG


** Ein wichtiger Hinweis des Unternehmens, das die Umfrage durchf=FChrt *=
*

eBay International AG hat Satmetrix Systems beauftragt, diese Umfrage mit=
 ihren Mitgliedern durchzuf=FChren. eBay AG befragt Sie f=FCr diese Studi=
e ausschlie=DFlich zu Marktforschungszwecken. Alle von Ihnen gemachten An=
gaben werden streng vertraulich und in =DCbereinstimmung mit den Datensch=
utzrichtlinien von eBay verwendet, die Sie unter folgender URL einsehen k=
=F6nnen:

http://pages.ebay.at/help/community/png-priv.html

Sie haben diese E-Mail erhalten, da wir aus Ihren eBay-Benachrichtigungse=
instellungen ersehen haben, dass Sie an den eBay-Umfragen teilnehmen m=F6=
chten. Um Ihre Benachrichtigungseinstellungen einzusehen, mit denen Sie f=
estlegen, wie Sie mit eBay kommunizieren m=F6chten, loggen Sie sich bitte=
 bei "Mein eBay" durch Klicken auf den "Mein eBay"-Link oben auf der eBay=
-Startseite ein, und =E4ndern Sie Ihre Benachrichtigungseinstellungen. Bi=
tte beachten Sie, dass es bis zu 14 Tage dauern kann, bis Ihre Anforderun=
g bearbeitet werden kann.

eBay fragt Sie niemals in E-Mails nach pers=F6nlichen Daten (wie z. B: Ke=
nnwort, Kreditkarten- oder Kontonummern).

Copyright =A9 2004 eBay International AG. Alle Rechte vorbehalten.
Ausgewiesene Marken geh=F6ren ihren jeweiligen Eigent=FCmern
eBay und das eBay-Logo sind Warenzeichen von eBay Inc.

[Linux-mips-commits]eBay Umfrage: Ihre Meinung ist uns wichtig

[eBay R. <eba...@cc...>]

Hallo eBay-Mitglied,

eBay legt h=F6chsten Wert auf Kundenzufriedenheit. Wir sind der =DCberzeu=
gung, dass der beste Weg unseren Service zu verbessern, darin besteht, au=
f die Mitglieder der eBay-Gemeinschaft zu h=F6ren.

Daher hoffen wir, dass Sie uns Ihre Meinung und Ihre Vorschl=E4ge mitteil=
en, indem Sie an dieser kurzen Umfrage teilnehmen, die von Satmetrix im A=
uftrag von eBay durchgef=FChrt wird. Wir wissen es zu sch=E4tzen, dass Si=
e sich f=FCr diese Umfrage Zeit nehmen. Ihre Meinung ist f=FCr uns unverz=
ichtbar, wenn es darum geht, eBay dabei zu helfen, die Serviceleistungen =
zu verbessern.

Um an der Umfrage teilzunehmen, klicken Sie bitte auf die nachstehende In=
ternetadresse. Sollte dies nicht funktionieren, kopieren Sie die gesamte =
Internetadresse in das Adressfeld Ihres Browsers.

http://survey.ccsurvey.com/ebay0401a/surveyge.pl?fjx67897tg

Vielen Dank f=FCr Ihre Mitarbeit!

eBay International AG


** Ein wichtiger Hinweis des Unternehmens, das die Umfrage durchf=FChrt *=
*

eBay International AG hat Satmetrix Systems beauftragt, diese Umfrage mit=
 ihren Mitgliedern durchzuf=FChren. eBay AG befragt Sie f=FCr diese Studi=
e ausschlie=DFlich zu Marktforschungszwecken. Alle von Ihnen gemachten An=
gaben werden streng vertraulich und in =DCbereinstimmung mit den Datensch=
utzrichtlinien von eBay verwendet, die Sie unter folgender URL einsehen k=
=F6nnen:

http://pages.ebay.at/help/community/png-priv.html

Sie haben diese E-Mail erhalten, da wir aus Ihren eBay-Benachrichtigungse=
instellungen ersehen haben, dass Sie an den eBay-Umfragen teilnehmen m=F6=
chten. Um Ihre Benachrichtigungseinstellungen einzusehen, mit denen Sie f=
estlegen, wie Sie mit eBay kommunizieren m=F6chten, loggen Sie sich bitte=
 bei "Mein eBay" durch Klicken auf den "Mein eBay"-Link oben auf der eBay=
-Startseite ein, und =E4ndern Sie Ihre Benachrichtigungseinstellungen. Bi=
tte beachten Sie, dass es bis zu 14 Tage dauern kann, bis Ihre Anforderun=
g bearbeitet werden kann.

eBay fragt Sie niemals in E-Mails nach pers=F6nlichen Daten (wie z. B: Ke=
nnwort, Kreditkarten- oder Kontonummern).

Copyright =A9 2004 eBay International AG. Alle Rechte vorbehalten.
Ausgewiesene Marken geh=F6ren ihren jeweiligen Eigent=FCmern
eBay und das eBay-Logo sind Warenzeichen von eBay Inc.

[Linux-mips-commits]HighPoint HPT371 IDE Controller

[Danya F. <da...@ma...>]

Hi.
I've got an Alchemy Pb1500 reference design board with IDE HPT371 controller onboard. 

Anyone ever manage to get Linux to work with this controller?

-- 
	/  Danya aka Denis Filatov
	/  ICQ UIN:42528048
	/  Registered Linux User #227003

[Linux-mips-commits]CVS: linux/arch/mips/vr41xx/common giu.c,1.1,1.2

[Leblanc f. <fle...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/common
In directory sc8-pr-cvs1:/tmp/cvs-serv20225/arch/mips/vr41xx/common

Modified Files:
	giu.c 
Log Message:
Apply Seiichi SATO clear giu bug fix patch.


Index: giu.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/common/giu.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- giu.c	12 Jul 2002 20:14:27 -0000	1.1
+++ giu.c	20 Jan 2003 08:42:28 -0000	1.2
@@ -108,9 +108,9 @@
 void vr41xx_clear_giuint(u8 pin)
 {
 	if (pin < 16)
-		write_giuint(GIUINTSTATL, (u16)1 << pin);
+		write_giuint((u16)1 << pin, GIUINTSTATL);
 	else
-		write_giuint(GIUINTSTATH, (u16)1 << (pin - 16));
+		write_giuint((u16)1 << (pin - 16), GIUINTSTATH);
 }
 
 void vr41xx_set_irq_trigger(u8 pin, u8 trigger, u8 hold)

[Linux-mips-commits]CVS: linux/arch/mips Makefile,1.54,1.55

[Leblanc f. <fle...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips
In directory usw-pr-cvs1:/tmp/cvs-serv15959

Modified Files:
	Makefile 
Log Message:
Change back little endian tool-prefix to mipsel-linux-


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/Makefile,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- Makefile	26 Sep 2002 05:39:38 -0000	1.54
+++ Makefile	13 Nov 2002 08:00:13 -0000	1.55
@@ -16,7 +16,7 @@
 # Select the object file format to substitute into the linker script.
 #
 ifdef CONFIG_CPU_LITTLE_ENDIAN
-tool-prefix	= mips_fp_le-
+tool-prefix	= mipsel-linux-
 else
 tool-prefix	= mips-linux-
 endif

[Linux-mips-commits]CVS: linux/arch/mips/au1000/pb1500 pci_ops.c,1.4,1.5

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/au1000/pb1500
In directory usw-pr-cvs1:/tmp/cvs-serv9978/arch/mips/au1000/pb1500

Modified Files:
	pci_ops.c 
Log Message:
Added support for all devsel devices. Patch by David Gathright.


Index: pci_ops.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/pb1500/pci_ops.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pci_ops.c	1 May 2002 18:00:30 -0000	1.4
+++ pci_ops.c	9 Nov 2002 01:54:50 -0000	1.5
@@ -6,6 +6,8 @@
  * Author: MontaVista Software, Inc.
  *         	pp...@mv... or so...@mv...
  *
+ *  Support for all devices (greater than 16) added by David Gathright.
+ *
  *  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
@@ -67,59 +69,45 @@
 extern struct pci_ops pb1500_pci_ops;
 
 struct pci_channel mips_pci_channels[] = {
-	{&pb1500_pci_ops, &pci_io_resource, &pci_mem_resource, (10<<3),(16<<3)},
+	{&pb1500_pci_ops, &pci_io_resource, &pci_mem_resource, (0<<3),(19<<3)},
 	{(struct pci_ops *) NULL, (struct resource *) NULL,
 	 (struct resource *) NULL, (int) NULL, (int) NULL}
 };
 
-static unsigned long cfg_addr, cfg_addr_type1;
 static int config_access(unsigned char access_type, struct pci_dev *dev, 
 			 unsigned char where, u32 * data)
 {
 	unsigned char bus = dev->bus->number;
 	unsigned int dev_fn = dev->devfn;
-	unsigned int device, function;
+	unsigned int device = PCI_SLOT(dev_fn);
+	unsigned int function = PCI_FUNC(dev_fn);
 	unsigned long config, status;
-	static int first = 1;
-
-	/* 
- 	 * 7:3 = slot
- 	 * 2:0 = function
-	 */
-
-	if (first) {
-		first = 0;
-		cfg_addr = ioremap(Au1500_EXT_CFG, 0x10000000);
-		if (!cfg_addr) 
-			panic (KERN_ERR "PCI unable to ioremap cfg space\n");
-
-		cfg_addr_type1 = ioremap(Au1500_EXT_CFG_TYPE1, 0x10000000);
-		if (!cfg_addr_type1)  {
-			panic (KERN_ERR "PCI unable to ioremap cfg space\n");
-		}
-	}
-
-	device = (dev_fn >> 3) & 0x1f;
-	function = dev_fn & 0x7;
+        unsigned long cfg_addr;
 
-	if (device > 16) {
+	if (device > 19) {
 		*data = 0xffffffff;
 		return -1;
 	}
 
-	au_writel(((0x2000 << 16) | (au_readl(Au1500_PCI_STATCMD) & 0xffff)),
+	au_writel(((0x2000 << 16) | (au_readl(Au1500_PCI_STATCMD) & 0xffff)), 
 			Au1500_PCI_STATCMD);
 	//au_writel(au_readl(Au1500_PCI_CFG) & ~PCI_ERROR, Au1500_PCI_CFG);
 	au_sync_udelay(1);
 
-	/* setup the lower 31 bits of the 36 bit address */
-	if (bus == 0) {
-		config = cfg_addr | 
-			((1<<device)<<11) | (function << 8) | (where & ~0x3);
-	} else {
-		config = cfg_addr_type1 | (bus<<16) | (device<<11) | 
-			(function << 8) | (where & ~0x3);
-	}
+        /* setup the config window */
+        if (bus == 0) {
+                cfg_addr = ioremap( Au1500_EXT_CFG | ((1<<device)<<11) , 
+				0x00100000);
+        } else {
+                cfg_addr = ioremap( Au1500_EXT_CFG_TYPE1 | (bus<<16) | 
+				(device<<11), 0x00100000);
+        }
+
+        if (!cfg_addr)
+                panic (KERN_ERR "PCI unable to ioremap cfg space\n");
+
+        /* setup the lower bits of the 36 bit address */
+        config = cfg_addr | (function << 8) | (where & ~0x3);
 
 #if 0
 	printk("cfg access: config %x, dev_fn %x, device %x function %x\n",
@@ -133,11 +121,18 @@
 	}
 	au_sync_udelay(2);
 
+
 	DBG("config_access: %d bus %d device %d at %x *data %x, conf %x\n", 
 			access_type, bus, device, where, *data, config);
 
+        /* unmap io space */
+        iounmap( cfg_addr );
+
 	/* check master abort */
 	status = au_readl(Au1500_PCI_STATCMD);
+#if 0
+printk("cfg access: status %x, data %x\n", status, *data );
+#endif
 	if (status & (1<<29)) { 
 		*data = 0xffffffff;
 		return -1;
@@ -145,8 +140,7 @@
 		DBG("PCI ERR detected: status %x\n", status);
 		*data = 0xffffffff;
 		return -1;
-	}
-	else {
+	} else {
 		return PCIBIOS_SUCCESSFUL;
 	}
 }

[Linux-mips-commits]CVS: linux/drivers/usb Config.in,NONE,1.1 Makefile,NONE,1.1 usb-ohci-nonpci.c,NONE,1.1 usb-ohci-pci.c,NONE,1.1 usb-ohci.c,NONE,1.1 usb-ohci.h,NONE,1.1

[Steve L. <slo...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/usb
In directory usw-pr-cvs1:/tmp/cvs-serv6625/usb

Added Files:
	Config.in Makefile usb-ohci-nonpci.c usb-ohci-pci.c usb-ohci.c 
	usb-ohci.h 
Log Message:
USB non-PCI OHCI support.


--- NEW FILE: Config.in ---
#
# USB device configuration
#
mainmenu_option next_comment
comment 'USB support'

dep_tristate 'Support for USB' CONFIG_USB $CONFIG_PCI
if [ "$CONFIG_USB" = "y" -o  "$CONFIG_USB" = "m" ]; then
   bool '  USB verbose debug messages' CONFIG_USB_DEBUG

comment 'Miscellaneous USB options'
   bool '  Preliminary USB device filesystem' CONFIG_USB_DEVICEFS
   if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
      bool '  Enforce USB bandwidth allocation (EXPERIMENTAL)' CONFIG_USB_BANDWIDTH
   else
      define_bool CONFIG_USB_BANDWIDTH n
   fi
   bool '  Long timeout for slow-responding devices (some MGE Ellipse UPSes)' CONFIG_USB_LONG_TIMEOUT
fi

comment 'USB Controllers'
if [ "$CONFIG_USB_UHCI_ALT" != "y" ]; then
   dep_tristate '  UHCI (Intel PIIX4, VIA, ...) support' CONFIG_USB_UHCI $CONFIG_USB
fi
if [ "$CONFIG_USB_UHCI" != "y" ]; then
   dep_tristate '  UHCI Alternate Driver (JE) support' CONFIG_USB_UHCI_ALT $CONFIG_USB
else
   define_bool CONFIG_USB_UHCI_ALT n
fi
dep_tristate '  OHCI (Compaq, iMacs, OPTi, SiS, ALi, ...) support' CONFIG_USB_OHCI $CONFIG_USB
dep_tristate '    Non-PCI OHCI support' CONFIG_USB_NON_PCI_OHCI $CONFIG_USB_OHCI

comment 'USB Device Class drivers'
dep_tristate '  USB Audio support' CONFIG_USB_AUDIO $CONFIG_USB $CONFIG_SOUND
dep_tristate '  USB Bluetooth support (EXPERIMENTAL)' CONFIG_USB_BLUETOOTH $CONFIG_USB $CONFIG_EXPERIMENTAL
if [ "$CONFIG_SCSI" = "n" ]; then
   comment '  SCSI support is needed for USB Storage'
fi
dep_tristate '  USB Mass Storage support' CONFIG_USB_STORAGE $CONFIG_USB $CONFIG_SCSI
   dep_mbool '    USB Mass Storage verbose debug' CONFIG_USB_STORAGE_DEBUG $CONFIG_USB_STORAGE
   dep_mbool '    Datafab MDCFE-B Compact Flash Reader support' CONFIG_USB_STORAGE_DATAFAB $CONFIG_USB_STORAGE $CONFIG_EXPERIMENTAL
   dep_mbool '    Freecom USB/ATAPI Bridge support' CONFIG_USB_STORAGE_FREECOM  $CONFIG_USB_STORAGE
   dep_mbool '    ISD-200 USB/ATA Bridge support' CONFIG_USB_STORAGE_ISD200 $CONFIG_USB_STORAGE
   dep_mbool '    Microtech CompactFlash/SmartMedia support' CONFIG_USB_STORAGE_DPCM $CONFIG_USB_STORAGE
   dep_mbool '    HP CD-Writer 82xx support' CONFIG_USB_STORAGE_HP8200e $CONFIG_USB_STORAGE $CONFIG_EXPERIMENTAL
   dep_mbool '    SanDisk SDDR-09 (and other SmartMedia) support' CONFIG_USB_STORAGE_SDDR09 $CONFIG_USB_STORAGE $CONFIG_EXPERIMENTAL
   dep_mbool '    Lexar Jumpshot Compact Flash Reader' CONFIG_USB_STORAGE_JUMPSHOT $CONFIG_USB_STORAGE $CONFIG_EXPERIMENTAL
dep_tristate '  USB Modem (CDC ACM) support' CONFIG_USB_ACM $CONFIG_USB
dep_tristate '  USB Printer support' CONFIG_USB_PRINTER $CONFIG_USB

comment 'USB Human Interface Devices (HID)'
if [ "$CONFIG_INPUT" = "n" ]; then
   comment '  Input core support is needed for USB HID'
else
   dep_tristate '  USB Human Interface Device (full HID) support' CONFIG_USB_HID $CONFIG_USB $CONFIG_INPUT
      dep_mbool '    /dev/hiddev raw HID device support (EXPERIMENTAL)' CONFIG_USB_HIDDEV $CONFIG_USB_HID
   if [ "$CONFIG_USB_HID" != "y" ]; then
      dep_tristate '  USB HIDBP Keyboard (basic) support' CONFIG_USB_KBD $CONFIG_USB $CONFIG_INPUT
      dep_tristate '  USB HIDBP Mouse (basic) support' CONFIG_USB_MOUSE $CONFIG_USB $CONFIG_INPUT
   fi
   dep_tristate '  Wacom Intuos/Graphire tablet support' CONFIG_USB_WACOM $CONFIG_USB $CONFIG_INPUT
fi

comment 'USB Imaging devices'
dep_tristate '  USB Kodak DC-2xx Camera support' CONFIG_USB_DC2XX $CONFIG_USB
dep_tristate '  USB Mustek MDC800 Digital Camera support (EXPERIMENTAL)' CONFIG_USB_MDC800 $CONFIG_USB $CONFIG_EXPERIMENTAL
dep_tristate '  USB Scanner support' CONFIG_USB_SCANNER $CONFIG_USB
dep_tristate '  Microtek X6USB scanner support' CONFIG_USB_MICROTEK $CONFIG_USB $CONFIG_SCSI
dep_tristate '  HP53xx USB scanner support (EXPERIMENTAL)' CONFIG_USB_HPUSBSCSI $CONFIG_USB $CONFIG_SCSI $CONFIG_EXPERIMENTAL

comment 'USB Multimedia devices'
if [ "$CONFIG_VIDEO_DEV" = "n" ]; then
   comment '  Video4Linux support is needed for USB Multimedia device support'
else
   dep_tristate '  USB IBM (Xirlink) C-it Camera support' CONFIG_USB_IBMCAM $CONFIG_USB $CONFIG_VIDEO_DEV
   dep_tristate '  USB OV511 Camera support' CONFIG_USB_OV511 $CONFIG_USB $CONFIG_VIDEO_DEV
   dep_tristate '  USB Philips Cameras' CONFIG_USB_PWC $CONFIG_USB $CONFIG_VIDEO_DEV
   dep_tristate '  USB SE401 Camera support' CONFIG_USB_SE401 $CONFIG_USB $CONFIG_VIDEO_DEV
   dep_tristate '  USB STV680 (Pencam) Camera support' CONFIG_USB_STV680 $CONFIG_USB $CONFIG_VIDEO_DEV
   dep_tristate '  USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)' CONFIG_USB_VICAM $CONFIG_USB $CONFIG_VIDEO_DEV $CONFIG_EXPERIMENTAL
   dep_tristate '  D-Link USB FM radio support (EXPERIMENTAL)' CONFIG_USB_DSBR $CONFIG_USB $CONFIG_VIDEO_DEV $CONFIG_EXPERIMENTAL
   dep_tristate '  DABUSB driver' CONFIG_USB_DABUSB $CONFIG_USB
fi

comment 'USB Network adaptors'
if [ "$CONFIG_NET" = "n" ]; then
   comment '  Networking support is needed for USB Networking device support'
else
   dep_tristate '  USB ADMtek Pegasus-based ethernet device support (EXPERIMENTAL)' CONFIG_USB_PEGASUS $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
   dep_tristate '  USB KLSI KL5USB101-based ethernet device support (EXPERIMENTAL)' CONFIG_USB_KAWETH $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
   dep_tristate '  USB CATC NetMate-based Ethernet device support (EXPERIMENTAL)' CONFIG_USB_CATC $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
   dep_tristate '  USB Communication Class Ethernet device support (EXPERIMENTAL)' CONFIG_USB_CDCETHER $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
   dep_tristate '  USB-to-USB Networking cable device support (EXPERIMENTAL)' CONFIG_USB_USBNET $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
fi

comment 'USB port drivers'
dep_tristate '  USS720 parport driver' CONFIG_USB_USS720 $CONFIG_USB $CONFIG_PARPORT
source drivers/usb/serial/Config.in

comment 'USB Miscellaneous drivers'
dep_tristate '  USB Diamond Rio500 support (EXPERIMENTAL)' CONFIG_USB_RIO500 $CONFIG_USB $CONFIG_EXPERIMENTAL

endmenu

--- NEW FILE: Makefile ---
#
# Makefile for the kernel USB device drivers.
#

# Subdirs.

# The target object and module list name.

O_TARGET	:= usbdrv.o

# Objects that export symbols.

export-objs		:= usb.o ov511.o pwc-uncompress.o

# Multipart objects.

list-multi		:= usbcore.o hid.o pwc.o
usbcore-objs		:= usb.o usb-debug.o hub.o
hid-objs		:= hid-core.o hid-input.o
pwc-objs		:= pwc-if.o pwc-misc.o pwc-ctrl.o pwc-uncompress.o


# Optional parts of multipart objects.

ifeq ($(CONFIG_USB_DEVICEFS),y)
	usbcore-objs	+= devio.o inode.o drivers.o devices.o
endif

ifeq ($(CONFIG_USB_HIDDEV),y)
	hid-objs	+= hiddev.o
endif

# Object file lists.

obj-y	:=
obj-m	:=
obj-n	:=
obj-	:=

# Each configuration option enables a list of files.

obj-$(CONFIG_USB)		+= usbcore.o
obj-$(CONFIG_USB_UHCI)		+= usb-uhci.o
obj-$(CONFIG_USB_UHCI_ALT)	+= uhci.o
obj-$(CONFIG_USB_OHCI)		+= usb-ohci.o
obj-$(CONFIG_USB_NON_PCI_OHCI)  += usb-ohci-nonpci.o

obj-$(CONFIG_USB_MOUSE)		+= usbmouse.o
obj-$(CONFIG_USB_HID)		+= hid.o
obj-$(CONFIG_USB_KBD)		+= usbkbd.o
obj-$(CONFIG_USB_WACOM)		+= wacom.o

obj-$(CONFIG_USB_SCANNER)	+= scanner.o
obj-$(CONFIG_USB_ACM)		+= acm.o
obj-$(CONFIG_USB_PRINTER)	+= printer.o
obj-$(CONFIG_USB_AUDIO)		+= audio.o
obj-$(CONFIG_USB_IBMCAM)	+= ibmcam.o usbvideo.o ultracam.o
obj-$(CONFIG_USB_PWC)		+= pwc.o
obj-$(CONFIG_USB_DC2XX)		+= dc2xx.o
obj-$(CONFIG_USB_MDC800)	+= mdc800.o
obj-$(CONFIG_USB_USS720)	+= uss720.o
obj-$(CONFIG_USB_DABUSB)	+= dabusb.o
obj-$(CONFIG_USB_VICAM)		+= vicam.o
obj-$(CONFIG_USB_OV511)		+= ov511.o
obj-$(CONFIG_USB_SE401)		+= se401.o
obj-$(CONFIG_USB_STV680)	+= stv680.o
obj-$(CONFIG_USB_PEGASUS)	+= pegasus.o
obj-$(CONFIG_USB_CATC)		+= catc.o
obj-$(CONFIG_USB_KAWETH)        += kaweth.o
obj-$(CONFIG_USB_CDCETHER)	+= CDCEther.o
obj-$(CONFIG_USB_RIO500)	+= rio500.o
obj-$(CONFIG_USB_DSBR)		+= dsbr100.o
obj-$(CONFIG_USB_MICROTEK)	+= microtek.o
obj-$(CONFIG_USB_HPUSBSCSI)	+= hpusbscsi.o
obj-$(CONFIG_USB_BLUETOOTH)	+= bluetooth.o
obj-$(CONFIG_USB_USBNET)	+= usbnet.o

# Object files in subdirectories
mod-subdirs	:= serial

subdir-$(CONFIG_USB_SERIAL)	+= serial
subdir-$(CONFIG_USB_STORAGE)	+= storage

ifeq ($(CONFIG_USB_SERIAL),y)
	obj-y += serial/usb-serial.o
endif

ifeq ($(CONFIG_USB_STORAGE),y)
	obj-y += storage/storage.o
endif

include $(TOPDIR)/Rules.make

# Link rules for multi-part drivers.

usbcore.o: $(usbcore-objs)
	$(LD) -r -o $@ $(usbcore-objs)

hid.o: $(hid-objs)
	$(LD) -r -o $@ $(hid-objs)

pwc.o: $(pwc-objs)
	$(LD) -r -o $@ $(pwc-objs)

--- NEW FILE: usb-ohci-nonpci.c ---
/*
 * BRIEF MODULE DESCRIPTION
 *      Non-PCI or "builtin" OHCI support.
 *
 * Copyright 2001 MontaVista Software Inc.
 * Author: MontaVista Software, Inc.
 *		st...@mv... or so...@mv...
 *
 *  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  SOFTWARE  IS PROVIDED	  ``AS	IS'' AND   ANY	EXPRESS OR IMPLIED
 *  WARRANTIES,	  INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
 *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
 *  NO	EVENT  SHALL   THE AUTHOR  BE	 LIABLE FOR ANY	  DIRECT, INDIRECT,
 *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 *  NOT LIMITED	  TO, PROCUREMENT OF  SUBSTITUTE GOODS	OR SERVICES; LOSS OF
 *  USE, DATA,	OR PROFITS; OR	BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
 *  ANY THEORY OF LIABILITY, WHETHER IN	 CONTRACT, STRICT LIABILITY, OR TORT
 *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 *  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.
 *
 *  Notes:
 *      Same as usb-ohci-sa1111.c, except that IO base and IRQ are
 *      module parameters, and controller poweron/shutdown needs
 *      to be handled elsewhere.
 *
 */
#include <linux/module.h>
#include <linux/init.h>
#include <linux/sched.h>
#include <linux/ioport.h>
#include <linux/interrupt.h>
#include <linux/slab.h>
#include <linux/usb.h>
#include <linux/pci.h>

#include <asm/irq.h>
#include <asm/io.h>

#include "usb-ohci.h"

int __devinit
hc_add_ohci(struct pci_dev *dev, int irq, void *membase, unsigned long flags,
	    ohci_t **ohci, const char *name, const char *slot_name);
extern void hc_remove_ohci(ohci_t *ohci);

static ohci_t *nonpci_ohci;

// Boot options
static int ohci_base=0, ohci_len=0;
static int ohci_irq=-1;
// bogus pci_dev
static struct pci_dev bogus_pcidev;
// ioremapped ohci_base
static void *mem_base;

MODULE_PARM(ohci_base, "i");
MODULE_PARM(ohci_len, "i");
MODULE_PARM(ohci_irq, "i");
MODULE_PARM_DESC(ohci_base, "IO Base address of OHCI Oper. registers");
MODULE_PARM_DESC(ohci_len, "IO length of OHCI Oper. registers");
MODULE_PARM_DESC(ohci_irq, "IRQ for OHCI interrupts");


#ifndef MODULE	

static int __init
ohci_setup (char* options)
{
	char* this_opt;

	if (!options || !*options)
		return 0;

	for(this_opt=strtok(options, ","); this_opt; this_opt=strtok(NULL, ",")) {
		if (!strncmp(this_opt, "base:", 5)) {
			ohci_base = simple_strtoul(this_opt+5, NULL, 0);
		} else if (!strncmp(this_opt, "len:", 4)) {
			ohci_len = simple_strtoul(this_opt+4, NULL, 0);
		} else if (!strncmp(this_opt, "irq:", 4)) {
			ohci_irq = simple_strtoul(this_opt+4, NULL, 0);
		}
	}

	return 0;
}

__setup("usb_ohci=", ohci_setup);

#endif


static int __init nonpci_ohci_init(void)
{
	int ret;

	if (!ohci_base || !ohci_len || (ohci_irq < 0))
		return -ENODEV;

	if (!request_mem_region (ohci_base, ohci_len, "usb-ohci")) {
		dbg ("controller already in use");
		return -EBUSY;
	}

	mem_base = ioremap_nocache (ohci_base, ohci_len);
	if (!mem_base) {
		err("Error mapping OHCI memory");
		return -EFAULT;
	}

	/*
	 * Fill in some fields of the bogus pci_dev.
	 */
	memset(&bogus_pcidev, 0, sizeof(struct pci_dev));
	strcpy(bogus_pcidev.name, "non-PCI OHCI");
	strcpy(bogus_pcidev.slot_name, "builtin");
	bogus_pcidev.resource[0].name = "OHCI Operational Registers";
	bogus_pcidev.resource[0].start = ohci_base;
	bogus_pcidev.resource[0].end = ohci_base + ohci_len;
	bogus_pcidev.resource[0].flags = 0;
	bogus_pcidev.irq = ohci_irq;

	/*
	 * Initialise the generic OHCI driver.
	 */
	ret = hc_add_ohci(&bogus_pcidev, ohci_irq, mem_base, 0, 
			   &nonpci_ohci, "usb-ohci", "builtin");

	if (ret) {
		iounmap(mem_base);
		release_mem_region(ohci_base, ohci_len);
	}

	return ret;
}

static void __exit nonpci_ohci_exit(void)
{
	hc_remove_ohci(nonpci_ohci);
	release_mem_region(ohci_base, ohci_len);
}

module_init(nonpci_ohci_init);
module_exit(nonpci_ohci_exit);

--- NEW FILE: usb-ohci-pci.c ---
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/kernel.h>
#include <linux/delay.h>
#include <linux/interrupt.h>  /* for in_interrupt() */
#undef DEBUG
#include <linux/usb.h>

#include "usb-ohci.h"

#ifdef CONFIG_PMAC_PBOOK
#include <asm/machdep.h>
#include <asm/pmac_feature.h>
#include <asm/pci-bridge.h>
#ifndef CONFIG_PM
#define CONFIG_PM
#endif
#endif


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

/* Increment the module usage count, start the control thread and
 * return success. */

static struct pci_driver ohci_pci_driver;

static int __devinit
hc_found_ohci (struct pci_dev *dev, int irq,
	void *mem_base, const struct pci_device_id *id)
{
	ohci_t * ohci;
	u8 latency, limit;
	char buf[8], *bufp = buf;
	int ret;

#ifndef __sparc__
	sprintf(buf, "%d", irq);
#else
	bufp = __irq_itoa(irq);
#endif
	printk(KERN_INFO __FILE__ ": USB OHCI at membase 0x%lx, IRQ %s\n",
		(unsigned long)	mem_base, bufp);
	printk(KERN_INFO __FILE__ ": usb-%s, %s\n", dev->slot_name, dev->name);
    
	ohci = hc_alloc_ohci (dev, mem_base);
	if (!ohci) {
		return -ENOMEM;
	}
	if ((ret = ohci_mem_init (ohci)) < 0) {
		hc_release_ohci (ohci);
		return ret;
	}
	ohci->flags = id->driver_data;
	if (ohci->flags & OHCI_QUIRK_AMD756)
		printk (KERN_INFO __FILE__ ": AMD756 erratum 4 workaround\n");

	/* bad pci latencies can contribute to overruns */ 
	pci_read_config_byte (dev, PCI_LATENCY_TIMER, &latency);
	if (latency) {
		pci_read_config_byte (dev, PCI_MAX_LAT, &limit);
		if (limit && limit < latency) {
			dbg ("PCI latency reduced to max %d", limit);
			pci_write_config_byte (dev, PCI_LATENCY_TIMER, limit);
			ohci->pci_latency = limit;
		} else {
			/* it might already have been reduced */
			ohci->pci_latency = latency;
		}
	}

	if (hc_reset (ohci) < 0) {
		hc_release_ohci (ohci);
		return -ENODEV;
	}

	/* FIXME this is a second HC reset; why?? */
	writel (ohci->hc_control = OHCI_USB_RESET, &ohci->regs->control);
	wait_ms (10);

	usb_register_bus (ohci->bus);
	
	if (request_irq (irq, hc_interrupt, SA_SHIRQ,
			ohci_pci_driver.name, ohci) != 0) {
		err ("request interrupt %s failed", bufp);
		hc_release_ohci (ohci);
		return -EBUSY;
	}
	ohci->irq = irq;     

	if (hc_start (ohci) < 0) {
		err ("can't start usb-%s", dev->slot_name);
		hc_release_ohci (ohci);
		return -EBUSY;
	}

#ifdef	DEBUG
	ohci_dump (ohci, 1);
#endif
	return 0;
}

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

#ifdef	CONFIG_PM

/* controller died; cleanup debris, then restart */
/* must not be called from interrupt context */

static void hc_restart (ohci_t *ohci)
{
	int temp;
	int i;

	if (ohci->pci_latency)
		pci_write_config_byte (ohci->ohci_dev, PCI_LATENCY_TIMER, ohci->pci_latency);

	ohci->disabled = 1;
	ohci->sleeping = 0;
	if (ohci->bus->root_hub)
		usb_disconnect (&ohci->bus->root_hub);
	
	/* empty the interrupt branches */
	for (i = 0; i < NUM_INTS; i++) ohci->ohci_int_load[i] = 0;
	for (i = 0; i < NUM_INTS; i++) ohci->hcca->int_table[i] = 0;
	
	/* no EDs to remove */
	ohci->ed_rm_list [0] = NULL;
	ohci->ed_rm_list [1] = NULL;

	/* empty control and bulk lists */	 
	ohci->ed_isotail     = NULL;
	ohci->ed_controltail = NULL;
	ohci->ed_bulktail    = NULL;

	if ((temp = hc_reset (ohci)) < 0 || (temp = hc_start (ohci)) < 0) {
		err ("can't restart usb-%s, %d", ohci->ohci_dev->slot_name, temp);
	} else
		dbg ("restart usb-%s completed", ohci->ohci_dev->slot_name);
}

#endif	/* CONFIG_PM */

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

/* configured so that an OHCI device is always provided */
/* always called with process context; sleeping is OK */

static int __devinit
ohci_pci_probe (struct pci_dev *dev, const struct pci_device_id *id)
{
	unsigned long mem_resource, mem_len;
	void *mem_base;

	if (pci_enable_device(dev) < 0)
		return -ENODEV;

        if (!dev->irq) {
        	err("found OHCI device with no IRQ assigned. check BIOS settings!");
   	        return -ENODEV;
        }
	
	/* we read its hardware registers as memory */
	mem_resource = pci_resource_start(dev, 0);
	mem_len = pci_resource_len(dev, 0);
	if (!request_mem_region (mem_resource, mem_len, ohci_pci_driver.name)) {
		dbg ("controller already in use");
		return -EBUSY;
	}

	mem_base = ioremap_nocache (mem_resource, mem_len);
	if (!mem_base) {
		err("Error mapping OHCI memory");
		return -EFAULT;
	}

	/* controller writes into our memory */
	pci_set_master (dev);

	return hc_found_ohci (dev, dev->irq, mem_base, id);
} 

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

/* may be called from interrupt context [interface spec] */
/* may be called without controller present */
/* may be called with controller, bus, and devices active */

static void __devexit
ohci_pci_remove (struct pci_dev *dev)
{
	ohci_t		*ohci = (ohci_t *) pci_get_drvdata(dev);

	dbg ("remove %s controller usb-%s%s%s",
		hcfs2string (ohci->hc_control & OHCI_CTRL_HCFS),
		dev->slot_name,
		ohci->disabled ? " (disabled)" : "",
		in_interrupt () ? " in interrupt" : ""
		);

	hc_remove_ohci(ohci);

	release_mem_region (pci_resource_start (dev, 0), pci_resource_len (dev, 0));
}


#ifdef	CONFIG_PM

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

static int
ohci_pci_suspend (struct pci_dev *dev, u32 state)
{
	ohci_t			*ohci = (ohci_t *) pci_get_drvdata(dev);
	unsigned long		flags;
	u16 cmd;

	if ((ohci->hc_control & OHCI_CTRL_HCFS) != OHCI_USB_OPER) {
		dbg ("can't suspend usb-%s (state is %s)", dev->slot_name,
			hcfs2string (ohci->hc_control & OHCI_CTRL_HCFS));
		return -EIO;
	}

	/* act as if usb suspend can always be used */
	info ("USB suspend: usb-%s", dev->slot_name);
	ohci->sleeping = 1;

	/* First stop processing */
  	spin_lock_irqsave (&usb_ed_lock, flags);
	ohci->hc_control &= ~(OHCI_CTRL_PLE|OHCI_CTRL_CLE|OHCI_CTRL_BLE|OHCI_CTRL_IE);
	writel (ohci->hc_control, &ohci->regs->control);
	writel (OHCI_INTR_SF, &ohci->regs->intrstatus);
	(void) readl (&ohci->regs->intrstatus);
  	spin_unlock_irqrestore (&usb_ed_lock, flags);

	/* Wait a frame or two */
	mdelay(1);
	if (!readl (&ohci->regs->intrstatus) & OHCI_INTR_SF)
		mdelay (1);
		
#ifdef CONFIG_PMAC_PBOOK
	if (_machine == _MACH_Pmac)
		disable_irq (ohci->irq);
	/* else, 2.4 assumes shared irqs -- don't disable */
#endif
	/* Enable remote wakeup */
	writel (readl(&ohci->regs->intrenable) | OHCI_INTR_RD, &ohci->regs->intrenable);

	/* Suspend chip and let things settle down a bit */
	ohci->hc_control = OHCI_USB_SUSPEND;
	writel (ohci->hc_control, &ohci->regs->control);
	(void) readl (&ohci->regs->control);
	mdelay (500); /* No schedule here ! */
	switch (readl (&ohci->regs->control) & OHCI_CTRL_HCFS) {
		case OHCI_USB_RESET:
			dbg("Bus in reset phase ???");
			break;
		case OHCI_USB_RESUME:
			dbg("Bus in resume phase ???");
			break;
		case OHCI_USB_OPER:
			dbg("Bus in operational phase ???");
			break;
		case OHCI_USB_SUSPEND:
			dbg("Bus suspended");
			break;
	}
	/* In some rare situations, Apple's OHCI have happily trashed
	 * memory during sleep. We disable it's bus master bit during
	 * suspend
	 */
	pci_read_config_word (dev, PCI_COMMAND, &cmd);
	cmd &= ~PCI_COMMAND_MASTER;
	pci_write_config_word (dev, PCI_COMMAND, cmd);
#ifdef CONFIG_PMAC_PBOOK
	{
	   	struct device_node	*of_node;

		/* Disable USB PAD & cell clock */
		of_node = pci_device_to_OF_node (ohci->ohci_dev);
		if (of_node)
			pmac_call_feature(PMAC_FTR_USB_ENABLE, of_node, 0, 0);
	}
#endif
	return 0;
}

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

static int
ohci_pci_resume (struct pci_dev *dev)
{
	ohci_t		*ohci = (ohci_t *) pci_get_drvdata(dev);
	int		temp;
	unsigned long	flags;

	/* guard against multiple resumes */
	atomic_inc (&ohci->resume_count);
	if (atomic_read (&ohci->resume_count) != 1) {
		err ("concurrent PCI resumes for usb-%s", dev->slot_name);
		atomic_dec (&ohci->resume_count);
		return 0;
	}

#ifdef CONFIG_PMAC_PBOOK
	{
		struct device_node *of_node;

		/* Re-enable USB PAD & cell clock */
		of_node = pci_device_to_OF_node (ohci->ohci_dev);
		if (of_node)
			pmac_call_feature(PMAC_FTR_USB_ENABLE, of_node, 0, 1);
	}
#endif

	/* did we suspend, or were we powered off? */
	ohci->hc_control = readl (&ohci->regs->control);
	temp = ohci->hc_control & OHCI_CTRL_HCFS;

#ifdef DEBUG
	/* the registers may look crazy here */
	ohci_dump_status (ohci);
#endif

	/* Re-enable bus mastering */
	pci_set_master(ohci->ohci_dev);
	
	switch (temp) {

	case OHCI_USB_RESET:	// lost power
		info ("USB restart: usb-%s", dev->slot_name);
		hc_restart (ohci);
		break;

	case OHCI_USB_SUSPEND:	// host wakeup
	case OHCI_USB_RESUME:	// remote wakeup
		info ("USB continue: usb-%s from %s wakeup", dev->slot_name,
			(temp == OHCI_USB_SUSPEND)
				? "host" : "remote");
		ohci->hc_control = OHCI_USB_RESUME;
		writel (ohci->hc_control, &ohci->regs->control);
		(void) readl (&ohci->regs->control);
		mdelay (20); /* no schedule here ! */
		/* Some controllers (lucent) need a longer delay here */
		mdelay (15);
		temp = readl (&ohci->regs->control);
		temp = ohci->hc_control & OHCI_CTRL_HCFS;
		if (temp != OHCI_USB_RESUME) {
			err ("controller usb-%s won't resume", dev->slot_name);
			ohci->disabled = 1;
			return -EIO;
		}

		/* Some chips likes being resumed first */
		writel (OHCI_USB_OPER, &ohci->regs->control);
		(void) readl (&ohci->regs->control);
		mdelay (3);

		/* Then re-enable operations */
		spin_lock_irqsave (&usb_ed_lock, flags);
		ohci->disabled = 0;
		ohci->sleeping = 0;
		ohci->hc_control = OHCI_CONTROL_INIT | OHCI_USB_OPER;
		if (!ohci->ed_rm_list[0] && !ohci->ed_rm_list[1]) {
			if (ohci->ed_controltail)
				ohci->hc_control |= OHCI_CTRL_CLE;
			if (ohci->ed_bulktail)
				ohci->hc_control |= OHCI_CTRL_BLE;
		}
		writel (ohci->hc_control, &ohci->regs->control);
		writel (OHCI_INTR_SF, &ohci->regs->intrstatus);
		writel (OHCI_INTR_SF, &ohci->regs->intrenable);
		/* Check for a pending done list */
		writel (OHCI_INTR_WDH, &ohci->regs->intrdisable);	
		(void) readl (&ohci->regs->intrdisable);
		spin_unlock_irqrestore (&usb_ed_lock, flags);
#ifdef CONFIG_PMAC_PBOOK
		if (_machine == _MACH_Pmac)
			enable_irq (ohci->irq);
#endif
		if (ohci->hcca->done_head)
			dl_done_list (ohci, dl_reverse_done_list (ohci));
		writel (OHCI_INTR_WDH, &ohci->regs->intrenable); 
		writel (OHCI_BLF, &ohci->regs->cmdstatus); /* start bulk list */
		writel (OHCI_CLF, &ohci->regs->cmdstatus); /* start Control list */
		break;

	default:
		warn ("odd PCI resume for usb-%s", dev->slot_name);
	}

	/* controller is operational, extra resumes are harmless */
	atomic_dec (&ohci->resume_count);

	return 0;
}

#endif	/* CONFIG_PM */


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

static const struct pci_device_id __devinitdata ohci_pci_ids [] = { {

	/*
	 * AMD-756 [Viper] USB has a serious erratum when used with
	 * lowspeed devices like mice.
	 */
	vendor:		0x1022,
	device:		0x740c,
	subvendor:	PCI_ANY_ID,
	subdevice:	PCI_ANY_ID,

	driver_data:	OHCI_QUIRK_AMD756,

} , {

	/* handle any USB OHCI controller */
	class: 		((PCI_CLASS_SERIAL_USB << 8) | 0x10),
	class_mask: 	~0,

	/* no matter who makes it */
	vendor:		PCI_ANY_ID,
	device:		PCI_ANY_ID,
	subvendor:	PCI_ANY_ID,
	subdevice:	PCI_ANY_ID,

	}, { /* end: all zeroes */ }
};

MODULE_DEVICE_TABLE (pci, ohci_pci_ids);

static struct pci_driver ohci_pci_driver = {
	name:		"usb-ohci",
	id_table:	&ohci_pci_ids [0],

	probe:		ohci_pci_probe,
	remove:		__devexit_p(ohci_pci_remove),

#ifdef	CONFIG_PM
	suspend:	ohci_pci_suspend,
	resume:		ohci_pci_resume,
#endif	/* PM */
};

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

static int __init ohci_hcd_init (void) 
{
	return pci_module_init (&ohci_pci_driver);
}

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

static void __exit ohci_hcd_cleanup (void) 
{	
	pci_unregister_driver (&ohci_pci_driver);
}

module_init (ohci_hcd_init);
module_exit (ohci_hcd_cleanup);


--- NEW FILE: usb-ohci.c ---
/*
 * URB OHCI HCD (Host Controller Driver) for USB.
 *
 * (C) Copyright 1999 Roman Weissgaerber <we...@vi...>
 * (C) Copyright 2000-2001 David Brownell <dbr...@us...>
 * 
 * [ Initialisation is based on Linus'  ]
 * [ uhci code and gregs ohci fragments ]
 * [ (C) Copyright 1999 Linus Torvalds  ]
 * [ (C) Copyright 1999 Gregory P. Smith]
 * 
 * 
 * History:
 * 
 * 2001/09/19 USB_ZERO_PACKET support (Jean Tourrilhes)
 * 2001/07/17 power management and pmac cleanup (Benjamin Herrenschmidt)
 * 2001/03/24 td/ed hashing to remove bus_to_virt (Steve Longerbeam);
 	pci_map_single (db)
 * 2001/03/21 td and dev/ed allocation uses new pci_pool API (db)
[...2485 lines suppressed...]
		dbg ("controller being disabled");
		ohci->disabled = 1;
	}

	/* on return, USB will always be reset (if present) */
	if (ohci->disabled)
		writel (ohci->hc_control = OHCI_USB_RESET,
			&ohci->regs->control);

	hc_release_ohci (ohci);
}

MODULE_AUTHOR( DRIVER_AUTHOR );
MODULE_DESCRIPTION( DRIVER_DESC );
MODULE_LICENSE("GPL");

/* Hack until usb-ohci-pci is made completely independent */
#if !defined(CONFIG_USB_OHCI_SA1111) && !defined(CONFIG_USB_NON_PCI_OHCI)
#include "usb-ohci-pci.c"
#endif

--- NEW FILE: usb-ohci.h ---
#ifndef _USB_OHCI_H
#define _USB_OHCI_H

/*
 * URB OHCI HCD (Host Controller Driver) for USB.
 * 
 * (C) Copyright 1999 Roman Weissgaerber <we...@vi...>
 * (C) Copyright 2000-2001 David Brownell <dbr...@us...>
 * 
 * usb-ohci.h
 */

 
static int cc_to_error[16] = { 

/* mapping of the OHCI CC status to error codes */ 
	/* No  Error  */               USB_ST_NOERROR,
	/* CRC Error  */               USB_ST_CRC,
	/* Bit Stuff  */               USB_ST_BITSTUFF,
	/* Data Togg  */               USB_ST_CRC,
	/* Stall      */               USB_ST_STALL,
	/* DevNotResp */               USB_ST_NORESPONSE,
	/* PIDCheck   */               USB_ST_BITSTUFF,
	/* UnExpPID   */               USB_ST_BITSTUFF,
	/* DataOver   */               USB_ST_DATAOVERRUN,
	/* DataUnder  */               USB_ST_DATAUNDERRUN,
	/* reservd    */               USB_ST_NORESPONSE,
	/* reservd    */               USB_ST_NORESPONSE,
	/* BufferOver */               USB_ST_BUFFEROVERRUN,
	/* BuffUnder  */               USB_ST_BUFFERUNDERRUN,
	/* Not Access */               USB_ST_NORESPONSE,
	/* Not Access */               USB_ST_NORESPONSE 
};

#include <linux/config.h>

/* ED States */

#define ED_NEW 		0x00
#define ED_UNLINK 	0x01
#define ED_OPER		0x02
#define ED_DEL		0x04
#define ED_URB_DEL  	0x08

/* usb_ohci_ed */
struct ed {
	__u32 hwINFO;       
	__u32 hwTailP;
	__u32 hwHeadP;
	__u32 hwNextED;

	struct ed * ed_prev;  
	__u8 int_period;
	__u8 int_branch;
	__u8 int_load; 
	__u8 int_interval;
	__u8 state;
	__u8 type; 
	__u16 last_iso;
	struct ed * ed_rm_list;

	dma_addr_t dma;
	__u32 unused[3];
} __attribute((aligned(16)));
typedef struct ed ed_t;

 
/* TD info field */
#define TD_CC       0xf0000000
#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_EC       0x0C000000
#define TD_T        0x03000000
#define TD_T_DATA0  0x02000000
#define TD_T_DATA1  0x03000000
#define TD_T_TOGGLE 0x00000000
#define TD_R        0x00040000
#define TD_DI       0x00E00000
#define TD_DI_SET(X) (((X) & 0x07)<< 21)
#define TD_DP       0x00180000
#define TD_DP_SETUP 0x00000000
#define TD_DP_IN    0x00100000
#define TD_DP_OUT   0x00080000

#define TD_ISO	    0x00010000
#define TD_DEL      0x00020000

/* CC Codes */
#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
#define TD_BUFFEROVERRUN   0x0C
#define TD_BUFFERUNDERRUN  0x0D
#define TD_NOTACCESSED     0x0F


#define MAXPSW 1

struct td {
	__u32 hwINFO;
  	__u32 hwCBP;		/* Current Buffer Pointer */
  	__u32 hwNextTD;		/* Next TD Pointer */
  	__u32 hwBE;		/* Memory Buffer End Pointer */

  	__u16 hwPSW[MAXPSW];
  	__u8 unused;
  	__u8 index;
  	struct ed * ed;
  	struct td * next_dl_td;
  	urb_t * urb;

	dma_addr_t td_dma;
	dma_addr_t data_dma;
	__u32 unused2[2];
} __attribute((aligned(32)));	/* normally 16, iso needs 32 */
typedef struct td td_t;

#define OHCI_ED_SKIP	(1 << 14)

/*
 * The HCCA (Host Controller Communications Area) is a 256 byte
 * structure defined in the OHCI spec. that the host controller is
 * told the base address of.  It must be 256-byte aligned.
 */
 
#define NUM_INTS 32	/* part of the OHCI standard */
struct ohci_hcca {
	__u32	int_table[NUM_INTS];	/* Interrupt ED table */
	__u16	frame_no;		/* current frame number */
	__u16	pad1;			/* set to 0 on each frame_no change */
	__u32	done_head;		/* info returned for an interrupt */
	u8		reserved_for_hc[116];
} __attribute((aligned(256)));

  
/*
 * Maximum number of root hub ports.  
 */
#define MAX_ROOT_PORTS	15	/* maximum OHCI root hub ports */

/*
 * This is the structure of the OHCI controller's memory mapped I/O
 * region.  This is Memory Mapped I/O.  You must use the readl() and
 * writel() macros defined in asm/io.h to access these!!
 */
struct ohci_regs {
	/* control and status registers */
	__u32	revision;
	__u32	control;
	__u32	cmdstatus;
	__u32	intrstatus;
	__u32	intrenable;
	__u32	intrdisable;
	/* memory pointers */
	__u32	hcca;
	__u32	ed_periodcurrent;
	__u32	ed_controlhead;
	__u32	ed_controlcurrent;
	__u32	ed_bulkhead;
	__u32	ed_bulkcurrent;
	__u32	donehead;
	/* frame counters */
	__u32	fminterval;
	__u32	fmremaining;
	__u32	fmnumber;
	__u32	periodicstart;
	__u32	lsthresh;
	/* Root hub ports */
	struct	ohci_roothub_regs {
		__u32	a;
		__u32	b;
		__u32	status;
		__u32	portstatus[MAX_ROOT_PORTS];
	} roothub;
} __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 */



/* Virtual Root HUB */
struct virt_root_hub {
	int devnum; /* Address of Root Hub endpoint */ 
	void * urb;
	void * int_addr;
	int send;
	int interval;
	struct timer_list rh_int_timer;
};


/* USB HUB CONSTANTS (not OHCI-specific; see hub.h) */
 
/* destination of request */
#define RH_INTERFACE               0x01
#define RH_ENDPOINT                0x02
#define RH_OTHER                   0x03

#define RH_CLASS                   0x20
#define RH_VENDOR                  0x40

/* Requests: bRequest << 8 | bmRequestType */
#define RH_GET_STATUS           0x0080
#define RH_CLEAR_FEATURE        0x0100
#define RH_SET_FEATURE          0x0300
#define RH_SET_ADDRESS		0x0500
#define RH_GET_DESCRIPTOR	0x0680
#define RH_SET_DESCRIPTOR       0x0700
#define RH_GET_CONFIGURATION	0x0880
#define RH_SET_CONFIGURATION	0x0900
#define RH_GET_STATE            0x0280
#define RH_GET_INTERFACE        0x0A80
#define RH_SET_INTERFACE        0x0B00
#define RH_SYNC_FRAME           0x0C80
/* Our Vendor Specific Request */
#define RH_SET_EP               0x2000


/* Hub port features */
#define RH_PORT_CONNECTION         0x00
#define RH_PORT_ENABLE             0x01
#define RH_PORT_SUSPEND            0x02
#define RH_PORT_OVER_CURRENT       0x03
#define RH_PORT_RESET              0x04
#define RH_PORT_POWER              0x08
#define RH_PORT_LOW_SPEED          0x09

#define RH_C_PORT_CONNECTION       0x10
#define RH_C_PORT_ENABLE           0x11
#define RH_C_PORT_SUSPEND          0x12
#define RH_C_PORT_OVER_CURRENT     0x13
#define RH_C_PORT_RESET            0x14  

/* Hub features */
#define RH_C_HUB_LOCAL_POWER       0x00
#define RH_C_HUB_OVER_CURRENT      0x01

#define RH_DEVICE_REMOTE_WAKEUP    0x00
#define RH_ENDPOINT_STALL          0x01

#define RH_ACK                     0x01
#define RH_REQ_ERR                 -1
#define RH_NACK                    0x00


/* 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 */

/* urb */
typedef struct 
{
	ed_t * ed;
	__u16 length;	// number of tds associated with this request
	__u16 td_cnt;	// number of tds already serviced
	int   state;
	wait_queue_head_t * wait;
	td_t * td[0];	// list pointer to all corresponding TDs associated with this request

} urb_priv_t;
#define URB_DEL 1


/* Hash struct used for TD/ED hashing */
struct hash_t {
	void		*virt;
	dma_addr_t	dma;
	struct hash_t	*next; // chaining for collision cases
};

/* List of TD/ED hash entries */
struct hash_list_t {
	struct hash_t	*head;
	struct hash_t	*tail;
};

#define TD_HASH_SIZE    64    /* power'o'two */
#define ED_HASH_SIZE    64    /* power'o'two */

#define TD_HASH_FUNC(td_dma) ((td_dma ^ (td_dma >> 5)) % TD_HASH_SIZE)
#define ED_HASH_FUNC(ed_dma) ((ed_dma ^ (ed_dma >> 5)) % ED_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)
 */


typedef struct ohci {
	struct ohci_hcca *hcca;		/* hcca */
	dma_addr_t hcca_dma;

	int irq;
	int disabled;			/* e.g. got a UE, we're hung */
	int sleeping;
	atomic_t resume_count;		/* defending against multiple resumes */
	unsigned long flags;		/* for HC bugs */
#define	OHCI_QUIRK_AMD756	0x01		/* erratum #4 */

	struct ohci_regs * regs;	/* OHCI controller's memory */
	struct list_head ohci_hcd_list;	/* list of all ohci_hcd */

	struct ohci * next; 		// chain of ohci device contexts
	struct list_head timeout_list;
	// struct list_head urb_list; 	// list of all pending urbs
	// spinlock_t urb_list_lock; 	// lock to keep consistency 
  
	int ohci_int_load[32];		/* load of the 32 Interrupt Chains (for load balancing)*/
	ed_t * ed_rm_list[2];     /* lists of all endpoints to be removed */
	ed_t * ed_bulktail;       /* last endpoint of bulk list */
	ed_t * ed_controltail;    /* last endpoint of control list */
 	ed_t * ed_isotail;        /* last endpoint of iso list */
	int intrstatus;
	__u32 hc_control;		/* copy of the hc control reg */
	struct usb_bus * bus;    
	struct usb_device * dev[128];
	struct virt_root_hub rh;

	/* PCI device handle, settings, ... */
	struct pci_dev	*ohci_dev;
	const char	*slot_name;
	u8		pci_latency;
	struct pci_pool	*td_cache;
	struct pci_pool	*dev_cache;
	struct hash_list_t	td_hash[TD_HASH_SIZE];
	struct hash_list_t	ed_hash[ED_HASH_SIZE];

} ohci_t;

#define NUM_EDS 32		/* num of preallocated endpoint descriptors */

struct ohci_device {
	ed_t 	ed[NUM_EDS];
	dma_addr_t dma;
	int ed_cnt;
	wait_queue_head_t * wait;
};

// #define ohci_to_usb(ohci)	((ohci)->usb)
#define usb_to_ohci(usb)	((struct ohci_device *)(usb)->hcpriv)

/* hcd */
/* endpoint */
static int ep_link(ohci_t * ohci, ed_t * ed);
static int ep_unlink(ohci_t * ohci, ed_t * ed);
static ed_t * ep_add_ed(struct usb_device * usb_dev, unsigned int pipe, int interval, int load, int mem_flags);
static void ep_rm_ed(struct usb_device * usb_dev, ed_t * ed);
/* td */
static void td_fill(ohci_t * ohci, unsigned int info, dma_addr_t data, int len, urb_t * urb, int index);
static void td_submit_urb(urb_t * urb);
/* root hub */
static int rh_submit_urb(urb_t * urb);
static int rh_unlink_urb(urb_t * urb);
static int rh_init_int_timer(urb_t * urb);

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

#define ALLOC_FLAGS (in_interrupt () ? GFP_ATOMIC : GFP_KERNEL)

#ifdef DEBUG
#	define OHCI_MEM_FLAGS	SLAB_POISON
#else
#	define OHCI_MEM_FLAGS	0
#endif
 
#ifndef CONFIG_PCI
//#	error "usb-ohci currently requires PCI-based controllers"
	/* to support non-PCI OHCIs, you need custom bus/mem/... glue */
#endif


/* Recover a TD/ED using its collision chain */
static inline void *
dma_to_ed_td (struct hash_list_t * entry, dma_addr_t dma)
{
	struct hash_t * scan = entry->head;
	while (scan && scan->dma != dma)
		scan = scan->next;
	if (!scan)
		BUG();
	return scan->virt;
}

static inline struct ed *
dma_to_ed (struct ohci * hc, dma_addr_t ed_dma)
{
	return (struct ed *) dma_to_ed_td(&(hc->ed_hash[ED_HASH_FUNC(ed_dma)]),
				      ed_dma);
}

static inline struct td *
dma_to_td (struct ohci * hc, dma_addr_t td_dma)
{
	return (struct td *) dma_to_ed_td(&(hc->td_hash[TD_HASH_FUNC(td_dma)]),
				      td_dma);
}

/* Add a hash entry for a TD/ED; return true on success */
static inline int
hash_add_ed_td(struct hash_list_t * entry, void * virt, dma_addr_t dma)
{
	struct hash_t * scan;
	
	scan = (struct hash_t *)kmalloc(sizeof(struct hash_t), ALLOC_FLAGS);
	if (!scan)
		return 0;
	
	if (!entry->tail) {
		entry->head = entry->tail = scan;
	} else {
		entry->tail->next = scan;
		entry->tail = scan;
	}
	
	scan->virt = virt;
	scan->dma = dma;
	scan->next = NULL;
	return 1;
}

static inline int
hash_add_ed (struct ohci * hc, struct ed * ed)
{
	return hash_add_ed_td (&(hc->ed_hash[ED_HASH_FUNC(ed->dma)]),
			ed, ed->dma);
}

static inline int
hash_add_td (struct ohci * hc, struct td * td)
{
	return hash_add_ed_td (&(hc->td_hash[TD_HASH_FUNC(td->td_dma)]),
			td, td->td_dma);
}


static inline void
hash_free_ed_td (struct hash_list_t * entry, void * virt)
{
	struct hash_t *scan, *prev;
	scan = prev = entry->head;

	// Find and unlink hash entry
	while (scan && scan->virt != virt) {
		prev = scan;
		scan = scan->next;
	}
	if (scan) {
		if (scan == entry->head) {
			if (entry->head == entry->tail)
				entry->head = entry->tail = NULL;
			else
				entry->head = scan->next;
		} else if (scan == entry->tail) {
			entry->tail = prev;
			prev->next = NULL;
		} else
			prev->next = scan->next;
		kfree(scan);
	}
}

static inline void
hash_free_ed (struct ohci * hc, struct ed * ed)
{
	hash_free_ed_td (&(hc->ed_hash[ED_HASH_FUNC(ed->dma)]), ed);
}

static inline void
hash_free_td (struct ohci * hc, struct td * td)
{
	hash_free_ed_td (&(hc->td_hash[TD_HASH_FUNC(td->td_dma)]), td);
}


static int ohci_mem_init (struct ohci *ohci)
{
	ohci->td_cache = pci_pool_create ("ohci_td", ohci->ohci_dev,
		sizeof (struct td),
		32 /* byte alignment */,
		0 /* no page-crossing issues */,
		GFP_KERNEL | OHCI_MEM_FLAGS);
	if (!ohci->td_cache)
		return -ENOMEM;
	ohci->dev_cache = pci_pool_create ("ohci_dev", ohci->ohci_dev,
		sizeof (struct ohci_device),
		16 /* byte alignment */,
		0 /* no page-crossing issues */,
		GFP_KERNEL | OHCI_MEM_FLAGS);
	if (!ohci->dev_cache)
		return -ENOMEM;
	return 0;
}

static void ohci_mem_cleanup (struct ohci *ohci)
{
	if (ohci->td_cache) {
		pci_pool_destroy (ohci->td_cache);
		ohci->td_cache = 0;
	}
	if (ohci->dev_cache) {
		pci_pool_destroy (ohci->dev_cache);
		ohci->dev_cache = 0;
	}
}

/* TDs ... */
static inline struct td *
td_alloc (struct ohci *hc, int mem_flags)
{
	dma_addr_t	dma;
	struct td	*td;

	td = pci_pool_alloc (hc->td_cache, mem_flags, &dma);
	if (td) {
		td->td_dma = dma;

		/* hash it for later reverse mapping */
		if (!hash_add_td (hc, td)) {
			pci_pool_free (hc->td_cache, td, dma);
			return NULL;
		}
	}
	return td;
}

static inline void
td_free (struct ohci *hc, struct td *td)
{
	hash_free_td (hc, td);
	pci_pool_free (hc->td_cache, td, td->td_dma);
}


/* DEV + EDs ... only the EDs need to be consistent */
static inline struct ohci_device *
dev_alloc (struct ohci *hc, int mem_flags)
{
	dma_addr_t		dma;
	struct ohci_device	*dev;
	int			i, offset;

	dev = pci_pool_alloc (hc->dev_cache, mem_flags, &dma);
	if (dev) {
		memset (dev, 0, sizeof (*dev));
		dev->dma = dma;
		offset = ((char *)&dev->ed) - ((char *)dev);
		for (i = 0; i < NUM_EDS; i++, offset += sizeof dev->ed [0])
			dev->ed [i].dma = dma + offset;
		/* add to hashtable if used */
	}
	return dev;
}

static inline void
dev_free (struct ohci *hc, struct ohci_device *dev)
{
	pci_pool_free (hc->dev_cache, dev, dev->dma);
}

#endif

[Linux-mips-commits]CVS: linux/drivers/usb - New directory

[Steve L. <slo...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/usb
In directory usw-pr-cvs1:/tmp/cvs-serv5909/usb

Log Message:
Directory /cvsroot/linux-mips/linux/drivers/usb added to the repository

[Linux-mips-commits]eBay Deutschland Verkäufer nennt Gesamtbetrag für 2054726083 (2 Stk. PLEXTOR PX-40TSi, SCSI, 40fach)

[<aw-...@eb...>]

Hallo oppitz4711

Der Verkaeufer, saskia_tech, , hat einen Gesamtpreis von EUR 29,00 fuer den nachfolgend aufgefuehrten Artikel eingegeben. 



http://cgi3.ebay.de/aw-cgi/eBayISAPI.dll?UnifiedCheckoutShippingDispatcher&item=2054726083&transactionid=0&quantity=1&editAddress=0&level=1&sspagename=cktinv:01

Einzelheiten zur Bezahlung
---------------------
Artikelbezeichnung: 2 Stk. PLEXTOR PX-40TSi, SCSI, 40fach
Artikelnummer:      2054726083

Eingabedatum:      Mittwoch, 02. Okt. 2002 19:55:43 MESZ

Artikelpreis:            EUR 22,00
Versand und Verpackung:  EUR 7,00Zusaetzliche Versandkosten:  EUR 0,00 
                     -------------
Gesamtpreis:             EUR 29,00

Zahlungshinweise: 
Adresse des Verkaeufers:   Saskia Siefert
Grafenhausenerstrasse 14
Rust 77977, 77

Wenn Sie weitere Fragen haben, wenden Sie sich bitte an den Verkaeufer unter sa...@sa....

Bitte beachten Sie: eBay fragt niemals per E-Mail nach vertraulichen persoenlichen Daten
(z.B. Kennwort, Kreditkarte, Kontonummer)
 

Copyright 1995-2002 eBay Inc. Alle Rechte vorbehalten. Ausgewiesene Marken gehoeren ihren jeweiligen Eigentuemern.

[Linux-mips-commits]Erinnerungs-E-Mail für Artikel: 2 Stk. PLEXTOR PX-40TSi, SCSI, 40fach (Artikel Nr. 2054726083)

[<aw-...@eb...>]

Hallo oppitz4711

Herzlichen Glueckwunsch. Sie sind der Hoechstbietende/K=E4ufer fuer das f=
olgende Angebot:

Artikelbezeichnung: 2 Stk. PLEXTOR PX-40TSi, SCSI, 40fach (Artikelnummer =
2054726083)
Verkaufspreis :EUR 22,00
Angebot endete um: 21.09.02 07:54:37 MESZ
Mitgliedsname des Verkaeufers: saskia_tech
E-Mail-Adresse des Verkaeufers sa...@sa...

Wir danken Ihnen fuer Ihr Hoechstgebot/ Ihren Kauf. Bitte nehmen Sie wege=
n der=20
Zahlungsinformationen so bald wie moeglich Kontakt zum Verkaeufer auf. Hi=
nweis: Mit Ihrem=20
Hoechstgebot/Kauf haben Sie rechtsverbindlich einen Kaufvertrag ueber den=
 angebotenen Artikel geschlossen.

Die Ergebnisse dieser Auktion sowie die E-Mail-Adressen des Verkaeufers k=
oennen Sie 30 Tage lang unter:
http://cgi.ebay.de/ws/eBayISAPI.dll?ViewItem&item=3D2054726083

 einsehen. Herzlichen Glueckwunsch!

[Linux-mips-commits]CVS: linux/drivers/video Config.in,1.20,1.21 epson1356fb.c,1.10,1.11

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv1799/drivers/video

Modified Files:
	Config.in epson1356fb.c 
Log Message:
Split up the Pb board and Au CPU dependencies properly.


Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/Config.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Config.in	25 Sep 2002 07:38:59 -0000	1.20
+++ Config.in	26 Sep 2002 05:39:40 -0000	1.21
@@ -154,20 +154,20 @@
 	    bool '    Use Compsite NTSC on Pb1000 (J63)' CONFIG_PB1000_NTSC
 	    bool '    Use TFT Panel on Pb1000 (J64)' CONFIG_PB1000_TFT
 	 fi
-         if [ "$CONFIG_MIPS_PB1500" = "y" -a "$CONFIG_FB_E1356" != "n" ]; then
+     if [ "$CONFIG_MIPS_PB1500" = "y" -a "$CONFIG_FB_E1356" != "n" ]; then
 	    bool '    Use CRT on Pb1500 ' CONFIG_PB1500_CRT
 	    bool '    Use TFT Panel on Pb1500 ' CONFIG_PB1500_TFT
-         fi
-         if [ "$CONFIG_MIPS_PB1100" = "y" -a "$CONFIG_FB_E1356" != "n" ]; then
+     fi
+     if [ "$CONFIG_MIPS_PB1100" = "y" -a "$CONFIG_FB_E1356" != "n" ]; then
 	    bool '    Use CRT on Pb1100 ' CONFIG_PB1500_CRT
 	    bool '    Use TFT Panel on Pb1100 ' CONFIG_PB1500_TFT
-         fi
-         if [ "$CONFIG_MIPS_PB1100" = "y" ]; then
-	    bool '    Au1100 LCD Driver' CONFIG_FB_AU1100
-         fi
-         if [ "$CONFIG_MIPS_HYD1100" = "y" ]; then
- 	    bool '    Au1100 LCD Driver' CONFIG_FB_AU1100
-         fi
+     fi
+     if [ "$CONFIG_MIPS_PB1100" = "y" ]; then
+	    bool '  Au1100 LCD Driver' CONFIG_FB_AU1100
+     fi
+     if [ "$CONFIG_MIPS_HYD1100" = "y" ]; then
+ 	    bool '  Au1100 LCD Driver' CONFIG_FB_AU1100
+     fi
       fi
       tristate '  ITE IT8181 framebuffer support' CONFIG_FB_IT8181
       tristate '  Simple Frame Buffer support' CONFIG_FB_SIMPLE

Index: epson1356fb.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/epson1356fb.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- epson1356fb.c	17 Sep 2002 18:20:01 -0000	1.10
+++ epson1356fb.c	26 Sep 2002 05:39:40 -0000	1.11
@@ -77,7 +77,7 @@
 
 #include <linux/e1356fb.h>
 
-#ifdef CONFIG_MIPS_AU1000
+#ifdef CONFIG_CPU_AU1X00
 #include <asm/au1000.h>
 #endif
 
@@ -2323,9 +2323,9 @@
 	 * Program the clocks
 	 */
 
-#ifdef CONFIG_MIPS_AU1000
+#ifdef CONFIG_CPU_AU1X00
 	if ((epfix->system == SYS_PB1000) || (epfix->system == SYS_PB1500))
-		epfix->busclk = get_au1000_lcd_clock();
+		epfix->busclk = get_au1x00_lcd_clock();
 #endif
 	
 	if (epfix->busclk > 80000) {

[Linux-mips-commits]CVS: linux/include/asm-mips au1000.h,1.21,1.22 bootinfo.h,1.33,1.34 serial.h,1.13,1.14

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/include/asm-mips
In directory usw-pr-cvs1:/tmp/cvs-serv1799/include/asm-mips

Modified Files:
	au1000.h bootinfo.h serial.h 
Log Message:
Split up the Pb board and Au CPU dependencies properly.


Index: au1000.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/au1000.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- au1000.h	25 Sep 2002 07:38:59 -0000	1.21
+++ au1000.h	26 Sep 2002 05:39:40 -0000	1.22
@@ -87,12 +87,12 @@
 }
 
 /* arch/mips/au1000/common/clocks.c */
-extern void set_au1000_speed(unsigned int new_freq);
-extern unsigned int get_au1000_speed(void);
-extern void set_au1000_uart_baud_base(unsigned long new_baud_base);
-extern unsigned long get_au1000_uart_baud_base(void);
-extern void set_au1000_lcd_clock(void);
-extern unsigned int get_au1000_lcd_clock(void);
+extern void set_au1x00_speed(unsigned int new_freq);
+extern unsigned int get_au1x00_speed(void);
+extern void set_au1x00_uart_baud_base(unsigned long new_baud_base);
+extern unsigned long get_au1x00_uart_baud_base(void);
+extern void set_au1x00_lcd_clock(void);
+extern unsigned int get_au1x00_lcd_clock(void);
 
 #ifdef CONFIG_PM
 /* no CP0 timer irq */

Index: bootinfo.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/bootinfo.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- bootinfo.h	17 Sep 2002 18:20:01 -0000	1.33
+++ bootinfo.h	26 Sep 2002 05:39:40 -0000	1.34
@@ -10,6 +10,7 @@
 #define _ASM_BOOTINFO_H
 
 #include <linux/types.h>
+#include <asm/mmu.h>
 
 /*
  * Values for machgroup

Index: serial.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/serial.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- serial.h	29 Apr 2002 23:05:11 -0000	1.13
+++ serial.h	26 Sep 2002 05:39:40 -0000	1.14
@@ -144,9 +144,9 @@
 #define IVR_SERIAL_PORT_DEFNS
 #endif
 
-#ifdef CONFIG_AU1000_UART
+#ifdef CONFIG_AU1X00_UART
 #include <asm/au1000.h>
-#define AU1000_SERIAL_PORT_DEFNS                              \
+#define AU1X00_SERIAL_PORT_DEFNS                              \
     { baud_base: 0, port: UART0_ADDR, irq: AU1000_UART0_INT,  \
       flags: STD_COM_FLAGS, type: 1 },                        \
     { baud_base: 0, port: UART1_ADDR, irq: AU1000_UART1_INT,  \
@@ -156,7 +156,7 @@
     { baud_base: 0, port: UART3_ADDR, irq: AU1000_UART3_INT,  \
       flags: STD_COM_FLAGS, type: 1 },
 #else
-#define AU1000_SERIAL_PORT_DEFNS
+#define AU1X00_SERIAL_PORT_DEFNS
 #endif
 
 #ifdef CONFIG_CPU_RC32300
@@ -328,7 +328,7 @@
 	EXTRA_SERIAL_PORT_DEFNS		\
 	HUB6_SERIAL_PORT_DFNS		\
 	MOMENCO_OCELOT_SERIAL_PORT_DEFNS\
-	AU1000_SERIAL_PORT_DEFNS	\
+	AU1X00_SERIAL_PORT_DEFNS	\
         TXX927_SERIAL_PORT_DEFNS        \
 	DDB5477_SERIAL_PORT_DEFNS	\
 	VR4122_SERIAL_PORT_DEFNS

[Linux-mips-commits]CVS: linux/drivers/sound Config.in,1.14,1.15 Makefile,1.13,1.14

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/sound
In directory usw-pr-cvs1:/tmp/cvs-serv1799/drivers/sound

Modified Files:
	Config.in Makefile 
Log Message:
Split up the Pb board and Au CPU dependencies properly.


Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/sound/Config.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Config.in	7 Mar 2002 09:15:16 -0000	1.14
+++ Config.in	26 Sep 2002 05:39:40 -0000	1.15
@@ -59,8 +59,11 @@
 if [ "$CONFIG_DDB5477" = "y" ]; then
     dep_tristate '  NEC Vrc5477 AC97 sound' CONFIG_SOUND_VRC5477 $CONFIG_SOUND
 fi
-if [ "$CONFIG_MIPS_AU1000" = "y" ]; then
-    dep_tristate '  Au1000 Sound' CONFIG_SOUND_AU1000 $CONFIG_SOUND
+if [ "$CONFIG_CPU_AU1X00" = "y" ]; then
+    dep_tristate '  Au1x00 Sound' CONFIG_SOUND_AU1X00 $CONFIG_SOUND
+fi
+if [ "$CONFIG_MIPS_AU1x00" = "y" ]; then
+    dep_tristate '  Au1x00 I2S Sound' CONFIG_SOUND_AU1I2S $CONFIG_SOUND
 fi
 
 dep_tristate '  Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core' CONFIG_SOUND_TRIDENT $CONFIG_SOUND

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/sound/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile	7 Mar 2002 09:15:16 -0000	1.13
+++ Makefile	26 Sep 2002 05:39:40 -0000	1.14
@@ -66,7 +66,7 @@
 obj-$(CONFIG_SOUND_ES1371)	+= es1371.o ac97_codec.o
 obj-$(CONFIG_SOUND_VRC5477)	+= nec_vrc5477.o ac97_codec.o
 obj-$(CONFIG_SOUND_IT8172)      += ite8172.o ac97_codec.o  
-obj-$(CONFIG_SOUND_AU1000)      += au1000.o ac97_codec.o  
+obj-$(CONFIG_SOUND_AU1X00)      += au1000.o ac97_codec.o  
 obj-$(CONFIG_SOUND_ESSSOLO1)	+= esssolo1.o
 obj-$(CONFIG_SOUND_FUSION)	+= cs46xx.o ac97_codec.o
 obj-$(CONFIG_SOUND_MAESTRO)	+= maestro.o

[Linux-mips-commits]CVS: linux/drivers/net Config.in,1.21,1.22 Makefile,1.12,1.13 au1000_eth.c,1.12,1.13 au1000_eth.h,1.6,1.7

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/net
In directory usw-pr-cvs1:/tmp/cvs-serv1799/drivers/net

Modified Files:
	Config.in Makefile au1000_eth.c au1000_eth.h 
Log Message:
Split up the Pb board and Au CPU dependencies properly.


Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/Config.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Config.in	29 Apr 2002 23:05:11 -0000	1.21
+++ Config.in	26 Sep 2002 05:39:39 -0000	1.22
@@ -59,8 +59,8 @@
    if [ "$CONFIG_MIPS_GT96100" = "y" ]; then
       bool '  MIPS GT96100 Ethernet support' CONFIG_MIPS_GT96100ETH
    fi
-   if [ "$CONFIG_MIPS_AU1000" = "y" ]; then
-      bool '  MIPS AU1000 Ethernet support' CONFIG_MIPS_AU1000_ENET
+   if [ "$CONFIG_CPU_AU1X00" = "y" ]; then
+      bool '  MIPS Au1x00 Ethernet support' CONFIG_MIPS_AU1X00_ENET
    fi
    if [ "$CONFIG_MIPS_RC32355" = "y" ]; then
       bool '  IDT RC32355 Ethernet support' CONFIG_MIPS_RC32355_ETH

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile	29 Apr 2002 23:05:11 -0000	1.12
+++ Makefile	26 Sep 2002 05:39:40 -0000	1.13
@@ -198,7 +198,7 @@
 obj-$(CONFIG_EQUALIZER) += eql.o
 obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
 obj-$(CONFIG_MIPS_GT96100ETH) += gt96100eth.o
-obj-$(CONFIG_MIPS_AU1000_ENET) += au1000_eth.o
+obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
 obj-$(CONFIG_MIPS_RC32355_ETH) += banyan.o
 obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o
 obj-$(CONFIG_BAGETLANCE) += bagetlance.o

Index: au1000_eth.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/au1000_eth.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- au1000_eth.c	19 Aug 2002 19:07:27 -0000	1.12
+++ au1000_eth.c	26 Sep 2002 05:39:40 -0000	1.13
@@ -1,6 +1,6 @@
 /*
  *
- * Alchemy Semi Au1000 ethernet driver
+ * Alchemy Au1x00 ethernet driver
  *
  * Copyright 2001 MontaVista Software Inc.
  * Author: MontaVista Software, Inc.
@@ -111,21 +111,23 @@
 /*
  * Base address and interupt of the Au1xxx ethernet macs
  */
-static struct {
+static struct au1if {
 	unsigned int port;
 	int irq;
-} au1000_iflist[NUM_INTERFACES] = {
+} au1x00_iflist[] = {
+#if defined(CONFIG_CPU_AU1000)
 		{AU1000_ETH0_BASE, AU1000_ETH0_IRQ}, 
 		{AU1000_ETH1_BASE, AU1000_ETH1_IRQ}
-	},
-  au1500_iflist[NUM_INTERFACES] = {
+#elif defined(CONFIG_CPU_AU1500)
 		{AU1500_ETH0_BASE, AU1000_ETH0_IRQ}, 
 		{AU1500_ETH1_BASE, AU1000_ETH1_IRQ}
-	},
-  au1100_iflist[NUM_INTERFACES] = {
+#elif defined(CONFIG_CPU_AU1100)
 		{AU1000_ETH0_BASE, AU1000_ETH0_IRQ}, 
-		{NULL, NULL}
+#else
+#error "Unsupported Au1x00 CPU"
+#endif
 	};
+#define NUM_INTERFACES (sizeof(au1x00_iflist) / sizeof(struct au1if))
 
 static char version[] __devinitdata =
     "au1000eth.c:1.0 pp...@mv...\n";
@@ -630,30 +632,14 @@
 static int __init au1000_init_module(void)
 {
 	int i;
-	int prid;
 	int base_addr, irq;
 
-	prid = read_32bit_cp0_register(CP0_PRID);
 	for (i=0; i<NUM_INTERFACES; i++) {
-		if ( (prid & 0xffff0000) == 0x00030000 ) {
-			base_addr = au1000_iflist[i].port;
-			irq = au1000_iflist[i].irq;
-		} else if ( (prid & 0xffff0000) == 0x01030000 ) {
-			base_addr = au1500_iflist[i].port;
-			irq = au1500_iflist[i].irq;
-		} else if ( (prid & 0xffff0000) == 0x02030000 ) {
-			base_addr = au1100_iflist[i].port;
-			irq = au1100_iflist[i].irq;
-		} else {
-			printk(KERN_ERR "au1000 eth: unknown Processor ID\n");
+		base_addr = au1x00_iflist[i].port;
+		irq = au1x00_iflist[i].irq;
+		if (au1000_probe1(NULL, base_addr, irq, i) != 0) {
 			return -ENODEV;
 		}
-		// check for valid entries, au1100 only has one entry
-		if (base_addr && irq) {
-			if (au1000_probe1(NULL, base_addr, irq, i) != 0) {
-				return -ENODEV;
-			}
-		}
 	}
 	return 0;
 }
@@ -668,7 +654,7 @@
 	char *pmac, *argptr;
 	char ethaddr[6];
 
-	if (!request_region(ioaddr, MAC_IOSIZE, "Au1000 ENET")) {
+	if (!request_region(ioaddr, MAC_IOSIZE, "Au1x00 ENET")) {
 		 return -ENODEV;
 	}
 

Index: au1000_eth.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/au1000_eth.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- au1000_eth.h	25 Sep 2002 07:38:59 -0000	1.6
+++ au1000_eth.h	26 Sep 2002 05:39:40 -0000	1.7
@@ -1,6 +1,6 @@
 /*
  *
- * Alchemy Semi Au1000 ethernet driver include file
+ * Alchemy Au1x00 ethernet driver include file
  *
  * Author: Pete Popov <pp...@mv...>
  *
@@ -27,10 +27,9 @@
  */
 
 
-#define NUM_INTERFACES 2
 #define MAC_IOSIZE 0x10000
-#define NUM_RX_DMA 4       /* Au1000 has 4 rx hardware descriptors */
-#define NUM_TX_DMA 4       /* Au1000 has 4 tx hardware descriptors */
+#define NUM_RX_DMA 4       /* Au1x00 has 4 rx hardware descriptors */
+#define NUM_TX_DMA 4       /* Au1x00 has 4 tx hardware descriptors */
 
 #define NUM_RX_BUFFS 4
 #define NUM_TX_BUFFS 4

[Linux-mips-commits]CVS: linux/arch/mips/kernel setup.c,1.68,1.69

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv1799/arch/mips/kernel

Modified Files:
	setup.c 
Log Message:
Split up the Pb board and Au CPU dependencies properly.


Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/setup.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- setup.c	25 Sep 2002 07:38:58 -0000	1.68
+++ setup.c	26 Sep 2002 05:39:39 -0000	1.69
@@ -919,24 +919,9 @@
 		nino_setup();
 		break;
 #endif
-#ifdef CONFIG_MIPS_PB1000
-	case MACH_GROUP_ALCHEMY:
-		au1000_setup();
-		break;
-#endif
-#ifdef CONFIG_MIPS_PB1500
-	case MACH_GROUP_ALCHEMY:
-		au1500_setup();
-		break;
-#endif
-#ifdef CONFIG_MIPS_PB1100
-	case MACH_GROUP_ALCHEMY:
-		au1100_setup();
-		break;
-#endif
-#ifdef CONFIG_MIPS_HYD1100
+#ifdef CONFIG_CPU_AU1X00
 	case MACH_GROUP_ALCHEMY:
-		au1100_setup();
+		au1x00_setup();
 		break;
 #endif
 #ifdef CONFIG_TOSHIBA_JMR3927

[Linux-mips-commits]CVS: linux/arch/mips/configs defconfig-pb1000,1.25,1.26 defconfig-pb1100,1.9,1.10 defconfig-pb1500,1.8,1.9

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/configs
In directory usw-pr-cvs1:/tmp/cvs-serv1799/arch/mips/configs

Modified Files:
	defconfig-pb1000 defconfig-pb1100 defconfig-pb1500 
Log Message:
Split up the Pb board and Au CPU dependencies properly.


Index: defconfig-pb1000
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-pb1000,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- defconfig-pb1000	25 Sep 2002 07:38:58 -0000	1.25
+++ defconfig-pb1000	26 Sep 2002 05:39:39 -0000	1.26
@@ -65,14 +65,13 @@
 # CONFIG_HIGHMEM is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-CONFIG_MIPS_AU1000=y
+CONFIG_CPU_AU1000=y
 CONFIG_NEW_IRQ=y
 CONFIG_PCI=y
 CONFIG_NEW_PCI=y
 CONFIG_NONCOHERENT_IO=y
 CONFIG_PC_KEYB=y
 CONFIG_SWAP_IO_SPACE=y
-# CONFIG_AU1000_USB_DEVICE is not set
 
 #
 # CPU selection
@@ -96,6 +95,17 @@
 CONFIG_CPU_MIPS32=y
 # CONFIG_CPU_MIPS64 is not set
 # CONFIG_CPU_RC32300 is not set
+# CONFIG_CPU_GENERIC is not set
+CONFIG_CPU_AU1000=y
+# CONFIG_CPU_AU1500 is not set
+# CONFIG_CPU_AU1100 is not set
+CONFIG_CPU_AU1X00=y
+CONFIG_64BIT_PHYS_ADDR=y
+# CONFIG_VTAG_ICACHE is not set
+CONFIG_CPU_HAS_LLSC=y
+# CONFIG_CPU_HAS_LLDSCD is not set
+CONFIG_CPU_HAS_WB=y
+# CONFIG_CPU_HAS_PREFETCH is not set
 CONFIG_CPU_HAS_PREFETCH=y
 # CONFIG_VTAG_ICACHE is not set
 CONFIG_64BIT_PHYS_ADDR=y
@@ -111,7 +121,7 @@
 # CONFIG_CPU_R5900_CONTEXT is not set
 # CONFIG_VR4131_CACHE_FIX is not set
 CONFIG_NET=y
-CONFIG_PCI_NAMES=y
+# CONFIG_PCI_NAMES is not set
 # CONFIG_ISA is not set
 # CONFIG_EISA is not set
 # CONFIG_TC is not set
@@ -122,13 +132,13 @@
 #
 # PCMCIA/CardBus support
 #
-CONFIG_PCMCIA=y
+CONFIG_PCMCIA=m
 # CONFIG_CARDBUS is not set
 # CONFIG_I82092 is not set
 # CONFIG_I82365 is not set
 # CONFIG_PCMCIA_IRQ_REMAP is not set
 # CONFIG_TCIC is not set
-CONFIG_PCMCIA_AU1000=m
+CONFIG_PCMCIA_AU1X00=m
 CONFIG_PCMCIA_PB1X00=y
 # CONFIG_PCMCIA_HYD1100 is not set
 
@@ -366,7 +376,7 @@
 # Ethernet (10 or 100Mbit)
 #
 CONFIG_NET_ETHERNET=y
-CONFIG_MIPS_AU1000_ENET=y
+CONFIG_MIPS_AU1X00_ENET=y
 # CONFIG_SUNLANCE is not set
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNBMAC is not set
@@ -492,12 +502,12 @@
 # CONFIG_SX is not set
 # CONFIG_RIO is not set
 # CONFIG_STALDRV is not set
+CONFIG_AU1X00_UART=y
+CONFIG_AU1X00_SERIAL_CONSOLE=y
+# CONFIG_AU1X00_USB_TTY is not set
+# CONFIG_AU1X00_USB_RAW is not set
 # CONFIG_SERIAL_TX3912 is not set
 # CONFIG_SERIAL_TX3912_CONSOLE is not set
-CONFIG_AU1000_UART=y
-CONFIG_AU1000_SERIAL_CONSOLE=y
-# CONFIG_AU1000_USB_TTY is not set
-# CONFIG_AU1000_USB_RAW is not set
 # CONFIG_TXX927_SERIAL is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX98_PTY_COUNT=256
@@ -567,7 +577,7 @@
 # PCMCIA character devices
 #
 # CONFIG_PCMCIA_SERIAL_CS is not set
-CONFIG_AU1000_GPIO=y
+CONFIG_AU1X00_GPIO=y
 # CONFIG_TS_AU1000_ADS7846 is not set
 
 #
@@ -733,8 +743,7 @@
 # CONFIG_SOUND_RME96XX is not set
 # CONFIG_SOUND_SONICVIBES is not set
 # CONFIG_SOUND_HAL2 is not set
-CONFIG_SOUND_AU1000=y
-# CONFIG_SOUND_AU1I2S is not set
+CONFIG_SOUND_AU1X00=y
 # CONFIG_SOUND_TRIDENT is not set
 # CONFIG_SOUND_MSNDCLAS is not set
 # CONFIG_SOUND_MSNDPIN is not set

Index: defconfig-pb1100
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-pb1100,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- defconfig-pb1100	25 Sep 2002 07:38:58 -0000	1.9
+++ defconfig-pb1100	26 Sep 2002 05:39:39 -0000	1.10
@@ -1,5 +1,5 @@
 #
-# Automatically generated by make menuconfig: don't edit
+# Automatically generated make config: don't edit
 #
 CONFIG_MIPS=y
 CONFIG_MIPS32=y
@@ -64,7 +64,7 @@
 # CONFIG_HIGHMEM is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-CONFIG_MIPS_AU1000=y
+CONFIG_CPU_AU1100=y
 CONFIG_NEW_IRQ=y
 CONFIG_PCI=y
 # CONFIG_PCI_AUTO is not set
@@ -72,7 +72,6 @@
 CONFIG_NONCOHERENT_IO=y
 CONFIG_PC_KEYB=y
 CONFIG_SWAP_IO_SPACE=y
-# CONFIG_AU1000_USB_DEVICE is not set
 
 #
 # CPU selection
@@ -96,6 +95,17 @@
 CONFIG_CPU_MIPS32=y
 # CONFIG_CPU_MIPS64 is not set
 # CONFIG_CPU_RC32300 is not set
+# CONFIG_CPU_GENERIC is not set
+# CONFIG_CPU_AU1000 is not set
+# CONFIG_CPU_AU1500 is not set
+CONFIG_CPU_AU1100=y
+CONFIG_CPU_AU1X00=y
+CONFIG_64BIT_PHYS_ADDR=y
+# CONFIG_VTAG_ICACHE is not set
+CONFIG_CPU_HAS_LLSC=y
+# CONFIG_CPU_HAS_LLDSCD is not set
+CONFIG_CPU_HAS_WB=y
+# CONFIG_CPU_HAS_PREFETCH is not set
 CONFIG_CPU_HAS_PREFETCH=y
 # CONFIG_VTAG_ICACHE is not set
 CONFIG_64BIT_PHYS_ADDR=y
@@ -111,7 +121,7 @@
 # CONFIG_CPU_R5900_CONTEXT is not set
 # CONFIG_VR4131_CACHE_FIX is not set
 CONFIG_NET=y
-CONFIG_PCI_NAMES=y
+# CONFIG_PCI_NAMES is not set
 # CONFIG_ISA is not set
 # CONFIG_EISA is not set
 # CONFIG_TC is not set
@@ -128,7 +138,7 @@
 # CONFIG_I82365 is not set
 # CONFIG_PCMCIA_IRQ_REMAP is not set
 # CONFIG_TCIC is not set
-CONFIG_PCMCIA_AU1000=m
+CONFIG_PCMCIA_AU1X00=m
 CONFIG_PCMCIA_PB1X00=y
 # CONFIG_PCMCIA_HYD1100 is not set
 
@@ -156,6 +166,10 @@
 # CONFIG_MTD_DEBUG is not set
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
 # CONFIG_FTL is not set
@@ -197,6 +211,10 @@
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_MTDRAM is not set
 # CONFIG_MTD_BLKMTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
 # CONFIG_MTD_DOC1000 is not set
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
@@ -280,6 +298,10 @@
 # CONFIG_KHTTPD is not set
 # CONFIG_ATM is not set
 # CONFIG_VLAN_8021Q is not set
+
+#
+#  
+#
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set
 # CONFIG_DECNET is not set
@@ -314,6 +336,10 @@
 # IDE, ATA and ATAPI Block devices
 #
 CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
 # CONFIG_BLK_DEV_HD_IDE is not set
 # CONFIG_BLK_DEV_HD is not set
 # CONFIG_BLK_DEV_IDEDISK is not set
@@ -332,6 +358,10 @@
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
+
+#
+# IDE chipset support/bugfixes
+#
 # CONFIG_BLK_DEV_CMD640 is not set
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
 # CONFIG_BLK_DEV_ISAPNP is not set
@@ -379,7 +409,7 @@
 # Ethernet (10 or 100Mbit)
 #
 CONFIG_NET_ETHERNET=y
-CONFIG_MIPS_AU1000_ENET=y
+CONFIG_MIPS_AU1X00_ENET=y
 # CONFIG_SUNLANCE is not set
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNBMAC is not set
@@ -490,12 +520,12 @@
 # CONFIG_SX is not set
 # CONFIG_RIO is not set
 # CONFIG_STALDRV is not set
+CONFIG_AU1X00_UART=y
+CONFIG_AU1X00_SERIAL_CONSOLE=y
+# CONFIG_AU1X00_USB_TTY is not set
+# CONFIG_AU1X00_USB_RAW is not set
 # CONFIG_SERIAL_TX3912 is not set
 # CONFIG_SERIAL_TX3912_CONSOLE is not set
-CONFIG_AU1000_UART=y
-CONFIG_AU1000_SERIAL_CONSOLE=y
-# CONFIG_AU1000_USB_TTY is not set
-# CONFIG_AU1000_USB_RAW is not set
 # CONFIG_TXX927_SERIAL is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX98_PTY_COUNT=256
@@ -522,6 +552,10 @@
 # CONFIG_INPUT_EMU10K1 is not set
 # CONFIG_INPUT_SERIO is not set
 # CONFIG_INPUT_SERPORT is not set
+
+#
+# Joysticks
+#
 # CONFIG_INPUT_ANALOG is not set
 # CONFIG_INPUT_A3D is not set
 # CONFIG_INPUT_ADI is not set
@@ -565,7 +599,7 @@
 # PCMCIA character devices
 #
 # CONFIG_PCMCIA_SERIAL_CS is not set
-# CONFIG_AU1000_GPIO is not set
+# CONFIG_AU1X00_GPIO is not set
 # CONFIG_TS_AU1000_ADS7846 is not set
 
 #
@@ -774,8 +808,7 @@
 # CONFIG_SOUND_RME96XX is not set
 # CONFIG_SOUND_SONICVIBES is not set
 # CONFIG_SOUND_HAL2 is not set
-CONFIG_SOUND_AU1000=y
-# CONFIG_SOUND_AU1I2S is not set
+CONFIG_SOUND_AU1X00=y
 # CONFIG_SOUND_TRIDENT is not set
 # CONFIG_SOUND_MSNDCLAS is not set
 # CONFIG_SOUND_MSNDPIN is not set
@@ -789,15 +822,31 @@
 #
 CONFIG_USB=y
 CONFIG_USB_DEBUG=y
+
+#
+# Miscellaneous USB options
+#
 CONFIG_USB_DEVICEFS=y
 # CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_LONG_TIMEOUT is not set
+
+#
+# USB Controllers
+#
 # CONFIG_USB_UHCI is not set
 # CONFIG_USB_UHCI_ALT is not set
 CONFIG_USB_OHCI=y
 CONFIG_USB_NON_PCI_OHCI=y
+
+#
+# USB Device Class drivers
+#
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_BLUETOOTH is not set
+
+#
+#   SCSI support is needed for USB Storage
+#
 # CONFIG_USB_STORAGE is not set
 # CONFIG_USB_STORAGE_DEBUG is not set
 # CONFIG_USB_STORAGE_DATAFAB is not set
@@ -809,19 +858,43 @@
 # CONFIG_USB_STORAGE_JUMPSHOT is not set
 # CONFIG_USB_ACM is not set
 # CONFIG_USB_PRINTER is not set
+
+#
+# USB Human Interface Devices (HID)
+#
 CONFIG_USB_HID=y
 # CONFIG_USB_HIDDEV is not set
 # CONFIG_USB_WACOM is not set
+
+#
+# USB Imaging devices
+#
 # CONFIG_USB_DC2XX is not set
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_SCANNER is not set
 # CONFIG_USB_MICROTEK is not set
 # CONFIG_USB_HPUSBSCSI is not set
+
+#
+# USB Multimedia devices
+#
+
+#
+#   Video4Linux support is needed for USB Multimedia device support
+#
+
+#
+# USB Network adaptors
+#
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_CATC is not set
 # CONFIG_USB_CDCETHER is not set
 # CONFIG_USB_USBNET is not set
+
+#
+# USB port drivers
+#
 # CONFIG_USB_USS720 is not set
 
 #
@@ -854,6 +927,10 @@
 # CONFIG_USB_SERIAL_CYBERJACK is not set
 # CONFIG_USB_SERIAL_XIRCOM is not set
 # CONFIG_USB_SERIAL_OMNINET is not set
+
+#
+# USB Miscellaneous drivers
+#
 # CONFIG_USB_RIO500 is not set
 
 #

Index: defconfig-pb1500
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-pb1500,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- defconfig-pb1500	25 Sep 2002 07:38:58 -0000	1.8
+++ defconfig-pb1500	26 Sep 2002 05:39:39 -0000	1.9
@@ -64,14 +64,13 @@
 # CONFIG_HIGHMEM is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-CONFIG_MIPS_AU1000=y
+CONFIG_CPU_AU1500=y
 CONFIG_NEW_IRQ=y
 CONFIG_PCI=y
 CONFIG_NEW_PCI=y
 CONFIG_PCI_AUTO=y
 CONFIG_NONCOHERENT_IO=y
 CONFIG_PC_KEYB=y
-# CONFIG_AU1000_USB_DEVICE is not set
 
 #
 # CPU selection
@@ -95,6 +94,17 @@
 CONFIG_CPU_MIPS32=y
 # CONFIG_CPU_MIPS64 is not set
 # CONFIG_CPU_RC32300 is not set
+# CONFIG_CPU_GENERIC is not set
+# CONFIG_CPU_AU1000 is not set
+CONFIG_CPU_AU1500=y
+# CONFIG_CPU_AU1100 is not set
+CONFIG_CPU_AU1X00=y
+CONFIG_64BIT_PHYS_ADDR=y
+# CONFIG_VTAG_ICACHE is not set
+CONFIG_CPU_HAS_LLSC=y
+# CONFIG_CPU_HAS_LLDSCD is not set
+CONFIG_CPU_HAS_WB=y
+# CONFIG_CPU_HAS_PREFETCH is not set
 CONFIG_CPU_HAS_PREFETCH=y
 # CONFIG_VTAG_ICACHE is not set
 CONFIG_64BIT_PHYS_ADDR=y
@@ -121,13 +131,7 @@
 #
 # PCMCIA/CardBus support
 #
-CONFIG_PCMCIA=y
-CONFIG_CARDBUS=y
-# CONFIG_I82092 is not set
-# CONFIG_I82365 is not set
-# CONFIG_PCMCIA_IRQ_REMAP is not set
-# CONFIG_TCIC is not set
-# CONFIG_PCMCIA_AU1000 is not set
+# CONFIG_PCMCIA is not set
 
 #
 # PCI Hotplug Support
@@ -324,7 +328,7 @@
 # CONFIG_BLK_DEV_IDEDISK_WD is not set
 # CONFIG_BLK_DEV_COMMERIAL is not set
 # CONFIG_BLK_DEV_TIVO is not set
-CONFIG_BLK_DEV_IDECS=m
+# CONFIG_BLK_DEV_IDECS is not set
 # CONFIG_BLK_DEV_IDECD is not set
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
@@ -407,7 +411,7 @@
 # Ethernet (10 or 100Mbit)
 #
 CONFIG_NET_ETHERNET=y
-CONFIG_MIPS_AU1000_ENET=y
+CONFIG_MIPS_AU1X00_ENET=y
 # CONFIG_SUNLANCE is not set
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNBMAC is not set
@@ -488,8 +492,6 @@
 # CONFIG_AIRO is not set
 CONFIG_HERMES=m
 # CONFIG_PLX_HERMES is not set
-CONFIG_PCMCIA_HERMES=m
-# CONFIG_AIRO_CS is not set
 CONFIG_NET_WIRELESS=y
 
 #
@@ -506,24 +508,6 @@
 # CONFIG_WAN is not set
 
 #
-# PCMCIA network device support
-#
-CONFIG_NET_PCMCIA=y
-# CONFIG_PCMCIA_3C589 is not set
-# CONFIG_PCMCIA_3C574 is not set
-# CONFIG_PCMCIA_FMVJ18X is not set
-# CONFIG_PCMCIA_PCNET is not set
-# CONFIG_PCMCIA_AXNET is not set
-# CONFIG_PCMCIA_NMCLAN is not set
-# CONFIG_PCMCIA_SMC91C92 is not set
-# CONFIG_PCMCIA_XIRC2PS is not set
-# CONFIG_ARCNET_COM20020_CS is not set
-# CONFIG_PCMCIA_IBMTR is not set
-# CONFIG_PCMCIA_XIRCOM is not set
-# CONFIG_PCMCIA_XIRTULIP is not set
-# CONFIG_NET_PCMCIA_RADIO is not set
-
-#
 # Amateur Radio support
 #
 # CONFIG_HAMRADIO is not set
@@ -562,12 +546,12 @@
 # CONFIG_SX is not set
 # CONFIG_RIO is not set
 # CONFIG_STALDRV is not set
+CONFIG_AU1X00_UART=y
+CONFIG_AU1X00_SERIAL_CONSOLE=y
+# CONFIG_AU1X00_USB_TTY is not set
+# CONFIG_AU1X00_USB_RAW is not set
 # CONFIG_SERIAL_TX3912 is not set
 # CONFIG_SERIAL_TX3912_CONSOLE is not set
-CONFIG_AU1000_UART=y
-CONFIG_AU1000_SERIAL_CONSOLE=y
-# CONFIG_AU1000_USB_TTY is not set
-# CONFIG_AU1000_USB_RAW is not set
 # CONFIG_TXX927_SERIAL is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX98_PTY_COUNT=256
@@ -632,12 +616,7 @@
 # CONFIG_FTAPE is not set
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
-
-#
-# PCMCIA character devices
-#
-# CONFIG_PCMCIA_SERIAL_CS is not set
-# CONFIG_AU1000_GPIO is not set
+CONFIG_AU1X00_GPIO=y
 # CONFIG_TS_AU1000_ADS7846 is not set
 
 #
@@ -847,8 +826,7 @@
 # CONFIG_SOUND_RME96XX is not set
 # CONFIG_SOUND_SONICVIBES is not set
 # CONFIG_SOUND_HAL2 is not set
-CONFIG_SOUND_AU1000=y
-# CONFIG_SOUND_AU1I2S is not set
+CONFIG_SOUND_AU1X00=y
 # CONFIG_SOUND_TRIDENT is not set
 # CONFIG_SOUND_MSNDCLAS is not set
 # CONFIG_SOUND_MSNDPIN is not set

[Linux-mips-commits]CVS: linux/arch/mips/au1000/hyd1100 setup.c,1.1,1.2

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/au1000/hyd1100
In directory usw-pr-cvs1:/tmp/cvs-serv1799/arch/mips/au1000/hyd1100

Modified Files:
	setup.c 
Log Message:
Split up the Pb board and Au CPU dependencies properly.


Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/hyd1100/setup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- setup.c	25 Sep 2002 07:38:58 -0000	1.1
+++ setup.c	26 Sep 2002 05:39:39 -0000	1.2
@@ -46,7 +46,7 @@
 #include <asm/au1000.h>
 #include <asm/hyd1100.h>
 
-#if defined(CONFIG_AU1000_SERIAL_CONSOLE)
+#if defined(CONFIG_AU1X00_SERIAL_CONSOLE)
 extern void console_setup(char *, int *);
 char serial_console[20];
 #endif
@@ -79,7 +79,7 @@
 	__asm__ volatile ("sync");
 }
 
-void __init au1100_setup(void)
+void __init au1x00_setup(void)
 {
 	char *argptr;
 	u32 pin_func, static_cfg0;
@@ -92,7 +92,7 @@
 	/* Various early Au1000 Errata corrected by this */
 	/* set_cp0_config(1<<19);*/ /* Config[OD] */
 
-#ifdef CONFIG_AU1000_SERIAL_CONSOLE
+#ifdef CONFIG_AU1X00_SERIAL_CONSOLE
 	if ((argptr = strstr(argptr, "console=")) == NULL) {
 		argptr = prom_getcmdline();
 		strcat(argptr, " console=ttyS0,115200");
@@ -127,7 +127,7 @@
 	writel(0, SYS_PINSTATERD);
 	udelay(100);
 
-#if defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1000_USB_DEVICE)
+#if defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE)
 #ifdef CONFIG_USB_OHCI
 	if ((argptr = strstr(argptr, "usb_ohci=")) == NULL) {
 	        char usb_args[80];
@@ -167,12 +167,12 @@
 
 	// get USB Functionality pin state (device vs host drive pins)	
 	pin_func = readl(SYS_PINFUNC) & (u32)(~0x8000);
-#ifndef CONFIG_AU1000_USB_DEVICE
+#ifndef CONFIG_AU1X00_USB_DEVICE
 	// 2nd USB port is USB host
 	pin_func |= 0x8000;
 #endif
 	writel(pin_func, SYS_PINFUNC);
-#endif // defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1000_USB_DEVICE)
+#endif // defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE)
 
 #ifdef CONFIG_USB_OHCI
 	// enable host controller and wait for reset done

[Linux-mips-commits]CVS: linux/arch/mips Makefile,1.53,1.54 config.in,1.104,1.105

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips
In directory usw-pr-cvs1:/tmp/cvs-serv1799/arch/mips

Modified Files:
	Makefile config.in 
Log Message:
Split up the Pb board and Au CPU dependencies properly.


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/Makefile,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- Makefile	25 Sep 2002 07:38:57 -0000	1.53
+++ Makefile	26 Sep 2002 05:39:38 -0000	1.54
@@ -16,7 +16,7 @@
 # Select the object file format to substitute into the linker script.
 #
 ifdef CONFIG_CPU_LITTLE_ENDIAN
-tool-prefix	= mipsel-linux-
+tool-prefix	= mips_fp_le-
 else
 tool-prefix	= mips-linux-
 endif

Index: config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/config.in,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- config.in	25 Sep 2002 07:38:57 -0000	1.104
+++ config.in	26 Sep 2002 05:39:38 -0000	1.105
@@ -24,13 +24,13 @@
 mainmenu_option next_comment
 comment 'Machine selection'
 dep_bool 'Support for Acer PICA 1 chipset (EXPERIMENTAL)' CONFIG_ACER_PICA_61 $CONFIG_EXPERIMENTAL
-bool 'Support for Alchemy Semi PB1000 board' CONFIG_MIPS_PB1000
+bool 'Support for Alchemy Pb1000 board' CONFIG_MIPS_PB1000
 if [ "$CONFIG_MIPS_PB1000" = "y" ]; then
    bool '  Support for PCI AUTO Config' CONFIG_PCI_AUTO
 fi
-bool 'Support for Alchemy Semi PB1100 board' CONFIG_MIPS_PB1100
-bool 'Support for Alchemy Semi PB1500 board' CONFIG_MIPS_PB1500
-bool 'Support for Alchemy Semi HYD1100 board' CONFIG_MIPS_HYD1100
+bool 'Support for Alchemy Pb1100 board' CONFIG_MIPS_PB1100
+bool 'Support for Alchemy Pb1500 board' CONFIG_MIPS_PB1500
+bool 'Support for Alchemy HYD1100 board' CONFIG_MIPS_HYD1100
 dep_bool 'Support for Algorithmics P4032 (EXPERIMENTAL)' CONFIG_ALGOR_P4032 $CONFIG_EXPERIMENTAL
 dep_bool 'Support for BAGET MIPS series (EXPERIMENTAL)' CONFIG_BAGET_MIPS $CONFIG_EXPERIMENTAL
 dep_bool 'Support for Cobalt Server (EXPERIMENTAL)' CONFIG_MIPS_COBALT $CONFIG_EXPERIMENTAL
@@ -142,7 +142,7 @@
    define_bool CONFIG_OLD_TIME_C y
 fi
 if [ "$CONFIG_MIPS_PB1000" = "y" ]; then
-   define_bool CONFIG_MIPS_AU1000 y
+   define_bool CONFIG_CPU_AU1000 y
    define_bool CONFIG_NEW_IRQ y
    define_bool CONFIG_PCI y
    define_bool CONFIG_NEW_PCI y
@@ -153,7 +153,7 @@
    define_bool CONFIG_AU1000_USB_DEVICE y
 fi
 if [ "$CONFIG_MIPS_PB1100" = "y" ]; then
-   define_bool CONFIG_MIPS_AU1000 y
+   define_bool CONFIG_CPU_AU1100 y
    define_bool CONFIG_NEW_IRQ y
    define_bool CONFIG_PCI y
    define_bool CONFIG_PCI_AUTO n
@@ -164,7 +164,7 @@
    define_bool CONFIG_AU1000_USB_DEVICE y
 fi
 if [ "$CONFIG_MIPS_PB1500" = "y" ]; then
-   define_bool CONFIG_MIPS_AU1000 y
+   define_bool CONFIG_CPU_AU1500 y
    define_bool CONFIG_NEW_IRQ y
    define_bool CONFIG_PCI y
    define_bool CONFIG_NEW_PCI y
@@ -174,7 +174,7 @@
    define_bool CONFIG_AU1000_USB_DEVICE y
 fi
 if [ "$CONFIG_MIPS_HYD1100" = "y" ]; then
-   define_bool CONFIG_MIPS_AU1000 y
+   define_bool CONFIG_CPU_AU1100 y
    define_bool CONFIG_NEW_IRQ y
    define_bool CONFIG_PCI y
    define_bool CONFIG_PCI_AUTO n
@@ -555,10 +555,6 @@
    define_bool CONFIG_SWAP_IO_SPACE y
    define_bool CONFIG_NONCOHERENT_IO y
 fi
-
-if [ "$CONFIG_MIPS_AU1000" != "y" ]; then
-   define_bool CONFIG_MIPS_AU1000 n
-fi
 endmenu
 
 mainmenu_option next_comment
@@ -584,6 +580,26 @@
 	 MIPS32	 CONFIG_CPU_MIPS32 \
 	 MIPS64	 CONFIG_CPU_MIPS64 \
 	 RC32300 CONFIG_CPU_RC32300" R4x00
+
+if [ "$CONFIG_CPU_MIPS32" = "y" ]; then
+   choice 'MIPS32 CPU type'  \
+   "Generic CONFIG_CPU_GENERIC \
+    Au1000 CONFIG_CPU_AU1000 \
+    Au1500 CONFIG_CPU_AU1500 \
+    Au1100 CONFIG_CPU_AU1100" Au1000
+fi
+
+if [ "$CONFIG_CPU_AU1000" = "y" -o \
+     "$CONFIG_CPU_AU1500" = "y" -o \
+     "$CONFIG_CPU_AU1100" = "y" ]; then
+   define_bool CONFIG_CPU_AU1X00 y
+   define_bool CONFIG_64BIT_PHYS_ADDR y
+   define_bool CONFIG_VTAG_ICACHE n
+   define_bool CONFIG_CPU_HAS_LLSC y
+   define_bool CONFIG_CPU_HAS_LLDSCD n
+   define_bool CONFIG_CPU_HAS_WB y
+   define_bool CONFIG_CPU_HAS_PREFETCH n
+fi
 
 if [ "$CONFIG_CPU_MIPS32" = "y" ]; then
    define_bool CONFIG_CPU_HAS_PREFETCH y

[Linux-mips-commits]CVS: linux/arch/mips/au1000/pb1000 setup.c,1.23,1.24

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/au1000/pb1000
In directory usw-pr-cvs1:/tmp/cvs-serv1799/arch/mips/au1000/pb1000

Modified Files:
	setup.c 
Log Message:
Split up the Pb board and Au CPU dependencies properly.


Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/pb1000/setup.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- setup.c	25 Sep 2002 07:38:58 -0000	1.23
+++ setup.c	26 Sep 2002 05:39:39 -0000	1.24
@@ -52,7 +52,7 @@
 #define CONFIG_AU1000_OHCI_FIX
 #endif
 
-#if defined(CONFIG_AU1000_SERIAL_CONSOLE)
+#if defined(CONFIG_AU1X00_SERIAL_CONSOLE)
 extern void console_setup(char *, int *);
 char serial_console[20];
 #endif
@@ -82,7 +82,7 @@
 	__asm__ volatile ("sync");
 }
 
-void __init au1000_setup(void)
+void __init au1x00_setup(void)
 {
 	char *argptr;
 	u32 pin_func, static_cfg0;
@@ -94,7 +94,7 @@
 	/* Various early Au1000 Errata corrected by this */
 	set_cp0_config(1<<19); /* Config[OD] */
 
-#ifdef CONFIG_AU1000_SERIAL_CONSOLE
+#ifdef CONFIG_AU1X00_SERIAL_CONSOLE
 	if ((argptr = strstr(argptr, "console=")) == NULL) {
 		argptr = prom_getcmdline();
 		strcat(argptr, " console=ttyS0,115200");
@@ -125,7 +125,7 @@
 	au_writel(0, SYS_PINSTATERD);
 	udelay(100);
 
-#if defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1000_USB_DEVICE)
+#if defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE)
 #ifdef CONFIG_USB_OHCI
 	if ((argptr = strstr(argptr, "usb_ohci=")) == NULL) {
 	        char usb_args[80];
@@ -187,7 +187,7 @@
 #ifdef CONFIG_USB_OHCI
 	sys_clksrc |= ((4<<12) | (0<<11) | (0<<10));
 #endif
-#ifdef CONFIG_AU1000_USB_DEVICE
+#ifdef CONFIG_AU1X00_USB_DEVICE
 	sys_clksrc |= ((4<<7) | (0<<6) | (0<<5));
 #endif
 	au_writel(sys_clksrc, SYS_CLKSRC);
@@ -206,14 +206,14 @@
 	// configure pins GPIO[14:9] as GPIO
 	pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x8080);
 
-#ifndef CONFIG_AU1000_USB_DEVICE
+#ifndef CONFIG_AU1X00_USB_DEVICE
 	// 2nd USB port is USB host
 	pin_func |= 0x8000;
 #endif
 	au_writel(pin_func, SYS_PINFUNC);
 	au_writel(0x2800, SYS_TRIOUTCLR);
 	au_writel(0x0030, SYS_OUTPUTCLR);
-#endif // defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1000_USB_DEVICE)
+#endif // defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE)
 
 	// make gpio 15 an input (for interrupt line) 
 	pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x100);

[Linux-mips-commits]CVS: linux/drivers/char tty_io.c,1.12,1.13 Config.in,1.37,1.38 Makefile,1.32,1.33

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv1799/drivers/char

Modified Files:
	Config.in Makefile 
Added Files:
	tty_io.c 
Log Message:
Split up the Pb board and Au CPU dependencies properly.



Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/Config.in,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- Config.in	31 May 2002 20:12:20 -0000	1.37
+++ Config.in	26 Sep 2002 05:39:39 -0000	1.38
@@ -62,17 +62,19 @@
      tristate '    Stallion EasyIO or EC8/32 support' CONFIG_STALLION
      tristate '    Stallion EC8/64, ONboard, Brumby support' CONFIG_ISTALLION
    fi
+   if [ "$CONFIG_CPU_AU1X00" = "y" ]; then
+     bool '  Enable Au1x00 UART Support' CONFIG_AU1X00_UART
+     if [ "$CONFIG_AU1X00_UART" = "y" ]; then
+        bool '        Enable Au1x00 serial console' CONFIG_AU1X00_SERIAL_CONSOLE
+     fi
+     dep_tristate '  Au1x00 USB TTY Device support' CONFIG_AU1X00_USB_TTY $CONFIG_AU1X00_USB_DEVICE
+     if [ "$CONFIG_AU1X00_USB_TTY" != "y" ]; then
+        dep_tristate '  Au1x00 USB Raw Device support' CONFIG_AU1X00_USB_RAW $CONFIG_AU1X00_USB_DEVICE
+     fi
+   fi
    if [ "$CONFIG_MIPS" = "y" ]; then
      bool '  TX3912/PR31700 serial port support' CONFIG_SERIAL_TX3912
      dep_bool '     Console on TX3912/PR31700 serial port' CONFIG_SERIAL_TX3912_CONSOLE $CONFIG_SERIAL_TX3912
-     bool '  Enable Au1000 UART Support' CONFIG_AU1000_UART
-     if [ "$CONFIG_AU1000_UART" = "y" ]; then
-        bool '        Enable Au1000 serial console' CONFIG_AU1000_SERIAL_CONSOLE
-     fi
-     dep_tristate '  Au1000 USB TTY Device support' CONFIG_AU1000_USB_TTY $CONFIG_AU1000_USB_DEVICE
-     if [ "$CONFIG_AU1000_USB_TTY" != "y" ]; then
-        dep_tristate '  Au1000 USB Raw Device support' CONFIG_AU1000_USB_RAW $CONFIG_AU1000_USB_DEVICE
-     fi
      bool 'TXx927 SIO support' CONFIG_TXX927_SERIAL 
      if [ "$CONFIG_TXX927_SERIAL" = "y" ]; then
         bool 'TXx927 SIO Console support' CONFIG_TXX927_SERIAL_CONSOLE  
@@ -121,10 +123,6 @@
    if [ "$CONFIG_MIPS" = "y" ]; then
      bool '  TMPTX3912/PR31700 serial port support' CONFIG_SERIAL_TX3912
      dep_bool '     Console on TMPTX3912/PR31700 serial port' CONFIG_SERIAL_TX3912_CONSOLE $CONFIG_SERIAL_TX3912
-     bool '  Enable Au1000 UART Support' CONFIG_AU1000_UART
-     if [ "$CONFIG_AU1000_UART" = "y" ]; then
-         bool '        Enable Au1000 serial console' CONFIG_AU1000_SERIAL_CONSOLE
-     fi
    fi
 fi
 if [ "$CONFIG_MIPS_ITE8172" = "y" ]; then
@@ -299,8 +297,8 @@
 if [ "$CONFIG_HOTPLUG" = "y" -a "$CONFIG_PCMCIA" != "n" ]; then
    source drivers/char/pcmcia/Config.in
 fi
-if [ "$CONFIG_MIPS_AU1000" = "y" ]; then
-   tristate ' Alchemy Au1000 GPIO device support' CONFIG_AU1000_GPIO
+if [ "$CONFIG_CPU_AU1X00" = "y" ]; then
+   tristate ' Alchemy Au1000 GPIO device support' CONFIG_AU1X00_GPIO
    tristate ' Au1000/ADS7846 touchscreen support' CONFIG_TS_AU1000_ADS7846
 fi
 if [ "$CONFIG_MIPS_ITE8172" = "y" ]; then

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/Makefile,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- Makefile	13 Jun 2002 12:57:33 -0000	1.32
+++ Makefile	26 Sep 2002 05:39:39 -0000	1.33
@@ -220,9 +220,9 @@
 obj-$(CONFIG_DS1620) += ds1620.o
 obj-$(CONFIG_INTEL_RNG) += i810_rng.o
 obj-$(CONFIG_ITE_GPIO) += ite_gpio.o
-obj-$(CONFIG_AU1000_GPIO) += au1000_gpio.o
-obj-$(CONFIG_AU1000_USB_TTY) += au1000_usbtty.o
-obj-$(CONFIG_AU1000_USB_RAW) += au1000_usbraw.o
+obj-$(CONFIG_AU1X00_GPIO) += au1000_gpio.o
+obj-$(CONFIG_AU1X00_USB_TTY) += au1000_usbtty.o
+obj-$(CONFIG_AU1X00_USB_RAW) += au1000_usbraw.o
 obj-$(CONFIG_COBALT_LCD) += lcd.o
 
 obj-$(CONFIG_QIC02_TAPE) += tpqic02.o

[Linux-mips-commits]CVS: linux/drivers/pcmcia Config.in,1.7,1.8 Makefile,1.8,1.9

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/pcmcia
In directory usw-pr-cvs1:/tmp/cvs-serv1799/drivers/pcmcia

Modified Files:
	Config.in Makefile 
Log Message:
Split up the Pb board and Au CPU dependencies properly.


Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/pcmcia/Config.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Config.in	25 Sep 2002 07:38:59 -0000	1.7
+++ Config.in	26 Sep 2002 05:39:40 -0000	1.8
@@ -24,9 +24,9 @@
    if [ "$CONFIG_HD64465" = "y" ]; then
       dep_tristate '  HD64465 host bridge support' CONFIG_HD64465_PCMCIA $CONFIG_PCMCIA
    fi
-   if [ "$CONFIG_MIPS_AU1000" = "y" ]; then
-      dep_tristate '  Au1x00 pcmcia support' CONFIG_PCMCIA_AU1000 $CONFIG_PCMCIA 
-      if [ "$CONFIG_PCMCIA_AU1000" != "n" ]; then
+   if [ "$CONFIG_CPU_AU1X00" = "y" ]; then
+      dep_tristate '  Au1x00 PCMCIA support' CONFIG_PCMCIA_AU1X00 $CONFIG_PCMCIA 
+      if [ "$CONFIG_PCMCIA_AU1X00" != "n" ]; then
         dep_bool '  Pb1x00 board support' CONFIG_PCMCIA_PB1X00
         dep_bool '  Hyd1100 support' CONFIG_PCMCIA_HYD1100
       fi

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/pcmcia/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile	25 Sep 2002 07:38:59 -0000	1.8
+++ Makefile	26 Sep 2002 05:39:40 -0000	1.9
@@ -59,7 +59,7 @@
   endif
 endif
 
-obj-$(CONFIG_PCMCIA_AU1000)			+= au1x00_ss.o
+obj-$(CONFIG_PCMCIA_AU1X00)			+= au1x00_ss.o
 au1000_ss-objs-y				:= au1000_generic.o
 au1000_ss-objs-$(CONFIG_PCMCIA_PB1X00)		+= au1000_pb1x00.o
 au1000_ss-objs-$(CONFIG_PCMCIA_HYD1100)	+= au1000_hyd1100.o

[Linux-mips-commits]CVS: linux/arch/mips/au1000/pb1500 setup.c,1.9,1.10

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/au1000/pb1500
In directory usw-pr-cvs1:/tmp/cvs-serv1799/arch/mips/au1000/pb1500

Modified Files:
	setup.c 
Log Message:
Split up the Pb board and Au CPU dependencies properly.


Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/pb1500/setup.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- setup.c	17 Sep 2002 18:20:00 -0000	1.9
+++ setup.c	26 Sep 2002 05:39:39 -0000	1.10
@@ -52,7 +52,7 @@
 #define CONFIG_AU1000_OHCI_FIX
 #endif
 
-#if defined(CONFIG_AU1000_SERIAL_CONSOLE)
+#if defined(CONFIG_AU1X00_SERIAL_CONSOLE)
 extern void console_setup(char *, int *);
 char serial_console[20];
 #endif
@@ -88,7 +88,7 @@
 	__asm__ volatile ("sync");
 }
 
-void __init au1500_setup(void)
+void __init au1x00_setup(void)
 {
 	char *argptr;
 	u32 pin_func, static_cfg0;
@@ -101,7 +101,7 @@
 	/* Various early Au1500 Errata corrected by this */
 	set_cp0_config(1<<19); /* Config[OD] */
 
-#ifdef CONFIG_AU1000_SERIAL_CONSOLE
+#ifdef CONFIG_AU1X00_SERIAL_CONSOLE
 	if ((argptr = strstr(argptr, "console=")) == NULL) {
 		argptr = prom_getcmdline();
 		strcat(argptr, " console=ttyS0,115200");
@@ -136,7 +136,7 @@
 	au_writel(0, SYS_PINSTATERD);
 	udelay(100);
 
-#if defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1000_USB_DEVICE)
+#if defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE)
 #ifdef CONFIG_USB_OHCI
 	if ((argptr = strstr(argptr, "usb_ohci=")) == NULL) {
 	        char usb_args[80];
@@ -174,19 +174,19 @@
 #ifdef CONFIG_USB_OHCI
 	sys_clksrc |= ((4<<12) | (0<<11) | (0<<10));
 #endif
-#ifdef CONFIG_AU1000_USB_DEVICE
+#ifdef CONFIG_AU1X00_USB_DEVICE
 	sys_clksrc |= ((4<<7) | (0<<6) | (0<<5));
 #endif
 	au_writel(sys_clksrc, SYS_CLKSRC);
 
 
 	pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x8000);
-#ifndef CONFIG_AU1000_USB_DEVICE
+#ifndef CONFIG_AU1X00_USB_DEVICE
 	// 2nd USB port is USB host
 	pin_func |= 0x8000;
 #endif
 	au_writel(pin_func, SYS_PINFUNC);
-#endif // defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1000_USB_DEVICE)
+#endif // defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE)
 
 
 #ifdef CONFIG_USB_OHCI

[Linux-mips-commits]CVS: linux/Documentation Configure.help,1.13,1.14

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/Documentation
In directory usw-pr-cvs1:/tmp/cvs-serv1799/Documentation

Modified Files:
	Configure.help 
Log Message:
Split up the Pb board and Au CPU dependencies properly.


Index: Configure.help
===================================================================
RCS file: /cvsroot/linux-mips/linux/Documentation/Configure.help,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Configure.help	13 Jun 2002 13:35:48 -0000	1.13
+++ Configure.help	26 Sep 2002 05:39:38 -0000	1.14
@@ -19151,20 +19151,20 @@
   hardware debugging with a logic analyzer and need to see all traffic
   on the bus.
 
-AU1000 serial console
-CONFIG_AU1000_SERIAL_CONSOLE
-  If you have an Alchemy AU1000 processor (MIPS based) and you want
+Au1x00 serial console
+CONFIG_AU1X00_SERIAL_CONSOLE
+  If you have an Alchemy Au1x00 processor (MIPS based) and you want
   to use a console on a serial port, say Y.  Otherwise, say N.
 
-AU1000 serial support
-CONFIG_AU1000_UART
-  If you have an Alchemy AU1000 processor (MIPS based) and you want
+Au1x00 serial support
+CONFIG_AU1X00_UART
+  If you have an Alchemy Au1x00 processor (MIPS based) and you want
   to use serial ports, say Y.  Otherwise, say N.
 
-AU1000 ethernet controller on SGI MIPS system
-CONFIG_MIPS_AU1000_ENET
-  If you have an Alchemy Semi AU1000 ethernet controller
-  on an SGI MIPS system, say Y.  Otherwise, say N.
+Au1x00 ethernet controller support
+CONFIG_MIPS_AU1X00_ENET
+  If you have an Alchemy Au1x00 ethernet controller (MIPS based) and
+  you want to use ethernet, say Y. Otherwise, say N.
 
 WD93 SCSI Controller on SGI MIPS system
 CONFIG_SGIWD93_SCSI

[Linux-mips-commits]CVS: linux/arch/mips/au1000/common Makefile,1.10,1.11 clocks.c,1.5,1.6 power.c,1.8,1.9 serial.c,1.10,1.11 time.c,1.12,1.13

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/au1000/common
In directory usw-pr-cvs1:/tmp/cvs-serv1799/arch/mips/au1000/common

Modified Files:
	Makefile clocks.c power.c serial.c time.c 
Log Message:
Split up the Pb board and Au CPU dependencies properly.


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/common/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile	29 May 2002 00:23:16 -0000	1.10
+++ Makefile	26 Sep 2002 05:39:38 -0000	1.11
@@ -24,7 +24,7 @@
 obj-y := prom.o int-handler.o dma.o irq.o puts.o time.o reset.o \
          clocks.o power.o usbdev.o
 
-obj-$(CONFIG_AU1000_UART) += serial.o             
+obj-$(CONFIG_AU1X00_UART) += serial.o             
 obj-$(CONFIG_REMOTE_DEBUG) += dbg_io.o             
 obj-$(CONFIG_RTC) += rtc.o
 

Index: clocks.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/common/clocks.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- clocks.c	1 May 2002 18:00:28 -0000	1.5
+++ clocks.c	26 Sep 2002 05:39:38 -0000	1.6
@@ -30,21 +30,21 @@
 #include <linux/module.h>
 #include <asm/au1000.h>
 
-static unsigned int au1000_clock; // Hz
+static unsigned int au1x00_clock; // Hz
 static unsigned int lcd_clock;    // KHz
 static unsigned long uart_baud_base;
 
 /*
  * Set the au1000_clock
  */
-void set_au1000_speed(unsigned int new_freq)
+void set_au1x00_speed(unsigned int new_freq)
 {
-	au1000_clock = new_freq;
+	au1x00_clock = new_freq;
 }
 
-unsigned int get_au1000_speed(void)
+unsigned int get_au1x00_speed(void)
 {
-	return au1000_clock;
+	return au1x00_clock;
 }
 
 
@@ -54,27 +54,27 @@
  * we want to be able to use the same code on different
  * speed CPUs.
  */
-unsigned long get_au1000_uart_baud_base(void)
+unsigned long get_au1x00_uart_baud_base(void)
 {
 	return uart_baud_base;
 }
 
-void set_au1000_uart_baud_base(unsigned long new_baud_base)
+void set_au1x00_uart_baud_base(unsigned long new_baud_base)
 {
 	uart_baud_base = new_baud_base;
 }
 
 /*
- * Calculate the Au1000's LCD clock based on the current
+ * Calculate the Au1x00's LCD clock based on the current
  * cpu clock and the system bus clock, and try to keep it
  * below 40 MHz (the Pb1000 board can lock-up if the LCD
  * clock is over 40 MHz).
  */
-void set_au1000_lcd_clock(void)
+void set_au1x00_lcd_clock(void)
 {
 	unsigned int static_cfg0;
 	unsigned int sys_busclk =
-		(get_au1000_speed()/1000) /
+		(get_au1x00_speed()/1000) /
 		((int)(au_readl(SYS_POWERCTRL)&0x03) + 2);
 
 	static_cfg0 = au_readl(MEM_STCFG0);
@@ -90,9 +90,9 @@
 			       lcd_clock);
 }
 
-unsigned int get_au1000_lcd_clock(void)
+unsigned int get_au1x00_lcd_clock(void)
 {
 	return lcd_clock;
 }
 
-EXPORT_SYMBOL(get_au1000_lcd_clock);
+EXPORT_SYMBOL(get_au1x00_lcd_clock);

Index: power.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/common/power.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- power.c	1 May 2002 18:00:29 -0000	1.8
+++ power.c	26 Sep 2002 05:39:38 -0000	1.9
@@ -52,10 +52,6 @@
 extern void au1k_wait(void);
 static void calibrate_delay(void);
 
-extern void set_au1000_speed(unsigned int new_freq);
-extern unsigned int get_au1000_speed(void);
-extern unsigned long get_au1000_uart_baud_base(void);
-extern void set_au1000_uart_baud_base(unsigned long new_baud_base);
 extern unsigned long save_local_and_disable(int controller);
 extern void restore_local_and_enable(int controller, unsigned long mask);
 extern void local_enable_irq(unsigned int irq_nr);
@@ -186,13 +182,13 @@
 			return -EFAULT;
 		}
 
-		old_baud_base = get_au1000_uart_baud_base();
-		old_cpu_freq = get_au1000_speed();
+		old_baud_base = get_au1x00_uart_baud_base();
+		old_cpu_freq = get_au1x00_speed();
 
 		new_cpu_freq = pll * 12 * 1000000;
 		new_baud_base = (new_cpu_freq / 4) / 16;
-		set_au1000_speed(new_cpu_freq);
-		set_au1000_uart_baud_base(new_baud_base);
+		set_au1x00_speed(new_cpu_freq);
+		set_au1x00_uart_baud_base(new_baud_base);
 
 		old_refresh = au_readl(MEM_SDREFCFG) & 0x1ffffff;
 		new_refresh =

Index: serial.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/common/serial.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serial.c	19 Jun 2002 01:50:10 -0000	1.10
+++ serial.c	26 Sep 2002 05:39:38 -0000	1.11
@@ -1,7 +1,7 @@
 /*
  *
  * BRIEF MODULE DESCRIPTION
- *	Au1000 serial port driver.
+ *	Au1x00 serial port driver.
  *
  * Copyright 2001 MontaVista Software Inc.
  * Author: MontaVista Software, Inc.
@@ -56,7 +56,7 @@
 #undef SERIAL_DEBUG_AUTOCONF
 
 #ifdef MODULE
-#undef CONFIG_AU1000_SERIAL_CONSOLE
+#undef CONFIG_AU1X00_SERIAL_CONSOLE
 #endif
 
 #define CONFIG_SERIAL_RSA
@@ -98,7 +98,7 @@
 #include <linux/init.h>
 #include <asm/uaccess.h>
 #include <linux/delay.h>
-#ifdef CONFIG_AU1000_SERIAL_CONSOLE
+#ifdef CONFIG_AU1X00_SERIAL_CONSOLE
 #include <linux/console.h>
 #endif
 #ifdef CONFIG_MAGIC_SYSRQ
@@ -131,8 +131,6 @@
 
 static struct timer_list serial_timer;
 
-extern unsigned long get_au1000_uart_baud_base(void);
-
 /* serial subtype definitions */
 #ifndef SERIAL_TYPE_NORMAL
 #define SERIAL_TYPE_NORMAL	1
@@ -149,11 +147,11 @@
 
 static struct async_struct *IRQ_ports[NR_IRQS];
 static int IRQ_timeout[NR_IRQS];
-#ifdef CONFIG_AU1000_SERIAL_CONSOLE
+#ifdef CONFIG_AU1X00_SERIAL_CONSOLE
 static struct console sercons;
 static int lsr_break_flag;
 #endif
-#if defined(CONFIG_AU1000_SERIAL_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#if defined(CONFIG_AU1X00_SERIAL_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
 static unsigned long break_pressed; /* break, really ... */
 #endif
 
@@ -369,7 +367,7 @@
 				 * may get masked by ignore_status_mask
 				 * or read_status_mask.
 				 */
-#if defined(CONFIG_AU1000_SERIAL_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#if defined(CONFIG_AU1X00_SERIAL_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
 				if (info->line == sercons.index) {
 					if (!break_pressed) {
 						break_pressed = jiffies;
@@ -399,7 +397,7 @@
 			}
 			*status &= info->read_status_mask;
 
-#ifdef CONFIG_AU1000_SERIAL_CONSOLE
+#ifdef CONFIG_AU1X00_SERIAL_CONSOLE
 			if (info->line == sercons.index) {
 				/* Recover the break flag from console xmit */
 				*status |= lsr_break_flag;
@@ -429,7 +427,7 @@
 					goto ignore_char;
 			}
 		}
-#if defined(CONFIG_AU1000_SERIAL_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#if defined(CONFIG_AU1X00_SERIAL_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
 		if (break_pressed && info->line == sercons.index) {
 			if (ch != 0 &&
 			    time_before(jiffies, break_pressed + HZ*5)) {
@@ -1042,7 +1040,7 @@
 	if (!baud) {
 		baud = 9600;	/* B0 transition handled in rs_set_termios */
 	}
-	baud_base = get_au1000_uart_baud_base();
+	baud_base = get_au1x00_uart_baud_base();
 
 	//if (baud == 38400 &&
 	if (((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST)) {
@@ -2348,7 +2346,7 @@
 			*tty->termios = info->state->callout_termios;
 		change_speed(info, 0);
 	}
-#ifdef CONFIG_AU1000_SERIAL_CONSOLE
+#ifdef CONFIG_AU1X00_SERIAL_CONSOLE
 	if (sercons.cflag && sercons.index == line) {
 		tty->termios->c_cflag = sercons.cflag;
 		sercons.cflag = 0;
@@ -2575,7 +2573,7 @@
 		IRQ_ports[i] = 0;
 		IRQ_timeout[i] = 0;
 	}
-#ifdef CONFIG_AU1000_SERIAL_CONSOLE
+#ifdef CONFIG_AU1X00_SERIAL_CONSOLE
 	/*
 	 *	The interrupt of the serial console port
 	 *	can't be shared.
@@ -2654,7 +2652,7 @@
 		panic("Couldn't register callout driver");
 	
 	for (i = 0, state = rs_table; i < NR_PORTS; i++,state++) {
-		state->baud_base = get_au1000_uart_baud_base();
+		state->baud_base = get_au1x00_uart_baud_base();
 		state->magic = SSTATE_MAGIC;
 		state->line = i;
 		state->type = PORT_UNKNOWN;
@@ -2851,7 +2849,7 @@
 
 module_init(rs_init);
 module_exit(rs_fini);
-MODULE_DESCRIPTION("Au1000 serial driver");
+MODULE_DESCRIPTION("Au1x00 serial driver");
 
 
 /*
@@ -2859,7 +2857,7 @@
  * Serial console driver
  * ------------------------------------------------------------
  */
-#ifdef CONFIG_AU1000_SERIAL_CONSOLE
+#ifdef CONFIG_AU1X00_SERIAL_CONSOLE
 
 #define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
 
@@ -3050,7 +3048,7 @@
 	info->io_type = state->io_type;
 	info->iomem_base = state->iomem_base;
 	info->iomem_reg_shift = state->iomem_reg_shift;
-	state->baud_base = get_au1000_uart_baud_base();
+	state->baud_base = get_au1x00_uart_baud_base();
 	quot = state->baud_base / baud;
 
 	cval = cflag & (CSIZE | CSTOPB);
@@ -3090,7 +3088,7 @@
 /*
  *	Register console.
  */
-void __init au1000_serial_console_init(void)
+void __init au1x00_serial_console_init(void)
 {
 	register_console(&sercons);
 }

Index: time.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/common/time.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- time.c	1 May 2002 18:00:29 -0000	1.12
+++ time.c	26 Sep 2002 05:39:39 -0000	1.13
@@ -201,7 +201,7 @@
 	count = read_32bit_cp0_register(CP0_COUNT);
 	cpu_speed = count * 2;
 	mips_counter_frequency = count;
-	set_au1000_uart_baud_base(((cpu_speed) / 4) / 16);
+	set_au1x00_uart_baud_base(((cpu_speed) / 4) / 16);
 	restore_flags(flags);
 	return (cpu_speed / HZ);
 }
@@ -221,8 +221,8 @@
 	est_freq -= est_freq%10000;
 	printk("CPU frequency %d.%02d MHz\n", est_freq/1000000, 
 	       (est_freq%1000000)*100/1000000);
-	set_au1000_speed(est_freq);
-	set_au1000_lcd_clock(); // program the LCD clock
+	set_au1x00_speed(est_freq);
+	set_au1x00_lcd_clock(); // program the LCD clock
 	r4k_cur = (read_32bit_cp0_register(CP0_COUNT) + r4k_offset);
 
 	write_32bit_cp0_register(CP0_COMPARE, r4k_cur);

[Linux-mips-commits]CVS: linux/arch/mips/au1000/pb1100 setup.c,1.6,1.7

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/au1000/pb1100
In directory usw-pr-cvs1:/tmp/cvs-serv1799/arch/mips/au1000/pb1100

Modified Files:
	setup.c 
Log Message:
Split up the Pb board and Au CPU dependencies properly.


Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/pb1100/setup.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- setup.c	25 Sep 2002 07:38:58 -0000	1.6
+++ setup.c	26 Sep 2002 05:39:39 -0000	1.7
@@ -52,7 +52,7 @@
 #define CONFIG_AU1000_OHCI_FIX
 #endif
 
-#if defined(CONFIG_AU1000_SERIAL_CONSOLE)
+#if defined(CONFIG_AU1X00_SERIAL_CONSOLE)
 extern void console_setup(char *, int *);
 char serial_console[20];
 #endif
@@ -85,7 +85,7 @@
 	__asm__ volatile ("sync");
 }
 
-void __init au1100_setup(void)
+void __init au1x00_setup(void)
 {
 	char *argptr;
 	u32 pin_func, static_cfg0;
@@ -98,7 +98,7 @@
 	/* Various early Au1000 Errata corrected by this */
 	set_cp0_config(1<<19); /* Config[OD] */
 
-#ifdef CONFIG_AU1000_SERIAL_CONSOLE
+#ifdef CONFIG_AU1X00_SERIAL_CONSOLE
 	if ((argptr = strstr(argptr, "console=")) == NULL) {
 		argptr = prom_getcmdline();
 		strcat(argptr, " console=ttyS0,115200");
@@ -133,7 +133,7 @@
 	au_writel(0, SYS_PININPUTEN);
 	udelay(100);
 
-#if defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1000_USB_DEVICE)
+#if defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE)
 #ifdef CONFIG_USB_OHCI
 	if ((argptr = strstr(argptr, "usb_ohci=")) == NULL) {
 	        char usb_args[80];
@@ -180,12 +180,12 @@
 
 	// get USB Functionality pin state (device vs host drive pins)	
 	pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x8000);
-#ifndef CONFIG_AU1000_USB_DEVICE
+#ifndef CONFIG_AU1X00_USB_DEVICE
 	// 2nd USB port is USB host
 	pin_func |= 0x8000;
 #endif
 	au_writel(pin_func, SYS_PINFUNC);
-#endif // defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1000_USB_DEVICE)
+#endif // defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE)
 
 #ifdef CONFIG_USB_OHCI
 	// enable host controller and wait for reset done