diff mbox

[v2,2/2] ARM: shmobile: Remove legacy mach/irqs.h

Message ID 1442905694-2317-3-git-send-email-laurent.pinchart+renesas@ideasonboard.com (mailing list archive)
State Accepted
Commit c8cd74a1468ffe20db3ddc6e6f408d5377f9be43
Delegated to: Simon Horman
Headers show

Commit Message

Laurent Pinchart Sept. 22, 2015, 7:08 a.m. UTC 
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

Comments

Laurent Pinchart Nov. 19, 2015, 2:41 p.m. UTC | #1 
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
Simon Horman Nov. 20, 2015, 12:28 a.m. UTC | #2 
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.
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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