aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBard Liao <bardliao@realtek.com>2016-10-25 21:40:44 -0400
committerMark Brown <broonie@kernel.org>2016-10-28 14:44:40 -0400
commitca5f17c59b63c3e52f8fad887c27c6eaa5ced81f (patch)
tree81b8e8f1a2c9f5db13862ae65ee56bed9556752f
parent25fb7062484a219174baab0761e06bbfd8fa3b07 (diff)
ASoC: rt5640: add Mono ADC Capture Switch control
Mono ADC Capture Switch control is missing in the driver. So, add it. Signed-off-by: Bard Liao <bardliao@realtek.com> Tested-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/codecs/rt5640.c2
-rw-r--r--sound/soc/codecs/rt5640.h4
2 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
index 0a7378f81acb..e29a6defefa0 100644
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
@@ -423,6 +423,8 @@ static const struct snd_kcontrol_new rt5640_snd_controls[] = {
423 SOC_DOUBLE_TLV("ADC Capture Volume", RT5640_ADC_DIG_VOL, 423 SOC_DOUBLE_TLV("ADC Capture Volume", RT5640_ADC_DIG_VOL,
424 RT5640_L_VOL_SFT, RT5640_R_VOL_SFT, 424 RT5640_L_VOL_SFT, RT5640_R_VOL_SFT,
425 127, 0, adc_vol_tlv), 425 127, 0, adc_vol_tlv),
426 SOC_DOUBLE("Mono ADC Capture Switch", RT5640_DUMMY1,
427 RT5640_M_MONO_ADC_L_SFT, RT5640_M_MONO_ADC_R_SFT, 1, 1),
426 SOC_DOUBLE_TLV("Mono ADC Capture Volume", RT5640_ADC_DATA, 428 SOC_DOUBLE_TLV("Mono ADC Capture Volume", RT5640_ADC_DATA,
427 RT5640_L_VOL_SFT, RT5640_R_VOL_SFT, 429 RT5640_L_VOL_SFT, RT5640_R_VOL_SFT,
428 127, 0, adc_vol_tlv), 430 127, 0, adc_vol_tlv),
diff --git a/sound/soc/codecs/rt5640.h b/sound/soc/codecs/rt5640.h
index 22c017c58d5b..b8a811732a52 100644
--- a/sound/soc/codecs/rt5640.h
+++ b/sound/soc/codecs/rt5640.h
@@ -1971,6 +1971,10 @@
1971#define RT5640_ZCD_HP_EN (0x1 << 15) 1971#define RT5640_ZCD_HP_EN (0x1 << 15)
1972 1972
1973/* General Control 1 (0xfa) */ 1973/* General Control 1 (0xfa) */
1974#define RT5640_M_MONO_ADC_L (0x1 << 13)
1975#define RT5640_M_MONO_ADC_L_SFT 13
1976#define RT5640_M_MONO_ADC_R (0x1 << 12)
1977#define RT5640_M_MONO_ADC_R_SFT 12
1974#define RT5640_MCLK_DET (0x1 << 11) 1978#define RT5640_MCLK_DET (0x1 << 11)
1975 1979
1976/* Codec Private Register definition */ 1980/* Codec Private Register definition */