aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/xhci-mvebu.h
diff options
context:
space:
mode:
authorPali Rohár <pali@kernel.org>2022-02-03 22:44:43 +0100
committerVinod Koul <vkoul@kernel.org>2022-02-25 19:12:21 +0530
commit8e10548f7f4814e530857d2049d6af6bc78add53 (patch)
tree678dfa2fe2a6e28f9d2e5b1985c19b7ba5a79e69 /drivers/usb/host/xhci-mvebu.h
parentRevert "ata: ahci: mvebu: Make SATA PHY optional for Armada 3720" (diff)
downloadlinux-dev-8e10548f7f4814e530857d2049d6af6bc78add53.tar.xz
linux-dev-8e10548f7f4814e530857d2049d6af6bc78add53.zip
Revert "usb: host: xhci: mvebu: make USB 3.0 PHY optional for Armada 3720"
This reverts commit 3241929b67d28c83945d3191c6816a3271fd6b85. Armada 3720 phy driver (phy-mvebu-a3700-comphy.c) does not return -EOPNOTSUPP from phy_power_on() callback anymore. So remove XHCI_SKIP_PHY_INIT flag from xhci_mvebu_a3700_plat_setup() and then also whole xhci_mvebu_a3700_plat_setup() function which is there just to handle -EOPNOTSUPP for XHCI_SKIP_PHY_INIT. xhci plat_setup callback is not used by any other xhci plat driver, so remove this callback completely. Signed-off-by: Pali Rohár <pali@kernel.org> Signed-off-by: Marek Behún <kabel@kernel.org> Acked-by: Miquel Raynal <miquel.raynal@bootlin.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Link: https://lore.kernel.org/r/20220203214444.1508-5-kabel@kernel.org Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'drivers/usb/host/xhci-mvebu.h')
-rw-r--r--drivers/usb/host/xhci-mvebu.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/usb/host/xhci-mvebu.h b/drivers/usb/host/xhci-mvebu.h
index 01bf3fcb3eca..3be021793cc8 100644
--- a/drivers/usb/host/xhci-mvebu.h
+++ b/drivers/usb/host/xhci-mvebu.h
@@ -12,7 +12,6 @@ struct usb_hcd;
#if IS_ENABLED(CONFIG_USB_XHCI_MVEBU)
int xhci_mvebu_mbus_init_quirk(struct usb_hcd *hcd);
-int xhci_mvebu_a3700_plat_setup(struct usb_hcd *hcd);
int xhci_mvebu_a3700_init_quirk(struct usb_hcd *hcd);
#else
static inline int xhci_mvebu_mbus_init_quirk(struct usb_hcd *hcd)
@@ -20,11 +19,6 @@ static inline int xhci_mvebu_mbus_init_quirk(struct usb_hcd *hcd)
return 0;
}
-static inline int xhci_mvebu_a3700_plat_setup(struct usb_hcd *hcd)
-{
- return 0;
-}
-
static inline int xhci_mvebu_a3700_init_quirk(struct usb_hcd *hcd)
{
return 0;