Skip to content

Commit d69af47

Browse files
arndbarndb
committed
Merge tag 'sunxi-dt-for-6.20' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into soc/dt
Allwinner device tree changes for 6.20 Not many changes this cycle. - The A523 family of SoCs gained support for SPI controllers. - Some cleanup of old ARM device tree files to fix DT binding validation errors. - D1 and A100 SoCs gained support for their LED controller. This was from a couple years ago. The driver made it in, but the DT patches were missed. - D1 and T113 SoCs gained support for the internal thermal sensor. * tag 'sunxi-dt-for-6.20' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: riscv: dts: allwinner: d1: Add CPU thermal sensor and zone ARM: dts: allwinner: Replace status "failed" with "fail" riscv: dts: allwinner: d1: Add RGB LEDs to boards riscv: dts: allwinner: d1: Add LED controller node arm64: dts: allwinner: a100: Add LED controller node ARM: dts: allwinner: sun5i-a13-utoo-p66: delete "power-gpios" property arm64: dts: allwinner: t527: orangepi-4a: Enable SPI-NOR flash arm64: dts: allwinner: sun55i: Add SPI controllers Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 91e93ed + f36e738 commit d69af47

14 files changed

Lines changed: 254 additions & 4 deletions

‎arch/arm/boot/dts/allwinner/sun4i-a10-dserve-dsrv9703c.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112

113113
&i2c1 {
114114
/* pull-ups and devices require AXP209 LDO3 */
115-
status = "failed";
115+
status = "fail";
116116
};
117117

118118
&i2c2 {

‎arch/arm/boot/dts/allwinner/sun4i-a10-pov-protab2-ips9.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696

9797
&i2c1 {
9898
/* pull-ups and devices require AXP209 LDO3 */
99-
status = "failed";
99+
status = "fail";
100100
};
101101

102102
&i2c2 {

‎arch/arm/boot/dts/allwinner/sun5i-a13-utoo-p66.dts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@
102102
/* The P66 uses a different EINT then the reference design */
103103
interrupts = <6 9 IRQ_TYPE_EDGE_FALLING>; /* EINT9 (PG9) */
104104
/* The icn8318 binding expects wake-gpios instead of power-gpios */
105+
/delete-property/ power-gpios;
105106
wake-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */
106107
touchscreen-size-x = <800>;
107108
touchscreen-size-y = <480>;

‎arch/arm/boot/dts/allwinner/sun6i-a31-hummingbird.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170

171171
&i2c0 {
172172
/* pull-ups and devices require AXP221 DLDO3 */
173-
status = "failed";
173+
status = "fail";
174174
};
175175

176176
&i2c1 {

‎arch/arm/boot/dts/allwinner/sun6i-a31s-primo81.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090

9191
&i2c0 {
9292
/* pull-ups and device VDDIO use AXP221 DLDO3 */
93-
status = "failed";
93+
status = "fail";
9494
};
9595

9696
&i2c1 {

‎arch/arm/boot/dts/allwinner/sun8i-t113s.dtsi‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#define SOC_PERIPHERAL_IRQ(nr) GIC_SPI nr
55

66
#include <dt-bindings/interrupt-controller/arm-gic.h>
7+
#include <dt-bindings/thermal/thermal.h>
78
#include <riscv/allwinner/sunxi-d1s-t113.dtsi>
89
#include <riscv/allwinner/sunxi-d1-t113.dtsi>
910

@@ -20,6 +21,7 @@
2021
reg = <0>;
2122
clocks = <&ccu CLK_CPUX>;
2223
clock-names = "cpu";
24+
#cooling-cells = <2>;
2325
};
2426

2527
cpu1: cpu@1 {
@@ -28,6 +30,7 @@
2830
reg = <1>;
2931
clocks = <&ccu CLK_CPUX>;
3032
clock-names = "cpu";
33+
#cooling-cells = <2>;
3134
};
3235
};
3336

@@ -56,4 +59,34 @@
5659
<GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
5760
interrupt-affinity = <&cpu0>, <&cpu1>;
5861
};
62+
63+
thermal-zones {
64+
cpu-thermal {
65+
polling-delay-passive = <0>;
66+
polling-delay = <0>;
67+
thermal-sensors = <&ths>;
68+
69+
cooling-maps {
70+
map0 {
71+
trip = <&cpu_alert>;
72+
cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
73+
<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
74+
};
75+
};
76+
77+
trips {
78+
cpu_alert: cpu-alert {
79+
temperature = <85000>;
80+
hysteresis = <2000>;
81+
type = "passive";
82+
};
83+
84+
cpu-crit {
85+
temperature = <100000>;
86+
hysteresis = <0>;
87+
type = "critical";
88+
};
89+
};
90+
};
91+
};
5992
};

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,20 @@
420420
#size-cells = <0>;
421421
};
422422

423+
ledc: led-controller@5018000 {
424+
compatible = "allwinner,sun50i-a100-ledc";
425+
reg = <0x5018000 0x400>;
426+
interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
427+
clocks = <&ccu CLK_BUS_LEDC>, <&ccu CLK_LEDC>;
428+
clock-names = "bus", "mod";
429+
resets = <&ccu RST_BUS_LEDC>;
430+
dmas = <&dma 42>;
431+
dma-names = "tx";
432+
#address-cells = <1>;
433+
#size-cells = <0>;
434+
status = "disabled";
435+
};
436+
423437
emac0: ethernet@5020000 {
424438
compatible = "allwinner,sun50i-a100-emac",
425439
"allwinner,sun50i-a64-emac";

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

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,43 @@
214214
allwinner,pinmux = <2>;
215215
};
216216

217+
/omit-if-no-ref/
218+
spi0_pc_pins: spi0-pc-pins {
219+
pins = "PC2", "PC4", "PC12";
220+
function = "spi0";
221+
allwinner,pinmux = <4>;
222+
};
223+
224+
/omit-if-no-ref/
225+
spi0_cs0_pc_pin: spi0-cs0-pc-pin {
226+
pins = "PC3";
227+
function = "spi0";
228+
allwinner,pinmux = <4>;
229+
};
230+
231+
/omit-if-no-ref/
232+
spi0_cs1_pc_pin: spi0-cs1-pc-pin {
233+
pins = "PC7";
234+
function = "spi0";
235+
allwinner,pinmux = <4>;
236+
};
237+
238+
/omit-if-no-ref/
239+
spi0_hold_pc_pin: spi0-hold-pc-pin {
240+
/* conflicts with eMMC D7 */
241+
pins = "PC16";
242+
function = "spi0";
243+
allwinner,pinmux = <4>;
244+
};
245+
246+
/omit-if-no-ref/
247+
spi0_wp_pc_pin: spi0-wp-pc-pin {
248+
/* conflicts with eMMC D2 */
249+
pins = "PC15";
250+
function = "spi0";
251+
allwinner,pinmux = <4>;
252+
};
253+
217254
uart0_pb_pins: uart0-pb-pins {
218255
pins = "PB9", "PB10";
219256
allwinner,pinmux = <2>;
@@ -563,6 +600,49 @@
563600
#size-cells = <0>;
564601
};
565602

603+
spi0: spi@4025000 {
604+
compatible = "allwinner,sun55i-a523-spi";
605+
reg = <0x04025000 0x1000>;
606+
interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
607+
clocks = <&ccu CLK_BUS_SPI0>, <&ccu CLK_SPI0>;
608+
clock-names = "ahb", "mod";
609+
dmas = <&dma 22>, <&dma 22>;
610+
dma-names = "rx", "tx";
611+
resets = <&ccu RST_BUS_SPI0>;
612+
status = "disabled";
613+
#address-cells = <1>;
614+
#size-cells = <0>;
615+
};
616+
617+
spi1: spi@4026000 {
618+
compatible = "allwinner,sun55i-a523-spi-dbi",
619+
"allwinner,sun55i-a523-spi";
620+
reg = <0x04026000 0x1000>;
621+
interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
622+
clocks = <&ccu CLK_BUS_SPI1>, <&ccu CLK_SPI1>;
623+
clock-names = "ahb", "mod";
624+
dmas = <&dma 23>, <&dma 23>;
625+
dma-names = "rx", "tx";
626+
resets = <&ccu RST_BUS_SPI1>;
627+
status = "disabled";
628+
#address-cells = <1>;
629+
#size-cells = <0>;
630+
};
631+
632+
spi2: spi@4027000 {
633+
compatible = "allwinner,sun55i-a523-spi";
634+
reg = <0x04027000 0x1000>;
635+
interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
636+
clocks = <&ccu CLK_BUS_SPI2>, <&ccu CLK_SPI2>;
637+
clock-names = "ahb", "mod";
638+
dmas = <&dma 24>, <&dma 24>;
639+
dma-names = "rx", "tx";
640+
resets = <&ccu RST_BUS_SPI2>;
641+
status = "disabled";
642+
#address-cells = <1>;
643+
#size-cells = <0>;
644+
};
645+
566646
usb_otg: usb@4100000 {
567647
compatible = "allwinner,sun55i-a523-musb",
568648
"allwinner,sun8i-a33-musb";
@@ -815,6 +895,20 @@
815895
#clock-cells = <1>;
816896
};
817897

898+
r_spi0: spi@7092000 {
899+
compatible = "allwinner,sun55i-a523-spi";
900+
reg = <0x07092000 0x1000>;
901+
interrupts = <GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH>;
902+
clocks = <&r_ccu CLK_BUS_R_SPI>, <&r_ccu CLK_R_SPI>;
903+
clock-names = "ahb", "mod";
904+
dmas = <&dma 53>, <&dma 53>;
905+
dma-names = "rx", "tx";
906+
resets = <&r_ccu RST_BUS_R_SPI>;
907+
status = "disabled";
908+
#address-cells = <1>;
909+
#size-cells = <0>;
910+
};
911+
818912
mcu_ccu: clock-controller@7102000 {
819913
compatible = "allwinner,sun55i-a523-mcu-ccu";
820914
reg = <0x7102000 0x200>;

‎arch/arm64/boot/dts/allwinner/sun55i-t527-orangepi-4a.dts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,21 @@
400400
assigned-clock-rates = <32768>;
401401
};
402402

403+
&spi0 {
404+
pinctrl-names = "default";
405+
pinctrl-0 = <&spi0_pc_pins>, <&spi0_cs0_pc_pin>;
406+
status = "okay";
407+
408+
flash@0 {
409+
#address-cells = <1>;
410+
#size-cells = <1>;
411+
compatible = "jedec,spi-nor";
412+
reg = <0>;
413+
spi-max-frequency = <20000000>;
414+
vcc-supply = <&reg_cldo1>;
415+
};
416+
};
417+
403418
&uart0 {
404419
pinctrl-names = "default";
405420
pinctrl-0 = <&uart0_pb_pins>;

‎arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-dock.dts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,18 @@
5959
status = "okay";
6060
};
6161

62+
&ledc {
63+
pinctrl-0 = <&ledc_pc0_pin>;
64+
pinctrl-names = "default";
65+
status = "okay";
66+
67+
multi-led@0 {
68+
reg = <0x0>;
69+
color = <LED_COLOR_ID_RGB>;
70+
function = LED_FUNCTION_STATUS;
71+
};
72+
};
73+
6274
&mmc1 {
6375
bus-width = <4>;
6476
mmc-pwrseq = <&wifi_pwrseq>;

0 commit comments

Comments
 (0)