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

ASoC: ti: omap3pandora: 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/87pl9ps8ub.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/ti/omap3pandora.c

+19 −17
Original line number Diff line number Diff line
@@ -71,9 +71,11 @@ static int omap3pandora_dac_event(struct snd_soc_dapm_widget *w, 
	 * VCC power on/off and /PD pin high/low

	 */

	if (SND_SOC_DAPM_EVENT_ON(event)) {

		struct device *dev = snd_soc_dapm_to_dev(w->dapm);



		ret = regulator_enable(omap3pandora_dac_reg);

		if (ret) {

			dev_err(w->dapm->dev, "Failed to power DAC: %d\n", ret);

			dev_err(dev, "Failed to power DAC: %d\n", ret);

			return ret;

		}

		mdelay(1);
@@ -139,32 +141,32 @@ static const struct snd_soc_dapm_route omap3pandora_map[] = { 


static int omap3pandora_out_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_dapm_context *dapm = &rtd->card->dapm;

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



	/* All TWL4030 output pins are floating */

	snd_soc_dapm_nc_pin(dapm, "EARPIECE");

	snd_soc_dapm_nc_pin(dapm, "PREDRIVEL");

	snd_soc_dapm_nc_pin(dapm, "PREDRIVER");

	snd_soc_dapm_nc_pin(dapm, "HSOL");

	snd_soc_dapm_nc_pin(dapm, "HSOR");

	snd_soc_dapm_nc_pin(dapm, "CARKITL");

	snd_soc_dapm_nc_pin(dapm, "CARKITR");

	snd_soc_dapm_nc_pin(dapm, "HFL");

	snd_soc_dapm_nc_pin(dapm, "HFR");

	snd_soc_dapm_nc_pin(dapm, "VIBRA");

	snd_soc_dapm_disable_pin(dapm, "EARPIECE");

	snd_soc_dapm_disable_pin(dapm, "PREDRIVEL");

	snd_soc_dapm_disable_pin(dapm, "PREDRIVER");

	snd_soc_dapm_disable_pin(dapm, "HSOL");

	snd_soc_dapm_disable_pin(dapm, "HSOR");

	snd_soc_dapm_disable_pin(dapm, "CARKITL");

	snd_soc_dapm_disable_pin(dapm, "CARKITR");

	snd_soc_dapm_disable_pin(dapm, "HFL");

	snd_soc_dapm_disable_pin(dapm, "HFR");

	snd_soc_dapm_disable_pin(dapm, "VIBRA");



	return 0;

}



static int omap3pandora_in_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_dapm_context *dapm = &rtd->card->dapm;

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



	/* Not comnnected */

	snd_soc_dapm_nc_pin(dapm, "HSMIC");

	snd_soc_dapm_nc_pin(dapm, "CARKITMIC");

	snd_soc_dapm_nc_pin(dapm, "DIGIMIC0");

	snd_soc_dapm_nc_pin(dapm, "DIGIMIC1");

	snd_soc_dapm_disable_pin(dapm, "HSMIC");

	snd_soc_dapm_disable_pin(dapm, "CARKITMIC");

	snd_soc_dapm_disable_pin(dapm, "DIGIMIC0");

	snd_soc_dapm_disable_pin(dapm, "DIGIMIC1");



	return 0;

}