diff options
| author | Emmanuel Vadot <manu@FreeBSD.org> | 2023-12-26 17:54:53 +0000 |
|---|---|---|
| committer | Emmanuel Vadot <manu@FreeBSD.org> | 2024-01-10 18:20:32 +0000 |
| commit | b2f0caf160993c30a0d0e3d52e8a2d03616908cd (patch) | |
| tree | 0bf9a48ddece6c03d25279184db7db931a9bf1f4 | |
| parent | e51b3d8e53cee7d6a36e34e1cd4d588593d71b40 (diff) | |
| download | src-b2f0caf160993c30a0d0e3d52e8a2d03616908cd.tar.gz src-b2f0caf160993c30a0d0e3d52e8a2d03616908cd.zip | |
regulator: Move regulator code in dev/regulator
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: emaste, imp
Sponsored by: Beckhoff Automation GmbH & Co. KG
Differential Revision: https://reviews.freebsd.org/D43194
59 files changed, 66 insertions, 65 deletions
diff --git a/sys/arm/allwinner/a10_ahci.c b/sys/arm/allwinner/a10_ahci.c index a0717a0e9dfa..b7aa991b6543 100644 --- a/sys/arm/allwinner/a10_ahci.c +++ b/sys/arm/allwinner/a10_ahci.c @@ -44,7 +44,7 @@ #include <dev/ahci/ahci.h> #include <dev/clk/clk.h> -#include <dev/extres/regulator/regulator.h> +#include <dev/regulator/regulator.h> /* * Allwinner a1x/a2x/a8x SATA attachment. This is just the AHCI register diff --git a/sys/arm/allwinner/a64/sun50i_a64_acodec.c b/sys/arm/allwinner/a64/sun50i_a64_acodec.c index f9ada20ec554..12c9a86cf361 100644 --- a/sys/arm/allwinner/a64/sun50i_a64_acodec.c +++ b/sys/arm/allwinner/a64/sun50i_a64_acodec.c @@ -42,7 +42,7 @@ #include <dev/clk/clk.h> #include <dev/hwreset/hwreset.h> -#include <dev/extres/regulator/regulator.h> +#include <dev/regulator/regulator.h> #include "syscon_if.h" diff --git a/sys/arm/allwinner/aw_gpio.c b/sys/arm/allwinner/aw_gpio.c index f72dbf88099f..cee2cf056f42 100644 --- a/sys/arm/allwinner/aw_gpio.c +++ b/sys/arm/allwinner/aw_gpio.c @@ -54,7 +54,7 @@ #include <arm/allwinner/allwinner_pinctrl.h> #include <dev/clk/clk.h> #include <dev/hwreset/hwreset.h> -#include <dev/extres/regulator/regulator.h> +#include <dev/regulator/regulator.h> #if defined(__aarch64__) #include "opt_soc.h" diff --git a/sys/arm/allwinner/aw_mmc.c b/sys/arm/allwinner/aw_mmc.c index d229fba1e07d..929cbd8f3ed8 100644 --- a/sys/arm/allwinner/aw_mmc.c +++ b/sys/arm/allwinner/aw_mmc.c @@ -54,7 +54,7 @@ #include <arm/allwinner/aw_mmc.h> #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/arm/allwinner/aw_usb3phy.c b/sys/arm/allwinner/aw_usb3phy.c index b49a9a86b6e9..fdf54ef79250 100644 --- a/sys/arm/allwinner/aw_usb3phy.c +++ b/sys/arm/allwinner/aw_usb3phy.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/phy/phy_usb.h> #include "phynode_if.h" diff --git a/sys/arm/allwinner/aw_usbphy.c b/sys/arm/allwinner/aw_usbphy.c index 09725783fd22..855be90d7fb8 100644 --- a/sys/arm/allwinner/aw_usbphy.c +++ b/sys/arm/allwinner/aw_usbphy.c @@ -42,7 +42,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/phy/phy_usb.h> #include "phynode_if.h" diff --git a/sys/arm/allwinner/axp209.c b/sys/arm/allwinner/axp209.c index b4e00988031e..239ead02d0e0 100644 --- a/sys/arm/allwinner/axp209.c +++ b/sys/arm/allwinner/axp209.c @@ -51,7 +51,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 <arm/allwinner/axp209reg.h> diff --git a/sys/arm/allwinner/axp81x.c b/sys/arm/allwinner/axp81x.c index ac9f9ee9e8ba..fc1a168595e5 100644 --- a/sys/arm/allwinner/axp81x.c +++ b/sys/arm/allwinner/axp81x.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 "gpio_if.h" #include "iicbus_if.h" diff --git a/sys/arm/allwinner/if_awg.c b/sys/arm/allwinner/if_awg.c index 6c38a65b5040..9834be083870 100644 --- a/sys/arm/allwinner/if_awg.c +++ b/sys/arm/allwinner/if_awg.c @@ -61,7 +61,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 "syscon_if.h" diff --git a/sys/arm/nvidia/as3722.c b/sys/arm/nvidia/as3722.c index 537cd4f6e24a..ca5f7372aed1 100644 --- a/sys/arm/nvidia/as3722.c +++ b/sys/arm/nvidia/as3722.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/gpio/gpiobusvar.h> #include <dev/iicbus/iiconf.h> diff --git a/sys/arm/nvidia/as3722_regulators.c b/sys/arm/nvidia/as3722_regulators.c index 912c0d964961..331dfb72f4b5 100644 --- a/sys/arm/nvidia/as3722_regulators.c +++ b/sys/arm/nvidia/as3722_regulators.c @@ -36,7 +36,7 @@ #include <machine/bus.h> -#include <dev/extres/regulator/regulator.h> +#include <dev/regulator/regulator.h> #include <dev/gpio/gpiobusvar.h> #include <dt-bindings/mfd/as3722.h> diff --git a/sys/arm/nvidia/drm2/tegra_hdmi.c b/sys/arm/nvidia/drm2/tegra_hdmi.c index 174a9718bbfa..e5ce30ac2eb3 100644 --- a/sys/arm/nvidia/drm2/tegra_hdmi.c +++ b/sys/arm/nvidia/drm2/tegra_hdmi.c @@ -38,7 +38,7 @@ #include <dev/clk/clk.h> #include <dev/hwreset/hwreset.h> -#include <dev/extres/regulator/regulator.h> +#include <dev/regulator/regulator.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/tegra124/tegra124_cpufreq.c b/sys/arm/nvidia/tegra124/tegra124_cpufreq.c index 7cf83978557e..a537d9397722 100644 --- a/sys/arm/nvidia/tegra124/tegra124_cpufreq.c +++ b/sys/arm/nvidia/tegra124/tegra124_cpufreq.c @@ -37,7 +37,7 @@ #include <machine/cpu.h> #include <dev/clk/clk.h> -#include <dev/extres/regulator/regulator.h> +#include <dev/regulator/regulator.h> #include <dev/ofw/ofw_bus_subr.h> #include <arm/nvidia/tegra_efuse.h> diff --git a/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c b/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c index 0b611abc39cb..43c7e345d12c 100644 --- a/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c +++ b/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c @@ -37,7 +37,7 @@ #include <dev/hwreset/hwreset.h> #include <dev/extres/phy/phy.h> -#include <dev/extres/regulator/regulator.h> +#include <dev/regulator/regulator.h> #include <dev/fdt/fdt_common.h> #include <dev/fdt/fdt_pinctrl.h> #include <dev/ofw/openfirm.h> diff --git a/sys/arm/nvidia/tegra_ahci.c b/sys/arm/nvidia/tegra_ahci.c index de60f02e97ea..bf60971e2b7c 100644 --- a/sys/arm/nvidia/tegra_ahci.c +++ b/sys/arm/nvidia/tegra_ahci.c @@ -47,7 +47,7 @@ #include <dev/clk/clk.h> #include <dev/hwreset/hwreset.h> #include <dev/extres/phy/phy.h> -#include <dev/extres/regulator/regulator.h> +#include <dev/regulator/regulator.h> #include <dev/fdt/fdt_pinctrl.h> #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> diff --git a/sys/arm/nvidia/tegra_pcie.c b/sys/arm/nvidia/tegra_pcie.c index a22ae02ce4bc..c9b5f46c4e30 100644 --- a/sys/arm/nvidia/tegra_pcie.c +++ b/sys/arm/nvidia/tegra_pcie.c @@ -50,7 +50,7 @@ #include <dev/clk/clk.h> #include <dev/hwreset/hwreset.h> #include <dev/extres/phy/phy.h> -#include <dev/extres/regulator/regulator.h> +#include <dev/regulator/regulator.h> #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> #include <dev/ofw/ofw_pci.h> diff --git a/sys/arm/nvidia/tegra_usbphy.c b/sys/arm/nvidia/tegra_usbphy.c index 2499a568fe4c..eeaca9fcc07c 100644 --- a/sys/arm/nvidia/tegra_usbphy.c +++ b/sys/arm/nvidia/tegra_usbphy.c @@ -41,7 +41,7 @@ #include <dev/clk/clk.h> #include <dev/hwreset/hwreset.h> #include <dev/extres/phy/phy.h> -#include <dev/extres/regulator/regulator.h> +#include <dev/regulator/regulator.h> #include <dev/fdt/fdt_pinctrl.h> #include <dev/ofw/openfirm.h> #include <dev/ofw/ofw_bus.h> diff --git a/sys/arm/nvidia/tegra_xhci.c b/sys/arm/nvidia/tegra_xhci.c index 21ce4dc0540d..5bd7e6b7736e 100644 --- a/sys/arm/nvidia/tegra_xhci.c +++ b/sys/arm/nvidia/tegra_xhci.c @@ -55,7 +55,7 @@ #include <dev/clk/clk.h> #include <dev/hwreset/hwreset.h> #include <dev/extres/phy/phy.h> -#include <dev/extres/regulator/regulator.h> +#include <dev/regulator/regulator.h> #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> #include <dev/usb/usb.h> diff --git a/sys/arm/qualcomm/ipq4018_usb_hs_phy.c b/sys/arm/qualcomm/ipq4018_usb_hs_phy.c index 618911fef640..953887ad9906 100644 --- a/sys/arm/qualcomm/ipq4018_usb_hs_phy.c +++ b/sys/arm/qualcomm/ipq4018_usb_hs_phy.c @@ -38,7 +38,7 @@ #include <dev/hwreset/hwreset.h> #include <dev/extres/phy/phy_usb.h> -#include <dev/extres/regulator/regulator.h> +#include <dev/regulator/regulator.h> #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> diff --git a/sys/arm/qualcomm/ipq4018_usb_ss_phy.c b/sys/arm/qualcomm/ipq4018_usb_ss_phy.c index 66ef4c9fe732..b60be5896595 100644 --- a/sys/arm/qualcomm/ipq4018_usb_ss_phy.c +++ b/sys/arm/qualcomm/ipq4018_usb_ss_phy.c @@ -38,7 +38,7 @@ #include <dev/hwreset/hwreset.h> #include <dev/extres/phy/phy_usb.h> -#include <dev/extres/regulator/regulator.h> +#include <dev/regulator/regulator.h> #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> diff --git a/sys/arm64/nvidia/tegra210/max77620.c b/sys/arm64/nvidia/tegra210/max77620.c index a27edf01889d..b33d73e71f90 100644 --- a/sys/arm64/nvidia/tegra210/max77620.c +++ b/sys/arm64/nvidia/tegra210/max77620.c @@ -40,7 +40,7 @@ #include <machine/bus.h> -#include <dev/extres/regulator/regulator.h> +#include <dev/regulator/regulator.h> #include <dev/fdt/fdt_pinctrl.h> #include <dev/gpio/gpiobusvar.h> #include <dev/iicbus/iiconf.h> diff --git a/sys/arm64/nvidia/tegra210/max77620_regulators.c b/sys/arm64/nvidia/tegra210/max77620_regulators.c index 3bfed6815711..af1a5af20ec3 100644 --- a/sys/arm64/nvidia/tegra210/max77620_regulators.c +++ b/sys/arm64/nvidia/tegra210/max77620_regulators.c @@ -37,7 +37,7 @@ #include <machine/bus.h> -#include <dev/extres/regulator/regulator.h> +#include <dev/regulator/regulator.h> #include <dev/gpio/gpiobusvar.h> #include <dt-bindings/mfd/max77620.h> diff --git a/sys/arm64/nvidia/tegra210/tegra210_cpufreq.c b/sys/arm64/nvidia/tegra210/tegra210_cpufreq.c index 99b54b224e89..9b248a09bd58 100644 --- a/sys/arm64/nvidia/tegra210/tegra210_cpufreq.c +++ b/sys/arm64/nvidia/tegra210/tegra210_cpufreq.c @@ -38,7 +38,7 @@ #include <machine/cpu.h> #include <dev/clk/clk.h> -#include <dev/extres/regulator/regulator.h> +#include <dev/regulator/regulator.h> #include <dev/ofw/ofw_bus_subr.h> #include <arm/nvidia/tegra_efuse.h> diff --git a/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c b/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c index 75662386427f..944f4e645533 100644 --- a/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c +++ b/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c @@ -38,7 +38,7 @@ #include <dev/clk/clk.h> #include <dev/hwreset/hwreset.h> #include <dev/extres/phy/phy.h> -#include <dev/extres/regulator/regulator.h> +#include <dev/regulator/regulator.h> #include <dev/fdt/fdt_common.h> #include <dev/fdt/fdt_pinctrl.h> #include <dev/ofw/openfirm.h> diff --git a/sys/arm64/rockchip/rk3568_combphy.c b/sys/arm64/rockchip/rk3568_combphy.c index 5152f3eed0d1..99144b3315b1 100644 --- a/sys/arm64/rockchip/rk3568_combphy.c +++ b/sys/arm64/rockchip/rk3568_combphy.c @@ -42,7 +42,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/extres/phy/phy.h> diff --git a/sys/arm64/rockchip/rk3568_pcie.c b/sys/arm64/rockchip/rk3568_pcie.c index 5343a5dd3f2c..9874efdb1ec9 100644 --- a/sys/arm64/rockchip/rk3568_pcie.c +++ b/sys/arm64/rockchip/rk3568_pcie.c @@ -51,7 +51,7 @@ #include <dev/clk/clk.h> #include <dev/extres/phy/phy.h> -#include <dev/extres/regulator/regulator.h> +#include <dev/regulator/regulator.h> #include <dev/hwreset/hwreset.h> #include <machine/bus.h> diff --git a/sys/arm64/rockchip/rk3568_pciephy.c b/sys/arm64/rockchip/rk3568_pciephy.c index f277253b577d..50471ea55130 100644 --- a/sys/arm64/rockchip/rk3568_pciephy.c +++ b/sys/arm64/rockchip/rk3568_pciephy.c @@ -42,7 +42,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/extres/phy/phy.h> diff --git a/sys/arm64/rockchip/rk_iodomain.c b/sys/arm64/rockchip/rk_iodomain.c index 695d941e4f9c..e872ee5a45ed 100644 --- a/sys/arm64/rockchip/rk_iodomain.c +++ b/sys/arm64/rockchip/rk_iodomain.c @@ -36,7 +36,7 @@ #include <dev/ofw/ofw_bus_subr.h> #include <dev/extres/syscon/syscon.h> -#include <dev/extres/regulator/regulator.h> +#include <dev/regulator/regulator.h> #include "syscon_if.h" diff --git a/sys/arm64/rockchip/rk_pcie.c b/sys/arm64/rockchip/rk_pcie.c index cc6c842a6f6a..ca85637589ee 100644 --- a/sys/arm64/rockchip/rk_pcie.c +++ b/sys/arm64/rockchip/rk_pcie.c @@ -47,7 +47,7 @@ #include <dev/clk/clk.h> #include <dev/hwreset/hwreset.h> #include <dev/extres/phy/phy.h> -#include <dev/extres/regulator/regulator.h> +#include <dev/regulator/regulator.h> #include <dev/gpio/gpiobusvar.h> #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> diff --git a/sys/arm64/rockchip/rk_usb2phy.c b/sys/arm64/rockchip/rk_usb2phy.c index 367d4fef61cc..d06dce90c27b 100644 --- a/sys/arm64/rockchip/rk_usb2phy.c +++ b/sys/arm64/rockchip/rk_usb2phy.c @@ -45,7 +45,7 @@ #include <dev/clk/clk.h> #include <dev/extres/phy/phy_usb.h> -#include <dev/extres/regulator/regulator.h> +#include <dev/regulator/regulator.h> #include <dev/extres/syscon/syscon.h> #include "clkdev_if.h" diff --git a/sys/arm64/rockchip/rk_usbphy.c b/sys/arm64/rockchip/rk_usbphy.c index 46859d1442e3..c2020373d040 100644 --- a/sys/arm64/rockchip/rk_usbphy.c +++ b/sys/arm64/rockchip/rk_usbphy.c @@ -39,7 +39,7 @@ #include <dev/clk/clk.h> #include <dev/hwreset/hwreset.h> #include <dev/extres/phy/phy_usb.h> -#include <dev/extres/regulator/regulator.h> +#include <dev/regulator/regulator.h> #include <dev/extres/syscon/syscon.h> #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> diff --git a/sys/conf/files b/sys/conf/files index e07ac548d93a..f0d4250a4537 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1682,11 +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/regulator/regdev_if.m optional regulator fdt -dev/extres/regulator/regnode_if.m optional regulator -dev/extres/regulator/regulator.c optional regulator -dev/extres/regulator/regulator_bus.c optional regulator fdt -dev/extres/regulator/regulator_fixed.c optional regulator dev/extres/syscon/syscon.c optional syscon dev/extres/syscon/syscon_generic.c optional syscon fdt dev/extres/syscon/syscon_if.m optional syscon @@ -2800,6 +2795,11 @@ dev/random/fortuna.c optional !random_loadable !random_fenestrasx dev/random/hash.c optional !random_loadable dev/rccgpio/rccgpio.c optional rccgpio gpio dev/re/if_re.c optional re +dev/regulator/regdev_if.m optional regulator fdt +dev/regulator/regnode_if.m optional regulator +dev/regulator/regulator.c optional regulator +dev/regulator/regulator_bus.c optional regulator fdt +dev/regulator/regulator_fixed.c optional regulator dev/rl/if_rl.c optional rl pci dev/rndtest/rndtest.c optional rndtest # 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" |