Merge remote-tracking branches 'asoc/fix/rt298', 'asoc/fix/sx', 'asoc/fix/wm8904...

diff --combined sound/soc/codecs/wm8962.c
index 2fbc6ef,b4eb975,b4eb975,b4eb975,45f06d5..39ebd7b
--- 1/sound/soc/codecs/wm8962.c
--- 2/sound/soc/codecs/wm8962.c
--- 3/sound/soc/codecs/wm8962.c
--- 4/sound/soc/codecs/wm8962.c
--- 5/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@@@@@ -2944,8 -2944,7 -2944,7 -2944,7 -2944,7 +2944,8 @@@@@@ static int wm8962_mute(struct snd_soc_d
                                   WM8962_DAC_MUTE, val);
     }
     
 ----#define WM8962_RATES SNDRV_PCM_RATE_8000_96000
 ++++#define WM8962_RATES (SNDRV_PCM_RATE_8000_48000 |\
 ++++           SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000)
     
     #define WM8962_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
                        SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
@@@@@@ -3760,7 -3759,7 -3759,7 -3759,7 -3759,7 +3760,7 @@@@@@ static int wm8962_i2c_probe(struct i2c_
        ret = snd_soc_register_codec(&i2c->dev,
                                     &soc_codec_dev_wm8962, &wm8962_dai, 1);
        if (ret < 0)
 ----           goto err_enable;
 ++++           goto err_pm_runtime;
     
        regcache_cache_only(wm8962->regmap, true);
     
@@@@@@ -3769,8 -3768,6 -3768,6 -3768,6 -3768,6 +3769,8 @@@@@@
     
        return 0;
     
 ++++err_pm_runtime:
 ++++   pm_runtime_disable(&i2c->dev);
     err_enable:
        regulator_bulk_disable(ARRAY_SIZE(wm8962->supplies), wm8962->supplies);
     err:
@@@@@@ -3780,7 -3777,6 -3777,6 -3777,6 -3777,6 +3780,7 @@@@@@
     static int wm8962_i2c_remove(struct i2c_client *client)
     {
        snd_soc_unregister_codec(&client->dev);
 ++++   pm_runtime_disable(&client->dev);
        return 0;
     }
     
@@@@@@ -3808,6 -3804,6 -3804,6 -3804,6 -3804,8 +3808,8 @@@@@@ static int wm8962_runtime_resume(struc
     
        wm8962_reset(wm8962);
     
++++    regcache_mark_dirty(wm8962->regmap);
++++ 
        /* SYSCLK defaults to on; make sure it is off so we can safely
         * write to registers if the device is declocked.
         */