From patchwork Thu Apr 30 14:44:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shenwei Wang X-Patchwork-Id: 6304781 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 3BDE09F444 for ; Thu, 30 Apr 2015 14:55:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 643D2200FE for ; Thu, 30 Apr 2015 14:55:08 +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 2E7BB201F4 for ; Thu, 30 Apr 2015 14:55:05 +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 1Ynpog-000190-96; Thu, 30 Apr 2015 14:51:54 +0000 Received: from mail-bn1bon0117.outbound.protection.outlook.com ([157.56.111.117] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ynpk3-0005Q8-TZ for linux-arm-kernel@lists.infradead.org; Thu, 30 Apr 2015 14:47:08 +0000 Received: from DM2PR03MB461.namprd03.prod.outlook.com (10.141.85.12) by DM2PR03MB336.namprd03.prod.outlook.com (10.141.54.25) with Microsoft SMTP Server (TLS) id 15.1.148.15; Thu, 30 Apr 2015 14:46:45 +0000 Received: from BLUPR0301CA0016.namprd03.prod.outlook.com (25.162.113.154) by DM2PR03MB461.namprd03.prod.outlook.com (10.141.85.12) with Microsoft SMTP Server (TLS) id 15.1.148.15; Thu, 30 Apr 2015 14:46:44 +0000 Received: from BY2FFO11OLC004.protection.gbl (2a01:111:f400:7c0c::132) by BLUPR0301CA0016.outlook.office365.com (2a01:111:e400:5259::26) with Microsoft SMTP Server (TLS) id 15.1.130.23 via Frontend Transport; Thu, 30 Apr 2015 14:46:44 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; lists.infradead.org; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BY2FFO11OLC004.mail.protection.outlook.com (10.1.15.184) with Microsoft SMTP Server (TLS) id 15.1.160.8 via Frontend Transport; Thu, 30 Apr 2015 14:46:43 +0000 Received: from [az84smr01.freescale.net (B38339-11.am.freescale.net [10.81.92.140]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id t3UEieib026417; Thu, 30 Apr 2015 07:46:42 -0700 From: Shenwei Wang To: Subject: [PATCH 10/18] ARM: imx: Removed the SoC relating codes in mxc_set_mode Date: Thu, 30 Apr 2015 09:44:25 -0500 Message-ID: <1430405073-13106-11-git-send-email-shenwei.wang@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1430405073-13106-1-git-send-email-shenwei.wang@freescale.com> References: <1430405073-13106-1-git-send-email-shenwei.wang@freescale.com> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(339900001)(189002)(199003)(92566002)(36756003)(50466002)(2950100001)(77156002)(62966003)(110136002)(5001960100002)(104016003)(77096005)(47776003)(19580405001)(2351001)(6806004)(46102003)(19580395003)(86362001)(50226001)(229853001)(33646002)(106466001)(85426001)(50986999)(76176999)(105606002)(48376002)(87936001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR03MB461; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:sfv; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:; SRVR:DM2PR03MB461; UriScan:; BCL:0; PCL:0; RULEID:; SRVR:DM2PR03MB336; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:DM2PR03MB461; BCL:0; PCL:0; RULEID:; SRVR:DM2PR03MB461; X-Forefront-PRVS: 056297E276 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2015 14:46:43.7902 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR03MB461 X-OriginatorOrg: freescale.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150430_074708_173624_2BF7D4D4 X-CRM114-Status: UNSURE ( 7.86 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) Cc: linux-arm-kernel@lists.infradead.org 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: , 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.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 Enabled the use of parameter *evt, and removed the SoC relating codes in mxc_set_mode. Signed-off-by: Shenwei Wang --- arch/arm/mach-imx/time.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c index e41bad9..ddbb3e7 100644 --- a/arch/arm/mach-imx/time.c +++ b/arch/arm/mach-imx/time.c @@ -258,6 +258,7 @@ static void mxc_set_mode(enum clock_event_mode mode, struct clock_event_device *evt) { unsigned long flags; + struct imx_timer *tm = container_of(evt, struct imx_timer, evt); /* * The timer interrupt generation is disabled at least @@ -266,19 +267,14 @@ static void mxc_set_mode(enum clock_event_mode mode, local_irq_save(flags); /* Disable interrupt in GPT module */ - gpt_irq_disable(); + tm->gpt_irq_disable(tm); if (mode != clockevent_mode) { /* Set event time into far-far future */ - if (timer_is_v2()) - __raw_writel(__raw_readl(timer_base + V2_TCN) - 3, - timer_base + V2_TCMP); - else - __raw_writel(__raw_readl(timer_base + MX1_2_TCN) - 3, - timer_base + MX1_2_TCMP); + evt->set_next_event(-3, evt); /* Clear pending interrupt */ - gpt_irq_acknowledge(); + tm->gpt_irq_acknowledge(tm); } #ifdef DEBUG @@ -304,7 +300,7 @@ static void mxc_set_mode(enum clock_event_mode mode, * mode switching */ local_irq_save(flags); - gpt_irq_enable(); + tm->gpt_irq_enable(tm); local_irq_restore(flags); break; case CLOCK_EVT_MODE_SHUTDOWN: