aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2006-06-08 22:44:07 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-06-08 22:44:07 +0100
commit0c27c5d5b93339df4def7ced77ea5be26df4d84b (patch)
tree5b0c8efeb5b4b6cfd840c125a875c12fbecbf014 /drivers
parent[ARM] Fix Neponset IRQ handling (diff)
downloadlinux-dev-0c27c5d5b93339df4def7ced77ea5be26df4d84b.tar.xz
linux-dev-0c27c5d5b93339df4def7ced77ea5be26df4d84b.zip
[ARM] 3547/1: PXA-OHCI: Allow platforms to specify a power budget
Patch from Richard Purdie Add a power budget variable to the PXA OHCI platform data and add a default value for the spitz platform(s) which prevents known failures with certain USB devices. Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/host/ohci-pxa27x.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c
index acde8868da21..fafe7c1265b3 100644
--- a/drivers/usb/host/ohci-pxa27x.c
+++ b/drivers/usb/host/ohci-pxa27x.c
@@ -185,6 +185,9 @@ int usb_hcd_pxa27x_probe (const struct hc_driver *driver, struct platform_device
/* Select Power Management Mode */
pxa27x_ohci_select_pmm(inf->port_mode);
+ if (inf->power_budget)
+ hcd->power_budget = inf->power_budget;
+
ohci_hcd_init(hcd_to_ohci(hcd));
retval = usb_add_hcd(hcd, pdev->resource[1].start, SA_INTERRUPT);