Unverified Commit df5bc88f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-dt-6.3-1' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 34b84ce9 12cb7a33

arch/arm/boot/dts/dove-cm-a510.dtsi

+11 −3
Original line number Diff line number Diff line
@@ -124,10 +124,18 @@ wifi_power: regulator@1 { 
};



/* Optional RTL8211D GbE PHY on SMI address 0x03 */

&ethphy {

&mdio {

	ethphy: ethernet-phy@3 {

		reg = <3>;

		status = "disabled";

	};

};



&eth {

	ethernet-port@0 {

		phy-handle = <&ethphy>;

	};

};



&i2c0 {

	/* Optional TI TLV320AIC23b audio codec */

arch/arm/boot/dts/dove-cubox.dts

+11 −4
Original line number Diff line number Diff line
@@ -72,12 +72,19 @@ gpu-subsystem { 
&uart0 { status = "okay"; };

&sata0 { status = "okay"; };

&mdio { status = "okay"; };

&eth { status = "okay"; };

&eth {

	status = "okay";

	ethernet-port@0 {

		phy-handle = <&ethphy>;

	};

};



&ethphy {

&mdio {

	ethphy: ethernet-phy@1 {

		compatible = "marvell,88e1310";

		reg = <1>;

	};

};



&gpu {

	status = "okay";

arch/arm/boot/dts/dove.dtsi

+0 −5
Original line number Diff line number Diff line
@@ -382,7 +382,6 @@ ethernet-port@0 { 
					interrupts = <29>;

					/* overwrite MAC address in bootloader */

					local-mac-address = [00 00 00 00 00 00];

					phy-handle = <&ethphy>;

				};

			};
@@ -394,10 +393,6 @@ mdio: mdio-bus@72004 { 
				interrupts = <30>;

				clocks = <&gate_clk 2>;

				status = "disabled";



				ethphy: ethernet-phy {

					/* set phy address in board file */

				};

			};



			sdio0: sdio-host@92000 {