Skip to content

Commit 4340c8d

Browse files
arndbarndb
committed
Merge tag 'v6.17-rockchip-dts64-1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt
New boards: ROC-RK3588S-PC, Luckfox Omni3576, Radxa Rock 5T, Sakura Pi RK3308B - all of them have the used soc in their name. New overlays: RockPro64 screen, optional Sige5 Wifi/BT module, ethernet-switch addon for Jaguar. Added peripherals on rk3528 (spi, power-domain controller, gpu) and sdio controller on rk3576. DSI display support for the Gameforce-ACE handheld, a fix for the cover-detection (closed/open) on the PineNote, camera support for the Haikou Video Demo overlay on PX30 Ringneck as well as a number of other newly enabled peripherals on a number of boards. * tag 'v6.17-rockchip-dts64-1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (40 commits) arm64: dts: rockchip: Enable eMMC HS200 mode on Radxa E20C arm64: dts: rockchip: Add bluetooth support to ArmSoM Sige7 arm64: dts: rockchip: enable PCIe on ROCK 4D arm64: dts: rockchip: Enable HDMI receiver on CM3588 arm64: dts: rockchip: Add HDMI PHY PLL clock source to VOP2 on rk3576 arm64: dts: rockchip: Enable HDMI PHY clk provider on rk3576 arm64: dts: rockchip: add DTs for Firefly ROC-RK3588S-PC dt-bindings: arm: rockchip: Add Firefly ROC-RK3588S-PC arm64: dts: rockchip: Enable GPU on Radxa E20C arm64: dts: rockchip: Add GPU node for RK3528 arm64: dts: rockchip: support camera module on Haikou Video Demo on PX30 Ringneck arm64: dts: rockchip: add label to first port of ISP on px30 arm64: dts: rockchip: fix endpoint dtc warning for PX30 ISP arm64: dts: rockchip: Add power controller for RK3528 arm64: dts: rockchip: enable USB on Sige5 arm64: dts: rockchip: add overlay for the WiFi/BT module on Sige5 v1.2 arm64: dts: rockchip: add version-independent WiFi/BT nodes on Sige5 arm64: dts: rockchip: add SDIO controller on RK3576 arm64: dts: rockchip: Enable gpu on rk3576-evb1-v10 arm64: dts: rockchip: Update the PinePhone Pro panel description ... Link: https://lore.kernel.org/r/15465458.uLZWGnKmhe@phil Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 8e7e63f + 6e3071f commit 4340c8d

32 files changed

Lines changed: 3923 additions & 1002 deletions

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,11 @@ properties:
258258
- const: firefly,rk3566-roc-pc
259259
- const: rockchip,rk3566
260260

261+
- description: Firefly Station M3
262+
items:
263+
- const: firefly,rk3588s-roc-pc
264+
- const: rockchip,rk3588s
265+
261266
- description: Firefly Station P2
262267
items:
263268
- const: firefly,rk3568-roc-pc
@@ -715,6 +720,13 @@ properties:
715720
- const: lckfb,tspi-rk3566
716721
- const: rockchip,rk3566
717722

723+
- description: Luckfox Core3576 Module based boards
724+
items:
725+
- enum:
726+
- luckfox,omni3576
727+
- const: luckfox,core3576
728+
- const: rockchip,rk3576
729+
718730
- description: Lunzn FastRhino R66S / R68S
719731
items:
720732
- enum:
@@ -961,6 +973,11 @@ properties:
961973
- const: radxa,rock-s0
962974
- const: rockchip,rk3308
963975

976+
- description: Radxa ROCK 5T
977+
items:
978+
- const: radxa,rock-5t
979+
- const: rockchip,rk3588
980+
964981
- description: Radxa ZERO 3W/3E
965982
items:
966983
- enum:
@@ -1109,6 +1126,11 @@ properties:
11091126
- const: rockchip,rk3588-toybrick-x0
11101127
- const: rockchip,rk3588
11111128

1129+
- description: Sakura Pi RK3308B
1130+
items:
1131+
- const: sakurapi,rk3308-sakurapi-rk3308b
1132+
- const: rockchip,rk3308
1133+
11121134
- description: Sinovoip RK3308 Banana Pi P2 Pro
11131135
items:
11141136
- const: sinovoip,rk3308-bpi-p2pro

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -890,6 +890,8 @@ patternProperties:
890890
description: Nanjing Loongmasses Ltd.
891891
"^lsi,.*":
892892
description: LSI Corp. (LSI Logic)
893+
"^luckfox,.*":
894+
description: Shenzhen Luckfox Technology Co., Ltd.
893895
"^lunzn,.*":
894896
description: Shenzhen Lunzn Technology Co., Ltd.
895897
"^luxul,.*":
@@ -1302,6 +1304,8 @@ patternProperties:
13021304
description: Recharge Véhicule Électrique (RVE) inc.
13031305
"^saef,.*":
13041306
description: Saef Technology Limited
1307+
"^sakurapi,.*":
1308+
description: SakuraPi.org
13051309
"^samsung,.*":
13061310
description: Samsung Semiconductor
13071311
"^samtec,.*":

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-evb.dtb
1818
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-roc-cc.dtb
1919
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-rock-pi-s.dtb
2020
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-rock-s0.dtb
21+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-sakurapi-rk3308b.dtb
2122
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3318-a95x-z2.dtb
2223
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-anbernic-rg351m.dtb
2324
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-anbernic-rg351v.dtb
@@ -84,6 +85,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4c.dtb
8485
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtb
8586
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64-v2.dtb
8687
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb
88+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64-screen.dtbo
8789
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb
8890
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb
8991
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb
@@ -143,7 +145,9 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-wolfvision-pf5.dtb
143145
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-wolfvision-pf5-display-vz.dtbo
144146
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-wolfvision-pf5-io-expander.dtbo
145147
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-armsom-sige5.dtb
148+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-armsom-sige5-v1.2-wifibt.dtbo
146149
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-evb1-v10.dtb
150+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-luckfox-omni3576.dtb
147151
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-roc-pc.dtb
148152
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-rock-4d.dtb
149153
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3582-radxa-e52c.dtb
@@ -160,6 +164,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-firefly-itx-3588j.dtb
160164
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-friendlyelec-cm3588-nas.dtb
161165
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-h96-max-v58.dtb
162166
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-jaguar.dtb
167+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-jaguar-ethernet-switch.dtbo
163168
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-jaguar-pre-ict-tester.dtbo
164169
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-reform2.dtb
165170
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nanopc-t6.dtb
@@ -174,6 +179,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b.dtb
174179
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b-pcie-ep.dtbo
175180
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b-pcie-srns.dtbo
176181
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b-plus.dtb
182+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5t.dtb
177183
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-tiger-haikou.dtb
178184
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-tiger-haikou-video-demo.dtbo
179185
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-toybrick-x0.dtb
@@ -188,6 +194,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-nanopi-r6c.dtb
188194
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-odroid-m2.dtb
189195
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-orangepi-5.dtb
190196
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-orangepi-5b.dtb
197+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-roc-pc.dtb
191198
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-rock-5a.dtb
192199
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-rock-5c.dtb
193200

@@ -220,11 +227,23 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou-haikou-video-demo.dtb
220227
rk3399-puma-haikou-haikou-video-demo-dtbs := rk3399-puma-haikou.dtb \
221228
rk3399-puma-haikou-video-demo.dtbo
222229

230+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64-screen.dtb
231+
rk3399-rockpro64-screen-dtbs := rk3399-rockpro64.dtb \
232+
rk3399-rockpro64-screen.dtbo
233+
234+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64-v2-screen.dtb
235+
rk3399-rockpro64-v2-screen-dtbs := rk3399-rockpro64-v2.dtb \
236+
rk3399-rockpro64-screen.dtbo
237+
223238
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-wolfvision-pf5-vz-2-uhd.dtb
224239
rk3568-wolfvision-pf5-vz-2-uhd-dtbs := rk3568-wolfvision-pf5.dtb \
225240
rk3568-wolfvision-pf5-display-vz.dtbo \
226241
rk3568-wolfvision-pf5-io-expander.dtbo
227242

243+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-armsom-sige5-v1.2-wifibt.dtb
244+
rk3576-armsom-sige5-v1.2-wifibt-dtbs := rk3576-armsom-sige5.dtb \
245+
rk3576-armsom-sige5-v1.2-wifibt.dtbo
246+
228247
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-edgeble-neu6a-wifi.dtb
229248
rk3588-edgeble-neu6a-wifi-dtbs := rk3588-edgeble-neu6a-io.dtb \
230249
rk3588-edgeble-neu6a-wifi.dtbo
@@ -233,6 +252,10 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-edgeble-neu6b-wifi.dtb
233252
rk3588-edgeble-neu6b-wifi-dtbs := rk3588-edgeble-neu6b-io.dtb \
234253
rk3588-edgeble-neu6a-wifi.dtbo
235254

255+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-jaguar-ethernet-switch.dtb
256+
rk3588-jaguar-ethernet-switch-dtbs := rk3588-jaguar.dtb \
257+
rk3588-jaguar-ethernet-switch.dtbo
258+
236259
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-jaguar-pre-ict-tester.dtb
237260
rk3588-jaguar-pre-ict-tester-dtbs := rk3588-jaguar.dtb \
238261
rk3588-jaguar-pre-ict-tester.dtbo

‎arch/arm64/boot/dts/rockchip/px30-evb.dts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -483,8 +483,7 @@
483483

484484
ports {
485485
port@0 {
486-
mipi_in_ucam: endpoint@0 {
487-
reg = <0>;
486+
mipi_in_ucam: endpoint {
488487
data-lanes = <1 2>;
489488
remote-endpoint = <&ucam_out>;
490489
};

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,8 +444,7 @@
444444

445445
ports {
446446
port@0 {
447-
mipi_in_ucam: endpoint@0 {
448-
reg = <0>;
447+
mipi_in_ucam: endpoint {
449448
data-lanes = <1 2>;
450449
remote-endpoint = <&ucam_out>;
451450
};

‎arch/arm64/boot/dts/rockchip/px30-ringneck-haikou-video-demo.dtso‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,15 @@
9494
};
9595
};
9696

97+
&cif_clkout_m0 {
98+
rockchip,pins =
99+
<2 RK_PB3 1 &pcfg_pull_none_12ma>;
100+
};
101+
102+
&csi_dphy {
103+
status = "okay";
104+
};
105+
97106
&display_subsystem {
98107
status = "okay";
99108
};
@@ -135,6 +144,12 @@
135144
/* OV5675, GT911, DW9714 are limited to 400KHz */
136145
clock-frequency = <400000>;
137146

147+
focus: focus@c {
148+
compatible = "dongwoon,dw9714";
149+
reg = <0xc>;
150+
vcc-supply = <&cam_afvdd_2v8>;
151+
};
152+
138153
touchscreen@14 {
139154
compatible = "goodix,gt911";
140155
reg = <0x14>;
@@ -157,6 +172,44 @@
157172
pinctrl-names = "default";
158173
reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;
159174
};
175+
176+
camera@36 {
177+
compatible = "ovti,ov5675";
178+
reg = <0x36>;
179+
clocks = <&cru SCLK_CIF_OUT>;
180+
assigned-clocks = <&cru SCLK_CIF_OUT>;
181+
/* Only parent to get exactly 19.2MHz */
182+
assigned-clock-parents = <&cru USB480M>;
183+
assigned-clock-rates = <19200000>;
184+
avdd-supply = <&cam_avdd_2v8>;
185+
dvdd-supply = <&cam_dvdd_1v2>;
186+
dovdd-supply = <&cam_dovdd_1v8>;
187+
lens-focus = <&focus>;
188+
orientation = <0>;
189+
pinctrl-names = "default";
190+
pinctrl-0 = <&cif_clkout_m0>;
191+
reset-gpios = <&pca9670 6 GPIO_ACTIVE_LOW>;
192+
rotation = <180>;
193+
194+
port {
195+
cam_out: endpoint {
196+
data-lanes = <1 2>;
197+
link-frequencies = /bits/ 64 <450000000>;
198+
remote-endpoint = <&mipi_in_cam>;
199+
};
200+
};
201+
};
202+
};
203+
204+
&isp {
205+
status = "okay";
206+
};
207+
208+
&isp_in {
209+
mipi_in_cam: endpoint {
210+
data-lanes = <1 2>;
211+
remote-endpoint = <&cam_out>;
212+
};
160213
};
161214

162215
&pinctrl {

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,10 +1269,8 @@
12691269
#address-cells = <1>;
12701270
#size-cells = <0>;
12711271

1272-
port@0 {
1272+
isp_in: port@0 {
12731273
reg = <0>;
1274-
#address-cells = <1>;
1275-
#size-cells = <0>;
12761274
};
12771275
};
12781276
};

0 commit comments

Comments
 (0)