11 files changed, 23 insertions, 18 deletions

diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
index f316ce1f214a..14f467345994 100644
--- a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
+++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
@@ -5,6 +5,7 @@ Required properties:
                                   "renesas,rcar_sound-gen1" if generation1, and
                                   "renesas,rcar_sound-gen2" if generation2
                                   Examples with soctypes are:
+                                    - "renesas,rcar_sound-r8a7778" (R-Car M1A)
                                     - "renesas,rcar_sound-r8a7790" (R-Car H2)
                                     - "renesas,rcar_sound-r8a7791" (R-Car M2-W)
 - reg                           : Should contain the register physical address.
diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c
index a0f265327fdf..f62da48eda9a 100644
--- a/sound/soc/codecs/88pm860x-codec.c
+++ b/sound/soc/codecs/88pm860x-codec.c
@@ -1187,16 +1187,16 @@ static struct snd_soc_dai_driver pm860x_dai[] = {
                         .channels_min   = 2,
                         .channels_max   = 2,
                         .rates          = PM860X_RATES,
-                        .formats        = SNDRV_PCM_FORMAT_S16_LE | \
-                                          SNDRV_PCM_FORMAT_S18_3LE,
+                        .formats        = SNDRV_PCM_FMTBIT_S16_LE | \
+                                          SNDRV_PCM_FMTBIT_S18_3LE,
                 },
                 .capture = {
                         .stream_name    = "PCM Capture",
                         .channels_min   = 2,
                         .channels_max   = 2,
                         .rates          = PM860X_RATES,
-                        .formats        = SNDRV_PCM_FORMAT_S16_LE | \
-                                          SNDRV_PCM_FORMAT_S18_3LE,
+                        .formats        = SNDRV_PCM_FMTBIT_S16_LE | \
+                                          SNDRV_PCM_FMTBIT_S18_3LE,
                 },
                 .ops    = &pm860x_pcm_dai_ops,
         }, {
@@ -1208,16 +1208,16 @@ static struct snd_soc_dai_driver pm860x_dai[] = {
                         .channels_min   = 2,
                         .channels_max   = 2,
                         .rates          = SNDRV_PCM_RATE_8000_48000,
-                        .formats        = SNDRV_PCM_FORMAT_S16_LE | \
-                                          SNDRV_PCM_FORMAT_S18_3LE,
+                        .formats        = SNDRV_PCM_FMTBIT_S16_LE | \
+                                          SNDRV_PCM_FMTBIT_S18_3LE,
                 },
                 .capture = {
                         .stream_name    = "I2S Capture",
                         .channels_min   = 2,
                         .channels_max   = 2,
                         .rates          = SNDRV_PCM_RATE_8000_48000,
-                        .formats        = SNDRV_PCM_FORMAT_S16_LE | \
-                                          SNDRV_PCM_FORMAT_S18_3LE,
+                        .formats        = SNDRV_PCM_FMTBIT_S16_LE | \
+                                          SNDRV_PCM_FMTBIT_S18_3LE,
                 },
                 .ops    = &pm860x_i2s_dai_ops,
         },
diff --git a/sound/soc/codecs/max98925.c b/sound/soc/codecs/max98925.c
index 9b5a17de4690..aad664225dc3 100644
--- a/sound/soc/codecs/max98925.c
+++ b/sound/soc/codecs/max98925.c
@@ -346,7 +346,7 @@ static int max98925_dai_set_fmt(struct snd_soc_dai *codec_dai,
         }
 
         regmap_update_bits(max98925->regmap, MAX98925_FORMAT,
-                        M98925_DAI_BCI_MASK, invert);
+                        M98925_DAI_BCI_MASK | M98925_DAI_WCI_MASK, invert);
         return 0;
 }
 
diff --git a/sound/soc/codecs/stac9766.c b/sound/soc/codecs/stac9766.c
index 6464caf72b21..7f939aec5a7f 100644
--- a/sound/soc/codecs/stac9766.c
+++ b/sound/soc/codecs/stac9766.c
@@ -321,7 +321,7 @@ static struct snd_soc_dai_driver stac9766_dai[] = {
                 .channels_max = 2,
                 .rates = SNDRV_PCM_RATE_32000 | \
                         SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000,
-                .formats = SNDRV_PCM_FORMAT_IEC958_SUBFRAME_BE,
+                .formats = SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_BE,
         },
         /* alsa ops */
         .ops = &stac9766_dai_ops_digital,
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c
index 0c6d1bc0526e..d476221dba51 100644
--- a/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@ -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[] = {
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index fbaeddb3e903..3ee6cfd0578b 100644
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -167,7 +167,7 @@ static int wm5110_sysclk_ev(struct snd_soc_dapm_widget *w,
 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) \
diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c
index 2eb986c19b88..fdb765600a10 100644
--- a/sound/soc/codecs/wm8900.c
+++ b/sound/soc/codecs/wm8900.c
@@ -998,8 +998,8 @@ static int wm8900_digital_mute(struct snd_soc_dai *codec_dai, int mute)
                       SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000)
 
 #define WM8900_PCM_FORMATS \
-        (SNDRV_PCM_FORMAT_S16_LE | SNDRV_PCM_FORMAT_S20_3LE | \
-         SNDRV_PCM_FORMAT_S24_LE)
+        (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
+         SNDRV_PCM_FMTBIT_S24_LE)
 
 static const struct snd_soc_dai_ops wm8900_dai_ops = {
         .hw_params      = wm8900_hw_params,
diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c
index a4d11770630c..e7c81baefe66 100644
--- a/sound/soc/codecs/wm8997.c
+++ b/sound/soc/codecs/wm8997.c
@@ -40,7 +40,7 @@ struct wm8997_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 reg_default wm8997_sysclk_reva_patch[] = {
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c
index 79552953e1bd..1b20b8d2b15d 100644
--- a/sound/soc/codecs/wm9713.c
+++ b/sound/soc/codecs/wm9713.c
@@ -1054,8 +1054,8 @@ static int ac97_aux_prepare(struct snd_pcm_substream *substream,
                           SNDRV_PCM_RATE_48000)
 
 #define WM9713_PCM_FORMATS \
-        (SNDRV_PCM_FORMAT_S16_LE | SNDRV_PCM_FORMAT_S20_3LE | \
-         SNDRV_PCM_FORMAT_S24_LE)
+        (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
+         SNDRV_PCM_FMTBIT_S24_LE)
 
 static const struct snd_soc_dai_ops wm9713_dai_ops_hifi = {
         .prepare        = ac97_hifi_prepare,
diff --git a/sound/soc/intel/atom/sst/sst_drv_interface.c b/sound/soc/intel/atom/sst/sst_drv_interface.c
index 7b50a9d17ec1..620da1d1b9e3 100644
--- a/sound/soc/intel/atom/sst/sst_drv_interface.c
+++ b/sound/soc/intel/atom/sst/sst_drv_interface.c
@@ -533,7 +533,7 @@ static inline int sst_calc_tstamp(struct intel_sst_drv *ctx,
 
         info->buffer_ptr = pointer_samples / substream->runtime->channels;
 
-        info->pcm_delay = delay_frames / substream->runtime->channels;
+        info->pcm_delay = delay_frames;
         dev_dbg(ctx->dev, "buffer ptr %llu pcm_delay rep: %llu\n",
                         info->buffer_ptr, info->pcm_delay);
         return 0;
diff --git a/sound/soc/ux500/mop500_ab8500.c b/sound/soc/ux500/mop500_ab8500.c
index b81a7a4c938b..85d810d7667c 100644
--- a/sound/soc/ux500/mop500_ab8500.c
+++ b/sound/soc/ux500/mop500_ab8500.c
@@ -372,6 +372,10 @@ int mop500_ab8500_machine_init(struct snd_soc_pcm_runtime *rtd)
         /* Create driver private-data struct */
         drvdata = devm_kzalloc(dev, sizeof(struct mop500_ab8500_drvdata),
                         GFP_KERNEL);
+
+        if (!drvdata)
+                return -ENOMEM;
+
         snd_soc_card_set_drvdata(rtd->card, drvdata);
 
         /* Setup clocks */