From: Simon Horman <horms@verge.net.au>
To: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Magnus Damm <magnus.damm@gmail.com>,
Andrew Morton <akpm@linux-foundation.org>,
linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/2] ARM: shmobile: Move legacy INTC definitions from irqs.h to intc.h
Date: Fri, 22 Aug 2014 12:24:45 +0900 [thread overview]
Message-ID: <20140822032445.GJ9099@verge.net.au> (raw)
In-Reply-To: <1408541963-20736-3-git-send-email-geert+renesas@glider.be>
On Wed, Aug 20, 2014 at 03:39:23PM +0200, Geert Uytterhoeven wrote:
> Move all definitions for legacy INTC from the common "irqs.h" to the
> INTC-specific "intc.h".
> Include "intc.h" in sh7372/sh73a0 CPU and board files where needed.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Thanks, I have queued this up with Magnus's Ack after removing
the whitespace change noted below.
> ---
> arch/arm/mach-shmobile/board-kzm9g.c | 1 +
> arch/arm/mach-shmobile/board-mackerel.c | 1 +
> arch/arm/mach-shmobile/intc.h | 6 ++++++
> arch/arm/mach-shmobile/irqs.h | 6 ------
> arch/arm/mach-shmobile/setup-sh7372.c | 1 +
> arch/arm/mach-shmobile/setup-sh73a0.c | 1 +
> 6 files changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
> index 36593cb20e57..77e36fa0b142 100644
> --- a/arch/arm/mach-shmobile/board-kzm9g.c
> +++ b/arch/arm/mach-shmobile/board-kzm9g.c
> @@ -50,6 +50,7 @@
> #include <video/sh_mobile_lcdc.h>
>
> #include "common.h"
> +#include "intc.h"
> #include "irqs.h"
> #include "sh73a0.h"
>
> diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
> index 79f448e93abb..b7c4261492b0 100644
> --- a/arch/arm/mach-shmobile/board-mackerel.c
> +++ b/arch/arm/mach-shmobile/board-mackerel.c
> @@ -63,6 +63,7 @@
> #include <asm/mach-types.h>
>
> #include "common.h"
> +#include "intc.h"
> #include "irqs.h"
> #include "pm-rmobile.h"
> #include "sh-gpio.h"
> diff --git a/arch/arm/mach-shmobile/intc.h b/arch/arm/mach-shmobile/intc.h
> index a5603c76cfe0..0313cf798c32 100644
> --- a/arch/arm/mach-shmobile/intc.h
> +++ b/arch/arm/mach-shmobile/intc.h
> @@ -1,5 +1,6 @@
> #ifndef __ASM_MACH_INTC_H
> #define __ASM_MACH_INTC_H
> +
> #include <linux/sh_intc.h>
>
> #define INTC_IRQ_PINS_ENUM_16L(p) \
I have removed the above hunk as it seems unrelated to the rest of the patch.
> @@ -287,4 +288,9 @@ static struct intc_desc p ## _desc __initdata = { \
> p ## _sense_registers, NULL), \
> }
>
> +/* INTCS */
> +#define INTCS_VECT_BASE 0x3400
> +#define INTCS_VECT(n, vect) INTC_VECT((n), INTCS_VECT_BASE + (vect))
> +#define intcs_evt2irq(evt) evt2irq(INTCS_VECT_BASE + (evt))
> +
> #endif /* __ASM_MACH_INTC_H */
> diff --git a/arch/arm/mach-shmobile/irqs.h b/arch/arm/mach-shmobile/irqs.h
> index 8e28223f1b3c..3070f6d887eb 100644
> --- a/arch/arm/mach-shmobile/irqs.h
> +++ b/arch/arm/mach-shmobile/irqs.h
> @@ -1,18 +1,12 @@
> #ifndef __SHMOBILE_IRQS_H
> #define __SHMOBILE_IRQS_H
>
> -#include <linux/sh_intc.h>
> #include "include/mach/irqs.h"
>
> /* GIC */
> #define gic_spi(nr) ((nr) + 32)
> #define gic_iid(nr) (nr) /* ICCIAR / interrupt ID */
>
> -/* INTCS */
> -#define INTCS_VECT_BASE 0x3400
> -#define INTCS_VECT(n, vect) INTC_VECT((n), INTCS_VECT_BASE + (vect))
> -#define intcs_evt2irq(evt) evt2irq(INTCS_VECT_BASE + (evt))
> -
> /* GPIO IRQ */
> #define _GPIO_IRQ_BASE 2500
> #define GPIO_IRQ_BASE(x) (_GPIO_IRQ_BASE + (32 * x))
> diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
> index 3731eccccef4..eaf5d1332c4b 100644
> --- a/arch/arm/mach-shmobile/setup-sh7372.c
> +++ b/arch/arm/mach-shmobile/setup-sh7372.c
> @@ -41,6 +41,7 @@
>
> #include "common.h"
> #include "dma-register.h"
> +#include "intc.h"
> #include "irqs.h"
> #include "pm-rmobile.h"
> #include "sh7372.h"
> diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
> index e7a0296b81b1..4c7022830e30 100644
> --- a/arch/arm/mach-shmobile/setup-sh73a0.c
> +++ b/arch/arm/mach-shmobile/setup-sh73a0.c
> @@ -40,6 +40,7 @@
>
> #include "common.h"
> #include "dma-register.h"
> +#include "intc.h"
> #include "irqs.h"
> #include "sh73a0.h"
>
> --
> 1.9.1
>
next prev parent reply other threads:[~2014-08-22 3:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-20 13:39 [PATCH 0/2] Legacy SH_INTC cleanup Geert Uytterhoeven
2014-08-20 13:39 ` [PATCH 1/2] sh: intc: Confine SH_INTC to platforms that need it Geert Uytterhoeven
2014-08-22 3:28 ` Simon Horman
2014-08-20 13:39 ` [PATCH 2/2] ARM: shmobile: Move legacy INTC definitions from irqs.h to intc.h Geert Uytterhoeven
2014-08-22 3:24 ` Simon Horman [this message]
2014-08-20 14:45 ` [PATCH 0/2] Legacy SH_INTC cleanup Magnus Damm
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=20140822032445.GJ9099@verge.net.au \
--to=horms@verge.net.au \
--cc=akpm@linux-foundation.org \
--cc=geert+renesas@glider.be \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=magnus.damm@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®