mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-12-27 12:21:22 -05:00
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>
This commit is contained in:
@@ -175,7 +175,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;
|
||||
};
|
||||
@@ -579,8 +579,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>;
|
||||
|
||||
Reference in New Issue
Block a user