Patchwork [U-Boot,V3,2/5] DTS: Addition of I2S0 channel and replacing I2S1

login
register
mail settings
Submitter Dani Krishna Mohan
Date Sept. 11, 2013, 11:08 a.m.
Message ID <1378897730-26678-3-git-send-email-krishna.md@samsung.com>
Download mbox | patch
Permalink /patch/274237/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

Dani Krishna Mohan - Sept. 11, 2013, 11:08 a.m.
This patch enables default I2S0 channel.And I2S platform
parameter has been moved to a common file viz exynos5.dtsi.

Signed-off-by: Dani Krishna Mohan <krishna.md@samsung.com>
---
 arch/arm/dts/exynos5250.dtsi              |   19 +++++++++++++++++++
 board/samsung/dts/exynos5250-smdk5250.dts |   13 ++++++-------
 board/samsung/dts/exynos5250-snow.dts     |   14 +++++++-------
 3 files changed, 32 insertions(+), 14 deletions(-)

Patch

diff --git a/arch/arm/dts/exynos5250.dtsi b/arch/arm/dts/exynos5250.dtsi
index 4fff5e3..1c5474f 100644
--- a/arch/arm/dts/exynos5250.dtsi
+++ b/arch/arm/dts/exynos5250.dtsi
@@ -93,9 +93,28 @@ 
 		interrupts = <0 63 0>;
 	};
 
+	sound@3830000 {
+		compatible = "samsung,exynos-sound";
+		reg = <0x3830000 0x50>;
+		samsung,i2s-epll-clock-frequency = <192000000>;
+		samsung,i2s-sampling-rate = <48000>;
+		samsung,i2s-bits-per-sample = <16>;
+		samsung,i2s-channels = <2>;
+		samsung,i2s-lr-clk-framesize = <256>;
+		samsung,i2s-bit-clk-framesize = <32>;
+		samsung,i2s-id = <0>;
+	};
+
 	sound@12d60000 {
 		compatible = "samsung,exynos-sound";
 		reg = <0x12d60000 0x20>;
+		samsung,i2s-epll-clock-frequency = <192000000>;
+		samsung,i2s-sampling-rate = <48000>;
+		samsung,i2s-bits-per-sample = <16>;
+		samsung,i2s-channels = <2>;
+		samsung,i2s-lr-clk-framesize = <256>;
+		samsung,i2s-bit-clk-framesize = <32>;
+		samsung,i2s-id = <1>;
 	};
 
 	spi@12d20000 {
diff --git a/board/samsung/dts/exynos5250-smdk5250.dts b/board/samsung/dts/exynos5250-smdk5250.dts
index 80ffe30..ec4c1c5 100644
--- a/board/samsung/dts/exynos5250-smdk5250.dts
+++ b/board/samsung/dts/exynos5250-smdk5250.dts
@@ -36,6 +36,7 @@ 
 		mmc3 = "/mmc@12230000";
 		serial0 = "/serial@12C30000";
 		console = "/serial@12C30000";
+		i2s = "/sound@3830000";
 	};
 
 	sromc@12250000 {
@@ -49,16 +50,14 @@ 
 		};
 	};
 
-	sound@12d60000 {
-		samsung,i2s-epll-clock-frequency = <192000000>;
-		samsung,i2s-sampling-rate = <48000>;
-		samsung,i2s-bits-per-sample = <16>;
-		samsung,i2s-channels = <2>;
-		samsung,i2s-lr-clk-framesize = <256>;
-		samsung,i2s-bit-clk-framesize = <32>;
+	sound@3830000 {
 		samsung,codec-type = "wm8994";
 	};
 
+	sound@12d60000 {
+		status = "disabled";
+	};
+
 	i2c@12c70000 {
 		soundcodec@1a {
 			reg = <0x1a>;
diff --git a/board/samsung/dts/exynos5250-snow.dts b/board/samsung/dts/exynos5250-snow.dts
index dca3386..b97312f 100644
--- a/board/samsung/dts/exynos5250-snow.dts
+++ b/board/samsung/dts/exynos5250-snow.dts
@@ -36,6 +36,7 @@ 
 		mmc3 = "/mmc@12230000";
 		serial0 = "/serial@12C30000";
 		console = "/serial@12C30000";
+		i2s = "/sound@3830000";
 	};
 
 	i2c4: i2c@12ca0000 {
@@ -65,16 +66,15 @@ 
 		};
 	};
 
-	sound@12d60000 {
-		samsung,i2s-epll-clock-frequency = <192000000>;
-		samsung,i2s-sampling-rate = <48000>;
-		samsung,i2s-bits-per-sample = <16>;
-		samsung,i2s-channels = <2>;
-		samsung,i2s-lr-clk-framesize = <256>;
-		samsung,i2s-bit-clk-framesize = <32>;
+	sound@3830000 {
 		samsung,codec-type = "max98095";
+		codec-enable-gpio = <&gpio 0xb7 0>;
 	};
 
+        sound@12d60000 {
+                status = "disabled";
+        };
+
 	i2c@12cd0000 {
 		soundcodec@22 {
 			reg = <0x22>;