From patchwork Fri May 29 07:41:26 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 26878 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 n4T7fXwj013399 for ; Fri, 29 May 2009 07:41:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754558AbZE2Hli (ORCPT ); Fri, 29 May 2009 03:41:38 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754759AbZE2Hli (ORCPT ); Fri, 29 May 2009 03:41:38 -0400 Received: from mail.renesas.com ([202.234.163.13]:60288 "EHLO mail03.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754558AbZE2Hlh (ORCPT ); Fri, 29 May 2009 03:41:37 -0400 X-AuditID: ac140386-0000000900001aa8-4c-4a1f91a717e4 Received: from guardian01.idc.renesas.com ([172.20.8.200]) by mail03.idc.renesas.com (sendmail) with ESMTP id n4T7fRpE029496; Fri, 29 May 2009 16:41:27 +0900 (JST) Received: (from root@localhost) by guardian01.idc.renesas.com with id n4T7fSoI006227; Fri, 29 May 2009 16:41:28 +0900 (JST) Received: from mta03.idc.renesas.com (localhost [127.0.0.1]) by mta03.idc.renesas.com with ESMTP id n4T7fTLr027763; Fri, 29 May 2009 16:41:29 +0900 (JST) Received: from PG10870.renesas.com ([172.30.8.159]) by ims05.idc.renesas.com (Sendmail) with ESMTPA id <0KKE00GEKAP3WW@ims05.idc.renesas.com>; Fri, 29 May 2009 16:41:27 +0900 (JST) Date: Fri, 29 May 2009 16:41:26 +0900 From: Kuninori Morimoto Subject: [PATCH] sh: fix CONFIG_SH_PCLK_FREQ bug for sh7724 To: Paul Mundt Cc: SH-Linux Message-id: MIME-version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-type: text/plain; charset=US-ASCII User-Agent: SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL/10.7 Emacs/22.1 (i386-mingw-nt5.1.2600) MULE/5.0 (SAKAKI) Meadow/3.00-dev (KIKU) X-Brightmail-Tracker: AAAAAA== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org CONFIG_SH_PCLK_FREQ=33333333 is correct for sh7724. sh7724 master clock is 33333333, but peripheral is 41666666. This bug came to light because sh-sci driver had changed clk from "module_clk" to "peripheral_clk" Signed-off-by: Kuninori Morimoto --- arch/sh/Kconfig | 3 +-- arch/sh/configs/se7724_defconfig | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index c815975..c506099 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -503,8 +503,7 @@ config SH_PCLK_FREQ CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7705 || \ CPU_SUBTYPE_SH7203 || CPU_SUBTYPE_SH7206 || \ CPU_SUBTYPE_SH7263 || CPU_SUBTYPE_MXG || \ - CPU_SUBTYPE_SH7786 - default "41666666" if CPU_SUBTYPE_SH7724 + CPU_SUBTYPE_SH7786 || CPU_SUBTYPE_SH7724 default "60000000" if CPU_SUBTYPE_SH7751 || CPU_SUBTYPE_SH7751R default "66000000" if CPU_SUBTYPE_SH4_202 default "50000000" diff --git a/arch/sh/configs/se7724_defconfig b/arch/sh/configs/se7724_defconfig index a029d0f..96d2587 100644 --- a/arch/sh/configs/se7724_defconfig +++ b/arch/sh/configs/se7724_defconfig @@ -243,7 +243,7 @@ CONFIG_SH_7724_SOLUTION_ENGINE=y # CONFIG_SH_TIMER_TMU=y # CONFIG_SH_TIMER_CMT is not set -CONFIG_SH_PCLK_FREQ=41666666 +CONFIG_SH_PCLK_FREQ=33333333 # CONFIG_NO_HZ is not set # CONFIG_HIGH_RES_TIMERS is not set CONFIG_GENERIC_CLOCKEVENTS_BUILD=y