Browse Source

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>
Klaus Goger 7 years ago
parent
commit
139eabece9

+ 0 - 8
arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts

@@ -117,14 +117,6 @@
 	clock-frequency = <400000>;
 	clock-frequency = <400000>;
 };
 };
 
 
-&i2s0 {
-	status = "okay";
-	rockchip,playback-channels = <8>;
-	rockchip,capture-channels = <8>;
-	#sound-dai-cells = <0>;
-	status = "okay";
-};
-
 &pcie_phy {
 &pcie_phy {
 	status = "okay";
 	status = "okay";
 };
 };

+ 8 - 0
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 {
 &io_domains {
 	status = "okay";
 	status = "okay";
 	bt656-supply = <&vcc_1v8>;
 	bt656-supply = <&vcc_1v8>;