From 5df44e43d6796661ce579da2ef85eb3fb9e63503 Mon Sep 17 00:00:00 2001 From: Maureen Helm Date: Tue, 26 Mar 2024 19:08:34 -0500 Subject: [PATCH] drivers: sensor: ams: Move to vendor subdirectory Organizes sensor drivers by vendor to distribute maintainership responsibilities. Signed-off-by: Maureen Helm --- drivers/sensor/CMakeLists.txt | 10 +--------- drivers/sensor/Kconfig | 10 +--------- drivers/sensor/ams/CMakeLists.txt | 14 ++++++++++++++ drivers/sensor/ams/Kconfig | 14 ++++++++++++++ drivers/sensor/{ => ams}/ams_as5600/CMakeLists.txt | 0 drivers/sensor/{ => ams}/ams_as5600/Kconfig | 0 drivers/sensor/{ => ams}/ams_as5600/ams_as5600.c | 0 .../sensor/{ => ams}/ams_iAQcore/CMakeLists.txt | 0 drivers/sensor/{ => ams}/ams_iAQcore/Kconfig | 0 drivers/sensor/{ => ams}/ams_iAQcore/iAQcore.c | 0 drivers/sensor/{ => ams}/ams_iAQcore/iAQcore.h | 0 drivers/sensor/{ => ams}/ccs811/CMakeLists.txt | 0 drivers/sensor/{ => ams}/ccs811/Kconfig | 0 drivers/sensor/{ => ams}/ccs811/ccs811.c | 0 drivers/sensor/{ => ams}/ccs811/ccs811.h | 0 drivers/sensor/{ => ams}/ccs811/ccs811_trigger.c | 0 drivers/sensor/{ => ams}/ens210/CMakeLists.txt | 0 drivers/sensor/{ => ams}/ens210/Kconfig | 0 drivers/sensor/{ => ams}/ens210/ens210.c | 0 drivers/sensor/{ => ams}/ens210/ens210.h | 0 drivers/sensor/{ => ams}/tcs3400/CMakeLists.txt | 0 drivers/sensor/{ => ams}/tcs3400/Kconfig | 0 drivers/sensor/{ => ams}/tcs3400/tcs3400.c | 0 drivers/sensor/{ => ams}/tmd2620/CMakeLists.txt | 0 drivers/sensor/{ => ams}/tmd2620/Kconfig | 0 drivers/sensor/{ => ams}/tmd2620/tmd2620.c | 0 drivers/sensor/{ => ams}/tmd2620/tmd2620.h | 0 drivers/sensor/{ => ams}/tmd2620/tmd2620_trigger.c | 0 drivers/sensor/{ => ams}/tsl2540/CMakeLists.txt | 0 drivers/sensor/{ => ams}/tsl2540/Kconfig | 0 drivers/sensor/{ => ams}/tsl2540/tsl2540.c | 0 drivers/sensor/{ => ams}/tsl2540/tsl2540.h | 0 drivers/sensor/{ => ams}/tsl2540/tsl2540_trigger.c | 0 drivers/sensor/{ => ams}/tsl2561/CMakeLists.txt | 0 drivers/sensor/{ => ams}/tsl2561/Kconfig | 0 drivers/sensor/{ => ams}/tsl2561/tsl2561.c | 0 drivers/sensor/{ => ams}/tsl2591/CMakeLists.txt | 0 drivers/sensor/{ => ams}/tsl2591/Kconfig | 0 drivers/sensor/{ => ams}/tsl2591/tsl2591.c | 0 drivers/sensor/{ => ams}/tsl2591/tsl2591.h | 0 drivers/sensor/{ => ams}/tsl2591/tsl2591_trigger.c | 0 41 files changed, 30 insertions(+), 18 deletions(-) create mode 100644 drivers/sensor/ams/CMakeLists.txt create mode 100644 drivers/sensor/ams/Kconfig rename drivers/sensor/{ => ams}/ams_as5600/CMakeLists.txt (100%) rename drivers/sensor/{ => ams}/ams_as5600/Kconfig (100%) rename drivers/sensor/{ => ams}/ams_as5600/ams_as5600.c (100%) rename drivers/sensor/{ => ams}/ams_iAQcore/CMakeLists.txt (100%) rename drivers/sensor/{ => ams}/ams_iAQcore/Kconfig (100%) rename drivers/sensor/{ => ams}/ams_iAQcore/iAQcore.c (100%) rename drivers/sensor/{ => ams}/ams_iAQcore/iAQcore.h (100%) rename drivers/sensor/{ => ams}/ccs811/CMakeLists.txt (100%) rename drivers/sensor/{ => ams}/ccs811/Kconfig (100%) rename drivers/sensor/{ => ams}/ccs811/ccs811.c (100%) rename drivers/sensor/{ => ams}/ccs811/ccs811.h (100%) rename drivers/sensor/{ => ams}/ccs811/ccs811_trigger.c (100%) rename drivers/sensor/{ => ams}/ens210/CMakeLists.txt (100%) rename drivers/sensor/{ => ams}/ens210/Kconfig (100%) rename drivers/sensor/{ => ams}/ens210/ens210.c (100%) rename drivers/sensor/{ => ams}/ens210/ens210.h (100%) rename drivers/sensor/{ => ams}/tcs3400/CMakeLists.txt (100%) rename drivers/sensor/{ => ams}/tcs3400/Kconfig (100%) rename drivers/sensor/{ => ams}/tcs3400/tcs3400.c (100%) rename drivers/sensor/{ => ams}/tmd2620/CMakeLists.txt (100%) rename drivers/sensor/{ => ams}/tmd2620/Kconfig (100%) rename drivers/sensor/{ => ams}/tmd2620/tmd2620.c (100%) rename drivers/sensor/{ => ams}/tmd2620/tmd2620.h (100%) rename drivers/sensor/{ => ams}/tmd2620/tmd2620_trigger.c (100%) rename drivers/sensor/{ => ams}/tsl2540/CMakeLists.txt (100%) rename drivers/sensor/{ => ams}/tsl2540/Kconfig (100%) rename drivers/sensor/{ => ams}/tsl2540/tsl2540.c (100%) rename drivers/sensor/{ => ams}/tsl2540/tsl2540.h (100%) rename drivers/sensor/{ => ams}/tsl2540/tsl2540_trigger.c (100%) rename drivers/sensor/{ => ams}/tsl2561/CMakeLists.txt (100%) rename drivers/sensor/{ => ams}/tsl2561/Kconfig (100%) rename drivers/sensor/{ => ams}/tsl2561/tsl2561.c (100%) rename drivers/sensor/{ => ams}/tsl2591/CMakeLists.txt (100%) rename drivers/sensor/{ => ams}/tsl2591/Kconfig (100%) rename drivers/sensor/{ => ams}/tsl2591/tsl2591.c (100%) rename drivers/sensor/{ => ams}/tsl2591/tsl2591.h (100%) rename drivers/sensor/{ => ams}/tsl2591/tsl2591_trigger.c (100%) diff --git a/drivers/sensor/CMakeLists.txt b/drivers/sensor/CMakeLists.txt index 01218c6db88..f0c1c1e8098 100644 --- a/drivers/sensor/CMakeLists.txt +++ b/drivers/sensor/CMakeLists.txt @@ -2,6 +2,7 @@ # zephyr-keep-sorted-start add_subdirectory(adi) +add_subdirectory(ams) add_subdirectory(bosch) add_subdirectory(maxim) add_subdirectory(microchip) @@ -18,18 +19,14 @@ add_subdirectory_ifdef(CONFIG_AK8975 ak8975) add_subdirectory_ifdef(CONFIG_AKM09918C akm09918c) add_subdirectory_ifdef(CONFIG_AMD_SB_TSI amd_sb_tsi) add_subdirectory_ifdef(CONFIG_AMG88XX amg88xx) -add_subdirectory_ifdef(CONFIG_AMS_AS5600 ams_as5600) -add_subdirectory_ifdef(CONFIG_AMS_IAQ_CORE ams_iAQcore) add_subdirectory_ifdef(CONFIG_APDS9960 apds9960) add_subdirectory_ifdef(CONFIG_BD8LB600FS_DIAGNOSTICS bd8lb600fs) add_subdirectory_ifdef(CONFIG_BH1750 bh1750) -add_subdirectory_ifdef(CONFIG_CCS811 ccs811) add_subdirectory_ifdef(CONFIG_CURRENT_AMP current_amp) add_subdirectory_ifdef(CONFIG_DHT dht) add_subdirectory_ifdef(CONFIG_DHT20 dht20) add_subdirectory_ifdef(CONFIG_DPS310 dps310) add_subdirectory_ifdef(CONFIG_ENS160 ens160) -add_subdirectory_ifdef(CONFIG_ENS210 ens210) add_subdirectory_ifdef(CONFIG_ESP32_TEMP esp32_temp) add_subdirectory_ifdef(CONFIG_EXPLORIR_M explorir_m) add_subdirectory_ifdef(CONFIG_F75303 f75303) @@ -75,13 +72,8 @@ add_subdirectory_ifdef(CONFIG_SM351LT sm351lt) add_subdirectory_ifdef(CONFIG_SX9500 sx9500) add_subdirectory_ifdef(CONFIG_TACH_IT8XXX2 ite_tach_it8xxx2) add_subdirectory_ifdef(CONFIG_TACH_NPCX nuvoton_tach_npcx) -add_subdirectory_ifdef(CONFIG_TCS3400 tcs3400) add_subdirectory_ifdef(CONFIG_TEMP_NRF5 nrf5) add_subdirectory_ifdef(CONFIG_TH02 th02) -add_subdirectory_ifdef(CONFIG_TMD2620 tmd2620) -add_subdirectory_ifdef(CONFIG_TSL2540 tsl2540) -add_subdirectory_ifdef(CONFIG_TSL2561 tsl2561) -add_subdirectory_ifdef(CONFIG_TSL2591 tsl2591) add_subdirectory_ifdef(CONFIG_VCMP_IT8XXX2 ite_vcmp_it8xxx2) add_subdirectory_ifdef(CONFIG_VCNL4040 vcnl4040) add_subdirectory_ifdef(CONFIG_VCNL36825T vcnl36825t) diff --git a/drivers/sensor/Kconfig b/drivers/sensor/Kconfig index e5a3bbb313e..8fd51aa9c6a 100644 --- a/drivers/sensor/Kconfig +++ b/drivers/sensor/Kconfig @@ -83,6 +83,7 @@ comment "Device Drivers" # zephyr-keep-sorted-start source "drivers/sensor/adi/Kconfig" +source "drivers/sensor/ams/Kconfig" source "drivers/sensor/bosch/Kconfig" source "drivers/sensor/maxim/Kconfig" source "drivers/sensor/microchip/Kconfig" @@ -98,18 +99,14 @@ source "drivers/sensor/ak8975/Kconfig" source "drivers/sensor/akm09918c/Kconfig" source "drivers/sensor/amd_sb_tsi/Kconfig" source "drivers/sensor/amg88xx/Kconfig" -source "drivers/sensor/ams_as5600/Kconfig" -source "drivers/sensor/ams_iAQcore/Kconfig" source "drivers/sensor/apds9960/Kconfig" source "drivers/sensor/bd8lb600fs/Kconfig" source "drivers/sensor/bh1750/Kconfig" -source "drivers/sensor/ccs811/Kconfig" source "drivers/sensor/current_amp/Kconfig" source "drivers/sensor/dht/Kconfig" source "drivers/sensor/dht20/Kconfig" source "drivers/sensor/dps310/Kconfig" source "drivers/sensor/ens160/Kconfig" -source "drivers/sensor/ens210/Kconfig" source "drivers/sensor/esp32_temp/Kconfig" source "drivers/sensor/explorir_m/Kconfig" source "drivers/sensor/f75303/Kconfig" @@ -157,12 +154,7 @@ source "drivers/sensor/sht4x/Kconfig" source "drivers/sensor/shtcx/Kconfig" source "drivers/sensor/sm351lt/Kconfig" source "drivers/sensor/sx9500/Kconfig" -source "drivers/sensor/tcs3400/Kconfig" source "drivers/sensor/th02/Kconfig" -source "drivers/sensor/tmd2620/Kconfig" -source "drivers/sensor/tsl2540/Kconfig" -source "drivers/sensor/tsl2561/Kconfig" -source "drivers/sensor/tsl2591/Kconfig" source "drivers/sensor/vcnl4040/Kconfig" source "drivers/sensor/vcnl36825t/Kconfig" source "drivers/sensor/veml7700/Kconfig" diff --git a/drivers/sensor/ams/CMakeLists.txt b/drivers/sensor/ams/CMakeLists.txt new file mode 100644 index 00000000000..6561af6659e --- /dev/null +++ b/drivers/sensor/ams/CMakeLists.txt @@ -0,0 +1,14 @@ +# Copyright (c) 2024 Analog Devices, Inc. +# SPDX-License-Identifier: Apache-2.0 + +# zephyr-keep-sorted-start +add_subdirectory_ifdef(CONFIG_AMS_AS5600 ams_as5600) +add_subdirectory_ifdef(CONFIG_AMS_IAQ_CORE ams_iAQcore) +add_subdirectory_ifdef(CONFIG_CCS811 ccs811) +add_subdirectory_ifdef(CONFIG_ENS210 ens210) +add_subdirectory_ifdef(CONFIG_TCS3400 tcs3400) +add_subdirectory_ifdef(CONFIG_TMD2620 tmd2620) +add_subdirectory_ifdef(CONFIG_TSL2540 tsl2540) +add_subdirectory_ifdef(CONFIG_TSL2561 tsl2561) +add_subdirectory_ifdef(CONFIG_TSL2591 tsl2591) +# zephyr-keep-sorted-stop diff --git a/drivers/sensor/ams/Kconfig b/drivers/sensor/ams/Kconfig new file mode 100644 index 00000000000..5aa40b944a8 --- /dev/null +++ b/drivers/sensor/ams/Kconfig @@ -0,0 +1,14 @@ +# Copyright (c) 2024 Analog Devices, Inc. +# SPDX-License-Identifier: Apache-2.0 + +# zephyr-keep-sorted-start +source "drivers/sensor/ams/ams_as5600/Kconfig" +source "drivers/sensor/ams/ams_iAQcore/Kconfig" +source "drivers/sensor/ams/ccs811/Kconfig" +source "drivers/sensor/ams/ens210/Kconfig" +source "drivers/sensor/ams/tcs3400/Kconfig" +source "drivers/sensor/ams/tmd2620/Kconfig" +source "drivers/sensor/ams/tsl2540/Kconfig" +source "drivers/sensor/ams/tsl2561/Kconfig" +source "drivers/sensor/ams/tsl2591/Kconfig" +# zephyr-keep-sorted-stop diff --git a/drivers/sensor/ams_as5600/CMakeLists.txt b/drivers/sensor/ams/ams_as5600/CMakeLists.txt similarity index 100% rename from drivers/sensor/ams_as5600/CMakeLists.txt rename to drivers/sensor/ams/ams_as5600/CMakeLists.txt diff --git a/drivers/sensor/ams_as5600/Kconfig b/drivers/sensor/ams/ams_as5600/Kconfig similarity index 100% rename from drivers/sensor/ams_as5600/Kconfig rename to drivers/sensor/ams/ams_as5600/Kconfig diff --git a/drivers/sensor/ams_as5600/ams_as5600.c b/drivers/sensor/ams/ams_as5600/ams_as5600.c similarity index 100% rename from drivers/sensor/ams_as5600/ams_as5600.c rename to drivers/sensor/ams/ams_as5600/ams_as5600.c diff --git a/drivers/sensor/ams_iAQcore/CMakeLists.txt b/drivers/sensor/ams/ams_iAQcore/CMakeLists.txt similarity index 100% rename from drivers/sensor/ams_iAQcore/CMakeLists.txt rename to drivers/sensor/ams/ams_iAQcore/CMakeLists.txt diff --git a/drivers/sensor/ams_iAQcore/Kconfig b/drivers/sensor/ams/ams_iAQcore/Kconfig similarity index 100% rename from drivers/sensor/ams_iAQcore/Kconfig rename to drivers/sensor/ams/ams_iAQcore/Kconfig diff --git a/drivers/sensor/ams_iAQcore/iAQcore.c b/drivers/sensor/ams/ams_iAQcore/iAQcore.c similarity index 100% rename from drivers/sensor/ams_iAQcore/iAQcore.c rename to drivers/sensor/ams/ams_iAQcore/iAQcore.c diff --git a/drivers/sensor/ams_iAQcore/iAQcore.h b/drivers/sensor/ams/ams_iAQcore/iAQcore.h similarity index 100% rename from drivers/sensor/ams_iAQcore/iAQcore.h rename to drivers/sensor/ams/ams_iAQcore/iAQcore.h diff --git a/drivers/sensor/ccs811/CMakeLists.txt b/drivers/sensor/ams/ccs811/CMakeLists.txt similarity index 100% rename from drivers/sensor/ccs811/CMakeLists.txt rename to drivers/sensor/ams/ccs811/CMakeLists.txt diff --git a/drivers/sensor/ccs811/Kconfig b/drivers/sensor/ams/ccs811/Kconfig similarity index 100% rename from drivers/sensor/ccs811/Kconfig rename to drivers/sensor/ams/ccs811/Kconfig diff --git a/drivers/sensor/ccs811/ccs811.c b/drivers/sensor/ams/ccs811/ccs811.c similarity index 100% rename from drivers/sensor/ccs811/ccs811.c rename to drivers/sensor/ams/ccs811/ccs811.c diff --git a/drivers/sensor/ccs811/ccs811.h b/drivers/sensor/ams/ccs811/ccs811.h similarity index 100% rename from drivers/sensor/ccs811/ccs811.h rename to drivers/sensor/ams/ccs811/ccs811.h diff --git a/drivers/sensor/ccs811/ccs811_trigger.c b/drivers/sensor/ams/ccs811/ccs811_trigger.c similarity index 100% rename from drivers/sensor/ccs811/ccs811_trigger.c rename to drivers/sensor/ams/ccs811/ccs811_trigger.c diff --git a/drivers/sensor/ens210/CMakeLists.txt b/drivers/sensor/ams/ens210/CMakeLists.txt similarity index 100% rename from drivers/sensor/ens210/CMakeLists.txt rename to drivers/sensor/ams/ens210/CMakeLists.txt diff --git a/drivers/sensor/ens210/Kconfig b/drivers/sensor/ams/ens210/Kconfig similarity index 100% rename from drivers/sensor/ens210/Kconfig rename to drivers/sensor/ams/ens210/Kconfig diff --git a/drivers/sensor/ens210/ens210.c b/drivers/sensor/ams/ens210/ens210.c similarity index 100% rename from drivers/sensor/ens210/ens210.c rename to drivers/sensor/ams/ens210/ens210.c diff --git a/drivers/sensor/ens210/ens210.h b/drivers/sensor/ams/ens210/ens210.h similarity index 100% rename from drivers/sensor/ens210/ens210.h rename to drivers/sensor/ams/ens210/ens210.h diff --git a/drivers/sensor/tcs3400/CMakeLists.txt b/drivers/sensor/ams/tcs3400/CMakeLists.txt similarity index 100% rename from drivers/sensor/tcs3400/CMakeLists.txt rename to drivers/sensor/ams/tcs3400/CMakeLists.txt diff --git a/drivers/sensor/tcs3400/Kconfig b/drivers/sensor/ams/tcs3400/Kconfig similarity index 100% rename from drivers/sensor/tcs3400/Kconfig rename to drivers/sensor/ams/tcs3400/Kconfig diff --git a/drivers/sensor/tcs3400/tcs3400.c b/drivers/sensor/ams/tcs3400/tcs3400.c similarity index 100% rename from drivers/sensor/tcs3400/tcs3400.c rename to drivers/sensor/ams/tcs3400/tcs3400.c diff --git a/drivers/sensor/tmd2620/CMakeLists.txt b/drivers/sensor/ams/tmd2620/CMakeLists.txt similarity index 100% rename from drivers/sensor/tmd2620/CMakeLists.txt rename to drivers/sensor/ams/tmd2620/CMakeLists.txt diff --git a/drivers/sensor/tmd2620/Kconfig b/drivers/sensor/ams/tmd2620/Kconfig similarity index 100% rename from drivers/sensor/tmd2620/Kconfig rename to drivers/sensor/ams/tmd2620/Kconfig diff --git a/drivers/sensor/tmd2620/tmd2620.c b/drivers/sensor/ams/tmd2620/tmd2620.c similarity index 100% rename from drivers/sensor/tmd2620/tmd2620.c rename to drivers/sensor/ams/tmd2620/tmd2620.c diff --git a/drivers/sensor/tmd2620/tmd2620.h b/drivers/sensor/ams/tmd2620/tmd2620.h similarity index 100% rename from drivers/sensor/tmd2620/tmd2620.h rename to drivers/sensor/ams/tmd2620/tmd2620.h diff --git a/drivers/sensor/tmd2620/tmd2620_trigger.c b/drivers/sensor/ams/tmd2620/tmd2620_trigger.c similarity index 100% rename from drivers/sensor/tmd2620/tmd2620_trigger.c rename to drivers/sensor/ams/tmd2620/tmd2620_trigger.c diff --git a/drivers/sensor/tsl2540/CMakeLists.txt b/drivers/sensor/ams/tsl2540/CMakeLists.txt similarity index 100% rename from drivers/sensor/tsl2540/CMakeLists.txt rename to drivers/sensor/ams/tsl2540/CMakeLists.txt diff --git a/drivers/sensor/tsl2540/Kconfig b/drivers/sensor/ams/tsl2540/Kconfig similarity index 100% rename from drivers/sensor/tsl2540/Kconfig rename to drivers/sensor/ams/tsl2540/Kconfig diff --git a/drivers/sensor/tsl2540/tsl2540.c b/drivers/sensor/ams/tsl2540/tsl2540.c similarity index 100% rename from drivers/sensor/tsl2540/tsl2540.c rename to drivers/sensor/ams/tsl2540/tsl2540.c diff --git a/drivers/sensor/tsl2540/tsl2540.h b/drivers/sensor/ams/tsl2540/tsl2540.h similarity index 100% rename from drivers/sensor/tsl2540/tsl2540.h rename to drivers/sensor/ams/tsl2540/tsl2540.h diff --git a/drivers/sensor/tsl2540/tsl2540_trigger.c b/drivers/sensor/ams/tsl2540/tsl2540_trigger.c similarity index 100% rename from drivers/sensor/tsl2540/tsl2540_trigger.c rename to drivers/sensor/ams/tsl2540/tsl2540_trigger.c diff --git a/drivers/sensor/tsl2561/CMakeLists.txt b/drivers/sensor/ams/tsl2561/CMakeLists.txt similarity index 100% rename from drivers/sensor/tsl2561/CMakeLists.txt rename to drivers/sensor/ams/tsl2561/CMakeLists.txt diff --git a/drivers/sensor/tsl2561/Kconfig b/drivers/sensor/ams/tsl2561/Kconfig similarity index 100% rename from drivers/sensor/tsl2561/Kconfig rename to drivers/sensor/ams/tsl2561/Kconfig diff --git a/drivers/sensor/tsl2561/tsl2561.c b/drivers/sensor/ams/tsl2561/tsl2561.c similarity index 100% rename from drivers/sensor/tsl2561/tsl2561.c rename to drivers/sensor/ams/tsl2561/tsl2561.c diff --git a/drivers/sensor/tsl2591/CMakeLists.txt b/drivers/sensor/ams/tsl2591/CMakeLists.txt similarity index 100% rename from drivers/sensor/tsl2591/CMakeLists.txt rename to drivers/sensor/ams/tsl2591/CMakeLists.txt diff --git a/drivers/sensor/tsl2591/Kconfig b/drivers/sensor/ams/tsl2591/Kconfig similarity index 100% rename from drivers/sensor/tsl2591/Kconfig rename to drivers/sensor/ams/tsl2591/Kconfig diff --git a/drivers/sensor/tsl2591/tsl2591.c b/drivers/sensor/ams/tsl2591/tsl2591.c similarity index 100% rename from drivers/sensor/tsl2591/tsl2591.c rename to drivers/sensor/ams/tsl2591/tsl2591.c diff --git a/drivers/sensor/tsl2591/tsl2591.h b/drivers/sensor/ams/tsl2591/tsl2591.h similarity index 100% rename from drivers/sensor/tsl2591/tsl2591.h rename to drivers/sensor/ams/tsl2591/tsl2591.h diff --git a/drivers/sensor/tsl2591/tsl2591_trigger.c b/drivers/sensor/ams/tsl2591/tsl2591_trigger.c similarity index 100% rename from drivers/sensor/tsl2591/tsl2591_trigger.c rename to drivers/sensor/ams/tsl2591/tsl2591_trigger.c