Skip to contentSkip to conversation

ARM: dts: Disable Exynos5250 I2S controllers by default

PATCH In review Mark Brown 4 participants 5 messages Sep 6, 2013 – Sep 12, 2013

Subsystems (2)
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/1 ARM: dts: Disable Exynos5250 I2S controllers by default

From: Mark Brown <[email protected]>

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.

---

This seems like a more robust approach to handling the externally visible IPs - if this is OK I can go through and do further updates for other devices.

 arch/arm/boot/dts/exynos5250-arndale.dts  | 4 ++++
 arch/arm/boot/dts/exynos5250-smdk5250.dts | 8 --------
 arch/arm/boot/dts/exynos5250.dtsi         | 3 +++
 3 files changed, 7 insertions(+), 8 deletions(-)
arch/arm/boot/dts/exynos5250-arndale.dts +4 -0
index cee55fa..4687fa0 100644
@@ -412,6 +412,10 @@
 		status = "disabled";
 	};
 
+	i2s0: i2s@03830000 {
+		status = "okay";
+	};
+
 	spi_0: spi@12d20000 {
 		status = "disabled";
 	};
arch/arm/boot/dts/exynos5250-smdk5250.dts +0 -8
index 2538b32..f86d567 100644
@@ -231,14 +231,6 @@
 		status = "okay";
 	};
 
-	i2s1: i2s@12D60000 {
-		status = "disabled";
-	};
-
-	i2s2: i2s@12D70000 {
-		status = "disabled";
-	};
-
 	sound {
 		compatible = "samsung,smdk-wm8994";
 
arch/arm/boot/dts/exynos5250.dtsi +3 -0
index 7d7cc77..c863113 100644
@@ -417,6 +417,7 @@
 
 	i2s0: i2s@03830000 {
 		compatible = "samsung,s5pv210-i2s";
+		status = "disabled";
 		reg = <0x03830000 0x100>;
 		dmas = <&pdma0 10
 			&pdma0 9
@@ -433,6 +434,7 @@
 
 	i2s1: i2s@12D60000 {
 		compatible = "samsung,s3c6410-i2s";
+		status = "disabled";
 		reg = <0x12D60000 0x100>;
 		dmas = <&pdma1 12
 			&pdma1 11>;
@@ -445,6 +447,7 @@
 
 	i2s2: i2s@12D70000 {
 		compatible = "samsung,s3c6410-i2s";
+		status = "disabled";
 		reg = <0x12D70000 0x100>;
 		dmas = <&pdma0 12
 			&pdma0 11>;
Signature · 1 line
1.8.4.rc3
Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · Mark Brown

From: Mark Brown <[email protected]>

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.

Quoted 6 lines

---

This seems like a more robust approach to handling the externally visible IPs - if this is OK I can go through and do further updates for other devices.

It seems far more sensible to me to mark devices disabled by default in shared dtsi files and then okay them as needed in particular dts files. I'd be happy with more of this.

Quoted 72 lines
 arch/arm/boot/dts/exynos5250-arndale.dts  | 4 ++++
 arch/arm/boot/dts/exynos5250-smdk5250.dts | 8 --------
 arch/arm/boot/dts/exynos5250.dtsi         | 3 +++
 3 files changed, 7 insertions(+), 8 deletions(-)
arch/arm/boot/dts/exynos5250-arndale.dts +4 -0
index cee55fa..4687fa0 100644
@@ -412,6 +412,10 @@
 		status = "disabled";
 	};
 
+	i2s0: i2s@03830000 {
+		status = "okay";
+	};
+
 	spi_0: spi@12d20000 {
 		status = "disabled";
 	};
arch/arm/boot/dts/exynos5250-smdk5250.dts +0 -8
index 2538b32..f86d567 100644
@@ -231,14 +231,6 @@
 		status = "okay";
 	};
 
-	i2s1: i2s@12D60000 {
-		status = "disabled";
-	};
-
-	i2s2: i2s@12D70000 {
-		status = "disabled";
-	};
-
 	sound {
 		compatible = "samsung,smdk-wm8994";
 
arch/arm/boot/dts/exynos5250.dtsi +3 -0
index 7d7cc77..c863113 100644
@@ -417,6 +417,7 @@
 
 	i2s0: i2s@03830000 {
 		compatible = "samsung,s5pv210-i2s";
+		status = "disabled";
 		reg = <0x03830000 0x100>;
 		dmas = <&pdma0 10
 			&pdma0 9
@@ -433,6 +434,7 @@
 
 	i2s1: i2s@12D60000 {
 		compatible = "samsung,s3c6410-i2s";
+		status = "disabled";
 		reg = <0x12D60000 0x100>;
 		dmas = <&pdma1 12
 			&pdma1 11>;
@@ -445,6 +447,7 @@
 
 	i2s2: i2s@12D70000 {
 		compatible = "samsung,s3c6410-i2s";
+		status = "disabled";
 		reg = <0x12D70000 0x100>;
 		dmas = <&pdma0 12
 			&pdma0 11>;
Signature · 1 line
1.8.4.rc3
author
#2 lore raw
Quoted 3 lines · Mark Rutland

It seems far more sensible to me to mark devices disabled by default in shared dtsi files and then okay them as needed in particular dts files. I'd be happy with more of this.

Yeah, me too - though only for devices that have an external impact, for things that are internal only (eg, a crypto engine) it makes sense to enable them by default since they should normally be usable regardless of the system configuration.

#3 lore raw
Quoted 11 lines · Mark Brown
Quoted 3 lines · Mark Rutland

It seems far more sensible to me to mark devices disabled by default in shared dtsi files and then okay them as needed in particular dts files. I'd be happy with more of this.

Yeah, me too - though only for devices that have an external impact, for things that are internal only (eg, a crypto engine) it makes sense to enable them by default since they should normally be usable regardless of the system configuration.

(+ DT ML)

Makes sense but I need to get the opinions from DT guys...

- Kukjin

#4 lore raw

Hi Kukjin,

Quoted 14 lines · On Thursday 12 of September 2013 19:42:57 Kukjin Kim wrote:
Quoted 7 lines · Mark Brown
Quoted 5 lines · Mark Rutland

It seems far more sensible to me to mark devices disabled by default in
shared dtsi files and then okay them as needed in particular dts files.
I'd be happy with more of this.

Quoted 5 lines

Yeah, me too - though only for devices that have an external impact, for
things that are internal only (eg, a crypto engine) it makes sense to enable them by default since they should normally be usable regardless of the system configuration.

Quoted 3 lines

(+ DT ML)

Makes sense but I need to get the opinions from DT guys...

Yes, this patch should have been posted to the DT ML indeed, but it has been already acked by Mark Rutland, one of DT binding maintainers.

Best regards,
Tomasz