diff mbox

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

Message ID 1440797837-25516-3-git-send-email-laurent.pinchart+renesas@ideasonboard.com (mailing list archive)
State Superseded
Commit 086cace291e7076f4faa7e0582496ace56c92cf8
Delegated to: Simon Horman
Headers show

Commit Message

Laurent Pinchart Aug. 28, 2015, 9:37 p.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

Simon Horman Sept. 11, 2015, 12:57 a.m. UTC | #1
On Sat, Aug 29, 2015 at 12:37:16AM +0300, 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>

Thanks, I have queued this up for v4.4.

N.B: I am not planning to take patch one of this series at this time.
--
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
Laurent Pinchart Sept. 11, 2015, 7:39 a.m. UTC | #2
Hi Simon,

On Friday 11 September 2015 09:57:22 Simon Horman wrote:
> On Sat, Aug 29, 2015 at 12:37:16AM +0300, 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>
> 
> Thanks, I have queued this up for v4.4.
> 
> N.B: I am not planning to take patch one of this series at this time.

Doesn't patch 2/3 depend on patch 1/3 ?
Simon Horman Sept. 11, 2015, 8:10 a.m. UTC | #3
On Fri, Sep 11, 2015 at 10:39:22AM +0300, Laurent Pinchart wrote:
> Hi Simon,
> 
> On Friday 11 September 2015 09:57:22 Simon Horman wrote:
> > On Sat, Aug 29, 2015 at 12:37:16AM +0300, 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>
> > 
> > Thanks, I have queued this up for v4.4.
> > 
> > N.B: I am not planning to take patch one of this series at this time.
> 
> Doesn't patch 2/3 depend on patch 1/3 ?

Thanks, I will drop patch 2.
Should I also drop patch 3?
--
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
Laurent Pinchart Sept. 11, 2015, 8:18 a.m. UTC | #4
Hi Simon,

On Friday 11 September 2015 17:10:11 Simon Horman wrote:
> On Fri, Sep 11, 2015 at 10:39:22AM +0300, Laurent Pinchart wrote:
> > On Friday 11 September 2015 09:57:22 Simon Horman wrote:
> > > On Sat, Aug 29, 2015 at 12:37:16AM +0300, 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>
> > > 
> > > Thanks, I have queued this up for v4.4.
> > > 
> > > N.B: I am not planning to take patch one of this series at this time.
> > 
> > Doesn't patch 2/3 depend on patch 1/3 ?
> 
> Thanks, I will drop patch 2.
> Should I also drop patch 3?

I believe patch 3 should be fine.
Simon Horman Sept. 11, 2015, 8:42 a.m. UTC | #5
On Fri, Sep 11, 2015 at 11:18:09AM +0300, Laurent Pinchart wrote:
> Hi Simon,
> 
> On Friday 11 September 2015 17:10:11 Simon Horman wrote:
> > On Fri, Sep 11, 2015 at 10:39:22AM +0300, Laurent Pinchart wrote:
> > > On Friday 11 September 2015 09:57:22 Simon Horman wrote:
> > > > On Sat, Aug 29, 2015 at 12:37:16AM +0300, 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>
> > > > 
> > > > Thanks, I have queued this up for v4.4.
> > > > 
> > > > N.B: I am not planning to take patch one of this series at this time.
> > > 
> > > Doesn't patch 2/3 depend on patch 1/3 ?
> > 
> > Thanks, I will drop patch 2.
> > Should I also drop patch 3?
> 
> I believe patch 3 should be fine.

Thanks, I will keep that one.
--
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 7de30f6ee9a5..f6404eaa0e91 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