From a3d428f5f2de9ec1dcce0725bdc9043ec178406b Mon Sep 17 00:00:00 2001
From: root <root@yes-desktop.(none)>
Date: Tue, 20 Jul 2010 17:39:44 +0800
Subject: [PATCH] wm8994 codec recorder
---
sound/soc/codecs/wm8994.c | 6 ++++--
sound/soc/rk2818/rk2818_i2s.c | 9 ++++++---
sound/soc/rk2818/rk2818_pcm.c | 2 +-
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 3f7df264e22e..573b5ab232df 100755
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -2234,7 +2234,9 @@ static int wm8994_set_bias_level(struct snd_soc_codec *codec,
return 0;
}
-#define WM8994_RATES SNDRV_PCM_RATE_8000_96000
+//#define WM8994_RATES SNDRV_PCM_RATE_8000_96000//cjq
+
+#define WM8994_RATES (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000)
#define WM8994_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
SNDRV_PCM_FMTBIT_S24_LE)
@@ -2258,7 +2260,7 @@ struct snd_soc_dai wm8994_dai = {
},
.capture = {
.stream_name = "Capture",
- .channels_min = 1,
+ .channels_min = 2,
.channels_max = 2,
.rates = WM8994_RATES,
.formats = WM8994_FORMATS,
diff --git a/sound/soc/rk2818/rk2818_i2s.c b/sound/soc/rk2818/rk2818_i2s.c
index 2c49febc5319..69ed88a57f83 100755
--- a/sound/soc/rk2818/rk2818_i2s.c
+++ b/sound/soc/rk2818/rk2818_i2s.c
@@ -343,10 +343,13 @@ int rockchip_i2s_resume(struct snd_soc_dai *cpu_dai)
#endif
-#define ROCKCHIP_I2S_RATES \
+/*#define ROCKCHIP_I2S_RATES \
(SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 | SNDRV_PCM_RATE_16000 | \
SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \
- SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000)
+ SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000)*///cjq
+
+#define ROCKCHIP_I2S_RATES \
+ (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000)
static struct snd_soc_dai_ops rockchip_i2s_dai_ops = {
.trigger = rockchip_i2s_trigger,
@@ -368,7 +371,7 @@ struct snd_soc_dai rk2818_i2s_dai = {
.rates = ROCKCHIP_I2S_RATES,
.formats = SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE,},
.capture = {
- .channels_min = 1,
+ .channels_min = 2,
.channels_max = 2,
.rates = ROCKCHIP_I2S_RATES,
.formats = SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE,},
diff --git a/sound/soc/rk2818/rk2818_pcm.c b/sound/soc/rk2818/rk2818_pcm.c
index 827d810aac08..bedaf6f00a38 100755
--- a/sound/soc/rk2818/rk2818_pcm.c
+++ b/sound/soc/rk2818/rk2818_pcm.c
@@ -52,7 +52,7 @@ static const struct snd_pcm_hardware rockchip_pcm_hardware = {
SNDRV_PCM_FMTBIT_U16_LE |
SNDRV_PCM_FMTBIT_U8 |
SNDRV_PCM_FMTBIT_S8,
- .channels_min = 1,
+ .channels_min = 2,
.channels_max = 2,
.buffer_bytes_max = 128*1024,
.period_bytes_min = 64, ///PAGE_SIZE,
--
2.34.1