From patchwork Tue Jan 22 01:12:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 2015031 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id C34A23FD1A for ; Tue, 22 Jan 2013 01:16:27 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TxSR5-0003fY-VN; Tue, 22 Jan 2013 01:13:59 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TxSQF-0003V1-S4 for linux-arm-kernel@lists.infradead.org; Tue, 22 Jan 2013 01:13:09 +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:13:01 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.48]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 46.5E.03918.C97EDF05; Tue, 22 Jan 2013 10:13:01 +0900 (KST) X-AuditID: cbfee61a-b7f7d6d000000f4e-8c-50fde79ccdc8 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id E5.5E.03918.C97EDF05; Tue, 22 Jan 2013 10:13:00 +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:13:00 +0900 (KST) From: Kukjin Kim To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 4/6] ARM: S3C24XX: Move mach-s3c2412/ cpufreq driver into mach-s3c24xx/ Date: Mon, 21 Jan 2013 17:12:09 -0800 Message-id: <1358817131-27169-5-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+NgFnrHLMWRmVeSWpSXmKPExsVy+t8zA925z/8GGLz8yGGx6fE1VgdGj81L 6gMYo7hsUlJzMstSi/TtErgyVt4TKfiqUvHkzxHWBsZOuS5GTg4JAROJtd9fsEPYYhIX7q1n 62Lk4hASWMYo0XT8IFCCA6zoxZcikBohgemMEt9P8kDUbGCSmH1lJitIgk1AQ+Lw+2dg9SIC 3hLLrymChJkF1CRuHHrLDGILC0RKnD/wFGwXi4CqRMOqbawg5bwCrhLvl5lDnKAo0f1sAhuI zSngJrF9/lQWiLWuEpfe94KdJiFwnU3i5vapTBBzBCS+TT7EAnGmrMSmA8wQcyQlDq64wTKB UXgBI8MqRtHUguSC4qT0XEO94sTc4tK8dL3k/NxNjJDQk9rBuLLB4hCjAAejEg+vxaO/AUKs iWXFlbmHGCU4mJVEeGdEAYV4UxIrq1KL8uOLSnNSiw8xJgMtn8gsJZqcD4yLvJJ4Q2NjEzMT UxNzS1NzU9KElcR5GU89CRASSE8sSc1OTS1ILYLZwsTBKdXAaMnw9qH7vqadepd/6nPHZucc mC2Wu+8g75zqJaqdjhrHOCL/dDlONZ6ruSdUSKZDspwjQmFqVccaowavK1sDkzwu/FneKyp2 +wYbs9dngyVBidKFNpqdU+YU/sj7v+nhvd+Hrqt+vMfLyWcXPm3RlfWLz3bqapXkvvb4E5io 7rvd6E1R2sXNSizFGYmGWsxFxYkAiYCrhIECAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprLIsWRmVeSWpSXmKPExsVy+t9jQd05z/8GGGx8bWKx6fE1VgdGj81L 6gMYoxoYbTJSE1NSixRS85LzUzLz0m2VvIPjneNNzQwMdQ0tLcyVFPISc1NtlVx8AnTdMnOA pioplCXmlAKFAhKLi5X07TBNCA1x07WAaYzQ9Q0JgusxMkADCesYM1beEyn4qlLx5M8R1gbG TrkuRg4OCQETiRdfiroYOYFMMYkL99azgdhCAtMZJb6f5Oli5AKyNzBJzL4ykxUkwSagIXH4 /TN2kF4RAW+J5dcUQcLMAmoSNw69ZQaxhQUiJc4feMoOYrMIqEo0rNrGClLOK+Aq8X6ZOcQq RYnuZxPAVnEKuElsnz+VBWKtq8Sl971sExh5FzAyrGIUTS1ILihOSs811CtOzC0uzUvXS87P 3cQIDuxnUjsYVzZYHGIU4GBU4uG1ePQ3QIg1say4MvcQowQHs5II74wooBBvSmJlVWpRfnxR aU5q8SHGZKCjJjJLiSbnA6MuryTe0NjEzMjSyMzCyMTcnDRhJXFexlNPAoQE0hNLUrNTUwtS i2C2MHFwSjUw6nlKH3zX/nXugVNrH4j5fzn+1vqmqeuHR3JfXdicDp9dlKaznPdmQHPja9/N k4Pf1jIz7S1fUa65ZNesY9w+B5ek7rFNP/cmbHrSM0nLrU+WZqyeLHlCUZHx8sf0xJn2/pPv fOTJmvdi9z9rdlajFYfYQlmnqE0oFZ0wQX39D5mwOybzfludPKrEUpyRaKjFXFScCABsiwqb sAIAAA== 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_201308_202047_9BEB1297 X-CRM114-Status: GOOD ( 15.98 ) 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 This patch moves mach-s3c2412/cpufreq driver into mach-s3c24xx/ and removes arch/arm/mach-s3c2412/ directory in kernel. Signed-off-by: Kukjin Kim --- arch/arm/Kconfig | 1 - arch/arm/Makefile | 2 +- arch/arm/mach-s3c2412/Kconfig | 13 ------------- arch/arm/mach-s3c2412/Makefile | 12 ------------ arch/arm/mach-s3c24xx/Kconfig | 8 ++++++++ arch/arm/mach-s3c24xx/Makefile | 1 + .../cpu-freq.c => mach-s3c24xx/cpufreq-s3c2412.c} | 6 ++---- 7 files changed, 12 insertions(+), 31 deletions(-) delete mode 100644 arch/arm/mach-s3c2412/Kconfig delete mode 100644 arch/arm/mach-s3c2412/Makefile rename arch/arm/{mach-s3c2412/cpu-freq.c => mach-s3c24xx/cpufreq-s3c2412.c} (99%) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f95ba14..5d566bf 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1095,7 +1095,6 @@ source "arch/arm/plat-spear/Kconfig" source "arch/arm/mach-s3c24xx/Kconfig" if ARCH_S3C24XX -source "arch/arm/mach-s3c2412/Kconfig" source "arch/arm/mach-s3c2440/Kconfig" endif diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 30c443c..29e8fae 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -173,7 +173,7 @@ machine-$(CONFIG_ARCH_PRIMA2) += prima2 machine-$(CONFIG_ARCH_PXA) += pxa machine-$(CONFIG_ARCH_REALVIEW) += realview machine-$(CONFIG_ARCH_RPC) += rpc -machine-$(CONFIG_ARCH_S3C24XX) += s3c24xx s3c2412 s3c2440 +machine-$(CONFIG_ARCH_S3C24XX) += s3c24xx s3c2440 machine-$(CONFIG_ARCH_S3C64XX) += s3c64xx machine-$(CONFIG_ARCH_S5P64X0) += s5p64x0 machine-$(CONFIG_ARCH_S5PC100) += s5pc100 diff --git a/arch/arm/mach-s3c2412/Kconfig b/arch/arm/mach-s3c2412/Kconfig deleted file mode 100644 index 495f692..0000000 --- a/arch/arm/mach-s3c2412/Kconfig +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2007 Simtec Electronics -# -# Licensed under GPLv2 - -# Note, the S3C2412 IOtiming support is in plat-s3c24xx - -config S3C2412_CPUFREQ - bool - depends on CPU_FREQ_S3C24XX && CPU_S3C2412 - default y - select S3C2412_IOTIMING - help - CPU Frequency scaling support for S3C2412 and S3C2413 SoC CPUs. diff --git a/arch/arm/mach-s3c2412/Makefile b/arch/arm/mach-s3c2412/Makefile deleted file mode 100644 index 41a6c27..0000000 --- a/arch/arm/mach-s3c2412/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# arch/arm/mach-s3c2412/Makefile -# -# Copyright 2007 Simtec Electronics -# -# Licensed under GPLv2 - -obj-y := -obj-m := -obj-n := -obj- := - -obj-$(CONFIG_S3C2412_CPUFREQ) += cpu-freq.o diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig index 5cc740c..f1d3951 100644 --- a/arch/arm/mach-s3c24xx/Kconfig +++ b/arch/arm/mach-s3c24xx/Kconfig @@ -280,6 +280,14 @@ config CPU_S3C2412_ONLY !CPU_S3C2443 && CPU_S3C2412 default y +config S3C2412_CPUFREQ + bool + depends on CPU_FREQ_S3C24XX && CPU_S3C2412 + default y + select S3C2412_IOTIMING + help + CPU Frequency scaling support for S3C2412 and S3C2413 SoC CPUs. + config S3C2412_DMA bool help diff --git a/arch/arm/mach-s3c24xx/Makefile b/arch/arm/mach-s3c24xx/Makefile index ecace54..0f042d1 100644 --- a/arch/arm/mach-s3c24xx/Makefile +++ b/arch/arm/mach-s3c24xx/Makefile @@ -23,6 +23,7 @@ obj-$(CONFIG_S3C2410_PLL) += pll-s3c2410.o obj-$(CONFIG_S3C2410_PM) += pm-s3c2410.o sleep-s3c2410.o obj-$(CONFIG_CPU_S3C2412) += s3c2412.o irq-s3c2412.o clock-s3c2412.o +obj-$(CONFIG_S3C2412_CPUFREQ) += cpufreq-s3c2412.o obj-$(CONFIG_S3C2412_DMA) += dma-s3c2412.o obj-$(CONFIG_S3C2412_PM) += pm-s3c2412.o obj-$(CONFIG_S3C2412_PM_SLEEP) += sleep-s3c2412.o diff --git a/arch/arm/mach-s3c2412/cpu-freq.c b/arch/arm/mach-s3c24xx/cpufreq-s3c2412.c similarity index 99% rename from arch/arm/mach-s3c2412/cpu-freq.c rename to arch/arm/mach-s3c24xx/cpufreq-s3c2412.c index 125be7d..c8f05f3 100644 --- a/arch/arm/mach-s3c2412/cpu-freq.c +++ b/arch/arm/mach-s3c24xx/cpufreq-s3c2412.c @@ -1,5 +1,4 @@ -/* linux/arch/arm/mach-s3c2412/cpu-freq.c - * +/* * Copyright 2008 Simtec Electronics * http://armlinux.simtec.co.uk/ * Ben Dooks @@ -111,7 +110,7 @@ static int s3c2412_cpufreq_calcdivs(struct s3c_cpufreq_config *cfg) return 0; - invalid: +invalid: return -EINVAL; } @@ -255,5 +254,4 @@ static int s3c2412_cpufreq_init(void) { return subsys_interface_register(&s3c2412_cpufreq_interface); } - arch_initcall(s3c2412_cpufreq_init);