Merge remote-tracking branches 'asoc/topic/txx9', 'asoc/topic/wm8750', 'asoc/topic...

diff --cc sound/soc/codecs/wm8904.c
Simple merge

diff --cc sound/soc/codecs/wm8995.c
index 79e1aea,c280f0a,1288ede,120228b,c280f0a..66103c2
--- 1/sound/soc/codecs/wm8995.c
--- 2/sound/soc/codecs/wm8995.c
--- 3/sound/soc/codecs/wm8995.c
--- 4/sound/soc/codecs/wm8995.c
--- 5/sound/soc/codecs/wm8995.c
+++ b/sound/soc/codecs/wm8995.c
@@@@@@ -2191,16 -2195,16 -2205,9 -2195,16 -2195,16 +2191,16 @@@@@@ static const struct snd_soc_codec_drive
        .remove = wm8995_remove,
        .set_bias_level = wm8995_set_bias_level,
        .idle_bias_off = true,
  +  
  +     .controls = wm8995_snd_controls,
  +     .num_controls = ARRAY_SIZE(wm8995_snd_controls),
  +     .dapm_widgets = wm8995_dapm_widgets,
  +     .num_dapm_widgets = ARRAY_SIZE(wm8995_dapm_widgets),
  +     .dapm_routes = wm8995_intercon,
  +     .num_dapm_routes = ARRAY_SIZE(wm8995_intercon),
     };
     
--- -static struct regmap_config wm8995_regmap = {
+++ +static const struct regmap_config wm8995_regmap = {
        .reg_bits = 16,
        .val_bits = 16,