Skip to content

Commit 0feaf3c

Browse files
committed
Merge tag 'sunxi-dt-for-6.16' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into soc/dt
Allwinner device tree changes for 6.16 Introduce Allwinner A523 / A527 / T527 SoC family w/ three new devices: - Radxa Cubie A5E - X96Q-Pro+ - Avaota-A1 Also enable EMAC0 ethernet MAC on A523 family for Cubie A5E & Avaota-A1. Note: the SoC has two different ethernet controllers. Changes to existing SoCs: - Enable GPU on H616 with all boards enabled - Set maximum MMC frequency for the A100 Changes to existing boards: - Add WiFi/BT header on PINE64 A64 boards - Add hp-det-gpios for Anbernic RG35XX - Add support for PHY LEDs on Bananapi (the original one) Add new devices for existing SoCs: - YuzukiHD Chameleon based on H6 - Liontron H-A133L based on A133 (compatible with A100) Tree wide cleanups: - Use preferred node names for cooling maps - Align wifi node name with bindings - Drop spurious 'clock-latency-ns' properties for H5 & H6 * tag 'sunxi-dt-for-6.16' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: (27 commits) arm64: dts: allwinner: a100: add Liontron H-A133L board support dt-bindings: arm: sunxi: Add Liontron H-A133L board name dt-bindings: vendor-prefixes: Add Liontron name ARM: dts: bananapi: add support for PHY LEDs arm64: dts: allwinner: a100: set maximum MMC frequency arm64: dts: allwinner: t527: add EMAC0 to Avaota-A1 board arm64: dts: allwinner: a527: add EMAC0 to Radxa A5E board arm64: dts: allwinner: a523: Add EMAC0 ethernet MAC dt-bindings: sram: sunxi-sram: Add A523 compatible arm64: dts: allwinner: a64: Add WiFi/BT header on SOPINE Baseboard arm64: dts: allwinner: a64: Add WiFi/BT header on PINE A64 arm64: dts: allwinner: correct the model name for Radxa Cubie A5E ARM: dts: allwinner: Align wifi node name with bindings arm64: dts: allwinner: Align wifi node name with bindings arm64: dts: allwinner: h616: enable Mali GPU for all boards arm64: dts: allwinner: h616: Add Mali GPU node arm64: dts: allwinner: h700: Add hp-det-gpios for Anbernic RG35XX arm64: dts: allwinner: h5/h6: Drop spurious 'clock-latency-ns' properties arm/arm64: dts: allwinner: Use preferred node names for cooling maps arm64: dts: allwinner: h616: add YuzukiHD Chameleon support ... Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 3818149 + a3cd12a commit 0feaf3c

33 files changed

+2180
-17
lines changed

Documentation/devicetree/bindings/arm/sunxi.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,11 @@ properties:
492492
- const: lamobo,lamobo-r1
493493
- const: allwinner,sun7i-a20
494494

495+
- description: Liontron H-A133L
496+
items:
497+
- const: liontron,h-a133l
498+
- const: allwinner,sun50i-a100
499+
495500
- description: HAOYU Electronics Marsboard A10
496501
items:
497502
- const: haoyu,a10-marsboard
@@ -845,6 +850,11 @@ properties:
845850
- const: allwinner,r7-tv-dongle
846851
- const: allwinner,sun5i-a10s
847852

853+
- description: Radxa Cubie A5E
854+
items:
855+
- const: radxa,cubie-a5e
856+
- const: allwinner,sun55i-a527
857+
848858
- description: Remix Mini PC
849859
items:
850860
- const: jide,remix-mini-pc
@@ -966,6 +976,11 @@ properties:
966976
- const: hechuang,x96-mate
967977
- const: allwinner,sun50i-h616
968978

979+
- description: X96Q Pro+
980+
items:
981+
- const: amediatech,x96q-pro-plus
982+
- const: allwinner,sun55i-h728
983+
969984
- description: Xunlong OrangePi
970985
items:
971986
- const: xunlong,orangepi
@@ -1081,4 +1096,14 @@ properties:
10811096
- const: xunlong,orangepi-zero3
10821097
- const: allwinner,sun50i-h618
10831098

1099+
- description: YuzukiHD Avaota A1
1100+
items:
1101+
- const: yuzukihd,avaota-a1
1102+
- const: allwinner,sun55i-t527
1103+
1104+
- description: YuzukiHD Chameleon
1105+
items:
1106+
- const: yuzukihd,chameleon
1107+
- const: allwinner,sun50i-h618
1108+
10841109
additionalProperties: true

Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ properties:
5050
- enum:
5151
- allwinner,sun50i-a100-system-control
5252
- allwinner,sun50i-h6-system-control
53+
- allwinner,sun55i-a523-system-control
5354
- const: allwinner,sun50i-a64-system-control
5455

5556
reg:

Documentation/devicetree/bindings/vendor-prefixes.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -864,6 +864,8 @@ patternProperties:
864864
description: Linux-specific binding
865865
"^linx,.*":
866866
description: Linx Technologies
867+
"^liontron,.*":
868+
description: Shenzhen Liontron Technology Co., Ltd
867869
"^liteon,.*":
868870
description: LITE-ON Technology Corp.
869871
"^litex,.*":
@@ -1755,6 +1757,8 @@ patternProperties:
17551757
description: Y Soft Corporation a.s.
17561758
"^yuridenki,.*":
17571759
description: Yuridenki-Shokai Co. Ltd.
1760+
"^yuzukihd,.*":
1761+
description: YuzukiHD Open Source Hardware
17581762
"^zarlink,.*":
17591763
description: Zarlink Semiconductor
17601764
"^zealz,.*":

arch/arm/boot/dts/allwinner/sun7i-a20-bananapi.dts

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848

4949
#include <dt-bindings/gpio/gpio.h>
5050
#include <dt-bindings/interrupt-controller/irq.h>
51+
#include <dt-bindings/leds/common.h>
5152

5253
/ {
5354
model = "LeMaker Banana Pi";
@@ -169,6 +170,32 @@
169170
&gmac_mdio {
170171
phy1: ethernet-phy@1 {
171172
reg = <1>;
173+
174+
leds {
175+
#address-cells = <1>;
176+
#size-cells = <0>;
177+
178+
led@0 {
179+
reg = <0>;
180+
color = <LED_COLOR_ID_GREEN>;
181+
function = LED_FUNCTION_LAN;
182+
linux,default-trigger = "netdev";
183+
};
184+
185+
led@1 {
186+
reg = <1>;
187+
color = <LED_COLOR_ID_AMBER>;
188+
function = LED_FUNCTION_LAN;
189+
linux,default-trigger = "netdev";
190+
};
191+
192+
led@2 {
193+
reg = <2>;
194+
color = <LED_COLOR_ID_BLUE>;
195+
function = LED_FUNCTION_LAN;
196+
linux,default-trigger = "netdev";
197+
};
198+
};
172199
};
173200
};
174201

arch/arm/boot/dts/allwinner/sun8i-a83t.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1225,7 +1225,7 @@
12251225
};
12261226

12271227
cooling-maps {
1228-
cpu-hot-limit {
1228+
map0 {
12291229
trip = <&cpu0_hot>;
12301230
cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
12311231
<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
@@ -1255,7 +1255,7 @@
12551255
};
12561256

12571257
cooling-maps {
1258-
cpu-hot-limit {
1258+
map0 {
12591259
trip = <&cpu1_hot>;
12601260
cooling-device = <&cpu100 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
12611261
<&cpu101 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,

arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo-air.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
non-removable;
9595
status = "okay";
9696

97-
brcmf: bcrmf@1 {
97+
brcmf: wifi@1 {
9898
reg = <1>;
9999
compatible = "brcm,bcm4329-fmac";
100100
interrupt-parent = <&pio>;

arch/arm/boot/dts/allwinner/sun8i-h3.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@
262262
};
263263

264264
cooling-maps {
265-
cpu-hot-limit {
265+
map0 {
266266
trip = <&cpu_hot_trip>;
267267
cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
268268
<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,

arch/arm/boot/dts/allwinner/sun8i-r40.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
};
147147

148148
cooling-maps {
149-
cpu-hot-limit {
149+
map0 {
150150
trip = <&cpu_hot_trip>;
151151
cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
152152
<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,

arch/arm64/boot/dts/allwinner/Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-sopine-baseboard.dtb
1818
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-teres-i.dtb
1919
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h64-remix-mini-pc.dtb
2020
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a100-allwinner-perf1.dtb
21+
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a133-liontron-h-a133l.dtb
2122
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-bananapi-m2-plus.dtb
2223
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-bananapi-m2-plus-v1.2.dtb
2324
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-emlid-neutis-n5-devboard.dtb
@@ -48,7 +49,11 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-longanpi-3h.dtb
4849
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-orangepi-zero2w.dtb
4950
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-orangepi-zero3.dtb
5051
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-transpeed-8k618-t.dtb
52+
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-yuzukihd-chameleon.dtb
5153
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h700-anbernic-rg35xx-2024.dtb
5254
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h700-anbernic-rg35xx-h.dtb
5355
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h700-anbernic-rg35xx-plus.dtb
5456
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h700-anbernic-rg35xx-sp.dtb
57+
dtb-$(CONFIG_ARCH_SUNXI) += sun55i-a527-cubie-a5e.dtb
58+
dtb-$(CONFIG_ARCH_SUNXI) += sun55i-h728-x96qpro+.dtb
59+
dtb-$(CONFIG_ARCH_SUNXI) += sun55i-t527-avaota-a1.dtb

arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@
252252
interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
253253
pinctrl-names = "default";
254254
pinctrl-0 = <&mmc0_pins>;
255+
max-frequency = <150000000>;
255256
status = "disabled";
256257
#address-cells = <1>;
257258
#size-cells = <0>;
@@ -267,6 +268,7 @@
267268
interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
268269
pinctrl-names = "default";
269270
pinctrl-0 = <&mmc1_pins>;
271+
max-frequency = <150000000>;
270272
status = "disabled";
271273
#address-cells = <1>;
272274
#size-cells = <0>;
@@ -282,6 +284,7 @@
282284
interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
283285
pinctrl-names = "default";
284286
pinctrl-0 = <&mmc2_pins>;
287+
max-frequency = <150000000>;
285288
status = "disabled";
286289
#address-cells = <1>;
287290
#size-cells = <0>;

0 commit comments

Comments
 (0)