github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-24 23:22:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

arm64: dts: rockchip: generalize rk3399 #sound-dai-cells

Browse Source 
The soc spdif and i2s controllers always only have one compontent, so
always require #sound-dai-cells to be 0. Therefore there is no need to
duplicate this property in individual boards.

So move them to rk3399.dtsi.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
This commit is contained in:
Heiko Stuebner 2018-06-16 16:11:32 +02:00
parent cc9b091803
commit 4486baca66
5 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
View File

@ -492,19 +492,16 @@ accelerometer@68 {
&i2s0 {
rockchip,playback-channels = <8>;
rockchip,capture-channels = <8>;
#sound-dai-cells = <0>;
status = "okay";
};
&i2s1 {
rockchip,playback-channels = <2>;
rockchip,capture-channels = <2>;
#sound-dai-cells = <0>;
status = "okay";
};
&i2s2 {
#sound-dai-cells = <0>;
status = "okay";
};

1
arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
View File

@ -402,7 +402,6 @@ &i2s0 {
pinctrl-0 = <&i2s0_2ch_bus>;
rockchip,playback-channels = <2>;
rockchip,capture-channels = <2>;
#sound-dai-cells = <0>;
status = "okay";
};

2
arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
View File

@ -149,7 +149,6 @@ accelerometer@68 {
&i2s0 {
rockchip,playback-channels = <8>;
rockchip,capture-channels = <8>;
#sound-dai-cells = <0>;
status = "okay";
};
@ -198,6 +197,5 @@ &sdio0 {
&spdif {
i2c-scl-rising-time-ns = <450>;
i2c-scl-falling-time-ns = <15>;
#sound-dai-cells = <0>;
status = "okay";
};

1
arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
View File

@ -425,7 +425,6 @@ &i2c3 {
};
&i2s2 {
#sound-dai-cells = <0>;
status = "okay";
};

3
arch/arm64/boot/dts/rockchip/rk3399.dtsi
View File

@ -1483,6 +1483,7 @@ spdif: spdif@ff870000 {
pinctrl-names = "default";
pinctrl-0 = <&spdif_bus>;
power-domains = <&power RK3399_PD_SDIOAUDIO>;
#sound-dai-cells = <0>;
status = "disabled";
};
@ -1498,6 +1499,7 @@ i2s0: i2s@ff880000 {
pinctrl-names = "default";
pinctrl-0 = <&i2s0_8ch_bus>;
power-domains = <&power RK3399_PD_SDIOAUDIO>;
#sound-dai-cells = <0>;
status = "disabled";
};
@ -1512,6 +1514,7 @@ i2s1: i2s@ff890000 {
pinctrl-names = "default";
pinctrl-0 = <&i2s1_2ch_bus>;
power-domains = <&power RK3399_PD_SDIOAUDIO>;
#sound-dai-cells = <0>;
status = "disabled";
};