aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorUk Kim <w0806.kim@samsung.com>2010-11-11 17:58:17 +0900
committerArve Hjønnevåg <arve@android.com>2011-11-17 17:52:15 -0800
commitab0e54b16ac9f6a19ebd68420ca3f3e0c2f8ddf2 (patch)
treee26ac7431e8f39a34f12808d9dec3cfa2c48cd4f /sound
parent55437a97e24f4585cf2919fb4ba27e76261e2bf5 (diff)
downloadkernel_samsung_crespo-ab0e54b16ac9f6a19ebd68420ca3f3e0c2f8ddf2.zip
kernel_samsung_crespo-ab0e54b16ac9f6a19ebd68420ca3f3e0c2f8ddf2.tar.gz
kernel_samsung_crespo-ab0e54b16ac9f6a19ebd68420ca3f3e0c2f8ddf2.tar.bz2
S5PC11X: SOUND: implemented MIC_OFF control for mic mute functionality.
disable mic path without closing input stream. Change-Id: If26c1c2317d94147dc038f63387eb14d12d1cb25 Signed-off-by: Uk Kim <w0806.kim@samsung.com>
Diffstat (limited to 'sound')
-rwxr-xr-xsound/soc/codecs/wm8994_herring.c2
-rwxr-xr-xsound/soc/codecs/wm8994_samsung.c3
2 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8994_herring.c b/sound/soc/codecs/wm8994_herring.c
index e227066..65ddcca 100755
--- a/sound/soc/codecs/wm8994_herring.c
+++ b/sound/soc/codecs/wm8994_herring.c
@@ -934,6 +934,7 @@ void wm8994_disable_rec_path(struct snd_soc_codec *codec)
break;
case BT_REC:
+ DEBUG_LOG("Disbaling BT Mic path..\n");
val = wm8994_read(codec, WM8994_AIF1_ADC1_LEFT_MIXER_ROUTING);
val &= ~(WM8994_AIF2DACL_TO_AIF1ADC1L_MASK |
WM8994_ADC1L_TO_AIF1ADC1L_MASK);
@@ -952,6 +953,7 @@ void wm8994_disable_rec_path(struct snd_soc_codec *codec)
case MIC_OFF:
DEBUG_LOG("Mic is already OFF!\n");
+ break;
default:
DEBUG_LOG_ERR("Path[%d] is not invaild!\n", mic);
diff --git a/sound/soc/codecs/wm8994_samsung.c b/sound/soc/codecs/wm8994_samsung.c
index d3e5385..84e8064 100755
--- a/sound/soc/codecs/wm8994_samsung.c
+++ b/sound/soc/codecs/wm8994_samsung.c
@@ -316,6 +316,9 @@ static int wm8994_set_mic_path(struct snd_kcontrol *kcontrol,
case 2:
wm8994->rec_path = BT_REC;
break;
+ case 3:
+ wm8994_disable_rec_path(codec);
+ return 0;
default:
return -EINVAL;
}