From patchwork Wed Jan 2 22:23:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 1925451 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 EDE7BDF230 for ; Wed, 2 Jan 2013 22:37:03 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TqWrW-00057k-39; Wed, 02 Jan 2013 22:32:40 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TqWkG-0000qy-Rq for linux-arm-kernel@lists.infradead.org; Wed, 02 Jan 2013 22:25:11 +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:53 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.51]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id FD.50.01231.4B3B4E05; Thu, 03 Jan 2013 07:24:53 +0900 (KST) X-AuditID: cbfee61a-b7fa66d0000004cf-f6-50e4b3b4ebf9 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id BD.50.01231.4B3B4E05; Thu, 03 Jan 2013 07:24:52 +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:52 +0900 (KST) From: Kukjin Kim To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 14/26] ARM: S3C24XX: make osiris-cpld.h and osiris-map.h local Date: Wed, 02 Jan 2013 14:23:51 -0800 Message-id: <1357165443-3716-15-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+t8zY92tm58EGGy/wmmx6fE1VgdGj81L 6gMYo7hsUlJzMstSi/TtErgy3t15xlbwWaOi+VUbUwPjbaUuRk4OCQETidUX3rJB2GISF+6t B7K5OIQEljFK3Jo9mxWmaNe1XewQiemMEnPe7Yeq2sAkcevWc0aQKjYBDYnD758BVXFwiAh4 Syy/pggSZhZQk7hx6C0zSFhYwE9ixWQrkDCLgKrE2ekbwRbzCrhKHF64gQVil6JE97MJYHFO oHjfxitgtpCAi8T8My+ZIXoFJL5NPsQCMlJCQFZi0wFmkGskBC6zSWza8IYZYo6kxMEVN1gm MAovYGRYxSiaWpBcUJyUnmuoV5yYW1yal66XnJ+7iRESgFI7GFc2WBxiFOBgVOLhZax/EiDE mlhWXJl7iFGCg1lJhPd6DlCINyWxsiq1KD++qDQntfgQow/QJROZpUST84HRkVcSb2hsbGJm YmpibmlqbopDWEmct9kjJUBIID2xJDU7NbUgtQhmHBMHp1QDo6Vi560HO6MLdhgzx+WcYXDd dJv3QETXdGk9P4MzHxQmKFmcrPecUz5bqt+mJVupYJ3B1snSrCpafBVPGxzi/+i5uM79dnj+ zebZBVXT/jxgfTD/m8E9nRjty93nd3vMvHzgQVnQZHvGNf86VGNf1r5bk3jhcLLhr8PHGi7M //n9pdTnOenHdyixFGckGmoxFxUnAgBPhT37bQIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkkeLIzCtJLcpLzFFi42I5/e+xoO6WzU8CDKYuMrPY9PgaqwOjx+Yl 9QGMUQ2MNhmpiSmpRQqpecn5KZl56bZK3sHxzvGmZgaGuoaWFuZKCnmJuam2Si4+AbpumTlA U5UUyhJzSoFCAYnFxUr6dpgmhIa46VrANEbo+oYEwfUYGaCBhHWMGe/uPGMr+KxR0fyqjamB 8bZSFyMnh4SAicSua7vYIWwxiQv31rN1MXJxCAlMZ5SY824/lLOBSeLWreeMIFVsAhoSh98/ A+rg4BAR8JZYfk0RJMwsoCZx49BbZpCwsICfxIrJViBhFgFVibPTN7KB2LwCrhKHF25ggdil KNH9bAJYnBMo3rfxCpgtJOAiMf/MS+YJjLwLGBlWMYqmFiQXFCel5xrqFSfmFpfmpesl5+du YgSH9zOpHYwrGywOMQpwMCrx8DLWPwkQYk0sK67MPcQowcGsJMJ7PQcoxJuSWFmVWpQfX1Sa k1p8iNEH6KqJzFKiyfnA2MsriTc0NjEzsjQyszAyMTfHIawkztvskRIgJJCeWJKanZpakFoE M46Jg1OqgdFOlvH7kVDThiW5PzOKJOT4Hnyf+eS26QpT66Yuv+a8lo87ppQm5k6vrrM5d3tB 2LJQQ4WdfBxcbwS+lBhf5lj/3jG/IXXL2sOlf+ucl544cvld7v8VQqV8rw8+3ONw77ilYc7K JOYv3JlW569OlmmwyWXdMX8/17WihGnOmR9VpiQt7jL+UqDEUpyRaKjFXFScCADylq3TnAIA AA== X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130102_172509_370823_7E274C21 X-CRM114-Status: GOOD ( 15.91 ) 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 This makes the headers local in mach-s3c24xx/. Signed-off-by: Kukjin Kim --- arch/arm/mach-s3c24xx/include/mach/osiris-cpld.h | 30 -------------------- arch/arm/mach-s3c24xx/mach-osiris.c | 27 ++++++++---------- arch/arm/mach-s3c24xx/mach-rx1950.c | 1 - .../{include/mach/osiris-map.h => osiris.h} | 23 +++++++++++---- 4 files changed, 29 insertions(+), 52 deletions(-) delete mode 100644 arch/arm/mach-s3c24xx/include/mach/osiris-cpld.h rename arch/arm/mach-s3c24xx/{include/mach/osiris-map.h => osiris.h} (69%) diff --git a/arch/arm/mach-s3c24xx/include/mach/osiris-cpld.h b/arch/arm/mach-s3c24xx/include/mach/osiris-cpld.h deleted file mode 100644 index e9e36b0..0000000 --- a/arch/arm/mach-s3c24xx/include/mach/osiris-cpld.h +++ /dev/null @@ -1,30 +0,0 @@ -/* arch/arm/mach-s3c2410/include/mach/osiris-cpld.h - * - * Copyright 2005 Simtec Electronics - * http://www.simtec.co.uk/products/ - * Ben Dooks - * - * OSIRIS - CPLD control constants - * - * 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. -*/ - -#ifndef __ASM_ARCH_OSIRISCPLD_H -#define __ASM_ARCH_OSIRISCPLD_H - -/* CTRL0 - NAND WP control */ - -#define OSIRIS_CTRL0_NANDSEL (0x3) -#define OSIRIS_CTRL0_BOOT_INT (1<<3) -#define OSIRIS_CTRL0_PCMCIA (1<<4) -#define OSIRIS_CTRL0_FIX8 (1<<5) -#define OSIRIS_CTRL0_PCMCIA_nWAIT (1<<6) -#define OSIRIS_CTRL0_PCMCIA_nIOIS16 (1<<7) - -#define OSIRIS_CTRL1_FIX8 (1<<0) - -#define OSIRIS_ID_REVMASK (0x7) - -#endif /* __ASM_ARCH_OSIRISCPLD_H */ diff --git a/arch/arm/mach-s3c24xx/mach-osiris.c b/arch/arm/mach-s3c24xx/mach-osiris.c index bb36d83..1eeeee4 100644 --- a/arch/arm/mach-s3c24xx/mach-osiris.c +++ b/arch/arm/mach-s3c24xx/mach-osiris.c @@ -1,5 +1,4 @@ -/* linux/arch/arm/mach-s3c2440/mach-osiris.c - * +/* * Copyright (c) 2005-2008 Simtec Electronics * http://armlinux.simtec.co.uk/ * Ben Dooks @@ -25,22 +24,12 @@ #include +#include #include #include #include - -#include -#include - -#include #include -#include -#include -#include -#include -#include -#include #include #include @@ -49,12 +38,20 @@ #include #include -#include #include -#include #include +#include +#include +#include +#include + +#include +#include +#include +#include #include "common.h" +#include "osiris.h" /* onboard perihperal map */ diff --git a/arch/arm/mach-s3c24xx/mach-rx1950.c b/arch/arm/mach-s3c24xx/mach-rx1950.c index bdcfb8b..c7db767 100644 --- a/arch/arm/mach-s3c24xx/mach-rx1950.c +++ b/arch/arm/mach-s3c24xx/mach-rx1950.c @@ -55,7 +55,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm/mach-s3c24xx/include/mach/osiris-map.h b/arch/arm/mach-s3c24xx/osiris.h similarity index 69% rename from arch/arm/mach-s3c24xx/include/mach/osiris-map.h rename to arch/arm/mach-s3c24xx/osiris.h index 17380f8..b8d5607 100644 --- a/arch/arm/mach-s3c24xx/include/mach/osiris-map.h +++ b/arch/arm/mach-s3c24xx/osiris.h @@ -1,9 +1,9 @@ -/* arch/arm/mach-s3c2410/include/mach/osiris-map.h - * +/* * Copyright 2005 Simtec Electronics * http://www.simtec.co.uk/products/ * Ben Dooks * + * OSIRIS - CPLD control constants * OSIRIS - Memory map definitions * * This program is free software; you can redistribute it and/or modify @@ -11,10 +11,21 @@ * published by the Free Software Foundation. */ -/* needs arch/map.h including with this */ +#ifndef __MACH_S3C24XX_OSIRIS_H +#define __MACH_S3C24XX_OSIRIS_H __FILE__ + +/* CTRL0 - NAND WP control */ + +#define OSIRIS_CTRL0_NANDSEL (0x3) +#define OSIRIS_CTRL0_BOOT_INT (1<<3) +#define OSIRIS_CTRL0_PCMCIA (1<<4) +#define OSIRIS_CTRL0_FIX8 (1<<5) +#define OSIRIS_CTRL0_PCMCIA_nWAIT (1<<6) +#define OSIRIS_CTRL0_PCMCIA_nIOIS16 (1<<7) + +#define OSIRIS_CTRL1_FIX8 (1<<0) -#ifndef __ASM_ARCH_OSIRISMAP_H -#define __ASM_ARCH_OSIRISMAP_H +#define OSIRIS_ID_REVMASK (0x7) /* start peripherals off after the S3C2410 */ @@ -39,4 +50,4 @@ #define OSIRIS_VA_IDREG OSIRIS_IOADDR(0x00700000) #define OSIRIS_PA_IDREG (OSIRIS_PA_CPLD + (7<<23)) -#endif /* __ASM_ARCH_OSIRISMAP_H */ +#endif /* __MACH_S3C24XX_OSIRIS_H */