2 files changed, 8 insertions, 11 deletions

diff --git a/sound/soc/imx/imx-audmux.c b/sound/soc/imx/imx-audmux.c
index a839494c5ea8..1765a197acb0 100644
--- a/sound/soc/imx/imx-audmux.c
+++ b/sound/soc/imx/imx-audmux.c
@@ -40,12 +40,6 @@ static void __iomem *audmux_base;
 #ifdef CONFIG_DEBUG_FS
 static struct dentry *audmux_debugfs_root;
 
-static int audmux_open_file(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-
 /* There is an annoying discontinuity in the SSI numbering with regard
  * to the Linux number of the devices */
 static const char *audmux_port_string(int port)
@@ -80,13 +74,13 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf,
                 return -ENOMEM;
 
         if (audmux_clk)
-                clk_enable(audmux_clk);
+                clk_prepare_enable(audmux_clk);
 
         ptcr = readl(audmux_base + IMX_AUDMUX_V2_PTCR(port));
         pdcr = readl(audmux_base + IMX_AUDMUX_V2_PDCR(port));
 
         if (audmux_clk)
-                clk_disable(audmux_clk);
+                clk_disable_unprepare(audmux_clk);
 
         ret = snprintf(buf, PAGE_SIZE, "PDCR: %08x\nPTCR: %08x\n",
                        pdcr, ptcr);
@@ -142,7 +136,7 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf,
 }
 
 static const struct file_operations audmux_debugfs_fops = {
-        .open = audmux_open_file,
+        .open = simple_open,
         .read = audmux_read_file,
         .llseek = default_llseek,
 };
@@ -237,13 +231,13 @@ int imx_audmux_v2_configure_port(unsigned int port, unsigned int ptcr,
                 return -ENOSYS;
 
         if (audmux_clk)
-                clk_enable(audmux_clk);
+                clk_prepare_enable(audmux_clk);
 
         writel(ptcr, audmux_base + IMX_AUDMUX_V2_PTCR(port));
         writel(pdcr, audmux_base + IMX_AUDMUX_V2_PDCR(port));
 
         if (audmux_clk)
-                clk_disable(audmux_clk);
+                clk_disable_unprepare(audmux_clk);
 
         return 0;
 }
diff --git a/sound/soc/imx/imx-pcm-dma-mx2.c b/sound/soc/imx/imx-pcm-dma-mx2.c
index e43c8fa2788b..6b818de2fc03 100644
--- a/sound/soc/imx/imx-pcm-dma-mx2.c
+++ b/sound/soc/imx/imx-pcm-dma-mx2.c
@@ -21,6 +21,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/dmaengine.h>
+#include <linux/types.h>
 
 #include <sound/core.h>
 #include <sound/initval.h>
@@ -58,6 +59,8 @@ static int snd_imx_pcm_hw_params(struct snd_pcm_substream *substream,
         if (ret)
                 return ret;
 
+        slave_config.device_fc = false;
+
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                 slave_config.dst_addr = dma_params->dma_addr;
                 slave_config.dst_maxburst = dma_params->burstsize;