From patchwork Fri May 15 08:11:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 6412621 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8DD92C0432 for ; Fri, 15 May 2015 08:18:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B4FA02026F for ; Fri, 15 May 2015 08:18:48 +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 CAABC200FE for ; Fri, 15 May 2015 08:18:47 +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 1YtAmP-0000I8-NB; Fri, 15 May 2015 08:15:37 +0000 Received: from mail.kernel.org ([198.145.29.136]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YtAkO-0006Jh-Gx for linux-arm-kernel@lists.infradead.org; Fri, 15 May 2015 08:13:35 +0000 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 994B820412; Fri, 15 May 2015 08:13:10 +0000 (UTC) Received: from localhost.localdomain (unknown [104.207.83.1]) (using TLSv1.2 with cipher AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6E12220452; Fri, 15 May 2015 08:13:08 +0000 (UTC) From: shawnguo@kernel.org To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 6/9] ARM: imx: define gpt register offset per device type Date: Fri, 15 May 2015 16:11:44 +0800 Message-Id: <1431677507-27420-7-git-send-email-shawnguo@kernel.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1431677507-27420-1-git-send-email-shawnguo@kernel.org> References: <1431677507-27420-1-git-send-email-shawnguo@kernel.org> X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150515_011332_751787_4046B59E X-CRM114-Status: GOOD ( 14.97 ) X-Spam-Score: -0.0 (/) Cc: Shawn Guo , Daniel Lezcano , kernel@pengutronix.de, Shenwei Wang 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-Virus-Scanned: ClamAV using ClamSMTP From: Shawn Guo It initializes offset of gpt registers TSTAT, TCN and TCMP per device type, so that the access to these registers can be unified. Signed-off-by: Shawn Guo --- arch/arm/mach-imx/time.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c index d79a00e24084..5908e78d9552 100644 --- a/arch/arm/mach-imx/time.c +++ b/arch/arm/mach-imx/time.c @@ -91,6 +91,9 @@ struct imx_timer { int irq; struct clk *clk_per; struct clk *clk_ipg; + int reg_tstat; + int reg_tcn; + int reg_tcmp; void (*gpt_setup_tctl)(void); }; @@ -147,7 +150,7 @@ static unsigned long imx_read_current_timer(void) static int __init mxc_clocksource_init(void) { unsigned int c = clk_get_rate(imxtm.clk_per); - void __iomem *reg = imxtm.base + (timer_is_v2() ? V2_TCN : MX1_2_TCN); + void __iomem *reg = imxtm.base + imxtm.reg_tcn; imx_delay_timer.read_current_timer = &imx_read_current_timer; imx_delay_timer.freq = c; @@ -214,13 +217,8 @@ static void mxc_set_mode(enum clock_event_mode mode, gpt_irq_disable(); if (mode != clockevent_mode) { - /* Set event time into far-far future */ - if (timer_is_v2()) - __raw_writel(__raw_readl(imxtm.base + V2_TCN) - 3, - imxtm.base + V2_TCMP); - else - __raw_writel(__raw_readl(imxtm.base + MX1_2_TCN) - 3, - imxtm.base + MX1_2_TCMP); + __raw_writel(__raw_readl(imxtm.base + imxtm.reg_tcn) - 3, + imxtm.base + imxtm.reg_tcmp); /* Clear pending interrupt */ gpt_irq_acknowledge(); @@ -268,10 +266,7 @@ static irqreturn_t mxc_timer_interrupt(int irq, void *dev_id) struct clock_event_device *evt = &clockevent_mxc; uint32_t tstat; - if (timer_is_v2()) - tstat = __raw_readl(imxtm.base + V2_TSTAT); - else - tstat = __raw_readl(imxtm.base + MX1_2_TSTAT); + tstat = __raw_readl(imxtm.base + imxtm.reg_tstat); gpt_irq_acknowledge(); @@ -346,18 +341,30 @@ static void __init imx_timer_data_init(void) { switch (imxtm.type) { case GPT_TYPE_IMX1: + imxtm.reg_tstat = MX1_2_TSTAT; + imxtm.reg_tcn = MX1_2_TCN; + imxtm.reg_tcmp = MX1_2_TCMP; imxtm.gpt_setup_tctl = imx1_gpt_setup_tctl; clockevent_mxc.set_next_event = mx1_2_set_next_event; break; case GPT_TYPE_IMX21: + imxtm.reg_tstat = MX1_2_TSTAT; + imxtm.reg_tcn = MX1_2_TCN; + imxtm.reg_tcmp = MX1_2_TCMP; imxtm.gpt_setup_tctl = imx21_gpt_setup_tctl; clockevent_mxc.set_next_event = mx1_2_set_next_event; break; case GPT_TYPE_IMX31: + imxtm.reg_tstat = V2_TSTAT; + imxtm.reg_tcn = V2_TCN; + imxtm.reg_tcmp = V2_TCMP; imxtm.gpt_setup_tctl = imx31_gpt_setup_tctl; clockevent_mxc.set_next_event = v2_set_next_event; break; case GPT_TYPE_IMX6DL: + imxtm.reg_tstat = V2_TSTAT; + imxtm.reg_tcn = V2_TCN; + imxtm.reg_tcmp = V2_TCMP; imxtm.gpt_setup_tctl = imx6dl_gpt_setup_tctl; clockevent_mxc.set_next_event = v2_set_next_event; break;