Modified: trunk/sound/soc/blackfin/bf5xx-adau1373.c (8884 => 8885)
--- trunk/sound/soc/blackfin/bf5xx-adau1373.c 2010-06-03 04:19:19 UTC (rev 8884)
+++ trunk/sound/soc/blackfin/bf5xx-adau1373.c 2010-06-03 07:57:58 UTC (rev 8885)
@@ -40,7 +40,8 @@
static struct adau1373_platform_data adau1373_pdata = {
.pll_settings_num = ARRAY_SIZE(adau1373_pll_settings),
.pll_settings = adau1373_pll_settings,
- .drc_settings = { 0x07, 0x77, 0x33, 0x88, 0x5d, 0x77, 0x77, 0x13 },
+ .drc_settings = { 0x03, 0x33, 0x00, 0x00, 0x00, 0x88, 0x00,
+ 0x77, 0x77, 0x13, 0x00, 0x02, 0x03 },
};
static int bf5xx_adau1373_hw_params(struct snd_pcm_substream *substream,
Modified: trunk/sound/soc/blackfin/bf5xx-i2s.c (8884 => 8885)
--- trunk/sound/soc/blackfin/bf5xx-i2s.c 2010-06-03 04:19:19 UTC (rev 8884)
+++ trunk/sound/soc/blackfin/bf5xx-i2s.c 2010-06-03 07:57:58 UTC (rev 8885)
@@ -109,16 +109,15 @@
bf5xx_i2s->tcr2 &= ~0x1f;
bf5xx_i2s->rcr2 &= ~0x1f;
switch (params_format(params)) {
+ case SNDRV_PCM_FMTBIT_S8:
+ bf5xx_i2s->tcr2 |= 7;
+ bf5xx_i2s->rcr2 |= 7;
+ sport_handle->wdsize = 1;
case SNDRV_PCM_FORMAT_S16_LE:
bf5xx_i2s->tcr2 |= 15;
bf5xx_i2s->rcr2 |= 15;
sport_handle->wdsize = 2;
break;
- case SNDRV_PCM_FORMAT_S24_LE:
- bf5xx_i2s->tcr2 |= 23;
- bf5xx_i2s->rcr2 |= 23;
- sport_handle->wdsize = 3;
- break;
case SNDRV_PCM_FORMAT_S32_LE:
bf5xx_i2s->tcr2 |= 31;
bf5xx_i2s->rcr2 |= 31;
@@ -214,8 +213,7 @@
SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 | \
SNDRV_PCM_RATE_96000)
-#define BF5XX_I2S_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE |\
- SNDRV_PCM_FMTBIT_S32_LE)
+#define BF5XX_I2S_FORMATS (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE)
static struct snd_soc_dai_ops bf5xx_i2s_dai_ops = {
.shutdown = bf5xx_i2s_shutdown,
@@ -229,12 +227,12 @@
.suspend = bf5xx_i2s_suspend,
.resume = bf5xx_i2s_resume,
.playback = {
- .channels_min = 1,
+ .channels_min = 2,
.channels_max = 2,
.rates = BF5XX_I2S_RATES,
.formats = BF5XX_I2S_FORMATS,},
.capture = {
- .channels_min = 1,
+ .channels_min = 2,
.channels_max = 2,
.rates = BF5XX_I2S_RATES,
.formats = BF5XX_I2S_FORMATS,},
