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

Commit d853c0cc authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/ad1980' and 'asoc/fix/isabelle' into asoc-linus

parents 45d39cbf 901bb6c5 cdbb4925

sound/soc/codecs/ad1980.c

+2 −2
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ static const u16 ad1980_reg[] = { 
static const char *ad1980_rec_sel[] = {"Mic", "CD", "NC", "AUX", "Line",

		"Stereo Mix", "Mono Mix", "Phone"};



static const struct soc_enum ad1980_cap_src =

	SOC_ENUM_DOUBLE(AC97_REC_SEL, 8, 0, 7, ad1980_rec_sel);

static SOC_ENUM_DOUBLE_DECL(ad1980_cap_src,

			    AC97_REC_SEL, 8, 0, ad1980_rec_sel);



static const struct snd_kcontrol_new ad1980_snd_ac97_controls[] = {

SOC_DOUBLE("Master Playback Volume", AC97_MASTER, 8, 0, 31, 1),

sound/soc/codecs/isabelle.c

+30 −22
Original line number Diff line number Diff line
@@ -140,13 +140,17 @@ static const char *isabelle_rx1_texts[] = {"VRX1", "ARX1"}; 
static const char *isabelle_rx2_texts[] = {"VRX2", "ARX2"};



static const struct soc_enum isabelle_rx1_enum[] = {

	SOC_ENUM_SINGLE(ISABELLE_VOICE_HPF_CFG_REG, 3, 1, isabelle_rx1_texts),

	SOC_ENUM_SINGLE(ISABELLE_AUDIO_HPF_CFG_REG, 5, 1, isabelle_rx1_texts),

	SOC_ENUM_SINGLE(ISABELLE_VOICE_HPF_CFG_REG, 3,

			ARRAY_SIZE(isabelle_rx1_texts), isabelle_rx1_texts),

	SOC_ENUM_SINGLE(ISABELLE_AUDIO_HPF_CFG_REG, 5,

			ARRAY_SIZE(isabelle_rx1_texts), isabelle_rx1_texts),

};



static const struct soc_enum isabelle_rx2_enum[] = {

	SOC_ENUM_SINGLE(ISABELLE_VOICE_HPF_CFG_REG, 2, 1, isabelle_rx2_texts),

	SOC_ENUM_SINGLE(ISABELLE_AUDIO_HPF_CFG_REG, 4, 1, isabelle_rx2_texts),

	SOC_ENUM_SINGLE(ISABELLE_VOICE_HPF_CFG_REG, 2,

			ARRAY_SIZE(isabelle_rx2_texts), isabelle_rx2_texts),

	SOC_ENUM_SINGLE(ISABELLE_AUDIO_HPF_CFG_REG, 4,

			ARRAY_SIZE(isabelle_rx2_texts), isabelle_rx2_texts),

};



/* Headset DAC playback switches */
@@ -161,13 +165,17 @@ static const char *isabelle_atx_texts[] = {"AMIC1", "DMIC"}; 
static const char *isabelle_vtx_texts[] = {"AMIC2", "DMIC"};



static const struct soc_enum isabelle_atx_enum[] = {

	SOC_ENUM_SINGLE(ISABELLE_AMIC_CFG_REG, 7, 1, isabelle_atx_texts),

	SOC_ENUM_SINGLE(ISABELLE_DMIC_CFG_REG, 0, 1, isabelle_atx_texts),

	SOC_ENUM_SINGLE(ISABELLE_AMIC_CFG_REG, 7,

			ARRAY_SIZE(isabelle_atx_texts), isabelle_atx_texts),

	SOC_ENUM_SINGLE(ISABELLE_DMIC_CFG_REG, 0,

			ARRAY_SIZE(isabelle_atx_texts), isabelle_atx_texts),

};



static const struct soc_enum isabelle_vtx_enum[] = {

	SOC_ENUM_SINGLE(ISABELLE_AMIC_CFG_REG, 6, 1, isabelle_vtx_texts),

	SOC_ENUM_SINGLE(ISABELLE_DMIC_CFG_REG, 0, 1, isabelle_vtx_texts),

	SOC_ENUM_SINGLE(ISABELLE_AMIC_CFG_REG, 6,

			ARRAY_SIZE(isabelle_vtx_texts), isabelle_vtx_texts),

	SOC_ENUM_SINGLE(ISABELLE_DMIC_CFG_REG, 0,

			ARRAY_SIZE(isabelle_vtx_texts), isabelle_vtx_texts),

};



static const struct snd_kcontrol_new atx_mux_controls =
@@ -183,17 +191,13 @@ static const char *isabelle_amic1_texts[] = { 
/* Left analog microphone selection */

static const char *isabelle_amic2_texts[] = {"Sub Mic", "Aux/FM Right"};



static const struct soc_enum isabelle_amic1_enum[] = {

	SOC_ENUM_SINGLE(ISABELLE_AMIC_CFG_REG, 5,

			ARRAY_SIZE(isabelle_amic1_texts),

			isabelle_amic1_texts),

};

static SOC_ENUM_SINGLE_DECL(isabelle_amic1_enum,

			    ISABELLE_AMIC_CFG_REG, 5,

			    isabelle_amic1_texts);



static const struct soc_enum isabelle_amic2_enum[] = {

	SOC_ENUM_SINGLE(ISABELLE_AMIC_CFG_REG, 4,

			ARRAY_SIZE(isabelle_amic2_texts),

			isabelle_amic2_texts),

};

static SOC_ENUM_SINGLE_DECL(isabelle_amic2_enum,

			    ISABELLE_AMIC_CFG_REG, 4,

			    isabelle_amic2_texts);



static const struct snd_kcontrol_new amic1_control =

	SOC_DAPM_ENUM("Route", isabelle_amic1_enum);
@@ -206,16 +210,20 @@ static const char *isabelle_st_audio_texts[] = {"ATX1", "ATX2"}; 
static const char *isabelle_st_voice_texts[] = {"VTX1", "VTX2"};



static const struct soc_enum isabelle_st_audio_enum[] = {

	SOC_ENUM_SINGLE(ISABELLE_ATX_STPGA1_CFG_REG, 7, 1,

	SOC_ENUM_SINGLE(ISABELLE_ATX_STPGA1_CFG_REG, 7,

			ARRAY_SIZE(isabelle_st_audio_texts),

			isabelle_st_audio_texts),

	SOC_ENUM_SINGLE(ISABELLE_ATX_STPGA2_CFG_REG, 7, 1,

	SOC_ENUM_SINGLE(ISABELLE_ATX_STPGA2_CFG_REG, 7,

			ARRAY_SIZE(isabelle_st_audio_texts),

			isabelle_st_audio_texts),

};



static const struct soc_enum isabelle_st_voice_enum[] = {

	SOC_ENUM_SINGLE(ISABELLE_VTX_STPGA1_CFG_REG, 7, 1,

	SOC_ENUM_SINGLE(ISABELLE_VTX_STPGA1_CFG_REG, 7,

			ARRAY_SIZE(isabelle_st_voice_texts),

			isabelle_st_voice_texts),

	SOC_ENUM_SINGLE(ISABELLE_VTX2_STPGA2_CFG_REG, 7, 1,

	SOC_ENUM_SINGLE(ISABELLE_VTX2_STPGA2_CFG_REG, 7,

			ARRAY_SIZE(isabelle_st_voice_texts),

			isabelle_st_voice_texts),

};