diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2014-03-07 11:27:00 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2014-03-07 11:27:00 +0000 |
commit | 2b43bb49dec4546cdca7e627b06e7682ae742591 (patch) | |
tree | 0d58c3ccdefbe53983cda5399612b4727f0ee81d /target/linux/generic/patches-3.14/102-ehci_hcd_ignore_oc.patch | |
parent | 3be7023c9be4e1381699ce393638ad63565c9ac5 (diff) | |
download | upstream-2b43bb49dec4546cdca7e627b06e7682ae742591.tar.gz upstream-2b43bb49dec4546cdca7e627b06e7682ae742591.tar.bz2 upstream-2b43bb49dec4546cdca7e627b06e7682ae742591.zip |
add preliminary 3.14 support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39789 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.14/102-ehci_hcd_ignore_oc.patch')
-rw-r--r-- | target/linux/generic/patches-3.14/102-ehci_hcd_ignore_oc.patch | 81 |
1 files changed, 81 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.14/102-ehci_hcd_ignore_oc.patch b/target/linux/generic/patches-3.14/102-ehci_hcd_ignore_oc.patch new file mode 100644 index 0000000000..7c32c6d5e0 --- /dev/null +++ b/target/linux/generic/patches-3.14/102-ehci_hcd_ignore_oc.patch @@ -0,0 +1,81 @@ +From 1e311820ec3055e3f08e687de6564692a7cec675 Mon Sep 17 00:00:00 2001 +From: Florian Fainelli <florian@openwrt.org> +Date: Mon, 28 Jan 2013 20:06:29 +0100 +Subject: [PATCH 11/12] USB: EHCI: add ignore_oc flag to disable overcurrent + checking + +This patch adds an ignore_oc flag which can be set by EHCI controller +not supporting or wanting to disable overcurrent checking. The EHCI +platform data in include/linux/usb/ehci_pdriver.h is also augmented to +take advantage of this new flag. + +Signed-off-by: Florian Fainelli <florian@openwrt.org> +--- + drivers/usb/host/ehci-hcd.c | 2 +- + drivers/usb/host/ehci-hub.c | 4 ++-- + drivers/usb/host/ehci-platform.c | 1 + + drivers/usb/host/ehci.h | 1 + + include/linux/usb/ehci_pdriver.h | 1 + + 5 files changed, 6 insertions(+), 3 deletions(-) + +--- a/drivers/usb/host/ehci-hcd.c ++++ b/drivers/usb/host/ehci-hcd.c +@@ -633,7 +633,7 @@ static int ehci_run (struct usb_hcd *hcd + "USB %x.%x started, EHCI %x.%02x%s\n", + ((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f), + temp >> 8, temp & 0xff, +- ignore_oc ? ", overcurrent ignored" : ""); ++ (ignore_oc || ehci->ignore_oc) ? ", overcurrent ignored" : ""); + + ehci_writel(ehci, INTR_MASK, + &ehci->regs->intr_enable); /* Turn On Interrupts */ +--- a/drivers/usb/host/ehci-hub.c ++++ b/drivers/usb/host/ehci-hub.c +@@ -641,7 +641,7 @@ ehci_hub_status_data (struct usb_hcd *hc + * always set, seem to clear PORT_OCC and PORT_CSC when writing to + * PORT_POWER; that's surprising, but maybe within-spec. + */ +- if (!ignore_oc) ++ if (!ignore_oc && !ehci->ignore_oc) + mask = PORT_CSC | PORT_PEC | PORT_OCC; + else + mask = PORT_CSC | PORT_PEC; +@@ -1001,7 +1001,7 @@ static int ehci_hub_control ( + if (temp & PORT_PEC) + status |= USB_PORT_STAT_C_ENABLE << 16; + +- if ((temp & PORT_OCC) && !ignore_oc){ ++ if ((temp & PORT_OCC) && (!ignore_oc && !ehci->ignore_oc)){ + status |= USB_PORT_STAT_C_OVERCURRENT << 16; + + /* +--- a/drivers/usb/host/ehci-platform.c ++++ b/drivers/usb/host/ehci-platform.c +@@ -47,6 +47,7 @@ static int ehci_platform_reset(struct us + ehci->has_synopsys_hc_bug = pdata->has_synopsys_hc_bug; + ehci->big_endian_desc = pdata->big_endian_desc; + ehci->big_endian_mmio = pdata->big_endian_mmio; ++ ehci->ignore_oc = pdata->ignore_oc; + + if (pdata->pre_setup) { + retval = pdata->pre_setup(hcd); +--- a/drivers/usb/host/ehci.h ++++ b/drivers/usb/host/ehci.h +@@ -226,6 +226,7 @@ struct ehci_hcd { /* one per controlle + unsigned frame_index_bug:1; /* MosChip (AKA NetMos) */ + unsigned need_oc_pp_cycle:1; /* MPC834X port power */ + unsigned imx28_write_fix:1; /* For Freescale i.MX28 */ ++ unsigned ignore_oc:1; + + /* required for usb32 quirk */ + #define OHCI_CTRL_HCFS (3 << 6) +--- a/include/linux/usb/ehci_pdriver.h ++++ b/include/linux/usb/ehci_pdriver.h +@@ -45,6 +45,7 @@ struct usb_ehci_pdata { + unsigned big_endian_desc:1; + unsigned big_endian_mmio:1; + unsigned no_io_watchdog:1; ++ unsigned ignore_oc:1; + + /* Turn on all power and clocks */ + int (*power_on)(struct platform_device *pdev); |