phy: amlogic: phy-meson-gxl-usb2: default to host mode

The USB2 PHY can switch between PHY_MODE_USB_HOST and
PHY_MODE_USB_DEVICE. However, it cannot do it on it's own since it
requires re-routing of the corresponding USB pins from dwc3 (which is
used for host-mode) to dwc2 (which is used for device-mode).
Thus we don't need to auto-detect the mode based on the USB controller,
which simplifies the driver code.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

diff --git a/drivers/phy/amlogic/Kconfig b/drivers/phy/amlogic/Kconfig
index cb8f4501652b133fffcc3ff327acc8174dfecb36..ef3625cd25bb81496ac5e8387b2747e5e88e7567 100644 (file)
--- a/drivers/phy/amlogic/Kconfig
+++ b/drivers/phy/amlogic/Kconfig
@@ -18,7 +18,6 @@ config PHY_MESON_GXL_USB2
        default ARCH_MESON
        depends on OF && (ARCH_MESON || COMPILE_TEST)
        depends on USB_SUPPORT
-       select USB_COMMON
        select GENERIC_PHY
        select REGMAP_MMIO
        help

diff --git a/drivers/phy/amlogic/phy-meson-gxl-usb2.c b/drivers/phy/amlogic/phy-meson-gxl-usb2.c
index a92a3fd51e166e3a657c9ea3cdd2456b800d9031..f062fc7f0a3a8a245e4a6d6a91152370c599f32c 100644 (file)
--- a/drivers/phy/amlogic/phy-meson-gxl-usb2.c
+++ b/drivers/phy/amlogic/phy-meson-gxl-usb2.c
@@ -20,7 +20,6 @@
 #include <linux/reset.h>
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
-#include <linux/usb/of.h>
 
 /* bits [31:27] are read-only */
 #define U2P_R0                                                 0x0
@@ -254,18 +253,8 @@ static int phy_meson_gxl_usb2_probe(struct platform_device *pdev)
        if (IS_ERR(base))
                return PTR_ERR(base);
 
-       switch (of_usb_get_dr_mode_by_phy(dev->of_node, -1)) {
-       case USB_DR_MODE_PERIPHERAL:
-               priv->mode = PHY_MODE_USB_DEVICE;
-               break;
-       case USB_DR_MODE_OTG:
-               priv->mode = PHY_MODE_USB_OTG;
-               break;
-       case USB_DR_MODE_HOST:
-       default:
-               priv->mode = PHY_MODE_USB_HOST;
-               break;
-       }
+       /* start in host mode */
+       priv->mode = PHY_MODE_USB_HOST;
 
        priv->regmap = devm_regmap_init_mmio(dev, base,
                                             &phy_meson_gxl_usb2_regmap_conf);