From patchwork Wed Jan 2 22:23:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 1925461 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 4DC4BDF230 for ; Wed, 2 Jan 2013 22:37:32 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TqWsD-0005VZ-Nb; Wed, 02 Jan 2013 22:33:23 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TqWkJ-0000qz-Gk for linux-arm-kernel@lists.infradead.org; Wed, 02 Jan 2013 22:25:14 +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 <0MG000LLVRKZPW30@mailout3.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 03 Jan 2013 07:24:59 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.47]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id CA.F0.12699.BB3B4E05; Thu, 03 Jan 2013 07:24:59 +0900 (KST) X-AuditID: cbfee61b-b7f616d00000319b-da-50e4b3bbb300 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 8A.F0.12699.BB3B4E05; Thu, 03 Jan 2013 07:24:59 +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 <0MG00028PRKVD920@mmp2.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 03 Jan 2013 07:24:59 +0900 (KST) From: Kukjin Kim To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 20/26] ARM: S3C24XX: remove dsc.c and make regs-dsc.h local Date: Wed, 02 Jan 2013 14:23:57 -0800 Message-id: <1357165443-3716-21-git-send-email-kgene.kim@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-reply-to: <1357165443-3716-1-git-send-email-kgene.kim@samsung.com> References: <1357165443-3716-1-git-send-email-kgene.kim@samsung.com> DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrFLMWRmVeSWpSXmKPExsVy+t8zfd3dm58EGBxcKGOx6fE1VgdGj81L 6gMYo7hsUlJzMstSi/TtErgynlxewFowQ7Vi0asjTA2MH+W6GDk5JARMJBpXNTND2GISF+6t Z+ti5OIQEljGKNH94zcbTNHnr+9ZIRLTGSV23rjPCOFsYJK4fvYxC0gVm4CGxOH3z9i7GDk4 RAS8JZZfUwQJMwuoSdw49BZsgzBQeOn3E4wgNouAqsTivZfA4rwCrhKTXt+DukJRovvZBLDF nEDxvo1XwGwhAReJ+WdeMkP0Ckh8m3yIBWSVhICsxKYDUK2X2SQ+twlB2JISB1fcYJnAKLyA kWEVo2hqQXJBcVJ6rpFecWJucWleul5yfu4mRkgASu9gXNVgcYhRgINRiYeXsf5JgBBrYllx Ze4hRgkOZiUR3us5QCHelMTKqtSi/Pii0pzU4kOMPkCHTGSWEk3OB0ZHXkm8obGxiZmJqYm5 pam5KQ5hJXHeZo+UACGB9MSS1OzU1ILUIphxTBycUg2MKrpcnjNn1b5+tb9h5fPwfet1jefY NSZf6XnoPf9gyPG5Sx809Fkkrr+vbrZ4ndmnYwrb+iK7FDlDIg3mqh/MS79/rYDlS7O7hX3z 8yKhrXskWptaOkyXiTbKLN9xZ2thf+nC48rfT8ws93Scf655P9/luWum/vgqNf3sHGHLOzX2 HgJRD1KXKLEUZyQaajEXFScCADeQd9dtAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupikeLIzCtJLcpLzFFi42I5/e+xoO7uzU8CDG6tk7DY9PgaqwOjx+Yl 9QGMUQ2MNhmpiSmpRQqpecn5KZl56bZK3sHxzvGmZgaGuoaWFuZKCnmJuam2Si4+AbpumTlA U5UUyhJzSoFCAYnFxUr6dpgmhIa46VrANEbo+oYEwfUYGaCBhHWMGU8uL2AtmKFasejVEaYG xo9yXYycHBICJhKfv75nhbDFJC7cW8/WxcjFISQwnVFi5437jBDOBiaJ62cfs4BUsQloSBx+ /4y9i5GDQ0TAW2L5NUWQMLOAmsSNQ2+ZQWxhoPDS7ycYQWwWAVWJxXsvgcV5BVwlJr2+xwyx TFGi+9kENhCbEyjet/EKmC0k4CIx/8xL5gmMvAsYGVYxiqYWJBcUJ6XnGukVJ+YWl+al6yXn 525iBAf4M+kdjKsaLA4xCnAwKvHwMtY/CRBiTSwrrsw9xCjBwawkwns9ByjEm5JYWZValB9f VJqTWnyI0QfoqonMUqLJ+cDoyyuJNzQ2MTOyNDKzMDIxN8chrCTO2+yREiAkkJ5YkpqdmlqQ WgQzjomDU6qB0fIy+5+9+02ubdq64uwsxmvz5tg821/q/Ouj4auv4Up1PLVzmK7lvqk6cEtb oc7lkfbnhH/XVp/hefxAsrXnXKvuS636o+Yf8rXzW79rHRH7tj7TYUUWw7OWXyqxbWtEtRm3 RD2TYp3RcKvK7M8r4clPus6Gbvdl+rFetCknvcQ5uCabU+vGASWW4oxEQy3mouJEAGtGJhOd AgAA X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130102_172511_881377_E5FA4E35 X-CRM114-Status: GOOD ( 17.07 ) 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 The mach-s3c2440/dsc.c is no longer used and the header, regs-dsc.h can be local in mach-s3c24xx/. Signed-off-by: Kukjin Kim --- arch/arm/mach-s3c2440/Makefile | 2 - arch/arm/mach-s3c2440/dsc.c | 54 -------------------- arch/arm/mach-s3c24xx/pm-s3c2412.c | 8 +-- .../arm/mach-s3c24xx/{include/mach => }/regs-dsc.h | 0 arch/arm/mach-s3c24xx/s3c2412.c | 3 +- arch/arm/mach-s3c24xx/s3c244x.c | 3 +- 6 files changed, 8 insertions(+), 62 deletions(-) delete mode 100644 arch/arm/mach-s3c2440/dsc.c rename arch/arm/mach-s3c24xx/{include/mach => }/regs-dsc.h (100%) diff --git a/arch/arm/mach-s3c2440/Makefile b/arch/arm/mach-s3c2440/Makefile index c460924..0ddd17f 100644 --- a/arch/arm/mach-s3c2440/Makefile +++ b/arch/arm/mach-s3c2440/Makefile @@ -9,8 +9,6 @@ obj-m := obj-n := obj- := -obj-$(CONFIG_CPU_S3C2440) += dsc.o - obj-$(CONFIG_S3C2440_CPUFREQ) += s3c2440-cpufreq.o obj-$(CONFIG_S3C2440_PLL_12000000) += s3c2440-pll-12000000.o diff --git a/arch/arm/mach-s3c2440/dsc.c b/arch/arm/mach-s3c2440/dsc.c deleted file mode 100644 index 9ea66e3..0000000 --- a/arch/arm/mach-s3c2440/dsc.c +++ /dev/null @@ -1,54 +0,0 @@ -/* linux/arch/arm/mach-s3c2440/dsc.c - * - * Copyright (c) 2004-2005 Simtec Electronics - * Ben Dooks - * - * Samsung S3C2440 Drive Strength Control support - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ - -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include - -#include -#include - -#include -#include - -int s3c2440_set_dsc(unsigned int pin, unsigned int value) -{ - void __iomem *base; - unsigned long val; - unsigned long flags; - unsigned long mask; - - base = (pin & S3C2440_SELECT_DSC1) ? S3C2440_DSC1 : S3C2440_DSC0; - mask = 3 << S3C2440_DSC_GETSHIFT(pin); - - local_irq_save(flags); - - val = __raw_readl(base); - val &= ~mask; - val |= value & mask; - __raw_writel(val, base); - - local_irq_restore(flags); - return 0; -} - -EXPORT_SYMBOL(s3c2440_set_dsc); diff --git a/arch/arm/mach-s3c24xx/pm-s3c2412.c b/arch/arm/mach-s3c24xx/pm-s3c2412.c index c60f67a..206765c 100644 --- a/arch/arm/mach-s3c24xx/pm-s3c2412.c +++ b/arch/arm/mach-s3c24xx/pm-s3c2412.c @@ -21,19 +21,19 @@ #include #include -#include #include #include -#include +#include #include -#include +#include #include #include - #include +#include "regs-dsc.h" + extern void s3c2412_sleep_enter(void); static int s3c2412_cpu_suspend(unsigned long arg) diff --git a/arch/arm/mach-s3c24xx/include/mach/regs-dsc.h b/arch/arm/mach-s3c24xx/regs-dsc.h similarity index 100% rename from arch/arm/mach-s3c24xx/include/mach/regs-dsc.h rename to arch/arm/mach-s3c24xx/regs-dsc.h diff --git a/arch/arm/mach-s3c24xx/s3c2412.c b/arch/arm/mach-s3c24xx/s3c2412.c index 26ab760..c511a22 100644 --- a/arch/arm/mach-s3c24xx/s3c2412.c +++ b/arch/arm/mach-s3c24xx/s3c2412.c @@ -33,7 +33,6 @@ #include #include -#include #include #include @@ -48,6 +47,8 @@ #include #include +#include "regs-dsc.h" + #define S3C2412_SWRST (S3C24XX_VA_CLKPWR + 0x30) #define S3C2412_SWRST_RESET (0x533C2412) diff --git a/arch/arm/mach-s3c24xx/s3c244x.c b/arch/arm/mach-s3c24xx/s3c244x.c index b0b60a1..ad2671b 100644 --- a/arch/arm/mach-s3c24xx/s3c244x.c +++ b/arch/arm/mach-s3c24xx/s3c244x.c @@ -36,7 +36,6 @@ #include #include #include -#include #include #include @@ -48,6 +47,8 @@ #include #include +#include "regs-dsc.h" + static struct map_desc s3c244x_iodesc[] __initdata = { IODESC_ENT(CLKPWR), IODESC_ENT(TIMER),