diff options
| author | Vineet Gupta <vgupta@synopsys.com> | 2016-10-31 11:27:08 -0700 |
|---|---|---|
| committer | Vineet Gupta <vgupta@synopsys.com> | 2016-11-30 11:54:25 -0800 |
| commit | 2d7f5c48c03ee53ad649cbf803dc33730f955234 (patch) | |
| tree | afde6d7fd51913d812e97ed9cb19e29e6e2151f0 | |
| parent | c33a605dd6f36618f9f658e71c09fcdcb44fc500 (diff) | |
| download | op-kernel-dev-2d7f5c48c03ee53ad649cbf803dc33730f955234.zip op-kernel-dev-2d7f5c48c03ee53ad649cbf803dc33730f955234.tar.gz | |
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>
| -rw-r--r-- | arch/arc/kernel/mcip.c | 2 | ||||
| -rw-r--r-- | arch/arc/kernel/time.c | 2 | ||||
| -rw-r--r-- | arch/arc/plat-axs10x/axs10x.c | 2 | ||||
| -rw-r--r-- | include/soc/arc/mcip.h (renamed from arch/arc/include/asm/mcip.h) | 8 |
4 files changed, 5 insertions, 9 deletions
diff --git a/arch/arc/kernel/mcip.c b/arch/arc/kernel/mcip.c index f39142a..560c4af 100644 --- a/arch/arc/kernel/mcip.c +++ b/arch/arc/kernel/mcip.c @@ -11,8 +11,8 @@ #include <linux/smp.h> #include <linux/irq.h> #include <linux/spinlock.h> +#include <soc/arc/mcip.h> #include <asm/irqflags-arcv2.h> -#include <asm/mcip.h> #include <asm/setup.h> static DEFINE_RAW_SPINLOCK(mcip_lock); diff --git a/arch/arc/kernel/time.c b/arch/arc/kernel/time.c index 417d32e..ec1b896 100644 --- a/arch/arc/kernel/time.c +++ b/arch/arc/kernel/time.c @@ -40,7 +40,7 @@ #include <asm/irq.h> #include <asm/arcregs.h> -#include <asm/mcip.h> +#include <soc/arc/mcip.h> /* Timer related Aux registers */ #define ARC_REG_TIMER0_LIMIT 0x23 /* timer 0 limit */ diff --git a/arch/arc/plat-axs10x/axs10x.c b/arch/arc/plat-axs10x/axs10x.c index 8654870..38ff349 100644 --- a/arch/arc/plat-axs10x/axs10x.c +++ b/arch/arc/plat-axs10x/axs10x.c @@ -21,7 +21,7 @@ #include <asm/asm-offsets.h> #include <asm/io.h> #include <asm/mach_desc.h> -#include <asm/mcip.h> +#include <soc/arc/mcip.h> #define AXS_MB_CGU 0xE0010000 #define AXS_MB_CREG 0xE0011000 diff --git a/arch/arc/include/asm/mcip.h b/include/soc/arc/mcip.h index fc28d09..6902c2a 100644 --- a/arch/arc/include/asm/mcip.h +++ b/include/soc/arc/mcip.h @@ -8,10 +8,8 @@ * 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> @@ -103,5 +101,3 @@ static inline void __mcip_cmd_data(unsigned int cmd, unsigned int param, } #endif - -#endif |
