aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-05-02 19:14:10 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-05-02 19:14:10 +0000
commit4a0dfb52dfc2ef79eed6bc883af4a5c72af77d29 (patch)
tree727a4e8278c2976354142c044d4c6207a18b2a33
parent443cf0e42716bf32f2d18b177911a7eec3bdfd20 (diff)
downloadupstream-4a0dfb52dfc2ef79eed6bc883af4a5c72af77d29.tar.gz
upstream-4a0dfb52dfc2ef79eed6bc883af4a5c72af77d29.tar.bz2
upstream-4a0dfb52dfc2ef79eed6bc883af4a5c72af77d29.zip
[brcm63xx] do not write to per-port over-current register, which is bogus (#6898)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21306 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/brcm63xx/patches-2.6.32/260-no_ehci_over_current_check.patch18
-rw-r--r--target/linux/brcm63xx/patches-2.6.33/260-no_ehci_over_current_check.patch18
2 files changed, 36 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-2.6.32/260-no_ehci_over_current_check.patch b/target/linux/brcm63xx/patches-2.6.32/260-no_ehci_over_current_check.patch
new file mode 100644
index 0000000000..28eb78ce8e
--- /dev/null
+++ b/target/linux/brcm63xx/patches-2.6.32/260-no_ehci_over_current_check.patch
@@ -0,0 +1,18 @@
+Index: linux-2.6.32.12/drivers/usb/host/ehci-hub.c
+===================================================================
+--- linux-2.6.32.12.orig/drivers/usb/host/ehci-hub.c 2010-05-02 21:06:45.000000000 +0200
++++ linux-2.6.32.12/drivers/usb/host/ehci-hub.c 2010-05-02 21:07:08.000000000 +0200
+@@ -741,11 +741,13 @@
+ * power switching; they're allowed to just limit the
+ * current. khubd will turn the power back on.
+ */
++#ifndef CONFIG_BCM63XX
+ if (HCS_PPC (ehci->hcs_params)){
+ ehci_writel(ehci,
+ temp & ~(PORT_RWC_BITS | PORT_POWER),
+ status_reg);
+ }
++#endif
+ }
+
+ /* whoever resumes must GetPortStatus to complete it!! */
diff --git a/target/linux/brcm63xx/patches-2.6.33/260-no_ehci_over_current_check.patch b/target/linux/brcm63xx/patches-2.6.33/260-no_ehci_over_current_check.patch
new file mode 100644
index 0000000000..28eb78ce8e
--- /dev/null
+++ b/target/linux/brcm63xx/patches-2.6.33/260-no_ehci_over_current_check.patch
@@ -0,0 +1,18 @@
+Index: linux-2.6.32.12/drivers/usb/host/ehci-hub.c
+===================================================================
+--- linux-2.6.32.12.orig/drivers/usb/host/ehci-hub.c 2010-05-02 21:06:45.000000000 +0200
++++ linux-2.6.32.12/drivers/usb/host/ehci-hub.c 2010-05-02 21:07:08.000000000 +0200
+@@ -741,11 +741,13 @@
+ * power switching; they're allowed to just limit the
+ * current. khubd will turn the power back on.
+ */
++#ifndef CONFIG_BCM63XX
+ if (HCS_PPC (ehci->hcs_params)){
+ ehci_writel(ehci,
+ temp & ~(PORT_RWC_BITS | PORT_POWER),
+ status_reg);
+ }
++#endif
+ }
+
+ /* whoever resumes must GetPortStatus to complete it!! */