From patchwork Tue Jan 22 01:12:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 2015011 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 953F8DF23A for ; Tue, 22 Jan 2013 01:16:13 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TxSQa-0003Zm-I3; Tue, 22 Jan 2013 01:13:28 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TxSQD-0003V1-97 for linux-arm-kernel@lists.infradead.org; Tue, 22 Jan 2013 01:13:06 +0000 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MH000L5461GPK90@mailout1.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 22 Jan 2013 10:12:57 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.48]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 92.5E.03918.997EDF05; Tue, 22 Jan 2013 10:12:57 +0900 (KST) X-AuditID: cbfee61a-b7f7d6d000000f4e-72-50fde799cd1e Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 52.5E.03918.997EDF05; Tue, 22 Jan 2013 10:12:57 +0900 (KST) Received: from localhost.localdomain ([105.128.18.183]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MH000NXU61A2ED0@mmp2.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 22 Jan 2013 10:12:57 +0900 (KST) From: Kukjin Kim To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 1/6] ARM: S3C24XX: Move mach-s3c2410/ cpufreq into mach-s3c24xx/ Date: Mon, 21 Jan 2013 17:12:06 -0800 Message-id: <1358817131-27169-2-git-send-email-kgene.kim@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-reply-to: <1358817131-27169-1-git-send-email-kgene.kim@samsung.com> References: <1358817131-27169-1-git-send-email-kgene.kim@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrELMWRmVeSWpSXmKPExsVy+t8zA92Zz/8GGFzrkbXY9PgaqwOjx+Yl 9QGMUVw2Kak5mWWpRfp2CVwZd/tOsxZMkK1Y1LqDuYHxrngXIyeHhICJxPbJRxghbDGJC/fW s3UxcnEICSxjlDix7R8TTNGmv7MYIRLTGSXWX/vKAuFsYJJYsfEtC0gVm4CGxOH3z9i7GDk4 RAS8JZZfUwQJMwuoSdw49JYZxBYWCJB48wqinEVAVWLxu99sIDavgKtEy5NvUMsUJbqfTQCL cwq4SWyfPxWsXgio5tL7XrDrJAQus0nMOriXCWKQgMS3yYdYQPZKCMhKbDrADDFHUuLgihss ExiFFzAyrGIUTS1ILihOSs811CtOzC0uzUvXS87P3cQICUGpHYwrGywOMQpwMCrx8Fo8+hsg xJpYVlyZe4hRgoNZSYR3RhRQiDclsbIqtSg/vqg0J7X4EGMy0PKJzFKiyfnA+MgriTc0NjYx MzE1Mbc0NTclTVhJnJfx1JMAIYH0xJLU7NTUgtQimC1MHJxSDYznL177xlUh2XCxeVHAxweG F6dcLmW3zys/+Nd0hen/ud8L5SyKwjvWPc6L+71iTfuHqUXsWxfdfHr+ukrAHdMWqSfnbYJn HYy3FNt9hfPSvrZIxcMip6at+2/SN70po1vh3ddbR5O8VsQc/ynpo1T8W+Oz2IadLa/DRXfN 0rr6aa3crfmlqZfjlFiKMxINtZiLihMBo45cEIUCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrIIsWRmVeSWpSXmKPExsVy+t9jQd2Zz/8GGJw5xmOx6fE1VgdGj81L 6gMYoxoYbTJSE1NSixRS85LzUzLz0m2VvIPjneNNzQwMdQ0tLcyVFPISc1NtlVx8AnTdMnOA pioplCXmlAKFAhKLi5X07TBNCA1x07WAaYzQ9Q0JgusxMkADCesYM+72nWYtmCBbsah1B3MD 413xLkZODgkBE4lNf2cxQthiEhfurWfrYuTiEBKYziix/tpXFghnA5PEio1vWUCq2AQ0JA6/ f8bexcjBISLgLbH8miJImFlATeLGobfMILawQIDEm1cQ5SwCqhKL3/1mA7F5BVwlWp58Y4JY pijR/WwCWJxTwE1i+/ypYPVCQDWX3veyTWDkXcDIsIpRNLUguaA4KT3XUK84Mbe4NC9dLzk/ dxMjOMCfSe1gXNlgcYhRgINRiYfX4tHfACHWxLLiytxDjBIczEoivDOigEK8KYmVValF+fFF pTmpxYcYk4GumsgsJZqcD4y+vJJ4Q2MTMyNLIzMLIxNzc9KElcR5GU89CRASSE8sSc1OTS1I LYLZwsTBKdXAyKmQKy3R1JDw4JRi5zEFf3HGx0HN5Z8/vdl/n+1octnvqSs2KG7s2HedQ2q3 bMsGjit5W8R8ircUdJgVHjg5Lzt1v1DlxE6Nb3NvtMbfz/SeOfOk+NxZzj8imt431PeeyPwk /LB4384jHxQn+t/y3sX0TcvJsslNZcnnH/dl7qvxBEpcdhHuUWIpzkg01GIuKk4EAIPIKIm0 AgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130121_201305_585441_1651BA26 X-CRM114-Status: GOOD ( 13.67 ) X-Spam-Score: -7.6 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.24 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -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: Kukjin Kim X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 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 Basically, the cpufreq driver for s3c2410 should be implemented into drivers/cpufreq, but we don't need to keep the mach-s3c2410 directory. So this patch moves current cpufreq driver into mach-s3c24xx/. Signed-off-by: Kukjin Kim --- arch/arm/mach-s3c2410/Kconfig | 7 ------- arch/arm/mach-s3c2410/Makefile | 1 - arch/arm/mach-s3c24xx/Kconfig | 7 +++++++ arch/arm/mach-s3c24xx/Makefile | 1 + .../{mach-s3c2410/cpu-freq.c => mach-s3c24xx/cpufreq-s3c2410.c} | 7 ++----- 5 files changed, 10 insertions(+), 13 deletions(-) rename arch/arm/{mach-s3c2410/cpu-freq.c => mach-s3c24xx/cpufreq-s3c2410.c} (98%) diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig index 68d89cb..910b8d2 100644 --- a/arch/arm/mach-s3c2410/Kconfig +++ b/arch/arm/mach-s3c2410/Kconfig @@ -4,13 +4,6 @@ # cpu frequency scaling support -config S3C2410_CPUFREQ - bool - depends on CPU_FREQ_S3C24XX && CPU_S3C2410 - select S3C2410_CPUFREQ_UTILS - help - CPU Frequency scaling support for S3C2410 - config S3C2410_PLLTABLE bool depends on S3C2410_CPUFREQ && CPU_FREQ_S3C24XX_PLL diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile index 6b9a316..2a160a5 100644 --- a/arch/arm/mach-s3c2410/Makefile +++ b/arch/arm/mach-s3c2410/Makefile @@ -9,6 +9,5 @@ obj-m := obj-n := obj- := -obj-$(CONFIG_S3C2410_CPUFREQ) += cpu-freq.o obj-$(CONFIG_S3C2410_PLLTABLE) += pll.o diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig index 25df14a..04921b9 100644 --- a/arch/arm/mach-s3c24xx/Kconfig +++ b/arch/arm/mach-s3c24xx/Kconfig @@ -127,6 +127,13 @@ config S3C2410_PM if CPU_S3C2410 +config S3C2410_CPUFREQ + bool + depends on CPU_FREQ_S3C24XX && CPU_S3C2410 + select S3C2410_CPUFREQ_UTILS + help + CPU Frequency scaling support for S3C2410 + config S3C24XX_SIMTEC_NOR bool help diff --git a/arch/arm/mach-s3c24xx/Makefile b/arch/arm/mach-s3c24xx/Makefile index 0ab6ab1..3c9fd51 100644 --- a/arch/arm/mach-s3c24xx/Makefile +++ b/arch/arm/mach-s3c24xx/Makefile @@ -17,6 +17,7 @@ obj- := obj-y += common.o obj-$(CONFIG_CPU_S3C2410) += s3c2410.o +obj-$(CONFIG_S3C2410_CPUFREQ) += cpufreq-s3c2410.o obj-$(CONFIG_S3C2410_DMA) += dma-s3c2410.o obj-$(CONFIG_S3C2410_PM) += pm-s3c2410.o sleep-s3c2410.o diff --git a/arch/arm/mach-s3c2410/cpu-freq.c b/arch/arm/mach-s3c24xx/cpufreq-s3c2410.c similarity index 98% rename from arch/arm/mach-s3c2410/cpu-freq.c rename to arch/arm/mach-s3c24xx/cpufreq-s3c2410.c index 5404535..cfa0dd8 100644 --- a/arch/arm/mach-s3c2410/cpu-freq.c +++ b/arch/arm/mach-s3c24xx/cpufreq-s3c2410.c @@ -1,5 +1,4 @@ -/* linux/arch/arm/mach-s3c2410/cpu-freq.c - * +/* * Copyright (c) 2006-2008 Simtec Electronics * http://armlinux.simtec.co.uk/ * Ben Dooks @@ -81,7 +80,7 @@ static int s3c2410_cpufreq_calcdivs(struct s3c_cpufreq_config *cfg) cfg->divs.p_divisor = pdiv; cfg->divs.h_divisor = hdiv; - return 0 ; + return 0; } static struct s3c_cpufreq_info s3c2410_cpufreq_info = { @@ -131,7 +130,6 @@ static int __init s3c2410_cpufreq_init(void) { return subsys_interface_register(&s3c2410_cpufreq_interface); } - arch_initcall(s3c2410_cpufreq_init); static int s3c2410a_cpufreq_add(struct device *dev, @@ -159,5 +157,4 @@ static int __init s3c2410a_cpufreq_init(void) { return subsys_interface_register(&s3c2410a_cpufreq_interface); } - arch_initcall(s3c2410a_cpufreq_init);