Skip to content

Commit 460df79

Browse files
arndbarndb
committed
Merge tag 'v6.4-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt
On the Rock5b a fix the newly added rtc node and cpu-regulators for the big cluster. Volume-keys (via adc) for the Pinephone Pro, display support for the Anbernic RG353. As well as gpio-ranges for rk356x and fixes for the audio-codec node-names on two boards. * tag 'v6.4-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: Add support for volume keys to rk3399-pinephone-pro arm64: dts: rockchip: Add vdd_cpu_big regulators to rk3588-rock-5b arm64: dts: rockchip: Use generic name for es8316 on Pinebook Pro and Rock 5B arm64: dts: rockchip: Drop RTC clock-frequency on rk3588-rock-5b arm64: dts: rockchip: Add pinctrl gpio-ranges for rk356x arm64: dts: rockchip: add panel to Anbernic RG353 series Link: https://lore.kernel.org/r/5144826.MHq7AAxBmi@phil Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 9476d41 + d3150ed commit 460df79

5 files changed

Lines changed: 147 additions & 3 deletions

File tree

‎arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@
675675
i2c-scl-rising-time-ns = <168>;
676676
status = "okay";
677677

678-
es8316: es8316@11 {
678+
es8316: audio-codec@11 {
679679
compatible = "everest,es8316";
680680
reg = <0x11>;
681681
clocks = <&cru SCLK_I2S_8CH_OUT>;

‎arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
/dts-v1/;
13+
#include <dt-bindings/input/gpio-keys.h>
1314
#include <dt-bindings/input/linux-event-codes.h>
1415
#include "rk3399.dtsi"
1516
#include "rk3399-opp.dtsi"
@@ -29,6 +30,26 @@
2930
stdout-path = "serial2:115200n8";
3031
};
3132

33+
adc-keys {
34+
compatible = "adc-keys";
35+
io-channels = <&saradc 1>;
36+
io-channel-names = "buttons";
37+
keyup-threshold-microvolt = <1600000>;
38+
poll-interval = <100>;
39+
40+
button-up {
41+
label = "Volume Up";
42+
linux,code = <KEY_VOLUMEUP>;
43+
press-threshold-microvolt = <100000>;
44+
};
45+
46+
button-down {
47+
label = "Volume Down";
48+
linux,code = <KEY_VOLUMEDOWN>;
49+
press-threshold-microvolt = <600000>;
50+
};
51+
};
52+
3253
backlight: backlight {
3354
compatible = "pwm-backlight";
3455
pwms = <&pwm0 0 50000 0>;
@@ -519,6 +540,11 @@
519540
status = "okay";
520541
};
521542

543+
&saradc {
544+
vref-supply = <&vcca1v8_s3>;
545+
status = "okay";
546+
};
547+
522548
&sdmmc {
523549
bus-width = <4>;
524550
cap-sd-highspeed;

‎arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353x.dtsi‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,48 @@
2020
assigned-clock-rates = <1200000000>, <200000000>, <241500000>;
2121
};
2222

23+
&dsi_dphy0 {
24+
status = "okay";
25+
};
26+
27+
&dsi0 {
28+
status = "okay";
29+
#address-cells = <1>;
30+
#size-cells = <0>;
31+
32+
ports {
33+
dsi0_in: port@0 {
34+
reg = <0>;
35+
dsi0_in_vp1: endpoint {
36+
remote-endpoint = <&vp1_out_dsi0>;
37+
};
38+
};
39+
40+
dsi0_out: port@1 {
41+
reg = <1>;
42+
mipi_out_panel: endpoint {
43+
remote-endpoint = <&mipi_in_panel>;
44+
};
45+
};
46+
};
47+
48+
panel: panel@0 {
49+
compatible = "anbernic,rg353p-panel", "newvision,nv3051d";
50+
reg = <0>;
51+
backlight = <&backlight>;
52+
pinctrl-names = "default";
53+
pinctrl-0 = <&lcd_rst>;
54+
reset-gpios = <&gpio4 RK_PA0 GPIO_ACTIVE_LOW>;
55+
vdd-supply = <&vcc3v3_lcd0_n>;
56+
57+
port {
58+
mipi_in_panel: endpoint {
59+
remote-endpoint = <&mipi_out_panel>;
60+
};
61+
};
62+
};
63+
};
64+
2365
&gpio_keys_control {
2466
button-a {
2567
gpios = <&gpio3 RK_PC2 GPIO_ACTIVE_LOW>;
@@ -55,6 +97,22 @@
5597
};
5698
};
5799

100+
&pinctrl {
101+
gpio-lcd {
102+
lcd_rst: lcd-rst {
103+
rockchip,pins =
104+
<4 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
105+
};
106+
};
107+
};
108+
58109
&pwm4 {
59110
status = "okay";
60111
};
112+
113+
&vp1 {
114+
vp1_out_dsi0: endpoint@ROCKCHIP_VOP2_EP_MIPI0 {
115+
reg = <ROCKCHIP_VOP2_EP_MIPI0>;
116+
remote-endpoint = <&dsi0_in_vp1>;
117+
};
118+
};

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1808,6 +1808,7 @@
18081808
interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
18091809
clocks = <&pmucru PCLK_GPIO0>, <&pmucru DBCLK_GPIO0>;
18101810
gpio-controller;
1811+
gpio-ranges = <&pinctrl 0 0 32>;
18111812
#gpio-cells = <2>;
18121813
interrupt-controller;
18131814
#interrupt-cells = <2>;
@@ -1819,6 +1820,7 @@
18191820
interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
18201821
clocks = <&cru PCLK_GPIO1>, <&cru DBCLK_GPIO1>;
18211822
gpio-controller;
1823+
gpio-ranges = <&pinctrl 0 32 32>;
18221824
#gpio-cells = <2>;
18231825
interrupt-controller;
18241826
#interrupt-cells = <2>;
@@ -1830,6 +1832,7 @@
18301832
interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
18311833
clocks = <&cru PCLK_GPIO2>, <&cru DBCLK_GPIO2>;
18321834
gpio-controller;
1835+
gpio-ranges = <&pinctrl 0 64 32>;
18331836
#gpio-cells = <2>;
18341837
interrupt-controller;
18351838
#interrupt-cells = <2>;
@@ -1841,6 +1844,7 @@
18411844
interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
18421845
clocks = <&cru PCLK_GPIO3>, <&cru DBCLK_GPIO3>;
18431846
gpio-controller;
1847+
gpio-ranges = <&pinctrl 0 96 32>;
18441848
#gpio-cells = <2>;
18451849
interrupt-controller;
18461850
#interrupt-cells = <2>;
@@ -1852,6 +1856,7 @@
18521856
interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
18531857
clocks = <&cru PCLK_GPIO4>, <&cru DBCLK_GPIO4>;
18541858
gpio-controller;
1859+
gpio-ranges = <&pinctrl 0 128 32>;
18551860
#gpio-cells = <2>;
18561861
interrupt-controller;
18571862
#interrupt-cells = <2>;

‎arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts‎

Lines changed: 57 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,69 @@
5353
};
5454
};
5555

56+
&cpu_b0 {
57+
cpu-supply = <&vdd_cpu_big0_s0>;
58+
};
59+
60+
&cpu_b1 {
61+
cpu-supply = <&vdd_cpu_big0_s0>;
62+
};
63+
64+
&cpu_b2 {
65+
cpu-supply = <&vdd_cpu_big1_s0>;
66+
};
67+
68+
&cpu_b3 {
69+
cpu-supply = <&vdd_cpu_big1_s0>;
70+
};
71+
72+
&i2c0 {
73+
pinctrl-names = "default";
74+
pinctrl-0 = <&i2c0m2_xfer>;
75+
status = "okay";
76+
77+
vdd_cpu_big0_s0: regulator@42 {
78+
compatible = "rockchip,rk8602";
79+
reg = <0x42>;
80+
fcs,suspend-voltage-selector = <1>;
81+
regulator-name = "vdd_cpu_big0_s0";
82+
regulator-always-on;
83+
regulator-boot-on;
84+
regulator-min-microvolt = <550000>;
85+
regulator-max-microvolt = <1050000>;
86+
regulator-ramp-delay = <2300>;
87+
vin-supply = <&vcc5v0_sys>;
88+
89+
regulator-state-mem {
90+
regulator-off-in-suspend;
91+
};
92+
};
93+
94+
vdd_cpu_big1_s0: regulator@43 {
95+
compatible = "rockchip,rk8603", "rockchip,rk8602";
96+
reg = <0x43>;
97+
fcs,suspend-voltage-selector = <1>;
98+
regulator-name = "vdd_cpu_big1_s0";
99+
regulator-always-on;
100+
regulator-boot-on;
101+
regulator-min-microvolt = <550000>;
102+
regulator-max-microvolt = <1050000>;
103+
regulator-ramp-delay = <2300>;
104+
vin-supply = <&vcc5v0_sys>;
105+
106+
regulator-state-mem {
107+
regulator-off-in-suspend;
108+
};
109+
};
110+
};
111+
56112
&i2c6 {
57113
status = "okay";
58114

59115
hym8563: rtc@51 {
60116
compatible = "haoyu,hym8563";
61117
reg = <0x51>;
62118
#clock-cells = <0>;
63-
clock-frequency = <32768>;
64119
clock-output-names = "hym8563";
65120
pinctrl-names = "default";
66121
pinctrl-0 = <&hym8563_int>;
@@ -73,7 +128,7 @@
73128
&i2c7 {
74129
status = "okay";
75130

76-
es8316: es8316@11 {
131+
es8316: audio-codec@11 {
77132
compatible = "everest,es8316";
78133
reg = <0x11>;
79134
clocks = <&cru I2S0_8CH_MCLKOUT>;

0 commit comments

Comments
 (0)