From patchwork Sat Jun 6 03:57:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Ulli Kroll X-Patchwork-Id: 6558841 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 34FB99F326 for ; Sat, 6 Jun 2015 04:01:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5661B207B6 for ; Sat, 6 Jun 2015 04:01:52 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8CA72207B4 for ; Sat, 6 Jun 2015 04:01:51 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Z15FQ-000151-52; Sat, 06 Jun 2015 03:58:16 +0000 Received: from mail-wi0-x22f.google.com ([2a00:1450:400c:c05::22f]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Z15FM-000149-UU for linux-arm-kernel@lists.infradead.org; Sat, 06 Jun 2015 03:58:13 +0000 Received: by wiga1 with SMTP id a1so37644069wig.0 for ; Fri, 05 Jun 2015 20:57:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=23bgulmMaMB87v00fhhBhA6KkKxe5mxjNbZj/2dF2Fk=; b=kN1T5tXgYwkFeONbg4KwWZjELHKkH+Pk6be73NAU1aBEZ1z7VT6YMFeZ6/yfkaDvYx 6HV8jZkJe7p8HSjlV83akpK2c8a8FPsO2uejTD5U/OYxpVgf9xiqYNWjY/WYfHZ9QUat Ns+VyrczaNmp2YoqZZMpQzDb//OBJrEeSIqfeOpPqZ9nhyTmYpgWuc6pYUgV6QxnFpM7 yKMQmkOQJ4bKqTL6KvR6/3murg6V+n0r+rLhdIZG7UtAjW5KmIYjonLhidNfu2uYQmIl 492HWX8Ac1mi8+ZOZLI+OcZnphB4k2q+TdJOtr4KyL5TAs9F+HtJ9d5SZARcdnjp/Syr MDlg== X-Received: by 10.180.108.201 with SMTP id hm9mr2306359wib.5.1433563068994; Fri, 05 Jun 2015 20:57:48 -0700 (PDT) Received: from localhost ([89.204.135.80]) by mx.google.com with ESMTPSA id g11sm13265752wjr.25.2015.06.05.20.57.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jun 2015 20:57:47 -0700 (PDT) From: Hans Ulli Kroll To: linux-kernel@vger.kernel.org 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150605_205813_150449_510BBF72 X-CRM114-Status: UNSURE ( 9.25 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.8 (/) Cc: Hans Ulli Kroll , linux-arm-kernel@lists.infradead.org, Arnd Bergmann X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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)