From patchwork Wed Jan 2 22:24:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 1925521 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 08A823FE37 for ; Wed, 2 Jan 2013 22:41:01 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TqWvR-0007tZ-AH; Wed, 02 Jan 2013 22:36:44 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TqWkS-0000qz-Ix for linux-arm-kernel@lists.infradead.org; Wed, 02 Jan 2013 22:25:22 +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:25:04 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.47]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 24.01.12699.0C3B4E05; Thu, 03 Jan 2013 07:25:04 +0900 (KST) X-AuditID: cbfee61b-b7f616d00000319b-fb-50e4b3c0897b Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id F3.01.12699.FB3B4E05; Thu, 03 Jan 2013 07:25:04 +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:25:03 +0900 (KST) From: Kukjin Kim To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 24/26] ARM: S3C64XX: make regs-srom.h local Date: Wed, 02 Jan 2013 14:24:01 -0800 Message-id: <1357165443-3716-25-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+t8zfd0Dm58EGLStYLPY9PgaqwOjx+Yl 9QGMUVw2Kak5mWWpRfp2CVwZV/ecZC64LVOxavpDxgbGrRJdjJwcEgImEm/2z2GFsMUkLtxb z9bFyMUhJLCMUeLXqreMMEWH/v9hh0hMZ5TYPH8rlLOBSeLu703sIFVsAhoSh98/A7I5OEQE vCWWX1MECTMLqEncOPSWGcQWFrCWaGmcwQJSwiKgKnHmYhZImFfAVeLA3MdQuxQlup9NYAOx OYHifRuvgNlCAi4S88+8BBvDIiAg8W3yIbAxEgKyEpsOMINcIyFwmU1i24TfLBBzJCUOrrjB MoFReAEjwypG0dSC5ILipPRcI73ixNzi0rx0veT83E2MkACU3sG4qsHiEKMAB6MSDy9j/ZMA IdbEsuLK3EOMEhzMSiK813OAQrwpiZVVqUX58UWlOanFhxh9gC6ZyCwlmpwPjI68knhDY2MT MxNTE3NLU3NTHMJK4rzNHikBQgLpiSWp2ampBalFMOOYODilGhjnBncczqhft2LKsk0uATri s4ouu4jIKW/4NisnoOT0xFuTvtgu5bxmsnFi7jzd/+nNLk1CxYs1jAonykiqtZwMZcw8WM31 N8ZBfJ7OF+HbMysjXDoEAxcV/nufunCvnYfl7iSRzwdVbq2W4j0+/er5TyeUe7f7t+01VLBa Nm/pvz8cqnMSXfcqsRRnJBpqMRcVJwIAEVwiM20CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkkeLIzCtJLcpLzFFi42I5/e+xoO6BzU8CDFo2MllsenyN1YHRY/OS +gDGqAZGm4zUxJTUIoXUvOT8lMy8dFsl7+B453hTMwNDXUNLC3MlhbzE3FRbJRefAF23zByg qUoKZYk5pUChgMTiYiV9O0wTQkPcdC1gGiN0fUOC4HqMDNBAwjrGjKt7TjIX3JapWDX9IWMD 41aJLkZODgkBE4lD//+wQ9hiEhfurWfrYuTiEBKYziixef5WdghnA5PE3d+bwKrYBDQkDr9/ BmRzcIgIeEssv6YIEmYWUJO4cegtM4gtLGAt0dI4gwWkhEVAVeLMxSyQMK+Aq8SBuY8ZIXYp SnQ/m8AGYnMCxfs2XgGzhQRcJOafeck8gZF3ASPDKkbR1ILkguKk9FwjveLE3OLSvHS95Pzc TYzg8H4mvYNxVYPFIUYBDkYlHl7G+icBQqyJZcWVuYcYJTiYlUR4r+cAhXhTEiurUovy44tK c1KLDzH6AB01kVlKNDkfGHt5JfGGxiZmRpZGZhZGJubmOISVxHmbPVIChATSE0tSs1NTC1KL YMYxcXBKNTD6biiSmvNwyzYDxchXjLXCry3mvc2N05YMMrLs9d798/OEotT1ra2O4u/7Nxgs inoc4eP1TX9N6U+hi+Z/7zunn2Zpc3ycdGTxUiOW8jVTnzI2rtnGsUJn4jQBscNr9ovIRe9J Xm8rXOTvcO+uQ1+e92qj1jrFzDcm0n16us57H/74G9ko8laJpTgj0VCLuag4EQDn6M1ZnAIA AA== X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130102_172521_594604_273895F5 X-CRM114-Status: GOOD ( 11.24 ) 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 header file can be local in mach-s3c64xx/. Signed-off-by: Kukjin Kim --- arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +- arch/arm/mach-s3c64xx/mach-real6410.c | 2 +- arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +- arch/arm/mach-s3c64xx/{include/mach => }/regs-srom.h | 11 +++++------ 4 files changed, 8 insertions(+), 9 deletions(-) rename arch/arm/mach-s3c64xx/{include/mach => }/regs-srom.h (90%) diff --git a/arch/arm/mach-s3c64xx/mach-mini6410.c b/arch/arm/mach-s3c64xx/mach-mini6410.c index 67881e6d..7cec86c 100644 --- a/arch/arm/mach-s3c64xx/mach-mini6410.c +++ b/arch/arm/mach-s3c64xx/mach-mini6410.c @@ -31,7 +31,6 @@ #include #include -#include #include #include @@ -46,6 +45,7 @@ #include "common.h" #include "regs-modem.h" +#include "regs-srom.h" #define UCON S3C2410_UCON_DEFAULT #define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB) diff --git a/arch/arm/mach-s3c64xx/mach-real6410.c b/arch/arm/mach-s3c64xx/mach-real6410.c index f620b89..215693c 100644 --- a/arch/arm/mach-s3c64xx/mach-real6410.c +++ b/arch/arm/mach-s3c64xx/mach-real6410.c @@ -32,7 +32,6 @@ #include #include -#include #include #include @@ -47,6 +46,7 @@ #include "common.h" #include "regs-modem.h" +#include "regs-srom.h" #define UCON S3C2410_UCON_DEFAULT #define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB) diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c index f49ecae..dcf41bd 100644 --- a/arch/arm/mach-s3c64xx/mach-smdk6410.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c @@ -59,7 +59,6 @@ #include #include #include -#include #include #include #include @@ -75,6 +74,7 @@ #include "common.h" #include "regs-modem.h" +#include "regs-srom.h" #define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB diff --git a/arch/arm/mach-s3c64xx/include/mach/regs-srom.h b/arch/arm/mach-s3c64xx/regs-srom.h similarity index 90% rename from arch/arm/mach-s3c64xx/include/mach/regs-srom.h rename to arch/arm/mach-s3c64xx/regs-srom.h index 756731b..d56f338 100644 --- a/arch/arm/mach-s3c64xx/include/mach/regs-srom.h +++ b/arch/arm/mach-s3c64xx/regs-srom.h @@ -1,5 +1,4 @@ -/* arch/arm/plat-s3c64xx/include/plat/regs-srom.h - * +/* * Copyright 2009 Andy Green * * S3C64XX SROM definitions @@ -9,8 +8,8 @@ * published by the Free Software Foundation. */ -#ifndef __PLAT_REGS_SROM_H -#define __PLAT_REGS_SROM_H __FILE__ +#ifndef __MACH_S3C64XX_REGS_SROM_H +#define __MACH_S3C64XX_REGS_SROM_H __FILE__ #define S3C64XX_SROMREG(x) (S3C_VA_MEM + (x)) @@ -29,7 +28,7 @@ #define S3C64XX_SROM_BW__DATAWIDTH__SHIFT 0 #define S3C64XX_SROM_BW__WAITENABLE__SHIFT 2 #define S3C64XX_SROM_BW__BYTEENABLE__SHIFT 3 -#define S3C64XX_SROM_BW__CS_MASK 0xf +#define S3C64XX_SROM_BW__CS_MASK 0xf #define S3C64XX_SROM_BW__NCS0__SHIFT 0 #define S3C64XX_SROM_BW__NCS1__SHIFT 4 @@ -56,4 +55,4 @@ #define S3C64XX_SROM_BCX__TACS__SHIFT 28 #define S3C64XX_SROM_BCX__TACS__MASK 0xf -#endif /* _PLAT_REGS_SROM_H */ +#endif /* __MACH_S3C64XX_REGS_SROM_H */