mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm64: dts: rockchip: rk3568: Move property '#sound-dai-cells" into dtsi

Browse Source 
Change-Id: Ia4a24f5730c8e985e7ec59d5f9174a7ce3d0e2f8
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
This commit is contained in:
Sugar Zhang
2020-11-17 10:54:39 +08:00
parent 68f8b78c75
commit 1b8e5ce927
5 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi
View File

@@ -46,7 +46,6 @@
&dig_acodec {
status = "disabled";
#sound-dai-cells = <0>;
rockchip,pwm-output-mode;
pinctrl-names = "default";
pinctrl-0 = <&audiopwmoutdiff_pins>;
@@ -147,7 +146,6 @@
&i2s3_2ch {
status = "disabled";
#sound-dai-cells = <0>;
rockchip,clk-trcm = <2>;
};

3
arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi
View File

@@ -51,12 +51,10 @@
&i2s1_8ch {
status = "disabled";
#sound-dai-cells = <0>;
};
&i2s3_2ch {
status = "okay";
#sound-dai-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&i2s3sclkm1
&i2s3lrckm1
@@ -69,7 +67,6 @@
};
&rk809_codec {
#sound-dai-cells = <0>;
compatible = "rockchip,rk809-codec", "rockchip,rk817-codec";
clocks = <&cru I2S3_MCLKOUT_TX>;
clock-names = "mclk";

2
arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts
View File

@@ -732,12 +732,10 @@
&i2s0_8ch {
status = "okay";
#sound-dai-cells = <0>;
};
&i2s1_8ch {
status = "okay";
#sound-dai-cells = <0>;
rockchip,clk-trcm = <1>;
pinctrl-names = "default";
pinctrl-0 = <&i2s1sclktxm0

8
arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
View File

@@ -1330,12 +1330,10 @@
&i2s0_8ch {
status = "okay";
#sound-dai-cells = <0>;
};
&i2s1_8ch {
status = "okay";
#sound-dai-cells = <0>;
rockchip,clk-trcm = <1>;
pinctrl-names = "default";
pinctrl-0 = <&i2s1sclktxm0
@@ -1368,10 +1366,6 @@
status = "okay";
};
&pdm {
#sound-dai-cells = <0>;
};
&pinctrl {
mxc6655xa {
@@ -1525,7 +1519,6 @@
&spdif_8ch {
status = "okay";
#sound-dai-cells = <0>;
};
&tsadc {
@@ -1600,7 +1593,6 @@
rockchip,buffer-time-ms = <128>;
rockchip,det-channel = <0>;
rockchip,mode = <0>;
#sound-dai-cells = <0>;
};
&vdpu {

9
arch/arm64/boot/dts/rockchip/rk3568.dtsi
View File

@@ -1874,6 +1874,7 @@
rockchip,cru = <&cru>;
rockchip,grf = <&grf>;
rockchip,playback-only;
#sound-dai-cells = <0>;
status = "disabled";
};
@@ -1889,6 +1890,7 @@
reset-names = "tx-m", "rx-m";
rockchip,cru = <&cru>;
rockchip,grf = <&grf>;
#sound-dai-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&i2s1sclktxm0
&i2s1sclkrxm0
@@ -1916,6 +1918,7 @@
rockchip,cru = <&cru>;
rockchip,grf = <&grf>;
rockchip,clk-trcm = <1>;
#sound-dai-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&i2s2sclktxm0
&i2s2lrcktxm0
@@ -1936,6 +1939,7 @@
reset-names = "tx-m", "rx-m";
rockchip,cru = <&cru>;
rockchip,grf = <&grf>;
#sound-dai-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&i2s3sclkm0
&i2s3lrckm0
@@ -1951,6 +1955,7 @@
clock-names = "pdm_clk", "pdm_hclk";
dmas = <&dmac1 9>;
dma-names = "rx";
#sound-dai-cells = <0>;
status = "disabled";
};
@@ -1964,6 +1969,7 @@
rockchip,audio-src = <0>;
rockchip,det-channel = <0>;
rockchip,mode = <0>;
#sound-dai-cells = <0>;
status = "disabled";
};
@@ -1975,6 +1981,7 @@
dma-names = "tx";
clock-names = "mclk", "hclk";
clocks = <&cru MCLK_SPDIF_8CH>, <&cru HCLK_SPDIF_8CH>;
#sound-dai-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&spdifm0_pins>;
status = "disabled";
@@ -1987,6 +1994,7 @@
clock-names = "clk", "hclk";
dmas = <&dmac1 8>;
dma-names = "tx";
#sound-dai-cells = <0>;
rockchip,sample-width-bits = <11>;
rockchip,interpolat-points = <1>;
status = "disabled";
@@ -2003,6 +2011,7 @@
resets = <&cru SRST_ACDCDIG>;
reset-names = "reset" ;
rockchip,grf = <&grf>;
#sound-dai-cells = <0>;
status = "disabled";
};