git: be82b3a0bf72 - main - clk: Move clock code in dev/clk
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 10 Jan 2024 18:21:07 UTC
The branch main has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=be82b3a0bf72ed3b5f01ac9fcd8dcd3802e3c742
commit be82b3a0bf72ed3b5f01ac9fcd8dcd3802e3c742
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2023-12-26 17:43:48 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2024-01-10 18:20:26 +0000
clk: Move clock code in dev/clk
We've removed kernel option EXT_RESOURCES almost two years ago.
While it was ok to have some code under a common 'extres' subdirectory
at first, we now have a lot of consumer of it and we made it mandatory
so no need to have it under a cryptic name.
Reviewed by: mhorne
Sponsored by: Beckhoff Automation GmbH & Co. KG
Differential Revision: https://reviews.freebsd.org/D43191
---
sys/arm/allwinner/a10_ahci.c | 2 +-
sys/arm/allwinner/a10_codec.c | 2 +-
sys/arm/allwinner/a10_dmac.c | 2 +-
sys/arm/allwinner/a10_timer.c | 2 +-
sys/arm/allwinner/a31_dmac.c | 2 +-
sys/arm/allwinner/a33_codec.c | 2 +-
sys/arm/allwinner/a64/sun50i_a64_acodec.c | 2 +-
sys/arm/allwinner/aw_cir.c | 2 +-
sys/arm/allwinner/aw_gmacclk.c | 4 ++--
sys/arm/allwinner/aw_gpio.c | 2 +-
sys/arm/allwinner/aw_i2s.c | 2 +-
sys/arm/allwinner/aw_mmc.c | 2 +-
sys/arm/allwinner/aw_rsb.c | 2 +-
sys/arm/allwinner/aw_rtc.c | 2 +-
sys/arm/allwinner/aw_thermal.c | 2 +-
sys/arm/allwinner/aw_usb3phy.c | 2 +-
sys/arm/allwinner/aw_usbphy.c | 2 +-
sys/arm/allwinner/if_awg.c | 2 +-
sys/arm/allwinner/if_emac.c | 2 +-
sys/arm/freescale/imx/imx_gpio.c | 2 +-
sys/arm/freescale/imx/imx_i2c.c | 2 +-
sys/arm/freescale/vybrid/vf_i2c.c | 2 +-
sys/arm/mv/clk/a37x0_nb_periph_clk_driver.c | 4 ++--
sys/arm/mv/clk/a37x0_periph_clk_driver.c | 4 ++--
sys/arm/mv/clk/a37x0_sb_periph_clk_driver.c | 4 ++--
sys/arm/mv/clk/a37x0_tbg.c | 2 +-
sys/arm/mv/clk/a37x0_tbg_pll.c | 2 +-
sys/arm/mv/clk/a37x0_tbg_pll.h | 2 +-
sys/arm/mv/clk/a37x0_xtal.c | 4 ++--
sys/arm/mv/clk/armada38x_coreclk.c | 2 +-
sys/arm/mv/clk/armada38x_gateclk.c | 4 ++--
sys/arm/mv/clk/armada38x_gen.c | 2 +-
sys/arm/mv/clk/armada38x_gen.h | 2 +-
sys/arm/mv/clk/periph.c | 10 +++++-----
sys/arm/mv/clk/periph.h | 8 ++++----
sys/arm/mv/clk/periph_clk_d.c | 10 +++++-----
sys/arm/mv/clk/periph_clk_fixed.c | 10 +++++-----
sys/arm/mv/clk/periph_clk_gate.c | 10 +++++-----
sys/arm/mv/clk/periph_clk_mux_gate.c | 10 +++++-----
sys/arm/mv/mv_ap806_clock.c | 2 +-
sys/arm/mv/mv_cp110_clock.c | 4 ++--
sys/arm/nvidia/drm2/tegra_bo.c | 2 +-
sys/arm/nvidia/drm2/tegra_dc.c | 2 +-
sys/arm/nvidia/drm2/tegra_drm_subr.c | 2 +-
sys/arm/nvidia/drm2/tegra_fb.c | 2 +-
sys/arm/nvidia/drm2/tegra_hdmi.c | 2 +-
sys/arm/nvidia/drm2/tegra_host1x.c | 2 +-
sys/arm/nvidia/tegra124/tegra124_car.c | 8 ++++----
sys/arm/nvidia/tegra124/tegra124_clk_per.c | 2 +-
sys/arm/nvidia/tegra124/tegra124_clk_pll.c | 2 +-
sys/arm/nvidia/tegra124/tegra124_clk_super.c | 2 +-
sys/arm/nvidia/tegra124/tegra124_coretemp.c | 2 +-
sys/arm/nvidia/tegra124/tegra124_cpufreq.c | 2 +-
sys/arm/nvidia/tegra124/tegra124_pmc.c | 2 +-
sys/arm/nvidia/tegra_ahci.c | 2 +-
sys/arm/nvidia/tegra_efuse.c | 2 +-
sys/arm/nvidia/tegra_ehci.c | 2 +-
sys/arm/nvidia/tegra_i2c.c | 2 +-
sys/arm/nvidia/tegra_mc.c | 2 +-
sys/arm/nvidia/tegra_pcie.c | 2 +-
sys/arm/nvidia/tegra_rtc.c | 2 +-
sys/arm/nvidia/tegra_sdhci.c | 2 +-
sys/arm/nvidia/tegra_soctherm.c | 2 +-
sys/arm/nvidia/tegra_uart.c | 2 +-
sys/arm/nvidia/tegra_usbphy.c | 2 +-
sys/arm/nvidia/tegra_xhci.c | 2 +-
sys/arm/ti/am335x/am335x_dmtimer.c | 2 +-
sys/arm/ti/am335x/am335x_dmtpps.c | 2 +-
sys/arm/ti/am335x/am335x_lcd.c | 2 +-
sys/arm/ti/am335x/am335x_musb.c | 2 +-
sys/arm/ti/clk/clock_common.c | 2 +-
sys/arm/ti/clk/ti_clk_clkctrl.c | 2 +-
sys/arm/ti/clk/ti_clk_clkctrl.h | 2 +-
sys/arm/ti/clk/ti_clk_dpll.c | 2 +-
sys/arm/ti/clk/ti_clk_dpll.h | 2 +-
sys/arm/ti/clk/ti_divider_clock.c | 2 +-
sys/arm/ti/clk/ti_dpll_clock.c | 2 +-
sys/arm/ti/clk/ti_gate_clock.c | 2 +-
sys/arm/ti/clk/ti_mux_clock.c | 2 +-
sys/arm/ti/ti_pruss.c | 2 +-
sys/arm/ti/ti_sdhci.c | 2 +-
sys/arm/ti/ti_sysc.c | 2 +-
sys/arm64/freescale/imx/clk/imx_clk_composite.c | 2 +-
sys/arm64/freescale/imx/clk/imx_clk_composite.h | 2 +-
sys/arm64/freescale/imx/clk/imx_clk_frac_pll.c | 2 +-
sys/arm64/freescale/imx/clk/imx_clk_frac_pll.h | 2 +-
sys/arm64/freescale/imx/clk/imx_clk_gate.c | 2 +-
sys/arm64/freescale/imx/clk/imx_clk_gate.h | 2 +-
sys/arm64/freescale/imx/clk/imx_clk_mux.c | 2 +-
sys/arm64/freescale/imx/clk/imx_clk_mux.h | 2 +-
sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.c | 2 +-
sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.h | 2 +-
sys/arm64/freescale/imx/imx_ccm_clk.h | 10 +++++-----
sys/arm64/nvidia/tegra210/tegra210_car.c | 8 ++++----
sys/arm64/nvidia/tegra210/tegra210_clk_per.c | 2 +-
sys/arm64/nvidia/tegra210/tegra210_clk_pll.c | 8 ++++----
sys/arm64/nvidia/tegra210/tegra210_clk_super.c | 2 +-
sys/arm64/nvidia/tegra210/tegra210_coretemp.c | 2 +-
sys/arm64/nvidia/tegra210/tegra210_cpufreq.c | 2 +-
sys/arm64/nvidia/tegra210/tegra210_pmc.c | 2 +-
sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c | 2 +-
sys/arm64/qoriq/clk/ls1028a_clkgen.c | 2 +-
sys/arm64/qoriq/clk/ls1028a_flexspi_clk.c | 2 +-
sys/arm64/qoriq/clk/ls1046a_clkgen.c | 2 +-
sys/arm64/qoriq/clk/ls1088a_clkgen.c | 2 +-
sys/arm64/qoriq/clk/lx2160a_clkgen.c | 2 +-
sys/arm64/qoriq/clk/qoriq_clk_pll.c | 4 ++--
sys/arm64/qoriq/clk/qoriq_clk_pll.h | 2 +-
sys/arm64/qoriq/clk/qoriq_clkgen.c | 2 +-
sys/arm64/qoriq/clk/qoriq_clkgen.h | 4 ++--
sys/arm64/qoriq/qoriq_therm.c | 2 +-
sys/arm64/rockchip/rk3328_codec.c | 2 +-
sys/arm64/rockchip/rk3399_emmcphy.c | 2 +-
sys/arm64/rockchip/rk3568_combphy.c | 2 +-
sys/arm64/rockchip/rk3568_pcie.c | 2 +-
sys/arm64/rockchip/rk3568_pciephy.c | 2 +-
sys/arm64/rockchip/rk_gpio.c | 2 +-
sys/arm64/rockchip/rk_i2s.c | 2 +-
sys/arm64/rockchip/rk_pcie.c | 2 +-
sys/arm64/rockchip/rk_pcie_phy.c | 2 +-
sys/arm64/rockchip/rk_tsadc.c | 2 +-
sys/arm64/rockchip/rk_typec_phy.c | 2 +-
sys/arm64/rockchip/rk_usb2phy.c | 2 +-
sys/arm64/rockchip/rk_usbphy.c | 2 +-
sys/conf/files | 18 +++++++++---------
sys/dev/ahci/ahci_fsl_fdt.c | 2 +-
sys/dev/cadence/if_cgem.c | 2 +-
sys/dev/clk/allwinner/aw_ccu.c | 2 +-
sys/dev/clk/allwinner/aw_ccung.c | 4 ++--
sys/dev/clk/allwinner/aw_ccung.h | 6 +++---
sys/dev/clk/allwinner/aw_clk_frac.c | 2 +-
sys/dev/clk/allwinner/aw_clk_frac.h | 2 +-
sys/dev/clk/allwinner/aw_clk_m.c | 2 +-
sys/dev/clk/allwinner/aw_clk_m.h | 2 +-
sys/dev/clk/allwinner/aw_clk_mipi.c | 2 +-
sys/dev/clk/allwinner/aw_clk_mipi.h | 2 +-
sys/dev/clk/allwinner/aw_clk_nkmp.c | 2 +-
sys/dev/clk/allwinner/aw_clk_nm.c | 2 +-
sys/dev/clk/allwinner/aw_clk_nm.h | 2 +-
sys/dev/clk/allwinner/aw_clk_nmm.c | 2 +-
sys/dev/clk/allwinner/aw_clk_nmm.h | 2 +-
sys/dev/clk/allwinner/aw_clk_np.c | 2 +-
sys/dev/clk/allwinner/aw_clk_np.h | 2 +-
sys/dev/clk/allwinner/aw_clk_prediv_mux.c | 2 +-
sys/dev/clk/allwinner/ccu_a10.c | 6 +++---
sys/dev/clk/allwinner/ccu_a13.c | 6 +++---
sys/dev/clk/allwinner/ccu_a31.c | 6 +++---
sys/dev/clk/allwinner/ccu_a64.c | 6 +++---
sys/dev/clk/allwinner/ccu_a83t.c | 6 +++---
sys/dev/clk/allwinner/ccu_de2.c | 6 +++---
sys/dev/clk/allwinner/ccu_h3.c | 6 +++---
sys/dev/clk/allwinner/ccu_h6.c | 6 +++---
sys/dev/clk/allwinner/ccu_h6_r.c | 6 +++---
sys/dev/clk/allwinner/ccu_sun8i_r.c | 6 +++---
sys/dev/{extres => }/clk/clk.c | 2 +-
sys/dev/{extres => }/clk/clk.h | 7 ++++---
sys/dev/{extres => }/clk/clk_bus.c | 0
sys/dev/{extres => }/clk/clk_div.c | 2 +-
sys/dev/{extres => }/clk/clk_div.h | 8 ++++----
sys/dev/{extres => }/clk/clk_fixed.c | 2 +-
sys/dev/{extres => }/clk/clk_fixed.h | 8 ++++----
sys/dev/{extres => }/clk/clk_gate.c | 2 +-
sys/dev/{extres => }/clk/clk_gate.h | 8 ++++----
sys/dev/{extres => }/clk/clk_link.c | 2 +-
sys/dev/{extres => }/clk/clk_link.h | 8 ++++----
sys/dev/{extres => }/clk/clk_mux.c | 2 +-
sys/dev/{extres => }/clk/clk_mux.h | 9 +++++----
sys/dev/{extres => }/clk/clkdev_if.m | 0
sys/dev/{extres => }/clk/clknode_if.m | 0
sys/dev/clk/rockchip/rk3288_cru.c | 8 ++++----
sys/dev/clk/rockchip/rk3328_cru.c | 6 +++---
sys/dev/clk/rockchip/rk3399_cru.c | 6 +++---
sys/dev/clk/rockchip/rk3399_pmucru.c | 6 +++---
sys/dev/clk/rockchip/rk3568_cru.c | 6 +++---
sys/dev/clk/rockchip/rk3568_pmucru.c | 6 +++---
sys/dev/clk/rockchip/rk_clk_armclk.c | 2 +-
sys/dev/clk/rockchip/rk_clk_armclk.h | 2 +-
sys/dev/clk/rockchip/rk_clk_composite.c | 2 +-
sys/dev/clk/rockchip/rk_clk_composite.h | 2 +-
sys/dev/clk/rockchip/rk_clk_fract.c | 2 +-
sys/dev/clk/rockchip/rk_clk_fract.h | 2 +-
sys/dev/clk/rockchip/rk_clk_gate.c | 2 +-
sys/dev/clk/rockchip/rk_clk_gate.h | 2 +-
sys/dev/clk/rockchip/rk_clk_mux.c | 2 +-
sys/dev/clk/rockchip/rk_clk_mux.h | 2 +-
sys/dev/clk/rockchip/rk_clk_pll.c | 2 +-
sys/dev/clk/rockchip/rk_clk_pll.h | 2 +-
sys/dev/clk/rockchip/rk_cru.c | 8 ++++----
sys/dev/clk/rockchip/rk_cru.h | 10 +++++-----
sys/dev/clk/xilinx/zynqmp_clk_div.c | 2 +-
sys/dev/clk/xilinx/zynqmp_clk_fixed.c | 2 +-
sys/dev/clk/xilinx/zynqmp_clk_gate.c | 2 +-
sys/dev/clk/xilinx/zynqmp_clk_mux.c | 2 +-
sys/dev/clk/xilinx/zynqmp_clk_pll.c | 2 +-
sys/dev/clk/xilinx/zynqmp_clock.c | 4 ++--
sys/dev/cpufreq/cpufreq_dt.c | 2 +-
sys/dev/dwc/dwc1000_core.c | 2 +-
sys/dev/dwc/dwc1000_dma.c | 2 +-
sys/dev/dwc/if_dwc.c | 2 +-
sys/dev/dwc/if_dwc_aw.c | 2 +-
sys/dev/dwc/if_dwc_rk.c | 2 +-
sys/dev/dwc/if_dwc_socfpga.c | 2 +-
sys/dev/dwwdt/dwwdt.c | 2 +-
sys/dev/eqos/if_eqos.c | 2 +-
sys/dev/eqos/if_eqos_fdt.c | 2 +-
sys/dev/etherswitch/ar40xx/ar40xx_hw.c | 2 +-
sys/dev/etherswitch/ar40xx/ar40xx_hw_atu.c | 2 +-
sys/dev/etherswitch/ar40xx/ar40xx_hw_mdio.c | 2 +-
sys/dev/etherswitch/ar40xx/ar40xx_hw_mib.c | 2 +-
sys/dev/etherswitch/ar40xx/ar40xx_hw_mirror.c | 2 +-
sys/dev/etherswitch/ar40xx/ar40xx_hw_port.c | 2 +-
sys/dev/etherswitch/ar40xx/ar40xx_hw_psgmii.c | 2 +-
sys/dev/etherswitch/ar40xx/ar40xx_hw_vtu.c | 2 +-
sys/dev/etherswitch/ar40xx/ar40xx_main.c | 2 +-
sys/dev/etherswitch/ar40xx/ar40xx_phy.c | 2 +-
sys/dev/firmware/arm/scmi.c | 2 +-
sys/dev/firmware/arm/scmi_clk.c | 2 +-
sys/dev/flash/flexspi/flex_spi.c | 2 +-
sys/dev/hdmi/dwc_hdmi_fdt.c | 2 +-
sys/dev/iicbus/controller/cadence/cdnc_i2c.c | 2 +-
sys/dev/iicbus/controller/opencores/iicoc_fdt.c | 2 +-
sys/dev/iicbus/controller/rockchip/rk_i2c.c | 2 +-
sys/dev/iicbus/controller/twsi/a10_twsi.c | 2 +-
sys/dev/iicbus/controller/twsi/mv_twsi.c | 2 +-
sys/dev/iicbus/controller/twsi/twsi.h | 2 +-
sys/dev/iicbus/pmic/rockchip/rk8xx_clocks.c | 2 +-
sys/dev/mmc/host/dwmmc.c | 2 +-
sys/dev/mmc/host/dwmmc_rockchip.c | 2 +-
sys/dev/mmc/host/dwmmc_var.h | 2 +-
sys/dev/mmc/mmc_pwrseq.c | 2 +-
sys/dev/neta/if_mvneta.c | 2 +-
sys/dev/ofw/ofw_cpu.c | 2 +-
sys/dev/pci/pci_dw_mv.c | 2 +-
sys/dev/pwm/controller/allwinner/aw_pwm.c | 2 +-
sys/dev/pwm/controller/rockchip/rk_pwm.c | 2 +-
sys/dev/qcom_clk/qcom_clk_apssdiv.c | 8 ++++----
sys/dev/qcom_clk/qcom_clk_branch2.c | 8 ++++----
sys/dev/qcom_clk/qcom_clk_fdiv.c | 8 ++++----
sys/dev/qcom_clk/qcom_clk_fepll.c | 8 ++++----
sys/dev/qcom_clk/qcom_clk_rcg2.c | 8 ++++----
sys/dev/qcom_clk/qcom_clk_ro_div.c | 8 ++++----
sys/dev/qcom_dwc3/qcom_dwc3.c | 2 +-
sys/dev/qcom_gcc/qcom_gcc_ipq4018_clock.c | 8 ++++----
sys/dev/qcom_qup/qcom_spi.c | 2 +-
sys/dev/qcom_qup/qcom_spi_hw.c | 2 +-
sys/dev/sdhci/sdhci_fdt.c | 4 ++--
sys/dev/sdhci/sdhci_fsl_fdt.c | 2 +-
sys/dev/spibus/controller/allwinner/aw_spi.c | 2 +-
sys/dev/spibus/controller/rockchip/rk_spi.c | 2 +-
sys/dev/uart/uart_dev_imx.c | 2 +-
sys/dev/uart/uart_dev_snps.c | 2 +-
sys/dev/usb/controller/dwc3/aw_dwc3.c | 2 +-
sys/dev/usb/controller/dwc3/dwc3.c | 2 +-
sys/dev/usb/controller/dwc3/rk_dwc3.c | 2 +-
sys/dev/usb/controller/generic_ehci_fdt.c | 2 +-
sys/dev/usb/controller/generic_ohci.c | 2 +-
sys/dev/usb/controller/musb_otg_allwinner.c | 2 +-
sys/dev/usb/controller/usb_nop_xceiv.c | 2 +-
sys/dev/usb/controller/xlnx_dwc3.c | 2 +-
sys/riscv/sifive/fu740_pci_dw.c | 2 +-
sys/riscv/sifive/sifive_prci.c | 6 +++---
sys/riscv/sifive/sifive_spi.c | 2 +-
sys/riscv/sifive/sifive_uart.c | 2 +-
263 files changed, 400 insertions(+), 398 deletions(-)
diff --git a/sys/arm/allwinner/a10_ahci.c b/sys/arm/allwinner/a10_ahci.c
index 74765e1a30dd..a0717a0e9dfa 100644
--- 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
index 711d2203f9a5..fc4937351f3b 100644
--- 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
index d5d27748a9d9..e711c5268b2d 100644
--- 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
index 890cb2332396..18fb2a56da3a 100644
--- 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
index 0a291becbb9d..988444c4b1c5 100644
--- 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
index a0d455676430..d71562b08c9b 100644
--- 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
index b5ab13efac41..f99d5385d897 100644
--- 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
index bc326e6d6afa..7e9fdfca80bf 100644
--- 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
index 46672c8fcb0f..99e69674bd25 100644
--- 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
index 5dd9a211acf4..b77972ac0187 100644
--- 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
index 8c159de7da6d..376405056f51 100644
--- 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
index 466ada8942c6..7c783f69880c 100644
--- 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
index 40627ebf8448..08522caff725 100644
--- 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
index 92bb73efc1f5..9938601f17ce 100644
--- 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
index 99e302571220..4f1e02612347 100644
--- 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
index e2bf9c068538..058fce6061a7 100644
--- 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
index 4125a13b36c2..33c11e62ef7c 100644
--- 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
index acc99083ad93..516cbefc6272 100644
--- 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
index c704e7830cbc..f581d361d3d9 100644
--- 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
index d3d01d3cb857..c5e92992a36b 100644
--- 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
index 7014ea4ea7e3..f8769d29e7f7 100644
--- 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
index 38717c186814..cc0b32bb4759 100644
--- 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
index 423a42b80e06..b102f05d25c1 100644
--- 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
index e8d90a0c9904..4456537ea785 100644
--- 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
index 0429c8ae12f8..910525411c7f 100644
--- 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
index d8f0f5203455..32ec1c83b102 100644
--- 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.c b/sys/arm/mv/clk/a37x0_tbg_pll.c
index 83115dc5741d..da8ff83cc898 100644
--- 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_tbg_pll.h b/sys/arm/mv/clk/a37x0_tbg_pll.h
index 2bb4fa6ab478..6c79c44c64db 100644
--- 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_xtal.c b/sys/arm/mv/clk/a37x0_xtal.c
index e4ce8a90a24e..67a791b8d34a 100644
--- 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
index 21e630d18b06..f0f7767397b5 100644
--- 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
index c50a65b3396e..24355d9c9dac 100644
--- 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.c b/sys/arm/mv/clk/armada38x_gen.c
index 13951a33da55..b225c927f0d2 100644
--- 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/armada38x_gen.h b/sys/arm/mv/clk/armada38x_gen.h
index ad46e38728fa..7275bd528529 100644
--- 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/periph.c b/sys/arm/mv/clk/periph.c
index 98445fa8bc6a..986016f77b8f 100644
--- 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.h b/sys/arm/mv/clk/periph.h
index 3eada61665a2..f23f641b8f1d 100644
--- 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_clk_d.c b/sys/arm/mv/clk/periph_clk_d.c
index 0e8659d56e18..f3dc3a30a8b6 100644
--- 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
index d3c1f0deafa8..e0e6f446716c 100644
--- 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
index 803b5f8ed7e1..538077eb444f 100644
--- 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
index 6016a7b1c1a4..f96d034228b4 100644
--- 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
index b926a58aca0c..f41f5e09c4dd 100644
--- 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
index 604195da1ab4..45f8476df5b3 100644
--- 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
index 1ffd65de9d36..c27b9f39c508 100644
--- 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
index 81177180056c..637ea3981acc 100644
--- 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
index 920419cc777e..060445966d68 100644
--- 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
index 23994060700b..d6a74a32fffb 100644
--- 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
index c45ca1721ff0..1c5e86bde498 100644
--- 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
index 080fbef659a1..284c5c2e8465 100644
--- 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
index ebb30b29aaa9..440f5a5b1044 100644
--- 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
index 95af7a75b21b..90edc6d3a8ec 100644
--- 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>
*** 3041 LINES SKIPPED ***