Skip to content

Commit b9e82be

Browse files
arndbarndb
committed
Merge tag 'v6.16-rockchip-dts64-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt
New SoC the RK3562 (4xA53, Mali-G52) with one evaluation board. New boards: - Cobra and PP1516 from Theobroma-Systems (build around the PX30) - Radxa Rock 5B+ (rk3588) - Rockchip RK3399 industrial eval board New peripherals: - GMAC + SDMMC/SDIO on rk3528 - SAI + HDMI-audio on rk3576 Interesting general updates: - move rk3528 i2c + uart aliases as requested - rk3568 PCIe3 MSI to use GIC ITS - update deprecated dwmac reset properties on some px30 boards - updates for cypress usb hubs on some Theobroma boards Binding taken with Greg's blessing https://lore.kernel.org/all/2025051550-polish-prude-ed56@gregkh/ * tag 'v6.16-rockchip-dts64-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (35 commits) arm64: dts: rockchip: Improve LED config for NanoPi R5S arm64: dts: rockchip: add px30-pp1516 base dtsi and board variants dt-bindings: arm: rockchip: add PX30-PP1516 boards from Theobroma Systems arm64: dts: rockchip: add px30-cobra base dtsi and board variants dt-bindings: arm: rockchip: add PX30-Cobra boards from Theobroma Systems arm64: dts: rockchip: move reset to dedicated eth-phy node on ringneck arm64: dts: rockchip: add basic mdio node to px30 arm64: dts: rockchip: disable unrouted USB controllers and PHY on RK3399 Puma with Haikou arm64: dts: rockchip: disable unrouted USB controllers and PHY on RK3399 Puma arm64: dts: rockchip: fix internal USB hub instability on RK3399 Puma dt-bindings: usb: cypress,hx3: Add support for all variants arm64: dts: rockchip: move rk3528 i2c+uart aliases to board files arm64: dts: rockchip: drop wrong spdif clock from edp1 on rk3588 arm64: dts: rockchip: Add RK3562 evb2 devicetree arm64: dts: rockchip: add core dtsi for RK3562 SoC dt-bindings: arm: rockchip: Add rk3562 evb2 board dt-bindings: soc: rockchip: Add rk3562 syscon compatibles dt-bindings: rockchip: pmu: Add rk3562 compatible arm64: dts: rockchip: Enable Ethernet controller on Radxa E20C arm64: dts: rockchip: Add GMAC nodes for RK3528 ... Link: https://lore.kernel.org/r/3998939.iIbC2pHGDl@phil Signed-off-by: Arnd Bergmann <[email protected]>
2 parents ebe6d8f + 1631cbd commit b9e82be

34 files changed

+7664
-1008
lines changed

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -946,6 +946,11 @@ properties:
946946
- const: radxa,rock-5b
947947
- const: rockchip,rk3588
948948

949+
- description: Radxa ROCK 5B+
950+
items:
951+
- const: radxa,rock-5b-plus
952+
- const: rockchip,rk3588
953+
949954
- description: Radxa ROCK 5C
950955
items:
951956
- const: radxa,rock-5c
@@ -1047,6 +1052,11 @@ properties:
10471052
- const: rockchip,rk3399-evb
10481053
- const: rockchip,rk3399
10491054

1055+
- description: Rockchip RK3399 Industry Evaluation board
1056+
items:
1057+
- const: rockchip,rk3399-evb-ind
1058+
- const: rockchip,rk3399
1059+
10501060
- description: Rockchip RK3399 Sapphire standalone
10511061
items:
10521062
- const: rockchip,rk3399-sapphire
@@ -1057,6 +1067,11 @@ properties:
10571067
- const: rockchip,rk3399-sapphire-excavator
10581068
- const: rockchip,rk3399
10591069

1070+
- description: Rockchip RK3562 Evaluation board 2
1071+
items:
1072+
- const: rockchip,rk3562-evb2-v10
1073+
- const: rockchip,rk3562
1074+
10601075
- description: Rockchip RK3566 BOX Evaluation Demo board
10611076
items:
10621077
- const: rockchip,rk3566-box-demo
@@ -1111,6 +1126,24 @@ properties:
11111126
- rockchip,rv1126
11121127
- rockchip,rv1109
11131128

1129+
- description: Theobroma Systems PX30-Cobra
1130+
items:
1131+
- enum:
1132+
- tsd,px30-cobra-ltk050h3146w
1133+
- tsd,px30-cobra-ltk050h3146w-a2
1134+
- tsd,px30-cobra-ltk050h3148w
1135+
- tsd,px30-cobra-ltk500hd1829
1136+
- const: tsd,px30-cobra
1137+
- const: rockchip,px30
1138+
1139+
- description: Theobroma Systems PX30-PP1516
1140+
items:
1141+
- enum:
1142+
- tsd,px30-pp1516-ltk050h3146w-a2
1143+
- tsd,px30-pp1516-ltk050h3148w
1144+
- const: tsd,px30-pp1516
1145+
- const: rockchip,px30
1146+
11141147
- description: Theobroma Systems PX30-uQ7 with Haikou baseboard
11151148
items:
11161149
- const: tsd,px30-ringneck-haikou

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ select:
2525
- rockchip,rk3288-pmu
2626
- rockchip,rk3368-pmu
2727
- rockchip,rk3399-pmu
28+
- rockchip,rk3562-pmu
2829
- rockchip,rk3568-pmu
2930
- rockchip,rk3576-pmu
3031
- rockchip,rk3588-pmu
@@ -43,6 +44,7 @@ properties:
4344
- rockchip,rk3288-pmu
4445
- rockchip,rk3368-pmu
4546
- rockchip,rk3399-pmu
47+
- rockchip,rk3562-pmu
4648
- rockchip,rk3568-pmu
4749
- rockchip,rk3576-pmu
4850
- rockchip,rk3588-pmu

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ properties:
1818
- rockchip,rk3528-ioc-grf
1919
- rockchip,rk3528-vo-grf
2020
- rockchip,rk3528-vpu-grf
21+
- rockchip,rk3562-ioc-grf
22+
- rockchip,rk3562-peri-grf
23+
- rockchip,rk3562-pipephy-grf
24+
- rockchip,rk3562-pmu-grf
25+
- rockchip,rk3562-sys-grf
26+
- rockchip,rk3562-usbphy-grf
2127
- rockchip,rk3566-pipe-grf
2228
- rockchip,rk3568-pcie3-phy-grf
2329
- rockchip,rk3568-pipe-grf
@@ -82,6 +88,7 @@ properties:
8288
- rockchip,rk3368-pmugrf
8389
- rockchip,rk3399-grf
8490
- rockchip,rk3399-pmugrf
91+
- rockchip,rk3562-pmu-grf
8592
- rockchip,rk3568-grf
8693
- rockchip,rk3568-pmugrf
8794
- rockchip,rk3576-ioc-grf

‎Documentation/devicetree/bindings/usb/cypress,hx3.yaml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,22 @@ allOf:
1414

1515
properties:
1616
compatible:
17-
enum:
18-
- usb4b4,6504
19-
- usb4b4,6506
17+
oneOf:
18+
- enum:
19+
- usb4b4,6504
20+
- usb4b4,6506
21+
- items:
22+
- enum:
23+
- usb4b4,6500
24+
- usb4b4,6508
25+
- const: usb4b4,6504
26+
- items:
27+
- enum:
28+
- usb4b4,6502
29+
- usb4b4,6503
30+
- usb4b4,6507
31+
- usb4b4,650a
32+
- const: usb4b4,6506
2033

2134
reg: true
2235

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
# SPDX-License-Identifier: GPL-2.0
2+
dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-cobra-ltk050h3146w-a2.dtb
3+
dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-cobra-ltk050h3146w.dtb
4+
dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-cobra-ltk050h3148w.dtb
5+
dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-cobra-ltk500hd1829.dtb
26
dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-evb.dtb
37
dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-engicam-px30-core-ctouch2.dtb
48
dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-engicam-px30-core-ctouch2-of10.dtb
59
dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-engicam-px30-core-edimm2.2.dtb
610
dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-firefly-jd4-core-mb.dtb
11+
dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-pp1516-ltk050h3146w-a2.dtb
12+
dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-pp1516-ltk050h3148w.dtb
713
dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-ringneck-haikou.dtb
814
dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-ringneck-haikou-lvds-9904379.dtbo
915
dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-ringneck-haikou-video-demo.dtbo
@@ -40,6 +46,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb
4046
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb
4147
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-eaidk-610.dtb
4248
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb
49+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb-ind.dtb
4350
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ficus.dtb
4451
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb
4552
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-bob.dtb
@@ -81,6 +88,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb
8188
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb
8289
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb
8390
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3528-radxa-e20c.dtb
91+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3562-evb2-v10.dtb
8492
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg-arc-d.dtb
8593
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg-arc-s.dtb
8694
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg353p.dtb
@@ -165,6 +173,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5-itx.dtb
165173
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b.dtb
166174
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b-pcie-ep.dtbo
167175
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b-pcie-srns.dtbo
176+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b-plus.dtb
168177
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-tiger-haikou.dtb
169178
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-tiger-haikou-video-demo.dtbo
170179
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-toybrick-x0.dtb

‎arch/arm64/boot/dts/rockchip/px30-cobra-ltk050h3146w-a2.dts

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2+
/*
3+
* Copyright (c) 2025 Cherry Embedded Solutions GmbH
4+
*/
5+
6+
/dts-v1/;
7+
#include "px30-cobra.dtsi"
8+
9+
/ {
10+
model = "Theobroma Systems Cobra with LTK050H3146W-A2 Display";
11+
compatible = "tsd,px30-cobra-ltk050h3146w-a2", "tsd,px30-cobra", "rockchip,px30";
12+
};
13+
14+
&dsi {
15+
status = "okay";
16+
17+
panel@0 {
18+
compatible = "leadtek,ltk050h3146w-a2";
19+
reg = <0>;
20+
backlight = <&backlight>;
21+
iovcc-supply = <&vcc_1v8>;
22+
pinctrl-names = "default";
23+
pinctrl-0 = <&dsp_rst>;
24+
reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
25+
vci-supply = <&vcc_2v8>;
26+
27+
port {
28+
mipi_in_panel: endpoint {
29+
remote-endpoint = <&mipi_out_panel>;
30+
};
31+
};
32+
};
33+
};
34+
35+
&dsi_out {
36+
mipi_out_panel: endpoint {
37+
remote-endpoint = <&mipi_in_panel>;
38+
};
39+
};

‎arch/arm64/boot/dts/rockchip/px30-cobra-ltk050h3146w.dts

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2+
/*
3+
* Copyright (c) 2025 Cherry Embedded Solutions GmbH
4+
*/
5+
6+
/dts-v1/;
7+
#include "px30-cobra.dtsi"
8+
9+
/ {
10+
model = "Theobroma Systems Cobra with LTK050H3146W Display";
11+
compatible = "tsd,px30-cobra-ltk050h3146w", "tsd,px30-cobra", "rockchip,px30";
12+
};
13+
14+
&dsi {
15+
status = "okay";
16+
17+
panel@0 {
18+
compatible = "leadtek,ltk050h3146w";
19+
reg = <0>;
20+
backlight = <&backlight>;
21+
iovcc-supply = <&vcc_1v8>;
22+
pinctrl-names = "default";
23+
pinctrl-0 = <&dsp_rst>;
24+
reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
25+
vci-supply = <&vcc_2v8>;
26+
27+
port {
28+
mipi_in_panel: endpoint {
29+
remote-endpoint = <&mipi_out_panel>;
30+
};
31+
};
32+
};
33+
};
34+
35+
&dsi_out {
36+
mipi_out_panel: endpoint {
37+
remote-endpoint = <&mipi_in_panel>;
38+
};
39+
};

‎arch/arm64/boot/dts/rockchip/px30-cobra-ltk050h3148w.dts

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2+
/*
3+
* Copyright (c) 2025 Cherry Embedded Solutions GmbH
4+
*/
5+
6+
/dts-v1/;
7+
#include "px30-cobra.dtsi"
8+
9+
/ {
10+
model = "Theobroma Systems Cobra with ltk050h3148w Display";
11+
compatible = "tsd,px30-cobra-ltk050h3148w", "tsd,px30-cobra", "rockchip,px30";
12+
};
13+
14+
&dsi {
15+
status = "okay";
16+
17+
panel@0 {
18+
compatible = "leadtek,ltk050h3148w";
19+
reg = <0>;
20+
backlight = <&backlight>;
21+
iovcc-supply = <&vcc_1v8>;
22+
pinctrl-names = "default";
23+
pinctrl-0 = <&dsp_rst>;
24+
reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
25+
vci-supply = <&vcc_2v8>;
26+
27+
port {
28+
mipi_in_panel: endpoint {
29+
remote-endpoint = <&mipi_out_panel>;
30+
};
31+
};
32+
};
33+
};
34+
35+
&dsi_out {
36+
mipi_out_panel: endpoint {
37+
remote-endpoint = <&mipi_in_panel>;
38+
};
39+
};

‎arch/arm64/boot/dts/rockchip/px30-cobra-ltk500hd1829.dts

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2+
/*
3+
* Copyright (c) 2025 Cherry Embedded Solutions GmbH
4+
*/
5+
6+
/dts-v1/;
7+
#include "px30-cobra.dtsi"
8+
9+
/ {
10+
model = "Theobroma Systems Cobra prototype with LTK500HD1829 Display";
11+
compatible = "tsd,px30-cobra-ltk500hd1829", "tsd,px30-cobra", "rockchip,px30";
12+
13+
aliases {
14+
mmc1 = &sdmmc;
15+
};
16+
};
17+
18+
&dsi {
19+
status = "okay";
20+
21+
panel@0 {
22+
compatible = "leadtek,ltk500hd1829";
23+
reg = <0>;
24+
backlight = <&backlight>;
25+
iovcc-supply = <&vcc_1v8>;
26+
pinctrl-names = "default";
27+
pinctrl-0 = <&dsp_rst>;
28+
reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
29+
vcc-supply = <&vcc_2v8>;
30+
31+
port {
32+
mipi_in_panel: endpoint {
33+
remote-endpoint = <&mipi_out_panel>;
34+
};
35+
};
36+
};
37+
};
38+
39+
&dsi_out {
40+
mipi_out_panel: endpoint {
41+
remote-endpoint = <&mipi_in_panel>;
42+
};
43+
};
44+
45+
&pinctrl {
46+
pinctrl-names = "default";
47+
pinctrl-0 = <&cobra_pin_hog>, <&cobra_proto_hog>;
48+
49+
hog {
50+
cobra_proto_hog: cobra-proto-hog {
51+
rockchip,pins =
52+
/* STUSB4500 open drain outout POWER_OK2, needs pull-up */
53+
<3 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>,
54+
/* STUSB4500 open drain outout POWER_OK3, needs pull-up */
55+
<3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>;
56+
};
57+
};
58+
};
59+
60+
&sdmmc {
61+
bus-width = <4>;
62+
broken-cd;
63+
cap-sd-highspeed;
64+
pinctrl-names = "default";
65+
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>;
66+
sd-uhs-sdr12;
67+
sd-uhs-sdr25;
68+
sd-uhs-sdr50;
69+
sd-uhs-sdr104;
70+
vmmc-supply = <&vccio_sd>;
71+
vqmmc-supply = <&vccio_sd>;
72+
status = "okay";
73+
};

0 commit comments

Comments
 (0)