Page MenuHomeFreeBSD
Files F142263379

D43191.diff
No OneTemporary
Actions

D43191.diff
View Options

diff --git a/sys/arm/allwinner/a10_ahci.c b/sys/arm/allwinner/a10_ahci.c
--- a/sys/arm/allwinner/a10_ahci.c
+++ b/sys/arm/allwinner/a10_ahci.c
@@ -43,7 +43,7 @@
#include <dev/ofw/ofw_bus_subr.h>
#include <dev/ahci/ahci.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dev/extres/regulator/regulator.h>
/*
diff --git a/sys/arm/allwinner/a10_codec.c b/sys/arm/allwinner/a10_codec.c
--- a/sys/arm/allwinner/a10_codec.c
+++ b/sys/arm/allwinner/a10_codec.c
@@ -47,7 +47,7 @@
#include <dev/gpio/gpiobusvar.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dev/extres/hwreset/hwreset.h>
#include "sunxi_dma_if.h"
diff --git a/sys/arm/allwinner/a10_dmac.c b/sys/arm/allwinner/a10_dmac.c
--- a/sys/arm/allwinner/a10_dmac.c
+++ b/sys/arm/allwinner/a10_dmac.c
@@ -45,7 +45,7 @@
#include <dev/ofw/ofw_bus_subr.h>
#include <arm/allwinner/a10_dmac.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include "sunxi_dma_if.h"
diff --git a/sys/arm/allwinner/a10_timer.c b/sys/arm/allwinner/a10_timer.c
--- a/sys/arm/allwinner/a10_timer.c
+++ b/sys/arm/allwinner/a10_timer.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>
#if defined(__aarch64__)
#include "opt_soc.h"
diff --git a/sys/arm/allwinner/a31_dmac.c b/sys/arm/allwinner/a31_dmac.c
--- a/sys/arm/allwinner/a31_dmac.c
+++ b/sys/arm/allwinner/a31_dmac.c
@@ -46,7 +46,7 @@
#include <dev/ofw/ofw_bus_subr.h>
#include <arm/allwinner/a10_dmac.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dev/extres/hwreset/hwreset.h>
#include "sunxi_dma_if.h"
diff --git a/sys/arm/allwinner/a33_codec.c b/sys/arm/allwinner/a33_codec.c
--- a/sys/arm/allwinner/a33_codec.c
+++ b/sys/arm/allwinner/a33_codec.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/gpio/gpiobusvar.h>
diff --git a/sys/arm/allwinner/a64/sun50i_a64_acodec.c b/sys/arm/allwinner/a64/sun50i_a64_acodec.c
--- a/sys/arm/allwinner/a64/sun50i_a64_acodec.c
+++ b/sys/arm/allwinner/a64/sun50i_a64_acodec.c
@@ -40,7 +40,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/arm/allwinner/aw_cir.c b/sys/arm/allwinner/aw_cir.c
--- a/sys/arm/allwinner/aw_cir.c
+++ b/sys/arm/allwinner/aw_cir.c
@@ -40,7 +40,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>
#include <dev/extres/hwreset/hwreset.h>
#include <dev/evdev/input.h>
diff --git a/sys/arm/allwinner/aw_gmacclk.c b/sys/arm/allwinner/aw_gmacclk.c
--- a/sys/arm/allwinner/aw_gmacclk.c
+++ b/sys/arm/allwinner/aw_gmacclk.c
@@ -39,8 +39,8 @@
#include <dev/ofw/ofw_bus_subr.h>
#include <dev/ofw/ofw_subr.h>
-#include <dev/extres/clk/clk_mux.h>
-#include <dev/extres/clk/clk_gate.h>
+#include <dev/clk/clk_mux.h>
+#include <dev/clk/clk_gate.h>
#include "clkdev_if.h"
diff --git a/sys/arm/allwinner/aw_gpio.c b/sys/arm/allwinner/aw_gpio.c
--- a/sys/arm/allwinner/aw_gpio.c
+++ b/sys/arm/allwinner/aw_gpio.c
@@ -52,7 +52,7 @@
#include <arm/allwinner/aw_machdep.h>
#include <arm/allwinner/allwinner_pinctrl.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/arm/allwinner/aw_i2s.c b/sys/arm/allwinner/aw_i2s.c
--- a/sys/arm/allwinner/aw_i2s.c
+++ b/sys/arm/allwinner/aw_i2s.c
@@ -40,7 +40,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 "syscon_if.h"
diff --git a/sys/arm/allwinner/aw_mmc.c b/sys/arm/allwinner/aw_mmc.c
--- a/sys/arm/allwinner/aw_mmc.c
+++ b/sys/arm/allwinner/aw_mmc.c
@@ -52,7 +52,7 @@
#include <dev/mmc/mmc_fdt_helpers.h>
#include <arm/allwinner/aw_mmc.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/arm/allwinner/aw_rsb.c b/sys/arm/allwinner/aw_rsb.c
--- a/sys/arm/allwinner/aw_rsb.c
+++ b/sys/arm/allwinner/aw_rsb.c
@@ -43,7 +43,7 @@
#include <dev/iicbus/iiconf.h>
#include <dev/iicbus/iicbus.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/arm/allwinner/aw_rtc.c b/sys/arm/allwinner/aw_rtc.c
--- a/sys/arm/allwinner/aw_rtc.c
+++ b/sys/arm/allwinner/aw_rtc.c
@@ -41,7 +41,7 @@
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
-#include <dev/extres/clk/clk_fixed.h>
+#include <dev/clk/clk_fixed.h>
#include <arm/allwinner/aw_machdep.h>
diff --git a/sys/arm/allwinner/aw_thermal.c b/sys/arm/allwinner/aw_thermal.c
--- a/sys/arm/allwinner/aw_thermal.c
+++ b/sys/arm/allwinner/aw_thermal.c
@@ -43,7 +43,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/nvmem/nvmem.h>
diff --git a/sys/arm/allwinner/aw_usb3phy.c b/sys/arm/allwinner/aw_usb3phy.c
--- a/sys/arm/allwinner/aw_usb3phy.c
+++ b/sys/arm/allwinner/aw_usb3phy.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/phy/phy_usb.h>
diff --git a/sys/arm/allwinner/aw_usbphy.c b/sys/arm/allwinner/aw_usbphy.c
--- a/sys/arm/allwinner/aw_usbphy.c
+++ b/sys/arm/allwinner/aw_usbphy.c
@@ -40,7 +40,7 @@
#include <dev/ofw/ofw_bus_subr.h>
#include <dev/gpio/gpiobusvar.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/phy/phy_usb.h>
diff --git a/sys/arm/allwinner/if_awg.c b/sys/arm/allwinner/if_awg.c
--- a/sys/arm/allwinner/if_awg.c
+++ b/sys/arm/allwinner/if_awg.c
@@ -59,7 +59,7 @@
#include <dev/mii/mii.h>
#include <dev/mii/miivar.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/arm/allwinner/if_emac.c b/sys/arm/allwinner/if_emac.c
--- a/sys/arm/allwinner/if_emac.c
+++ b/sys/arm/allwinner/if_emac.c
@@ -75,7 +75,7 @@
#include <arm/allwinner/if_emacreg.h>
#include <arm/allwinner/aw_sid.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include "miibus_if.h"
diff --git a/sys/arm/freescale/imx/imx_gpio.c b/sys/arm/freescale/imx/imx_gpio.c
--- a/sys/arm/freescale/imx/imx_gpio.c
+++ b/sys/arm/freescale/imx/imx_gpio.c
@@ -59,7 +59,7 @@
#endif
#ifdef IMX_ENABLE_CLOCKS
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#endif
#include "gpio_if.h"
diff --git a/sys/arm/freescale/imx/imx_i2c.c b/sys/arm/freescale/imx/imx_i2c.c
--- a/sys/arm/freescale/imx/imx_i2c.c
+++ b/sys/arm/freescale/imx/imx_i2c.c
@@ -75,7 +75,7 @@
#endif
#ifdef IMX_ENABLE_CLOCKS
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#endif
#define I2C_ADDR_REG 0x00 /* I2C slave address register */
diff --git a/sys/arm/freescale/vybrid/vf_i2c.c b/sys/arm/freescale/vybrid/vf_i2c.c
--- a/sys/arm/freescale/vybrid/vf_i2c.c
+++ b/sys/arm/freescale/vybrid/vf_i2c.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 <machine/bus.h>
#include <machine/cpu.h>
diff --git a/sys/arm/mv/clk/a37x0_nb_periph_clk_driver.c b/sys/arm/mv/clk/a37x0_nb_periph_clk_driver.c
--- a/sys/arm/mv/clk/a37x0_nb_periph_clk_driver.c
+++ b/sys/arm/mv/clk/a37x0_nb_periph_clk_driver.c
@@ -35,8 +35,8 @@
#include <dev/fdt/simplebus.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/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/mv/clk/a37x0_periph_clk_driver.c b/sys/arm/mv/clk/a37x0_periph_clk_driver.c
--- a/sys/arm/mv/clk/a37x0_periph_clk_driver.c
+++ b/sys/arm/mv/clk/a37x0_periph_clk_driver.c
@@ -35,8 +35,8 @@
#include <dev/fdt/simplebus.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/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/mv/clk/a37x0_sb_periph_clk_driver.c b/sys/arm/mv/clk/a37x0_sb_periph_clk_driver.c
--- a/sys/arm/mv/clk/a37x0_sb_periph_clk_driver.c
+++ b/sys/arm/mv/clk/a37x0_sb_periph_clk_driver.c
@@ -35,8 +35,8 @@
#include <dev/fdt/simplebus.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/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/mv/clk/a37x0_tbg.c b/sys/arm/mv/clk/a37x0_tbg.c
--- a/sys/arm/mv/clk/a37x0_tbg.c
+++ b/sys/arm/mv/clk/a37x0_tbg.c
@@ -32,7 +32,7 @@
#include <sys/rman.h>
#include <machine/bus.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dev/ofw/ofw_bus_subr.h>
#include "clkdev_if.h"
diff --git a/sys/arm/mv/clk/a37x0_tbg_pll.h b/sys/arm/mv/clk/a37x0_tbg_pll.h
--- a/sys/arm/mv/clk/a37x0_tbg_pll.h
+++ b/sys/arm/mv/clk/a37x0_tbg_pll.h
@@ -29,7 +29,7 @@
#ifndef _TBG_CLK_PLL_H_
#define _TBG_CLK_PLL_H_
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
struct a37x0_tbg_pll_reg_def {
uint32_t offset;
diff --git a/sys/arm/mv/clk/a37x0_tbg_pll.c b/sys/arm/mv/clk/a37x0_tbg_pll.c
--- a/sys/arm/mv/clk/a37x0_tbg_pll.c
+++ b/sys/arm/mv/clk/a37x0_tbg_pll.c
@@ -30,7 +30,7 @@
#include <sys/rman.h>
#include <machine/bus.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/mv/clk/a37x0_xtal.c b/sys/arm/mv/clk/a37x0_xtal.c
--- a/sys/arm/mv/clk/a37x0_xtal.c
+++ b/sys/arm/mv/clk/a37x0_xtal.c
@@ -35,8 +35,8 @@
#include <dev/fdt/simplebus.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/ofw/ofw_bus.h>
diff --git a/sys/arm/mv/clk/armada38x_coreclk.c b/sys/arm/mv/clk/armada38x_coreclk.c
--- a/sys/arm/mv/clk/armada38x_coreclk.c
+++ b/sys/arm/mv/clk/armada38x_coreclk.c
@@ -37,7 +37,7 @@
#include <dev/fdt/simplebus.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>
#include <arm/mv/mvwin.h>
#include <arm/mv/mvreg.h>
diff --git a/sys/arm/mv/clk/armada38x_gateclk.c b/sys/arm/mv/clk/armada38x_gateclk.c
--- a/sys/arm/mv/clk/armada38x_gateclk.c
+++ b/sys/arm/mv/clk/armada38x_gateclk.c
@@ -38,8 +38,8 @@
#include <dev/fdt/simplebus.h>
#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 "clkdev_if.h"
diff --git a/sys/arm/mv/clk/armada38x_gen.h b/sys/arm/mv/clk/armada38x_gen.h
--- a/sys/arm/mv/clk/armada38x_gen.h
+++ b/sys/arm/mv/clk/armada38x_gen.h
@@ -27,7 +27,7 @@
#ifndef _ARMADA38X_GEN_H_
#define _ARMADA38X_GEN_H_
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
struct armada38x_gen_clknode_def
{
diff --git a/sys/arm/mv/clk/armada38x_gen.c b/sys/arm/mv/clk/armada38x_gen.c
--- a/sys/arm/mv/clk/armada38x_gen.c
+++ b/sys/arm/mv/clk/armada38x_gen.c
@@ -30,7 +30,7 @@
#include <machine/bus.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <arm/mv/clk/armada38x_gen.h>
diff --git a/sys/arm/mv/clk/periph.h b/sys/arm/mv/clk/periph.h
--- a/sys/arm/mv/clk/periph.h
+++ b/sys/arm/mv/clk/periph.h
@@ -29,10 +29,10 @@
#ifndef _PERIPH_H_
#define _PERIPH_H_
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_mux.h>
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_gate.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_mux.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_gate.h>
#define TBG_SEL 0x0
#define DIV_SEL0 0x4
diff --git a/sys/arm/mv/clk/periph.c b/sys/arm/mv/clk/periph.c
--- a/sys/arm/mv/clk/periph.c
+++ b/sys/arm/mv/clk/periph.c
@@ -35,11 +35,11 @@
#include <dev/fdt/simplebus.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_gate.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_gate.h>
+#include <dev/clk/clk_mux.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/mv/clk/periph_clk_d.c b/sys/arm/mv/clk/periph_clk_d.c
--- a/sys/arm/mv/clk/periph_clk_d.c
+++ b/sys/arm/mv/clk/periph_clk_d.c
@@ -35,11 +35,11 @@
#include <dev/fdt/simplebus.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_gate.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_gate.h>
+#include <dev/clk/clk_mux.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/mv/clk/periph_clk_fixed.c b/sys/arm/mv/clk/periph_clk_fixed.c
--- a/sys/arm/mv/clk/periph_clk_fixed.c
+++ b/sys/arm/mv/clk/periph_clk_fixed.c
@@ -35,11 +35,11 @@
#include <dev/fdt/simplebus.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_gate.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_gate.h>
+#include <dev/clk/clk_mux.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/mv/clk/periph_clk_gate.c b/sys/arm/mv/clk/periph_clk_gate.c
--- a/sys/arm/mv/clk/periph_clk_gate.c
+++ b/sys/arm/mv/clk/periph_clk_gate.c
@@ -35,11 +35,11 @@
#include <dev/fdt/simplebus.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_gate.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_gate.h>
+#include <dev/clk/clk_mux.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/mv/clk/periph_clk_mux_gate.c b/sys/arm/mv/clk/periph_clk_mux_gate.c
--- a/sys/arm/mv/clk/periph_clk_mux_gate.c
+++ b/sys/arm/mv/clk/periph_clk_mux_gate.c
@@ -35,11 +35,11 @@
#include <dev/fdt/simplebus.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_gate.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_gate.h>
+#include <dev/clk/clk_mux.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/mv/mv_ap806_clock.c b/sys/arm/mv/mv_ap806_clock.c
--- a/sys/arm/mv/mv_ap806_clock.c
+++ b/sys/arm/mv/mv_ap806_clock.c
@@ -39,7 +39,7 @@
#include <machine/resource.h>
#include <machine/intr.h>
-#include <dev/extres/clk/clk_fixed.h>
+#include <dev/clk/clk_fixed.h>
#include <dev/extres/syscon/syscon.h>
#include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/mv/mv_cp110_clock.c b/sys/arm/mv/mv_cp110_clock.c
--- a/sys/arm/mv/mv_cp110_clock.c
+++ b/sys/arm/mv/mv_cp110_clock.c
@@ -39,8 +39,8 @@
#include <machine/resource.h>
#include <machine/intr.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_gate.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_gate.h>
#include <dev/extres/syscon/syscon.h>
#include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/nvidia/drm2/tegra_bo.c b/sys/arm/nvidia/drm2/tegra_bo.c
--- a/sys/arm/nvidia/drm2/tegra_bo.c
+++ b/sys/arm/nvidia/drm2/tegra_bo.c
@@ -32,7 +32,7 @@
#include <machine/bus.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm_crtc_helper.h>
#include <dev/drm2/drm_fb_helper.h>
diff --git a/sys/arm/nvidia/drm2/tegra_dc.c b/sys/arm/nvidia/drm2/tegra_dc.c
--- a/sys/arm/nvidia/drm2/tegra_dc.c
+++ b/sys/arm/nvidia/drm2/tegra_dc.c
@@ -36,7 +36,7 @@
#include <machine/bus.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dev/extres/hwreset/hwreset.h>
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm_crtc_helper.h>
diff --git a/sys/arm/nvidia/drm2/tegra_drm_subr.c b/sys/arm/nvidia/drm2/tegra_drm_subr.c
--- a/sys/arm/nvidia/drm2/tegra_drm_subr.c
+++ b/sys/arm/nvidia/drm2/tegra_drm_subr.c
@@ -32,7 +32,7 @@
#include <machine/bus.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm_crtc.h>
#include <dev/drm2/drm_crtc_helper.h>
diff --git a/sys/arm/nvidia/drm2/tegra_fb.c b/sys/arm/nvidia/drm2/tegra_fb.c
--- a/sys/arm/nvidia/drm2/tegra_fb.c
+++ b/sys/arm/nvidia/drm2/tegra_fb.c
@@ -32,7 +32,7 @@
#include <machine/bus.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm_crtc_helper.h>
#include <dev/drm2/drm_fb_helper.h>
diff --git a/sys/arm/nvidia/drm2/tegra_hdmi.c b/sys/arm/nvidia/drm2/tegra_hdmi.c
--- a/sys/arm/nvidia/drm2/tegra_hdmi.c
+++ b/sys/arm/nvidia/drm2/tegra_hdmi.c
@@ -36,7 +36,7 @@
#include <machine/bus.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/drm2/drmP.h>
diff --git a/sys/arm/nvidia/drm2/tegra_host1x.c b/sys/arm/nvidia/drm2/tegra_host1x.c
--- a/sys/arm/nvidia/drm2/tegra_host1x.c
+++ b/sys/arm/nvidia/drm2/tegra_host1x.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/extres/hwreset/hwreset.h>
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm_crtc_helper.h>
diff --git a/sys/arm/nvidia/tegra124/tegra124_car.c b/sys/arm/nvidia/tegra124/tegra124_car.c
--- a/sys/arm/nvidia/tegra124/tegra124_car.c
+++ b/sys/arm/nvidia/tegra124/tegra124_car.c
@@ -38,10 +38,10 @@
#include <machine/bus.h>
#include <machine/cpu.h>
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_gate.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_gate.h>
+#include <dev/clk/clk_mux.h>
#include <dev/extres/hwreset/hwreset.h>
#include <dev/ofw/openfirm.h>
#include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/nvidia/tegra124/tegra124_clk_per.c b/sys/arm/nvidia/tegra124/tegra124_clk_per.c
--- a/sys/arm/nvidia/tegra124/tegra124_clk_per.c
+++ b/sys/arm/nvidia/tegra124/tegra124_clk_per.c
@@ -33,7 +33,7 @@
#include <machine/bus.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dt-bindings/clock/tegra124-car.h>
#include "tegra124_car.h"
diff --git a/sys/arm/nvidia/tegra124/tegra124_clk_pll.c b/sys/arm/nvidia/tegra124/tegra124_clk_pll.c
--- a/sys/arm/nvidia/tegra124/tegra124_clk_pll.c
+++ b/sys/arm/nvidia/tegra124/tegra124_clk_pll.c
@@ -33,7 +33,7 @@
#include <machine/bus.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dt-bindings/clock/tegra124-car.h>
#include "tegra124_car.h"
diff --git a/sys/arm/nvidia/tegra124/tegra124_clk_super.c b/sys/arm/nvidia/tegra124/tegra124_clk_super.c
--- a/sys/arm/nvidia/tegra124/tegra124_clk_super.c
+++ b/sys/arm/nvidia/tegra124/tegra124_clk_super.c
@@ -33,7 +33,7 @@
#include <machine/bus.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dt-bindings/clock/tegra124-car.h>
#include "tegra124_car.h"
diff --git a/sys/arm/nvidia/tegra124/tegra124_coretemp.c b/sys/arm/nvidia/tegra124/tegra124_coretemp.c
--- a/sys/arm/nvidia/tegra124/tegra124_coretemp.c
+++ b/sys/arm/nvidia/tegra124/tegra124_coretemp.c
@@ -37,7 +37,7 @@
#include <machine/bus.h>
#include <machine/cpu.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dev/ofw/ofw_bus_subr.h>
#include "tegra_soctherm_if.h"
diff --git a/sys/arm/nvidia/tegra124/tegra124_cpufreq.c b/sys/arm/nvidia/tegra124/tegra124_cpufreq.c
--- a/sys/arm/nvidia/tegra124/tegra124_cpufreq.c
+++ b/sys/arm/nvidia/tegra124/tegra124_cpufreq.c
@@ -36,7 +36,7 @@
#include <machine/bus.h>
#include <machine/cpu.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dev/extres/regulator/regulator.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/nvidia/tegra124/tegra124_pmc.c b/sys/arm/nvidia/tegra124/tegra124_pmc.c
--- a/sys/arm/nvidia/tegra124/tegra124_pmc.c
+++ b/sys/arm/nvidia/tegra124/tegra124_pmc.c
@@ -36,7 +36,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>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/nvidia/tegra_ahci.c b/sys/arm/nvidia/tegra_ahci.c
--- a/sys/arm/nvidia/tegra_ahci.c
+++ b/sys/arm/nvidia/tegra_ahci.c
@@ -44,7 +44,7 @@
#include <machine/resource.h>
#include <dev/ahci/ahci.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/regulator/regulator.h>
diff --git a/sys/arm/nvidia/tegra_efuse.c b/sys/arm/nvidia/tegra_efuse.c
--- a/sys/arm/nvidia/tegra_efuse.c
+++ b/sys/arm/nvidia/tegra_efuse.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/hwreset/hwreset.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/nvidia/tegra_ehci.c b/sys/arm/nvidia/tegra_ehci.c
--- a/sys/arm/nvidia/tegra_ehci.c
+++ b/sys/arm/nvidia/tegra_ehci.c
@@ -42,7 +42,7 @@
#include <machine/bus.h>
#include <machine/resource.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/ofw/ofw_bus.h>
diff --git a/sys/arm/nvidia/tegra_i2c.c b/sys/arm/nvidia/tegra_i2c.c
--- a/sys/arm/nvidia/tegra_i2c.c
+++ b/sys/arm/nvidia/tegra_i2c.c
@@ -43,7 +43,7 @@
#include <sys/lock.h>
#include <sys/mutex.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dev/extres/hwreset/hwreset.h>
#include <dev/iicbus/iiconf.h>
#include <dev/iicbus/iicbus.h>
diff --git a/sys/arm/nvidia/tegra_mc.c b/sys/arm/nvidia/tegra_mc.c
--- a/sys/arm/nvidia/tegra_mc.c
+++ b/sys/arm/nvidia/tegra_mc.c
@@ -42,7 +42,7 @@
#include <machine/resource.h>
#include <sys/rman.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/nvidia/tegra_pcie.c b/sys/arm/nvidia/tegra_pcie.c
--- a/sys/arm/nvidia/tegra_pcie.c
+++ b/sys/arm/nvidia/tegra_pcie.c
@@ -47,7 +47,7 @@
#include <vm/vm_kern.h>
#include <vm/pmap.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/regulator/regulator.h>
diff --git a/sys/arm/nvidia/tegra_rtc.c b/sys/arm/nvidia/tegra_rtc.c
--- a/sys/arm/nvidia/tegra_rtc.c
+++ b/sys/arm/nvidia/tegra_rtc.c
@@ -43,7 +43,7 @@
#include <machine/resource.h>
#include <sys/rman.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/nvidia/tegra_sdhci.c b/sys/arm/nvidia/tegra_sdhci.c
--- a/sys/arm/nvidia/tegra_sdhci.c
+++ b/sys/arm/nvidia/tegra_sdhci.c
@@ -48,7 +48,7 @@
#include <machine/resource.h>
#include <machine/intr.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dev/extres/hwreset/hwreset.h>
#include <dev/gpio/gpiobusvar.h>
#include <dev/mmc/bridge.h>
diff --git a/sys/arm/nvidia/tegra_soctherm.c b/sys/arm/nvidia/tegra_soctherm.c
--- a/sys/arm/nvidia/tegra_soctherm.c
+++ b/sys/arm/nvidia/tegra_soctherm.c
@@ -43,7 +43,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>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/nvidia/tegra_uart.c b/sys/arm/nvidia/tegra_uart.c
--- a/sys/arm/nvidia/tegra_uart.c
+++ b/sys/arm/nvidia/tegra_uart.c
@@ -39,7 +39,7 @@
#include <sys/sysctl.h>
#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>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/nvidia/tegra_usbphy.c b/sys/arm/nvidia/tegra_usbphy.c
--- a/sys/arm/nvidia/tegra_usbphy.c
+++ b/sys/arm/nvidia/tegra_usbphy.c
@@ -38,7 +38,7 @@
#include <machine/bus.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/regulator/regulator.h>
diff --git a/sys/arm/nvidia/tegra_xhci.c b/sys/arm/nvidia/tegra_xhci.c
--- a/sys/arm/nvidia/tegra_xhci.c
+++ b/sys/arm/nvidia/tegra_xhci.c
@@ -52,7 +52,7 @@
#include <machine/bus.h>
#include <machine/resource.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/regulator/regulator.h>
diff --git a/sys/arm/ti/am335x/am335x_dmtimer.c b/sys/arm/ti/am335x/am335x_dmtimer.c
--- a/sys/arm/ti/am335x/am335x_dmtimer.c
+++ b/sys/arm/ti/am335x/am335x_dmtimer.c
@@ -39,7 +39,7 @@
#include <machine/machdep.h> /* For arm_set_delay */
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dev/ofw/openfirm.h>
#include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/ti/am335x/am335x_dmtpps.c b/sys/arm/ti/am335x/am335x_dmtpps.c
--- a/sys/arm/ti/am335x/am335x_dmtpps.c
+++ b/sys/arm/ti/am335x/am335x_dmtpps.c
@@ -60,7 +60,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>
#include <arm/ti/ti_sysc.h>
#include <arm/ti/ti_pinmux.h>
diff --git a/sys/arm/ti/am335x/am335x_lcd.c b/sys/arm/ti/am335x/am335x_lcd.c
--- a/sys/arm/ti/am335x/am335x_lcd.c
+++ b/sys/arm/ti/am335x/am335x_lcd.c
@@ -48,7 +48,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/openfirm.h>
diff --git a/sys/arm/ti/am335x/am335x_musb.c b/sys/arm/ti/am335x/am335x_musb.c
--- a/sys/arm/ti/am335x/am335x_musb.c
+++ b/sys/arm/ti/am335x/am335x_musb.c
@@ -66,7 +66,7 @@
#include <arm/ti/am335x/am335x_scm.h>
#include <arm/ti/ti_sysc.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dev/extres/syscon/syscon.h>
#include "syscon_if.h"
diff --git a/sys/arm/ti/clk/clock_common.c b/sys/arm/ti/clk/clock_common.c
--- a/sys/arm/ti/clk/clock_common.c
+++ b/sys/arm/ti/clk/clock_common.c
@@ -38,7 +38,7 @@
#include <machine/bus.h>
#include <dev/fdt/simplebus.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk_mux.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/ti/clk/ti_clk_clkctrl.h b/sys/arm/ti/clk/ti_clk_clkctrl.h
--- a/sys/arm/ti/clk/ti_clk_clkctrl.h
+++ b/sys/arm/ti/clk/ti_clk_clkctrl.h
@@ -28,7 +28,7 @@
#ifndef _TI_CLK_CLKCTRL_H_
#define _TI_CLK_CLKCTRL_H_
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
struct ti_clk_clkctrl_def {
struct clknode_init_def clkdef;
diff --git a/sys/arm/ti/clk/ti_clk_clkctrl.c b/sys/arm/ti/clk/ti_clk_clkctrl.c
--- a/sys/arm/ti/clk/ti_clk_clkctrl.c
+++ b/sys/arm/ti/clk/ti_clk_clkctrl.c
@@ -30,7 +30,7 @@
#include <sys/bus.h>
#include <sys/malloc.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <arm/ti/clk/ti_clk_clkctrl.h>
diff --git a/sys/arm/ti/clk/ti_clk_dpll.h b/sys/arm/ti/clk/ti_clk_dpll.h
--- a/sys/arm/ti/clk/ti_clk_dpll.h
+++ b/sys/arm/ti/clk/ti_clk_dpll.h
@@ -30,7 +30,7 @@
#ifndef _TI_DPLL_CLOCK_H_
#define _TI_DPLL_CLOCK_H_
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
/* Registers are described in AM335x TRM chapter 8.1.12.2.* */
diff --git a/sys/arm/ti/clk/ti_clk_dpll.c b/sys/arm/ti/clk/ti_clk_dpll.c
--- a/sys/arm/ti/clk/ti_clk_dpll.c
+++ b/sys/arm/ti/clk/ti_clk_dpll.c
@@ -33,7 +33,7 @@
#include <sys/systm.h>
#include <sys/bus.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <arm/ti/clk/ti_clk_dpll.h>
diff --git a/sys/arm/ti/clk/ti_divider_clock.c b/sys/arm/ti/clk/ti_divider_clock.c
--- a/sys/arm/ti/clk/ti_divider_clock.c
+++ b/sys/arm/ti/clk/ti_divider_clock.c
@@ -36,7 +36,7 @@
#include <machine/bus.h>
#include <dev/fdt/simplebus.h>
-#include <dev/extres/clk/clk_div.h>
+#include <dev/clk/clk_div.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/ti/clk/ti_dpll_clock.c b/sys/arm/ti/clk/ti_dpll_clock.c
--- a/sys/arm/ti/clk/ti_dpll_clock.c
+++ b/sys/arm/ti/clk/ti_dpll_clock.c
@@ -36,7 +36,7 @@
#include <machine/bus.h>
#include <dev/fdt/simplebus.h>
-#include <dev/extres/clk/clk_div.h>
+#include <dev/clk/clk_div.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/ti/clk/ti_gate_clock.c b/sys/arm/ti/clk/ti_gate_clock.c
--- a/sys/arm/ti/clk/ti_gate_clock.c
+++ b/sys/arm/ti/clk/ti_gate_clock.c
@@ -36,7 +36,7 @@
#include <machine/bus.h>
#include <dev/fdt/simplebus.h>
-#include <dev/extres/clk/clk_gate.h>
+#include <dev/clk/clk_gate.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/ti/clk/ti_mux_clock.c b/sys/arm/ti/clk/ti_mux_clock.c
--- a/sys/arm/ti/clk/ti_mux_clock.c
+++ b/sys/arm/ti/clk/ti_mux_clock.c
@@ -38,7 +38,7 @@
#include <machine/bus.h>
#include <dev/fdt/simplebus.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk_mux.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/ti/ti_pruss.c b/sys/arm/ti/ti_pruss.c
--- a/sys/arm/ti/ti_pruss.c
+++ b/sys/arm/ti/ti_pruss.c
@@ -55,7 +55,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/ti/ti_sysc.h>
#include <arm/ti/ti_pruss.h>
diff --git a/sys/arm/ti/ti_sdhci.c b/sys/arm/ti/ti_sdhci.c
--- a/sys/arm/ti/ti_sdhci.c
+++ b/sys/arm/ti/ti_sdhci.c
@@ -46,7 +46,7 @@
#include <arm/ti/ti_sysc.h>
#include "gpio_if.h"
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/ti/ti_sysc.c b/sys/arm/ti/ti_sysc.c
--- a/sys/arm/ti/ti_sysc.c
+++ b/sys/arm/ti/ti_sysc.c
@@ -45,7 +45,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/ti/ti_sysc.h>
#include <arm/ti/clk/clock_common.h>
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_composite.h b/sys/arm64/freescale/imx/clk/imx_clk_composite.h
--- a/sys/arm64/freescale/imx/clk/imx_clk_composite.h
+++ b/sys/arm64/freescale/imx/clk/imx_clk_composite.h
@@ -28,7 +28,7 @@
#ifndef _IMX_CLK_COMPOSITE_H_
#define _IMX_CLK_COMPOSITE_H_
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
struct imx_clk_composite_def {
struct clknode_init_def clkdef;
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_composite.c b/sys/arm64/freescale/imx/clk/imx_clk_composite.c
--- a/sys/arm64/freescale/imx/clk/imx_clk_composite.c
+++ b/sys/arm64/freescale/imx/clk/imx_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 <arm64/freescale/imx/clk/imx_clk_composite.h>
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_frac_pll.h b/sys/arm64/freescale/imx/clk/imx_clk_frac_pll.h
--- a/sys/arm64/freescale/imx/clk/imx_clk_frac_pll.h
+++ b/sys/arm64/freescale/imx/clk/imx_clk_frac_pll.h
@@ -28,7 +28,7 @@
#ifndef _IMX_CLK_FRAC_PLL_H_
#define _IMX_CLK_FRAC_PLL_H_
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
struct imx_clk_frac_pll_def {
struct clknode_init_def clkdef;
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_frac_pll.c b/sys/arm64/freescale/imx/clk/imx_clk_frac_pll.c
--- a/sys/arm64/freescale/imx/clk/imx_clk_frac_pll.c
+++ b/sys/arm64/freescale/imx/clk/imx_clk_frac_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 <arm64/freescale/imx/clk/imx_clk_frac_pll.h>
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_gate.h b/sys/arm64/freescale/imx/clk/imx_clk_gate.h
--- a/sys/arm64/freescale/imx/clk/imx_clk_gate.h
+++ b/sys/arm64/freescale/imx/clk/imx_clk_gate.h
@@ -28,7 +28,7 @@
#ifndef _IMX_CLK_GATE_H_
#define _IMX_CLK_GATE_H_
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
struct imx_clk_gate_def {
struct clknode_init_def clkdef;
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_gate.c b/sys/arm64/freescale/imx/clk/imx_clk_gate.c
--- a/sys/arm64/freescale/imx/clk/imx_clk_gate.c
+++ b/sys/arm64/freescale/imx/clk/imx_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 <arm64/freescale/imx/clk/imx_clk_gate.h>
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_mux.h b/sys/arm64/freescale/imx/clk/imx_clk_mux.h
--- a/sys/arm64/freescale/imx/clk/imx_clk_mux.h
+++ b/sys/arm64/freescale/imx/clk/imx_clk_mux.h
@@ -28,7 +28,7 @@
#ifndef _IMX_CLK_MUX_H_
#define _IMX_CLK_MUX_H_
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
struct imx_clk_mux_def {
struct clknode_init_def clkdef;
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_mux.c b/sys/arm64/freescale/imx/clk/imx_clk_mux.c
--- a/sys/arm64/freescale/imx/clk/imx_clk_mux.c
+++ b/sys/arm64/freescale/imx/clk/imx_clk_mux.c
@@ -34,7 +34,7 @@
#include <machine/bus.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <arm64/freescale/imx/clk/imx_clk_mux.h>
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.h b/sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.h
--- a/sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.h
+++ b/sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.h
@@ -28,7 +28,7 @@
#ifndef _IMX_CLK_SSCG_PLL_H_
#define _IMX_CLK_SSCG_PLL_H_
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
struct imx_clk_sscg_pll_def {
struct clknode_init_def clkdef;
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.c b/sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.c
--- a/sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.c
+++ b/sys/arm64/freescale/imx/clk/imx_clk_sscg_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 <arm64/freescale/imx/clk/imx_clk_sscg_pll.h>
diff --git a/sys/arm64/freescale/imx/imx_ccm_clk.h b/sys/arm64/freescale/imx/imx_ccm_clk.h
--- a/sys/arm64/freescale/imx/imx_ccm_clk.h
+++ b/sys/arm64/freescale/imx/imx_ccm_clk.h
@@ -28,11 +28,11 @@
#ifndef IMX6_CCM_CLK_H
#define IMX6_CCM_CLK_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_gate.h>
-#include <dev/extres/clk/clk_link.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_gate.h>
+#include <dev/clk/clk_link.h>
enum imx_clk_type {
IMX_CLK_UNDEFINED = 0,
diff --git a/sys/arm64/nvidia/tegra210/tegra210_car.c b/sys/arm64/nvidia/tegra210/tegra210_car.c
--- a/sys/arm64/nvidia/tegra210/tegra210_car.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_car.c
@@ -39,10 +39,10 @@
#include <machine/bus.h>
#include <machine/cpu.h>
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_gate.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_gate.h>
+#include <dev/clk/clk_mux.h>
#include <dev/extres/hwreset/hwreset.h>
#include <dev/ofw/openfirm.h>
#include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm64/nvidia/tegra210/tegra210_clk_per.c b/sys/arm64/nvidia/tegra210/tegra210_clk_per.c
--- a/sys/arm64/nvidia/tegra210/tegra210_clk_per.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_clk_per.c
@@ -34,7 +34,7 @@
#include <machine/bus.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dt-bindings/clock/tegra210-car.h>
#include <dt-bindings/reset/tegra210-car.h>
diff --git a/sys/arm64/nvidia/tegra210/tegra210_clk_pll.c b/sys/arm64/nvidia/tegra210/tegra210_clk_pll.c
--- a/sys/arm64/nvidia/tegra210/tegra210_clk_pll.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_clk_pll.c
@@ -34,10 +34,10 @@
#include <machine/bus.h>
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_gate.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_gate.h>
+#include <dev/clk/clk_mux.h>
#include <dt-bindings/clock/tegra210-car.h>
#include "tegra210_car.h"
diff --git a/sys/arm64/nvidia/tegra210/tegra210_clk_super.c b/sys/arm64/nvidia/tegra210/tegra210_clk_super.c
--- a/sys/arm64/nvidia/tegra210/tegra210_clk_super.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_clk_super.c
@@ -34,7 +34,7 @@
#include <machine/bus.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dt-bindings/clock/tegra210-car.h>
#include "tegra210_car.h"
diff --git a/sys/arm64/nvidia/tegra210/tegra210_coretemp.c b/sys/arm64/nvidia/tegra210/tegra210_coretemp.c
--- a/sys/arm64/nvidia/tegra210/tegra210_coretemp.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_coretemp.c
@@ -38,7 +38,7 @@
#include <machine/bus.h>
#include <machine/cpu.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dev/ofw/ofw_bus_subr.h>
#include "tegra_soctherm_if.h"
diff --git a/sys/arm64/nvidia/tegra210/tegra210_cpufreq.c b/sys/arm64/nvidia/tegra210/tegra210_cpufreq.c
--- a/sys/arm64/nvidia/tegra210/tegra210_cpufreq.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_cpufreq.c
@@ -37,7 +37,7 @@
#include <machine/bus.h>
#include <machine/cpu.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dev/extres/regulator/regulator.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm64/nvidia/tegra210/tegra210_pmc.c b/sys/arm64/nvidia/tegra210/tegra210_pmc.c
--- a/sys/arm64/nvidia/tegra210/tegra210_pmc.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_pmc.c
@@ -36,7 +36,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>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c b/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c
--- a/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c
@@ -35,7 +35,7 @@
#include <machine/bus.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/regulator/regulator.h>
diff --git a/sys/arm64/qoriq/clk/ls1028a_clkgen.c b/sys/arm64/qoriq/clk/ls1028a_clkgen.c
--- a/sys/arm64/qoriq/clk/ls1028a_clkgen.c
+++ b/sys/arm64/qoriq/clk/ls1028a_clkgen.c
@@ -39,7 +39,7 @@
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
-#include <dev/extres/clk/clk_fixed.h>
+#include <dev/clk/clk_fixed.h>
#include <arm64/qoriq/clk/qoriq_clkgen.h>
diff --git a/sys/arm64/qoriq/clk/ls1028a_flexspi_clk.c b/sys/arm64/qoriq/clk/ls1028a_flexspi_clk.c
--- a/sys/arm64/qoriq/clk/ls1028a_flexspi_clk.c
+++ b/sys/arm64/qoriq/clk/ls1028a_flexspi_clk.c
@@ -40,7 +40,7 @@
#include <machine/bus.h>
#include <machine/cpu.h>
-#include <dev/extres/clk/clk_div.h>
+#include <dev/clk/clk_div.h>
#include <dev/ofw/openfirm.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm64/qoriq/clk/ls1046a_clkgen.c b/sys/arm64/qoriq/clk/ls1046a_clkgen.c
--- a/sys/arm64/qoriq/clk/ls1046a_clkgen.c
+++ b/sys/arm64/qoriq/clk/ls1046a_clkgen.c
@@ -39,7 +39,7 @@
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
-#include <dev/extres/clk/clk_fixed.h>
+#include <dev/clk/clk_fixed.h>
#include <arm64/qoriq/clk/qoriq_clkgen.h>
diff --git a/sys/arm64/qoriq/clk/ls1088a_clkgen.c b/sys/arm64/qoriq/clk/ls1088a_clkgen.c
--- a/sys/arm64/qoriq/clk/ls1088a_clkgen.c
+++ b/sys/arm64/qoriq/clk/ls1088a_clkgen.c
@@ -44,7 +44,7 @@
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
-#include <dev/extres/clk/clk_fixed.h>
+#include <dev/clk/clk_fixed.h>
#include <arm64/qoriq/clk/qoriq_clkgen.h>
diff --git a/sys/arm64/qoriq/clk/lx2160a_clkgen.c b/sys/arm64/qoriq/clk/lx2160a_clkgen.c
--- a/sys/arm64/qoriq/clk/lx2160a_clkgen.c
+++ b/sys/arm64/qoriq/clk/lx2160a_clkgen.c
@@ -42,7 +42,7 @@
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
-#include <dev/extres/clk/clk_fixed.h>
+#include <dev/clk/clk_fixed.h>
#include <arm64/qoriq/clk/qoriq_clkgen.h>
diff --git a/sys/arm64/qoriq/clk/qoriq_clk_pll.h b/sys/arm64/qoriq/clk/qoriq_clk_pll.h
--- a/sys/arm64/qoriq/clk/qoriq_clk_pll.h
+++ b/sys/arm64/qoriq/clk/qoriq_clk_pll.h
@@ -30,7 +30,7 @@
#ifndef _QORIQ_CLK_PLL_H_
#define _QORIQ_CLK_PLL_H_
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#define QORIQ_CLK_PLL_HAS_KILL_BIT 0x01
diff --git a/sys/arm64/qoriq/clk/qoriq_clk_pll.c b/sys/arm64/qoriq/clk/qoriq_clk_pll.c
--- a/sys/arm64/qoriq/clk/qoriq_clk_pll.c
+++ b/sys/arm64/qoriq/clk/qoriq_clk_pll.c
@@ -31,8 +31,8 @@
#include <sys/bus.h>
#include <sys/malloc.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 <arm64/qoriq/clk/qoriq_clkgen.h>
diff --git a/sys/arm64/qoriq/clk/qoriq_clkgen.h b/sys/arm64/qoriq/clk/qoriq_clkgen.h
--- a/sys/arm64/qoriq/clk/qoriq_clkgen.h
+++ b/sys/arm64/qoriq/clk/qoriq_clkgen.h
@@ -30,8 +30,8 @@
#ifndef _QORIQ_CLKGEN_H_
#define _QORIQ_CLKGEN_H_
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_mux.h>
#include <arm64/qoriq/clk/qoriq_clk_pll.h>
diff --git a/sys/arm64/qoriq/clk/qoriq_clkgen.c b/sys/arm64/qoriq/clk/qoriq_clkgen.c
--- a/sys/arm64/qoriq/clk/qoriq_clkgen.c
+++ b/sys/arm64/qoriq/clk/qoriq_clkgen.c
@@ -42,7 +42,7 @@
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
-#include <dev/extres/clk/clk_fixed.h>
+#include <dev/clk/clk_fixed.h>
#include <arm64/qoriq/clk/qoriq_clkgen.h>
diff --git a/sys/arm64/qoriq/qoriq_therm.c b/sys/arm64/qoriq/qoriq_therm.c
--- a/sys/arm64/qoriq/qoriq_therm.c
+++ b/sys/arm64/qoriq/qoriq_therm.c
@@ -42,7 +42,7 @@
#include <machine/bus.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm64/rockchip/rk3328_codec.c b/sys/arm64/rockchip/rk3328_codec.c
--- a/sys/arm64/rockchip/rk3328_codec.c
+++ b/sys/arm64/rockchip/rk3328_codec.c
@@ -40,7 +40,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/syscon/syscon.h>
#include "syscon_if.h"
diff --git a/sys/arm64/rockchip/rk3399_emmcphy.c b/sys/arm64/rockchip/rk3399_emmcphy.c
--- a/sys/arm64/rockchip/rk3399_emmcphy.c
+++ b/sys/arm64/rockchip/rk3399_emmcphy.c
@@ -43,7 +43,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/syscon/syscon.h>
#include <dev/extres/phy/phy.h>
diff --git a/sys/arm64/rockchip/rk3568_combphy.c b/sys/arm64/rockchip/rk3568_combphy.c
--- a/sys/arm64/rockchip/rk3568_combphy.c
+++ b/sys/arm64/rockchip/rk3568_combphy.c
@@ -40,7 +40,7 @@
#include <dev/fdt/simple_mfd.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/arm64/rockchip/rk3568_pcie.c b/sys/arm64/rockchip/rk3568_pcie.c
--- a/sys/arm64/rockchip/rk3568_pcie.c
+++ b/sys/arm64/rockchip/rk3568_pcie.c
@@ -49,7 +49,7 @@
#include <dev/pci/pcib_private.h>
#include <dev/pci/pci_dw.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dev/extres/phy/phy.h>
#include <dev/extres/regulator/regulator.h>
#include <dev/extres/hwreset/hwreset.h>
diff --git a/sys/arm64/rockchip/rk3568_pciephy.c b/sys/arm64/rockchip/rk3568_pciephy.c
--- a/sys/arm64/rockchip/rk3568_pciephy.c
+++ b/sys/arm64/rockchip/rk3568_pciephy.c
@@ -40,7 +40,7 @@
#include <dev/fdt/simple_mfd.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/arm64/rockchip/rk_gpio.c b/sys/arm64/rockchip/rk_gpio.c
--- a/sys/arm64/rockchip/rk_gpio.c
+++ b/sys/arm64/rockchip/rk_gpio.c
@@ -46,7 +46,7 @@
#include <dev/gpio/gpiobusvar.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>
#include "gpio_if.h"
#include "pic_if.h"
diff --git a/sys/arm64/rockchip/rk_i2s.c b/sys/arm64/rockchip/rk_i2s.c
--- a/sys/arm64/rockchip/rk_i2s.c
+++ b/sys/arm64/rockchip/rk_i2s.c
@@ -39,7 +39,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/syscon/syscon.h>
diff --git a/sys/arm64/rockchip/rk_pcie.c b/sys/arm64/rockchip/rk_pcie.c
--- a/sys/arm64/rockchip/rk_pcie.c
+++ b/sys/arm64/rockchip/rk_pcie.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/hwreset/hwreset.h>
#include <dev/extres/phy/phy.h>
#include <dev/extres/regulator/regulator.h>
diff --git a/sys/arm64/rockchip/rk_pcie_phy.c b/sys/arm64/rockchip/rk_pcie_phy.c
--- a/sys/arm64/rockchip/rk_pcie_phy.c
+++ b/sys/arm64/rockchip/rk_pcie_phy.c
@@ -44,7 +44,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.h>
#include <dev/extres/phy/phy_internal.h>
#include <dev/extres/syscon/syscon.h>
diff --git a/sys/arm64/rockchip/rk_tsadc.c b/sys/arm64/rockchip/rk_tsadc.c
--- a/sys/arm64/rockchip/rk_tsadc.c
+++ b/sys/arm64/rockchip/rk_tsadc.c
@@ -44,7 +44,7 @@
#include <machine/bus.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dev/extres/hwreset/hwreset.h>
#include <dev/extres/syscon/syscon.h>
#include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm64/rockchip/rk_typec_phy.c b/sys/arm64/rockchip/rk_typec_phy.c
--- a/sys/arm64/rockchip/rk_typec_phy.c
+++ b/sys/arm64/rockchip/rk_typec_phy.c
@@ -43,7 +43,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>
#include <dev/extres/syscon/syscon.h>
#include <dev/extres/hwreset/hwreset.h>
diff --git a/sys/arm64/rockchip/rk_usb2phy.c b/sys/arm64/rockchip/rk_usb2phy.c
--- a/sys/arm64/rockchip/rk_usb2phy.c
+++ b/sys/arm64/rockchip/rk_usb2phy.c
@@ -43,7 +43,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>
#include <dev/extres/regulator/regulator.h>
#include <dev/extres/syscon/syscon.h>
diff --git a/sys/arm64/rockchip/rk_usbphy.c b/sys/arm64/rockchip/rk_usbphy.c
--- a/sys/arm64/rockchip/rk_usbphy.c
+++ b/sys/arm64/rockchip/rk_usbphy.c
@@ -36,7 +36,7 @@
#include <machine/bus.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/regulator/regulator.h>
diff --git a/sys/conf/files b/sys/conf/files
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1353,6 +1353,15 @@
dev/cfi/cfi_disk.c optional cfid
dev/chromebook_platform/chromebook_platform.c optional chromebook_platform
dev/ciss/ciss.c optional ciss
+dev/clk/clk.c optional clk
+dev/clk/clkdev_if.m optional clk
+dev/clk/clknode_if.m optional clk
+dev/clk/clk_bus.c optional clk fdt
+dev/clk/clk_div.c optional clk
+dev/clk/clk_fixed.c optional clk
+dev/clk/clk_gate.c optional clk
+dev/clk/clk_link.c optional clk
+dev/clk/clk_mux.c optional clk
dev/cpufreq/ichss.c optional cpufreq pci
dev/cxgb/cxgb_main.c optional cxgb pci \
compile-with "${NORMAL_C} -I$S/dev/cxgb"
@@ -1668,15 +1677,6 @@
dev/evdev/evdev_utils.c optional evdev
dev/evdev/uinput.c optional evdev uinput
dev/exca/exca.c optional cbb
-dev/extres/clk/clk.c optional clk
-dev/extres/clk/clkdev_if.m optional clk
-dev/extres/clk/clknode_if.m optional clk
-dev/extres/clk/clk_bus.c optional clk fdt
-dev/extres/clk/clk_div.c optional clk
-dev/extres/clk/clk_fixed.c optional clk
-dev/extres/clk/clk_gate.c optional clk
-dev/extres/clk/clk_link.c optional clk
-dev/extres/clk/clk_mux.c optional clk
dev/extres/phy/phy.c optional phy
dev/extres/phy/phydev_if.m optional phy fdt
dev/extres/phy/phynode_if.m optional phy
diff --git a/sys/dev/ahci/ahci_fsl_fdt.c b/sys/dev/ahci/ahci_fsl_fdt.c
--- 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
--- 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
--- 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.h b/sys/dev/clk/allwinner/aw_ccung.h
--- 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_ccung.c b/sys/dev/clk/allwinner/aw_ccung.c
--- 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_clk_frac.h b/sys/dev/clk/allwinner/aw_clk_frac.h
--- 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_frac.c b/sys/dev/clk/allwinner/aw_clk_frac.c
--- 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_m.h b/sys/dev/clk/allwinner/aw_clk_m.h
--- 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_m.c b/sys/dev/clk/allwinner/aw_clk_m.c
--- 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_mipi.h b/sys/dev/clk/allwinner/aw_clk_mipi.h
--- 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_mipi.c b/sys/dev/clk/allwinner/aw_clk_mipi.c
--- 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_nkmp.c b/sys/dev/clk/allwinner/aw_clk_nkmp.c
--- 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.h b/sys/dev/clk/allwinner/aw_clk_nm.h
--- 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_nm.c b/sys/dev/clk/allwinner/aw_clk_nm.c
--- 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_nmm.h b/sys/dev/clk/allwinner/aw_clk_nmm.h
--- 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_nmm.c b/sys/dev/clk/allwinner/aw_clk_nmm.c
--- 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_np.h b/sys/dev/clk/allwinner/aw_clk_np.h
--- 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_np.c b/sys/dev/clk/allwinner/aw_clk_np.c
--- 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_prediv_mux.c b/sys/dev/clk/allwinner/aw_clk_prediv_mux.c
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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.h b/sys/dev/clk/clk.h
rename from sys/dev/extres/clk/clk.h
rename to sys/dev/clk/clk.h
--- 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_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.c b/sys/dev/clk/clk.c
rename from sys/dev/extres/clk/clk.c
rename to sys/dev/clk/clk.c
--- 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_bus.c b/sys/dev/clk/clk_bus.c
rename from sys/dev/extres/clk/clk_bus.c
rename to sys/dev/clk/clk_bus.c
diff --git a/sys/dev/extres/clk/clk_div.h b/sys/dev/clk/clk_div.h
rename from sys/dev/extres/clk/clk_div.h
rename to sys/dev/clk/clk_div.h
--- 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 @@
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_div.c b/sys/dev/clk/clk_div.c
rename from sys/dev/extres/clk/clk_div.c
rename to sys/dev/clk/clk_div.c
--- 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_fixed.h b/sys/dev/clk/clk_fixed.h
rename from sys/dev/extres/clk/clk_fixed.h
rename to sys/dev/clk/clk_fixed.h
--- 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 @@
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_fixed.c b/sys/dev/clk/clk_fixed.c
rename from sys/dev/extres/clk/clk_fixed.c
rename to sys/dev/clk/clk_fixed.c
--- 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_gate.h b/sys/dev/clk/clk_gate.h
rename from sys/dev/extres/clk/clk_gate.h
rename to sys/dev/clk/clk_gate.h
--- 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 @@
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_gate.c b/sys/dev/clk/clk_gate.c
rename from sys/dev/extres/clk/clk_gate.c
rename to sys/dev/clk/clk_gate.c
--- 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_link.h b/sys/dev/clk/clk_link.h
rename from sys/dev/extres/clk/clk_link.h
rename to sys/dev/clk/clk_link.h
--- 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 @@
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_link.c b/sys/dev/clk/clk_link.c
rename from sys/dev/extres/clk/clk_link.c
rename to sys/dev/clk/clk_link.c
--- 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_mux.h b/sys/dev/clk/clk_mux.h
rename from sys/dev/extres/clk/clk_mux.h
rename to sys/dev/clk/clk_mux.h
--- 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 @@
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/clk_mux.c b/sys/dev/clk/clk_mux.c
rename from sys/dev/extres/clk/clk_mux.c
rename to sys/dev/clk/clk_mux.c
--- 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/clkdev_if.m b/sys/dev/clk/clkdev_if.m
rename from sys/dev/extres/clk/clkdev_if.m
rename to sys/dev/clk/clkdev_if.m
diff --git a/sys/dev/extres/clk/clknode_if.m b/sys/dev/clk/clknode_if.m
rename from sys/dev/extres/clk/clknode_if.m
rename to sys/dev/clk/clknode_if.m
diff --git a/sys/dev/clk/rockchip/rk3288_cru.c b/sys/dev/clk/rockchip/rk3288_cru.c
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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.h b/sys/dev/clk/rockchip/rk_clk_armclk.h
--- 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_armclk.c b/sys/dev/clk/rockchip/rk_clk_armclk.c
--- 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_composite.h b/sys/dev/clk/rockchip/rk_clk_composite.h
--- 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_composite.c b/sys/dev/clk/rockchip/rk_clk_composite.c
--- 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_fract.h b/sys/dev/clk/rockchip/rk_clk_fract.h
--- 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_fract.c b/sys/dev/clk/rockchip/rk_clk_fract.c
--- 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_gate.h b/sys/dev/clk/rockchip/rk_clk_gate.h
--- 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_gate.c b/sys/dev/clk/rockchip/rk_clk_gate.c
--- 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_mux.h b/sys/dev/clk/rockchip/rk_clk_mux.h
--- 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_mux.c b/sys/dev/clk/rockchip/rk_clk_mux.c
--- 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_pll.h b/sys/dev/clk/rockchip/rk_clk_pll.h
--- 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_clk_pll.c b/sys/dev/clk/rockchip/rk_clk_pll.c
--- 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_cru.h b/sys/dev/clk/rockchip/rk_cru.h
--- 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/rockchip/rk_cru.c b/sys/dev/clk/rockchip/rk_cru.c
--- 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/xilinx/zynqmp_clk_div.c b/sys/dev/clk/xilinx/zynqmp_clk_div.c
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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>
diff --git a/sys/riscv/sifive/fu740_pci_dw.c b/sys/riscv/sifive/fu740_pci_dw.c
--- a/sys/riscv/sifive/fu740_pci_dw.c
+++ b/sys/riscv/sifive/fu740_pci_dw.c
@@ -40,7 +40,7 @@
#include <machine/intr.h>
#include <machine/resource.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dev/extres/hwreset/hwreset.h>
#include <dev/gpio/gpiobusvar.h>
#include <dev/ofw/ofw_bus.h>
diff --git a/sys/riscv/sifive/sifive_prci.c b/sys/riscv/sifive/sifive_prci.c
--- a/sys/riscv/sifive/sifive_prci.c
+++ b/sys/riscv/sifive/sifive_prci.c
@@ -42,9 +42,9 @@
#include <machine/bus.h>
#include <machine/cpu.h>
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_gate.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_gate.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/riscv/sifive/sifive_spi.c b/sys/riscv/sifive/sifive_spi.c
--- a/sys/riscv/sifive/sifive_spi.c
+++ b/sys/riscv/sifive/sifive_spi.c
@@ -41,7 +41,7 @@
#include <machine/bus.h>
#include <machine/cpu.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/riscv/sifive/sifive_uart.c b/sys/riscv/sifive/sifive_uart.c
--- a/sys/riscv/sifive/sifive_uart.c
+++ b/sys/riscv/sifive/sifive_uart.c
@@ -41,7 +41,7 @@
#include <machine/bus.h>
#include <machine/cpu.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>

File Metadata

Mime Type
text/plain
Expires
Sun, Jan 18, 10:49 PM (13 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27722105
Default Alt Text
D43191.diff (104 KB)

Event Timeline