On Tue, Jul 23, 2013 at 11:25:06PM +0100, Maxime Ripard wrote:
> The Allwinner A31 has a sligthly different watchdog that requires a
> different restart code.
>
> Signed-off-by: Maxime Ripard <maxime.rip...@free-electrons.com>
> ---
> arch/arm/mach-sunxi/sunxi.c | 37 +++++++++++++++++++++++++++++++++++++
> 1 file changed, 37 insertions(+)
>
> diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
> index 11326d9..c18ef3a 100644
> --- a/arch/arm/mach-sunxi/sunxi.c
> +++ b/arch/arm/mach-sunxi/sunxi.c
> @@ -32,6 +32,15 @@
> #define SUN4I_WATCHDOG_MODE_ENABLE (1 << 0)
> #define SUN4I_WATCHDOG_MODE_RESET_ENABLE (1 << 1)
>
> +#define SUN6I_WATCHDOG1_IRQ_REG 0x00
> +#define SUN6I_WATCHDOG1_CTRL_REG 0x10
> +#define SUN6I_WATCHDOG1_CTRL_RESTART (1 << 0)
> +#define SUN6I_WATCHDOG1_CONFIG_REG 0x14
> +#define SUN6I_WATCHDOG1_CONFIG_RESTART (1 << 0)
> +#define SUN6I_WATCHDOG1_CONFIG_IRQ (1 << 1)
> +#define SUN6I_WATCHDOG1_MODE_REG 0x18
> +#define SUN6I_WATCHDOG1_MODE_ENABLE (1 << 0)
> +
> static void __iomem *wdt_base;
>
> static void sun4i_restart(enum reboot_mode mode, const char *cmd)
> @@ -56,8 +65,36 @@ static void sun4i_restart(enum reboot_mode mode, const
> char *cmd)
> }
> }
>
> +static void sun6i_restart(char mode, const char *cmd)
> +{
> + if (!wdt_base)
> + return;
> +
> + /* Disable interrupts */
> + writel(0, wdt_base + SUN6I_WATCHDOG1_IRQ_REG);
> +
> + /* We want to disable the IRQ and just reset the whole system */
> + writel(SUN6I_WATCHDOG1_CONFIG_RESTART,
> + wdt_base + SUN6I_WATCHDOG1_CONFIG_REG);
> +
> + /* Enable timer. The default and lowest interval value is 0.5s */
> + writel(SUN6I_WATCHDOG1_MODE_ENABLE,
> + wdt_base + SUN6I_WATCHDOG1_MODE_REG);
> +
> + /* Restart the watchdog. */
> + writel(SUN6I_WATCHDOG1_CTRL_RESTART,
> + wdt_base + SUN6I_WATCHDOG1_CTRL_REG);
> +
> + while (1) {
> + mdelay(5);
> + writel(SUN6I_WATCHDOG1_MODE_ENABLE,
> + wdt_base + SUN6I_WATCHDOG1_MODE_REG);
> + }
> +}
> +
> static struct of_device_id sunxi_restart_ids[] = {
> { .compatible = "allwinner,sun4i-wdt", .data = sun4i_restart },
> + { .compatible = "allwinner,sun6i-wdt", .data = sun6i_restart },
Is there a corresponding binding document addition?
sun4i-wdt.txt could be turned into a more general sunxi-wdt.txt.
Thanks,
Mark.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
