summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2008-03-05 12:29:32 +0100
committerStefan Roese <sr@denx.de>2008-03-15 07:28:05 +0100
commit2596f5b9d353ff3e4387a3325d05740f16958038 (patch)
tree34293a09f79af737592c5ad835f0c4a79a5ba73b
parent71665ebf88408ff2acb762af47989fd4365b321a (diff)
downloadtalos-obmc-uboot-2596f5b9d353ff3e4387a3325d05740f16958038.tar.gz
talos-obmc-uboot-2596f5b9d353ff3e4387a3325d05740f16958038.zip
usb: Add CFG_OHCI_USE_NPS to common USB-OHCI driver
This patch adds CFG_OHCI_USE_NPS to the common USB-OHCI driver. This way a board just needs to define this new option to enable the "force NoPowerSwitching mode" instead of adding new CPU/architecture defines to the USB source itself. This new option will be used first with the new AMCC 460EX Canyonlands board port, which will be posted in a few days. This patch also fixes a small compilation problem when DEBUG is enabled. Signed-off-by: Stefan Roese <sr@denx.de>
-rw-r--r--drivers/usb/usb_ohci.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/usb_ohci.c b/drivers/usb/usb_ohci.c
index fb4726f283..829bbcae3a 100644
--- a/drivers/usb/usb_ohci.c
+++ b/drivers/usb/usb_ohci.c
@@ -68,7 +68,8 @@
defined(CONFIG_S3C2410) || \
defined(CONFIG_440EP) || \
defined(CONFIG_PCI_OHCI) || \
- defined(CONFIG_MPC5200)
+ defined(CONFIG_MPC5200) || \
+ defined(CFG_OHCI_USE_NPS)
# define OHCI_USE_NPS /* force NoPowerSwitching mode */
#endif
@@ -415,7 +416,7 @@ static void ohci_dump (ohci_t *controller, int verbose)
ep_print_int_eds (controller, "hcca");
dbg ("hcca frame #%04x", controller->hcca->frame_no);
ohci_dump_roothub (controller, 1);
-
+}
#endif /* DEBUG */
/*-------------------------------------------------------------------------*
OpenPOWER on IntegriCloud