Skip to content

Commit 4ead53b

Browse files
committed
Merge tag 'v6.19-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes
In terms of bigger fixes, RK3576 GPU register range was overflowing into the next peripheral, Nano Pi M5 sound was not working correctly, the adc-keys voltage levels for 2 buttons on the Pinephone Pro were wrong and a really wrong PCIe linkspeed was removed from helios64. Apart from that there are a number of dt-cleanlieness fixes. * tag 'v6.19-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: Drop unsupported properties arm64: dts: rockchip: Fix gpio pinctrl node names arm64: dts: rockchip: Fix pinctrl property typo on rk3326-odroid-go3 arm64: dts: rockchip: Drop "sitronix,st7789v" fallback compatible from rk3568-wolfvision arm64: dts: rockchip: Fix wrong register range of rk3576 gpu arm64: dts: rockchip: Configure MCLK for analog sound on NanoPi M5 arm64: dts: rockchip: Fix headphones widget name on NanoPi M5 arm64: dts: rockchip: remove redundant max-link-speed from nanopi-r4s arm64: dts: rockchip: remove dangerous max-link-speed from helios64 arm64: dts: rockchip: fix unit-address for RK3588 NPU's core1 and core2's IOMMU arm64: dts: rockchip: Fix wifi interrupts flag on Sakura Pi RK3308B arm64: dts: rockchip: Fix voltage threshold for volume keys for Pinephone Pro Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 1902e2e + 56e7cc8 commit 4ead53b

12 files changed

Lines changed: 20 additions & 20 deletions

arch/arm64/boot/dts/rockchip/rk3308-sakurapi-rk3308b.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@
199199
compatible = "brcm,bcm43455-fmac", "brcm,bcm4329-fmac";
200200
reg = <1>;
201201
interrupt-parent = <&gpio0>;
202-
interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
202+
interrupts = <RK_PA3 IRQ_TYPE_LEVEL_HIGH>;
203203
interrupt-names = "host-wake";
204204
pinctrl-names = "default";
205205
pinctrl-0 = <&wifi_host_wake>;

arch/arm64/boot/dts/rockchip/rk3326-odroid-go3.dts

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

1515
joystick_mux_controller: mux-controller {
1616
compatible = "gpio-mux";
17-
pinctrl = <&mux_en_pins>;
17+
pinctrl-0 = <&mux_en_pins>;
18+
pinctrl-names = "default";
1819
#mux-control-cells = <0>;
1920

2021
mux-gpios = <&gpio3 RK_PB3 GPIO_ACTIVE_LOW>,

arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,9 +424,7 @@
424424

425425
&pcie0 {
426426
ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;
427-
max-link-speed = <2>;
428427
num-lanes = <2>;
429-
pinctrl-names = "default";
430428
status = "okay";
431429

432430
vpcie12v-supply = <&vcc12v_dcin>;

arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
};
7272

7373
&pcie0 {
74-
max-link-speed = <1>;
7574
num-lanes = <1>;
7675
vpcie3v3-supply = <&vcc3v3_sys>;
7776
};

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -969,7 +969,6 @@
969969
};
970970

971971
&spi1 {
972-
max-freq = <10000000>;
973972
status = "okay";
974973

975974
spiflash: flash@0 {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@
4040
button-up {
4141
label = "Volume Up";
4242
linux,code = <KEY_VOLUMEUP>;
43-
press-threshold-microvolt = <100000>;
43+
press-threshold-microvolt = <2000>;
4444
};
4545

4646
button-down {
4747
label = "Volume Down";
4848
linux,code = <KEY_VOLUMEDOWN>;
49-
press-threshold-microvolt = <600000>;
49+
press-threshold-microvolt = <300000>;
5050
};
5151
};
5252

arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@
483483
pinctrl-names = "default";
484484
pinctrl-0 = <&q7_thermal_pin &bios_disable_override_hog_pin>;
485485

486-
gpios {
486+
gpio-pins {
487487
bios_disable_override_hog_pin: bios-disable-override-hog-pin {
488488
rockchip,pins =
489489
<3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>;

arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,11 +529,11 @@
529529
rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
530530
};
531531

532-
vsel1_gpio: vsel1-gpio {
532+
vsel1_gpio: vsel1-gpio-pin {
533533
rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
534534
};
535535

536-
vsel2_gpio: vsel2-gpio {
536+
vsel2_gpio: vsel2-gpio-pin {
537537
rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
538538
};
539539
};

arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-display-vz.dtso

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include "rk3568-wolfvision-pf5-display.dtsi"
1212

1313
&st7789 {
14-
compatible = "jasonic,jt240mhqs-hwt-ek-e3",
15-
"sitronix,st7789v";
14+
compatible = "jasonic,jt240mhqs-hwt-ek-e3";
1615
rotation = <270>;
1716
};

arch/arm64/boot/dts/rockchip/rk3576-nanopi-m5.dts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@
201201
pinctrl-names = "default";
202202
pinctrl-0 = <&hp_det_l>;
203203

204+
simple-audio-card,bitclock-master = <&masterdai>;
204205
simple-audio-card,format = "i2s";
205206
simple-audio-card,hp-det-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_LOW>;
206207
simple-audio-card,mclk-fs = <256>;
@@ -211,15 +212,16 @@
211212
"Headphones", "HPOR",
212213
"IN1P", "Microphone Jack";
213214
simple-audio-card,widgets =
214-
"Headphone", "Headphone Jack",
215+
"Headphone", "Headphones",
215216
"Microphone", "Microphone Jack";
216217

217218
simple-audio-card,codec {
218219
sound-dai = <&rt5616>;
219220
};
220221

221-
simple-audio-card,cpu {
222+
masterdai: simple-audio-card,cpu {
222223
sound-dai = <&sai2>;
224+
system-clock-frequency = <12288000>;
223225
};
224226
};
225227
};
@@ -727,10 +729,12 @@
727729
rt5616: audio-codec@1b {
728730
compatible = "realtek,rt5616";
729731
reg = <0x1b>;
730-
assigned-clocks = <&cru CLK_SAI2_MCLKOUT>;
732+
assigned-clocks = <&cru CLK_SAI2_MCLKOUT_TO_IO>;
731733
assigned-clock-rates = <12288000>;
732-
clocks = <&cru CLK_SAI2_MCLKOUT>;
734+
clocks = <&cru CLK_SAI2_MCLKOUT_TO_IO>;
733735
clock-names = "mclk";
736+
pinctrl-0 = <&sai2m0_mclk>;
737+
pinctrl-names = "default";
734738
#sound-dai-cells = <0>;
735739
};
736740
};

0 commit comments

Comments
 (0)