27 files changed, 30 insertions, 29 deletions

diff --git a/sys/dev/cpufreq/cpufreq_dt.c b/sys/dev/cpufreq/cpufreq_dt.c
index 4dae7142b380..929eebfe7dc5 100644
--- a/sys/dev/cpufreq/cpufreq_dt.c
+++ b/sys/dev/cpufreq/cpufreq_dt.c
@@ -42,7 +42,7 @@
 #include <dev/ofw/ofw_bus_subr.h>
 
 #include <dev/clk/clk.h>
-#include <dev/extres/regulator/regulator.h>
+#include <dev/regulator/regulator.h>
 
 #include "cpufreq_if.h"
 
diff --git a/sys/dev/dwc/if_dwc_aw.c b/sys/dev/dwc/if_dwc_aw.c
index 2a0dfaa33715..460b24b0401a 100644
--- a/sys/dev/dwc/if_dwc_aw.c
+++ b/sys/dev/dwc/if_dwc_aw.c
@@ -43,7 +43,7 @@
 
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
-#include <dev/extres/regulator/regulator.h>
+#include <dev/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 c78fb447d6d3..fca9f879247b 100644
--- a/sys/dev/dwc/if_dwc_rk.c
+++ b/sys/dev/dwc/if_dwc_rk.c
@@ -44,7 +44,7 @@
 
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
-#include <dev/extres/regulator/regulator.h>
+#include <dev/regulator/regulator.h>
 #include <dev/extres/syscon/syscon.h>
 
 #include <dev/dwc/if_dwcvar.h>
diff --git a/sys/dev/eqos/if_eqos_fdt.c b/sys/dev/eqos/if_eqos_fdt.c
index 5601c8b778e2..114f83f3bf37 100644
--- a/sys/dev/eqos/if_eqos_fdt.c
+++ b/sys/dev/eqos/if_eqos_fdt.c
@@ -52,7 +52,7 @@
 
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
-#include <dev/extres/regulator/regulator.h>
+#include <dev/regulator/regulator.h>
 #include <dev/extres/syscon/syscon.h>
 
 #include <dev/eqos/if_eqos_var.h>
diff --git a/sys/dev/gpio/gpioregulator.c b/sys/dev/gpio/gpioregulator.c
index 1f18bd6fd709..1fddb7dedc10 100644
--- a/sys/dev/gpio/gpioregulator.c
+++ b/sys/dev/gpio/gpioregulator.c
@@ -40,7 +40,7 @@
 
 #include <dev/gpio/gpiobusvar.h>
 
-#include <dev/extres/regulator/regulator.h>
+#include <dev/regulator/regulator.h>
 
 #include "regdev_if.h"
 
diff --git a/sys/dev/iicbus/pmic/act8846.c b/sys/dev/iicbus/pmic/act8846.c
index af3ee0ede5e5..5e166247f79b 100644
--- a/sys/dev/iicbus/pmic/act8846.c
+++ b/sys/dev/iicbus/pmic/act8846.c
@@ -41,7 +41,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/regulator/regulator.h>
+#include <dev/regulator/regulator.h>
 #include <dev/fdt/fdt_pinctrl.h>
 #include <dev/iicbus/iiconf.h>
 #include <dev/iicbus/iicbus.h>
diff --git a/sys/dev/iicbus/pmic/act8846_regulator.c b/sys/dev/iicbus/pmic/act8846_regulator.c
index 551b537bb64f..9a711db2fbef 100644
--- a/sys/dev/iicbus/pmic/act8846_regulator.c
+++ b/sys/dev/iicbus/pmic/act8846_regulator.c
@@ -40,7 +40,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/regulator/regulator.h>
+#include <dev/regulator/regulator.h>
 
 #include <dev/iicbus/pmic/act8846.h>
 
diff --git a/sys/dev/iicbus/pmic/fan53555.c b/sys/dev/iicbus/pmic/fan53555.c
index 12940bad5c67..7693770428e2 100644
--- a/sys/dev/iicbus/pmic/fan53555.c
+++ b/sys/dev/iicbus/pmic/fan53555.c
@@ -41,7 +41,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/regulator/regulator.h>
+#include <dev/regulator/regulator.h>
 
 #include "regdev_if.h"
 
diff --git a/sys/dev/iicbus/pmic/rockchip/rk8xx_regulators.c b/sys/dev/iicbus/pmic/rockchip/rk8xx_regulators.c
index 7e637176531d..f640c6668376 100644
--- a/sys/dev/iicbus/pmic/rockchip/rk8xx_regulators.c
+++ b/sys/dev/iicbus/pmic/rockchip/rk8xx_regulators.c
@@ -33,7 +33,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/regulator/regulator.h>
+#include <dev/regulator/regulator.h>
 
 #include <dev/iicbus/pmic/rockchip/rk8xx.h>
 
diff --git a/sys/dev/iicbus/pmic/silergy/sy8106a.c b/sys/dev/iicbus/pmic/silergy/sy8106a.c
index 76a39415349d..7c00c67f38d9 100644
--- a/sys/dev/iicbus/pmic/silergy/sy8106a.c
+++ b/sys/dev/iicbus/pmic/silergy/sy8106a.c
@@ -41,7 +41,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/regulator/regulator.h>
+#include <dev/regulator/regulator.h>
 
 #include "iicbus_if.h"
 #include "regdev_if.h"
diff --git a/sys/dev/iicbus/pmic/silergy/syr827.c b/sys/dev/iicbus/pmic/silergy/syr827.c
index afc2bacfcd02..d48a3c92e665 100644
--- a/sys/dev/iicbus/pmic/silergy/syr827.c
+++ b/sys/dev/iicbus/pmic/silergy/syr827.c
@@ -40,7 +40,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/regulator/regulator.h>
+#include <dev/regulator/regulator.h>
 
 #include "iicbus_if.h"
 #include "regdev_if.h"
diff --git a/sys/dev/mmc/host/dwmmc_var.h b/sys/dev/mmc/host/dwmmc_var.h
index ebfc738eb8af..c524fd88f00a 100644
--- a/sys/dev/mmc/host/dwmmc_var.h
+++ b/sys/dev/mmc/host/dwmmc_var.h
@@ -33,7 +33,7 @@
 
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
-#include <dev/extres/regulator/regulator.h>
+#include <dev/regulator/regulator.h>
 
 #include "opt_mmccam.h"
 
diff --git a/sys/dev/mmc/mmc_fdt_helpers.c b/sys/dev/mmc/mmc_fdt_helpers.c
index 8742b90d4f9c..0fb76dbfe522 100644
--- a/sys/dev/mmc/mmc_fdt_helpers.c
+++ b/sys/dev/mmc/mmc_fdt_helpers.c
@@ -38,7 +38,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/regulator/regulator.h>
+#include <dev/regulator/regulator.h>
 
 #include <dev/mmc/mmc_helpers.h>
 
diff --git a/sys/dev/mmc/mmc_fdt_helpers.h b/sys/dev/mmc/mmc_fdt_helpers.h
index 8b14138d882d..f22ce65b10ea 100644
--- a/sys/dev/mmc/mmc_fdt_helpers.h
+++ b/sys/dev/mmc/mmc_fdt_helpers.h
@@ -31,7 +31,7 @@
 #include <dev/gpio/gpiobusvar.h>
 #include <dev/ofw/ofw_bus.h>
 
-#include <dev/extres/regulator/regulator.h>
+#include <dev/regulator/regulator.h>
 
 #include <dev/mmc/mmc_helpers.h>
 
diff --git a/sys/dev/mmc/mmc_helpers.h b/sys/dev/mmc/mmc_helpers.h
index 2788d1eb0ecc..db2ed0a3959a 100644
--- a/sys/dev/mmc/mmc_helpers.h
+++ b/sys/dev/mmc/mmc_helpers.h
@@ -30,7 +30,7 @@
 
 #include <dev/gpio/gpiobusvar.h>
 
-#include <dev/extres/regulator/regulator.h>
+#include <dev/regulator/regulator.h>
 
 struct mmc_helper {
 	device_t		dev;
diff --git a/sys/dev/pwm/pwm_backlight.c b/sys/dev/pwm/pwm_backlight.c
index 0a5cf4c34d6f..ce3c0a6e1bd9 100644
--- a/sys/dev/pwm/pwm_backlight.c
+++ b/sys/dev/pwm/pwm_backlight.c
@@ -47,7 +47,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/regulator/regulator.h>
+#include <dev/regulator/regulator.h>
 
 #include <dev/backlight/backlight.h>
 
diff --git a/sys/dev/extres/regulator/regdev_if.m b/sys/dev/regulator/regdev_if.m
index bed20c464a1c..bed20c464a1c 100644
--- a/sys/dev/extres/regulator/regdev_if.m
+++ b/sys/dev/regulator/regdev_if.m
diff --git a/sys/dev/extres/regulator/regnode_if.m b/sys/dev/regulator/regnode_if.m
index 83ca0460ff70..83ca0460ff70 100644
--- a/sys/dev/extres/regulator/regnode_if.m
+++ b/sys/dev/regulator/regnode_if.m
diff --git a/sys/dev/extres/regulator/regulator.c b/sys/dev/regulator/regulator.c
index 68e76f09a05e..6b49c6e93aae 100644
--- a/sys/dev/extres/regulator/regulator.c
+++ b/sys/dev/regulator/regulator.c
@@ -45,7 +45,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 #endif
-#include <dev/extres/regulator/regulator.h>
+#include <dev/regulator/regulator.h>
 
 #ifdef FDT
 #include "regdev_if.h"
diff --git a/sys/dev/extres/regulator/regulator.h b/sys/dev/regulator/regulator.h
index 4ef07f9acf12..e11dec515019 100644
--- a/sys/dev/extres/regulator/regulator.h
+++ b/sys/dev/regulator/regulator.h
@@ -24,8 +24,9 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _DEV_EXTRES_REGULATOR_H_
-#define _DEV_EXTRES_REGULATOR_H_
+#ifndef _DEV_REGULATOR_H_
+#define	_DEV_REGULATOR_H_
+
 #include "opt_platform.h"
 
 #include <sys/kobj.h>
@@ -151,4 +152,4 @@ int regulator_range_volt_to_sel8(struct regulator_range *ranges, int nranges,
 int regulator_range_sel8_to_volt(struct regulator_range *ranges, int nranges,
    uint8_t sel, int *volt);
 
-#endif /* _DEV_EXTRES_REGULATOR_H_ */
+#endif /* _DEV_REGULATOR_H_ */
diff --git a/sys/dev/extres/regulator/regulator_bus.c b/sys/dev/regulator/regulator_bus.c
index 99081c792b90..99081c792b90 100644
--- a/sys/dev/extres/regulator/regulator_bus.c
+++ b/sys/dev/regulator/regulator_bus.c
diff --git a/sys/dev/extres/regulator/regulator_fixed.c b/sys/dev/regulator/regulator_fixed.c
index d39e83c93037..d9ebbe017e11 100644
--- a/sys/dev/extres/regulator/regulator_fixed.c
+++ b/sys/dev/regulator/regulator_fixed.c
@@ -42,7 +42,7 @@
 #include <dev/ofw/ofw_bus_subr.h>
 #endif
 #include <dev/gpio/gpiobusvar.h>
-#include <dev/extres/regulator/regulator_fixed.h>
+#include <dev/regulator/regulator_fixed.h>
 
 #ifdef FDT
 #include "regdev_if.h"
diff --git a/sys/dev/extres/regulator/regulator_fixed.h b/sys/dev/regulator/regulator_fixed.h
index 2d1abe01b9af..33213252d653 100644
--- a/sys/dev/extres/regulator/regulator_fixed.h
+++ b/sys/dev/regulator/regulator_fixed.h
@@ -24,11 +24,11 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _DEV_EXTRES_REGULATOR_FIXED_H_
-#define _DEV_EXTRES_REGULATOR_FIXED_H_
+#ifndef _DEV_REGULATOR_FIXED_H_
+#define	_DEV_REGULATOR_FIXED_H_
 
 #include <dev/gpio/gpiobusvar.h>
-#include <dev/extres/regulator/regulator.h>
+#include <dev/regulator/regulator.h>
 
 struct regnode_fixed_init_def {
 	struct regnode_init_def	reg_init_def;
@@ -39,4 +39,4 @@ struct regnode_fixed_init_def {
 int regnode_fixed_register(device_t dev,
     struct regnode_fixed_init_def *init_def);
 
-#endif /*_DEV_EXTRES_REGULATOR_FIXED_H_*/
+#endif /*_DEV_REGULATOR_FIXED_H_*/
diff --git a/sys/dev/sdhci/sdhci_xenon.c b/sys/dev/sdhci/sdhci_xenon.c
index d8f66e655e50..4a823b896ca8 100644
--- a/sys/dev/sdhci/sdhci_xenon.c
+++ b/sys/dev/sdhci/sdhci_xenon.c
@@ -45,7 +45,7 @@
 #include <machine/bus.h>
 #include <machine/resource.h>
 
-#include <dev/extres/regulator/regulator.h>
+#include <dev/regulator/regulator.h>
 
 #include <dev/mmc/bridge.h>
 #include <dev/mmc/mmcbrvar.h>
diff --git a/sys/dev/sdhci/sdhci_xenon_acpi.c b/sys/dev/sdhci/sdhci_xenon_acpi.c
index c792e3cf2e48..01b6c14dc5f2 100644
--- a/sys/dev/sdhci/sdhci_xenon_acpi.c
+++ b/sys/dev/sdhci/sdhci_xenon_acpi.c
@@ -40,7 +40,7 @@
 #include <contrib/dev/acpica/include/accommon.h>
 #include <dev/acpica/acpivar.h>
 
-#include <dev/extres/regulator/regulator.h>
+#include <dev/regulator/regulator.h>
 
 #include <dev/sdhci/sdhci.h>
 #include <dev/sdhci/sdhci_xenon.h>
diff --git a/sys/dev/sound/fdt/simple_amplifier.c b/sys/dev/sound/fdt/simple_amplifier.c
index 45505be4d3e3..c6379dd08450 100644
--- a/sys/dev/sound/fdt/simple_amplifier.c
+++ b/sys/dev/sound/fdt/simple_amplifier.c
@@ -39,7 +39,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/regulator/regulator.h>
+#include <dev/regulator/regulator.h>
 #include <dev/gpio/gpiobusvar.h>
 
 #include "opt_snd.h"
diff --git a/sys/dev/usb/controller/usb_nop_xceiv.c b/sys/dev/usb/controller/usb_nop_xceiv.c
index 25fc13cb0020..e9503a35531a 100644
--- a/sys/dev/usb/controller/usb_nop_xceiv.c
+++ b/sys/dev/usb/controller/usb_nop_xceiv.c
@@ -42,7 +42,7 @@
 #include <dev/ofw/ofw_bus_subr.h>
 
 #include <dev/clk/clk.h>
-#include <dev/extres/regulator/regulator.h>
+#include <dev/regulator/regulator.h>
 #include <dev/extres/phy/phy_usb.h>
 
 #include "phynode_if.h"