ASoC: tas2562: Add support for ISENSE and VSENSE

Add additional support for ISENSE and VSENSE feature for the TAS2562.
This feature monitors the output to the loud speaker attempts to
eliminate IR drop errors due to packaging.

This feature is defined in Section 8.4.5 IV Sense of the data sheet.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
Link: https://lore.kernel.org/r/20200219134622.22066-1-dmurphy@ti.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/tas2562.c b/sound/soc/codecs/tas2562.c
index 729acd874c485cebd0826fa269430a3a57330878..b517ada7e8092a0471049072e3c5becb6ae33373 100644 (file)
--- a/sound/soc/codecs/tas2562.c
+++ b/sound/soc/codecs/tas2562.c
@@ -382,18 +382,34 @@ static int tas2562_dac_event(struct snd_soc_dapm_widget *w,
        struct snd_soc_component *component =
                                        snd_soc_dapm_to_component(w->dapm);
        struct tas2562_data *tas2562 = snd_soc_component_get_drvdata(component);
+       int ret;
 
        switch (event) {
        case SND_SOC_DAPM_POST_PMU:
-               dev_info(tas2562->dev, "SND_SOC_DAPM_POST_PMU\n");
+               ret = snd_soc_component_update_bits(component,
+                       TAS2562_PWR_CTRL,
+                       TAS2562_MODE_MASK,
+                       TAS2562_MUTE);
+               if (ret)
+                       goto end;
                break;
        case SND_SOC_DAPM_PRE_PMD:
-               dev_info(tas2562->dev, "SND_SOC_DAPM_PRE_PMD\n");
+               ret = snd_soc_component_update_bits(component,
+                       TAS2562_PWR_CTRL,
+                       TAS2562_MODE_MASK,
+                       TAS2562_SHUTDOWN);
+               if (ret)
+                       goto end;
                break;
        default:
-               break;
+               dev_err(tas2562->dev, "Not supported evevt\n");
+               return -EINVAL;
        }
 
+end:
+       if (ret < 0)
+               return ret;
+
        return 0;
 }
 
@@ -415,7 +431,6 @@ static const struct snd_kcontrol_new tas2562_snd_controls[] = {
 static const struct snd_soc_dapm_widget tas2562_dapm_widgets[] = {
        SND_SOC_DAPM_AIF_IN("ASI1", "ASI1 Playback", 0, SND_SOC_NOPM, 0, 0),
        SND_SOC_DAPM_MUX("ASI1 Sel", SND_SOC_NOPM, 0, 0, &tas2562_asi1_mux),
-       SND_SOC_DAPM_AIF_IN("DAC IN", "Playback", 0, SND_SOC_NOPM, 0, 0),
        SND_SOC_DAPM_DAC_E("DAC", NULL, SND_SOC_NOPM, 0, 0, tas2562_dac_event,
                           SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
        SND_SOC_DAPM_SWITCH("ISENSE", TAS2562_PWR_CTRL, 3, 1, &isense_switch),
@@ -430,7 +445,7 @@ static const struct snd_soc_dapm_route tas2562_audio_map[] = {
        {"ASI1 Sel", "Left", "ASI1"},
        {"ASI1 Sel", "Right", "ASI1"},
        {"ASI1 Sel", "LeftRightDiv2", "ASI1"},
-       { "DAC", NULL, "DAC IN" },
+       { "DAC", NULL, "ASI1 Sel" },
        { "OUT", NULL, "DAC" },
        {"ISENSE", "Switch", "IMON"},
        {"VSENSE", "Switch", "VMON"},
@@ -471,6 +486,13 @@ static struct snd_soc_dai_driver tas2562_dai[] = {
                        .rates      = SNDRV_PCM_RATE_8000_192000,
                        .formats    = TAS2562_FORMATS,
                },
+               .capture = {
+                       .stream_name    = "ASI1 Capture",
+                       .channels_min   = 0,
+                       .channels_max   = 2,
+                       .rates          = SNDRV_PCM_RATE_8000_192000,
+                       .formats        = TAS2562_FORMATS,
+               },
                .ops = &tas2562_speaker_dai_ops,
        },
 };

diff --git a/sound/soc/codecs/tas2562.h b/sound/soc/codecs/tas2562.h
index 62e659ab786d9fac5ac365cda36f49eeb4130ced..6f55ebcf19ea7c46002a6402447d5c79a904cb95 100644 (file)
--- a/sound/soc/codecs/tas2562.h
+++ b/sound/soc/codecs/tas2562.h
@@ -40,7 +40,7 @@
 
 #define TAS2562_RESET  BIT(0)
 
-#define TAS2562_MODE_MASK      0x3
+#define TAS2562_MODE_MASK      GENMASK(1,0)
 #define TAS2562_ACTIVE         0x0
 #define TAS2562_MUTE           0x1
 #define TAS2562_SHUTDOWN       0x2
@@ -73,8 +73,8 @@
 #define TAS2562_TDM_CFG2_RXWLEN_24B    BIT(3)
 #define TAS2562_TDM_CFG2_RXWLEN_32B    (BIT(2) | BIT(3))
 
-#define TAS2562_VSENSE_POWER_EN                BIT(2)
-#define TAS2562_ISENSE_POWER_EN                BIT(3)
+#define TAS2562_VSENSE_POWER_EN                2
+#define TAS2562_ISENSE_POWER_EN                3
 
 #define TAS2562_TDM_CFG5_VSNS_EN       BIT(6)
 #define TAS2562_TDM_CFG5_VSNS_SLOT_MASK        GENMASK(5, 0)