Configuration for Internal DMA operation and LP audio operation is seperated.

IIS can operate with internal DMA without LP audio mode.
cpu-dai name changed to S5P series.

3 files changed, 20 insertions, 20 deletions

diff --git a/sound/soc/samsung/s3c-dma-wrapper.c b/sound/soc/samsung/s3c-dma-wrapper.c
index bfa834e..f73e9d3 100644
--- a/sound/soc/samsung/s3c-dma-wrapper.c
+++ b/sound/soc/samsung/s3c-dma-wrapper.c
@@ -20,7 +20,7 @@ static int s3c_wrpdma_hw_params(struct snd_pcm_substream *substream,
 {
 	struct snd_soc_platform *platform;
 
-#ifdef CONFIG_S5P_LPAUDIO
+#ifdef CONFIG_S5P_INTERNAL_DMA
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
 		platform = &idma_soc_platform;
 	else
@@ -37,7 +37,7 @@ static int s3c_wrpdma_hw_free(struct snd_pcm_substream *substream)
 {
 	struct snd_soc_platform *platform;
 
-#ifdef CONFIG_S5P_LPAUDIO
+#ifdef CONFIG_S5P_INTERNAL_DMA
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
 		platform = &idma_soc_platform;
 	else
@@ -54,7 +54,7 @@ static int s3c_wrpdma_prepare(struct snd_pcm_substream *substream)
 {
 	struct snd_soc_platform *platform;
 
-#ifdef CONFIG_S5P_LPAUDIO
+#ifdef CONFIG_S5P_INTERNAL_DMA
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
 		platform = &idma_soc_platform;
 	else
@@ -71,7 +71,7 @@ static int s3c_wrpdma_trigger(struct snd_pcm_substream *substream, int cmd)
 {
 	struct snd_soc_platform *platform;
 
-#ifdef CONFIG_S5P_LPAUDIO
+#ifdef CONFIG_S5P_INTERNAL_DMA
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
 		platform = &idma_soc_platform;
 	else
@@ -88,7 +88,7 @@ static snd_pcm_uframes_t s3c_wrpdma_pointer(struct snd_pcm_substream *substream)
 {
 	struct snd_soc_platform *platform;
 
-#ifdef CONFIG_S5P_LPAUDIO
+#ifdef CONFIG_S5P_INTERNAL_DMA
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
 		platform = &idma_soc_platform;
 	else
@@ -105,7 +105,7 @@ static int s3c_wrpdma_open(struct snd_pcm_substream *substream)
 {
 	struct snd_soc_platform *platform;
 
-#ifdef CONFIG_S5P_LPAUDIO
+#ifdef CONFIG_S5P_INTERNAL_DMA
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
 		platform = &idma_soc_platform;
 	else
@@ -122,7 +122,7 @@ static int s3c_wrpdma_close(struct snd_pcm_substream *substream)
 {
 	struct snd_soc_platform *platform;
 
-#ifdef CONFIG_S5P_LPAUDIO
+#ifdef CONFIG_S5P_INTERNAL_DMA
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
 		platform = &idma_soc_platform;
 	else
@@ -140,7 +140,7 @@ static int s3c_wrpdma_ioctl(struct snd_pcm_substream * substream,
 {
 	struct snd_soc_platform *platform;
 
-#ifdef CONFIG_S5P_LPAUDIO
+#ifdef CONFIG_S5P_INTERNAL_DMA
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
 		platform = &idma_soc_platform;
 	else
@@ -158,7 +158,7 @@ static int s3c_wrpdma_mmap(struct snd_pcm_substream *substream,
 {
 	struct snd_soc_platform *platform;
 
-#ifdef CONFIG_S5P_LPAUDIO
+#ifdef CONFIG_S5P_INTERNAL_DMA
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
 		platform = &idma_soc_platform;
 	else
@@ -186,11 +186,11 @@ static struct snd_pcm_ops s3c_wrpdma_ops = {
 static void s3c_wrpdma_pcm_free(struct snd_pcm *pcm)
 {
 	struct snd_soc_platform *gdma_platform;
-#ifdef CONFIG_S5P_LPAUDIO
+#ifdef CONFIG_S5P_INTERNAL_DMA
 	struct snd_soc_platform *idma_platform;
 #endif
 
-#ifdef CONFIG_S5P_LPAUDIO
+#ifdef CONFIG_S5P_INTERNAL_DMA
 	idma_platform = &idma_soc_platform;
 	if (idma_platform->pcm_free)
 		idma_platform->pcm_free(pcm);
@@ -204,14 +204,14 @@ static int s3c_wrpdma_pcm_new(struct snd_card *card,
 		struct snd_soc_dai *dai, struct snd_pcm *pcm)
 {
 	struct snd_soc_platform *gdma_platform;
-#ifdef CONFIG_S5P_LPAUDIO
+#ifdef CONFIG_S5P_INTERNAL_DMA
 	struct snd_soc_platform *idma_platform;
 #endif
 
 	/* sec_fifo i/f always use internal h/w buffers
 	 * irrespective of the xfer method (iDMA or SysDMA) */
 
-#ifdef CONFIG_S5P_LPAUDIO
+#ifdef CONFIG_S5P_INTERNAL_DMA
 	idma_platform = &idma_soc_platform;
 	if (idma_platform->pcm_new)
 		idma_platform->pcm_new(card, dai, pcm);
diff --git a/sound/soc/samsung/s3c-dma.c b/sound/soc/samsung/s3c-dma.c
index ff37bda..d99a8a6 100644
--- a/sound/soc/samsung/s3c-dma.c
+++ b/sound/soc/samsung/s3c-dma.c
@@ -411,7 +411,7 @@ static void s3c_dma_free_dma_buffers(struct snd_pcm *pcm)
 
 	pr_debug("Entered %s\n", __func__);
 
-#ifdef CONFIG_S5P_LPAUDIO
+#ifdef CONFIG_S5P_INTERNAL_DMA
 	for (stream = 1; stream < 2; stream++) {
 #else
 	for (stream = 0; stream < 2; stream++) {
@@ -443,7 +443,7 @@ static int s3c_dma_new(struct snd_card *card,
 		card->dev->dma_mask = &s3c_dma_mask;
 	if (!card->dev->coherent_dma_mask)
 		card->dev->coherent_dma_mask = 0xffffffff;
-#ifndef CONFIG_S5P_LPAUDIO
+#ifndef CONFIG_S5P_INTERNAL_DMA
 	if (dai->playback.channels_min) {
 		ret = s3c_preallocate_dma_buffer(pcm,
 			SNDRV_PCM_STREAM_PLAYBACK);
diff --git a/sound/soc/samsung/s5pc1xx-i2s.c b/sound/soc/samsung/s5pc1xx-i2s.c
index 6ca999e..e15bebe 100644
--- a/sound/soc/samsung/s5pc1xx-i2s.c
+++ b/sound/soc/samsung/s5pc1xx-i2s.c
@@ -138,7 +138,7 @@ void s5p_i2s_set_clk_enabled(struct snd_soc_dai *dai, bool state)
 static int s5p_i2s_wr_hw_params(struct snd_pcm_substream *substream,
 				struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)
 {
-#ifdef CONFIG_S5P_LPAUDIO
+#ifdef CONFIG_S5P_INTERNAL_DMA
 	if(substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
 		s5p_i2s_hw_params(substream, params, dai);
 	}else {
@@ -153,7 +153,7 @@ static int s5p_i2s_wr_trigger(struct snd_pcm_substream *substream,
 				int cmd, struct snd_soc_dai *dai)
 {
 	struct s3c_i2sv2_info *i2s = to_info(dai);
-#ifdef CONFIG_S5P_LPAUDIO
+#ifdef CONFIG_S5P_INTERNAL_DMA
 	if(substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
 		dump_reg(i2s);
 		s5p_i2s_trigger(substream, cmd, dai);
@@ -470,7 +470,7 @@ static int s5p_i2s_wr_startup(struct snd_pcm_substream *substream,
 		writel(iisfic, i2s->regs + S3C2412_IISFIC);
 	}
 
-#ifdef CONFIG_S5P_LPAUDIO
+#ifdef CONFIG_S5P_INTERNAL_DMA
 	if(substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
 		s5p_i2s_startup(dai);
 #endif
@@ -529,7 +529,7 @@ static void s5p_i2s_wr_shutdown(struct snd_pcm_substream *substream, struct snd_
 
 static void s3c64xx_iis_dai_init(struct snd_soc_dai *dai)
 {
-	dai->name = "s3c64xx-i2s";
+	dai->name = "s5pc1xx-i2s";
 	//dai->symmetric_rates = 1;//Not enforcing symmetric rate setting
 	dai->playback.channels_min = 2;
 	dai->playback.channels_max = 2;
@@ -807,7 +807,7 @@ static __devinit int s3c64xx_iis_dev_probe(struct platform_device *pdev)
 	iismod |= S3C2412_IISMOD_MODE_TXRX;
 	writel(iismod, i2s->regs + S3C2412_IISMOD);
 
-#ifdef CONFIG_S5P_LPAUDIO
+#ifdef CONFIG_S5P_INTERNAL_DMA
 	s5p_i2s_sec_init(i2s->regs, base);
 #endif