usb: ohci-hcd: Remove some unused legacy code

At this point, the only user of ohci-hcd that also uses PCI is using DM,
so we can drop CONFIG_PCI_OHCI* usage.  No platforms set either of
CONFIG_SYS_USB_OHCI_BOARD_INIT or CONFIG_SYS_USB_OHCI_CPU_INIT so those
hooks can be removed as well.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/doc/README.generic_usb_ohci b/doc/README.generic_usb_ohci
index 65b0896c7fd29603a69e3e1f6c1b82997d205491..a7da4bcb836eec125b1c92325458f88764a8f8df 100644 (file)
--- a/doc/README.generic_usb_ohci
+++ b/doc/README.generic_usb_ohci
@@ -11,18 +11,6 @@ Configuration options
 
        CONFIG_USB_OHCI_NEW: enable the new OHCI driver
 
-       CONFIG_SYS_USB_OHCI_BOARD_INIT: call the board dependant hooks:
-
-                 - extern int board_usb_init(void);
-                 - extern int usb_board_stop(void);
-                 - extern int usb_cpu_init_fail(void);
-
-       CONFIG_SYS_USB_OHCI_CPU_INIT: call the cpu dependant hooks:
-
-                 - extern int usb_cpu_init(void);
-                 - extern int usb_cpu_stop(void);
-                 - extern int usb_cpu_init_fail(void);
-
        CONFIG_SYS_USB_OHCI_REGS_BASE: defines the base address of the OHCI
                                registers
 
@@ -43,21 +31,3 @@ config option
 
 needs to be defined.
 
-
-PCI Controllers
-----------------
-
-You'll need to define
-
-       CONFIG_PCI_OHCI
-
-If you have several USB PCI controllers, define
-
-       CONFIG_PCI_OHCI_DEVNO: number of the OHCI device in PCI list
-
-If undefined, the first instance found in PCI space will be used.
-
-PCI Controllers need to do byte swapping on register accesses, so they
-should to define:
-
-       CONFIG_SYS_OHCI_SWAP_REG_ACCESS

diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index fedf0db9c7e4f081ae6f73e594cc5c25bf2de416..9acef5ee4f84813fc5037d94ec20b0a1ac77835d 100644 (file)
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -35,13 +35,6 @@
 #include <asm/cache.h>
 #include <linux/delay.h>
 
-#if defined(CONFIG_PCI_OHCI)
-# include <pci.h>
-#if !defined(CONFIG_PCI_OHCI_DEVNO)
-#define CONFIG_PCI_OHCI_DEVNO  0
-#endif
-#endif
-
 #include <malloc.h>
 #include <memalign.h>
 #include <usb.h>
@@ -53,7 +46,6 @@
 #endif
 
 #if defined(CONFIG_CPU_ARM920T) || \
-       defined(CONFIG_PCI_OHCI) || \
        defined(CONFIG_PCI) || \
        defined(CONFIG_SYS_OHCI_USE_NPS)
 # define OHCI_USE_NPS          /* force NoPowerSwitching mode */
@@ -68,26 +60,6 @@
 #define OHCI_CONTROL_INIT \
        (OHCI_CTRL_CBSR & 0x3) | OHCI_CTRL_IE | OHCI_CTRL_PLE
 
-#if !CONFIG_IS_ENABLED(DM_USB)
-#ifdef CONFIG_PCI_OHCI
-static struct pci_device_id ohci_pci_ids[] = {
-       {0x10b9, 0x5237},       /* ULI1575 PCI OHCI module ids */
-       {0x1033, 0x0035},       /* NEC PCI OHCI module ids */
-       {0x1131, 0x1561},       /* Philips 1561 PCI OHCI module ids */
-       /* Please add supported PCI OHCI controller ids here */
-       {0, 0}
-};
-#endif
-#endif
-
-#ifdef CONFIG_PCI_EHCI_DEVNO
-static struct pci_device_id ehci_pci_ids[] = {
-       {0x1131, 0x1562},       /* Philips 1562 PCI EHCI module ids */
-       /* Please add supported PCI EHCI controller ids here */
-       {0, 0}
-};
-#endif
-
 #ifdef DEBUG
 #define dbg(format, arg...) printf("DEBUG: " format "\n", ## arg)
 #else
@@ -2007,21 +1979,6 @@ static char ohci_inited = 0;
 
 int usb_lowlevel_init(int index, enum usb_init_type init, void **controller)
 {
-#ifdef CONFIG_PCI_OHCI
-       pci_dev_t pdev;
-#endif
-
-#ifdef CONFIG_SYS_USB_OHCI_CPU_INIT
-       /* cpu dependant init */
-       if (usb_cpu_init())
-               return -1;
-#endif
-
-#ifdef CONFIG_SYS_USB_OHCI_BOARD_INIT
-       /*  board dependant init */
-       if (board_usb_init(index, USB_INIT_HOST))
-               return -1;
-#endif
        memset(&gohci, 0, sizeof(ohci_t));
 
        /* align the storage */
@@ -2036,28 +1993,7 @@ int usb_lowlevel_init(int index, enum usb_init_type init, void **controller)
        gohci.disabled = 1;
        gohci.sleeping = 0;
        gohci.irq = -1;
-#ifdef CONFIG_PCI_OHCI
-       pdev = pci_find_devices(ohci_pci_ids, CONFIG_PCI_OHCI_DEVNO);
-
-       if (pdev != -1) {
-               u16 vid, did;
-               u32 base;
-               pci_read_config_word(pdev, PCI_VENDOR_ID, &vid);
-               pci_read_config_word(pdev, PCI_DEVICE_ID, &did);
-               printf("OHCI pci controller (%04x, %04x) found @(%d:%d:%d)\n",
-                               vid, did, (pdev >> 16) & 0xff,
-                               (pdev >> 11) & 0x1f, (pdev >> 8) & 0x7);
-               pci_read_config_dword(pdev, PCI_BASE_ADDRESS_0, &base);
-               printf("OHCI regs address 0x%08x\n", base);
-               gohci.regs = (struct ohci_regs *)base;
-       } else {
-               printf("%s: OHCI devnr: %d not found\n", __func__,
-                      CONFIG_PCI_OHCI_DEVNO);
-               return -1;
-       }
-#else
        gohci.regs = (struct ohci_regs *)CONFIG_SYS_USB_OHCI_REGS_BASE;
-#endif
 
        gohci.flags = 0;
        gohci.slot_name = CONFIG_SYS_USB_OHCI_SLOT_NAME;
@@ -2065,15 +2001,6 @@ int usb_lowlevel_init(int index, enum usb_init_type init, void **controller)
        if (hc_reset (&gohci) < 0) {
                hc_release_ohci (&gohci);
                err ("can't reset usb-%s", gohci.slot_name);
-#ifdef CONFIG_SYS_USB_OHCI_BOARD_INIT
-               /* board dependant cleanup */
-               board_usb_cleanup(index, USB_INIT_HOST);
-#endif
-
-#ifdef CONFIG_SYS_USB_OHCI_CPU_INIT
-               /* cpu dependant cleanup */
-               usb_cpu_init_fail();
-#endif
                return -1;
        }
 
@@ -2081,15 +2008,6 @@ int usb_lowlevel_init(int index, enum usb_init_type init, void **controller)
                err("can't start usb-%s", gohci.slot_name);
                hc_release_ohci(&gohci);
                /* Initialization failed */
-#ifdef CONFIG_SYS_USB_OHCI_BOARD_INIT
-               /* board dependant cleanup */
-               usb_board_stop();
-#endif
-
-#ifdef CONFIG_SYS_USB_OHCI_CPU_INIT
-               /* cpu dependant cleanup */
-               usb_cpu_stop();
-#endif
                return -1;
        }
 
@@ -2112,17 +2030,6 @@ int usb_lowlevel_stop(int index)
        /* call hc_release_ohci() here ? */
        hc_reset(&gohci);
 
-#ifdef CONFIG_SYS_USB_OHCI_BOARD_INIT
-       /* board dependant cleanup */
-       if (usb_board_stop())
-               return -1;
-#endif
-
-#ifdef CONFIG_SYS_USB_OHCI_CPU_INIT
-       /* cpu dependant cleanup */
-       if (usb_cpu_stop())
-               return -1;
-#endif
        /* This driver is no longer initialised. It needs a new low-level
         * init (board/cpu) before it can be used again. */
        ohci_inited = 0;

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index db28268132614c87cf43ea7b4be9ca0137613208..5dc8d8559882f88286b5bf2f3315a7b24a22573c 100644 (file)
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -222,7 +222,4 @@
 
 /* pass open firmware flat tree */
 
-/* USB support */
-#define CONFIG_PCI_OHCI                        1
-
 #endif /* __CONFIG_H */