D43192.diff
No OneTemporary
Actions

Size

34 KB

Referenced Files

None

Subscribers

None

D43192.diff
View Options

	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
	@@ -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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- a/sys/conf/files
	+++ b/sys/conf/files
	@@ -1682,9 +1682,6 @@
	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/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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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.h b/sys/dev/hwreset/hwreset.h
	rename from sys/dev/extres/hwreset/hwreset.h
	rename to sys/dev/hwreset/hwreset.h
	--- a/sys/dev/extres/hwreset/hwreset.h
	+++ b/sys/dev/hwreset/hwreset.h
	@@ -23,8 +23,8 @@
	* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	*/

	-#ifndef DEV_EXTRES_HWRESET_HWRESET_H
	-#define DEV_EXTRES_HWRESET_HWRESET_H
	+#ifndef _DEV_HWRESET_HWRESET_H_
	+#define _DEV_HWRESET_HWRESET_H_

	#include "opt_platform.h"
	#include <sys/types.h>
	@@ -70,4 +70,4 @@
	#endif


	-#endif /* DEV_EXTRES_HWRESET_HWRESET_H */
	+#endif /* _DEV_HWRESET_HWRESET_H_ */
	diff --git a/sys/dev/extres/hwreset/hwreset.c b/sys/dev/hwreset/hwreset.c
	rename from sys/dev/extres/hwreset/hwreset.c
	rename to sys/dev/hwreset/hwreset.c
	--- a/sys/dev/extres/hwreset/hwreset.c
	+++ b/sys/dev/hwreset/hwreset.c
	@@ -36,7 +36,7 @@
	#include <dev/ofw/ofw_bus_subr.h>
	#endif

	-#include <dev/extres/hwreset/hwreset.h>
	+#include <dev/hwreset/hwreset.h>

	#include "hwreset_if.h"

	diff --git a/sys/dev/extres/hwreset/hwreset_array.c b/sys/dev/hwreset/hwreset_array.c
	rename from sys/dev/extres/hwreset/hwreset_array.c
	rename to sys/dev/hwreset/hwreset_array.c
	--- a/sys/dev/extres/hwreset/hwreset_array.c
	+++ b/sys/dev/hwreset/hwreset_array.c
	@@ -41,7 +41,7 @@
	#include <dev/ofw/ofw_bus_subr.h>
	#endif

	-#include <dev/extres/hwreset/hwreset.h>
	+#include <dev/hwreset/hwreset.h>

	MALLOC_DECLARE(M_HWRESET);

	diff --git a/sys/dev/extres/hwreset/hwreset_if.m b/sys/dev/hwreset/hwreset_if.m
	rename from sys/dev/extres/hwreset/hwreset_if.m
	rename to sys/dev/hwreset/hwreset_if.m
	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
	@@ -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 "iicbus_if.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
	@@ -32,7 +32,7 @@
	#define DEV_MMC_HOST_DWMMC_VAR_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/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
	@@ -46,7 +46,7 @@
	#include <dev/ofw/ofw_subr.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/syscon/syscon.h>

	diff --git a/sys/dev/qcom_gcc/qcom_gcc_ipq4018.c b/sys/dev/qcom_gcc/qcom_gcc_ipq4018.c
	--- a/sys/dev/qcom_gcc/qcom_gcc_ipq4018.c
	+++ b/sys/dev/qcom_gcc/qcom_gcc_ipq4018.c
	@@ -44,7 +44,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 "clkdev_if.h"
	#include "hwreset_if.h"
	diff --git a/sys/dev/qcom_gcc/qcom_gcc_ipq4018_reset.c b/sys/dev/qcom_gcc/qcom_gcc_ipq4018_reset.c
	--- a/sys/dev/qcom_gcc/qcom_gcc_ipq4018_reset.c
	+++ b/sys/dev/qcom_gcc/qcom_gcc_ipq4018_reset.c
	@@ -44,7 +44,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/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
	@@ -54,7 +54,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/spibus/spi.h>
	#include <dev/spibus/spibusvar.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
	@@ -50,7 +50,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/spibus/spi.h>
	#include <dev/spibus/spibusvar.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
	@@ -41,7 +41,7 @@
	#include <dev/spibus/spibusvar.h>

	#include <dev/clk/clk.h>
	-#include <dev/extres/hwreset/hwreset.h>
	+#include <dev/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
	@@ -43,7 +43,7 @@
	#include <dev/spibus/spibusvar.h>

	#include <dev/clk/clk.h>
	-#include <dev/extres/hwreset/hwreset.h>
	+#include <dev/hwreset/hwreset.h>

	#include "spibus_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
	@@ -39,7 +39,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 "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
	@@ -46,7 +46,7 @@
	#include <dev/ofw/ofw_subr.h>

	#include <dev/clk/clk.h>
	-#include <dev/extres/hwreset/hwreset.h>
	+#include <dev/hwreset/hwreset.h>
	#include <dev/extres/phy/phy_usb.h>

	static struct ofw_compat_data compat_data[] = {
	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
	@@ -46,7 +46,7 @@
	#include <dev/ofw/ofw_subr.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/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
	@@ -55,7 +55,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/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
	@@ -54,7 +54,7 @@
	#include <dev/usb/controller/ohcireg.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/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
	@@ -59,7 +59,7 @@
	#include <dev/usb/controller/musb_otg.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/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
	@@ -48,7 +48,7 @@
	#include <dev/ofw/ofw_subr.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/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
	@@ -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/gpio/gpiobusvar.h>
	#include <dev/ofw/ofw_bus.h>
	#include <dev/ofw/ofw_bus_subr.h>

File Metadata

Mime Type: text/plain
Expires: Sat, Nov 9, 2:58 PM (20 h, 51 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 14562161
Default Alt Text: D43192.diff (34 KB)

D43192.diffNo OneTemporaryActions

D43192.diffView Options

File Metadata

Event Timeline

D43192.diff
No OneTemporary
Actions

D43192.diff
View Options