Unverified Commit 5391c5d8 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v6.13-rockchip-dtsfixes1' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 155c5bf2 3699f2c4

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

+1 −0
Original line number Diff line number Diff line
@@ -333,6 +333,7 @@ power: power-controller { 


			power-domain@RK3328_PD_HEVC {

				reg = <RK3328_PD_HEVC>;

				clocks = <&cru SCLK_VENC_CORE>;

				#power-domain-cells = <0>;

			};

			power-domain@RK3328_PD_VIDEO {

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

+1 −0
Original line number Diff line number Diff line
@@ -350,6 +350,7 @@ combphy0: phy@fe820000 { 
		assigned-clocks = <&pmucru CLK_PCIEPHY0_REF>;

		assigned-clock-rates = <100000000>;

		resets = <&cru SRST_PIPEPHY0>;

		reset-names = "phy";

		rockchip,pipe-grf = <&pipegrf>;

		rockchip,pipe-phy-grf = <&pipe_phy_grf0>;

		#phy-cells = <1>;

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

+2 −0
Original line number Diff line number Diff line
@@ -1681,6 +1681,7 @@ combphy1: phy@fe830000 { 
		assigned-clocks = <&pmucru CLK_PCIEPHY1_REF>;

		assigned-clock-rates = <100000000>;

		resets = <&cru SRST_PIPEPHY1>;

		reset-names = "phy";

		rockchip,pipe-grf = <&pipegrf>;

		rockchip,pipe-phy-grf = <&pipe_phy_grf1>;

		#phy-cells = <1>;
@@ -1697,6 +1698,7 @@ combphy2: phy@fe840000 { 
		assigned-clocks = <&pmucru CLK_PCIEPHY2_REF>;

		assigned-clock-rates = <100000000>;

		resets = <&cru SRST_PIPEPHY2>;

		reset-names = "phy";

		rockchip,pipe-grf = <&pipegrf>;

		rockchip,pipe-phy-grf = <&pipe_phy_grf2>;

		#phy-cells = <1>;

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

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ fan: pwm-fan { 


	rfkill {

		compatible = "rfkill-gpio";

		label = "rfkill-pcie-wlan";

		label = "rfkill-m2-wlan";

		radio-type = "wlan";

		shutdown-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;

	};

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

+1 −0
Original line number Diff line number Diff line
@@ -434,6 +434,7 @@ &sdhci { 
&sdmmc {

	bus-width = <4>;

	cap-sd-highspeed;

	cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;

	disable-wp;

	max-frequency = <150000000>;

	no-mmc;