ENGR00141651-2 Audio: audio not work when ipmux2 clock disabled in idle

When SOC enter wait mode, ipmux2_clk will disable to save power, if using
ssi1 for audio transfer, audio will not work correctly.

To around this, using ssi2.

Signed-off-by: Zeng Zhaoming <b32542@freescale.com>

diff --git a/sound/soc/imx/imx-pcm-dma-mx2.c b/sound/soc/imx/imx-pcm-dma-mx2.c
index 4173b3d87f979d2757f1498bd503f15b07195542..89e859a7fb65c47ae373b7391196e2b24f3253bb 100644 (file)
--- a/sound/soc/imx/imx-pcm-dma-mx2.c
+++ b/sound/soc/imx/imx-pcm-dma-mx2.c
@@ -83,7 +83,7 @@ static int imx_ssi_dma_alloc(struct snd_pcm_substream *substream,
 
        dma_params = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
 
-       iprtd->dma_data.peripheral_type = IMX_DMATYPE_SSI;
+       iprtd->dma_data.peripheral_type = IMX_DMATYPE_SSI_SP;
        iprtd->dma_data.priority = DMA_PRIO_HIGH;
        iprtd->dma_data.dma_request = dma_params->dma;
 

diff --git a/sound/soc/imx/imx-sgtl5000.c b/sound/soc/imx/imx-sgtl5000.c
index 618d0fe018b5183c45c372453c42ee6a235c7473..3ccf26368039234fbc142930567bd4f7ba7f16f1 100644 (file)
--- a/sound/soc/imx/imx-sgtl5000.c
+++ b/sound/soc/imx/imx-sgtl5000.c
@@ -238,8 +238,8 @@ static struct snd_soc_dai_link imx_sgtl5000_dai[] = {
                .stream_name    = "HiFi",
                .codec_dai_name = "sgtl5000",
                .codec_name     = "sgtl5000.1-000a",
-               .cpu_dai_name   = "imx-ssi.0",
-               .platform_name  = "imx-pcm-audio.0",
+               .cpu_dai_name   = "imx-ssi.1",
+               .platform_name  = "imx-pcm-audio.1",
                .init           = imx_3stack_sgtl5000_init,
                .ops            = &imx_sgtl5000_hifi_ops,
        },