diff options
| author | Emmanuel Vadot <manu@FreeBSD.org> | 2023-12-26 17:58:15 +0000 |
|---|---|---|
| committer | Emmanuel Vadot <manu@FreeBSD.org> | 2024-01-10 18:20:37 +0000 |
| commit | 62e8ccc3a489434af379c7f47da71545bc1e14ee (patch) | |
| tree | 112fa305efab5de40936c4acf708056830dd6ff5 | |
| parent | 950a6087ec18cd22464b3297573f54a6d9223c99 (diff) | |
| download | src-62e8ccc3a489434af379c7f47da71545bc1e14ee.tar.gz src-62e8ccc3a489434af379c7f47da71545bc1e14ee.zip | |
syscon: Move syscon code in dev/syscon
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: mhorne
Sponsored by: Beckhoff Automation GmbH & Co. KG
Differential Revision: https://reviews.freebsd.org/D43196
47 files changed, 47 insertions, 47 deletions
diff --git a/sys/arm/allwinner/aw_syscon.c b/sys/arm/allwinner/aw_syscon.c index 3f6e8260c2c9..6a880a9b617e 100644 --- a/sys/arm/allwinner/aw_syscon.c +++ b/sys/arm/allwinner/aw_syscon.c @@ -41,8 +41,8 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/syscon/syscon.h> -#include <dev/extres/syscon/syscon_generic.h> +#include <dev/syscon/syscon.h> +#include <dev/syscon/syscon_generic.h> static struct ofw_compat_data compat_data[] = { {"allwinner,sun50i-a64-system-controller", 1}, diff --git a/sys/arm/allwinner/if_awg.c b/sys/arm/allwinner/if_awg.c index 9834be083870..29a75e5a4d9b 100644 --- a/sys/arm/allwinner/if_awg.c +++ b/sys/arm/allwinner/if_awg.c @@ -62,7 +62,7 @@ #include <dev/clk/clk.h> #include <dev/hwreset/hwreset.h> #include <dev/regulator/regulator.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include "syscon_if.h" #include "miibus_if.h" diff --git a/sys/arm/mv/clk/a37x0_xtal.c b/sys/arm/mv/clk/a37x0_xtal.c index 67a791b8d34a..195c26259e63 100644 --- a/sys/arm/mv/clk/a37x0_xtal.c +++ b/sys/arm/mv/clk/a37x0_xtal.c @@ -37,7 +37,7 @@ #include <dev/clk/clk.h> #include <dev/clk/clk_fixed.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> diff --git a/sys/arm/mv/mv_ap806_clock.c b/sys/arm/mv/mv_ap806_clock.c index f41f5e09c4dd..6d15d5687088 100644 --- a/sys/arm/mv/mv_ap806_clock.c +++ b/sys/arm/mv/mv_ap806_clock.c @@ -40,7 +40,7 @@ #include <machine/intr.h> #include <dev/clk/clk_fixed.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> diff --git a/sys/arm/mv/mv_cp110_clock.c b/sys/arm/mv/mv_cp110_clock.c index 45f8476df5b3..9edc01e95074 100644 --- a/sys/arm/mv/mv_cp110_clock.c +++ b/sys/arm/mv/mv_cp110_clock.c @@ -41,7 +41,7 @@ #include <dev/clk/clk_fixed.h> #include <dev/clk/clk_gate.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> diff --git a/sys/arm/mv/mv_cp110_icu_bus.c b/sys/arm/mv/mv_cp110_icu_bus.c index 43429292c9f1..75c0bee75414 100644 --- a/sys/arm/mv/mv_cp110_icu_bus.c +++ b/sys/arm/mv/mv_cp110_icu_bus.c @@ -38,7 +38,7 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include <dev/fdt/simple_mfd.h> static struct ofw_compat_data compat_data[] = { diff --git a/sys/arm/mv/mv_thermal.c b/sys/arm/mv/mv_thermal.c index 8004fdd38289..9240666ec726 100644 --- a/sys/arm/mv/mv_thermal.c +++ b/sys/arm/mv/mv_thermal.c @@ -39,7 +39,7 @@ #include <machine/bus.h> #include <machine/resource.h> #include <machine/intr.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> diff --git a/sys/arm/mv/mvebu_gpio.c b/sys/arm/mv/mvebu_gpio.c index 001369bb3a02..a2001589867c 100644 --- a/sys/arm/mv/mvebu_gpio.c +++ b/sys/arm/mv/mvebu_gpio.c @@ -43,7 +43,7 @@ #include <machine/intr.h> #include <machine/resource.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include <dev/gpio/gpiobusvar.h> diff --git a/sys/arm/mv/mvebu_pinctrl.c b/sys/arm/mv/mvebu_pinctrl.c index 658a4b615cf7..7e9ecda1a67a 100644 --- a/sys/arm/mv/mvebu_pinctrl.c +++ b/sys/arm/mv/mvebu_pinctrl.c @@ -39,7 +39,7 @@ #include <machine/resource.h> #include <machine/intr.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include <dev/fdt/fdt_pinctrl.h> diff --git a/sys/arm/ti/am335x/am335x_musb.c b/sys/arm/ti/am335x/am335x_musb.c index b24f12990640..93cb7cef41b9 100644 --- a/sys/arm/ti/am335x/am335x_musb.c +++ b/sys/arm/ti/am335x/am335x_musb.c @@ -67,7 +67,7 @@ #include <arm/ti/am335x/am335x_scm.h> #include <arm/ti/ti_sysc.h> #include <dev/clk/clk.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include "syscon_if.h" #define USBCTRL_REV 0x00 diff --git a/sys/arm/ti/am335x/am335x_pwmss.c b/sys/arm/ti/am335x/am335x_pwmss.c index c4a045503b1e..8766c706b807 100644 --- a/sys/arm/ti/am335x/am335x_pwmss.c +++ b/sys/arm/ti/am335x/am335x_pwmss.c @@ -45,7 +45,7 @@ #include <arm/ti/ti_sysc.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include "syscon_if.h" #include "am335x_pwm.h" diff --git a/sys/arm/ti/am335x/am335x_scm.c b/sys/arm/ti/am335x/am335x_scm.c index 1a4fd0ed6325..214a9dfdf18b 100644 --- a/sys/arm/ti/am335x/am335x_scm.c +++ b/sys/arm/ti/am335x/am335x_scm.c @@ -37,7 +37,7 @@ #include <arm/ti/ti_cpuid.h> #include <arm/ti/ti_scm.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include "syscon_if.h" #define TZ_ZEROC 2731 diff --git a/sys/arm/ti/cpsw/if_cpsw.c b/sys/arm/ti/cpsw/if_cpsw.c index 223d24019cb8..c2651c33e1b1 100644 --- a/sys/arm/ti/cpsw/if_cpsw.c +++ b/sys/arm/ti/cpsw/if_cpsw.c @@ -72,7 +72,7 @@ #include <net/if_media.h> #include <net/if_types.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include "syscon_if.h" #include <arm/ti/am335x/am335x_scm.h> diff --git a/sys/arm/ti/ti_scm_syscon.c b/sys/arm/ti/ti_scm_syscon.c index af77bc54f150..7286be7b8f2c 100644 --- a/sys/arm/ti/ti_scm_syscon.c +++ b/sys/arm/ti/ti_scm_syscon.c @@ -46,7 +46,7 @@ #include <dev/ofw/ofw_bus_subr.h> #include "syscon_if.h" -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include "clkdev_if.h" #include <arm/ti/ti_cpuid.h> diff --git a/sys/arm64/rockchip/rk3328_codec.c b/sys/arm64/rockchip/rk3328_codec.c index ff6f2a3da881..91d73ee4ca34 100644 --- a/sys/arm64/rockchip/rk3328_codec.c +++ b/sys/arm64/rockchip/rk3328_codec.c @@ -41,7 +41,7 @@ #include <dev/ofw/ofw_bus_subr.h> #include <dev/clk/clk.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include "syscon_if.h" diff --git a/sys/arm64/rockchip/rk3399_emmcphy.c b/sys/arm64/rockchip/rk3399_emmcphy.c index 8799dcb06b5d..97b2123e89fd 100644 --- a/sys/arm64/rockchip/rk3399_emmcphy.c +++ b/sys/arm64/rockchip/rk3399_emmcphy.c @@ -44,7 +44,7 @@ #include <dev/ofw/ofw_bus_subr.h> #include <dev/clk/clk.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include <dev/phy/phy.h> #include "syscon_if.h" diff --git a/sys/arm64/rockchip/rk3568_combphy.c b/sys/arm64/rockchip/rk3568_combphy.c index 1f9c0003b531..c5d35fa0b8e2 100644 --- a/sys/arm64/rockchip/rk3568_combphy.c +++ b/sys/arm64/rockchip/rk3568_combphy.c @@ -43,7 +43,7 @@ #include <dev/clk/clk.h> #include <dev/hwreset/hwreset.h> #include <dev/regulator/regulator.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include <dev/phy/phy.h> #include <contrib/device-tree/include/dt-bindings/phy/phy.h> diff --git a/sys/arm64/rockchip/rk3568_pciephy.c b/sys/arm64/rockchip/rk3568_pciephy.c index 83ee77decdb9..fc6156e596ed 100644 --- a/sys/arm64/rockchip/rk3568_pciephy.c +++ b/sys/arm64/rockchip/rk3568_pciephy.c @@ -43,7 +43,7 @@ #include <dev/clk/clk.h> #include <dev/hwreset/hwreset.h> #include <dev/regulator/regulator.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include <dev/phy/phy.h> #include <contrib/device-tree/include/dt-bindings/phy/phy.h> diff --git a/sys/arm64/rockchip/rk_grf.c b/sys/arm64/rockchip/rk_grf.c index e2ee9a89b832..7e4911c1b048 100644 --- a/sys/arm64/rockchip/rk_grf.c +++ b/sys/arm64/rockchip/rk_grf.c @@ -37,7 +37,7 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include <dev/fdt/simple_mfd.h> static struct ofw_compat_data compat_data[] = { diff --git a/sys/arm64/rockchip/rk_i2s.c b/sys/arm64/rockchip/rk_i2s.c index 3f7cd71eda27..6d3db56919d7 100644 --- a/sys/arm64/rockchip/rk_i2s.c +++ b/sys/arm64/rockchip/rk_i2s.c @@ -41,7 +41,7 @@ #include <dev/clk/clk.h> #include <dev/hwreset/hwreset.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include "syscon_if.h" diff --git a/sys/arm64/rockchip/rk_iodomain.c b/sys/arm64/rockchip/rk_iodomain.c index e872ee5a45ed..ed61b99481f2 100644 --- a/sys/arm64/rockchip/rk_iodomain.c +++ b/sys/arm64/rockchip/rk_iodomain.c @@ -35,7 +35,7 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include <dev/regulator/regulator.h> #include "syscon_if.h" diff --git a/sys/arm64/rockchip/rk_otp.c b/sys/arm64/rockchip/rk_otp.c index 1d8191ff1f90..7b8935106534 100644 --- a/sys/arm64/rockchip/rk_otp.c +++ b/sys/arm64/rockchip/rk_otp.c @@ -37,7 +37,7 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include <dev/fdt/simple_mfd.h> #include "rk_otp.h" diff --git a/sys/arm64/rockchip/rk_pcie_phy.c b/sys/arm64/rockchip/rk_pcie_phy.c index 7e9077d33eb8..cfaf26e8fbb3 100644 --- a/sys/arm64/rockchip/rk_pcie_phy.c +++ b/sys/arm64/rockchip/rk_pcie_phy.c @@ -47,7 +47,7 @@ #include <dev/clk/clk.h> #include <dev/phy/phy.h> #include <dev/phy/phy_internal.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include <dev/hwreset/hwreset.h> #include "syscon_if.h" diff --git a/sys/arm64/rockchip/rk_pinctrl.c b/sys/arm64/rockchip/rk_pinctrl.c index 1c873292b852..4892b0bf236c 100644 --- a/sys/arm64/rockchip/rk_pinctrl.c +++ b/sys/arm64/rockchip/rk_pinctrl.c @@ -48,7 +48,7 @@ #include <dev/fdt/fdt_pinctrl.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include "gpio_if.h" #include "syscon_if.h" diff --git a/sys/arm64/rockchip/rk_pmu.c b/sys/arm64/rockchip/rk_pmu.c index 92a1fbae9413..0e5b9380d66d 100644 --- a/sys/arm64/rockchip/rk_pmu.c +++ b/sys/arm64/rockchip/rk_pmu.c @@ -37,7 +37,7 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include <dev/fdt/simple_mfd.h> static struct ofw_compat_data compat_data[] = { diff --git a/sys/arm64/rockchip/rk_tsadc.c b/sys/arm64/rockchip/rk_tsadc.c index ff5fd722d0f0..a8a64b69d7d3 100644 --- a/sys/arm64/rockchip/rk_tsadc.c +++ b/sys/arm64/rockchip/rk_tsadc.c @@ -46,7 +46,7 @@ #include <dev/clk/clk.h> #include <dev/hwreset/hwreset.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/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 index df29d514cf37..07b3ed9d93c8 100644 --- a/sys/arm64/rockchip/rk_typec_phy.c +++ b/sys/arm64/rockchip/rk_typec_phy.c @@ -45,7 +45,7 @@ #include <dev/clk/clk.h> #include <dev/phy/phy_usb.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include <dev/hwreset/hwreset.h> #include "syscon_if.h" diff --git a/sys/arm64/rockchip/rk_usb2phy.c b/sys/arm64/rockchip/rk_usb2phy.c index ec8a4ba89e37..3f6c0b19f10a 100644 --- a/sys/arm64/rockchip/rk_usb2phy.c +++ b/sys/arm64/rockchip/rk_usb2phy.c @@ -46,7 +46,7 @@ #include <dev/clk/clk.h> #include <dev/phy/phy_usb.h> #include <dev/regulator/regulator.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include "clkdev_if.h" #include "syscon_if.h" diff --git a/sys/arm64/rockchip/rk_usbphy.c b/sys/arm64/rockchip/rk_usbphy.c index f91c8167df62..f9acbdff6d79 100644 --- a/sys/arm64/rockchip/rk_usbphy.c +++ b/sys/arm64/rockchip/rk_usbphy.c @@ -40,11 +40,11 @@ #include <dev/hwreset/hwreset.h> #include <dev/phy/phy_usb.h> #include <dev/regulator/regulator.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include <dev/fdt/simple_mfd.h> #include "phynode_if.h" #include "phynode_usb_if.h" diff --git a/sys/conf/files b/sys/conf/files index f63f844e7942..6a089de5bb98 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1677,10 +1677,6 @@ dev/evdev/evdev_mt.c optional evdev dev/evdev/evdev_utils.c optional evdev dev/evdev/uinput.c optional evdev uinput dev/exca/exca.c optional cbb -dev/extres/syscon/syscon.c optional syscon -dev/extres/syscon/syscon_generic.c optional syscon fdt -dev/extres/syscon/syscon_if.m optional syscon -dev/extres/syscon/syscon_power.c optional syscon syscon_power dev/fb/fbd.c optional fbd | vt dev/fb/fb_if.m standard dev/fb/splash.c optional sc splash @@ -3140,6 +3136,10 @@ dev/ste/if_ste.c optional ste pci dev/stge/if_stge.c optional stge dev/sym/sym_hipd.c optional sym \ dependency "$S/dev/sym/sym_{conf,defs}.h" +dev/syscon/syscon.c optional syscon +dev/syscon/syscon_generic.c optional syscon fdt +dev/syscon/syscon_if.m optional syscon +dev/syscon/syscon_power.c optional syscon syscon_power dev/syscons/blank/blank_saver.c optional blank_saver dev/syscons/daemon/daemon_saver.c optional daemon_saver dev/syscons/dragon/dragon_saver.c optional dragon_saver diff --git a/sys/dev/clk/rockchip/rk_clk_composite.c b/sys/dev/clk/rockchip/rk_clk_composite.c index 2b6c889913b8..14f3229df5dd 100644 --- a/sys/dev/clk/rockchip/rk_clk_composite.c +++ b/sys/dev/clk/rockchip/rk_clk_composite.c @@ -30,7 +30,7 @@ #include <sys/bus.h> #include <dev/clk/clk.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include <dev/clk/rockchip/rk_clk_composite.h> diff --git a/sys/dev/clk/rockchip/rk_clk_mux.c b/sys/dev/clk/rockchip/rk_clk_mux.c index fba57f794d16..97c1ad6f2f1c 100644 --- a/sys/dev/clk/rockchip/rk_clk_mux.c +++ b/sys/dev/clk/rockchip/rk_clk_mux.c @@ -35,7 +35,7 @@ #include <machine/bus.h> #include <dev/clk/clk.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include <dev/clk/rockchip/rk_cru.h> #include <dev/clk/rockchip/rk_clk_mux.h> diff --git a/sys/dev/dwc/if_dwc_rk.c b/sys/dev/dwc/if_dwc_rk.c index fca9f879247b..83f2bad167fb 100644 --- a/sys/dev/dwc/if_dwc_rk.c +++ b/sys/dev/dwc/if_dwc_rk.c @@ -45,7 +45,7 @@ #include <dev/clk/clk.h> #include <dev/hwreset/hwreset.h> #include <dev/regulator/regulator.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.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 index 114f83f3bf37..1d2aa53d158c 100644 --- a/sys/dev/eqos/if_eqos_fdt.c +++ b/sys/dev/eqos/if_eqos_fdt.c @@ -53,7 +53,7 @@ #include <dev/clk/clk.h> #include <dev/hwreset/hwreset.h> #include <dev/regulator/regulator.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include <dev/eqos/if_eqos_var.h> diff --git a/sys/dev/fdt/simple_mfd.c b/sys/dev/fdt/simple_mfd.c index 2bed3e552760..3ca7578d234d 100644 --- a/sys/dev/fdt/simple_mfd.c +++ b/sys/dev/fdt/simple_mfd.c @@ -50,7 +50,7 @@ struct simplebus_devinfo *simple_mfd_setup_dinfo(device_t dev, phandle_t node, struct simplebus_devinfo *di); #include "syscon_if.h" -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> MALLOC_DECLARE(M_SYSCON); diff --git a/sys/dev/qcom_dwc3/qcom_dwc3.c b/sys/dev/qcom_dwc3/qcom_dwc3.c index cd58b9ef7705..5fc93b871ad1 100644 --- a/sys/dev/qcom_dwc3/qcom_dwc3.c +++ b/sys/dev/qcom_dwc3/qcom_dwc3.c @@ -48,7 +48,7 @@ #include <dev/clk/clk.h> #include <dev/hwreset/hwreset.h> #include <dev/phy/phy_usb.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> static struct ofw_compat_data compat_data[] = { { "qcom,dwc3", 1}, diff --git a/sys/dev/sdhci/sdhci_fdt.c b/sys/dev/sdhci/sdhci_fdt.c index 3914c96b5165..e7dda316539c 100644 --- a/sys/dev/sdhci/sdhci_fdt.c +++ b/sys/dev/sdhci/sdhci_fdt.c @@ -52,7 +52,7 @@ #include <dev/ofw/ofw_subr.h> #include <dev/clk/clk.h> #include <dev/clk/clk_fixed.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include <dev/phy/phy.h> #include <dev/mmc/bridge.h> diff --git a/sys/dev/sdhci/sdhci_fsl_fdt.c b/sys/dev/sdhci/sdhci_fsl_fdt.c index 12ce8c13342c..c04bdefb1382 100644 --- a/sys/dev/sdhci/sdhci_fsl_fdt.c +++ b/sys/dev/sdhci/sdhci_fsl_fdt.c @@ -40,7 +40,7 @@ #include <machine/resource.h> #include <dev/clk/clk.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> #include <dev/mmc/bridge.h> #include <dev/mmc/mmcbrvar.h> #include <dev/mmc/mmc_fdt_helpers.h> diff --git a/sys/dev/extres/syscon/syscon.c b/sys/dev/syscon/syscon.c index 52bf46dca297..52bf46dca297 100644 --- a/sys/dev/extres/syscon/syscon.c +++ b/sys/dev/syscon/syscon.c diff --git a/sys/dev/extres/syscon/syscon.h b/sys/dev/syscon/syscon.h index cf72cc123946..cf72cc123946 100644 --- a/sys/dev/extres/syscon/syscon.h +++ b/sys/dev/syscon/syscon.h diff --git a/sys/dev/extres/syscon/syscon_generic.c b/sys/dev/syscon/syscon_generic.c index be3d093915cc..be3d093915cc 100644 --- a/sys/dev/extres/syscon/syscon_generic.c +++ b/sys/dev/syscon/syscon_generic.c diff --git a/sys/dev/extres/syscon/syscon_generic.h b/sys/dev/syscon/syscon_generic.h index 2a4b05cb1291..2a4b05cb1291 100644 --- a/sys/dev/extres/syscon/syscon_generic.h +++ b/sys/dev/syscon/syscon_generic.h diff --git a/sys/dev/extres/syscon/syscon_if.m b/sys/dev/syscon/syscon_if.m index f67dae55c8fd..f67dae55c8fd 100644 --- a/sys/dev/extres/syscon/syscon_if.m +++ b/sys/dev/syscon/syscon_if.m diff --git a/sys/dev/extres/syscon/syscon_power.c b/sys/dev/syscon/syscon_power.c index 365dc0252417..365dc0252417 100644 --- a/sys/dev/extres/syscon/syscon_power.c +++ b/sys/dev/syscon/syscon_power.c diff --git a/sys/dev/usb/controller/dwc3/rk_dwc3.c b/sys/dev/usb/controller/dwc3/rk_dwc3.c index b3345fb4a67b..f53f446a29f3 100644 --- a/sys/dev/usb/controller/dwc3/rk_dwc3.c +++ b/sys/dev/usb/controller/dwc3/rk_dwc3.c @@ -48,7 +48,7 @@ #include <dev/clk/clk.h> #include <dev/hwreset/hwreset.h> #include <dev/phy/phy_usb.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> enum rk_dwc3_type { RK3399 = 1, diff --git a/sys/dev/usb/controller/xlnx_dwc3.c b/sys/dev/usb/controller/xlnx_dwc3.c index 9b9d10e81ad8..b0680db97d22 100644 --- a/sys/dev/usb/controller/xlnx_dwc3.c +++ b/sys/dev/usb/controller/xlnx_dwc3.c @@ -50,7 +50,7 @@ #include <dev/clk/clk.h> #include <dev/hwreset/hwreset.h> #include <dev/phy/phy_usb.h> -#include <dev/extres/syscon/syscon.h> +#include <dev/syscon/syscon.h> static struct ofw_compat_data compat_data[] = { { "xlnx,zynqmp-dwc3", 1 }, diff --git a/sys/riscv/riscv/riscv_syscon.c b/sys/riscv/riscv/riscv_syscon.c index 7442b982f2ab..3dac114edd4f 100644 --- a/sys/riscv/riscv/riscv_syscon.c +++ b/sys/riscv/riscv/riscv_syscon.c @@ -43,8 +43,8 @@ #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/extres/syscon/syscon.h> -#include <dev/extres/syscon/syscon_generic.h> +#include <dev/syscon/syscon.h> +#include <dev/syscon/syscon_generic.h> static struct ofw_compat_data compat_data[] = { {"sifive,test0", 1}, |