git: 1f469a9fc498 - main - hwreset: Move reset code in dev/hwreset
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 10 Jan 2024 18:21:08 UTC
The branch main has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=1f469a9fc498c3d406ef7c4e347232678f49da0a
commit 1f469a9fc498c3d406ef7c4e347232678f49da0a
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2023-12-26 17:49:19 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2024-01-10 18:20:28 +0000
hwreset: Move reset code in dev/hwreset
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: imp
Sponsored by: Beckhoff Automation GmbH & Co. KG
Differential Revision: https://reviews.freebsd.org/D43192
---
sys/arm/allwinner/a10_codec.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_gpio.c | 2 +-
sys/arm/allwinner/aw_i2s.c | 2 +-
sys/arm/allwinner/aw_mmc.c | 2 +-
sys/arm/allwinner/aw_reset.c | 2 +-
sys/arm/allwinner/aw_rsb.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/nvidia/drm2/tegra_dc.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 | 2 +-
sys/arm/nvidia/tegra124/tegra124_pmc.c | 2 +-
sys/arm/nvidia/tegra124/tegra124_xusbpadctl.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_pcie.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/qualcomm/ipq4018_usb_hs_phy.c | 2 +-
sys/arm/qualcomm/ipq4018_usb_ss_phy.c | 2 +-
sys/arm64/nvidia/tegra210/tegra210_car.c | 2 +-
sys/arm64/nvidia/tegra210/tegra210_pmc.c | 2 +-
sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.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_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_usbphy.c | 2 +-
sys/conf/files | 6 +++---
sys/dev/clk/allwinner/aw_ccung.c | 2 +-
sys/dev/clk/allwinner/ccu_de2.c | 2 +-
sys/dev/clk/rockchip/rk_cru.c | 2 +-
sys/dev/clk/xilinx/zynqmp_reset.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/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/{extres => }/hwreset/hwreset.c | 2 +-
sys/dev/{extres => }/hwreset/hwreset.h | 6 +++---
sys/dev/{extres => }/hwreset/hwreset_array.c | 2 +-
sys/dev/{extres => }/hwreset/hwreset_if.m | 0
sys/dev/iicbus/controller/twsi/a10_twsi.c | 2 +-
sys/dev/mmc/host/dwmmc_var.h | 2 +-
sys/dev/qcom_dwc3/qcom_dwc3.c | 2 +-
sys/dev/qcom_gcc/qcom_gcc_ipq4018.c | 2 +-
sys/dev/qcom_gcc/qcom_gcc_ipq4018_reset.c | 2 +-
sys/dev/qcom_qup/qcom_spi.c | 2 +-
sys/dev/qcom_qup/qcom_spi_hw.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_snps.c | 2 +-
sys/dev/usb/controller/dwc3/aw_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/xlnx_dwc3.c | 2 +-
sys/riscv/sifive/fu740_pci_dw.c | 2 +-
87 files changed, 90 insertions(+), 90 deletions(-)
diff --git a/sys/arm/allwinner/a10_codec.c b/sys/arm/allwinner/a10_codec.c
index fc4937351f3b..421d1c015691 100644
--- a/sys/arm/allwinner/a10_codec.c
+++ b/sys/arm/allwinner/a10_codec.c
@@ -48,7 +48,7 @@
#include <dev/gpio/gpiobusvar.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include "sunxi_dma_if.h"
#include "mixer_if.h"
diff --git a/sys/arm/allwinner/a31_dmac.c b/sys/arm/allwinner/a31_dmac.c
index 988444c4b1c5..9dc98342a159 100644
--- a/sys/arm/allwinner/a31_dmac.c
+++ b/sys/arm/allwinner/a31_dmac.c
@@ -47,7 +47,7 @@
#include <arm/allwinner/a10_dmac.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/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 d71562b08c9b..4bf2863b74ef 100644
--- a/sys/arm/allwinner/a33_codec.c
+++ b/sys/arm/allwinner/a33_codec.c
@@ -42,7 +42,7 @@
#include <dev/ofw/ofw_bus_subr.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/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 f99d5385d897..f9ada20ec554 100644
--- a/sys/arm/allwinner/a64/sun50i_a64_acodec.c
+++ b/sys/arm/allwinner/a64/sun50i_a64_acodec.c
@@ -41,7 +41,7 @@
#include <dev/ofw/ofw_bus_subr.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/extres/regulator/regulator.h>
#include "syscon_if.h"
diff --git a/sys/arm/allwinner/aw_cir.c b/sys/arm/allwinner/aw_cir.c
index 7e9fdfca80bf..5ebb57f48040 100644
--- a/sys/arm/allwinner/aw_cir.c
+++ b/sys/arm/allwinner/aw_cir.c
@@ -41,7 +41,7 @@
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/evdev/input.h>
#include <dev/evdev/evdev.h>
diff --git a/sys/arm/allwinner/aw_gpio.c b/sys/arm/allwinner/aw_gpio.c
index b77972ac0187..f72dbf88099f 100644
--- a/sys/arm/allwinner/aw_gpio.c
+++ b/sys/arm/allwinner/aw_gpio.c
@@ -53,7 +53,7 @@
#include <arm/allwinner/aw_machdep.h>
#include <arm/allwinner/allwinner_pinctrl.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/extres/regulator/regulator.h>
#if defined(__aarch64__)
diff --git a/sys/arm/allwinner/aw_i2s.c b/sys/arm/allwinner/aw_i2s.c
index 376405056f51..87dfb109363f 100644
--- a/sys/arm/allwinner/aw_i2s.c
+++ b/sys/arm/allwinner/aw_i2s.c
@@ -41,7 +41,7 @@
#include <dev/ofw/ofw_bus_subr.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include "syscon_if.h"
diff --git a/sys/arm/allwinner/aw_mmc.c b/sys/arm/allwinner/aw_mmc.c
index 7c783f69880c..d229fba1e07d 100644
--- a/sys/arm/allwinner/aw_mmc.c
+++ b/sys/arm/allwinner/aw_mmc.c
@@ -53,7 +53,7 @@
#include <arm/allwinner/aw_mmc.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/extres/regulator/regulator.h>
#include "opt_mmccam.h"
diff --git a/sys/arm/allwinner/aw_reset.c b/sys/arm/allwinner/aw_reset.c
index da2879ce20c8..4fadaf2bfef4 100644
--- a/sys/arm/allwinner/aw_reset.c
+++ b/sys/arm/allwinner/aw_reset.c
@@ -40,7 +40,7 @@
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include "hwreset_if.h"
diff --git a/sys/arm/allwinner/aw_rsb.c b/sys/arm/allwinner/aw_rsb.c
index 08522caff725..fa599ddcb3dd 100644
--- a/sys/arm/allwinner/aw_rsb.c
+++ b/sys/arm/allwinner/aw_rsb.c
@@ -44,7 +44,7 @@
#include <dev/iicbus/iicbus.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include "iicbus_if.h"
diff --git a/sys/arm/allwinner/aw_thermal.c b/sys/arm/allwinner/aw_thermal.c
index 4f1e02612347..d9293b5cb171 100644
--- a/sys/arm/allwinner/aw_thermal.c
+++ b/sys/arm/allwinner/aw_thermal.c
@@ -44,7 +44,7 @@
#include <dev/ofw/ofw_bus_subr.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/extres/nvmem/nvmem.h>
#include <arm/allwinner/aw_sid.h>
diff --git a/sys/arm/allwinner/aw_usb3phy.c b/sys/arm/allwinner/aw_usb3phy.c
index 058fce6061a7..b49a9a86b6e9 100644
--- a/sys/arm/allwinner/aw_usb3phy.c
+++ b/sys/arm/allwinner/aw_usb3phy.c
@@ -43,7 +43,7 @@
#include <dev/ofw/ofw_bus_subr.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/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 33c11e62ef7c..09725783fd22 100644
--- a/sys/arm/allwinner/aw_usbphy.c
+++ b/sys/arm/allwinner/aw_usbphy.c
@@ -41,7 +41,7 @@
#include <dev/gpio/gpiobusvar.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/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 516cbefc6272..6c38a65b5040 100644
--- a/sys/arm/allwinner/if_awg.c
+++ b/sys/arm/allwinner/if_awg.c
@@ -60,7 +60,7 @@
#include <dev/mii/miivar.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/extres/regulator/regulator.h>
#include <dev/extres/syscon/syscon.h>
diff --git a/sys/arm/nvidia/drm2/tegra_dc.c b/sys/arm/nvidia/drm2/tegra_dc.c
index 637ea3981acc..f4168f161f5e 100644
--- a/sys/arm/nvidia/drm2/tegra_dc.c
+++ b/sys/arm/nvidia/drm2/tegra_dc.c
@@ -37,7 +37,7 @@
#include <machine/bus.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.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 1c5e86bde498..174a9718bbfa 100644
--- a/sys/arm/nvidia/drm2/tegra_hdmi.c
+++ b/sys/arm/nvidia/drm2/tegra_hdmi.c
@@ -37,7 +37,7 @@
#include <machine/bus.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/extres/regulator/regulator.h>
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm_crtc.h>
diff --git a/sys/arm/nvidia/drm2/tegra_host1x.c b/sys/arm/nvidia/drm2/tegra_host1x.c
index 284c5c2e8465..4384ab0bc976 100644
--- a/sys/arm/nvidia/drm2/tegra_host1x.c
+++ b/sys/arm/nvidia/drm2/tegra_host1x.c
@@ -41,7 +41,7 @@
#include <machine/resource.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.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/tegra124/tegra124_car.c b/sys/arm/nvidia/tegra124/tegra124_car.c
index 440f5a5b1044..57d7760494a6 100644
--- a/sys/arm/nvidia/tegra124/tegra124_car.c
+++ b/sys/arm/nvidia/tegra124/tegra124_car.c
@@ -42,7 +42,7 @@
#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/hwreset/hwreset.h>
#include <dev/ofw/openfirm.h>
#include <dev/ofw/ofw_bus.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
index 6b42659d453a..83bd0a1e6983 100644
--- a/sys/arm/nvidia/tegra124/tegra124_pmc.c
+++ b/sys/arm/nvidia/tegra124/tegra124_pmc.c
@@ -37,7 +37,7 @@
#include <machine/bus.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c b/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c
index eb749a2ffbc9..0b611abc39cb 100644
--- a/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c
+++ b/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c
@@ -35,7 +35,7 @@
#include <machine/bus.h>
#include <machine/fdt.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/extres/phy/phy.h>
#include <dev/extres/regulator/regulator.h>
#include <dev/fdt/fdt_common.h>
diff --git a/sys/arm/nvidia/tegra_ahci.c b/sys/arm/nvidia/tegra_ahci.c
index eeb49d6ea5a8..de60f02e97ea 100644
--- a/sys/arm/nvidia/tegra_ahci.c
+++ b/sys/arm/nvidia/tegra_ahci.c
@@ -45,7 +45,7 @@
#include <dev/ahci/ahci.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/extres/phy/phy.h>
#include <dev/extres/regulator/regulator.h>
#include <dev/fdt/fdt_pinctrl.h>
diff --git a/sys/arm/nvidia/tegra_efuse.c b/sys/arm/nvidia/tegra_efuse.c
index 9e151f6ed564..35d9380a18a5 100644
--- a/sys/arm/nvidia/tegra_efuse.c
+++ b/sys/arm/nvidia/tegra_efuse.c
@@ -40,7 +40,7 @@
#include <machine/resource.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/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
index 1d34ed45dd90..033b7b9794fb 100644
--- a/sys/arm/nvidia/tegra_ehci.c
+++ b/sys/arm/nvidia/tegra_ehci.c
@@ -43,7 +43,7 @@
#include <machine/resource.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/extres/phy/phy.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/nvidia/tegra_i2c.c b/sys/arm/nvidia/tegra_i2c.c
index 1849ae33e3a2..1b959c5c5bbe 100644
--- a/sys/arm/nvidia/tegra_i2c.c
+++ b/sys/arm/nvidia/tegra_i2c.c
@@ -44,7 +44,7 @@
#include <sys/mutex.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/iicbus/iiconf.h>
#include <dev/iicbus/iicbus.h>
#include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/nvidia/tegra_pcie.c b/sys/arm/nvidia/tegra_pcie.c
index 82e282146d68..a22ae02ce4bc 100644
--- a/sys/arm/nvidia/tegra_pcie.c
+++ b/sys/arm/nvidia/tegra_pcie.c
@@ -48,7 +48,7 @@
#include <vm/pmap.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/extres/phy/phy.h>
#include <dev/extres/regulator/regulator.h>
#include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/nvidia/tegra_sdhci.c b/sys/arm/nvidia/tegra_sdhci.c
index 6877b7021980..2b152227d95f 100644
--- a/sys/arm/nvidia/tegra_sdhci.c
+++ b/sys/arm/nvidia/tegra_sdhci.c
@@ -49,7 +49,7 @@
#include <machine/intr.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/gpio/gpiobusvar.h>
#include <dev/mmc/bridge.h>
#include <dev/mmc/mmcbrvar.h>
diff --git a/sys/arm/nvidia/tegra_soctherm.c b/sys/arm/nvidia/tegra_soctherm.c
index 0018833e5a43..fa6d0d9fa5cd 100644
--- a/sys/arm/nvidia/tegra_soctherm.c
+++ b/sys/arm/nvidia/tegra_soctherm.c
@@ -44,7 +44,7 @@
#include <machine/bus.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/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
index 31f92d34a6d3..e18b77ecc321 100644
--- a/sys/arm/nvidia/tegra_uart.c
+++ b/sys/arm/nvidia/tegra_uart.c
@@ -40,7 +40,7 @@
#include <machine/bus.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
#include <dev/uart/uart.h>
diff --git a/sys/arm/nvidia/tegra_usbphy.c b/sys/arm/nvidia/tegra_usbphy.c
index 438ba719170c..2499a568fe4c 100644
--- a/sys/arm/nvidia/tegra_usbphy.c
+++ b/sys/arm/nvidia/tegra_usbphy.c
@@ -39,7 +39,7 @@
#include <machine/bus.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/extres/phy/phy.h>
#include <dev/extres/regulator/regulator.h>
#include <dev/fdt/fdt_pinctrl.h>
diff --git a/sys/arm/nvidia/tegra_xhci.c b/sys/arm/nvidia/tegra_xhci.c
index e80e34f38c38..21ce4dc0540d 100644
--- a/sys/arm/nvidia/tegra_xhci.c
+++ b/sys/arm/nvidia/tegra_xhci.c
@@ -53,7 +53,7 @@
#include <machine/resource.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/extres/phy/phy.h>
#include <dev/extres/regulator/regulator.h>
#include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/qualcomm/ipq4018_usb_hs_phy.c b/sys/arm/qualcomm/ipq4018_usb_hs_phy.c
index 75bfa931e8e3..618911fef640 100644
--- a/sys/arm/qualcomm/ipq4018_usb_hs_phy.c
+++ b/sys/arm/qualcomm/ipq4018_usb_hs_phy.c
@@ -36,7 +36,7 @@
#include <machine/bus.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/extres/phy/phy_usb.h>
#include <dev/extres/regulator/regulator.h>
#include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/qualcomm/ipq4018_usb_ss_phy.c b/sys/arm/qualcomm/ipq4018_usb_ss_phy.c
index 22dc92ffd2ec..66ef4c9fe732 100644
--- a/sys/arm/qualcomm/ipq4018_usb_ss_phy.c
+++ b/sys/arm/qualcomm/ipq4018_usb_ss_phy.c
@@ -36,7 +36,7 @@
#include <machine/bus.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/extres/phy/phy_usb.h>
#include <dev/extres/regulator/regulator.h>
#include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm64/nvidia/tegra210/tegra210_car.c b/sys/arm64/nvidia/tegra210/tegra210_car.c
index 2046782805d6..bff91024192f 100644
--- a/sys/arm64/nvidia/tegra210/tegra210_car.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_car.c
@@ -43,7 +43,7 @@
#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/hwreset/hwreset.h>
#include <dev/ofw/openfirm.h>
#include <dev/ofw/ofw_bus.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
index a04ec212a8c7..0f0343a317ce 100644
--- a/sys/arm64/nvidia/tegra210/tegra210_pmc.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_pmc.c
@@ -37,7 +37,7 @@
#include <machine/bus.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
#include <dev/psci/smccc.h>
diff --git a/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c b/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c
index bfcd8894034a..75662386427f 100644
--- a/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c
@@ -36,7 +36,7 @@
#include <machine/bus.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/extres/phy/phy.h>
#include <dev/extres/regulator/regulator.h>
#include <dev/fdt/fdt_common.h>
diff --git a/sys/arm64/rockchip/rk3568_combphy.c b/sys/arm64/rockchip/rk3568_combphy.c
index f9ba38e663ad..5152f3eed0d1 100644
--- a/sys/arm64/rockchip/rk3568_combphy.c
+++ b/sys/arm64/rockchip/rk3568_combphy.c
@@ -41,7 +41,7 @@
#include <dev/fdt/simple_mfd.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/extres/regulator/regulator.h>
#include <dev/extres/syscon/syscon.h>
#include <dev/extres/phy/phy.h>
diff --git a/sys/arm64/rockchip/rk3568_pcie.c b/sys/arm64/rockchip/rk3568_pcie.c
index b8ad5b8a33f5..5343a5dd3f2c 100644
--- a/sys/arm64/rockchip/rk3568_pcie.c
+++ b/sys/arm64/rockchip/rk3568_pcie.c
@@ -52,7 +52,7 @@
#include <dev/clk/clk.h>
#include <dev/extres/phy/phy.h>
#include <dev/extres/regulator/regulator.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <machine/bus.h>
#include <machine/intr.h>
diff --git a/sys/arm64/rockchip/rk3568_pciephy.c b/sys/arm64/rockchip/rk3568_pciephy.c
index 0f1aa5d280a8..f277253b577d 100644
--- a/sys/arm64/rockchip/rk3568_pciephy.c
+++ b/sys/arm64/rockchip/rk3568_pciephy.c
@@ -41,7 +41,7 @@
#include <dev/fdt/simple_mfd.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/extres/regulator/regulator.h>
#include <dev/extres/syscon/syscon.h>
#include <dev/extres/phy/phy.h>
diff --git a/sys/arm64/rockchip/rk_i2s.c b/sys/arm64/rockchip/rk_i2s.c
index fb1c23b80eb9..3f7cd71eda27 100644
--- a/sys/arm64/rockchip/rk_i2s.c
+++ b/sys/arm64/rockchip/rk_i2s.c
@@ -40,7 +40,7 @@
#include <dev/ofw/ofw_bus_subr.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/extres/syscon/syscon.h>
#include "syscon_if.h"
diff --git a/sys/arm64/rockchip/rk_pcie.c b/sys/arm64/rockchip/rk_pcie.c
index cccb04ffdcd9..cc6c842a6f6a 100644
--- a/sys/arm64/rockchip/rk_pcie.c
+++ b/sys/arm64/rockchip/rk_pcie.c
@@ -45,7 +45,7 @@
#include <machine/resource.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/extres/phy/phy.h>
#include <dev/extres/regulator/regulator.h>
#include <dev/gpio/gpiobusvar.h>
diff --git a/sys/arm64/rockchip/rk_pcie_phy.c b/sys/arm64/rockchip/rk_pcie_phy.c
index d4c8c3eb2587..88ba4035ebb9 100644
--- a/sys/arm64/rockchip/rk_pcie_phy.c
+++ b/sys/arm64/rockchip/rk_pcie_phy.c
@@ -48,7 +48,7 @@
#include <dev/extres/phy/phy.h>
#include <dev/extres/phy/phy_internal.h>
#include <dev/extres/syscon/syscon.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include "syscon_if.h"
diff --git a/sys/arm64/rockchip/rk_tsadc.c b/sys/arm64/rockchip/rk_tsadc.c
index 8b99c384da48..ff5fd722d0f0 100644
--- a/sys/arm64/rockchip/rk_tsadc.c
+++ b/sys/arm64/rockchip/rk_tsadc.c
@@ -45,7 +45,7 @@
#include <machine/bus.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/extres/syscon/syscon.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm64/rockchip/rk_typec_phy.c b/sys/arm64/rockchip/rk_typec_phy.c
index 6e75394377e4..7f49da5e2208 100644
--- a/sys/arm64/rockchip/rk_typec_phy.c
+++ b/sys/arm64/rockchip/rk_typec_phy.c
@@ -46,7 +46,7 @@
#include <dev/clk/clk.h>
#include <dev/extres/phy/phy_usb.h>
#include <dev/extres/syscon/syscon.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include "syscon_if.h"
diff --git a/sys/arm64/rockchip/rk_usbphy.c b/sys/arm64/rockchip/rk_usbphy.c
index 6f9001470df8..46859d1442e3 100644
--- a/sys/arm64/rockchip/rk_usbphy.c
+++ b/sys/arm64/rockchip/rk_usbphy.c
@@ -37,7 +37,7 @@
#include <machine/bus.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/extres/phy/phy_usb.h>
#include <dev/extres/regulator/regulator.h>
#include <dev/extres/syscon/syscon.h>
diff --git a/sys/conf/files b/sys/conf/files
index 8b28d6428584..95228194fc5a 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1682,9 +1682,6 @@ dev/extres/phy/phydev_if.m optional phy fdt
dev/extres/phy/phynode_if.m optional phy
dev/extres/phy/phy_usb.c optional phy
dev/extres/phy/phynode_usb_if.m optional phy
-dev/extres/hwreset/hwreset.c optional hwreset
-dev/extres/hwreset/hwreset_array.c optional hwreset
-dev/extres/hwreset/hwreset_if.m optional hwreset
dev/extres/nvmem/nvmem.c optional nvmem fdt
dev/extres/nvmem/nvmem_if.m optional nvmem
dev/extres/regulator/regdev_if.m optional regulator fdt
@@ -1783,6 +1780,9 @@ dev/hptiop/hptiop.c optional hptiop scbus
dev/hwpmc/hwpmc_logging.c optional hwpmc
dev/hwpmc/hwpmc_mod.c optional hwpmc
dev/hwpmc/hwpmc_soft.c optional hwpmc
+dev/hwreset/hwreset.c optional hwreset
+dev/hwreset/hwreset_array.c optional hwreset
+dev/hwreset/hwreset_if.m optional hwreset
dev/ichiic/ig4_acpi.c optional ig4 acpi iicbus
dev/ichiic/ig4_iic.c optional ig4 iicbus
dev/ichiic/ig4_pci.c optional ig4 pci iicbus
diff --git a/sys/dev/clk/allwinner/aw_ccung.c b/sys/dev/clk/allwinner/aw_ccung.c
index f446b77b6226..751ebba6c349 100644
--- a/sys/dev/clk/allwinner/aw_ccung.c
+++ b/sys/dev/clk/allwinner/aw_ccung.c
@@ -47,7 +47,7 @@
#include <dev/clk/clk.h>
#include <dev/clk/clk_gate.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/clk/allwinner/aw_ccung.h>
#include <dev/clk/allwinner/aw_clk.h>
diff --git a/sys/dev/clk/allwinner/ccu_de2.c b/sys/dev/clk/allwinner/ccu_de2.c
index 4bd29d139c11..cc4debdbfc89 100644
--- a/sys/dev/clk/allwinner/ccu_de2.c
+++ b/sys/dev/clk/allwinner/ccu_de2.c
@@ -46,7 +46,7 @@
#include <dev/clk/clk_fixed.h>
#include <dev/clk/clk_mux.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/clk/allwinner/aw_ccung.h>
diff --git a/sys/dev/clk/rockchip/rk_cru.c b/sys/dev/clk/rockchip/rk_cru.c
index a7d1b26166f1..6b0978e885b5 100644
--- a/sys/dev/clk/rockchip/rk_cru.c
+++ b/sys/dev/clk/rockchip/rk_cru.c
@@ -48,7 +48,7 @@
#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/hwreset/hwreset.h>
#include <dev/clk/rockchip/rk_clk_composite.h>
#include <dev/clk/rockchip/rk_clk_gate.h>
diff --git a/sys/dev/clk/xilinx/zynqmp_reset.c b/sys/dev/clk/xilinx/zynqmp_reset.c
index 52074d4c62af..c89a4c8ff58c 100644
--- a/sys/dev/clk/xilinx/zynqmp_reset.c
+++ b/sys/dev/clk/xilinx/zynqmp_reset.c
@@ -40,7 +40,7 @@
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/firmware/xilinx/pm_defs.h>
diff --git a/sys/dev/dwc/dwc1000_core.c b/sys/dev/dwc/dwc1000_core.c
index d25c31e66e28..ba895f991b50 100644
--- a/sys/dev/dwc/dwc1000_core.c
+++ b/sys/dev/dwc/dwc1000_core.c
@@ -55,7 +55,7 @@
#include <machine/bus.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/dwc/dwc1000_dma.c b/sys/dev/dwc/dwc1000_dma.c
index e89ccee5b0ff..c510c252072c 100644
--- a/sys/dev/dwc/dwc1000_dma.c
+++ b/sys/dev/dwc/dwc1000_dma.c
@@ -50,7 +50,7 @@
#include <machine/bus.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c
index be44a6be193b..17657045b73c 100644
--- a/sys/dev/dwc/if_dwc.c
+++ b/sys/dev/dwc/if_dwc.c
@@ -60,7 +60,7 @@
#include <machine/bus.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/dwc/if_dwc_aw.c b/sys/dev/dwc/if_dwc_aw.c
index 981f621e3f27..2a0dfaa33715 100644
--- a/sys/dev/dwc/if_dwc_aw.c
+++ b/sys/dev/dwc/if_dwc_aw.c
@@ -42,7 +42,7 @@
#include <dev/ofw/ofw_bus_subr.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/extres/regulator/regulator.h>
#include <arm/allwinner/aw_machdep.h>
diff --git a/sys/dev/dwc/if_dwc_rk.c b/sys/dev/dwc/if_dwc_rk.c
index 76fd11dfd109..c78fb447d6d3 100644
--- a/sys/dev/dwc/if_dwc_rk.c
+++ b/sys/dev/dwc/if_dwc_rk.c
@@ -43,7 +43,7 @@
#include <dev/ofw/ofw_bus_subr.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/extres/regulator/regulator.h>
#include <dev/extres/syscon/syscon.h>
diff --git a/sys/dev/dwc/if_dwc_socfpga.c b/sys/dev/dwc/if_dwc_socfpga.c
index ae2bcac54a95..5a95d133c197 100644
--- a/sys/dev/dwc/if_dwc_socfpga.c
+++ b/sys/dev/dwc/if_dwc_socfpga.c
@@ -45,7 +45,7 @@
#include <dev/ofw/ofw_bus_subr.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/dwc/if_dwcvar.h>
#include <dev/dwc/dwc1000_reg.h>
diff --git a/sys/dev/eqos/if_eqos_fdt.c b/sys/dev/eqos/if_eqos_fdt.c
index 9c36f658bad1..5601c8b778e2 100644
--- a/sys/dev/eqos/if_eqos_fdt.c
+++ b/sys/dev/eqos/if_eqos_fdt.c
@@ -51,7 +51,7 @@
#include <dev/ofw/ofw_bus_subr.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/extres/regulator/regulator.h>
#include <dev/extres/syscon/syscon.h>
diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_hw.c b/sys/dev/etherswitch/ar40xx/ar40xx_hw.c
index c017419be0ff..cdc13366eef3 100644
--- a/sys/dev/etherswitch/ar40xx/ar40xx_hw.c
+++ b/sys/dev/etherswitch/ar40xx/ar40xx_hw.c
@@ -52,7 +52,7 @@
#include <dev/mii/miivar.h>
#include <dev/mdio/mdio.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/fdt/fdt_common.h>
#include <dev/ofw/ofw_bus.h>
diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_hw_atu.c b/sys/dev/etherswitch/ar40xx/ar40xx_hw_atu.c
index a3facf4a6199..4ddcc58a2cfc 100644
--- a/sys/dev/etherswitch/ar40xx/ar40xx_hw_atu.c
+++ b/sys/dev/etherswitch/ar40xx/ar40xx_hw_atu.c
@@ -52,7 +52,7 @@
#include <dev/mii/miivar.h>
#include <dev/mdio/mdio.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/fdt/fdt_common.h>
#include <dev/ofw/ofw_bus.h>
diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_hw_mdio.c b/sys/dev/etherswitch/ar40xx/ar40xx_hw_mdio.c
index 43c2d8744054..793507b9aaa2 100644
--- a/sys/dev/etherswitch/ar40xx/ar40xx_hw_mdio.c
+++ b/sys/dev/etherswitch/ar40xx/ar40xx_hw_mdio.c
@@ -52,7 +52,7 @@
#include <dev/mii/miivar.h>
#include <dev/mdio/mdio.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/fdt/fdt_common.h>
#include <dev/ofw/ofw_bus.h>
diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_hw_mib.c b/sys/dev/etherswitch/ar40xx/ar40xx_hw_mib.c
index 6fdc9e96fd81..73110753c915 100644
--- a/sys/dev/etherswitch/ar40xx/ar40xx_hw_mib.c
+++ b/sys/dev/etherswitch/ar40xx/ar40xx_hw_mib.c
@@ -52,7 +52,7 @@
#include <dev/mii/miivar.h>
#include <dev/mdio/mdio.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/fdt/fdt_common.h>
#include <dev/ofw/ofw_bus.h>
diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_hw_mirror.c b/sys/dev/etherswitch/ar40xx/ar40xx_hw_mirror.c
index 7e440f54e3ac..fff97147d878 100644
--- a/sys/dev/etherswitch/ar40xx/ar40xx_hw_mirror.c
+++ b/sys/dev/etherswitch/ar40xx/ar40xx_hw_mirror.c
@@ -52,7 +52,7 @@
#include <dev/mii/miivar.h>
#include <dev/mdio/mdio.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/fdt/fdt_common.h>
#include <dev/ofw/ofw_bus.h>
diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_hw_port.c b/sys/dev/etherswitch/ar40xx/ar40xx_hw_port.c
index e701f3ae28ba..a540f9b7498e 100644
--- a/sys/dev/etherswitch/ar40xx/ar40xx_hw_port.c
+++ b/sys/dev/etherswitch/ar40xx/ar40xx_hw_port.c
@@ -52,7 +52,7 @@
#include <dev/mii/miivar.h>
#include <dev/mdio/mdio.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/fdt/fdt_common.h>
#include <dev/ofw/ofw_bus.h>
diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_hw_psgmii.c b/sys/dev/etherswitch/ar40xx/ar40xx_hw_psgmii.c
index 0f0704c41aba..67a2bcbc7a6c 100644
--- a/sys/dev/etherswitch/ar40xx/ar40xx_hw_psgmii.c
+++ b/sys/dev/etherswitch/ar40xx/ar40xx_hw_psgmii.c
@@ -52,7 +52,7 @@
#include <dev/mii/miivar.h>
#include <dev/mdio/mdio.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/fdt/fdt_common.h>
#include <dev/ofw/ofw_bus.h>
diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_hw_vtu.c b/sys/dev/etherswitch/ar40xx/ar40xx_hw_vtu.c
index 3c3800847438..15f5f61f8b2d 100644
--- a/sys/dev/etherswitch/ar40xx/ar40xx_hw_vtu.c
+++ b/sys/dev/etherswitch/ar40xx/ar40xx_hw_vtu.c
@@ -52,7 +52,7 @@
#include <dev/mii/miivar.h>
#include <dev/mdio/mdio.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/fdt/fdt_common.h>
#include <dev/ofw/ofw_bus.h>
diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_main.c b/sys/dev/etherswitch/ar40xx/ar40xx_main.c
index d8cbfd836a9b..757dbe23071e 100644
--- a/sys/dev/etherswitch/ar40xx/ar40xx_main.c
+++ b/sys/dev/etherswitch/ar40xx/ar40xx_main.c
@@ -52,7 +52,7 @@
#include <dev/mii/miivar.h>
#include <dev/mdio/mdio.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/fdt/fdt_common.h>
#include <dev/ofw/ofw_bus.h>
diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_phy.c b/sys/dev/etherswitch/ar40xx/ar40xx_phy.c
index 079a92983503..b9a308e3620d 100644
--- a/sys/dev/etherswitch/ar40xx/ar40xx_phy.c
+++ b/sys/dev/etherswitch/ar40xx/ar40xx_phy.c
@@ -52,7 +52,7 @@
#include <dev/mii/miivar.h>
#include <dev/mdio/mdio.h>
#include <dev/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/hwreset/hwreset.h>
#include <dev/fdt/fdt_common.h>
#include <dev/ofw/ofw_bus.h>
diff --git a/sys/dev/extres/hwreset/hwreset.c b/sys/dev/hwreset/hwreset.c
similarity index 99%
rename from sys/dev/extres/hwreset/hwreset.c
rename to sys/dev/hwreset/hwreset.c
index eda8878229d4..82ffa3491a11 100644
--- a/sys/dev/extres/hwreset/hwreset.c
+++ b/sys/dev/hwreset/hwreset.c
*** 274 LINES SKIPPED ***