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

Unverified Commit 0a047f07 authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Mark Brown
Browse files

ASoC: wm_adsp: Declare firmware controls from codec driver 



To allow for more flexibility in naming of DSP-type cores
move the creation of the firmware controls to the codec
drivers instead of having a hardcoded list in wm_adsp.

Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f861e3e2

sound/soc/codecs/cs47l24.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -235,6 +235,9 @@ ARIZONA_MIXER_CONTROLS("AIF2TX6", ARIZONA_AIF2TX6MIX_INPUT_1_SOURCE), 




ARIZONA_MIXER_CONTROLS("AIF3TX1", ARIZONA_AIF3TX1MIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("AIF3TX1", ARIZONA_AIF3TX1MIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("AIF3TX2", ARIZONA_AIF3TX2MIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("AIF3TX2", ARIZONA_AIF3TX2MIX_INPUT_1_SOURCE),



WM_ADSP_FW_CONTROL("DSP2", 1),

WM_ADSP_FW_CONTROL("DSP3", 2),

};

};





ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE);

ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE);

sound/soc/codecs/wm2200.c

+4 −6
Original line number Original line Diff line number Diff line
@@ -1180,6 +1180,9 @@ SOC_DOUBLE_R_TLV("OUT2 Digital Volume", WM2200_DAC_DIGITAL_VOLUME_2L, 
SOC_DOUBLE("OUT2 Switch", WM2200_PDM_1, WM2200_SPK1L_MUTE_SHIFT,

SOC_DOUBLE("OUT2 Switch", WM2200_PDM_1, WM2200_SPK1L_MUTE_SHIFT,

	   WM2200_SPK1R_MUTE_SHIFT, 1, 1),

	   WM2200_SPK1R_MUTE_SHIFT, 1, 1),

SOC_ENUM("RxANC Src", wm2200_rxanc_input_sel),

SOC_ENUM("RxANC Src", wm2200_rxanc_input_sel),



WM_ADSP_FW_CONTROL("DSP1", 0),

WM_ADSP_FW_CONTROL("DSP2", 1),

};

};





WM2200_MIXER_ENUMS(OUT1L, WM2200_OUT1LMIX_INPUT_1_SOURCE);

WM2200_MIXER_ENUMS(OUT1L, WM2200_OUT1LMIX_INPUT_1_SOURCE);
@@ -1553,15 +1556,10 @@ static const struct snd_soc_dapm_route wm2200_dapm_routes[] = { 
static int wm2200_probe(struct snd_soc_component *component)

static int wm2200_probe(struct snd_soc_component *component)

{

{

	struct wm2200_priv *wm2200 = snd_soc_component_get_drvdata(component);

	struct wm2200_priv *wm2200 = snd_soc_component_get_drvdata(component);

	int ret;





	wm2200->component = component;

	wm2200->component = component;





	ret = snd_soc_add_component_controls(component, wm_adsp_fw_controls, 2);

	return 0;

	if (ret != 0)

		return ret;



	return ret;

}

}





static int wm2200_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)

static int wm2200_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)

sound/soc/codecs/wm5102.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -985,6 +985,8 @@ ARIZONA_MIXER_CONTROLS("SLIMTX5", ARIZONA_SLIMTX5MIX_INPUT_1_SOURCE), 
ARIZONA_MIXER_CONTROLS("SLIMTX6", ARIZONA_SLIMTX6MIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("SLIMTX6", ARIZONA_SLIMTX6MIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("SLIMTX7", ARIZONA_SLIMTX7MIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("SLIMTX7", ARIZONA_SLIMTX7MIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("SLIMTX8", ARIZONA_SLIMTX8MIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("SLIMTX8", ARIZONA_SLIMTX8MIX_INPUT_1_SOURCE),



WM_ADSP_FW_CONTROL("DSP1", 0),

};

};





ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE);

ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE);

sound/soc/codecs/wm5110.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -927,6 +927,11 @@ ARIZONA_MIXER_CONTROLS("SLIMTX5", ARIZONA_SLIMTX5MIX_INPUT_1_SOURCE), 
ARIZONA_MIXER_CONTROLS("SLIMTX6", ARIZONA_SLIMTX6MIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("SLIMTX6", ARIZONA_SLIMTX6MIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("SLIMTX7", ARIZONA_SLIMTX7MIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("SLIMTX7", ARIZONA_SLIMTX7MIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("SLIMTX8", ARIZONA_SLIMTX8MIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("SLIMTX8", ARIZONA_SLIMTX8MIX_INPUT_1_SOURCE),



WM_ADSP_FW_CONTROL("DSP1", 0),

WM_ADSP_FW_CONTROL("DSP2", 1),

WM_ADSP_FW_CONTROL("DSP3", 2),

WM_ADSP_FW_CONTROL("DSP4", 3),

};

};





ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE);

ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE);

sound/soc/codecs/wm_adsp.c

+9 −26
Original line number Original line Diff line number Diff line
@@ -684,7 +684,7 @@ static inline void wm_adsp_debugfs_clear(struct wm_adsp *dsp) 
}

}

#endif

#endif





static int wm_adsp_fw_get(struct snd_kcontrol *kcontrol,

int wm_adsp_fw_get(struct snd_kcontrol *kcontrol,

		   struct snd_ctl_elem_value *ucontrol)

		   struct snd_ctl_elem_value *ucontrol)

{

{

	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);

	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
@@ -695,8 +695,9 @@ static int wm_adsp_fw_get(struct snd_kcontrol *kcontrol, 




	return 0;

	return 0;

}

}

EXPORT_SYMBOL_GPL(wm_adsp_fw_get);





static int wm_adsp_fw_put(struct snd_kcontrol *kcontrol,

int wm_adsp_fw_put(struct snd_kcontrol *kcontrol,

		   struct snd_ctl_elem_value *ucontrol)

		   struct snd_ctl_elem_value *ucontrol)

{

{

	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);

	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
@@ -721,8 +722,9 @@ static int wm_adsp_fw_put(struct snd_kcontrol *kcontrol, 




	return ret;

	return ret;

}

}

EXPORT_SYMBOL_GPL(wm_adsp_fw_put);





static const struct soc_enum wm_adsp_fw_enum[] = {

const struct soc_enum wm_adsp_fw_enum[] = {

	SOC_ENUM_SINGLE(0, 0, ARRAY_SIZE(wm_adsp_fw_text), wm_adsp_fw_text),

	SOC_ENUM_SINGLE(0, 0, ARRAY_SIZE(wm_adsp_fw_text), wm_adsp_fw_text),

	SOC_ENUM_SINGLE(0, 1, ARRAY_SIZE(wm_adsp_fw_text), wm_adsp_fw_text),

	SOC_ENUM_SINGLE(0, 1, ARRAY_SIZE(wm_adsp_fw_text), wm_adsp_fw_text),

	SOC_ENUM_SINGLE(0, 2, ARRAY_SIZE(wm_adsp_fw_text), wm_adsp_fw_text),

	SOC_ENUM_SINGLE(0, 2, ARRAY_SIZE(wm_adsp_fw_text), wm_adsp_fw_text),
@@ -731,24 +733,7 @@ static const struct soc_enum wm_adsp_fw_enum[] = { 
	SOC_ENUM_SINGLE(0, 5, ARRAY_SIZE(wm_adsp_fw_text), wm_adsp_fw_text),

	SOC_ENUM_SINGLE(0, 5, ARRAY_SIZE(wm_adsp_fw_text), wm_adsp_fw_text),

	SOC_ENUM_SINGLE(0, 6, ARRAY_SIZE(wm_adsp_fw_text), wm_adsp_fw_text),

	SOC_ENUM_SINGLE(0, 6, ARRAY_SIZE(wm_adsp_fw_text), wm_adsp_fw_text),

};

};



EXPORT_SYMBOL_GPL(wm_adsp_fw_enum);

const struct snd_kcontrol_new wm_adsp_fw_controls[] = {

	SOC_ENUM_EXT("DSP1 Firmware", wm_adsp_fw_enum[0],

		     wm_adsp_fw_get, wm_adsp_fw_put),

	SOC_ENUM_EXT("DSP2 Firmware", wm_adsp_fw_enum[1],

		     wm_adsp_fw_get, wm_adsp_fw_put),

	SOC_ENUM_EXT("DSP3 Firmware", wm_adsp_fw_enum[2],

		     wm_adsp_fw_get, wm_adsp_fw_put),

	SOC_ENUM_EXT("DSP4 Firmware", wm_adsp_fw_enum[3],

		     wm_adsp_fw_get, wm_adsp_fw_put),

	SOC_ENUM_EXT("DSP5 Firmware", wm_adsp_fw_enum[4],

		     wm_adsp_fw_get, wm_adsp_fw_put),

	SOC_ENUM_EXT("DSP6 Firmware", wm_adsp_fw_enum[5],

		     wm_adsp_fw_get, wm_adsp_fw_put),

	SOC_ENUM_EXT("DSP7 Firmware", wm_adsp_fw_enum[6],

		     wm_adsp_fw_get, wm_adsp_fw_put),

};

EXPORT_SYMBOL_GPL(wm_adsp_fw_controls);





static struct wm_adsp_region const *wm_adsp_find_region(struct wm_adsp *dsp,

static struct wm_adsp_region const *wm_adsp_find_region(struct wm_adsp *dsp,

							int type)

							int type)
@@ -2884,9 +2869,7 @@ int wm_adsp2_component_probe(struct wm_adsp *dsp, struct snd_soc_component *comp 




	dsp->component = component;

	dsp->component = component;





	return snd_soc_add_component_controls(component,

	return 0;

					  &wm_adsp_fw_controls[dsp->num - 1],

					  1);

}

}

EXPORT_SYMBOL_GPL(wm_adsp2_component_probe);

EXPORT_SYMBOL_GPL(wm_adsp2_component_probe);