git: 7c569caa0a6f - main - iicbus: Move i2c sensors drivers into new sensor subdirectory
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 03 Oct 2023 07:56:39 UTC
The branch main has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=7c569caa0a6fffa7e1cc0a7f61e986dbc7c59074
commit 7c569caa0a6fffa7e1cc0a7f61e986dbc7c59074
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2023-09-19 09:51:40 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-10-03 07:56:20 +0000
iicbus: Move i2c sensors drivers into new sensor subdirectory
No reason that they should live directly under iicbus
Sponsored by: Beckhoff Automation GmbH & Co. KG
Differential Revision: https://reviews.freebsd.org/D41913
---
sys/conf/files | 6 +++---
sys/conf/files.powerpc | 6 +++---
sys/dev/iicbus/{ => sensor}/ds1631.c | 0
sys/dev/iicbus/{ => sensor}/ds1775.c | 0
sys/dev/iicbus/{ => sensor}/htu21.c | 0
sys/dev/iicbus/{ => sensor}/lm75.c | 0
sys/dev/iicbus/{ => sensor}/max44009.c | 0
sys/dev/iicbus/{ => sensor}/max6690.c | 0
sys/dev/iicbus/{ => sensor}/tmp461.c | 0
sys/modules/i2c/htu21/Makefile | 2 +-
sys/modules/i2c/max44009/Makefile | 2 +-
sys/modules/i2c/tmp461/Makefile | 2 +-
12 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/sys/conf/files b/sys/conf/files
index 6f1718309951..36ba432cc93e 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1792,7 +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/htu21.c optional htu21
dev/iicbus/icee.c optional icee
dev/iicbus/if_ic.c optional ic
dev/iicbus/iic.c optional iic
@@ -1808,8 +1807,6 @@ dev/iicbus/iicsmb.c optional iicsmb \
dev/iicbus/iicoc.c optional iicoc
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
@@ -1830,6 +1827,9 @@ dev/iicbus/rtc/pcf85063.c optional pcf85063 iicbus fdt
dev/iicbus/rtc/rtc8583.c optional rtc8583
dev/iicbus/rtc/rx8803.c optional rx8803 iicbus fdt
dev/iicbus/rtc/s35390a.c optional s35390a
+dev/iicbus/sensor/htu21.c optional htu21
+dev/iicbus/sensor/lm75.c optional lm75
+dev/iicbus/sensor/max44009.c optional max44009
dev/iicbus/gpio/pcf8574.c optional pcf8574
dev/iicbus/gpio/tca64xx.c optional tca64xx fdt gpio
dev/iicbus/pmic/fan53555.c optional fan53555 fdt | tcs4525 fdt
diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc
index 76a0f4d707f3..0293efd28fbe 100644
--- a/sys/conf/files.powerpc
+++ b/sys/conf/files.powerpc
@@ -40,14 +40,14 @@ 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/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
dev/iicbus/pwm/adt746x.c optional adt746x powermac
+dev/iicbus/sensor/ds1631.c optional ds1631 powermac
+dev/iicbus/sensor/ds1775.c optional ds1775 powermac
+dev/iicbus/sensor/max6690.c optional max6690 powermac
dev/ipmi/ipmi.c optional ipmi
dev/ipmi/ipmi_opal.c optional powernv ipmi
dev/ice/if_ice_iflib.c optional ice pci powerpc64 | ice pci powerpc64le \
diff --git a/sys/dev/iicbus/ds1631.c b/sys/dev/iicbus/sensor/ds1631.c
similarity index 100%
rename from sys/dev/iicbus/ds1631.c
rename to sys/dev/iicbus/sensor/ds1631.c
diff --git a/sys/dev/iicbus/ds1775.c b/sys/dev/iicbus/sensor/ds1775.c
similarity index 100%
rename from sys/dev/iicbus/ds1775.c
rename to sys/dev/iicbus/sensor/ds1775.c
diff --git a/sys/dev/iicbus/htu21.c b/sys/dev/iicbus/sensor/htu21.c
similarity index 100%
rename from sys/dev/iicbus/htu21.c
rename to sys/dev/iicbus/sensor/htu21.c
diff --git a/sys/dev/iicbus/lm75.c b/sys/dev/iicbus/sensor/lm75.c
similarity index 100%
rename from sys/dev/iicbus/lm75.c
rename to sys/dev/iicbus/sensor/lm75.c
diff --git a/sys/dev/iicbus/max44009.c b/sys/dev/iicbus/sensor/max44009.c
similarity index 100%
rename from sys/dev/iicbus/max44009.c
rename to sys/dev/iicbus/sensor/max44009.c
diff --git a/sys/dev/iicbus/max6690.c b/sys/dev/iicbus/sensor/max6690.c
similarity index 100%
rename from sys/dev/iicbus/max6690.c
rename to sys/dev/iicbus/sensor/max6690.c
diff --git a/sys/dev/iicbus/tmp461.c b/sys/dev/iicbus/sensor/tmp461.c
similarity index 100%
rename from sys/dev/iicbus/tmp461.c
rename to sys/dev/iicbus/sensor/tmp461.c
diff --git a/sys/modules/i2c/htu21/Makefile b/sys/modules/i2c/htu21/Makefile
index a7108d62fd0b..e049139c20cf 100644
--- a/sys/modules/i2c/htu21/Makefile
+++ b/sys/modules/i2c/htu21/Makefile
@@ -1,5 +1,5 @@
-.PATH: ${SRCTOP}/sys/dev/iicbus
+.PATH: ${SRCTOP}/sys/dev/iicbus/sensor
KMOD= htu21
SRCS= htu21.c
diff --git a/sys/modules/i2c/max44009/Makefile b/sys/modules/i2c/max44009/Makefile
index 42c96bbbf883..c4342b5819aa 100644
--- a/sys/modules/i2c/max44009/Makefile
+++ b/sys/modules/i2c/max44009/Makefile
@@ -1,5 +1,5 @@
-.PATH: ${SRCTOP}/sys/dev/iicbus
+.PATH: ${SRCTOP}/sys/dev/iicbus/sensor
KMOD= max44009
SRCS= max44009.c
diff --git a/sys/modules/i2c/tmp461/Makefile b/sys/modules/i2c/tmp461/Makefile
index 4cd5be59fd18..9c4d6518d596 100644
--- a/sys/modules/i2c/tmp461/Makefile
+++ b/sys/modules/i2c/tmp461/Makefile
@@ -1,5 +1,5 @@
-.PATH: ${SRCTOP}/sys/dev/iicbus
+.PATH: ${SRCTOP}/sys/dev/iicbus/sensor
KMOD = tmp461
SRCS = tmp461.c bus_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h