aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2014-01-21 03:23:16 -0500
committerLee Jones <lee.jones@linaro.org>2014-01-21 03:23:16 -0500
commit6eb37eb276f0b91adb43b853ce6fb0812fbf0883 (patch)
treef57e6ddb20a498e57bdc2faf5136879519fda79e /sound
parentac99a037bce3e6ae16d45ffb26eadbfc518fc143 (diff)
parent254dc326dbfd23c2678fafad1b84fc0e42ac4374 (diff)
Merge tag 'tags/ib-asoc-1' into for-mfd-next
Immutable branch for ASoC, as requested by Mark Brown
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/arizona.c10
-rw-r--r--sound/soc/codecs/arizona.h1
-rw-r--r--sound/soc/codecs/wm5110.c19
3 files changed, 30 insertions, 0 deletions
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index fea991031be1..f5588bd50051 100644
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -560,6 +560,16 @@ const struct soc_enum arizona_ng_hold =
560 4, arizona_ng_hold_text); 560 4, arizona_ng_hold_text);
561EXPORT_SYMBOL_GPL(arizona_ng_hold); 561EXPORT_SYMBOL_GPL(arizona_ng_hold);
562 562
563static const char * const arizona_in_hpf_cut_text[] = {
564 "2.5Hz", "5Hz", "10Hz", "20Hz", "40Hz"
565};
566
567const struct soc_enum arizona_in_hpf_cut_enum =
568 SOC_ENUM_SINGLE(ARIZONA_HPF_CONTROL, ARIZONA_IN_HPF_CUT_SHIFT,
569 ARRAY_SIZE(arizona_in_hpf_cut_text),
570 arizona_in_hpf_cut_text);
571EXPORT_SYMBOL_GPL(arizona_in_hpf_cut_enum);
572
563static const char * const arizona_in_dmic_osr_text[] = { 573static const char * const arizona_in_dmic_osr_text[] = {
564 "1.536MHz", "3.072MHz", "6.144MHz", 574 "1.536MHz", "3.072MHz", "6.144MHz",
565}; 575};
diff --git a/sound/soc/codecs/arizona.h b/sound/soc/codecs/arizona.h
index 9e81b6392692..f8e63865a1c5 100644
--- a/sound/soc/codecs/arizona.h
+++ b/sound/soc/codecs/arizona.h
@@ -199,6 +199,7 @@ extern const struct soc_enum arizona_lhpf3_mode;
199extern const struct soc_enum arizona_lhpf4_mode; 199extern const struct soc_enum arizona_lhpf4_mode;
200 200
201extern const struct soc_enum arizona_ng_hold; 201extern const struct soc_enum arizona_ng_hold;
202extern const struct soc_enum arizona_in_hpf_cut_enum;
202extern const struct soc_enum arizona_in_dmic_osr[]; 203extern const struct soc_enum arizona_in_dmic_osr[];
203 204
204extern int arizona_in_ev(struct snd_soc_dapm_widget *w, 205extern int arizona_in_ev(struct snd_soc_dapm_widget *w,
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index 0ab2dc296474..9add6c7b5360 100644
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -117,6 +117,25 @@ SOC_SINGLE_RANGE_TLV("IN3L Volume", ARIZONA_IN3L_CONTROL,
117SOC_SINGLE_RANGE_TLV("IN3R Volume", ARIZONA_IN3R_CONTROL, 117SOC_SINGLE_RANGE_TLV("IN3R Volume", ARIZONA_IN3R_CONTROL,
118 ARIZONA_IN3R_PGA_VOL_SHIFT, 0x40, 0x5f, 0, ana_tlv), 118 ARIZONA_IN3R_PGA_VOL_SHIFT, 0x40, 0x5f, 0, ana_tlv),
119 119
120SOC_ENUM("IN HPF Cutoff Frequency", arizona_in_hpf_cut_enum),
121
122SOC_SINGLE("IN1L HPF Switch", ARIZONA_IN1L_CONTROL,
123 ARIZONA_IN1L_HPF_SHIFT, 1, 0),
124SOC_SINGLE("IN1R HPF Switch", ARIZONA_IN1R_CONTROL,
125 ARIZONA_IN1R_HPF_SHIFT, 1, 0),
126SOC_SINGLE("IN2L HPF Switch", ARIZONA_IN2L_CONTROL,
127 ARIZONA_IN2L_HPF_SHIFT, 1, 0),
128SOC_SINGLE("IN2R HPF Switch", ARIZONA_IN2R_CONTROL,
129 ARIZONA_IN2R_HPF_SHIFT, 1, 0),
130SOC_SINGLE("IN3L HPF Switch", ARIZONA_IN3L_CONTROL,
131 ARIZONA_IN3L_HPF_SHIFT, 1, 0),
132SOC_SINGLE("IN3R HPF Switch", ARIZONA_IN3R_CONTROL,
133 ARIZONA_IN3R_HPF_SHIFT, 1, 0),
134SOC_SINGLE("IN4L HPF Switch", ARIZONA_IN4L_CONTROL,
135 ARIZONA_IN4L_HPF_SHIFT, 1, 0),
136SOC_SINGLE("IN4R HPF Switch", ARIZONA_IN4R_CONTROL,
137 ARIZONA_IN4R_HPF_SHIFT, 1, 0),
138
120SOC_SINGLE_TLV("IN1L Digital Volume", ARIZONA_ADC_DIGITAL_VOLUME_1L, 139SOC_SINGLE_TLV("IN1L Digital Volume", ARIZONA_ADC_DIGITAL_VOLUME_1L,
121 ARIZONA_IN1L_DIG_VOL_SHIFT, 0xbf, 0, digital_tlv), 140 ARIZONA_IN1L_DIG_VOL_SHIFT, 0xbf, 0, digital_tlv),
122SOC_SINGLE_TLV("IN1R Digital Volume", ARIZONA_ADC_DIGITAL_VOLUME_1R, 141SOC_SINGLE_TLV("IN1R Digital Volume", ARIZONA_ADC_DIGITAL_VOLUME_1R,