diff options
| author | Martin Kaiser <martin@kaiser.cx> | 2018-07-21 19:47:03 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2018-09-04 08:47:23 +0200 |
| commit | 69f78cf840d03c25347847aaa74f2bdfa6c19f46 (patch) | |
| tree | 018148bb64298c18820c071608c85e10192e96e8 | |
| parent | 1a8c01995fa7a5086a51f3cf0d11e54ef07beefe (diff) | |
| download | u-boot-69f78cf840d03c25347847aaa74f2bdfa6c19f46.zip u-boot-69f78cf840d03c25347847aaa74f2bdfa6c19f46.tar.gz u-boot-69f78cf840d03c25347847aaa74f2bdfa6c19f46.tar.bz2 | |
watchdog: mx25: use the imx_watchdog driver for mx25
The existing imx_watchdog driver is compatible with mx25 chipsets.
Add a WDOG1_BASE_ADDR define for the base address and enable the driver
in watchdog's Makefile.
To use the driver, a board must define CONFIG_IMX_WATCHDOG and
CONFIG_HW_WATCHDOG.
This fixes an issue when booting an mx25 chip via usb/serial. In this
case, the boot rom will always enable the watchdog. If u-boot is running
in interactive mode and the watchdog is not serviced, the system is
rebooted when the watchdog expires.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
| -rw-r--r-- | arch/arm/include/asm/arch-mx25/imx-regs.h | 1 | ||||
| -rw-r--r-- | drivers/watchdog/Makefile | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-mx25/imx-regs.h b/arch/arm/include/asm/arch-mx25/imx-regs.h index cee42e5..5d0974f 100644 --- a/arch/arm/include/asm/arch-mx25/imx-regs.h +++ b/arch/arm/include/asm/arch-mx25/imx-regs.h @@ -354,6 +354,7 @@ struct cspi_regs { #define IMX_GPIO2_BASE (0x53FD0000) #define IMX_SDMA_BASE (0x53FD4000) #define IMX_WDT_BASE (0x53FDC000) +#define WDOG1_BASE_ADDR IMX_WDT_BASE #define IMX_PWM1_BASE (0x53FE0000) #define IMX_RTIC_BASE (0x53FEC000) #define IMX_IIM_BASE (0x53FF0000) diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index f405f51..08406ca 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -5,7 +5,7 @@ obj-$(CONFIG_AT91SAM9_WATCHDOG) += at91sam9_wdt.o obj-$(CONFIG_FTWDT010_WATCHDOG) += ftwdt010_wdt.o -ifneq (,$(filter $(SOC), mx31 mx35 mx5 mx6 mx7 vf610)) +ifneq (,$(filter $(SOC), mx25 mx31 mx35 mx5 mx6 mx7 vf610)) obj-y += imx_watchdog.o endif obj-$(CONFIG_S5P) += s5p_wdt.o |