Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1398212

[PATCH 1/5] ASoC: da7213: Add DAI DAPM event to control DAI clocks

From Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
Newsgroups linux.kernel
Subject [PATCH 1/5] ASoC: da7213: Add DAI DAPM event to control DAI clocks
Date 2016-05-10 17:20 +0200
Message-ID <rxhC3-4UM-53@gated-at.bofh.it> (permalink)
References <rxhC2-4UM-21@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

Currently, when Codec is I2S master DAI clocks are continuously
generated even if all audio streams have stopped. To improve
efficiency, control of the DAI clocks for master mode have been
moved to a DAPM widget event so they're only enabled as required.

Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
---
 sound/soc/codecs/da7213.c | 35 ++++++++++++++++++++++++++++++++---
 sound/soc/codecs/da7213.h |  2 --
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c
index 7278f93..701bd62 100644
--- a/sound/soc/codecs/da7213.c
+++ b/sound/soc/codecs/da7213.c
@@ -726,6 +726,36 @@ static const struct snd_kcontrol_new da7213_dapm_mixoutr_controls[] = {
 
 
 /*
+ * DAPM Events
+ */
+
+static int da7213_dai_event(struct snd_soc_dapm_widget *w,
+			    struct snd_kcontrol *kcontrol, int event)
+{
+	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+	struct da7213_priv *da7213 = snd_soc_codec_get_drvdata(codec);
+
+	switch (event) {
+	case SND_SOC_DAPM_PRE_PMU:
+		/* Enable DAI clks for master mode */
+		if (da7213->master)
+			snd_soc_update_bits(codec, DA7213_DAI_CLK_MODE,
+					    DA7213_DAI_CLK_EN_MASK,
+					    DA7213_DAI_CLK_EN_MASK);
+		return 0;
+	case SND_SOC_DAPM_POST_PMD:
+		/* Disable DAI clks if in master mode */
+		if (da7213->master)
+			snd_soc_update_bits(codec, DA7213_DAI_CLK_MODE,
+					    DA7213_DAI_CLK_EN_MASK, 0);
+		return 0;
+	default:
+		return -EINVAL;
+	}
+}
+
+
+/*
  * DAPM widgets
  */
 
@@ -736,7 +766,8 @@ static const struct snd_soc_dapm_widget da7213_dapm_widgets[] = {
 
 	/* Use a supply here as this controls both input & output DAIs */
 	SND_SOC_DAPM_SUPPLY("DAI", DA7213_DAI_CTRL, DA7213_DAI_EN_SHIFT,
-			    DA7213_NO_INVERT, NULL, 0),
+			    DA7213_NO_INVERT, da7213_dai_event,
+			    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
 
 	/*
 	 * Input
@@ -1143,11 +1174,9 @@ static int da7213_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
 	/* Set master/slave mode */
 	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
 	case SND_SOC_DAIFMT_CBM_CFM:
-		dai_clk_mode |= DA7213_DAI_CLK_EN_MASTER_MODE;
 		da7213->master = true;
 		break;
 	case SND_SOC_DAIFMT_CBS_CFS:
-		dai_clk_mode |= DA7213_DAI_CLK_EN_SLAVE_MODE;
 		da7213->master = false;
 		break;
 	default:
diff --git a/sound/soc/codecs/da7213.h b/sound/soc/codecs/da7213.h
index 030fd69..5de5c29 100644
--- a/sound/soc/codecs/da7213.h
+++ b/sound/soc/codecs/da7213.h
@@ -178,8 +178,6 @@
 #define DA7213_DAI_BCLKS_PER_WCLK_MASK				(0x3 << 0)
 #define DA7213_DAI_CLK_POL_INV					(0x1 << 2)
 #define DA7213_DAI_WCLK_POL_INV					(0x1 << 3)
-#define DA7213_DAI_CLK_EN_SLAVE_MODE				(0x0 << 7)
-#define DA7213_DAI_CLK_EN_MASTER_MODE				(0x1 << 7)
 #define DA7213_DAI_CLK_EN_MASK					(0x1 << 7)
 
 /* DA7213_DAI_CTRL = 0x29 */
-- 
1.9.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/5] ASoC: da7213: clocking related improvements for codec Adam Thomson <Adam.Thomson.Opensource@diasemi.com> - 2016-05-10 17:20 +0200
  [PATCH 2/5] ASoC: da7213: Add checking of SRM lock status before  enabling DAI Adam Thomson <Adam.Thomson.Opensource@diasemi.com> - 2016-05-10 17:20 +0200
    Re: [PATCH 2/5] ASoC: da7213: Add checking of SRM lock status before  enabling DAI Mark Brown <broonie@kernel.org> - 2016-05-10 20:30 +0200
      Re: [PATCH 2/5] ASoC: da7213: Add checking of SRM lock status before  enabling DAI Mark Brown <broonie@kernel.org> - 2016-05-10 20:30 +0200
    Applied "ASoC: da7213: Add checking of SRM lock status before enabling DAI" to the asoc tree Mark Brown <broonie@kernel.org> - 2016-05-10 21:00 +0200
  [PATCH 3/5] ASoC: da7213: Default PC counter to free-running when DAI  disabled Adam Thomson <Adam.Thomson.Opensource@diasemi.com> - 2016-05-10 17:20 +0200
    Applied "ASoC: da7213: Default PC counter to free-running when DAI disabled" to the asoc tree Mark Brown <broonie@kernel.org> - 2016-05-10 21:00 +0200
  [PATCH 1/5] ASoC: da7213: Add DAI DAPM event to control DAI clocks Adam Thomson <Adam.Thomson.Opensource@diasemi.com> - 2016-05-10 17:20 +0200
    Applied "ASoC: da7213: Add DAI DAPM event to control DAI clocks" to the asoc tree Mark Brown <broonie@kernel.org> - 2016-05-10 20:50 +0200
  [PATCH 5/5] ASoC: da7213: Allow PLL disable/bypass when using 32KHz  sysclk Adam Thomson <Adam.Thomson.Opensource@diasemi.com> - 2016-05-10 17:20 +0200
    Applied "ASoC: da7213: Allow PLL disable/bypass when using 32KHz sysclk" to the asoc tree Mark Brown <broonie@kernel.org> - 2016-05-10 21:00 +0200
  [PATCH 4/5] ASoC: da7213: Update PLL ranges to improve locking at  frequency boundary Adam Thomson <Adam.Thomson.Opensource@diasemi.com> - 2016-05-10 17:20 +0200
    Applied "ASoC: da7213: Update PLL ranges to improve locking at frequency boundary" to the asoc tree Mark Brown <broonie@kernel.org> - 2016-05-10 20:50 +0200

csiph-web