[resend, got list address wrong the first time...]
The 2.6 code for Intel's IXP4xx NPU line has been updated to
remove all references to IXP42x or IXP425 and replace it
with IXP4XX, including config options and file names. This
patch updates the USB-gadget pxa-udc driver with these changes.
Tnx,
~Deepak
--
Deepak Saxena - dsaxena at plexity dot net - http://www.plexity.net/
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.1709 -> 1.1710
# drivers/usb/gadget/Kconfig 1.10 -> 1.11
# drivers/usb/gadget/pxa2xx_udc.c 1.3 -> 1.4
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 04/03/14 [EMAIL PROTECTED] 1.1710
# pxa2xx_udc.c, Kconfig:
# IXP425/42x -> IXP4xx
# --------------------------------------------
#
diff -Nru a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
--- a/drivers/usb/gadget/Kconfig Sun Mar 14 22:08:38 2004
+++ b/drivers/usb/gadget/Kconfig Sun Mar 14 22:08:38 2004
@@ -61,8 +61,8 @@
default USB_GADGET
config USB_GADGET_PXA2XX
- boolean "PXA 2xx or IXP 42x"
- depends on ARCH_PXA || ARCH_IXP425
+ boolean "PXA 2xx or IXP 4xx"
+ depends on ARCH_PXA || ARCH_IXP4XX
help
Intel's PXA 2xx series XScale ARM-5TE processors include
an integrated full speed USB 1.1 device controller. The
diff -Nru a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c
--- a/drivers/usb/gadget/pxa2xx_udc.c Sun Mar 14 22:08:38 2004
+++ b/drivers/usb/gadget/pxa2xx_udc.c Sun Mar 14 22:08:38 2004
@@ -94,7 +94,7 @@
#define UDC_PROC_FILE
#endif
-#ifdef CONFIG_ARCH_IXP425
+#ifdef CONFIG_ARCH_IXP4XX
#undef USE_DMA
/* cpu-specific register addresses are compiled in to this code */
@@ -2374,8 +2374,8 @@
#if defined(CONFIG_ARCH_PXA)
#define CP15R0_XSCALE_VALUE 0x69052000 /* intel/arm/xscale */
-#elif defined(CONFIG_ARCH_IXP425)
-#define CP15R0_XSCALE_VALUE 0x69054000 /* intel/arm/ixp425 */
+#elif defined(CONFIG_ARCH_IXP4XX)
+#define CP15R0_XSCALE_VALUE 0x69054000 /* intel/arm/ixp4xx */
#endif
@@ -2434,7 +2434,7 @@
/* fall through */
case PXA250_C0: case PXA210_C0:
break;
-#elif defined(CONFIG_ARCH_IXP425)
+#elif defined(CONFIG_ARCH_IXP4XX)
case IXP425_A0:
out_dma = 0;
break;
