Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

[cascardo/linux.git] / arch / arm / boot / dts / exynos5250.dtsi

diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index c774aae..b1ac73e 100644 (file)
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -211,8 +211,9 @@
                compatible = "samsung,exynos4210-spi";
                reg = <0x12d20000 0x100>;
                interrupts = <0 66 0>;
-               tx-dma-channel = <&pdma0 5>; /* preliminary */
-               rx-dma-channel = <&pdma0 4>; /* preliminary */
+               dmas = <&pdma0 5
+                       &pdma0 4>;
+               dma-names = "tx", "rx";
                #address-cells = <1>;
                #size-cells = <0>;
        };
@@ -221,8 +222,9 @@
                compatible = "samsung,exynos4210-spi";
                reg = <0x12d30000 0x100>;
                interrupts = <0 67 0>;
-               tx-dma-channel = <&pdma1 5>; /* preliminary */
-               rx-dma-channel = <&pdma1 4>; /* preliminary */
+               dmas = <&pdma1 5
+                       &pdma1 4>;
+               dma-names = "tx", "rx";
                #address-cells = <1>;
                #size-cells = <0>;
        };
@@ -231,8 +233,9 @@
                compatible = "samsung,exynos4210-spi";
                reg = <0x12d40000 0x100>;
                interrupts = <0 68 0>;
-               tx-dma-channel = <&pdma0 7>; /* preliminary */
-               rx-dma-channel = <&pdma0 6>; /* preliminary */
+               dmas = <&pdma0 7
+                       &pdma0 6>;
+               dma-names = "tx", "rx";
                #address-cells = <1>;
                #size-cells = <0>;
        };
@@ -269,6 +272,35 @@
                #size-cells = <0>;
        };
 
+       i2s0: 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>;
+       };
+
+       i2s1: i2s@12D60000 {
+               compatible = "samsung,i2s-v5";
+               reg = <0x12D60000 0x100>;
+               dmas = <&pdma1 12
+                       &pdma1 11>;
+               dma-names = "tx", "rx";
+       };
+
+       i2s2: 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>;
@@ -586,7 +618,7 @@
 
        hdmi {
                compatible = "samsung,exynos5-hdmi";
-               reg = <0x14530000 0x100000>;
+               reg = <0x14530000 0x70000>;
                interrupts = <0 95 0>;
        };