DTS: Addition of I2S0 channel and replacing I2S1

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>

diff --git a/arch/arm/dts/exynos5250.dtsi b/arch/arm/dts/exynos5250.dtsi
index 4fff5e36942ccead7ebf059861ab7204e33eaaa0..1c5474f40b03af1d2b58f01460acb0cd4cdc9b46 100644 (file)
--- 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 1e94c7f82c5010a5efbb4985fdc0dc223db9ca91..b1bba9662e5bba3ee9d24072b8055936d79092b3 100644 (file)
--- 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 7832e4edda0b756e224ab223e43652dadc48eafe..9b7e57e43d5aa36d4a47f0ad96b74b2fde18c50c 100644 (file)
--- 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>;