From patchwork Fri Aug 12 10:26:26 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhilash Kesavan X-Patchwork-Id: 1060292 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7CATEGU018721 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 12 Aug 2011 10:29:35 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QroyW-0001U0-7S; Fri, 12 Aug 2011 10:28:26 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Qroy3-0007DF-A1; Fri, 12 Aug 2011 10:27:55 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QrowA-0006bE-0c for linux-arm-kernel@lists.infradead.org; Fri, 12 Aug 2011 10:25:59 +0000 Received: from epcpsbgm1.samsung.com (mailout2.samsung.com [203.254.224.25]) by mailout2.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTP id <0LPT00DB48YJOVR0@mailout2.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 12 Aug 2011 19:25:35 +0900 (KST) X-AuditID: cbfee61a-b7cf0ae000006bc6-fb-4e44ff9ffa02 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (MMPCPMTA) with SMTP id 15.45.27590.F9FF44E4; Fri, 12 Aug 2011 19:25:35 +0900 (KST) Received: from localhost.localdomain ([107.108.73.92]) by mmp2.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LPT00ESK8YEI1@mmp2.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 12 Aug 2011 19:25:35 +0900 (KST) Date: Fri, 12 Aug 2011 15:56:26 +0530 From: Abhilash Kesavan Subject: [PATCH 4/5] ARM: S5P64X0: Fix incorrect serial clock name In-reply-to: <1313144787-30666-1-git-send-email-a.kesavan@samsung.com> To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, kgene.kim@samsung.com Message-id: <1313144787-30666-5-git-send-email-a.kesavan@samsung.com> X-Mailer: git-send-email 1.6.6.1 References: <1313144787-30666-1-git-send-email-a.kesavan@samsung.com> X-Brightmail-Tracker: AAAAAA== X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110812_062558_421411_19CACB89 X-CRM114-Status: GOOD ( 15.05 ) X-Spam-Score: -3.1 (---) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-3.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [203.254.224.25 listed in list.dnswl.org] -0.8 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: 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+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Fri, 12 Aug 2011 10:29:35 +0000 (UTC) The S3C6400 serial glue driver(used by S5P64X0) needs the clock name to be pclk or uclk1. Correct the clock name in init.c to pclk and source pclk from pclk_low to get the correct rate. Signed-off-by: Abhilash Kesavan --- arch/arm/mach-s5p64x0/clock-s5p6440.c | 2 +- arch/arm/mach-s5p64x0/clock-s5p6450.c | 2 +- arch/arm/mach-s5p64x0/init.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-s5p64x0/clock-s5p6440.c b/arch/arm/mach-s5p64x0/clock-s5p6440.c index 0e9cd30..4b594a4 100644 --- a/arch/arm/mach-s5p64x0/clock-s5p6440.c +++ b/arch/arm/mach-s5p64x0/clock-s5p6440.c @@ -554,7 +554,7 @@ void __init_or_cpufreq s5p6440_setup_clocks(void) clk_f.rate = fclk; clk_h.rate = hclk; - clk_p.rate = pclk; + clk_p.rate = pclk_low; for (ptr = 0; ptr < ARRAY_SIZE(clksrcs); ptr++) s3c_set_clksrc(&clksrcs[ptr], true); diff --git a/arch/arm/mach-s5p64x0/clock-s5p6450.c b/arch/arm/mach-s5p64x0/clock-s5p6450.c index d9dc16c..eca9a57 100644 --- a/arch/arm/mach-s5p64x0/clock-s5p6450.c +++ b/arch/arm/mach-s5p64x0/clock-s5p6450.c @@ -613,7 +613,7 @@ void __init_or_cpufreq s5p6450_setup_clocks(void) clk_f.rate = fclk; clk_h.rate = hclk; - clk_p.rate = pclk; + clk_p.rate = pclk_low; for (ptr = 0; ptr < ARRAY_SIZE(clksrcs); ptr++) s3c_set_clksrc(&clksrcs[ptr], true); diff --git a/arch/arm/mach-s5p64x0/init.c b/arch/arm/mach-s5p64x0/init.c index 79833ca..ee25e28 100644 --- a/arch/arm/mach-s5p64x0/init.c +++ b/arch/arm/mach-s5p64x0/init.c @@ -25,7 +25,7 @@ static struct s3c24xx_uart_clksrc s5p64x0_serial_clocks[] = { [0] = { - .name = "pclk_low", + .name = "pclk", .divisor = 1, .min_baud = 0, .max_baud = 0,