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

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

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

parents 566d4eef 9de98da2

include/sound/soc-dapm.h

+0 −12
Original line number Diff line number Diff line
@@ -107,10 +107,6 @@ struct device; 
{	.id = snd_soc_dapm_mux, .name = wname, \

	SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \

	.kcontrol_news = wcontrols, .num_kcontrols = 1}

#define SND_SOC_DAPM_VIRT_MUX(wname, wreg, wshift, winvert, wcontrols) \

	SND_SOC_DAPM_MUX(wname, wreg, wshift, winvert, wcontrols)

#define SND_SOC_DAPM_VALUE_MUX(wname, wreg, wshift, winvert, wcontrols) \

	SND_SOC_DAPM_MUX(wname, wreg, wshift, winvert, wcontrols)



/* Simplified versions of above macros, assuming wncontrols = ARRAY_SIZE(wcontrols) */

#define SOC_PGA_ARRAY(wname, wreg, wshift, winvert,\
@@ -166,10 +162,6 @@ struct device; 
	SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \

	.kcontrol_news = wcontrols, .num_kcontrols = 1, \

	.event = wevent, .event_flags = wflags}

#define SND_SOC_DAPM_VIRT_MUX_E(wname, wreg, wshift, winvert, wcontrols, \

	wevent, wflags) \

	SND_SOC_DAPM_MUX_E(wname, wreg, wshift, winvert, wcontrols, wevent, \

		wflags)



/* additional sequencing control within an event type */

#define SND_SOC_DAPM_PGA_S(wname, wsubseq, wreg, wshift, winvert, \
@@ -304,16 +296,12 @@ struct device; 
 	.get = snd_soc_dapm_get_enum_double, \

 	.put = snd_soc_dapm_put_enum_double, \

  	.private_value = (unsigned long)&xenum }

#define SOC_DAPM_ENUM_VIRT(xname, xenum) \

	SOC_DAPM_ENUM(xname, xenum)

#define SOC_DAPM_ENUM_EXT(xname, xenum, xget, xput) \

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

	.info = snd_soc_info_enum_double, \

	.get = xget, \

	.put = xput, \

	.private_value = (unsigned long)&xenum }

#define SOC_DAPM_VALUE_ENUM(xname, xenum) \

	SOC_DAPM_ENUM(xname, xenum)

#define SOC_DAPM_PIN_SWITCH(xname) \

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

	.info = snd_soc_dapm_info_pin_switch, \

include/sound/soc.h

+0 −2
Original line number Diff line number Diff line
@@ -196,8 +196,6 @@ 
	.info = snd_soc_info_enum_double, \

	.get = snd_soc_get_enum_double, .put = snd_soc_put_enum_double, \

	.private_value = (unsigned long)&xenum }

#define SOC_VALUE_ENUM(xname, xenum) \

	SOC_ENUM(xname, xenum)

#define SOC_SINGLE_EXT(xname, xreg, xshift, xmax, xinvert,\

	 xhandler_get, xhandler_put) \

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

sound/soc/codecs/adau1373.c

+3 −4
Original line number Diff line number Diff line
@@ -519,8 +519,7 @@ static const struct snd_kcontrol_new adau1373_controls[] = { 
	SOC_ENUM("HPF Channel", adau1373_hpf_channel_enum),



	SOC_ENUM("Bass HPF Cutoff", adau1373_bass_hpf_cutoff_enum),

	SOC_VALUE_ENUM("Bass Clip Level Threshold",

	    adau1373_bass_clip_level_enum),

	SOC_ENUM("Bass Clip Level Threshold", adau1373_bass_clip_level_enum),

	SOC_ENUM("Bass LPF Cutoff", adau1373_bass_lpf_cutoff_enum),

	SOC_DOUBLE("Bass Playback Switch", ADAU1373_BASS2, 0, 1, 1, 0),

	SOC_SINGLE_TLV("Bass Playback Volume", ADAU1373_BASS2, 2, 7, 0,
@@ -580,7 +579,7 @@ static SOC_ENUM_SINGLE_VIRT_DECL(adau1373_decimator_enum, 
	adau1373_decimator_text);



static const struct snd_kcontrol_new adau1373_decimator_mux =

	SOC_DAPM_ENUM_VIRT("Decimator Mux", adau1373_decimator_enum);

	SOC_DAPM_ENUM("Decimator Mux", adau1373_decimator_enum);



static const struct snd_kcontrol_new adau1373_left_adc_mixer_controls[] = {

	SOC_DAPM_SINGLE("DAC1 Switch", ADAU1373_LADC_MIXER, 4, 1, 0),
@@ -694,7 +693,7 @@ static const struct snd_soc_dapm_widget adau1373_dapm_widgets[] = { 
	SND_SOC_DAPM_ADC("DMIC1", NULL, ADAU1373_DIGMICCTRL, 0, 0),

	SND_SOC_DAPM_ADC("DMIC2", NULL, ADAU1373_DIGMICCTRL, 2, 0),



	SND_SOC_DAPM_VIRT_MUX("Decimator Mux", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_MUX("Decimator Mux", SND_SOC_NOPM, 0, 0,

		&adau1373_decimator_mux),



	SND_SOC_DAPM_SUPPLY("MICBIAS2", ADAU1373_PWDN_CTRL1, 5, 0, NULL, 0),

sound/soc/codecs/adav80x.c

+4 −4
Original line number Diff line number Diff line
@@ -172,14 +172,14 @@ static ADAV80X_MUX_ENUM_DECL(adav80x_capture_enum, ADAV80X_DPATH_CTRL1, 3); 
static ADAV80X_MUX_ENUM_DECL(adav80x_dac_enum, ADAV80X_DPATH_CTRL2, 3);



static const struct snd_kcontrol_new adav80x_aux_capture_mux_ctrl =

	SOC_DAPM_VALUE_ENUM("Route", adav80x_aux_capture_enum);

	SOC_DAPM_ENUM("Route", adav80x_aux_capture_enum);

static const struct snd_kcontrol_new adav80x_capture_mux_ctrl =

	SOC_DAPM_VALUE_ENUM("Route", adav80x_capture_enum);

	SOC_DAPM_ENUM("Route", adav80x_capture_enum);

static const struct snd_kcontrol_new adav80x_dac_mux_ctrl =

	SOC_DAPM_VALUE_ENUM("Route", adav80x_dac_enum);

	SOC_DAPM_ENUM("Route", adav80x_dac_enum);



#define ADAV80X_MUX(name, ctrl) \

	SND_SOC_DAPM_VALUE_MUX(name, SND_SOC_NOPM, 0, 0, ctrl)

	SND_SOC_DAPM_MUX(name, SND_SOC_NOPM, 0, 0, ctrl)



static const struct snd_soc_dapm_widget adav80x_dapm_widgets[] = {

	SND_SOC_DAPM_DAC("DAC", NULL, ADAV80X_DAC_CTRL1, 7, 1),

sound/soc/codecs/arizona.h

+2 −2
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ extern int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS]; 


#define ARIZONA_MUX_CTL_DECL(name) \

	const struct snd_kcontrol_new name##_mux =	\

		SOC_DAPM_VALUE_ENUM("Route", name##_enum)

		SOC_DAPM_ENUM("Route", name##_enum)



#define ARIZONA_MUX_ENUMS(name, base_reg) \

	static ARIZONA_MUX_ENUM_DECL(name##_enum, base_reg);      \
@@ -128,7 +128,7 @@ extern int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS]; 
	ARIZONA_MUX_ENUMS(name##_aux6, base_reg + 40)



#define ARIZONA_MUX(name, ctrl) \

	SND_SOC_DAPM_VALUE_MUX(name, SND_SOC_NOPM, 0, 0, ctrl)

	SND_SOC_DAPM_MUX(name, SND_SOC_NOPM, 0, 0, ctrl)



#define ARIZONA_MUX_WIDGETS(name, name_str) \

	ARIZONA_MUX(name_str " Input", &name##_mux)