From c3e6aa3a2483a711b360753430a1f79939a2e365 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Fri, 10 Dec 2010 18:42:58 +0000 Subject: [PATCH] --- yaml --- r: 230367 b: refs/heads/master c: 460f4aae8f9c6e414f17bfaaf9b89942ed5984a6 h: refs/heads/master i: 230365: 9ffb7f7ad09e24948faf2fc14a458821d40d3eba 230363: cd6fa6fd23de3e1bd82d34b547b27e4a9a8d8be1 230359: b674ff664e630ea5b8cd7874bd669ad29f48f739 230351: 116e17b389b9bcfac7f0be8f4859acc0087d9a91 230335: 137404e85d0606b9df03dbfe3f42227cc00ba4a2 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8903.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5a476e85a2d7..9f8c7580dee9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1957668be903b2c98e1dfb295510850531eea135 +refs/heads/master: 460f4aae8f9c6e414f17bfaaf9b89942ed5984a6 diff --git a/trunk/sound/soc/codecs/wm8903.c b/trunk/sound/soc/codecs/wm8903.c index 620793e51666..797992c09342 100644 --- a/trunk/sound/soc/codecs/wm8903.c +++ b/trunk/sound/soc/codecs/wm8903.c @@ -474,6 +474,13 @@ static const DECLARE_TLV_DB_SCALE(drc_tlv_min, 0, 600, 0); static const DECLARE_TLV_DB_SCALE(drc_tlv_max, 1200, 600, 0); static const DECLARE_TLV_DB_SCALE(drc_tlv_startup, -300, 50, 0); +static const char *hpf_mode_text[] = { + "Hi-fi", "Voice 1", "Voice 2", "Voice 3" +}; + +static const struct soc_enum hpf_mode = + SOC_ENUM_SINGLE(WM8903_ADC_DIGITAL_0, 5, 4, hpf_mode_text); + static const char *drc_slope_text[] = { "1", "1/2", "1/4", "1/8", "1/16", "0" }; @@ -612,6 +619,8 @@ SOC_SINGLE("Right Input PGA Common Mode Switch", WM8903_ANALOGUE_RIGHT_INPUT_1, 6, 1, 0), /* ADCs */ +SOC_SINGLE("HPF Switch", WM8903_ADC_DIGITAL_0, 4, 1, 0), +SOC_ENUM("HPF Mode", hpf_mode), SOC_SINGLE("DRC Switch", WM8903_DRC_0, 15, 1, 0), SOC_ENUM("DRC Compressor Slope R0", drc_slope_r0), SOC_ENUM("DRC Compressor Slope R1", drc_slope_r1),