diff --git a/doc/releases/migration-guide-4.1.rst b/doc/releases/migration-guide-4.1.rst index 622fb7718b2..b11bb2ad598 100644 --- a/doc/releases/migration-guide-4.1.rst +++ b/doc/releases/migration-guide-4.1.rst @@ -214,6 +214,7 @@ GPIO * Renamed the device tree property ``bit_per_gpio`` to ``bit-per-gpio``. * Renamed the device tree property ``off_val`` to ``off-val``. * Renamed the device tree property ``on_val`` to ``on-val``. +* Renamed the ``compatible`` from ``ti,ads114s0x-gpio`` to :dtcompatible:`ti,ads1x4s0x-gpio`. HWSPINLOCK ========== diff --git a/drivers/adc/CMakeLists.txt b/drivers/adc/CMakeLists.txt index bb0227f0139..5770e9eb3cc 100644 --- a/drivers/adc/CMakeLists.txt +++ b/drivers/adc/CMakeLists.txt @@ -34,7 +34,7 @@ zephyr_library_sources_ifdef(CONFIG_ADC_GD32 adc_gd32.c) zephyr_library_sources_ifdef(CONFIG_ADC_ADS1112 adc_ads1112.c) zephyr_library_sources_ifdef(CONFIG_ADC_ADS1119 adc_ads1119.c) zephyr_library_sources_ifdef(CONFIG_ADC_ADS7052 adc_ads7052.c) -zephyr_library_sources_ifdef(CONFIG_ADC_ADS1X4S0X adc_ads114s0x.c) +zephyr_library_sources_ifdef(CONFIG_ADC_ADS1X4S0X adc_ads1x4s0x.c) zephyr_library_sources_ifdef(CONFIG_ADC_ADS131M02 adc_ads131m02.c) zephyr_library_sources_ifdef(CONFIG_ADC_RPI_PICO adc_rpi_pico.c) zephyr_library_sources_ifdef(CONFIG_ADC_XMC4XXX adc_xmc4xxx.c) diff --git a/drivers/adc/Kconfig b/drivers/adc/Kconfig index 410ddc9cfef..0266c7f2a8d 100644 --- a/drivers/adc/Kconfig +++ b/drivers/adc/Kconfig @@ -100,7 +100,7 @@ source "drivers/adc/Kconfig.ads1119" source "drivers/adc/Kconfig.ads7052" -source "drivers/adc/Kconfig.ads114s0x" +source "drivers/adc/Kconfig.ads1x4s0x" source "drivers/adc/Kconfig.ads131m02" diff --git a/drivers/adc/Kconfig.ads114s0x b/drivers/adc/Kconfig.ads1x4s0x similarity index 100% rename from drivers/adc/Kconfig.ads114s0x rename to drivers/adc/Kconfig.ads1x4s0x diff --git a/drivers/adc/adc_ads114s0x.c b/drivers/adc/adc_ads1x4s0x.c similarity index 99% rename from drivers/adc/adc_ads114s0x.c rename to drivers/adc/adc_ads1x4s0x.c index 61358cab1ab..26fe8fe5ba6 100644 --- a/drivers/adc/adc_ads114s0x.c +++ b/drivers/adc/adc_ads1x4s0x.c @@ -6,10 +6,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include #include diff --git a/drivers/gpio/CMakeLists.txt b/drivers/gpio/CMakeLists.txt index d55132dcba1..dc437eafd9e 100644 --- a/drivers/gpio/CMakeLists.txt +++ b/drivers/gpio/CMakeLists.txt @@ -7,7 +7,7 @@ zephyr_library() # zephyr-keep-sorted-start zephyr_library_sources_ifdef(CONFIG_GPIO_AD559X gpio_ad559x.c) zephyr_library_sources_ifdef(CONFIG_GPIO_ADP5585 gpio_adp5585.c) -zephyr_library_sources_ifdef(CONFIG_GPIO_ADS1X4S0X gpio_ads114s0x.c) +zephyr_library_sources_ifdef(CONFIG_GPIO_ADS1X4S0X gpio_ads1x4s0x.c) zephyr_library_sources_ifdef(CONFIG_GPIO_ALTERA_PIO gpio_altera_pio.c) zephyr_library_sources_ifdef(CONFIG_GPIO_AMBIQ gpio_ambiq.c) zephyr_library_sources_ifdef(CONFIG_GPIO_ANDES_ATCGPIO100 gpio_andes_atcgpio100.c) diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 668691de927..c05b23477a6 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -96,7 +96,7 @@ config GPIO_ENABLE_DISABLE_INTERRUPT # zephyr-keep-sorted-start source "drivers/gpio/Kconfig.ad559x" source "drivers/gpio/Kconfig.adp5585" -source "drivers/gpio/Kconfig.ads114s0x" +source "drivers/gpio/Kconfig.ads1x4s0x" source "drivers/gpio/Kconfig.altera" source "drivers/gpio/Kconfig.ambiq" source "drivers/gpio/Kconfig.andes_atcgpio100" diff --git a/drivers/gpio/Kconfig.ads114s0x b/drivers/gpio/Kconfig.ads1x4s0x similarity index 100% rename from drivers/gpio/Kconfig.ads114s0x rename to drivers/gpio/Kconfig.ads1x4s0x diff --git a/drivers/gpio/gpio_ads114s0x.c b/drivers/gpio/gpio_ads1x4s0x.c similarity index 98% rename from drivers/gpio/gpio_ads114s0x.c rename to drivers/gpio/gpio_ads1x4s0x.c index 07aca4f4597..81ed760adcc 100644 --- a/drivers/gpio/gpio_ads114s0x.c +++ b/drivers/gpio/gpio_ads1x4s0x.c @@ -6,7 +6,7 @@ /** * @file - * @brief GPIO driver for the ADS114S0x AFE. + * @brief GPIO driver for the ADS1X4S0X AFE. */ #define DT_DRV_COMPAT ti_ads1x4s0x_gpio @@ -18,7 +18,7 @@ #include LOG_MODULE_REGISTER(gpio_ads1x4s0x); -#include +#include #include diff --git a/dts/bindings/gpio/ti,ads114s0x-gpio.yaml b/dts/bindings/gpio/ti,ads1x4s0x-gpio.yaml similarity index 100% rename from dts/bindings/gpio/ti,ads114s0x-gpio.yaml rename to dts/bindings/gpio/ti,ads1x4s0x-gpio.yaml diff --git a/include/zephyr/drivers/adc/ads114s0x.h b/include/zephyr/drivers/adc/ads1x4s0x.h similarity index 100% rename from include/zephyr/drivers/adc/ads114s0x.h rename to include/zephyr/drivers/adc/ads1x4s0x.h diff --git a/include/zephyr/dt-bindings/adc/ads114s0x_adc.h b/include/zephyr/dt-bindings/adc/ads1x4s0x_adc.h similarity index 100% rename from include/zephyr/dt-bindings/adc/ads114s0x_adc.h rename to include/zephyr/dt-bindings/adc/ads1x4s0x_adc.h