ASoC: sgtl5000: refactor registering internal ldo

The code for registering the internal ldo was present twice. Turn it
into a function instead. Also, inform the user if LDO is used now.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Tested-by: Dong Aisheng <b29396@freescale.com>
Tested-by: Shawn Guo <shawn.guo@freescale.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index ff29380c9ed30ee5eb2eda225e505b1415de0269..17af336892a7ab5624310a9ba8d9a3d2ce98dd2c 100644 (file)
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -1218,6 +1218,34 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec)
        return 0;
 }
 
+static int sgtl5000_replace_vddd_with_ldo(struct snd_soc_codec *codec)
+{
+       struct sgtl5000_priv *sgtl5000 = snd_soc_codec_get_drvdata(codec);
+       int ret;
+
+       /* set internal ldo to 1.2v */
+       ret = ldo_regulator_register(codec, &ldo_init_data, LDO_VOLTAGE);
+       if (ret) {
+               dev_err(codec->dev,
+                       "Failed to register vddd internal supplies: %d\n", ret);
+               return ret;
+       }
+
+       sgtl5000->supplies[VDDD].supply = LDO_CONSUMER_NAME;
+
+       ret = regulator_bulk_get(codec->dev, ARRAY_SIZE(sgtl5000->supplies),
+                       sgtl5000->supplies);
+
+       if (ret) {
+               ldo_regulator_remove(codec);
+               dev_err(codec->dev, "Failed to request supplies: %d\n", ret);
+               return ret;
+       }
+
+       dev_info(codec->dev, "Using internal LDO instead of VDDD\n");
+       return 0;
+}
+
 static int sgtl5000_enable_regulators(struct snd_soc_codec *codec)
 {
        u16 reg;
@@ -1235,30 +1263,9 @@ static int sgtl5000_enable_regulators(struct snd_soc_codec *codec)
        if (!ret)
                external_vddd = 1;
        else {
-               /* set internal ldo to 1.2v */
-               int voltage = LDO_VOLTAGE;
-
-               ret = ldo_regulator_register(codec, &ldo_init_data, voltage);
-               if (ret) {
-                       dev_err(codec->dev,
-                       "Failed to register vddd internal supplies: %d\n",
-                               ret);
-                       return ret;
-               }
-
-               sgtl5000->supplies[VDDD].supply = LDO_CONSUMER_NAME;
-
-               ret = regulator_bulk_get(codec->dev,
-                               ARRAY_SIZE(sgtl5000->supplies),
-                               sgtl5000->supplies);
-
-               if (ret) {
-                       ldo_regulator_remove(codec);
-                       dev_err(codec->dev,
-                               "Failed to request supplies: %d\n", ret);
-
+               ret = sgtl5000_replace_vddd_with_ldo(codec);
+               if (ret)
                        return ret;
-               }
        }
 
        ret = regulator_bulk_enable(ARRAY_SIZE(sgtl5000->supplies),
@@ -1287,7 +1294,6 @@ static int sgtl5000_enable_regulators(struct snd_soc_codec *codec)
         * roll back to use internal LDO
         */
        if (external_vddd && rev >= 0x11) {
-               int voltage = LDO_VOLTAGE;
                /* disable all regulator first */
                regulator_bulk_disable(ARRAY_SIZE(sgtl5000->supplies),
                                        sgtl5000->supplies);
@@ -1295,23 +1301,10 @@ static int sgtl5000_enable_regulators(struct snd_soc_codec *codec)
                regulator_bulk_free(ARRAY_SIZE(sgtl5000->supplies),
                                        sgtl5000->supplies);
 
-               ret = ldo_regulator_register(codec, &ldo_init_data, voltage);
+               ret = sgtl5000_replace_vddd_with_ldo(codec);
                if (ret)
                        return ret;
 
-               sgtl5000->supplies[VDDD].supply = LDO_CONSUMER_NAME;
-
-               ret = regulator_bulk_get(codec->dev,
-                               ARRAY_SIZE(sgtl5000->supplies),
-                               sgtl5000->supplies);
-               if (ret) {
-                       ldo_regulator_remove(codec);
-                       dev_err(codec->dev,
-                               "Failed to request supplies: %d\n", ret);
-
-                       return ret;
-               }
-
                ret = regulator_bulk_enable(ARRAY_SIZE(sgtl5000->supplies),
                                                sgtl5000->supplies);
                if (ret)