aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorUK KIM <w0806.kim@samsung.com>2010-10-05 23:10:58 -0700
committerArve Hjønnevåg <arve@android.com>2011-11-17 17:47:04 -0800
commit17cfe63a324818c8921b7969e143853c7c18145c (patch)
tree9e25a7b96dd21fc65c4dcd58c6dcb4e91f5edcdc /sound/soc
parent0bd74fc36b34517f24e86da6f2752055205afedc (diff)
downloadkernel_samsung_crespo-17cfe63a324818c8921b7969e143853c7c18145c.zip
kernel_samsung_crespo-17cfe63a324818c8921b7969e143853c7c18145c.tar.gz
kernel_samsung_crespo-17cfe63a324818c8921b7969e143853c7c18145c.tar.bz2
S5PC11X: SOUND: update H/W codec's gain values.
Signed-off-by: UK KIM <w0806.kim@samsung.com> Change-Id: Id5c1989203014aa72ba0f24de9cdff52e932811e
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/wm8994_herring.c16
-rwxr-xr-xsound/soc/codecs/wm8994_samsung.h2
2 files changed, 4 insertions, 14 deletions
diff --git a/sound/soc/codecs/wm8994_herring.c b/sound/soc/codecs/wm8994_herring.c
index 18df501..24957da 100644
--- a/sound/soc/codecs/wm8994_herring.c
+++ b/sound/soc/codecs/wm8994_herring.c
@@ -110,16 +110,6 @@ struct gain_info_t playback_gain_table[PLAYBACK_GAIN_NUM] = {
.reg = WM8994_AIF1_DAC1_RIGHT_VOLUME, /* 403h */
.mask = WM8994_AIF1DAC1R_VOL_MASK,
.gain = WM8994_AIF1DAC1_VU | 0xB8
- }, {
- .mode = PLAYBACK_SPK,
- .reg = WM8994_DAC1_LEFT_VOLUME, /* 610h */
- .mask = WM8994_DAC1L_VOL_MASK,
- .gain = WM8994_DAC1_VU | 0xB1
- }, {
- .mode = PLAYBACK_SPK,
- .reg = WM8994_DAC1_RIGHT_VOLUME, /* 611h */
- .mask = WM8994_DAC1R_VOL_MASK,
- .gain = WM8994_DAC1_VU | 0xB1
}, { /* HP */
.mode = PLAYBACK_HP,
.reg = WM8994_LEFT_OUTPUT_VOLUME, /* 1Ch */
@@ -293,12 +283,12 @@ struct gain_info_t voicecall_gain_table[VOICECALL_GAIN_NUM] = {
.mode = VOICECALL_RCV,
.reg = WM8994_LEFT_OPGA_VOLUME, /* 20h */
.mask = WM8994_MIXOUTL_VOL_MASK,
- .gain = WM8994_MIXOUT_VU | 0x39
+ .gain = WM8994_MIXOUT_VU | 0x3F
}, {
.mode = VOICECALL_RCV,
.reg = WM8994_RIGHT_OPGA_VOLUME, /* 21h */
.mask = WM8994_MIXOUTR_VOL_MASK,
- .gain = WM8994_MIXOUT_VU | 0x39
+ .gain = WM8994_MIXOUT_VU | 0x3F
}, {
.mode = VOICECALL_RCV,
.reg = WM8994_HPOUT2_VOLUME, /* 1Fh */
@@ -328,7 +318,7 @@ struct gain_info_t voicecall_gain_table[VOICECALL_GAIN_NUM] = {
.mode = VOICECALL_SPK,
.reg = WM8994_SPEAKER_VOLUME_LEFT, /* 26h */
.mask = WM8994_SPKOUTL_VOL_MASK,
- .gain = WM8994_SPKOUT_VU | 0x39
+ .gain = WM8994_SPKOUT_VU | 0x3C
}, {
.mode = VOICECALL_SPK,
.reg = WM8994_SPEAKER_VOLUME_RIGHT, /* 27h */
diff --git a/sound/soc/codecs/wm8994_samsung.h b/sound/soc/codecs/wm8994_samsung.h
index caf1f9c..bd67510 100755
--- a/sound/soc/codecs/wm8994_samsung.h
+++ b/sound/soc/codecs/wm8994_samsung.h
@@ -71,7 +71,7 @@ extern struct snd_soc_dai wm8994_dai;
#define RECORDING_REC_HP (0x01 << 5)
#define RECORDING_REC_BT (0x01 << 6)
-#define PLAYBACK_GAIN_NUM 41
+#define PLAYBACK_GAIN_NUM 39
#define VOICECALL_GAIN_NUM 26
#define RECORDING_GAIN_NUM 16