Skip to content

Commit 5391c5d

Browse files
committed
Merge tag 'v6.13-rockchip-dtsfixes1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes
Fixed card-detect on one board and some missing properties added. * tag 'v6.13-rockchip-dtsfixes1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: add hevc power domain clock to rk3328 arm64: dts: rockchip: Fix the SD card detection on NanoPi R6C/R6S arm64: dts: rockchip: rename rfkill label for Radxa ROCK 5B arm64: dts: rockchip: add reset-names for combphy on rk3568 Link: https://lore.kernel.org/r/2914560.yaVYbkx8dN@diego Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 155c5bf + 3699f2c commit 5391c5d

File tree

5 files changed

+6
-1
lines changed

5 files changed

+6
-1
lines changed

arch/arm64/boot/dts/rockchip/rk3328.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,7 @@
333333

334334
power-domain@RK3328_PD_HEVC {
335335
reg = <RK3328_PD_HEVC>;
336+
clocks = <&cru SCLK_VENC_CORE>;
336337
#power-domain-cells = <0>;
337338
};
338339
power-domain@RK3328_PD_VIDEO {

arch/arm64/boot/dts/rockchip/rk3568.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,7 @@
350350
assigned-clocks = <&pmucru CLK_PCIEPHY0_REF>;
351351
assigned-clock-rates = <100000000>;
352352
resets = <&cru SRST_PIPEPHY0>;
353+
reset-names = "phy";
353354
rockchip,pipe-grf = <&pipegrf>;
354355
rockchip,pipe-phy-grf = <&pipe_phy_grf0>;
355356
#phy-cells = <1>;

arch/arm64/boot/dts/rockchip/rk356x-base.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1681,6 +1681,7 @@
16811681
assigned-clocks = <&pmucru CLK_PCIEPHY1_REF>;
16821682
assigned-clock-rates = <100000000>;
16831683
resets = <&cru SRST_PIPEPHY1>;
1684+
reset-names = "phy";
16841685
rockchip,pipe-grf = <&pipegrf>;
16851686
rockchip,pipe-phy-grf = <&pipe_phy_grf1>;
16861687
#phy-cells = <1>;
@@ -1697,6 +1698,7 @@
16971698
assigned-clocks = <&pmucru CLK_PCIEPHY2_REF>;
16981699
assigned-clock-rates = <100000000>;
16991700
resets = <&cru SRST_PIPEPHY2>;
1701+
reset-names = "phy";
17001702
rockchip,pipe-grf = <&pipegrf>;
17011703
rockchip,pipe-phy-grf = <&pipe_phy_grf2>;
17021704
#phy-cells = <1>;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272

7373
rfkill {
7474
compatible = "rfkill-gpio";
75-
label = "rfkill-pcie-wlan";
75+
label = "rfkill-m2-wlan";
7676
radio-type = "wlan";
7777
shutdown-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
7878
};

arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,7 @@
434434
&sdmmc {
435435
bus-width = <4>;
436436
cap-sd-highspeed;
437+
cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
437438
disable-wp;
438439
max-frequency = <150000000>;
439440
no-mmc;

0 commit comments

Comments
 (0)