lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:	Sat,  6 Jun 2015 05:57:23 +0200
From:	Hans Ulli Kroll <ulli.kroll@...glemail.com>
To:	linux-kernel@...r.kernel.org
Cc:	Arnd Bergmann <arnd@...db.de>,
	linux-arm-kernel@...ts.infradead.org,
	Hans Ulli Kroll <ulli.kroll@...glemail.com>
Subject: [PATCH 1/6] ARM:Gemini:move timer register definitions into the right place

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@...glemail.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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists