diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2014-10-27 22:55:39 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2014-10-27 22:55:39 +0000 |
commit | 2644af4717cf9cc3cf89564ca017f596a7dcad05 (patch) | |
tree | 7f2121f700446e60159a365094fdc6eea16d5cb7 /target/linux/generic/patches-3.18/102-ehci_hcd_ignore_oc.patch | |
parent | 5e558fcd48c8c4acb87fe7bcf3eb2a66bb279503 (diff) | |
download | master-187ad058-2644af4717cf9cc3cf89564ca017f596a7dcad05.tar.gz master-187ad058-2644af4717cf9cc3cf89564ca017f596a7dcad05.tar.bz2 master-187ad058-2644af4717cf9cc3cf89564ca017f596a7dcad05.zip |
kernel: make the kernel 3.18 patches apply and boot on arm.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43095 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/102-ehci_hcd_ignore_oc.patch')
-rw-r--r-- | target/linux/generic/patches-3.18/102-ehci_hcd_ignore_oc.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/target/linux/generic/patches-3.18/102-ehci_hcd_ignore_oc.patch b/target/linux/generic/patches-3.18/102-ehci_hcd_ignore_oc.patch index de087d551c..f498d4eac6 100644 --- a/target/linux/generic/patches-3.18/102-ehci_hcd_ignore_oc.patch +++ b/target/linux/generic/patches-3.18/102-ehci_hcd_ignore_oc.patch @@ -51,14 +51,15 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org> /* --- a/drivers/usb/host/ehci-platform.c +++ b/drivers/usb/host/ehci-platform.c -@@ -57,6 +57,7 @@ static int ehci_platform_reset(struct us +@@ -226,6 +226,8 @@ static int ehci_platform_probe(struct pl + ehci->big_endian_desc = 1; + if (pdata->big_endian_mmio) + ehci->big_endian_mmio = 1; ++ if (pdata->ignore_oc) ++ ehci->ignore_oc = 1; - hcd->has_tt = pdata->has_tt; - ehci->has_synopsys_hc_bug = pdata->has_synopsys_hc_bug; -+ ehci->ignore_oc = pdata->ignore_oc; - - if (pdata->pre_setup) { - retval = pdata->pre_setup(hcd); + #ifndef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO + if (ehci->big_endian_mmio) { --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h @@ -226,6 +226,7 @@ struct ehci_hcd { /* one per controlle |