ASoC: es7134: correct required power supplies

Drop AVDD in favor of PVDD to match the names used in the datasheet
and only claim PVDD on the es7154. The es7134 and es7144 don't have
a separate supply for the digital I/O.

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/es7134.c b/sound/soc/codecs/es7134.c
index 5ad59c38fed1c8dfc03cf279b4593d521ca876e6..80f2936cefedc98788679512a868920cbcbd9b8c 100644 (file)
--- a/sound/soc/codecs/es7134.c
+++ b/sound/soc/codecs/es7134.c
@@ -35,6 +35,10 @@ struct es7134_clock_mode {
 struct es7134_chip {
        const struct es7134_clock_mode *modes;
        unsigned int mode_num;
+       const struct snd_soc_dapm_widget *extra_widgets;
+       unsigned int extra_widget_num;
+       const struct snd_soc_dapm_route *extra_routes;
+       unsigned int extra_route_num;
 };
 
 struct es7134_data {
@@ -110,6 +114,34 @@ static int es7134_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
        return 0;
 }
 
+static int es7134_component_probe(struct snd_soc_component *c)
+{
+       struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(c);
+       struct es7134_data *priv = snd_soc_component_get_drvdata(c);
+       const struct es7134_chip *chip = priv->chip;
+       int ret;
+
+       if (chip->extra_widget_num) {
+               ret = snd_soc_dapm_new_controls(dapm, chip->extra_widgets,
+                                               chip->extra_widget_num);
+               if (ret) {
+                       dev_err(c->dev, "failed to add extra widgets\n");
+                       return ret;
+               }
+       }
+
+       if (chip->extra_route_num) {
+               ret = snd_soc_dapm_add_routes(dapm, chip->extra_routes,
+                                             chip->extra_route_num);
+               if (ret) {
+                       dev_err(c->dev, "failed to add extra routes\n");
+                       return ret;
+               }
+       }
+
+       return 0;
+}
+
 static const struct snd_soc_dai_ops es7134_dai_ops = {
        .set_fmt        = es7134_set_fmt,
        .hw_params      = es7134_hw_params,
@@ -158,9 +190,16 @@ static const struct es7134_clock_mode es7134_modes[] = {
        },
 };
 
+/* Digital I/O are also supplied by VDD on the es7134 */
+static const struct snd_soc_dapm_route es7134_extra_routes[] = {
+       { "Playback", NULL, "VDD", }
+};
+
 static const struct es7134_chip es7134_chip = {
        .modes = es7134_modes,
        .mode_num = ARRAY_SIZE(es7134_modes),
+       .extra_routes = es7134_extra_routes,
+       .extra_route_num = ARRAY_SIZE(es7134_extra_routes),
 };
 
 static const struct snd_soc_dapm_widget es7134_dapm_widgets[] = {
@@ -168,17 +207,16 @@ static const struct snd_soc_dapm_widget es7134_dapm_widgets[] = {
        SND_SOC_DAPM_OUTPUT("AOUTR"),
        SND_SOC_DAPM_DAC("DAC", "Playback", SND_SOC_NOPM, 0, 0),
        SND_SOC_DAPM_REGULATOR_SUPPLY("VDD", 0, 0),
-       SND_SOC_DAPM_REGULATOR_SUPPLY("AVDD", 0, 0),
 };
 
 static const struct snd_soc_dapm_route es7134_dapm_routes[] = {
        { "AOUTL", NULL, "DAC" },
        { "AOUTR", NULL, "DAC" },
-       { "Playback", NULL, "VDD" },
-       { "DAC", NULL, "AVDD" },
+       { "DAC", NULL, "VDD" },
 };
 
 static const struct snd_soc_component_driver es7134_component_driver = {
+       .probe                  = es7134_component_probe,
        .dapm_widgets           = es7134_dapm_widgets,
        .num_dapm_widgets       = ARRAY_SIZE(es7134_dapm_widgets),
        .dapm_routes            = es7134_dapm_routes,