[PATCH v1 0/4] rockchip: emmc: rk3399 add vendor prefix

[PATCH v1 0/4] rockchip: emmc: rk3399 add vendor prefix

[Chris Ruehl]

This patchset follow up with commit 8b5c2b45b8f0a and a8cef928276bb
Following the reference in vendor-prefixes.yaml, update implementation,
devicetree binding dtsi and documentation for the phy-rockchip-emmc.

Signed-off-by: Chris Ruehl <chris.ruehl@gtsys.com.hk>
---
Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt | 19 ++++++++++---------
arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi               |  2 +-
arch/arm64/boot/dts/rockchip/rk3399.dtsi                    |  2 +-
drivers/phy/rockchip/phy-rockchip-emmc.c                    |  6 +++---
4 files changed, 15 insertions(+), 14 deletions(-)

[PATCH v1 1/4] devicetree: phy: rockchip-emmc optional add vendor prefix

[Chris Ruehl]

Update the documentation and add the vendor prefix to the optional
properties referred in vendor-prefixes.yaml.

Signed-off-by: Chris Ruehl <chris.ruehl@gtsys.com.hk>
---
 .../bindings/phy/rockchip-emmc-phy.txt        | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt b/Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt
index 00aa2d349e55..3a55d8086868 100644
--- a/Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt
+++ b/Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt
@@ -13,14 +13,15 @@ Optional properties:
 		access to it), it is strongly suggested.
 		See ../clock/clock-bindings.txt for details.
  - clocks: Should have a phandle to the card clock exported by the SDHCI driver.
- - drive-impedance-ohm: Specifies the drive impedance in Ohm.
-                        Possible values are 33, 40, 50, 66 and 100.
-                        If not set, the default value of 50 will be applied.
- - enable-strobe-pulldown: Enable internal pull-down for the strobe line.
-                           If not set, pull-down is not used.
- - output-tapdelay-select: Specifies the phyctrl_otapdlysec register.
-                           If not set, the register defaults to 0x4.
-                           Maximum value 0xf.
+ - rockchip,drive-impedance-ohm: Specifies the drive impedance in Ohm.
+                                 Possible values are 33, 40, 50, 66 and 100.
+                                 If not set, the default value of 50 will be
+                                 applied.
+ - rockchip,enable-strobe-pulldown: Enable internal pull-down for the strobe
+                                    line.  If not set, pull-down is not used.
+ - rockchip,output-tapdelay-select: Specifies the phyctrl_otapdlysec register.
+                                    If not set, the register defaults to 0x4.
+                                    Maximum value 0xf.
 
 Example:
 
@@ -37,7 +38,7 @@ grf: syscon@ff770000 {
 		reg = <0xf780 0x20>;
 		clocks = <&sdhci>;
 		clock-names = "emmcclk";
-		drive-impedance-ohm = <50>;
+		rockchip,drive-impedance-ohm = <50>;
 		#phy-cells = <0>;
 	};
 };
-- 
2.20.1

Re: [PATCH v1 1/4] devicetree: phy: rockchip-emmc optional add vendor prefix

[Rob Herring]

On Sun, Dec 13, 2020 at 9:00 PM Chris Ruehl <chris.ruehl@gtsys.com.hk> wrote:
>
> Update the documentation and add the vendor prefix to the optional
> properties referred in vendor-prefixes.yaml.
>
> Signed-off-by: Chris Ruehl <chris.ruehl@gtsys.com.hk>
> ---
>  .../bindings/phy/rockchip-emmc-phy.txt        | 19 ++++++++++---------
>  1 file changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt b/Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt
> index 00aa2d349e55..3a55d8086868 100644
> --- a/Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt
> +++ b/Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt
> @@ -13,14 +13,15 @@ Optional properties:
>                 access to it), it is strongly suggested.
>                 See ../clock/clock-bindings.txt for details.
>   - clocks: Should have a phandle to the card clock exported by the SDHCI driver.
> - - drive-impedance-ohm: Specifies the drive impedance in Ohm.
> -                        Possible values are 33, 40, 50, 66 and 100.
> -                        If not set, the default value of 50 will be applied.
> - - enable-strobe-pulldown: Enable internal pull-down for the strobe line.
> -                           If not set, pull-down is not used.
> - - output-tapdelay-select: Specifies the phyctrl_otapdlysec register.
> -                           If not set, the register defaults to 0x4.
> -                           Maximum value 0xf.
> + - rockchip,drive-impedance-ohm: Specifies the drive impedance in Ohm.
> +                                 Possible values are 33, 40, 50, 66 and 100.
> +                                 If not set, the default value of 50 will be
> +                                 applied.

You can't change this one, it's already an ABI. Only what just got
queued can be changed.

> + - rockchip,enable-strobe-pulldown: Enable internal pull-down for the strobe
> +                                    line.  If not set, pull-down is not used.
> + - rockchip,output-tapdelay-select: Specifies the phyctrl_otapdlysec register.
> +                                    If not set, the register defaults to 0x4.
> +                                    Maximum value 0xf.
>
>  Example:
>
> @@ -37,7 +38,7 @@ grf: syscon@ff770000 {
>                 reg = <0xf780 0x20>;
>                 clocks = <&sdhci>;
>                 clock-names = "emmcclk";
> -               drive-impedance-ohm = <50>;
> +               rockchip,drive-impedance-ohm = <50>;
>                 #phy-cells = <0>;
>         };
>  };
> --
> 2.20.1
>

[PATCH v1 2/4] phy: rockchip: emmc, add vendor prefix to optional dts properties

[Chris Ruehl]

Update the implementation add "rockchip," vendor prefix for the
optional dts properties. Prefix referred from vendor-prefixes.yaml

Signed-off-by: Chris Ruehl <chris.ruehl@gtsys.com.hk>
---
 drivers/phy/rockchip/phy-rockchip-emmc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/phy/rockchip/phy-rockchip-emmc.c b/drivers/phy/rockchip/phy-rockchip-emmc.c
index 1e424f263e7a..2fdbc8495798 100644
--- a/drivers/phy/rockchip/phy-rockchip-emmc.c
+++ b/drivers/phy/rockchip/phy-rockchip-emmc.c
@@ -377,13 +377,13 @@ static int rockchip_emmc_phy_probe(struct platform_device *pdev)
 	rk_phy->enable_strobe_pulldown = PHYCTRL_REN_STRB_DISABLE;
 	rk_phy->output_tapdelay_select = PHYCTRL_OTAPDLYSEL_DEFAULT;
 
-	if (!of_property_read_u32(dev->of_node, "drive-impedance-ohm", &val))
+	if (!of_property_read_u32(dev->of_node, "rockchip,drive-impedance-ohm", &val))
 		rk_phy->drive_impedance = convert_drive_impedance_ohm(pdev, val);
 
-	if (of_property_read_bool(dev->of_node, "enable-strobe-pulldown"))
+	if (of_property_read_bool(dev->of_node, "rockchip,enable-strobe-pulldown"))
 		rk_phy->enable_strobe_pulldown = PHYCTRL_REN_STRB_ENABLE;
 
-	if (!of_property_read_u32(dev->of_node, "output-tapdelay-select", &val)) {
+	if (!of_property_read_u32(dev->of_node, "rockchip,output-tapdelay-select", &val)) {
 		if (val <= PHYCTRL_OTAPDLYSEL_MAXVALUE)
 			rk_phy->output_tapdelay_select = val;
 		else
-- 
2.20.1

[PATCH v1 3/4] devicetree: dtsi: rk3399.dtsi, add "rockchip," vendor prefix

[Chris Ruehl]

Update rk3399.dtsi with the vendor prefix referred in vendor-prefixes.yaml.
Optional property: rockchip,drive-impedance-ohm

Signed-off-by: Chris Ruehl <chris.ruehl@gtsys.com.hk>
---
 arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index f5dee5f447bb..38284686aab0 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -1482,7 +1482,7 @@
 			clock-names = "refclk";
 			#phy-cells = <1>;
 			resets = <&cru SRST_PCIEPHY>;
-			drive-impedance-ohm = <50>;
+			rockchip,drive-impedance-ohm = <50>;
 			reset-names = "phy";
 			status = "disabled";
 		};
-- 
2.20.1

[PATCH v1 4/4] devicetree: dtsi: rk3399-puma.dtsi, add "rockchip," vendor prefix

[Chris Ruehl]

Update rk3399-puma.dtsi with the vendor prefix referred in
vendor-prefixes.yaml.
Optional property: rockchip,drive-impedance-ohm

Signed-off-by: Chris Ruehl <chris.ruehl@gtsys.com.hk>
---
 arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
index 4660416c8f38..b715e73f9749 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
@@ -146,7 +146,7 @@
 
 &emmc_phy {
 	status = "okay";
-	drive-impedance-ohm = <33>;
+	rockchip,drive-impedance-ohm = <33>;
 };
 
 &gmac {
-- 
2.20.1