Re: [project-aspen-dev] [PATCH 3/5] phy: add inno-usb2-phy driver for hi3798cv200 SoC

2017-06-21 Thread Daniel Thompson 

On 21/06/17 10:00, Jiancheng Xue wrote:

From: Pengcheng Li 

Add inno-usb2-phy driver for hi3798cv200 SoC.

Signed-off-by: Pengcheng Li 
Signed-off-by: Jiancheng Xue 
---
  drivers/phy/Kconfig  |  10 ++
  drivers/phy/Makefile |   1 +
  drivers/phy/phy-hisi-inno-usb2.c | 287 +++
  3 files changed, 298 insertions(+)
  create mode 100644 drivers/phy/phy-hisi-inno-usb2.c

...
diff --git a/drivers/phy/phy-hisi-inno-usb2.c b/drivers/phy/phy-hisi-inno-usb2.c
new file mode 100644
index 000..582c500
--- /dev/null
+++ b/drivers/phy/phy-hisi-inno-usb2.c
@@ -0,0 +1,287 @@

> ...> +static int hisi_inno_phy_of_get_ports(struct device *dev,

+   struct  hisi_inno_phy_priv *priv)
+{
+   struct device_node *node = dev->of_node;
+   struct device_node *child;
+   int port = 0;
+   int ret;
+
+   priv->port_num = of_get_child_count(node);
+   if (priv->port_num > MAX_PORTS) {
+   dev_err(dev, "too many ports : %d (max = %d)\n",
+   priv->port_num, MAX_PORTS);
+   return -EINVAL;
+   }
+
+   priv->ports = devm_kcalloc(dev, priv->port_num,
+   sizeof(struct hisi_inno_phy_port), GFP_KERNEL);
+   if (!priv->ports)
+   return -ENOMEM;
+
+   for_each_child_of_node(node, child) {
+   struct hisi_inno_phy_port *phy_port = >ports[port];
+
+   phy_port->utmi_clk = devm_get_clk_from_child(dev, child, NULL);
+   if (IS_ERR(phy_port->utmi_clk)) {
+   ret = PTR_ERR(phy_port->utmi_clk);
+   goto fail;
+   }
+
+   phy_port->port_rst = of_reset_control_get_exclusive(child, 
"port_rst"); > + if (IS_ERR(phy_port->port_rst)) {
+   ret = PTR_ERR(phy_port->port_rst);
+   goto fail;
+   }
+
+   phy_port->utmi_rst = of_reset_control_get_exclusive(child, 
"utmi_rst");
+   if (IS_ERR(phy_port->utmi_rst)) {
+   ret = PTR_ERR(phy_port->utmi_rst);
+   reset_control_put(phy_port->port_rst);
+   goto fail;
+   }
+   port++;
+   }
+
+   return 0;
+
+fail:
+   while (--port >= 0) {
+   struct hisi_inno_phy_port *phy_port = >ports[port];
+
+   reset_control_put(phy_port->utmi_rst);
+   reset_control_put(phy_port->port_rst) > + 
clk_put(phy_port->utmi_clk);


clk_put() should not be needed here.


+   }


Do we also need clean up code like this in a remove callback?


Daniel.

Re: [project-aspen-dev] [PATCH 3/5] phy: add inno-usb2-phy driver for hi3798cv200 SoC

2017-06-21 Thread Daniel Thompson 

On 21/06/17 10:00, Jiancheng Xue wrote:

From: Pengcheng Li 

Add inno-usb2-phy driver for hi3798cv200 SoC.

Signed-off-by: Pengcheng Li 
Signed-off-by: Jiancheng Xue 
---
  drivers/phy/Kconfig  |  10 ++
  drivers/phy/Makefile |   1 +
  drivers/phy/phy-hisi-inno-usb2.c | 287 +++
  3 files changed, 298 insertions(+)
  create mode 100644 drivers/phy/phy-hisi-inno-usb2.c

...
diff --git a/drivers/phy/phy-hisi-inno-usb2.c b/drivers/phy/phy-hisi-inno-usb2.c
new file mode 100644
index 000..582c500
--- /dev/null
+++ b/drivers/phy/phy-hisi-inno-usb2.c
@@ -0,0 +1,287 @@

> ...> +static int hisi_inno_phy_of_get_ports(struct device *dev,

+   struct  hisi_inno_phy_priv *priv)
+{
+   struct device_node *node = dev->of_node;
+   struct device_node *child;
+   int port = 0;
+   int ret;
+
+   priv->port_num = of_get_child_count(node);
+   if (priv->port_num > MAX_PORTS) {
+   dev_err(dev, "too many ports : %d (max = %d)\n",
+   priv->port_num, MAX_PORTS);
+   return -EINVAL;
+   }
+
+   priv->ports = devm_kcalloc(dev, priv->port_num,
+   sizeof(struct hisi_inno_phy_port), GFP_KERNEL);
+   if (!priv->ports)
+   return -ENOMEM;
+
+   for_each_child_of_node(node, child) {
+   struct hisi_inno_phy_port *phy_port = >ports[port];
+
+   phy_port->utmi_clk = devm_get_clk_from_child(dev, child, NULL);
+   if (IS_ERR(phy_port->utmi_clk)) {
+   ret = PTR_ERR(phy_port->utmi_clk);
+   goto fail;
+   }
+
+   phy_port->port_rst = of_reset_control_get_exclusive(child, 
"port_rst"); > + if (IS_ERR(phy_port->port_rst)) {
+   ret = PTR_ERR(phy_port->port_rst);
+   goto fail;
+   }
+
+   phy_port->utmi_rst = of_reset_control_get_exclusive(child, 
"utmi_rst");
+   if (IS_ERR(phy_port->utmi_rst)) {
+   ret = PTR_ERR(phy_port->utmi_rst);
+   reset_control_put(phy_port->port_rst);
+   goto fail;
+   }
+   port++;
+   }
+
+   return 0;
+
+fail:
+   while (--port >= 0) {
+   struct hisi_inno_phy_port *phy_port = >ports[port];
+
+   reset_control_put(phy_port->utmi_rst);
+   reset_control_put(phy_port->port_rst) > + 
clk_put(phy_port->utmi_clk);


clk_put() should not be needed here.


+   }


Do we also need clean up code like this in a remove callback?


Daniel.

[PATCH 3/5] phy: add inno-usb2-phy driver for hi3798cv200 SoC

2017-06-21 Thread Jiancheng Xue 
From: Pengcheng Li 

Add inno-usb2-phy driver for hi3798cv200 SoC.

Signed-off-by: Pengcheng Li 
Signed-off-by: Jiancheng Xue 
---
 drivers/phy/Kconfig  |  10 ++
 drivers/phy/Makefile |   1 +
 drivers/phy/phy-hisi-inno-usb2.c | 287 +++
 3 files changed, 298 insertions(+)
 create mode 100644 drivers/phy/phy-hisi-inno-usb2.c

diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index afaf7b6..f86b9b7 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -225,6 +225,16 @@ config PHY_EXYNOS5250_SATA
  SATA 3.0 Gb/s, SATA 6.0 Gb/s speeds. It supports one SATA host
  port to accept one SATA device.
 
+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/Makefile b/drivers/phy/Makefile
index f8047b4..a275547 100644
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@ -27,6 +27,7 @@ obj-$(CONFIG_TWL4030_USB) += phy-twl4030-usb.o
 obj-$(CONFIG_PHY_EXYNOS5250_SATA)  += phy-exynos5250-sata.o
 obj-$(CONFIG_PHY_HIX5HD2_SATA) += phy-hix5hd2-sata.o
 obj-$(CONFIG_PHY_HI6220_USB)   += phy-hi6220-usb.o
+obj-$(CONFIG_PHY_HISI_INNO_USB2)   += phy-hisi-inno-usb2.o
 obj-$(CONFIG_PHY_MT65XX_USB3)  += phy-mt65xx-usb3.o
 obj-$(CONFIG_PHY_SUN4I_USB)+= phy-sun4i-usb.o
 obj-$(CONFIG_PHY_SUN9I_USB)+= phy-sun9i-usb.o
diff --git a/drivers/phy/phy-hisi-inno-usb2.c b/drivers/phy/phy-hisi-inno-usb2.c
new file mode 100644
index 000..582c500
--- /dev/null
+++ b/drivers/phy/phy-hisi-inno-usb2.c
@@ -0,0 +1,287 @@
+/*
+ * 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 .
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#defineMAX_PORTS   4
+#define REF_CLK_STABLE_TIME100 /*unit:us*/
+#define UTMI_CLK_STABLE_TIME   200 /*unit:us*/
+#define UTMI_RST_COMPLETE_TIME 200 /*unit:us*/
+#define PORT_RST_COMPLETE_TIME 2   /*unit:ms*/
+#define TEST_RST_COMPLETE_TIME 100 /*unit:us*/
+#define POR_RST_COMPLETE_TIME  300 /*unit:us*/
+
+
+struct  hisi_inno_phy_port {
+   struct clk *utmi_clk;
+   struct reset_control *port_rst;
+   struct reset_control *utmi_rst;
+};
+
+struct hisi_inno_phy_priv {
+   struct regmap *reg_peri;
+   struct clk *ref_clk;
+   struct reset_control *test_rst;
+   struct reset_control *por_rst;
+   const struct reg_sequence *reg_seq;
+   u32 reg_num;
+   struct  hisi_inno_phy_port *ports;
+   u8  port_num;
+};
+
+#define HI3798CV200_PERI_USB0  0x120
+static const struct reg_sequence hi3798cv200_reg_seq[] = {
+   { HI3798CV200_PERI_USB0, 0x00a00604, },
+   { HI3798CV200_PERI_USB0, 0x00e00604, },
+   { HI3798CV200_PERI_USB0, 0x00a00604, 1000 },
+};
+
+static int hisi_inno_phy_setup(struct hisi_inno_phy_priv *priv)
+{
+   return regmap_multi_reg_write_bypassed(priv->reg_peri,
+   priv->reg_seq, priv->reg_num);
+}
+
+static int hisi_inno_port_init(struct hisi_inno_phy_port *port)
+{
+   int ret;
+
+   reset_control_deassert(port->port_rst);
+   msleep(PORT_RST_COMPLETE_TIME);
+
+   ret = clk_prepare_enable(port->utmi_clk);
+   if (ret)
+   return ret;
+   udelay(UTMI_CLK_STABLE_TIME);
+
+   reset_control_deassert(port->utmi_rst);
+   udelay(UTMI_RST_COMPLETE_TIME);
+
+   return 0;
+}
+
+static int hisi_inno_phy_init(struct phy *phy)
+{
+   struct hisi_inno_phy_priv *priv = phy_get_drvdata(phy);
+   int ret, port;
+
+   ret = clk_prepare_enable(priv->ref_clk);
+   if (ret)
+   return ret;
+   udelay(REF_CLK_STABLE_TIME);
+
+   if (priv->test_rst) {
+

[PATCH 3/5] phy: add inno-usb2-phy driver for hi3798cv200 SoC

2017-06-21 Thread Jiancheng Xue 
From: Pengcheng Li 

Add inno-usb2-phy driver for hi3798cv200 SoC.

Signed-off-by: Pengcheng Li 
Signed-off-by: Jiancheng Xue 
---
 drivers/phy/Kconfig  |  10 ++
 drivers/phy/Makefile |   1 +
 drivers/phy/phy-hisi-inno-usb2.c | 287 +++
 3 files changed, 298 insertions(+)
 create mode 100644 drivers/phy/phy-hisi-inno-usb2.c

diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index afaf7b6..f86b9b7 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -225,6 +225,16 @@ config PHY_EXYNOS5250_SATA
  SATA 3.0 Gb/s, SATA 6.0 Gb/s speeds. It supports one SATA host
  port to accept one SATA device.
 
+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/Makefile b/drivers/phy/Makefile
index f8047b4..a275547 100644
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@ -27,6 +27,7 @@ obj-$(CONFIG_TWL4030_USB) += phy-twl4030-usb.o
 obj-$(CONFIG_PHY_EXYNOS5250_SATA)  += phy-exynos5250-sata.o
 obj-$(CONFIG_PHY_HIX5HD2_SATA) += phy-hix5hd2-sata.o
 obj-$(CONFIG_PHY_HI6220_USB)   += phy-hi6220-usb.o
+obj-$(CONFIG_PHY_HISI_INNO_USB2)   += phy-hisi-inno-usb2.o
 obj-$(CONFIG_PHY_MT65XX_USB3)  += phy-mt65xx-usb3.o
 obj-$(CONFIG_PHY_SUN4I_USB)+= phy-sun4i-usb.o
 obj-$(CONFIG_PHY_SUN9I_USB)+= phy-sun9i-usb.o
diff --git a/drivers/phy/phy-hisi-inno-usb2.c b/drivers/phy/phy-hisi-inno-usb2.c
new file mode 100644
index 000..582c500
--- /dev/null
+++ b/drivers/phy/phy-hisi-inno-usb2.c
@@ -0,0 +1,287 @@
+/*
+ * 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 .
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#defineMAX_PORTS   4
+#define REF_CLK_STABLE_TIME100 /*unit:us*/
+#define UTMI_CLK_STABLE_TIME   200 /*unit:us*/
+#define UTMI_RST_COMPLETE_TIME 200 /*unit:us*/
+#define PORT_RST_COMPLETE_TIME 2   /*unit:ms*/
+#define TEST_RST_COMPLETE_TIME 100 /*unit:us*/
+#define POR_RST_COMPLETE_TIME  300 /*unit:us*/
+
+
+struct  hisi_inno_phy_port {
+   struct clk *utmi_clk;
+   struct reset_control *port_rst;
+   struct reset_control *utmi_rst;
+};
+
+struct hisi_inno_phy_priv {
+   struct regmap *reg_peri;
+   struct clk *ref_clk;
+   struct reset_control *test_rst;
+   struct reset_control *por_rst;
+   const struct reg_sequence *reg_seq;
+   u32 reg_num;
+   struct  hisi_inno_phy_port *ports;
+   u8  port_num;
+};
+
+#define HI3798CV200_PERI_USB0  0x120
+static const struct reg_sequence hi3798cv200_reg_seq[] = {
+   { HI3798CV200_PERI_USB0, 0x00a00604, },
+   { HI3798CV200_PERI_USB0, 0x00e00604, },
+   { HI3798CV200_PERI_USB0, 0x00a00604, 1000 },
+};
+
+static int hisi_inno_phy_setup(struct hisi_inno_phy_priv *priv)
+{
+   return regmap_multi_reg_write_bypassed(priv->reg_peri,
+   priv->reg_seq, priv->reg_num);
+}
+
+static int hisi_inno_port_init(struct hisi_inno_phy_port *port)
+{
+   int ret;
+
+   reset_control_deassert(port->port_rst);
+   msleep(PORT_RST_COMPLETE_TIME);
+
+   ret = clk_prepare_enable(port->utmi_clk);
+   if (ret)
+   return ret;
+   udelay(UTMI_CLK_STABLE_TIME);
+
+   reset_control_deassert(port->utmi_rst);
+   udelay(UTMI_RST_COMPLETE_TIME);
+
+   return 0;
+}
+
+static int hisi_inno_phy_init(struct phy *phy)
+{
+   struct hisi_inno_phy_priv *priv = phy_get_drvdata(phy);
+   int ret, port;
+
+   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);
+