Browse Source

ARC: move mcip.h into include/soc and adjust the includes

Also remove the dependency on ARCv2, to increase compile coverage for
!ARCV2 builds

Acked-by: Daniel Lezcano <daniel.lezcnao@linaro.org>
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Vineet Gupta 8 years ago
parent
commit
2d7f5c48c0
4 changed files with 5 additions and 9 deletions
  1. 1 1
      arch/arc/kernel/mcip.c
  2. 1 1
      arch/arc/kernel/time.c
  3. 1 1
      arch/arc/plat-axs10x/axs10x.c
  4. 2 6
      include/soc/arc/mcip.h

+ 1 - 1
arch/arc/kernel/mcip.c

@@ -11,8 +11,8 @@
 #include <linux/smp.h>
 #include <linux/smp.h>
 #include <linux/irq.h>
 #include <linux/irq.h>
 #include <linux/spinlock.h>
 #include <linux/spinlock.h>
+#include <soc/arc/mcip.h>
 #include <asm/irqflags-arcv2.h>
 #include <asm/irqflags-arcv2.h>
-#include <asm/mcip.h>
 #include <asm/setup.h>
 #include <asm/setup.h>
 
 
 static DEFINE_RAW_SPINLOCK(mcip_lock);
 static DEFINE_RAW_SPINLOCK(mcip_lock);

+ 1 - 1
arch/arc/kernel/time.c

@@ -40,7 +40,7 @@
 #include <asm/irq.h>
 #include <asm/irq.h>
 #include <asm/arcregs.h>
 #include <asm/arcregs.h>
 
 
-#include <asm/mcip.h>
+#include <soc/arc/mcip.h>
 
 
 /* Timer related Aux registers */
 /* Timer related Aux registers */
 #define ARC_REG_TIMER0_LIMIT	0x23	/* timer 0 limit */
 #define ARC_REG_TIMER0_LIMIT	0x23	/* timer 0 limit */

+ 1 - 1
arch/arc/plat-axs10x/axs10x.c

@@ -21,7 +21,7 @@
 #include <asm/asm-offsets.h>
 #include <asm/asm-offsets.h>
 #include <asm/io.h>
 #include <asm/io.h>
 #include <asm/mach_desc.h>
 #include <asm/mach_desc.h>
-#include <asm/mcip.h>
+#include <soc/arc/mcip.h>
 
 
 #define AXS_MB_CGU		0xE0010000
 #define AXS_MB_CGU		0xE0010000
 #define AXS_MB_CREG		0xE0011000
 #define AXS_MB_CREG		0xE0011000

+ 2 - 6
arch/arc/include/asm/mcip.h → include/soc/arc/mcip.h

@@ -8,10 +8,8 @@
  * published by the Free Software Foundation.
  * published by the Free Software Foundation.
  */
  */
 
 
-#ifndef __ASM_MCIP_H
-#define __ASM_MCIP_H
-
-#ifdef CONFIG_ISA_ARCV2
+#ifndef __SOC_ARC_MCIP_H
+#define __SOC_ARC_MCIP_H
 
 
 #include <soc/arc/aux.h>
 #include <soc/arc/aux.h>
 
 
@@ -103,5 +101,3 @@ static inline void __mcip_cmd_data(unsigned int cmd, unsigned int param,
 }
 }
 
 
 #endif
 #endif
-
-#endif