diff -drupN a/sound/soc/sunxi/Makefile b/sound/soc/sunxi/Makefile
--- a/sound/soc/sunxi/Makefile	2018-08-06 17:23:04.000000000 +0300
+++ b/sound/soc/sunxi/Makefile	2022-06-12 05:28:14.000000000 +0300
@@ -1,3 +1,81 @@
-obj-$(CONFIG_SND_SUN4I_CODEC) += sun4i-codec.o
+# SUNXI Platform Support
+ifneq ($(CONFIG_ARCH_SUN8IW19),)
+snd-soc-sunxi-objs := sun8iw19-pcm.o
+snd-soc-sunxi-daudio-objs := sun8iw19-daudio.o
+else
+snd-soc-sunxi-objs := sunxi-pcm.o
+snd-soc-sunxi-daudio-objs := sunxi-daudio.o
+endif
+snd-soc-sunxi-hdmi-objs := sunxi-hdmi.o
+snd-soc-sunxi-spdif-objs := sunxi-spdif.o
+snd-soc-sunxi-dmic-objs := sunxi-dmic.o
+snd-soc-sunxi-cpudai-objs := sunxi-cpudai.o
+snd-soc-sunxi-rwfunc-objs := sunxi_rw_func.o
+snd-soc-sunxi-inter-i2s-objs := sunxi-inter-i2s.o
+
+obj-$(CONFIG_SND_SOC) += sun8iw8/
+obj-$(CONFIG_SND_SOC) += sun50iw11/
+
+obj-$(CONFIG_SND_SUNXI_SOC) += snd-soc-sunxi.o
+obj-$(CONFIG_SND_SUNXI_SOC_HDMI) += snd-soc-sunxi-hdmi.o
+obj-$(CONFIG_SND_SUNXI_SOC_DAUDIO) += snd-soc-sunxi-daudio.o
+obj-$(CONFIG_SND_SUNXI_SOC_SPDIF) += snd-soc-sunxi-spdif.o spdif-utils.o
+obj-$(CONFIG_SND_SUNXI_SOC_DMIC) += snd-soc-sunxi-dmic.o
+obj-$(CONFIG_SND_SUNXI_SOC_CPUDAI) += snd-soc-sunxi-cpudai.o
+obj-$(CONFIG_SND_SUNXI_SOC_RWFUNC) += snd-soc-sunxi-rwfunc.o
+obj-$(CONFIG_SND_SUNXI_SOC_INTER_I2S) += snd-soc-sunxi-inter-i2s.o
+
+obj-$(CONFIG_SND_SUN8IW18_CPUDAI) += sun8iw18-cpudai.o
+
+# SUNXI Codec Embedded Support
+obj-$(CONFIG_SND_SUN50IW1_CODEC) += sun50iw1-codec.o
+obj-$(CONFIG_SND_SUN50IW3_CODEC) += sun50iw3-codec.o
+obj-$(CONFIG_SND_SUN50IW8_CODEC) += sun50iw8-codec.o
+obj-$(CONFIG_SND_SUN50IW9_CODEC) += sun50iw9-codec.o
+
+obj-$(CONFIG_SND_SUN8IW11_CODEC) += sun8iw11-codec.o
+obj-$(CONFIG_SND_SUN8IW15_CODEC) += sun8iw15-codec.o
+obj-$(CONFIG_SND_SUN8IW16_CODEC) += sun8iw16-codec.o
+obj-$(CONFIG_SND_SUN8IW17_CODEC) += sun8iw17-codec.o
+obj-$(CONFIG_SND_SUN8IW18_CODEC) += sun8iw18-codec.o
+obj-$(CONFIG_SND_SUN8IW19_CODEC) += sun8iw19-codec.o
+
+# SUNXI Machine Support
+obj-$(CONFIG_SND_SUNXI_SOC_SUN50IW1_CODEC) += sun50iw1-sndcodec.o
+obj-$(CONFIG_SND_SUNXI_SOC_SUN50IW3_CODEC) += sun50iw3-sndcodec.o
+obj-$(CONFIG_SND_SUNXI_SOC_SUN50IW8_CODEC) += sun50iw8-sndcodec.o
+obj-$(CONFIG_SND_SUNXI_SOC_SUN50IW9_CODEC) += sun50iw9-sndcodec.o
+
+obj-$(CONFIG_SND_SUNXI_SOC_SUN8IW11_CODEC) += sun8iw11-sndcodec.o
+obj-$(CONFIG_SND_SUNXI_SOC_SUN8IW15_CODEC) += sun8iw15-sndcodec.o
+obj-$(CONFIG_SND_SUNXI_SOC_SUN8IW16_CODEC) += sun8iw16-sndcodec.o
+obj-$(CONFIG_SND_SUNXI_SOC_SUN8IW17_CODEC) += sun8iw17-sndcodec.o
+obj-$(CONFIG_SND_SUNXI_SOC_SUN8IW18_CODEC) += sun8iw18-sndcodec.o
+obj-$(CONFIG_SND_SUNXI_SOC_SUN8IW19_CODEC) += sun8iw19-sndcodec.o
+
+obj-$(CONFIG_SND_SUNXI_SOC_SUNXI_HDMIAUDIO) += sunxi-sndhdmi.o
+ifneq ($(CONFIG_ARCH_SUN8IW19),)
+obj-$(CONFIG_SND_SUNXI_SOC_SUNXI_DAUDIO) += sun8iw19-snddaudio.o
+else
+obj-$(CONFIG_SND_SUNXI_SOC_SUNXI_DAUDIO) += sunxi-snddaudio.o
+endif
+obj-$(CONFIG_SND_SUNXI_SOC_SUNXI_SPDIF) += sunxi-sndspdif.o
+obj-$(CONFIG_SND_SUNXI_SOC_SUNXI_DMIC) += sunxi-snddmic.o
+
+# audio hub
+obj-$(CONFIG_SND_SUNXI_SOC_AHUB) += sunxi_ahub.o
+obj-$(CONFIG_SND_SUNXI_SOC_AHUB) += sunxi_ahub_cpudai.o
+obj-$(CONFIG_SND_SUNXI_SOC_AHUB) += sunxi_ahub_daudio.o
+obj-$(CONFIG_SND_SUNXI_SOC_AHUB) += sunxi_netlink.o
+# ahub machine
+obj-$(CONFIG_SND_SUNXI_SOC_AHUB) += sunxi-sndahub.o
+
+#MAD module
+obj-$(CONFIG_SND_SUNXI_MAD) += sunxi-mad.o
+
 obj-$(CONFIG_SND_SUN4I_I2S) += sun4i-i2s.o
+obj-$(CONFIG_SND_SUN4I_CODEC) += sun4i-codec.o
 obj-$(CONFIG_SND_SUN4I_SPDIF) += sun4i-spdif.o
+
+#For mpp aio
+obj-$(CONFIG_SUNXI_MPP) += sunxi-aio/