Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7f38435 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: wm5110: Correct input OSR bits for wm5110 



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: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent b79fae60

sound/soc/codecs/arizona.c

+20 −0
Original line number Diff line number Diff line
@@ -553,6 +553,26 @@ const struct soc_enum arizona_ng_hold = 
			4, arizona_ng_hold_text);

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)

{

	struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);

sound/soc/codecs/arizona.h

+1 −0
Original line number Diff line number Diff line
@@ -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_ng_hold;

extern const struct soc_enum arizona_in_dmic_osr[];



extern int arizona_in_ev(struct snd_soc_dapm_widget *w,

			 struct snd_kcontrol *kcontrol,

sound/soc/codecs/wm5110.c

+4 −8
Original line number Diff line number Diff line
@@ -58,14 +58,10 @@ static DECLARE_TLV_DB_SCALE(ng_tlv, -10200, 600, 0); 
	SOC_SINGLE(name " NG SPKDAT2R Switch", base, 11, 1, 0)



static const struct snd_kcontrol_new wm5110_snd_controls[] = {

SOC_SINGLE("IN1 High Performance Switch", ARIZONA_IN1L_CONTROL,

	   ARIZONA_IN1_OSR_SHIFT, 1, 0),

SOC_SINGLE("IN2 High Performance Switch", ARIZONA_IN2L_CONTROL,

	   ARIZONA_IN2_OSR_SHIFT, 1, 0),

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_ENUM("IN1 OSR", arizona_in_dmic_osr[0]),

SOC_ENUM("IN2 OSR", arizona_in_dmic_osr[1]),

SOC_ENUM("IN3 OSR", arizona_in_dmic_osr[2]),

SOC_ENUM("IN4 OSR", arizona_in_dmic_osr[3]),



SOC_SINGLE_RANGE_TLV("IN1L Volume", ARIZONA_IN1L_CONTROL,

		     ARIZONA_IN1L_PGA_VOL_SHIFT, 0x40, 0x5f, 0, ana_tlv),