Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Michał Grzelak and committed by
Gregory CLEMENT
12cb7a33 1b929c02

+22 -12
+11 -3
arch/arm/boot/dts/dove-cm-a510.dtsi
··· 124 124 }; 125 125 126 126 /* Optional RTL8211D GbE PHY on SMI address 0x03 */ 127 - &ethphy { 128 - reg = <3>; 129 - status = "disabled"; 127 + &mdio { 128 + ethphy: ethernet-phy@3 { 129 + reg = <3>; 130 + status = "disabled"; 131 + }; 132 + }; 133 + 134 + &eth { 135 + ethernet-port@0 { 136 + phy-handle = <&ethphy>; 137 + }; 130 138 }; 131 139 132 140 &i2c0 {
+11 -4
arch/arm/boot/dts/dove-cubox.dts
··· 72 72 &uart0 { status = "okay"; }; 73 73 &sata0 { status = "okay"; }; 74 74 &mdio { status = "okay"; }; 75 - &eth { status = "okay"; }; 75 + &eth { 76 + status = "okay"; 77 + ethernet-port@0 { 78 + phy-handle = <&ethphy>; 79 + }; 80 + }; 76 81 77 - &ethphy { 78 - compatible = "marvell,88e1310"; 79 - reg = <1>; 82 + &mdio { 83 + ethphy: ethernet-phy@1 { 84 + compatible = "marvell,88e1310"; 85 + reg = <1>; 86 + }; 80 87 }; 81 88 82 89 &gpu {
-5
arch/arm/boot/dts/dove.dtsi
··· 382 382 interrupts = <29>; 383 383 /* overwrite MAC address in bootloader */ 384 384 local-mac-address = [00 00 00 00 00 00]; 385 - phy-handle = <&ethphy>; 386 385 }; 387 386 }; 388 387 ··· 393 394 interrupts = <30>; 394 395 clocks = <&gate_clk 2>; 395 396 status = "disabled"; 396 - 397 - ethphy: ethernet-phy { 398 - /* set phy address in board file */ 399 - }; 400 397 }; 401 398 402 399 sdio0: sdio-host@92000 {