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@xxxxxxxxx>
> ---
> 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@xxxxxxxxxxxxxxxxxxx
> 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@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
