update for Android 2.3 Recode

diff --git a/sound/soc/rk29/rk29_i2s.c b/sound/soc/rk29/rk29_i2s.c
index 35226ae6651e37de01f3dffe8382c6bf3383dac0..a5fd9aa488ffdd2cca6c52a7c63aaf1e4cd2e11c 100755 (executable)
--- 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 dd38a4248032fb207cadb0246803ec688bfc20e2..f04bc5f812d868f256451b17b910bc63ae376358 100755 (executable)
--- 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,