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

Commit 57487c91 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents bb198dc6 a0628934

sound/soc/codecs/max98088.c

+19 −20
Original line number Diff line number Diff line
@@ -597,28 +597,27 @@ static const unsigned int max98088_exmode_values[] = { 
       0x00, 0x43, 0x10, 0x20, 0x30, 0x40, 0x11, 0x22, 0x32

};



static const struct soc_enum max98088_exmode_enum =

       SOC_VALUE_ENUM_SINGLE(M98088_REG_41_SPKDHP, 0, 127,

                             ARRAY_SIZE(max98088_exmode_texts),

static SOC_VALUE_ENUM_SINGLE_DECL(max98088_exmode_enum,

				  M98088_REG_41_SPKDHP, 0, 127,

				  max98088_exmode_texts,

				  max98088_exmode_values);



static const char *max98088_ex_thresh[] = { /* volts PP */

       "0.6", "1.2", "1.8", "2.4", "3.0", "3.6", "4.2", "4.8"};

static const struct soc_enum max98088_ex_thresh_enum[] = {

       SOC_ENUM_SINGLE(M98088_REG_42_SPKDHP_THRESH, 0, 8,

               max98088_ex_thresh),

};

static SOC_ENUM_SINGLE_DECL(max98088_ex_thresh_enum,

			    M98088_REG_42_SPKDHP_THRESH, 0,

			    max98088_ex_thresh);



static const char *max98088_fltr_mode[] = {"Voice", "Music" };

static const struct soc_enum max98088_filter_mode_enum[] = {

       SOC_ENUM_SINGLE(M98088_REG_18_DAI1_FILTERS, 7, 2, max98088_fltr_mode),

};

static SOC_ENUM_SINGLE_DECL(max98088_filter_mode_enum,

			    M98088_REG_18_DAI1_FILTERS, 7,

			    max98088_fltr_mode);



static const char *max98088_extmic_text[] = { "None", "MIC1", "MIC2" };



static const struct soc_enum max98088_extmic_enum =

       SOC_ENUM_SINGLE(M98088_REG_48_CFG_MIC, 0, 3, max98088_extmic_text);

static SOC_ENUM_SINGLE_DECL(max98088_extmic_enum,

			    M98088_REG_48_CFG_MIC, 0,

			    max98088_extmic_text);



static const struct snd_kcontrol_new max98088_extmic_mux =

       SOC_DAPM_ENUM("External MIC Mux", max98088_extmic_enum);
@@ -626,12 +625,12 @@ static const struct snd_kcontrol_new max98088_extmic_mux = 
static const char *max98088_dai1_fltr[] = {

       "Off", "fc=258/fs=16k", "fc=500/fs=16k",

       "fc=258/fs=8k", "fc=500/fs=8k", "fc=200"};

static const struct soc_enum max98088_dai1_dac_filter_enum[] = {

       SOC_ENUM_SINGLE(M98088_REG_18_DAI1_FILTERS, 0, 6, max98088_dai1_fltr),

};

static const struct soc_enum max98088_dai1_adc_filter_enum[] = {

       SOC_ENUM_SINGLE(M98088_REG_18_DAI1_FILTERS, 4, 6, max98088_dai1_fltr),

};

static SOC_ENUM_SINGLE_DECL(max98088_dai1_dac_filter_enum,

			    M98088_REG_18_DAI1_FILTERS, 0,

			    max98088_dai1_fltr);

static SOC_ENUM_SINGLE_DECL(max98088_dai1_adc_filter_enum,

			    M98088_REG_18_DAI1_FILTERS, 4,

			    max98088_dai1_fltr);



static int max98088_mic1pre_set(struct snd_kcontrol *kcontrol,

                               struct snd_ctl_elem_value *ucontrol)