Unverified Commit 9188f03a authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: ti: davinci-evm: convert to snd_soc_dapm_xxx() 



This patch converts below functions.

dapm->dev					-> snd_soc_dapm_to_dev()
dapm->card					-> snd_soc_dapm_to_card()
dapm->component					-> snd_soc_dapm_to_component()

dapm_kcontrol_get_value()			-> snd_soc_dapm_kcontrol_get_value()

snd_soc_component_enable_pin()			-> snd_soc_dapm_enable_pin()
snd_soc_component_enable_pin_unlocked()		-> snd_soc_dapm_enable_pin_unlocked()
snd_soc_component_disable_pin()			-> snd_soc_dapm_disable_pin()
snd_soc_component_disable_pin_unlocked()	-> snd_soc_dapm_disable_pin_unlocked()
snd_soc_component_nc_pin()			-> snd_soc_dapm_nc_pin()
snd_soc_component_nc_pin_unlocked()		-> snd_soc_dapm_nc_pin_unlocked()
snd_soc_component_get_pin_status()		-> snd_soc_dapm_get_pin_status()
snd_soc_component_force_enable_pin()		-> snd_soc_dapm_force_enable_pin()
snd_soc_component_force_enable_pin_unlocked()	-> snd_soc_dapm_force_enable_pin_unlocked()
snd_soc_component_force_bias_level()		-> snd_soc_dapm_force_bias_level()
snd_soc_component_get_bias_level()		-> snd_soc_dapm_get_bias_level()
snd_soc_component_init_bias_level()		-> snd_soc_dapm_init_bias_level()
snd_soc_component_get_dapm()			-> snd_soc_component_to_dapm()

snd_soc_dapm_kcontrol_component()		-> snd_soc_dapm_kcontrol_to_component()
snd_soc_dapm_kcontrol_widget()			-> snd_soc_dapm_kcontrol_to_widget()
snd_soc_dapm_kcontrol_dapm()			-> snd_soc_dapm_kcontrol_to_dapm()
snd_soc_dapm_np_pin()				-> snd_soc_dapm_disable_pin()

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/87wm3xs8ur.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent cf3c9aa0

sound/soc/ti/davinci-evm.c

+6 −5
Original line number Diff line number Diff line
@@ -113,11 +113,12 @@ static const struct snd_soc_dapm_route audio_map[] = { 
static int evm_aic3x_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_card *card = rtd->card;

	struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(rtd->card);

	struct device_node *np = card->dev->of_node;

	int ret;



	/* Add davinci-evm specific widgets */

	snd_soc_dapm_new_controls(&card->dapm, aic3x_dapm_widgets,

	snd_soc_dapm_new_controls(dapm, aic3x_dapm_widgets,

				  ARRAY_SIZE(aic3x_dapm_widgets));



	if (np) {
@@ -126,14 +127,14 @@ static int evm_aic3x_init(struct snd_soc_pcm_runtime *rtd) 
			return ret;

	} else {

		/* Set up davinci-evm specific audio path audio_map */

		snd_soc_dapm_add_routes(&card->dapm, audio_map,

		snd_soc_dapm_add_routes(dapm, audio_map,

					ARRAY_SIZE(audio_map));

	}



	/* not connected */

	snd_soc_dapm_nc_pin(&card->dapm, "MONO_LOUT");

	snd_soc_dapm_nc_pin(&card->dapm, "HPLCOM");

	snd_soc_dapm_nc_pin(&card->dapm, "HPRCOM");

	snd_soc_dapm_disable_pin(dapm, "MONO_LOUT");

	snd_soc_dapm_disable_pin(dapm, "HPLCOM");

	snd_soc_dapm_disable_pin(dapm, "HPRCOM");



	return 0;

}