Skip to content

Commit 67fea39

Browse files
arndbarndb
committed
Merge tag 'v6.20-rockchip-dts64-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt
New boards: Anberic RG-DS game console, Radxa CM3J module + baseboard for the Rpi CM4 IO board, QNAP TS133 from the RK3568 NAS series. 2 display outputs for the Lion board (old RK3368), TPS65185 pmic for the PineNote and fixes for the PCIe ranges on both RK356x and RK3588. These came quite late, so I wanted to give them the time till 6.20-rc1 and have them migrate to stable-kernels afterwards. The rest is small stuff on a number of boards wrt gpios and compatibles. * tag 'v6.20-rockchip-dts64-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (25 commits) arm64: dts: rockchip: Fix rk3588 PCIe range mappings arm64: dts: rockchip: Fix rk356x PCIe range mappings arm64: dts: rockchip: Add Anbernic RG-DS dt-bindings: input: touchscreen: goodix: Add "panel" property dt-bindings: arm: rockchip: Add Anbernic RG-DS arm64: dts: rockchip: Explicitly request UFS reset pin on RK3576 arm64: dts: rockchip: Add TPS65185 for PineNote arm64: dts: rockchip: Do not enable hdmi_sound node on Pinebook Pro arm64: dts: rockchip: Fix imx258 variant on pinephone pro arm64: dts: rockchip: Add the Video-Demo overlay for Lion Haikou arm64: dts: rockchip: Enable pwm1 on rk3368-lion-haikou arm64: dts: rockchip: Enable HDMI output on RK3368-Lion-Haikou arm64: dts: rockchip: Add HDMI node to RK3368 arm64: dts: rockchip: Use phandle for i2c_lvds_blc on rk3368-lion haikou arm64: dts: rockchip: Fix SD card support for RK3576 Nanopi R76s arm64: dts: rockchip: Fix SD card support for RK3576 EVB1 arm64: dts: rockchip: Add Radxa CM3J on RPi CM4 IO Board arm64: dts: rockchip: Add Radxa CM3J dt-bindings: arm: rockchip: Add Radxa CM3J on RPi CM4 IO Board arm64: dts: rockchip: Make eeprom read-only for Radxa ROCK 3C/5A/5C ... Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents a46cb1c + 46c56b7 commit 67fea39

28 files changed

Lines changed: 2498 additions & 50 deletions

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

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ properties:
6060
- anbernic,rg-arc-s
6161
- const: rockchip,rk3566
6262

63+
- description: Anbernic RK3568 Handheld Gaming Console
64+
items:
65+
- enum:
66+
- anbernic,rg-ds
67+
- const: rockchip,rk3568
68+
6369
- description: Ariaboard Photonicat
6470
items:
6571
- const: ariaboard,photonicat
@@ -894,11 +900,15 @@ properties:
894900
- const: rockchip,rk3568
895901

896902
- description: QNAP TS-x33 NAS devices
897-
items:
898-
- enum:
899-
- qnap,ts233
900-
- qnap,ts433
901-
- const: rockchip,rk3568
903+
oneOf:
904+
- items:
905+
- const: qnap,ts133
906+
- const: rockchip,rk3566
907+
- items:
908+
- enum:
909+
- qnap,ts233
910+
- qnap,ts433
911+
- const: rockchip,rk3568
902912

903913
- description: Radxa Compute Module 3 (CM3)
904914
items:
@@ -914,6 +924,13 @@ properties:
914924
- const: radxa,cm3i
915925
- const: rockchip,rk3568
916926

927+
- description: Radxa CM3J
928+
items:
929+
- enum:
930+
- radxa,cm3j-rpi-cm4
931+
- const: radxa,cm3j
932+
- const: rockchip,rk3568
933+
917934
- description: Radxa CM5
918935
items:
919936
- enum:

‎Documentation/devicetree/bindings/input/touchscreen/goodix.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ properties:
4242
address, thus it can be driven by the host during the reset sequence.
4343
maxItems: 1
4444

45+
panel: true
46+
4547
reset-gpios:
4648
maxItems: 1
4749

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-evb-act8846.dtb
4242
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-geekbox.dtb
4343
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-lba3368.dtb
4444
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-lion-haikou.dtb
45+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-lion-haikou-video-demo.dtbo
4546
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-orion-r68-meta.dtb
4647
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb
4748
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb
@@ -114,6 +115,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-powkiddy-rgb20sx.dtb
114115
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-powkiddy-rgb30.dtb
115116
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-powkiddy-rk2023.dtb
116117
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-powkiddy-x55.dtb
118+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-qnap-ts133.dtb
117119
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb
118120
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-b.dtb
119121
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-radxa-cm3-io.dtb
@@ -133,6 +135,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-bigtreetech-pi2.dtb
133135
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-tinker-board-3.dtb
134136
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-tinker-board-3s.dtb
135137
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-9tripod-x3568-v4.dtb
138+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-anbernic-rg-ds.dtb
136139
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-bpi-r2-pro.dtb
137140
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-easepi-r1.dtb
138141
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb
@@ -148,6 +151,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-odroid-m1.dtb
148151
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-photonicat.dtb
149152
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-qnap-ts233.dtb
150153
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-qnap-ts433.dtb
154+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-radxa-cm3j-rpi-cm4.dtb
151155
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-radxa-e25.dtb
152156
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-roc-pc.dtb
153157
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-rock-3a.dtb
@@ -241,6 +245,10 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-ringneck-haikou-haikou-video-demo.dtb
241245
px30-ringneck-haikou-haikou-video-demo-dtbs := px30-ringneck-haikou.dtb \
242246
px30-ringneck-haikou-video-demo.dtbo
243247

248+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-lion-haikou-haikou-video-demo.dtb
249+
rk3368-lion-haikou-haikou-video-demo-dtbs := rk3368-lion-haikou.dtb \
250+
rk3368-lion-haikou-video-demo.dtbo
251+
244252
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou-haikou-video-demo.dtb
245253
rk3399-puma-haikou-haikou-video-demo-dtbs := rk3399-puma-haikou.dtb \
246254
rk3399-puma-haikou-video-demo.dtbo

‎arch/arm64/boot/dts/rockchip/rk3368-lion-haikou-video-demo.dtso‎

Lines changed: 170 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,170 @@
1+
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2+
/*
3+
* Copyright (c) 2025 Cherry Embedded Solutions GmbH
4+
*
5+
* DEVKIT ADDON CAM-TS-A01
6+
* https://embedded.cherry.de/product/development-kit/
7+
*
8+
* DT-overlay for the camera / DSI demo appliance for Haikou boards.
9+
* In the flavour for use with a Lion system-on-module.
10+
*/
11+
12+
/dts-v1/;
13+
/plugin/;
14+
15+
#include <dt-bindings/clock/rk3368-cru.h>
16+
#include <dt-bindings/gpio/gpio.h>
17+
#include <dt-bindings/interrupt-controller/irq.h>
18+
#include <dt-bindings/leds/common.h>
19+
#include <dt-bindings/pinctrl/rockchip.h>
20+
21+
&{/} {
22+
backlight: backlight {
23+
compatible = "pwm-backlight";
24+
power-supply = <&dc_12v>;
25+
pwms = <&pwm1 0 25000 0>;
26+
};
27+
28+
cam_afvdd_2v8: regulator-cam-afvdd-2v8 {
29+
compatible = "regulator-fixed";
30+
gpio = <&pca9670 2 GPIO_ACTIVE_LOW>;
31+
regulator-max-microvolt = <2800000>;
32+
regulator-min-microvolt = <2800000>;
33+
regulator-name = "cam-afvdd-2v8";
34+
vin-supply = <&vcc2v8_video>;
35+
};
36+
37+
cam_avdd_2v8: regulator-cam-avdd-2v8 {
38+
compatible = "regulator-fixed";
39+
gpio = <&pca9670 4 GPIO_ACTIVE_LOW>;
40+
regulator-max-microvolt = <2800000>;
41+
regulator-min-microvolt = <2800000>;
42+
regulator-name = "cam-avdd-2v8";
43+
vin-supply = <&vcc2v8_video>;
44+
};
45+
46+
cam_dovdd_1v8: regulator-cam-dovdd-1v8 {
47+
compatible = "regulator-fixed";
48+
gpio = <&pca9670 3 GPIO_ACTIVE_LOW>;
49+
regulator-max-microvolt = <1800000>;
50+
regulator-min-microvolt = <1800000>;
51+
regulator-name = "cam-dovdd-1v8";
52+
vin-supply = <&vcc1v8_video>;
53+
};
54+
55+
cam_dvdd_1v2: regulator-cam-dvdd-1v2 {
56+
compatible = "regulator-fixed";
57+
enable-active-high;
58+
gpio = <&pca9670 5 GPIO_ACTIVE_HIGH>;
59+
regulator-max-microvolt = <1200000>;
60+
regulator-min-microvolt = <1200000>;
61+
regulator-name = "cam-dvdd-1v2";
62+
vin-supply = <&vcc3v3_baseboard>;
63+
};
64+
65+
vcc1v8_video: regulator-vcc1v8-video {
66+
compatible = "regulator-fixed";
67+
regulator-always-on;
68+
regulator-boot-on;
69+
regulator-max-microvolt = <1800000>;
70+
regulator-min-microvolt = <1800000>;
71+
regulator-name = "vcc1v8-video";
72+
vin-supply = <&vcc3v3_baseboard>;
73+
};
74+
75+
vcc2v8_video: regulator-vcc2v8-video {
76+
compatible = "regulator-fixed";
77+
regulator-always-on;
78+
regulator-boot-on;
79+
regulator-max-microvolt = <2800000>;
80+
regulator-min-microvolt = <2800000>;
81+
regulator-name = "vcc2v8-video";
82+
vin-supply = <&vcc3v3_baseboard>;
83+
};
84+
85+
video-adapter-leds {
86+
compatible = "gpio-leds";
87+
88+
video-adapter-led {
89+
color = <LED_COLOR_ID_BLUE>;
90+
gpios = <&pca9670 7 GPIO_ACTIVE_HIGH>;
91+
label = "video-adapter-led";
92+
linux,default-trigger = "none";
93+
};
94+
};
95+
};
96+
97+
&dphy {
98+
status = "okay";
99+
};
100+
101+
&i2c_gp2 {
102+
#address-cells = <1>;
103+
#size-cells = <0>;
104+
/* OV5675, GT911, DW9714 are limited to 400KHz */
105+
clock-frequency = <400000>;
106+
107+
touchscreen@14 {
108+
compatible = "goodix,gt911";
109+
reg = <0x14>;
110+
interrupt-parent = <&gpio1>;
111+
interrupts = <RK_PB5 IRQ_TYPE_LEVEL_LOW>;
112+
irq-gpios = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;
113+
pinctrl-0 = <&touch_int>;
114+
pinctrl-names = "default";
115+
reset-gpios = <&pca9670 1 GPIO_ACTIVE_HIGH>;
116+
AVDD28-supply = <&vcc2v8_video>;
117+
VDDIO-supply = <&vcc3v3_baseboard>;
118+
};
119+
120+
pca9670: gpio@27 {
121+
compatible = "nxp,pca9670";
122+
reg = <0x27>;
123+
gpio-controller;
124+
#gpio-cells = <2>;
125+
pinctrl-0 = <&pca9670_resetn>;
126+
pinctrl-names = "default";
127+
reset-gpios = <&gpio1 RK_PA5 GPIO_ACTIVE_LOW>;
128+
};
129+
};
130+
131+
&mipi_dsi {
132+
#address-cells = <1>;
133+
#size-cells = <0>;
134+
status = "okay";
135+
136+
panel@0 {
137+
compatible = "leadtek,ltk050h3148w";
138+
reg = <0>;
139+
backlight = <&backlight>;
140+
iovcc-supply = <&vcc1v8_video>;
141+
reset-gpios = <&pca9670 0 GPIO_ACTIVE_LOW>;
142+
vci-supply = <&vcc2v8_video>;
143+
144+
port {
145+
mipi_in_panel: endpoint {
146+
remote-endpoint = <&mipi_out_panel>;
147+
};
148+
};
149+
};
150+
};
151+
152+
&mipi_out {
153+
mipi_out_panel: endpoint {
154+
remote-endpoint = <&mipi_in_panel>;
155+
};
156+
};
157+
158+
&pinctrl {
159+
pca9670 {
160+
pca9670_resetn: pca9670-resetn {
161+
rockchip,pins = <1 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
162+
};
163+
};
164+
165+
touch {
166+
touch_int: touch-int {
167+
rockchip,pins = <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
168+
};
169+
};
170+
};

‎arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,6 @@
1818
stdout-path = "serial0:115200n8";
1919
};
2020

21-
i2cmux2 {
22-
i2c@0 {
23-
eeprom: eeprom@50 {
24-
compatible = "atmel,24c01";
25-
pagesize = <8>;
26-
reg = <0x50>;
27-
};
28-
};
29-
};
30-
3121
leds {
3222
pinctrl-0 = <&module_led_pins>, <&sd_card_led_pin>;
3323

@@ -68,6 +58,26 @@
6858
};
6959
};
7060

61+
&display_subsystem {
62+
status = "okay";
63+
};
64+
65+
&hdmi {
66+
status = "okay";
67+
};
68+
69+
&i2c_lvds_blc {
70+
eeprom: eeprom@50 {
71+
compatible = "atmel,24c01";
72+
pagesize = <8>;
73+
reg = <0x50>;
74+
};
75+
};
76+
77+
&pwm1 {
78+
status = "okay";
79+
};
80+
7181
&sdmmc {
7282
bus-width = <4>;
7383
cap-mmc-highspeed;
@@ -103,6 +113,14 @@
103113
status = "disabled";
104114
};
105115

116+
&vop {
117+
status = "okay";
118+
};
119+
120+
&vop_mmu {
121+
status = "okay";
122+
};
123+
106124
&pinctrl {
107125
pinctrl-names = "default";
108126
pinctrl-0 = <&haikou_pin_hog>;

‎arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,11 @@
164164
status = "okay";
165165
};
166166

167+
&hdmi {
168+
avdd-0v9-supply = <&vdd10_video>;
169+
avdd-1v8-supply = <&vcc18_video>;
170+
};
171+
167172
&i2c0 {
168173
status = "okay";
169174

0 commit comments

Comments
 (0)