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

4 files changed, 4 insertions, 5 deletions

diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c
index 3f333e5b4673..47f046a8fdab 100644
--- a/sound/soc/fsl/imx-audmux.c
+++ b/sound/soc/fsl/imx-audmux.c
@@ -262,7 +262,7 @@ static int imx_audmux_probe(struct platform_device *pdev)
                 return PTR_ERR(pinctrl);
         }
 
-        audmux_clk = clk_get(&pdev->dev, "audmux");
+        audmux_clk = devm_clk_get(&pdev->dev, "audmux");
         if (IS_ERR(audmux_clk)) {
                 dev_dbg(&pdev->dev, "cannot get clock: %ld\n",
                                 PTR_ERR(audmux_clk));
@@ -282,7 +282,6 @@ static int imx_audmux_remove(struct platform_device *pdev)
 {
         if (audmux_type == IMX31_AUDMUX)
                 audmux_debugfs_remove();
-        clk_put(audmux_clk);
 
         return 0;
 }
diff --git a/sound/soc/fsl/imx-pcm-fiq.c b/sound/soc/fsl/imx-pcm-fiq.c
index 025d0d9494f4..670b96b0ce2f 100644
--- a/sound/soc/fsl/imx-pcm-fiq.c
+++ b/sound/soc/fsl/imx-pcm-fiq.c
@@ -34,7 +34,7 @@
 #include "imx-ssi.h"
 
 struct imx_pcm_runtime_data {
-        int period;
+        unsigned int period;
         int periods;
         unsigned long offset;
         unsigned long last_offset;
diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c
index 424347e9b2d7..9584e78858df 100644
--- a/sound/soc/fsl/imx-sgtl5000.c
+++ b/sound/soc/fsl/imx-sgtl5000.c
@@ -148,7 +148,7 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
         data->dai.stream_name = "HiFi";
         data->dai.codec_dai_name = "sgtl5000";
         data->dai.codec_of_node = codec_np;
-        data->dai.cpu_dai_name = dev_name(&ssi_pdev->dev);
+        data->dai.cpu_of_node = ssi_np;
         data->dai.platform_name = "imx-pcm-audio";
         data->dai.init = &imx_sgtl5000_dai_init;
         data->dai.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c
index 77300d163b96..4ce2d608b37a 100644
--- a/sound/soc/fsl/imx-ssi.c
+++ b/sound/soc/fsl/imx-ssi.c
@@ -400,7 +400,7 @@ static struct snd_soc_dai_driver imx_ac97_dai = {
                 .stream_name = "AC97 Playback",
                 .channels_min = 2,
                 .channels_max = 2,
-                .rates = SNDRV_PCM_RATE_48000,
+                .rates = SNDRV_PCM_RATE_8000_48000,
                 .formats = SNDRV_PCM_FMTBIT_S16_LE,
         },
         .capture = {