From patchwork Tue Jan 11 05:11:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 470231 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0B5BNE8028409 for ; Tue, 11 Jan 2011 05:11:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750804Ab1AKFLW (ORCPT ); Tue, 11 Jan 2011 00:11:22 -0500 Received: from relmlor4.renesas.com ([210.160.252.174]:56386 "EHLO relmlor4.renesas.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750765Ab1AKFLW (ORCPT ); Tue, 11 Jan 2011 00:11:22 -0500 Received: from relmlir4.idc.renesas.com ([10.200.68.154]) by relmlor4.idc.renesas.com ( SJSMS) with ESMTP id <0LEU00DNDEEXWD50@relmlor4.idc.renesas.com> for linux-sh@vger.kernel.org; Tue, 11 Jan 2011 14:11:21 +0900 (JST) Received: from relmlac3.idc.renesas.com ([10.200.69.23]) by relmlir4.idc.renesas.com ( SJSMS) with ESMTP id <0LEU0094DEEXEDD0@relmlir4.idc.renesas.com> for linux-sh@vger.kernel.org; Tue, 11 Jan 2011 14:11:21 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id 1012218079; Tue, 11 Jan 2011 14:11:21 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id 0B11618071; Tue, 11 Jan 2011 14:11:21 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac3.idc.renesas.com with ESMTP id QAM04723; Tue, 11 Jan 2011 14:11:21 +0900 Date: Tue, 11 Jan 2011 14:11:20 +0900 X-IronPort-AV: E=Sophos;i="4.60,305,1291561200"; d="scan'208";a="5288100" Received: from unknown (HELO PG10870.renesas.com) ([172.30.8.159]) by relmlii1.idc.renesas.com with ESMTP; Tue, 11 Jan 2011 14:11:20 +0900 From: Kuninori Morimoto Message-id: To: Guennadi Liakhovetski , Paul Mundt Cc: Magnus , Linux-SH In-reply-to: References: Subject: [PATCH] ARM: mach-shmobile: clock-sh7372: fixup pllc2 set_rate User-Agent: SEMI/1.14.6 (Maruoka) FLIM/1.14.7 (=?ISO-2022-JP-2?B?U2Fuag==?= =?ISO-2022-JP-2?B?GyQoRCtXGyhC?=) APEL/10.6 Emacs/23.2 (i386-mingw-nt5.1.2600) MULE/6.0 (HANACHIRUSATO) MIME-version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-type: text/plain; charset=US-ASCII Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 11 Jan 2011 05:11:24 +0000 (UTC) diff --git a/arch/arm/mach-shmobile/clock-sh7372.c b/arch/arm/mach-shmobile/clock-sh7372.c index 9aa8d68..e9731b5 100644 --- a/arch/arm/mach-shmobile/clock-sh7372.c +++ b/arch/arm/mach-shmobile/clock-sh7372.c @@ -234,7 +234,9 @@ static int pllc2_set_rate(struct clk *clk, unsigned long rate) value = __raw_readl(PLLC2CR) & ~(0x3f << 24); - __raw_writel((value & ~0x80000000) | ((idx + 19) << 24), PLLC2CR); + __raw_writel(value | ((idx + 19) << 24), PLLC2CR); + + clk->rate = clk->freq_table[idx].frequency; return 0; }