Add Combo PHY driver for HiSilicon STB SoCs
Subsystems (2)
v2 cover Add Combo PHY driver for HiSilicon STB SoCs
From: Shawn Guo <[email protected]>
It adds device tree bindings and driver support for Combo PHY device which can be found on HiSilicon STB SoCs.
Changes for v2:
- Move DT bindings into a separate patch.
- Drop the spurious newline from drivers/phy/Makefile.
- Use the phy type defines in dt-bindings/phy/phy.h.
- Use PTR_ERR_OR_ZERO() for checking return from devm_of_phy_provider_register().
- Add USB3 phy support.
Jianguo Sun (2):
dt-bindings: add bindings doc for hi3798cv200 combphy
phy: add combo phy driver for HiSilicon STB SoCs
.../bindings/phy/phy-hi3798cv200-combphy.txt | 19 ++ drivers/phy/hisilicon/Kconfig | 9 + drivers/phy/hisilicon/Makefile | 1 + drivers/phy/hisilicon/phy-histb-combphy.c | 253 +++++++++++++++++++++ 4 files changed, 282 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/phy-hi3798cv200-combphy.txt create mode 100644 drivers/phy/hisilicon/phy-histb-combphy.c
Signature · 1 line
1.9.1
PATCH v2 1/2 dt-bindings: add bindings doc for hi3798cv200 combphy
From: Jianguo Sun <[email protected]>
It adds the device tree bindings for PCIE/SATA/USB3 combo PHY found on HiSilicon STB SoCs.
--- .../bindings/phy/phy-hi3798cv200-combphy.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/phy-hi3798cv200-combphy.txt
Documentation/devicetree/bindings/phy/phy-hi3798cv200-combphy.txt new file +19 -0
@@ -0,0 +1,19 @@ +HiSilicon STB PCIE/SATA/USB3 PHY + +Properties: +- compatible: Should be "hisilicon,hi3798cv200-combphy" +- #phy-cells: Should be 1. The cell number is used to select the phy mode + as defined in <dt-bindings/phy/phy.h>. +- clocks: The phandle to clock provider and clock specifier pair. +- resets: The phandle to reset controller and reset specifier pair. +- hisilicon,peripheral-syscon: The phandle to the peripheral controller. + +Example: + +combphy1: phy { + compatible = "hisilicon,hi3798cv200-combphy"; + #phy-cells = <1>; + clocks = <&crg HISTB_COMBPHY1_CLK>; + resets = <&crg 0x188 12>; + hisilicon,peripheral-syscon = <&peri_ctrl>; +};
Signature · 1 line
1.9.1
PATCH v2 2/2 phy: add combo phy driver for HiSilicon STB SoCs
In reply to Shawn GuoFrom: Jianguo Sun <[email protected]>
Add combo phy driver for HiSilicon STB SoCs. This phy can be used as pcie-phy, sata-phy or usb-phy.
--- drivers/phy/hisilicon/Kconfig | 9 ++ drivers/phy/hisilicon/Makefile | 1 + drivers/phy/hisilicon/phy-histb-combphy.c | 253 ++++++++++++++++++++++++++++++ 3 files changed, 263 insertions(+) create mode 100644 drivers/phy/hisilicon/phy-histb-combphy.c
drivers/phy/hisilicon/Kconfig +9 -0
@@ -11,6 +11,15 @@ config PHY_HI6220_USB To compile this driver as a module, choose M here. +config PHY_HISTB_COMBPHY + tristate "HiSilicon STB SoCs COMBPHY support" + depends on (ARCH_HISI && ARM64) || COMPILE_TEST + select GENERIC_PHY + select MFD_SYSCON + help + Enable this to support the HISILICON STB SoCs COMBPHY. + If unsure, say N. + config PHY_HIX5HD2_SATA tristate "HIX5HD2 SATA PHY Driver" depends on ARCH_HIX5HD2 && OF && HAS_IOMEM
drivers/phy/hisilicon/Makefile +1 -0
@@ -1,2 +1,3 @@ obj-$(CONFIG_PHY_HI6220_USB) += phy-hi6220-usb.o +obj-$(CONFIG_PHY_HISTB_COMBPHY) += phy-histb-combphy.o obj-$(CONFIG_PHY_HIX5HD2_SATA) += phy-hix5hd2-sata.o
drivers/phy/hisilicon/phy-histb-combphy.c new file +253 -0
253 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH v2 2/2 phy: add combo phy driver for HiSilicon STB SoCs
Hi,
Quoted 60 lines · Shawn Guo
From: Jianguo Sun <[email protected]>
Add combo phy driver for HiSilicon STB SoCs. This phy can be used as pcie-phy, sata-phy or usb-phy.
Signed-off-by Jianguo Sun <[email protected]>Signed-off-by Shawn Guo <[email protected]>--- drivers/phy/hisilicon/Kconfig | 9 ++ drivers/phy/hisilicon/Makefile | 1 + drivers/phy/hisilicon/phy-histb-combphy.c | 253 ++++++++++++++++++++++++++++++ 3 files changed, 263 insertions(+) create mode 100644 drivers/phy/hisilicon/phy-histb-combphy.cdrivers/phy/hisilicon/Kconfig +9
-0@@ -11,6 +11,15 @@ config PHY_HI6220_USB To compile this driver as a module, choose M here. +config PHY_HISTB_COMBPHY + tristate "HiSilicon STB SoCs COMBPHY support" + depends on (ARCH_HISI && ARM64) || COMPILE_TEST + select GENERIC_PHY + select MFD_SYSCON + help + Enable this to support the HISILICON STB SoCs COMBPHY. + If unsure, say N. + config PHY_HIX5HD2_SATA tristate "HIX5HD2 SATA PHY Driver" depends on ARCH_HIX5HD2 && OF && HAS_IOMEMdrivers/phy/hisilicon/Makefile +1
-0@@ -1,2 +1,3 @@ obj-$(CONFIG_PHY_HI6220_USB) += phy-hi6220-usb.o +obj-$(CONFIG_PHY_HISTB_COMBPHY) += phy-histb-combphy.o obj-$(CONFIG_PHY_HIX5HD2_SATA) += phy-hix5hd2-sata.odrivers/phy/hisilicon/phy-histb-combphy.c new file +12
-0@@ -0,0 +1,253 @@ +/* +* COMBPHY driver for HiSilicon STB SoCs +* +* Copyright (C) 2016-2017 HiSilicon Co., Ltd. http://www.hisilicon.com +* +* Authors: Jianguo Sun <[email protected]> +* +* 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. +*/ +
[snip]
Quoted 41 lines
drivers/phy/hisilicon/phy-histb-combphy.c new file +41
-0+ +static int histb_pcie_phy_init (struct histb_combphy_priv *priv) +{ +struct regmap *peri = priv->peri; +int ret; + +/* set to pcie mode */ +regmap_update_bits (peri,PERI_CTRL ,COMBPHY1_MODE_MASK , +COMBPHY_MODE_PCIE <<COMBPHY_MODE_SHIFT ); + +regmap_update_bits (peri,PERI_COMBPHY1_CFG , +COMBPHY1_BYPASS_CODEC_MASK , + ~COMBPHY1_BYPASS_CODEC_VAL ); + + ret =clk_prepare_enable (priv->ref); +if (ret) { +dev_err (&priv->phy->dev,"clk_prepare_enable fail!\n" ); +return ret; + } + +reset_control_deassert (priv->por); + +regmap_update_bits (peri,PERI_COMBPHY1_CFG , +COMBPHY1_CLKREF_OUT_OEN_MASK , +COMBPHY1_CLKREF_OUT_OEN_VAL ); + +/* need to wait for EP clk stable */ +mdelay (5 ); + +nano_register_write (peri,PERI_COMBPHY1_CFG ,0x1 ,0x8 ); +nano_register_write (peri,PERI_COMBPHY1_CFG ,0xc ,0x9 ); +nano_register_write (peri,PERI_COMBPHY1_CFG ,0x1a ,0x4 ); + +return 0 ; +} + +static int histb_pcie_phy_exit (struct histb_combphy_priv *priv) +{ +regmap_update_bits (priv->peri,PERI_COMBPHY1_CFG , +COMBPHY1_CLKREF_OUT_OEN_MASK , + ~COMBPHY1_CLKREF_OUT_OEN_VAL );
drivers/phy/hisilicon/phy-histb-combphy.c line 123
Quoted 10 lines
drivers/phy/hisilicon/phy-histb-combphy.c new file +10
-0+reset_control_deassert (priv->por); +clk_disable_unprepare (priv->ref); + +return 0 ; +} + +static int histb_usb_phy_init (struct histb_combphy_priv *priv) +{ +int ret; +
I think the work mode should be set to usb3 first as histb_pcie_phy_init does. The current one may be not usb3.
Quoted 9 lines
drivers/phy/hisilicon/phy-histb-combphy.c new file +9
-0+ ret =clk_prepare_enable (priv->ref); +if (ret) { +dev_err (&priv->phy->dev,"clk_prepare_enable fail!\n" ); +return ret; + } +reset_control_deassert (priv->por); +mdelay (1 ); + +return 0 ;
drivers/phy/hisilicon/phy-histb-combphy.c line 142
Quoted 10 lines
drivers/phy/hisilicon/phy-histb-combphy.c new file +10
-0+} + +static int histb_usb_phy_exit (struct histb_combphy_priv *priv) +{ +reset_control_deassert (priv->por); +clk_disable_unprepare (priv->ref); + +return 0 ; +} +
[snip]
Regards,
Jiancheng
PATCH v2 2/2 phy: add combo phy driver for HiSilicon STB SoCs
Quoted 44 lines · Jiancheng Xue
Quoted 44 lines
drivers/phy/hisilicon/phy-histb-combphy.c new file +44
-0+static int histb_pcie_phy_init (struct histb_combphy_priv *priv) +{ +struct regmap *peri = priv->peri; +int ret; + +/* set to pcie mode */ +regmap_update_bits (peri,PERI_CTRL ,COMBPHY1_MODE_MASK , +COMBPHY_MODE_PCIE <<COMBPHY_MODE_SHIFT ); + +regmap_update_bits (peri,PERI_COMBPHY1_CFG , +COMBPHY1_BYPASS_CODEC_MASK , + ~COMBPHY1_BYPASS_CODEC_VAL ); + + ret =clk_prepare_enable (priv->ref); +if (ret) { +dev_err (&priv->phy->dev,"clk_prepare_enable fail!\n" ); +return ret; + } + +reset_control_deassert (priv->por); + +regmap_update_bits (peri,PERI_COMBPHY1_CFG , +COMBPHY1_CLKREF_OUT_OEN_MASK , +COMBPHY1_CLKREF_OUT_OEN_VAL ); + +/* need to wait for EP clk stable */ +mdelay (5 ); + +nano_register_write (peri,PERI_COMBPHY1_CFG ,0x1 ,0x8 ); +nano_register_write (peri,PERI_COMBPHY1_CFG ,0xc ,0x9 ); +nano_register_write (peri,PERI_COMBPHY1_CFG ,0x1a ,0x4 ); + +return 0 ; +} + +static int histb_pcie_phy_exit (struct histb_combphy_priv *priv) +{ +regmap_update_bits (priv->peri,PERI_COMBPHY1_CFG , +COMBPHY1_CLKREF_OUT_OEN_MASK , + ~COMBPHY1_CLKREF_OUT_OEN_VAL ); +reset_control_deassert (priv->por); +clk_disable_unprepare (priv->ref); + +return 0 ;
Quoted 8 lines
drivers/phy/hisilicon/phy-histb-combphy.c line 123
Quoted 6 lines
drivers/phy/hisilicon/phy-histb-combphy.c new file +6
-0+} + +static int histb_usb_phy_init (struct histb_combphy_priv *priv) +{ +int ret; +I think the work mode should be set to usb3 first as
histb_pcie_phy_initdoes. The current one may be not usb3.
Thanks for the reminding. We will address that in the next version.
Shawn
Quoted 10 lines
Quoted 10 lines
drivers/phy/hisilicon/phy-histb-combphy.c new file +10
-0+ ret =clk_prepare_enable (priv->ref); +if (ret) { +dev_err (&priv->phy->dev,"clk_prepare_enable fail!\n" ); +return ret; + } +reset_control_deassert (priv->por); +mdelay (1 ); + +return 0 ; +}