From patchwork Fri Apr 12 07:36:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sugaya Taichi X-Patchwork-Id: 162093 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp298402jan; Fri, 12 Apr 2019 00:37:10 -0700 (PDT) X-Google-Smtp-Source: APXvYqwDvBkquD4S+1WcVAzhhOFpT0GrqCMd1orPwzq/d96C1OjI5hfWCGbJDRfkoe9bnuA1MxuF X-Received: by 2002:a62:5fc7:: with SMTP id t190mr7236959pfb.191.1555054630686; Fri, 12 Apr 2019 00:37:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555054630; cv=none; d=google.com; s=arc-20160816; b=b7cKbQ903aM+/9jmrcn1gwVyoKzZM4ytDKwzVqLi6VGZWcbomQ7IVpPFeCGCAWLtaX QWBEqEe3PQZezaAqleksSP+rggQ/p/NcUmR5OzkIMB5MoDuujkkJqnS/V6CdLxjlcJS0 z1H1q2Z3bbwQQSUCkXfoFZ38vAyR4zvK8ry8zuZ4U8al7jKYl4HatlOba3u6Qssygd2D Je2Ci3g2wupdT1O1qHOwV+IL1jL1pDRbOakKn82TkQXkeM9VUO1qiS5ey18SKTNhAdb2 cVddN/ays/Z9u6dHbly0XW3JyBYM4bsZb8JxFMQSrH+tMgVTOP/1BapJ/rgrB2HNqNNL twWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=+NZ2dFSl2yj4PhIVdgXm8ai0m5+Q+yuVR4hKAYsUe/Y=; b=t+bnK/deYaEB45KG3EGq4SqrEAChqY8yq6C6qgEg0Z856r/gnfJRTovEEJ9vjMosAH 5Eub1WmPKV+Gax1wN3FCb84yurmJo4JZs6YcyEE4Lks1k7yhJKHimQk+sidHxC9de1xB avv+IM4xunEBy5iQLSrIR5slyEJh93anZeAkPpjYF46J8+KoeszeVtEgRUZf+9w+mnCh SZ8MsY33YyRO1xx0y2B6ARDPVff+Hn8B3PfiYdco1N05jXHuiWPczyeaESTTewncuYwe vqkIBpIjY0WeNxs8wc50mAatqm0/2ufPwyECFWpSohFJuDi+PkS8E8MBH5rI09V3HfaO r4Cg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g189si32391593pfb.289.2019.04.12.00.37.10; Fri, 12 Apr 2019 00:37:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727178AbfDLHhJ (ORCPT + 31 others); Fri, 12 Apr 2019 03:37:09 -0400 Received: from mx.socionext.com ([202.248.49.38]:45657 "EHLO mx.socionext.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726616AbfDLHhI (ORCPT ); Fri, 12 Apr 2019 03:37:08 -0400 Received: from unknown (HELO kinkan-ex.css.socionext.com) ([172.31.9.52]) by mx.socionext.com with ESMTP; 12 Apr 2019 16:37:07 +0900 Received: from mail.mfilter.local (m-filter-2 [10.213.24.62]) by kinkan-ex.css.socionext.com (Postfix) with ESMTP id 321EA180C0E; Fri, 12 Apr 2019 16:37:07 +0900 (JST) Received: from 172.31.9.51 (172.31.9.51) by m-FILTER with ESMTP; Fri, 12 Apr 2019 16:37:07 +0900 Received: from yuzu.css.socionext.com (yuzu [172.31.8.45]) by kinkan.css.socionext.com (Postfix) with ESMTP id BBC8D1A15B7; Fri, 12 Apr 2019 16:37:06 +0900 (JST) Received: from M20VSDK.e01.socionext.com (unknown [10.213.118.34]) by yuzu.css.socionext.com (Postfix) with ESMTP id A9E94120499; Fri, 12 Apr 2019 16:37:06 +0900 (JST) From: Sugaya Taichi To: Daniel Lezcano , Thomas Gleixner , linux-kernel@vger.kernel.org Cc: Takao Orito , Kazuhiro Kasai , Shinji Kanematsu , Jassi Brar , Masami Hiramatsu , Sugaya Taichi Subject: [PATCH v2 1/3] clocksource/drivers/timer-milbeaut: Fix to enable one-shot timer Date: Fri, 12 Apr 2019 16:36:49 +0900 Message-Id: <1555054611-23566-2-git-send-email-sugaya.taichi@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1555054611-23566-1-git-send-email-sugaya.taichi@socionext.com> References: <1555054611-23566-1-git-send-email-sugaya.taichi@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix mlb_set_oneshot_state() to enable one-shot timer. The function should stop and start a timer, but "start" statement was dropped. Kick the register to start one-shot timer. Fixes: b58f28f306db ("clocksource/drivers/timer-milbeaut: Introduce timer for Milbeaut SoCs") Signed-off-by: Sugaya Taichi --- drivers/clocksource/timer-milbeaut.c | 2 ++ 1 file changed, 2 insertions(+) -- 1.9.1 diff --git a/drivers/clocksource/timer-milbeaut.c b/drivers/clocksource/timer-milbeaut.c index f2019a8..9fd5d08 100644 --- a/drivers/clocksource/timer-milbeaut.c +++ b/drivers/clocksource/timer-milbeaut.c @@ -80,6 +80,8 @@ static int mlb_set_state_oneshot(struct clock_event_device *clk) u32 val = MLB_TMR_TMCSR_CSL_DIV2; writel_relaxed(val, timer_of_base(to) + MLB_TMR_EVT_TMCSR_OFS); + val |= MLB_TMR_TMCSR_CNTE | MLB_TMR_TMCSR_TRG | MLB_TMR_TMCSR_INTE; + writel_relaxed(val, timer_of_base(to) + MLB_TMR_EVT_TMCSR_OFS); return 0; } From patchwork Fri Apr 12 07:36:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sugaya Taichi X-Patchwork-Id: 162094 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp298585jan; Fri, 12 Apr 2019 00:37:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqxXOdLIcMa3dcQW+/+/61OqonlRf9UFinUEgrqJruAUC64zcp15R90RDf4MPF9B03LoVpME X-Received: by 2002:aa7:8609:: with SMTP id p9mr54753557pfn.166.1555054642241; Fri, 12 Apr 2019 00:37:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555054642; cv=none; d=google.com; s=arc-20160816; b=UQsD2iX57wxX3FrgAXXgElZHhXoF/aT7vNCBby7m2IzKmkQcB4dtTynKcTYmANUkG1 UNTJNGUWUx93xjD0Q6uXZt138KCQJTywV9nmw5mWe3g7OZNjiGy7eZx7alGyHjWdhH6q /Ypc9q962ioy3Hw8ROp/t2EZYQFmlKC6TSaI1A3pLfyCwlH6+67gSi0Z+z0wk+v4CmNJ 5OYpcw5N/NFkBuncM7A2COKMnAK7VJL3R7MBJh9zArYVYYeXBhN3YghIDsMoC/es1czn 5+V/DrE6TX0wMsyOpPH1WhIO051A2wFf7k0M8GdJ0BwiK0H4St6E0LbyNU9o2VuSv2hC n1Yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=iiUDipOap5XzNFOSTN9Y2r2/JCc7CSCGLq0y/m8FpkQ=; b=hN7IEOXH9lEuULWZcrYZTOWBwid9za8EK6mUDy0yZ+mB1/5u9R4EEesnkaP5hdRK+L lR8WRuj1pePcCMQtRJKmYnunwpJTcGmCCi6yGICtaMh22gTlBh8+iPFYprkCvH0Hr9Mc 0ZPmcA+kcUYWoGw/TdBaCh595HC4mYbjFF2zlC13wAL/i90pbGKyM5y9FIv8aR5nngTa FnERbV7RIxup+FXO4nxI1dWZcJQ6x8NNsG6OrL8/WTfFSVW9m3vJCPBqJT6Q+8aSgmvd MfACn/pdwwhGT/NGoptLUh4/hkEmI1Vl5muoqyJ1OJLc2deFlFvvPnSDkW7mThOFLnsX dwTA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g189si32391593pfb.289.2019.04.12.00.37.21; Fri, 12 Apr 2019 00:37:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727208AbfDLHhU (ORCPT + 31 others); Fri, 12 Apr 2019 03:37:20 -0400 Received: from mx.socionext.com ([202.248.49.38]:45667 "EHLO mx.socionext.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726217AbfDLHhU (ORCPT ); Fri, 12 Apr 2019 03:37:20 -0400 Received: from unknown (HELO kinkan-ex.css.socionext.com) ([172.31.9.52]) by mx.socionext.com with ESMTP; 12 Apr 2019 16:37:18 +0900 Received: from mail.mfilter.local (m-filter-2 [10.213.24.62]) by kinkan-ex.css.socionext.com (Postfix) with ESMTP id B2336180C0E; Fri, 12 Apr 2019 16:37:18 +0900 (JST) Received: from 172.31.9.53 (172.31.9.53) by m-FILTER with ESMTP; Fri, 12 Apr 2019 16:37:18 +0900 Received: from yuzu.css.socionext.com (yuzu [172.31.8.45]) by iyokan.css.socionext.com (Postfix) with ESMTP id 4F6CA40372; Fri, 12 Apr 2019 16:37:18 +0900 (JST) Received: from M20VSDK.e01.socionext.com (unknown [10.213.118.34]) by yuzu.css.socionext.com (Postfix) with ESMTP id 3C501120499; Fri, 12 Apr 2019 16:37:18 +0900 (JST) From: Sugaya Taichi To: Daniel Lezcano , Thomas Gleixner , linux-kernel@vger.kernel.org Cc: Takao Orito , Kazuhiro Kasai , Shinji Kanematsu , Jassi Brar , Masami Hiramatsu , Sugaya Taichi Subject: [PATCH v2 2/3] clocksource/drivers/timer-milbeaut: Add shutdown function Date: Fri, 12 Apr 2019 16:36:50 +0900 Message-Id: <1555054611-23566-3-git-send-email-sugaya.taichi@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1555054611-23566-1-git-send-email-sugaya.taichi@socionext.com> References: <1555054611-23566-1-git-send-email-sugaya.taichi@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a shutdown operation to support shutdown timer. Signed-off-by: Sugaya Taichi --- drivers/clocksource/timer-milbeaut.c | 10 ++++++++++ 1 file changed, 10 insertions(+) -- 1.9.1 diff --git a/drivers/clocksource/timer-milbeaut.c b/drivers/clocksource/timer-milbeaut.c index 9fd5d08..f478061 100644 --- a/drivers/clocksource/timer-milbeaut.c +++ b/drivers/clocksource/timer-milbeaut.c @@ -85,6 +85,15 @@ static int mlb_set_state_oneshot(struct clock_event_device *clk) return 0; } +static int mlb_set_state_shutdown(struct clock_event_device *clk) +{ + struct timer_of *to = to_timer_of(clk); + u32 val = MLB_TMR_TMCSR_CSL_DIV2; + + writel_relaxed(val, timer_of_base(to) + MLB_TMR_EVT_TMCSR_OFS); + return 0; +} + static int mlb_clkevt_next_event(unsigned long event, struct clock_event_device *clk) { @@ -125,6 +134,7 @@ static int mlb_config_clock_event(struct timer_of *to) .features = CLOCK_EVT_FEAT_DYNIRQ | CLOCK_EVT_FEAT_ONESHOT, .set_state_oneshot = mlb_set_state_oneshot, .set_state_periodic = mlb_set_state_periodic, + .set_state_shutdown = mlb_set_state_shutdown, .set_next_event = mlb_clkevt_next_event, }, From patchwork Fri Apr 12 07:36:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sugaya Taichi X-Patchwork-Id: 162095 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp298630jan; Fri, 12 Apr 2019 00:37:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqw30TZnTqgXGcWxosckhi+W2NtSGWf/pb9OCxBjlYi32vxw4/hfNmEdiRcyrACngctekK9S X-Received: by 2002:a63:700f:: with SMTP id l15mr51450137pgc.3.1555054646121; Fri, 12 Apr 2019 00:37:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555054646; cv=none; d=google.com; s=arc-20160816; b=cFghf0EDW2ZwlOPpBSgXzPpDNrMGbjSyF8s7pO4CuxLR/I7RJ5EiPD6LXXNz21dW3y BHRGvfqvllAuVTq9LnzDhj87+a1QaDcFWsubSy6e3ulylwi16whjmv0kfLeMmZa49TXy v8CbTLoIrCSUEwFoFUQbxeKkc9rjnFg5FN621V7xUmJW+4xKM8Nd0REjd9xNRniGnddF GqACeKmG5w7rOE+Cp5aS+ABc6HCW8Ft0ENNAu3pPywVN9lWbhTCwvt5+56Hcj8hyVPNA Boh0L7Sk1A0Qp/fH5GBTHfzxjoJW1h1/7DfwAeIdgN/zn/NsHPKaQgQigWiRLR8/D2f7 HNJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=2sC/1ZCXf/zVMZi9IZuumDbsh+n7M+Pv088MtlU5ei0=; b=d6UJpuDT4I+CkGeiRZ7LadBscwB9ZstDGwTom8pg+1T7TVagPUkaeQLcUyrD+HZ/vZ z1mUAvgkYaQ2UqW5FNz0YxlLgS8Yt2r8kBhn5f5t5hj8a3wDMB5u39pr7YnPxIRAeRQc 5JM1V2wujoFI8F4RDAF/CggnqHHQ7xOBoqxY53AVVULFRgoKN9B1GIMJUWE7K8oOeUt6 twD9B2Dt3EsFsLzdSSCH0qqD9zyRif93fnE4LVAE8X5MC8ocZPrBI+h8d579wUx9lt76 zJ+ABvUAkPos76S/NGA4rIi3KcWloULCvvKSdJkaMMG4kfsrP8WDAc4XDpvUaO2S03t8 k7ig== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a6si36713317plm.62.2019.04.12.00.37.25; Fri, 12 Apr 2019 00:37:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727232AbfDLHhY (ORCPT + 31 others); Fri, 12 Apr 2019 03:37:24 -0400 Received: from mx.socionext.com ([202.248.49.38]:45670 "EHLO mx.socionext.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727204AbfDLHhV (ORCPT ); Fri, 12 Apr 2019 03:37:21 -0400 Received: from unknown (HELO kinkan-ex.css.socionext.com) ([172.31.9.52]) by mx.socionext.com with ESMTP; 12 Apr 2019 16:37:20 +0900 Received: from mail.mfilter.local (m-filter-1 [10.213.24.61]) by kinkan-ex.css.socionext.com (Postfix) with ESMTP id 3014C180C0E; Fri, 12 Apr 2019 16:37:20 +0900 (JST) Received: from 172.31.9.53 (172.31.9.53) by m-FILTER with ESMTP; Fri, 12 Apr 2019 16:37:20 +0900 Received: from yuzu.css.socionext.com (yuzu [172.31.8.45]) by iyokan.css.socionext.com (Postfix) with ESMTP id BC5A240372; Fri, 12 Apr 2019 16:37:19 +0900 (JST) Received: from M20VSDK.e01.socionext.com (unknown [10.213.118.34]) by yuzu.css.socionext.com (Postfix) with ESMTP id A80ED120499; Fri, 12 Apr 2019 16:37:19 +0900 (JST) From: Sugaya Taichi To: Daniel Lezcano , Thomas Gleixner , linux-kernel@vger.kernel.org Cc: Takao Orito , Kazuhiro Kasai , Shinji Kanematsu , Jassi Brar , Masami Hiramatsu , Sugaya Taichi Subject: [PATCH v2 3/3] clocksource/drivers/timer-milbeaut: Cleanup common register accesses Date: Fri, 12 Apr 2019 16:36:51 +0900 Message-Id: <1555054611-23566-4-git-send-email-sugaya.taichi@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1555054611-23566-1-git-send-email-sugaya.taichi@socionext.com> References: <1555054611-23566-1-git-send-email-sugaya.taichi@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Aggregate common register accesses into shared functions for maintainability. Signed-off-by: Sugaya Taichi --- drivers/clocksource/timer-milbeaut.c | 62 +++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 23 deletions(-) -- 1.9.1 diff --git a/drivers/clocksource/timer-milbeaut.c b/drivers/clocksource/timer-milbeaut.c index f478061..fa9fb4e 100644 --- a/drivers/clocksource/timer-milbeaut.c +++ b/drivers/clocksource/timer-milbeaut.c @@ -26,8 +26,8 @@ #define MLB_TMR_TMCSR_CSL_DIV2 0 #define MLB_TMR_DIV_CNT 2 -#define MLB_TMR_SRC_CH (1) -#define MLB_TMR_EVT_CH (0) +#define MLB_TMR_SRC_CH 1 +#define MLB_TMR_EVT_CH 0 #define MLB_TMR_SRC_CH_OFS (MLB_TMR_REGSZPCH * MLB_TMR_SRC_CH) #define MLB_TMR_EVT_CH_OFS (MLB_TMR_REGSZPCH * MLB_TMR_EVT_CH) @@ -43,6 +43,8 @@ #define MLB_TMR_EVT_TMRLR2_OFS (MLB_TMR_EVT_CH_OFS + MLB_TMR_TMRLR2_OFS) #define MLB_TIMER_RATING 500 +#define MLB_TIMER_ONESHOT 0 +#define MLB_TIMER_PERIODIC 1 static irqreturn_t mlb_timer_interrupt(int irq, void *dev_id) { @@ -59,38 +61,53 @@ static irqreturn_t mlb_timer_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } -static int mlb_set_state_periodic(struct clock_event_device *clk) +static void mlb_evt_timer_start(struct timer_of *to, bool periodic) { - struct timer_of *to = to_timer_of(clk); u32 val = MLB_TMR_TMCSR_CSL_DIV2; + val |= MLB_TMR_TMCSR_CNTE | MLB_TMR_TMCSR_TRG | MLB_TMR_TMCSR_INTE; + if (periodic) + val |= MLB_TMR_TMCSR_RELD; writel_relaxed(val, timer_of_base(to) + MLB_TMR_EVT_TMCSR_OFS); +} + +static void mlb_evt_timer_stop(struct timer_of *to) +{ + u32 val = readl_relaxed(timer_of_base(to) + MLB_TMR_EVT_TMCSR_OFS); - writel_relaxed(to->of_clk.period, timer_of_base(to) + - MLB_TMR_EVT_TMRLR1_OFS); - val |= MLB_TMR_TMCSR_RELD | MLB_TMR_TMCSR_CNTE | - MLB_TMR_TMCSR_TRG | MLB_TMR_TMCSR_INTE; + val &= ~MLB_TMR_TMCSR_CNTE; writel_relaxed(val, timer_of_base(to) + MLB_TMR_EVT_TMCSR_OFS); +} + +static void mlb_evt_timer_register_count(struct timer_of *to, unsigned long cnt) +{ + writel_relaxed(cnt, timer_of_base(to) + MLB_TMR_EVT_TMRLR1_OFS); +} + +static int mlb_set_state_periodic(struct clock_event_device *clk) +{ + struct timer_of *to = to_timer_of(clk); + + mlb_evt_timer_stop(to); + mlb_evt_timer_register_count(to, to->of_clk.period); + mlb_evt_timer_start(to, MLB_TIMER_PERIODIC); return 0; } static int mlb_set_state_oneshot(struct clock_event_device *clk) { struct timer_of *to = to_timer_of(clk); - u32 val = MLB_TMR_TMCSR_CSL_DIV2; - writel_relaxed(val, timer_of_base(to) + MLB_TMR_EVT_TMCSR_OFS); - val |= MLB_TMR_TMCSR_CNTE | MLB_TMR_TMCSR_TRG | MLB_TMR_TMCSR_INTE; - writel_relaxed(val, timer_of_base(to) + MLB_TMR_EVT_TMCSR_OFS); + mlb_evt_timer_stop(to); + mlb_evt_timer_start(to, MLB_TIMER_ONESHOT); return 0; } static int mlb_set_state_shutdown(struct clock_event_device *clk) { struct timer_of *to = to_timer_of(clk); - u32 val = MLB_TMR_TMCSR_CSL_DIV2; - writel_relaxed(val, timer_of_base(to) + MLB_TMR_EVT_TMCSR_OFS); + mlb_evt_timer_stop(to); return 0; } @@ -99,22 +116,21 @@ static int mlb_clkevt_next_event(unsigned long event, { struct timer_of *to = to_timer_of(clk); - writel_relaxed(event, timer_of_base(to) + MLB_TMR_EVT_TMRLR1_OFS); - writel_relaxed(MLB_TMR_TMCSR_CSL_DIV2 | - MLB_TMR_TMCSR_CNTE | MLB_TMR_TMCSR_INTE | - MLB_TMR_TMCSR_TRG, timer_of_base(to) + - MLB_TMR_EVT_TMCSR_OFS); + mlb_evt_timer_stop(to); + mlb_evt_timer_register_count(to, event); + mlb_evt_timer_start(to, MLB_TIMER_ONESHOT); return 0; } static int mlb_config_clock_source(struct timer_of *to) { - writel_relaxed(0, timer_of_base(to) + MLB_TMR_SRC_TMCSR_OFS); - writel_relaxed(~0, timer_of_base(to) + MLB_TMR_SRC_TMR_OFS); + u32 val = MLB_TMR_TMCSR_CSL_DIV2; + + writel_relaxed(val, timer_of_base(to) + MLB_TMR_SRC_TMCSR_OFS); writel_relaxed(~0, timer_of_base(to) + MLB_TMR_SRC_TMRLR1_OFS); writel_relaxed(~0, timer_of_base(to) + MLB_TMR_SRC_TMRLR2_OFS); - writel_relaxed(BIT(4) | BIT(1) | BIT(0), timer_of_base(to) + - MLB_TMR_SRC_TMCSR_OFS); + val |= MLB_TMR_TMCSR_RELD | MLB_TMR_TMCSR_CNTE | MLB_TMR_TMCSR_TRG; + writel_relaxed(val, timer_of_base(to) + MLB_TMR_SRC_TMCSR_OFS); return 0; }