Merge remote-tracking branches 'asoc/topic/max98090', 'asoc/topic/rockchip', 'asoc...

diff --cc sound/soc/codecs/Kconfig
Simple merge

diff --cc sound/soc/codecs/max98090.c
index 7e111865946a63c47d81f80a79387cf65b2b0c01,f2a3f30a5d9f95fc231878b7eee3d45d35c43da3,4a063fa88526821b279bd7c49cdbb14cfef994c8,4a063fa88526821b279bd7c49cdbb14cfef994c8,4a063fa88526821b279bd7c49cdbb14cfef994c8..d519294f57c79c289784f9a71bb43d7bf51dc7e9
--- 1/sound/soc/codecs/max98090.c
--- 2/sound/soc/codecs/max98090.c
--- 3/sound/soc/codecs/max98090.c
--- 4/sound/soc/codecs/max98090.c
--- 5/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@@@@@ -2414,9 -2406,10 -2310,6 -2310,6 -2310,6 +2406,10 @@@@@@ static int max98090_remove(struct snd_s
        struct max98090_priv *max98090 = snd_soc_codec_get_drvdata(codec);
     
        cancel_delayed_work_sync(&max98090->jack_work);
  +++   cancel_delayed_work_sync(&max98090->pll_det_enable_work);
  +++   cancel_work_sync(&max98090->pll_det_disable_work);
  +++   cancel_work_sync(&max98090->pll_work);
+ +++   max98090->codec = NULL;
     
        return 0;
     }

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

diff --cc sound/soc/rockchip/rockchip_i2s.c
Simple merge