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

Unverified Commit 6606f9df authored by Bard liao's avatar Bard liao Committed by Mark Brown
Browse files

ASoC: rt5670: remove unused mux/mixer define 



Some mux/mixer are not used. Remove them from the driver.

Signed-off-by: default avatarBard liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c3db2132

sound/soc/codecs/rt5670.c

+0 −54
Original line number Diff line number Diff line
@@ -1057,20 +1057,6 @@ static const struct snd_kcontrol_new rt5670_lout_mix[] = { 
			RT5670_M_OV_R_LM_SFT, 1, 1),

};



static const struct snd_kcontrol_new rt5670_hpl_mix[] = {

	SOC_DAPM_SINGLE("DAC L1 Switch", RT5670_HPO_MIXER,

			RT5670_M_DACL1_HML_SFT, 1, 1),

	SOC_DAPM_SINGLE("INL1 Switch", RT5670_HPO_MIXER,

			RT5670_M_INL1_HML_SFT, 1, 1),

};



static const struct snd_kcontrol_new rt5670_hpr_mix[] = {

	SOC_DAPM_SINGLE("DAC R1 Switch", RT5670_HPO_MIXER,

			RT5670_M_DACR1_HMR_SFT, 1, 1),

	SOC_DAPM_SINGLE("INR1 Switch", RT5670_HPO_MIXER,

			RT5670_M_INR1_HMR_SFT, 1, 1),

};



static const struct snd_kcontrol_new lout_l_enable_control =

	SOC_DAPM_SINGLE_AUTODISABLE("Switch", RT5670_LOUT1,

		RT5670_L_MUTE_SFT, 1, 1);
@@ -1196,24 +1182,6 @@ static SOC_ENUM_SINGLE_DECL(rt5670_stereo2_adc2_enum, RT5670_STO2_ADC_MIXER, 
static const struct snd_kcontrol_new rt5670_sto2_adc_2_mux =

	SOC_DAPM_ENUM("Stereo2 ADC 2 Mux", rt5670_stereo2_adc2_enum);





/* MX-27 MX26 [10] */

static const char * const rt5670_stereo_adc_src[] = {

	"ADC1L ADC2R", "ADC3"

};



static SOC_ENUM_SINGLE_DECL(rt5670_stereo1_adc_enum, RT5670_STO1_ADC_MIXER,

	RT5670_ADC_SRC_SFT, rt5670_stereo_adc_src);



static const struct snd_kcontrol_new rt5670_sto_adc_mux =

	SOC_DAPM_ENUM("Stereo1 ADC source", rt5670_stereo1_adc_enum);



static SOC_ENUM_SINGLE_DECL(rt5670_stereo2_adc_enum, RT5670_STO2_ADC_MIXER,

	RT5670_ADC_SRC_SFT, rt5670_stereo_adc_src);



static const struct snd_kcontrol_new rt5670_sto2_adc_mux =

	SOC_DAPM_ENUM("Stereo2 ADC source", rt5670_stereo2_adc_enum);



/* MX-27 MX-26 [9:8] */

static const char * const rt5670_stereo_dmic_src[] = {

	"DMIC1", "DMIC2", "DMIC3"
@@ -1231,17 +1199,6 @@ static SOC_ENUM_SINGLE_DECL(rt5670_stereo2_dmic_enum, RT5670_STO2_ADC_MIXER, 
static const struct snd_kcontrol_new rt5670_sto2_dmic_mux =

	SOC_DAPM_ENUM("Stereo2 DMIC source", rt5670_stereo2_dmic_enum);



/* MX-27 [0] */

static const char * const rt5670_stereo_dmic3_src[] = {

	"DMIC3", "PDM ADC"

};



static SOC_ENUM_SINGLE_DECL(rt5670_stereo_dmic3_enum, RT5670_STO1_ADC_MIXER,

	RT5670_DMIC3_SRC_SFT, rt5670_stereo_dmic3_src);



static const struct snd_kcontrol_new rt5670_sto_dmic3_mux =

	SOC_DAPM_ENUM("Stereo DMIC3 source", rt5670_stereo_dmic3_enum);



/* Mono ADC source */

/* MX-28 [12] */

static const char * const rt5670_mono_adc_l1_src[] = {
@@ -1334,17 +1291,6 @@ static SOC_ENUM_SINGLE_DECL(rt5670_if2_adc_in_enum, RT5670_DIG_INF1_DATA, 
static const struct snd_kcontrol_new rt5670_if2_adc_in_mux =

	SOC_DAPM_ENUM("IF2 ADC IN source", rt5670_if2_adc_in_enum);



/* MX-30 [5:4] */

static const char * const rt5670_if4_adc_in_src[] = {

	"IF_ADC1", "IF_ADC2", "IF_ADC3"

};



static SOC_ENUM_SINGLE_DECL(rt5670_if4_adc_in_enum, RT5670_DIG_INF2_DATA,

	RT5670_IF4_ADC_IN_SFT, rt5670_if4_adc_in_src);



static const struct snd_kcontrol_new rt5670_if4_adc_in_mux =

	SOC_DAPM_ENUM("IF4 ADC IN source", rt5670_if4_adc_in_enum);



/* MX-31 [15] [13] [11] [9] */

static const char * const rt5670_pdm_src[] = {

	"Mono DAC", "Stereo DAC"