Skip to content

Commit 70ea4e9

Browse files
arndbarndb
committed
Merge tag 'v6.7-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt
Work mostly focussed on the still new rk3588 Soc with some new boards the Orange Pi 5 and Orange Pi 5 Plus as well as the QuartzPro64 from Pine64. It also gained two new peripherals, the SFC (serial-flash-controller) as well as support for it's AV1 video decoder. And of course existing rk3588 boards got support added for various peripherals (PCIe, usb, sardadc, leds, etc). And in non-rk3588 news, rk3566-based gaming devices seem to be en-vogue, and the Powkiddy RGB30 also moved in. * tag 'v6.7-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (27 commits) arm64: dts: rockchip: add support for Powkiddy RGB30 dt-bindings: arm64: rockchip: add Powkiddy RGB30 arm64: dts: rockchip: add status LED to rock-5b arm64: dts: rockchip: add ADC buttons to rk3588-evb1 arm64: dts: rockchip: Add AV1 decoder node to rk3588s arm64: dts: rockchip: Add missing sdmmc2 SDR rates to rock-3a arm64: dts: rockchip: Enable UART6 on rock-5b arm64: dts: rockchip: Remove duplicate regulator vcc3v3_wf from rock-5b arm64: dts: rockchip: Add QuartzPro64 SBC device tree dt-bindings: arm: rockchip: Add Pine64 QuarzPro64 arm64: dts: rockchip: Add board device tree for rk3588-orangepi-5-plus dt-bindings: arm: rockchip: Add Orange Pi 5 Plus arm64: dts: rockchip: Add UART9 M0 pin definitions to rk3588s arm64: dts: rockchip: Add I2S2 M0 pin definitions to rk3588s arm64: dts: rockchip: Add Orange Pi 5 arm64: dts: rockchip: Add sfc node to rk3588s dt-bindings: arm: rockchip: Add Orange Pi 5 board arm64: dts: rockchip: Add NanoPC T6 PCIe e-key support arm64: dts: rockchip: Add sdio node to rock-5b arm64: dts: rockchip: add PCIe3 bus to rk3588-evb1 ... Link: https://lore.kernel.org/r/1870252.CQOukoFCf9@phil Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 79384a0 + 1e9ac3e commit 70ea4e9

13 files changed

Lines changed: 3288 additions & 0 deletions

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -660,6 +660,11 @@ properties:
660660
- pine64,quartz64-b
661661
- const: rockchip,rk3566
662662

663+
- description: Pine64 QuartzPro64
664+
items:
665+
- const: pine64,quartzpro64
666+
- const: rockchip,rk3588
667+
663668
- description: Pine64 SoQuartz SoM
664669
items:
665670
- enum:
@@ -669,6 +674,11 @@ properties:
669674
- const: pine64,soquartz
670675
- const: rockchip,rk3566
671676

677+
- description: Powkiddy RGB30
678+
items:
679+
- const: powkiddy,rgb30
680+
- const: rockchip,rk3566
681+
672682
- description: Radxa Compute Module 3(CM3)
673683
items:
674684
- enum:
@@ -870,13 +880,23 @@ properties:
870880
- const: tronsmart,orion-r68-meta
871881
- const: rockchip,rk3368
872882

883+
- description: Xunlong Orange Pi 5 Plus
884+
items:
885+
- const: xunlong,orangepi-5-plus
886+
- const: rockchip,rk3588
887+
873888
- description: Xunlong Orange Pi R1 Plus / LTS
874889
items:
875890
- enum:
876891
- xunlong,orangepi-r1-plus
877892
- xunlong,orangepi-r1-plus-lts
878893
- const: rockchip,rk3328
879894

895+
- description: Xunlong Orange Pi 5
896+
items:
897+
- const: xunlong,orangepi-5
898+
- const: rockchip,rk3588s
899+
880900
- description: Zkmagic A95X Z2
881901
items:
882902
- const: zkmagic,a95x-z2

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg353vs.dtb
7777
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg503.dtb
7878
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.1.dtb
7979
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.2.dtb
80+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-powkiddy-rgb30.dtb
8081
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb
8182
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-b.dtb
8283
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-radxa-cm3-io.dtb
@@ -101,7 +102,10 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-edgeble-neu6a-io.dtb
101102
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-edgeble-neu6b-io.dtb
102103
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-evb1-v10.dtb
103104
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nanopc-t6.dtb
105+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-orangepi-5-plus.dtb
106+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-quartzpro64.dtb
104107
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b.dtb
105108
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-indiedroid-nova.dtb
106109
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-khadas-edge2.dtb
107110
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-rock-5a.dtb
111+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-orangepi-5.dtb

‎arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rgb30.dts‎

Lines changed: 152 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
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 = "RGB30";
12+
compatible = "powkiddy,rgb30", "rockchip,rk3566";
13+
14+
aliases {
15+
mmc1 = &sdmmc0;
16+
mmc2 = &sdmmc1;
17+
mmc3 = &sdmmc2;
18+
};
19+
20+
battery: battery {
21+
compatible = "simple-battery";
22+
charge-full-design-microamp-hours = <3151000>;
23+
charge-term-current-microamp = <300000>;
24+
constant-charge-current-max-microamp = <2000000>;
25+
constant-charge-voltage-max-microvolt = <4250000>;
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>, <4092000 95>, <4035000 90>, <3990000 85>,
32+
<3939000 80>, <3895000 75>, <3852000 70>, <3807000 65>,
33+
<3762000 60>, <3713000 55>, <3672000 50>, <3647000 45>,
34+
<3629000 40>, <3613000 35>, <3598000 30>, <3578000 25>,
35+
<3550000 20>, <3519000 15>, <3479000 10>, <3438000 5>,
36+
<3400000 0>;
37+
};
38+
39+
/*
40+
* Channels reversed for speakers. Headphones automatically switch via hardware when
41+
* detected with no ability to control output in software. Headphones appear to be mono
42+
* (each output channel receives all audio). No microphone support on 3.5mm jack.
43+
*/
44+
sound {
45+
compatible = "simple-audio-card";
46+
simple-audio-card,name = "rk817_ext";
47+
simple-audio-card,format = "i2s";
48+
simple-audio-card,mclk-fs = <256>;
49+
simple-audio-card,widgets =
50+
"Headphone", "Headphones";
51+
simple-audio-card,routing =
52+
"Headphones", "HPOL",
53+
"Headphones", "HPOR";
54+
55+
simple-audio-card,codec {
56+
sound-dai = <&rk817>;
57+
};
58+
59+
simple-audio-card,cpu {
60+
sound-dai = <&i2s1_8ch>;
61+
};
62+
};
63+
};
64+
65+
/delete-node/ &adc_keys;
66+
67+
&cru {
68+
assigned-clocks = <&pmucru CLK_RTC_32K>, <&cru PLL_GPLL>,
69+
<&pmucru PLL_PPLL>, <&cru PLL_VPLL>;
70+
assigned-clock-rates = <32768>, <1200000000>,
71+
<200000000>, <108000000>;
72+
};
73+
74+
&gpio_keys_control {
75+
button-r1 {
76+
gpios = <&gpio3 RK_PB3 GPIO_ACTIVE_LOW>;
77+
label = "TR";
78+
linux,code = <BTN_TR>;
79+
};
80+
81+
button-r2 {
82+
gpios = <&gpio3 RK_PB4 GPIO_ACTIVE_LOW>;
83+
label = "TR2";
84+
linux,code = <BTN_TR2>;
85+
};
86+
};
87+
88+
/delete-node/ &{/i2c@fdd40000/regulator@40};
89+
90+
&i2c0 {
91+
vdd_cpu: regulator@1c {
92+
compatible = "tcs,tcs4525";
93+
reg = <0x1c>;
94+
fcs,suspend-voltage-selector = <1>;
95+
regulator-always-on;
96+
regulator-boot-on;
97+
regulator-min-microvolt = <712500>;
98+
regulator-max-microvolt = <1390000>;
99+
regulator-name = "vdd_cpu";
100+
regulator-ramp-delay = <2300>;
101+
vin-supply = <&vcc_sys>;
102+
regulator-state-mem {
103+
regulator-off-in-suspend;
104+
};
105+
};
106+
};
107+
108+
/*
109+
* Device has 2 red LEDs instead of an amber and a red. Relabel LEDs as
110+
* red_led0 and red_led1.
111+
*/
112+
/delete-node/ &{/pwm-leds/led-1};
113+
/delete-node/ &{/pwm-leds/led-2};
114+
115+
&leds {
116+
red_led0: led-1 {
117+
color = <LED_COLOR_ID_RED>;
118+
function = LED_FUNCTION_CHARGING;
119+
max-brightness = <255>;
120+
pwms = <&pwm7 0 25000 0>;
121+
};
122+
123+
red_led1: led-2 {
124+
color = <LED_COLOR_ID_RED>;
125+
default-state = "off";
126+
function = LED_FUNCTION_STATUS;
127+
max-brightness = <255>;
128+
pwms = <&pwm0 0 25000 0>;
129+
};
130+
};
131+
132+
&panel {
133+
compatible = "powkiddy,rgb30-panel";
134+
vcc-supply = <&vcc3v3_lcd0_n>;
135+
iovcc-supply = <&vcc3v3_lcd0_n>;
136+
/delete-property/ vdd-supply;
137+
};
138+
139+
&pwm5 {
140+
status = "disabled";
141+
};
142+
143+
&rk817 {
144+
rk817_charger: charger {
145+
monitored-battery = <&battery>;
146+
rockchip,resistor-sense-micro-ohms = <10000>;
147+
rockchip,sleep-enter-current-microamp = <300000>;
148+
rockchip,sleep-filter-current-microamp = <100000>;
149+
};
150+
};
151+
152+
/delete-node/ &vibrator;

‎arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
ethernet0 = &gmac1;
1616
mmc0 = &sdhci;
1717
mmc1 = &sdmmc0;
18+
mmc2 = &sdmmc2;
1819
};
1920

2021
chosen: chosen {
@@ -747,6 +748,9 @@
747748
non-removable;
748749
pinctrl-names = "default";
749750
pinctrl-0 = <&sdmmc2m0_bus4 &sdmmc2m0_cmd &sdmmc2m0_clk>;
751+
sd-uhs-sdr12;
752+
sd-uhs-sdr25;
753+
sd-uhs-sdr50;
750754
sd-uhs-sdr104;
751755
vmmc-supply = <&vcc3v3_sys>;
752756
vqmmc-supply = <&vcc_1v8>;

0 commit comments

Comments
 (0)