From a8ea6a96b117b7a3c72b201b94445d7f8fed48e5 Mon Sep 17 00:00:00 2001
From: Padmavathi Venna <padma.v@samsung.com>
Date: Fri, 18 Jan 2013 17:17:04 +0530
Subject: [PATCH] --- yaml --- r: 353405 b: refs/heads/master c:
 4c4c746399a6fdd34c4f0c60e4041c9d49f3b940 h: refs/heads/master i:   353403:
 0954237a299fdd8d45682623a1c1ac7896cfede6 v: v3

---
 [refs]                                        |  2 +-
 .../arch/arm/boot/dts/exynos5250-smdk5250.dts | 14 +++++++++
 trunk/arch/arm/boot/dts/exynos5250.dtsi       | 29 +++++++++++++++++++
 3 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ee8630e8744c..0bd157f0565a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5be04d35dbb2e00ab27a97bfd26e17019e857ef
+refs/heads/master: 4c4c746399a6fdd34c4f0c60e4041c9d49f3b940
diff --git a/trunk/arch/arm/boot/dts/exynos5250-smdk5250.dts b/trunk/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 942d5761ca97..78fee35d09fc 100644
--- a/trunk/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/trunk/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -204,4 +204,18 @@
 		samsung,mfc-r = <0x43000000 0x800000>;
 		samsung,mfc-l = <0x51000000 0x800000>;
 	};
+
+	i2s@03830000 {
+		gpios = <&gpz 0 2 0 0>, <&gpz 1 2 0 0>, <&gpz 2 2 0 0>,
+			<&gpz 3 2 0 0>, <&gpz 4 2 0 0>, <&gpz 5 2 0 0>,
+			<&gpz 6 2 0 0>;
+	};
+
+	i2s@12D60000 {
+		status = "disabled";
+	};
+
+	i2s@12D70000 {
+		status = "disabled";
+	};
 };
diff --git a/trunk/arch/arm/boot/dts/exynos5250.dtsi b/trunk/arch/arm/boot/dts/exynos5250.dtsi
index 3acf594ea60b..fe05b60a3984 100644
--- a/trunk/arch/arm/boot/dts/exynos5250.dtsi
+++ b/trunk/arch/arm/boot/dts/exynos5250.dtsi
@@ -269,6 +269,35 @@
 		#size-cells = <0>;
 	};
 
+	i2s@03830000 {
+		compatible = "samsung,i2s-v5";
+		reg = <0x03830000 0x100>;
+		dmas = <&pdma0 10
+			&pdma0 9
+			&pdma0 8>;
+		dma-names = "tx", "rx", "tx-sec";
+		samsung,supports-6ch;
+		samsung,supports-rstclr;
+		samsung,supports-secdai;
+		samsung,idma-addr = <0x03000000>;
+	};
+
+	i2s@12D60000 {
+		compatible = "samsung,i2s-v5";
+		reg = <0x12D60000 0x100>;
+		dmas = <&pdma1 12
+			&pdma1 11>;
+		dma-names = "tx", "rx";
+	};
+
+	i2s@12D70000 {
+		compatible = "samsung,i2s-v5";
+		reg = <0x12D70000 0x100>;
+		dmas = <&pdma0 12
+			&pdma0 11>;
+		dma-names = "tx", "rx";
+	};
+
 	amba {
 		#address-cells = <1>;
 		#size-cells = <1>;