summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Poselenov <sposelenov@emcraft.com>2008-05-27 11:35:02 +0200
committerWolfgang Denk <wd@denx.de>2008-05-27 12:53:34 +0200
commit5a904e5637cff1d708dc67098004f83ba9e84c54 (patch)
tree2f7d84a22386ddbfafc6c3fbb454d1a6129316d5
parent2f7468aeba60e1288030a8d007c4e63bd3f13221 (diff)
downloadu-boot-imx-5a904e5637cff1d708dc67098004f83ba9e84c54.zip
u-boot-imx-5a904e5637cff1d708dc67098004f83ba9e84c54.tar.gz
u-boot-imx-5a904e5637cff1d708dc67098004f83ba9e84c54.tar.bz2
USB: add new configuration variable CONFIG_PCI_OHCI_DEVNO
In case of several PCI USB controllers on a board this variable specifys which controller to use. See doc/README.generic_usb_ohci for details. Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
-rw-r--r--doc/README.generic_usb_ohci6
-rw-r--r--drivers/usb/usb_ohci.c5
2 files changed, 10 insertions, 1 deletions
diff --git a/doc/README.generic_usb_ohci b/doc/README.generic_usb_ohci
index c44c501..147ea51 100644
--- a/doc/README.generic_usb_ohci
+++ b/doc/README.generic_usb_ohci
@@ -51,6 +51,12 @@ 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:
diff --git a/drivers/usb/usb_ohci.c b/drivers/usb/usb_ohci.c
index ee0f2e4..318478a 100644
--- a/drivers/usb/usb_ohci.c
+++ b/drivers/usb/usb_ohci.c
@@ -53,6 +53,9 @@
#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>
@@ -1818,7 +1821,7 @@ int usb_lowlevel_init(void)
gohci.sleeping = 0;
gohci.irq = -1;
#ifdef CONFIG_PCI_OHCI
- pdev = pci_find_devices(ohci_pci_ids, 0);
+ pdev = pci_find_devices(ohci_pci_ids, CONFIG_PCI_OHCI_DEVNO);
if (pdev != -1) {
u16 vid, did;