xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: wm5110: Correct input OSR bits for wm5110

Browse Source 
The input OSR bits are specified differently for wm5110 than for current
revs of wm5102. This patch corrects support for this on wm5110.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Charles Keepax
2013-08-06 17:03:55 +01:00
committed by Mark Brown
parent b79fae606c
commit c7f3843575
3 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sound/soc/codecs/arizona.c
View File

@@ -553,6 +553,26 @@ const struct soc_enum arizona_ng_hold =
4, arizona_ng_hold_text); 4, arizona_ng_hold_text);
EXPORT_SYMBOL_GPL(arizona_ng_hold); EXPORT_SYMBOL_GPL(arizona_ng_hold);
static const char * const arizona_in_dmic_osr_text[] = {
"1.536MHz", "3.072MHz", "6.144MHz",
};
const struct soc_enum arizona_in_dmic_osr[] = {
SOC_ENUM_SINGLE(ARIZONA_IN1L_CONTROL, ARIZONA_IN1_OSR_SHIFT,
ARRAY_SIZE(arizona_in_dmic_osr_text),
arizona_in_dmic_osr_text),
SOC_ENUM_SINGLE(ARIZONA_IN2L_CONTROL, ARIZONA_IN2_OSR_SHIFT,
ARRAY_SIZE(arizona_in_dmic_osr_text),
arizona_in_dmic_osr_text),
SOC_ENUM_SINGLE(ARIZONA_IN3L_CONTROL, ARIZONA_IN3_OSR_SHIFT,
ARRAY_SIZE(arizona_in_dmic_osr_text),
arizona_in_dmic_osr_text),
SOC_ENUM_SINGLE(ARIZONA_IN4L_CONTROL, ARIZONA_IN4_OSR_SHIFT,
ARRAY_SIZE(arizona_in_dmic_osr_text),
arizona_in_dmic_osr_text),
};
EXPORT_SYMBOL_GPL(arizona_in_dmic_osr);
static void arizona_in_set_vu(struct snd_soc_codec *codec, int ena) static void arizona_in_set_vu(struct snd_soc_codec *codec, int ena)
{ {
struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec); struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);

1
sound/soc/codecs/arizona.h
View File

@@ -198,6 +198,7 @@ extern const struct soc_enum arizona_lhpf3_mode;
extern const struct soc_enum arizona_lhpf4_mode; extern const struct soc_enum arizona_lhpf4_mode;
extern const struct soc_enum arizona_ng_hold; extern const struct soc_enum arizona_ng_hold;
extern const struct soc_enum arizona_in_dmic_osr[];
extern int arizona_in_ev(struct snd_soc_dapm_widget *w, extern int arizona_in_ev(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, struct snd_kcontrol *kcontrol,

12
sound/soc/codecs/wm5110.c
View File

@@ -58,14 +58,10 @@ static DECLARE_TLV_DB_SCALE(ng_tlv, -10200, 600, 0);
SOC_SINGLE(name " NG SPKDAT2R Switch", base, 11, 1, 0) SOC_SINGLE(name " NG SPKDAT2R Switch", base, 11, 1, 0)
static const struct snd_kcontrol_new wm5110_snd_controls[] = { static const struct snd_kcontrol_new wm5110_snd_controls[] = {
SOC_SINGLE("IN1 High Performance Switch", ARIZONA_IN1L_CONTROL, SOC_ENUM("IN1 OSR", arizona_in_dmic_osr[0]),
ARIZONA_IN1_OSR_SHIFT, 1, 0), SOC_ENUM("IN2 OSR", arizona_in_dmic_osr[1]),
SOC_SINGLE("IN2 High Performance Switch", ARIZONA_IN2L_CONTROL, SOC_ENUM("IN3 OSR", arizona_in_dmic_osr[2]),
ARIZONA_IN2_OSR_SHIFT, 1, 0), SOC_ENUM("IN4 OSR", arizona_in_dmic_osr[3]),
SOC_SINGLE("IN3 High Performance Switch", ARIZONA_IN3L_CONTROL,
ARIZONA_IN3_OSR_SHIFT, 1, 0),
SOC_SINGLE("IN4 High Performance Switch", ARIZONA_IN4L_CONTROL,
ARIZONA_IN4_OSR_SHIFT, 1, 0),
SOC_SINGLE_RANGE_TLV("IN1L Volume", ARIZONA_IN1L_CONTROL, SOC_SINGLE_RANGE_TLV("IN1L Volume", ARIZONA_IN1L_CONTROL,
ARIZONA_IN1L_PGA_VOL_SHIFT, 0x40, 0x5f, 0, ana_tlv), ARIZONA_IN1L_PGA_VOL_SHIFT, 0x40, 0x5f, 0, ana_tlv),