Skip to content

Commit d4c84d9

Browse files
committed
Revert "ASoC: bcm2835: add 24bit support"
This reverts commit a34b027.
1 parent d4481e2 commit d4c84d9

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

sound/soc/bcm/bcm2835-i2s.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,6 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream,
259259
case SNDRV_PCM_FORMAT_S16_LE:
260260
data_length = 16;
261261
break;
262-
case SNDRV_PCM_FORMAT_S24_LE:
263-
data_length = 24;
264-
break;
265262
case SNDRV_PCM_FORMAT_S32_LE:
266263
data_length = 32;
267264
break;
@@ -282,7 +279,7 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream,
282279
/* Setup the frame format */
283280
format = BCM2835_I2S_CHEN;
284281

285-
if (data_length >= 24)
282+
if (data_length > 24)
286283
format |= BCM2835_I2S_CHWEX;
287284

288285
format |= BCM2835_I2S_CHWID((data_length-8)&0xf);
@@ -573,15 +570,13 @@ static struct snd_soc_dai_driver bcm2835_i2s_dai = {
573570
.channels_max = 2,
574571
.rates = SNDRV_PCM_RATE_8000_192000,
575572
.formats = SNDRV_PCM_FMTBIT_S16_LE
576-
| SNDRV_PCM_FMTBIT_S24_LE
577573
| SNDRV_PCM_FMTBIT_S32_LE
578574
},
579575
.capture = {
580576
.channels_min = 2,
581577
.channels_max = 2,
582578
.rates = SNDRV_PCM_RATE_8000_192000,
583579
.formats = SNDRV_PCM_FMTBIT_S16_LE
584-
| SNDRV_PCM_FMTBIT_S24_LE
585580
| SNDRV_PCM_FMTBIT_S32_LE
586581
},
587582
.ops = &bcm2835_i2s_dai_ops,

0 commit comments

Comments
 (0)