ASoC: Remove internally generated WM8915 supplies

DCVDD and MICVDD are intended to be (and almost always are) generated by
on-board LDOs which are transparently controlled by the driver so we
shouldn't really be requesting them from the regulator API. If the driver
is updated to support external supply of these then we will need to change
the way we handle this.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

diff --git a/sound/soc/codecs/wm8915.c b/sound/soc/codecs/wm8915.c
index bb1ff2c25eb0ffa44c637a57ec29b1e482e0c17c..5ff6a773c8fb0829d083ae94077ae1a21d76d6e2 100644 (file)
--- a/sound/soc/codecs/wm8915.c
+++ b/sound/soc/codecs/wm8915.c
@@ -41,14 +41,12 @@
 #define HPOUT2L 4
 #define HPOUT2R 8
 
-#define WM8915_NUM_SUPPLIES 6
+#define WM8915_NUM_SUPPLIES 4
 static const char *wm8915_supply_names[WM8915_NUM_SUPPLIES] = {
-       "DCVDD",
        "DBVDD",
        "AVDD1",
        "AVDD2",
        "CPVDD",
-       "MICVDD",
 };
 
 struct wm8915_priv {
@@ -113,8 +111,6 @@ WM8915_REGULATOR_EVENT(0)
 WM8915_REGULATOR_EVENT(1)
 WM8915_REGULATOR_EVENT(2)
 WM8915_REGULATOR_EVENT(3)
-WM8915_REGULATOR_EVENT(4)
-WM8915_REGULATOR_EVENT(5)
 
 static const u16 wm8915_reg[WM8915_MAX_REGISTER] = {
        [WM8915_SOFTWARE_RESET] = 0x8915,
@@ -2495,8 +2491,6 @@ static int wm8915_probe(struct snd_soc_codec *codec)
        wm8915->disable_nb[1].notifier_call = wm8915_regulator_event_1;
        wm8915->disable_nb[2].notifier_call = wm8915_regulator_event_2;
        wm8915->disable_nb[3].notifier_call = wm8915_regulator_event_3;
-       wm8915->disable_nb[4].notifier_call = wm8915_regulator_event_4;
-       wm8915->disable_nb[5].notifier_call = wm8915_regulator_event_5;
 
        /* This should really be moved into the regulator core */
        for (i = 0; i < ARRAY_SIZE(wm8915->supplies); i++) {