Commit 6121f69c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soc-fixes-6.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull SoC fixes from Arnd Bergmann:
 "These are two fixes that came in late, one addresses a regression on a
  rockchips based board, the other is for ensuring a consistent dt
  binding for a device added in 6.16 before the incorrect one makes it
  into a release"

* tag 'soc-fixes-6.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  arm64: dts: rockchip: Drop netdev led-triggers on NanoPi R5S
  arm64: dts: allwinner: a523: Rename emac0 to gmac0
parents 5f33ebd2 912b1f2a

arch/arm64/boot/dts/allwinner/sun55i-a523.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ rgmii0_pins: rgmii0-pins { 
				       "PH5", "PH6", "PH7", "PH9", "PH10",

				       "PH14", "PH15", "PH16", "PH17", "PH18";

				allwinner,pinmux = <5>;

				function = "emac0";

				function = "gmac0";

				drive-strength = <40>;

				bias-disable;

			};
@@ -540,8 +540,8 @@ ohci1: usb@4200400 { 
			status = "disabled";

		};



		emac0: ethernet@4500000 {

			compatible = "allwinner,sun55i-a523-emac0",

		gmac0: ethernet@4500000 {

			compatible = "allwinner,sun55i-a523-gmac0",

				     "allwinner,sun50i-a64-emac";

			reg = <0x04500000 0x10000>;

			clocks = <&ccu CLK_BUS_EMAC0>;

arch/arm64/boot/dts/allwinner/sun55i-a527-cubie-a5e.dts

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ / { 
	compatible = "radxa,cubie-a5e", "allwinner,sun55i-a527";



	aliases {

		ethernet0 = &emac0;

		ethernet0 = &gmac0;

		serial0 = &uart0;

	};
@@ -55,7 +55,7 @@ &ehci1 { 
	status = "okay";

};



&emac0 {

&gmac0 {

	phy-mode = "rgmii-id";

	phy-handle = <&ext_rgmii_phy>;

	phy-supply = <&reg_cldo3>;

arch/arm64/boot/dts/allwinner/sun55i-t527-avaota-a1.dts

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ / { 
	compatible = "yuzukihd,avaota-a1", "allwinner,sun55i-t527";



	aliases {

		ethernet0 = &emac0;

		ethernet0 = &gmac0;

		serial0 = &uart0;

	};
@@ -65,7 +65,7 @@ &ehci1 { 
	status = "okay";

};



&emac0 {

&gmac0 {

	phy-mode = "rgmii-id";

	phy-handle = <&ext_rgmii_phy>;

	phy-supply = <&reg_dcdc4>;

arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts

+0 −3
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ led-lan1 { 
			function-enumerator = <1>;

			gpios = <&gpio3 RK_PD6 GPIO_ACTIVE_HIGH>;

			label = "LAN-1";

			linux,default-trigger = "netdev";

		};



		led-lan2 {
@@ -39,7 +38,6 @@ led-lan2 { 
			function-enumerator = <2>;

			gpios = <&gpio3 RK_PD7 GPIO_ACTIVE_HIGH>;

			label = "LAN-2";

			linux,default-trigger = "netdev";

		};



		power_led: led-sys {
@@ -56,7 +54,6 @@ led-wan { 
			function = LED_FUNCTION_WAN;

			gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;

			label = "WAN";

			linux,default-trigger = "netdev";

		};

	};

};