On Tue, Oct 30, 2012 at 03:21:13PM +0100, Wolfram Sang wrote:
> These routines can fail, add support for that. Also, put in missing
> copyright headers.
>
> Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Applied, thanks
Sascha
> ---
> arch/arm/mach-mxs/common.c | 39 +++++++++++++++++++++++++++++++++++----
> 1 file changed, 35 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-mxs/common.c b/arch/arm/mach-mxs/common.c
> index 3730633..122d883 100644
> --- a/arch/arm/mach-mxs/common.c
> +++ b/arch/arm/mach-mxs/common.c
> @@ -1,8 +1,26 @@
> +/*
> + * Freescale i.MXS common code
> + *
> + * Copyright (C) 2012 Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
> + *
> + * Based on code from LTIB:
> + * Copyright (C) 2010 Freescale Semiconductor, Inc.
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of
> + * the License, or (at your option) any later version.
> + */
> +
> #include <common.h>
> #include <io.h>
> +#include <errno.h>
> +#include <clock.h>
> #include <mach/mxs.h>
> #include <mach/imx-regs.h>
>
> +#define MXS_IP_RESET_TIMEOUT (10 * MSECOND)
> +
> #define MXS_BLOCK_SFTRST (1 << 31)
> #define MXS_BLOCK_CLKGATE (1 << 30)
>
> @@ -10,7 +28,9 @@ int mxs_reset_block(void __iomem *reg, int just_enable)
> {
> /* Clear SFTRST */
> writel(MXS_BLOCK_SFTRST, reg + BIT_CLR);
> - mdelay(1);
> +
> + if (wait_on_timeout(MXS_IP_RESET_TIMEOUT, !(readl(reg) & MXS_BLOCK_SFTRST)))
> + goto timeout;
>
> /* Clear CLKGATE */
> writel(MXS_BLOCK_CLKGATE, reg + BIT_CLR);
> @@ -18,16 +38,27 @@ int mxs_reset_block(void __iomem *reg, int just_enable)
> if (!just_enable) {
> /* Set SFTRST */
> writel(MXS_BLOCK_SFTRST, reg + BIT_SET);
> - mdelay(1);
> +
> + /* Wait for CLKGATE being set */
> + if (wait_on_timeout(MXS_IP_RESET_TIMEOUT, readl(reg) & MXS_BLOCK_CLKGATE))
> + goto timeout;
> }
>
> /* Clear SFTRST */
> writel(MXS_BLOCK_SFTRST, reg + BIT_CLR);
> - mdelay(1);
> +
> + if (wait_on_timeout(MXS_IP_RESET_TIMEOUT, !(readl(reg) & MXS_BLOCK_SFTRST)))
> + goto timeout;
>
> /* Clear CLKGATE */
> writel(MXS_BLOCK_CLKGATE, reg + BIT_CLR);
> - mdelay(1);
> +
> + if (wait_on_timeout(MXS_IP_RESET_TIMEOUT, !(readl(reg) & MXS_BLOCK_CLKGATE)))
> + goto timeout;
>
> return 0;
> +
> +timeout:
> + printf("MXS: Timeout resetting block via register 0x%p\n", reg);
> + return -ETIMEDOUT;
> }
> --
> 1.7.10.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
