aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorZeng Zhaoming <b32542@freescale.com>2011-04-06 04:48:28 +0800
committerZeng Zhaoming <b32542@freescale.com>2011-04-06 04:50:47 +0800
commitb489b79ecdabf0ae3f638425fff6de292b5beb54 (patch)
tree9dd063b20152ab5db0b9d6339b300f53b7232d15 /sound
parente5d8683f8c7fa4579f4496032453b709c34bea02 (diff)
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/imx/imx-pcm-dma-mx2.c2
-rw-r--r--sound/soc/imx/imx-sgtl5000.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/imx/imx-pcm-dma-mx2.c b/sound/soc/imx/imx-pcm-dma-mx2.c
index 4d758024610..4b8fe782da9 100644
--- 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 618d0fe018b..3ccf2636803 100644
--- 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,
},