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
This commit is contained in:
Emmanuel Vadot 2023-12-26 18:54:53 +01:00
parent e51b3d8e53
commit b2f0caf160
59 changed files with 66 additions and 65 deletions

View File

@ -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

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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>

View File

@ -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"

View File

@ -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"

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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"

View File

@ -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>

View File

@ -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"

View File

@ -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>

View File

@ -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
#

View File

@ -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"

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -40,7 +40,7 @@
#include <dev/gpio/gpiobusvar.h>
#include <dev/extres/regulator/regulator.h>
#include <dev/regulator/regulator.h>
#include "regdev_if.h"

View File

@ -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>

View File

@ -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>

View File

@ -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"

View File

@ -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>

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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>

View File

@ -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>

View File

@ -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;

View File

@ -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>

View File

@ -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"

View File

@ -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_ */

View File

@ -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"

View File

@ -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_*/

View File

@ -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>

View File

@ -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>

View File

@ -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"

View File

@ -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"