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

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

Merge remote-tracking branch 'asoc/topic/ext' into asoc-next

parents fbc6c4ee f0ddb219

sound/soc/codecs/88pm860x-codec.c

+2 −4
Original line number Diff line number Diff line
@@ -120,10 +120,8 @@ 
 * before DAC & PGA in DAPM power-off sequence.

 */

#define PM860X_DAPM_OUTPUT(wname, wevent)	\

{	.id = snd_soc_dapm_pga, .name = wname, .reg = SND_SOC_NOPM, \

	.shift = 0, .invert = 0, .kcontrol_news = NULL, \

	.num_kcontrols = 0, .event = wevent, \

	.event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD, }

	SND_SOC_DAPM_PGA_E(wname, SND_SOC_NOPM, 0, 0, NULL, 0, wevent, \

			    SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD)



struct pm860x_det {

	struct snd_soc_jack	*hp_jack;

sound/soc/codecs/tlv320aic3x.c

+2 −4
Original line number Diff line number Diff line
@@ -128,10 +128,8 @@ static const u8 aic3x_reg[AIC3X_CACHEREGNUM] = { 
};



#define SOC_DAPM_SINGLE_AIC3X(xname, reg, shift, mask, invert) \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \

	.info = snd_soc_info_volsw, \

	.get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw_aic3x, \

	.private_value =  SOC_SINGLE_VALUE(reg, shift, mask, invert) }

	SOC_SINGLE_EXT(xname, reg, shift, mask, invert, \

		snd_soc_dapm_get_volsw, snd_soc_dapm_put_volsw_aic3x)



/*

 * All input lines are connected when !0xf and disconnected with 0xf bit field,

sound/soc/codecs/wm8400.c

+2 −7
Original line number Diff line number Diff line
@@ -143,13 +143,8 @@ static int wm8400_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol, 
}



#define WM8400_OUTPGA_SINGLE_R_TLV(xname, reg, shift, max, invert, tlv_array) \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \

	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\

		SNDRV_CTL_ELEM_ACCESS_READWRITE,\

	.tlv.p = (tlv_array), \

	.info = snd_soc_info_volsw, \

	.get = snd_soc_get_volsw, .put = wm8400_outpga_put_volsw_vu, \

	.private_value = SOC_SINGLE_VALUE(reg, shift, max, invert) }

	SOC_SINGLE_EXT_TLV(xname, reg, shift, max, invert, \

		snd_soc_get_volsw, wm8400_outpga_put_volsw_vu, tlv_array)





static const char *wm8400_digital_sidetone[] =

sound/soc/codecs/wm8903.c

+2 −4
Original line number Diff line number Diff line
@@ -403,10 +403,8 @@ static int wm8903_class_w_put(struct snd_kcontrol *kcontrol, 
}



#define SOC_DAPM_SINGLE_W(xname, reg, shift, max, invert) \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \

	.info = snd_soc_info_volsw, \

	.get = snd_soc_dapm_get_volsw, .put = wm8903_class_w_put, \

	.private_value =  SOC_SINGLE_VALUE(reg, shift, max, invert) }

	SOC_SINGLE_EXT(xname, reg, shift, max, invert, \

		snd_soc_dapm_get_volsw, wm8903_class_w_put)





static int wm8903_deemph[] = { 0, 32000, 44100, 48000 };

sound/soc/codecs/wm8904.c

+2 −7
Original line number Diff line number Diff line
@@ -603,13 +603,8 @@ SOC_DOUBLE_R("Capture Switch", WM8904_ANALOGUE_LEFT_INPUT_0, 


SOC_SINGLE("High Pass Filter Switch", WM8904_ADC_DIGITAL_0, 4, 1, 0),

SOC_ENUM("High Pass Filter Mode", hpf_mode),



{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "ADC 128x OSR Switch",

	.info = snd_soc_info_volsw, .get = snd_soc_get_volsw,

	.put = wm8904_adc_osr_put,

	.private_value = SOC_SINGLE_VALUE(WM8904_ANALOGUE_ADC_0, 0, 1, 0),

},

SOC_SINGLE_EXT("ADC 128x OSR Switch", WM8904_ANALOGUE_ADC_0, 0, 1, 0,

	snd_soc_get_volsw, wm8904_adc_osr_put),

};



static const char *drc_path_text[] = {