[PATCH v2 0/4] Enable usb2 function on poplar board

[PATCH v2 0/4] Enable usb2 function on poplar board

[Jiancheng Xue]

This patchset is mainly used to enable the usb2 function on poplar board,
including usb2 phy drivers, dts nodes and configs.

Jiancheng Xue (3):
  dt-bindings: phy-hisi-inno-usb2: add support for hisi-inno-usb2 phy
  arm64: dts: hisilicon: add usb2 controller and phy nodes for poplar
    board.
  arm64: defconfig: enable some drivers for hi3798cv200-poplar board.

Pengcheng Li (1):
  phy: add inno-usb2-phy driver for hi3798cv200 SoC

 .../devicetree/bindings/phy/phy-hisi-inno-usb2.txt |  31 +++
 .../boot/dts/hisilicon/hi3798cv200-poplar.dts      |  13 ++
 arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi     |  60 ++++++
 arch/arm64/configs/defconfig                       |   4 +
 drivers/phy/hisilicon/Kconfig                      |  11 +-
 drivers/phy/hisilicon/Makefile                     |   1 +
 drivers/phy/hisilicon/phy-hisi-inno-usb2.c         | 236 +++++++++++++++++++++
 7 files changed, 355 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/phy/phy-hisi-inno-usb2.txt
 create mode 100644 drivers/phy/hisilicon/phy-hisi-inno-usb2.c

-- 
1.9.1

[PATCH v2 1/4] dt-bindings: phy-hisi-inno-usb2: add support for hisi-inno-usb2 phy

[Jiancheng Xue]

Add support for hisi-inno-usb2 phy.

Signed-off-by: Jiancheng Xue <xuejiancheng@hisilicon.com>
---
 .../devicetree/bindings/phy/phy-hisi-inno-usb2.txt | 31 ++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/phy/phy-hisi-inno-usb2.txt

diff --git a/Documentation/devicetree/bindings/phy/phy-hisi-inno-usb2.txt b/Documentation/devicetree/bindings/phy/phy-hisi-inno-usb2.txt
new file mode 100644
index 0000000..417eeaa
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/phy-hisi-inno-usb2.txt
@@ -0,0 +1,31 @@
+HiSilicon INNO USB2 PHY
+-----------------------
+Required properties:
+- compatible: Should be one of the following strings:
+		"hisilicon,inno-usb2-phy",
+		"hisilicon,hi3798cv200-usb2-phy",
+- #phy-cells: Shall be 0.
+- hisilicon,peripheral-syscon: Phandle of syscon used to control phy.
+- hisilicon,phycon-reg: Offset of the phy control register in the syscon.
+- hisilicon,port-num: Number of utmi ports. Range [1,2].
+- clocks: Phandle and clock specifier pair for reference clock utmi_refclk.
+- resets: List of phandle and reset specifier pairs for each reset signal
+in reset-names.
+- reset-names: Shall be "power_on", "utmi0", "utmi1". Thereinto, utmi[n] is
+required only if port[n] exists.
+
+Refer to phy/phy-bindings.txt for the generic PHY binding properties
+
+Example:
+usb2_phy: phy {
+		 compatible = "hisilicon,inno-usb2-phy";
+		 #phy-cells = <0>;
+		 hisilicon,peripheral-syscon = <&peri_ctrl>;
+		 hisilicon,phycon-reg = <0x120>;
+		 hisilicon,port-num = <2>;
+		 clocks = <&crg USB2_PHY_UTMI_REF_CLK>;
+		 resets = <&crg 0xbc 2>,
+			  <&crg 0xbc 8>,
+			  <&crg 0xbc 9>,
+		 reset-names = "power_on", "utmi0", "utmi1";
+	 };
-- 
1.9.1

[PATCH v2 2/4] phy: add inno-usb2-phy driver for hi3798cv200 SoC

[Jiancheng Xue]

From: Pengcheng Li <lpc.li@hisilicon.com>

Add inno-usb2-phy driver for hi3798cv200 SoC.

Signed-off-by: Pengcheng Li <lpc.li@hisilicon.com>
Signed-off-by: Jiancheng Xue <xuejiancheng@hisilicon.com>
---
 drivers/phy/hisilicon/Kconfig              |  11 +-
 drivers/phy/hisilicon/Makefile             |   1 +
 drivers/phy/hisilicon/phy-hisi-inno-usb2.c | 236 +++++++++++++++++++++++++++++
 3 files changed, 247 insertions(+), 1 deletion(-)
 create mode 100644 drivers/phy/hisilicon/phy-hisi-inno-usb2.c

diff --git a/drivers/phy/hisilicon/Kconfig b/drivers/phy/hisilicon/Kconfig
index 6164c4c..6a675c5 100644
--- a/drivers/phy/hisilicon/Kconfig
+++ b/drivers/phy/hisilicon/Kconfig
@@ -8,9 +8,18 @@ config PHY_HI6220_USB
 	select MFD_SYSCON
 	help
 	  Enable this to support the HISILICON HI6220 USB PHY.
-
 	  To compile this driver as a module, choose M here.
 
+config PHY_HISI_INNO_USB2
+       tristate "HiSilicon INNO USB2 PHY support"
+       depends on (ARCH_HISI) || COMPILE_TEST
+       select GENERIC_PHY
+       select MFD_SYSCON
+       help
+         Support for INNO USB2 PHY on HiSilicon SoCs. This Phy supports
+         USB 1.5Mb/s, USB 12Mb/s, USB 480Mb/s speeds. It supports one
+         USB host port to accept one USB device.
+
 config PHY_HIX5HD2_SATA
 	tristate "HIX5HD2 SATA PHY Driver"
 	depends on ARCH_HIX5HD2 && OF && HAS_IOMEM
diff --git a/drivers/phy/hisilicon/Makefile b/drivers/phy/hisilicon/Makefile
index 541b348..e6c9794 100644
--- a/drivers/phy/hisilicon/Makefile
+++ b/drivers/phy/hisilicon/Makefile
@@ -1,2 +1,3 @@
 obj-$(CONFIG_PHY_HI6220_USB)		+= phy-hi6220-usb.o
+obj-$(CONFIG_PHY_HISI_INNO_USB2)	+= phy-hisi-inno-usb2.o
 obj-$(CONFIG_PHY_HIX5HD2_SATA)		+= phy-hix5hd2-sata.o
diff --git a/drivers/phy/hisilicon/phy-hisi-inno-usb2.c b/drivers/phy/hisilicon/phy-hisi-inno-usb2.c
new file mode 100644
index 0000000..7edf4a3
--- /dev/null
+++ b/drivers/phy/hisilicon/phy-hisi-inno-usb2.c
@@ -0,0 +1,236 @@
+/*
+ * HiSilicon INNO USB2 PHY Driver.
+ *
+ * Copyright (c) 2016-2017 HiSilicon Technologies Co., Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/mfd/syscon.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/phy/phy.h>
+#include <linux/regmap.h>
+#include <linux/reset.h>
+
+#define INNO_PHY_PORT_NUM	2
+#define REF_CLK_STABLE_TIME	100	/* unit:us */
+#define UTMI_CLK_STABLE_TIME	200	/* unit:us */
+#define TEST_CLK_STABLE_TIME	2	/* unit:ms */
+#define PHY_CLK_STABLE_TIME	2	/* unit:ms */
+#define UTMI_RST_COMPLETE_TIME	2	/* unit:ms */
+#define TEST_RST_COMPLETE_TIME	100	/* unit:us */
+#define POR_RST_COMPLETE_TIME	300	/* unit:us */
+#define PHY_TEST_DATA	GENMASK(7, 0)
+#define PHY_TEST_ADDR	GENMASK(15, 8)
+#define PHY_TEST_PORT	GENMASK(18, 16)
+#define PHY_TEST_WREN	BIT(21)
+#define PHY_TEST_CLK	BIT(22)	/* rising edge active */
+#define PHY_TEST_RST	BIT(23)	/* low active */
+#define PHY_CLK_ENABLE	BIT(2)
+
+struct hisi_inno_phy_priv {
+	struct regmap *syscon;
+	u32 reg;
+	struct clk *ref_clk;
+	struct reset_control *por_rst;
+	struct reset_control *test_rst;
+	struct reset_control *utmi_rst[INNO_PHY_PORT_NUM];
+	u32 port_num;
+};
+
+static void hisi_inno_phy_write_reg(struct regmap *syscon,
+			u32 reg, u8 port, u32 addr, u32 data)
+{
+	u32 value;
+
+	value = (data & PHY_TEST_DATA)
+		| ((addr << 8) & PHY_TEST_ADDR)
+		| ((port << 16) & PHY_TEST_PORT)
+		| PHY_TEST_WREN | PHY_TEST_RST;
+	regmap_write(syscon, reg, value);
+	value |= PHY_TEST_CLK;
+	regmap_write(syscon, reg, value);
+	value &= ~PHY_TEST_CLK;
+	regmap_write(syscon, reg, value);
+}
+
+static void hisi_inno_phy_setup(struct hisi_inno_phy_priv *priv)
+{
+	/* The phy clk is controlled by the port0 register 0x06. */
+	hisi_inno_phy_write_reg(priv->syscon,
+			priv->reg, 0, 0x06, PHY_CLK_ENABLE);
+	msleep(PHY_CLK_STABLE_TIME);
+}
+
+static int hisi_inno_phy_init(struct phy *phy)
+{
+	struct hisi_inno_phy_priv *priv = phy_get_drvdata(phy);
+	int ret, i;
+
+	ret = clk_prepare_enable(priv->ref_clk);
+	if (ret)
+		return ret;
+	udelay(REF_CLK_STABLE_TIME);
+
+	if (priv->test_rst) {
+		reset_control_deassert(priv->test_rst);
+		udelay(TEST_RST_COMPLETE_TIME);
+	}
+
+	reset_control_deassert(priv->por_rst);
+	udelay(POR_RST_COMPLETE_TIME);
+
+	/* config phy clk and phy eye diagram */
+	hisi_inno_phy_setup(priv);
+
+	for (i = 0; i < priv->port_num; i++) {
+		reset_control_deassert(priv->utmi_rst[i]);
+		udelay(UTMI_RST_COMPLETE_TIME);
+	}
+
+	return 0;
+}
+
+static void hisi_inno_phy_disable(struct phy *phy)
+{
+	struct hisi_inno_phy_priv *priv = phy_get_drvdata(phy);
+	int i;
+
+	for (i = 0; i < priv->port_num; i++)
+		reset_control_assert(priv->utmi_rst[i]);
+
+	reset_control_assert(priv->por_rst);
+	if (priv->test_rst)
+		reset_control_assert(priv->test_rst);
+	clk_disable_unprepare(priv->ref_clk);
+}
+
+static int hisi_inno_phy_probe(struct platform_device *pdev)
+{
+	struct device *dev = &pdev->dev;
+	struct phy *phy;
+	struct hisi_inno_phy_priv *priv;
+	struct device_node *node = dev->of_node;
+	int ret, i;
+
+	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+	if (!priv)
+		return -ENOMEM;
+
+	priv->syscon = syscon_regmap_lookup_by_phandle(node,
+			"hisilicon,peripheral-syscon");
+	if (IS_ERR(priv->syscon)) {
+		dev_err(dev, "no hisilicon,peripheral-syscon\n");
+		return PTR_ERR(priv->syscon);
+	}
+
+	ret = device_property_read_u32(dev,
+			"hisilicon,phycon-reg", &priv->reg);
+	if (ret)
+		return ret;
+
+	priv->ref_clk = devm_clk_get(dev, NULL);
+	if (IS_ERR(priv->ref_clk))
+		return PTR_ERR(priv->ref_clk);
+
+	priv->por_rst = devm_reset_control_get_exclusive(dev, "power_on");
+	if (IS_ERR(priv->por_rst))
+		return PTR_ERR(priv->por_rst);
+
+	ret = device_property_read_u32(dev,
+					"hisilicon,port-num", &priv->port_num);
+	if (ret)
+		return ret;
+
+	if (priv->port_num <= 0
+		|| priv->port_num > INNO_PHY_PORT_NUM)
+		return -EINVAL;
+
+	for (i = 0; i < priv->port_num; i++) {
+		char id[6];
+
+		snprintf(id, 6, "utmi%1d\n", i);
+		priv->utmi_rst[i] = devm_reset_control_get_exclusive(dev, id);
+		if (IS_ERR(priv->utmi_rst[i]))
+			return PTR_ERR(priv->utmi_rst[i]);
+	}
+
+	priv->test_rst = devm_reset_control_get_optional_exclusive(dev, "test");
+	if (IS_ERR(priv->test_rst))
+		return PTR_ERR(priv->test_rst);
+
+	phy = devm_kzalloc(dev, sizeof(*phy), GFP_KERNEL);
+	if (!phy)
+		return -ENOMEM;
+
+	platform_set_drvdata(pdev, phy);
+	phy_set_drvdata(phy, priv);
+
+	return hisi_inno_phy_init(phy);
+}
+
+static int hisi_inno_phy_remove(struct platform_device *pdev)
+{
+	struct phy *phy = platform_get_drvdata(pdev);
+
+	hisi_inno_phy_disable(phy);
+
+	return 0;
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int hisi_inno_phy_suspend(struct device *dev)
+{
+	struct phy *phy = dev_get_drvdata(dev);
+
+	hisi_inno_phy_disable(phy);
+
+	return 0;
+}
+
+static int hisi_inno_phy_resume(struct device *dev)
+{
+	struct phy *phy = dev_get_drvdata(dev);
+
+	return hisi_inno_phy_init(phy);
+}
+#endif /* CONFIG_PM_SLEEP */
+
+static const struct dev_pm_ops hisi_inno_phy_pm_ops = {
+	SET_SYSTEM_SLEEP_PM_OPS(hisi_inno_phy_suspend, hisi_inno_phy_resume)
+};
+
+static const struct of_device_id hisi_inno_phy_of_match[] = {
+	{.compatible = "hisilicon,inno-usb2-phy",},
+	{.compatible = "hisilicon,hi3798cv200-usb2-phy",},
+	{ },
+};
+MODULE_DEVICE_TABLE(of, hisi_inno_phy_of_match);
+
+static struct platform_driver hisi_inno_phy_driver = {
+	.probe	= hisi_inno_phy_probe,
+	.remove = hisi_inno_phy_remove,
+	.driver = {
+		.name	= "hisi-inno-phy",
+		.of_match_table	= hisi_inno_phy_of_match,
+		.pm    = &hisi_inno_phy_pm_ops,
+	}
+};
+module_platform_driver(hisi_inno_phy_driver);
+
+MODULE_DESCRIPTION("HiSilicon INNO USB2 PHY Driver");
+MODULE_LICENSE("GPL v2");
-- 
1.9.1

[PATCH v2 3/4] arm64: dts: hisilicon: add usb2 controller and phy nodes for poplar board.

[Jiancheng Xue]

Add usb2 controller and phy nodes for poplar board.

Signed-off-by: Jiancheng Xue <xuejiancheng@hisilicon.com>
Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org>
---
 .../boot/dts/hisilicon/hi3798cv200-poplar.dts      | 13 +++++
 arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi     | 60 ++++++++++++++++++++++
 2 files changed, 73 insertions(+)

diff --git a/arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts b/arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts
index b914287..4656ba9 100644
--- a/arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts
@@ -63,6 +63,10 @@
 	};
 };
 
+&ehci {
+	status = "okay";
+};
+
 &gmac1 {
 	status = "okay";
 	#address-cells = <1>;
@@ -146,6 +150,10 @@
 	status = "okay";
 };
 
+&ohci {
+	status = "okay";
+};
+
 &spi0 {
 	status = "okay";
 	label = "LS-SPI0";
@@ -160,3 +168,8 @@
 	label = "LS-UART0";
 };
 /* No optional LS-UART1 on Low Speed Expansion Connector. */
+
+&usb2_phy1 {
+	status = "okay";
+};
+
diff --git a/arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi b/arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi
index 75865f8a..250b68b 100644
--- a/arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi
@@ -106,6 +106,11 @@
 			#reset-cells = <2>;
 		};
 
+		peri_ctrl: system-controller@8a20000 {
+			compatible = "syscon";
+			reg = <0x8a20000 0x1000>;
+		};
+
 		uart0: serial@8b00000 {
 			compatible = "arm,pl011", "arm,primecell";
 			reg = <0x8b00000 0x1000>;
@@ -407,5 +412,60 @@
 			clocks = <&sysctrl HISTB_IR_CLK>;
 			status = "disabled";
 		};
+
+		ehci: ehci@0x9890000 {
+			compatible = "generic-ehci";
+			reg = <0x9890000 0x10000>;
+			interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&crg HISTB_USB2_BUS_CLK>,
+				 <&crg HISTB_USB2_PHY_CLK>,
+				 <&crg HISTB_USB2_UTMI_CLK>;
+			clock-names = "ehci_system", "phy", "utmi";
+			resets = <&crg 0xb8 12>,
+				 <&crg 0xb8 16>,
+				 <&crg 0xb8 13>;
+			reset-names = "bus", "phy", "utmi";
+			status = "disabled";
+		};
+
+		ohci: ohci@0x9880000 {
+			compatible = "generic-ohci";
+			reg = <0x9880000 0x10000>;
+			interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&crg HISTB_USB2_BUS_CLK>,
+				 <&crg HISTB_USB2_12M_CLK>,
+				 <&crg HISTB_USB2_48M_CLK>;
+			clock-names = "ahb_biu", "clk12", "clk48";
+			resets = <&crg 0xb8 12>;
+			reset-names = "bus";
+			status = "disabled";
+		};
+
+		usb2_phy1: usb-phy@1 {
+			compatible = "hisilicon,hi3798cv200-usb2-phy";
+			#phy-cells = <0>;
+			hisilicon,peripheral-syscon = <&peri_ctrl>;
+			hisilicon,phycon-reg = <0x120>;
+			hisilicon,port-num = <2>;
+			clocks = <&crg HISTB_USB2_PHY1_REF_CLK>;
+			resets = <&crg 0xbc 4>,
+				 <&crg 0xbc 8>,
+				 <&crg 0xbc 9>;
+			reset-names = "power_on", "utmi0", "utmi1";
+			status = "disabled";
+		};
+
+		usb2_phy2: usb-phy@2 {
+			compatible = "hisilicon,hi3798cv200-usb2-phy";
+			#phy-cells = <0>;
+			hisilicon,peripheral-syscon = <&peri_ctrl>;
+			hisilicon,phycon-reg = <0x124>;
+			hisilicon,port-num = <1>;
+			clocks = <&crg HISTB_USB2_PHY2_REF_CLK>;
+			resets = <&crg 0xbc 6>,
+				 <&crg 0xbc 10>;
+			reset-names = "power_on", "utmi0";
+			status = "disabled";
+		};
 	};
 };
-- 
1.9.1

[PATCH v2 4/4] arm64: defconfig: enable some drivers for hi3798cv200-poplar board.

[Jiancheng Xue]

Enable GMAC,I2C,USB2-PHY for hi3798cv200-poplar board.

Signed-off-by: Jiancheng Xue <xuejiancheng@hisilicon.com>
---
 arch/arm64/configs/defconfig | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 6c7d147..93c709d7 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -184,6 +184,7 @@ CONFIG_VIRTIO_NET=y
 CONFIG_AMD_XGBE=y
 CONFIG_NET_XGENE=y
 CONFIG_MACB=y
+CONFIG_HIX5HD2_GMAC=y
 CONFIG_HNS_DSAF=y
 CONFIG_HNS_ENET=y
 CONFIG_E1000E=y
@@ -267,6 +268,7 @@ CONFIG_I2C_TEGRA=y
 CONFIG_I2C_UNIPHIER_F=y
 CONFIG_I2C_RCAR=y
 CONFIG_I2C_CROS_EC_TUNNEL=y
+CONFIG_I2C_HIX5HD2=y
 CONFIG_SPI=y
 CONFIG_SPI_MESON_SPICC=m
 CONFIG_SPI_MESON_SPIFC=m
@@ -504,7 +506,9 @@ CONFIG_PWM_MESON=m
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_PWM_SAMSUNG=y
 CONFIG_PWM_TEGRA=m
+CONFIG_TI_SYSCON_RESET=y
 CONFIG_PHY_RCAR_GEN3_USB2=y
+CONFIG_PHY_HISI_INNO_USB2=y
 CONFIG_PHY_HI6220_USB=y
 CONFIG_PHY_SUN4I_USB=y
 CONFIG_PHY_ROCKCHIP_INNO_USB2=y
-- 
1.9.1

Re: [PATCH v2 1/4] dt-bindings: phy-hisi-inno-usb2: add support for hisi-inno-usb2 phy

[Rob Herring]

On Wed, Jul 26, 2017 at 02:06:00PM +0800, Jiancheng Xue wrote:
> Add support for hisi-inno-usb2 phy.
> 
> Signed-off-by: Jiancheng Xue <xuejiancheng@hisilicon.com>
> ---
>  .../devicetree/bindings/phy/phy-hisi-inno-usb2.txt | 31 ++++++++++++++++++++++
>  1 file changed, 31 insertions(+)
>  create mode 100644 Documentation/devicetree/bindings/phy/phy-hisi-inno-usb2.txt
> 
> diff --git a/Documentation/devicetree/bindings/phy/phy-hisi-inno-usb2.txt b/Documentation/devicetree/bindings/phy/phy-hisi-inno-usb2.txt
> new file mode 100644
> index 0000000..417eeaa
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/phy/phy-hisi-inno-usb2.txt
> @@ -0,0 +1,31 @@
> +HiSilicon INNO USB2 PHY
> +-----------------------
> +Required properties:
> +- compatible: Should be one of the following strings:
> +		"hisilicon,inno-usb2-phy",
> +		"hisilicon,hi3798cv200-usb2-phy",
> +- #phy-cells: Shall be 0.
> +- hisilicon,peripheral-syscon: Phandle of syscon used to control phy.
> +- hisilicon,phycon-reg: Offset of the phy control register in the syscon.

Just make this a cell of hisilicon,peripheral-syscon: <&syscon 0x120>

With that,

Acked-by: Rob Herring <robh@kernel.org>

Re: [PATCH v2 2/4] phy: add inno-usb2-phy driver for hi3798cv200 SoC

[Kishon Vijay Abraham I]

Hi,

On Wednesday 26 July 2017 11:36 AM, Jiancheng Xue wrote:
> From: Pengcheng Li <lpc.li-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org>
> 
> Add inno-usb2-phy driver for hi3798cv200 SoC.
> 
> Signed-off-by: Pengcheng Li <lpc.li-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org>
> Signed-off-by: Jiancheng Xue <xuejiancheng-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org>
> ---
>  drivers/phy/hisilicon/Kconfig              |  11 +-
>  drivers/phy/hisilicon/Makefile             |   1 +
>  drivers/phy/hisilicon/phy-hisi-inno-usb2.c | 236 +++++++++++++++++++++++++++++
>  3 files changed, 247 insertions(+), 1 deletion(-)
>  create mode 100644 drivers/phy/hisilicon/phy-hisi-inno-usb2.c
> 
> diff --git a/drivers/phy/hisilicon/Kconfig b/drivers/phy/hisilicon/Kconfig
> index 6164c4c..6a675c5 100644
> --- a/drivers/phy/hisilicon/Kconfig
> +++ b/drivers/phy/hisilicon/Kconfig
> @@ -8,9 +8,18 @@ config PHY_HI6220_USB
>  	select MFD_SYSCON
>  	help
>  	  Enable this to support the HISILICON HI6220 USB PHY.
> -
  ^^
not related to $patch.
>  	  To compile this driver as a module, choose M here.
>  
> +config PHY_HISI_INNO_USB2
> +       tristate "HiSilicon INNO USB2 PHY support"
> +       depends on (ARCH_HISI) || COMPILE_TEST
> +       select GENERIC_PHY
> +       select MFD_SYSCON
> +       help
> +         Support for INNO USB2 PHY on HiSilicon SoCs. This Phy supports
> +         USB 1.5Mb/s, USB 12Mb/s, USB 480Mb/s speeds. It supports one
> +         USB host port to accept one USB device.
> +
>  config PHY_HIX5HD2_SATA
>  	tristate "HIX5HD2 SATA PHY Driver"
>  	depends on ARCH_HIX5HD2 && OF && HAS_IOMEM
> diff --git a/drivers/phy/hisilicon/Makefile b/drivers/phy/hisilicon/Makefile
> index 541b348..e6c9794 100644
> --- a/drivers/phy/hisilicon/Makefile
> +++ b/drivers/phy/hisilicon/Makefile
> @@ -1,2 +1,3 @@
>  obj-$(CONFIG_PHY_HI6220_USB)		+= phy-hi6220-usb.o
> +obj-$(CONFIG_PHY_HISI_INNO_USB2)	+= phy-hisi-inno-usb2.o
>  obj-$(CONFIG_PHY_HIX5HD2_SATA)		+= phy-hix5hd2-sata.o
> diff --git a/drivers/phy/hisilicon/phy-hisi-inno-usb2.c b/drivers/phy/hisilicon/phy-hisi-inno-usb2.c
> new file mode 100644
> index 0000000..7edf4a3
> --- /dev/null
> +++ b/drivers/phy/hisilicon/phy-hisi-inno-usb2.c
> @@ -0,0 +1,236 @@
> +/*
> + * HiSilicon INNO USB2 PHY Driver.
> + *
> + * Copyright (c) 2016-2017 HiSilicon Technologies Co., Ltd.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program. If not, see <http://www.gnu.org/licenses/>.
> + */
> +
> +#include <linux/clk.h>
> +#include <linux/delay.h>
> +#include <linux/mfd/syscon.h>
> +#include <linux/module.h>
> +#include <linux/platform_device.h>
> +#include <linux/phy/phy.h>
> +#include <linux/regmap.h>
> +#include <linux/reset.h>
> +
> +#define INNO_PHY_PORT_NUM	2
> +#define REF_CLK_STABLE_TIME	100	/* unit:us */
> +#define UTMI_CLK_STABLE_TIME	200	/* unit:us */
> +#define TEST_CLK_STABLE_TIME	2	/* unit:ms */
> +#define PHY_CLK_STABLE_TIME	2	/* unit:ms */
> +#define UTMI_RST_COMPLETE_TIME	2	/* unit:ms */
> +#define TEST_RST_COMPLETE_TIME	100	/* unit:us */
> +#define POR_RST_COMPLETE_TIME	300	/* unit:us */
> +#define PHY_TEST_DATA	GENMASK(7, 0)
> +#define PHY_TEST_ADDR	GENMASK(15, 8)
> +#define PHY_TEST_PORT	GENMASK(18, 16)
> +#define PHY_TEST_WREN	BIT(21)
> +#define PHY_TEST_CLK	BIT(22)	/* rising edge active */
> +#define PHY_TEST_RST	BIT(23)	/* low active */
> +#define PHY_CLK_ENABLE	BIT(2)
> +
> +struct hisi_inno_phy_priv {
> +	struct regmap *syscon;
> +	u32 reg;
> +	struct clk *ref_clk;
> +	struct reset_control *por_rst;
> +	struct reset_control *test_rst;
> +	struct reset_control *utmi_rst[INNO_PHY_PORT_NUM];
> +	u32 port_num;
> +};
> +
> +static void hisi_inno_phy_write_reg(struct regmap *syscon,
> +			u32 reg, u8 port, u32 addr, u32 data)
> +{
> +	u32 value;
> +
> +	value = (data & PHY_TEST_DATA)
> +		| ((addr << 8) & PHY_TEST_ADDR)
> +		| ((port << 16) & PHY_TEST_PORT)
> +		| PHY_TEST_WREN | PHY_TEST_RST;
> +	regmap_write(syscon, reg, value);
> +	value |= PHY_TEST_CLK;
> +	regmap_write(syscon, reg, value);
> +	value &= ~PHY_TEST_CLK;
> +	regmap_write(syscon, reg, value);
> +}
> +
> +static void hisi_inno_phy_setup(struct hisi_inno_phy_priv *priv)
> +{
> +	/* The phy clk is controlled by the port0 register 0x06. */
> +	hisi_inno_phy_write_reg(priv->syscon,
> +			priv->reg, 0, 0x06, PHY_CLK_ENABLE);
> +	msleep(PHY_CLK_STABLE_TIME);
> +}
> +
> +static int hisi_inno_phy_init(struct phy *phy)
> +{
> +	struct hisi_inno_phy_priv *priv = phy_get_drvdata(phy);
> +	int ret, i;
> +
> +	ret = clk_prepare_enable(priv->ref_clk);
> +	if (ret)
> +		return ret;
> +	udelay(REF_CLK_STABLE_TIME);
> +
> +	if (priv->test_rst) {
> +		reset_control_deassert(priv->test_rst);
> +		udelay(TEST_RST_COMPLETE_TIME);
> +	}
> +
> +	reset_control_deassert(priv->por_rst);
> +	udelay(POR_RST_COMPLETE_TIME);
> +
> +	/* config phy clk and phy eye diagram */
> +	hisi_inno_phy_setup(priv);
> +
> +	for (i = 0; i < priv->port_num; i++) {
> +		reset_control_deassert(priv->utmi_rst[i]);
> +		udelay(UTMI_RST_COMPLETE_TIME);
> +	}
> +
> +	return 0;
> +}
> +
> +static void hisi_inno_phy_disable(struct phy *phy)
> +{
> +	struct hisi_inno_phy_priv *priv = phy_get_drvdata(phy);
> +	int i;
> +
> +	for (i = 0; i < priv->port_num; i++)
> +		reset_control_assert(priv->utmi_rst[i]);
> +
> +	reset_control_assert(priv->por_rst);
> +	if (priv->test_rst)
> +		reset_control_assert(priv->test_rst);
> +	clk_disable_unprepare(priv->ref_clk);
> +}
> +
> +static int hisi_inno_phy_probe(struct platform_device *pdev)
> +{
> +	struct device *dev = &pdev->dev;
> +	struct phy *phy;
> +	struct hisi_inno_phy_priv *priv;
> +	struct device_node *node = dev->of_node;
> +	int ret, i;
> +
> +	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
> +	if (!priv)
> +		return -ENOMEM;
> +
> +	priv->syscon = syscon_regmap_lookup_by_phandle(node,
> +			"hisilicon,peripheral-syscon");
> +	if (IS_ERR(priv->syscon)) {
> +		dev_err(dev, "no hisilicon,peripheral-syscon\n");
> +		return PTR_ERR(priv->syscon);
> +	}
> +
> +	ret = device_property_read_u32(dev,
> +			"hisilicon,phycon-reg", &priv->reg);
> +	if (ret)
> +		return ret;
> +
> +	priv->ref_clk = devm_clk_get(dev, NULL);
> +	if (IS_ERR(priv->ref_clk))
> +		return PTR_ERR(priv->ref_clk);
> +
> +	priv->por_rst = devm_reset_control_get_exclusive(dev, "power_on");
> +	if (IS_ERR(priv->por_rst))
> +		return PTR_ERR(priv->por_rst);
> +
> +	ret = device_property_read_u32(dev,
> +					"hisilicon,port-num", &priv->port_num);
> +	if (ret)
> +		return ret;
> +
> +	if (priv->port_num <= 0
> +		|| priv->port_num > INNO_PHY_PORT_NUM)
> +		return -EINVAL;
> +
> +	for (i = 0; i < priv->port_num; i++) {
> +		char id[6];
> +
> +		snprintf(id, 6, "utmi%1d\n", i);
> +		priv->utmi_rst[i] = devm_reset_control_get_exclusive(dev, id);
> +		if (IS_ERR(priv->utmi_rst[i]))
> +			return PTR_ERR(priv->utmi_rst[i]);
> +	}
> +
> +	priv->test_rst = devm_reset_control_get_optional_exclusive(dev, "test");
> +	if (IS_ERR(priv->test_rst))
> +		return PTR_ERR(priv->test_rst);
> +
> +	phy = devm_kzalloc(dev, sizeof(*phy), GFP_KERNEL);
> +	if (!phy)
> +		return -ENOMEM;
> +
> +	platform_set_drvdata(pdev, phy);
> +	phy_set_drvdata(phy, priv);
> +
> +	return hisi_inno_phy_init(phy);

why don't you use the phy framework and initialize the phy only when required
by the usb host controller?
> +}
> +
> +static int hisi_inno_phy_remove(struct platform_device *pdev)
> +{
> +	struct phy *phy = platform_get_drvdata(pdev);
> +
> +	hisi_inno_phy_disable(phy);
> +
> +	return 0;
> +}
> +
> +#ifdef CONFIG_PM_SLEEP
> +static int hisi_inno_phy_suspend(struct device *dev)
> +{
> +	struct phy *phy = dev_get_drvdata(dev);
> +
> +	hisi_inno_phy_disable(phy);

How do you make sure, usb is not using the phy when suspend is invoked? We
don't want to be disabling the phy when usb controller is using it.

Thanks
Kishon
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html