michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: watchdog: Update drivers to use devicetree Kconfig symbol

Browse source 
Update watchdog drivers to use DT_HAS_<compat>_ENABLED Kconfig symbol
to expose the driver and enable it by default based on devicetree.

We remove 'depend on' Kconfig for symbols that would be implied by
the devicetree node existing.

Signed-off-by: Kumar Gala <galak@kernel.org>
This commit is contained in:
Kumar Gala 2022-07-21 16:24:59 -05:00 • committed by Fabio Baltieri
commit bdff3e76e5
16 changed files with 34 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/watchdog/Kconfig
View file

@ -31,7 +31,8 @@ config WDT_MULTISTAGE
config WDT_COUNTER config WDT_COUNTER
bool "Counter based watchdog" bool "Counter based watchdog"
def_bool $(dt_nodelabel_enabled,wdt_counter) default y
depends on DT_HAS_ZEPHYR_COUNTER_WATCHDOG_ENABLED
select COUNTER select COUNTER
help help
Watchdog emulated with counter device. If counter device supports using Watchdog emulated with counter device. If counter device supports using

7
drivers/watchdog/Kconfig.cc32xx
View file

@ -1,13 +1,10 @@
# Copyright (c) 2021 Pavlo Hamov <pasha.gamov@gmail.com> # Copyright (c) 2021 Pavlo Hamov <pasha.gamov@gmail.com>
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
DT_COMPAT_TI_CC32XX_WDG := ti,cc32xx-watchdog
config WDT_CC32XX config WDT_CC32XX
bool "Watchdog Driver for cc32xx family of MCUs" bool "Watchdog Driver for cc32xx family of MCUs"
default $(dt_compat_enabled,$(DT_COMPAT_TI_CC32XX_WDG)) default y
depends on SOC_SERIES_CC32XX depends on DT_HAS_TI_CC32XX_WATCHDOG_ENABLED
depends on SOC_FAMILY_TISIMPLELINK
help help
Watchdog for cc32xx family of MCUs Watchdog for cc32xx family of MCUs

2
drivers/watchdog/Kconfig.cmsdk_apb
View file

@ -5,6 +5,8 @@
config WDOG_CMSDK_APB config WDOG_CMSDK_APB
bool "CMSDK APB Watchdog Driver for ARM family of MCUs" bool "CMSDK APB Watchdog Driver for ARM family of MCUs"
default y
depends on DT_HAS_ARM_CMSDK_WATCHDOG_ENABLED
depends on RUNTIME_NMI depends on RUNTIME_NMI
help help
Enable CMSDK APB Watchdog (WDOG_CMSDK_APB) Driver for ARM Enable CMSDK APB Watchdog (WDOG_CMSDK_APB) Driver for ARM

6
drivers/watchdog/Kconfig.esp32
View file

@ -3,11 +3,9 @@
# Copyright (C) 2017 Intel Corporation # Copyright (C) 2017 Intel Corporation
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
DT_COMPAT_ESP32_WDT := espressif,esp32-watchdog
config WDT_ESP32 config WDT_ESP32
bool "ESP32 Watchdog (WDT) Driver" bool "ESP32 Watchdog (WDT) Driver"
depends on SOC_ESP32 || SOC_ESP32S2 || SOC_ESP32C3 default y
default $(dt_compat_enabled,$(DT_COMPAT_ESP32_WDT)) depends on DT_HAS_ESPRESSIF_ESP32_WATCHDOG_ENABLED
help help
Enable WDT driver for ESP32. Enable WDT driver for ESP32.

3
drivers/watchdog/Kconfig.gecko
View file

@ -7,7 +7,8 @@
config WDT_GECKO config WDT_GECKO
bool "Gecko series Watchdog (WDOG) Driver" bool "Gecko series Watchdog (WDOG) Driver"
depends on SOC_FAMILY_EXX32 default y
depends on DT_HAS_SILABS_GECKO_WDOG_ENABLED
select SOC_GECKO_WDOG select SOC_GECKO_WDOG
default y default y
help help

2
drivers/watchdog/Kconfig.it8xxx2
View file

@ -3,8 +3,8 @@
config WDT_ITE_IT8XXX2 config WDT_ITE_IT8XXX2
bool "ITE it8xxx2 Watchdog Timer (WDT) driver" bool "ITE it8xxx2 Watchdog Timer (WDT) driver"
depends on SOC_IT8XXX2
default y default y
depends on DT_HAS_ITE_IT8XXX2_WATCHDOG_ENABLED
help help
This option enables the Watchdog Timer driver for ITE it8xxx2. This option enables the Watchdog Timer driver for ITE it8xxx2.
This driver supports only one channel that id is 0 and 16-bits This driver supports only one channel that id is 0 and 16-bits

11
drivers/watchdog/Kconfig.mcux
View file

@ -5,18 +5,23 @@
config WDT_MCUX_WDOG config WDT_MCUX_WDOG
bool "MCUX WDOG driver" bool "MCUX WDOG driver"
depends on HAS_MCUX && !HAS_MCUX_WDOG32 && CLOCK_CONTROL default y
depends on DT_HAS_NXP_KINETIS_WDOG_ENABLED
depends on CLOCK_CONTROL
help help
Enable the mcux wdog driver. Enable the mcux wdog driver.
config WDT_MCUX_WDOG32 config WDT_MCUX_WDOG32
bool "MCUX WDOG32 driver" bool "MCUX WDOG32 driver"
depends on HAS_MCUX_WDOG32 && CLOCK_CONTROL default y
depends on DT_HAS_NXP_KINETIS_WDOG32_ENABLED
depends on CLOCK_CONTROL
help help
Enable the mcux wdog32 driver. Enable the mcux wdog32 driver.
config WDT_MCUX_WWDT config WDT_MCUX_WWDT
bool "MCUX WWDT driver" bool "MCUX WWDT driver"
depends on HAS_MCUX_WWDT default y
depends on DT_HAS_NXP_LPC_WWDT_ENABLED
help help
Enable the mcux wwdt driver. Enable the mcux wwdt driver.

3
drivers/watchdog/Kconfig.mcux_imx
View file

@ -5,6 +5,7 @@
config WDT_MCUX_IMX_WDOG config WDT_MCUX_IMX_WDOG
bool "MCUX IMX WDOG driver" bool "MCUX IMX WDOG driver"
depends on HAS_MCUX default y
depends on DT_HAS_NXP_IMX_WDOG_ENABLED
help help
Enable the mcux imx wdog driver. Enable the mcux imx wdog driver.

3
drivers/watchdog/Kconfig.npcx
View file

@ -5,7 +5,8 @@
config WDT_NPCX config WDT_NPCX
bool "Nuvoton NPCX embedded controller (EC) Watchdog Timer driver" bool "Nuvoton NPCX embedded controller (EC) Watchdog Timer driver"
depends on SOC_FAMILY_NPCX default y
depends on DT_HAS_NUVOTON_NPCX_WATCHDOG_ENABLED
help help
This option enables the Watchdog Timer driver for NPCX family of This option enables the Watchdog Timer driver for NPCX family of
processors. processors.

2
drivers/watchdog/Kconfig.nrfx
View file

@ -6,7 +6,7 @@
config WDT_NRFX config WDT_NRFX
bool "nRF WDT nrfx driver" bool "nRF WDT nrfx driver"
default y default y
depends on SOC_FAMILY_NRF depends on DT_HAS_NORDIC_NRF_WDT_ENABLED
select NRFX_WDT0 if HAS_HW_NRF_WDT0 select NRFX_WDT0 if HAS_HW_NRF_WDT0
select NRFX_WDT1 if HAS_HW_NRF_WDT1 select NRFX_WDT1 if HAS_HW_NRF_WDT1
help help

6
drivers/watchdog/Kconfig.rpi_pico
View file

@ -1,12 +1,10 @@
# Copyright (c) 2022, Jamie McCrae # Copyright (c) 2022, Jamie McCrae
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
DT_COMPAT_RASPBERRYPI_PICO_WATCHDOG := raspberrypi,pico-watchdog
config WDT_RPI_PICO config WDT_RPI_PICO
bool "Raspberry Pi Pico Watchdog driver" bool "Raspberry Pi Pico Watchdog driver"
default $(dt_compat_enabled,$(DT_COMPAT_RASPBERRYPI_PICO_WATCHDOG)) default y
depends on SOC_FAMILY_RPI_PICO depends on DT_HAS_RASPBERRYPI_PICO_WATCHDOG_ENABLED
config WDT_RPI_PICO_INITIAL_TIMEOUT config WDT_RPI_PICO_INITIAL_TIMEOUT
int "Default watchdog timeout in us" int "Default watchdog timeout in us"

2
drivers/watchdog/Kconfig.sam
View file

@ -5,7 +5,7 @@
config WDT_SAM config WDT_SAM
bool "Atmel SAM MCU Family Watchdog (WDT) Driver" bool "Atmel SAM MCU Family Watchdog (WDT) Driver"
depends on SOC_FAMILY_SAM
default y default y
depends on DT_HAS_ATMEL_SAM_WATCHDOG_ENABLED
help help
Enable WDT driver for Atmel SAM MCUs. Enable WDT driver for Atmel SAM MCUs.

2
drivers/watchdog/Kconfig.sam0
View file

@ -5,7 +5,7 @@
config WDT_SAM0 config WDT_SAM0
bool "Atmel SAM0 series Watchdog (WDT) Driver" bool "Atmel SAM0 series Watchdog (WDT) Driver"
depends on SOC_FAMILY_SAM0
default y default y
depends on DT_HAS_ATMEL_SAM0_WATCHDOG_ENABLED
help help
Enable WDT driver for Atmel SAM0 MCUs. Enable WDT driver for Atmel SAM0 MCUs.

2
drivers/watchdog/Kconfig.sifive
View file

@ -5,7 +5,7 @@
config WDT_SIFIVE config WDT_SIFIVE
bool "SiFive Watchdog (WDT) Driver" bool "SiFive Watchdog (WDT) Driver"
depends on SOC_RISCV_SIFIVE_FREEDOM
default y default y
depends on DT_HAS_SIFIVE_WDT_ENABLED
help help
This option enables WDT driver for SiFive Freedom. This option enables WDT driver for SiFive Freedom.

11
drivers/watchdog/Kconfig.stm32
View file

@ -5,13 +5,10 @@
# Copyright (c) 2019 Centaur Analytics, Inc # Copyright (c) 2019 Centaur Analytics, Inc
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
DT_COMPAT_ST_STM32_IWDG := st,stm32-watchdog
DT_COMPAT_ST_STM32_WWDG := st,stm32-window-watchdog
config IWDG_STM32 config IWDG_STM32
bool "Independent Watchdog (IWDG) Driver for STM32 family of MCUs" bool "Independent Watchdog (IWDG) Driver for STM32 family of MCUs"
default $(dt_compat_enabled,$(DT_COMPAT_ST_STM32_IWDG)) default y
depends on SOC_FAMILY_STM32 depends on DT_HAS_ST_STM32_WATCHDOG_ENABLED
help help
Enable IWDG driver for STM32 line of MCUs Enable IWDG driver for STM32 line of MCUs
@ -33,7 +30,7 @@ config IWDG_STM32_INITIAL_TIMEOUT
config WWDG_STM32 config WWDG_STM32
bool "System Window Watchdog (WWDG) Driver for STM32 family of MCUs" bool "System Window Watchdog (WWDG) Driver for STM32 family of MCUs"
default $(dt_compat_enabled,$(DT_COMPAT_ST_STM32_WWDG)) default y
depends on SOC_FAMILY_STM32 depends on DT_HAS_ST_STM32_WINDOW_WATCHDOG_ENABLED
help help
Enable WWDG driver for STM32 line of MCUs Enable WWDG driver for STM32 line of MCUs

2
drivers/watchdog/Kconfig.xec
View file

@ -5,7 +5,7 @@
config WDT_XEC config WDT_XEC
bool "Microchip XEC series Watchdog Timer (WDT) driver" bool "Microchip XEC series Watchdog Timer (WDT) driver"
depends on SOC_FAMILY_MEC
default y default y
depends on DT_HAS_MICROCHIP_XEC_WATCHDOG_ENABLED
help help
Enable WDT driver for Microchip XEC MCU series. Enable WDT driver for Microchip XEC MCU series.