ASoC: Rename WM8915 to WM8996

For marketing reasons the part will be called WM8996. In order to avoid
user confusion rename the driver to reflect this.

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

2 files changed, 17 insertions, 17 deletions

diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index 54b0e4b7faf..b99091fc34e 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -183,7 +183,7 @@ config SND_SOC_SPEYSIDE
         tristate "Audio support for Wolfson Speyside"
         depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410
         select SND_SAMSUNG_I2S
-        select SND_SOC_WM8915
+        select SND_SOC_WM8996
         select SND_SOC_WM9081
 
 config SND_SOC_SPEYSIDE_WM8962
diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c
index d6dee4d0203..590e9274b06 100644
--- a/sound/soc/samsung/speyside.c
+++ b/sound/soc/samsung/speyside.c
@@ -14,10 +14,10 @@
 #include <sound/jack.h>
 #include <linux/gpio.h>
 
-#include "../codecs/wm8915.h"
+#include "../codecs/wm8996.h"
 #include "../codecs/wm9081.h"
 
-#define WM8915_HPSEL_GPIO 214
+#define WM8996_HPSEL_GPIO 214
 
 static int speyside_set_bias_level(struct snd_soc_card *card,
                                    struct snd_soc_dapm_context *dapm,
@@ -31,12 +31,12 @@ static int speyside_set_bias_level(struct snd_soc_card *card,
 
         switch (level) {
         case SND_SOC_BIAS_STANDBY:
-                ret = snd_soc_dai_set_sysclk(codec_dai, WM8915_SYSCLK_MCLK2,
+                ret = snd_soc_dai_set_sysclk(codec_dai, WM8996_SYSCLK_MCLK2,
                                              32768, SND_SOC_CLOCK_IN);
                 if (ret < 0)
                         return ret;
 
-                ret = snd_soc_dai_set_pll(codec_dai, WM8915_FLL_MCLK2,
+                ret = snd_soc_dai_set_pll(codec_dai, WM8996_FLL_MCLK2,
                                           0, 0, 0);
                 if (ret < 0) {
                         pr_err("Failed to stop FLL\n");
@@ -65,7 +65,7 @@ static int speyside_set_bias_level_post(struct snd_soc_card *card,
         case SND_SOC_BIAS_PREPARE:
                 if (card->dapm.bias_level == SND_SOC_BIAS_STANDBY) {
                         ret = snd_soc_dai_set_pll(codec_dai, 0,
-                                                  WM8915_FLL_MCLK2,
+                                                  WM8996_FLL_MCLK2,
                                                   32768, 48000 * 256);
                         if (ret < 0) {
                                 pr_err("Failed to start FLL\n");
@@ -73,7 +73,7 @@ static int speyside_set_bias_level_post(struct snd_soc_card *card,
                         }
 
                         ret = snd_soc_dai_set_sysclk(codec_dai,
-                                                     WM8915_SYSCLK_FLL,
+                                                     WM8996_SYSCLK_FLL,
                                                      48000 * 256,
                                                      SND_SOC_CLOCK_IN);
                         if (ret < 0)
@@ -149,26 +149,26 @@ static void speyside_set_polarity(struct snd_soc_codec *codec,
                                   int polarity)
 {
         speyside_jack_polarity = !polarity;
-        gpio_direction_output(WM8915_HPSEL_GPIO, speyside_jack_polarity);
+        gpio_direction_output(WM8996_HPSEL_GPIO, speyside_jack_polarity);
 
         /* Re-run DAPM to make sure we're using the correct mic bias */
         snd_soc_dapm_sync(&codec->dapm);
 }
 
-static int speyside_wm8915_init(struct snd_soc_pcm_runtime *rtd)
+static int speyside_wm8996_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_dai *dai = rtd->codec_dai;
         struct snd_soc_codec *codec = rtd->codec;
         int ret;
 
-        ret = snd_soc_dai_set_sysclk(dai, WM8915_SYSCLK_MCLK2, 32768, 0);
+        ret = snd_soc_dai_set_sysclk(dai, WM8996_SYSCLK_MCLK2, 32768, 0);
         if (ret < 0)
                 return ret;
 
-        ret = gpio_request(WM8915_HPSEL_GPIO, "HP_SEL");
+        ret = gpio_request(WM8996_HPSEL_GPIO, "HP_SEL");
         if (ret != 0)
                 pr_err("Failed to request HP_SEL GPIO: %d\n", ret);
-        gpio_direction_output(WM8915_HPSEL_GPIO, speyside_jack_polarity);
+        gpio_direction_output(WM8996_HPSEL_GPIO, speyside_jack_polarity);
 
         ret = snd_soc_jack_new(codec, "Headset",
                                SND_JACK_HEADSET | SND_JACK_BTN_0,
@@ -182,7 +182,7 @@ static int speyside_wm8915_init(struct snd_soc_pcm_runtime *rtd)
         if (ret)
                 return ret;
 
-        wm8915_detect(codec, &speyside_headset, speyside_set_polarity);
+        wm8996_detect(codec, &speyside_headset, speyside_set_polarity);
 
         return 0;
 }
@@ -205,16 +205,16 @@ static struct snd_soc_dai_link speyside_dai[] = {
                 .name = "CPU",
                 .stream_name = "CPU",
                 .cpu_dai_name = "samsung-i2s.0",
-                .codec_dai_name = "wm8915-aif1",
+                .codec_dai_name = "wm8996-aif1",
                 .platform_name = "samsung-audio",
-                .codec_name = "wm8915.1-001a",
-                .init = speyside_wm8915_init,
+                .codec_name = "wm8996.1-001a",
+                .init = speyside_wm8996_init,
                 .ops = &speyside_ops,
         },
         {
                 .name = "Baseband",
                 .stream_name = "Baseband",
-                .cpu_dai_name = "wm8915-aif2",
+                .cpu_dai_name = "wm8996-aif2",
                 .codec_dai_name = "wm1250-ev1",
                 .codec_name = "wm1250-ev1.1-0027",
                 .ops = &speyside_ops,