Introduced the configuration option CONFIG_USB_OHCI_NEW in order to be able

to choose between the old and the generic OHCI drivers.

diff --git a/board/trab/auto_update.c b/board/trab/auto_update.c
index d2c8d44a79f87188ac87383da844491700a40474..7684499c246dc2ed4ec8dd13088a38e7dae05daf 100644 (file)
--- a/board/trab/auto_update.c
+++ b/board/trab/auto_update.c
@@ -34,7 +34,7 @@
 
 #ifdef CONFIG_AUTO_UPDATE
 
-#ifndef CONFIG_USB_OHCI
+#ifndef CONFIG_USB_OHCI_NEW
 #error "must define CONFIG_USB_OHCI"
 #endif
 

diff --git a/cpu/arm920t/at91rm9200/usb.c b/cpu/arm920t/at91rm9200/usb.c
index 98e3cdd58a71f7de6f751255f5a23dbd748badc2..366262e4ccd0c2f5b71f235a4d2fdd50a82f7183 100644 (file)
--- a/cpu/arm920t/at91rm9200/usb.c
+++ b/cpu/arm920t/at91rm9200/usb.c
@@ -23,7 +23,7 @@
 
 #include <common.h>
 
-#if defined(CONFIG_USB_OHCI) && defined(CFG_USB_OHCI_CPU_INIT)
+#if defined(CONFIG_USB_OHCI_NEW) && defined(CFG_USB_OHCI_CPU_INIT)
 # ifdef CONFIG_AT91RM9200
 
 #include <asm/arch/hardware.h>

diff --git a/cpu/arm920t/s3c24x0/usb.c b/cpu/arm920t/s3c24x0/usb.c
index 4bc7961a019d7748da2434811410331ecc9f08e5..ef5d5bf71b139e50e8b80d1989b5eb725f3f5ece 100644 (file)
--- a/cpu/arm920t/s3c24x0/usb.c
+++ b/cpu/arm920t/s3c24x0/usb.c
@@ -23,7 +23,7 @@
 
 #include <common.h>
 
-#if defined(CONFIG_USB_OHCI) && defined(CFG_USB_OHCI_CPU_INIT)
+#if defined(CONFIG_USB_OHCI_NEW) && defined(CFG_USB_OHCI_CPU_INIT)
 # if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410)
 
 #if defined(CONFIG_S3C2400)

diff --git a/cpu/pxa/usb.c b/cpu/pxa/usb.c
index bff5bfb6ae9408649fbbcea3e687b88173807939..5d273cb35186829954618324df6d8c7ec482b037 100644 (file)
--- a/cpu/pxa/usb.c
+++ b/cpu/pxa/usb.c
@@ -23,7 +23,7 @@
 
 #include <common.h>
 
-#if defined(CONFIG_USB_OHCI) && defined(CFG_USB_OHCI_CPU_INIT)
+#if defined(CONFIG_USB_OHCI_NEW) && defined(CFG_USB_OHCI_CPU_INIT)
 # ifdef CONFIG_CPU_MONAHANS
 
 #include <asm/arch/pxa-regs.h>

diff --git a/drivers/usb_ohci.c b/drivers/usb_ohci.c
index be1a615ebeb2b4bb22ab2da7e1a7693877033626..482633fc67ebc95367f4ed6f6fd28729f0a4c255 100644 (file)
--- a/drivers/usb_ohci.c
+++ b/drivers/usb_ohci.c
@@ -43,7 +43,7 @@
 #include <common.h>
 /* #include <pci.h> no PCI on the S3C24X0 */
 
-#ifdef CONFIG_USB_OHCI
+#ifdef CONFIG_USB_OHCI_NEW
 
 /* mk: are these really required? */
 #if defined(CONFIG_S3C2400)
@@ -1756,4 +1756,4 @@ int usb_lowlevel_stop(void)
        return 0;
 }
 
-#endif /* CONFIG_USB_OHCI */
+#endif /* CONFIG_USB_OHCI_NEW */

diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 832dcdde5867359765db6ff72acfaaf958dd7737..6c8712b68d02bbb44a869fab23a8a31671c3d7c8 100644 (file)
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -125,7 +125,7 @@
 
 /* USB */
 #ifdef CONFIG_STK52XX
-#define CONFIG_USB_OHCI
+#define CONFIG_USB_OHCI_NEW
 #define ADD_USB_CMD            CFG_CMD_USB | CFG_CMD_FAT
 #define CONFIG_USB_STORAGE
 

diff --git a/include/configs/delta.h b/include/configs/delta.h
index 0617ad864e7b7e0b15369274d205e2cd5ee928aa..4038f219602b107f6c997582944c8583bfa7ad59 100644 (file)
--- a/include/configs/delta.h
+++ b/include/configs/delta.h
@@ -103,7 +103,7 @@
 #endif
 
 /* USB */
-#define CONFIG_USB_OHCI         1
+#define CONFIG_USB_OHCI_NEW    1
 #define CONFIG_USB_STORAGE      1
 #define CONFIG_DOS_PARTITION    1
 

diff --git a/include/configs/mp2usb.h b/include/configs/mp2usb.h
index d182d49488a3fa98284cb8f424c8e206b78fdfe9..2cf78a3b150b314f38a1ca1845296b83602299aa 100644 (file)
--- a/include/configs/mp2usb.h
+++ b/include/configs/mp2usb.h
@@ -101,7 +101,7 @@
 
 #undef CONFIG_MODEM_SUPPORT            /* disable modem initialization stuff */
 
-#define CONFIG_USB_OHCI                1
+#define CONFIG_USB_OHCI_NEW    1
 #define CONFIG_USB_KEYBOARD    1
 #define CONFIG_USB_STORAGE     1
 #define CONFIG_DOS_PARTITION   1

diff --git a/include/configs/trab.h b/include/configs/trab.h
index 33617cdcd495e6c64901f2231525d283b15624d9..acf86d08ad2d3baf74b93eec137f88451aefc4ec 100644 (file)
--- a/include/configs/trab.h
+++ b/include/configs/trab.h
@@ -80,7 +80,7 @@
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
 
 /* USB stuff */
-#define CONFIG_USB_OHCI                1
+#define CONFIG_USB_OHCI_NEW    1
 #define CONFIG_USB_STORAGE     1
 #define CONFIG_DOS_PARTITION   1
 

diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h
index e6a02c6316ca33aef50ce583cb8b98692aab6da2..7f434e93f8d3145a3ddec2011c8fadb6d74764b2 100644 (file)
--- a/include/configs/yosemite.h
+++ b/include/configs/yosemite.h
@@ -213,7 +213,7 @@
 
 #ifdef CONFIG_440EP
 /* USB */
-#define CONFIG_USB_OHCI
+#define CONFIG_USB_OHCI_NEW
 #define CONFIG_USB_STORAGE
 
 #undef CFG_USB_OHCI_BOARD_INIT

diff --git a/include/usb.h b/include/usb.h
index bf7155404170337c8b7e1701c1aca5582c761262..fafac8934adb26aa45f36df18ea5ba480a7d3541 100644 (file)
--- a/include/usb.h
+++ b/include/usb.h
@@ -169,7 +169,7 @@ struct usb_device {
  * this is how the lowlevel part communicate with the outer world
  */
 
-#if defined(CONFIG_USB_UHCI) || defined(CONFIG_USB_OHCI) || defined (CONFIG_USB_SL811HS)
+#if defined(CONFIG_USB_UHCI) || defined(CONFIG_USB_OHCI) || defined (CONFIG_USB_SL811HS) || defined(CONFIG_USB_OHCI_NEW)
 int usb_lowlevel_init(void);
 int usb_lowlevel_stop(void);
 int submit_bulk_msg(struct usb_device *dev, unsigned long pipe, void *buffer,int transfer_len);