From patchwork Wed Jun 10 05:35:22 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Shimoda X-Patchwork-Id: 29186 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n5A5ZRTE023136 for ; Wed, 10 Jun 2009 05:35:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752517AbZFJFfX (ORCPT ); Wed, 10 Jun 2009 01:35:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752769AbZFJFfX (ORCPT ); Wed, 10 Jun 2009 01:35:23 -0400 Received: from mail.renesas.com ([202.234.163.13]:62828 "EHLO mail04.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752517AbZFJFfX (ORCPT ); Wed, 10 Jun 2009 01:35:23 -0400 X-AuditID: ac140387-00000004000005fd-77-4a2f461b474c Received: from guardian03.idc.renesas.com ([172.20.8.202]) by mail04.idc.renesas.com (sendmail) with ESMTP id n5A5ZNcw002285; Wed, 10 Jun 2009 14:35:23 +0900 (JST) Received: (from root@localhost) by guardian03.idc.renesas.com with id n5A5ZNPa019913; Wed, 10 Jun 2009 14:35:23 +0900 (JST) Received: from mta01.idc.renesas.com (localhost [127.0.0.1]) by mta01.idc.renesas.com with ESMTP id n5A5ZMM8029624; Wed, 10 Jun 2009 14:35:22 +0900 (JST) Received: from [172.30.8.157] by ims05.idc.renesas.com (Sendmail) with ESMTPA id <0KL000JGTCUZXA@ims05.idc.renesas.com>; Wed, 10 Jun 2009 14:35:23 +0900 (JST) Date: Wed, 10 Jun 2009 14:35:22 +0900 From: Yoshihiro Shimoda Subject: [PATCH] sh: fix clock for sh7785 To: Paul Mundt Cc: SH-Linux Message-id: <4A2F461A.8080506@renesas.com> MIME-version: 1.0 Content-type: text/plain; charset=ISO-8859-1 Content-transfer-encoding: 7bit User-Agent: Thunderbird 2.0.0.14 (Windows/20080421) X-Brightmail-Tracker: AAAAAA== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org Signed-off-by: Yoshihiro Shimoda --- Could you apply this patch to linux-2.6.30? If impossible, this patch is not necessary because clock-sh7785.c will modify in linux-2.6.31. arch/sh/kernel/cpu/sh4a/clock-sh7785.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff -uprN a/arch/sh/kernel/cpu/sh4a/clock-sh7785.c b/arch/sh/kernel/cpu/sh4a/clock-sh7785.c --- a/arch/sh/kernel/cpu/sh4a/clock-sh7785.c +++ b/arch/sh/kernel/cpu/sh4a/clock-sh7785.c @@ -26,7 +26,9 @@ static int pfc_divisors[] = { 1, 1, 1, 1 static void master_clk_init(struct clk *clk) { - clk->rate *= pfc_divisors[ctrl_inl(FRQMR1) & 0x000f]; + unsigned long frqmr1 = ctrl_inl(FRQMR1); + + clk->rate = CONFIG_SH_PCLK_FREQ * pfc_divisors[frqmr1 & 0x000f]; } static struct clk_ops sh7785_master_clk_ops = {