From c3e75d50143c5bcc3719b60e42465107de48c61f Mon Sep 17 00:00:00 2001 From: florian Date: Wed, 10 Aug 2011 11:37:21 +0000 Subject: [kernel] add ignore_oc in struct ehci_hcd git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27945 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-3.0/011-add_bcm63xx_ehci_controller.patch | 7 ++++--- .../patches-3.0/210-no_ehci_over_current_check.patch | 16 ---------------- 2 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 target/linux/brcm63xx/patches-3.0/210-no_ehci_over_current_check.patch (limited to 'target/linux/brcm63xx/patches-3.0') diff --git a/target/linux/brcm63xx/patches-3.0/011-add_bcm63xx_ehci_controller.patch b/target/linux/brcm63xx/patches-3.0/011-add_bcm63xx_ehci_controller.patch index b3138345f..913bf3615 100644 --- a/target/linux/brcm63xx/patches-3.0/011-add_bcm63xx_ehci_controller.patch +++ b/target/linux/brcm63xx/patches-3.0/011-add_bcm63xx_ehci_controller.patch @@ -7,7 +7,7 @@ Signed-off-by: Maxime Bizon --- /dev/null +++ b/drivers/usb/host/ehci-bcm63xx.c -@@ -0,0 +1,154 @@ +@@ -0,0 +1,155 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive @@ -118,9 +118,10 @@ Signed-off-by: Maxime Bizon + ehci->big_endian_desc = 0; + ehci->caps = hcd->regs; + ehci->regs = hcd->regs + -+ HC_LENGTH(ehci, ehci_readl(ehci, &ehci->caps->hc_capbase)); ++ HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase)); + ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params); + ehci->sbrn = 0x20; ++ ehci->ignore_oc = 1; + + ret = usb_add_hcd(hcd, irq, IRQF_DISABLED); + if (ret) @@ -164,7 +165,7 @@ Signed-off-by: Maxime Bizon +MODULE_ALIAS("platform:bcm63xx_ehci"); --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c -@@ -1286,6 +1286,11 @@ MODULE_LICENSE ("GPL"); +@@ -1284,6 +1284,11 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER ehci_grlib_driver #endif diff --git a/target/linux/brcm63xx/patches-3.0/210-no_ehci_over_current_check.patch b/target/linux/brcm63xx/patches-3.0/210-no_ehci_over_current_check.patch deleted file mode 100644 index f2c10da85..000000000 --- a/target/linux/brcm63xx/patches-3.0/210-no_ehci_over_current_check.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/drivers/usb/host/ehci-hub.c -+++ b/drivers/usb/host/ehci-hub.c -@@ -891,11 +891,13 @@ static int ehci_hub_control ( - * 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!! */ -- cgit v1.2.3