git: c1335891057c - stable/14 - iicbus: Move opencores i2c driver into controller subdirectory

The branch stable/14 has been updated by manu:

URL: https://cgit.FreeBSD.org/src/commit/?id=c1335891057c90000ab185c1c1fbd893a809fa8b

commit c1335891057c90000ab185c1c1fbd893a809fa8b
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2023-09-19 10:06:32 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-10-18 14:32:15 +0000

    iicbus: Move opencores i2c driver into controller subdirectory
    
    Sponsored by:   Beckhoff Automation GmbH & Co. KG
    Differential Revision:  https://reviews.freebsd.org/D41914
    
    (cherry picked from commit 125f5c5b48b1fdccf364b821ce48bfdbd9687ed1)
---
 sys/conf/files                                        | 6 +++---
 sys/dev/iicbus/{ => controller/opencores}/iicoc.c     | 0
 sys/dev/iicbus/{ => controller/opencores}/iicoc.h     | 0
 sys/dev/iicbus/{ => controller/opencores}/iicoc_fdt.c | 0
 sys/dev/iicbus/{ => controller/opencores}/iicoc_pci.c | 0
 sys/modules/i2c/controllers/iicoc/Makefile            | 2 +-
 6 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/conf/files b/sys/conf/files
index 44646cb8f6bf..f113794ab68a 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1804,12 +1804,12 @@ dev/iicbus/iichid.c		optional iichid acpi hid iicbus
 dev/iicbus/iiconf.c		optional iicbus | compat_linuxkpi
 dev/iicbus/iicsmb.c		optional iicsmb				\
 	dependency	"iicbus_if.h"
-dev/iicbus/iicoc.c		optional iicoc
-dev/iicbus/iicoc_fdt.c		optional iicoc fdt
-dev/iicbus/iicoc_pci.c		optional iicoc pci
 dev/iicbus/adc/ad7418.c		optional ad7418
 dev/iicbus/adc/ads111x.c	optional ads111x
 dev/iicbus/adc/pcf8591.c	optional pcf8591
+dev/iicbus/controller/opencores/iicoc.c	optional iicoc
+dev/iicbus/controller/opencores/iicoc_fdt.c	optional iicoc fdt
+dev/iicbus/controller/opencores/iicoc_pci.c	optional iicoc pci
 dev/iicbus/mux/iicmux.c		optional iicmux
 dev/iicbus/mux/iicmux_if.m	optional iicmux
 dev/iicbus/mux/iic_gpiomux.c	optional iic_gpiomux fdt
diff --git a/sys/dev/iicbus/iicoc.c b/sys/dev/iicbus/controller/opencores/iicoc.c
similarity index 100%
rename from sys/dev/iicbus/iicoc.c
rename to sys/dev/iicbus/controller/opencores/iicoc.c
diff --git a/sys/dev/iicbus/iicoc.h b/sys/dev/iicbus/controller/opencores/iicoc.h
similarity index 100%
rename from sys/dev/iicbus/iicoc.h
rename to sys/dev/iicbus/controller/opencores/iicoc.h
diff --git a/sys/dev/iicbus/iicoc_fdt.c b/sys/dev/iicbus/controller/opencores/iicoc_fdt.c
similarity index 100%
rename from sys/dev/iicbus/iicoc_fdt.c
rename to sys/dev/iicbus/controller/opencores/iicoc_fdt.c
diff --git a/sys/dev/iicbus/iicoc_pci.c b/sys/dev/iicbus/controller/opencores/iicoc_pci.c
similarity index 100%
rename from sys/dev/iicbus/iicoc_pci.c
rename to sys/dev/iicbus/controller/opencores/iicoc_pci.c
diff --git a/sys/modules/i2c/controllers/iicoc/Makefile b/sys/modules/i2c/controllers/iicoc/Makefile
index f6902f1f864a..f86a6513ad22 100644
--- a/sys/modules/i2c/controllers/iicoc/Makefile
+++ b/sys/modules/i2c/controllers/iicoc/Makefile
@@ -1,4 +1,4 @@
-.PATH:		${SRCTOP}/sys/dev/iicbus
+.PATH:		${SRCTOP}/sys/dev/iicbus/controller/opencores
 
 KMOD		= iicoc
 SRCS		= device_if.h bus_if.h iicbus_if.h \