From patchwork Tue Nov 29 13:45:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kochetkov X-Patchwork-Id: 9452129 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 D9DE960710 for ; Tue, 29 Nov 2016 13:51:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CBED328339 for ; Tue, 29 Nov 2016 13:51:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BEE062833B; Tue, 29 Nov 2016 13:51:26 +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 31BE228339 for ; Tue, 29 Nov 2016 13:51:26 +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 1cBin3-0002Fi-Pq; Tue, 29 Nov 2016 13:49:45 +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 1cBijL-0007jp-Tm; Tue, 29 Nov 2016 13:45:59 +0000 Received: by mail-lf0-x243.google.com with SMTP id o20so12704766lfg.3; Tue, 29 Nov 2016 05:45:36 -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=1l25gacJ7T5fvL6QOYGmS75Zv9MeqfWWeVe1vOOz530=; b=pAZZxINHPBwOarVnK83pfxeGcYySSrorJiC8JAqZkztYnzXSFt8Sfx4aQUADb2f5tH Jt/SoZAkGlg4ulAB8Ej29WNuPk9Yw4d83UPLR0vvXg4FutLI8tT+b7ZphoCL4Qv7fRrv AJ6vPBBL/7u8USSDnTKt2KRX6Wm6kgMLXzbIY3XRr2Go+MTev4D7GBPGoT8tAiXCyrF3 NLmaU65/Y7z3DJvUCuLZy1LcFLPuwO5T6N7FjobemH1XbNZCfoqu/53DhlCewYpNCXx5 7JNs7diqV2FIfFrTzGuzAFQlFCeOXiw2HEtaZNnXLn4DA618u+DGcjoB/A/gxVBbwPE3 iM7A== 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=1l25gacJ7T5fvL6QOYGmS75Zv9MeqfWWeVe1vOOz530=; b=MGQESHnf+TNUcPlC6gbU/9/9LrDIBscsDlSpD46yzuApJGCPhwh5OoCCcyKBYMSIz5 e7hySKWFV9SSALrvgWEGRy1tpF2wJ1NrheiL7dreKu+RLQ5Ns2dAQotjs+4uDsz1LAg4 8B482I4sv9MkVD/l6rdTJtDbFWPmQMiUloLSzeFOxIAlriNAEdse+cSfQK853WFsvjkt g1xvns6m5Xi/MZ3ZPrRUqE4KtwOvFOsiPs6XtOvcbw5L0slJJeeu7USr246FG5u9bRc3 iBrsVR/DWq1/k/rMkp5708+Ds1KsEXUreu107jT8Bgv850RA/L5W58I9HrEHZ1+GKPoH RySg== X-Gm-Message-State: AKaTC00tsyBWZ3SCnx2mCz/7VRq+6Rjq9gb26YJw2y5iOqOtxoE4zyMf+gMGjMLmjXETFw== X-Received: by 10.25.202.66 with SMTP id h2mr10210390lfj.131.1480427135217; Tue, 29 Nov 2016 05:45:35 -0800 (PST) Received: from ubuntu.lintech.local ([185.35.119.87]) by smtp.gmail.com with ESMTPSA id y3sm250543lfj.42.2016.11.29.05.45.34 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Nov 2016 05:45:34 -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 v3 10/13] clocksource/drivers/rockchip_timer: implement loading 64bit value into timer Date: Tue, 29 Nov 2016 16:45:15 +0300 Message-Id: <1480427118-5126-11-git-send-email-al.kochet@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1480427118-5126-1-git-send-email-al.kochet@gmail.com> References: <1480343486-25539-1-git-send-email-al.kochet@gmail.com> <1480427118-5126-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_054556_531129_1C76022C X-CRM114-Status: GOOD ( 10.11 ) 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 Signed-off-by: Alexander Kochetkov --- drivers/clocksource/rockchip_timer.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/clocksource/rockchip_timer.c b/drivers/clocksource/rockchip_timer.c index 61c3bb1..c2b0454 100644 --- a/drivers/clocksource/rockchip_timer.c +++ b/drivers/clocksource/rockchip_timer.c @@ -63,11 +63,13 @@ static inline void rk_timer_enable(struct rk_timer *timer, u32 flags) writel_relaxed(TIMER_ENABLE | flags, timer->ctrl); } -static void rk_timer_update_counter(unsigned long cycles, - struct rk_timer *timer) +static void rk_timer_update_counter(u64 cycles, struct rk_timer *timer) { - writel_relaxed(cycles, timer->base + TIMER_LOAD_COUNT0); - writel_relaxed(0, timer->base + TIMER_LOAD_COUNT1); + u32 lower = cycles & 0xFFFFFFFF; + u32 upper = (cycles >> 32) & 0xFFFFFFFF; + + writel_relaxed(lower, timer->base + TIMER_LOAD_COUNT0); + writel_relaxed(upper, timer->base + TIMER_LOAD_COUNT1); } static void rk_timer_interrupt_clear(struct rk_timer *timer)