Merge tag 'v5.10-rc1' into asoc-5.10

Linux 5.10-rc1

diff --combined sound/soc/codecs/wsa881x.c
index 5456124457a7c99a2a56383a31181cb1ceff9887,68e774e69c850f18c2ee5547b9f708c53a02c35c..4530b74f5921b74a52667c65b32396f8426e8520
--- 1/sound/soc/codecs/wsa881x.c
--- 2/sound/soc/codecs/wsa881x.c
+++ b/sound/soc/codecs/wsa881x.c
@@@ -1026,8 -1026,6 +1026,8 @@@ static struct snd_soc_dai_driver wsa881
                .id = 0,
                .playback = {
                        .stream_name = "SPKR Playback",
 +                      .rates = SNDRV_PCM_RATE_48000,
 +                      .formats = SNDRV_PCM_FMTBIT_S16_LE,
                        .rate_max = 48000,
                        .rate_min = 48000,
                        .channels_min = 1,
@@@ -1114,6 -1112,7 +1114,7 @@@ static int wsa881x_probe(struct sdw_sla
        wsa881x->sconfig.type = SDW_STREAM_PDM;
        pdev->prop.sink_ports = GENMASK(WSA881X_MAX_SWR_PORTS, 0);
        pdev->prop.sink_dpn_prop = wsa_sink_dpn_prop;
+       pdev->prop.scp_int1_mask = SDW_SCP_INT1_BUS_CLASH | SDW_SCP_INT1_PARITY;
        gpiod_direction_output(wsa881x->sd_n, 1);
  
        wsa881x->regmap = devm_regmap_init_sdw(pdev, &wsa881x_regmap_config);

diff --combined sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
index 9630637b8ab9385037af1c965290668f0fd02d6b,c2c1eb16fcc0ca5ada6f0ef378b1a43bb2e723ca..26e7d9a7198f807911b4d54d65641380013cff96
--- 1/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
--- 2/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
+++ b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
@@@ -630,34 -630,15 +630,34 @@@ static struct snd_soc_codec_conf mt8183
        },
  };
  
 +static const struct snd_kcontrol_new mt8183_da7219_rt1015_snd_controls[] = {
 +      SOC_DAPM_PIN_SWITCH("Left Spk"),
 +      SOC_DAPM_PIN_SWITCH("Right Spk"),
 +};
 +
 +static const
 +struct snd_soc_dapm_widget mt8183_da7219_rt1015_dapm_widgets[] = {
 +      SND_SOC_DAPM_SPK("Left Spk", NULL),
 +      SND_SOC_DAPM_SPK("Right Spk", NULL),
 +      SND_SOC_DAPM_PINCTRL("TDM_OUT_PINCTRL",
 +                           "aud_tdm_out_on", "aud_tdm_out_off"),
 +};
 +
 +static const struct snd_soc_dapm_route mt8183_da7219_rt1015_dapm_routes[] = {
 +      {"Left Spk", NULL, "Left SPO"},
 +      {"Right Spk", NULL, "Right SPO"},
 +      {"I2S Playback", NULL, "TDM_OUT_PINCTRL"},
 +};
 +
  static struct snd_soc_card mt8183_da7219_rt1015_card = {
        .name = "mt8183_da7219_rt1015",
        .owner = THIS_MODULE,
 -      .controls = mt8183_da7219_max98357_snd_controls,
 -      .num_controls = ARRAY_SIZE(mt8183_da7219_max98357_snd_controls),
 -      .dapm_widgets = mt8183_da7219_max98357_dapm_widgets,
 -      .num_dapm_widgets = ARRAY_SIZE(mt8183_da7219_max98357_dapm_widgets),
 -      .dapm_routes = mt8183_da7219_max98357_dapm_routes,
 -      .num_dapm_routes = ARRAY_SIZE(mt8183_da7219_max98357_dapm_routes),
 +      .controls = mt8183_da7219_rt1015_snd_controls,
 +      .num_controls = ARRAY_SIZE(mt8183_da7219_rt1015_snd_controls),
 +      .dapm_widgets = mt8183_da7219_rt1015_dapm_widgets,
 +      .num_dapm_widgets = ARRAY_SIZE(mt8183_da7219_rt1015_dapm_widgets),
 +      .dapm_routes = mt8183_da7219_rt1015_dapm_routes,
 +      .num_dapm_routes = ARRAY_SIZE(mt8183_da7219_rt1015_dapm_routes),
        .dai_link = mt8183_da7219_dai_links,
        .num_links = ARRAY_SIZE(mt8183_da7219_dai_links),
        .aux_dev = &mt8183_da7219_max98357_headset_dev,
@@@ -715,7 -696,7 +715,7 @@@ static int mt8183_da7219_max98357_dev_p
                        if (card == &mt8183_da7219_max98357_card) {
                                dai_link->be_hw_params_fixup =
                                        mt8183_i2s_hw_params_fixup;
-                               dai_link->ops = &mt8183_mt6358_i2s_ops;
+                               dai_link->ops = &mt8183_da7219_i2s_ops;
                                dai_link->cpus = i2s3_max98357a_cpus;
                                dai_link->num_cpus =
                                        ARRAY_SIZE(i2s3_max98357a_cpus);