From: Troy Kisky <troy.kisky@boundarydevices.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH V2 1/1] mx31/mx35/mx51/mx53/mx6: add watchdog
Date: Tue, 21 Aug 2012 10:51:43 -0700 [thread overview]
Message-ID: <5033CAAF.90303@boundarydevices.com> (raw)
In-Reply-To: <50332699.6040701@denx.de>
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
next prev parent reply other threads:[~2012-08-21 17:51 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-20 23:03 [U-Boot] [PATCH V2 1/1] mx31/mx35/mx51/mx53/mx6: add watchdog Troy Kisky
2012-08-21 6:11 ` Stefano Babic
2012-08-21 17:51 ` Troy Kisky [this message]
2012-08-22 7:22 ` Stefano Babic
2012-08-22 18:30 ` Troy Kisky
2012-08-22 18:37 ` Troy Kisky
2012-08-23 9:19 ` Stefano Babic
2012-09-01 7:59 ` Stefano Babic
2012-10-23 1:19 ` [U-Boot] [PATCH V3 " Troy Kisky
2012-10-25 10:56 ` Stefano Babic
2012-10-28 11:48 ` Stefano Babic
2013-01-11 23:26 ` Troy Kisky
2013-01-13 10:43 ` Stefano Babic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5033CAAF.90303@boundarydevices.com \
--to=troy.kisky@boundarydevices.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.