diff options
Diffstat (limited to 'sys/dev')
134 files changed, 216 insertions, 214 deletions
diff --git a/sys/dev/ahci/ahci_fsl_fdt.c b/sys/dev/ahci/ahci_fsl_fdt.c index 983ef7c77ee9..4a6fbed470f4 100644 --- a/sys/dev/ahci/ahci_fsl_fdt.c +++ b/sys/dev/ahci/ahci_fsl_fdt.c @@ -48,7 +48,7 @@ #include <dev/ahci/ahci.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #define AHCI_FSL_REG_PHY1 0xa8 #define AHCI_FSL_REG_PHY2 0xac diff --git a/sys/dev/cadence/if_cgem.c b/sys/dev/cadence/if_cgem.c index d89e91ad1c5b..9d2b1d71883e 100644 --- a/sys/dev/cadence/if_cgem.c +++ b/sys/dev/cadence/if_cgem.c @@ -75,7 +75,7 @@ #include <dev/mii/miivar.h> #include <dev/mii/mii_fdt.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #if BUS_SPACE_MAXADDR > BUS_SPACE_MAXADDR_32BIT #define CGEM64 diff --git a/sys/dev/clk/allwinner/aw_ccu.c b/sys/dev/clk/allwinner/aw_ccu.c index fc963f7a6485..9ee08f8f2dd1 100644 --- a/sys/dev/clk/allwinner/aw_ccu.c +++ b/sys/dev/clk/allwinner/aw_ccu.c @@ -42,7 +42,7 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include "clkdev_if.h" diff --git a/sys/dev/clk/allwinner/aw_ccung.c b/sys/dev/clk/allwinner/aw_ccung.c index 2a6cbd8b9a20..f446b77b6226 100644 --- a/sys/dev/clk/allwinner/aw_ccung.c +++ b/sys/dev/clk/allwinner/aw_ccung.c @@ -44,8 +44,8 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk.h> -#include <dev/extres/clk/clk_gate.h> +#include <dev/clk/clk.h> +#include <dev/clk/clk_gate.h> #include <dev/extres/hwreset/hwreset.h> diff --git a/sys/dev/clk/allwinner/aw_ccung.h b/sys/dev/clk/allwinner/aw_ccung.h index 61d99fc3d50f..555a8a95e38a 100644 --- a/sys/dev/clk/allwinner/aw_ccung.h +++ b/sys/dev/clk/allwinner/aw_ccung.h @@ -37,9 +37,9 @@ #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> +#include <dev/clk/clk_mux.h> +#include <dev/clk/clk_div.h> +#include <dev/clk/clk_fixed.h> enum aw_ccung_clk_type { AW_CLK_UNDEFINED = 0, diff --git a/sys/dev/clk/allwinner/aw_clk_frac.c b/sys/dev/clk/allwinner/aw_clk_frac.c index 696f6c2ebfbf..57249dafbcc2 100644 --- a/sys/dev/clk/allwinner/aw_clk_frac.c +++ b/sys/dev/clk/allwinner/aw_clk_frac.c @@ -27,7 +27,7 @@ #include <sys/systm.h> #include <sys/bus.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/clk/allwinner/aw_clk.h> #include <dev/clk/allwinner/aw_clk_frac.h> diff --git a/sys/dev/clk/allwinner/aw_clk_frac.h b/sys/dev/clk/allwinner/aw_clk_frac.h index 8ee59bbebcc1..107c04ba3552 100644 --- a/sys/dev/clk/allwinner/aw_clk_frac.h +++ b/sys/dev/clk/allwinner/aw_clk_frac.h @@ -26,7 +26,7 @@ #ifndef __AW_CLK_FRAC_H__ #define __AW_CLK_FRAC_H__ -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> struct aw_clk_frac_def { struct clknode_init_def clkdef; diff --git a/sys/dev/clk/allwinner/aw_clk_m.c b/sys/dev/clk/allwinner/aw_clk_m.c index d57434617d23..5d7dd971cc7a 100644 --- a/sys/dev/clk/allwinner/aw_clk_m.c +++ b/sys/dev/clk/allwinner/aw_clk_m.c @@ -27,7 +27,7 @@ #include <sys/systm.h> #include <sys/bus.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/clk/allwinner/aw_clk.h> #include <dev/clk/allwinner/aw_clk_m.h> diff --git a/sys/dev/clk/allwinner/aw_clk_m.h b/sys/dev/clk/allwinner/aw_clk_m.h index 45a231bfdb37..a2a9b0664662 100644 --- a/sys/dev/clk/allwinner/aw_clk_m.h +++ b/sys/dev/clk/allwinner/aw_clk_m.h @@ -26,7 +26,7 @@ #ifndef __AW_CLK_M_H__ #define __AW_CLK_M_H__ -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> struct aw_clk_m_def { struct clknode_init_def clkdef; diff --git a/sys/dev/clk/allwinner/aw_clk_mipi.c b/sys/dev/clk/allwinner/aw_clk_mipi.c index e57b5347994a..9875e179a277 100644 --- a/sys/dev/clk/allwinner/aw_clk_mipi.c +++ b/sys/dev/clk/allwinner/aw_clk_mipi.c @@ -27,7 +27,7 @@ #include <sys/systm.h> #include <sys/bus.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/clk/allwinner/aw_clk.h> #include <dev/clk/allwinner/aw_clk_mipi.h> diff --git a/sys/dev/clk/allwinner/aw_clk_mipi.h b/sys/dev/clk/allwinner/aw_clk_mipi.h index bc28c0fa685d..81d2bd1bd64c 100644 --- a/sys/dev/clk/allwinner/aw_clk_mipi.h +++ b/sys/dev/clk/allwinner/aw_clk_mipi.h @@ -26,7 +26,7 @@ #ifndef __AW_CLK_MIPI_H__ #define __AW_CLK_MIPI_H__ -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> struct aw_clk_mipi_def { struct clknode_init_def clkdef; diff --git a/sys/dev/clk/allwinner/aw_clk_nkmp.c b/sys/dev/clk/allwinner/aw_clk_nkmp.c index 73bf6a2fafe3..ede89c1d1b8b 100644 --- a/sys/dev/clk/allwinner/aw_clk_nkmp.c +++ b/sys/dev/clk/allwinner/aw_clk_nkmp.c @@ -27,7 +27,7 @@ #include <sys/systm.h> #include <sys/bus.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/clk/allwinner/aw_clk.h> #include <dev/clk/allwinner/aw_clk_nkmp.h> diff --git a/sys/dev/clk/allwinner/aw_clk_nm.c b/sys/dev/clk/allwinner/aw_clk_nm.c index 5692ce2c8b99..cb49adda8597 100644 --- a/sys/dev/clk/allwinner/aw_clk_nm.c +++ b/sys/dev/clk/allwinner/aw_clk_nm.c @@ -27,7 +27,7 @@ #include <sys/systm.h> #include <sys/bus.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/clk/allwinner/aw_clk.h> #include <dev/clk/allwinner/aw_clk_nm.h> diff --git a/sys/dev/clk/allwinner/aw_clk_nm.h b/sys/dev/clk/allwinner/aw_clk_nm.h index 10c37cbf6ec7..7fbdc3c49002 100644 --- a/sys/dev/clk/allwinner/aw_clk_nm.h +++ b/sys/dev/clk/allwinner/aw_clk_nm.h @@ -26,7 +26,7 @@ #ifndef __AW_CLK_NM_H__ #define __AW_CLK_NM_H__ -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> struct aw_clk_nm_def { struct clknode_init_def clkdef; diff --git a/sys/dev/clk/allwinner/aw_clk_nmm.c b/sys/dev/clk/allwinner/aw_clk_nmm.c index 754c313271cb..ac55c5eea182 100644 --- a/sys/dev/clk/allwinner/aw_clk_nmm.c +++ b/sys/dev/clk/allwinner/aw_clk_nmm.c @@ -29,7 +29,7 @@ #include <sys/systm.h> #include <sys/bus.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/clk/allwinner/aw_clk.h> #include <dev/clk/allwinner/aw_clk_nmm.h> diff --git a/sys/dev/clk/allwinner/aw_clk_nmm.h b/sys/dev/clk/allwinner/aw_clk_nmm.h index 7b95ec3e23c8..7100ee72ef4e 100644 --- a/sys/dev/clk/allwinner/aw_clk_nmm.h +++ b/sys/dev/clk/allwinner/aw_clk_nmm.h @@ -28,7 +28,7 @@ #ifndef __AW_CLK_NMM_H__ #define __AW_CLK_NMM_H__ -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> struct aw_clk_nmm_def { struct clknode_init_def clkdef; diff --git a/sys/dev/clk/allwinner/aw_clk_np.c b/sys/dev/clk/allwinner/aw_clk_np.c index a06b0fa16796..bca81eb3e937 100644 --- a/sys/dev/clk/allwinner/aw_clk_np.c +++ b/sys/dev/clk/allwinner/aw_clk_np.c @@ -29,7 +29,7 @@ #include <sys/systm.h> #include <sys/bus.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/clk/allwinner/aw_clk.h> #include <dev/clk/allwinner/aw_clk_np.h> diff --git a/sys/dev/clk/allwinner/aw_clk_np.h b/sys/dev/clk/allwinner/aw_clk_np.h index d91bcd0dbb1f..bffa61cafe1a 100644 --- a/sys/dev/clk/allwinner/aw_clk_np.h +++ b/sys/dev/clk/allwinner/aw_clk_np.h @@ -28,7 +28,7 @@ #ifndef __AW_CLK_NP_H__ #define __AW_CLK_NP_H__ -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> struct aw_clk_np_def { struct clknode_init_def clkdef; diff --git a/sys/dev/clk/allwinner/aw_clk_prediv_mux.c b/sys/dev/clk/allwinner/aw_clk_prediv_mux.c index 3a64726ca776..5bcc06b37c8f 100644 --- a/sys/dev/clk/allwinner/aw_clk_prediv_mux.c +++ b/sys/dev/clk/allwinner/aw_clk_prediv_mux.c @@ -27,7 +27,7 @@ #include <sys/systm.h> #include <sys/bus.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/clk/allwinner/aw_clk.h> #include <dev/clk/allwinner/aw_clk_prediv_mux.h> diff --git a/sys/dev/clk/allwinner/ccu_a10.c b/sys/dev/clk/allwinner/ccu_a10.c index 0a14583a9f04..491cb4b28d3b 100644 --- a/sys/dev/clk/allwinner/ccu_a10.c +++ b/sys/dev/clk/allwinner/ccu_a10.c @@ -38,9 +38,9 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk_div.h> -#include <dev/extres/clk/clk_fixed.h> -#include <dev/extres/clk/clk_mux.h> +#include <dev/clk/clk_div.h> +#include <dev/clk/clk_fixed.h> +#include <dev/clk/clk_mux.h> #include <dev/clk/allwinner/aw_ccung.h> diff --git a/sys/dev/clk/allwinner/ccu_a13.c b/sys/dev/clk/allwinner/ccu_a13.c index 2bddcd382040..76b3b803aec1 100644 --- a/sys/dev/clk/allwinner/ccu_a13.c +++ b/sys/dev/clk/allwinner/ccu_a13.c @@ -38,9 +38,9 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk_div.h> -#include <dev/extres/clk/clk_fixed.h> -#include <dev/extres/clk/clk_mux.h> +#include <dev/clk/clk_div.h> +#include <dev/clk/clk_fixed.h> +#include <dev/clk/clk_mux.h> #include <dev/clk/allwinner/aw_ccung.h> diff --git a/sys/dev/clk/allwinner/ccu_a31.c b/sys/dev/clk/allwinner/ccu_a31.c index d6db0ab03fe7..f2cbd9196682 100644 --- a/sys/dev/clk/allwinner/ccu_a31.c +++ b/sys/dev/clk/allwinner/ccu_a31.c @@ -38,9 +38,9 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk_div.h> -#include <dev/extres/clk/clk_fixed.h> -#include <dev/extres/clk/clk_mux.h> +#include <dev/clk/clk_div.h> +#include <dev/clk/clk_fixed.h> +#include <dev/clk/clk_mux.h> #include <dev/clk/allwinner/aw_ccung.h> diff --git a/sys/dev/clk/allwinner/ccu_a64.c b/sys/dev/clk/allwinner/ccu_a64.c index 73cbe147c398..779b20a19d3e 100644 --- a/sys/dev/clk/allwinner/ccu_a64.c +++ b/sys/dev/clk/allwinner/ccu_a64.c @@ -38,9 +38,9 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk_div.h> -#include <dev/extres/clk/clk_fixed.h> -#include <dev/extres/clk/clk_mux.h> +#include <dev/clk/clk_div.h> +#include <dev/clk/clk_fixed.h> +#include <dev/clk/clk_mux.h> #include <dev/clk/allwinner/aw_ccung.h> diff --git a/sys/dev/clk/allwinner/ccu_a83t.c b/sys/dev/clk/allwinner/ccu_a83t.c index 1cb49d99ccbc..bc94250ba4ac 100644 --- a/sys/dev/clk/allwinner/ccu_a83t.c +++ b/sys/dev/clk/allwinner/ccu_a83t.c @@ -38,9 +38,9 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk_div.h> -#include <dev/extres/clk/clk_fixed.h> -#include <dev/extres/clk/clk_mux.h> +#include <dev/clk/clk_div.h> +#include <dev/clk/clk_fixed.h> +#include <dev/clk/clk_mux.h> #include <dev/clk/allwinner/aw_ccung.h> diff --git a/sys/dev/clk/allwinner/ccu_de2.c b/sys/dev/clk/allwinner/ccu_de2.c index de490a88bafa..4bd29d139c11 100644 --- a/sys/dev/clk/allwinner/ccu_de2.c +++ b/sys/dev/clk/allwinner/ccu_de2.c @@ -42,9 +42,9 @@ #include "opt_soc.h" #endif -#include <dev/extres/clk/clk_div.h> -#include <dev/extres/clk/clk_fixed.h> -#include <dev/extres/clk/clk_mux.h> +#include <dev/clk/clk_div.h> +#include <dev/clk/clk_fixed.h> +#include <dev/clk/clk_mux.h> #include <dev/extres/hwreset/hwreset.h> diff --git a/sys/dev/clk/allwinner/ccu_h3.c b/sys/dev/clk/allwinner/ccu_h3.c index fb6e26542b8a..de538f720d4f 100644 --- a/sys/dev/clk/allwinner/ccu_h3.c +++ b/sys/dev/clk/allwinner/ccu_h3.c @@ -42,9 +42,9 @@ #include <sys/systm.h> #include <sys/bus.h> -#include <dev/extres/clk/clk_div.h> -#include <dev/extres/clk/clk_fixed.h> -#include <dev/extres/clk/clk_mux.h> +#include <dev/clk/clk_div.h> +#include <dev/clk/clk_fixed.h> +#include <dev/clk/clk_mux.h> #if defined(__aarch64__) #include "opt_soc.h" diff --git a/sys/dev/clk/allwinner/ccu_h6.c b/sys/dev/clk/allwinner/ccu_h6.c index 0a378d9c3980..f172d85ab07e 100644 --- a/sys/dev/clk/allwinner/ccu_h6.c +++ b/sys/dev/clk/allwinner/ccu_h6.c @@ -38,9 +38,9 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk_div.h> -#include <dev/extres/clk/clk_fixed.h> -#include <dev/extres/clk/clk_mux.h> +#include <dev/clk/clk_div.h> +#include <dev/clk/clk_fixed.h> +#include <dev/clk/clk_mux.h> #include <dev/clk/allwinner/aw_ccung.h> diff --git a/sys/dev/clk/allwinner/ccu_h6_r.c b/sys/dev/clk/allwinner/ccu_h6_r.c index 7d87b3082682..4ca5e86cc436 100644 --- a/sys/dev/clk/allwinner/ccu_h6_r.c +++ b/sys/dev/clk/allwinner/ccu_h6_r.c @@ -38,9 +38,9 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk_div.h> -#include <dev/extres/clk/clk_fixed.h> -#include <dev/extres/clk/clk_mux.h> +#include <dev/clk/clk_div.h> +#include <dev/clk/clk_fixed.h> +#include <dev/clk/clk_mux.h> #include <dev/clk/allwinner/aw_ccung.h> diff --git a/sys/dev/clk/allwinner/ccu_sun8i_r.c b/sys/dev/clk/allwinner/ccu_sun8i_r.c index e970dd1de95c..0fdbe6a10ec2 100644 --- a/sys/dev/clk/allwinner/ccu_sun8i_r.c +++ b/sys/dev/clk/allwinner/ccu_sun8i_r.c @@ -42,9 +42,9 @@ #include "opt_soc.h" #endif -#include <dev/extres/clk/clk_div.h> -#include <dev/extres/clk/clk_fixed.h> -#include <dev/extres/clk/clk_mux.h> +#include <dev/clk/clk_div.h> +#include <dev/clk/clk_fixed.h> +#include <dev/clk/clk_mux.h> #include <dev/clk/allwinner/aw_ccung.h> diff --git a/sys/dev/extres/clk/clk.c b/sys/dev/clk/clk.c index c569b05b6189..52015d4e2905 100644 --- a/sys/dev/extres/clk/clk.c +++ b/sys/dev/clk/clk.c @@ -46,7 +46,7 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> #endif -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> SYSCTL_NODE(_hw, OID_AUTO, clock, CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "Clocks"); diff --git a/sys/dev/extres/clk/clk.h b/sys/dev/clk/clk.h index caface7bc765..4702e8741a67 100644 --- a/sys/dev/extres/clk/clk.h +++ b/sys/dev/clk/clk.h @@ -24,8 +24,9 @@ * SUCH DAMAGE. */ -#ifndef _DEV_EXTRES_CLK_H_ -#define _DEV_EXTRES_CLK_H_ +#ifndef _DEV_CLK_H_ +#define _DEV_CLK_H_ + #include "opt_platform.h" #include <sys/kobj.h> @@ -152,4 +153,4 @@ int clk_parse_ofw_out_names(device_t dev, phandle_t node, int clk_parse_ofw_clk_name(device_t dev, phandle_t node, const char **name); #endif -#endif /* _DEV_EXTRES_CLK_H_ */ +#endif /* _DEV_CLK_H_ */ diff --git a/sys/dev/extres/clk/clk_bus.c b/sys/dev/clk/clk_bus.c index 622ff1fbf01d..622ff1fbf01d 100644 --- a/sys/dev/extres/clk/clk_bus.c +++ b/sys/dev/clk/clk_bus.c diff --git a/sys/dev/extres/clk/clk_div.c b/sys/dev/clk/clk_div.c index ab65e2bae2d2..b43136b7b4f0 100644 --- a/sys/dev/extres/clk/clk_div.c +++ b/sys/dev/clk/clk_div.c @@ -32,7 +32,7 @@ #include <machine/bus.h> -#include <dev/extres/clk/clk_div.h> +#include <dev/clk/clk_div.h> #include "clkdev_if.h" diff --git a/sys/dev/extres/clk/clk_div.h b/sys/dev/clk/clk_div.h index 7db3f5885b1f..328fc40fec8b 100644 --- a/sys/dev/extres/clk/clk_div.h +++ b/sys/dev/clk/clk_div.h @@ -24,10 +24,10 @@ * SUCH DAMAGE. */ -#ifndef _DEV_EXTRES_CLK_DIV_H_ -#define _DEV_EXTRES_CLK_DIV_H_ +#ifndef _DEV_CLK_DIV_H_ +#define _DEV_CLK_DIV_H_ -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #define CLK_DIV_ZERO_BASED 0x0001 /* Zero based divider. */ #define CLK_DIV_WITH_TABLE 0x0002 /* Table to lookup the real value */ @@ -50,4 +50,4 @@ struct clk_div_def { int clknode_div_register(struct clkdom *clkdom, struct clk_div_def *clkdef); -#endif /*_DEV_EXTRES_CLK_DIV_H_*/ +#endif /*_DEV_CLK_DIV_H_*/ diff --git a/sys/dev/extres/clk/clk_fixed.c b/sys/dev/clk/clk_fixed.c index e5ca6b31d000..647ca6a05568 100644 --- a/sys/dev/extres/clk/clk_fixed.c +++ b/sys/dev/clk/clk_fixed.c @@ -44,7 +44,7 @@ #include <dev/ofw/ofw_bus_subr.h> #endif -#include <dev/extres/clk/clk_fixed.h> +#include <dev/clk/clk_fixed.h> #define CLK_TYPE_FIXED 1 #define CLK_TYPE_FIXED_FACTOR 2 diff --git a/sys/dev/extres/clk/clk_fixed.h b/sys/dev/clk/clk_fixed.h index 103ca69126ba..56f0fcbbb449 100644 --- a/sys/dev/extres/clk/clk_fixed.h +++ b/sys/dev/clk/clk_fixed.h @@ -24,10 +24,10 @@ * SUCH DAMAGE. */ -#ifndef _DEV_EXTRES_CLK_FIXED_H_ -#define _DEV_EXTRES_CLK_FIXED_H_ +#ifndef _DEV_CLK_FIXED_H_ +#define _DEV_CLK_FIXED_H_ -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> /* * A fixed clock can represent several different real-world objects, including @@ -47,4 +47,4 @@ struct clk_fixed_def { int clknode_fixed_register(struct clkdom *clkdom, struct clk_fixed_def *clkdef); -#endif /*_DEV_EXTRES_CLK_FIXED_H_*/ +#endif /*_DEV_CLK_FIXED_H_*/ diff --git a/sys/dev/extres/clk/clk_gate.c b/sys/dev/clk/clk_gate.c index 1ed9987c0b33..59c65d0015fe 100644 --- a/sys/dev/extres/clk/clk_gate.c +++ b/sys/dev/clk/clk_gate.c @@ -32,7 +32,7 @@ #include <machine/bus.h> -#include <dev/extres/clk/clk_gate.h> +#include <dev/clk/clk_gate.h> #include "clkdev_if.h" diff --git a/sys/dev/extres/clk/clk_gate.h b/sys/dev/clk/clk_gate.h index 2e9a5969d3e6..ea8de7380227 100644 --- a/sys/dev/extres/clk/clk_gate.h +++ b/sys/dev/clk/clk_gate.h @@ -24,10 +24,10 @@ * SUCH DAMAGE. */ -#ifndef _DEV_EXTRES_CLK_GATE_H_ -#define _DEV_EXTRES_CLK_GATE_H_ +#ifndef _DEV_CLK_GATE_H_ +#define _DEV_CLK_GATE_H_ -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> struct clk_gate_def { struct clknode_init_def clkdef; @@ -41,4 +41,4 @@ struct clk_gate_def { int clknode_gate_register(struct clkdom *clkdom, struct clk_gate_def *clkdef); -#endif /* _DEV_EXTRES_CLK_GATE_H_ */ +#endif /* _DEV_CLK_GATE_H_ */ diff --git a/sys/dev/extres/clk/clk_link.c b/sys/dev/clk/clk_link.c index dc82a093bab9..14debc48cdac 100644 --- a/sys/dev/extres/clk/clk_link.c +++ b/sys/dev/clk/clk_link.c @@ -37,7 +37,7 @@ #include <machine/bus.h> -#include <dev/extres/clk/clk_link.h> +#include <dev/clk/clk_link.h> static int clknode_link_init(struct clknode *clk, device_t dev); static int clknode_link_recalc(struct clknode *clk, uint64_t *freq); diff --git a/sys/dev/extres/clk/clk_link.h b/sys/dev/clk/clk_link.h index 1591e8166794..9610f842abcf 100644 --- a/sys/dev/extres/clk/clk_link.h +++ b/sys/dev/clk/clk_link.h @@ -24,10 +24,10 @@ * SUCH DAMAGE. */ -#ifndef _DEV_EXTRES_CLK_LINK_H_ -#define _DEV_EXTRES_CLK_LINK_H_ +#ifndef _DEV_CLK_LINK_H_ +#define _DEV_CLK_LINK_H_ -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> /* * A linked clock is used as placeholder for not yet available clock. @@ -42,4 +42,4 @@ struct clk_link_def { int clknode_link_register(struct clkdom *clkdom, struct clk_link_def *clkdef); -#endif /*_DEV_EXTRES_CLK_LINK_H_*/ +#endif /*_DEV_CLK_LINK_H_*/ diff --git a/sys/dev/extres/clk/clk_mux.c b/sys/dev/clk/clk_mux.c index bfdf2ba028f0..279adddae42c 100644 --- a/sys/dev/extres/clk/clk_mux.c +++ b/sys/dev/clk/clk_mux.c @@ -32,7 +32,7 @@ #include <machine/bus.h> -#include <dev/extres/clk/clk_mux.h> +#include <dev/clk/clk_mux.h> #include "clkdev_if.h" diff --git a/sys/dev/extres/clk/clk_mux.h b/sys/dev/clk/clk_mux.h index ff5bbaa54b20..4bfa2c829b4a 100644 --- a/sys/dev/extres/clk/clk_mux.h +++ b/sys/dev/clk/clk_mux.h @@ -23,10 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -#ifndef _DEV_EXTRESF_CLK_MUX_H_ -#define _DEV_EXTRESF_CLK_MUX_H_ -#include <dev/extres/clk/clk.h> +#ifndef _DEV_CLK_MUX_H_ +#define _DEV_CLK_MUX_H_ + +#include <dev/clk/clk.h> struct clk_mux_def { struct clknode_init_def clkdef; @@ -38,4 +39,4 @@ struct clk_mux_def { int clknode_mux_register(struct clkdom *clkdom, struct clk_mux_def *clkdef); -#endif /* _DEV_EXTRESF_CLK_MUX_H_ */ +#endif /* _DEV_CLK_MUX_H_ */ diff --git a/sys/dev/extres/clk/clkdev_if.m b/sys/dev/clk/clkdev_if.m index 8b75cfb9003b..8b75cfb9003b 100644 --- a/sys/dev/extres/clk/clkdev_if.m +++ b/sys/dev/clk/clkdev_if.m diff --git a/sys/dev/extres/clk/clknode_if.m b/sys/dev/clk/clknode_if.m index 69cb514e4deb..69cb514e4deb 100644 --- a/sys/dev/extres/clk/clknode_if.m +++ b/sys/dev/clk/clknode_if.m diff --git a/sys/dev/clk/rockchip/rk3288_cru.c b/sys/dev/clk/rockchip/rk3288_cru.c index 354a293ff7f2..9c8ff18ce01c 100644 --- a/sys/dev/clk/rockchip/rk3288_cru.c +++ b/sys/dev/clk/rockchip/rk3288_cru.c @@ -39,10 +39,10 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk.h> -#include <dev/extres/clk/clk_div.h> -#include <dev/extres/clk/clk_fixed.h> -#include <dev/extres/clk/clk_mux.h> +#include <dev/clk/clk.h> +#include <dev/clk/clk_div.h> +#include <dev/clk/clk_fixed.h> +#include <dev/clk/clk_mux.h> #include <dev/clk/rockchip/rk_cru.h> diff --git a/sys/dev/clk/rockchip/rk3328_cru.c b/sys/dev/clk/rockchip/rk3328_cru.c index 6a9583250516..0edd562ddd08 100644 --- a/sys/dev/clk/rockchip/rk3328_cru.c +++ b/sys/dev/clk/rockchip/rk3328_cru.c @@ -38,9 +38,9 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk_div.h> -#include <dev/extres/clk/clk_fixed.h> -#include <dev/extres/clk/clk_mux.h> +#include <dev/clk/clk_div.h> +#include <dev/clk/clk_fixed.h> +#include <dev/clk/clk_mux.h> #include <dev/clk/rockchip/rk_cru.h> diff --git a/sys/dev/clk/rockchip/rk3399_cru.c b/sys/dev/clk/rockchip/rk3399_cru.c index 45d6592ceb73..c4b2dc0910d8 100644 --- a/sys/dev/clk/rockchip/rk3399_cru.c +++ b/sys/dev/clk/rockchip/rk3399_cru.c @@ -39,9 +39,9 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk_div.h> -#include <dev/extres/clk/clk_fixed.h> -#include <dev/extres/clk/clk_mux.h> +#include <dev/clk/clk_div.h> +#include <dev/clk/clk_fixed.h> +#include <dev/clk/clk_mux.h> #include <dev/clk/rockchip/rk_cru.h> diff --git a/sys/dev/clk/rockchip/rk3399_pmucru.c b/sys/dev/clk/rockchip/rk3399_pmucru.c index 706bf444aaf2..2239722849c0 100644 --- a/sys/dev/clk/rockchip/rk3399_pmucru.c +++ b/sys/dev/clk/rockchip/rk3399_pmucru.c @@ -39,9 +39,9 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk_div.h> -#include <dev/extres/clk/clk_fixed.h> -#include <dev/extres/clk/clk_mux.h> +#include <dev/clk/clk_div.h> +#include <dev/clk/clk_fixed.h> +#include <dev/clk/clk_mux.h> #include <dev/clk/rockchip/rk_cru.h> diff --git a/sys/dev/clk/rockchip/rk3568_cru.c b/sys/dev/clk/rockchip/rk3568_cru.c index 4d7f569a3de2..5f6eb766b4ee 100644 --- a/sys/dev/clk/rockchip/rk3568_cru.c +++ b/sys/dev/clk/rockchip/rk3568_cru.c @@ -39,9 +39,9 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk_div.h> -#include <dev/extres/clk/clk_fixed.h> -#include <dev/extres/clk/clk_mux.h> +#include <dev/clk/clk_div.h> +#include <dev/clk/clk_fixed.h> +#include <dev/clk/clk_mux.h> #include <dev/clk/rockchip/rk_cru.h> #include <contrib/device-tree/include/dt-bindings/clock/rk3568-cru.h> diff --git a/sys/dev/clk/rockchip/rk3568_pmucru.c b/sys/dev/clk/rockchip/rk3568_pmucru.c index 0756dc5392bf..214253abb55e 100644 --- a/sys/dev/clk/rockchip/rk3568_pmucru.c +++ b/sys/dev/clk/rockchip/rk3568_pmucru.c @@ -39,9 +39,9 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk_div.h> -#include <dev/extres/clk/clk_fixed.h> -#include <dev/extres/clk/clk_mux.h> +#include <dev/clk/clk_div.h> +#include <dev/clk/clk_fixed.h> +#include <dev/clk/clk_mux.h> #include <dev/clk/rockchip/rk_cru.h> #include <contrib/device-tree/include/dt-bindings/clock/rk3568-cru.h> diff --git a/sys/dev/clk/rockchip/rk_clk_armclk.c b/sys/dev/clk/rockchip/rk_clk_armclk.c index 3d462e74d92b..36197166d213 100644 --- a/sys/dev/clk/rockchip/rk_clk_armclk.c +++ b/sys/dev/clk/rockchip/rk_clk_armclk.c @@ -29,7 +29,7 @@ #include <sys/systm.h> #include <sys/bus.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/clk/rockchip/rk_clk_armclk.h> diff --git a/sys/dev/clk/rockchip/rk_clk_armclk.h b/sys/dev/clk/rockchip/rk_clk_armclk.h index 0c7f91d21d60..d5d14f1e8449 100644 --- a/sys/dev/clk/rockchip/rk_clk_armclk.h +++ b/sys/dev/clk/rockchip/rk_clk_armclk.h @@ -28,7 +28,7 @@ #ifndef _RK_CLK_ARMCLK_H_ #define _RK_CLK_ARMCLK_H_ -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> struct rk_clk_armclk_rates { uint64_t freq; diff --git a/sys/dev/clk/rockchip/rk_clk_composite.c b/sys/dev/clk/rockchip/rk_clk_composite.c index a37ddcd6ecb2..2b6c889913b8 100644 --- a/sys/dev/clk/rockchip/rk_clk_composite.c +++ b/sys/dev/clk/rockchip/rk_clk_composite.c @@ -29,7 +29,7 @@ #include <sys/systm.h> #include <sys/bus.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/syscon/syscon.h> #include <dev/clk/rockchip/rk_clk_composite.h> diff --git a/sys/dev/clk/rockchip/rk_clk_composite.h b/sys/dev/clk/rockchip/rk_clk_composite.h index 22a052da22c2..346bee53f04f 100644 --- a/sys/dev/clk/rockchip/rk_clk_composite.h +++ b/sys/dev/clk/rockchip/rk_clk_composite.h @@ -28,7 +28,7 @@ #ifndef _RK_CLK_COMPOSITE_H_ #define _RK_CLK_COMPOSITE_H_ -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> struct rk_clk_composite_def { struct clknode_init_def clkdef; diff --git a/sys/dev/clk/rockchip/rk_clk_fract.c b/sys/dev/clk/rockchip/rk_clk_fract.c index f559e9c71852..aa7084c90d76 100644 --- a/sys/dev/clk/rockchip/rk_clk_fract.c +++ b/sys/dev/clk/rockchip/rk_clk_fract.c @@ -29,7 +29,7 @@ #include <sys/systm.h> #include <sys/bus.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/clk/rockchip/rk_clk_fract.h> diff --git a/sys/dev/clk/rockchip/rk_clk_fract.h b/sys/dev/clk/rockchip/rk_clk_fract.h index 6923f162f265..57f539d8d246 100644 --- a/sys/dev/clk/rockchip/rk_clk_fract.h +++ b/sys/dev/clk/rockchip/rk_clk_fract.h @@ -28,7 +28,7 @@ #ifndef _RK_CLK_FRACT_H_ #define _RK_CLK_FRACT_H_ -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> struct rk_clk_fract_def { struct clknode_init_def clkdef; diff --git a/sys/dev/clk/rockchip/rk_clk_gate.c b/sys/dev/clk/rockchip/rk_clk_gate.c index 053236d043e6..911e4cbad2c9 100644 --- a/sys/dev/clk/rockchip/rk_clk_gate.c +++ b/sys/dev/clk/rockchip/rk_clk_gate.c @@ -30,7 +30,7 @@ #include <sys/systm.h> #include <sys/bus.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/clk/rockchip/rk_clk_gate.h> diff --git a/sys/dev/clk/rockchip/rk_clk_gate.h b/sys/dev/clk/rockchip/rk_clk_gate.h index add5cd22aa89..2282f7c19284 100644 --- a/sys/dev/clk/rockchip/rk_clk_gate.h +++ b/sys/dev/clk/rockchip/rk_clk_gate.h @@ -28,7 +28,7 @@ #ifndef _RK_CLK_GATE_H_ #define _RK_CLK_GATE_H_ -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> struct rk_clk_gate_def { struct clknode_init_def clkdef; diff --git a/sys/dev/clk/rockchip/rk_clk_mux.c b/sys/dev/clk/rockchip/rk_clk_mux.c index e42d5819378a..fba57f794d16 100644 --- a/sys/dev/clk/rockchip/rk_clk_mux.c +++ b/sys/dev/clk/rockchip/rk_clk_mux.c @@ -34,7 +34,7 @@ #include <machine/bus.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/syscon/syscon.h> #include <dev/clk/rockchip/rk_cru.h> diff --git a/sys/dev/clk/rockchip/rk_clk_mux.h b/sys/dev/clk/rockchip/rk_clk_mux.h index b32e0687fac3..c6c261294b68 100644 --- a/sys/dev/clk/rockchip/rk_clk_mux.h +++ b/sys/dev/clk/rockchip/rk_clk_mux.h @@ -28,7 +28,7 @@ #ifndef _RK_CLK_MUX_H_ #define _RK_CLK_MUX_H_ -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> struct rk_clk_mux_def { struct clknode_init_def clkdef; diff --git a/sys/dev/clk/rockchip/rk_clk_pll.c b/sys/dev/clk/rockchip/rk_clk_pll.c index f89fdeb0c341..8e6551ef6c29 100644 --- a/sys/dev/clk/rockchip/rk_clk_pll.c +++ b/sys/dev/clk/rockchip/rk_clk_pll.c @@ -29,7 +29,7 @@ #include <sys/systm.h> #include <sys/bus.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/clk/rockchip/rk_clk_pll.h> diff --git a/sys/dev/clk/rockchip/rk_clk_pll.h b/sys/dev/clk/rockchip/rk_clk_pll.h index 2d0c0bb67fdf..28d795b4e5b8 100644 --- a/sys/dev/clk/rockchip/rk_clk_pll.h +++ b/sys/dev/clk/rockchip/rk_clk_pll.h @@ -28,7 +28,7 @@ #ifndef _RK_CLK_PLL_H_ #define _RK_CLK_PLL_H_ -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> struct rk_clk_pll_rate { uint32_t freq; diff --git a/sys/dev/clk/rockchip/rk_cru.c b/sys/dev/clk/rockchip/rk_cru.c index 81760bcd74a1..a7d1b26166f1 100644 --- a/sys/dev/clk/rockchip/rk_cru.c +++ b/sys/dev/clk/rockchip/rk_cru.c @@ -44,10 +44,10 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk.h> -#include <dev/extres/clk/clk_gate.h> -#include <dev/extres/clk/clk_fixed.h> -#include <dev/extres/clk/clk_link.h> +#include <dev/clk/clk.h> +#include <dev/clk/clk_gate.h> +#include <dev/clk/clk_fixed.h> +#include <dev/clk/clk_link.h> #include <dev/extres/hwreset/hwreset.h> #include <dev/clk/rockchip/rk_clk_composite.h> diff --git a/sys/dev/clk/rockchip/rk_cru.h b/sys/dev/clk/rockchip/rk_cru.h index 3249c8c8f13c..685c6bb67568 100644 --- a/sys/dev/clk/rockchip/rk_cru.h +++ b/sys/dev/clk/rockchip/rk_cru.h @@ -28,11 +28,11 @@ #ifndef __RK_CRU_H__ #define __RK_CRU_H__ -#include <dev/extres/clk/clk.h> -#include <dev/extres/clk/clk_div.h> -#include <dev/extres/clk/clk_gate.h> -#include <dev/extres/clk/clk_fixed.h> -#include <dev/extres/clk/clk_link.h> +#include <dev/clk/clk.h> +#include <dev/clk/clk_div.h> +#include <dev/clk/clk_gate.h> +#include <dev/clk/clk_fixed.h> +#include <dev/clk/clk_link.h> #include <dev/clk/rockchip/rk_clk_armclk.h> #include <dev/clk/rockchip/rk_clk_composite.h> diff --git a/sys/dev/clk/xilinx/zynqmp_clk_div.c b/sys/dev/clk/xilinx/zynqmp_clk_div.c index cc6e4d73e92d..ce754b10fb55 100644 --- a/sys/dev/clk/xilinx/zynqmp_clk_div.c +++ b/sys/dev/clk/xilinx/zynqmp_clk_div.c @@ -31,7 +31,7 @@ #include <sys/systm.h> #include <sys/bus.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/clk/xilinx/zynqmp_clk_div.h> diff --git a/sys/dev/clk/xilinx/zynqmp_clk_fixed.c b/sys/dev/clk/xilinx/zynqmp_clk_fixed.c index 94de0491acb6..7a8016593c8f 100644 --- a/sys/dev/clk/xilinx/zynqmp_clk_fixed.c +++ b/sys/dev/clk/xilinx/zynqmp_clk_fixed.c @@ -31,7 +31,7 @@ #include <sys/systm.h> #include <sys/bus.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/clk/xilinx/zynqmp_clk_fixed.h> diff --git a/sys/dev/clk/xilinx/zynqmp_clk_gate.c b/sys/dev/clk/xilinx/zynqmp_clk_gate.c index 180c7db38c09..8f3f7de1c151 100644 --- a/sys/dev/clk/xilinx/zynqmp_clk_gate.c +++ b/sys/dev/clk/xilinx/zynqmp_clk_gate.c @@ -31,7 +31,7 @@ #include <sys/systm.h> #include <sys/bus.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/clk/xilinx/zynqmp_clk_gate.h> diff --git a/sys/dev/clk/xilinx/zynqmp_clk_mux.c b/sys/dev/clk/xilinx/zynqmp_clk_mux.c index 6826ee5123fe..49034edeff96 100644 --- a/sys/dev/clk/xilinx/zynqmp_clk_mux.c +++ b/sys/dev/clk/xilinx/zynqmp_clk_mux.c @@ -31,7 +31,7 @@ #include <sys/systm.h> #include <sys/bus.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/clk/xilinx/zynqmp_clk_mux.h> diff --git a/sys/dev/clk/xilinx/zynqmp_clk_pll.c b/sys/dev/clk/xilinx/zynqmp_clk_pll.c index 6e5da9533859..9a8157994971 100644 --- a/sys/dev/clk/xilinx/zynqmp_clk_pll.c +++ b/sys/dev/clk/xilinx/zynqmp_clk_pll.c @@ -31,7 +31,7 @@ #include <sys/systm.h> #include <sys/bus.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/clk/xilinx/zynqmp_clk_pll.h> diff --git a/sys/dev/clk/xilinx/zynqmp_clock.c b/sys/dev/clk/xilinx/zynqmp_clock.c index 76f23cec38d0..6d7eb7fa2b7e 100644 --- a/sys/dev/clk/xilinx/zynqmp_clock.c +++ b/sys/dev/clk/xilinx/zynqmp_clock.c @@ -41,8 +41,8 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk.h> -#include <dev/extres/clk/clk_fixed.h> +#include <dev/clk/clk.h> +#include <dev/clk/clk_fixed.h> #include <dev/clk/xilinx/zynqmp_clk_mux.h> #include <dev/clk/xilinx/zynqmp_clk_pll.h> diff --git a/sys/dev/cpufreq/cpufreq_dt.c b/sys/dev/cpufreq/cpufreq_dt.c index cfd052c56a96..4dae7142b380 100644 --- a/sys/dev/cpufreq/cpufreq_dt.c +++ b/sys/dev/cpufreq/cpufreq_dt.c @@ -41,7 +41,7 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/regulator/regulator.h> #include "cpufreq_if.h" diff --git a/sys/dev/dwc/dwc1000_core.c b/sys/dev/dwc/dwc1000_core.c index 83d54d8325e1..d25c31e66e28 100644 --- a/sys/dev/dwc/dwc1000_core.c +++ b/sys/dev/dwc/dwc1000_core.c @@ -54,7 +54,7 @@ #include <machine/bus.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include <dev/mii/mii.h> diff --git a/sys/dev/dwc/dwc1000_dma.c b/sys/dev/dwc/dwc1000_dma.c index 8f3340eb3128..e89ccee5b0ff 100644 --- a/sys/dev/dwc/dwc1000_dma.c +++ b/sys/dev/dwc/dwc1000_dma.c @@ -49,7 +49,7 @@ #include <machine/bus.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include <dev/ofw/ofw_bus.h> diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c index ab43ad6f8645..be44a6be193b 100644 --- a/sys/dev/dwc/if_dwc.c +++ b/sys/dev/dwc/if_dwc.c @@ -59,7 +59,7 @@ #include <machine/bus.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include <dev/mii/mii.h> diff --git a/sys/dev/dwc/if_dwc_aw.c b/sys/dev/dwc/if_dwc_aw.c index 5a39a08809f8..981f621e3f27 100644 --- a/sys/dev/dwc/if_dwc_aw.c +++ b/sys/dev/dwc/if_dwc_aw.c @@ -41,7 +41,7 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include <dev/extres/regulator/regulator.h> diff --git a/sys/dev/dwc/if_dwc_rk.c b/sys/dev/dwc/if_dwc_rk.c index 2a1a5e763c2f..76fd11dfd109 100644 --- a/sys/dev/dwc/if_dwc_rk.c +++ b/sys/dev/dwc/if_dwc_rk.c @@ -42,7 +42,7 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include <dev/extres/regulator/regulator.h> #include <dev/extres/syscon/syscon.h> diff --git a/sys/dev/dwc/if_dwc_socfpga.c b/sys/dev/dwc/if_dwc_socfpga.c index ae3ea55564b6..ae2bcac54a95 100644 --- a/sys/dev/dwc/if_dwc_socfpga.c +++ b/sys/dev/dwc/if_dwc_socfpga.c @@ -44,7 +44,7 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include <dev/dwc/if_dwcvar.h> diff --git a/sys/dev/dwwdt/dwwdt.c b/sys/dev/dwwdt/dwwdt.c index e1787bb549ca..89f94fff9bad 100644 --- a/sys/dev/dwwdt/dwwdt.c +++ b/sys/dev/dwwdt/dwwdt.c @@ -40,7 +40,7 @@ #include <machine/bus.h> #include <machine/resource.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/fdt/fdt_common.h> #include <dev/ofw/openfirm.h> #include <dev/ofw/ofw_bus.h> diff --git a/sys/dev/eqos/if_eqos.c b/sys/dev/eqos/if_eqos.c index 75e3ca957b48..17c820a1b191 100644 --- a/sys/dev/eqos/if_eqos.c +++ b/sys/dev/eqos/if_eqos.c @@ -67,7 +67,7 @@ #include <dev/ofw/openfirm.h> #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #endif #include <dev/eqos/if_eqos_reg.h> diff --git a/sys/dev/eqos/if_eqos_fdt.c b/sys/dev/eqos/if_eqos_fdt.c index 68fcbc1ea706..9c36f658bad1 100644 --- a/sys/dev/eqos/if_eqos_fdt.c +++ b/sys/dev/eqos/if_eqos_fdt.c @@ -50,7 +50,7 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include <dev/extres/regulator/regulator.h> #include <dev/extres/syscon/syscon.h> diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_hw.c b/sys/dev/etherswitch/ar40xx/ar40xx_hw.c index 4e1f803a92fe..c017419be0ff 100644 --- a/sys/dev/etherswitch/ar40xx/ar40xx_hw.c +++ b/sys/dev/etherswitch/ar40xx/ar40xx_hw.c @@ -51,7 +51,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/mdio/mdio.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include <dev/fdt/fdt_common.h> diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_hw_atu.c b/sys/dev/etherswitch/ar40xx/ar40xx_hw_atu.c index 4cbe65025111..a3facf4a6199 100644 --- a/sys/dev/etherswitch/ar40xx/ar40xx_hw_atu.c +++ b/sys/dev/etherswitch/ar40xx/ar40xx_hw_atu.c @@ -51,7 +51,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/mdio/mdio.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include <dev/fdt/fdt_common.h> diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_hw_mdio.c b/sys/dev/etherswitch/ar40xx/ar40xx_hw_mdio.c index 39296fc3d444..43c2d8744054 100644 --- a/sys/dev/etherswitch/ar40xx/ar40xx_hw_mdio.c +++ b/sys/dev/etherswitch/ar40xx/ar40xx_hw_mdio.c @@ -51,7 +51,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/mdio/mdio.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include <dev/fdt/fdt_common.h> diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_hw_mib.c b/sys/dev/etherswitch/ar40xx/ar40xx_hw_mib.c index 55c0003766c5..6fdc9e96fd81 100644 --- a/sys/dev/etherswitch/ar40xx/ar40xx_hw_mib.c +++ b/sys/dev/etherswitch/ar40xx/ar40xx_hw_mib.c @@ -51,7 +51,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/mdio/mdio.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include <dev/fdt/fdt_common.h> diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_hw_mirror.c b/sys/dev/etherswitch/ar40xx/ar40xx_hw_mirror.c index 011cf8607343..7e440f54e3ac 100644 --- a/sys/dev/etherswitch/ar40xx/ar40xx_hw_mirror.c +++ b/sys/dev/etherswitch/ar40xx/ar40xx_hw_mirror.c @@ -51,7 +51,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/mdio/mdio.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include <dev/fdt/fdt_common.h> diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_hw_port.c b/sys/dev/etherswitch/ar40xx/ar40xx_hw_port.c index e207a6da8b8f..e701f3ae28ba 100644 --- a/sys/dev/etherswitch/ar40xx/ar40xx_hw_port.c +++ b/sys/dev/etherswitch/ar40xx/ar40xx_hw_port.c @@ -51,7 +51,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/mdio/mdio.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include <dev/fdt/fdt_common.h> diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_hw_psgmii.c b/sys/dev/etherswitch/ar40xx/ar40xx_hw_psgmii.c index 24460d8b0b43..0f0704c41aba 100644 --- a/sys/dev/etherswitch/ar40xx/ar40xx_hw_psgmii.c +++ b/sys/dev/etherswitch/ar40xx/ar40xx_hw_psgmii.c @@ -51,7 +51,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/mdio/mdio.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include <dev/fdt/fdt_common.h> diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_hw_vtu.c b/sys/dev/etherswitch/ar40xx/ar40xx_hw_vtu.c index e471dd4746dc..3c3800847438 100644 --- a/sys/dev/etherswitch/ar40xx/ar40xx_hw_vtu.c +++ b/sys/dev/etherswitch/ar40xx/ar40xx_hw_vtu.c @@ -51,7 +51,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/mdio/mdio.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include <dev/fdt/fdt_common.h> diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_main.c b/sys/dev/etherswitch/ar40xx/ar40xx_main.c index ed17d2789bf4..d8cbfd836a9b 100644 --- a/sys/dev/etherswitch/ar40xx/ar40xx_main.c +++ b/sys/dev/etherswitch/ar40xx/ar40xx_main.c @@ -51,7 +51,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/mdio/mdio.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include <dev/fdt/fdt_common.h> diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_phy.c b/sys/dev/etherswitch/ar40xx/ar40xx_phy.c index 3e2bcd4af18d..079a92983503 100644 --- a/sys/dev/etherswitch/ar40xx/ar40xx_phy.c +++ b/sys/dev/etherswitch/ar40xx/ar40xx_phy.c @@ -51,7 +51,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/mdio/mdio.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include <dev/fdt/fdt_common.h> diff --git a/sys/dev/firmware/arm/scmi.c b/sys/dev/firmware/arm/scmi.c index 455a802f254d..3101be245ee1 100644 --- a/sys/dev/firmware/arm/scmi.c +++ b/sys/dev/firmware/arm/scmi.c @@ -37,7 +37,7 @@ #include <sys/module.h> #include <sys/mutex.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/fdt/simplebus.h> #include <dev/fdt/fdt_common.h> #include <dev/ofw/ofw_bus_subr.h> diff --git a/sys/dev/firmware/arm/scmi_clk.c b/sys/dev/firmware/arm/scmi_clk.c index fbf65f0fee74..da7a8d37b465 100644 --- a/sys/dev/firmware/arm/scmi_clk.c +++ b/sys/dev/firmware/arm/scmi_clk.c @@ -35,7 +35,7 @@ #include <sys/kernel.h> #include <sys/module.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/fdt/simplebus.h> #include <dev/fdt/fdt_common.h> #include <dev/ofw/ofw_bus_subr.h> diff --git a/sys/dev/flash/flexspi/flex_spi.c b/sys/dev/flash/flexspi/flex_spi.c index 106a7845b2ad..766a1cfaa332 100644 --- a/sys/dev/flash/flexspi/flex_spi.c +++ b/sys/dev/flash/flexspi/flex_spi.c @@ -42,7 +42,7 @@ #include <machine/bus.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/fdt/fdt_common.h> #include <dev/ofw/ofw_bus_subr.h> diff --git a/sys/dev/hdmi/dwc_hdmi_fdt.c b/sys/dev/hdmi/dwc_hdmi_fdt.c index d8cd1a3cba8f..927a6a15427d 100644 --- a/sys/dev/hdmi/dwc_hdmi_fdt.c +++ b/sys/dev/hdmi/dwc_hdmi_fdt.c @@ -42,7 +42,7 @@ #include <machine/bus.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/videomode/videomode.h> #include <dev/videomode/edidvar.h> diff --git a/sys/dev/iicbus/controller/cadence/cdnc_i2c.c b/sys/dev/iicbus/controller/cadence/cdnc_i2c.c index fff9c57184d7..61f4975c10de 100644 --- a/sys/dev/iicbus/controller/cadence/cdnc_i2c.c +++ b/sys/dev/iicbus/controller/cadence/cdnc_i2c.c @@ -52,7 +52,7 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/iicbus/iiconf.h> #include <dev/iicbus/iicbus.h> diff --git a/sys/dev/iicbus/controller/opencores/iicoc_fdt.c b/sys/dev/iicbus/controller/opencores/iicoc_fdt.c index 40994c22628b..649027038659 100644 --- a/sys/dev/iicbus/controller/opencores/iicoc_fdt.c +++ b/sys/dev/iicbus/controller/opencores/iicoc_fdt.c @@ -39,7 +39,7 @@ #include <sys/mutex.h> #include <sys/rman.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/iicbus/iicbus.h> #include <dev/iicbus/iiconf.h> diff --git a/sys/dev/iicbus/controller/rockchip/rk_i2c.c b/sys/dev/iicbus/controller/rockchip/rk_i2c.c index 0961dbc96a92..4a431649de49 100644 --- a/sys/dev/iicbus/controller/rockchip/rk_i2c.c +++ b/sys/dev/iicbus/controller/rockchip/rk_i2c.c @@ -39,7 +39,7 @@ #include <dev/iicbus/iiconf.h> #include <dev/iicbus/iicbus.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include "iicbus_if.h" diff --git a/sys/dev/iicbus/controller/twsi/a10_twsi.c b/sys/dev/iicbus/controller/twsi/a10_twsi.c index e66f941d3814..40d75f64e3e1 100644 --- a/sys/dev/iicbus/controller/twsi/a10_twsi.c +++ b/sys/dev/iicbus/controller/twsi/a10_twsi.c @@ -44,7 +44,7 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include "iicbus_if.h" diff --git a/sys/dev/iicbus/controller/twsi/mv_twsi.c b/sys/dev/iicbus/controller/twsi/mv_twsi.c index 23f3ee8debd2..b3032533da47 100644 --- a/sys/dev/iicbus/controller/twsi/mv_twsi.c +++ b/sys/dev/iicbus/controller/twsi/mv_twsi.c @@ -58,7 +58,7 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <arm/mv/mvreg.h> #include <arm/mv/mvvar.h> diff --git a/sys/dev/iicbus/controller/twsi/twsi.h b/sys/dev/iicbus/controller/twsi/twsi.h index 132a75fd0ab8..54aec51bbb76 100644 --- a/sys/dev/iicbus/controller/twsi/twsi.h +++ b/sys/dev/iicbus/controller/twsi/twsi.h @@ -32,7 +32,7 @@ #ifndef _TWSI_H_ #define _TWSI_H_ -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> struct twsi_baud_rate { uint32_t raw; diff --git a/sys/dev/iicbus/pmic/rockchip/rk8xx_clocks.c b/sys/dev/iicbus/pmic/rockchip/rk8xx_clocks.c index c450154001f6..c65a41294c96 100644 --- a/sys/dev/iicbus/pmic/rockchip/rk8xx_clocks.c +++ b/sys/dev/iicbus/pmic/rockchip/rk8xx_clocks.c @@ -34,7 +34,7 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/iicbus/pmic/rockchip/rk8xx.h> diff --git a/sys/dev/mmc/host/dwmmc.c b/sys/dev/mmc/host/dwmmc.c index 8cd50d2cc898..fd55ce5c0cd4 100644 --- a/sys/dev/mmc/host/dwmmc.c +++ b/sys/dev/mmc/host/dwmmc.c @@ -60,7 +60,7 @@ #include <machine/cpu.h> #include <machine/intr.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/mmc/host/dwmmc_reg.h> #include <dev/mmc/host/dwmmc_var.h> diff --git a/sys/dev/mmc/host/dwmmc_rockchip.c b/sys/dev/mmc/host/dwmmc_rockchip.c index 5cec9f9603d1..c4b07ac3290e 100644 --- a/sys/dev/mmc/host/dwmmc_rockchip.c +++ b/sys/dev/mmc/host/dwmmc_rockchip.c @@ -38,7 +38,7 @@ #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/mmc/host/dwmmc_var.h> diff --git a/sys/dev/mmc/host/dwmmc_var.h b/sys/dev/mmc/host/dwmmc_var.h index ef9b1d5305bd..16893b110804 100644 --- a/sys/dev/mmc/host/dwmmc_var.h +++ b/sys/dev/mmc/host/dwmmc_var.h @@ -31,7 +31,7 @@ #ifndef DEV_MMC_HOST_DWMMC_VAR_H #define DEV_MMC_HOST_DWMMC_VAR_H -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include <dev/extres/regulator/regulator.h> diff --git a/sys/dev/mmc/mmc_pwrseq.c b/sys/dev/mmc/mmc_pwrseq.c index 5e2e87fd5564..46bfab41aa6c 100644 --- a/sys/dev/mmc/mmc_pwrseq.c +++ b/sys/dev/mmc/mmc_pwrseq.c @@ -36,7 +36,7 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include "mmc_pwrseq_if.h" diff --git a/sys/dev/neta/if_mvneta.c b/sys/dev/neta/if_mvneta.c index f7f9c042b937..8a2c2ec8512c 100644 --- a/sys/dev/neta/if_mvneta.c +++ b/sys/dev/neta/if_mvneta.c @@ -63,7 +63,7 @@ #include <sys/rman.h> #include <machine/resource.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/mii/mii.h> #include <dev/mii/miivar.h> diff --git a/sys/dev/ofw/ofw_cpu.c b/sys/dev/ofw/ofw_cpu.c index bd9164fd9f5c..e18004ae19d2 100644 --- a/sys/dev/ofw/ofw_cpu.c +++ b/sys/dev/ofw/ofw_cpu.c @@ -43,7 +43,7 @@ #include <dev/ofw/ofw_cpu.h> #if defined(__arm__) || defined(__arm64__) || defined(__riscv__) -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #endif static int ofw_cpulist_probe(device_t); diff --git a/sys/dev/pci/pci_dw_mv.c b/sys/dev/pci/pci_dw_mv.c index b37baf044e8b..4f0671cb23d9 100644 --- a/sys/dev/pci/pci_dw_mv.c +++ b/sys/dev/pci/pci_dw_mv.c @@ -44,7 +44,7 @@ #include <machine/intr.h> #include <machine/resource.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/phy/phy.h> #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> diff --git a/sys/dev/pwm/controller/allwinner/aw_pwm.c b/sys/dev/pwm/controller/allwinner/aw_pwm.c index 85ccf4352423..8d7e38834fdd 100644 --- a/sys/dev/pwm/controller/allwinner/aw_pwm.c +++ b/sys/dev/pwm/controller/allwinner/aw_pwm.c @@ -37,7 +37,7 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include "pwmbus_if.h" diff --git a/sys/dev/pwm/controller/rockchip/rk_pwm.c b/sys/dev/pwm/controller/rockchip/rk_pwm.c index 260899f15d89..f1f3946e4d59 100644 --- a/sys/dev/pwm/controller/rockchip/rk_pwm.c +++ b/sys/dev/pwm/controller/rockchip/rk_pwm.c @@ -38,7 +38,7 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include "pwmbus_if.h" diff --git a/sys/dev/qcom_clk/qcom_clk_apssdiv.c b/sys/dev/qcom_clk/qcom_clk_apssdiv.c index d33134f0ba86..52f6bfa9945f 100644 --- a/sys/dev/qcom_clk/qcom_clk_apssdiv.c +++ b/sys/dev/qcom_clk/qcom_clk_apssdiv.c @@ -31,10 +31,10 @@ #include <sys/rman.h> #include <machine/bus.h> -#include <dev/extres/clk/clk.h> -#include <dev/extres/clk/clk_div.h> -#include <dev/extres/clk/clk_fixed.h> -#include <dev/extres/clk/clk_mux.h> +#include <dev/clk/clk.h> +#include <dev/clk/clk_div.h> +#include <dev/clk/clk_fixed.h> +#include <dev/clk/clk_mux.h> #include "qcom_clk_freqtbl.h" #include "qcom_clk_apssdiv.h" diff --git a/sys/dev/qcom_clk/qcom_clk_branch2.c b/sys/dev/qcom_clk/qcom_clk_branch2.c index 7cbd9a2b73e9..dac9d83ddfbb 100644 --- a/sys/dev/qcom_clk/qcom_clk_branch2.c +++ b/sys/dev/qcom_clk/qcom_clk_branch2.c @@ -31,10 +31,10 @@ #include <sys/rman.h> #include <machine/bus.h> -#include <dev/extres/clk/clk.h> -#include <dev/extres/clk/clk_div.h> -#include <dev/extres/clk/clk_fixed.h> -#include <dev/extres/clk/clk_mux.h> +#include <dev/clk/clk.h> +#include <dev/clk/clk_div.h> +#include <dev/clk/clk_fixed.h> +#include <dev/clk/clk_mux.h> #include "qcom_clk_branch2.h" #include "qcom_clk_branch2_reg.h" diff --git a/sys/dev/qcom_clk/qcom_clk_fdiv.c b/sys/dev/qcom_clk/qcom_clk_fdiv.c index 6d7e7cfa8bb5..1fb1975446e6 100644 --- a/sys/dev/qcom_clk/qcom_clk_fdiv.c +++ b/sys/dev/qcom_clk/qcom_clk_fdiv.c @@ -31,10 +31,10 @@ #include <sys/rman.h> #include <machine/bus.h> -#include <dev/extres/clk/clk.h> -#include <dev/extres/clk/clk_div.h> -#include <dev/extres/clk/clk_fixed.h> -#include <dev/extres/clk/clk_mux.h> +#include <dev/clk/clk.h> +#include <dev/clk/clk_div.h> +#include <dev/clk/clk_fixed.h> +#include <dev/clk/clk_mux.h> #include "qcom_clk_fdiv.h" diff --git a/sys/dev/qcom_clk/qcom_clk_fepll.c b/sys/dev/qcom_clk/qcom_clk_fepll.c index e50b4823fee5..4704186d91ed 100644 --- a/sys/dev/qcom_clk/qcom_clk_fepll.c +++ b/sys/dev/qcom_clk/qcom_clk_fepll.c @@ -31,10 +31,10 @@ #include <sys/rman.h> #include <machine/bus.h> -#include <dev/extres/clk/clk.h> -#include <dev/extres/clk/clk_div.h> -#include <dev/extres/clk/clk_fixed.h> -#include <dev/extres/clk/clk_mux.h> +#include <dev/clk/clk.h> +#include <dev/clk/clk_div.h> +#include <dev/clk/clk_fixed.h> +#include <dev/clk/clk_mux.h> #include "qcom_clk_fepll.h" diff --git a/sys/dev/qcom_clk/qcom_clk_rcg2.c b/sys/dev/qcom_clk/qcom_clk_rcg2.c index 03de356aa64d..0407706dd138 100644 --- a/sys/dev/qcom_clk/qcom_clk_rcg2.c +++ b/sys/dev/qcom_clk/qcom_clk_rcg2.c @@ -31,10 +31,10 @@ #include <sys/rman.h> #include <machine/bus.h> -#include <dev/extres/clk/clk.h> -#include <dev/extres/clk/clk_div.h> -#include <dev/extres/clk/clk_fixed.h> -#include <dev/extres/clk/clk_mux.h> +#include <dev/clk/clk.h> +#include <dev/clk/clk_div.h> +#include <dev/clk/clk_fixed.h> +#include <dev/clk/clk_mux.h> #include "qcom_clk_freqtbl.h" #include "qcom_clk_rcg2.h" diff --git a/sys/dev/qcom_clk/qcom_clk_ro_div.c b/sys/dev/qcom_clk/qcom_clk_ro_div.c index 72712119faf7..f6cb14192bfb 100644 --- a/sys/dev/qcom_clk/qcom_clk_ro_div.c +++ b/sys/dev/qcom_clk/qcom_clk_ro_div.c @@ -31,10 +31,10 @@ #include <sys/rman.h> #include <machine/bus.h> -#include <dev/extres/clk/clk.h> -#include <dev/extres/clk/clk_div.h> -#include <dev/extres/clk/clk_fixed.h> -#include <dev/extres/clk/clk_mux.h> +#include <dev/clk/clk.h> +#include <dev/clk/clk_div.h> +#include <dev/clk/clk_fixed.h> +#include <dev/clk/clk_mux.h> #include "qcom_clk_ro_div.h" diff --git a/sys/dev/qcom_dwc3/qcom_dwc3.c b/sys/dev/qcom_dwc3/qcom_dwc3.c index 73034c914eeb..d9f01e714867 100644 --- a/sys/dev/qcom_dwc3/qcom_dwc3.c +++ b/sys/dev/qcom_dwc3/qcom_dwc3.c @@ -45,7 +45,7 @@ #include <dev/ofw/ofw_bus_subr.h> #include <dev/ofw/ofw_subr.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include <dev/extres/phy/phy_usb.h> #include <dev/extres/syscon/syscon.h> diff --git a/sys/dev/qcom_gcc/qcom_gcc_ipq4018_clock.c b/sys/dev/qcom_gcc/qcom_gcc_ipq4018_clock.c index b49053dc96d0..6441cf3e6ae5 100644 --- a/sys/dev/qcom_gcc/qcom_gcc_ipq4018_clock.c +++ b/sys/dev/qcom_gcc/qcom_gcc_ipq4018_clock.c @@ -44,10 +44,10 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk_div.h> -#include <dev/extres/clk/clk_fixed.h> -#include <dev/extres/clk/clk_mux.h> -#include <dev/extres/clk/clk_link.h> +#include <dev/clk/clk_div.h> +#include <dev/clk/clk_fixed.h> +#include <dev/clk/clk_mux.h> +#include <dev/clk/clk_link.h> #include <dt-bindings/clock/qcom,gcc-ipq4019.h> diff --git a/sys/dev/qcom_qup/qcom_spi.c b/sys/dev/qcom_qup/qcom_spi.c index 552f01c59bb2..f7163fa1dcab 100644 --- a/sys/dev/qcom_qup/qcom_spi.c +++ b/sys/dev/qcom_qup/qcom_spi.c @@ -53,7 +53,7 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include <dev/spibus/spi.h> diff --git a/sys/dev/qcom_qup/qcom_spi_hw.c b/sys/dev/qcom_qup/qcom_spi_hw.c index ba2663c79cff..6efbedf0892a 100644 --- a/sys/dev/qcom_qup/qcom_spi_hw.c +++ b/sys/dev/qcom_qup/qcom_spi_hw.c @@ -49,7 +49,7 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include <dev/spibus/spi.h> diff --git a/sys/dev/sdhci/sdhci_fdt.c b/sys/dev/sdhci/sdhci_fdt.c index 02077e9766c6..bf9f81108467 100644 --- a/sys/dev/sdhci/sdhci_fdt.c +++ b/sys/dev/sdhci/sdhci_fdt.c @@ -50,8 +50,8 @@ #include <dev/ofw/ofw_bus_subr.h> #include <dev/ofw/ofw_subr.h> -#include <dev/extres/clk/clk.h> -#include <dev/extres/clk/clk_fixed.h> +#include <dev/clk/clk.h> +#include <dev/clk/clk_fixed.h> #include <dev/extres/syscon/syscon.h> #include <dev/extres/phy/phy.h> diff --git a/sys/dev/sdhci/sdhci_fsl_fdt.c b/sys/dev/sdhci/sdhci_fsl_fdt.c index e83ee384cad9..12ce8c13342c 100644 --- a/sys/dev/sdhci/sdhci_fsl_fdt.c +++ b/sys/dev/sdhci/sdhci_fsl_fdt.c @@ -39,7 +39,7 @@ #include <machine/bus.h> #include <machine/resource.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/syscon/syscon.h> #include <dev/mmc/bridge.h> #include <dev/mmc/mmcbrvar.h> diff --git a/sys/dev/spibus/controller/allwinner/aw_spi.c b/sys/dev/spibus/controller/allwinner/aw_spi.c index 3dcde0e4225e..fe6f5c21fcd7 100644 --- a/sys/dev/spibus/controller/allwinner/aw_spi.c +++ b/sys/dev/spibus/controller/allwinner/aw_spi.c @@ -40,7 +40,7 @@ #include <dev/spibus/spi.h> #include <dev/spibus/spibusvar.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include "spibus_if.h" diff --git a/sys/dev/spibus/controller/rockchip/rk_spi.c b/sys/dev/spibus/controller/rockchip/rk_spi.c index c7a79c4e3cad..42f12e6ddaee 100644 --- a/sys/dev/spibus/controller/rockchip/rk_spi.c +++ b/sys/dev/spibus/controller/rockchip/rk_spi.c @@ -42,7 +42,7 @@ #include <dev/spibus/spi.h> #include <dev/spibus/spibusvar.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include "spibus_if.h" diff --git a/sys/dev/uart/uart_dev_imx.c b/sys/dev/uart/uart_dev_imx.c index 698497644ee2..b40012a313ca 100644 --- a/sys/dev/uart/uart_dev_imx.c +++ b/sys/dev/uart/uart_dev_imx.c @@ -49,7 +49,7 @@ #endif #ifdef IMX_ENABLE_CLOCKS -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #endif #include "uart_if.h" diff --git a/sys/dev/uart/uart_dev_snps.c b/sys/dev/uart/uart_dev_snps.c index 6dd071f95fe1..fb5894344927 100644 --- a/sys/dev/uart/uart_dev_snps.c +++ b/sys/dev/uart/uart_dev_snps.c @@ -38,7 +38,7 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include "uart_if.h" diff --git a/sys/dev/usb/controller/dwc3/aw_dwc3.c b/sys/dev/usb/controller/dwc3/aw_dwc3.c index 5b4d5291c28f..7f2869933ee5 100644 --- a/sys/dev/usb/controller/dwc3/aw_dwc3.c +++ b/sys/dev/usb/controller/dwc3/aw_dwc3.c @@ -45,7 +45,7 @@ #include <dev/ofw/ofw_bus_subr.h> #include <dev/ofw/ofw_subr.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include <dev/extres/phy/phy_usb.h> diff --git a/sys/dev/usb/controller/dwc3/dwc3.c b/sys/dev/usb/controller/dwc3/dwc3.c index d97b0b11d44c..e0ad19fb835f 100644 --- a/sys/dev/usb/controller/dwc3/dwc3.c +++ b/sys/dev/usb/controller/dwc3/dwc3.c @@ -65,7 +65,7 @@ #include <dev/ofw/ofw_bus_subr.h> #include <dev/ofw/ofw_subr.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/phy/phy_usb.h> #endif diff --git a/sys/dev/usb/controller/dwc3/rk_dwc3.c b/sys/dev/usb/controller/dwc3/rk_dwc3.c index f336490c386e..f0cec78a6f22 100644 --- a/sys/dev/usb/controller/dwc3/rk_dwc3.c +++ b/sys/dev/usb/controller/dwc3/rk_dwc3.c @@ -45,7 +45,7 @@ #include <dev/ofw/ofw_bus_subr.h> #include <dev/ofw/ofw_subr.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include <dev/extres/phy/phy_usb.h> #include <dev/extres/syscon/syscon.h> diff --git a/sys/dev/usb/controller/generic_ehci_fdt.c b/sys/dev/usb/controller/generic_ehci_fdt.c index 4dc3758b59f3..8f9558c6636a 100644 --- a/sys/dev/usb/controller/generic_ehci_fdt.c +++ b/sys/dev/usb/controller/generic_ehci_fdt.c @@ -54,7 +54,7 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include <dev/extres/phy/phy.h> #include <dev/extres/phy/phy_usb.h> diff --git a/sys/dev/usb/controller/generic_ohci.c b/sys/dev/usb/controller/generic_ohci.c index 5098a12446b0..efedc92ebfb9 100644 --- a/sys/dev/usb/controller/generic_ohci.c +++ b/sys/dev/usb/controller/generic_ohci.c @@ -53,7 +53,7 @@ #include <dev/usb/controller/ohci.h> #include <dev/usb/controller/ohcireg.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include <dev/extres/phy/phy.h> #include <dev/extres/phy/phy_usb.h> diff --git a/sys/dev/usb/controller/musb_otg_allwinner.c b/sys/dev/usb/controller/musb_otg_allwinner.c index 2949f730cd7d..4e630ac431e8 100644 --- a/sys/dev/usb/controller/musb_otg_allwinner.c +++ b/sys/dev/usb/controller/musb_otg_allwinner.c @@ -58,7 +58,7 @@ #include <dev/usb/usb_bus.h> #include <dev/usb/controller/musb_otg.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include <dev/extres/phy/phy.h> #include <dev/extres/phy/phy_usb.h> diff --git a/sys/dev/usb/controller/usb_nop_xceiv.c b/sys/dev/usb/controller/usb_nop_xceiv.c index 3d2583d561cf..25fc13cb0020 100644 --- a/sys/dev/usb/controller/usb_nop_xceiv.c +++ b/sys/dev/usb/controller/usb_nop_xceiv.c @@ -41,7 +41,7 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/regulator/regulator.h> #include <dev/extres/phy/phy_usb.h> diff --git a/sys/dev/usb/controller/xlnx_dwc3.c b/sys/dev/usb/controller/xlnx_dwc3.c index 0a53fb855034..df91d5e5bc3b 100644 --- a/sys/dev/usb/controller/xlnx_dwc3.c +++ b/sys/dev/usb/controller/xlnx_dwc3.c @@ -47,7 +47,7 @@ #include <dev/ofw/ofw_bus_subr.h> #include <dev/ofw/ofw_subr.h> -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/extres/hwreset/hwreset.h> #include <dev/extres/phy/phy_usb.h> #include <dev/extres/syscon/syscon.h> |