Skip to content

Commit

Permalink
ARM: dts: Disable Exynos5250 I2S controllers by default
Browse files Browse the repository at this point in the history
Rather than requiring each board to explicitly disable the I2S controllers
it is not using instead require boards to enable those that they are using.

This is required for audio operation on Arndale, one of the unused I2S
controllers is pinmuxed with the LDO enable GPIOs for the WM1811A.

Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
  • Loading branch information
Mark Brown authored and Kukjin Kim committed Oct 7, 2013
1 parent 8365f76 commit 328aee4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
4 changes: 4 additions & 0 deletions arch/arm/boot/dts/exynos5250-arndale.dts
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,10 @@
status = "disabled";
};

i2s0: i2s@03830000 {
status = "okay";
};

spi_0: spi@12d20000 {
status = "disabled";
};
Expand Down
8 changes: 0 additions & 8 deletions arch/arm/boot/dts/exynos5250-smdk5250.dts
Original file line number Diff line number Diff line change
Expand Up @@ -231,14 +231,6 @@
status = "okay";
};

i2s1: i2s@12D60000 {
status = "disabled";
};

i2s2: i2s@12D70000 {
status = "disabled";
};

sound {
compatible = "samsung,smdk-wm8994";

Expand Down
3 changes: 3 additions & 0 deletions arch/arm/boot/dts/exynos5250.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,7 @@

i2s0: i2s@03830000 {
compatible = "samsung,s5pv210-i2s";
status = "disabled";
reg = <0x03830000 0x100>;
dmas = <&pdma0 10
&pdma0 9
Expand All @@ -433,6 +434,7 @@

i2s1: i2s@12D60000 {
compatible = "samsung,s3c6410-i2s";
status = "disabled";
reg = <0x12D60000 0x100>;
dmas = <&pdma1 12
&pdma1 11>;
Expand All @@ -445,6 +447,7 @@

i2s2: i2s@12D70000 {
compatible = "samsung,s3c6410-i2s";
status = "disabled";
reg = <0x12D70000 0x100>;
dmas = <&pdma0 12
&pdma0 11>;
Expand Down

0 comments on commit 328aee4

Please sign in to comment.