Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1514860
| From | Vineet Gupta <Vineet.Gupta1@synopsys.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v2 08/10] ARC: move mcip.h into include/soc and adjust the includes |
| Date | 2016-11-03 22:40 +0100 |
| Message-ID | <szxTP-UG-27@gated-at.bofh.it> (permalink) |
| References | <szxTP-UG-11@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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>
---
arch/arc/kernel/mcip.c | 2 +-
arch/arc/kernel/time.c | 2 +-
arch/arc/plat-axs10x/axs10x.c | 2 +-
{arch/arc/include/asm => include/soc/arc}/mcip.h | 8 ++------
4 files changed, 5 insertions(+), 9 deletions(-)
rename {arch/arc/include/asm => include/soc/arc}/mcip.h (96%)
diff --git a/arch/arc/kernel/mcip.c b/arch/arc/kernel/mcip.c
index c424d5abc318..0651e0a2e8b1 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 9bb7e3105ca9..f0b6e6bc1e36 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 86548701023c..38ff349d7f2a 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
similarity index 96%
rename from arch/arc/include/asm/mcip.h
rename to include/soc/arc/mcip.h
index fc28d0944801..6902c2a8bd23 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
--
2.7.4
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v2 00/10] Move ARC timer code into drivers/clocksource/ Vineet Gupta <Vineet.Gupta1@synopsys.com> - 2016-11-03 22:40 +0100
[PATCH v2 01/10] ARC: timer: rtc: implement read loop in "C" vs. inline asm Vineet Gupta <Vineet.Gupta1@synopsys.com> - 2016-11-03 22:40 +0100
Re: [PATCH v2 01/10] ARC: timer: rtc: implement read loop in "C" vs. inline asm Daniel Lezcano <daniel.lezcano@linaro.org> - 2016-11-03 23:00 +0100
Re: [PATCH v2 01/10] ARC: timer: rtc: implement read loop in "C" vs. inline asm Vineet Gupta <Vineet.Gupta1@synopsys.com> - 2016-11-03 23:30 +0100
Re: [PATCH v2 01/10] ARC: timer: rtc: implement read loop in "C" vs. inline asm Daniel Lezcano <daniel.lezcano@linaro.org> - 2016-11-03 23:40 +0100
Re: [PATCH v2 01/10] ARC: timer: rtc: implement read loop in "C" vs. inline asm Daniel Lezcano <daniel.lezcano@linaro.org> - 2016-11-03 23:50 +0100
Re: [PATCH v2 01/10] ARC: timer: rtc: implement read loop in "C" vs. inline asm Vineet Gupta <Vineet.Gupta1@synopsys.com> - 2016-11-03 23:50 +0100
RE: [PATCH v2 01/10] ARC: timer: rtc: implement read loop in "C" vs. inline asm Alexey Brodkin <Alexey.Brodkin@synopsys.com> - 2016-11-04 19:00 +0100
[PATCH v2 05/10] ARC: time: move time_init() out of the driver Vineet Gupta <Vineet.Gupta1@synopsys.com> - 2016-11-03 22:40 +0100
[PATCH v2 07/10] ARC: breakout aux handling into a separate header Vineet Gupta <Vineet.Gupta1@synopsys.com> - 2016-11-03 22:40 +0100
[PATCH v2 08/10] ARC: move mcip.h into include/soc and adjust the includes Vineet Gupta <Vineet.Gupta1@synopsys.com> - 2016-11-03 22:40 +0100
[PATCH v2 02/10] ARC: timer: gfrc, rtc: deuglify big endian code Vineet Gupta <Vineet.Gupta1@synopsys.com> - 2016-11-03 22:40 +0100
Re: [PATCH v2 02/10] ARC: timer: gfrc, rtc: deuglify big endian code Daniel Lezcano <daniel.lezcano@linaro.org> - 2016-11-03 23:00 +0100
Re: [PATCH v2 02/10] ARC: timer: gfrc, rtc: deuglify big endian code Vineet Gupta <Vineet.Gupta1@synopsys.com> - 2016-11-03 23:20 +0100
RE: [PATCH v2 02/10] ARC: timer: gfrc, rtc: deuglify big endian code Alexey Brodkin <Alexey.Brodkin@synopsys.com> - 2016-11-04 19:20 +0100
[PATCH v2 03/10] ARC: timer: gfrc, rtc: Read BCR to detect whether hardware exists ... Vineet Gupta <Vineet.Gupta1@synopsys.com> - 2016-11-03 22:40 +0100
[PATCH v2 10/10] clocksource: import ARC timer driver Vineet Gupta <Vineet.Gupta1@synopsys.com> - 2016-11-03 22:40 +0100
Re: [PATCH v2 10/10] clocksource: import ARC timer driver Daniel Lezcano <daniel.lezcano@linaro.org> - 2016-11-03 23:40 +0100
Re: [PATCH v2 10/10] clocksource: import ARC timer driver Vineet Gupta <Vineet.Gupta1@synopsys.com> - 2016-11-04 00:00 +0100
Re: [PATCH v2 10/10] clocksource: import ARC timer driver Vineet Gupta <Vineet.Gupta1@synopsys.com> - 2016-11-04 00:10 +0100
Re: [PATCH v2 10/10] clocksource: import ARC timer driver Daniel Lezcano <daniel.lezcano@linaro.org> - 2016-11-04 00:10 +0100
[PATCH v2 09/10] ARC: breakout timer include code into separate header ... Vineet Gupta <Vineet.Gupta1@synopsys.com> - 2016-11-03 22:40 +0100
[PATCH v2 04/10] ARC: timer: gfrc: boot print alongside other timers Vineet Gupta <Vineet.Gupta1@synopsys.com> - 2016-11-03 22:40 +0100
[PATCH v2 06/10] ARC: timer: Build gfrc, rtc under same option (64-bit timers) Vineet Gupta <Vineet.Gupta1@synopsys.com> - 2016-11-03 22:40 +0100
Re: [PATCH v2 06/10] ARC: timer: Build gfrc, rtc under same option (64-bit timers) Daniel Lezcano <daniel.lezcano@linaro.org> - 2016-11-03 23:20 +0100
csiph-web