Unverified Commit d823bf89 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v5.16-rockchip-dtsfixes1' of... 

Merge tag 'v5.16-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes

Fixes for some board-level issues (regulators, mmc, poweroff, audio)

* tag 'v5.16-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: fix poweroff on helios64
  arm64: dts: rockchip: fix audio-supply for Rock Pi 4
  arm64: dts: rockchip: fix rk3399-leez-p710 vcc3v3-lan supply
  arm64: dts: rockchip: fix rk3308-roc-cc vcc-sd supply
  arm64: dts: rockchip: remove mmc-hs400-enhanced-strobe from rk3399-khadas-edge

Link: https://lore.kernel.org/r/3072346.MIvVl8DfR5@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents e3c68ab1 aef4b9a8

arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ 
		regulator-max-microvolt = <3300000>;

		regulator-always-on;

		regulator-boot-on;

		vim-supply = <&vcc_io>;

		vin-supply = <&vcc_io>;

	};



	vdd_core: vdd-core {

arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi

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

	bus-width = <8>;

	mmc-hs400-1_8v;

	mmc-hs400-enhanced-strobe;

	non-removable;

	status = "okay";

};

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

+1 −0
Original line number Diff line number Diff line
@@ -276,6 +276,7 @@ 
		clock-output-names = "xin32k", "rk808-clkout2";

		pinctrl-names = "default";

		pinctrl-0 = <&pmic_int_l>;

		rockchip,system-power-controller;

		vcc1-supply = <&vcc5v0_sys>;

		vcc2-supply = <&vcc5v0_sys>;

		vcc3-supply = <&vcc5v0_sys>;

arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
		regulator-boot-on;

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		vim-supply = <&vcc3v3_sys>;

		vin-supply = <&vcc3v3_sys>;

	};



	vcc3v3_sys: vcc3v3-sys {

arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ 
	status = "okay";



	bt656-supply = <&vcc_3v0>;

	audio-supply = <&vcc_3v0>;

	audio-supply = <&vcc1v8_codec>;

	sdmmc-supply = <&vcc_sdio>;

	gpio1830-supply = <&vcc_3v0>;

};