ASoC: samsung: Fix DTS breakage from missing dependencies
Revert "ARM: dts: Change i2s compatible string on exynos5250" (c7f7e6) and "ARM: dts: exynos5250: move common i2s properties to exynos5 dtsi" 618728) since they reference DMA controller nodes that don't exist causing DT build issues. Reported-by: Olof Johansson <olof@lixom.net> Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Родитель
64efc5a0f2
Коммит
a0b5f81e71
|
@ -108,25 +108,4 @@
|
||||||
interrupts = <0 42 0>;
|
interrupts = <0 42 0>;
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
i2s0: i2s@03830000 {
|
|
||||||
reg = <0x03830000 0x100>;
|
|
||||||
samsung,idma-addr = <0x03000000>;
|
|
||||||
};
|
|
||||||
|
|
||||||
i2s1: i2s@12D60000 {
|
|
||||||
compatible = "samsung,s3c6410-i2s";
|
|
||||||
reg = <0x12D60000 0x100>;
|
|
||||||
dmas = <&pdma1 12
|
|
||||||
&pdma1 11>;
|
|
||||||
dma-names = "tx", "rx";
|
|
||||||
};
|
|
||||||
|
|
||||||
i2s2: i2s@12D70000 {
|
|
||||||
compatible = "samsung,s3c6410-i2s";
|
|
||||||
reg = <0x12D70000 0x100>;
|
|
||||||
dmas = <&pdma0 12
|
|
||||||
&pdma0 11>;
|
|
||||||
dma-names = "tx", "rx";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -405,7 +405,8 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
i2s0: i2s@03830000 {
|
i2s0: i2s@03830000 {
|
||||||
compatible = "samsung,s5pv210-i2s";
|
compatible = "samsung,i2s-v5";
|
||||||
|
reg = <0x03830000 0x100>;
|
||||||
dmas = <&pdma0 10
|
dmas = <&pdma0 10
|
||||||
&pdma0 9
|
&pdma0 9
|
||||||
&pdma0 8>;
|
&pdma0 8>;
|
||||||
|
@ -414,11 +415,20 @@
|
||||||
<&clock_audss EXYNOS_I2S_BUS>,
|
<&clock_audss EXYNOS_I2S_BUS>,
|
||||||
<&clock_audss EXYNOS_SCLK_I2S>;
|
<&clock_audss EXYNOS_SCLK_I2S>;
|
||||||
clock-names = "iis", "i2s_opclk0", "i2s_opclk1";
|
clock-names = "iis", "i2s_opclk0", "i2s_opclk1";
|
||||||
|
samsung,supports-6ch;
|
||||||
|
samsung,supports-rstclr;
|
||||||
|
samsung,supports-secdai;
|
||||||
|
samsung,idma-addr = <0x03000000>;
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&i2s0_bus>;
|
pinctrl-0 = <&i2s0_bus>;
|
||||||
};
|
};
|
||||||
|
|
||||||
i2s1: i2s@12D60000 {
|
i2s1: i2s@12D60000 {
|
||||||
|
compatible = "samsung,i2s-v5";
|
||||||
|
reg = <0x12D60000 0x100>;
|
||||||
|
dmas = <&pdma1 12
|
||||||
|
&pdma1 11>;
|
||||||
|
dma-names = "tx", "rx";
|
||||||
clocks = <&clock 307>, <&clock 157>;
|
clocks = <&clock 307>, <&clock 157>;
|
||||||
clock-names = "iis", "i2s_opclk0";
|
clock-names = "iis", "i2s_opclk0";
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
|
@ -426,6 +436,11 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
i2s2: i2s@12D70000 {
|
i2s2: i2s@12D70000 {
|
||||||
|
compatible = "samsung,i2s-v5";
|
||||||
|
reg = <0x12D70000 0x100>;
|
||||||
|
dmas = <&pdma0 12
|
||||||
|
&pdma0 11>;
|
||||||
|
dma-names = "tx", "rx";
|
||||||
clocks = <&clock 308>, <&clock 158>;
|
clocks = <&clock 308>, <&clock 158>;
|
||||||
clock-names = "iis", "i2s_opclk0";
|
clock-names = "iis", "i2s_opclk0";
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
|
|
Загрузка…
Ссылка в новой задаче