Skip to content

Commit b74638b

Browse files
arndbarndb
committed
Merge tag 'v6.9-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt
Initial support for the rk3568 Qnap TS433 NAS, the rk3588-based Tiger SoM from Theobroma-Systems and the rk3588-based Toybrick TB-RK3588X. Some fixes to conform to dt-bindings for i2s (rk3588, rk356x) and rk356x video-decoder (missing interrupt-names). Correcting the vendor in the compatible for OrangePi RK3399 and BananaPi R2 Pro (discussed with DT-maintainers beforehand of course). The VO1-GRF syscon needs its clock to work, and that clock also needed to be actually exported forst, so we're sharing a branch with the Rockchip clock-tree (that already got merged into the main clock-tree for 6.9) for this small shared code. And as another step on the long road to graphics output on rk3588, 6.9 will get the hdmi-phy via the phy-tree, so here the dts node is added. * tag 'v6.9-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: Fix name for UART pin header on qnap-ts433 arm64: dts: rockchip: Add basic support for QNAP TS-433 dt-bindings: arm: rockchip: Add QNAP TS-433 arm64: dts: rockchip: add Haikou baseboard with RK3588-Q7 SoM arm64: dts: rockchip: add RK3588-Q7 (Tiger) SoM dt-bindings: arm: rockchip: Add Theobroma-Systems RK3588 Q7 with baseboard arm64: dts: rockchip: drop rockchip,trcm-sync-tx-only from rk3588 i2s arm64: dts: rockchip: fix reset-names for rk356x i2s2 controller arm64: dts: rockchip: add missing interrupt-names for rk356x vdpu arm64: dts: rockchip: add clock to vo1-grf syscon on rk3588 dt-bindings: arm: rockchip: Add Toybrick TB-RK3588X arm64: dts: rockchip: Add devicetree support for TB-RK3588X board arm64: dts: rockchip: adjust vendor on orangepi rk3399 board arm64: dts: rockchip: adjust vendor on Banana Pi R2 Pro board dt-bindings: arm: rockchip: Correct vendor for Banana Pi R2 Pro dt-bindings: arm: rockchip: Correct vendor for Orange Pi RK3399 board arm64: dts: rockchip: Add HDMI0 PHY to rk3588 dt-bindings: clock: rk3588: add missing PCLK_VO1GRF dt-bindings: clock: rk3588: drop CLK_NR_CLKS clk: rockchip: rk3588: fix CLK_NR_CLKS usage Link: https://lore.kernel.org/r/3695004.ElGaqSPkdT@phil Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents f9c59f2 + c5a48ff commit b74638b

14 files changed

Lines changed: 1803 additions & 12 deletions

File tree

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

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -620,9 +620,9 @@ properties:
620620
- const: openailab,eaidk-610
621621
- const: rockchip,rk3399
622622

623-
- description: Orange Pi RK3399 board
623+
- description: Xunlong Orange Pi RK3399 board
624624
items:
625-
- const: rockchip,rk3399-orangepi
625+
- const: xunlong,rk3399-orangepi
626626
- const: rockchip,rk3399
627627

628628
- description: Phytec phyCORE-RK3288 Rapid Development Kit
@@ -700,6 +700,11 @@ properties:
700700
- powkiddy,x55
701701
- const: rockchip,rk3566
702702

703+
- description: QNAP TS-433-4G 4-Bay NAS
704+
items:
705+
- const: qnap,ts433
706+
- const: rockchip,rk3568
707+
703708
- description: Radxa Compute Module 3(CM3)
704709
items:
705710
- enum:
@@ -881,6 +886,11 @@ properties:
881886
- const: rockchip,rv1108-evb
882887
- const: rockchip,rv1108
883888

889+
- description: Rockchip Toybrick TB-RK3588X board
890+
items:
891+
- const: rockchip,rk3588-toybrick-x0
892+
- const: rockchip,rk3588
893+
884894
- description: Theobroma Systems PX30-uQ7 with Haikou baseboard
885895
items:
886896
- const: tsd,px30-ringneck-haikou
@@ -901,6 +911,12 @@ properties:
901911
- const: tsd,rk3588-jaguar
902912
- const: rockchip,rk3588
903913

914+
- description: Theobroma Systems RK3588-Q7 with Haikou baseboard
915+
items:
916+
- const: tsd,rk3588-tiger-haikou
917+
- const: tsd,rk3588-tiger
918+
- const: rockchip,rk3588
919+
904920
- description: Tronsmart Orion R68 Meta
905921
items:
906922
- const: tronsmart,orion-r68-meta
@@ -943,9 +959,9 @@ properties:
943959
- const: rockchip,rk3568-evb1-v10
944960
- const: rockchip,rk3568
945961

946-
- description: Rockchip RK3568 Banana Pi R2 Pro
962+
- description: Sinovoip RK3568 Banana Pi R2 Pro
947963
items:
948-
- const: rockchip,rk3568-bpi-r2pro
964+
- const: sinovoip,rk3568-bpi-r2pro
949965
- const: rockchip,rk3568
950966

951967
- description: Sonoff iHost Smart Home Hub

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-lubancat-2.dtb
103103
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nanopi-r5c.dtb
104104
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nanopi-r5s.dtb
105105
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-odroid-m1.dtb
106+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-qnap-ts433.dtb
106107
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-radxa-e25.dtb
107108
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-roc-pc.dtb
108109
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-rock-3a.dtb
@@ -116,6 +117,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nanopc-t6.dtb
116117
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-orangepi-5-plus.dtb
117118
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-quartzpro64.dtb
118119
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b.dtb
120+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-tiger-haikou.dtb
121+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-toybrick-x0.dtb
119122
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-turing-rk1.dtb
120123
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-coolpi-4b.dtb
121124
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-indiedroid-nova.dtb

‎arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
/ {
1616
model = "Orange Pi RK3399 Board";
17-
compatible = "rockchip,rk3399-orangepi", "rockchip,rk3399";
17+
compatible = "xunlong,rk3399-orangepi", "rockchip,rk3399";
1818

1919
aliases {
2020
ethernet0 = &gmac;

‎arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
/ {
1515
model = "Bananapi-R2 Pro (RK3568) DDR4 Board";
16-
compatible = "rockchip,rk3568-bpi-r2pro", "rockchip,rk3568";
16+
compatible = "sinovoip,rk3568-bpi-r2pro", "rockchip,rk3568";
1717

1818
aliases {
1919
ethernet0 = &gmac0;

‎arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2+
/*
3+
* Copyright (c) 2021 Rockchip Electronics Co., Ltd.
4+
* Copyright (c) 2024 Uwe Kleine-König
5+
*/
6+
7+
/dts-v1/;
8+
9+
#include <dt-bindings/gpio/gpio.h>
10+
#include "rk3568.dtsi"
11+
12+
/ {
13+
model = "Qnap TS-433-4G NAS System 4-Bay";
14+
compatible = "qnap,ts433", "rockchip,rk3568";
15+
};
16+
17+
&gmac0 {
18+
assigned-clocks = <&cru SCLK_GMAC0_RX_TX>, <&cru SCLK_GMAC0>;
19+
assigned-clock-parents = <&cru SCLK_GMAC0_RGMII_SPEED>, <&cru CLK_MAC0_2TOP>;
20+
assigned-clock-rates = <0>, <125000000>;
21+
clock_in_out = "output";
22+
phy-handle = <&rgmii_phy0>;
23+
phy-mode = "rgmii";
24+
pinctrl-names = "default";
25+
pinctrl-0 = <&gmac0_miim
26+
&gmac0_tx_bus2
27+
&gmac0_rx_bus2
28+
&gmac0_rgmii_clk
29+
&gmac0_rgmii_bus>;
30+
rx_delay = <0x2f>;
31+
tx_delay = <0x3c>;
32+
status = "okay";
33+
};
34+
35+
&i2c0 {
36+
pmic@20 {
37+
compatible = "rockchip,rk809";
38+
reg = <0x20>;
39+
interrupt-parent = <&gpio0>;
40+
interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
41+
};
42+
};
43+
44+
&i2c1 {
45+
status = "okay";
46+
47+
rtc@51 {
48+
compatible = "microcrystal,rv8263";
49+
reg = <0x51>;
50+
wakeup-source;
51+
};
52+
};
53+
54+
&mdio0 {
55+
rgmii_phy0: ethernet-phy@0 {
56+
compatible = "ethernet-phy-ieee802.3-c22";
57+
reg = <0x0>;
58+
};
59+
};
60+
61+
&pcie30phy {
62+
status = "okay";
63+
};
64+
65+
&pcie3x1 {
66+
/* The downstream dts has: rockchip,bifurcation, XXX: find out what this is about */
67+
reset-gpios = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>;
68+
status = "okay";
69+
};
70+
71+
&sdhci {
72+
bus-width = <8>;
73+
max-frequency = <200000000>;
74+
non-removable;
75+
status = "okay";
76+
};
77+
78+
/*
79+
* Pins available on CN3 connector at TTL voltage level (3V3).
80+
* ,_ _.
81+
* |1234| 1=TX 2=VCC
82+
* `----' 3=RX 4=GND
83+
*/
84+
&uart2 {
85+
status = "okay";
86+
};

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -597,6 +597,7 @@
597597
compatible = "rockchip,rk3568-vpu";
598598
reg = <0x0 0xfdea0000 0x0 0x800>;
599599
interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>;
600+
interrupt-names = "vdpu";
600601
clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;
601602
clock-names = "aclk", "hclk";
602603
iommus = <&vdpu_mmu>;
@@ -1123,7 +1124,7 @@
11231124
dmas = <&dmac1 4>, <&dmac1 5>;
11241125
dma-names = "tx", "rx";
11251126
resets = <&cru SRST_M_I2S2_2CH>;
1126-
reset-names = "m";
1127+
reset-names = "tx-m";
11271128
rockchip,grf = <&grf>;
11281129
pinctrl-names = "default";
11291130
pinctrl-0 = <&i2s2m0_sclktx

0 commit comments

Comments
 (0)