From patchwork Tue Jan 22 01:12:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 2015001 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 B45983FD1A for ; Tue, 22 Jan 2013 01:16:08 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TxSQQ-0003Y4-DQ; Tue, 22 Jan 2013 01:13:18 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TxSQB-0003V7-3e for linux-arm-kernel@lists.infradead.org; Tue, 22 Jan 2013 01:13:05 +0000 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MH0000Q6611QXL0@mailout3.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 22 Jan 2013 10:12:58 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.48]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 9F.09.03880.A97EDF05; Tue, 22 Jan 2013 10:12:58 +0900 (KST) X-AuditID: cbfee61b-b7fb06d000000f28-a5-50fde79a0e4d Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 4F.09.03880.A97EDF05; Tue, 22 Jan 2013 10:12:58 +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:58 +0900 (KST) From: Kukjin Kim To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 2/6] ARM: S3C24XX: Move mach-s3c2410/ pll into mach-s3c24xx/ Date: Mon, 21 Jan 2013 17:12:07 -0800 Message-id: <1358817131-27169-3-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+NgFnrPLMWRmVeSWpSXmKPExsVy+t8zA91Zz/8GGExqULDY9PgaqwOjx+Yl 9QGMUVw2Kak5mWWpRfp2CVwZ3y4+Yip4JV3x+d0dxgbGF2JdjJwcEgImEreer2GCsMUkLtxb z9bFyMUhJLCMUeLgwV2MMEVPW1uhEtMZJf4sPsQKkhAS2MAk0XkyE8RmE9CQOPz+GXsXIweH iIC3xPJriiBhZgE1iRuH3jKDhIUFfCSWHEwACbMIqEqcvfmEBSTMK+Aq8WxLLMQmRYnuZxPY QGxOATeJ7fOnskAscpW49L4X7AIJgctsEgcndDNBzBGQ+Db5ENgcCQFZiU0HmCHmSEocXHGD ZQKj8AJGhlWMoqkFyQXFSem5RnrFibnFpXnpesn5uZsYIcEnvYNxVYPFIUYBDkYlHt4H9/8G CLEmlhVX5h5ilOBgVhLhnREFFOJNSaysSi3Kjy8qzUktPsSYDLR8IrOUaHI+MDLySuINjY1N zExMTcwtTc1NSRNWEudlPPUkQEggPbEkNTs1tSC1CGYLEwenVAOj0P7jZYmmgnkZiU222yRn qPnOXTx3ir7xP8Xy75sfPuH/4HrhjomUxo+Vj99Xli1h5OoR3JaQ3l99RDD9zF7riZnCG251 RFxaumzJRtmle6d8vpoudSvz1NqIHu/8E3IfZqaZaGzvn/aP51Xnovelv0+ob75764zJxFWZ J0wk0nxvOqWW2QibKbEUZyQaajEXFScCACCafF2CAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprHIsWRmVeSWpSXmKPExsVy+t9jQd1Zz/8GGHz5wWex6fE1VgdGj81L 6gMYoxoYbTJSE1NSixRS85LzUzLz0m2VvIPjneNNzQwMdQ0tLcyVFPISc1NtlVx8AnTdMnOA pioplCXmlAKFAhKLi5X07TBNCA1x07WAaYzQ9Q0JgusxMkADCesYM75dfMRU8Eq64vO7O4wN jC/Euhg5OSQETCSetrayQdhiEhfurQeyuTiEBKYzSvxZfIgVJCEksIFJovNkJojNJqAhcfj9 M/YuRg4OEQFvieXXFEHCzAJqEjcOvWUGCQsL+EgsOZgAEmYRUJU4e/MJC0iYV8BV4tmWWIhN ihLdzyaAbeUUcJPYPn8qC8QiV4lL73vZJjDyLmBkWMUomlqQXFCclJ5rpFecmFtcmpeul5yf u4kRHNrPpHcwrmqwOMQowMGoxMP74P7fACHWxLLiytxDjBIczEoivDOigEK8KYmVValF+fFF pTmpxYcYk4GOmsgsJZqcD4y7vJJ4Q2MTMyNLIzMLIxNzc9KElcR5GU89CRASSE8sSc1OTS1I LYLZwsTBKdXAmNV94TGH8ffF/KY/7ffM83SfO9HX/dxsucdzi02zzZteXI58qyR6LiB8LteK csn9ia7qQc7LckWfNJzfUVNza6nDJrOtd7fMuvT00+yJGrP3vOTwvWssZhLyZ7mtEp/qPN0n TPlPM/hWCEpO15zW9uRprW5FSXmDGrO/56FrK4RO/Y89cGTzPyWW4oxEQy3mouJEADpmFvqx 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_201303_397013_66D63A9D X-CRM114-Status: GOOD ( 14.48 ) 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.33 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-s3c2410/pll into mach-s3c24xx/ and removes arch/arm/mach-s3c2410/ directory in kernel. Signed-off-by: Kukjin Kim --- arch/arm/mach-s3c2410/Kconfig | 13 ------------- arch/arm/mach-s3c2410/Makefile | 13 ------------- arch/arm/mach-s3c24xx/Kconfig | 7 +++++++ arch/arm/mach-s3c24xx/Makefile | 1 + .../{mach-s3c2410/pll.c => mach-s3c24xx/pll-s3c2410.c} | 5 +---- 5 files changed, 9 insertions(+), 30 deletions(-) delete mode 100644 arch/arm/mach-s3c2410/Kconfig delete mode 100644 arch/arm/mach-s3c2410/Makefile rename arch/arm/{mach-s3c2410/pll.c => mach-s3c24xx/pll-s3c2410.c} (99%) diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig deleted file mode 100644 index 910b8d2..0000000 --- a/arch/arm/mach-s3c2410/Kconfig +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2007 Simtec Electronics -# -# Licensed under GPLv2 - -# cpu frequency scaling support - -config S3C2410_PLLTABLE - bool - depends on S3C2410_CPUFREQ && CPU_FREQ_S3C24XX_PLL - default y - help - Select the PLL table for the S3C2410 - diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile deleted file mode 100644 index 2a160a5..0000000 --- a/arch/arm/mach-s3c2410/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# arch/arm/mach-s3c2410/Makefile -# -# Copyright 2007 Simtec Electronics -# -# Licensed under GPLv2 - -obj-y := -obj-m := -obj-n := -obj- := - -obj-$(CONFIG_S3C2410_PLLTABLE) += pll.o - diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig index 04921b9..5cc740c 100644 --- a/arch/arm/mach-s3c24xx/Kconfig +++ b/arch/arm/mach-s3c24xx/Kconfig @@ -134,6 +134,13 @@ config S3C2410_CPUFREQ help CPU Frequency scaling support for S3C2410 +config S3C2410_PLL + bool + depends on S3C2410_CPUFREQ && CPU_FREQ_S3C24XX_PLL + default y + help + Select the PLL table for the S3C2410 + config S3C24XX_SIMTEC_NOR bool help diff --git a/arch/arm/mach-s3c24xx/Makefile b/arch/arm/mach-s3c24xx/Makefile index 3c9fd51..ecace54 100644 --- a/arch/arm/mach-s3c24xx/Makefile +++ b/arch/arm/mach-s3c24xx/Makefile @@ -19,6 +19,7 @@ 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_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 diff --git a/arch/arm/mach-s3c2410/pll.c b/arch/arm/mach-s3c24xx/pll-s3c2410.c similarity index 99% rename from arch/arm/mach-s3c2410/pll.c rename to arch/arm/mach-s3c24xx/pll-s3c2410.c index e0b3b34..dcf3420 100644 --- a/arch/arm/mach-s3c2410/pll.c +++ b/arch/arm/mach-s3c24xx/pll-s3c2410.c @@ -1,5 +1,4 @@ -/* arch/arm/mach-s3c2410/pll.c - * +/* * Copyright (c) 2006-2007 Simtec Electronics * http://armlinux.simtec.co.uk/ * Ben Dooks @@ -82,7 +81,6 @@ static int __init s3c2410_pll_init(void) return subsys_interface_register(&s3c2410_plls_interface); } - arch_initcall(s3c2410_pll_init); static struct subsys_interface s3c2410a_plls_interface = { @@ -95,5 +93,4 @@ static int __init s3c2410a_pll_init(void) { return subsys_interface_register(&s3c2410a_plls_interface); } - arch_initcall(s3c2410a_pll_init);