diff options
| author |   Felipe Balbi <felipe.balbi@linux.intel.com> | 2016-04-22 13:17:14 +0300 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-26 16:08:02 -0700 |
| commit | 3bdb263d6b3c2384d98745897ba9db676806ed04 (patch) | |
| tree | c7e9ae93aa19391f6c568925e42d07dd4760e010 /drivers/usb/host | |
| parent | usb: xhci: plat: add ->plat_start() and ->init_quirk() methods (diff) | |
| download | linux-dev-3bdb263d6b3c2384d98745897ba9db676806ed04.tar.xz linux-dev-3bdb263d6b3c2384d98745897ba9db676806ed04.zip | |
usb: host: xhci: plat: move mvebu init_quirk() to xhci_plat_setup()
xhci_plat_setup() is the rightful place for
xhci_mvebu_mbus_init_quirk(), so let's move it there
in order to make it simpler to get rid of
xhci_plat_type_is() later on.
Acked-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host')
| -rw-r--r-- | drivers/usb/host/xhci-plat.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index 474b5fa14900..4fcb3418e7a7 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -72,6 +72,15 @@ static int xhci_plat_setup(struct usb_hcd *hcd) return ret; } + if (xhci_plat_type_is(hcd, XHCI_PLAT_TYPE_MARVELL_ARMADA)) { + struct platform_device *pdev; + + pdev = to_platform_device(hcd->self.controller); + ret = xhci_mvebu_mbus_init_quirk(pdev); + if (ret) + return ret; + } + return xhci_gen_setup(hcd, xhci_plat_quirks); } @@ -207,12 +216,6 @@ static int xhci_plat_probe(struct platform_device *pdev) *priv = *priv_match; } - if (xhci_plat_type_is(hcd, XHCI_PLAT_TYPE_MARVELL_ARMADA)) { - ret = xhci_mvebu_mbus_init_quirk(pdev); - if (ret) - goto disable_clk; - } - device_wakeup_enable(hcd->self.controller); xhci->clk = clk; |