From patchwork Wed Jan 2 22:23:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 1925531 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 840C2DF230 for ; Wed, 2 Jan 2013 22:41: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 1TqWwE-0008Qz-N5; Wed, 02 Jan 2013 22:37:31 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TqWkT-0000qy-BG for linux-arm-kernel@lists.infradead.org; Wed, 02 Jan 2013 22:25:23 +0000 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MG000B7VRKLFV10@mailout2.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 03 Jan 2013 07:24:57 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.51]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id E0.60.01231.9B3B4E05; Thu, 03 Jan 2013 07:24:57 +0900 (KST) X-AuditID: cbfee61a-b7fa66d0000004cf-0c-50e4b3b93bdd Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id C0.60.01231.9B3B4E05; Thu, 03 Jan 2013 07:24:57 +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:57 +0900 (KST) From: Kukjin Kim To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 18/26] ARM: S3C2412: cleanup regs-s3c2412.h Date: Wed, 02 Jan 2013 14:23:55 -0800 Message-id: <1357165443-3716-19-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+t8zY92dm58EGFztk7HY9PgaqwOjx+Yl 9QGMUVw2Kak5mWWpRfp2CVwZCz5vYS3oE6vov3SLrYHxrVAXIyeHhICJxM1v3WwQtpjEhXvr gWwuDiGBZYwSCxeuA3I4wIo+bE6HiE9nlDi5aR47hLOBSeLBnr+sIN1sAhoSh98/YwdpEBHw llh+TREkzCygJnHj0FtmEFtYwFriyYM2sHIWAVWJhmN3mUBsXgFXidlnZjFBHKEo0f1sAthB nEDxvo1XwGwhAReJ+WdeMkP0Ckh8m3yIBeI2WYlNB5hBzpEQuM4m8XvCVqg5khIHV9xgmcAo vICRYRWjaGpBckFxUnquoV5xYm5xaV66XnJ+7iZGSABK7WBc2WBxiFGAg1GJh5ex/kmAEGti WXFl7iFGCQ5mJRHe6zlAId6UxMqq1KL8+KLSnNTiQ4w+QJdMZJYSTc4HRkdeSbyhsbGJmYmp ibmlqbkpDmElcd5mj5QAIYH0xJLU7NTUgtQimHFMHJxSDYyhmQoxKyKf2s7hcFk1i3PV67cH /4qulLw8u93Bc+OyDZx7bt0KvLI4osZkfy3Xz6V23xIEF5nGvn3k0W/i58IbuXxe5Eu/xcHv X8fd260jXHSG66fTi0MLdgTsV2FSWtiWYitY/t5j5ZL51tLurdz2Hp4Mu29Y6X/kWXrZcKnn A4lDD2oCi9crsRRnJBpqMRcVJwIA4VdM820CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkkeLIzCtJLcpLzFFi42I5/e+xoO7OzU8CDD4d4bbY9PgaqwOjx+Yl 9QGMUQ2MNhmpiSmpRQqpecn5KZl56bZK3sHxzvGmZgaGuoaWFuZKCnmJuam2Si4+AbpumTlA U5UUyhJzSoFCAYnFxUr6dpgmhIa46VrANEbo+oYEwfUYGaCBhHWMGQs+b2Et6BOr6L90i62B 8a1QFyMHh4SAicSHzeldjJxAppjEhXvr2boYuTiEBKYzSpzcNI8dwtnAJPFgz19WkCo2AQ2J w++fsYM0iwh4Syy/pggSZhZQk7hx6C0ziC0sYC3x5EEbWDmLgKpEw7G7TCA2r4CrxOwzs5gg lilKdD+bwAZicwLF+zZeAbOFBFwk5p95yTyBkXcBI8MqRtHUguSC4qT0XEO94sTc4tK8dL3k /NxNjODwfia1g3Flg8UhRgEORiUeXsb6JwFCrIllxZW5hxglOJiVRHiv5wCFeFMSK6tSi/Lj i0pzUosPMfoAXTWRWUo0OR8Ye3kl8YbGJmZGlkZmFkYm5uY4hJXEeZs9UgKEBNITS1KzU1ML UotgxjFxcEo1MBY4Kkxet0lAVWid47KT9ZXPY7f9qDg6Zac0657vTT71Rje857Z/tHki+qar 0P3c8s2KVx/FtC8+9lTi+5tzvx4rfHk8IdZihs5bJmMG/c15vkrslzbuS2jZrPh5Q/bN4L1L ZVc/qNcyd+h7nP2v9ATfdbsT2ZzM8xOZ2nSv3eGvfaxVk/bmjZcSS3FGoqEWc1FxIgAT+bVU nAIAAA== X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130102_172522_461632_0F5B713C X-CRM114-Status: GOOD ( 14.51 ) 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.25 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 Move the regs-s3c2412.h into mach-s3c24xx/s3c2412.c file. Signed-off-by: Kukjin Kim --- arch/arm/mach-s3c24xx/include/mach/regs-s3c2412.h | 23 ----------------- arch/arm/mach-s3c24xx/s3c2412.c | 28 ++++++++++----------- 2 files changed, 14 insertions(+), 37 deletions(-) delete mode 100644 arch/arm/mach-s3c24xx/include/mach/regs-s3c2412.h diff --git a/arch/arm/mach-s3c24xx/include/mach/regs-s3c2412.h b/arch/arm/mach-s3c24xx/include/mach/regs-s3c2412.h deleted file mode 100644 index aa69dc7..0000000 --- a/arch/arm/mach-s3c24xx/include/mach/regs-s3c2412.h +++ /dev/null @@ -1,23 +0,0 @@ -/* arch/arm/mach-s3c2410/include/mach/regs-s3c2412.h - * - * Copyright 2007 Simtec Electronics - * http://armlinux.simtec.co.uk/ - * Ben Dooks - * - * 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. - * - * S3C2412 specific register definitions -*/ - -#ifndef __ASM_ARCH_REGS_S3C2412_H -#define __ASM_ARCH_REGS_S3C2412_H "s3c2412" - -#define S3C2412_SWRST (S3C24XX_VA_CLKPWR + 0x30) -#define S3C2412_SWRST_RESET (0x533C2412) - -/* see regs-power.h for the other registers in the power block. */ - -#endif /* __ASM_ARCH_REGS_S3C2412_H */ - diff --git a/arch/arm/mach-s3c24xx/s3c2412.c b/arch/arm/mach-s3c24xx/s3c2412.c index 6c5f403..26ab760 100644 --- a/arch/arm/mach-s3c24xx/s3c2412.c +++ b/arch/arm/mach-s3c24xx/s3c2412.c @@ -1,5 +1,4 @@ -/* linux/arch/arm/mach-s3c2412/s3c2412.c - * +/* * Copyright (c) 2006 Simtec Electronics * Ben Dooks * @@ -28,28 +27,29 @@ #include #include -#include #include #include #include -#include - +#include #include -#include -#include -#include #include -#include -#include +#include +#include -#include +#include #include +#include #include -#include -#include -#include #include +#include +#include +#include +#include +#include + +#define S3C2412_SWRST (S3C24XX_VA_CLKPWR + 0x30) +#define S3C2412_SWRST_RESET (0x533C2412) #ifndef CONFIG_CPU_S3C2412_ONLY void __iomem *s3c24xx_va_gpio2 = S3C24XX_VA_GPIO;