From patchwork Fri Jul 17 05:11:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 51221 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 39AB422A28 for ; Fri, 17 Jul 2015 05:13:17 +0000 (UTC) Received: by wgwk7 with SMTP id k7sf23445381wgw.0 for ; Thu, 16 Jul 2015 22:13:16 -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: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=h7k3P8JCfzgj71AE9/rZys8Q3MPHmI6YzKBILfnnGuk=; b=CmMqPiQBq/v+WE8yynvLr4APNapr9sDfIoDUcpdDC9thB7TmEgxPQc8MoC2Rk9pGgw DMOHI3DGqQAQs6NxBb8mNhuGC7TCMalgLpRA3llygYvi8AHnyhLFTUv2bBYux72MJAwN +hakfi1guflcBDAz8EJ0UYw4bALPtigJEr1fgswgB25f3Fcjtp5eWP2m6yarM+u7RHoL KVAghPfbAE4HT6QTMTK8SPLpqaSbqlZUDa1uWpDIHf17qbaTBDVtltutvcq1ZXD5vXN9 EKfP/oxYyAdW3cvzwVhrzSN+Dl3Avs3VwIqkudlZrJ3KBH5+jVBjvJYoFNBd1TNcfxLl A6yQ== X-Gm-Message-State: ALoCoQlwivzeWQ4F9PQzOcr/WynuebTIpA8gaf5lvQTRxzvv9CmDwCAK8sfoVgoLDhIJF13kZdkW X-Received: by 10.180.216.12 with SMTP id om12mr3627355wic.1.1437109996583; Thu, 16 Jul 2015 22:13:16 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.44.228 with SMTP id h4ls465279lam.23.gmail; Thu, 16 Jul 2015 22:13:16 -0700 (PDT) X-Received: by 10.112.157.36 with SMTP id wj4mr12688745lbb.115.1437109996322; Thu, 16 Jul 2015 22:13:16 -0700 (PDT) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com. [209.85.215.50]) by mx.google.com with ESMTPS id ld8si8884324lac.58.2015.07.16.22.13.16 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Jul 2015 22:13:16 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) client-ip=209.85.215.50; Received: by lagw2 with SMTP id w2so55019114lag.3 for ; Thu, 16 Jul 2015 22:13:16 -0700 (PDT) X-Received: by 10.112.125.34 with SMTP id mn2mr11636057lbb.76.1437109996204; Thu, 16 Jul 2015 22:13:16 -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.108.230 with SMTP id hn6csp668609lbb; Thu, 16 Jul 2015 22:13:14 -0700 (PDT) X-Received: by 10.66.65.229 with SMTP id a5mr26229638pat.11.1437109988304; Thu, 16 Jul 2015 22:13:08 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id dn2si16701042pdb.54.2015.07.16.22.13.07; Thu, 16 Jul 2015 22:13:08 -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 S1756904AbbGQFMw (ORCPT + 28 others); Fri, 17 Jul 2015 01:12:52 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:36085 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756860AbbGQFMs (ORCPT ); Fri, 17 Jul 2015 01:12:48 -0400 Received: by pachj5 with SMTP id hj5so54641109pac.3 for ; Thu, 16 Jul 2015 22:12:48 -0700 (PDT) X-Received: by 10.70.135.195 with SMTP id pu3mr26193964pdb.0.1437109968502; Thu, 16 Jul 2015 22:12:48 -0700 (PDT) Received: from localhost ([122.171.186.190]) by smtp.gmail.com with ESMTPSA id ho10sm9698549pbc.27.2015.07.16.22.12.47 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 16 Jul 2015 22:12:47 -0700 (PDT) From: Viresh Kumar To: arm@kernel.org, olof@lixom.net Cc: linaro-kernel@lists.linaro.org, arnd.bergmann@linaro.org, linux-arm-kernel@lists.infradead.org, Viresh Kumar , Wan ZongShun , linux-kernel@vger.kernel.org (open list), Russell King Subject: [PATCH 16/18] ARM/w90x900/time: Migrate to new 'set-state' interface Date: Fri, 17 Jul 2015 10:41:10 +0530 Message-Id: <6c724d4388997588f38587213ce1ab7d3925b87c.1437101996.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.4.0 In-Reply-To: References: In-Reply-To: References: 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: viresh.kumar@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.50 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: , Migrate w90x900 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: Wan ZongShun Signed-off-by: Viresh Kumar --- arch/arm/mach-w90x900/time.c | 51 ++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/arch/arm/mach-w90x900/time.c b/arch/arm/mach-w90x900/time.c index 9230d3725599..cd1966ec9143 100644 --- a/arch/arm/mach-w90x900/time.c +++ b/arch/arm/mach-w90x900/time.c @@ -48,31 +48,32 @@ static unsigned int timer0_load; -static void nuc900_clockevent_setmode(enum clock_event_mode mode, - struct clock_event_device *clk) +static int nuc900_clockevent_shutdown(struct clock_event_device *evt) { - unsigned int val; + unsigned int val = __raw_readl(REG_TCSR0) & ~(0x03 << 27); - val = __raw_readl(REG_TCSR0); - val &= ~(0x03 << 27); + __raw_writel(val, REG_TCSR0); + return 0; +} + +static int nuc900_clockevent_set_oneshot(struct clock_event_device *evt) +{ + unsigned int val = __raw_readl(REG_TCSR0) & ~(0x03 << 27); - switch (mode) { - case CLOCK_EVT_MODE_PERIODIC: - __raw_writel(timer0_load, REG_TICR0); - val |= (PERIOD | COUNTEN | INTEN | PRESCALE); - break; + val |= (ONESHOT | COUNTEN | INTEN | PRESCALE); - case CLOCK_EVT_MODE_ONESHOT: - val |= (ONESHOT | COUNTEN | INTEN | PRESCALE); - break; + __raw_writel(val, REG_TCSR0); + return 0; +} - case CLOCK_EVT_MODE_UNUSED: - case CLOCK_EVT_MODE_SHUTDOWN: - case CLOCK_EVT_MODE_RESUME: - break; - } +static int nuc900_clockevent_set_periodic(struct clock_event_device *evt) +{ + unsigned int val = __raw_readl(REG_TCSR0) & ~(0x03 << 27); + __raw_writel(timer0_load, REG_TICR0); + val |= (PERIOD | COUNTEN | INTEN | PRESCALE); __raw_writel(val, REG_TCSR0); + return 0; } static int nuc900_clockevent_setnextevent(unsigned long evt, @@ -90,11 +91,15 @@ static int nuc900_clockevent_setnextevent(unsigned long evt, } static struct clock_event_device nuc900_clockevent_device = { - .name = "nuc900-timer0", - .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, - .set_mode = nuc900_clockevent_setmode, - .set_next_event = nuc900_clockevent_setnextevent, - .rating = 300, + .name = "nuc900-timer0", + .features = CLOCK_EVT_FEAT_PERIODIC | + CLOCK_EVT_FEAT_ONESHOT, + .set_state_shutdown = nuc900_clockevent_shutdown, + .set_state_periodic = nuc900_clockevent_set_periodic, + .set_state_oneshot = nuc900_clockevent_set_oneshot, + .tick_resume = nuc900_clockevent_shutdown, + .set_next_event = nuc900_clockevent_setnextevent, + .rating = 300, }; /*IRQ handler for the timer*/