Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next

diff --combined sound/soc/codecs/wm5102.c
index c5ec519d34bef7c63c37374871207e2e350f17fb,559cbe2c8dc1eeef4dbdb40eecee4e08dda885da..d097f09e50f2577fb711677c370d1f6014c408ac
--- 1/sound/soc/codecs/wm5102.c
--- 2/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@@ -42,7 -42,7 +42,7 @@@ struct wm5102_priv 
  static DECLARE_TLV_DB_SCALE(ana_tlv, 0, 100, 0);
  static DECLARE_TLV_DB_SCALE(eq_tlv, -1200, 100, 0);
  static DECLARE_TLV_DB_SCALE(digital_tlv, -6400, 50, 0);
 -static DECLARE_TLV_DB_SCALE(noise_tlv, 0, 600, 0);
 +static DECLARE_TLV_DB_SCALE(noise_tlv, -13200, 600, 0);
  static DECLARE_TLV_DB_SCALE(ng_tlv, -10200, 600, 0);
  
  static const struct wm_adsp_region wm5102_dsp1_regions[] = {
@@@ -1880,6 -1880,11 +1880,11 @@@ static int wm5102_codec_probe(struct sn
        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 --combined sound/soc/codecs/wm5110.c
index 5f032a37b61f38e08dbd311da7f2e8e481f558b0,944354ddc0c47c57375a4f316c93c9e7c7d638b2..709fcc6169d81eda5a9cfcb3f26c55a8f77f6602
--- 1/sound/soc/codecs/wm5110.c
--- 2/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@@ -167,7 -167,7 +167,7 @@@ static int wm5110_sysclk_ev(struct snd_
  static DECLARE_TLV_DB_SCALE(ana_tlv, 0, 100, 0);
  static DECLARE_TLV_DB_SCALE(eq_tlv, -1200, 100, 0);
  static DECLARE_TLV_DB_SCALE(digital_tlv, -6400, 50, 0);
 -static DECLARE_TLV_DB_SCALE(noise_tlv, 0, 600, 0);
 +static DECLARE_TLV_DB_SCALE(noise_tlv, -13200, 600, 0);
  static DECLARE_TLV_DB_SCALE(ng_tlv, -10200, 600, 0);
  
  #define WM5110_NG_SRC(name, base) \
@@@ -1614,6 -1614,12 +1614,12 @@@ static int wm5110_codec_probe(struct sn
                        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;