diff --git a/sys/arm/allwinner/a10/files.a10 b/sys/arm/allwinner/a10/files.a10
--- a/sys/arm/allwinner/a10/files.a10
+++ b/sys/arm/allwinner/a10/files.a10
@@ -1,4 +1,4 @@
 
 arm/allwinner/a10/a10_intc.c		standard
 arm/allwinner/a10/a10_padconf.c		standard
-arm/allwinner/clkng/ccu_a10.c		standard
+dev/clk/allwinner/ccu_a10.c		standard
diff --git a/sys/arm/allwinner/a13/files.a13 b/sys/arm/allwinner/a13/files.a13
--- a/sys/arm/allwinner/a13/files.a13
+++ b/sys/arm/allwinner/a13/files.a13
@@ -1,3 +1,3 @@
 
 arm/allwinner/a13/a13_padconf.c		standard
-arm/allwinner/clkng/ccu_a13.c		standard
+dev/clk/allwinner/ccu_a13.c		standard
diff --git a/sys/arm/allwinner/a20/files.a20 b/sys/arm/allwinner/a20/files.a20
--- a/sys/arm/allwinner/a20/files.a20
+++ b/sys/arm/allwinner/a20/files.a20
@@ -1,3 +1,3 @@
 
 arm/allwinner/a20/a20_padconf.c		standard
-arm/allwinner/clkng/ccu_a10.c		standard
+dev/clk/allwinner/ccu_a10.c		standard
diff --git a/sys/arm/allwinner/a31/files.a31 b/sys/arm/allwinner/a31/files.a31
--- a/sys/arm/allwinner/a31/files.a31
+++ b/sys/arm/allwinner/a31/files.a31
@@ -1,5 +1,5 @@
 
-arm/allwinner/clkng/ccu_a31.c		standard
+dev/clk/allwinner/ccu_a31.c		standard
 arm/allwinner/a31/a31_padconf.c		standard
 arm/allwinner/a31/a31_r_padconf.c	standard
 arm/allwinner/a31/a31s_padconf.c	standard
diff --git a/sys/arm/allwinner/a83t/files.a83t b/sys/arm/allwinner/a83t/files.a83t
--- a/sys/arm/allwinner/a83t/files.a83t
+++ b/sys/arm/allwinner/a83t/files.a83t
@@ -1,5 +1,5 @@
 
-arm/allwinner/clkng/ccu_a83t.c		standard
-arm/allwinner/clkng/ccu_sun8i_r.c	standard
+dev/clk/allwinner/ccu_a83t.c		standard
+dev/clk/allwinner/ccu_sun8i_r.c		standard
 arm/allwinner/a83t/a83t_padconf.c	standard
 arm/allwinner/a83t/a83t_r_padconf.c	standard
diff --git a/sys/arm/allwinner/files.allwinner b/sys/arm/allwinner/files.allwinner
--- a/sys/arm/allwinner/files.allwinner
+++ b/sys/arm/allwinner/files.allwinner
@@ -33,16 +33,16 @@
 arm/allwinner/aw_cir.c			optional	aw_cir evdev
 
 arm/allwinner/aw_reset.c		standard
-arm/allwinner/aw_ccu.c			standard
+dev/clk/allwinner/aw_ccu.c		standard
 arm/allwinner/aw_gmacclk.c		standard
 
-arm/allwinner/clkng/aw_ccung.c		standard
-arm/allwinner/clkng/aw_clk_frac.c	standard
-arm/allwinner/clkng/aw_clk_m.c		standard
-arm/allwinner/clkng/aw_clk_mipi.c	standard
-arm/allwinner/clkng/aw_clk_nkmp.c	standard
-arm/allwinner/clkng/aw_clk_nm.c		standard
-arm/allwinner/clkng/aw_clk_np.c		standard
-arm/allwinner/clkng/aw_clk_nmm.c	standard
-arm/allwinner/clkng/aw_clk_prediv_mux.c	standard
-arm/allwinner/clkng/ccu_de2.c		standard
+dev/clk/allwinner/aw_ccung.c		standard
+dev/clk/allwinner/aw_clk_frac.c		standard
+dev/clk/allwinner/aw_clk_m.c		standard
+dev/clk/allwinner/aw_clk_mipi.c		standard
+dev/clk/allwinner/aw_clk_nkmp.c		standard
+dev/clk/allwinner/aw_clk_nm.c		standard
+dev/clk/allwinner/aw_clk_np.c		standard
+dev/clk/allwinner/aw_clk_nmm.c		standard
+dev/clk/allwinner/aw_clk_prediv_mux.c	standard
+dev/clk/allwinner/ccu_de2.c		standard
diff --git a/sys/arm/allwinner/h3/files.h3 b/sys/arm/allwinner/h3/files.h3
--- a/sys/arm/allwinner/h3/files.h3
+++ b/sys/arm/allwinner/h3/files.h3
@@ -1,5 +1,5 @@
 
-arm/allwinner/clkng/ccu_h3.c		standard
-arm/allwinner/clkng/ccu_sun8i_r.c	standard
+dev/clk/allwinner/ccu_h3.c		standard
+dev/clk/allwinner/ccu_sun8i_r.c		standard
 arm/allwinner/h3/h3_padconf.c		standard
 arm/allwinner/h3/h3_r_padconf.c		standard
diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -456,21 +456,21 @@
 arm/allwinner/if_awg.c				optional awg syscon aw_sid nvmem fdt
 
 # Allwinner clock driver
-arm/allwinner/clkng/aw_ccung.c			optional aw_ccu fdt
-arm/allwinner/clkng/aw_clk_frac.c		optional aw_ccu fdt
-arm/allwinner/clkng/aw_clk_m.c			optional aw_ccu fdt
-arm/allwinner/clkng/aw_clk_mipi.c		optional aw_ccu fdt
-arm/allwinner/clkng/aw_clk_nkmp.c		optional aw_ccu fdt
-arm/allwinner/clkng/aw_clk_nm.c			optional aw_ccu fdt
-arm/allwinner/clkng/aw_clk_nmm.c		optional aw_ccu fdt
-arm/allwinner/clkng/aw_clk_np.c			optional aw_ccu fdt
-arm/allwinner/clkng/aw_clk_prediv_mux.c		optional aw_ccu fdt
-arm/allwinner/clkng/ccu_a64.c			optional soc_allwinner_a64 aw_ccu fdt
-arm/allwinner/clkng/ccu_h3.c			optional soc_allwinner_h5 aw_ccu fdt
-arm/allwinner/clkng/ccu_h6.c			optional soc_allwinner_h6 aw_ccu fdt
-arm/allwinner/clkng/ccu_h6_r.c			optional soc_allwinner_h6 aw_ccu fdt
-arm/allwinner/clkng/ccu_sun8i_r.c		optional aw_ccu fdt
-arm/allwinner/clkng/ccu_de2.c			optional aw_ccu fdt
+dev/clk/allwinner/aw_ccung.c			optional aw_ccu fdt
+dev/clk/allwinner/aw_clk_frac.c			optional aw_ccu fdt
+dev/clk/allwinner/aw_clk_m.c			optional aw_ccu fdt
+dev/clk/allwinner/aw_clk_mipi.c			optional aw_ccu fdt
+dev/clk/allwinner/aw_clk_nkmp.c			optional aw_ccu fdt
+dev/clk/allwinner/aw_clk_nm.c			optional aw_ccu fdt
+dev/clk/allwinner/aw_clk_nmm.c			optional aw_ccu fdt
+dev/clk/allwinner/aw_clk_np.c			optional aw_ccu fdt
+dev/clk/allwinner/aw_clk_prediv_mux.c		optional aw_ccu fdt
+dev/clk/allwinner/ccu_a64.c			optional soc_allwinner_a64 aw_ccu fdt
+dev/clk/allwinner/ccu_h3.c			optional soc_allwinner_h5 aw_ccu fdt
+dev/clk/allwinner/ccu_h6.c			optional soc_allwinner_h6 aw_ccu fdt
+dev/clk/allwinner/ccu_h6_r.c			optional soc_allwinner_h6 aw_ccu fdt
+dev/clk/allwinner/ccu_sun8i_r.c			optional aw_ccu fdt
+dev/clk/allwinner/ccu_de2.c			optional aw_ccu fdt
 
 # Allwinner padconf files
 arm/allwinner/a64/a64_padconf.c			optional soc_allwinner_a64 fdt
diff --git a/sys/arm/allwinner/aw_ccu.c b/sys/dev/clk/allwinner/aw_ccu.c
rename from sys/arm/allwinner/aw_ccu.c
rename to sys/dev/clk/allwinner/aw_ccu.c
diff --git a/sys/arm/allwinner/clkng/aw_ccung.h b/sys/dev/clk/allwinner/aw_ccung.h
rename from sys/arm/allwinner/clkng/aw_ccung.h
rename to sys/dev/clk/allwinner/aw_ccung.h
--- a/sys/arm/allwinner/clkng/aw_ccung.h
+++ b/sys/dev/clk/allwinner/aw_ccung.h
@@ -28,15 +28,15 @@
 #ifndef __CCU_NG_H__
 #define __CCU_NG_H__
 
-#include <arm/allwinner/clkng/aw_clk.h>
-#include <arm/allwinner/clkng/aw_clk_m.h>
-#include <arm/allwinner/clkng/aw_clk_mipi.h>
-#include <arm/allwinner/clkng/aw_clk_nkmp.h>
-#include <arm/allwinner/clkng/aw_clk_nm.h>
-#include <arm/allwinner/clkng/aw_clk_nmm.h>
-#include <arm/allwinner/clkng/aw_clk_np.h>
-#include <arm/allwinner/clkng/aw_clk_prediv_mux.h>
-#include <arm/allwinner/clkng/aw_clk_frac.h>
+#include <dev/clk/allwinner/aw_clk.h>
+#include <dev/clk/allwinner/aw_clk_m.h>
+#include <dev/clk/allwinner/aw_clk_mipi.h>
+#include <dev/clk/allwinner/aw_clk_nkmp.h>
+#include <dev/clk/allwinner/aw_clk_nm.h>
+#include <dev/clk/allwinner/aw_clk_nmm.h>
+#include <dev/clk/allwinner/aw_clk_np.h>
+#include <dev/clk/allwinner/aw_clk_prediv_mux.h>
+#include <dev/clk/allwinner/aw_clk_frac.h>
 #include <dev/extres/clk/clk_mux.h>
 #include <dev/extres/clk/clk_div.h>
 #include <dev/extres/clk/clk_fixed.h>
diff --git a/sys/arm/allwinner/clkng/aw_ccung.c b/sys/dev/clk/allwinner/aw_ccung.c
rename from sys/arm/allwinner/clkng/aw_ccung.c
rename to sys/dev/clk/allwinner/aw_ccung.c
--- a/sys/arm/allwinner/clkng/aw_ccung.c
+++ b/sys/dev/clk/allwinner/aw_ccung.c
@@ -49,8 +49,8 @@
 
 #include <dev/extres/hwreset/hwreset.h>
 
-#include <arm/allwinner/clkng/aw_ccung.h>
-#include <arm/allwinner/clkng/aw_clk.h>
+#include <dev/clk/allwinner/aw_ccung.h>
+#include <dev/clk/allwinner/aw_clk.h>
 
 #ifdef __aarch64__
 #include "opt_soc.h"
diff --git a/sys/arm/allwinner/clkng/aw_clk.h b/sys/dev/clk/allwinner/aw_clk.h
rename from sys/arm/allwinner/clkng/aw_clk.h
rename to sys/dev/clk/allwinner/aw_clk.h
diff --git a/sys/arm/allwinner/clkng/aw_clk_frac.h b/sys/dev/clk/allwinner/aw_clk_frac.h
rename from sys/arm/allwinner/clkng/aw_clk_frac.h
rename to sys/dev/clk/allwinner/aw_clk_frac.h
diff --git a/sys/arm/allwinner/clkng/aw_clk_frac.c b/sys/dev/clk/allwinner/aw_clk_frac.c
rename from sys/arm/allwinner/clkng/aw_clk_frac.c
rename to sys/dev/clk/allwinner/aw_clk_frac.c
--- a/sys/arm/allwinner/clkng/aw_clk_frac.c
+++ b/sys/dev/clk/allwinner/aw_clk_frac.c
@@ -29,8 +29,8 @@
 
 #include <dev/extres/clk/clk.h>
 
-#include <arm/allwinner/clkng/aw_clk.h>
-#include <arm/allwinner/clkng/aw_clk_frac.h>
+#include <dev/clk/allwinner/aw_clk.h>
+#include <dev/clk/allwinner/aw_clk_frac.h>
 
 #include "clkdev_if.h"
 
diff --git a/sys/arm/allwinner/clkng/aw_clk_m.h b/sys/dev/clk/allwinner/aw_clk_m.h
rename from sys/arm/allwinner/clkng/aw_clk_m.h
rename to sys/dev/clk/allwinner/aw_clk_m.h
diff --git a/sys/arm/allwinner/clkng/aw_clk_m.c b/sys/dev/clk/allwinner/aw_clk_m.c
rename from sys/arm/allwinner/clkng/aw_clk_m.c
rename to sys/dev/clk/allwinner/aw_clk_m.c
--- a/sys/arm/allwinner/clkng/aw_clk_m.c
+++ b/sys/dev/clk/allwinner/aw_clk_m.c
@@ -29,8 +29,8 @@
 
 #include <dev/extres/clk/clk.h>
 
-#include <arm/allwinner/clkng/aw_clk.h>
-#include <arm/allwinner/clkng/aw_clk_m.h>
+#include <dev/clk/allwinner/aw_clk.h>
+#include <dev/clk/allwinner/aw_clk_m.h>
 
 #include "clkdev_if.h"
 
diff --git a/sys/arm/allwinner/clkng/aw_clk_mipi.h b/sys/dev/clk/allwinner/aw_clk_mipi.h
rename from sys/arm/allwinner/clkng/aw_clk_mipi.h
rename to sys/dev/clk/allwinner/aw_clk_mipi.h
diff --git a/sys/arm/allwinner/clkng/aw_clk_mipi.c b/sys/dev/clk/allwinner/aw_clk_mipi.c
rename from sys/arm/allwinner/clkng/aw_clk_mipi.c
rename to sys/dev/clk/allwinner/aw_clk_mipi.c
--- a/sys/arm/allwinner/clkng/aw_clk_mipi.c
+++ b/sys/dev/clk/allwinner/aw_clk_mipi.c
@@ -29,8 +29,8 @@
 
 #include <dev/extres/clk/clk.h>
 
-#include <arm/allwinner/clkng/aw_clk.h>
-#include <arm/allwinner/clkng/aw_clk_mipi.h>
+#include <dev/clk/allwinner/aw_clk.h>
+#include <dev/clk/allwinner/aw_clk_mipi.h>
 
 #include "clkdev_if.h"
 
diff --git a/sys/arm/allwinner/clkng/aw_clk_nkmp.h b/sys/dev/clk/allwinner/aw_clk_nkmp.h
rename from sys/arm/allwinner/clkng/aw_clk_nkmp.h
rename to sys/dev/clk/allwinner/aw_clk_nkmp.h
--- a/sys/arm/allwinner/clkng/aw_clk_nkmp.h
+++ b/sys/dev/clk/allwinner/aw_clk_nkmp.h
@@ -27,7 +27,7 @@
 #ifndef	__AW_CLK_NKMP_H__
 #define __AW_CLK_NKMP_H__
 
-#include <arm/allwinner/clkng/aw_clk.h>
+#include <dev/clk/allwinner/aw_clk.h>
 
 struct aw_clk_nkmp_def {
 	struct clknode_init_def clkdef;
diff --git a/sys/arm/allwinner/clkng/aw_clk_nkmp.c b/sys/dev/clk/allwinner/aw_clk_nkmp.c
rename from sys/arm/allwinner/clkng/aw_clk_nkmp.c
rename to sys/dev/clk/allwinner/aw_clk_nkmp.c
--- a/sys/arm/allwinner/clkng/aw_clk_nkmp.c
+++ b/sys/dev/clk/allwinner/aw_clk_nkmp.c
@@ -29,8 +29,8 @@
 
 #include <dev/extres/clk/clk.h>
 
-#include <arm/allwinner/clkng/aw_clk.h>
-#include <arm/allwinner/clkng/aw_clk_nkmp.h>
+#include <dev/clk/allwinner/aw_clk.h>
+#include <dev/clk/allwinner/aw_clk_nkmp.h>
 
 #include "clkdev_if.h"
 
diff --git a/sys/arm/allwinner/clkng/aw_clk_nm.h b/sys/dev/clk/allwinner/aw_clk_nm.h
rename from sys/arm/allwinner/clkng/aw_clk_nm.h
rename to sys/dev/clk/allwinner/aw_clk_nm.h
diff --git a/sys/arm/allwinner/clkng/aw_clk_nm.c b/sys/dev/clk/allwinner/aw_clk_nm.c
rename from sys/arm/allwinner/clkng/aw_clk_nm.c
rename to sys/dev/clk/allwinner/aw_clk_nm.c
--- a/sys/arm/allwinner/clkng/aw_clk_nm.c
+++ b/sys/dev/clk/allwinner/aw_clk_nm.c
@@ -29,8 +29,8 @@
 
 #include <dev/extres/clk/clk.h>
 
-#include <arm/allwinner/clkng/aw_clk.h>
-#include <arm/allwinner/clkng/aw_clk_nm.h>
+#include <dev/clk/allwinner/aw_clk.h>
+#include <dev/clk/allwinner/aw_clk_nm.h>
 
 #include "clkdev_if.h"
 
diff --git a/sys/arm/allwinner/clkng/aw_clk_nmm.h b/sys/dev/clk/allwinner/aw_clk_nmm.h
rename from sys/arm/allwinner/clkng/aw_clk_nmm.h
rename to sys/dev/clk/allwinner/aw_clk_nmm.h
diff --git a/sys/arm/allwinner/clkng/aw_clk_nmm.c b/sys/dev/clk/allwinner/aw_clk_nmm.c
rename from sys/arm/allwinner/clkng/aw_clk_nmm.c
rename to sys/dev/clk/allwinner/aw_clk_nmm.c
--- a/sys/arm/allwinner/clkng/aw_clk_nmm.c
+++ b/sys/dev/clk/allwinner/aw_clk_nmm.c
@@ -31,8 +31,8 @@
 
 #include <dev/extres/clk/clk.h>
 
-#include <arm/allwinner/clkng/aw_clk.h>
-#include <arm/allwinner/clkng/aw_clk_nmm.h>
+#include <dev/clk/allwinner/aw_clk.h>
+#include <dev/clk/allwinner/aw_clk_nmm.h>
 
 #include "clkdev_if.h"
 
diff --git a/sys/arm/allwinner/clkng/aw_clk_np.h b/sys/dev/clk/allwinner/aw_clk_np.h
rename from sys/arm/allwinner/clkng/aw_clk_np.h
rename to sys/dev/clk/allwinner/aw_clk_np.h
diff --git a/sys/arm/allwinner/clkng/aw_clk_np.c b/sys/dev/clk/allwinner/aw_clk_np.c
rename from sys/arm/allwinner/clkng/aw_clk_np.c
rename to sys/dev/clk/allwinner/aw_clk_np.c
--- a/sys/arm/allwinner/clkng/aw_clk_np.c
+++ b/sys/dev/clk/allwinner/aw_clk_np.c
@@ -31,8 +31,8 @@
 
 #include <dev/extres/clk/clk.h>
 
-#include <arm/allwinner/clkng/aw_clk.h>
-#include <arm/allwinner/clkng/aw_clk_np.h>
+#include <dev/clk/allwinner/aw_clk.h>
+#include <dev/clk/allwinner/aw_clk_np.h>
 
 #include "clkdev_if.h"
 
diff --git a/sys/arm/allwinner/clkng/aw_clk_prediv_mux.h b/sys/dev/clk/allwinner/aw_clk_prediv_mux.h
rename from sys/arm/allwinner/clkng/aw_clk_prediv_mux.h
rename to sys/dev/clk/allwinner/aw_clk_prediv_mux.h
--- a/sys/arm/allwinner/clkng/aw_clk_prediv_mux.h
+++ b/sys/dev/clk/allwinner/aw_clk_prediv_mux.h
@@ -26,7 +26,7 @@
 #ifndef	__AW_CLK_PREDIV_MUX_H__
 #define __AW_CLK_PREDIV_MUX_H__
 
-#include <arm/allwinner/clkng/aw_clk.h>
+#include <dev/clk/allwinner/aw_clk.h>
 
 struct aw_clk_prediv_mux_def {
 	struct clknode_init_def clkdef;
diff --git a/sys/arm/allwinner/clkng/aw_clk_prediv_mux.c b/sys/dev/clk/allwinner/aw_clk_prediv_mux.c
rename from sys/arm/allwinner/clkng/aw_clk_prediv_mux.c
rename to sys/dev/clk/allwinner/aw_clk_prediv_mux.c
--- a/sys/arm/allwinner/clkng/aw_clk_prediv_mux.c
+++ b/sys/dev/clk/allwinner/aw_clk_prediv_mux.c
@@ -29,8 +29,8 @@
 
 #include <dev/extres/clk/clk.h>
 
-#include <arm/allwinner/clkng/aw_clk.h>
-#include <arm/allwinner/clkng/aw_clk_prediv_mux.h>
+#include <dev/clk/allwinner/aw_clk.h>
+#include <dev/clk/allwinner/aw_clk_prediv_mux.h>
 
 #include "clkdev_if.h"
 
diff --git a/sys/arm/allwinner/clkng/ccu_a10.c b/sys/dev/clk/allwinner/ccu_a10.c
rename from sys/arm/allwinner/clkng/ccu_a10.c
rename to sys/dev/clk/allwinner/ccu_a10.c
--- a/sys/arm/allwinner/clkng/ccu_a10.c
+++ b/sys/dev/clk/allwinner/ccu_a10.c
@@ -42,7 +42,7 @@
 #include <dev/extres/clk/clk_fixed.h>
 #include <dev/extres/clk/clk_mux.h>
 
-#include <arm/allwinner/clkng/aw_ccung.h>
+#include <dev/clk/allwinner/aw_ccung.h>
 
 #include <dt-bindings/clock/sun4i-a10-ccu.h>
 #include <dt-bindings/clock/sun7i-a20-ccu.h>
diff --git a/sys/arm/allwinner/clkng/ccu_a13.c b/sys/dev/clk/allwinner/ccu_a13.c
rename from sys/arm/allwinner/clkng/ccu_a13.c
rename to sys/dev/clk/allwinner/ccu_a13.c
--- a/sys/arm/allwinner/clkng/ccu_a13.c
+++ b/sys/dev/clk/allwinner/ccu_a13.c
@@ -42,7 +42,7 @@
 #include <dev/extres/clk/clk_fixed.h>
 #include <dev/extres/clk/clk_mux.h>
 
-#include <arm/allwinner/clkng/aw_ccung.h>
+#include <dev/clk/allwinner/aw_ccung.h>
 
 #include <dt-bindings/clock/sun5i-ccu.h>
 #include <dt-bindings/reset/sun5i-ccu.h>
diff --git a/sys/arm/allwinner/clkng/ccu_a31.c b/sys/dev/clk/allwinner/ccu_a31.c
rename from sys/arm/allwinner/clkng/ccu_a31.c
rename to sys/dev/clk/allwinner/ccu_a31.c
--- a/sys/arm/allwinner/clkng/ccu_a31.c
+++ b/sys/dev/clk/allwinner/ccu_a31.c
@@ -42,7 +42,7 @@
 #include <dev/extres/clk/clk_fixed.h>
 #include <dev/extres/clk/clk_mux.h>
 
-#include <arm/allwinner/clkng/aw_ccung.h>
+#include <dev/clk/allwinner/aw_ccung.h>
 
 #include <dt-bindings/clock/sun6i-a31-ccu.h>
 #include <dt-bindings/reset/sun6i-a31-ccu.h>
diff --git a/sys/arm/allwinner/clkng/ccu_a64.c b/sys/dev/clk/allwinner/ccu_a64.c
rename from sys/arm/allwinner/clkng/ccu_a64.c
rename to sys/dev/clk/allwinner/ccu_a64.c
--- a/sys/arm/allwinner/clkng/ccu_a64.c
+++ b/sys/dev/clk/allwinner/ccu_a64.c
@@ -42,7 +42,7 @@
 #include <dev/extres/clk/clk_fixed.h>
 #include <dev/extres/clk/clk_mux.h>
 
-#include <arm/allwinner/clkng/aw_ccung.h>
+#include <dev/clk/allwinner/aw_ccung.h>
 
 #include <dt-bindings/clock/sun50i-a64-ccu.h>
 #include <dt-bindings/reset/sun50i-a64-ccu.h>
diff --git a/sys/arm/allwinner/clkng/ccu_a83t.c b/sys/dev/clk/allwinner/ccu_a83t.c
rename from sys/arm/allwinner/clkng/ccu_a83t.c
rename to sys/dev/clk/allwinner/ccu_a83t.c
--- a/sys/arm/allwinner/clkng/ccu_a83t.c
+++ b/sys/dev/clk/allwinner/ccu_a83t.c
@@ -42,7 +42,7 @@
 #include <dev/extres/clk/clk_fixed.h>
 #include <dev/extres/clk/clk_mux.h>
 
-#include <arm/allwinner/clkng/aw_ccung.h>
+#include <dev/clk/allwinner/aw_ccung.h>
 
 #include <dt-bindings/clock/sun8i-a83t-ccu.h>
 #include <dt-bindings/reset/sun8i-a83t-ccu.h>
diff --git a/sys/arm/allwinner/clkng/ccu_de2.c b/sys/dev/clk/allwinner/ccu_de2.c
rename from sys/arm/allwinner/clkng/ccu_de2.c
rename to sys/dev/clk/allwinner/ccu_de2.c
--- a/sys/arm/allwinner/clkng/ccu_de2.c
+++ b/sys/dev/clk/allwinner/ccu_de2.c
@@ -48,7 +48,7 @@
 
 #include <dev/extres/hwreset/hwreset.h>
 
-#include <arm/allwinner/clkng/aw_ccung.h>
+#include <dev/clk/allwinner/aw_ccung.h>
 
 #include <dt-bindings/clock/sun8i-de2.h>
 #include <dt-bindings/reset/sun8i-de2.h>
diff --git a/sys/arm/allwinner/clkng/ccu_h3.c b/sys/dev/clk/allwinner/ccu_h3.c
rename from sys/arm/allwinner/clkng/ccu_h3.c
rename to sys/dev/clk/allwinner/ccu_h3.c
--- a/sys/arm/allwinner/clkng/ccu_h3.c
+++ b/sys/dev/clk/allwinner/ccu_h3.c
@@ -50,7 +50,7 @@
 #include "opt_soc.h"
 #endif
 
-#include <arm/allwinner/clkng/aw_ccung.h>
+#include <dev/clk/allwinner/aw_ccung.h>
 
 #include <dt-bindings/clock/sun8i-h3-ccu.h>
 #include <dt-bindings/reset/sun8i-h3-ccu.h>
diff --git a/sys/arm/allwinner/clkng/ccu_h6.c b/sys/dev/clk/allwinner/ccu_h6.c
rename from sys/arm/allwinner/clkng/ccu_h6.c
rename to sys/dev/clk/allwinner/ccu_h6.c
--- a/sys/arm/allwinner/clkng/ccu_h6.c
+++ b/sys/dev/clk/allwinner/ccu_h6.c
@@ -42,7 +42,7 @@
 #include <dev/extres/clk/clk_fixed.h>
 #include <dev/extres/clk/clk_mux.h>
 
-#include <arm/allwinner/clkng/aw_ccung.h>
+#include <dev/clk/allwinner/aw_ccung.h>
 
 #include <dt-bindings/clock/sun50i-h6-ccu.h>
 #include <dt-bindings/reset/sun50i-h6-ccu.h>
diff --git a/sys/arm/allwinner/clkng/ccu_h6_r.c b/sys/dev/clk/allwinner/ccu_h6_r.c
rename from sys/arm/allwinner/clkng/ccu_h6_r.c
rename to sys/dev/clk/allwinner/ccu_h6_r.c
--- a/sys/arm/allwinner/clkng/ccu_h6_r.c
+++ b/sys/dev/clk/allwinner/ccu_h6_r.c
@@ -42,7 +42,7 @@
 #include <dev/extres/clk/clk_fixed.h>
 #include <dev/extres/clk/clk_mux.h>
 
-#include <arm/allwinner/clkng/aw_ccung.h>
+#include <dev/clk/allwinner/aw_ccung.h>
 
 #include <dt-bindings/clock/sun50i-h6-r-ccu.h>
 #include <dt-bindings/reset/sun50i-h6-r-ccu.h>
diff --git a/sys/arm/allwinner/clkng/ccu_sun8i_r.c b/sys/dev/clk/allwinner/ccu_sun8i_r.c
rename from sys/arm/allwinner/clkng/ccu_sun8i_r.c
rename to sys/dev/clk/allwinner/ccu_sun8i_r.c
--- a/sys/arm/allwinner/clkng/ccu_sun8i_r.c
+++ b/sys/dev/clk/allwinner/ccu_sun8i_r.c
@@ -46,7 +46,7 @@
 #include <dev/extres/clk/clk_fixed.h>
 #include <dev/extres/clk/clk_mux.h>
 
-#include <arm/allwinner/clkng/aw_ccung.h>
+#include <dev/clk/allwinner/aw_ccung.h>
 
 #include <dt-bindings/clock/sun8i-r-ccu.h>
 #include <dt-bindings/reset/sun8i-r-ccu.h>