diff options
| author | Charles Keepax <ckeepax@opensource.wolfsonmicro.com> | 2013-08-13 00:46:55 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-13 12:31:56 +0200 |
| commit | 40843aea5a9bd2c3d7917d086e6d23cb02cc4b39 (patch) | |
| tree | 1d81449122d2960d4d93fcbfb3f97fb362f7e84c /sound/soc/codecs/arizona.c | |
| parent | ASoC: arizona: Add widget<->mux route into mux route macro (diff) | |
| download | linux-40843aea5a9bd2c3d7917d086e6d23cb02cc4b39.tar.xz linux-40843aea5a9bd2c3d7917d086e6d23cb02cc4b39.zip | |
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>
Diffstat (limited to 'sound/soc/codecs/arizona.c')
| -rw-r--r-- | sound/soc/codecs/arizona.c | 13 |
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, |