From: thomas.petazzoni@free-electrons.com (Thomas Petazzoni)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 04/10] ARM: sun6i: Add restart code for the A31
Date: Fri, 26 Jul 2013 12:35:59 +0200 [thread overview]
Message-ID: <20130726123559.66216580@skate> (raw)
In-Reply-To: <1374618312-19001-5-git-send-email-maxime.ripard@free-electrons.com>
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.ripard@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
WARNING: multiple messages have this Message-ID (diff)
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
To: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Mike Turquette <mturquette@linaro.org>,
Linus Walleij <linus.walleij@linaro.org>,
albert.u.boot@aribaud.net, Emilio Lopez <emilio@elopez.com.ar>,
linux-kernel@vger.kernel.org, shuge@allwinnertech.com,
linux-sunxi@googlegroups.com, kevin.z.m.zh@gmail.com,
sunny@allwinnertech.com, Olof Johansson <olof@lixom.net>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 04/10] ARM: sun6i: Add restart code for the A31
Date: Fri, 26 Jul 2013 12:35:59 +0200 [thread overview]
Message-ID: <20130726123559.66216580@skate> (raw)
In-Reply-To: <1374618312-19001-5-git-send-email-maxime.ripard@free-electrons.com>
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.ripard@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
next prev parent reply other threads:[~2013-07-26 10:35 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-23 22:25 [PATCH 00/10] ARM: sunxi: Add support for the Allwinner A31 SoC Maxime Ripard
2013-07-23 22:25 ` Maxime Ripard
2013-07-23 22:25 ` [PATCH 01/10] irqchip: GIC: Add Cortex-A7 compatible string Maxime Ripard
2013-07-23 22:25 ` Maxime Ripard
2013-07-23 22:25 ` [PATCH 02/10] clk: sunxi: fix initialization of basic clocks Maxime Ripard
2013-07-23 22:25 ` Maxime Ripard
2013-07-23 22:25 ` [PATCH 03/10] ARM: sunxi: Add the Allwinner A31 compatible to the machine definition Maxime Ripard
2013-07-23 22:25 ` Maxime Ripard
2013-07-26 10:35 ` Thomas Petazzoni
2013-07-26 10:35 ` Thomas Petazzoni
2013-07-26 12:22 ` Maxime Ripard
2013-07-26 12:22 ` Maxime Ripard
2013-07-23 22:25 ` [PATCH 04/10] ARM: sun6i: Add restart code for the A31 Maxime Ripard
2013-07-23 22:25 ` Maxime Ripard
2013-07-26 10:35 ` Thomas Petazzoni [this message]
2013-07-26 10:35 ` Thomas Petazzoni
2013-07-26 12:23 ` Maxime Ripard
2013-07-26 12:23 ` Maxime Ripard
2013-07-29 14:04 ` Mark Rutland
2013-07-29 14:04 ` Mark Rutland
2013-07-30 12:44 ` Maxime Ripard
2013-07-30 12:44 ` Maxime Ripard
2013-07-23 22:25 ` [PATCH 05/10] ARM: sunxi: Add Allwinner A31 DTSI Maxime Ripard
2013-07-23 22:25 ` Maxime Ripard
2013-07-26 10:37 ` Thomas Petazzoni
2013-07-26 10:37 ` Thomas Petazzoni
2013-07-26 12:48 ` Maxime Ripard
2013-07-26 12:48 ` Maxime Ripard
2013-07-29 14:11 ` Mark Rutland
2013-07-29 14:11 ` Mark Rutland
2013-07-30 8:59 ` Marc Zyngier
2013-07-30 8:59 ` Marc Zyngier
2013-07-30 13:18 ` Maxime Ripard
2013-07-30 13:18 ` Maxime Ripard
2013-07-23 22:25 ` [PATCH 06/10] ARM: sun6i: Add WITS Colombus A31 evaluation kit support Maxime Ripard
2013-07-23 22:25 ` Maxime Ripard
2013-07-23 22:25 ` [PATCH 07/10] pinctrl: sunxi: Add Allwinner A31 pins set Maxime Ripard
2013-07-23 22:25 ` Maxime Ripard
2013-07-29 16:20 ` Linus Walleij
2013-07-29 16:20 ` Linus Walleij
2013-07-30 9:00 ` Maxime Ripard
2013-07-30 9:00 ` Maxime Ripard
2013-07-23 22:25 ` [PATCH 08/10] ARM: sunxi: dt: Add PIO controller to A31 DTSI Maxime Ripard
2013-07-23 22:25 ` Maxime Ripard
2013-07-26 10:39 ` Thomas Petazzoni
2013-07-26 10:39 ` Thomas Petazzoni
2013-07-23 22:25 ` [PATCH 09/10] ARM: sun6i: Add UART0 muxing options Maxime Ripard
2013-07-23 22:25 ` Maxime Ripard
2013-07-23 22:25 ` [PATCH 10/10] ARM: sun6i: colombus: Add uart0 muxing Maxime Ripard
2013-07-23 22:25 ` Maxime Ripard
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=20130726123559.66216580@skate \
--to=thomas.petazzoni@free-electrons.com \
--cc=linux-arm-kernel@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.