From patchwork Tue Jan 22 01:12:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 2015051 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 834FADF23A for ; Tue, 22 Jan 2013 01:16:53 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TxSRP-0003mq-Sv; Tue, 22 Jan 2013 01:14:19 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TxSQH-0003V1-S8 for linux-arm-kernel@lists.infradead.org; Tue, 22 Jan 2013 01:13:11 +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:02 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.48]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 17.5E.03918.E97EDF05; Tue, 22 Jan 2013 10:13:02 +0900 (KST) X-AuditID: cbfee61a-b7f7d6d000000f4e-92-50fde79e44a5 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id E6.5E.03918.D97EDF05; Tue, 22 Jan 2013 10:13:02 +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:01 +0900 (KST) From: Kukjin Kim To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 5/6] ARM: S3C24XX: Move mach-s3c2440/ cpufreq driver into mach-s3c24xx/ Date: Mon, 21 Jan 2013 17:12:10 -0800 Message-id: <1358817131-27169-6-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+NgFvrILMWRmVeSWpSXmKPExsVy+t8zA915z/8GGKzuFLXY9PgaqwOjx+Yl 9QGMUVw2Kak5mWWpRfp2CVwZay9sYyz4JVVxufUeWwPjArEuRg4OCQETiWsPTLsYOYFMMYkL 99azdTFycQgJLGOUeHz/PCtEwkSid2U/M0RiOqPEvh8X2SGcDUwSe950MINUsQloSBx+/4wd ZKqIgLfE8muKIGFmATWJG4fegpUIC0RK7L58hAXEZhFQlbh98jY7iM0r4Crx7/BSZohlihLd zyawgdicAm4S2+dPBasXAqq59L4X7DoJgctsEk8m7mOCGCQg8W3yIRaIb2QlNh2AmiMpcXDF DZYJjMILGBlWMYqmFiQXFCel5xrqFSfmFpfmpesl5+duYoQEoNQOxpUNFocYBTgYlXh4LR79 DRBiTSwrrsw9xCjBwawkwjsjCijEm5JYWZValB9fVJqTWnyIMRlo+URmKdHkfGB05JXEGxob m5iZmJqYW5qam5ImrCTOy3jqSYCQQHpiSWp2ampBahHMFiYOTqkGxiOL8m3dPi69qP66ejtz enRn3I0ZM7fOXHLA8tED693+AZsE+p/ZM8Vw8qiuPuH6ti+ds/3vRv9Oi/3uNz9MMFppYPmx 8/O7iE0zfj/4HpjssjP3c3EY67RFPa/WmInx7V3D2LnP5MfaT4Y5avvEKiZ/mBTeH7tAq8Mk XeTj7tf5076cklq/bbMSS3FGoqEWc1FxIgDB5pPNhAIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrIIsWRmVeSWpSXmKPExsVy+t9jQd15z/8GGCxsYLHY9PgaqwOjx+Yl 9QGMUQ2MNhmpiSmpRQqpecn5KZl56bZK3sHxzvGmZgaGuoaWFuZKCnmJuam2Si4+AbpumTlA U5UUyhJzSoFCAYnFxUr6dpgmhIa46VrANEbo+oYEwfUYGaCBhHWMGWsvbGMs+CVVcbn1HlsD 4wKxLkZODgkBE4nelf3MELaYxIV769m6GLk4hASmM0rs+3GRHcLZwCSx500HWBWbgIbE4ffP gBIcHCIC3hLLrymChJkF1CRuHHoLViIsECmx+/IRFhCbRUBV4vbJ2+wgNq+Aq8S/w0uhlilK dD+bwAZicwq4SWyfPxWsXgio5tL7XrYJjLwLGBlWMYqmFiQXFCel5xrqFSfmFpfmpesl5+du YgQH+DOpHYwrGywOMQpwMCrx8Fo8+hsgxJpYVlyZe4hRgoNZSYR3RhRQiDclsbIqtSg/vqg0 J7X4EGMy0FUTmaVEk/OB0ZdXEm9obGJmZGlkZmFkYm5OmrCSOC/jqScBQgLpiSWp2ampBalF MFuYODilGhjtDnkvCHzftZdbPiFbT+Kryl5+R91JS7oDzqn3B0qJP3X6e+nt+1SNs3z3rPTD ykMncGZGp0+dMsuT2ezr7Geus1S7l7YKO2xZzL42x+TpNYOmljuXLphKJhVvWD3HQ0/UJOxV UM333ZzLLz9nYpzsGCY1MXeRc+Pm0/f6Rfctf11zu/8DT7ISS3FGoqEWc1FxIgAyYJG5tAIA AA== 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_201310_194152_EBF27E25 X-CRM114-Status: GOOD ( 11.75 ) 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 Signed-off-by: Kukjin Kim --- arch/arm/mach-s3c2440/Kconfig | 8 -------- arch/arm/mach-s3c2440/Makefile | 2 -- arch/arm/mach-s3c24xx/Kconfig | 8 ++++++++ arch/arm/mach-s3c24xx/Makefile | 1 + .../s3c2440-cpufreq.c => mach-s3c24xx/cpufreq-s3c2440.c} | 4 +--- 5 files changed, 10 insertions(+), 13 deletions(-) rename arch/arm/{mach-s3c2440/s3c2440-cpufreq.c => mach-s3c24xx/cpufreq-s3c2440.c} (99%) diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig index a4d7fd2..ad06fa2 100644 --- a/arch/arm/mach-s3c2440/Kconfig +++ b/arch/arm/mach-s3c2440/Kconfig @@ -2,14 +2,6 @@ # # Licensed under GPLv2 -config S3C2440_CPUFREQ - bool "S3C2440/S3C2442 CPU Frequency scaling support" - depends on CPU_FREQ_S3C24XX && (CPU_S3C2440 || CPU_S3C2442) - default y - select S3C2410_CPUFREQ_UTILS - help - CPU Frequency scaling support for S3C2440 and S3C2442 SoC CPUs. - config S3C2440_XTAL_12000000 bool help diff --git a/arch/arm/mach-s3c2440/Makefile b/arch/arm/mach-s3c2440/Makefile index 0ddd17f..d76e4b9 100644 --- a/arch/arm/mach-s3c2440/Makefile +++ b/arch/arm/mach-s3c2440/Makefile @@ -9,7 +9,5 @@ obj-m := obj-n := obj- := -obj-$(CONFIG_S3C2440_CPUFREQ) += s3c2440-cpufreq.o - obj-$(CONFIG_S3C2440_PLL_12000000) += s3c2440-pll-12000000.o obj-$(CONFIG_S3C2440_PLL_16934400) += s3c2440-pll-16934400.o diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig index f1d3951..edf6549 100644 --- a/arch/arm/mach-s3c24xx/Kconfig +++ b/arch/arm/mach-s3c24xx/Kconfig @@ -387,6 +387,14 @@ endif # CPU_S3C2416 if CPU_S3C2440 +config S3C2440_CPUFREQ + bool "S3C2440/S3C2442 CPU Frequency scaling support" + depends on CPU_FREQ_S3C24XX && (CPU_S3C2440 || CPU_S3C2442) + default y + select S3C2410_CPUFREQ_UTILS + help + CPU Frequency scaling support for S3C2440 and S3C2442 SoC CPUs. + config S3C2440_DMA bool help diff --git a/arch/arm/mach-s3c24xx/Makefile b/arch/arm/mach-s3c24xx/Makefile index 0f042d1..6d4b9ad 100644 --- a/arch/arm/mach-s3c24xx/Makefile +++ b/arch/arm/mach-s3c24xx/Makefile @@ -34,6 +34,7 @@ obj-$(CONFIG_S3C2416_PM) += pm-s3c2416.o obj-$(CONFIG_CPU_S3C2440) += s3c2440.o irq-s3c2440.o clock-s3c2440.o obj-$(CONFIG_CPU_S3C2442) += s3c2442.o obj-$(CONFIG_CPU_S3C244X) += s3c244x.o irq-s3c244x.o clock-s3c244x.o +obj-$(CONFIG_S3C2440_CPUFREQ) += cpufreq-s3c2440.o obj-$(CONFIG_S3C2440_DMA) += dma-s3c2440.o obj-$(CONFIG_CPU_S3C2443) += s3c2443.o irq-s3c2443.o clock-s3c2443.o diff --git a/arch/arm/mach-s3c2440/s3c2440-cpufreq.c b/arch/arm/mach-s3c24xx/cpufreq-s3c2440.c similarity index 99% rename from arch/arm/mach-s3c2440/s3c2440-cpufreq.c rename to arch/arm/mach-s3c24xx/cpufreq-s3c2440.c index 6177676..72b2cc8 100644 --- a/arch/arm/mach-s3c2440/s3c2440-cpufreq.c +++ b/arch/arm/mach-s3c24xx/cpufreq-s3c2440.c @@ -1,5 +1,4 @@ -/* linux/arch/arm/plat-s3c24xx/s3c2440-cpufreq.c - * +/* * Copyright (c) 2006-2009 Simtec Electronics * http://armlinux.simtec.co.uk/ * Ben Dooks @@ -310,5 +309,4 @@ static int s3c2442_cpufreq_init(void) { return subsys_interface_register(&s3c2442_cpufreq_interface); } - subsys_initcall(s3c2442_cpufreq_init);