redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ARM: dts: s5pv210: remove dedicated 'audio-subsystem' node 

[ Upstream commit 6c17a2974a ]

The 'audio-subsystem' node is an artificial creation, not representing
real hardware.  The hardware is described by its nodes - AUDSS clock
controller and I2S0.

Remove the 'audio-subsystem' node along with its undocumented compatible
to fix dtbs_check warnings like:

  audio-subsystem: $nodename:0: 'audio-subsystem' does not match '^([a-z][a-z0-9\\-]+-bus|bus|soc|axi|ahb|apb)(@[0-9a-f]+)?$'

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Tested-by: Jonathan Bakker <xc-racer2@live.ca>
Link: https://lore.kernel.org/r/20200907161141.31034-9-krzk@kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
5.4-rM2-2.2.x-imx-squashed
Krzysztof Kozlowski 2020-09-07 18:11:24 +02:00 committed by Greg Kroah-Hartman
parent 3ad1464467
commit b71dbaf08f
1 changed files with 29 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
arch/arm/boot/dts/s5pv210.dtsi
View File

@ -211,43 +211,36 @@
status = "disabled"; status = "disabled";
}; };
audio-subsystem { clk_audss: clock-controller@eee10000 {
compatible = "samsung,s5pv210-audss", "simple-bus"; compatible = "samsung,s5pv210-audss-clock";
#address-cells = <1>; reg = <0xeee10000 0x1000>;
#size-cells = <1>; clock-names = "hclk", "xxti",
ranges; "fout_epll",
"sclk_audio0";
clocks = <&clocks DOUT_HCLKP>, <&xxti>,
<&clocks FOUT_EPLL>,
<&clocks SCLK_AUDIO0>;
#clock-cells = <1>;
};
clk_audss: clock-controller@eee10000 { i2s0: i2s@eee30000 {
compatible = "samsung,s5pv210-audss-clock"; compatible = "samsung,s5pv210-i2s";
reg = <0xeee10000 0x1000>; reg = <0xeee30000 0x1000>;
clock-names = "hclk", "xxti", interrupt-parent = <&vic2>;
"fout_epll", interrupts = <16>;
"sclk_audio0"; dma-names = "rx", "tx", "tx-sec";
clocks = <&clocks DOUT_HCLKP>, <&xxti>, dmas = <&pdma1 9>, <&pdma1 10>, <&pdma1 11>;
<&clocks FOUT_EPLL>, clock-names = "iis",
<&clocks SCLK_AUDIO0>; "i2s_opclk0",
#clock-cells = <1>; "i2s_opclk1";
}; clocks = <&clk_audss CLK_I2S>,
<&clk_audss CLK_I2S>,
i2s0: i2s@eee30000 { <&clk_audss CLK_DOUT_AUD_BUS>;
compatible = "samsung,s5pv210-i2s"; samsung,idma-addr = <0xc0010000>;
reg = <0xeee30000 0x1000>; pinctrl-names = "default";
interrupt-parent = <&vic2>; pinctrl-0 = <&i2s0_bus>;
interrupts = <16>; #sound-dai-cells = <0>;
dma-names = "rx", "tx", "tx-sec"; status = "disabled";
dmas = <&pdma1 9>, <&pdma1 10>, <&pdma1 11>;
clock-names = "iis",
"i2s_opclk0",
"i2s_opclk1";
clocks = <&clk_audss CLK_I2S>,
<&clk_audss CLK_I2S>,
<&clk_audss CLK_DOUT_AUD_BUS>;
samsung,idma-addr = <0xc0010000>;
pinctrl-names = "default";
pinctrl-0 = <&i2s0_bus>;
#sound-dai-cells = <0>;
status = "disabled";
};
}; };
i2s1: i2s@e2100000 { i2s1: i2s@e2100000 {