ASoC: Merge up fixes

For the benefit of CI

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

diff --cc sound/soc/fsl/fsl_micfil.c
Simple merge

diff --cc sound/soc/fsl/fsl_micfil.h
Simple merge

diff --cc sound/soc/intel/boards/sof_sdw.c
Simple merge

diff --cc sound/soc/sof/intel/hda-dai-ops.c
Simple merge

diff --cc sound/soc/sof/intel/hda-dai.c
Simple merge

diff --cc sound/soc/sof/intel/hda.h
Simple merge

diff --cc sound/soc/sof/ipc3.c
Simple merge

diff --cc sound/soc/sof/ipc4-topology.c
index 0196cbf,11361e1..b436638
--- 1/sound/soc/sof/ipc4-topology.c
--- 2/sound/soc/sof/ipc4-topology.c
+++ b/sound/soc/sof/ipc4-topology.c
@@@ -1731,6 -1731,9 +1731,12 @@@ sof_ipc4_prepare_copier_module(struct s
  
        *ipc_config_size = ipc_size;
  
+       /* update pipeline memory usage */
+       sof_ipc4_update_resource_usage(sdev, swidget, &copier_data->base_config);
+ 
++      /* update pipeline memory usage */
++      sof_ipc4_update_resource_usage(sdev, swidget, &copier_data->base_config);
++
        /* copy IPC data */
        memcpy(*ipc_config_data, (void *)copier_data, sizeof(*copier_data));
        if (gtw_cfg_config_length)
@@@ -1743,15 -1746,6 +1749,12 @@@
                       gtw_cfg_config_length,
                       &ipc4_copier->dma_config_tlv, dma_config_tlv_size);
  
-       /* update pipeline memory usage */
-       sof_ipc4_update_resource_usage(sdev, swidget, &copier_data->base_config);
- 
 +      /*
 +       * Restore gateway config length now that IPC payload is prepared. This avoids
 +       * counting the DMA CONFIG TLV multiple times
 +       */
 +      copier_data->gtw_cfg.config_length = gtw_cfg_config_length / 4;
 +
        return 0;
  }