arm64: dts: rockchip: move i2s0 node from baseboard to SoM on rk3399-puma

The I2S definition is part of the SoM and therefore should be in
rk3399-puma.dtsi. Also correct the number of channels available.

Signed-off-by: Klaus Goger <klaus.goger@theobroma-systems.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts
index 9a7486058455fe3c4b39b1bf68cf5434ab444d0a..8fd0d7ba1dc9d1ca7fbc30e8533ed81b42c5de72 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts
@@ -117,14 +117,6 @@
        clock-frequency = <400000>;
 };
 
-&i2s0 {
-       status = "okay";
-       rockchip,playback-channels = <8>;
-       rockchip,capture-channels = <8>;
-       #sound-dai-cells = <0>;
-       status = "okay";
-};
-
 &pcie_phy {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
index ce15a57a5b856a4987dceaadde498335f37e026e..fc913e2d962f682bd5d4ac254e8e1ad3ccfa33cf 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
@@ -435,6 +435,14 @@
        };
 };
 
+&i2s0 {
+       pinctrl-0 = <&i2s0_2ch_bus>;
+       rockchip,playback-channels = <2>;
+       rockchip,capture-channels = <2>;
+       #sound-dai-cells = <0>;
+       status = "okay";
+};
+
 &io_domains {
        status = "okay";
        bt656-supply = <&vcc_1v8>;