Merge git://git.denx.de/u-boot-video

[J-u-boot.git] / doc / README.generic_usb_ohci

diff --git a/doc/README.generic_usb_ohci b/doc/README.generic_usb_ohci
index 494dd1f5d92bfa404d47671ae27f6525394f2698..61300c35758a8c0c222c8605713d2ee90b984ee3 100644 (file)
--- a/doc/README.generic_usb_ohci
+++ b/doc/README.generic_usb_ohci
@@ -1,7 +1,7 @@
 Notes on the the generic USB-OHCI driver
 ========================================
 
-This driver (drivers/usb_ohci.[ch]) is the result of the merge of
+This driver (drivers/usb/usb_ohci.[ch]) is the result of the merge of
 various existing OHCI drivers that were basically identical beside
 cpu/board dependant initalization. This initalization has been moved
 into cpu/board directories and are called via the hooks below.
@@ -11,24 +11,24 @@ Configuration options
 
        CONFIG_USB_OHCI_NEW: enable the new OHCI driver
 
-       CFG_USB_OHCI_BOARD_INIT: call the board dependant hooks:
+       CONFIG_SYS_USB_OHCI_BOARD_INIT: call the board dependant hooks:
 
                  - extern int usb_board_init(void);
                  - extern int usb_board_stop(void);
                  - extern int usb_cpu_init_fail(void);
 
-       CFG_USB_OHCI_CPU_INIT: call the cpu dependant hooks:
+       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);
 
-       CFG_USB_OHCI_REGS_BASE: defines the base address of the OHCI
+       CONFIG_SYS_USB_OHCI_REGS_BASE: defines the base address of the OHCI
                                registers
 
-       CFG_USB_OHCI_SLOT_NAME: slot name
+       CONFIG_SYS_USB_OHCI_SLOT_NAME: slot name
 
-       CFG_USB_OHCI_MAX_ROOT_PORTS: maximal number of ports of the
+       CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS: maximal number of ports of the
                                     root hub.
 
 
@@ -36,10 +36,10 @@ Endianness issues
 ------------------
 
 The USB bus operates in little endian, but unfortunately there are
-OHCI controllers that operate in big endian such as ppc4xx and
-mpc5xxx. For these the config option
+OHCI controllers that operate in big endian such as ppc4xx. For these the
+config option
 
-       CFG_OHCI_BE_CONTROLLER
+       CONFIG_SYS_OHCI_BE_CONTROLLER
 
 needs to be defined.
 
@@ -51,7 +51,13 @@ 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:
 
-       CFG_OHCI_SWAP_REG_ACCESS
+       CONFIG_SYS_OHCI_SWAP_REG_ACCESS