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

Commit 4fc932c6 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: pcm3008: Manage DAC and ADC power with DAPM 



Rather than leaving the DAC and ADC active whenever the system is running
manage their power with DAPM.

Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent faaf36f2

sound/soc/codecs/pcm3008.c

+39 −33
Original line number Original line Diff line number Diff line
@@ -28,20 +28,53 @@ 




#include "pcm3008.h"

#include "pcm3008.h"





static int pcm3008_dac_ev(struct snd_soc_dapm_widget *w,

			  struct snd_kcontrol *kcontrol,

			  int event)

{

	struct snd_soc_codec *codec = w->codec;

	struct pcm3008_setup_data *setup = codec->dev->platform_data;



	gpio_set_value_cansleep(setup->pdda_pin,

				SND_SOC_DAPM_EVENT_ON(event));



	return 0;

}



static int pcm3008_adc_ev(struct snd_soc_dapm_widget *w,

			  struct snd_kcontrol *kcontrol,

			  int event)

{

	struct snd_soc_codec *codec = w->codec;

	struct pcm3008_setup_data *setup = codec->dev->platform_data;



	gpio_set_value_cansleep(setup->pdad_pin,

				SND_SOC_DAPM_EVENT_ON(event));



	return 0;

}



static const struct snd_soc_dapm_widget pcm3008_dapm_widgets[] = {

static const struct snd_soc_dapm_widget pcm3008_dapm_widgets[] = {

SND_SOC_DAPM_INPUT("VINL"),

SND_SOC_DAPM_INPUT("VINL"),

SND_SOC_DAPM_INPUT("VINR"),

SND_SOC_DAPM_INPUT("VINR"),





SND_SOC_DAPM_DAC_E("DAC", NULL, SND_SOC_NOPM, 0, 0, pcm3008_dac_ev,

		   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),

SND_SOC_DAPM_ADC_E("ADC", NULL, SND_SOC_NOPM, 0, 0, pcm3008_adc_ev,

		   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),



SND_SOC_DAPM_OUTPUT("VOUTL"),

SND_SOC_DAPM_OUTPUT("VOUTL"),

SND_SOC_DAPM_OUTPUT("VOUTR"),

SND_SOC_DAPM_OUTPUT("VOUTR"),

};

};





static const struct snd_soc_dapm_route pcm3008_dapm_routes[] = {

static const struct snd_soc_dapm_route pcm3008_dapm_routes[] = {

	{ "PCM3008 Capture", NULL, "VINL" },

	{ "PCM3008 Capture", NULL, "ADC" },

	{ "PCM3008 Capture", NULL, "VINR" },

	{ "ADC", NULL, "VINL" },

	{ "ADC", NULL, "VINR" },





	{ "VOUTL", NULL, "PCM3008 Playback" },

	{ "DAC", NULL, "PCM3008 Playback" },

	{ "VOUTR", NULL, "PCM3008 Playback" },

	{ "VOUTL", NULL, "DAC" },

	{ "VOUTR", NULL, "DAC" },

};

};





#define PCM3008_RATES (SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |	\

#define PCM3008_RATES (SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |	\
@@ -65,34 +98,7 @@ static struct snd_soc_dai_driver pcm3008_dai = { 
	},

	},

};

};





#ifdef CONFIG_PM

static int pcm3008_soc_suspend(struct snd_soc_codec *codec)

{

	struct pcm3008_setup_data *setup = codec->dev->platform_data;



	gpio_set_value_cansleep(setup->pdad_pin, 0);

	gpio_set_value_cansleep(setup->pdda_pin, 0);



	return 0;

}



static int pcm3008_soc_resume(struct snd_soc_codec *codec)

{

	struct pcm3008_setup_data *setup = codec->dev->platform_data;



	gpio_set_value_cansleep(setup->pdad_pin, 1);

	gpio_set_value_cansleep(setup->pdda_pin, 1);



	return 0;

}

#else

#define pcm3008_soc_suspend NULL

#define pcm3008_soc_resume NULL

#endif



static struct snd_soc_codec_driver soc_codec_dev_pcm3008 = {

static struct snd_soc_codec_driver soc_codec_dev_pcm3008 = {

	.suspend =	pcm3008_soc_suspend,

	.resume =	pcm3008_soc_resume,

	.dapm_widgets = pcm3008_dapm_widgets,

	.dapm_widgets = pcm3008_dapm_widgets,

	.num_dapm_widgets = ARRAY_SIZE(pcm3008_dapm_widgets),

	.num_dapm_widgets = ARRAY_SIZE(pcm3008_dapm_widgets),

	.dapm_routes = pcm3008_dapm_routes,

	.dapm_routes = pcm3008_dapm_routes,
@@ -128,13 +134,13 @@ static int pcm3008_codec_probe(struct platform_device *pdev) 




	/* Configure PDAD GPIO. */

	/* Configure PDAD GPIO. */

	ret = devm_gpio_request_one(&pdev->dev, setup->pdad_pin,

	ret = devm_gpio_request_one(&pdev->dev, setup->pdad_pin,

				    GPIOF_OUT_INIT_HIGH, "codec_pdad");

				    GPIOF_OUT_INIT_LOW, "codec_pdad");

	if (ret != 0)

	if (ret != 0)

		return ret;

		return ret;





	/* Configure PDDA GPIO. */

	/* Configure PDDA GPIO. */

	ret = devm_gpio_request_one(&pdev->dev, setup->pdda_pin,

	ret = devm_gpio_request_one(&pdev->dev, setup->pdda_pin,

				    GPIOF_OUT_INIT_HIGH, "codec_pdda");

				    GPIOF_OUT_INIT_LOW, "codec_pdda");

	if (ret != 0)

	if (ret != 0)

		return ret;

		return ret;