From patchwork Fri May 15 08:11:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 6412601 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 9CFD19F1C1 for ; Fri, 15 May 2015 08:18:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CD12520411 for ; Fri, 15 May 2015 08:18:30 +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 023192026F for ; Fri, 15 May 2015 08:18:30 +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 1YtAm5-0008Fz-1A; Fri, 15 May 2015 08:15:17 +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-0006Jg-H0 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 0F58420461; Fri, 15 May 2015 08:13:08 +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 85DB120412; Fri, 15 May 2015 08:13:05 +0000 (UTC) From: shawnguo@kernel.org To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 5/9] ARM: imx: set up set_next_event hook in imx_timer_data_init() Date: Fri, 15 May 2015 16:11:43 +0800 Message-Id: <1431677507-27420-6-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_701236_C256D5FA X-CRM114-Status: GOOD ( 12.96 ) 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 Function imx_timer_data_init() was there for setting up device specific data, so let's move the setup of set_next_event hook into there. Signed-off-by: Shawn Guo --- arch/arm/mach-imx/time.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c index c86e25922eb4..d79a00e24084 100644 --- a/arch/arm/mach-imx/time.c +++ b/arch/arm/mach-imx/time.c @@ -290,15 +290,11 @@ static struct clock_event_device clockevent_mxc = { .name = "mxc_timer1", .features = CLOCK_EVT_FEAT_ONESHOT, .set_mode = mxc_set_mode, - .set_next_event = mx1_2_set_next_event, .rating = 200, }; static int __init mxc_clockevent_init(void) { - if (timer_is_v2()) - clockevent_mxc.set_next_event = v2_set_next_event; - clockevent_mxc.cpumask = cpumask_of(0); clockevents_config_and_register(&clockevent_mxc, clk_get_rate(imxtm.clk_per), @@ -351,15 +347,19 @@ static void __init imx_timer_data_init(void) switch (imxtm.type) { case GPT_TYPE_IMX1: imxtm.gpt_setup_tctl = imx1_gpt_setup_tctl; + clockevent_mxc.set_next_event = mx1_2_set_next_event; break; case GPT_TYPE_IMX21: imxtm.gpt_setup_tctl = imx21_gpt_setup_tctl; + clockevent_mxc.set_next_event = mx1_2_set_next_event; break; case GPT_TYPE_IMX31: imxtm.gpt_setup_tctl = imx31_gpt_setup_tctl; + clockevent_mxc.set_next_event = v2_set_next_event; break; case GPT_TYPE_IMX6DL: imxtm.gpt_setup_tctl = imx6dl_gpt_setup_tctl; + clockevent_mxc.set_next_event = v2_set_next_event; break; default: BUG();