diff options
| author | Arnd Bergmann <[email protected]> | 2023-02-03 14:13:47 +0100 |
|---|---|---|
| committer | Arnd Bergmann <[email protected]> | 2023-02-03 14:13:48 +0100 |
| commit | df5bc88fa178f55d0df9dd88254dd454e99abb31 (patch) | |
| tree | 85ffe276bb0de0738aecff42a989dfbbe90d3c5e | |
| parent | 34b84ce9c699e9b10e1b9b8e2dc85564c0b679a6 (diff) | |
| parent | 12cb7a3349a53efa8698a01fe0efdc61d887e541 (diff) | |
Merge tag 'mvebu-dt-6.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into arm/dt
mvebu dt for 6.3 (part 1)
Fix errors reported by dtbs_check on dove boards
* tag 'mvebu-dt-6.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
ARM: dts: dove.dtsi: Move ethphy to fix schema error
Link: https://lore.kernel.org/r/87357oaxs0.fsf@BL-laptop
Signed-off-by: Arnd Bergmann <[email protected]>
| -rw-r--r-- | arch/arm/boot/dts/dove-cm-a510.dtsi | 14 | ||||
| -rw-r--r-- | arch/arm/boot/dts/dove-cubox.dts | 15 | ||||
| -rw-r--r-- | arch/arm/boot/dts/dove.dtsi | 5 |
3 files changed, 22 insertions, 12 deletions
diff --git a/arch/arm/boot/dts/dove-cm-a510.dtsi b/arch/arm/boot/dts/dove-cm-a510.dtsi index 0af9e9fda7d3..1082fdfbfe60 100644 --- 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 */ -ðphy { - reg = <3>; - status = "disabled"; +&mdio { + ethphy: ethernet-phy@3 { + reg = <3>; + status = "disabled"; + }; +}; + +ð { + ethernet-port@0 { + phy-handle = <ðphy>; + }; }; &i2c0 { diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts index c0e8d6bc4083..dbba0c8cdab1 100644 --- 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"; }; -ð { status = "okay"; }; +ð { + status = "okay"; + ethernet-port@0 { + phy-handle = <ðphy>; + }; +}; -ðphy { - 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 9aee3cfd3e98..85408d4c6f2e 100644 --- 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 = <ðphy>; }; }; @@ -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 { |