From: Grazvydas Ignotas <notasas@gmail.com>
Date: Sun, 3 Jul 2016 19:44:59 +0000 (+0300)
Subject: Revert "ASoC: twl4030: disable 256fs clock on shutdown"
X-Git-Tag: sz_175~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e572d8e8ad5503928c1e6e06dcd0d87c041415a6;p=pandora-kernel.git

Revert "ASoC: twl4030: disable 256fs clock on shutdown"

This reverts commit 5ee6c9912674b66378fe9d9ed9561baf8025b740.

wrong thing to do because:
- disables clock if one stream ends even while another still runs
- stops the clock while DAC is still active - DAC always requires
  a clock while PD is high
---

diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 321a0b926f66..ea099d586ce1 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -136,8 +136,6 @@ struct twl4030_priv {
 	/* reference counts of AIF/APLL users */
 	unsigned int apll_enabled;
 
-	unsigned int using_256fs;
-
 	struct snd_pcm_substream *master_substream;
 	struct snd_pcm_substream *slave_substream;
 
@@ -1701,7 +1699,6 @@ static int twl4030_startup(struct snd_pcm_substream *substream,
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
 	struct snd_soc_codec *codec = rtd->codec;
 	struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
-	u8 format;
 
 	snd_pcm_hw_constraint_msbits(substream->runtime, 0, 32, 24);
 	if (twl4030->master_substream) {
@@ -1724,12 +1721,6 @@ static int twl4030_startup(struct snd_pcm_substream *substream,
 		twl4030->master_substream = substream;
 	}
 
-	format = twl4030_read_reg_cache(codec, TWL4030_REG_AUDIO_IF);
-	if (twl4030->using_256fs && !(format & TWL4030_CLK256FS_EN)) {
-		format |= TWL4030_CLK256FS_EN;
-		twl4030_write(codec, TWL4030_REG_AUDIO_IF, format);
-	}
-
 	return 0;
 }
 
@@ -1739,7 +1730,6 @@ static void twl4030_shutdown(struct snd_pcm_substream *substream,
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
 	struct snd_soc_codec *codec = rtd->codec;
 	struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
-	u8 format;
 
 	if (twl4030->master_substream == substream)
 		twl4030->master_substream = twl4030->slave_substream;
@@ -1756,13 +1746,6 @@ static void twl4030_shutdown(struct snd_pcm_substream *substream,
 	 /* If the closing substream had 4 channel, do the necessary cleanup */
 	if (substream->runtime->channels == 4)
 		twl4030_tdm_enable(codec, substream->stream, 0);
-
-	/* Disable 256fs clock to avoid noisy output in power save modes */
-	format = twl4030_read_reg_cache(codec, TWL4030_REG_AUDIO_IF);
-	if (format & TWL4030_CLK256FS_EN) {
-		format &= ~TWL4030_CLK256FS_EN;
-		twl4030_write(codec, TWL4030_REG_AUDIO_IF, format);
-	}
 }
 
 static int twl4030_hw_params(struct snd_pcm_substream *substream,
@@ -1928,12 +1911,10 @@ static int twl4030_set_dai_fmt(struct snd_soc_dai *codec_dai,
 	case SND_SOC_DAIFMT_CBM_CFM:
 		format &= ~(TWL4030_AIF_SLAVE_EN);
 		format &= ~(TWL4030_CLK256FS_EN);
-		twl4030->using_256fs = 0;
 		break;
 	case SND_SOC_DAIFMT_CBS_CFS:
 		format |= TWL4030_AIF_SLAVE_EN;
 		format |= TWL4030_CLK256FS_EN;
-		twl4030->using_256fs = 1;
 		break;
 	default:
 		return -EINVAL;