--- /dev/null
+Lantiq XWAY SoC RCU USB 1.1/2.0 PHY binding
+===========================================
+
+This binding describes the USB PHY hardware provided by the RCU module on the
+Lantiq XWAY SoCs.
+
+This node has to be a sub node of the Lantiq RCU block.
+
+-------------------------------------------------------------------------------
+Required properties (controller (parent) node):
+- compatible   : Should be one of
+                       "lantiq,ase-usb2-phy"
+                       "lantiq,danube-usb2-phy"
+                       "lantiq,xrx100-usb2-phy"
+                       "lantiq,xrx200-usb2-phy"
+                       "lantiq,xrx300-usb2-phy"
+- reg          : Defines the following sets of registers in the parent
+                 syscon device
+                       - Offset of the USB PHY configuration register
+                       - Offset of the USB Analog configuration
+                         register (only for xrx200 and xrx200)
+- clocks       : References to the (PMU) "phy" clk gate.
+- clock-names  : Must be "phy"
+- resets       : References to the RCU USB configuration reset bits.
+- reset-names  : Must be one of the following:
+                       "phy" (optional)
+                       "ctrl" (shared)
+
+-------------------------------------------------------------------------------
+Example for the USB PHYs on an xRX200 SoC:
+       usb_phy0: usb2-phy@18 {
+               compatible = "lantiq,xrx200-usb2-phy";
+               reg = <0x18 4>, <0x38 4>;
+
+               clocks = <&pmu PMU_GATE_USB0_PHY>;
+               clock-names = "phy";
+               resets = <&reset1 4 4>, <&reset0 4 4>;
+               reset-names = "phy", "ctrl";
+               #phy-cells = <0>;
+       };
 
 
        if (of_machine_is_compatible("lantiq,grx390") ||
            of_machine_is_compatible("lantiq,ar10")) {
-               clkdev_add_pmu("1e101000.usb", "phy", 1, 2, PMU_ANALOG_USB0_P);
-               clkdev_add_pmu("1e106000.usb", "phy", 1, 2, PMU_ANALOG_USB1_P);
+               clkdev_add_pmu("1f203018.usb2-phy", "phy", 1, 2, PMU_ANALOG_USB0_P);
+               clkdev_add_pmu("1f203034.usb2-phy", "phy", 1, 2, PMU_ANALOG_USB1_P);
                /* rc 0 */
                clkdev_add_pmu("1d900000.pcie", "phy", 1, 2, PMU_ANALOG_PCIE0_P);
                clkdev_add_pmu("1d900000.pcie", "msi", 1, 1, PMU1_PCIE_MSI);
                else
                        clkdev_add_static(CLOCK_133M, CLOCK_133M,
                                                CLOCK_133M, CLOCK_133M);
-               clkdev_add_pmu("1e101000.usb", "ctl", 1, 0, PMU_USB0);
-               clkdev_add_pmu("1e101000.usb", "phy", 1, 0, PMU_USB0_P);
+               clkdev_add_pmu("1e101000.usb", "otg", 1, 0, PMU_USB0);
+               clkdev_add_pmu("1f203018.usb2-phy", "phy", 1, 0, PMU_USB0_P);
                clkdev_add_pmu("1e180000.etop", "ppe", 1, 0, PMU_PPE);
                clkdev_add_cgu("1e180000.etop", "ephycgu", CGU_EPHY);
                clkdev_add_pmu("1e180000.etop", "ephy", 1, 0, PMU_EPHY);
        } else if (of_machine_is_compatible("lantiq,grx390")) {
                clkdev_add_static(ltq_grx390_cpu_hz(), ltq_grx390_fpi_hz(),
                                  ltq_grx390_fpi_hz(), ltq_grx390_pp32_hz());
-               clkdev_add_pmu("1e101000.usb", "ctl", 1, 0, PMU_USB0);
-               clkdev_add_pmu("1e106000.usb", "ctl", 1, 0, PMU_USB1);
+               clkdev_add_pmu("1e101000.usb", "otg", 1, 0, PMU_USB0);
+               clkdev_add_pmu("1e106000.usb", "otg", 1, 0, PMU_USB1);
                /* rc 2 */
                clkdev_add_pmu("1a800000.pcie", "phy", 1, 2, PMU_ANALOG_PCIE2_P);
                clkdev_add_pmu("1a800000.pcie", "msi", 1, 1, PMU1_PCIE2_MSI);
        } else if (of_machine_is_compatible("lantiq,ar10")) {
                clkdev_add_static(ltq_ar10_cpu_hz(), ltq_ar10_fpi_hz(),
                                  ltq_ar10_fpi_hz(), ltq_ar10_pp32_hz());
-               clkdev_add_pmu("1e101000.usb", "ctl", 1, 0, PMU_USB0);
-               clkdev_add_pmu("1e106000.usb", "ctl", 1, 0, PMU_USB1);
+               clkdev_add_pmu("1e101000.usb", "otg", 1, 0, PMU_USB0);
+               clkdev_add_pmu("1e106000.usb", "otg", 1, 0, PMU_USB1);
                clkdev_add_pmu("1e108000.eth", NULL, 0, 0, PMU_SWITCH |
                               PMU_PPE_DP | PMU_PPE_TC);
                clkdev_add_pmu("1da00000.usif", "NULL", 1, 0, PMU_USIF);
        } else if (of_machine_is_compatible("lantiq,vr9")) {
                clkdev_add_static(ltq_vr9_cpu_hz(), ltq_vr9_fpi_hz(),
                                ltq_vr9_fpi_hz(), ltq_vr9_pp32_hz());
-               clkdev_add_pmu("1e101000.usb", "phy", 1, 0, PMU_USB0_P);
-               clkdev_add_pmu("1e101000.usb", "ctl", 1, 0, PMU_USB0 | PMU_AHBM);
-               clkdev_add_pmu("1e106000.usb", "phy", 1, 0, PMU_USB1_P);
-               clkdev_add_pmu("1e106000.usb", "ctl", 1, 0, PMU_USB1 | PMU_AHBM);
+               clkdev_add_pmu("1f203018.usb2-phy", "phy", 1, 0, PMU_USB0_P);
+               clkdev_add_pmu("1e101000.usb", "otg", 1, 0, PMU_USB0 | PMU_AHBM);
+               clkdev_add_pmu("1f203034.usb2-phy", "phy", 1, 0, PMU_USB1_P);
+               clkdev_add_pmu("1e106000.usb", "otg", 1, 0, PMU_USB1 | PMU_AHBM);
                clkdev_add_pmu("1d900000.pcie", "phy", 1, 1, PMU1_PCIE_PHY);
                clkdev_add_pmu("1d900000.pcie", "bus", 1, 0, PMU_PCIE_CLK);
                clkdev_add_pmu("1d900000.pcie", "msi", 1, 1, PMU1_PCIE_MSI);
        } else if (of_machine_is_compatible("lantiq,ar9")) {
                clkdev_add_static(ltq_ar9_cpu_hz(), ltq_ar9_fpi_hz(),
                                ltq_ar9_fpi_hz(), CLOCK_250M);
-               clkdev_add_pmu("1e101000.usb", "ctl", 1, 0, PMU_USB0);
-               clkdev_add_pmu("1e101000.usb", "phy", 1, 0, PMU_USB0_P);
-               clkdev_add_pmu("1e106000.usb", "ctl", 1, 0, PMU_USB1);
-               clkdev_add_pmu("1e106000.usb", "phy", 1, 0, PMU_USB1_P);
+               clkdev_add_pmu("1f203018.usb2-phy", "phy", 1, 0, PMU_USB0_P);
+               clkdev_add_pmu("1e101000.usb", "otg", 1, 0, PMU_USB0);
+               clkdev_add_pmu("1f203034.usb2-phy", "phy", 1, 0, PMU_USB1_P);
+               clkdev_add_pmu("1e106000.usb", "otg", 1, 0, PMU_USB1);
                clkdev_add_pmu("1e180000.etop", "switch", 1, 0, PMU_SWITCH);
                clkdev_add_pmu("1e103000.sdio", NULL, 1, 0, PMU_SDIO);
                clkdev_add_pmu("1e103100.deu", NULL, 1, 0, PMU_DEU);
        } else {
                clkdev_add_static(ltq_danube_cpu_hz(), ltq_danube_fpi_hz(),
                                ltq_danube_fpi_hz(), ltq_danube_pp32_hz());
-               clkdev_add_pmu("1e101000.usb", "ctl", 1, 0, PMU_USB0);
-               clkdev_add_pmu("1e101000.usb", "phy", 1, 0, PMU_USB0_P);
+               clkdev_add_pmu("1f203018.usb2-phy", "ctrl", 1, 0, PMU_USB0);
+               clkdev_add_pmu("1f203018.usb2-phy", "phy", 1, 0, PMU_USB0_P);
                clkdev_add_pmu("1e103000.sdio", NULL, 1, 0, PMU_SDIO);
                clkdev_add_pmu("1e103100.deu", NULL, 1, 0, PMU_DEU);
                clkdev_add_pmu("1e116000.mei", "dfe", 1, 0, PMU_DFE);
 
 source "drivers/phy/amlogic/Kconfig"
 source "drivers/phy/broadcom/Kconfig"
 source "drivers/phy/hisilicon/Kconfig"
+source "drivers/phy/lantiq/Kconfig"
 source "drivers/phy/marvell/Kconfig"
 source "drivers/phy/motorola/Kconfig"
 source "drivers/phy/qualcomm/Kconfig"
 
 obj-$(CONFIG_PHY_MT65XX_USB3)          += phy-mt65xx-usb3.o
 obj-$(CONFIG_PHY_XGENE)                        += phy-xgene.o
 obj-$(CONFIG_PHY_PISTACHIO_USB)                += phy-pistachio-usb.o
-
 obj-$(CONFIG_ARCH_SUNXI)               += allwinner/
 obj-$(CONFIG_ARCH_MESON)               += amlogic/
+obj-$(CONFIG_LANTIQ)                   += lantiq/
 obj-$(CONFIG_ARCH_RENESAS)             += renesas/
 obj-$(CONFIG_ARCH_ROCKCHIP)            += rockchip/
 obj-$(CONFIG_ARCH_TEGRA)               += tegra/
 
--- /dev/null
+#
+# Phy drivers for Lantiq / Intel platforms
+#
+config PHY_LANTIQ_RCU_USB2
+       tristate "Lantiq XWAY SoC RCU based USB PHY"
+       depends on OF && (SOC_TYPE_XWAY || COMPILE_TEST)
+       select GENERIC_PHY
+       help
+         Support for the USB PHY(s) on the Lantiq / Intel XWAY family SoCs.
 
--- /dev/null
+obj-$(CONFIG_PHY_LANTIQ_RCU_USB2)      += phy-lantiq-rcu-usb2.o
 
--- /dev/null
+/*
+ * Lantiq XWAY SoC RCU module based USB 1.1/2.0 PHY driver
+ *
+ * Copyright (C) 2016 Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+ * Copyright (C) 2017 Hauke Mehrtens <hauke@hauke-m.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/mfd/syscon.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_device.h>
+#include <linux/phy/phy.h>
+#include <linux/platform_device.h>
+#include <linux/property.h>
+#include <linux/regmap.h>
+#include <linux/reset.h>
+
+/* Transmitter HS Pre-Emphasis Enable */
+#define RCU_CFG1_TX_PEE                BIT(0)
+/* Disconnect Threshold */
+#define RCU_CFG1_DIS_THR_MASK  0x00038000
+#define RCU_CFG1_DIS_THR_SHIFT 15
+
+struct ltq_rcu_usb2_bits {
+       u8 hostmode;
+       u8 slave_endianness;
+       u8 host_endianness;
+       bool have_ana_cfg;
+};
+
+struct ltq_rcu_usb2_priv {
+       struct regmap                   *regmap;
+       unsigned int                    phy_reg_offset;
+       unsigned int                    ana_cfg1_reg_offset;
+       const struct ltq_rcu_usb2_bits  *reg_bits;
+       struct device                   *dev;
+       struct phy                      *phy;
+       struct clk                      *phy_gate_clk;
+       struct reset_control            *ctrl_reset;
+       struct reset_control            *phy_reset;
+};
+
+static const struct ltq_rcu_usb2_bits xway_rcu_usb2_reg_bits = {
+       .hostmode = 11,
+       .slave_endianness = 9,
+       .host_endianness = 10,
+       .have_ana_cfg = false,
+};
+
+static const struct ltq_rcu_usb2_bits xrx100_rcu_usb2_reg_bits = {
+       .hostmode = 11,
+       .slave_endianness = 17,
+       .host_endianness = 10,
+       .have_ana_cfg = false,
+};
+
+static const struct ltq_rcu_usb2_bits xrx200_rcu_usb2_reg_bits = {
+       .hostmode = 11,
+       .slave_endianness = 9,
+       .host_endianness = 10,
+       .have_ana_cfg = true,
+};
+
+static const struct of_device_id ltq_rcu_usb2_phy_of_match[] = {
+       {
+               .compatible = "lantiq,ase-usb2-phy",
+               .data = &xway_rcu_usb2_reg_bits,
+       },
+       {
+               .compatible = "lantiq,danube-usb2-phy",
+               .data = &xway_rcu_usb2_reg_bits,
+       },
+       {
+               .compatible = "lantiq,xrx100-usb2-phy",
+               .data = &xrx100_rcu_usb2_reg_bits,
+       },
+       {
+               .compatible = "lantiq,xrx200-usb2-phy",
+               .data = &xrx200_rcu_usb2_reg_bits,
+       },
+       {
+               .compatible = "lantiq,xrx300-usb2-phy",
+               .data = &xrx200_rcu_usb2_reg_bits,
+       },
+       { },
+};
+MODULE_DEVICE_TABLE(of, ltq_rcu_usb2_phy_of_match);
+
+static int ltq_rcu_usb2_phy_init(struct phy *phy)
+{
+       struct ltq_rcu_usb2_priv *priv = phy_get_drvdata(phy);
+
+       if (priv->reg_bits->have_ana_cfg) {
+               regmap_update_bits(priv->regmap, priv->ana_cfg1_reg_offset,
+                       RCU_CFG1_TX_PEE, RCU_CFG1_TX_PEE);
+               regmap_update_bits(priv->regmap, priv->ana_cfg1_reg_offset,
+                       RCU_CFG1_DIS_THR_MASK, 7 << RCU_CFG1_DIS_THR_SHIFT);
+       }
+
+       /* Configure core to host mode */
+       regmap_update_bits(priv->regmap, priv->phy_reg_offset,
+                          BIT(priv->reg_bits->hostmode), 0);
+
+       /* Select DMA endianness (Host-endian: big-endian) */
+       regmap_update_bits(priv->regmap, priv->phy_reg_offset,
+               BIT(priv->reg_bits->slave_endianness), 0);
+       regmap_update_bits(priv->regmap, priv->phy_reg_offset,
+               BIT(priv->reg_bits->host_endianness),
+               BIT(priv->reg_bits->host_endianness));
+
+       return 0;
+}
+
+static int ltq_rcu_usb2_phy_power_on(struct phy *phy)
+{
+       struct ltq_rcu_usb2_priv *priv = phy_get_drvdata(phy);
+       struct device *dev = priv->dev;
+       int ret;
+
+       reset_control_deassert(priv->phy_reset);
+
+       ret = clk_prepare_enable(priv->phy_gate_clk);
+       if (ret)
+               dev_err(dev, "failed to enable PHY gate\n");
+
+       return ret;
+}
+
+static int ltq_rcu_usb2_phy_power_off(struct phy *phy)
+{
+       struct ltq_rcu_usb2_priv *priv = phy_get_drvdata(phy);
+
+       reset_control_assert(priv->phy_reset);
+
+       clk_disable_unprepare(priv->phy_gate_clk);
+
+       return 0;
+}
+
+static struct phy_ops ltq_rcu_usb2_phy_ops = {
+       .init           = ltq_rcu_usb2_phy_init,
+       .power_on       = ltq_rcu_usb2_phy_power_on,
+       .power_off      = ltq_rcu_usb2_phy_power_off,
+       .owner          = THIS_MODULE,
+};
+
+static int ltq_rcu_usb2_of_parse(struct ltq_rcu_usb2_priv *priv,
+                                struct platform_device *pdev)
+{
+       struct device *dev = priv->dev;
+       const __be32 *offset;
+       int ret;
+
+       priv->reg_bits = of_device_get_match_data(dev);
+
+       priv->regmap = syscon_node_to_regmap(dev->of_node->parent);
+       if (IS_ERR(priv->regmap)) {
+               dev_err(dev, "Failed to lookup RCU regmap\n");
+               return PTR_ERR(priv->regmap);
+       }
+
+       offset = of_get_address(dev->of_node, 0, NULL, NULL);
+       if (!offset) {
+               dev_err(dev, "Failed to get RCU PHY reg offset\n");
+               return -ENOENT;
+       }
+       priv->phy_reg_offset = __be32_to_cpu(*offset);
+
+       if (priv->reg_bits->have_ana_cfg) {
+               offset = of_get_address(dev->of_node, 1, NULL, NULL);
+               if (!offset) {
+                       dev_err(dev, "Failed to get RCU ANA CFG1 reg offset\n");
+                       return -ENOENT;
+               }
+               priv->ana_cfg1_reg_offset = __be32_to_cpu(*offset);
+       }
+
+       priv->phy_gate_clk = devm_clk_get(dev, "phy");
+       if (IS_ERR(priv->phy_gate_clk)) {
+               dev_err(dev, "Unable to get USB phy gate clk\n");
+               return PTR_ERR(priv->phy_gate_clk);
+       }
+
+       priv->ctrl_reset = devm_reset_control_get_shared(dev, "ctrl");
+       if (IS_ERR(priv->ctrl_reset)) {
+               if (PTR_ERR(priv->ctrl_reset) != -EPROBE_DEFER)
+                       dev_err(dev, "failed to get 'ctrl' reset\n");
+               return PTR_ERR(priv->ctrl_reset);
+       }
+
+       priv->phy_reset = devm_reset_control_get_optional(dev, "phy");
+       if (IS_ERR(priv->phy_reset))
+               return PTR_ERR(priv->phy_reset);
+
+       return 0;
+}
+
+static int ltq_rcu_usb2_phy_probe(struct platform_device *pdev)
+{
+       struct device *dev = &pdev->dev;
+       struct ltq_rcu_usb2_priv *priv;
+       struct phy_provider *provider;
+       int ret;
+
+       priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+       if (!priv)
+               return -ENOMEM;
+
+       priv->dev = dev;
+
+       ret = ltq_rcu_usb2_of_parse(priv, pdev);
+       if (ret)
+               return ret;
+
+       /* Reset USB core through reset controller */
+       reset_control_deassert(priv->ctrl_reset);
+
+       reset_control_assert(priv->phy_reset);
+
+       priv->phy = devm_phy_create(dev, dev->of_node, <q_rcu_usb2_phy_ops);
+       if (IS_ERR(priv->phy)) {
+               dev_err(dev, "failed to create PHY\n");
+               return PTR_ERR(priv->phy);
+       }
+
+       phy_set_drvdata(priv->phy, priv);
+
+       provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
+       if (IS_ERR(provider))
+               return PTR_ERR(provider);
+
+       dev_set_drvdata(priv->dev, priv);
+       return 0;
+}
+
+static struct platform_driver ltq_rcu_usb2_phy_driver = {
+       .probe  = ltq_rcu_usb2_phy_probe,
+       .driver = {
+               .name   = "lantiq-rcu-usb2-phy",
+               .of_match_table = ltq_rcu_usb2_phy_of_match,
+       }
+};
+module_platform_driver(ltq_rcu_usb2_phy_driver);
+
+MODULE_AUTHOR("Martin Blumenstingl <martin.blumenstingl@googlemail.com>");
+MODULE_DESCRIPTION("Lantiq XWAY USB2 PHY driver");
+MODULE_LICENSE("GPL v2");