* [PATCH v2 2/2] ARM: shmobile: Remove legacy mach/irqs.h
@ 2015-09-22 7:08 Laurent Pinchart
2015-11-19 14:41 ` Laurent Pinchart
2015-11-20 0:28 ` Simon Horman
0 siblings, 2 replies; 3+ messages in thread
From: Laurent Pinchart @ 2015-09-22 7:08 UTC (permalink / raw)
To: linux-sh
The header isn't needed anymore now that all SoCs use multiplatform
kernels. Remove it.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
arch/arm/mach-shmobile/include/mach/irqs.h | 10 ----------
arch/arm/mach-shmobile/irqs.h | 15 ---------------
arch/arm/mach-shmobile/setup-r8a7778.c | 1 -
3 files changed, 26 deletions(-)
delete mode 100644 arch/arm/mach-shmobile/include/mach/irqs.h
delete mode 100644 arch/arm/mach-shmobile/irqs.h
diff --git a/arch/arm/mach-shmobile/include/mach/irqs.h b/arch/arm/mach-shmobile/include/mach/irqs.h
deleted file mode 100644
index 5aee83f079e2..000000000000
--- a/arch/arm/mach-shmobile/include/mach/irqs.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __ASM_MACH_IRQS_H
-#define __ASM_MACH_IRQS_H
-
-/* Stuck here until drivers/pinctl/sh-pfc gets rid of legacy code */
-
-/* External IRQ pins */
-#define IRQPIN_BASE 2000
-#define irq_pin(nr) ((nr) + IRQPIN_BASE)
-
-#endif /* __ASM_MACH_IRQS_H */
diff --git a/arch/arm/mach-shmobile/irqs.h b/arch/arm/mach-shmobile/irqs.h
deleted file mode 100644
index 3070f6d887eb..000000000000
--- a/arch/arm/mach-shmobile/irqs.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef __SHMOBILE_IRQS_H
-#define __SHMOBILE_IRQS_H
-
-#include "include/mach/irqs.h"
-
-/* GIC */
-#define gic_spi(nr) ((nr) + 32)
-#define gic_iid(nr) (nr) /* ICCIAR / interrupt ID */
-
-/* GPIO IRQ */
-#define _GPIO_IRQ_BASE 2500
-#define GPIO_IRQ_BASE(x) (_GPIO_IRQ_BASE + (32 * x))
-#define GPIO_IRQ(x, y) (_GPIO_IRQ_BASE + (32 * x) + y)
-
-#endif /* __SHMOBILE_IRQS_H */
diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
index b0c9986d022d..008ea680fb8a 100644
--- a/arch/arm/mach-shmobile/setup-r8a7778.c
+++ b/arch/arm/mach-shmobile/setup-r8a7778.c
@@ -22,7 +22,6 @@
#include <asm/mach/arch.h>
#include "common.h"
-#include "irqs.h"
#define MODEMR 0xffcc0020
--
2.4.6
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2 2/2] ARM: shmobile: Remove legacy mach/irqs.h
2015-09-22 7:08 [PATCH v2 2/2] ARM: shmobile: Remove legacy mach/irqs.h Laurent Pinchart
@ 2015-11-19 14:41 ` Laurent Pinchart
2015-11-20 0:28 ` Simon Horman
1 sibling, 0 replies; 3+ messages in thread
From: Laurent Pinchart @ 2015-11-19 14:41 UTC (permalink / raw)
To: linux-sh
Hi Simon,
Now that patch 1/2 has been merged in v4.4-rc1, could you merge this one in
your tree ?
On Tuesday 22 September 2015 10:08:14 Laurent Pinchart wrote:
> The header isn't needed anymore now that all SoCs use multiplatform
> kernels. Remove it.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> ---
> arch/arm/mach-shmobile/include/mach/irqs.h | 10 ----------
> arch/arm/mach-shmobile/irqs.h | 15 ---------------
> arch/arm/mach-shmobile/setup-r8a7778.c | 1 -
> 3 files changed, 26 deletions(-)
> delete mode 100644 arch/arm/mach-shmobile/include/mach/irqs.h
> delete mode 100644 arch/arm/mach-shmobile/irqs.h
>
> diff --git a/arch/arm/mach-shmobile/include/mach/irqs.h
> b/arch/arm/mach-shmobile/include/mach/irqs.h deleted file mode 100644
> index 5aee83f079e2..000000000000
> --- a/arch/arm/mach-shmobile/include/mach/irqs.h
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -#ifndef __ASM_MACH_IRQS_H
> -#define __ASM_MACH_IRQS_H
> -
> -/* Stuck here until drivers/pinctl/sh-pfc gets rid of legacy code */
> -
> -/* External IRQ pins */
> -#define IRQPIN_BASE 2000
> -#define irq_pin(nr) ((nr) + IRQPIN_BASE)
> -
> -#endif /* __ASM_MACH_IRQS_H */
> diff --git a/arch/arm/mach-shmobile/irqs.h b/arch/arm/mach-shmobile/irqs.h
> deleted file mode 100644
> index 3070f6d887eb..000000000000
> --- a/arch/arm/mach-shmobile/irqs.h
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -#ifndef __SHMOBILE_IRQS_H
> -#define __SHMOBILE_IRQS_H
> -
> -#include "include/mach/irqs.h"
> -
> -/* GIC */
> -#define gic_spi(nr) ((nr) + 32)
> -#define gic_iid(nr) (nr) /* ICCIAR / interrupt ID */
> -
> -/* GPIO IRQ */
> -#define _GPIO_IRQ_BASE 2500
> -#define GPIO_IRQ_BASE(x) (_GPIO_IRQ_BASE + (32 * x))
> -#define GPIO_IRQ(x, y) (_GPIO_IRQ_BASE + (32 * x) + y)
> -
> -#endif /* __SHMOBILE_IRQS_H */
> diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c
> b/arch/arm/mach-shmobile/setup-r8a7778.c index b0c9986d022d..008ea680fb8a
> 100644
> --- a/arch/arm/mach-shmobile/setup-r8a7778.c
> +++ b/arch/arm/mach-shmobile/setup-r8a7778.c
> @@ -22,7 +22,6 @@
> #include <asm/mach/arch.h>
>
> #include "common.h"
> -#include "irqs.h"
>
> #define MODEMR 0xffcc0020
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2 2/2] ARM: shmobile: Remove legacy mach/irqs.h
2015-09-22 7:08 [PATCH v2 2/2] ARM: shmobile: Remove legacy mach/irqs.h Laurent Pinchart
2015-11-19 14:41 ` Laurent Pinchart
@ 2015-11-20 0:28 ` Simon Horman
1 sibling, 0 replies; 3+ messages in thread
From: Simon Horman @ 2015-11-20 0:28 UTC (permalink / raw)
To: linux-sh
On Thu, Nov 19, 2015 at 04:41:49PM +0200, Laurent Pinchart wrote:
> Hi Simon,
>
> Now that patch 1/2 has been merged in v4.4-rc1, could you merge this one in
> your tree ?
Sure, done.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-11-20 0:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-22 7:08 [PATCH v2 2/2] ARM: shmobile: Remove legacy mach/irqs.h Laurent Pinchart
2015-11-19 14:41 ` Laurent Pinchart
2015-11-20 0:28 ` Simon Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox