From patchwork Wed Jan 2 22:23:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 1925421 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 1AEFCDF230 for ; Wed, 2 Jan 2013 22:34:52 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TqWpU-0003mP-54; Wed, 02 Jan 2013 22:30:33 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TqWkD-0000qz-SL for linux-arm-kernel@lists.infradead.org; Wed, 02 Jan 2013 22:25:08 +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:54 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.47]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 47.F0.12699.5B3B4E05; Thu, 03 Jan 2013 07:24:53 +0900 (KST) X-AuditID: cbfee61b-b7f616d00000319b-bc-50e4b3b5b8f3 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 27.F0.12699.5B3B4E05; Thu, 03 Jan 2013 07:24:53 +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:53 +0900 (KST) From: Kukjin Kim To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 15/26] ARM: S3C24XX: make otom-map.h local Date: Wed, 02 Jan 2013 14:23:52 -0800 Message-id: <1357165443-3716-16-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+t8zfd2tm58EGEw6Z2Ox6fE1VgdGj81L 6gMYo7hsUlJzMstSi/TtErgy1uxfy1bwSKqiZ8t61gbGHrEuRk4OCQETibutE1ghbDGJC/fW s3UxcnEICSxjlFiy4ziQwwFWtLG1ACI+nVHi/NbtjBDOBiaJ/d2djCDdbAIaEoffP2MHaRAR 8JZYfk0RJMwsoCZx49BbZhBbWMBK4tqhTWDlLAKqEud6b4LZvAKuEjeWfmGEOEJRovvZBDYQ mxMo3rfxCpgtJOAiMf/MS2aIXgGJb5MPsUDcJiux6QAzyDkSApfZJDYeu80CMUdS4uCKGywT GIUXMDKsYhRNLUguKE5KzzXSK07MLS7NS9dLzs/dxAgJQOkdjKsaLA4xCnAwKvHwMtY/CRBi TSwrrsw9xCjBwawkwns9ByjEm5JYWZValB9fVJqTWnyI0QfokonMUqLJ+cDoyCuJNzQ2NjEz MTUxtzQ1N8UhrCTO2+yREiAkkJ5YkpqdmlqQWgQzjomDU6qBUW3SkX0by61CE/YIaiv9+5l/ 4n63Q8LM5Pq2y7mXC3YumNSdPMthJo/4f78ZxfnT2p9P3XBKpC3xsbRi6KJKRf61/15y9Vy7 LrDc42at+8ezW87/vmn9sGan9u9Z1Te1Vmz10nQMWClQ81rpwmQukbK52lN5DSbOqVV5MtU1 bqqGUmSnSrTBTiWW4oxEQy3mouJEAAJ1SDVtAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkkeLIzCtJLcpLzFFi42I5/e+xoO7WzU8CDJbcsbDY9PgaqwOjx+Yl 9QGMUQ2MNhmpiSmpRQqpecn5KZl56bZK3sHxzvGmZgaGuoaWFuZKCnmJuam2Si4+AbpumTlA U5UUyhJzSoFCAYnFxUr6dpgmhIa46VrANEbo+oYEwfUYGaCBhHWMGWv2r2UreCRV0bNlPWsD Y49YFyMHh4SAicTG1oIuRk4gU0ziwr31bF2MXBxCAtMZJc5v3c4I4Wxgktjf3ckIUsUmoCFx +P0zdpBmEQFvieXXFEHCzAJqEjcOvWUGsYUFrCSuHdoEVs4ioCpxrvcmmM0r4CpxY+kXRohl ihLdzyawgdicQPG+jVfAbCEBF4n5Z14yT2DkXcDIsIpRNLUguaA4KT3XSK84Mbe4NC9dLzk/ dxMjOLyfSe9gXNVgcYhRgINRiYeXsf5JgBBrYllxZe4hRgkOZiUR3us5QCHelMTKqtSi/Pii 0pzU4kOMPkBXTWSWEk3OB8ZeXkm8obGJmZGlkZmFkYm5OQ5hJXHeZo+UACGB9MSS1OzU1ILU IphxTBycUg2MSzpKS2OFFIVV/0n4mtml/DWROf2F4+zFAqbd97S1D9+tPyAV8GJubl5fZ8+F 7aL/5x4+yDj3uGdukbNByDzeP9/P/L9mpXbMT1jLgmvCyz0hUjcYtk39pSTa9bv188SHW95O tlnz+NaOjX+9Mjj9zz2YejHcRf3ki/m+747/VZ4lesRFM01SRYmlOCPRUIu5qDgRADz4yT6c AgAA X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130102_172506_324271_A441FCF2 X-CRM114-Status: GOOD ( 14.19 ) 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 can be local in mach-s3c24xx/. Signed-off-by: Kukjin Kim --- arch/arm/mach-s3c24xx/mach-otom.c | 20 +++++++++----------- .../{include/mach/otom-map.h => otom.h} | 20 +++++++++----------- 2 files changed, 18 insertions(+), 22 deletions(-) rename arch/arm/mach-s3c24xx/{include/mach/otom-map.h => otom.h} (50%) diff --git a/arch/arm/mach-s3c24xx/mach-otom.c b/arch/arm/mach-s3c24xx/mach-otom.c index bca39f0..91d8493 100644 --- a/arch/arm/mach-s3c24xx/mach-otom.c +++ b/arch/arm/mach-s3c24xx/mach-otom.c @@ -1,4 +1,4 @@ -/* linux/arch/arm/mach-s3c2410/mach-otom.c +/* * * Copyright (c) 2004 Nex Vision * Guillaume GOURAT @@ -6,7 +6,6 @@ * 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 @@ -19,26 +18,25 @@ #include #include +#include + +#include +#include #include #include #include -#include - #include -#include -#include - -#include #include -#include #include -#include -#include #include +#include +#include +#include #include "common.h" +#include "otom.h" static struct map_desc otom11_iodesc[] __initdata = { /* Device area */ diff --git a/arch/arm/mach-s3c24xx/include/mach/otom-map.h b/arch/arm/mach-s3c24xx/otom.h similarity index 50% rename from arch/arm/mach-s3c24xx/include/mach/otom-map.h rename to arch/arm/mach-s3c24xx/otom.h index f9277a5..321b7be 100644 --- a/arch/arm/mach-s3c24xx/include/mach/otom-map.h +++ b/arch/arm/mach-s3c24xx/otom.h @@ -1,5 +1,4 @@ -/* arch/arm/mach-s3c2410/include/mach/otom-map.h - * +/* * (c) 2005 Guillaume GOURAT / NexVision * guillaume.gourat@nexvision.fr * @@ -10,21 +9,20 @@ * published by the Free Software Foundation. */ -/* needs arch/map.h including with this */ - -/* ok, we've used up to 0x01300000, now we need to find space for the +/* + * ok, we've used up to 0x01300000, now we need to find space for the * peripherals that live in the nGCS[x] areas, which are quite numerous * in their space. */ -#ifndef __ASM_ARCH_OTOMMAP_H -#define __ASM_ARCH_OTOMMAP_H +#ifndef __MACH_S3C24XX_OTOM_H +#define __MACH_S3C24XX_OTOM_H __FILE__ -#define OTOM_PA_CS8900A_BASE (S3C2410_CS3 + 0x01000000) /* nGCS3 +0x01000000 */ -#define OTOM_VA_CS8900A_BASE S3C2410_ADDR(0x04000000) /* 0xF4000000 */ +#define OTOM_PA_CS8900A_BASE (S3C2410_CS3 + 0x01000000) /* nGCS3 +0x01000000 */ +#define OTOM_VA_CS8900A_BASE S3C2410_ADDR(0x04000000) /* 0xF4000000 */ /* physical offset addresses for the peripherals */ -#define OTOM_PA_FLASH0_BASE (S3C2410_CS0) /* Bank 0 */ +#define OTOM_PA_FLASH0_BASE (S3C2410_CS0) -#endif /* __ASM_ARCH_OTOMMAP_H */ +#endif /* __MACH_S3C24XX_OTOM_H */