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

Commit b2e69054 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: omap3pandora: Convert to table based DAPM setup 



Use table based setup to register the controls and DAPM widgets and routes. This
on one hand makes the code a bit shorter and cleaner and on the other hand the
board level DAPM elements get registered in the card's DAPM context rather than
in the CODEC's DAPM context.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 81fc5dd4

sound/soc/omap/omap3pandora.c

+9 −22
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static int omap3pandora_hp_event(struct snd_soc_dapm_widget *w, 
 *  |A| <~~clk~~+

 *  |P| <--- TWL4030 <--------- Line In and MICs

 */

static const struct snd_soc_dapm_widget omap3pandora_out_dapm_widgets[] = {

static const struct snd_soc_dapm_widget omap3pandora_dapm_widgets[] = {

	SND_SOC_DAPM_DAC_E("PCM DAC", "HiFi Playback", SND_SOC_NOPM,

			   0, 0, omap3pandora_dac_event,

			   SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
@@ -130,22 +130,18 @@ static const struct snd_soc_dapm_widget omap3pandora_out_dapm_widgets[] = { 
			   SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),

	SND_SOC_DAPM_HP("Headphone Jack", NULL),

	SND_SOC_DAPM_LINE("Line Out", NULL),

};



static const struct snd_soc_dapm_widget omap3pandora_in_dapm_widgets[] = {

	SND_SOC_DAPM_MIC("Mic (internal)", NULL),

	SND_SOC_DAPM_MIC("Mic (external)", NULL),

	SND_SOC_DAPM_LINE("Line In", NULL),

};



static const struct snd_soc_dapm_route omap3pandora_out_map[] = {

static const struct snd_soc_dapm_route omap3pandora_map[] = {

	{"PCM DAC", NULL, "APLL Enable"},

	{"Headphone Amplifier", NULL, "PCM DAC"},

	{"Line Out", NULL, "PCM DAC"},

	{"Headphone Jack", NULL, "Headphone Amplifier"},

};



static const struct snd_soc_dapm_route omap3pandora_in_map[] = {

	{"AUXL", NULL, "Line In"},

	{"AUXR", NULL, "Line In"},
@@ -160,7 +156,6 @@ static int omap3pandora_out_init(struct snd_soc_pcm_runtime *rtd) 
{

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_dapm_context *dapm = &codec->dapm;

	int ret;



	/* All TWL4030 output pins are floating */

	snd_soc_dapm_nc_pin(dapm, "EARPIECE");
@@ -174,20 +169,13 @@ static int omap3pandora_out_init(struct snd_soc_pcm_runtime *rtd) 
	snd_soc_dapm_nc_pin(dapm, "HFR");

	snd_soc_dapm_nc_pin(dapm, "VIBRA");



	ret = snd_soc_dapm_new_controls(dapm, omap3pandora_out_dapm_widgets,

				ARRAY_SIZE(omap3pandora_out_dapm_widgets));

	if (ret < 0)

		return ret;



	return snd_soc_dapm_add_routes(dapm, omap3pandora_out_map,

		ARRAY_SIZE(omap3pandora_out_map));

	return 0;

}



static int omap3pandora_in_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_dapm_context *dapm = &codec->dapm;

	int ret;



	/* Not comnnected */

	snd_soc_dapm_nc_pin(dapm, "HSMIC");
@@ -195,13 +183,7 @@ static int omap3pandora_in_init(struct snd_soc_pcm_runtime *rtd) 
	snd_soc_dapm_nc_pin(dapm, "DIGIMIC0");

	snd_soc_dapm_nc_pin(dapm, "DIGIMIC1");



	ret = snd_soc_dapm_new_controls(dapm, omap3pandora_in_dapm_widgets,

				ARRAY_SIZE(omap3pandora_in_dapm_widgets));

	if (ret < 0)

		return ret;



	return snd_soc_dapm_add_routes(dapm, omap3pandora_in_map,

		ARRAY_SIZE(omap3pandora_in_map));

	return 0;

}



static struct snd_soc_ops omap3pandora_ops = {
@@ -241,6 +223,11 @@ static struct snd_soc_card snd_soc_card_omap3pandora = { 
	.owner = THIS_MODULE,

	.dai_link = omap3pandora_dai,

	.num_links = ARRAY_SIZE(omap3pandora_dai),



	.dapm_widgets = omap3pandora_dapm_widgets,

	.num_dapm_widgets = ARRAY_SIZE(omap3pandora_dapm_widgets),

	.dapm_routes = omap3pandora_map,

	.num_dapm_routes = ARRAY_SIZE(omap3pandora_map),

};



static struct platform_device *omap3pandora_snd_device;