[OpenWrt-Devel] [PATCH 16/23] ar71xx: refresh 490-usb-ehci-add-quirks-for-qca-socs.patch

[Zhao, Gang]

Signed-off-by: Zhao, Gang <gang.zhao.42 at gmail.com>
---
 .../490-usb-ehci-add-quirks-for-qca-socs.patch           | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/target/linux/ar71xx/patches-3.14/490-usb-ehci-add-quirks-for-qca-socs.patch b/target/linux/ar71xx/patches-3.14/490-usb-ehci-add-quirks-for-qca-socs.patch
index fcbf51b..0e89b5f 100644
--- a/target/linux/ar71xx/patches-3.14/490-usb-ehci-add-quirks-for-qca-socs.patch
+++ b/target/linux/ar71xx/patches-3.14/490-usb-ehci-add-quirks-for-qca-socs.patch
@@ -1,6 +1,6 @@
 --- a/drivers/usb/host/ehci-hcd.c
 +++ b/drivers/usb/host/ehci-hcd.c
-@@ -249,6 +249,37 @@ static int ehci_reset (struct ehci_hcd *
+@@ -252,6 +252,37 @@ static int ehci_reset (struct ehci_hcd *
  	command |= CMD_RESET;
  	dbg_cmd (ehci, "reset", command);
  	ehci_writel(ehci, command, &ehci->regs->command);
@@ -37,10 +37,10 @@
 +
  	ehci->rh_state = EHCI_RH_HALTED;
  	ehci->next_statechange = jiffies;
- 	retval = handshake (ehci, &ehci->regs->command,
+ 	retval = ehci_handshake(ehci, &ehci->regs->command,
 --- a/drivers/usb/host/ehci.h
 +++ b/drivers/usb/host/ehci.h
-@@ -202,6 +202,10 @@ struct ehci_hcd {			/* one per controlle
+@@ -227,6 +227,10 @@ struct ehci_hcd {			/* one per controlle
  	unsigned		need_oc_pp_cycle:1; /* MPC834X port power */
  	unsigned		imx28_write_fix:1; /* For Freescale i.MX28 */
  	unsigned		ignore_oc:1;
@@ -53,7 +53,7 @@
  	#define OHCI_CTRL_HCFS          (3 << 6)
 --- a/include/linux/usb/ehci_pdriver.h
 +++ b/include/linux/usb/ehci_pdriver.h
-@@ -43,6 +43,8 @@ struct usb_ehci_pdata {
+@@ -46,6 +46,8 @@ struct usb_ehci_pdata {
  	unsigned	big_endian_mmio:1;
  	unsigned	no_io_watchdog:1;
  	unsigned	ignore_oc:1;
@@ -62,10 +62,10 @@
  
  	/* Turn on all power and clocks */
  	int (*power_on)(struct platform_device *pdev);
-@@ -51,6 +53,7 @@ struct usb_ehci_pdata {
- 	/* Turn on only VBUS suspend power and hotplug detection,
+@@ -55,6 +57,7 @@ struct usb_ehci_pdata {
  	 * turn off everything else */
  	void (*power_suspend)(struct platform_device *pdev);
+ 	int (*pre_setup)(struct usb_hcd *hcd);
 +	void (*reset_notifier)(struct platform_device *pdev);
  };
  
@@ -97,5 +97,5 @@
 +	if (pdata->reset_notifier)
 +		ehci->reset_notifier = ehci_platform_reset_notifier;
  
- 	ehci->caps = hcd->regs + pdata->caps_offset;
- 	retval = ehci_setup(hcd);
+ 	if (pdata->pre_setup) {
+ 		retval = pdata->pre_setup(hcd);
-- 
1.9.3
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel