Skip to contentSkip to conversation

ASoC: Fix data format configuration for S3C64XX IISv2

PATCH In review Joonyoung Shim 2 participants 5 messages Aug 18, 2009

Subsystems (4)
Arm (32-bit) Sound Arm sub-architectures ASoC
lore
Share & tools
lore

Joonyoung Shim

author
#0 lore raw

PATCH 1/1 ASoC: Fix data format configuration for S3C64XX IISv2

The data format configuration for S3C64xx IISv2 was hardcoded for IISMOD register. This patch changes to the defined values it.

And instead of bits 9 and 10 of IISMOD we should clear bits 13 and 14.

Signed-off-by Joonyoung Shim <[email protected]>
---
 arch/arm/plat-s3c/include/plat/regs-s3c2412-iis.h |    5 +++++
 sound/soc/s3c24xx/s3c-i2s-v2.c                    |    6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)
arch/arm/plat-s3c/include/plat/regs-s3c2412-iis.h +5 -0
index 0fad757..07659da 100644
@@ -33,6 +33,11 @@
 #define S3C2412_IISCON_RXDMA_ACTIVE	(1 << 1)
 #define S3C2412_IISCON_IIS_ACTIVE	(1 << 0)
 
+#define S3C64XX_IISMOD_BLC_16BIT	(0 << 13)
+#define S3C64XX_IISMOD_BLC_8BIT		(1 << 13)
+#define S3C64XX_IISMOD_BLC_24BIT	(2 << 13)
+#define S3C64XX_IISMOD_BLC_MASK		(3 << 13)
+
 #define S3C64XX_IISMOD_IMS_PCLK		(0 << 10)
 #define S3C64XX_IISMOD_IMS_SYSMUX	(1 << 10)
sound/soc/s3c24xx/s3c-i2s-v2.c +3 -3
index 1a28317..ebfb2f6 100644
@@ -357,19 +357,19 @@ static int s3c2412_i2s_hw_params(struct snd_pcm_substream *substream,
 #endif
 
 #ifdef CONFIG_PLAT_S3C64XX
-	iismod &= ~0x606;
+	iismod &= ~(S3C64XX_IISMOD_BLC_MASK | S3C2412_IISMOD_BCLK_MASK);
 	/* Sample size */
 	switch (params_format(params)) {
 	case SNDRV_PCM_FORMAT_S8:
 		/* 8 bit sample, 16fs BCLK */
-		iismod |= 0x2004;
+		iismod |= (S3C64XX_IISMOD_BLC_8BIT | S3C2412_IISMOD_BCLK_16FS);
 		break;
 	case SNDRV_PCM_FORMAT_S16_LE:
 		/* 16 bit sample, 32fs BCLK */
 		break;
 	case SNDRV_PCM_FORMAT_S24_LE:
 		/* 24 bit sample, 48fs BCLK */
-		iismod |= 0x4002;
+		iismod |= (S3C64XX_IISMOD_BLC_24BIT | S3C2412_IISMOD_BCLK_48FS);
 		break;
 	}
 #endif
Signature · 1 line
1.6.0.4
#1 lore raw
Quoted 4 lines · Joonyoung Shim

The data format configuration for S3C64xx IISv2 was hardcoded for IISMOD register. This patch changes to the defined values it.

And instead of bits 9 and 10 of IISMOD we should clear bits 13 and 14.

Thanks - there's quite a few problems with this area.

Can you confirm if you've got the device DMAing usable audio (and if so in what configuration)?

author
#2 lore raw
Quoted 11 lines · Mark Brown
Quoted 4 lines · Joonyoung Shim

The data format configuration for S3C64xx IISv2 was hardcoded for IISMOD register. This patch changes to the defined values it.

And instead of bits 9 and 10 of IISMOD we should clear bits 13 and 14.

Thanks - there's quite a few problems with this area.

Can you confirm if you've got the device DMAing usable audio (and if so in what configuration)?

Do you mean which target board i use?

I have the NCP target board using S3C6410 arm cpu. The NCP board has the LM49350 audio codec chip, but this codec driver doesn't make ready to post yet. The codec chip of the NCP is connected to the I2S0 of platform for playback and capture.

#3 lore raw
Quoted 6 lines · Joonyoung Shim
Quoted 2 lines · Mark Brown

Can you confirm if you've got the device DMAing usable audio (and if so in what configuration)?

Do you mean which target board i use?

That's useful, yes, but I was more wondering about the configuration of the DAI - mostly what's master.

author
#4 lore raw
Quoted 11 lines · Mark Brown
Quoted 6 lines · Joonyoung Shim
Quoted 2 lines · Mark Brown

Can you confirm if you've got the device DMAing usable audio (and if so in what configuration)?

Do you mean which target board i use?

That's useful, yes, but I was more wondering about the configuration of the DAI - mostly what's master.

I use the configuration that the DAI of codec is master and the DAI of cpu is slave.