Skip to content

Commit 816309d

Browse files
committed
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 <[email protected]>
2 parents 347e9f5 + a46b482 commit 816309d

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
"PH5", "PH6", "PH7", "PH9", "PH10",
132132
"PH14", "PH15", "PH16", "PH17", "PH18";
133133
allwinner,pinmux = <5>;
134-
function = "emac0";
134+
function = "gmac0";
135135
drive-strength = <40>;
136136
bias-disable;
137137
};
@@ -540,8 +540,8 @@
540540
status = "disabled";
541541
};
542542

543-
emac0: ethernet@4500000 {
544-
compatible = "allwinner,sun55i-a523-emac0",
543+
gmac0: ethernet@4500000 {
544+
compatible = "allwinner,sun55i-a523-gmac0",
545545
"allwinner,sun50i-a64-emac";
546546
reg = <0x04500000 0x10000>;
547547
clocks = <&ccu CLK_BUS_EMAC0>;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
compatible = "radxa,cubie-a5e", "allwinner,sun55i-a527";
1313

1414
aliases {
15-
ethernet0 = &emac0;
15+
ethernet0 = &gmac0;
1616
serial0 = &uart0;
1717
};
1818

@@ -55,7 +55,7 @@
5555
status = "okay";
5656
};
5757

58-
&emac0 {
58+
&gmac0 {
5959
phy-mode = "rgmii-id";
6060
phy-handle = <&ext_rgmii_phy>;
6161
phy-supply = <&reg_cldo3>;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
compatible = "yuzukihd,avaota-a1", "allwinner,sun55i-t527";
1313

1414
aliases {
15-
ethernet0 = &emac0;
15+
ethernet0 = &gmac0;
1616
serial0 = &uart0;
1717
};
1818

@@ -65,7 +65,7 @@
6565
status = "okay";
6666
};
6767

68-
&emac0 {
68+
&gmac0 {
6969
phy-mode = "rgmii-id";
7070
phy-handle = <&ext_rgmii_phy>;
7171
phy-supply = <&reg_dcdc4>;

0 commit comments

Comments
 (0)