The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=06589d6e029c6ff64a7816d743e0a508abe6193b
commit 06589d6e029c6ff64a7816d743e0a508abe6193b Author: Emmanuel Vadot <[email protected]> AuthorDate: 2023-09-19 08:38:19 +0000 Commit: Emmanuel Vadot <[email protected]> CommitDate: 2023-10-03 07:56:19 +0000 iicbus: Move ADC drivers into a new adc subfolder No reason that they should live directly under iicbus Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D41911 --- sys/conf/files | 6 +++--- sys/conf/files.powerpc | 2 +- sys/dev/iicbus/{ => adc}/ad7417.c | 0 sys/dev/iicbus/{ => adc}/ad7418.c | 0 sys/dev/iicbus/{ => adc}/ads111x.c | 0 sys/dev/iicbus/{ => adc}/pcf8591.c | 0 sys/modules/i2c/ads111x/Makefile | 2 +- sys/modules/i2c/pcf8591/Makefile | 2 +- 8 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 83333e195ad0..1eb6ba4ff781 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1792,8 +1792,6 @@ dev/ida/ida.c optional ida dev/ida/ida_disk.c optional ida dev/ida/ida_pci.c optional ida pci dev/iicbus/acpi_iicbus.c optional acpi iicbus | acpi compat_linuxkpi -dev/iicbus/ad7418.c optional ad7418 -dev/iicbus/ads111x.c optional ads111x dev/iicbus/htu21.c optional htu21 dev/iicbus/icee.c optional icee dev/iicbus/if_ic.c optional ic @@ -1812,6 +1810,9 @@ dev/iicbus/iicoc_fdt.c optional iicoc fdt dev/iicbus/iicoc_pci.c optional iicoc pci dev/iicbus/lm75.c optional lm75 dev/iicbus/max44009.c optional max44009 +dev/iicbus/adc/ad7418.c optional ad7418 +dev/iicbus/adc/ads111x.c optional ads111x +dev/iicbus/adc/pcf8591.c optional pcf8591 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 @@ -1820,7 +1821,6 @@ dev/iicbus/mux/pca954x.c optional pca954x iicbus iicmux dev/iicbus/ofw_iicbus.c optional fdt iicbus dev/iicbus/ofw_iicbus_if.m optional fdt iicbus dev/iicbus/pcf8574.c optional pcf8574 -dev/iicbus/pcf8591.c optional pcf8591 dev/iicbus/rtc/ds1307.c optional ds1307 dev/iicbus/rtc/ds13rtc.c optional ds13rtc | ds133x | ds1374 dev/iicbus/rtc/ds1672.c optional ds1672 diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index 0a05b1327689..76a0f4d707f3 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -40,10 +40,10 @@ dev/hwpmc/hwpmc_mpc7xxx.c optional hwpmc dev/hwpmc/hwpmc_power8.c optional hwpmc dev/hwpmc/hwpmc_powerpc.c optional hwpmc dev/hwpmc/hwpmc_ppc970.c optional hwpmc -dev/iicbus/ad7417.c optional ad7417 powermac dev/iicbus/ds1631.c optional ds1631 powermac dev/iicbus/ds1775.c optional ds1775 powermac dev/iicbus/max6690.c optional max6690 powermac +dev/iicbus/adc/ad7417.c optional ad7417 powermac dev/iicbus/ofw_iicbus.c optional iicbus aim dev/iicbus/ofw_iicbus_if.m optional iicbus aim dev/iicbus/pwm/adm1030.c optional powermac windtunnel | adm1030 powermac diff --git a/sys/dev/iicbus/ad7417.c b/sys/dev/iicbus/adc/ad7417.c similarity index 100% rename from sys/dev/iicbus/ad7417.c rename to sys/dev/iicbus/adc/ad7417.c diff --git a/sys/dev/iicbus/ad7418.c b/sys/dev/iicbus/adc/ad7418.c similarity index 100% rename from sys/dev/iicbus/ad7418.c rename to sys/dev/iicbus/adc/ad7418.c diff --git a/sys/dev/iicbus/ads111x.c b/sys/dev/iicbus/adc/ads111x.c similarity index 100% rename from sys/dev/iicbus/ads111x.c rename to sys/dev/iicbus/adc/ads111x.c diff --git a/sys/dev/iicbus/pcf8591.c b/sys/dev/iicbus/adc/pcf8591.c similarity index 100% rename from sys/dev/iicbus/pcf8591.c rename to sys/dev/iicbus/adc/pcf8591.c diff --git a/sys/modules/i2c/ads111x/Makefile b/sys/modules/i2c/ads111x/Makefile index 05e2d1c0da0e..d02cb704146c 100644 --- a/sys/modules/i2c/ads111x/Makefile +++ b/sys/modules/i2c/ads111x/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus/adc KMOD= ads111x SRCS= ads111x.c diff --git a/sys/modules/i2c/pcf8591/Makefile b/sys/modules/i2c/pcf8591/Makefile index c944a2c8c66d..8f17f3dc3ae1 100644 --- a/sys/modules/i2c/pcf8591/Makefile +++ b/sys/modules/i2c/pcf8591/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus/adc KMOD= pcf8591 SRCS= pcf8591.c
