Skip to content

Commit ff68e81

Browse files
arndbarndb
committed
Merge tag 'v6.4-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt
New boards: OrangePi R1 Plus, NanoPi R2C + R5C + R5S, Khadas Edge2. General RK3588 additions: audio, thermal management, sdmmc, clock fixes, watchdog; RK3588-Rock5b: rtc, pwm, audio. Display support for Odroid Go Super and PinephonePro. And some misc adaptions for recently merged yaml binding conversions. * tag 'v6.4-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (35 commits) arm64: dts: rockchip: correct panel supplies on Odroid Go Super arm64: dts: rockchip: Add rk3588-rock-5b analog audio arm64: dts: rockchip: Add I2S rk3588 nodes arm64: dts: rockchip: Add rk3588s I2S nodes arm64: dts: rockchip: Assign PLL_PPLL clock rate to 1.1 GHz on rk3588s arm64: dts: rockchip: Fix SCMI assigned clocks on rk3588s arm64: dts: rockchip: add rk3588 thermal sensor arm64: dts: rockchip: Add pwm-fan to rk3588-rock-5b arm64: dts: rockchip: Enable RTC support for Rock 5B arm64: dts: rockchip: Add Xunlong OrangePi R1 Plus LTS dt-bindings: Add doc for Xunlong OrangePi R1 Plus LTS arm64: dts: rockchip: Add FriendlyARM NanoPi R2C dt-bindings: Add doc for FriendlyARM NanoPi R2C arm64: dts: rockchip: Add touchscreen support to rk3399-pinephone-pro arm64: dts: rockchip: Add internal display support to rk3399-pinephone-pro dt-bindings: watchdog: rockchip: Add rockchip,rk3588-wdt string arm64: dts: rockchip: Enable watchdog support for RK3588 arm64: dts: rockchip: remove hclk from dsi node on rk356x arm64: dts: rockchip: rename vbus-supply to phy-supply in rk3566-box-demo.dts arm64: dts: rockchip: fix rk3399 dp node ... Link: https://lore.kernel.org/r/7289562.MhkbZ0Pkbq@phil Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 8f09b5e + 07099a5 commit ff68e81

19 files changed

Lines changed: 1503 additions & 20 deletions

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

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,11 @@ properties:
185185
- const: firefly,rk3566-roc-pc
186186
- const: rockchip,rk3566
187187

188-
- description: FriendlyElec NanoPi R2S
188+
- description: FriendlyElec NanoPi R2 series boards
189189
items:
190-
- const: friendlyarm,nanopi-r2s
190+
- enum:
191+
- friendlyarm,nanopi-r2c
192+
- friendlyarm,nanopi-r2s
191193
- const: rockchip,rk3328
192194

193195
- description: FriendlyElec NanoPi4 series boards
@@ -201,6 +203,13 @@ properties:
201203
- friendlyarm,nanopi-r4s-enterprise
202204
- const: rockchip,rk3399
203205

206+
- description: FriendlyElec NanoPi R5 series boards
207+
items:
208+
- enum:
209+
- friendlyarm,nanopi-r5c
210+
- friendlyarm,nanopi-r5s
211+
- const: rockchip,rk3568
212+
204213
- description: GeekBuying GeekBox
205214
items:
206215
- const: geekbuying,geekbox
@@ -533,6 +542,11 @@ properties:
533542
- khadas,edge-v
534543
- const: rockchip,rk3399
535544

545+
- description: Khadas Edge2 series boards
546+
items:
547+
- const: khadas,edge2
548+
- const: rockchip,rk3588s
549+
536550
- description: Kobol Helios64
537551
items:
538552
- const: kobol,helios64
@@ -817,9 +831,11 @@ properties:
817831
- const: tronsmart,orion-r68-meta
818832
- const: rockchip,rk3368
819833

820-
- description: Xunlong Orange Pi R1 Plus
834+
- description: Xunlong Orange Pi R1 Plus / LTS
821835
items:
822-
- const: xunlong,orangepi-r1-plus
836+
- enum:
837+
- xunlong,orangepi-r1-plus
838+
- xunlong,orangepi-r1-plus-lts
823839
- const: rockchip,rk3328
824840

825841
- description: Zkmagic A95X Z2

‎Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ properties:
2929
- rockchip,rk3368-wdt
3030
- rockchip,rk3399-wdt
3131
- rockchip,rk3568-wdt
32+
- rockchip,rk3588-wdt
3233
- rockchip,rv1108-wdt
3334
- const: snps,dw-wdt
3435

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go2-v11.dtb
1414
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go3.dtb
1515
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb
1616
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb
17+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2c.dtb
1718
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb
1819
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus.dtb
20+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus-lts.dtb
1921
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb
2022
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock-pi-e.dtb
2123
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb
@@ -84,10 +86,13 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-lubancat-1.dtb
8486
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-bpi-r2-pro.dtb
8587
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb
8688
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-lubancat-2.dtb
89+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nanopi-r5c.dtb
90+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nanopi-r5s.dtb
8791
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-odroid-m1.dtb
8892
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-radxa-e25.dtb
8993
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-rock-3a.dtb
9094
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-edgeble-neu6a-io.dtb
9195
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-evb1-v10.dtb
9296
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b.dtb
97+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-khadas-edge2.dtb
9398
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-rock-5a.dtb

‎arch/arm64/boot/dts/rockchip/px30.dtsi‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@
474474
#address-cells = <1>;
475475
#size-cells = <0>;
476476

477-
port@0 {
477+
lvds_in: port@0 {
478478
reg = <0>;
479479
#address-cells = <1>;
480480
#size-cells = <0>;
@@ -489,6 +489,10 @@
489489
remote-endpoint = <&vopl_out_lvds>;
490490
};
491491
};
492+
493+
lvds_out: port@1 {
494+
reg = <1>;
495+
};
492496
};
493497
};
494498
};
@@ -1134,7 +1138,7 @@
11341138
#address-cells = <1>;
11351139
#size-cells = <0>;
11361140

1137-
port@0 {
1141+
dsi_in: port@0 {
11381142
reg = <0>;
11391143
#address-cells = <1>;
11401144
#size-cells = <0>;
@@ -1149,6 +1153,10 @@
11491153
remote-endpoint = <&vopl_out_dsi>;
11501154
};
11511155
};
1156+
1157+
dsi_out: port@1 {
1158+
reg = <1>;
1159+
};
11521160
};
11531161
};
11541162

‎arch/arm64/boot/dts/rockchip/rk3326-odroid-go3.dts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,10 @@
142142
};
143143

144144
&internal_display {
145-
status = "disabled";
145+
compatible = "elida,kd50t048a", "sitronix,st7701";
146+
reset-gpios = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>;
147+
IOVCC-supply = <&vcc_lcd>;
148+
VCC-supply = <&vcc_lcd>;
146149
};
147150

148151
&rk817_charger {

‎arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c.dts‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
2+
/*
3+
* Copyright (c) 2021 FriendlyElec Computer Tech. Co., Ltd.
4+
* (http://www.friendlyarm.com)
5+
*
6+
* Copyright (c) 2021-2023 Tianling Shen <cnsztl@gmail.com>
7+
*/
8+
9+
/dts-v1/;
10+
#include "rk3328-nanopi-r2s.dts"
11+
12+
/ {
13+
model = "FriendlyElec NanoPi R2C";
14+
compatible = "friendlyarm,nanopi-r2c", "rockchip,rk3328";
15+
};
16+
17+
&gmac2io {
18+
phy-handle = <&yt8521s>;
19+
tx_delay = <0x22>;
20+
rx_delay = <0x12>;
21+
22+
mdio {
23+
/delete-node/ ethernet-phy@1;
24+
25+
yt8521s: ethernet-phy@3 {
26+
compatible = "ethernet-phy-ieee802.3-c22";
27+
reg = <3>;
28+
29+
motorcomm,clk-out-frequency-hz = <125000000>;
30+
motorcomm,keep-pll-enabled;
31+
motorcomm,auto-sleep-disabled;
32+
33+
pinctrl-0 = <&eth_phy_reset_pin>;
34+
pinctrl-names = "default";
35+
reset-assert-us = <10000>;
36+
reset-deassert-us = <50000>;
37+
reset-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
38+
};
39+
};
40+
};

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

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
2+
/*
3+
* Copyright (c) 2016 Xunlong Software. Co., Ltd.
4+
* (http://www.orangepi.org)
5+
*
6+
* Copyright (c) 2021-2023 Tianling Shen <cnsztl@gmail.com>
7+
*/
8+
9+
/dts-v1/;
10+
#include "rk3328-orangepi-r1-plus.dts"
11+
12+
/ {
13+
model = "Xunlong Orange Pi R1 Plus LTS";
14+
compatible = "xunlong,orangepi-r1-plus-lts", "rockchip,rk3328";
15+
};
16+
17+
&gmac2io {
18+
phy-handle = <&yt8531c>;
19+
tx_delay = <0x19>;
20+
rx_delay = <0x05>;
21+
22+
mdio {
23+
/delete-node/ ethernet-phy@1;
24+
25+
yt8531c: ethernet-phy@0 {
26+
compatible = "ethernet-phy-ieee802.3-c22";
27+
reg = <0>;
28+
29+
motorcomm,clk-out-frequency-hz = <125000000>;
30+
motorcomm,keep-pll-enabled;
31+
motorcomm,auto-sleep-disabled;
32+
33+
pinctrl-0 = <&eth_phy_reset_pin>;
34+
pinctrl-names = "default";
35+
reset-assert-us = <15000>;
36+
reset-deassert-us = <50000>;
37+
reset-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
38+
};
39+
};
40+
};

‎arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@
2929
stdout-path = "serial2:115200n8";
3030
};
3131

32+
backlight: backlight {
33+
compatible = "pwm-backlight";
34+
pwms = <&pwm0 0 50000 0>;
35+
};
36+
3237
gpio-keys {
3338
compatible = "gpio-keys";
3439
pinctrl-names = "default";
@@ -102,6 +107,30 @@
102107
/* WL_REG_ON on module */
103108
reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
104109
};
110+
111+
/* MIPI DSI panel 1.8v supply */
112+
vcc1v8_lcd: vcc1v8-lcd {
113+
compatible = "regulator-fixed";
114+
enable-active-high;
115+
regulator-name = "vcc1v8_lcd";
116+
regulator-min-microvolt = <1800000>;
117+
regulator-max-microvolt = <1800000>;
118+
vin-supply = <&vcc3v3_sys>;
119+
gpio = <&gpio3 RK_PA5 GPIO_ACTIVE_HIGH>;
120+
pinctrl-names = "default";
121+
};
122+
123+
/* MIPI DSI panel 2.8v supply */
124+
vcc2v8_lcd: vcc2v8-lcd {
125+
compatible = "regulator-fixed";
126+
enable-active-high;
127+
regulator-name = "vcc2v8_lcd";
128+
regulator-min-microvolt = <2800000>;
129+
regulator-max-microvolt = <2800000>;
130+
vin-supply = <&vcc3v3_sys>;
131+
gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
132+
pinctrl-names = "default";
133+
};
105134
};
106135

107136
&cpu_alert0 {
@@ -139,6 +168,11 @@
139168
status = "okay";
140169
};
141170

171+
&gpu {
172+
mali-supply = <&vdd_gpu>;
173+
status = "okay";
174+
};
175+
142176
&i2c0 {
143177
clock-frequency = <400000>;
144178
i2c-scl-rising-time-ns = <168>;
@@ -333,6 +367,25 @@
333367
};
334368
};
335369

370+
&i2c3 {
371+
i2c-scl-rising-time-ns = <450>;
372+
i2c-scl-falling-time-ns = <15>;
373+
status = "okay";
374+
375+
touchscreen@14 {
376+
compatible = "goodix,gt1158";
377+
reg = <0x14>;
378+
interrupt-parent = <&gpio3>;
379+
interrupts = <RK_PB5 IRQ_TYPE_EDGE_RISING>;
380+
irq-gpios = <&gpio3 RK_PB5 GPIO_ACTIVE_HIGH>;
381+
reset-gpios = <&gpio3 RK_PB4 GPIO_ACTIVE_HIGH>;
382+
AVDD28-supply = <&vcc3v0_touch>;
383+
VDDIO-supply = <&vcc3v0_touch>;
384+
touchscreen-size-x = <720>;
385+
touchscreen-size-y = <1440>;
386+
};
387+
};
388+
336389
&cluster0_opp {
337390
opp04 {
338391
status = "disabled";
@@ -362,6 +415,39 @@
362415
status = "okay";
363416
};
364417

418+
&mipi_dsi {
419+
status = "okay";
420+
clock-master;
421+
422+
ports {
423+
mipi_out: port@1 {
424+
#address-cells = <0>;
425+
#size-cells = <0>;
426+
reg = <1>;
427+
428+
mipi_out_panel: endpoint {
429+
remote-endpoint = <&mipi_in_panel>;
430+
};
431+
};
432+
};
433+
434+
panel@0 {
435+
compatible = "hannstar,hsd060bhw4";
436+
reg = <0>;
437+
backlight = <&backlight>;
438+
reset-gpios = <&gpio4 RK_PD1 GPIO_ACTIVE_LOW>;
439+
vcc-supply = <&vcc2v8_lcd>;
440+
iovcc-supply = <&vcc1v8_lcd>;
441+
pinctrl-names = "default";
442+
443+
port {
444+
mipi_in_panel: endpoint {
445+
remote-endpoint = <&mipi_out_panel>;
446+
};
447+
};
448+
};
449+
};
450+
365451
&pmu_io_domains {
366452
pmu1830-supply = <&vcc_1v8>;
367453
status = "okay";
@@ -429,6 +515,10 @@
429515
status = "okay";
430516
};
431517

518+
&pwm0 {
519+
status = "okay";
520+
};
521+
432522
&sdmmc {
433523
bus-width = <4>;
434524
cap-sd-highspeed;
@@ -479,3 +569,27 @@
479569
&uart2 {
480570
status = "okay";
481571
};
572+
573+
&vopb {
574+
status = "okay";
575+
assigned-clocks = <&cru DCLK_VOP0_DIV>, <&cru DCLK_VOP0>,
576+
<&cru ACLK_VOP0>, <&cru HCLK_VOP0>;
577+
assigned-clock-rates = <0>, <0>, <400000000>, <100000000>;
578+
assigned-clock-parents = <&cru PLL_GPLL>, <&cru DCLK_VOP0_DIV>;
579+
};
580+
581+
&vopb_mmu {
582+
status = "okay";
583+
};
584+
585+
&vopl {
586+
status = "okay";
587+
assigned-clocks = <&cru DCLK_VOP1_DIV>, <&cru DCLK_VOP1>,
588+
<&cru ACLK_VOP1>, <&cru HCLK_VOP1>;
589+
assigned-clock-rates = <0>, <0>, <400000000>, <100000000>;
590+
assigned-clock-parents = <&cru PLL_GPLL>, <&cru DCLK_VOP1_DIV>;
591+
};
592+
593+
&vopl_mmu {
594+
status = "okay";
595+
};

0 commit comments

Comments
 (0)