The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=580d00f42fdd94ce43583cc45fe3f1d9fdff47d4
commit 580d00f42fdd94ce43583cc45fe3f1d9fdff47d4 Author: Emmanuel Vadot <[email protected]> AuthorDate: 2023-09-19 07:43:37 +0000 Commit: Emmanuel Vadot <[email protected]> CommitDate: 2023-10-03 07:56:19 +0000 iicbus: Move twsi under a new controller subdirectory The folder is a mess so start moving stuff into sub-directories. Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D41907 --- sys/arm/allwinner/files.allwinner | 2 +- sys/arm/mv/files.arm7 | 2 +- sys/conf/files.arm | 2 +- sys/conf/files.arm64 | 6 +++--- sys/dev/iicbus/{ => controller}/twsi/a10_twsi.c | 2 +- sys/dev/iicbus/{ => controller}/twsi/mv_twsi.c | 2 +- sys/dev/iicbus/{ => controller}/twsi/twsi.c | 2 +- sys/dev/iicbus/{ => controller}/twsi/twsi.h | 0 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/arm/allwinner/files.allwinner b/sys/arm/allwinner/files.allwinner index b5197809380d..cc609e50f2bd 100644 --- a/sys/arm/allwinner/files.allwinner +++ b/sys/arm/allwinner/files.allwinner @@ -22,7 +22,7 @@ arm/allwinner/axp81x.c optional axp81x arm/allwinner/if_awg.c optional awg syscon arm/allwinner/if_emac.c optional emac arm/allwinner/sunxi_dma_if.m optional a10_dmac | a31_dmac -dev/iicbus/twsi/a10_twsi.c optional twsi +dev/iicbus/controller/twsi/a10_twsi.c optional twsi dev/usb/controller/generic_ohci.c optional ohci dev/usb/controller/generic_usb_if.m optional ohci dev/usb/controller/generic_ehci.c optional ehci diff --git a/sys/arm/mv/files.arm7 b/sys/arm/mv/files.arm7 index 3eb18739532a..791046161151 100644 --- a/sys/arm/mv/files.arm7 +++ b/sys/arm/mv/files.arm7 @@ -22,7 +22,7 @@ arm/mv/rtc.c standard arm/mv/armadaxp/armadaxp_mp.c optional smp arm/mv/armadaxp/mptramp.S optional smp dev/cesa/cesa.c optional cesa -dev/iicbus/twsi/mv_twsi.c optional twsi +dev/iicbus/controller/twsi/mv_twsi.c optional twsi dev/mge/if_mge.c optional mge dev/neta/if_mvneta_fdt.c optional neta fdt dev/neta/if_mvneta.c optional neta mdio mii diff --git a/sys/conf/files.arm b/sys/conf/files.arm index 3dc48e20b168..344dada420c9 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -93,7 +93,7 @@ dev/fdt/fdt_arm_platform.c optional platform fdt dev/video/crtc_if.m optional vt dev/hwpmc/hwpmc_arm.c optional hwpmc dev/hwpmc/hwpmc_armv7.c optional hwpmc -dev/iicbus/twsi/twsi.c optional twsi +dev/iicbus/controller/twsi/twsi.c optional twsi dev/ofw/ofw_pcib.c optional fdt pci dev/pci/pci_host_generic.c optional pci_host_generic pci dev/pci/pci_host_generic_fdt.c optional pci_host_generic pci fdt diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index dc78840646bb..4df4f5c81bd1 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -337,9 +337,9 @@ ice_ddp.fw optional ice_ddp \ clean "ice_ddp.fw" dev/iicbus/sy8106a.c optional sy8106a fdt -dev/iicbus/twsi/mv_twsi.c optional twsi fdt -dev/iicbus/twsi/a10_twsi.c optional twsi fdt -dev/iicbus/twsi/twsi.c optional twsi fdt +dev/iicbus/controller/twsi/mv_twsi.c optional twsi fdt +dev/iicbus/controller/twsi/a10_twsi.c optional twsi fdt +dev/iicbus/controller/twsi/twsi.c optional twsi fdt dev/ipmi/ipmi.c optional ipmi dev/ipmi/ipmi_acpi.c optional ipmi acpi diff --git a/sys/dev/iicbus/twsi/a10_twsi.c b/sys/dev/iicbus/controller/twsi/a10_twsi.c similarity index 98% rename from sys/dev/iicbus/twsi/a10_twsi.c rename to sys/dev/iicbus/controller/twsi/a10_twsi.c index 3b61d338e580..de3f6a92f44f 100644 --- a/sys/dev/iicbus/twsi/a10_twsi.c +++ b/sys/dev/iicbus/controller/twsi/a10_twsi.c @@ -41,7 +41,7 @@ #include <dev/iicbus/iiconf.h> #include <dev/iicbus/iicbus.h> -#include <dev/iicbus/twsi/twsi.h> +#include <dev/iicbus/controller/twsi/twsi.h> #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> diff --git a/sys/dev/iicbus/twsi/mv_twsi.c b/sys/dev/iicbus/controller/twsi/mv_twsi.c similarity index 99% rename from sys/dev/iicbus/twsi/mv_twsi.c rename to sys/dev/iicbus/controller/twsi/mv_twsi.c index 3f50bb0c4968..35f5b0acc650 100644 --- a/sys/dev/iicbus/twsi/mv_twsi.c +++ b/sys/dev/iicbus/controller/twsi/mv_twsi.c @@ -63,7 +63,7 @@ #include <arm/mv/mvreg.h> #include <arm/mv/mvvar.h> -#include <dev/iicbus/twsi/twsi.h> +#include <dev/iicbus/controller/twsi/twsi.h> #include "iicbus_if.h" diff --git a/sys/dev/iicbus/twsi/twsi.c b/sys/dev/iicbus/controller/twsi/twsi.c similarity index 99% rename from sys/dev/iicbus/twsi/twsi.c rename to sys/dev/iicbus/controller/twsi/twsi.c index 802110ed7f99..7031cce515ce 100644 --- a/sys/dev/iicbus/twsi/twsi.c +++ b/sys/dev/iicbus/controller/twsi/twsi.c @@ -56,7 +56,7 @@ #include <dev/iicbus/iiconf.h> #include <dev/iicbus/iicbus.h> -#include <dev/iicbus/twsi/twsi.h> +#include <dev/iicbus/controller/twsi/twsi.h> #include "iicbus_if.h" diff --git a/sys/dev/iicbus/twsi/twsi.h b/sys/dev/iicbus/controller/twsi/twsi.h similarity index 100% rename from sys/dev/iicbus/twsi/twsi.h rename to sys/dev/iicbus/controller/twsi/twsi.h
