Skip to content

Commit 681d855

Browse files
arndbarndb
committed
Merge tag 'sunxi-dt-for-6.10-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into soc/dt
- added multicolor LED node for pinephone - marked pinephone LEDs to retain status in suspend - DT cleanups & fixes - fixed A64 GPU frequency at 432 MHz - added H616 NMI node - new boards: PocketBook 614 Plus, Tanix TX1 * tag 'sunxi-dt-for-6.10-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: arm64: dts: allwinner: h616: Add NMI device node arm64: dts: allwinner: Add Tanix TX1 support dt-bindings: arm: sunxi: document Tanix TX1 name ARM: dts: sun5i: Add PocketBook 614 Plus support dt-bindings: arm: sunxi: Add PocketBook 614 Plus arm64: dts: allwinner: h616: Fix I2C0 pins arm64: dts: allwinner: a64: Run GPU at 432 MHz arm: dts: allwinner: drop underscore in node names arm64: dts: allwinner: Orange Pi: delete node by phandle arm64: dts: allwinner: drop underscore in node names arm64: dts: allwinner: Pine H64: correctly remove reg_gmac_3v3 arm64: dts: allwinner: pinephone: add multicolor LED node arm64: dts: allwinner: pinephone: Retain LEDs state in suspend Link: https://lore.kernel.org/r/20240426164510.GA101219@jernej-laptop Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 2173e54 + fd46e5e commit 681d855

78 files changed

Lines changed: 553 additions & 128 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Documentation/devicetree/bindings/arm/sunxi.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -774,6 +774,11 @@ properties:
774774
- const: pocketbook,touch-lux-3
775775
- const: allwinner,sun5i-a13
776776

777+
- description: PocketBook 614 Plus
778+
items:
779+
- const: pocketbook,614-plus
780+
- const: allwinner,sun5i-a13
781+
777782
- description: Point of View Protab2-IPS9
778783
items:
779784
- const: pov,protab2-ips9
@@ -860,6 +865,11 @@ properties:
860865
- const: allwinner,sl631
861866
- const: allwinner,sun8i-v3
862867

868+
- description: Tanix TX1
869+
items:
870+
- const: oranth,tanix-tx1
871+
- const: allwinner,sun50i-h616
872+
863873
- description: Tanix TX6
864874
items:
865875
- const: oranth,tanix-tx6

‎arch/arm/boot/dts/allwinner/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ dtb-$(CONFIG_MACH_SUN5I) += \
6161
sun5i-a13-olinuxino.dtb \
6262
sun5i-a13-olinuxino-micro.dtb \
6363
sun5i-a13-pocketbook-touch-lux-3.dtb \
64+
sun5i-a13-pocketbook-614-plus.dtb \
6465
sun5i-a13-q8-tablet.dtb \
6566
sun5i-a13-utoo-p66.dtb \
6667
sun5i-gr8-chip-pro.dtb \

‎arch/arm/boot/dts/allwinner/sun5i-a13-pocketbook-614-plus.dts‎

Lines changed: 218 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,218 @@
1+
// SPDX-License-Identifier: GPL-2.0+
2+
/*
3+
* Copyright 2024 Denis Burkov <hitechshell@mail.ru>
4+
*/
5+
6+
/dts-v1/;
7+
#include "sun5i-a13.dtsi"
8+
#include "sunxi-common-regulators.dtsi"
9+
10+
#include <dt-bindings/gpio/gpio.h>
11+
#include <dt-bindings/input/input.h>
12+
#include <dt-bindings/interrupt-controller/irq.h>
13+
#include <dt-bindings/leds/common.h>
14+
15+
/ {
16+
model = "PocketBook 614 Plus";
17+
compatible = "pocketbook,614-plus", "allwinner,sun5i-a13";
18+
19+
aliases {
20+
serial0 = &uart1;
21+
};
22+
23+
chosen {
24+
stdout-path = "serial0:115200n8";
25+
};
26+
27+
leds {
28+
compatible = "gpio-leds";
29+
30+
led-0 {
31+
color = <LED_COLOR_ID_WHITE>;
32+
function = LED_FUNCTION_POWER;
33+
linux,default-trigger = "default-on";
34+
gpios = <&pio 4 8 GPIO_ACTIVE_LOW>; /* PE8 */
35+
};
36+
};
37+
38+
gpio-keys {
39+
compatible = "gpio-keys";
40+
41+
key-0 {
42+
label = "Right";
43+
linux,code = <KEY_NEXT>;
44+
gpios = <&pio 6 9 GPIO_ACTIVE_LOW>; /* PG9 */
45+
};
46+
47+
key-1 {
48+
label = "Left";
49+
linux,code = <KEY_PREVIOUS>;
50+
gpios = <&pio 6 10 GPIO_ACTIVE_LOW>; /* PG10 */
51+
};
52+
};
53+
54+
reg_3v3_mmc0: regulator-mmc0 {
55+
compatible = "regulator-fixed";
56+
regulator-name = "vdd-mmc0";
57+
regulator-min-microvolt = <3300000>;
58+
regulator-max-microvolt = <3300000>;
59+
gpio = <&pio 4 4 GPIO_ACTIVE_LOW>; /* PE4 */
60+
vin-supply = <&reg_vcc3v3>;
61+
};
62+
};
63+
64+
&cpu0 {
65+
cpu-supply = <&reg_dcdc2>;
66+
};
67+
68+
&ehci0 {
69+
status = "okay";
70+
};
71+
72+
&i2c0 {
73+
status = "okay";
74+
75+
axp209: pmic@34 {
76+
compatible = "x-powers,axp209";
77+
reg = <0x34>;
78+
interrupts = <0>;
79+
};
80+
};
81+
82+
#include "axp209.dtsi"
83+
84+
&i2c1 {
85+
status = "okay";
86+
87+
pcf8563: rtc@51 {
88+
compatible = "nxp,pcf8563";
89+
reg = <0x51>;
90+
#clock-cells = <0>;
91+
};
92+
};
93+
94+
&lradc {
95+
vref-supply = <&reg_ldo2>;
96+
status = "okay";
97+
98+
button-300 {
99+
label = "Down";
100+
linux,code = <KEY_DOWN>;
101+
channel = <0>;
102+
voltage = <300000>;
103+
};
104+
105+
button-700 {
106+
label = "Up";
107+
linux,code = <KEY_UP>;
108+
channel = <0>;
109+
voltage = <700000>;
110+
};
111+
112+
button-1000 {
113+
label = "Left";
114+
linux,code = <KEY_LEFT>;
115+
channel = <0>;
116+
voltage = <1000000>;
117+
};
118+
119+
button-1200 {
120+
label = "Menu";
121+
linux,code = <KEY_MENU>;
122+
channel = <0>;
123+
voltage = <1200000>;
124+
};
125+
126+
button-1500 {
127+
label = "Right";
128+
linux,code = <KEY_RIGHT>;
129+
channel = <0>;
130+
voltage = <1500000>;
131+
};
132+
};
133+
134+
&mmc0 {
135+
vmmc-supply = <&reg_3v3_mmc0>;
136+
bus-width = <4>;
137+
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
138+
status = "okay";
139+
};
140+
141+
&mmc2 {
142+
pinctrl-names = "default";
143+
pinctrl-0 = <&mmc2_4bit_pc_pins>;
144+
vmmc-supply = <&reg_vcc3v3>;
145+
bus-width = <4>;
146+
non-removable;
147+
status = "okay";
148+
};
149+
150+
&ohci0 {
151+
status = "okay";
152+
};
153+
154+
&otg_sram {
155+
status = "okay";
156+
};
157+
158+
&reg_dcdc2 {
159+
regulator-always-on;
160+
regulator-min-microvolt = <1000000>;
161+
regulator-max-microvolt = <1500000>;
162+
regulator-name = "vdd-cpu";
163+
};
164+
165+
&reg_dcdc3 {
166+
regulator-always-on;
167+
regulator-min-microvolt = <1000000>;
168+
regulator-max-microvolt = <1400000>;
169+
regulator-name = "vdd-int-dll";
170+
};
171+
172+
&reg_ldo1 {
173+
regulator-name = "vdd-rtc";
174+
};
175+
176+
&reg_ldo2 {
177+
regulator-always-on;
178+
regulator-min-microvolt = <3000000>;
179+
regulator-max-microvolt = <3000000>;
180+
regulator-name = "avcc";
181+
};
182+
183+
&reg_usb0_vbus {
184+
status = "okay";
185+
gpio = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
186+
};
187+
188+
&reg_usb1_vbus {
189+
gpio = <&pio 6 11 GPIO_ACTIVE_HIGH>; /* PG11 */
190+
status = "okay";
191+
};
192+
193+
&uart1 {
194+
pinctrl-names = "default";
195+
pinctrl-0 = <&uart1_pg_pins>;
196+
status = "okay";
197+
};
198+
199+
&usb_otg {
200+
dr_mode = "otg";
201+
status = "okay";
202+
};
203+
204+
&usb_power_supply {
205+
status = "okay";
206+
};
207+
208+
&battery_power_supply {
209+
status = "okay";
210+
};
211+
212+
&usbphy {
213+
usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
214+
usb0_vbus_det-gpios = <&axp_gpio 1 GPIO_ACTIVE_HIGH>;
215+
usb0_vbus-supply = <&reg_usb0_vbus>;
216+
usb1_vbus-supply = <&reg_usb1_vbus>;
217+
status = "okay";
218+
};

‎arch/arm/boot/dts/allwinner/sun5i-a13.dtsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,14 @@
6262
};
6363

6464
trips {
65-
cpu_alert0: cpu_alert0 {
65+
cpu_alert0: cpu-alert0 {
6666
/* milliCelsius */
6767
temperature = <85000>;
6868
hysteresis = <2000>;
6969
type = "passive";
7070
};
7171

72-
cpu_crit: cpu_crit {
72+
cpu_crit: cpu-crit {
7373
/* milliCelsius */
7474
temperature = <100000>;
7575
hysteresis = <2000>;

‎arch/arm/boot/dts/allwinner/sun5i-gr8-chip-pro.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
};
7878
};
7979

80-
mmc0_pwrseq: mmc0_pwrseq {
80+
mmc0_pwrseq: pwrseq {
8181
compatible = "mmc-pwrseq-simple";
8282
reset-gpios = <&pio 1 10 GPIO_ACTIVE_LOW>; /* PB10 */
8383
};

‎arch/arm/boot/dts/allwinner/sun5i-r8-chip.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
};
7878
};
7979

80-
mmc0_pwrseq: mmc0_pwrseq {
80+
mmc0_pwrseq: pwrseq {
8181
compatible = "mmc-pwrseq-simple";
8282
reset-gpios = <&pio 2 19 GPIO_ACTIVE_LOW>; /* PC19 */
8383
};

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
};
110110
};
111111

112-
reg_vga_3v3: vga_3v3_regulator {
112+
reg_vga_3v3: vga-3v3-regulator {
113113
compatible = "regulator-fixed";
114114
regulator-name = "vga-3v3";
115115
regulator-min-microvolt = <3300000>;
@@ -119,7 +119,7 @@
119119
gpio = <&pio 7 25 GPIO_ACTIVE_HIGH>; /* PH25 */
120120
};
121121

122-
wifi_pwrseq: wifi_pwrseq {
122+
wifi_pwrseq: pwrseq {
123123
compatible = "mmc-pwrseq-simple";
124124
reset-gpios = <&pio 6 10 GPIO_ACTIVE_LOW>; /* PG10 */
125125
};

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -179,14 +179,14 @@
179179
};
180180

181181
trips {
182-
cpu_alert0: cpu_alert0 {
182+
cpu_alert0: cpu-alert0 {
183183
/* milliCelsius */
184184
temperature = <70000>;
185185
hysteresis = <2000>;
186186
type = "passive";
187187
};
188188

189-
cpu_crit: cpu_crit {
189+
cpu_crit: cpu-crit {
190190
/* milliCelsius */
191191
temperature = <100000>;
192192
hysteresis = <2000>;
@@ -1318,7 +1318,7 @@
13181318
compatible = "allwinner,sun6i-a31-prcm";
13191319
reg = <0x01f01400 0x200>;
13201320

1321-
ar100: ar100_clk {
1321+
ar100: ar100-clk {
13221322
compatible = "allwinner,sun6i-a31-ar100-clk";
13231323
#clock-cells = <0>;
13241324
clocks = <&rtc CLK_OSC32K>, <&osc24M>,
@@ -1327,7 +1327,7 @@
13271327
clock-output-names = "ar100";
13281328
};
13291329

1330-
ahb0: ahb0_clk {
1330+
ahb0: ahb0-clk {
13311331
compatible = "fixed-factor-clock";
13321332
#clock-cells = <0>;
13331333
clock-div = <1>;
@@ -1336,14 +1336,14 @@
13361336
clock-output-names = "ahb0";
13371337
};
13381338

1339-
apb0: apb0_clk {
1339+
apb0: apb0-clk {
13401340
compatible = "allwinner,sun6i-a31-apb0-clk";
13411341
#clock-cells = <0>;
13421342
clocks = <&ahb0>;
13431343
clock-output-names = "apb0";
13441344
};
13451345

1346-
apb0_gates: apb0_gates_clk {
1346+
apb0_gates: apb0-gates-clk {
13471347
compatible = "allwinner,sun6i-a31-apb0-gates-clk";
13481348
#clock-cells = <1>;
13491349
clocks = <&apb0>;
@@ -1353,14 +1353,14 @@
13531353
"apb0_i2c";
13541354
};
13551355

1356-
ir_clk: ir_clk {
1356+
ir_clk: ir-clk {
13571357
#clock-cells = <0>;
13581358
compatible = "allwinner,sun4i-a10-mod0-clk";
13591359
clocks = <&rtc CLK_OSC32K>, <&osc24M>;
13601360
clock-output-names = "ir";
13611361
};
13621362

1363-
apb0_rst: apb0_rst {
1363+
apb0_rst: apb0-rst {
13641364
compatible = "allwinner,sun6i-a31-clock-reset";
13651365
#reset-cells = <1>;
13661366
};

‎arch/arm/boot/dts/allwinner/sun6i-a31s-sinovoip-bpi-m2.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
};
7676
};
7777

78-
mmc2_pwrseq: mmc2_pwrseq {
78+
mmc2_pwrseq: pwrseq {
7979
compatible = "mmc-pwrseq-simple";
8080
reset-gpios = <&r_pio 0 8 GPIO_ACTIVE_LOW>; /* PL8 WIFI_EN */
8181
};

‎arch/arm/boot/dts/allwinner/sun7i-a20-bananapi-m1-plus.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
};
8787
};
8888

89-
mmc3_pwrseq: mmc3_pwrseq {
89+
mmc3_pwrseq: pwrseq {
9090
compatible = "mmc-pwrseq-simple";
9191
reset-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 WL-PMU-EN */
9292
};

0 commit comments

Comments
 (0)