clk: Move rockchip driver into the common directory

No need to keep it under sys/arm64/rockchip/clk
It's easier to find which controller we support by looking under one directory.

Sponsored by:   Beckhoff Automation GmbH & Co. KG
Differential Revision:	https://reviews.freebsd.org/D43189

23 files changed, 45 insertions, 45 deletions

diff --git a/sys/arm/rockchip/files.rk32xx b/sys/arm/rockchip/files.rk32xx
index 5393b7784108..5f15a22cc334 100644
--- a/sys/arm/rockchip/files.rk32xx
+++ b/sys/arm/rockchip/files.rk32xx
@@ -12,14 +12,14 @@ dev/pwm/controller/rockchip/rk_pwm.c	standard
 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
index 00a16553e6d6..6c761b37f191 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -687,18 +687,18 @@ arm64/rockchip/rk_pcie.c			optional fdt pci soc_rockchip_rk3399
 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
index b7b106dc849a..354a293ff7f2 100644
--- 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
index 4c8562240a12..6a9583250516 100644
--- 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
index d1b066b50c47..45d6592ceb73 100644
--- 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
index f652f45129ca..f652f45129ca 100644
--- a/sys/arm64/rockchip/clk/rk3399_cru_dt.h
+++ b/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
index f95afbad11ee..706bf444aaf2 100644
--- 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
index f5992323c3bd..4d7f569a3de2 100644
--- 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
index 9805f743346c..0756dc5392bf 100644
--- 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.c b/sys/dev/clk/rockchip/rk_clk_armclk.c
index 1caae0505444..3d462e74d92b 100644
--- 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_armclk.h b/sys/dev/clk/rockchip/rk_clk_armclk.h
index 0c7f91d21d60..0c7f91d21d60 100644
--- a/sys/arm64/rockchip/clk/rk_clk_armclk.h
+++ b/sys/dev/clk/rockchip/rk_clk_armclk.h
diff --git a/sys/arm64/rockchip/clk/rk_clk_composite.c b/sys/dev/clk/rockchip/rk_clk_composite.c
index 791668ff2e9c..a37ddcd6ecb2 100644
--- 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_composite.h b/sys/dev/clk/rockchip/rk_clk_composite.h
index 22a052da22c2..22a052da22c2 100644
--- a/sys/arm64/rockchip/clk/rk_clk_composite.h
+++ b/sys/dev/clk/rockchip/rk_clk_composite.h
diff --git a/sys/arm64/rockchip/clk/rk_clk_fract.c b/sys/dev/clk/rockchip/rk_clk_fract.c
index f32585b43c21..f559e9c71852 100644
--- 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_fract.h b/sys/dev/clk/rockchip/rk_clk_fract.h
index 6923f162f265..6923f162f265 100644
--- a/sys/arm64/rockchip/clk/rk_clk_fract.h
+++ b/sys/dev/clk/rockchip/rk_clk_fract.h
diff --git a/sys/arm64/rockchip/clk/rk_clk_gate.c b/sys/dev/clk/rockchip/rk_clk_gate.c
index d82035d4e624..053236d043e6 100644
--- 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_gate.h b/sys/dev/clk/rockchip/rk_clk_gate.h
index add5cd22aa89..add5cd22aa89 100644
--- a/sys/arm64/rockchip/clk/rk_clk_gate.h
+++ b/sys/dev/clk/rockchip/rk_clk_gate.h
diff --git a/sys/arm64/rockchip/clk/rk_clk_mux.c b/sys/dev/clk/rockchip/rk_clk_mux.c
index 3e9dbe542582..e42d5819378a 100644
--- 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_mux.h b/sys/dev/clk/rockchip/rk_clk_mux.h
index b32e0687fac3..b32e0687fac3 100644
--- a/sys/arm64/rockchip/clk/rk_clk_mux.h
+++ b/sys/dev/clk/rockchip/rk_clk_mux.h
diff --git a/sys/arm64/rockchip/clk/rk_clk_pll.c b/sys/dev/clk/rockchip/rk_clk_pll.c
index 7df0e1491c9d..f89fdeb0c341 100644
--- 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_clk_pll.h b/sys/dev/clk/rockchip/rk_clk_pll.h
index 2d0c0bb67fdf..2d0c0bb67fdf 100644
--- a/sys/arm64/rockchip/clk/rk_clk_pll.h
+++ b/sys/dev/clk/rockchip/rk_clk_pll.h
diff --git a/sys/arm64/rockchip/clk/rk_cru.c b/sys/dev/clk/rockchip/rk_cru.c
index b1043fde4507..81760bcd74a1 100644
--- 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"
diff --git a/sys/arm64/rockchip/clk/rk_cru.h b/sys/dev/clk/rockchip/rk_cru.h
index 5d45dc6ab859..3249c8c8f13c 100644
--- 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. */