Skip to content

Commit 4395055

Browse files
arndbarndb
committed
Merge tag 'v6.3-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes
Lower sd card speeds for two boards to make them run more reliable, missing 32k clock definition for Anbric xx3 devices, missing cache-levels for rk3588, fixed rk3326-board display supplies and more dt-schema fixes. * tag 'v6.3-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: correct panel supplies on some rk3326 boards arm64: dts: rockchip: use just "port" in panel on RockPro64 arm64: dts: rockchip: use just "port" in panel on Pinebook Pro arm64: dts: rockchip: Remove non-existing pwm-delay-us property arm64: dts: rockchip: Add clk_rtc_32k to Anbernic xx3 Devices arm64: dts: rockchip: add rk3588 cache level information arm64: dts: rockchip: Lower SD card speed on rk3399 Pinebook Pro arm64: dts: rockchip: Lower sd speed on rk3566-soquartz ARM: dts: rockchip: fix a typo error for rk3288 spdif node arm64: dts: rockchip: Fix rk3399 GICv3 ITS node name Link: https://lore.kernel.org/r/10559306.CDJkKcVGEf@phil Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 4323516 + 60a655d commit 4395055

15 files changed

Lines changed: 33 additions & 35 deletions

‎arch/arm/boot/dts/rk3288.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -942,7 +942,7 @@
942942
status = "disabled";
943943
};
944944

945-
spdif: sound@ff88b0000 {
945+
spdif: sound@ff8b0000 {
946946
compatible = "rockchip,rk3288-spdif", "rockchip,rk3066-spdif";
947947
reg = <0x0 0xff8b0000 0x0 0x10000>;
948948
#sound-dai-cells = <0>;

‎arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351m.dts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
&internal_display {
2626
compatible = "elida,kd35t133";
27+
iovcc-supply = <&vcc_lcd>;
28+
vdd-supply = <&vcc_lcd>;
2729
};
2830

2931
&pwm0 {

‎arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,8 @@
235235
internal_display: panel@0 {
236236
reg = <0>;
237237
backlight = <&backlight>;
238-
iovcc-supply = <&vcc_lcd>;
239238
reset-gpios = <&gpio3 RK_PC0 GPIO_ACTIVE_LOW>;
240239
rotation = <270>;
241-
vdd-supply = <&vcc_lcd>;
242240

243241
port {
244242
mipi_in_panel: endpoint {

‎arch/arm64/boot/dts/rockchip/rk3326-odroid-go2-v11.dts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@
8383

8484
&internal_display {
8585
compatible = "elida,kd35t133";
86+
iovcc-supply = <&vcc_lcd>;
87+
vdd-supply = <&vcc_lcd>;
8688
};
8789

8890
&rk817 {

‎arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@
5959

6060
&internal_display {
6161
compatible = "elida,kd35t133";
62+
iovcc-supply = <&vcc_lcd>;
63+
vdd-supply = <&vcc_lcd>;
6264
};
6365

6466
&rk817_charger {

‎arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
pinctrl-names = "default";
6262
pinctrl-0 = <&bl_en>;
6363
pwms = <&pwm0 0 1000000 PWM_POLARITY_INVERTED>;
64-
pwm-delay-us = <10000>;
6564
};
6665

6766
emmc_pwrseq: emmc-pwrseq {

‎arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@
198198
power-supply = <&pp3300_disp>;
199199
pinctrl-names = "default";
200200
pinctrl-0 = <&bl_en>;
201-
pwm-delay-us = <10000>;
202201
};
203202

204203
gpio_keys: gpio-keys {

‎arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@
167167
pinctrl-names = "default";
168168
pinctrl-0 = <&bl_en>;
169169
pwms = <&pwm1 0 1000000 0>;
170-
pwm-delay-us = <10000>;
171170
};
172171

173172
dmic: dmic {

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

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,9 @@
5050
pinctrl-0 = <&panel_en_pin>;
5151
power-supply = <&vcc3v3_panel>;
5252

53-
ports {
54-
#address-cells = <1>;
55-
#size-cells = <0>;
56-
57-
port@0 {
58-
reg = <0>;
59-
#address-cells = <1>;
60-
#size-cells = <0>;
61-
62-
panel_in_edp: endpoint@0 {
63-
reg = <0>;
64-
remote-endpoint = <&edp_out_panel>;
65-
};
53+
port {
54+
panel_in_edp: endpoint {
55+
remote-endpoint = <&edp_out_panel>;
6656
};
6757
};
6858
};
@@ -943,7 +933,7 @@
943933
disable-wp;
944934
pinctrl-names = "default";
945935
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>;
946-
sd-uhs-sdr104;
936+
sd-uhs-sdr50;
947937
vmmc-supply = <&vcc3v0_sd>;
948938
vqmmc-supply = <&vcc_sdio>;
949939
status = "okay";

‎arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -647,16 +647,10 @@
647647
avdd-supply = <&avdd>;
648648
backlight = <&backlight>;
649649
dvdd-supply = <&vcc3v3_s0>;
650-
ports {
651-
#address-cells = <1>;
652-
#size-cells = <0>;
653650

654-
port@0 {
655-
reg = <0>;
656-
657-
mipi_in_panel: endpoint {
658-
remote-endpoint = <&mipi_out_panel>;
659-
};
651+
port {
652+
mipi_in_panel: endpoint {
653+
remote-endpoint = <&mipi_out_panel>;
660654
};
661655
};
662656
};

0 commit comments

Comments
 (0)