ASoC: wm8997: Initial CODEC driver

The wm8997 is a compact, high-performance audio hub CODEC with SLIMbus
interfacing, for smartphones, tablets and other portable audio devices
based on the Arizona platform.

This patch adds the wm8997 CODEC driver.

[Fixed some interface churn from bitrot due to the patch not going via
the MFD tree as expected -- broonie]

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

1 files changed, 10 insertions, 3 deletions

diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index 779a0eeac67c..657808ba1418 100644
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -200,9 +200,16 @@ int arizona_init_spk(struct snd_soc_codec *codec)
         if (ret != 0)
                 return ret;
 
-        ret = snd_soc_dapm_new_controls(&codec->dapm, &arizona_spkr, 1);
-        if (ret != 0)
-                return ret;
+        switch (arizona->type) {
+        case WM8997:
+                break;
+        default:
+                ret = snd_soc_dapm_new_controls(&codec->dapm,
+                                                &arizona_spkr, 1);
+                if (ret != 0)
+                        return ret;
+                break;
+        }
 
         ret = arizona_request_irq(arizona, ARIZONA_IRQ_SPK_SHUTDOWN_WARN,
                                   "Thermal warning", arizona_thermal_warn,