From patchwork Mon Aug 10 09:52:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 52173 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by patches.linaro.org (Postfix) with ESMTPS id 1FF062152A for ; Mon, 10 Aug 2015 09:57:57 +0000 (UTC) Received: by wijp15 with SMTP id p15sf36992747wij.3 for ; Mon, 10 Aug 2015 02:57:56 -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=r706O85gvpQ25Ejga64AMeNzPd0hvNSrK0EeNwRDUp4=; b=AEm7sTW4NsHcYu99hZqCzKsqSdFOQSsVf9Kmsv169ulxkcVgKXGM0gBigLpBt1ip2C BfGiBNmQumMRUAivOYalFsJ3T3a91ASyrFnjtCimEdOCXbJnQZepsvion871oyVfsdav ZZCPwwsJXQX+ccAZibVXHSHJc5AUHGjmw/tBCXgqO5HkZE5Q2OarCst7bMJwRI1rk0fh wl4rSvAitUtuK9vxJhjNdRSxWq2GkpyI6EFDlwmDQsyPOH75aqW1t5CnETObXc7OX39r owiikCxoNZROckY4Wcx2McFpS1glEh/5Mc9XfqBnIAy0MxDFRlbPgb8MOKzY/aUMauQL wZSA== X-Gm-Message-State: ALoCoQkL8YBJ8Ppbx/LMxxUUjztYic1Ss64017IEwkrbuKtW0242K5WEEb4UuRhVZrwY6ASwpu1F X-Received: by 10.180.75.49 with SMTP id z17mr3444559wiv.7.1439200676474; Mon, 10 Aug 2015 02:57:56 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.21.133 with SMTP id v5ls700929lae.63.gmail; Mon, 10 Aug 2015 02:57:56 -0700 (PDT) X-Received: by 10.152.239.135 with SMTP id vs7mr18858365lac.18.1439200676156; Mon, 10 Aug 2015 02:57:56 -0700 (PDT) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com. [209.85.217.169]) by mx.google.com with ESMTPS id pd4si13774539lbc.40.2015.08.10.02.57.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Aug 2015 02:57:56 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) client-ip=209.85.217.169; Received: by lbbpo9 with SMTP id po9so92195938lbb.2 for ; Mon, 10 Aug 2015 02:57:56 -0700 (PDT) X-Received: by 10.112.168.168 with SMTP id zx8mr6647258lbb.117.1439200676022; Mon, 10 Aug 2015 02:57:56 -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 l6csp1829084lba; Mon, 10 Aug 2015 02:57:55 -0700 (PDT) X-Received: by 10.67.15.67 with SMTP id fm3mr42173606pad.114.1439200671999; Mon, 10 Aug 2015 02:57:51 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gk2si32398021pac.68.2015.08.10.02.57.50; Mon, 10 Aug 2015 02:57:51 -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 S1754965AbbHJJ5a (ORCPT + 28 others); Mon, 10 Aug 2015 05:57:30 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:37149 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754852AbbHJJ5W (ORCPT ); Mon, 10 Aug 2015 05:57:22 -0400 Received: by wibhh20 with SMTP id hh20so143049609wib.0 for ; Mon, 10 Aug 2015 02:57:21 -0700 (PDT) X-Received: by 10.180.82.230 with SMTP id l6mr21832720wiy.61.1439200641735; Mon, 10 Aug 2015 02:57:21 -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.57.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Aug 2015 02:57:20 -0700 (PDT) From: Daniel Lezcano To: mingo@kernel.org Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org, Viresh Kumar , Mikael Starvik , Jesper Nilsson , Rabin Vincent , Guenter Roeck , linux-cris-kernel@axis.com Subject: [PATCH 74/74] cris/time: Migrate to new 'set-state' interface Date: Mon, 10 Aug 2015 11:52:31 +0200 Message-Id: <1439200352-26767-74-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.169 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 cris 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: Mikael Starvik Cc: Jesper Nilsson Cc: Rabin Vincent Cc: Guenter Roeck Cc: linux-cris-kernel@axis.com Signed-off-by: Viresh Kumar Signed-off-by: Daniel Lezcano --- arch/cris/arch-v32/kernel/time.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/cris/arch-v32/kernel/time.c b/arch/cris/arch-v32/kernel/time.c index 4fce9f1..d2a8440 100644 --- a/arch/cris/arch-v32/kernel/time.c +++ b/arch/cris/arch-v32/kernel/time.c @@ -172,8 +172,7 @@ void handle_watchdog_bite(struct pt_regs *regs) extern void cris_profile_sample(struct pt_regs *regs); static void __iomem *timer_base; -static void crisv32_clkevt_mode(enum clock_event_mode mode, - struct clock_event_device *dev) +static int crisv32_clkevt_switch_state(struct clock_event_device *dev) { reg_timer_rw_tmr0_ctrl ctrl = { .op = regk_timer_hold, @@ -181,6 +180,7 @@ static void crisv32_clkevt_mode(enum clock_event_mode mode, }; REG_WR(timer, timer_base, rw_tmr0_ctrl, ctrl); + return 0; } static int crisv32_clkevt_next_event(unsigned long evt, @@ -231,7 +231,9 @@ static struct clock_event_device crisv32_clockevent = { .name = "crisv32-timer", .rating = 300, .features = CLOCK_EVT_FEAT_ONESHOT, - .set_mode = crisv32_clkevt_mode, + .set_state_oneshot = crisv32_clkevt_switch_state, + .set_state_shutdown = crisv32_clkevt_switch_state, + .tick_resume = crisv32_clkevt_switch_state, .set_next_event = crisv32_clkevt_next_event, };