Skip to content

Commit d823bf8

Browse files
committed
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: Arnd Bergmann <[email protected]>
2 parents e3c68ab + aef4b9a commit d823bf8

File tree

5 files changed

+4
-4
lines changed

5 files changed

+4
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
regulator-max-microvolt = <3300000>;
9898
regulator-always-on;
9999
regulator-boot-on;
100-
vim-supply = <&vcc_io>;
100+
vin-supply = <&vcc_io>;
101101
};
102102

103103
vdd_core: vdd-core {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,6 @@
705705
&sdhci {
706706
bus-width = <8>;
707707
mmc-hs400-1_8v;
708-
mmc-hs400-enhanced-strobe;
709708
non-removable;
710709
status = "okay";
711710
};

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@
276276
clock-output-names = "xin32k", "rk808-clkout2";
277277
pinctrl-names = "default";
278278
pinctrl-0 = <&pmic_int_l>;
279+
rockchip,system-power-controller;
279280
vcc1-supply = <&vcc5v0_sys>;
280281
vcc2-supply = <&vcc5v0_sys>;
281282
vcc3-supply = <&vcc5v0_sys>;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
regulator-boot-on;
5656
regulator-min-microvolt = <3300000>;
5757
regulator-max-microvolt = <3300000>;
58-
vim-supply = <&vcc3v3_sys>;
58+
vin-supply = <&vcc3v3_sys>;
5959
};
6060

6161
vcc3v3_sys: vcc3v3-sys {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@
502502
status = "okay";
503503

504504
bt656-supply = <&vcc_3v0>;
505-
audio-supply = <&vcc_3v0>;
505+
audio-supply = <&vcc1v8_codec>;
506506
sdmmc-supply = <&vcc_sdio>;
507507
gpio1830-supply = <&vcc_3v0>;
508508
};

0 commit comments

Comments
 (0)