Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 21:54:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

arm: at91: Remove CONFIG_AT91_HW_WDT_TIMEOUT

Browse source 
This patch removes the CONFIG_AT91_HW_WDT_TIMEOUT as its not needed any
more. The WD timeout value can be provided via the "timeout-sec" DT
property. If not provided this way, the default value of 2 seconds will
be used.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Heiko Schocher <hs@denx.de>
Cc: Andreas Bießmann <andreas@biessmann.org>
Cc: Eugen Hristev <eugen.hristev@microchip.com>
This commit is contained in:
Stefan Roese 2019-04-03 07:37:05 +02:00 committed by Eugen Hristev
parent 6c04bd3857
commit 05d4b8e4ad
5 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README
View file

@ -767,9 +767,6 @@ The following options need to be configured:
SoC, then define this variable and provide board SoC, then define this variable and provide board
specific code for the "hw_watchdog_reset" function. specific code for the "hw_watchdog_reset" function.
CONFIG_AT91_HW_WDT_TIMEOUT
specify the timeout in seconds. default 2 seconds.
- Real-Time Clock: - Real-Time Clock:
When CONFIG_CMD_DATE is selected, the type of the RTC When CONFIG_CMD_DATE is selected, the type of the RTC

1
configs/smartweb_defconfig
View file

@ -59,6 +59,5 @@ CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_MCS7830=y CONFIG_USB_ETHER_MCS7830=y
CONFIG_WDT=y CONFIG_WDT=y
CONFIG_WDT_AT91=y CONFIG_WDT_AT91=y
CONFIG_AT91_HW_WDT_TIMEOUT=y
CONFIG_SPL_TINY_MEMSET=y CONFIG_SPL_TINY_MEMSET=y
# CONFIG_EFI_LOADER is not set # CONFIG_EFI_LOADER is not set

1
configs/taurus_defconfig
View file

@ -62,5 +62,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_WDT=y CONFIG_WDT=y
CONFIG_WDT_AT91=y CONFIG_WDT_AT91=y
CONFIG_AT91_HW_WDT_TIMEOUT=y
CONFIG_USE_TINY_PRINTF=y CONFIG_USE_TINY_PRINTF=y

4
drivers/watchdog/Kconfig
View file

@ -139,10 +139,6 @@ config WDT_AT91
Select this to enable Microchip watchdog timer, which can be found on Select this to enable Microchip watchdog timer, which can be found on
some AT91 devices. some AT91 devices.
config AT91_HW_WDT_TIMEOUT
bool "AT91 watchdog timeout specified"
depends on WDT_AT91
config WDT_MT7621 config WDT_MT7621
bool "MediaTek MT7621 watchdog timer support" bool "MediaTek MT7621 watchdog timer support"
depends on WDT && ARCH_MT7620 depends on WDT && ARCH_MT7620

4
drivers/watchdog/at91sam9_wdt.c
View file

@ -117,10 +117,12 @@ static int at91_wdt_probe(struct udevice *dev)
if (!priv->regs) if (!priv->regs)
return -EINVAL; return -EINVAL;
#ifdef CONFIG_AT91_HW_WDT_TIMEOUT #if CONFIG_IS_ENABLED(OF_CONTROL)
priv->timeout = dev_read_u32_default(dev, "timeout-sec", priv->timeout = dev_read_u32_default(dev, "timeout-sec",
WDT_DEFAULT_TIMEOUT); WDT_DEFAULT_TIMEOUT);
debug("%s: timeout %d", __func__, priv->timeout); debug("%s: timeout %d", __func__, priv->timeout);
#else
priv->timeout = WDT_DEFAULT_TIMEOUT;
#endif #endif
debug("%s: Probing wdt%u\n", __func__, dev->seq); debug("%s: Probing wdt%u\n", __func__, dev->seq);