diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-08-10 11:37:21 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-08-10 11:37:21 +0000 |
| commit | c3e75d50143c5bcc3719b60e42465107de48c61f (patch) | |
| tree | 3cd327b1399890ecd5faf93032d7d1d7adbf815b /target/linux/brcm63xx/patches-3.1 | |
| parent | d3bd4c6457cd7137418eb560a76f88a2913ea98b (diff) | |
[kernel] add ignore_oc in struct ehci_hcd
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27945 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.1')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.1/011-add_bcm63xx_ehci_controller.patch | 5 | ||||
| -rw-r--r-- | target/linux/brcm63xx/patches-3.1/210-no_ehci_over_current_check.patch | 17 |
2 files changed, 3 insertions, 19 deletions
diff --git a/target/linux/brcm63xx/patches-3.1/011-add_bcm63xx_ehci_controller.patch b/target/linux/brcm63xx/patches-3.1/011-add_bcm63xx_ehci_controller.patch index 397562cac..62c39c3a0 100644 --- a/target/linux/brcm63xx/patches-3.1/011-add_bcm63xx_ehci_controller.patch +++ b/target/linux/brcm63xx/patches-3.1/011-add_bcm63xx_ehci_controller.patch @@ -7,7 +7,7 @@ Signed-off-by: Maxime Bizon <mbizon@freebox.fr> --- /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 <mbizon@freebox.fr> + 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) diff --git a/target/linux/brcm63xx/patches-3.1/210-no_ehci_over_current_check.patch b/target/linux/brcm63xx/patches-3.1/210-no_ehci_over_current_check.patch deleted file mode 100644 index bb5d9e77f..000000000 --- a/target/linux/brcm63xx/patches-3.1/210-no_ehci_over_current_check.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/drivers/usb/host/ehci-hub.c -+++ b/drivers/usb/host/ehci-hub.c -@@ -816,12 +816,14 @@ 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 ((temp & PORT_OC) && HCS_PPC(ehci->hcs_params)) { - ehci_writel(ehci, - temp & ~(PORT_RWC_BITS | PORT_POWER), - status_reg); - temp = ehci_readl(ehci, status_reg); - } -+#endif - } - - /* whoever resumes must GetPortStatus to complete it!! */ |