Merge tag 'asoc-v4.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: A couple more updates for v4.2

These were sitting on my laptop.

8 files changed, 48 insertions, 50 deletions

diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index 88f6df21ad95..802e05eae3e9 100644
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -2286,6 +2286,33 @@ int arizona_set_output_mode(struct snd_soc_codec *codec, int output, bool diff)
 }
 EXPORT_SYMBOL_GPL(arizona_set_output_mode);
 
+static const struct soc_enum arizona_adsp2_rate_enum[] = {
+        SOC_VALUE_ENUM_SINGLE(ARIZONA_DSP1_CONTROL_1,
+                              ARIZONA_DSP1_RATE_SHIFT, 0xf,
+                              ARIZONA_RATE_ENUM_SIZE,
+                              arizona_rate_text, arizona_rate_val),
+        SOC_VALUE_ENUM_SINGLE(ARIZONA_DSP2_CONTROL_1,
+                              ARIZONA_DSP1_RATE_SHIFT, 0xf,
+                              ARIZONA_RATE_ENUM_SIZE,
+                              arizona_rate_text, arizona_rate_val),
+        SOC_VALUE_ENUM_SINGLE(ARIZONA_DSP3_CONTROL_1,
+                              ARIZONA_DSP1_RATE_SHIFT, 0xf,
+                              ARIZONA_RATE_ENUM_SIZE,
+                              arizona_rate_text, arizona_rate_val),
+        SOC_VALUE_ENUM_SINGLE(ARIZONA_DSP4_CONTROL_1,
+                              ARIZONA_DSP1_RATE_SHIFT, 0xf,
+                              ARIZONA_RATE_ENUM_SIZE,
+                              arizona_rate_text, arizona_rate_val),
+};
+
+const struct snd_kcontrol_new arizona_adsp2_rate_controls[] = {
+        SOC_ENUM("DSP1 Rate", arizona_adsp2_rate_enum[0]),
+        SOC_ENUM("DSP2 Rate", arizona_adsp2_rate_enum[1]),
+        SOC_ENUM("DSP3 Rate", arizona_adsp2_rate_enum[2]),
+        SOC_ENUM("DSP4 Rate", arizona_adsp2_rate_enum[3]),
+};
+EXPORT_SYMBOL_GPL(arizona_adsp2_rate_controls);
+
 MODULE_DESCRIPTION("ASoC Wolfson Arizona class device support");
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
 MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/arizona.h b/sound/soc/codecs/arizona.h
index 84e119a56515..43deb0462309 100644
--- a/sound/soc/codecs/arizona.h
+++ b/sound/soc/codecs/arizona.h
@@ -217,6 +217,8 @@ extern const struct soc_enum arizona_ng_hold;
 extern const struct soc_enum arizona_in_hpf_cut_enum;
 extern const struct soc_enum arizona_in_dmic_osr[];
 
+extern const struct snd_kcontrol_new arizona_adsp2_rate_controls[];
+
 extern int arizona_in_ev(struct snd_soc_dapm_widget *w,
                          struct snd_kcontrol *kcontrol,
                          int event);
diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c
index 5a9da28f4f33..c83083285e53 100644
--- a/sound/soc/codecs/wm2200.c
+++ b/sound/soc/codecs/wm2200.c
@@ -1555,7 +1555,7 @@ static int wm2200_probe(struct snd_soc_codec *codec)
 
         wm2200->codec = codec;
 
-        ret = snd_soc_add_codec_controls(codec, wm_adsp1_fw_controls, 2);
+        ret = snd_soc_add_codec_controls(codec, wm_adsp_fw_controls, 2);
         if (ret != 0)
                 return ret;
 
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c
index c5ec519d34be..d097f09e50f2 100644
--- a/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@ -1880,6 +1880,11 @@ static int wm5102_codec_probe(struct snd_soc_codec *codec)
         if (ret)
                 return ret;
 
+        ret = snd_soc_add_codec_controls(codec,
+                                         arizona_adsp2_rate_controls, 1);
+        if (ret)
+                return ret;
+
         arizona_init_spk(codec);
         arizona_init_gpio(codec);
 
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index 5f032a37b61f..709fcc6169d8 100644
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -1614,6 +1614,12 @@ static int wm5110_codec_probe(struct snd_soc_codec *codec)
                         return ret;
         }
 
+        ret = snd_soc_add_codec_controls(codec,
+                                         arizona_adsp2_rate_controls,
+                                         WM5110_NUM_ADSP);
+        if (ret)
+                return ret;
+
         snd_soc_dapm_disable_pin(dapm, "HAPTICS");
 
         return 0;
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index f9f90b0f5db4..0bb415a28723 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -458,57 +458,17 @@ static const struct soc_enum wm_adsp_fw_enum[] = {
         SOC_ENUM_SINGLE(0, 3, ARRAY_SIZE(wm_adsp_fw_text), wm_adsp_fw_text),
 };
 
-const struct snd_kcontrol_new wm_adsp1_fw_controls[] = {
+const struct snd_kcontrol_new wm_adsp_fw_controls[] = {
         SOC_ENUM_EXT("DSP1 Firmware", wm_adsp_fw_enum[0],
                      wm_adsp_fw_get, wm_adsp_fw_put),
         SOC_ENUM_EXT("DSP2 Firmware", wm_adsp_fw_enum[1],
                      wm_adsp_fw_get, wm_adsp_fw_put),
         SOC_ENUM_EXT("DSP3 Firmware", wm_adsp_fw_enum[2],
                      wm_adsp_fw_get, wm_adsp_fw_put),
+        SOC_ENUM_EXT("DSP4 Firmware", wm_adsp_fw_enum[3],
+                     wm_adsp_fw_get, wm_adsp_fw_put),
 };
-EXPORT_SYMBOL_GPL(wm_adsp1_fw_controls);
-
-static const struct soc_enum wm_adsp2_rate_enum[] = {
-        SOC_VALUE_ENUM_SINGLE(ARIZONA_DSP1_CONTROL_1,
-                              ARIZONA_DSP1_RATE_SHIFT, 0xf,
-                              ARIZONA_RATE_ENUM_SIZE,
-                              arizona_rate_text, arizona_rate_val),
-        SOC_VALUE_ENUM_SINGLE(ARIZONA_DSP2_CONTROL_1,
-                              ARIZONA_DSP1_RATE_SHIFT, 0xf,
-                              ARIZONA_RATE_ENUM_SIZE,
-                              arizona_rate_text, arizona_rate_val),
-        SOC_VALUE_ENUM_SINGLE(ARIZONA_DSP3_CONTROL_1,
-                              ARIZONA_DSP1_RATE_SHIFT, 0xf,
-                              ARIZONA_RATE_ENUM_SIZE,
-                              arizona_rate_text, arizona_rate_val),
-        SOC_VALUE_ENUM_SINGLE(ARIZONA_DSP4_CONTROL_1,
-                              ARIZONA_DSP1_RATE_SHIFT, 0xf,
-                              ARIZONA_RATE_ENUM_SIZE,
-                              arizona_rate_text, arizona_rate_val),
-};
-
-static const struct snd_kcontrol_new wm_adsp2_fw_controls[4][2] = {
-        {
-                SOC_ENUM_EXT("DSP1 Firmware", wm_adsp_fw_enum[0],
-                             wm_adsp_fw_get, wm_adsp_fw_put),
-                SOC_ENUM("DSP1 Rate", wm_adsp2_rate_enum[0]),
-        },
-        {
-                SOC_ENUM_EXT("DSP2 Firmware", wm_adsp_fw_enum[1],
-                             wm_adsp_fw_get, wm_adsp_fw_put),
-                SOC_ENUM("DSP2 Rate", wm_adsp2_rate_enum[1]),
-        },
-        {
-                SOC_ENUM_EXT("DSP3 Firmware", wm_adsp_fw_enum[2],
-                             wm_adsp_fw_get, wm_adsp_fw_put),
-                SOC_ENUM("DSP3 Rate", wm_adsp2_rate_enum[2]),
-        },
-        {
-                SOC_ENUM_EXT("DSP4 Firmware", wm_adsp_fw_enum[3],
-                             wm_adsp_fw_get, wm_adsp_fw_put),
-                SOC_ENUM("DSP4 Rate", wm_adsp2_rate_enum[3]),
-        },
-};
+EXPORT_SYMBOL_GPL(wm_adsp_fw_controls);
 
 static struct wm_adsp_region const *wm_adsp_find_region(struct wm_adsp *dsp,
                                                         int type)
@@ -2125,8 +2085,8 @@ int wm_adsp2_codec_probe(struct wm_adsp *dsp, struct snd_soc_codec *codec)
         wm_adsp2_init_debugfs(dsp, codec);
 
         return snd_soc_add_codec_controls(codec,
-                                          wm_adsp2_fw_controls[dsp->num - 1],
-                                          ARRAY_SIZE(wm_adsp2_fw_controls[0]));
+                                          &wm_adsp_fw_controls[dsp->num - 1],
+                                          1);
 }
 EXPORT_SYMBOL_GPL(wm_adsp2_codec_probe);
 
diff --git a/sound/soc/codecs/wm_adsp.h b/sound/soc/codecs/wm_adsp.h
index 5042cbd39e54..579a6350fb01 100644
--- a/sound/soc/codecs/wm_adsp.h
+++ b/sound/soc/codecs/wm_adsp.h
@@ -83,7 +83,7 @@ struct wm_adsp {
 #define WM_ADSP2(wname, num) \
         WM_ADSP2_E(wname, num, wm_adsp2_early_event)
 
-extern const struct snd_kcontrol_new wm_adsp1_fw_controls[];
+extern const struct snd_kcontrol_new wm_adsp_fw_controls[];
 
 int wm_adsp1_init(struct wm_adsp *dsp);
 int wm_adsp2_init(struct wm_adsp *dsp);
diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c
index 8caca2e180c3..84e935711e29 100644
--- a/sound/soc/sh/rcar/rsrc-card.c
+++ b/sound/soc/sh/rcar/rsrc-card.c
@@ -75,8 +75,6 @@ static int rsrc_card_startup(struct snd_pcm_substream *substream)
         struct rsrc_card_priv *priv =   snd_soc_card_get_drvdata(rtd->card);
         struct rsrc_card_dai *dai_props =
                 rsrc_priv_to_props(priv, rtd - rtd->card->rtd);
-        int ret;
-
 
         return clk_prepare_enable(dai_props->clk);
 }