From patchwork Thu Dec 15 01:24:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhao X-Patchwork-Id: 5733 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id CD28C23E04 for ; Thu, 15 Dec 2011 01:25:05 +0000 (UTC) Received: from mail-ee0-f52.google.com (mail-ee0-f52.google.com [74.125.83.52]) by fiordland.canonical.com (Postfix) with ESMTP id BDA0BA180EC for ; Thu, 15 Dec 2011 01:25:05 +0000 (UTC) Received: by eeke52 with SMTP id e52so1692373eek.11 for ; Wed, 14 Dec 2011 17:25:05 -0800 (PST) Received: by 10.205.120.135 with SMTP id fy7mr244121bkc.54.1323912305525; Wed, 14 Dec 2011 17:25:05 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.205.129.2 with SMTP id hg2cs25764bkc; Wed, 14 Dec 2011 17:25:05 -0800 (PST) Received: by 10.42.19.195 with SMTP id d3mr717079icb.21.1323912302641; Wed, 14 Dec 2011 17:25:02 -0800 (PST) Received: from TX2EHSOBE007.bigfish.com (tx2ehsobe004.messaging.microsoft.com. [65.55.88.14]) by mx.google.com with ESMTPS id o5si2440079icu.102.2011.12.14.17.25.02 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 14 Dec 2011 17:25:02 -0800 (PST) Received-SPF: neutral (google.com: 65.55.88.14 is neither permitted nor denied by best guess record for domain of B20223@freescale.com) client-ip=65.55.88.14; Authentication-Results: mx.google.com; spf=neutral (google.com: 65.55.88.14 is neither permitted nor denied by best guess record for domain of B20223@freescale.com) smtp.mail=B20223@freescale.com Received: from mail114-tx2-R.bigfish.com (10.9.14.252) by TX2EHSOBE007.bigfish.com (10.9.40.27) with Microsoft SMTP Server id 14.1.225.23; Thu, 15 Dec 2011 01:25:02 +0000 Received: from mail114-tx2 (localhost [127.0.0.1]) by mail114-tx2-R.bigfish.com (Postfix) with ESMTP id 8F898100225; Thu, 15 Dec 2011 01:25:05 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275dhz2dh2a8h668h839h61h) X-Spam-TCS-SCL: 0:0 X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI Received: from mail114-tx2 (localhost.localdomain [127.0.0.1]) by mail114-tx2 (MessageSwitch) id 1323912305458005_6505; Thu, 15 Dec 2011 01:25:05 +0000 (UTC) Received: from TX2EHSMHS015.bigfish.com (unknown [10.9.14.242]) by mail114-tx2.bigfish.com (Postfix) with ESMTP id 68A39140019; Thu, 15 Dec 2011 01:25:05 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by TX2EHSMHS015.bigfish.com (10.9.99.115) with Microsoft SMTP Server (TLS) id 14.1.225.23; Thu, 15 Dec 2011 01:25:02 +0000 Received: from az33smr01.freescale.net (10.64.34.199) by 039-SN1MMR1-003.039d.mgd.msft.net (10.84.1.16) with Microsoft SMTP Server id 14.1.355.3; Wed, 14 Dec 2011 19:25:00 -0600 Received: from b20223-02.ap.freescale.net (b20223-02.ap.freescale.net [10.192.242.124]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id pBF1OvgG018541; Wed, 14 Dec 2011 19:24:58 -0600 (CST) From: Richard Zhao To: CC: , Richard Zhao Subject: [RFC V2 1/8] clk: pass parent rate if recalc_rate is NULL Date: Thu, 15 Dec 2011 09:24:48 +0800 Message-ID: <1323912295-21144-1-git-send-email-richard.zhao@freescale.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1323854638-3455-1-git-send-email-richard.zhao@linaro.org> References: <1323854638-3455-1-git-send-email-richard.zhao@linaro.org> MIME-Version: 1.0 X-OriginatorOrg: freescale.com From: Richard Zhao Signed-off-by: Richard Zhao --- drivers/clk/clk.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index a6ddbb1..30ba22e 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -470,6 +470,8 @@ static void __clk_recalc_rates(struct clk *clk, unsigned long msg) if (clk->ops->recalc_rate) clk->rate = clk->ops->recalc_rate(clk); + else if (clk->parent) + clk->rate = clk->parent->rate; /* ignore return value for POST_RATE_CHANGE & ABORT_RATE_CHANGE */ if (clk->notifier_count) @@ -864,6 +866,8 @@ void clk_init(struct device *dev, struct clk *clk) if (clk->ops->recalc_rate) clk->rate = clk->ops->recalc_rate(clk); + else if (clk->parent) + clk->rate = clk->parent->rate; else clk->rate = 0;