diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-07-19 17:58:46 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-07-19 17:58:46 +0000 |
commit | 651504de1ec5fa4e661a7944746fb87659938edc (patch) | |
tree | a6046d52b05ae64911922686327e2e92ba064dd4 /target/linux/ar71xx/patches-4.1/490-usb-ehci-add-quirks-for-qca-socs.patch | |
parent | ed2bc20d7f7aab0886ccf8baf4141740c249f6a8 (diff) | |
download | master-187ad058-651504de1ec5fa4e661a7944746fb87659938edc.tar.gz master-187ad058-651504de1ec5fa4e661a7944746fb87659938edc.tar.bz2 master-187ad058-651504de1ec5fa4e661a7944746fb87659938edc.zip |
ar71xx: refresh 4.1 patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46427 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/patches-4.1/490-usb-ehci-add-quirks-for-qca-socs.patch')
-rw-r--r-- | target/linux/ar71xx/patches-4.1/490-usb-ehci-add-quirks-for-qca-socs.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/ar71xx/patches-4.1/490-usb-ehci-add-quirks-for-qca-socs.patch b/target/linux/ar71xx/patches-4.1/490-usb-ehci-add-quirks-for-qca-socs.patch index a5053130d6..162510bb08 100644 --- a/target/linux/ar71xx/patches-4.1/490-usb-ehci-add-quirks-for-qca-socs.patch +++ b/target/linux/ar71xx/patches-4.1/490-usb-ehci-add-quirks-for-qca-socs.patch @@ -53,16 +53,16 @@ #define OHCI_CTRL_HCFS (3 << 6) --- a/include/linux/usb/ehci_pdriver.h +++ b/include/linux/usb/ehci_pdriver.h -@@ -46,6 +46,8 @@ struct usb_ehci_pdata { - unsigned big_endian_mmio:1; - unsigned no_io_watchdog:1; +@@ -50,6 +50,8 @@ struct usb_ehci_pdata { + unsigned reset_on_resume:1; + unsigned dma_mask_64:1; unsigned ignore_oc:1; + unsigned qca_force_host_mode:1; + unsigned qca_force_16bit_ptw:1; /* Turn on all power and clocks */ int (*power_on)(struct platform_device *pdev); -@@ -55,6 +57,7 @@ struct usb_ehci_pdata { +@@ -59,6 +61,7 @@ struct usb_ehci_pdata { * turn off everything else */ void (*power_suspend)(struct platform_device *pdev); int (*pre_setup)(struct usb_hcd *hcd); @@ -72,7 +72,7 @@ #endif /* __USB_CORE_EHCI_PDRIVER_H */ --- a/drivers/usb/host/ehci-platform.c +++ b/drivers/usb/host/ehci-platform.c -@@ -48,6 +48,14 @@ struct ehci_platform_priv { +@@ -49,6 +49,14 @@ struct ehci_platform_priv { static const char hcd_name[] = "ehci-platform"; @@ -87,7 +87,7 @@ static int ehci_platform_reset(struct usb_hcd *hcd) { struct platform_device *pdev = to_platform_device(hcd->self.controller); -@@ -228,6 +236,13 @@ static int ehci_platform_probe(struct pl +@@ -266,6 +274,13 @@ static int ehci_platform_probe(struct pl ehci->big_endian_mmio = 1; if (pdata->ignore_oc) ehci->ignore_oc = 1; |