summaryrefslogtreecommitdiffstats
path: root/arch/arm64
diff options
context:
space:
mode:
authorVicente Bergas <vicencb@gmail.com>2020-12-01 16:41:31 +0100
committerHeiko Stuebner <heiko@sntech.de>2020-12-04 11:23:52 +0100
commiteff57d38b546b3a50588e447a41ff3571a407c9f (patch)
tree7eed7deeae875b217fb37ca27d7b8593a490e5f0 /arch/arm64
parentarm64: dts: rockchip: fix supplies on rk3399-rock-pi-4 (diff)
downloadlinux-eff57d38b546b3a50588e447a41ff3571a407c9f.tar.xz
linux-eff57d38b546b3a50588e447a41ff3571a407c9f.zip
arm64: dts: rockchip: fix I2S conflict on rk3399-rock-pi-4
Based on the board schematics at https://dl.radxa.com/rockpi4/docs/hw/rockpi4/rockpi_4c_v12_sch_20200620.pdf on page 14: Only two channels of I2S are connected and the extra I2S pins are in conflict with other functions like USB power. Signed-off-by: Vicente Bergas <vicencb@gmail.com> Link: https://lore.kernel.org/r/20201201154132.1286-3-vicencb@gmail.com Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Diffstat (limited to 'arch/arm64')
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
index 06df2397bbb4..63b029a543c1 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
@@ -432,8 +432,9 @@
};
&i2s0 {
- rockchip,playback-channels = <8>;
- rockchip,capture-channels = <8>;
+ pinctrl-0 = <&i2s0_2ch_bus>;
+ rockchip,capture-channels = <2>;
+ rockchip,playback-channels = <2>;
status = "okay";
};