From patchwork Mon Aug 10 09:52:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 52164 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 480D82152A for ; Mon, 10 Aug 2015 09:56:01 +0000 (UTC) Received: by lagz9 with SMTP id z9sf40371750lag.3 for ; Mon, 10 Aug 2015 02:56:00 -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=PqeaLnbz+KruS5SgIRGKL+r3Sf+iMcOu8K2RNw4GcYk=; b=PeSQRprRw9anmt1cI7/mrF98RBCiN67Ab8vGjNeSgesjR7MDIrOecmvfGiXe6y51Cw cN8IGnUxQZjG0U+WiIARkPR0yPLGO4vd+OG3a1d0zzsw8NQAwVKyBAUs9VyZMqmapSwS 0xrvOrnveVwBK6nMkw3H7yMv5DGkXwzQqmAeaN66Ayk1kUZvgBUxf1Yq5reBVbo5ggy4 ntFVO2xZWTqyVpjsEkGid6iosZEFLTIDP8upQOFV4WD5eC08nk2IX12qYTqFe2wAF58d 9dkhsOE7vpX3pyzzaLEpF9iCG3a757ZAZixr0Jd7rZHVJjrS240kxCUgSRYzrwfDsE2A mAOg== X-Gm-Message-State: ALoCoQnc7DY51xsTIZFwXHJjEz4eqWEidbnap7pSBYWQYydPuMke5Lzu1fnU9nzpLyhj9PwkQSR0 X-Received: by 10.112.161.35 with SMTP id xp3mr3116696lbb.2.1439200560253; Mon, 10 Aug 2015 02:56:00 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.224.129 with SMTP id rc1ls650206lac.25.gmail; Mon, 10 Aug 2015 02:56:00 -0700 (PDT) X-Received: by 10.152.205.66 with SMTP id le2mr19965095lac.0.1439200560077; Mon, 10 Aug 2015 02:56:00 -0700 (PDT) Received: from mail-la0-f48.google.com (mail-la0-f48.google.com. [209.85.215.48]) by mx.google.com with ESMTPS id ls9si13780490lac.7.2015.08.10.02.56.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Aug 2015 02:56:00 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) client-ip=209.85.215.48; Received: by lagz9 with SMTP id z9so50652272lag.3 for ; Mon, 10 Aug 2015 02:56:00 -0700 (PDT) X-Received: by 10.112.166.106 with SMTP id zf10mr19252307lbb.36.1439200559972; Mon, 10 Aug 2015 02:55:59 -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 l6csp1828324lba; Mon, 10 Aug 2015 02:55:58 -0700 (PDT) X-Received: by 10.70.103.203 with SMTP id fy11mr4669363pdb.144.1439200557328; Mon, 10 Aug 2015 02:55:57 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fv2si32287849pdb.209.2015.08.10.02.55.56; Mon, 10 Aug 2015 02:55:57 -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 S933494AbbHJJzT (ORCPT + 28 others); Mon, 10 Aug 2015 05:55:19 -0400 Received: from mail-wi0-f180.google.com ([209.85.212.180]:37987 "EHLO mail-wi0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933477AbbHJJzP (ORCPT ); Mon, 10 Aug 2015 05:55:15 -0400 Received: by wicja10 with SMTP id ja10so17951138wic.1 for ; Mon, 10 Aug 2015 02:55:14 -0700 (PDT) X-Received: by 10.194.81.67 with SMTP id y3mr40932460wjx.7.1439200514224; Mon, 10 Aug 2015 02:55:14 -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.55.12 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Aug 2015 02:55:13 -0700 (PDT) From: Daniel Lezcano To: mingo@kernel.org Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org, Viresh Kumar , Chen Liqin , Lennox Wu , Michael Opdenacker Subject: [PATCH 67/74] score/time: Migrate to new 'set-state' interface Date: Mon, 10 Aug 2015 11:52:24 +0200 Message-Id: <1439200352-26767-67-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.48 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 score 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. We weren't doing anything in ONESHOT/SHUTDOWN/RESUME modes and so callbacks for them aren't implemented. Cc: Chen Liqin Cc: Lennox Wu Cc: Michael Opdenacker Signed-off-by: Viresh Kumar Signed-off-by: Daniel Lezcano --- arch/score/kernel/time.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/arch/score/kernel/time.c b/arch/score/kernel/time.c index 24770cd..679b8d7 100644 --- a/arch/score/kernel/time.c +++ b/arch/score/kernel/time.c @@ -55,31 +55,20 @@ static int score_timer_set_next_event(unsigned long delta, return 0; } -static void score_timer_set_mode(enum clock_event_mode mode, - struct clock_event_device *evdev) +static int score_timer_set_periodic(struct clock_event_device *evt) { - switch (mode) { - case CLOCK_EVT_MODE_PERIODIC: - outl((TMR_M_PERIODIC | TMR_IE_ENABLE), P_TIMER0_CTRL); - outl(SYSTEM_CLOCK/HZ, P_TIMER0_PRELOAD); - outl(inl(P_TIMER0_CTRL) | TMR_ENABLE, P_TIMER0_CTRL); - break; - case CLOCK_EVT_MODE_ONESHOT: - case CLOCK_EVT_MODE_SHUTDOWN: - case CLOCK_EVT_MODE_RESUME: - case CLOCK_EVT_MODE_UNUSED: - break; - default: - BUG(); - } + outl((TMR_M_PERIODIC | TMR_IE_ENABLE), P_TIMER0_CTRL); + outl(SYSTEM_CLOCK / HZ, P_TIMER0_PRELOAD); + outl(inl(P_TIMER0_CTRL) | TMR_ENABLE, P_TIMER0_CTRL); + return 0; } static struct clock_event_device score_clockevent = { - .name = "score_clockevent", - .features = CLOCK_EVT_FEAT_PERIODIC, - .shift = 16, - .set_next_event = score_timer_set_next_event, - .set_mode = score_timer_set_mode, + .name = "score_clockevent", + .features = CLOCK_EVT_FEAT_PERIODIC, + .shift = 16, + .set_next_event = score_timer_set_next_event, + .set_state_periodic = score_timer_set_periodic, }; void __init time_init(void)