diff --git a/sys/arm/rockchip/files.rk32xx b/sys/arm/rockchip/files.rk32xx
--- a/sys/arm/rockchip/files.rk32xx
+++ b/sys/arm/rockchip/files.rk32xx
@@ -12,14 +12,14 @@
 arm64/rockchip/rk_tsadc.c		standard
 arm64/rockchip/rk_tsadc_if.m		standard
 arm64/rockchip/rk_usbphy.c		standard
-arm64/rockchip/clk/rk_clk_armclk.c	standard
-arm64/rockchip/clk/rk_clk_composite.c	standard
-arm64/rockchip/clk/rk_clk_fract.c	standard
-arm64/rockchip/clk/rk_clk_gate.c	standard
-arm64/rockchip/clk/rk_clk_mux.c		standard
-arm64/rockchip/clk/rk_clk_pll.c		standard
-arm64/rockchip/clk/rk_cru.c		standard
-arm64/rockchip/clk/rk3288_cru.c		standard
+dev/clk/rockchip/rk_clk_armclk.c	standard
+dev/clk//rockchip/rk_clk_composite.c	standard
+dev/clk//rockchip/rk_clk_fract.c	standard
+dev/clk//rockchip/rk_clk_gate.c		standard
+dev/clk//rockchip/rk_clk_mux.c		standard
+dev/clk//rockchip/rk_clk_pll.c		standard
+dev/clk//rockchip/rk_cru.c		standard
+dev/clk//rockchip/rk3288_cru.c		standard
 
 dev/dwc/if_dwc_rk.c			standard
 dev/iicbus/pmic/act8846.c		standard
diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -687,18 +687,18 @@
 arm64/rockchip/rk_pcie_phy.c			optional fdt pci soc_rockchip_rk3399
 
 # RockChip Clock support
-arm64/rockchip/clk/rk_cru.c			optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
-arm64/rockchip/clk/rk_clk_armclk.c		optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
-arm64/rockchip/clk/rk_clk_composite.c		optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
-arm64/rockchip/clk/rk_clk_fract.c		optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
-arm64/rockchip/clk/rk_clk_gate.c		optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
-arm64/rockchip/clk/rk_clk_mux.c			optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
-arm64/rockchip/clk/rk_clk_pll.c			optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
-arm64/rockchip/clk/rk3328_cru.c			optional fdt soc_rockchip_rk3328
-arm64/rockchip/clk/rk3399_cru.c			optional fdt soc_rockchip_rk3399
-arm64/rockchip/clk/rk3399_pmucru.c		optional fdt soc_rockchip_rk3399
-arm64/rockchip/clk/rk3568_cru.c			optional fdt soc_rockchip_rk3568
-arm64/rockchip/clk/rk3568_pmucru.c		optional fdt soc_rockchip_rk3568
+dev/clk/rockchip/rk_cru.c			optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
+dev/clk/rockchip/rk_clk_armclk.c		optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
+dev/clk/rockchip/rk_clk_composite.c		optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
+dev/clk/rockchip/rk_clk_fract.c			optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
+dev/clk/rockchip/rk_clk_gate.c			optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
+dev/clk/rockchip/rk_clk_mux.c			optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
+dev/clk/rockchip/rk_clk_pll.c			optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
+dev/clk/rockchip/rk3328_cru.c			optional fdt soc_rockchip_rk3328
+dev/clk/rockchip/rk3399_cru.c			optional fdt soc_rockchip_rk3399
+dev/clk/rockchip/rk3399_pmucru.c		optional fdt soc_rockchip_rk3399
+dev/clk/rockchip/rk3568_cru.c			optional fdt soc_rockchip_rk3568
+dev/clk/rockchip/rk3568_pmucru.c		optional fdt soc_rockchip_rk3568
 
 # Xilinx
 arm/xilinx/uart_dev_cdnc.c			optional uart soc_xilinx_zynq fdt
diff --git a/sys/arm64/rockchip/clk/rk3288_cru.c b/sys/dev/clk/rockchip/rk3288_cru.c
rename from sys/arm64/rockchip/clk/rk3288_cru.c
rename to sys/dev/clk/rockchip/rk3288_cru.c
--- a/sys/arm64/rockchip/clk/rk3288_cru.c
+++ b/sys/dev/clk/rockchip/rk3288_cru.c
@@ -44,7 +44,7 @@
 #include <dev/extres/clk/clk_fixed.h>
 #include <dev/extres/clk/clk_mux.h>
 
-#include <arm64/rockchip/clk/rk_cru.h>
+#include <dev/clk/rockchip/rk_cru.h>
 
 #include <dt-bindings/clock/rk3288-cru.h>
 
diff --git a/sys/arm64/rockchip/clk/rk3328_cru.c b/sys/dev/clk/rockchip/rk3328_cru.c
rename from sys/arm64/rockchip/clk/rk3328_cru.c
rename to sys/dev/clk/rockchip/rk3328_cru.c
--- a/sys/arm64/rockchip/clk/rk3328_cru.c
+++ b/sys/dev/clk/rockchip/rk3328_cru.c
@@ -42,7 +42,7 @@
 #include <dev/extres/clk/clk_fixed.h>
 #include <dev/extres/clk/clk_mux.h>
 
-#include <arm64/rockchip/clk/rk_cru.h>
+#include <dev/clk/rockchip/rk_cru.h>
 
 #define	CRU_CLKSEL_CON(x)	(0x100 + (x) * 0x4)
 #define	CRU_CLKGATE_CON(x)	(0x200 + (x) * 0x4)
diff --git a/sys/arm64/rockchip/clk/rk3399_cru.c b/sys/dev/clk/rockchip/rk3399_cru.c
rename from sys/arm64/rockchip/clk/rk3399_cru.c
rename to sys/dev/clk/rockchip/rk3399_cru.c
--- a/sys/arm64/rockchip/clk/rk3399_cru.c
+++ b/sys/dev/clk/rockchip/rk3399_cru.c
@@ -43,9 +43,9 @@
 #include <dev/extres/clk/clk_fixed.h>
 #include <dev/extres/clk/clk_mux.h>
 
-#include <arm64/rockchip/clk/rk_cru.h>
+#include <dev/clk/rockchip/rk_cru.h>
 
-#include <arm64/rockchip/clk/rk3399_cru_dt.h>
+#include <dev/clk/rockchip/rk3399_cru_dt.h>
 
 #define	CRU_CLKSEL_CON(x)	(0x100 + (x) * 0x4)
 #define	CRU_CLKGATE_CON(x)	(0x300 + (x) * 0x4)
diff --git a/sys/arm64/rockchip/clk/rk3399_cru_dt.h b/sys/dev/clk/rockchip/rk3399_cru_dt.h
rename from sys/arm64/rockchip/clk/rk3399_cru_dt.h
rename to sys/dev/clk/rockchip/rk3399_cru_dt.h
diff --git a/sys/arm64/rockchip/clk/rk3399_pmucru.c b/sys/dev/clk/rockchip/rk3399_pmucru.c
rename from sys/arm64/rockchip/clk/rk3399_pmucru.c
rename to sys/dev/clk/rockchip/rk3399_pmucru.c
--- a/sys/arm64/rockchip/clk/rk3399_pmucru.c
+++ b/sys/dev/clk/rockchip/rk3399_pmucru.c
@@ -43,7 +43,7 @@
 #include <dev/extres/clk/clk_fixed.h>
 #include <dev/extres/clk/clk_mux.h>
 
-#include <arm64/rockchip/clk/rk_cru.h>
+#include <dev/clk/rockchip/rk_cru.h>
 
 #define	CRU_CLKSEL_CON(x)	(0x80 + (x) * 0x4)
 #define	CRU_CLKGATE_CON(x)	(0x100 + (x) * 0x4)
diff --git a/sys/arm64/rockchip/clk/rk3568_cru.c b/sys/dev/clk/rockchip/rk3568_cru.c
rename from sys/arm64/rockchip/clk/rk3568_cru.c
rename to sys/dev/clk/rockchip/rk3568_cru.c
--- a/sys/arm64/rockchip/clk/rk3568_cru.c
+++ b/sys/dev/clk/rockchip/rk3568_cru.c
@@ -43,7 +43,7 @@
 #include <dev/extres/clk/clk_fixed.h>
 #include <dev/extres/clk/clk_mux.h>
 
-#include <arm64/rockchip/clk/rk_cru.h>
+#include <dev/clk/rockchip/rk_cru.h>
 #include <contrib/device-tree/include/dt-bindings/clock/rk3568-cru.h>
 
 
diff --git a/sys/arm64/rockchip/clk/rk3568_pmucru.c b/sys/dev/clk/rockchip/rk3568_pmucru.c
rename from sys/arm64/rockchip/clk/rk3568_pmucru.c
rename to sys/dev/clk/rockchip/rk3568_pmucru.c
--- a/sys/arm64/rockchip/clk/rk3568_pmucru.c
+++ b/sys/dev/clk/rockchip/rk3568_pmucru.c
@@ -43,7 +43,7 @@
 #include <dev/extres/clk/clk_fixed.h>
 #include <dev/extres/clk/clk_mux.h>
 
-#include <arm64/rockchip/clk/rk_cru.h>
+#include <dev/clk/rockchip/rk_cru.h>
 #include <contrib/device-tree/include/dt-bindings/clock/rk3568-cru.h>
 
 
diff --git a/sys/arm64/rockchip/clk/rk_clk_armclk.h b/sys/dev/clk/rockchip/rk_clk_armclk.h
rename from sys/arm64/rockchip/clk/rk_clk_armclk.h
rename to sys/dev/clk/rockchip/rk_clk_armclk.h
diff --git a/sys/arm64/rockchip/clk/rk_clk_armclk.c b/sys/dev/clk/rockchip/rk_clk_armclk.c
rename from sys/arm64/rockchip/clk/rk_clk_armclk.c
rename to sys/dev/clk/rockchip/rk_clk_armclk.c
--- a/sys/arm64/rockchip/clk/rk_clk_armclk.c
+++ b/sys/dev/clk/rockchip/rk_clk_armclk.c
@@ -31,7 +31,7 @@
 
 #include <dev/extres/clk/clk.h>
 
-#include <arm64/rockchip/clk/rk_clk_armclk.h>
+#include <dev/clk/rockchip/rk_clk_armclk.h>
 
 #include "clkdev_if.h"
 
diff --git a/sys/arm64/rockchip/clk/rk_clk_composite.h b/sys/dev/clk/rockchip/rk_clk_composite.h
rename from sys/arm64/rockchip/clk/rk_clk_composite.h
rename to sys/dev/clk/rockchip/rk_clk_composite.h
diff --git a/sys/arm64/rockchip/clk/rk_clk_composite.c b/sys/dev/clk/rockchip/rk_clk_composite.c
rename from sys/arm64/rockchip/clk/rk_clk_composite.c
rename to sys/dev/clk/rockchip/rk_clk_composite.c
--- a/sys/arm64/rockchip/clk/rk_clk_composite.c
+++ b/sys/dev/clk/rockchip/rk_clk_composite.c
@@ -32,7 +32,7 @@
 #include <dev/extres/clk/clk.h>
 #include <dev/extres/syscon/syscon.h>
 
-#include <arm64/rockchip/clk/rk_clk_composite.h>
+#include <dev/clk/rockchip/rk_clk_composite.h>
 
 #include "clkdev_if.h"
 #include "syscon_if.h"
diff --git a/sys/arm64/rockchip/clk/rk_clk_fract.h b/sys/dev/clk/rockchip/rk_clk_fract.h
rename from sys/arm64/rockchip/clk/rk_clk_fract.h
rename to sys/dev/clk/rockchip/rk_clk_fract.h
diff --git a/sys/arm64/rockchip/clk/rk_clk_fract.c b/sys/dev/clk/rockchip/rk_clk_fract.c
rename from sys/arm64/rockchip/clk/rk_clk_fract.c
rename to sys/dev/clk/rockchip/rk_clk_fract.c
--- a/sys/arm64/rockchip/clk/rk_clk_fract.c
+++ b/sys/dev/clk/rockchip/rk_clk_fract.c
@@ -31,7 +31,7 @@
 
 #include <dev/extres/clk/clk.h>
 
-#include <arm64/rockchip/clk/rk_clk_fract.h>
+#include <dev/clk/rockchip/rk_clk_fract.h>
 
 #include "clkdev_if.h"
 
diff --git a/sys/arm64/rockchip/clk/rk_clk_gate.h b/sys/dev/clk/rockchip/rk_clk_gate.h
rename from sys/arm64/rockchip/clk/rk_clk_gate.h
rename to sys/dev/clk/rockchip/rk_clk_gate.h
diff --git a/sys/arm64/rockchip/clk/rk_clk_gate.c b/sys/dev/clk/rockchip/rk_clk_gate.c
rename from sys/arm64/rockchip/clk/rk_clk_gate.c
rename to sys/dev/clk/rockchip/rk_clk_gate.c
--- a/sys/arm64/rockchip/clk/rk_clk_gate.c
+++ b/sys/dev/clk/rockchip/rk_clk_gate.c
@@ -32,7 +32,7 @@
 
 #include <dev/extres/clk/clk.h>
 
-#include <arm64/rockchip/clk/rk_clk_gate.h>
+#include <dev/clk/rockchip/rk_clk_gate.h>
 
 #include "clkdev_if.h"
 
diff --git a/sys/arm64/rockchip/clk/rk_clk_mux.h b/sys/dev/clk/rockchip/rk_clk_mux.h
rename from sys/arm64/rockchip/clk/rk_clk_mux.h
rename to sys/dev/clk/rockchip/rk_clk_mux.h
diff --git a/sys/arm64/rockchip/clk/rk_clk_mux.c b/sys/dev/clk/rockchip/rk_clk_mux.c
rename from sys/arm64/rockchip/clk/rk_clk_mux.c
rename to sys/dev/clk/rockchip/rk_clk_mux.c
--- a/sys/arm64/rockchip/clk/rk_clk_mux.c
+++ b/sys/dev/clk/rockchip/rk_clk_mux.c
@@ -37,8 +37,8 @@
 #include <dev/extres/clk/clk.h>
 #include <dev/extres/syscon/syscon.h>
 
-#include <arm64/rockchip/clk/rk_cru.h>
-#include <arm64/rockchip/clk/rk_clk_mux.h>
+#include <dev/clk/rockchip/rk_cru.h>
+#include <dev/clk/rockchip/rk_clk_mux.h>
 
 #include "clkdev_if.h"
 #include "syscon_if.h"
diff --git a/sys/arm64/rockchip/clk/rk_clk_pll.h b/sys/dev/clk/rockchip/rk_clk_pll.h
rename from sys/arm64/rockchip/clk/rk_clk_pll.h
rename to sys/dev/clk/rockchip/rk_clk_pll.h
diff --git a/sys/arm64/rockchip/clk/rk_clk_pll.c b/sys/dev/clk/rockchip/rk_clk_pll.c
rename from sys/arm64/rockchip/clk/rk_clk_pll.c
rename to sys/dev/clk/rockchip/rk_clk_pll.c
--- a/sys/arm64/rockchip/clk/rk_clk_pll.c
+++ b/sys/dev/clk/rockchip/rk_clk_pll.c
@@ -31,7 +31,7 @@
 
 #include <dev/extres/clk/clk.h>
 
-#include <arm64/rockchip/clk/rk_clk_pll.h>
+#include <dev/clk/rockchip/rk_clk_pll.h>
 
 #include "clkdev_if.h"
 
diff --git a/sys/arm64/rockchip/clk/rk_cru.h b/sys/dev/clk/rockchip/rk_cru.h
rename from sys/arm64/rockchip/clk/rk_cru.h
rename to sys/dev/clk/rockchip/rk_cru.h
--- a/sys/arm64/rockchip/clk/rk_cru.h
+++ b/sys/dev/clk/rockchip/rk_cru.h
@@ -34,12 +34,12 @@
 #include <dev/extres/clk/clk_fixed.h>
 #include <dev/extres/clk/clk_link.h>
 
-#include <arm64/rockchip/clk/rk_clk_armclk.h>
-#include <arm64/rockchip/clk/rk_clk_composite.h>
-#include <arm64/rockchip/clk/rk_clk_fract.h>
-#include <arm64/rockchip/clk/rk_clk_gate.h>
-#include <arm64/rockchip/clk/rk_clk_mux.h>
-#include <arm64/rockchip/clk/rk_clk_pll.h>
+#include <dev/clk/rockchip/rk_clk_armclk.h>
+#include <dev/clk/rockchip/rk_clk_composite.h>
+#include <dev/clk/rockchip/rk_clk_fract.h>
+#include <dev/clk/rockchip/rk_clk_gate.h>
+#include <dev/clk/rockchip/rk_clk_mux.h>
+#include <dev/clk/rockchip/rk_clk_pll.h>
 
 /* Macro for defining various types of clocks. */
 
diff --git a/sys/arm64/rockchip/clk/rk_cru.c b/sys/dev/clk/rockchip/rk_cru.c
rename from sys/arm64/rockchip/clk/rk_cru.c
rename to sys/dev/clk/rockchip/rk_cru.c
--- a/sys/arm64/rockchip/clk/rk_cru.c
+++ b/sys/dev/clk/rockchip/rk_cru.c
@@ -50,11 +50,11 @@
 #include <dev/extres/clk/clk_link.h>
 #include <dev/extres/hwreset/hwreset.h>
 
-#include <arm64/rockchip/clk/rk_clk_composite.h>
-#include <arm64/rockchip/clk/rk_clk_gate.h>
-#include <arm64/rockchip/clk/rk_clk_mux.h>
-#include <arm64/rockchip/clk/rk_clk_pll.h>
-#include <arm64/rockchip/clk/rk_cru.h>
+#include <dev/clk/rockchip/rk_clk_composite.h>
+#include <dev/clk/rockchip/rk_clk_gate.h>
+#include <dev/clk/rockchip/rk_clk_mux.h>
+#include <dev/clk/rockchip/rk_clk_pll.h>
+#include <dev/clk/rockchip/rk_cru.h>
 
 #include "clkdev_if.h"
 #include "hwreset_if.h"