diff options
| author | Klaus Goger | 2018-02-19 09:18:53 +0100 |
|---|---|---|
| committer | Heiko Stuebner | 2018-02-19 09:23:52 +0100 |
| commit | 139eabece9a66cb6ae694369cfa4c64badbf994a (patch) | |
| tree | 4aaa6f97745cfbac60907eca7ca1511d3a15a52f /arch/arm64/boot/dts/rockchip | |
| parent | arm64: dts: rockchip: vdd_log on rk3399-sapphire is not an i2c slave (diff) | |
| download | kernel-qcow2-linux-139eabece9a66cb6ae694369cfa4c64badbf994a.tar.gz kernel-qcow2-linux-139eabece9a66cb6ae694369cfa4c64badbf994a.tar.xz kernel-qcow2-linux-139eabece9a66cb6ae694369cfa4c64badbf994a.zip | |
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>
Diffstat (limited to 'arch/arm64/boot/dts/rockchip')
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 8 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts index 9a7486058455..8fd0d7ba1dc9 100644 --- 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 ce15a57a5b85..fc913e2d962f 100644 --- 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>; |