From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752099AbbFFD56 (ORCPT ); Fri, 5 Jun 2015 23:57:58 -0400 Received: from mail-wg0-f41.google.com ([74.125.82.41]:33227 "EHLO mail-wg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751422AbbFFD5u (ORCPT ); Fri, 5 Jun 2015 23:57:50 -0400 From: Hans Ulli Kroll To: linux-kernel@vger.kernel.org Cc: Arnd Bergmann , linux-arm-kernel@lists.infradead.org, Hans Ulli Kroll Subject: [PATCH 1/6] ARM:Gemini:move timer register definitions into the right place Date: Sat, 6 Jun 2015 05:57:23 +0200 Message-Id: <1433563048-21922-2-git-send-email-ulli.kroll@googlemail.com> X-Mailer: git-send-email 2.4.2 In-Reply-To: <1433563048-21922-1-git-send-email-ulli.kroll@googlemail.com> References: <1433563048-21922-1-git-send-email-ulli.kroll@googlemail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We need the offset for the timer registers in driver only. So move this out of hardware.h Signed-off-by: Hans Ulli Kroll --- 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