Pārlūkot izejas kodu

ASoC: bcm2835: add 24bit support

This adds 24 bit support to the I2S driver of the BCM2835

Code ported from bcm2708-i2s driver in Raspberry Pi tree.

Signed-off-by: Florian Meier <florian.meier@koalo.de>
Signed-off-by: Matthias Reichl <hias@horus.com>
Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Matthias Reichl 9 gadi atpakaļ
vecāks
revīzija
a34b027dca
1 mainītis faili ar 6 papildinājumiem un 1 dzēšanām
  1. 6 1
      sound/soc/bcm/bcm2835-i2s.c

+ 6 - 1
sound/soc/bcm/bcm2835-i2s.c

@@ -259,6 +259,9 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream,
 	case SNDRV_PCM_FORMAT_S16_LE:
 	case SNDRV_PCM_FORMAT_S16_LE:
 		data_length = 16;
 		data_length = 16;
 		break;
 		break;
+	case SNDRV_PCM_FORMAT_S24_LE:
+		data_length = 24;
+		break;
 	case SNDRV_PCM_FORMAT_S32_LE:
 	case SNDRV_PCM_FORMAT_S32_LE:
 		data_length = 32;
 		data_length = 32;
 		break;
 		break;
@@ -279,7 +282,7 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream,
 	/* Setup the frame format */
 	/* Setup the frame format */
 	format = BCM2835_I2S_CHEN;
 	format = BCM2835_I2S_CHEN;
 
 
-	if (data_length > 24)
+	if (data_length >= 24)
 		format |= BCM2835_I2S_CHWEX;
 		format |= BCM2835_I2S_CHWEX;
 
 
 	format |= BCM2835_I2S_CHWID((data_length-8)&0xf);
 	format |= BCM2835_I2S_CHWID((data_length-8)&0xf);
@@ -570,6 +573,7 @@ static struct snd_soc_dai_driver bcm2835_i2s_dai = {
 		.channels_max = 2,
 		.channels_max = 2,
 		.rates =	SNDRV_PCM_RATE_8000_192000,
 		.rates =	SNDRV_PCM_RATE_8000_192000,
 		.formats =	SNDRV_PCM_FMTBIT_S16_LE
 		.formats =	SNDRV_PCM_FMTBIT_S16_LE
+				| SNDRV_PCM_FMTBIT_S24_LE
 				| SNDRV_PCM_FMTBIT_S32_LE
 				| SNDRV_PCM_FMTBIT_S32_LE
 		},
 		},
 	.capture = {
 	.capture = {
@@ -577,6 +581,7 @@ static struct snd_soc_dai_driver bcm2835_i2s_dai = {
 		.channels_max = 2,
 		.channels_max = 2,
 		.rates =	SNDRV_PCM_RATE_8000_192000,
 		.rates =	SNDRV_PCM_RATE_8000_192000,
 		.formats =	SNDRV_PCM_FMTBIT_S16_LE
 		.formats =	SNDRV_PCM_FMTBIT_S16_LE
+				| SNDRV_PCM_FMTBIT_S24_LE
 				| SNDRV_PCM_FMTBIT_S32_LE
 				| SNDRV_PCM_FMTBIT_S32_LE
 		},
 		},
 	.ops = &bcm2835_i2s_dai_ops,
 	.ops = &bcm2835_i2s_dai_ops,