diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index 6b1ac66e1690..33c4db06c034 100644
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -306,6 +306,7 @@ source "drivers/clk/meson/Kconfig"
 source "drivers/clk/mvebu/Kconfig"
 source "drivers/clk/qcom/Kconfig"
 source "drivers/clk/renesas/Kconfig"
+source "drivers/clk/rockchip/Kconfig"
 source "drivers/clk/samsung/Kconfig"
 source "drivers/clk/sprd/Kconfig"
 source "drivers/clk/sunxi-ng/Kconfig"
diff --git a/drivers/clk/rockchip/Kconfig b/drivers/clk/rockchip/Kconfig
new file mode 100644
index 000000000000..f5b7a6e7aebe
--- /dev/null
+++ b/drivers/clk/rockchip/Kconfig
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0
+
+source "drivers/clk/rockchip/regmap/Kconfig"
diff --git a/drivers/clk/rockchip/Makefile b/drivers/clk/rockchip/Makefile
index 5858f79b3a92..4e4178af8dba 100644
--- a/drivers/clk/rockchip/Makefile
+++ b/drivers/clk/rockchip/Makefile
@@ -30,4 +30,4 @@ obj-$(CONFIG_CPU_RK3368)	+= clk-rk3368.o
 obj-$(CONFIG_CPU_RK3568)	+= clk-rk3568.o
 obj-$(CONFIG_CPU_RK3399)	+= clk-rk3399.o
 
-obj-$(CONFIG_MFD_RK618)		+= rk618/
+obj-$(CONFIG_COMMON_CLK_ROCKCHIP_REGMAP)	+= regmap/
diff --git a/drivers/clk/rockchip/regmap/Kconfig b/drivers/clk/rockchip/regmap/Kconfig
new file mode 100644
index 000000000000..df30e308e163
--- /dev/null
+++ b/drivers/clk/rockchip/regmap/Kconfig
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0
+
+config COMMON_CLK_ROCKCHIP_REGMAP
+	tristate
+
+config CLK_RK618
+	tristate "Clock driver for Rockchip RK618"
+	depends on MFD_RK618
+	default MFD_RK618
+	select COMMON_CLK_ROCKCHIP_REGMAP
diff --git a/drivers/clk/rockchip/regmap/Makefile b/drivers/clk/rockchip/regmap/Makefile
new file mode 100644
index 000000000000..8127b7727750
--- /dev/null
+++ b/drivers/clk/rockchip/regmap/Makefile
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_COMMON_CLK_ROCKCHIP_REGMAP) += clk-rockchip-regmap.o
+
+clk-rockchip-regmap-objs := clk-regmap-mux.o \
+			    clk-regmap-divider.o \
+			    clk-regmap-gate.o \
+			    clk-regmap-fractional-divider.o \
+			    clk-regmap-composite.o \
+			    clk-regmap-pll.o
+
+obj-$(CONFIG_CLK_RK618) += clk-rk618.o
diff --git a/drivers/clk/rockchip/rk618/clk-regmap-composite.c b/drivers/clk/rockchip/regmap/clk-regmap-composite.c
similarity index 100%
rename from drivers/clk/rockchip/rk618/clk-regmap-composite.c
rename to drivers/clk/rockchip/regmap/clk-regmap-composite.c
diff --git a/drivers/clk/rockchip/rk618/clk-regmap-divider.c b/drivers/clk/rockchip/regmap/clk-regmap-divider.c
similarity index 100%
rename from drivers/clk/rockchip/rk618/clk-regmap-divider.c
rename to drivers/clk/rockchip/regmap/clk-regmap-divider.c
diff --git a/drivers/clk/rockchip/rk618/clk-regmap-fractional-divider.c b/drivers/clk/rockchip/regmap/clk-regmap-fractional-divider.c
similarity index 100%
rename from drivers/clk/rockchip/rk618/clk-regmap-fractional-divider.c
rename to drivers/clk/rockchip/regmap/clk-regmap-fractional-divider.c
diff --git a/drivers/clk/rockchip/rk618/clk-regmap-gate.c b/drivers/clk/rockchip/regmap/clk-regmap-gate.c
similarity index 100%
rename from drivers/clk/rockchip/rk618/clk-regmap-gate.c
rename to drivers/clk/rockchip/regmap/clk-regmap-gate.c
diff --git a/drivers/clk/rockchip/rk618/clk-regmap-mux.c b/drivers/clk/rockchip/regmap/clk-regmap-mux.c
similarity index 100%
rename from drivers/clk/rockchip/rk618/clk-regmap-mux.c
rename to drivers/clk/rockchip/regmap/clk-regmap-mux.c
diff --git a/drivers/clk/rockchip/rk618/clk-regmap-pll.c b/drivers/clk/rockchip/regmap/clk-regmap-pll.c
similarity index 100%
rename from drivers/clk/rockchip/rk618/clk-regmap-pll.c
rename to drivers/clk/rockchip/regmap/clk-regmap-pll.c
diff --git a/drivers/clk/rockchip/rk618/clk-regmap.h b/drivers/clk/rockchip/regmap/clk-regmap.h
similarity index 100%
rename from drivers/clk/rockchip/rk618/clk-regmap.h
rename to drivers/clk/rockchip/regmap/clk-regmap.h
diff --git a/drivers/clk/rockchip/rk618/clk-rk618.c b/drivers/clk/rockchip/regmap/clk-rk618.c
similarity index 100%
rename from drivers/clk/rockchip/rk618/clk-rk618.c
rename to drivers/clk/rockchip/regmap/clk-rk618.c
diff --git a/drivers/clk/rockchip/rk618/Makefile b/drivers/clk/rockchip/rk618/Makefile
deleted file mode 100644
index 55e7964bd190..000000000000
--- a/drivers/clk/rockchip/rk618/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-#
-# Makefile for the Rockchip RK618 CRU driver.
-#
-
-obj-$(CONFIG_MFD_RK618) += clk-regmap-mux.o \
-			   clk-regmap-divider.o \
-			   clk-regmap-gate.o \
-			   clk-regmap-fractional-divider.o \
-			   clk-regmap-composite.o \
-			   clk-regmap-pll.o \
-			   clk-rk618.o