Revert "usb: host: ehci-hcd: add controller_resets_phy quirk"

This reverts commit 2c7d591aa11086ba841f8712b7cee33e245b62f6.

Change-Id: Ic9994dafc424e16d5d8251c287f8be65832b611b

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 74cc97b80c4b36eb33168279410a2a9f64fd7c8e..794a104a1e4cf13c6e8696f8a175e6ded6a1639e 100644 (file)
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -259,8 +259,7 @@ static int ehci_reset (struct ehci_hcd *ehci)
 
        command |= CMD_RESET;
        dbg_cmd (ehci, "reset", command);
-       if (!ehci->controller_resets_phy)
-               ehci_writel(ehci, command, &ehci->regs->command);
+       ehci_writel(ehci, command, &ehci->regs->command);
        ehci_to_hcd(ehci)->state = HC_STATE_HALT;
        ehci->next_statechange = jiffies;
        retval = handshake (ehci, &ehci->regs->command,

diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index 530540a4bdd4f7d4ef61760a67fc5238c86e4e53..6f62e68e0e6f976fa9e387548f31cb69a7a39ecd 100644 (file)
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -132,7 +132,6 @@ struct ehci_hcd {                   /* one per controller */
        unsigned                need_io_watchdog:1;
        unsigned                broken_periodic:1;
        unsigned                fs_i_thresh:1;  /* Intel iso scheduling */
-       unsigned                controller_resets_phy:1;
        unsigned                port_reset_no_wait:1;
 
        /* required for usb32 quirk */