Skip to contentSkip to conversation

dt-bindings: net: convert emac_rockchip.txt to YAML

PATCH Applied Johan Jonker 3 participants 7 messages Jun 3, 2022 – Sep 9, 2022

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/3 dt-bindings: net: convert emac_rockchip.txt to YAML

Convert emac_rockchip.txt to YAML.

Changes against original bindings:
Add mdio sub node.
Add extra clock for rk3036

---

Changed V2:
use phy
rename to rockchip,emac.yaml
add more requirements

---
 .../devicetree/bindings/net/emac_rockchip.txt |  52 --------
 .../bindings/net/rockchip,emac.yaml           | 115 ++++++++++++++++++
 2 files changed, 115 insertions(+), 52 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/net/emac_rockchip.txt
 create mode 100644 Documentation/devicetree/bindings/net/rockchip,emac.yaml
Documentation/devicetree/bindings/net/emac_rockchip.txt deleted +0 -52
deleted file mode 100644
index 05bd7dafc..000000000
@@ -1,52 +0,0 @@
-* ARC EMAC 10/100 Ethernet platform driver for Rockchip RK3036/RK3066/RK3188 SoCs
-
-Required properties:
-- compatible: should be "rockchip,<name>-emac"
-   "rockchip,rk3036-emac": found on RK3036 SoCs
-   "rockchip,rk3066-emac": found on RK3066 SoCs
-   "rockchip,rk3188-emac": found on RK3188 SoCs
-- reg: Address and length of the register set for the device
-- interrupts: Should contain the EMAC interrupts
-- rockchip,grf: phandle to the syscon grf used to control speed and mode
-  for emac.
-- phy: see ethernet.txt file in the same directory.
-- phy-mode: see ethernet.txt file in the same directory.
-
-Optional properties:
-- phy-supply: phandle to a regulator if the PHY needs one
-
-Clock handling:
-- clocks: Must contain an entry for each entry in clock-names.
-- clock-names: Shall be "hclk" for the host clock needed to calculate and set
-  polling period of EMAC and "macref" for the reference clock needed to transfer
-  data to and from the phy.
-
-Child nodes of the driver are the individual PHY devices connected to the
-MDIO bus. They must have a "reg" property given the PHY address on the MDIO bus.
-
-Examples:
-
-ethernet@10204000 {
-	compatible = "rockchip,rk3188-emac";
-	reg = <0xc0fc2000 0x3c>;
-	interrupts = <6>;
-	mac-address = [ 00 11 22 33 44 55 ];
-
-	clocks = <&cru HCLK_EMAC>, <&cru SCLK_MAC>;
-	clock-names = "hclk", "macref";
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&emac_xfer>, <&emac_mdio>, <&phy_int>;
-
-	rockchip,grf = <&grf>;
-
-	phy = <&phy0>;
-	phy-mode = "rmii";
-	phy-supply = <&vcc_rmii>;
-
-	#address-cells = <1>;
-	#size-cells = <0>;
-	phy0: ethernet-phy@0 {
-	      reg = <1>;
-	};
-};
Documentation/devicetree/bindings/net/rockchip,emac.yaml new file +115 -0

115 lines not on this page · raw message

Signature · 1 line
2.20.1
#1 lore raw

PATCH v2 2/3 ARM: dts: rockchip: fix rk3036 emac node compatible string

The Linux kernel has no logic to decide which driver to probe first. To prevent race conditions remove the rk3036 emac node fall back compatible string.

---
 arch/arm/boot/dts/rk3036.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/rk3036.dtsi +1 -1
index 9b0f04975..e240b89b0 100644
@@ -225,7 +225,7 @@
 	};
 
 	emac: ethernet@10200000 {
-		compatible = "rockchip,rk3036-emac", "snps,arc-emac";
+		compatible = "rockchip,rk3036-emac";
 		reg = <0x10200000 0x4000>;
 		interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
 		#address-cells = <1>;
Signature · 1 line
2.20.1
#2 lore raw

PATCH v2 3/3 ARM: dts: rockchip: restyle emac nodes

In reply to Johan Jonker

The emac_rockchip.txt file is converted to YAML.
Phy nodes are now a subnode of mdio, so restyle
the emac nodes of rk3036/rk3066/rk3188.

---

Changed V2:
use phy

---
 arch/arm/boot/dts/rk3036-evb.dts        | 16 ++++++++++------
 arch/arm/boot/dts/rk3036-kylin.dts      | 16 ++++++++++------
 arch/arm/boot/dts/rk3036.dtsi           |  2 --
 arch/arm/boot/dts/rk3066a-marsboard.dts | 17 ++++++++++-------
 arch/arm/boot/dts/rk3066a-rayeager.dts  | 15 ++++++++++-----
 arch/arm/boot/dts/rk3188-radxarock.dts  | 19 +++++++++++--------
 arch/arm/boot/dts/rk3xxx.dtsi           |  2 --
 7 files changed, 51 insertions(+), 36 deletions(-)
arch/arm/boot/dts/rk3036-evb.dts +10 -6
index 2a7e6624e..9fd4d9db9 100644
@@ -15,16 +15,20 @@
 };
 
 &emac {
-	pinctrl-names = "default";
-	pinctrl-0 = <&emac_xfer>, <&emac_mdio>;
 	phy = <&phy0>;
-	phy-reset-gpios = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>; /* PHY_RST */
 	phy-reset-duration = <10>; /* millisecond */
-
+	phy-reset-gpios = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>; /* PHY_RST */
+	pinctrl-names = "default";
+	pinctrl-0 = <&emac_xfer>, <&emac_mdio>;
 	status = "okay";
 
-	phy0: ethernet-phy@0 {
-		reg = <0>;
+	mdio {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		phy0: ethernet-phy@0 {
+			reg = <0>;
+		};
 	};
 };
 
arch/arm/boot/dts/rk3036-kylin.dts +10 -6
index e817eba8c..67e1e0413 100644
@@ -80,16 +80,20 @@
 };
 
 &emac {
-	pinctrl-names = "default";
-	pinctrl-0 = <&emac_xfer>, <&emac_mdio>;
 	phy = <&phy0>;
-	phy-reset-gpios = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>; /* PHY_RST */
 	phy-reset-duration = <10>; /* millisecond */
-
+	phy-reset-gpios = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>; /* PHY_RST */
+	pinctrl-names = "default";
+	pinctrl-0 = <&emac_xfer>, <&emac_mdio>;
 	status = "okay";
 
-	phy0: ethernet-phy@0 {
-		reg = <0>;
+	mdio {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		phy0: ethernet-phy@0 {
+			reg = <0>;
+		};
 	};
 };
 
arch/arm/boot/dts/rk3036.dtsi +0 -2
index e240b89b0..78686fc72 100644
@@ -228,8 +228,6 @@
 		compatible = "rockchip,rk3036-emac";
 		reg = <0x10200000 0x4000>;
 		interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
-		#address-cells = <1>;
-		#size-cells = <0>;
 		rockchip,grf = <&grf>;
 		clocks = <&cru HCLK_MAC>, <&cru SCLK_MACREF>, <&cru SCLK_MAC>;
 		clock-names = "hclk", "macref", "macclk";
arch/arm/boot/dts/rk3066a-marsboard.dts +10 -7
index a66d915aa..8beecd628 100644
@@ -150,18 +150,21 @@
 #include "tps65910.dtsi"
 
 &emac {
-	status = "okay";
-
 	phy = <&phy0>;
 	phy-supply = <&vcc_rmii>;
-
 	pinctrl-names = "default";
 	pinctrl-0 = <&emac_xfer>, <&emac_mdio>, <&phy_int>;
+	status = "okay";
+
+	mdio {
+		#address-cells = <1>;
+		#size-cells = <0>;
 
-	phy0: ethernet-phy@0 {
-		reg = <0>;
-		interrupt-parent = <&gpio1>;
-		interrupts = <RK_PD2 IRQ_TYPE_LEVEL_LOW>;
+		phy0: ethernet-phy@0 {
+			reg = <0>;
+			interrupt-parent = <&gpio1>;
+			interrupts = <RK_PD2 IRQ_TYPE_LEVEL_LOW>;
+		};
 	};
 };
 
arch/arm/boot/dts/rk3066a-rayeager.dts +10 -5
index 12b2e59ae..9aeef36ca 100644
@@ -142,15 +142,20 @@
 };
 
 &emac {
-	pinctrl-names = "default";
-	pinctrl-0 = <&emac_xfer>, <&emac_mdio>, <&rmii_rst>;
 	phy = <&phy0>;
 	phy-supply = <&vcc_rmii>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&emac_xfer>, <&emac_mdio>, <&rmii_rst>;
 	status = "okay";
 
-	phy0: ethernet-phy@0 {
-		reg = <0>;
-		reset-gpios = <&gpio1 RK_PD6 GPIO_ACTIVE_LOW>;
+	mdio {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		phy0: ethernet-phy@0 {
+			reg = <0>;
+			reset-gpios = <&gpio1 RK_PD6 GPIO_ACTIVE_LOW>;
+		};
 	};
 };
 
arch/arm/boot/dts/rk3188-radxarock.dts +11 -8
index 36c0945f4..bb0942d3e 100644
@@ -126,18 +126,21 @@
 };
 
 &emac {
-	status = "okay";
-
+	phy = <&phy0>;
+	phy-supply = <&vcc_rmii>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&emac_xfer>, <&emac_mdio>, <&phy_int>;
+	status = "okay";
 
-	phy = <&phy0>;
-	phy-supply = <&vcc_rmii>;
+	mdio {
+		#address-cells = <1>;
+		#size-cells = <0>;
 
-	phy0: ethernet-phy@0 {
-		reg = <0>;
-		interrupt-parent = <&gpio3>;
-		interrupts = <RK_PD2 IRQ_TYPE_LEVEL_LOW>;
+		phy0: ethernet-phy@0 {
+			reg = <0>;
+			interrupt-parent = <&gpio3>;
+			interrupts = <RK_PD2 IRQ_TYPE_LEVEL_LOW>;
+		};
 	};
 };
 
arch/arm/boot/dts/rk3xxx.dtsi +0 -2
index 616a828e0..bf285091a 100644
@@ -186,8 +186,6 @@
 		compatible = "snps,arc-emac";
 		reg = <0x10204000 0x3c>;
 		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		rockchip,grf = <&grf>;
 
Signature · 1 line
2.20.1
maintainer
#3 lore raw
In reply to Johan Jonker
Quoted 13 lines · Johan Jonker

Convert emac_rockchip.txt to YAML.

Changes against original bindings:
Add mdio sub node.
Add extra clock for rk3036

---

Changed V2:
use phy
rename to rockchip,emac.yaml
add more requirements

Quoted 7 lines
---
 .../devicetree/bindings/net/emac_rockchip.txt |  52 --------
 .../bindings/net/rockchip,emac.yaml           | 115 ++++++++++++++++++
 2 files changed, 115 insertions(+), 52 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/net/emac_rockchip.txt
 create mode 100644 Documentation/devicetree/bindings/net/rockchip,emac.yaml

Running 'make dtbs_check' with the schema in this patch gives the following warnings. Consider if they are expected or the schema is incorrect. These may not be new warnings.

Note that it is not yet a requirement to have 0 warnings for dtbs_check. This will change in the future.

Full log is available here: https://patchwork.ozlabs.org/patch/

ethernet@10200000: compatible: ['rockchip,rk3036-emac', 'snps,arc-emac'] is too long

	arch/arm/boot/dts/rk3036-evb.dtb
	arch/arm/boot/dts/rk3036-kylin.dtb

ethernet@10200000: 'mdio' is a required property

	arch/arm/boot/dts/rk3036-evb.dtb
	arch/arm/boot/dts/rk3036-kylin.dtb

ethernet@10204000: 'mdio' is a required property

	arch/arm/boot/dts/rk3066a-marsboard.dtb
	arch/arm/boot/dts/rk3066a-rayeager.dtb
	arch/arm/boot/dts/rk3188-radxarock.dtb

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

maintainer Reviewed-by on v2 1/3
#4 lore raw
In reply to Johan Jonker
Quoted 13 lines · Johan Jonker

Convert emac_rockchip.txt to YAML.

Changes against original bindings:
Add mdio sub node.
Add extra clock for rk3036

---

Changed V2:
use phy
rename to rockchip,emac.yaml
add more requirements

Quoted 7 lines
---
 .../devicetree/bindings/net/emac_rockchip.txt |  52 --------
 .../bindings/net/rockchip,emac.yaml           | 115 ++++++++++++++++++
 2 files changed, 115 insertions(+), 52 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/net/emac_rockchip.txt
 create mode 100644 Documentation/devicetree/bindings/net/rockchip,emac.yaml
maintainer
#5 lore raw
In reply to Johan Jonker
Quoted 13 lines · Johan Jonker

Convert emac_rockchip.txt to YAML.

Changes against original bindings:
Add mdio sub node.
Add extra clock for rk3036

---

Changed V2:
use phy
rename to rockchip,emac.yaml
add more requirements

Quoted 7 lines
---
 .../devicetree/bindings/net/emac_rockchip.txt |  52 --------
 .../bindings/net/rockchip,emac.yaml           | 115 ++++++++++++++++++
 2 files changed, 115 insertions(+), 52 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/net/emac_rockchip.txt
 create mode 100644 Documentation/devicetree/bindings/net/rockchip,emac.yaml

Looks like this fell through the cracks. Applied, thanks!

maintainer Applied
#6 lore raw

Re: (subset) [PATCH v2 1/3] dt-bindings: net: convert emac_rockchip.txt to YAML

In reply to Johan Jonker
Quoted 5 lines · Johan Jonker

Convert emac_rockchip.txt to YAML.

Changes against original bindings:
Add mdio sub node.
Add extra clock for rk3036

Applied, thanks!

[2/3] ARM: dts: rockchip: fix rk3036 emac node compatible string

      commit: d28b680a34948d7634b824b1fc7546e9dc8422fb
[3/3] ARM: dts: rockchip: restyle emac nodes
      commit: 1dabb74971b38d966ecef566bafddc4a34f4db9d

Best regards,

Signature · 6 lines
Heiko Stuebner <[email protected]>

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip