D43194.diff
No OneTemporary
Actions

Size

23 KB

Referenced Files

None

Subscribers

None

D43194.diff
View Options

	diff --git a/sys/arm/allwinner/a10_ahci.c b/sys/arm/allwinner/a10_ahci.c
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- a/sys/conf/files
	+++ b/sys/conf/files
	@@ -1682,11 +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/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/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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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.h b/sys/dev/mmc/mmc_fdt_helpers.h
	--- 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_fdt_helpers.c b/sys/dev/mmc/mmc_fdt_helpers.c
	--- 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_helpers.h b/sys/dev/mmc/mmc_helpers.h
	--- 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
	--- 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
	rename from sys/dev/extres/regulator/regdev_if.m
	rename to sys/dev/regulator/regdev_if.m
	diff --git a/sys/dev/extres/regulator/regnode_if.m b/sys/dev/regulator/regnode_if.m
	rename from sys/dev/extres/regulator/regnode_if.m
	rename to sys/dev/regulator/regnode_if.m
	diff --git a/sys/dev/extres/regulator/regulator.h b/sys/dev/regulator/regulator.h
	rename from sys/dev/extres/regulator/regulator.h
	rename to sys/dev/regulator/regulator.h
	--- 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_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.c b/sys/dev/regulator/regulator.c
	rename from sys/dev/extres/regulator/regulator.c
	rename to sys/dev/regulator/regulator.c
	--- 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_bus.c b/sys/dev/regulator/regulator_bus.c
	rename from sys/dev/extres/regulator/regulator_bus.c
	rename to sys/dev/regulator/regulator_bus.c
	diff --git a/sys/dev/extres/regulator/regulator_fixed.h b/sys/dev/regulator/regulator_fixed.h
	rename from sys/dev/extres/regulator/regulator_fixed.h
	rename to sys/dev/regulator/regulator_fixed.h
	--- 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 @@
	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/extres/regulator/regulator_fixed.c b/sys/dev/regulator/regulator_fixed.c
	rename from sys/dev/extres/regulator/regulator_fixed.c
	rename to sys/dev/regulator/regulator_fixed.c
	--- 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/sdhci/sdhci_xenon.c b/sys/dev/sdhci/sdhci_xenon.c
	--- 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
	--- 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
	--- 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
	--- 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"

File Metadata

Mime Type: text/plain
Expires: Sun, Apr 27, 4:44 AM (19 h, 6 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 17813433
Default Alt Text: D43194.diff (23 KB)

D43194.diffNo OneTemporaryActions

D43194.diffView Options

File Metadata

Event Timeline

D43194.diff
No OneTemporary
Actions

D43194.diff
View Options