From: Hans Ulli Kroll <ulli.kroll@googlemail.com>
To: linux-kernel@vger.kernel.org
Cc: Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org,
Hans Ulli Kroll <ulli.kroll@googlemail.com>
Subject: [PATCH 1/6] ARM:Gemini:move timer register definitions into the right place
Date: Sat, 6 Jun 2015 05:57:23 +0200 [thread overview]
Message-ID: <1433563048-21922-2-git-send-email-ulli.kroll@googlemail.com> (raw)
In-Reply-To: <1433563048-21922-1-git-send-email-ulli.kroll@googlemail.com>
We need the offset for the timer registers in driver only.
So move this out of hardware.h
Signed-off-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
---
arch/arm/mach-gemini/include/mach/hardware.h | 3 ---
arch/arm/mach-gemini/time.c | 4 ++++
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-gemini/include/mach/hardware.h b/arch/arm/mach-gemini/include/mach/hardware.h
index 98e7b0f..f0390f1 100644
--- a/arch/arm/mach-gemini/include/mach/hardware.h
+++ b/arch/arm/mach-gemini/include/mach/hardware.h
@@ -57,9 +57,6 @@
#define GEMINI_USB1_BASE 0x69000000
#define GEMINI_BIG_ENDIAN_BASE 0x80000000
-#define GEMINI_TIMER1_BASE GEMINI_TIMER_BASE
-#define GEMINI_TIMER2_BASE (GEMINI_TIMER_BASE + 0x10)
-#define GEMINI_TIMER3_BASE (GEMINI_TIMER_BASE + 0x20)
/*
* UART Clock when System clk is 150MHz
diff --git a/arch/arm/mach-gemini/time.c b/arch/arm/mach-gemini/time.c
index 0a63c4d2..d0bbd2f 100644
--- a/arch/arm/mach-gemini/time.c
+++ b/arch/arm/mach-gemini/time.c
@@ -19,6 +19,10 @@
/*
* Register definitions for the timers
*/
+#define GEMINI_TIMER1_BASE GEMINI_TIMER_BASE
+#define GEMINI_TIMER2_BASE (GEMINI_TIMER_BASE + 0x10)
+#define GEMINI_TIMER3_BASE (GEMINI_TIMER_BASE + 0x20)
+
#define TIMER_COUNT(BASE_ADDR) (BASE_ADDR + 0x00)
#define TIMER_LOAD(BASE_ADDR) (BASE_ADDR + 0x04)
#define TIMER_MATCH1(BASE_ADDR) (BASE_ADDR + 0x08)
--
2.4.2
next prev parent reply other threads:[~2015-06-06 3:57 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-06 3:57 ARM:Gemini:fix/update timer clocksource Hans Ulli Kroll
2015-06-06 3:57 ` Hans Ulli Kroll [this message]
2015-06-06 3:57 ` [PATCH 2/6] ARM:Gemini:move IOADDRESS() into #define's Hans Ulli Kroll
2015-06-06 3:57 ` [PATCH 3/6] ARM:Gemini:add missing intr state and mask register Hans Ulli Kroll
2015-06-06 3:57 ` [PATCH 4/6] ARM:Gemini:remove index for timer control register Hans Ulli Kroll
2015-06-06 3:57 ` [PATCH 5/6] ARM:Gemini:use timer 1 as clockevent timer Hans Ulli Kroll
2015-06-06 3:57 ` [PATCH 6/6] ARM:Gemini:add timer3 as sched_clock_source Hans Ulli Kroll
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1433563048-21922-2-git-send-email-ulli.kroll@googlemail.com \
--to=ulli.kroll@googlemail.com \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®