Skip to content

Commit 1037b30

Browse files
committed
Merge tag 'sunxi-dt-for-6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into soc/dt
Allwinner device tree changes for 6.17 This branch includes a change shared with the clk tree for adding the missing PPU0 reset on the A523. The PM domain DT binding immutable branch is also included, which brings in v6.16-rc2, as well as PM domain bindings for other platforms. Other changes include: - RGB666 LCD pin definitions for the V3s PE pins and V3 PD pins - node order fixes for the A523 dtsi - UART1 pin definitions for A523 - Allwinner board DT binding cleanup - EMAC support on A100/A133 - Enabled on the Liontron H-A133L board - SID efuse, power controllers and GPU added for A523 - A523 GPU enabled on all existing boards New boards: - Xunlong OrangePi 4A with the Allwinner T527 SoC. * tag 'sunxi-dt-for-6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: (21 commits) arm64: dts: allwinner: a523: enable Mali GPU for all boards arm64: dts: allwinner: a523: add Mali GPU node arm64: dts: allwinner: a523: Add power controller device nodes dt-bindings: power: Add A523 PPU and PCK600 power controllers arm64: dts: allwinner: A523: Add SID controller node arm64: dts: allwinner: a133-liontron-h-a133l: Add Ethernet support arm64: dts: allwinner: a100: Add EMAC support arm64: dts: allwinner: a100: Add pin definitions for RGMII/RMII dt-bindings: arm: sunxi: Combine board variants into enums dt-bindings: power: qcom,rpmpd: document the Milos RPMh Power Domains arm64: dts: allwinner: t527: Add OrangePi 4A board arm64: dts: allwinner: a523: Add UART1 pins arm64: dts: allwinner: a523: Move rgmii0 pins to correct location arm64: dts: allwinner: a523: Move mmc nodes to correct position dt-bindings: arm: sunxi: Add Xunlong OrangePi 4A board ARM: dts: sun8i: v3: Add RGB666 LCD PD pins definition ARM: dts: sun8i: v3s: Add RGB666 LCD PE pins definition dt-bindings: reset: sun55i-a523-r-ccu: Add missing PPU0 reset dt-bindings: firmware: thead,th1520: Add resets for GPU clkgen dt-bindings: rockchip: pmu: Add compatible for RK3528 ... Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents c522d00 + d96d9ac commit 1037b30

20 files changed

+681
-96
lines changed

Documentation/devicetree/bindings/arm/rockchip/pmu.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ select:
2525
- rockchip,rk3288-pmu
2626
- rockchip,rk3368-pmu
2727
- rockchip,rk3399-pmu
28+
- rockchip,rk3528-pmu
2829
- rockchip,rk3562-pmu
2930
- rockchip,rk3568-pmu
3031
- rockchip,rk3576-pmu
@@ -44,6 +45,7 @@ properties:
4445
- rockchip,rk3288-pmu
4546
- rockchip,rk3368-pmu
4647
- rockchip,rk3399-pmu
48+
- rockchip,rk3528-pmu
4749
- rockchip,rk3562-pmu
4850
- rockchip,rk3568-pmu
4951
- rockchip,rk3576-pmu

Documentation/devicetree/bindings/arm/sunxi.yaml

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -341,15 +341,11 @@ properties:
341341
- const: allwinner,i12-tvbox
342342
- const: allwinner,sun7i-a20
343343

344-
- description: ICnova A20 ADB4006
344+
- description: ICnova A20
345345
items:
346-
- const: incircuit,icnova-a20-adb4006
347-
- const: incircuit,icnova-a20
348-
- const: allwinner,sun7i-a20
349-
350-
- description: ICNova A20 SWAC
351-
items:
352-
- const: incircuit,icnova-a20-swac
346+
- enum:
347+
- incircuit,icnova-a20-adb4006
348+
- incircuit,icnova-a20-swac
353349
- const: incircuit,icnova-a20
354350
- const: allwinner,sun7i-a20
355351

@@ -760,21 +756,12 @@ properties:
760756
- const: pine64,pinebook
761757
- const: allwinner,sun50i-a64
762758

763-
- description: Pine64 PinePhone Developer Batch (1.0)
764-
items:
765-
- const: pine64,pinephone-1.0
766-
- const: pine64,pinephone
767-
- const: allwinner,sun50i-a64
768-
769-
- description: Pine64 PinePhone Braveheart (1.1)
759+
- description: Pine64 PinePhone
770760
items:
771-
- const: pine64,pinephone-1.1
772-
- const: pine64,pinephone
773-
- const: allwinner,sun50i-a64
774-
775-
- description: Pine64 PinePhone (1.2)
776-
items:
777-
- const: pine64,pinephone-1.2
761+
- enum:
762+
- pine64,pinephone-1.0 # Developer Batch (1.0)
763+
- pine64,pinephone-1.1 # Braveheart (1.1)
764+
- pine64,pinephone-1.2
778765
- const: pine64,pinephone
779766
- const: allwinner,sun50i-a64
780767

@@ -996,6 +983,11 @@ properties:
996983
- const: xunlong,orangepi-3
997984
- const: allwinner,sun50i-h6
998985

986+
- description: Xunlong OrangePi 4A
987+
items:
988+
- const: xunlong,orangepi-4a
989+
- const: allwinner,sun55i-t527
990+
999991
- description: Xunlong OrangePi Lite
1000992
items:
1001993
- const: xunlong,orangepi-lite

Documentation/devicetree/bindings/firmware/thead,th1520-aon.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@ properties:
3232
items:
3333
- const: aon
3434

35+
resets:
36+
maxItems: 1
37+
38+
reset-names:
39+
items:
40+
- const: gpu-clkgen
41+
3542
"#power-domain-cells":
3643
const: 1
3744

Documentation/devicetree/bindings/power/allwinner,sun20i-d1-ppu.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ description:
1616
properties:
1717
compatible:
1818
enum:
19-
- allwinner,sun20i-d1-ppu
2019
- allwinner,sun8i-v853-ppu
20+
- allwinner,sun20i-d1-ppu
21+
- allwinner,sun55i-a523-pck-600
22+
- allwinner,sun55i-a523-ppu
2123

2224
reg:
2325
maxItems: 1

Documentation/devicetree/bindings/power/qcom,rpmpd.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ properties:
1818
oneOf:
1919
- enum:
2020
- qcom,mdm9607-rpmpd
21+
- qcom,milos-rpmhpd
2122
- qcom,msm8226-rpmpd
2223
- qcom,msm8909-rpmpd
2324
- qcom,msm8916-rpmpd

Documentation/devicetree/bindings/power/rockchip,power-controller.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ properties:
4040
- rockchip,rk3366-power-controller
4141
- rockchip,rk3368-power-controller
4242
- rockchip,rk3399-power-controller
43+
- rockchip,rk3528-power-controller
4344
- rockchip,rk3562-power-controller
4445
- rockchip,rk3568-power-controller
4546
- rockchip,rk3576-power-controller

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,15 @@
5656
function = "i2s";
5757
};
5858

59+
/omit-if-no-ref/
60+
lcd_rgb666_pd_pins: lcd-rgb666-pd-pins {
61+
pins = "PD0", "PD1", "PD2", "PD3", "PD4", "PD5",
62+
"PD6", "PD7", "PD8", "PD9", "PD10", "PD11",
63+
"PD12", "PD13", "PD14", "PD15", "PD16", "PD17",
64+
"PD18", "PD19", "PD20", "PD21";
65+
function = "lcd";
66+
};
67+
5968
uart1_pg_pins: uart1-pg-pins {
6069
pins = "PG6", "PG7";
6170
function = "uart1";

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,15 @@
411411
function = "i2c1";
412412
};
413413

414+
/omit-if-no-ref/
415+
lcd_rgb666_pe_pins: lcd-rgb666-pe-pins {
416+
pins = "PE0", "PE1", "PE2", "PE3", "PE4", "PE5",
417+
"PE6", "PE7", "PE8", "PE9", "PE10", "PE11",
418+
"PE12", "PE13", "PE14", "PE15", "PE16", "PE17",
419+
"PE18", "PE19", "PE23", "PE24";
420+
function = "lcd";
421+
};
422+
414423
uart0_pb_pins: uart0-pb-pins {
415424
pins = "PB8", "PB9";
416425
function = "uart0";

arch/arm64/boot/dts/allwinner/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,4 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h700-anbernic-rg35xx-sp.dtb
5757
dtb-$(CONFIG_ARCH_SUNXI) += sun55i-a527-cubie-a5e.dtb
5858
dtb-$(CONFIG_ARCH_SUNXI) += sun55i-h728-x96qpro+.dtb
5959
dtb-$(CONFIG_ARCH_SUNXI) += sun55i-t527-avaota-a1.dtb
60+
dtb-$(CONFIG_ARCH_SUNXI) += sun55i-t527-orangepi-4a.dtb

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,21 @@
236236
bias-pull-up;
237237
};
238238

239+
rgmii0_pins: rgmii0-pins {
240+
pins = "PH0", "PH1", "PH2", "PH3", "PH4",
241+
"PH5", "PH6", "PH7", "PH9", "PH10",
242+
"PH14", "PH15", "PH16", "PH17", "PH18";
243+
function = "emac0";
244+
drive-strength = <40>;
245+
};
246+
247+
rmii0_pins: rmii0-pins {
248+
pins = "PH0", "PH1", "PH2", "PH3", "PH4",
249+
"PH5", "PH6", "PH7", "PH9", "PH10";
250+
function = "emac0";
251+
drive-strength = <40>;
252+
};
253+
239254
uart0_pb_pins: uart0-pb-pins {
240255
pins = "PB9", "PB10";
241256
function = "uart0";
@@ -405,6 +420,26 @@
405420
#size-cells = <0>;
406421
};
407422

423+
emac0: ethernet@5020000 {
424+
compatible = "allwinner,sun50i-a100-emac",
425+
"allwinner,sun50i-a64-emac";
426+
reg = <0x5020000 0x10000>;
427+
interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
428+
interrupt-names = "macirq";
429+
clocks = <&ccu CLK_BUS_EMAC>;
430+
clock-names = "stmmaceth";
431+
resets = <&ccu RST_BUS_EMAC>;
432+
reset-names = "stmmaceth";
433+
syscon = <&syscon>;
434+
status = "disabled";
435+
436+
mdio0: mdio {
437+
compatible = "snps,dwmac-mdio";
438+
#address-cells = <1>;
439+
#size-cells = <0>;
440+
};
441+
};
442+
408443
ths: thermal-sensor@5070400 {
409444
compatible = "allwinner,sun50i-a100-ths";
410445
reg = <0x05070400 0x100>;

0 commit comments

Comments
 (0)