aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPadmavathi Venna <padma.v@samsung.com>2013-08-12 05:49:53 -0400
committerMark Brown <broonie@linaro.org>2013-08-13 08:44:12 -0400
commit6187288f15bcb430b62df1dcb0f588048f4622f6 (patch)
tree54097db5d75a8da4ae83f76c19f2482088af9288
parent4ca0c0d4784fa82d68733f7793e3487023e12282 (diff)
ARM: dts: exynos5250: move common i2s properties to exynos5 dtsi
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> Reviewed-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--arch/arm/boot/dts/exynos5.dtsi21
-rw-r--r--arch/arm/boot/dts/exynos5250.dtsi12
2 files changed, 21 insertions, 12 deletions
diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi
index f65e124c04a6..aae2fa165eae 100644
--- a/arch/arm/boot/dts/exynos5.dtsi
+++ b/arch/arm/boot/dts/exynos5.dtsi
@@ -108,4 +108,25 @@
108 interrupts = <0 42 0>; 108 interrupts = <0 42 0>;
109 status = "disabled"; 109 status = "disabled";
110 }; 110 };
111
112 i2s0: i2s@03830000 {
113 reg = <0x03830000 0x100>;
114 samsung,idma-addr = <0x03000000>;
115 };
116
117 i2s1: i2s@12D60000 {
118 compatible = "samsung,i2s-v5";
119 reg = <0x12D60000 0x100>;
120 dmas = <&pdma1 12
121 &pdma1 11>;
122 dma-names = "tx", "rx";
123 };
124
125 i2s2: i2s@12D70000 {
126 compatible = "samsung,i2s-v5";
127 reg = <0x12D70000 0x100>;
128 dmas = <&pdma0 12
129 &pdma0 11>;
130 dma-names = "tx", "rx";
131 };
111}; 132};
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index ef57277fc38f..f941d5299618 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -406,7 +406,6 @@
406 406
407 i2s0: i2s@03830000 { 407 i2s0: i2s@03830000 {
408 compatible = "samsung,i2s-v5"; 408 compatible = "samsung,i2s-v5";
409 reg = <0x03830000 0x100>;
410 dmas = <&pdma0 10 409 dmas = <&pdma0 10
411 &pdma0 9 410 &pdma0 9
412 &pdma0 8>; 411 &pdma0 8>;
@@ -418,17 +417,11 @@
418 samsung,supports-6ch; 417 samsung,supports-6ch;
419 samsung,supports-rstclr; 418 samsung,supports-rstclr;
420 samsung,supports-secdai; 419 samsung,supports-secdai;
421 samsung,idma-addr = <0x03000000>;
422 pinctrl-names = "default"; 420 pinctrl-names = "default";
423 pinctrl-0 = <&i2s0_bus>; 421 pinctrl-0 = <&i2s0_bus>;
424 }; 422 };
425 423
426 i2s1: i2s@12D60000 { 424 i2s1: i2s@12D60000 {
427 compatible = "samsung,i2s-v5";
428 reg = <0x12D60000 0x100>;
429 dmas = <&pdma1 12
430 &pdma1 11>;
431 dma-names = "tx", "rx";
432 clocks = <&clock 307>, <&clock 157>; 425 clocks = <&clock 307>, <&clock 157>;
433 clock-names = "iis", "i2s_opclk0"; 426 clock-names = "iis", "i2s_opclk0";
434 pinctrl-names = "default"; 427 pinctrl-names = "default";
@@ -436,11 +429,6 @@
436 }; 429 };
437 430
438 i2s2: i2s@12D70000 { 431 i2s2: i2s@12D70000 {
439 compatible = "samsung,i2s-v5";
440 reg = <0x12D70000 0x100>;
441 dmas = <&pdma0 12
442 &pdma0 11>;
443 dma-names = "tx", "rx";
444 clocks = <&clock 308>, <&clock 158>; 432 clocks = <&clock 308>, <&clock 158>;
445 clock-names = "iis", "i2s_opclk0"; 433 clock-names = "iis", "i2s_opclk0";
446 pinctrl-names = "default"; 434 pinctrl-names = "default";