ASoC: Merge up fixes

We need this to get the i.MX platforms working in CI again.

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

diff --cc sound/soc/sof/ipc4-topology.c
Simple merge