From patchwork Tue Nov 29 16:14:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kochetkov X-Patchwork-Id: 9452657 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 79B4A6071E for ; Tue, 29 Nov 2016 16:21:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C774283FB for ; Tue, 29 Nov 2016 16:21:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 610FB28401; Tue, 29 Nov 2016 16:21:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1D214283FB for ; Tue, 29 Nov 2016 16:21:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cBl8H-0003tg-VT; Tue, 29 Nov 2016 16:19:50 +0000 Received: from mail-lf0-x244.google.com ([2a00:1450:4010:c07::244]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cBl4I-0001SX-PH; Tue, 29 Nov 2016 16:15:46 +0000 Received: by mail-lf0-x244.google.com with SMTP id o141so13187519lff.1; Tue, 29 Nov 2016 08:15:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zPlos5my+4iMmpPibPuUj5QD/Zc+Vzx5FVXPmnOOs+0=; b=gBCF4iFstJBlV8bgOUv/1WuTHC+fckqVTpW9mNbKEgZXjH4Y20ieYRvaRucbDoHyRA uqHikDjlWAsRpATz9BS2ZXf7Tm4oCL/6SwXV14OpJD85CAblntClVnkrtC4HYJsDM9S4 y0rEi3Mvv2WNe0s2FCEckjw73JEMRa3EusIFMpWl4cBXcUUBx4fpfYlP8QR6j2svNDWq ZDM3ma2eC1CyaoAPuOQmMkmNB5NI+9+fTxOsuC5SAO1+04jp3iAMjEJ+1Lsqrwm6SLUf +xcGbuEfkYAKrP9KPNfMdOvORvnxhjgE2rTkHSH9WnwfYMPpgmsPvx4+75giwZGtvdox frqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zPlos5my+4iMmpPibPuUj5QD/Zc+Vzx5FVXPmnOOs+0=; b=cPwEOJNF9meVoo2v7REjIuxa46R3O7D39+YVRpvJxypm9iTcT9OSh3TCi+OwwUTcqa GdRPHJV7oDqzINjTCBWvap3F07B/NlyxH3VN8z2RDMxx6P3Tn+JsjdoZ7c//1WT3DXGF 1E9Y6CPBn2aocVY2OoXir0SOr4ydIm7/+Z9iZypxjw+UxItkQd2g/8npv/Bvd7cWeYlE XfrIL7+51Bp+oifhSXjuQnZEDaur3QVZo/qaPxHQa3NantBEijyp77UiLrn7+SlB4iK+ lIOZ3uEwHuqdiP0l2RfS9+Pqkk6gf706WGKqfDKHKg7rBdbaCGYwd3HcABm7yUIwQ1NS 98OQ== X-Gm-Message-State: AKaTC01DtGFZdvbWceQn2eLHMwBYiY8FhDAz4xz/y1LkDIwXdrBi/6H6WVcDawWrkCnsKQ== X-Received: by 10.25.167.20 with SMTP id q20mr10673376lfe.115.1480436125985; Tue, 29 Nov 2016 08:15:25 -0800 (PST) Received: from ubuntu.lintech.local ([185.35.119.87]) by smtp.gmail.com with ESMTPSA id e78sm13771566lfg.23.2016.11.29.08.15.24 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Nov 2016 08:15:25 -0800 (PST) From: Alexander Kochetkov To: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Subject: [PATCH v4 8/9] clocksource/drivers/rockchip_timer: move TIMER_INT_UNMASK out of rk_timer_enable() Date: Tue, 29 Nov 2016 19:14:51 +0300 Message-Id: <1480436092-10728-9-git-send-email-al.kochet@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1480436092-10728-1-git-send-email-al.kochet@gmail.com> References: <1480343486-25539-1-git-send-email-al.kochet@gmail.com> <1480436092-10728-1-git-send-email-al.kochet@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161129_081543_125877_A10DD061 X-CRM114-Status: GOOD ( 11.10 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Huang Tao , Heiko Stuebner , Alexander Kochetkov , Daniel Lezcano , Russell King , Rob Herring , Thomas Gleixner , Caesar Wang 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 This allow to enable timer without enabling interrupts from it. As that mode will be used in clocksource implementation. This is refactoring step without functional changes. Signed-off-by: Alexander Kochetkov --- drivers/clocksource/rockchip_timer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/clocksource/rockchip_timer.c b/drivers/clocksource/rockchip_timer.c index a17dc61..61c3bb1 100644 --- a/drivers/clocksource/rockchip_timer.c +++ b/drivers/clocksource/rockchip_timer.c @@ -60,8 +60,7 @@ static inline void rk_timer_disable(struct rk_timer *timer) static inline void rk_timer_enable(struct rk_timer *timer, u32 flags) { - writel_relaxed(TIMER_ENABLE | TIMER_INT_UNMASK | flags, - timer->ctrl); + writel_relaxed(TIMER_ENABLE | flags, timer->ctrl); } static void rk_timer_update_counter(unsigned long cycles, @@ -83,7 +82,8 @@ static inline int rk_timer_set_next_event(unsigned long cycles, rk_timer_disable(timer); rk_timer_update_counter(cycles, timer); - rk_timer_enable(timer, TIMER_MODE_USER_DEFINED_COUNT); + rk_timer_enable(timer, TIMER_MODE_USER_DEFINED_COUNT | + TIMER_INT_UNMASK); return 0; } @@ -101,7 +101,7 @@ static int rk_timer_set_periodic(struct clock_event_device *ce) rk_timer_disable(timer); rk_timer_update_counter(timer->freq / HZ - 1, timer); - rk_timer_enable(timer, TIMER_MODE_FREE_RUNNING); + rk_timer_enable(timer, TIMER_MODE_FREE_RUNNING | TIMER_INT_UNMASK); return 0; }