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

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

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

parents 53a2c4db 6af5263c

include/sound/soc-dapm.h

+7 −31
Original line number Diff line number Diff line
@@ -108,13 +108,9 @@ struct device; 
	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) \

{	.id = snd_soc_dapm_virt_mux, .name = wname, \

	SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \

	.kcontrol_news = wcontrols, .num_kcontrols = 1}

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

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

{	.id = snd_soc_dapm_value_mux, .name = wname, \

	SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \

	.kcontrol_news = wcontrols, .num_kcontrols = 1}

	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,\
@@ -172,10 +168,8 @@ struct device; 
	.event = wevent, .event_flags = wflags}

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

	wevent, wflags) \

{	.id = snd_soc_dapm_virt_mux, .name = wname, \

	SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \

	.kcontrol_news = wcontrols, .num_kcontrols = 1, \

	.event = wevent, .event_flags = 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, \
@@ -312,11 +306,7 @@ struct device; 
 	.put = snd_soc_dapm_put_enum_double, \

  	.private_value = (unsigned long)&xenum }

#define SOC_DAPM_ENUM_VIRT(xname, xenum) \

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

	.info = snd_soc_info_enum_double, \

	.get = snd_soc_dapm_get_enum_virt, \

	.put = snd_soc_dapm_put_enum_virt, \

	.private_value = (unsigned long)&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, \
@@ -324,11 +314,7 @@ struct device; 
	.put = xput, \

	.private_value = (unsigned long)&xenum }

#define SOC_DAPM_VALUE_ENUM(xname, xenum) \

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

	.info = snd_soc_info_enum_double, \

	.get = snd_soc_dapm_get_value_enum_double, \

	.put = snd_soc_dapm_put_value_enum_double, \

	.private_value = (unsigned long)&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, \
@@ -392,14 +378,6 @@ int snd_soc_dapm_get_enum_double(struct snd_kcontrol *kcontrol, 
	struct snd_ctl_elem_value *ucontrol);

int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_dapm_get_enum_virt(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_dapm_put_enum_virt(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_dapm_get_value_enum_double(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_dapm_put_value_enum_double(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_dapm_info_pin_switch(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_info *uinfo);

int snd_soc_dapm_get_pin_switch(struct snd_kcontrol *kcontrol,
@@ -484,8 +462,6 @@ enum snd_soc_dapm_type { 
	snd_soc_dapm_input = 0,		/* input pin */

	snd_soc_dapm_output,		/* output pin */

	snd_soc_dapm_mux,			/* selects 1 analog signal from many inputs */

	snd_soc_dapm_virt_mux,			/* virtual version of snd_soc_dapm_mux */

	snd_soc_dapm_value_mux,			/* selects 1 analog signal from many inputs */

	snd_soc_dapm_mixer,			/* mixes several analog signals together */

	snd_soc_dapm_mixer_named_ctl,		/* mixer with named controls */

	snd_soc_dapm_pga,			/* programmable gain/attenuation (volume) */

include/sound/soc.h

+60 −26
Original line number Diff line number Diff line
@@ -45,6 +45,11 @@ 
	((unsigned long)&(struct soc_mixer_control) \

	{.reg = xlreg, .rreg = xrreg, .shift = xshift, .rshift = xshift, \

	.max = xmax, .platform_max = xmax, .invert = xinvert})

#define SOC_DOUBLE_R_S_VALUE(xlreg, xrreg, xshift, xmin, xmax, xsign_bit, xinvert) \

	((unsigned long)&(struct soc_mixer_control) \

	{.reg = xlreg, .rreg = xrreg, .shift = xshift, .rshift = xshift, \

	.max = xmax, .min = xmin, .platform_max = xmax, .sign_bit = xsign_bit, \

	.invert = xinvert})

#define SOC_DOUBLE_R_RANGE_VALUE(xlreg, xrreg, xshift, xmin, xmax, xinvert) \

	((unsigned long)&(struct soc_mixer_control) \

	{.reg = xlreg, .rreg = xrreg, .shift = xshift, .rshift = xshift, \
@@ -152,6 +157,15 @@ 
		{.reg = xreg, .rreg = xrreg, \

		.shift = xshift, .rshift = xshift, \

		.max = xmax, .min = xmin} }

#define SOC_DOUBLE_R_S_TLV(xname, reg_left, reg_right, xshift, xmin, xmax, xsign_bit, xinvert, 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 = snd_soc_put_volsw, \

	.private_value = SOC_DOUBLE_R_S_VALUE(reg_left, reg_right, xshift, \

					    xmin, xmax, xsign_bit, xinvert) }

#define SOC_DOUBLE_S8_TLV(xname, xreg, xmin, xmax, tlv_array) \

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

	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \
@@ -162,30 +176,28 @@ 
	.private_value = (unsigned long)&(struct soc_mixer_control) \

		{.reg = xreg, .min = xmin, .max = xmax, \

		 .platform_max = xmax} }

#define SOC_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xmax, xtexts) \

#define SOC_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xitems, xtexts) \

{	.reg = xreg, .shift_l = xshift_l, .shift_r = xshift_r, \

	.max = xmax, .texts = xtexts, \

	.mask = xmax ? roundup_pow_of_two(xmax) - 1 : 0}

#define SOC_ENUM_SINGLE(xreg, xshift, xmax, xtexts) \

	SOC_ENUM_DOUBLE(xreg, xshift, xshift, xmax, xtexts)

#define SOC_ENUM_SINGLE_EXT(xmax, xtexts) \

{	.max = xmax, .texts = xtexts }

#define SOC_VALUE_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xmask, xmax, xtexts, xvalues) \

	.items = xitems, .texts = xtexts, \

	.mask = xitems ? roundup_pow_of_two(xitems) - 1 : 0}

#define SOC_ENUM_SINGLE(xreg, xshift, xitems, xtexts) \

	SOC_ENUM_DOUBLE(xreg, xshift, xshift, xitems, xtexts)

#define SOC_ENUM_SINGLE_EXT(xitems, xtexts) \

{	.items = xitems, .texts = xtexts }

#define SOC_VALUE_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xmask, xitems, xtexts, xvalues) \

{	.reg = xreg, .shift_l = xshift_l, .shift_r = xshift_r, \

	.mask = xmask, .max = xmax, .texts = xtexts, .values = xvalues}

#define SOC_VALUE_ENUM_SINGLE(xreg, xshift, xmask, xmax, xtexts, xvalues) \

	SOC_VALUE_ENUM_DOUBLE(xreg, xshift, xshift, xmask, xmax, xtexts, xvalues)

	.mask = xmask, .items = xitems, .texts = xtexts, .values = xvalues}

#define SOC_VALUE_ENUM_SINGLE(xreg, xshift, xmask, xnitmes, xtexts, xvalues) \

	SOC_VALUE_ENUM_DOUBLE(xreg, xshift, xshift, xmask, xnitmes, xtexts, xvalues)

#define SOC_ENUM_SINGLE_VIRT(xitems, xtexts) \

	SOC_ENUM_SINGLE(SND_SOC_NOPM, 0, xitems, xtexts)

#define SOC_ENUM(xname, xenum) \

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

	.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) \

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

	.info = snd_soc_info_enum_double, \

	.get = snd_soc_get_value_enum_double, \

	.put = snd_soc_put_value_enum_double, \

	.private_value = (unsigned long)&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, \
@@ -272,17 +284,19 @@ 
 * ARRAY_SIZE internally

 */

#define SOC_ENUM_DOUBLE_DECL(name, xreg, xshift_l, xshift_r, xtexts) \

	struct soc_enum name = SOC_ENUM_DOUBLE(xreg, xshift_l, xshift_r, \

	const struct soc_enum name = SOC_ENUM_DOUBLE(xreg, xshift_l, xshift_r, \

						ARRAY_SIZE(xtexts), xtexts)

#define SOC_ENUM_SINGLE_DECL(name, xreg, xshift, xtexts) \

	SOC_ENUM_DOUBLE_DECL(name, xreg, xshift, xshift, xtexts)

#define SOC_ENUM_SINGLE_EXT_DECL(name, xtexts) \

	struct soc_enum name = SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(xtexts), xtexts)

	const struct soc_enum name = SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(xtexts), xtexts)

#define SOC_VALUE_ENUM_DOUBLE_DECL(name, xreg, xshift_l, xshift_r, xmask, xtexts, xvalues) \

	struct soc_enum name = SOC_VALUE_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xmask, \

	const struct soc_enum name = SOC_VALUE_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xmask, \

							ARRAY_SIZE(xtexts), xtexts, xvalues)

#define SOC_VALUE_ENUM_SINGLE_DECL(name, xreg, xshift, xmask, xtexts, xvalues) \

	SOC_VALUE_ENUM_DOUBLE_DECL(name, xreg, xshift, xshift, xmask, xtexts, xvalues)

#define SOC_ENUM_SINGLE_VIRT_DECL(name, xtexts) \

	const struct soc_enum name = SOC_ENUM_SINGLE_VIRT(ARRAY_SIZE(xtexts), xtexts)



/*

 * Component probe and remove ordering levels for components with runtime
@@ -500,10 +514,6 @@ int snd_soc_get_enum_double(struct snd_kcontrol *kcontrol, 
	struct snd_ctl_elem_value *ucontrol);

int snd_soc_put_enum_double(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_get_value_enum_double(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_put_value_enum_double(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_info_volsw(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_info *uinfo);

#define snd_soc_info_bool_ext		snd_ctl_boolean_mono_info
@@ -1076,6 +1086,7 @@ struct soc_mixer_control { 
	int min, max, platform_max;

	int reg, rreg;

	unsigned int shift, rshift;

	unsigned int sign_bit;

	unsigned int invert:1;

	unsigned int autodisable:1;

};
@@ -1094,11 +1105,10 @@ struct soc_mreg_control { 


/* enumerated kcontrol */

struct soc_enum {

	unsigned short reg;

	unsigned short reg2;

	int reg;

	unsigned char shift_l;

	unsigned char shift_r;

	unsigned int max;

	unsigned int items;

	unsigned int mask;

	const char * const *texts;

	const unsigned int *values;
@@ -1177,6 +1187,30 @@ static inline bool snd_soc_volsw_is_stereo(struct soc_mixer_control *mc) 
	return 1;

}



static inline unsigned int snd_soc_enum_val_to_item(struct soc_enum *e,

	unsigned int val)

{

	unsigned int i;



	if (!e->values)

		return val;



	for (i = 0; i < e->items; i++)

		if (val == e->values[i])

			return i;



	return 0;

}



static inline unsigned int snd_soc_enum_item_to_val(struct soc_enum *e,

	unsigned int item)

{

	if (!e->values)

		return item;



	return e->values[item];

}



static inline bool snd_soc_component_is_active(

	struct snd_soc_component *component)

{

sound/soc/codecs/adau1373.c

+16 −16
Original line number Diff line number Diff line
@@ -345,15 +345,15 @@ static const char *adau1373_fdsp_sel_text[] = { 
	"Channel 5",

};



static const SOC_ENUM_SINGLE_DECL(adau1373_drc1_channel_enum,

static SOC_ENUM_SINGLE_DECL(adau1373_drc1_channel_enum,

	ADAU1373_FDSP_SEL1, 4, adau1373_fdsp_sel_text);

static const SOC_ENUM_SINGLE_DECL(adau1373_drc2_channel_enum,

static SOC_ENUM_SINGLE_DECL(adau1373_drc2_channel_enum,

	ADAU1373_FDSP_SEL1, 0, adau1373_fdsp_sel_text);

static const SOC_ENUM_SINGLE_DECL(adau1373_drc3_channel_enum,

static SOC_ENUM_SINGLE_DECL(adau1373_drc3_channel_enum,

	ADAU1373_FDSP_SEL2, 0, adau1373_fdsp_sel_text);

static const SOC_ENUM_SINGLE_DECL(adau1373_hpf_channel_enum,

static SOC_ENUM_SINGLE_DECL(adau1373_hpf_channel_enum,

	ADAU1373_FDSP_SEL3, 0, adau1373_fdsp_sel_text);

static const SOC_ENUM_SINGLE_DECL(adau1373_bass_channel_enum,

static SOC_ENUM_SINGLE_DECL(adau1373_bass_channel_enum,

	ADAU1373_FDSP_SEL4, 4, adau1373_fdsp_sel_text);



static const char *adau1373_hpf_cutoff_text[] = {
@@ -362,7 +362,7 @@ static const char *adau1373_hpf_cutoff_text[] = { 
	"800Hz",

};



static const SOC_ENUM_SINGLE_DECL(adau1373_hpf_cutoff_enum,

static SOC_ENUM_SINGLE_DECL(adau1373_hpf_cutoff_enum,

	ADAU1373_HPF_CTRL, 3, adau1373_hpf_cutoff_text);



static const char *adau1373_bass_lpf_cutoff_text[] = {
@@ -388,14 +388,14 @@ static const unsigned int adau1373_bass_tlv[] = { 
	5, 7, TLV_DB_SCALE_ITEM(1400, 150, 0),

};



static const SOC_ENUM_SINGLE_DECL(adau1373_bass_lpf_cutoff_enum,

static SOC_ENUM_SINGLE_DECL(adau1373_bass_lpf_cutoff_enum,

	ADAU1373_BASS1, 5, adau1373_bass_lpf_cutoff_text);



static const SOC_VALUE_ENUM_SINGLE_DECL(adau1373_bass_clip_level_enum,

static SOC_VALUE_ENUM_SINGLE_DECL(adau1373_bass_clip_level_enum,

	ADAU1373_BASS1, 2, 7, adau1373_bass_clip_level_text,

	adau1373_bass_clip_level_values);



static const SOC_ENUM_SINGLE_DECL(adau1373_bass_hpf_cutoff_enum,

static SOC_ENUM_SINGLE_DECL(adau1373_bass_hpf_cutoff_enum,

	ADAU1373_BASS1, 0, adau1373_bass_hpf_cutoff_text);



static const char *adau1373_3d_level_text[] = {
@@ -409,9 +409,9 @@ static const char *adau1373_3d_cutoff_text[] = { 
	"0.16875 fs", "0.27083 fs"

};



static const SOC_ENUM_SINGLE_DECL(adau1373_3d_level_enum,

static SOC_ENUM_SINGLE_DECL(adau1373_3d_level_enum,

	ADAU1373_3D_CTRL1, 4, adau1373_3d_level_text);

static const SOC_ENUM_SINGLE_DECL(adau1373_3d_cutoff_enum,

static SOC_ENUM_SINGLE_DECL(adau1373_3d_cutoff_enum,

	ADAU1373_3D_CTRL1, 0, adau1373_3d_cutoff_text);



static const unsigned int adau1373_3d_tlv[] = {
@@ -427,11 +427,11 @@ static const char *adau1373_lr_mux_text[] = { 
	"Stereo",

};



static const SOC_ENUM_SINGLE_DECL(adau1373_lineout1_lr_mux_enum,

static SOC_ENUM_SINGLE_DECL(adau1373_lineout1_lr_mux_enum,

	ADAU1373_OUTPUT_CTRL, 4, adau1373_lr_mux_text);

static const SOC_ENUM_SINGLE_DECL(adau1373_lineout2_lr_mux_enum,

static SOC_ENUM_SINGLE_DECL(adau1373_lineout2_lr_mux_enum,

	ADAU1373_OUTPUT_CTRL, 6, adau1373_lr_mux_text);

static const SOC_ENUM_SINGLE_DECL(adau1373_speaker_lr_mux_enum,

static SOC_ENUM_SINGLE_DECL(adau1373_speaker_lr_mux_enum,

	ADAU1373_LS_CTRL, 4, adau1373_lr_mux_text);



static const struct snd_kcontrol_new adau1373_controls[] = {
@@ -576,8 +576,8 @@ static const char *adau1373_decimator_text[] = { 
	"DMIC1",

};



static const struct soc_enum adau1373_decimator_enum =

	SOC_ENUM_SINGLE(0, 0, 2, adau1373_decimator_text);

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);

sound/soc/codecs/arizona.c

+40 −31
Original line number Diff line number Diff line
@@ -542,47 +542,55 @@ static const char *arizona_vol_ramp_text[] = { 
	"15ms/6dB", "30ms/6dB",

};



const struct soc_enum arizona_in_vd_ramp =

	SOC_ENUM_SINGLE(ARIZONA_INPUT_VOLUME_RAMP,

			ARIZONA_IN_VD_RAMP_SHIFT, 7, arizona_vol_ramp_text);

SOC_ENUM_SINGLE_DECL(arizona_in_vd_ramp,

		     ARIZONA_INPUT_VOLUME_RAMP,

		     ARIZONA_IN_VD_RAMP_SHIFT,

		     arizona_vol_ramp_text);

EXPORT_SYMBOL_GPL(arizona_in_vd_ramp);



const struct soc_enum arizona_in_vi_ramp =

	SOC_ENUM_SINGLE(ARIZONA_INPUT_VOLUME_RAMP,

			ARIZONA_IN_VI_RAMP_SHIFT, 7, arizona_vol_ramp_text);

SOC_ENUM_SINGLE_DECL(arizona_in_vi_ramp,

		     ARIZONA_INPUT_VOLUME_RAMP,

		     ARIZONA_IN_VI_RAMP_SHIFT,

		     arizona_vol_ramp_text);

EXPORT_SYMBOL_GPL(arizona_in_vi_ramp);



const struct soc_enum arizona_out_vd_ramp =

	SOC_ENUM_SINGLE(ARIZONA_OUTPUT_VOLUME_RAMP,

			ARIZONA_OUT_VD_RAMP_SHIFT, 7, arizona_vol_ramp_text);

SOC_ENUM_SINGLE_DECL(arizona_out_vd_ramp,

		     ARIZONA_OUTPUT_VOLUME_RAMP,

		     ARIZONA_OUT_VD_RAMP_SHIFT,

		     arizona_vol_ramp_text);

EXPORT_SYMBOL_GPL(arizona_out_vd_ramp);



const struct soc_enum arizona_out_vi_ramp =

	SOC_ENUM_SINGLE(ARIZONA_OUTPUT_VOLUME_RAMP,

			ARIZONA_OUT_VI_RAMP_SHIFT, 7, arizona_vol_ramp_text);

SOC_ENUM_SINGLE_DECL(arizona_out_vi_ramp,

		     ARIZONA_OUTPUT_VOLUME_RAMP,

		     ARIZONA_OUT_VI_RAMP_SHIFT,

		     arizona_vol_ramp_text);

EXPORT_SYMBOL_GPL(arizona_out_vi_ramp);



static const char *arizona_lhpf_mode_text[] = {

	"Low-pass", "High-pass"

};



const struct soc_enum arizona_lhpf1_mode =

	SOC_ENUM_SINGLE(ARIZONA_HPLPF1_1, ARIZONA_LHPF1_MODE_SHIFT, 2,

SOC_ENUM_SINGLE_DECL(arizona_lhpf1_mode,

		     ARIZONA_HPLPF1_1,

		     ARIZONA_LHPF1_MODE_SHIFT,

		     arizona_lhpf_mode_text);

EXPORT_SYMBOL_GPL(arizona_lhpf1_mode);



const struct soc_enum arizona_lhpf2_mode =

	SOC_ENUM_SINGLE(ARIZONA_HPLPF2_1, ARIZONA_LHPF2_MODE_SHIFT, 2,

SOC_ENUM_SINGLE_DECL(arizona_lhpf2_mode,

		     ARIZONA_HPLPF2_1,

		     ARIZONA_LHPF2_MODE_SHIFT,

		     arizona_lhpf_mode_text);

EXPORT_SYMBOL_GPL(arizona_lhpf2_mode);



const struct soc_enum arizona_lhpf3_mode =

	SOC_ENUM_SINGLE(ARIZONA_HPLPF3_1, ARIZONA_LHPF3_MODE_SHIFT, 2,

SOC_ENUM_SINGLE_DECL(arizona_lhpf3_mode,

		     ARIZONA_HPLPF3_1,

		     ARIZONA_LHPF3_MODE_SHIFT,

		     arizona_lhpf_mode_text);

EXPORT_SYMBOL_GPL(arizona_lhpf3_mode);



const struct soc_enum arizona_lhpf4_mode =

	SOC_ENUM_SINGLE(ARIZONA_HPLPF4_1, ARIZONA_LHPF4_MODE_SHIFT, 2,

SOC_ENUM_SINGLE_DECL(arizona_lhpf4_mode,

		     ARIZONA_HPLPF4_1,

		     ARIZONA_LHPF4_MODE_SHIFT,

		     arizona_lhpf_mode_text);

EXPORT_SYMBOL_GPL(arizona_lhpf4_mode);
@@ -590,18 +598,19 @@ static const char *arizona_ng_hold_text[] = { 
	"30ms", "120ms", "250ms", "500ms",

};



const struct soc_enum arizona_ng_hold =

	SOC_ENUM_SINGLE(ARIZONA_NOISE_GATE_CONTROL, ARIZONA_NGATE_HOLD_SHIFT,

			4, arizona_ng_hold_text);

SOC_ENUM_SINGLE_DECL(arizona_ng_hold,

		     ARIZONA_NOISE_GATE_CONTROL,

		     ARIZONA_NGATE_HOLD_SHIFT,

		     arizona_ng_hold_text);

EXPORT_SYMBOL_GPL(arizona_ng_hold);



static const char * const arizona_in_hpf_cut_text[] = {

	"2.5Hz", "5Hz", "10Hz", "20Hz", "40Hz"

};



const struct soc_enum arizona_in_hpf_cut_enum =

	SOC_ENUM_SINGLE(ARIZONA_HPF_CONTROL, ARIZONA_IN_HPF_CUT_SHIFT,

			ARRAY_SIZE(arizona_in_hpf_cut_text),

SOC_ENUM_SINGLE_DECL(arizona_in_hpf_cut_enum,

		     ARIZONA_HPF_CONTROL,

		     ARIZONA_IN_HPF_CUT_SHIFT,

		     arizona_in_hpf_cut_text);

EXPORT_SYMBOL_GPL(arizona_in_hpf_cut_enum);

sound/soc/codecs/da732x.h

+0 −3
Original line number Diff line number Diff line
@@ -113,9 +113,6 @@ 
#define	DA732X_EQ_OVERALL_VOL_DB_MIN	-1800

#define	DA732X_EQ_OVERALL_VOL_DB_INC	600



#define DA732X_SOC_ENUM_DOUBLE_R(xreg, xrreg, xmax, xtext) \

	{.reg = xreg, .reg2 = xrreg, .max = xmax, .texts = xtext}



enum da732x_sysctl {

	DA732X_SR_8KHZ		= 0x1,

	DA732X_SR_11_025KHZ	= 0x2,