Linux Samsung SOC development
 help / color / mirror / Atom feed
From: Padmavathi Venna <padma.v@samsung.com>
To: linux-samsung-soc@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
	padma.v@samsung.com, padma.kvr@gmail.com
Cc: broonie@kernel.org, kgene.kim@samsung.com, tomasz.figa@gmail.com,
	abrestic@chromium.org
Subject: [PATCH V3 4/7] ARM: dts: exynos5250: move common i2s properties to exynos5 dtsi
Date: Wed, 07 Aug 2013 14:40:13 +0530	[thread overview]
Message-ID: <1375866616-5541-5-git-send-email-padma.v@samsung.com> (raw)
In-Reply-To: <1375866616-5541-1-git-send-email-padma.v@samsung.com>

I2S nodes shares some properties across exynos5 SoCs (exynos5250
and exyno5420). Common code is moved to exynos5.dtsi which is
included in exyno5250 and exynos5420 SoC files.

Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
---
 arch/arm/boot/dts/exynos5.dtsi    |   21 +++++++++++++++++++++
 arch/arm/boot/dts/exynos5250.dtsi |   12 ------------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi
index ec384c9..c37b57d 100644
--- a/arch/arm/boot/dts/exynos5.dtsi
+++ b/arch/arm/boot/dts/exynos5.dtsi
@@ -191,4 +191,25 @@
 		#size-cells = <0>;
 		status = "disabled";
 	};
+
+	i2s0: i2s@03830000 {
+		reg = <0x03830000 0x100>;
+		samsung,idma-addr = <0x03000000>;
+	};
+
+	i2s1: i2s@12D60000 {
+		compatible = "samsung,s3c6410-i2s";
+		reg = <0x12D60000 0x100>;
+		dmas = <&pdma1 12
+			&pdma1 11>;
+		dma-names = "tx", "rx";
+	};
+
+	i2s2: i2s@12D70000 {
+		compatible = "samsung,s3c6410-i2s";
+		reg = <0x12D70000 0x100>;
+		dmas = <&pdma0 12
+			&pdma0 11>;
+		dma-names = "tx", "rx";
+	};
 };
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 5b36121..3873ff7 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -394,7 +394,6 @@
 
 	i2s0: i2s@03830000 {
 		compatible = "samsung,s5pv210-i2s";
-		reg = <0x03830000 0x100>;
 		dmas = <&pdma0 10
 			&pdma0 9
 			&pdma0 8>;
@@ -403,17 +402,11 @@
 			<&clock_audss EXYNOS_I2S_BUS>,
 			<&clock_audss EXYNOS_SCLK_I2S>;
 		clock-names = "iis", "i2s_opclk0", "i2s_opclk1";
-		samsung,idma-addr = <0x03000000>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&i2s0_bus>;
 	};
 
 	i2s1: i2s@12D60000 {
-		compatible = "samsung,s3c6410-i2s";
-		reg = <0x12D60000 0x100>;
-		dmas = <&pdma1 12
-			&pdma1 11>;
-		dma-names = "tx", "rx";
 		clocks = <&clock 307>, <&clock 157>;
 		clock-names = "iis", "i2s_opclk0";
 		pinctrl-names = "default";
@@ -421,11 +414,6 @@
 	};
 
 	i2s2: i2s@12D70000 {
-		compatible = "samsung,s3c6410-i2s";
-		reg = <0x12D70000 0x100>;
-		dmas = <&pdma0 12
-			&pdma0 11>;
-		dma-names = "tx", "rx";
 		clocks = <&clock 308>, <&clock 158>;
 		clock-names = "iis", "i2s_opclk0";
 		pinctrl-names = "default";
-- 
1.7.4.4

  parent reply	other threads:[~2013-08-07  9:08 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-07  9:10 [PATCH V3 0/7] Add i2s nodes on Exynos5420 and enable sound support on sdmk5420 Padmavathi Venna
2013-08-07  9:10 ` [PATCH V3 1/7] ARM: dts: Change i2s compatible string on exynos5250 Padmavathi Venna
2013-08-07 10:10   ` Mark Brown
2013-08-07 10:32     ` Padma Venkat
2013-08-07 11:17       ` Tomasz Figa
2013-08-07  9:10 ` [PATCH V3 2/7] ARM: dts: exynos5420: add i2s controllers Padmavathi Venna
2013-08-07  9:10 ` [PATCH V3 3/7] ARM: dts: Add i2c bus 1 and it's audio codec child node on smdk5420 Padmavathi Venna
2013-08-07 15:11   ` Tomasz Figa
2013-08-07  9:10 ` Padmavathi Venna [this message]
2013-08-07 15:14   ` [PATCH V3 4/7] ARM: dts: exynos5250: move common i2s properties to exynos5 dtsi Tomasz Figa
2013-08-07  9:10 ` [PATCH V3 5/7] ARM: dts: Add osc clock node on smdk5420 Padmavathi Venna
2013-08-07 15:16   ` Tomasz Figa
2013-08-07  9:10 ` [PATCH V3 6/7] ASoC: Samsung: wm8994: Register the osc clock Padmavathi Venna
2013-08-07 10:10   ` Mark Brown
2013-08-07 11:05     ` Padma Venkat
2013-08-07 15:18   ` Tomasz Figa
2013-08-07 15:28     ` Mark Brown
2013-08-07  9:10 ` [PATCH V3 7/7] ARM: dts: Enable sound support on smdk5420 Padmavathi Venna

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1375866616-5541-5-git-send-email-padma.v@samsung.com \
    --to=padma.v@samsung.com \
    --cc=abrestic@chromium.org \
    --cc=broonie@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=kgene.kim@samsung.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    --cc=padma.kvr@gmail.com \
    --cc=tomasz.figa@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox