ENGR00320678 ASoC: cs42xx8: Revert the DAPM routes to the old one

The upstream version of DAPM routes results record noise issue due to its
inappropriate power-up sequence. So we provisionally revert this change
to the old stable one, and figure out why the sequence has problem later.

Acked-by: Wang Shengjiu <b02247@freescale.com>
Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com>
(cherry picked from commit 3cda4b6d88aa7b40ac22652df92fa449063bc35a)

1 files changed, 29 insertions, 17 deletions

diff --git a/sound/soc/codecs/cs42xx8.c b/sound/soc/codecs/cs42xx8.c
index c7b75007ca9b..561a35b0b58f 100644
--- a/sound/soc/codecs/cs42xx8.c
+++ b/sound/soc/codecs/cs42xx8.c
@@ -127,7 +127,7 @@ static const struct snd_soc_dapm_widget cs42xx8_dapm_widgets[] = {
         SND_SOC_DAPM_INPUT("AIN2L"),
         SND_SOC_DAPM_INPUT("AIN2R"),
 
-        SND_SOC_DAPM_SUPPLY("PWR", CS42XX8_PWRCTL, 0, 1, NULL, 0),
+        SND_SOC_DAPM_PGA_E("PWR", CS42XX8_PWRCTL, 0, 1, NULL, 0, NULL, 0),
 };
 
 static const struct snd_soc_dapm_widget cs42xx8_adc3_dapm_widgets[] = {
@@ -139,29 +139,41 @@ static const struct snd_soc_dapm_widget cs42xx8_adc3_dapm_widgets[] = {
 
 static const struct snd_soc_dapm_route cs42xx8_dapm_routes[] = {
         /* Playback */
-        { "AOUT1L", NULL, "DAC1" },
-        { "AOUT1R", NULL, "DAC1" },
-        { "DAC1", NULL, "PWR" },
+        { "PWR", NULL, "DAC1" },
+        { "PWR", NULL, "DAC1" },
 
-        { "AOUT2L", NULL, "DAC2" },
-        { "AOUT2R", NULL, "DAC2" },
-        { "DAC2", NULL, "PWR" },
+        { "PWR", NULL, "DAC2" },
+        { "PWR", NULL, "DAC2" },
 
-        { "AOUT3L", NULL, "DAC3" },
-        { "AOUT3R", NULL, "DAC3" },
-        { "DAC3", NULL, "PWR" },
+        { "PWR", NULL, "DAC3" },
+        { "PWR", NULL, "DAC3" },
 
-        { "AOUT4L", NULL, "DAC4" },
-        { "AOUT4R", NULL, "DAC4" },
-        { "DAC4", NULL, "PWR" },
+        { "PWR", NULL, "DAC4" },
+        { "PWR", NULL, "DAC4" },
+
+        { "AOUT1L", NULL, "PWR" },
+        { "AOUT1R", NULL, "PWR" },
+
+        { "AOUT2L", NULL, "PWR" },
+        { "AOUT2R", NULL, "PWR" },
+
+        { "AOUT3L", NULL, "PWR" },
+        { "AOUT3R", NULL, "PWR" },
+
+        { "AOUT4L", NULL, "PWR" },
+        { "AOUT4R", NULL, "PWR" },
 
         /* Capture */
-        { "ADC1", NULL, "AIN1L" },
-        { "ADC1", NULL, "AIN1R" },
+        { "PWR", NULL, "AIN1L" },
+        { "PWR", NULL, "AIN1R" },
+
+        { "PWR", NULL, "AIN2L" },
+        { "PWR", NULL, "AIN2R" },
+
+        { "ADC1", NULL, "PWR" },
         { "ADC1", NULL, "PWR" },
 
-        { "ADC2", NULL, "AIN2L" },
-        { "ADC2", NULL, "AIN2R" },
+        { "ADC2", NULL, "PWR" },
         { "ADC2", NULL, "PWR" },
 };