mirror of
https://github.com/torvalds/linux.git
synced 2026-06-01 02:53:36 +02:00
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. -----BEGIN PGP SIGNATURE----- iQJCBAABCgAsFiEE2nN1m/hhnkhOWjtHOJpUIZwPJDAFAmh2iT4OHHdlbnNAY3Np ZS5vcmcACgkQOJpUIZwPJDCMJBAAuauzK0XFSSwuzxlkd2b4fb9iY8V8U+h4T6E0 T83snFr3IDZxRU3z9+6EKhIAyh/yHpu8wv27jMNyb6UAbafzhqYaCENXdIrI7lDX CzgDCJJWPTJ9L/Iq5EY+BXSBNaHQz1PLrryjdLJeNSzxXWP4k62oPCE09HioYIvK hMEUIyH9jdTK6h4jfp0J0YHYfDZPr4ix33Ua33ToPnTYeaMeowaWDZ2I/IXyhmG7 q+XRzdNrpcMuKQH5hpSTDYI1TjonWa1jovpYH9uktuzb7CHHz2C9f3wxz9X2xpui nxa44UoqKF0XfP3Luur9cfXHS6zq5HqKRaXkCP9EiXoIpocjo5rCHqvIabyC+6QU ACRrbp/9rCJ/XZm5MRvXD3+JlcF+SFJ3vYhZgk1iLXFFEPGgfUezf0s6hAUv5xGc OnxmF2ztxxXVAKCkRFG7JVbyHzQmKojX9lZUVWQP1dRZCfaQ1dqAN6oCO1NuVvLc mPVgftt3N2XDaM/XCp054RFBu0Dmjm6oIUNJy2Jc59ED5FF+Erit+xTqYfv9iZGu PfyBk43lPhFr+6twsYsaivoh45px7aCRAuKnwY4AizIjr01ZeVjc1snauiUS7pzo jtdIESYuaRnmTE1tiY0keAB5y4OH/jxB61jJ4IwIUIEGzySrmG8HchizVnd0UYoA eJsh/Jw= =j8oj -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmh56IgACgkQmmx57+YA GNkLmBAAhe2cre+Xw4DJu7jTKIcHJM5T7Ug93Jfa8rJ17vg6ksk+/PDwTATS5EmS trcw4H0ch23ZI/KQ0Lkf2fVAUwZkhbk16xlHLPzhfx8I6hn5VmhQc0JV1lsGgxu6 SJSMwMsmDJH2BKkQUQHkx3vYtv4MF9FduNWLj2UgJUFaZH6QbeTmnTr+ksVfZJ7M F0sLlHBGYJybHk4yJsV6zdvuLIy1lZ5EU7NAD6ZDCl9uzp79LgzLKEEoc2ip9B0g NxvBDyc71MqqqSnEoCVPBQi3N6HFXVWSwGnzyhkmKmG57oiKyudagMHga4rIN3Iw DBkXYBp1LduiA6v64lKtXjCcXmidFi/hQDlll9eyOzwRjUBdHrNZe0Lt3sdrHKdb l12SCgEmHG0BNDP1YOOQSnrA1DyLcoK0Y45YkzDHjUkSpZY1uxeC6RBUiKMCCrxS shSZLSfQlK0IcZ130eIHENkwqm75T/Kje0vnJN0PdqechYgQFLn9z4nT0P/oYUhk +TrLUjukL4H9CGR3sFpeQmpobIQcBU50G7xG9K9kgLk+BawIcrbPcABJ/WkgkWnF GXCaIDqdiYn2ihZ4xwQGUHt2ft6T59YnvcARKcJak3Vqic+ASnNGsjvpCKV3c6FK PF2nJJHyFAPBSBCzVjDd5m70Of+M6gJj0197a7KMYhBHaVahoTU= =5gpa -----END PGP SIGNATURE----- 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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
816309d500
|
|
@ -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>;
|
||||
|
|
|
|||
|
|
@ -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 = <®_cldo3>;
|
||||
|
|
|
|||
|
|
@ -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 = <®_dcdc4>;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user