Date: Wed, 10 Jan 2024 18:21:04 GMT From: Emmanuel Vadot <manu@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: e37e8677fe55 - main - clk: Move allwinner driver into the common directory Message-ID: <202401101821.40AIL4V8052879@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=e37e8677fe55ddd0685c764e17ac58707787758a commit e37e8677fe55ddd0685c764e17ac58707787758a Author: Emmanuel Vadot <manu@FreeBSD.org> AuthorDate: 2023-12-25 19:01:52 +0000 Commit: Emmanuel Vadot <manu@FreeBSD.org> CommitDate: 2024-01-10 18:20:20 +0000 clk: Move allwinner driver into the common directory No need to keep it under sys/arm/allwinner/clkng It's easier to find which controller we support by looking under one directory. It will also be shared with Allwinner RiscV SoC. Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D43188 --- sys/arm/allwinner/a10/files.a10 | 2 +- sys/arm/allwinner/a13/files.a13 | 2 +- sys/arm/allwinner/a20/files.a20 | 2 +- sys/arm/allwinner/a31/files.a31 | 2 +- sys/arm/allwinner/a83t/files.a83t | 4 +-- sys/arm/allwinner/files.allwinner | 22 ++++++++-------- sys/arm/allwinner/h3/files.h3 | 4 +-- sys/conf/files.arm64 | 30 +++++++++++----------- sys/{arm => dev/clk}/allwinner/aw_ccu.c | 0 .../clkng => dev/clk/allwinner}/aw_ccung.c | 4 +-- .../clkng => dev/clk/allwinner}/aw_ccung.h | 18 ++++++------- .../allwinner/clkng => dev/clk/allwinner}/aw_clk.h | 0 .../clkng => dev/clk/allwinner}/aw_clk_frac.c | 4 +-- .../clkng => dev/clk/allwinner}/aw_clk_frac.h | 0 .../clkng => dev/clk/allwinner}/aw_clk_m.c | 4 +-- .../clkng => dev/clk/allwinner}/aw_clk_m.h | 0 .../clkng => dev/clk/allwinner}/aw_clk_mipi.c | 4 +-- .../clkng => dev/clk/allwinner}/aw_clk_mipi.h | 0 .../clkng => dev/clk/allwinner}/aw_clk_nkmp.c | 4 +-- .../clkng => dev/clk/allwinner}/aw_clk_nkmp.h | 2 +- .../clkng => dev/clk/allwinner}/aw_clk_nm.c | 4 +-- .../clkng => dev/clk/allwinner}/aw_clk_nm.h | 0 .../clkng => dev/clk/allwinner}/aw_clk_nmm.c | 4 +-- .../clkng => dev/clk/allwinner}/aw_clk_nmm.h | 0 .../clkng => dev/clk/allwinner}/aw_clk_np.c | 4 +-- .../clkng => dev/clk/allwinner}/aw_clk_np.h | 0 .../clk/allwinner}/aw_clk_prediv_mux.c | 4 +-- .../clk/allwinner}/aw_clk_prediv_mux.h | 2 +- .../clkng => dev/clk/allwinner}/ccu_a10.c | 2 +- .../clkng => dev/clk/allwinner}/ccu_a13.c | 2 +- .../clkng => dev/clk/allwinner}/ccu_a31.c | 2 +- .../clkng => dev/clk/allwinner}/ccu_a64.c | 2 +- .../clkng => dev/clk/allwinner}/ccu_a83t.c | 2 +- .../clkng => dev/clk/allwinner}/ccu_de2.c | 2 +- .../allwinner/clkng => dev/clk/allwinner}/ccu_h3.c | 2 +- .../allwinner/clkng => dev/clk/allwinner}/ccu_h6.c | 2 +- .../clkng => dev/clk/allwinner}/ccu_h6_r.c | 2 +- .../clkng => dev/clk/allwinner}/ccu_sun8i_r.c | 2 +- 38 files changed, 73 insertions(+), 73 deletions(-) diff --git a/sys/arm/allwinner/a10/files.a10 b/sys/arm/allwinner/a10/files.a10 index 46fbb208f998..f21b937b1b45 100644 --- 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 index 6bf013e96b42..ec248227e058 100644 --- 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 index f708638ff294..663047867e45 100644 --- 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 index 69bf5514b0e7..9b3ac550b6fa 100644 --- 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 index f7c47185279c..3a641f12fa5e 100644 --- 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 index a136b2e050ac..ae5a7bb7403d 100644 --- a/sys/arm/allwinner/files.allwinner +++ b/sys/arm/allwinner/files.allwinner @@ -33,16 +33,16 @@ arm/allwinner/aw_thermal.c optional aw_thermal 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 index f4c90e5e9ed4..89c73165ff1a 100644 --- 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 index db5ef64eb583..00a16553e6d6 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -456,21 +456,21 @@ arm/allwinner/axp81x.c optional axp81x fdt 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 similarity index 100% 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.c b/sys/dev/clk/allwinner/aw_ccung.c similarity index 99% rename from sys/arm/allwinner/clkng/aw_ccung.c rename to sys/dev/clk/allwinner/aw_ccung.c index b37719fa7770..2a6cbd8b9a20 100644 --- 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_ccung.h b/sys/dev/clk/allwinner/aw_ccung.h similarity index 87% rename from sys/arm/allwinner/clkng/aw_ccung.h rename to sys/dev/clk/allwinner/aw_ccung.h index 5dbcb729da40..61d99fc3d50f 100644 --- 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_clk.h b/sys/dev/clk/allwinner/aw_clk.h similarity index 100% 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.c b/sys/dev/clk/allwinner/aw_clk_frac.c similarity index 99% rename from sys/arm/allwinner/clkng/aw_clk_frac.c rename to sys/dev/clk/allwinner/aw_clk_frac.c index 506ba0fa177b..696f6c2ebfbf 100644 --- 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_frac.h b/sys/dev/clk/allwinner/aw_clk_frac.h similarity index 100% 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_m.c b/sys/dev/clk/allwinner/aw_clk_m.c similarity index 98% rename from sys/arm/allwinner/clkng/aw_clk_m.c rename to sys/dev/clk/allwinner/aw_clk_m.c index 90a347b1af86..d57434617d23 100644 --- 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_m.h b/sys/dev/clk/allwinner/aw_clk_m.h similarity index 100% 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_mipi.c b/sys/dev/clk/allwinner/aw_clk_mipi.c similarity index 98% rename from sys/arm/allwinner/clkng/aw_clk_mipi.c rename to sys/dev/clk/allwinner/aw_clk_mipi.c index 89a51b859eb3..e57b5347994a 100644 --- 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_mipi.h b/sys/dev/clk/allwinner/aw_clk_mipi.h similarity index 100% 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_nkmp.c b/sys/dev/clk/allwinner/aw_clk_nkmp.c similarity index 99% rename from sys/arm/allwinner/clkng/aw_clk_nkmp.c rename to sys/dev/clk/allwinner/aw_clk_nkmp.c index 963787a4bd94..73bf6a2fafe3 100644 --- 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_nkmp.h b/sys/dev/clk/allwinner/aw_clk_nkmp.h similarity index 97% rename from sys/arm/allwinner/clkng/aw_clk_nkmp.h rename to sys/dev/clk/allwinner/aw_clk_nkmp.h index 2c6986c8d722..f6d75cd3737a 100644 --- 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_nm.c b/sys/dev/clk/allwinner/aw_clk_nm.c similarity index 99% rename from sys/arm/allwinner/clkng/aw_clk_nm.c rename to sys/dev/clk/allwinner/aw_clk_nm.c index 4419b94d2c42..5692ce2c8b99 100644 --- 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_nm.h b/sys/dev/clk/allwinner/aw_clk_nm.h similarity index 100% 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_nmm.c b/sys/dev/clk/allwinner/aw_clk_nmm.c similarity index 98% rename from sys/arm/allwinner/clkng/aw_clk_nmm.c rename to sys/dev/clk/allwinner/aw_clk_nmm.c index 3fff86042d31..754c313271cb 100644 --- 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_nmm.h b/sys/dev/clk/allwinner/aw_clk_nmm.h similarity index 100% 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_np.c b/sys/dev/clk/allwinner/aw_clk_np.c similarity index 98% rename from sys/arm/allwinner/clkng/aw_clk_np.c rename to sys/dev/clk/allwinner/aw_clk_np.c index e23fb3ec8733..a06b0fa16796 100644 --- 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_np.h b/sys/dev/clk/allwinner/aw_clk_np.h similarity index 100% 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_prediv_mux.c b/sys/dev/clk/allwinner/aw_clk_prediv_mux.c similarity index 98% rename from sys/arm/allwinner/clkng/aw_clk_prediv_mux.c rename to sys/dev/clk/allwinner/aw_clk_prediv_mux.c index 17e580c7471a..3a64726ca776 100644 --- 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/aw_clk_prediv_mux.h b/sys/dev/clk/allwinner/aw_clk_prediv_mux.h similarity index 97% rename from sys/arm/allwinner/clkng/aw_clk_prediv_mux.h rename to sys/dev/clk/allwinner/aw_clk_prediv_mux.h index b95d8e281978..2de2f01a654e 100644 --- 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/ccu_a10.c b/sys/dev/clk/allwinner/ccu_a10.c similarity index 99% rename from sys/arm/allwinner/clkng/ccu_a10.c rename to sys/dev/clk/allwinner/ccu_a10.c index a96d3d305414..0a14583a9f04 100644 --- 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 similarity index 99% rename from sys/arm/allwinner/clkng/ccu_a13.c rename to sys/dev/clk/allwinner/ccu_a13.c index c485b2bc72c4..2bddcd382040 100644 --- 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 similarity index 99% rename from sys/arm/allwinner/clkng/ccu_a31.c rename to sys/dev/clk/allwinner/ccu_a31.c index 633838ee348a..d6db0ab03fe7 100644 --- 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 similarity index 99% rename from sys/arm/allwinner/clkng/ccu_a64.c rename to sys/dev/clk/allwinner/ccu_a64.c index 70e2e98da9f2..73cbe147c398 100644 --- 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 similarity index 99% rename from sys/arm/allwinner/clkng/ccu_a83t.c rename to sys/dev/clk/allwinner/ccu_a83t.c index 35561b04f602..1cb49d99ccbc 100644 --- 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 similarity index 99% rename from sys/arm/allwinner/clkng/ccu_de2.c rename to sys/dev/clk/allwinner/ccu_de2.c index d50aaf5d5e32..de490a88bafa 100644 --- 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 similarity index 99% rename from sys/arm/allwinner/clkng/ccu_h3.c rename to sys/dev/clk/allwinner/ccu_h3.c index 7d2a1be6a21d..fb6e26542b8a 100644 --- 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 similarity index 99% rename from sys/arm/allwinner/clkng/ccu_h6.c rename to sys/dev/clk/allwinner/ccu_h6.c index 9cdbe935f2cf..0a378d9c3980 100644 --- 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 similarity index 99% rename from sys/arm/allwinner/clkng/ccu_h6_r.c rename to sys/dev/clk/allwinner/ccu_h6_r.c index 070cbfb38f12..7d87b3082682 100644 --- 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 similarity index 99% rename from sys/arm/allwinner/clkng/ccu_sun8i_r.c rename to sys/dev/clk/allwinner/ccu_sun8i_r.c index 4e6289c1bfba..e970dd1de95c 100644 --- 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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401101821.40AIL4V8052879>