From patchwork Mon Nov 28 14:31:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kochetkov X-Patchwork-Id: 9449651 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 5665A60756 for ; Mon, 28 Nov 2016 14:36:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D74C27BFC for ; Mon, 28 Nov 2016 14:36:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4220927CEA; Mon, 28 Nov 2016 14:36:50 +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 04C6D27BFC for ; Mon, 28 Nov 2016 14:36:50 +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 1cBN1b-0001Y2-3u; Mon, 28 Nov 2016 14:35:19 +0000 Received: from mail-lf0-x243.google.com ([2a00:1450:4010:c07::243]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cBMyN-0007aN-F3; Mon, 28 Nov 2016 14:32:02 +0000 Received: by mail-lf0-x243.google.com with SMTP id p100so9662935lfg.2; Mon, 28 Nov 2016 06:31:41 -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=d0qClOJEUgAcDEkp33yq/5W52SV4oSychtxaHWcuPaGhx4eH86KBuGwRbm56RtpwPC bGpLBTRVLBlK2VvpmnjTVK4GTtXy8r4eHnOU1FEq5TJFJcEjWiu80jo+Qm6XFrZ6LKmg JPZFXvRIz7/frlEr3oeXt3o5Llr2H5d7q+FDRHmBoOW2Nu9i3v8Xa4moRa9Pz3fDpPQj gwciVABcs+cjcsXzvN/69sc8q8cTPTLJ+ExdAH12b19d/Hjw6EdLUEJq+LQciLqf8u44 G+DzfFe2eWzRRVsY3H4I3cqJHUZ+7A4bet2tzC3EhfbsAk0wOKrKodS94VFOLxc9bdgC yOqg== 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=j1QB14mmeZjnGRx1bVMwIgvznuAgXa8pRrZ41F9obPL2WkSmPAXWG46xjxJGQaJ2GX CgTnTVhFC2iDwaJZsHDHJpCqSAOMiaWjAhAf/rcTgjJ8J1raZGPjAt7/t0gYvD23oazw UsbRv0VsVyJAuosayPhYkzg9+IW1Ok7Qj3RJKM4QAuX3JFnC9a/qKSZXuGwlsR+dSiP4 h/uGpFgP+QtZ++F9gPKnfSK4KJq5wu5YVszZeI8RQ/gySBTtX88m0SBA0anuC5pkU9Di 7RUrN2GF03oiBcNXVYsemGfURY0OZ3PHD4RWnfmmpf+obj5n5MbTiNAjFPCwHuT2jhJ9 luEQ== X-Gm-Message-State: AKaTC02u7lBB6wUXSILFQv4ElP8Q7oVAirPGoQu9WzH5Cq8yDVzmGeWSG/rB3oJYBG9Hcg== X-Received: by 10.25.162.79 with SMTP id l76mr6591202lfe.14.1480343500108; Mon, 28 Nov 2016 06:31:40 -0800 (PST) Received: from ubuntu.lintech.local ([185.35.119.87]) by smtp.gmail.com with ESMTPSA id h30sm12816162lji.28.2016.11.28.06.31.38 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 Nov 2016 06:31:39 -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: [PATCHv2 08/11] clocksource/drivers/rockchip_timer: move TIMER_INT_UNMASK out of rk_timer_enable() Date: Mon, 28 Nov 2016 17:31:23 +0300 Message-Id: <1480343486-25539-9-git-send-email-al.kochet@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1480343486-25539-1-git-send-email-al.kochet@gmail.com> References: <1480343486-25539-1-git-send-email-al.kochet@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161128_063159_988143_A7E80057 X-CRM114-Status: GOOD ( 10.35 ) 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; }