ASoC: rt1015: Add bclk detection and dc detection

Add bclk detection and dc detection before playback.

Signed-off-by: Jack Yu <jack.yu@realtek.com>
Link: https://lore.kernel.org/r/20210322055053.31797-1-jack.yu@realtek.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/rt1015.c b/sound/soc/codecs/rt1015.c
index 10a7b7745f4be5b8e883d4f8df511a6e537c1930..9238f12999aa8bffbd1c9b550bb3f4be505faaa7 100644 (file)
--- a/sound/soc/codecs/rt1015.c
+++ b/sound/soc/codecs/rt1015.c
@@ -669,8 +669,23 @@ static int rt1015_amp_drv_event(struct snd_soc_dapm_widget *w,
        struct snd_soc_component *component =
                snd_soc_dapm_to_component(w->dapm);
        struct rt1015_priv *rt1015 = snd_soc_component_get_drvdata(component);
+       unsigned int ret, ret2;
 
        switch (event) {
+       case SND_SOC_DAPM_PRE_PMU:
+               ret = snd_soc_component_read(component, RT1015_CLK_DET);
+               ret2 = snd_soc_component_read(component, RT1015_SPK_DC_DETECT1);
+               if (!((ret >> 15) & 0x1)) {
+                       snd_soc_component_update_bits(component, RT1015_CLK_DET,
+                               RT1015_EN_BCLK_DET_MASK, RT1015_EN_BCLK_DET);
+                       dev_dbg(component->dev, "BCLK Detection Enabled.\n");
+               }
+               if (!((ret2 >> 12) & 0x1)) {
+                       snd_soc_component_update_bits(component, RT1015_SPK_DC_DETECT1,
+                               RT1015_EN_CLA_D_DC_DET_MASK, RT1015_EN_CLA_D_DC_DET);
+                       dev_dbg(component->dev, "Class-D DC Detection Enabled.\n");
+               }
+               break;
        case SND_SOC_DAPM_POST_PMU:
                if (rt1015->hw_config == RT1015_HW_28)
                        schedule_delayed_work(&rt1015->flush_work, msecs_to_jiffies(10));
@@ -690,7 +705,8 @@ static const struct snd_soc_dapm_widget rt1015_dapm_widgets[] = {
                r1015_dac_event, SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
                SND_SOC_DAPM_POST_PMD),
        SND_SOC_DAPM_OUT_DRV_E("Amp Drv", SND_SOC_NOPM, 0, 0, NULL, 0,
-                       rt1015_amp_drv_event, SND_SOC_DAPM_POST_PMU),
+                       rt1015_amp_drv_event, SND_SOC_DAPM_PRE_PMU |
+                       SND_SOC_DAPM_POST_PMU),
        SND_SOC_DAPM_OUTPUT("SPO"),
 };
 

diff --git a/sound/soc/codecs/rt1015.h b/sound/soc/codecs/rt1015.h
index 2aeaf65ba7931af21ba4e39c07bab400da7b6c73..14344532048e53b7ee8b41d4d8cb622629e78af1 100644 (file)
--- a/sound/soc/codecs/rt1015.h
+++ b/sound/soc/codecs/rt1015.h
@@ -209,6 +209,11 @@
 #define RT1015_PLL_K_MASK                      (RT1015_PLL_K_MAX)
 #define RT1015_PLL_K_SFT                       0
 
+/* 0x0020 */
+#define RT1015_EN_BCLK_DET_MASK                        (0x1 << 15)
+#define RT1015_EN_BCLK_DET                             (0x1 << 15)
+#define RT1015_DIS_BCLK_DET                            (0x0 << 15)
+
 /* 0x007a */
 #define RT1015_ID_MASK                         0xff
 #define RT1015_ID_VERA                         0x0
@@ -374,6 +379,11 @@
 #define RT1015_PWR_SWR                         (0x1 << 12)
 #define RT1015_PWR_SWR_BIT                     12
 
+/* 0x0519 */
+#define RT1015_EN_CLA_D_DC_DET_MASK    (0x1 << 12)
+#define RT1015_EN_CLA_D_DC_DET         (0x1 << 12)
+#define RT1015_DIS_CLA_D_DC_DET                (0x0 << 12)
+
 /* 0x1300 */
 #define RT1015_PWR_CLSD                                (0x1 << 12)
 #define RT1015_PWR_CLSD_BIT                    12