Unverified Commit 816309d5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-fixes-for-6.16' of... 

Merge tag 'sunxi-fixes-for-6.16' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes

Allwinner fixes for 6.16

Only one fix:

Correct the name of the A523's EMAC0 to GMAC0, as seen in the SoC's
datasheets. The matching DT binding change is in the net tree.

* tag 'sunxi-fixes-for-6.16' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux

:
  arm64: dts: allwinner: a523: Rename emac0 to gmac0

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 347e9f50 a46b4822

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>;