ASoC: Fix vaud18 power leakage of mt6359

vaud18 is power of mt6359 audio path. It
should only enable when audio is used,
instead of in boot up stage.
Once mt6359 audio path is enabled or disabled,
vaud18 is controlled by regulator supply widget
"LDO_VAUD18". Due to vaud18 is controlled by
regulator dapm macro instead of regmap, the macro
MT6359_LDO_VAUD18_CON0 and variable avdd_reg
is no used and removed from mt6359.h.

Signed-off-by: Shane.Chien <shane.chien@mediatek.com>
Link: https://lore.kernel.org/r/1604975492-6142-2-git-send-email-shane.chien@mediatek.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/mt6359.c b/sound/soc/codecs/mt6359.c
index d20c59a8752460edfea4f1a2f95cc480740a1df4..ecdfd5732075d86307a14ef912661883555b5087 100644 (file)
--- a/sound/soc/codecs/mt6359.c
+++ b/sound/soc/codecs/mt6359.c
@@ -1943,9 +1943,7 @@ static const struct snd_soc_dapm_widget mt6359_dapm_widgets[] = {
        SND_SOC_DAPM_SUPPLY_S("CLK_BUF", SUPPLY_SEQ_CLK_BUF,
                              MT6359_DCXO_CW12,
                              RG_XO_AUDIO_EN_M_SFT, 0, NULL, 0),
-       SND_SOC_DAPM_SUPPLY_S("LDO_VAUD18", SUPPLY_SEQ_LDO_VAUD18,
-                             MT6359_LDO_VAUD18_CON0,
-                             RG_LDO_VAUD18_EN_SFT, 0, NULL, 0),
+       SND_SOC_DAPM_REGULATOR_SUPPLY("LDO_VAUD18", 0, 0),
        SND_SOC_DAPM_SUPPLY_S("AUDGLB", SUPPLY_SEQ_AUD_GLB,
                              MT6359_AUDDEC_ANA_CON13,
                              RG_AUDGLB_PWRDN_VA32_SFT, 1, NULL, 0),
@@ -2807,20 +2805,6 @@ static int mt6359_platform_driver_probe(struct platform_device *pdev)
        dev_set_drvdata(&pdev->dev, priv);
        priv->dev = &pdev->dev;
 
-       priv->avdd_reg = devm_regulator_get(&pdev->dev, "vaud18");
-       if (IS_ERR(priv->avdd_reg)) {
-               dev_err(&pdev->dev, "%s(), have no vaud18 supply: %ld",
-                       __func__, PTR_ERR(priv->avdd_reg));
-               return PTR_ERR(priv->avdd_reg);
-       }
-
-       ret = regulator_enable(priv->avdd_reg);
-       if (ret) {
-               dev_err(&pdev->dev, "%s(), failed to enable regulator!\n",
-                       __func__);
-               return ret;
-       }
-
        ret = mt6359_parse_dt(priv);
        if (ret) {
                dev_warn(&pdev->dev, "%s() failed to parse dts\n", __func__);
@@ -2841,13 +2825,6 @@ static int mt6359_platform_driver_remove(struct platform_device *pdev)
        dev_dbg(&pdev->dev, "%s(), dev name %s\n",
                __func__, dev_name(&pdev->dev));
 
-       ret = regulator_disable(priv->avdd_reg);
-       if (ret) {
-               dev_err(&pdev->dev, "%s(), failed to disable regulator!\n",
-                       __func__);
-               return ret;
-       }
-
        return 0;
 }
 

diff --git a/sound/soc/codecs/mt6359.h b/sound/soc/codecs/mt6359.h
index af6f07fbc4fd19e80c65398c46de5d65d3b889e9..35f806b7396dd89574e2e2e0dd0049363a8dfcee 100644 (file)
--- a/sound/soc/codecs/mt6359.h
+++ b/sound/soc/codecs/mt6359.h
@@ -135,11 +135,6 @@
 /* MT6359_DCXO_CW12 */
 #define RG_XO_AUDIO_EN_M_SFT                           13
 
-/* LDO_VAUD18_CON0 */
-#define RG_LDO_VAUD18_EN_SFT                           0
-#define RG_LDO_VAUD18_EN_MASK                          0x1
-#define RG_LDO_VAUD18_EN_MASK_SFT                      (0x1 << 0)
-
 /* AUD_TOP_CKPDN_CON0 */
 #define RG_VOW13M_CK_PDN_SFT                           13
 #define RG_VOW13M_CK_PDN_MASK                          0x1
@@ -2132,7 +2127,6 @@
 
 #define MT6359_DCXO_CW11                               0x7a6
 #define MT6359_DCXO_CW12                               0x7a8
-#define MT6359_LDO_VAUD18_CON0                         0x1c98
 
 #define MT6359_GPIO_MODE0                              0xcc
 #define MT6359_GPIO_MODE0_SET                          0xce
@@ -2469,7 +2463,6 @@ enum {
 enum {
        /* common */
        SUPPLY_SEQ_CLK_BUF,
-       SUPPLY_SEQ_LDO_VAUD18,
        SUPPLY_SEQ_AUD_GLB,
        SUPPLY_SEQ_HP_PULL_DOWN,
        SUPPLY_SEQ_CLKSQ,
@@ -2629,7 +2622,6 @@ struct mt6359_priv {
        int hp_gain_ctl;
        int hp_hifi_mode;
        int mtkaif_protocol;
-       struct regulator *avdd_reg;
 };
 
 #define CODEC_MT6359_NAME "mtk-codec-mt6359"