ASoC: Merge fixes

Required for more changes for the ops.

diff --cc include/sound/soc.h
Simple merge

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

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

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

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

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

diff --cc sound/soc/soc-ops.c
Simple merge

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

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

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