From: Arnd Bergmann <arnd@arndb.de>
Date: Sat, 26 Jul 2025 10:01:43 +0000 (+0200)
Subject: Merge tag 'sunxi-fixes-for-6.16' of https://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac75da105eb38d7c48ee3421d116282d8c44b690;p=thirdparty%2Flinux.git

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

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.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

ac75da105eb38d7c48ee3421d116282d8c44b690
diff --cc arch/arm64/boot/dts/allwinner/sun55i-a523.dtsi
index d8f5a56bde494,51cd148f4227b..6b6f2296bdff6
--- a/arch/arm64/boot/dts/allwinner/sun55i-a523.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun55i-a523.dtsi
@@@ -170,16 -163,6 +170,16 @@@
  				bias-pull-up;
  			};
  
 +			rgmii0_pins: rgmii0-pins {
 +				pins = "PH0", "PH1", "PH2", "PH3", "PH4",
 +				       "PH5", "PH6", "PH7", "PH9", "PH10",
 +				       "PH14", "PH15", "PH16", "PH17", "PH18";
 +				allwinner,pinmux = <5>;
- 				function = "emac0";
++				function = "gmac0";
 +				drive-strength = <40>;
 +				bias-disable;
 +			};
 +
  			uart0_pb_pins: uart0-pb-pins {
  				pins = "PB9", "PB10";
  				allwinner,pinmux = <2>;