Skip to content

Commit 228307a

Browse files
arndbarndb
committed
Merge tag 'v6.8-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt
One new boards, the CoolPi CM5 SoM and 4B SBC. Basic node for the rk3588 display controller and a bunch of small improvements for different boards, * tag 'v6.8-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (21 commits) arm64: dts: rockchip: Fix led pinctrl of lubancat 1 arm64: dts: rockchip: correct gpio_pwrctrl1 typo on nanopc-t6 arm64: dts: rockchip: correct gpio_pwrctrl1 typo on rock-5b arm64: dts: rockchip: support poweroff on the rock-5b arm64: dts: rockchip: Support poweroff on Orange Pi 5 arm64: dts: rockchip: nanopc-t6 sdmmc beautification arm64: dts: rockchip: Fix rk3588 USB power-domain clocks arm64: dts: rockchip: configure eth pad driver strength for orangepi r1 plus lts arm64: dts: rockchip: Support poweroff on NanoPC-T6 arm64: dts: rockchip: rk3308-rock-pi-s gpio-line-names cleanup arm64: dts: rockchip: Add support for rk3588 based board Cool Pi CM5 EVB dt-bindings: arm: rockchip: Add Cool Pi CM5 arm64: dts: rockchip: Add support for rk3588s based board Cool Pi 4B dt-bindings: arm: rockchip: Add Cool Pi 4B dt-bindings: vendor-prefixes: Add Cool Pi arm64: dts: rockchip: add gpio-line-names to rk3328-rock-pi-e arm64: dts: rockchip: make use gpio-keys for buttons on puma-haikou arm64: dts: rockchip: expose BIOS Disable feedback pin on rk3399-puma arm64: dts: rockchip: fix misleading comment in rk3399-puma-haikou.dts arm64: dts: rockchip: Add vop on rk3588 ... Link: https://lore.kernel.org/r/3711719.VqM8IeB0Os@diego Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents f3a4d7c + 8586a5d commit 228307a

17 files changed

Lines changed: 1956 additions & 71 deletions

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,18 @@ properties:
9797
- const: chipspark,rayeager-px2
9898
- const: rockchip,rk3066a
9999

100+
- description: Cool Pi Compute Module 5(CM5) EVB
101+
items:
102+
- enum:
103+
- coolpi,pi-cm5-evb
104+
- const: coolpi,pi-cm5
105+
- const: rockchip,rk3588
106+
107+
- description: Cool Pi 4 Model B
108+
items:
109+
- const: coolpi,pi-4b
110+
- const: rockchip,rk3588s
111+
100112
- description: Edgeble Neural Compute Module 2(Neu2) SoM based boards
101113
items:
102114
- const: edgeble,neural-compute-module-2-io # Edgeble Neural Compute Module 2 IO Board

‎Documentation/devicetree/bindings/soc/rockchip/grf.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ properties:
2828
- rockchip,rk3588-sys-grf
2929
- rockchip,rk3588-pcie3-phy-grf
3030
- rockchip,rk3588-pcie3-pipe-grf
31+
- rockchip,rk3588-vo-grf
32+
- rockchip,rk3588-vop-grf
3133
- rockchip,rv1108-usbgrf
3234
- const: syscon
3335
- items:

‎Documentation/devicetree/bindings/vendor-prefixes.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,8 @@ patternProperties:
294294
description: CompuLab Ltd.
295295
"^congatec,.*":
296296
description: congatec GmbH
297+
"^coolpi,.*":
298+
description: cool-pi.com
297299
"^coreriver,.*":
298300
description: CORERIVER Semiconductor Co.,Ltd.
299301
"^corpro,.*":

‎arch/arm64/boot/dts/rockchip/Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-odroid-m1.dtb
101101
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-radxa-e25.dtb
102102
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-roc-pc.dtb
103103
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-rock-3a.dtb
104+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-coolpi-cm5-evb.dtb
104105
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-edgeble-neu6a-io.dtb
105106
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-edgeble-neu6b-io.dtb
106107
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-evb1-v10.dtb
@@ -110,6 +111,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-orangepi-5-plus.dtb
110111
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-quartzpro64.dtb
111112
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b.dtb
112113
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-turing-rk1.dtb
114+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-coolpi-4b.dtb
113115
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-indiedroid-nova.dtb
114116
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-khadas-edge2.dtb
115117
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-rock-5a.dtb

‎arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts‎

Lines changed: 62 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,68 @@
143143
status = "okay";
144144
};
145145

146+
&gpio0 {
147+
gpio-line-names =
148+
/* GPIO0_A0 - A7 */
149+
"", "", "", "", "", "", "", "",
150+
/* GPIO0_B0 - B7 */
151+
"", "", "", "header1-pin3 [GPIO0_B3]",
152+
"header1-pin5 [GPIO0_B4]", "", "",
153+
"header1-pin11 [GPIO0_B7]",
154+
/* GPIO0_C0 - C7 */
155+
"header1-pin13 [GPIO0_C0]",
156+
"header1-pin15 [GPIO0_C1]", "", "", "",
157+
"", "", "",
158+
/* GPIO0_D0 - D7 */
159+
"", "", "", "", "", "", "", "";
160+
};
161+
162+
&gpio1 {
163+
gpio-line-names =
164+
/* GPIO1_A0 - A7 */
165+
"", "", "", "", "", "", "", "",
166+
/* GPIO1_B0 - B7 */
167+
"", "", "", "", "", "", "", "",
168+
/* GPIO1_C0 - C7 */
169+
"", "", "", "", "", "", "header1-pin21 [GPIO1_C6]",
170+
"header1-pin19 [GPIO1_C7]",
171+
/* GPIO1_D0 - D7 */
172+
"header1-pin23 [GPIO1_D0]", "header1-pin24 [GPIO1_D1]",
173+
"", "", "", "", "", "";
174+
};
175+
176+
&gpio2 {
177+
gpio-line-names =
178+
/* GPIO2_A0 - A7 */
179+
"header1-pin10 [GPIO2_A0]", "header1-pin8 [GPIO2_A1]",
180+
"", "",
181+
"header1-pin7 [GPIO2_A4]", "header1-pin12 [GPIO2_A5]",
182+
"header2-pin46 [GPIO2_A6]", "header1-pin22 [GPIO1_A7]",
183+
/* GPIO2_B0 - B7 */
184+
"header2-pin45 [GPIO2_B0]", "header1-pin18 [GPIO2_B1]",
185+
"header1-pin16 [GPIO2_B2]", "header2-pin44 [GPIO2_B3]",
186+
"header2-pin43 [GPIO2_B4]", "header2-pin28 [GPIO2_B5]",
187+
"header2-pin30 [GPIO2_B6]", "header2-pin32 [GPIO2_B7]",
188+
/* GPIO2_C0 - C7 */
189+
"header2-pin34 [GPIO2_C0]", "", "", "", "", "", "", "",
190+
/* GPIO2_D0 - D7 */
191+
"", "", "", "", "", "", "", "";
192+
};
193+
194+
&gpio3 {
195+
gpio-line-names =
196+
/* GPIO3_A0 - A7 */
197+
"", "", "", "", "", "", "", "",
198+
/* GPIO3_B0 - B7 */
199+
"", "", "header2-pin42 [GPIO3_B2]",
200+
"header2-pin41 [GPIO3_B3]", "header2-pin40 [GPIO3_B4]",
201+
"header2-pin39 [GPIO3_B5]", "", "",
202+
/* GPIO3_C0 - C7 */
203+
"", "", "", "", "", "", "", "",
204+
/* GPIO3_D0 - D7 */
205+
"", "", "", "", "", "", "", "";
206+
};
207+
146208
&i2c1 {
147209
status = "okay";
148210
};
@@ -250,61 +312,3 @@
250312
&wdt {
251313
status = "okay";
252314
};
253-
254-
&gpio0 {
255-
gpio-line-names =
256-
/* GPIO0_A0 - A7 */
257-
"", "", "", "", "", "", "", "",
258-
/* GPIO0_B0 - B7 */
259-
"", "", "", "header1-pin3 [GPIO0_B3]", "header1-pin5 [GPIO0_B4]",
260-
"", "", "header1-pin11 [GPIO0_B7]",
261-
/* GPIO0_C0 - C7 */
262-
"header1-pin13 [GPIO0_C0]", "header1-pin15 [GPIO0_C1]", "", "", "",
263-
"", "", "",
264-
/* GPIO0_D0 - D8 */
265-
"", "", "", "", "", "", "", "";
266-
};
267-
268-
&gpio1 {
269-
gpio-line-names =
270-
/* GPIO1_A0 - A7 */
271-
"", "", "", "", "", "", "", "",
272-
/* GPIO1_B0 - B7 */
273-
"", "", "", "", "", "", "", "",
274-
/* GPIO1_C0 - C7 */
275-
"", "", "", "", "", "", "header1-pin21 [GPIO1_C6]",
276-
"header1-pin19 [GPIO1_C7]",
277-
/* GPIO1_D0 - D8 */
278-
"header1-pin23 [GPIO1_D0]", "header1-pin24 [GPIO1_D1]", "", "", "",
279-
"", "", "";
280-
};
281-
282-
&gpio2 {
283-
gpio-line-names =
284-
/* GPIO2_A0 - A7 */
285-
"header1-pin10 [GPIO2_A0]", "header1-pin8 [GPIO2_A1]", "", "",
286-
"header1-pin7 [GPIO2_A4]", "header1-pin12 [GPIO2_A5]",
287-
"header2-pin46 [GPIO2_A6]", "header1-pin22 [GPIO1_A7]",
288-
/* GPIO2_B0 - B7 */
289-
"header2-pin45 [GPIO2_B0]", "header1-pin18 [GPIO2_B1]",
290-
"header1-pin16 [GPIO2_B2]", "header2-pin44 [GPIO2_B3]",
291-
"header2-pin43 [GPIO2_B4]", "header2-pin28 [GPIO2_B5]",
292-
"header2-pin30 [GPIO2_B6]", "header2-pin32 [GPIO2_B7]",
293-
/* GPIO2_C0 - C7 */
294-
"header2-pin34 [GPIO2_C0]", "", "", "", "", "", "", "",
295-
/* GPIO2_D0 - D8 */
296-
"", "", "", "", "", "", "", "";
297-
};
298-
299-
&gpio3 {
300-
gpio-line-names =
301-
/* GPIO3_A0 - A7 */
302-
"", "", "", "", "", "", "", "",
303-
/* GPIO3_B0 - B7 */
304-
"", "", "header2-pin42 [GPIO3_B2]", "header2-pin41 [GPIO3_B3]",
305-
"header2-pin40 [GPIO3_B4]", "header2-pin39 [GPIO3_B5]", "", "",
306-
/* GPIO3_C0 - C7 */
307-
"", "", "", "", "", "", "", "",
308-
/* GPIO3_D0 - D8 */
309-
"", "", "", "", "", "", "", "";
310-
};

‎arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@
2626
compatible = "ethernet-phy-ieee802.3-c22";
2727
reg = <0>;
2828

29+
motorcomm,auto-sleep-disabled;
2930
motorcomm,clk-out-frequency-hz = <125000000>;
3031
motorcomm,keep-pll-enabled;
31-
motorcomm,auto-sleep-disabled;
32+
motorcomm,rx-clk-drv-microamp = <5020>;
33+
motorcomm,rx-data-drv-microamp = <5020>;
3234

3335
pinctrl-0 = <&eth_phy_reset_pin>;
3436
pinctrl-names = "default";

‎arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,59 @@
182182
status = "okay";
183183
};
184184

185+
&gpio0 {
186+
gpio-line-names =
187+
/* GPIO0_A0 - A7 */
188+
"", "", "", "", "", "", "", "",
189+
/* GPIO0_B0 - B7 */
190+
"", "", "", "", "", "", "", "",
191+
/* GPIO0_C0 - C7 */
192+
"", "", "", "", "", "", "", "",
193+
/* GPIO0_D0 - D7 */
194+
"", "", "", "pin-15 [GPIO0_D3]", "", "", "", "";
195+
};
196+
197+
&gpio1 {
198+
gpio-line-names =
199+
/* GPIO1_A0 - A7 */
200+
"", "", "", "", "", "", "", "",
201+
/* GPIO1_B0 - B7 */
202+
"", "", "", "", "", "", "", "",
203+
/* GPIO1_C0 - C7 */
204+
"", "", "", "", "", "", "", "",
205+
/* GPIO1_D0 - D7 */
206+
"", "", "", "", "pin-07 [GPIO1_D4]", "", "", "";
207+
};
208+
209+
&gpio2 {
210+
gpio-line-names =
211+
/* GPIO2_A0 - A7 */
212+
"pin-08 [GPIO2_A0]", "pin-10 [GPIO2_A1]", "pin-11 [GPIO2_A2]",
213+
"pin-13 [GPIO2-A3]", "pin-27 [GPIO2_A4]", "pin-28 [GPIO2_A5]",
214+
"pin-33 [GPIO2_A6]", "",
215+
/* GPIO2_B0 - B7 */
216+
"", "", "", "", "pin-26 [GPIO2_B4]", "", "", "pin-36 [GPIO2_B7]",
217+
/* GPIO2_C0 - C7 */
218+
"pin-32 [GPIO2_C0]", "pin-35 [GPIO2_C1]", "pin-12 [GPIO2_C2]",
219+
"pin-38 [GPIO2_C3]", "pin-29 [GPIO2_C4]", "pin-31 [GPIO2_C5]",
220+
"pin-37 [GPIO2_C6]", "pin-40 [GPIO2_C7]",
221+
/* GPIO2_D0 - D7 */
222+
"", "", "", "", "", "", "", "";
223+
};
224+
225+
&gpio3 {
226+
gpio-line-names =
227+
/* GPIO3_A0 - A7 */
228+
"pin-23 [GPIO3_A0]", "pin-19 [GPIO3_A1]", "pin-21 [GPIO3_A2]",
229+
"", "pin-03 [GPIO3_A4]", "", "pin-05 [GPIO3_A6]", "",
230+
/* GPIO3_B0 - B7 */
231+
"pin-24 [GPIO3_B0]", "", "", "", "", "", "", "",
232+
/* GPIO3_C0 - C7 */
233+
"", "", "", "", "", "", "", "",
234+
/* GPIO3_D0 - D7 */
235+
"", "", "", "", "", "", "", "";
236+
};
237+
185238
&i2c1 {
186239
status = "okay";
187240

‎arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts‎

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
/dts-v1/;
77
#include "rk3399-puma.dtsi"
8+
#include <dt-bindings/input/input.h>
89

910
/ {
1011
model = "Theobroma Systems RK3399-Q7 SoM";
@@ -18,6 +19,38 @@
1819
stdout-path = "serial0:115200n8";
1920
};
2021

22+
gpio-keys {
23+
compatible = "gpio-keys";
24+
pinctrl-0 = <&haikou_keys_pin>;
25+
pinctrl-names = "default";
26+
27+
button-batlow-n {
28+
gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
29+
label = "BATLOW#";
30+
linux,code = <KEY_BATTERY>;
31+
};
32+
33+
button-slp-btn-n {
34+
gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_LOW>;
35+
label = "SLP_BTN#";
36+
linux,code = <KEY_SLEEP>;
37+
};
38+
39+
button-wake-n {
40+
gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_LOW>;
41+
label = "WAKE#";
42+
linux,code = <KEY_WAKEUP>;
43+
wakeup-source;
44+
};
45+
46+
switch-lid-btn-n {
47+
gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
48+
label = "LID_BTN#";
49+
linux,code = <SW_LID>;
50+
linux,input-type = <EV_SW>;
51+
};
52+
};
53+
2154
leds {
2255
pinctrl-0 = <&module_led_pin>, <&sd_card_led_pin>;
2356

@@ -165,19 +198,16 @@
165198
};
166199

167200
&pinctrl {
168-
pinctrl-names = "default";
169-
pinctrl-0 = <&haikou_pin_hog>;
170-
171-
hog {
172-
haikou_pin_hog: haikou-pin-hog {
201+
buttons {
202+
haikou_keys_pin: haikou-keys-pin {
173203
rockchip,pins =
174204
/* LID_BTN */
175205
<0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>,
176206
/* BATLOW# */
177207
<0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>,
178208
/* SLP_BTN# */
179209
<0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_up>,
180-
/* BIOS_DISABLE# */
210+
/* WAKE# */
181211
<0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>;
182212
};
183213
};

‎arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,20 @@
120120
drive-impedance-ohm = <33>;
121121
};
122122

123+
&gpio0 {
124+
/*
125+
* The BIOS_DISABLE hog is a feedback pin for the actual status of the
126+
* signal. This usually represents the state of a switch on the baseboard.
127+
* The pin has a 10k pull-up resistor connected, so no pull-up setting is needed.
128+
*/
129+
bios-disable-hog {
130+
gpios = <RK_PB0 GPIO_ACTIVE_HIGH>;
131+
gpio-hog;
132+
input;
133+
line-name = "bios_disable";
134+
};
135+
};
136+
123137
&gmac {
124138
assigned-clocks = <&cru SCLK_RMII_SRC>;
125139
assigned-clock-parents = <&clkin_gmac>;

‎arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@
455455
&pinctrl {
456456
leds {
457457
sys_led_pin: sys-status-led-pin {
458-
rockchip,pins = <0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
458+
rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
459459
};
460460
};
461461

0 commit comments

Comments
 (0)