From patchwork Mon Aug 10 09:52:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 52156 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by patches.linaro.org (Postfix) with ESMTPS id B419F2152A for ; Mon, 10 Aug 2015 09:55:16 +0000 (UTC) Received: by lagz9 with SMTP id z9sf40365606lag.3 for ; Mon, 10 Aug 2015 02:55:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=1NnhHfCfBDIWwaUec0fmMYSMT253ctLOrsOvjGi5dnE=; b=Xg9GaMGIDh5vLs3Isl6tAGujEoUwEkfJTLdBi4w9tTbAVXYDyX3bTwSiSqT+sfkkXQ RyZWjdpJNOke8/o4MmJ1Z8wvzi2XL4ms7gcAPeFxN7g0r4dswnlVRtAier9r0CW3rXYs iRtSN1yibt0wDULWuo+PEQgb7HUzyPGrABBXe3jFuMwAmOZ8pVYMGlxmgsDv2NJUxwVL GiTkJvpKJYzsGI8boeLa4yYAFzsEwWo+Xu37QsgiaNLlMB9gK6Mu6rHXb+8PWoVdpLOp FxdtRh90TPlhxAqiKm9egLBSpCicu8YdIBJyUVuvKkreAgqEBobz52b1+AMcyVSCpaL6 pnag== X-Gm-Message-State: ALoCoQnF9ttazZDLan6H4Ew2+MmlvkS6kFUIsffomUfC7jc0uJoIxxpD5W9W4wQ1/5uJsGsksk9q X-Received: by 10.112.173.230 with SMTP id bn6mr6056071lbc.15.1439200515726; Mon, 10 Aug 2015 02:55:15 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.26.1 with SMTP id h1ls647457lag.36.gmail; Mon, 10 Aug 2015 02:55:15 -0700 (PDT) X-Received: by 10.112.55.33 with SMTP id o1mr19090017lbp.96.1439200515407; Mon, 10 Aug 2015 02:55:15 -0700 (PDT) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com. [209.85.217.182]) by mx.google.com with ESMTPS id ba18si13734274lab.100.2015.08.10.02.55.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Aug 2015 02:55:15 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) client-ip=209.85.217.182; Received: by lbbpu9 with SMTP id pu9so64544425lbb.3 for ; Mon, 10 Aug 2015 02:55:15 -0700 (PDT) X-Received: by 10.112.140.68 with SMTP id re4mr19352398lbb.72.1439200515152; Mon, 10 Aug 2015 02:55:15 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.7.198 with SMTP id l6csp1827978lba; Mon, 10 Aug 2015 02:55:14 -0700 (PDT) X-Received: by 10.68.65.77 with SMTP id v13mr42923960pbs.157.1439200509423; Mon, 10 Aug 2015 02:55:09 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id sz3si32368137pac.98.2015.08.10.02.55.08; Mon, 10 Aug 2015 02:55:09 -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; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933354AbbHJJyj (ORCPT + 28 others); Mon, 10 Aug 2015 05:54:39 -0400 Received: from mail-wi0-f173.google.com ([209.85.212.173]:33629 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933316AbbHJJy3 (ORCPT ); Mon, 10 Aug 2015 05:54:29 -0400 Received: by wijp15 with SMTP id p15so128580374wij.0 for ; Mon, 10 Aug 2015 02:54:28 -0700 (PDT) X-Received: by 10.180.90.65 with SMTP id bu1mr23498339wib.0.1439200468555; Mon, 10 Aug 2015 02:54:28 -0700 (PDT) Received: from localhost.localdomain (sju31-1-78-210-255-2.fbx.proxad.net. [78.210.255.2]) by smtp.gmail.com with ESMTPSA id jr5sm28598154wjc.14.2015.08.10.02.54.27 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Aug 2015 02:54:28 -0700 (PDT) From: Daniel Lezcano To: mingo@kernel.org Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org, Viresh Kumar , Maxime Coquelin , linux-arm-kernel@lists.infradead.org (moderated list:ARM/STM32 ARCHITE...) Subject: [PATCH 44/74] clockevents/drivers/stm32: Migrate to new 'set-state' interface Date: Mon, 10 Aug 2015 11:52:01 +0200 Message-Id: <1439200352-26767-44-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1439200352-26767-1-git-send-email-daniel.lezcano@linaro.org> References: <55C87382.4070309@linaro.org> <1439200352-26767-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: daniel.lezcano@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Viresh Kumar Migrate stm32 driver to the new 'set-state' interface provided by clockevents core, the earlier 'set-mode' interface is marked obsolete now. This also enables us to implement callbacks for new states of clockevent devices, for example: ONESHOT_STOPPED. Cc: Maxime Coquelin Signed-off-by: Viresh Kumar Signed-off-by: Daniel Lezcano Tested-by: Maxime Coquelin Acked-by: Maxime Coquelin --- drivers/clocksource/timer-stm32.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/drivers/clocksource/timer-stm32.c b/drivers/clocksource/timer-stm32.c index a97e8b5..f3dcb76 100644 --- a/drivers/clocksource/timer-stm32.c +++ b/drivers/clocksource/timer-stm32.c @@ -40,24 +40,25 @@ struct stm32_clock_event_ddata { void __iomem *base; }; -static void stm32_clock_event_set_mode(enum clock_event_mode mode, - struct clock_event_device *evtdev) +static int stm32_clock_event_shutdown(struct clock_event_device *evtdev) { struct stm32_clock_event_ddata *data = container_of(evtdev, struct stm32_clock_event_ddata, evtdev); void *base = data->base; - switch (mode) { - case CLOCK_EVT_MODE_PERIODIC: - writel_relaxed(data->periodic_top, base + TIM_ARR); - writel_relaxed(TIM_CR1_ARPE | TIM_CR1_CEN, base + TIM_CR1); - break; + writel_relaxed(0, base + TIM_CR1); + return 0; +} - case CLOCK_EVT_MODE_ONESHOT: - default: - writel_relaxed(0, base + TIM_CR1); - break; - } +static int stm32_clock_event_set_periodic(struct clock_event_device *evtdev) +{ + struct stm32_clock_event_ddata *data = + container_of(evtdev, struct stm32_clock_event_ddata, evtdev); + void *base = data->base; + + writel_relaxed(data->periodic_top, base + TIM_ARR); + writel_relaxed(TIM_CR1_ARPE | TIM_CR1_CEN, base + TIM_CR1); + return 0; } static int stm32_clock_event_set_next_event(unsigned long evt, @@ -88,7 +89,10 @@ static struct stm32_clock_event_ddata clock_event_ddata = { .evtdev = { .name = "stm32 clockevent", .features = CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_PERIODIC, - .set_mode = stm32_clock_event_set_mode, + .set_state_shutdown = stm32_clock_event_shutdown, + .set_state_periodic = stm32_clock_event_set_periodic, + .set_state_oneshot = stm32_clock_event_shutdown, + .tick_resume = stm32_clock_event_shutdown, .set_next_event = stm32_clock_event_set_next_event, .rating = 200, },