diff -drupN a/drivers/clk/sunxi/Makefile b/drivers/clk/sunxi/Makefile
--- a/drivers/clk/sunxi/Makefile	2018-08-06 17:23:04.000000000 +0300
+++ b/drivers/clk/sunxi/Makefile	2022-06-12 05:28:14.000000000 +0300
@@ -2,27 +2,29 @@
 # Makefile for sunxi specific clk
 #
 
-obj-y += clk-sunxi.o clk-factors.o
-obj-y += clk-a10-codec.o
-obj-y += clk-a10-hosc.o
-obj-y += clk-a10-mod1.o
-obj-y += clk-a10-pll2.o
-obj-y += clk-a10-ve.o
-obj-y += clk-a20-gmac.o
-obj-y += clk-mod0.o
-obj-y += clk-simple-gates.o
-obj-y += clk-sun4i-display.o
-obj-y += clk-sun4i-pll3.o
-obj-y += clk-sun4i-tcon-ch1.o
-obj-y += clk-sun8i-bus-gates.o
-obj-y += clk-sun8i-mbus.o
-obj-y += clk-sun9i-core.o
-obj-y += clk-sun9i-mmc.o
-obj-y += clk-usb.o
-
-obj-$(CONFIG_MACH_SUN9I) += clk-sun8i-apb0.o
-obj-$(CONFIG_MACH_SUN9I) += clk-sun9i-cpus.o
-
-obj-$(CONFIG_MFD_SUN6I_PRCM) += \
-	clk-sun6i-ar100.o clk-sun6i-apb0.o clk-sun6i-apb0-gates.o \
-	clk-sun8i-apb0.o
+obj-y += clk-sunxi.o clk-factors.o clk-periph.o
+obj-${CONFIG_COMMON_CLK_DEBUG} += clk-debugfs.o
+obj-${CONFIG_ARCH_SUN50IW3} += clk-sun50iw3.o
+obj-${CONFIG_ARCH_SUN50IW1} += clk-sun50iw1.o
+obj-${CONFIG_ARCH_SUN50IW6} += clk-sun50iw6.o
+obj-${CONFIG_ARCH_SUN50IW8} += clk-sun50iw8.o
+obj-${CONFIG_ARCH_SUN50IW9} += clk-sun50iw9.o
+ifeq ($(CONFIG_ARCH_SUN50IW9),y)
+obj-${CONFIG_ARCH_SUN50IW9} += clk-cpu.o
+endif
+obj-${CONFIG_ARCH_SUN50IW10} += clk-sun50iw10.o
+obj-${CONFIG_ARCH_SUN50IW11} += clk-sun50iw11.o
+obj-${CONFIG_ARCH_SUN50IW5T} += clk-sun50iw5t.o
+obj-${CONFIG_ARCH_SUN8IW6} += clk-sun8iw6.o
+ifeq ($(CONFIG_SUNXI_ARISC), y)
+obj-${CONFIG_ARCH_SUN8IW6} += clk-ac100.o
+endif
+obj-${CONFIG_ARCH_SUN8IW7} += clk-sun8iw7.o
+obj-${CONFIG_ARCH_SUN8IW11} += clk-sun8iw11.o
+obj-${CONFIG_ARCH_SUN8IW8} += clk-sun8iw8.o
+obj-${CONFIG_ARCH_SUN8IW12} += clk-sun8iw12.o
+obj-${CONFIG_ARCH_SUN8IW15} += clk-sun8iw15.o
+obj-${CONFIG_ARCH_SUN8IW16} += clk-sun8iw16.o
+obj-${CONFIG_ARCH_SUN8IW17} += clk-sun8iw17.o
+obj-${CONFIG_ARCH_SUN8IW18} += clk-sun8iw18.o
+obj-${CONFIG_ARCH_SUN8IW19} += clk-sun8iw19.o