All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] MIPS: GIC: Select R4K counter as fallback.
@ 2013-09-11 19:51 Steven J. Hill
  2013-09-12  6:34 ` John Crispin
  2013-09-12  7:28 ` Lars-Peter Clausen
  0 siblings, 2 replies; 9+ messages in thread
From: Steven J. Hill @ 2013-09-11 19:51 UTC (permalink / raw)
  To: linux-mips; +Cc: Leonid Yegoshin, ralf, Steven J. Hill

From: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>

If CONFIG_CSRC_GIC is selected and the GIC is not found during
boot, then fallback to the R4K counter gracefully.

Signed-off-by: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>
Signed-off-by: Steven J. Hill <Steven.Hill@imgtec.com>
---
 arch/mips/include/asm/time.h |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/arch/mips/include/asm/time.h b/arch/mips/include/asm/time.h
index 2d7b9df..6ff85e6 100644
--- a/arch/mips/include/asm/time.h
+++ b/arch/mips/include/asm/time.h
@@ -18,6 +18,7 @@
 #include <linux/spinlock.h>
 #include <linux/clockchips.h>
 #include <linux/clocksource.h>
+#include <asm/gic.h>
 
 extern spinlock_t rtc_lock;
 
@@ -75,11 +76,13 @@ extern int init_r4k_clocksource(void);
 
 static inline int init_mips_clocksource(void)
 {
-#if defined(CONFIG_CSRC_R4K) && !defined(CONFIG_CSRC_GIC)
-	return init_r4k_clocksource();
-#else
-	return 0;
+#ifdef CONFIG_CSRC_R4K
+#ifdef CONFIG_CSRC_GIC
+	if (!gic_present)
 #endif
+		return init_r4k_clocksource();
+#endif
+	return 0;
 }
 
 static inline void clockevent_set_clock(struct clock_event_device *cd,
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2013-09-13  7:51 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-11 19:51 [PATCH v2] MIPS: GIC: Select R4K counter as fallback Steven J. Hill
2013-09-12  6:34 ` John Crispin
2013-09-12  7:28 ` Lars-Peter Clausen
2013-09-12  7:33   ` John Crispin
2013-09-12  7:38     ` Lars-Peter Clausen
2013-09-12  8:04       ` John Crispin
2013-09-12 18:23   ` Leonid Yegoshin
2013-09-12 18:23     ` Leonid Yegoshin
2013-09-13  7:52     ` Lars-Peter Clausen

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.