Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'soc-fixes-6.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC fixes from Arnd Bergmann:
"These are two fixes that came in late, one addresses a regression on a
rockchips based board, the other is for ensuring a consistent dt
binding for a device added in 6.16 before the incorrect one makes it
into a release"
* tag 'soc-fixes-6.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
arm64: dts: rockchip: Drop netdev led-triggers on NanoPi R5S
arm64: dts: allwinner: a523: Rename emac0 to gmac0
+7
-10
+3
-3
arch/arm64/boot/dts/allwinner/sun55i-a523.dtsi
+3
-3
arch/arm64/boot/dts/allwinner/sun55i-a523.dtsi
···
131
131
"PH5", "PH6", "PH7", "PH9", "PH10",
132
132
"PH14", "PH15", "PH16", "PH17", "PH18";
133
133
allwinner,pinmux = <5>;
134
-
function = "emac0";
134
+
function = "gmac0";
135
135
drive-strength = <40>;
136
136
bias-disable;
137
137
};
···
540
540
status = "disabled";
541
541
};
542
542
543
-
emac0: ethernet@4500000 {
544
-
compatible = "allwinner,sun55i-a523-emac0",
543
+
gmac0: ethernet@4500000 {
544
+
compatible = "allwinner,sun55i-a523-gmac0",
545
545
"allwinner,sun50i-a64-emac";
546
546
reg = <0x04500000 0x10000>;
547
547
clocks = <&ccu CLK_BUS_EMAC0>;
+2
-2
arch/arm64/boot/dts/allwinner/sun55i-a527-cubie-a5e.dts
+2
-2
arch/arm64/boot/dts/allwinner/sun55i-a527-cubie-a5e.dts
···
12
12
compatible = "radxa,cubie-a5e", "allwinner,sun55i-a527";
13
13
14
14
aliases {
15
-
ethernet0 = &emac0;
15
+
ethernet0 = &gmac0;
16
16
serial0 = &uart0;
17
17
};
18
18
···
55
55
status = "okay";
56
56
};
57
57
58
-
&emac0 {
58
+
&gmac0 {
59
59
phy-mode = "rgmii-id";
60
60
phy-handle = <&ext_rgmii_phy>;
61
61
phy-supply = <®_cldo3>;
+2
-2
arch/arm64/boot/dts/allwinner/sun55i-t527-avaota-a1.dts
+2
-2
arch/arm64/boot/dts/allwinner/sun55i-t527-avaota-a1.dts
···
12
12
compatible = "yuzukihd,avaota-a1", "allwinner,sun55i-t527";
13
13
14
14
aliases {
15
-
ethernet0 = &emac0;
15
+
ethernet0 = &gmac0;
16
16
serial0 = &uart0;
17
17
};
18
18
···
65
65
status = "okay";
66
66
};
67
67
68
-
&emac0 {
68
+
&gmac0 {
69
69
phy-mode = "rgmii-id";
70
70
phy-handle = <&ext_rgmii_phy>;
71
71
phy-supply = <®_dcdc4>;
-3
arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts
-3
arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts
···
29
29
function-enumerator = <1>;
30
30
gpios = <&gpio3 RK_PD6 GPIO_ACTIVE_HIGH>;
31
31
label = "LAN-1";
32
-
linux,default-trigger = "netdev";
33
32
};
34
33
35
34
led-lan2 {
···
38
39
function-enumerator = <2>;
39
40
gpios = <&gpio3 RK_PD7 GPIO_ACTIVE_HIGH>;
40
41
label = "LAN-2";
41
-
linux,default-trigger = "netdev";
42
42
};
43
43
44
44
power_led: led-sys {
···
54
56
function = LED_FUNCTION_WAN;
55
57
gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
56
58
label = "WAN";
57
-
linux,default-trigger = "netdev";
58
59
};
59
60
};
60
61
};