Dear Maxime Ripard,

On Wed, 24 Jul 2013 00:25:06 +0200, 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)

Alignment is not nice, and the BIT() macro should be used.

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
--
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/

Reply via email to