From patchwork Fri May 23 10:30:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 30690 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f70.google.com (mail-pa0-f70.google.com [209.85.220.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8CBCE20369 for ; Fri, 23 May 2014 10:32:40 +0000 (UTC) Received: by mail-pa0-f70.google.com with SMTP id lj1sf17158007pab.1 for ; Fri, 23 May 2014 03:32:39 -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=j29KQ0lASMcDHbgMmPzeZg7NxmZhhmvMXMjiauIVKQo=; b=IeIzAw0TmSLouZhmPQgQUBL/3rDakGeSnuSKwRlCuTEU0XIWy3V8peOD1pJrn2vVnM 4SE+9VvaCmY27BR5K/TXmvF89aYm5l9/xPFrR37Csl08AisjJbQwQ7Eg9aak8lAedzb/ my0/O799tlcAjEtOiepWrufa7WbX2eyekG3ogQ9K0Ig4bu/L2nkqxM8P31PPsH3d/U7A /yoaffovtSQ6UIJv3bgKWQ/3gZa+hpoCZpbe/1rcYkumiux2JbGCBHgU4BD/emVON0tP XW2j549+lPTzTtg4sBCFElKTJAL7n0tcqyKAwiOwoXvS+1PC+n9ypCLkOYOYEWc3XZ5j /fmg== X-Gm-Message-State: ALoCoQncKnmqQ62OeLdXymN0GJIA4VJbaIBbTqeZO8TG5nv/mTYfu4UJFt3xxK6ejaxHhc4Wl2ho X-Received: by 10.66.66.109 with SMTP id e13mr1725210pat.1.1400841159899; Fri, 23 May 2014 03:32:39 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.87.141 with SMTP id r13ls1789089qgd.98.gmail; Fri, 23 May 2014 03:32:39 -0700 (PDT) X-Received: by 10.58.30.1 with SMTP id o1mr591365veh.37.1400841159756; Fri, 23 May 2014 03:32:39 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id ni9si1381208veb.58.2014.05.23.03.32.39 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 May 2014 03:32:39 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id ik5so2588655vcb.31 for ; Fri, 23 May 2014 03:32:39 -0700 (PDT) X-Received: by 10.220.59.65 with SMTP id k1mr3424081vch.22.1400841159681; Fri, 23 May 2014 03:32:39 -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.220.221.72 with SMTP id ib8csp19794vcb; Fri, 23 May 2014 03:32:39 -0700 (PDT) X-Received: by 10.66.177.168 with SMTP id cr8mr4609373pac.128.1400841158784; Fri, 23 May 2014 03:32:38 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bg4si3275525pbb.67.2014.05.23.03.32.38 for ; Fri, 23 May 2014 03:32:38 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752661AbaEWKcC (ORCPT + 27 others); Fri, 23 May 2014 06:32:02 -0400 Received: from mail-we0-f179.google.com ([74.125.82.179]:33932 "EHLO mail-we0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752549AbaEWKbz (ORCPT ); Fri, 23 May 2014 06:31:55 -0400 Received: by mail-we0-f179.google.com with SMTP id q59so4566976wes.24 for ; Fri, 23 May 2014 03:31:54 -0700 (PDT) X-Received: by 10.194.222.197 with SMTP id qo5mr1229654wjc.78.1400841114682; Fri, 23 May 2014 03:31:54 -0700 (PDT) Received: from localhost.localdomain (AToulouse-654-1-404-187.w82-125.abo.wanadoo.fr. [82.125.3.187]) by mx.google.com with ESMTPSA id s9sm2200908wix.13.2014.05.23.03.31.53 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 May 2014 03:31:54 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, mingo@kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 15/71] clocksource: sh_cmt: Hardcode CMT clock source rating to 125 Date: Fri, 23 May 2014 12:30:55 +0200 Message-Id: <1400841111-6683-15-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1400841111-6683-1-git-send-email-daniel.lezcano@linaro.org> References: <537F214C.8000700@linaro.org> <1400841111-6683-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.220.172 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: Laurent Pinchart All boards use or should use a clock source rating of 125 for the CMT, hardcode it in the driver. Signed-off-by: Laurent Pinchart --- drivers/clocksource/sh_cmt.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c index 75b1f83..c753efc 100644 --- a/drivers/clocksource/sh_cmt.c +++ b/drivers/clocksource/sh_cmt.c @@ -656,12 +656,12 @@ static void sh_cmt_clocksource_resume(struct clocksource *cs) } static int sh_cmt_register_clocksource(struct sh_cmt_channel *ch, - const char *name, unsigned long rating) + const char *name) { struct clocksource *cs = &ch->cs; cs->name = name; - cs->rating = rating; + cs->rating = 125; cs->read = sh_cmt_clocksource_read; cs->enable = sh_cmt_clocksource_enable; cs->disable = sh_cmt_clocksource_disable; @@ -788,13 +788,13 @@ static void sh_cmt_register_clockevent(struct sh_cmt_channel *ch, } static int sh_cmt_register(struct sh_cmt_channel *ch, const char *name, - bool clockevent, unsigned long clocksource_rating) + bool clockevent, bool clocksource) { if (clockevent) sh_cmt_register_clockevent(ch, name); - if (clocksource_rating) - sh_cmt_register_clocksource(ch, name, clocksource_rating); + if (clocksource) + sh_cmt_register_clocksource(ch, name); return 0; } @@ -827,7 +827,7 @@ static int sh_cmt_setup_channel(struct sh_cmt_channel *ch, unsigned int index, ret = sh_cmt_register(ch, dev_name(&cmt->pdev->dev), cfg->clockevent_rating != 0, - cfg->clocksource_rating); + cfg->clocksource_rating != 0); if (ret) { dev_err(&cmt->pdev->dev, "ch%u: registration failed\n", ch->index);