1 files changed, 0 insertions, 105 deletions
diff --git a/patches/barebox-2012.12.0/0006-ARM-omap-Make-timer-base-runtime-configurable.patch b/patches/barebox-2012.12.0/0006-ARM-omap-Make-timer-base-runtime-configurable.patch
deleted file mode 100644
index 5f6fa7b..0000000
--- a/patches/barebox-2012.12.0/0006-ARM-omap-Make-timer-base-runtime-configurable.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 684627d09ef0eab88f712535fb505fd330392d10 Mon Sep 17 00:00:00 2001
-From: Sascha Hauer <s.hauer@pengutronix.de>
-Date: Thu, 13 Dec 2012 17:30:41 +0100
-Subject: [PATCH] ARM omap: Make timer base runtime configurable
-
-Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
----
- arch/arm/mach-omap/include/mach/timers.h |    4 ----
- arch/arm/mach-omap/omap3_clock.c         |    3 +++
- arch/arm/mach-omap/omap4_clock.c         |    1 +
- arch/arm/mach-omap/omap4_generic.c       |    2 +-
- arch/arm/mach-omap/s32k_clksource.c      |   10 +++++++++-
- 5 files changed, 14 insertions(+), 6 deletions(-)
-
-diff --git a/arch/arm/mach-omap/include/mach/timers.h b/arch/arm/mach-omap/include/mach/timers.h
-index 2df507d..8e4cb92 100644
---- a/arch/arm/mach-omap/include/mach/timers.h
-+++ b/arch/arm/mach-omap/include/mach/timers.h
-@@ -47,8 +47,4 @@
- /* Enable sys_clk NO-prescale /1 */
- #define GPT_EN			((0 << 2) | (0x1 << 1) | (0x1 << 0))
- 
--/** Sync 32Khz Timer registers */
--#define S32K_CR			(OMAP_32KTIMER_BASE + 0x10)
--#define S32K_FREQUENCY		32768
--
- #endif /*__ASM_ARCH_GPT_H */
-diff --git a/arch/arm/mach-omap/omap3_clock.c b/arch/arm/mach-omap/omap3_clock.c
-index 975bf45..2a5e6f2 100644
---- a/arch/arm/mach-omap/omap3_clock.c
-+++ b/arch/arm/mach-omap/omap3_clock.c
-@@ -34,10 +34,13 @@
- #include <io.h>
- #include <mach/silicon.h>
- #include <mach/clocks.h>
-+#include <mach/omap3-clock.h>
- #include <mach/timers.h>
- #include <mach/sys_info.h>
- #include <mach/syslib.h>
- 
-+#define S32K_CR			(OMAP_32KTIMER_BASE + 0x10)
-+
- /* Following functions are exported from omap3_clock_core.S */
- /* Helper functions */
- static u32 get_osc_clk_speed(void);
-diff --git a/arch/arm/mach-omap/omap4_clock.c b/arch/arm/mach-omap/omap4_clock.c
-index b489d59..c86e4e5 100644
---- a/arch/arm/mach-omap/omap4_clock.c
-+++ b/arch/arm/mach-omap/omap4_clock.c
-@@ -3,6 +3,7 @@
- #include <mach/syslib.h>
- #include <mach/silicon.h>
- #include <mach/clocks.h>
-+#include <mach/omap4-clock.h>
- 
- #define LDELAY	12000000
- 
-diff --git a/arch/arm/mach-omap/omap4_generic.c b/arch/arm/mach-omap/omap4_generic.c
-index dc1dbae..4653b17 100644
---- a/arch/arm/mach-omap/omap4_generic.c
-+++ b/arch/arm/mach-omap/omap4_generic.c
-@@ -1,7 +1,7 @@
- #include <common.h>
- #include <init.h>
- #include <io.h>
--#include <mach/clocks.h>
-+#include <mach/omap4-clock.h>
- #include <mach/silicon.h>
- #include <mach/omap4-mux.h>
- #include <mach/syslib.h>
-diff --git a/arch/arm/mach-omap/s32k_clksource.c b/arch/arm/mach-omap/s32k_clksource.c
-index 2cfcfa9..ca73753 100644
---- a/arch/arm/mach-omap/s32k_clksource.c
-+++ b/arch/arm/mach-omap/s32k_clksource.c
-@@ -31,6 +31,12 @@
- #include <mach/sys_info.h>
- #include <mach/syslib.h>
- 
-+/** Sync 32Khz Timer registers */
-+#define S32K_CR			0x10
-+#define S32K_FREQUENCY		32768
-+
-+static void __iomem *timerbase;
-+
- /**
-  * @brief Provide a simple clock read
-  *
-@@ -41,7 +47,7 @@
-  */
- static uint64_t s32k_clocksource_read(void)
- {
--	return readl(S32K_CR);
-+	return readl(timerbase + S32K_CR);
- }
- 
- /* A bit obvious isn't it? */
-@@ -62,6 +68,8 @@ static struct clocksource s32k_cs = {
-  */
- static int s32k_clocksource_init(void)
- {
-+	timerbase = (void *)OMAP_32KTIMER_BASE;
-+
- 	s32k_cs.mult = clocksource_hz2mult(S32K_FREQUENCY, s32k_cs.shift);
- 
- 	return init_clock(&s32k_cs);