Commit 3635acef authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mark Brown

ARM: dts: Exynos4 and Odroid X2/U3 sound device nodes update

Clock related properties are added to the Exynos4 I2S device nodes
so they can be referred to as clock providers. Missing i2s_opclk1
clock is added to the I2S0 node and clock properties are added
to the MAX98090 codec node to allow it to control/read frequency
of the MCLK clock directly.
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6cf2cf31
...@@ -61,6 +61,8 @@ i2s0: i2s@03830000 { ...@@ -61,6 +61,8 @@ i2s0: i2s@03830000 {
reg = <0x03830000 0x100>; reg = <0x03830000 0x100>;
clocks = <&clock_audss EXYNOS_I2S_BUS>; clocks = <&clock_audss EXYNOS_I2S_BUS>;
clock-names = "iis"; clock-names = "iis";
#clock-cells = <1>;
clock-output-names = "i2s_cdclk0";
dmas = <&pdma0 12>, <&pdma0 11>, <&pdma0 10>; dmas = <&pdma0 12>, <&pdma0 11>, <&pdma0 10>;
dma-names = "tx", "rx", "tx-sec"; dma-names = "tx", "rx", "tx-sec";
samsung,idma-addr = <0x03000000>; samsung,idma-addr = <0x03000000>;
...@@ -372,6 +374,8 @@ i2s1: i2s@13960000 { ...@@ -372,6 +374,8 @@ i2s1: i2s@13960000 {
reg = <0x13960000 0x100>; reg = <0x13960000 0x100>;
clocks = <&clock CLK_I2S1>; clocks = <&clock CLK_I2S1>;
clock-names = "iis"; clock-names = "iis";
#clock-cells = <1>;
clock-output-names = "i2s_cdclk1";
dmas = <&pdma1 12>, <&pdma1 11>; dmas = <&pdma1 12>, <&pdma1 11>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
status = "disabled"; status = "disabled";
...@@ -382,6 +386,8 @@ i2s2: i2s@13970000 { ...@@ -382,6 +386,8 @@ i2s2: i2s@13970000 {
reg = <0x13970000 0x100>; reg = <0x13970000 0x100>;
clocks = <&clock CLK_I2S2>; clocks = <&clock CLK_I2S2>;
clock-names = "iis"; clock-names = "iis";
#clock-cells = <1>;
clock-output-names = "i2s_cdclk2";
dmas = <&pdma0 14>, <&pdma0 13>; dmas = <&pdma0 14>, <&pdma0 13>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
status = "disabled"; status = "disabled";
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include <dt-bindings/sound/samsung-i2s.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include "exynos4412.dtsi" #include "exynos4412.dtsi"
...@@ -37,8 +38,9 @@ i2s0: i2s@03830000 { ...@@ -37,8 +38,9 @@ i2s0: i2s@03830000 {
pinctrl-names = "default"; pinctrl-names = "default";
status = "okay"; status = "okay";
clocks = <&clock_audss EXYNOS_I2S_BUS>, clocks = <&clock_audss EXYNOS_I2S_BUS>,
<&clock_audss EXYNOS_DOUT_AUD_BUS>; <&clock_audss EXYNOS_DOUT_AUD_BUS>,
clock-names = "iis", "i2s_opclk0"; <&clock_audss EXYNOS_SCLK_I2S>;
clock-names = "iis", "i2s_opclk0", "i2s_opclk1";
}; };
sound: sound { sound: sound {
...@@ -373,6 +375,8 @@ max98090: max98090@10 { ...@@ -373,6 +375,8 @@ max98090: max98090@10 {
reg = <0x10>; reg = <0x10>;
interrupt-parent = <&gpx0>; interrupt-parent = <&gpx0>;
interrupts = <0 0>; interrupts = <0 0>;
clocks = <&i2s0 CLK_I2S_CDCLK>;
clock-names = "mclk";
}; };
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment