ASoC: tas2552: Correct Output Data register usage

Do not write to DOUT Tristate register at probe time, specially not write
data which is defined to be used in Output Data Register.
Fix the defines for the Output Data Register and correct the register write
at probe time.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

2 files changed, 18 insertions, 6 deletions

diff --git a/sound/soc/codecs/tas2552.c b/sound/soc/codecs/tas2552.c
index 067ea6e5e521..e4c02ee42966 100644
--- a/sound/soc/codecs/tas2552.c
+++ b/sound/soc/codecs/tas2552.c
@@ -598,8 +598,9 @@ static int tas2552_codec_probe(struct snd_soc_codec *codec)
         snd_soc_update_bits(codec, TAS2552_CFG_1, TAS2552_MUTE, TAS2552_MUTE);
         snd_soc_write(codec, TAS2552_CFG_3, TAS2552_I2S_OUT_SEL |
                                             TAS2552_DIN_SRC_SEL_AVG_L_R);
-        snd_soc_write(codec, TAS2552_DOUT, TAS2552_PDM_DATA_I);
-        snd_soc_write(codec, TAS2552_OUTPUT_DATA, TAS2552_PDM_DATA_V_I | 0x8);
+        snd_soc_write(codec, TAS2552_OUTPUT_DATA,
+                      TAS2552_PDM_DATA_SEL_V_I |
+                      TAS2552_R_DATA_OUT(TAS2552_DATA_OUT_V_DATA));
         snd_soc_write(codec, TAS2552_BOOST_PT_CTRL, TAS2552_APT_DELAY_200 |
                                 TAS2552_APT_THRESH_2_1_7);
 
diff --git a/sound/soc/codecs/tas2552.h b/sound/soc/codecs/tas2552.h
index 6806516a62cd..4a22f598ecb6 100644
--- a/sound/soc/codecs/tas2552.h
+++ b/sound/soc/codecs/tas2552.h
@@ -103,10 +103,21 @@
 #define TAS2552_WCLKDIR                 (1 << 7)
 
 /* OUTPUT_DATA register */
-#define TAS2552_PDM_DATA_I              0x00
-#define TAS2552_PDM_DATA_V              (1 << 6)
-#define TAS2552_PDM_DATA_I_V    (1 << 7)
-#define TAS2552_PDM_DATA_V_I    (0x11 << 6)
+#define TAS2552_DATA_OUT_I_DATA         (0x0)
+#define TAS2552_DATA_OUT_V_DATA         (0x1)
+#define TAS2552_DATA_OUT_VBAT_DATA      (0x2)
+#define TAS2552_DATA_OUT_VBOOST_DATA    (0x3)
+#define TAS2552_DATA_OUT_PGA_GAIN       (0x4)
+#define TAS2552_DATA_OUT_IV_DATA        (0x5)
+#define TAS2552_DATA_OUT_VBAT_VBOOST_GAIN       (0x6)
+#define TAS2552_DATA_OUT_DISABLED       (0x7)
+#define TAS2552_L_DATA_OUT(x)           ((x) << 0)
+#define TAS2552_R_DATA_OUT(x)           ((x) << 3)
+#define TAS2552_PDM_DATA_SEL_I          (0x0 << 6)
+#define TAS2552_PDM_DATA_SEL_V          (0x1 << 6)
+#define TAS2552_PDM_DATA_SEL_I_V        (0x2 << 6)
+#define TAS2552_PDM_DATA_SEL_V_I        (0x3 << 6)
+#define TAS2552_PDM_DATA_SEL_MASK       TAS2552_PDM_DATA_SEL_V_I
 
 /* PDM CFG Register */
 #define TAS2552_PDM_CLK_SEL_PLL         (0x0 << 0)