From patchwork Tue Jan 22 01:12:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 2015061 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 A981EDF23A for ; Tue, 22 Jan 2013 01:17:45 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TxSRe-0003vk-9D; Tue, 22 Jan 2013 01:14:34 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TxSQJ-0003V1-KL for linux-arm-kernel@lists.infradead.org; Tue, 22 Jan 2013 01:13:13 +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:04 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.48]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id B9.5E.03918.F97EDF05; Tue, 22 Jan 2013 10:13:03 +0900 (KST) X-AuditID: cbfee61a-b7f7d6d000000f4e-a5-50fde79f4002 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 49.5E.03918.F97EDF05; Tue, 22 Jan 2013 10:13:03 +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:03 +0900 (KST) From: Kukjin Kim To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 6/6] ARM: S3C24XX: Move mach-s3c2440/ pll into mach-s3c24xx/ Date: Mon, 21 Jan 2013 17:12:11 -0800 Message-id: <1358817131-27169-7-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+t8zA935z/8GGJzuMLDY9PgaqwOjx+Yl 9QGMUVw2Kak5mWWpRfp2CVwZbfcUCjrNK9oWLmJpYHyg28XIySEhYCKxa/49FghbTOLCvfVs XYxcHEICyxglzm5ezQhT9OfUNlYQW0hgOqPEgmZ9iKINTBL/ni9hBkmwCWhIHH7/jL2LkYND RMBbYvk1RZAws4CaxI1Db5lBwsICPhKNu6VAwiwCqhI7XpxkA7F5BVwlznR9ZYdYpSjR/WwC WJxTwE1i+/ypLBBrXSUuve8Fu01C4DKbxPd5y1khBglIfJt8iAVkvoSArMSmA8wQcyQlDq64 wTKBUXgBI8MqRtHUguSC4qT0XEO94sTc4tK8dL3k/NxNjJDgk9rBuLLB4hCjAAejEg+vxaO/ AUKsiWXFlbmHGCU4mJVEeGdEAYV4UxIrq1KL8uOLSnNSiw8xJgMtn8gsJZqcD4yMvJJ4Q2Nj EzMTUxNzS1NzU9KElcR5GU89CRASSE8sSc1OTS1ILYLZwsTBKdXAuMPcXyPxve/+3Eta85tO iyu8fy7DPO143Lljq68I//b/VKDSrfGAa+XmshWq82fr7d0oG2g7+f/efJc9P1J1Fv2xvVho 1No2Jf3iHo+asj/lq7XkZwi8vMB5W/2NgsarspzH31+x8XF9Ybu9MkFU3utjjnnHBqWdpd2x XFIH1XQjN1Q/4TeSUWIpzkg01GIuKk4EAHfmhMCCAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprHIsWRmVeSWpSXmKPExsVy+t9jQd35z/8GGGy8L2ux6fE1VgdGj81L 6gMYoxoYbTJSE1NSixRS85LzUzLz0m2VvIPjneNNzQwMdQ0tLcyVFPISc1NtlVx8AnTdMnOA pioplCXmlAKFAhKLi5X07TBNCA1x07WAaYzQ9Q0JgusxMkADCesYM9ruKRR0mle0LVzE0sD4 QLeLkZNDQsBE4s+pbawQtpjEhXvr2UBsIYHpjBILmvW7GLmA7A1MEv+eL2EGSbAJaEgcfv+M vYuRg0NEwFti+TVFkDCzgJrEjUNvmUHCwgI+Eo27pUDCLAKqEjtenAQbySvgKnGm6ys7xCpF ie5nE8DinAJuEtvnT2WBWOsqcel9L9sERt4FjAyrGEVTC5ILipPScw31ihNzi0vz0vWS83M3 MYJD+5nUDsaVDRaHGAU4GJV4eC0e/Q0QYk0sK67MPcQowcGsJMI7IwooxJuSWFmVWpQfX1Sa k1p8iDEZ6KqJzFKiyfnAuMsriTc0NjEzsjQyszAyMTcnTVhJnJfx1JMAIYH0xJLU7NTUgtQi mC1MHJxSDYwuVn1HZB6cNlH2vM1jzzdZSm7D/AtPs06mlFqsyY9i6r+vvOa46G+jea8M53J0 RabMkezbddOzW0H5xfY7N2xZNlXtstNymhUXsyhfc2u9gtvzSXN+1ZYqTt024cez343qF60C z0tXTIvKOPdpuaDnF6Xma59EnXffEfizkkPx+j2/zWULPx5TYinOSDTUYi4qTgQAqpZDsLEC AAA= 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_201311_956650_E5E42161 X-CRM114-Status: GOOD ( 16.08 ) 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-s3c2440/pll into mach-s3c24xx/ and removes arch/arm/mach-s3c2440/ directory in kernel. Signed-off-by: Kukjin Kim --- arch/arm/Kconfig | 3 -- arch/arm/Makefile | 2 +- arch/arm/mach-s3c2440/Kconfig | 29 -------------------- arch/arm/mach-s3c2440/Makefile | 13 --------- arch/arm/mach-s3c24xx/Kconfig | 26 ++++++++++++++++++ arch/arm/mach-s3c24xx/Makefile | 2 ++ .../pll-s3c2440-12000000.c} | 5 +--- .../pll-s3c2440-16934400.c} | 5 +--- 8 files changed, 31 insertions(+), 54 deletions(-) delete mode 100644 arch/arm/mach-s3c2440/Kconfig delete mode 100644 arch/arm/mach-s3c2440/Makefile rename arch/arm/{mach-s3c2440/s3c2440-pll-12000000.c => mach-s3c24xx/pll-s3c2440-12000000.c} (98%) rename arch/arm/{mach-s3c2440/s3c2440-pll-16934400.c => mach-s3c24xx/pll-s3c2440-16934400.c} (99%) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5d566bf..f22c510 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1094,9 +1094,6 @@ source "arch/arm/mach-socfpga/Kconfig" source "arch/arm/plat-spear/Kconfig" source "arch/arm/mach-s3c24xx/Kconfig" -if ARCH_S3C24XX -source "arch/arm/mach-s3c2440/Kconfig" -endif if ARCH_S3C64XX source "arch/arm/mach-s3c64xx/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 29e8fae..0935dac 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 s3c2440 +machine-$(CONFIG_ARCH_S3C24XX) += s3c24xx machine-$(CONFIG_ARCH_S3C64XX) += s3c64xx machine-$(CONFIG_ARCH_S5P64X0) += s5p64x0 machine-$(CONFIG_ARCH_S5PC100) += s5pc100 diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig deleted file mode 100644 index ad06fa2..0000000 --- a/arch/arm/mach-s3c2440/Kconfig +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2007 Simtec Electronics -# -# Licensed under GPLv2 - -config S3C2440_XTAL_12000000 - bool - help - Indicate that the build needs to support 12MHz system - crystal. - -config S3C2440_XTAL_16934400 - bool - help - Indicate that the build needs to support 16.9344MHz system - crystal. - -config S3C2440_PLL_12000000 - bool - depends on S3C2440_CPUFREQ && S3C2440_XTAL_12000000 - default y if CPU_FREQ_S3C24XX_PLL - help - PLL tables for S3C2440 or S3C2442 CPUs with 12MHz crystals. - -config S3C2440_PLL_16934400 - bool - depends on S3C2440_CPUFREQ && S3C2440_XTAL_16934400 - default y if CPU_FREQ_S3C24XX_PLL - help - PLL tables for S3C2440 or S3C2442 CPUs with 16.934MHz crystals. diff --git a/arch/arm/mach-s3c2440/Makefile b/arch/arm/mach-s3c2440/Makefile deleted file mode 100644 index d76e4b9..0000000 --- a/arch/arm/mach-s3c2440/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# arch/arm/mach-s3c2440/Makefile -# -# Copyright 2007 Simtec Electronics -# -# Licensed under GPLv2 - -obj-y := -obj-m := -obj-n := -obj- := - -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 edf6549..67df58b 100644 --- a/arch/arm/mach-s3c24xx/Kconfig +++ b/arch/arm/mach-s3c24xx/Kconfig @@ -400,6 +400,32 @@ config S3C2440_DMA help Support for S3C2440 specific DMA code5A +config S3C2440_XTAL_12000000 + bool + help + Indicate that the build needs to support 12MHz system + crystal. + +config S3C2440_XTAL_16934400 + bool + help + Indicate that the build needs to support 16.9344MHz system + crystal. + +config S3C2440_PLL_12000000 + bool + depends on S3C2440_CPUFREQ && S3C2440_XTAL_12000000 + default y if CPU_FREQ_S3C24XX_PLL + help + PLL tables for S3C2440 or S3C2442 CPUs with 12MHz crystals. + +config S3C2440_PLL_16934400 + bool + depends on S3C2440_CPUFREQ && S3C2440_XTAL_16934400 + default y if CPU_FREQ_S3C24XX_PLL + help + PLL tables for S3C2440 or S3C2442 CPUs with 16.934MHz crystals. + comment "S3C2440 Boards" # diff --git a/arch/arm/mach-s3c24xx/Makefile b/arch/arm/mach-s3c24xx/Makefile index 6d4b9ad..08b87cd 100644 --- a/arch/arm/mach-s3c24xx/Makefile +++ b/arch/arm/mach-s3c24xx/Makefile @@ -36,6 +36,8 @@ 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_S3C2440_PLL_12000000) += pll-s3c2440-12000000.o +obj-$(CONFIG_S3C2440_PLL_16934400) += pll-s3c2440-16934400.o obj-$(CONFIG_CPU_S3C2443) += s3c2443.o irq-s3c2443.o clock-s3c2443.o diff --git a/arch/arm/mach-s3c2440/s3c2440-pll-12000000.c b/arch/arm/mach-s3c24xx/pll-s3c2440-12000000.c similarity index 98% rename from arch/arm/mach-s3c2440/s3c2440-pll-12000000.c rename to arch/arm/mach-s3c24xx/pll-s3c2440-12000000.c index 551fb43..6737817 100644 --- a/arch/arm/mach-s3c2440/s3c2440-pll-12000000.c +++ b/arch/arm/mach-s3c24xx/pll-s3c2440-12000000.c @@ -1,5 +1,4 @@ -/* arch/arm/mach-s3c2440/s3c2440-pll-12000000.c - * +/* * Copyright (c) 2006-2007 Simtec Electronics * http://armlinux.simtec.co.uk/ * Ben Dooks @@ -83,7 +82,6 @@ static int __init s3c2440_pll_12mhz(void) return subsys_interface_register(&s3c2440_plls12_interface); } - arch_initcall(s3c2440_pll_12mhz); static struct subsys_interface s3c2442_plls12_interface = { @@ -97,5 +95,4 @@ static int __init s3c2442_pll_12mhz(void) return subsys_interface_register(&s3c2442_plls12_interface); } - arch_initcall(s3c2442_pll_12mhz); diff --git a/arch/arm/mach-s3c2440/s3c2440-pll-16934400.c b/arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c similarity index 99% rename from arch/arm/mach-s3c2440/s3c2440-pll-16934400.c rename to arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c index 3f15bcf..debfa10 100644 --- a/arch/arm/mach-s3c2440/s3c2440-pll-16934400.c +++ b/arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c @@ -1,5 +1,4 @@ -/* arch/arm/mach-s3c2440/s3c2440-pll-16934400.c - * +/* * Copyright (c) 2006-2008 Simtec Electronics * http://armlinux.simtec.co.uk/ * Ben Dooks @@ -111,7 +110,6 @@ static int __init s3c2440_pll_16934400(void) { return subsys_interface_register(&s3c2440_plls169344_interface); } - arch_initcall(s3c2440_pll_16934400); static struct subsys_interface s3c2442_plls169344_interface = { @@ -124,5 +122,4 @@ static int __init s3c2442_pll_16934400(void) { return subsys_interface_register(&s3c2442_plls169344_interface); } - arch_initcall(s3c2442_pll_16934400);