From: fang Date: Thu, 30 Dec 2010 07:38:03 +0000 (+0800) Subject: update for Android 2.3 Recode X-Git-Tag: firefly_0821_release~10858 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e76118e89380eb3b3f2f04a4be1377d828e8ec5f;p=firefly-linux-kernel-4.4.55.git update for Android 2.3 Recode --- diff --git a/sound/soc/rk29/rk29_i2s.c b/sound/soc/rk29/rk29_i2s.c index 35226ae6651e..a5fd9aa488ff 100755 --- a/sound/soc/rk29/rk29_i2s.c +++ b/sound/soc/rk29/rk29_i2s.c @@ -559,11 +559,11 @@ static int __devinit rockchip_i2s_probe(struct platform_device *pdev) dai->playback.channels_max = 2; } dai->playback.rates = ROCKCHIP_I2S_RATES; - dai->playback.formats = SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE; + dai->playback.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | SNDRV_PCM_FMTBIT_S24_LE; dai->capture.channels_min = 2; dai->capture.channels_max = 2; - dai->capture.rates = ROCKCHIP_I2S_RATES; - dai->capture.formats = SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE; + dai->capture.rates = SNDRV_PCM_RATE_44100;//ROCKCHIP_I2S_RATES; + dai->capture.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | SNDRV_PCM_FMTBIT_S24_LE; dai->probe = rockchip_i2s_dai_probe; dai->ops = &rockchip_i2s_dai_ops; diff --git a/sound/soc/rk29/rk29_pcm.c b/sound/soc/rk29/rk29_pcm.c index dd38a4248032..f04bc5f812d8 100755 --- a/sound/soc/rk29/rk29_pcm.c +++ b/sound/soc/rk29/rk29_pcm.c @@ -47,10 +47,9 @@ static const struct snd_pcm_hardware rockchip_pcm_hardware = { SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME, - .formats = SNDRV_PCM_FMTBIT_S16_LE | - SNDRV_PCM_FMTBIT_U16_LE | - SNDRV_PCM_FMTBIT_U8 | - SNDRV_PCM_FMTBIT_S8, + .formats = SNDRV_PCM_FMTBIT_S24_LE | + SNDRV_PCM_FMTBIT_S20_3LE | + SNDRV_PCM_FMTBIT_S16_LE, .channels_min = 2, .channels_max = 8, .buffer_bytes_max = 128*1024,