ASoC: Merge up fixes

To facilitate testing get our current fixes into the branch.

diff --cc sound/soc/amd/acp/acp-mach-common.c
Simple merge

diff --cc sound/soc/amd/acp/acp-sof-mach.c
index 19ff4fe5b1eaa944351e325f94cfd8df3867300c,20b94814a0462147258fe94cd4219b772afa45f0..fc59ea34e687ad4d02fcab4df6dc322079f8d219
--- 1/sound/soc/amd/acp/acp-sof-mach.c
--- 2/sound/soc/amd/acp/acp-sof-mach.c
+++ b/sound/soc/amd/acp/acp-sof-mach.c
@@@ -46,6 -48,8 +46,7 @@@ static struct acp_card_drvdata sof_rt56
        .hs_codec_id = RT5682S,
        .amp_codec_id = RT1019,
        .dmic_codec_id = DMIC,
 -      .tdm_mode = false,
+       .platform = RENOIR,
  };
  
  static struct acp_card_drvdata sof_rt5682s_max_data = {
@@@ -55,6 -59,8 +56,7 @@@
        .hs_codec_id = RT5682S,
        .amp_codec_id = MAX98360A,
        .dmic_codec_id = DMIC,
 -      .tdm_mode = false,
+       .platform = RENOIR,
  };
  
  static struct acp_card_drvdata sof_nau8825_data = {
@@@ -64,7 -70,9 +66,8 @@@
        .hs_codec_id = NAU8825,
        .amp_codec_id = MAX98360A,
        .dmic_codec_id = DMIC,
+       .platform = REMBRANDT,
        .soc_mclk = true,
 -      .tdm_mode = false,
  };
  
  static struct acp_card_drvdata sof_rt5682s_hs_rt1019_data = {
@@@ -74,7 -82,9 +77,8 @@@
        .hs_codec_id = RT5682S,
        .amp_codec_id = RT1019,
        .dmic_codec_id = DMIC,
+       .platform = REMBRANDT,
        .soc_mclk = true,
 -      .tdm_mode = false,
  };
  
  static struct acp_card_drvdata sof_nau8821_max98388_data = {