ARC: [Review] Multi-platform image #4: Isolate platform headers

-Top level ARC makefile removes -I for platform headers
-asm/irq.h no longer includes plat/irq.h

-platform makefile adds -I for it's specfic platform headers
-platform code to directly include it's plat/irq.h

-Linker script needed plat/memmap.h for CCM info, already in .config

Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>

4 files changed, 6 insertions, 3 deletions

diff --git a/arch/arc/plat-arcfpga/Makefile b/arch/arc/plat-arcfpga/Makefile
index 2a828bec821..a44e22ebc1b 100644
--- a/arch/arc/plat-arcfpga/Makefile
+++ b/arch/arc/plat-arcfpga/Makefile
@@ -6,5 +6,7 @@
 # published by the Free Software Foundation.
 #
 
+KBUILD_CFLAGS	+= -Iarch/arc/plat-arcfpga/include
+
 obj-y := platform.o irq.o
 obj-$(CONFIG_SMP)		+= smp.o
diff --git a/arch/arc/plat-arcfpga/irq.c b/arch/arc/plat-arcfpga/irq.c
index 0ea43c26f16..d2215fd889c 100644
--- a/arch/arc/plat-arcfpga/irq.c
+++ b/arch/arc/plat-arcfpga/irq.c
@@ -9,7 +9,7 @@
  */
 
 #include <linux/interrupt.h>
-#include <asm/irq.h>
+#include <plat/irq.h>
 
 void __init plat_fpga_init_IRQ(void)
 {
diff --git a/arch/arc/plat-arcfpga/platform.c b/arch/arc/plat-arcfpga/platform.c
index ac85d692733..4024f10a39c 100644
--- a/arch/arc/plat-arcfpga/platform.c
+++ b/arch/arc/plat-arcfpga/platform.c
@@ -16,11 +16,11 @@
 #include <linux/console.h>
 #include <linux/of_platform.h>
 #include <asm/setup.h>
-#include <asm/irq.h>
 #include <asm/clk.h>
 #include <asm/mach_desc.h>
 #include <plat/memmap.h>
 #include <plat/smp.h>
+#include <plat/irq.h>
 
 /*-----------------------BVCI Latency Unit -----------------------------*/
 
diff --git a/arch/arc/plat-arcfpga/smp.c b/arch/arc/plat-arcfpga/smp.c
index fec18793bbe..68a53b153d0 100644
--- a/arch/arc/plat-arcfpga/smp.c
+++ b/arch/arc/plat-arcfpga/smp.c
@@ -12,7 +12,8 @@
  */
 
 #include <linux/smp.h>
-#include <asm/irq.h>
+#include <linux/irq.h>
+#include <plat/irq.h>
 #include <plat/smp.h>
 
 static char smp_cpuinfo_buf[128];