ARM: shmobile: Random header and makefile cleanups

ARM: shmobile: Random header and makefile cleanups

[PATCH 01/04] ARM: shmobile: No need to use INTC header on r8a7779 [PATCH 02/04] ARM: shmobile: Use pm-rmobile on sh7372 and r8a7740 only [PATCH 03/04] ARM: shmobile: No need to use INTC demux on r8a7740 [PATCH 04/04] ARM: shmobile: Remove unused mach/dma.h

Remove pointless header files and unnecessary use of header files, and only link in bits that are actually needed.

---

Built on top of renesas-next-20130704v2

 arch/arm/mach-shmobile/Makefile           |    8 +++-----
 arch/arm/mach-shmobile/include/mach/dma.h |    1 -
 arch/arm/mach-shmobile/intc-r8a7779.c     |    1 -
 arch/arm/mach-shmobile/setup-r8a7779.c    |    1 -
 4 files changed, 3 insertions(+), 8 deletions(-)

From: Magnus Damm <[email protected]>

Now when the intc-irqpin driver is used for external IRQ pins on r8a7779 it possible to get rid of unused INTC headers mach/intc.h and linux/sh_intc.h.

---

 arch/arm/mach-shmobile/intc-r8a7779.c  |    1 -
 arch/arm/mach-shmobile/setup-r8a7779.c |    1 -
 2 files changed, 2 deletions(-)

@@ -27,7 +27,6 @@
 #include <linux/platform_data/irq-renesas-intc-irqpin.h>
 #include <linux/irqchip.h>
 #include <mach/common.h>
-#include <mach/intc.h>
 #include <mach/irqs.h>
 #include <mach/r8a7779.h>
 #include <asm/mach-types.h>

@@ -29,7 +29,6 @@
 #include <linux/input.h>
 #include <linux/io.h>
 #include <linux/serial_sci.h>
-#include <linux/sh_intc.h>
 #include <linux/sh_timer.h>
 #include <linux/dma-mapping.h>
 #include <linux/usb/otg.h>

Thanks, I have queued this up for v3.12 in the cleanup branch. It should appear in renesas-next-20130710

From: Magnus Damm <[email protected]>

The functions in pm-rmobile.c are only used on sh7372 and r8a7740, so adjust the Makefile to only link in that file in case those SoCs are selected.

---

 arch/arm/mach-shmobile/Makefile |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

@@ -28,11 +28,10 @@ obj-$(CONFIG_ARCH_R8A7740)	+= entry-intc
 # PM objects
 obj-$(CONFIG_SUSPEND)		+= suspend.o
 obj-$(CONFIG_CPU_IDLE)		+= cpuidle.o
-obj-$(CONFIG_ARCH_SHMOBILE)	+= pm-rmobile.o
-obj-$(CONFIG_ARCH_SH7372)	+= pm-sh7372.o sleep-sh7372.o
-obj-$(CONFIG_ARCH_R8A7740)	+= pm-r8a7740.o
-obj-$(CONFIG_ARCH_R8A7779)	+= pm-r8a7779.o
+obj-$(CONFIG_ARCH_SH7372)	+= pm-sh7372.o sleep-sh7372.o pm-rmobile.o
 obj-$(CONFIG_ARCH_SH73A0)	+= pm-sh73a0.o
+obj-$(CONFIG_ARCH_R8A7740)	+= pm-r8a7740.o pm-rmobile.o
+obj-$(CONFIG_ARCH_R8A7779)	+= pm-r8a7779.o
 
 # Board objects
 obj-$(CONFIG_MACH_AG5EVM)	+= board-ag5evm.o

Thanks, I have queued this up for v3.12 in the cleanup branch. It should appear in renesas-next-20130710

From: Magnus Damm <[email protected]>

Now when the r8a7740 code has been converted to make use of GIC instead of INTC for root interrupt controller it is possible to exclude the low level INTC demux function shmobile_handle_irq_intc from linking.

---

 arch/arm/mach-shmobile/Makefile |    1 -
 1 file changed, 1 deletion(-)

@@ -23,7 +23,6 @@ smp-$(CONFIG_ARCH_EMEV2)	+= smp-emev2.o
 
 # IRQ objects
 obj-$(CONFIG_ARCH_SH7372)	+= entry-intc.o
-obj-$(CONFIG_ARCH_R8A7740)	+= entry-intc.o
 
 # PM objects
 obj-$(CONFIG_SUSPEND)		+= suspend.o

Thanks, I have queued this up for v3.12 in the cleanup branch. It should appear in renesas-next-20130710

From: Magnus Damm <[email protected]>

Remove mach-shmobile mach/dma.h since it only
seems to be used on non-mach-shmobile platforms.

---

 arch/arm/mach-shmobile/include/mach/dma.h |    1 -
 1 file changed, 1 deletion(-)

@@ -1 +0,0 @@
-/* empty */

Thanks, I have queued this up for v3.12 in the cleanup branch. It should appear in renesas-next-20130710