diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml index 466c9682c74..4786168d8ac 100644 --- a/MAINTAINERS.yml +++ b/MAINTAINERS.yml @@ -3676,7 +3676,7 @@ Infineon Platforms: - drivers/*/*ifx_cat1* - drivers/*/*xmc*/ - drivers/*/*xmc*.c - - drivers/*/*/*xmc* + - drivers/sensor/infineon/ - dts/arm/infineon/ - dts/arm/cypress/ - soc/cypress/ diff --git a/drivers/sensor/CMakeLists.txt b/drivers/sensor/CMakeLists.txt index ea00d33128d..8f671f40d21 100644 --- a/drivers/sensor/CMakeLists.txt +++ b/drivers/sensor/CMakeLists.txt @@ -6,6 +6,7 @@ add_subdirectory(ams) add_subdirectory(aosong) add_subdirectory(bosch) add_subdirectory(honeywell) +add_subdirectory(infineon) add_subdirectory(ite) add_subdirectory(maxim) add_subdirectory(microchip) @@ -29,7 +30,6 @@ add_subdirectory_ifdef(CONFIG_AMD_SB_TSI amd_sb_tsi) add_subdirectory_ifdef(CONFIG_AMG88XX amg88xx) add_subdirectory_ifdef(CONFIG_APDS9960 apds9960) add_subdirectory_ifdef(CONFIG_CURRENT_AMP current_amp) -add_subdirectory_ifdef(CONFIG_DPS310 dps310) add_subdirectory_ifdef(CONFIG_ENS160 ens160) add_subdirectory_ifdef(CONFIG_ESP32_TEMP esp32_temp) add_subdirectory_ifdef(CONFIG_EXPLORIR_M explorir_m) @@ -64,7 +64,6 @@ add_subdirectory_ifdef(CONFIG_SBS_GAUGE sbs_gauge) add_subdirectory_ifdef(CONFIG_SX9500 sx9500) add_subdirectory_ifdef(CONFIG_TH02 th02) add_subdirectory_ifdef(CONFIG_VOLTAGE_DIVIDER voltage_divider) -add_subdirectory_ifdef(CONFIG_XMC4XXX_TEMP xmc4xxx_temp) add_subdirectory_ifdef(CONFIG_TACH_ENE_KB1200 ene_tach_kb1200) zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/sensor.h) diff --git a/drivers/sensor/Kconfig b/drivers/sensor/Kconfig index dc97f2b0e9f..08d3172bb17 100644 --- a/drivers/sensor/Kconfig +++ b/drivers/sensor/Kconfig @@ -87,6 +87,7 @@ source "drivers/sensor/ams/Kconfig" source "drivers/sensor/aosong/Kconfig" source "drivers/sensor/bosch/Kconfig" source "drivers/sensor/honeywell/Kconfig" +source "drivers/sensor/infineon/Kconfig" source "drivers/sensor/ite/Kconfig" source "drivers/sensor/maxim/Kconfig" source "drivers/sensor/microchip/Kconfig" @@ -110,7 +111,6 @@ source "drivers/sensor/amd_sb_tsi/Kconfig" source "drivers/sensor/amg88xx/Kconfig" source "drivers/sensor/apds9960/Kconfig" source "drivers/sensor/current_amp/Kconfig" -source "drivers/sensor/dps310/Kconfig" source "drivers/sensor/ens160/Kconfig" source "drivers/sensor/esp32_temp/Kconfig" source "drivers/sensor/explorir_m/Kconfig" @@ -145,7 +145,6 @@ source "drivers/sensor/sbs_gauge/Kconfig" source "drivers/sensor/sx9500/Kconfig" source "drivers/sensor/th02/Kconfig" source "drivers/sensor/voltage_divider/Kconfig" -source "drivers/sensor/xmc4xxx_temp/Kconfig" source "drivers/sensor/ene_tach_kb1200/Kconfig" endif # SENSOR diff --git a/drivers/sensor/infineon/CMakeLists.txt b/drivers/sensor/infineon/CMakeLists.txt new file mode 100644 index 00000000000..5c0afd3c4e3 --- /dev/null +++ b/drivers/sensor/infineon/CMakeLists.txt @@ -0,0 +1,7 @@ +# Copyright (c) 2024 Analog Devices, Inc. +# SPDX-License-Identifier: Apache-2.0 + +# zephyr-keep-sorted-start +add_subdirectory_ifdef(CONFIG_DPS310 dps310) +add_subdirectory_ifdef(CONFIG_XMC4XXX_TEMP xmc4xxx_temp) +# zephyr-keep-sorted-stop diff --git a/drivers/sensor/infineon/Kconfig b/drivers/sensor/infineon/Kconfig new file mode 100644 index 00000000000..92d95d20fbb --- /dev/null +++ b/drivers/sensor/infineon/Kconfig @@ -0,0 +1,7 @@ +# Copyright (c) 2024 Analog Devices, Inc. +# SPDX-License-Identifier: Apache-2.0 + +# zephyr-keep-sorted-start +source "drivers/sensor/infineon/dps310/Kconfig" +source "drivers/sensor/infineon/xmc4xxx_temp/Kconfig" +# zephyr-keep-sorted-stop diff --git a/drivers/sensor/dps310/CMakeLists.txt b/drivers/sensor/infineon/dps310/CMakeLists.txt similarity index 100% rename from drivers/sensor/dps310/CMakeLists.txt rename to drivers/sensor/infineon/dps310/CMakeLists.txt diff --git a/drivers/sensor/dps310/Kconfig b/drivers/sensor/infineon/dps310/Kconfig similarity index 100% rename from drivers/sensor/dps310/Kconfig rename to drivers/sensor/infineon/dps310/Kconfig diff --git a/drivers/sensor/dps310/dps310.c b/drivers/sensor/infineon/dps310/dps310.c similarity index 100% rename from drivers/sensor/dps310/dps310.c rename to drivers/sensor/infineon/dps310/dps310.c diff --git a/drivers/sensor/xmc4xxx_temp/CMakeLists.txt b/drivers/sensor/infineon/xmc4xxx_temp/CMakeLists.txt similarity index 100% rename from drivers/sensor/xmc4xxx_temp/CMakeLists.txt rename to drivers/sensor/infineon/xmc4xxx_temp/CMakeLists.txt diff --git a/drivers/sensor/xmc4xxx_temp/Kconfig b/drivers/sensor/infineon/xmc4xxx_temp/Kconfig similarity index 100% rename from drivers/sensor/xmc4xxx_temp/Kconfig rename to drivers/sensor/infineon/xmc4xxx_temp/Kconfig diff --git a/drivers/sensor/xmc4xxx_temp/xmc4xxx_temp.c b/drivers/sensor/infineon/xmc4xxx_temp/xmc4xxx_temp.c similarity index 100% rename from drivers/sensor/xmc4xxx_temp/xmc4xxx_temp.c rename to drivers/sensor/infineon/xmc4xxx_temp/xmc4xxx_temp.c