[U-Boot] [PATCH V2 1/1] mx31/mx35/mx51/mx53/mx6: add watchdog

[Troy Kisky]

On 8/20/2012 11:11 PM, Stefano Babic wrote:
> On 21/08/2012 01:03, Troy Kisky wrote:
> diff --git a/arch/arm/include/asm/arch-mx31/imx-regs.h b/arch/arm/include/asm/arch-mx31/imx-regs.h
> index bba37ac..594d613 100644
> --- a/arch/arm/include/asm/arch-mx31/imx-regs.h
> +++ b/arch/arm/include/asm/arch-mx31/imx-regs.h
> @@ -68,17 +68,6 @@ struct cspi_regs {
>   	u32 test;
>   };
> -#define WDOG_BASE		0x53FDC000
> -
> +#define WDOG1_BASE_ADDR		0x53FDC000
> +#define CONFIG_IMX_WATCHDOG	/* cpu_reset implemented in watchdog */
>   /*
>    * GPIO
>    */
> diff --git a/arch/arm/include/asm/arch-mx35/imx-regs.h b/arch/arm/include/asm/arch-mx35/imx-regs.h
> index b18b984..45b331f 100644
> --- a/arch/arm/include/asm/arch-mx35/imx-regs.h
> +++ b/arch/arm/include/asm/arch-mx35/imx-regs.h
> @@ -76,7 +76,8 @@
>   #define GPIO2_BASE_ADDR		0x53FD0000
>   #define SDMA_BASE_ADDR		0x53FD4000
>   #define RTC_BASE_ADDR		0x53FD8000
> -#define WDOG_BASE_ADDR		0x53FDC000
> +#define WDOG1_BASE_ADDR		0x53FDC000
> +#define CONFIG_IMX_WATCHDOG	/* cpu_reset implemented in watchdog */
>   #define PWM_BASE_ADDR		0x53FE0000
> diff --git a/arch/arm/include/asm/arch-mx5/imx-regs.h b/arch/arm/include/asm/arch-mx5/imx-regs.h
> index c53465f..caac574 100644
> --- a/arch/arm/include/asm/arch-mx5/imx-regs.h
> +++ b/arch/arm/include/asm/arch-mx5/imx-regs.h
> @@ -78,6 +78,7 @@
>   #define GPIO4_BASE_ADDR		(AIPS1_BASE_ADDR + 0x00090000)
>   #define KPP_BASE_ADDR		(AIPS1_BASE_ADDR + 0x00094000)
>   #define WDOG1_BASE_ADDR		(AIPS1_BASE_ADDR + 0x00098000)
> +#define CONFIG_IMX_WATCHDOG	/* cpu_reset implemented in watchdog */
>   #define WDOG2_BASE_ADDR		(AIPS1_BASE_ADDR + 0x0009C000)
>   #define GPT1_BASE_ADDR		(AIPS1_BASE_ADDR + 0x000A0000)
> diff --git a/arch/arm/include/asm/arch-mx6/imx-regs.h b/arch/arm/include/asm/arch-mx6/imx-regs.h
> index dacb9ea..0f59567 100644
> --- a/arch/arm/include/asm/arch-mx6/imx-regs.h
> +++ b/arch/arm/include/asm/arch-mx6/imx-regs.h
> @@ -115,6 +115,7 @@
>   #define GPIO7_BASE_ADDR             (AIPS1_OFF_BASE_ADDR + 0x34000)
>   #define KPP_BASE_ADDR               (AIPS1_OFF_BASE_ADDR + 0x38000)
>   #define WDOG1_BASE_ADDR             (AIPS1_OFF_BASE_ADDR + 0x3C000)
> +#define CONFIG_IMX_WATCHDOG	/* cpu_reset implemented in watchdog */
>   #define WDOG2_BASE_ADDR             (AIPS1_OFF_BASE_ADDR + 0x40000)
>   #define ANATOP_BASE_ADDR            (AIPS1_OFF_BASE_ADDR + 0x48000)
>   #define USB_PHY0_BASE_ADDR          (AIPS1_OFF_BASE_ADDR + 0x49000)
>
> I have only an issue with your patch. You move the reset_cpu (good idea
> so we can factorize it) inside imx_watchdog.c, but then it depends on
> CONFIG_IMX_WATCHDOG. If it is not set, the file is not compiled and
> there is no reset_cpu. This constraints all boards to activate it, but
> this is not what we want.
>
> Best regards,
> Stefano
>
So, you are saying CONFIG_ options don't belong in imx-regs.h, or
you didn't notice I stuck it there, or both???

Troy