From: Stefan Roese Date: Tue, 2 Apr 2019 10:57:20 +0200 Subject: [U-Boot] [PATCH 06/13 v3] arm: at91: Remove CONFIG_AT91_HW_WDT_TIMEOUT In-Reply-To: <20190402085727.14552-1-sr@denx.de> References: <20190402085727.14552-1-sr@denx.de> Message-ID: <20190402085727.14552-6-sr@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: quoted-printable To: u-boot@lists.denx.de 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 Cc: Heiko Schocher Cc: Andreas Bie=C3=9Fmann Cc: Eugen Hristev --- v3: - New patch README | 3 --- configs/smartweb_defconfig | 1 - configs/taurus_defconfig | 1 - drivers/watchdog/Kconfig | 4 ---- drivers/watchdog/at91sam9_wdt.c | 2 -- 5 files changed, 11 deletions(-) diff --git a/README b/README index c9a20db34f..a514f48cae 100644 --- a/README +++ b/README @@ -767,9 +767,6 @@ The following options need to be configured: SoC, then define this variable and provide board specific code for the "hw_watchdog_reset" function. =20 - CONFIG_AT91_HW_WDT_TIMEOUT - specify the timeout in seconds. default 2 seconds. - - Real-Time Clock: =20 When CONFIG_CMD_DATE is selected, the type of the RTC diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig index 7c7220afc8..807a569121 100644 --- a/configs/smartweb_defconfig +++ b/configs/smartweb_defconfig @@ -59,6 +59,5 @@ CONFIG_USB_ETHER_ASIX=3Dy CONFIG_USB_ETHER_MCS7830=3Dy CONFIG_WDT=3Dy CONFIG_WDT_AT91=3Dy -CONFIG_AT91_HW_WDT_TIMEOUT=3Dy CONFIG_SPL_TINY_MEMSET=3Dy # CONFIG_EFI_LOADER is not set diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig index 022b0b6da1..d69f4895ef 100644 --- a/configs/taurus_defconfig +++ b/configs/taurus_defconfig @@ -62,5 +62,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=3D0x02d2 CONFIG_USB_GADGET_DOWNLOAD=3Dy CONFIG_WDT=3Dy CONFIG_WDT_AT91=3Dy -CONFIG_AT91_HW_WDT_TIMEOUT=3Dy CONFIG_USE_TINY_PRINTF=3Dy diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 115fc4551f..34e78beb2a 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -139,10 +139,6 @@ config WDT_AT91 Select this to enable Microchip watchdog timer, which can be found on some AT91 devices. =20 -config AT91_HW_WDT_TIMEOUT - bool "AT91 watchdog timeout specified" - depends on WDT_AT91 - config WDT_MT7621 bool "MediaTek MT7621 watchdog timer support" depends on WDT && ARCH_MT7620 diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wd= t.c index b0a3b4ed58..1c71778bdc 100644 --- a/drivers/watchdog/at91sam9_wdt.c +++ b/drivers/watchdog/at91sam9_wdt.c @@ -117,11 +117,9 @@ static int at91_wdt_probe(struct udevice *dev) if (!priv->regs) return -EINVAL; =20 -#ifdef CONFIG_AT91_HW_WDT_TIMEOUT priv->timeout =3D dev_read_u32_default(dev, "timeout-sec", WDT_DEFAULT_TIMEOUT); debug("%s: timeout %d", __func__, priv->timeout); -#endif =20 debug("%s: Probing wdt%u\n", __func__, dev->seq); =20 --=20 2.21.0