Skip to content

Commit d0b5886

Browse files
committed
Merge tag 'v6.5-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt
New boards are - Indiedroid Nova (rk3588) - Add Edgeble Neural Compute Module 6B (rk3588) - FriendlyARM NanoPi R2C Plus (rk3328) - Anbernic RG353PS (rk3566) - Lunzn Fastrhino R66S / R68S (rk3568) The rk3588 got a lot of attention and gained support for the GIC ITS (needed an errata from Rockchip), timers, otp memory, saradc and sdio. The rk356x got support for its RGA block With all the core improvements to rk3588 support, the Rock5b got a lot improvements from that too, namely support for its PMIC, sd-card and saradc, as well as a clock-rate fix for its es8316 codec. Similarly the rk3588-evb1 also got support for its PMIC. The Anberic RGxx3 series got a better bluetooth compatible and updates to its LEDs to make them use the PWM blocks they're connected to. * tag 'v6.5-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (29 commits) arm64: dts: rockchip: Add saradc node to rock5b arm64: dts: rockchip: Fix compatible for Bluetooth on rk3566-anbernic arm64: dts: rockchip: Add SD card support to rock-5b arm64: dts: rockchip: add PMIC to rock-5b arm64: dts: rockchip: Assign ES8316 MCLK rate on rk3588-rock-5b arm64: dts: rockchip: Add Indiedroid Nova board dt-bindings: arm: rockchip: Add Indiedroid Nova dt-bindings: vendor-prefixes: add Indiedroid arm64: dts: rockchip: Add sdio node to rk3588 arm64: dts: rockchip: add default pinctrl for rk3588 emmc arm64: dts: rockchip: Add DT node for ADC support in RK3588 arm64: dts: rockchip: add PMIC to rk3588-evb1 arm64: dts: rockchip: Add rk3588 Edgeble Neu6 Model B IO arm64: dts: rockchip: Add rk3588 Edgeble Neu6 Model B SoM arm64: dts: rockchip: Add Rockchip RK3588J dt-bindings: arm: rockchip: Add Edgeble Neural Compute Module 6B arm64: dts: rockchip: Add RGA2 support to rk356x media: dt-bindings: media: rockchip-rga: add rockchip,rk3568-rga arm64: dts: rockchip: Add rk3588 OTP node arm64: dts: rockchip: Add FriendlyARM NanoPi R2C Plus ... Link: https://lore.kernel.org/r/3239799.44csPzL39Z@phil Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 6db9253 + a68e1ae commit d0b5886

18 files changed

Lines changed: 2789 additions & 19 deletions

Documentation/devicetree/bindings/arm/rockchip.yaml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ properties:
4040
- const: anbernic,rg353p
4141
- const: rockchip,rk3566
4242

43+
- description: Anbernic RG353PS
44+
items:
45+
- const: anbernic,rg353ps
46+
- const: rockchip,rk3566
47+
4348
- description: Anbernic RG353V
4449
items:
4550
- const: anbernic,rg353v
@@ -102,6 +107,12 @@ properties:
102107
- const: edgeble,neural-compute-module-6a # Edgeble Neural Compute Module 6A SoM
103108
- const: rockchip,rk3588
104109

110+
- description: Edgeble Neural Compute Module 6(Neu6) Model B SoM based boards
111+
items:
112+
- const: edgeble,neural-compute-module-6b-io # Edgeble Neural Compute Module 6B IO Board
113+
- const: edgeble,neural-compute-module-6b # Edgeble Neural Compute Module 6B SoM
114+
- const: rockchip,rk3588
115+
105116
- description: Elgin RV1108 R1
106117
items:
107118
- const: elgin,rv1108-r1
@@ -189,6 +200,7 @@ properties:
189200
items:
190201
- enum:
191202
- friendlyarm,nanopi-r2c
203+
- friendlyarm,nanopi-r2c-plus
192204
- friendlyarm,nanopi-r2s
193205
- const: rockchip,rk3328
194206

@@ -534,6 +546,11 @@ properties:
534546
- const: hugsun,x99
535547
- const: rockchip,rk3399
536548

549+
- description: Indiedroid Nova SBC
550+
items:
551+
- const: indiedroid,nova
552+
- const: rockchip,rk3588s
553+
537554
- description: Khadas Edge series boards
538555
items:
539556
- enum:
@@ -562,6 +579,13 @@ properties:
562579
- const: leez,p710
563580
- const: rockchip,rk3399
564581

582+
- description: Lunzn FastRhino R66S / R68S
583+
items:
584+
- enum:
585+
- lunzn,fastrhino-r66s
586+
- lunzn,fastrhino-r68s
587+
- const: rockchip,rk3568
588+
565589
- description: mqmaker MiQi
566590
items:
567591
- const: mqmaker,miqi

Documentation/devicetree/bindings/media/rockchip-rga.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ properties:
2121
- const: rockchip,rk3288-rga
2222
- const: rockchip,rk3399-rga
2323
- items:
24-
- const: rockchip,rk3228-rga
24+
- enum:
25+
- rockchip,rk3228-rga
26+
- rockchip,rk3568-rga
2527
- const: rockchip,rk3288-rga
2628

2729
reg:

Documentation/devicetree/bindings/vendor-prefixes.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -619,6 +619,8 @@ patternProperties:
619619
description: Integrated Micro-Electronics Inc.
620620
"^incircuit,.*":
621621
description: In-Circuit GmbH
622+
"^indiedroid,.*":
623+
description: Indiedroid
622624
"^inet-tek,.*":
623625
description: Shenzhen iNet Mobile Internet Technology Co., Ltd
624626
"^infineon,.*":
@@ -783,6 +785,8 @@ patternProperties:
783785
description: Nanjing Loongmasses Ltd.
784786
"^lsi,.*":
785787
description: LSI Corp. (LSI Logic)
788+
"^lunzn,.*":
789+
description: Shenzhen Lunzn Technology Co., Ltd.
786790
"^lwn,.*":
787791
description: Liebherr-Werk Nenzing GmbH
788792
"^lxa,.*":

arch/arm64/boot/dts/rockchip/Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go3.dtb
1515
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb
1616
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb
1717
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2c.dtb
18+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2c-plus.dtb
1819
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb
1920
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus.dtb
2021
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus-lts.dtb
@@ -69,6 +70,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb
6970
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb
7071
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb
7172
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg353p.dtb
73+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg353ps.dtb
7274
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg353v.dtb
7375
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg353vs.dtb
7476
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg503.dtb
@@ -85,14 +87,18 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-box-demo.dtb
8587
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-lubancat-1.dtb
8688
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-bpi-r2-pro.dtb
8789
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb
90+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-fastrhino-r66s.dtb
91+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-fastrhino-r68s.dtb
8892
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-lubancat-2.dtb
8993
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nanopi-r5c.dtb
9094
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nanopi-r5s.dtb
9195
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-odroid-m1.dtb
9296
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-radxa-e25.dtb
9397
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-rock-3a.dtb
9498
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-edgeble-neu6a-io.dtb
99+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-edgeble-neu6b-io.dtb
95100
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-evb1-v10.dtb
96101
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b.dtb
102+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-indiedroid-nova.dtb
97103
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-khadas-edge2.dtb
98104
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-rock-5a.dtb
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
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) 2023 Tianling Shen <cnsztl@gmail.com>
7+
*/
8+
9+
/dts-v1/;
10+
#include "rk3328-nanopi-r2c.dts"
11+
12+
/ {
13+
model = "FriendlyElec NanoPi R2C Plus";
14+
compatible = "friendlyarm,nanopi-r2c-plus", "rockchip,rk3328";
15+
16+
aliases {
17+
mmc1 = &emmc;
18+
};
19+
};
20+
21+
&emmc {
22+
bus-width = <8>;
23+
cap-mmc-highspeed;
24+
max-frequency = <150000000>;
25+
mmc-ddr-1_8v;
26+
mmc-hs200-1_8v;
27+
non-removable;
28+
pinctrl-names = "default";
29+
pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
30+
vmmc-supply = <&vcc_io_33>;
31+
vqmmc-supply = <&vcc18_emmc>;
32+
status = "okay";
33+
};
Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2+
3+
/dts-v1/;
4+
5+
#include <dt-bindings/gpio/gpio.h>
6+
#include <dt-bindings/input/linux-event-codes.h>
7+
#include <dt-bindings/pinctrl/rockchip.h>
8+
#include "rk3566-anbernic-rg353x.dtsi"
9+
10+
/ {
11+
model = "RG353PS";
12+
compatible = "anbernic,rg353ps", "rockchip,rk3566";
13+
14+
aliases {
15+
mmc0 = &sdmmc0;
16+
mmc1 = &sdmmc1;
17+
mmc2 = &sdmmc2;
18+
};
19+
20+
battery: battery {
21+
compatible = "simple-battery";
22+
charge-full-design-microamp-hours = <3472000>;
23+
charge-term-current-microamp = <300000>;
24+
constant-charge-current-max-microamp = <2000000>;
25+
constant-charge-voltage-max-microvolt = <4200000>;
26+
factory-internal-resistance-micro-ohms = <117000>;
27+
voltage-max-design-microvolt = <4172000>;
28+
voltage-min-design-microvolt = <3400000>;
29+
30+
ocv-capacity-celsius = <20>;
31+
ocv-capacity-table-0 = <4172000 100>, <4054000 95>, <3984000 90>, <3926000 85>,
32+
<3874000 80>, <3826000 75>, <3783000 70>, <3746000 65>,
33+
<3714000 60>, <3683000 55>, <3650000 50>, <3628000 45>,
34+
<3612000 40>, <3600000 35>, <3587000 30>, <3571000 25>,
35+
<3552000 20>, <3525000 15>, <3492000 10>, <3446000 5>,
36+
<3400000 0>;
37+
};
38+
39+
/* Channels reversed for both headphones and speakers. */
40+
sound {
41+
compatible = "simple-audio-card";
42+
simple-audio-card,name = "rk817_ext";
43+
simple-audio-card,aux-devs = <&spk_amp>;
44+
simple-audio-card,format = "i2s";
45+
simple-audio-card,hp-det-gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>;
46+
simple-audio-card,mclk-fs = <256>;
47+
simple-audio-card,widgets =
48+
"Microphone", "Mic Jack",
49+
"Headphone", "Headphones",
50+
"Speaker", "Internal Speakers";
51+
simple-audio-card,routing =
52+
"MICL", "Mic Jack",
53+
"Headphones", "HPOL",
54+
"Headphones", "HPOR",
55+
"Internal Speakers", "Speaker Amp OUTL",
56+
"Internal Speakers", "Speaker Amp OUTR",
57+
"Speaker Amp INL", "HPOL",
58+
"Speaker Amp INR", "HPOR";
59+
simple-audio-card,pin-switches = "Internal Speakers";
60+
61+
simple-audio-card,codec {
62+
sound-dai = <&rk817>;
63+
};
64+
65+
simple-audio-card,cpu {
66+
sound-dai = <&i2s1_8ch>;
67+
};
68+
};
69+
70+
spk_amp: audio-amplifier {
71+
compatible = "simple-audio-amplifier";
72+
enable-gpios = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;
73+
pinctrl-0 = <&spk_amp_enable_h>;
74+
pinctrl-names = "default";
75+
sound-name-prefix = "Speaker Amp";
76+
};
77+
};
78+
79+
&gpio_keys_control {
80+
button-r1 {
81+
gpios = <&gpio3 RK_PB4 GPIO_ACTIVE_LOW>;
82+
label = "TR";
83+
linux,code = <BTN_TR>;
84+
};
85+
86+
button-r2 {
87+
gpios = <&gpio3 RK_PB3 GPIO_ACTIVE_LOW>;
88+
label = "TR2";
89+
linux,code = <BTN_TR2>;
90+
};
91+
};
92+
93+
&panel {
94+
compatible = "anbernic,rg353v-panel-v2";
95+
iovcc-supply = <&vcc3v3_lcd0_n>;
96+
vcc-supply = <&vcc3v3_lcd0_n>;
97+
/delete-property/ vdd-supply;
98+
};
99+
100+
&pinctrl {
101+
audio-amplifier {
102+
spk_amp_enable_h: spk-amp-enable-h {
103+
rockchip,pins =
104+
<4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
105+
};
106+
};
107+
};
108+
109+
&rk817 {
110+
rk817_charger: charger {
111+
monitored-battery = <&battery>;
112+
rockchip,resistor-sense-micro-ohms = <10000>;
113+
rockchip,sleep-enter-current-microamp = <300000>;
114+
rockchip,sleep-filter-current-microamp = <100000>;
115+
};
116+
};

arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -191,30 +191,30 @@
191191
};
192192
};
193193

194-
leds: gpio-leds {
195-
compatible = "gpio-leds";
196-
pinctrl-0 = <&led_pins>;
197-
pinctrl-names = "default";
194+
leds: pwm-leds {
195+
compatible = "pwm-leds";
198196

199197
green_led: led-0 {
200198
color = <LED_COLOR_ID_GREEN>;
201199
default-state = "on";
202200
function = LED_FUNCTION_POWER;
203-
gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
201+
max-brightness = <255>;
202+
pwms = <&pwm6 0 25000 0>;
204203
};
205204

206205
amber_led: led-1 {
207206
color = <LED_COLOR_ID_AMBER>;
208207
function = LED_FUNCTION_CHARGING;
209-
gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>;
210-
retain-state-suspended;
208+
max-brightness = <255>;
209+
pwms = <&pwm7 0 25000 0>;
211210
};
212211

213212
red_led: led-2 {
214213
color = <LED_COLOR_ID_RED>;
215214
default-state = "off";
216215
function = LED_FUNCTION_STATUS;
217-
gpios = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>;
216+
max-brightness = <255>;
217+
pwms = <&pwm0 0 25000 0>;
218218
};
219219
};
220220

@@ -597,15 +597,6 @@
597597
};
598598
};
599599

600-
gpio-led {
601-
led_pins: led-pins {
602-
rockchip,pins =
603-
<0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>,
604-
<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>,
605-
<0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
606-
};
607-
};
608-
609600
joy-mux {
610601
joy_mux_en: joy-mux-en {
611602
rockchip,pins =
@@ -654,10 +645,24 @@
654645
vccio7-supply = <&vcc_3v3>;
655646
};
656647

648+
&pwm0 {
649+
pinctrl-0 = <&pwm0m1_pins>;
650+
pinctrl-names = "default";
651+
status = "okay";
652+
};
653+
657654
&pwm5 {
658655
status = "okay";
659656
};
660657

658+
&pwm6 {
659+
status = "okay";
660+
};
661+
662+
&pwm7 {
663+
status = "okay";
664+
};
665+
661666
&saradc {
662667
vref-supply = <&vcc_1v8>;
663668
status = "okay";
@@ -716,7 +721,7 @@
716721
status = "okay";
717722

718723
bluetooth {
719-
compatible = "realtek,rtl8821cs-bt", "realtek,rtl8822cs-bt";
724+
compatible = "realtek,rtl8821cs-bt", "realtek,rtl8723bs-bt";
720725
device-wake-gpios = <&gpio4 4 GPIO_ACTIVE_HIGH>;
721726
enable-gpios = <&gpio4 3 GPIO_ACTIVE_HIGH>;
722727
host-wake-gpios = <&gpio4 5 GPIO_ACTIVE_HIGH>;
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
2+
3+
#include "rk3568-fastrhino-r66s.dtsi"
4+
5+
/ {
6+
model = "Lunzn FastRhino R66S";
7+
compatible = "lunzn,fastrhino-r66s", "rockchip,rk3568";
8+
9+
aliases {
10+
mmc0 = &sdmmc0;
11+
};
12+
};
13+
14+
&sdmmc0 {
15+
bus-width = <4>;
16+
cap-mmc-highspeed;
17+
cap-sd-highspeed;
18+
disable-wp;
19+
max-frequency = <150000000>;
20+
no-sdio;
21+
no-mmc;
22+
pinctrl-names = "default";
23+
pinctrl-0 = <&sdmmc0_bus4 &sdmmc0_clk &sdmmc0_cmd &sdmmc0_det>;
24+
vmmc-supply = <&vcc3v3_sd>;
25+
vqmmc-supply = <&vccio_sd>;
26+
status = "okay";
27+
};

0 commit comments

Comments
 (0)