From: Sascha Hauer <s.hauer@pengutronix.de>
To: Juergen Kilb <J.Kilb@phytec.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] Add Reset Support for omap3.
Date: Mon, 12 Sep 2011 12:32:03 +0200 [thread overview]
Message-ID: <20110912103203.GU31404@pengutronix.de> (raw)
In-Reply-To: <1315570256-28614-1-git-send-email-J.Kilb@phytec.de>
Hi Jürgen,
Applied the first three patches to -next, the fourth to master.
Sascha
On Fri, Sep 09, 2011 at 02:10:53PM +0200, Juergen Kilb wrote:
> Inspired from reset_cpu in omap4_generic.c.
>
> Signed-off-by: Juergen Kilb <j.kilb@phytec.de>
> ---
> arch/arm/mach-omap/include/mach/omap3-silicon.h | 3 +++
> arch/arm/mach-omap/omap3_generic.c | 5 +++--
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-omap/include/mach/omap3-silicon.h b/arch/arm/mach-omap/include/mach/omap3-silicon.h
> index 0e6a45f..67f7747 100644
> --- a/arch/arm/mach-omap/include/mach/omap3-silicon.h
> +++ b/arch/arm/mach-omap/include/mach/omap3-silicon.h
> @@ -132,5 +132,8 @@
> #define OMAP_SDRC_CS0 0x80000000
> #define OMAP_SDRC_CS1 0xA0000000
>
> +/* PRM */
> +#define PRM_RSTCTRL_RESET 0x04
> +
> #endif /* __ASM_ARCH_OMAP3_H */
>
> diff --git a/arch/arm/mach-omap/omap3_generic.c b/arch/arm/mach-omap/omap3_generic.c
> index 661a971..9627a6b 100644
> --- a/arch/arm/mach-omap/omap3_generic.c
> +++ b/arch/arm/mach-omap/omap3_generic.c
> @@ -59,8 +59,9 @@
> */
> void __noreturn reset_cpu(unsigned long addr)
> {
> - /* FIXME: Enable WDT and cause reset */
> - hang();
> + writel(PRM_RSTCTRL_RESET, PRM_REG(RSTCTRL));
> +
> + while (1);
> }
> EXPORT_SYMBOL(reset_cpu);
>
> --
> 1.7.0.4
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2011-09-12 10:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-09 12:10 Juergen Kilb
2011-09-09 12:10 ` [PATCH] Add omap_hsmmc platform data Juergen Kilb
2011-09-09 12:10 ` [PATCH] Added helper function to get CS1 base address Juergen Kilb
2011-09-09 12:10 ` [PATCH] Corrected ns16550 access at all omap based boards Juergen Kilb
2011-09-12 10:32 ` Sascha Hauer [this message]
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=20110912103203.GU31404@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=J.Kilb@phytec.de \
--cc=barebox@lists.infradead.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox