ARM: dts: dove.dtsi: Move ethphy to fix schema error

Running 'make dtbs_check' with schema in net/marvell,orion-mdio.yaml
gives following warnings:
mdio-bus@72004: Unevaluated properties are not allowed
('ethernet-phy' was unexpected)
	arch/arm/boot/dts/dove-cubox.dtb
	arch/arm/boot/dts/dove-cubox-es.dtb
	arch/arm/boot/dts/dove-d2plug.dtb
	arch/arm/boot/dts/dove-d2plug.dtb
	arch/arm/boot/dts/dove-dove-db.dtb
	arch/arm/boot/dts/dove-d3plug.dtb
	arch/arm/boot/dts/dove-sbc-a510.dtb
As every subnode of mdio is expected to have an @X, ethernet-phy subnode
in dove.dtsi doesn't have one. Fix these errors by moving ethernet-phy
into relevant .dts files with correct @<reg address>.

Signed-off-by: Michał Grzelak <mig@semihalf.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>

diff --git a/arch/arm/boot/dts/dove-cm-a510.dtsi b/arch/arm/boot/dts/dove-cm-a510.dtsi
index 9b9dfbe..2f2f0a4 100644 (file)
--- a/arch/arm/boot/dts/dove-cm-a510.dtsi
+++ b/arch/arm/boot/dts/dove-cm-a510.dtsi
@@ -124,9 +124,17 @@
 };
 
 /* Optional RTL8211D GbE PHY on SMI address 0x03 */
-&ethphy {
-       reg = <3>;
-       status = "disabled";
+&mdio {
+       ethphy: ethernet-phy@3 {
+               reg = <3>;
+               status = "disabled";
+       };
+};
+
+&eth {
+       ethernet-port@0 {
+               phy-handle = <&ethphy>;
+       };
 };
 
 &i2c0 {

diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts
index 2639b9f..170c14d 100644 (file)
--- a/arch/arm/boot/dts/dove-cubox.dts
+++ b/arch/arm/boot/dts/dove-cubox.dts
@@ -72,11 +72,18 @@
 &uart0 { status = "okay"; };
 &sata0 { status = "okay"; };
 &mdio { status = "okay"; };
-&eth { status = "okay"; };
+&eth {
+       status = "okay";
+       ethernet-port@0 {
+               phy-handle = <&ethphy>;
+       };
+};
 
-&ethphy {
-       compatible = "marvell,88e1310";
-       reg = <1>;
+&mdio {
+       ethphy: ethernet-phy@1 {
+               compatible = "marvell,88e1310";
+               reg = <1>;
+       };
 };
 
 &gpu {

diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index 9aee3cf..85408d4 100644 (file)
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -382,7 +382,6 @@
                                        interrupts = <29>;
                                        /* overwrite MAC address in bootloader */
                                        local-mac-address = [00 00 00 00 00 00];
-                                       phy-handle = <&ethphy>;
                                };
                        };
 
@@ -394,10 +393,6 @@
                                interrupts = <30>;
                                clocks = <&gate_clk 2>;
                                status = "disabled";
-
-                               ethphy: ethernet-phy {
-                                       /* set phy address in board file */
-                               };
                        };
 
                        sdio0: sdio-host@92000 {