Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next

6 files changed, 82 insertions, 10 deletions

diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index e05b18f3c33d..4db9db0a8443 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -49,6 +49,11 @@
                         compatible = "samsung,s524ad0xd1";
                         reg = <0x51>;
                 };
+
+                wm8994: wm8994@1a {
+                         compatible = "wlf,wm8994";
+                         reg = <0x1a>;
+                };
         };
 
         i2c@121D0000 {
@@ -204,4 +209,25 @@
                 samsung,mfc-r = <0x43000000 0x800000>;
                 samsung,mfc-l = <0x51000000 0x800000>;
         };
+
+        i2s0: 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>;
+        };
+
+        i2s1: i2s@12D60000 {
+                status = "disabled";
+        };
+
+        i2s2: i2s@12D70000 {
+                status = "disabled";
+        };
+
+        sound {
+                compatible = "samsung,smdk-wm8994";
+
+                samsung,i2s-controller = <&i2s0>;
+                samsung,audio-codec = <&wm8994>;
+        };
 };
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 3acf594ea60b..f50b4e854355 100644
--- 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>;
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
index e99d3d8f2bcf..ea9e3020972d 100644
--- a/arch/arm/mach-exynos/mach-exynos5-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
@@ -104,6 +104,12 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = {
         OF_DEV_AUXDATA("samsung,mfc-v6", 0x11000000, "s5p-mfc-v6", NULL),
         OF_DEV_AUXDATA("samsung,exynos5250-tmu", 0x10060000,
                                 "exynos-tmu", NULL),
+        OF_DEV_AUXDATA("samsung,i2s-v5", 0x03830000,
+                                "samsung-i2s.0", NULL),
+        OF_DEV_AUXDATA("samsung,i2s-v5", 0x12D60000,
+                                "samsung-i2s.1", NULL),
+        OF_DEV_AUXDATA("samsung,i2s-v5", 0x12D70000,
+                                "samsung-i2s.2", NULL),
         {},
 };
 
diff --git a/arch/arm/plat-samsung/dma-ops.c b/arch/arm/plat-samsung/dma-ops.c
index d088afa034e8..71d58ddea9c1 100644
--- a/arch/arm/plat-samsung/dma-ops.c
+++ b/arch/arm/plat-samsung/dma-ops.c
@@ -19,7 +19,8 @@
 #include <mach/dma.h>
 
 static unsigned samsung_dmadev_request(enum dma_ch dma_ch,
-                                struct samsung_dma_req *param)
+                                struct samsung_dma_req *param,
+                                struct device *dev, char *ch_name)
 {
         dma_cap_mask_t mask;
         void *filter_param;
@@ -33,7 +34,12 @@ static unsigned samsung_dmadev_request(enum dma_ch dma_ch,
          */
         filter_param = (dma_ch == DMACH_DT_PROP) ?
                 (void *)param->dt_dmach_prop : (void *)dma_ch;
-        return (unsigned)dma_request_channel(mask, pl330_filter, filter_param);
+
+        if (dev->of_node)
+                return (unsigned)dma_request_slave_channel(dev, ch_name);
+        else
+                return (unsigned)dma_request_channel(mask, pl330_filter,
+                                                        filter_param);
 }
 
 static int samsung_dmadev_release(unsigned ch, void *param)
diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h
index f5144cdd3001..114178268b75 100644
--- a/arch/arm/plat-samsung/include/plat/dma-ops.h
+++ b/arch/arm/plat-samsung/include/plat/dma-ops.h
@@ -39,7 +39,8 @@ struct samsung_dma_config {
 };
 
 struct samsung_dma_ops {
-        unsigned (*request)(enum dma_ch ch, struct samsung_dma_req *param);
+        unsigned (*request)(enum dma_ch ch, struct samsung_dma_req *param,
+                                struct device *dev, char *ch_name);
         int (*release)(unsigned ch, void *param);
         int (*config)(unsigned ch, struct samsung_dma_config *param);
         int (*prepare)(unsigned ch, struct samsung_dma_prep *param);
diff --git a/arch/arm/plat-samsung/s3c-dma-ops.c b/arch/arm/plat-samsung/s3c-dma-ops.c
index f99448c48d30..0cc40aea3f5a 100644
--- a/arch/arm/plat-samsung/s3c-dma-ops.c
+++ b/arch/arm/plat-samsung/s3c-dma-ops.c
@@ -36,7 +36,8 @@ static void s3c_dma_cb(struct s3c2410_dma_chan *channel, void *param,
 }
 
 static unsigned s3c_dma_request(enum dma_ch dma_ch,
-                                        struct samsung_dma_req *param)
+                                struct samsung_dma_req *param,
+                                struct device *dev, char *ch_name)
 {
         struct cb_data *data;