From patchwork Mon Feb 25 16:30:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Pargmann X-Patchwork-Id: 222963 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D1E0B2C02A3 for ; Tue, 26 Feb 2013 03:35:01 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1UA0xm-0006Lg-8D; Mon, 25 Feb 2013 16:31:38 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1UA0x3-00069v-8T for linux-arm-kernel@lists.infradead.org; Mon, 25 Feb 2013 16:30:53 +0000 Received: from dude.hi.pengutronix.de ([2001:6f8:1178:2:21e:67ff:fe11:9c5c]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1UA0wz-0000Ql-Rj; Mon, 25 Feb 2013 17:30:49 +0100 Received: from mpa by dude.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1UA0wz-0006UY-QN; Mon, 25 Feb 2013 17:30:49 +0100 From: Markus Pargmann To: s.hauer@pengutronix.de Subject: [PATCH 3/4] ARM: bugfix i.MX cpufreq clock id Date: Mon, 25 Feb 2013 17:30:18 +0100 Message-Id: <1361809819-24383-4-git-send-email-mpa@pengutronix.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1361809819-24383-1-git-send-email-mpa@pengutronix.de> References: <1361809819-24383-1-git-send-email-mpa@pengutronix.de> X-SA-Exim-Connect-IP: 2001:6f8:1178:2:21e:67ff:fe11:9c5c X-SA-Exim-Mail-From: mpa@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130225_113053_500701_82780F22 X-CRM114-Status: GOOD ( 12.81 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: kernel@pengutronix.de, Markus Pargmann , t.gamez@phytec.de, linux-arm-kernel@lists.infradead.org, c.hemp@phytec.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org The clock id changed some time ago with the new clock framework. The cpufreq driver still uses "cpu_clk" while all devices register their cpu clock devices as "cpu". Signed-off-by: Markus Pargmann --- arch/arm/mach-imx/cpufreq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/cpufreq.c b/arch/arm/mach-imx/cpufreq.c index d8c75c3..9dae54e 100644 --- a/arch/arm/mach-imx/cpufreq.c +++ b/arch/arm/mach-imx/cpufreq.c @@ -111,7 +111,7 @@ static int mxc_cpufreq_init(struct cpufreq_policy *policy) if (!get_cpu_op) return -EINVAL; - cpu_clk = clk_get(NULL, "cpu_clk"); + cpu_clk = clk_get(NULL, "cpu"); if (IS_ERR(cpu_clk)) { printk(KERN_ERR "%s: failed to get cpu clock\n", __func__); return PTR_ERR(cpu_clk);