From patchwork Mon Aug 10 09:51:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 52151 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by patches.linaro.org (Postfix) with ESMTPS id 9722A2152A for ; Mon, 10 Aug 2015 09:54:29 +0000 (UTC) Received: by lagz9 with SMTP id z9sf40357988lag.3 for ; Mon, 10 Aug 2015 02:54:28 -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=RioowkLUC6r0OaqDbfP7QR4XrDJcO2wiMvTuqxEn5iE=; b=Fi0eVDoXurbP4xrAglKcnp5ouKV/e7dGSDTl6RPQtS+XWCjtZdcdOvS9+kOKlTIkl3 HFoIt8gVXD9hrw5fDrdExNmxcNDNtnuf6z8Bj1gnHqnT/GtGw7HMUfUNWUYGAsnLOFwg qYjNIlukpT3jC1mqGKwhJFKjnPwQZgsq5wHSYOVbBiKHK41XxWbN18oRQityWyA0P8EJ 5I7yDZ9TtWWmNRCLbJwW3prlh4DyWXTE3Yqr9CHtE6UNKFTW9gjdTKPJsocJwdtFl5Rn d3Y9JEhbr47fNeXpZ2Gga+ggc/kQ2KSyQCzKSPyB2NQnm8PZCM/egTHCNqCOdTv6Yk07 ALFg== X-Gm-Message-State: ALoCoQkd9YkWPmovJb32XwKaXZrGwVgfbzZLsS4HFRgMtXOg85270Jv2dgtAVJQf0EPlccgfgQP9 X-Received: by 10.112.119.166 with SMTP id kv6mr4985833lbb.3.1439200468496; Mon, 10 Aug 2015 02:54:28 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.18.137 with SMTP id w9ls649130lad.102.gmail; Mon, 10 Aug 2015 02:54:28 -0700 (PDT) X-Received: by 10.112.36.165 with SMTP id r5mr19417211lbj.3.1439200468055; Mon, 10 Aug 2015 02:54:28 -0700 (PDT) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id g1si3601846lbd.126.2015.08.10.02.54.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Aug 2015 02:54:28 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by labd1 with SMTP id d1so37065510lab.1 for ; Mon, 10 Aug 2015 02:54:27 -0700 (PDT) X-Received: by 10.152.120.135 with SMTP id lc7mr19097952lab.41.1439200467914; Mon, 10 Aug 2015 02:54:27 -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 l6csp1827633lba; Mon, 10 Aug 2015 02:54:26 -0700 (PDT) X-Received: by 10.70.92.138 with SMTP id cm10mr43195874pdb.63.1439200460219; Mon, 10 Aug 2015 02:54:20 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id yq3si32145746pbb.250.2015.08.10.02.54.19; Mon, 10 Aug 2015 02:54:20 -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 S933209AbbHJJyM (ORCPT + 28 others); Mon, 10 Aug 2015 05:54:12 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:33071 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933084AbbHJJyB (ORCPT ); Mon, 10 Aug 2015 05:54:01 -0400 Received: by wijp15 with SMTP id p15so128566067wij.0 for ; Mon, 10 Aug 2015 02:54:00 -0700 (PDT) X-Received: by 10.180.77.68 with SMTP id q4mr21948447wiw.22.1439200440462; Mon, 10 Aug 2015 02:54:00 -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.53.59 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Aug 2015 02:53:59 -0700 (PDT) From: Daniel Lezcano To: mingo@kernel.org Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org, Viresh Kumar , Linus Walleij Subject: [PATCH 24/74] clockevents/drivers/nomadik-mtu: Migrate to new 'set-state' interface Date: Mon, 10 Aug 2015 11:51:41 +0200 Message-Id: <1439200352-26767-24-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.215.52 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 nomadik-mtu 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: Linus Walleij Signed-off-by: Viresh Kumar Signed-off-by: Daniel Lezcano Acked-by: Linus Walleij --- drivers/clocksource/nomadik-mtu.c | 58 ++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/drivers/clocksource/nomadik-mtu.c b/drivers/clocksource/nomadik-mtu.c index a709cfa..bc8dd44 100644 --- a/drivers/clocksource/nomadik-mtu.c +++ b/drivers/clocksource/nomadik-mtu.c @@ -119,28 +119,27 @@ static void nmdk_clkevt_reset(void) } } -static void nmdk_clkevt_mode(enum clock_event_mode mode, - struct clock_event_device *dev) +static int nmdk_clkevt_shutdown(struct clock_event_device *evt) { - switch (mode) { - case CLOCK_EVT_MODE_PERIODIC: - clkevt_periodic = true; - nmdk_clkevt_reset(); - break; - case CLOCK_EVT_MODE_ONESHOT: - clkevt_periodic = false; - break; - case CLOCK_EVT_MODE_SHUTDOWN: - case CLOCK_EVT_MODE_UNUSED: - writel(0, mtu_base + MTU_IMSC); - /* disable timer */ - writel(0, mtu_base + MTU_CR(1)); - /* load some high default value */ - writel(0xffffffff, mtu_base + MTU_LR(1)); - break; - case CLOCK_EVT_MODE_RESUME: - break; - } + writel(0, mtu_base + MTU_IMSC); + /* disable timer */ + writel(0, mtu_base + MTU_CR(1)); + /* load some high default value */ + writel(0xffffffff, mtu_base + MTU_LR(1)); + return 0; +} + +static int nmdk_clkevt_set_oneshot(struct clock_event_device *evt) +{ + clkevt_periodic = false; + return 0; +} + +static int nmdk_clkevt_set_periodic(struct clock_event_device *evt) +{ + clkevt_periodic = true; + nmdk_clkevt_reset(); + return 0; } static void nmdk_clksrc_reset(void) @@ -163,13 +162,16 @@ static void nmdk_clkevt_resume(struct clock_event_device *cedev) } static struct clock_event_device nmdk_clkevt = { - .name = "mtu_1", - .features = CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_PERIODIC | - CLOCK_EVT_FEAT_DYNIRQ, - .rating = 200, - .set_mode = nmdk_clkevt_mode, - .set_next_event = nmdk_clkevt_next, - .resume = nmdk_clkevt_resume, + .name = "mtu_1", + .features = CLOCK_EVT_FEAT_ONESHOT | + CLOCK_EVT_FEAT_PERIODIC | + CLOCK_EVT_FEAT_DYNIRQ, + .rating = 200, + .set_state_shutdown = nmdk_clkevt_shutdown, + .set_state_periodic = nmdk_clkevt_set_periodic, + .set_state_oneshot = nmdk_clkevt_set_oneshot, + .set_next_event = nmdk_clkevt_next, + .resume = nmdk_clkevt_resume, }; /*