From patchwork Wed Jan 2 22:24:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 1925551 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 9B9223FE37 for ; Wed, 2 Jan 2013 22:42:54 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TqWxN-0000n2-Dq; Wed, 02 Jan 2013 22:38:42 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TqWkY-0000qy-PW for linux-arm-kernel@lists.infradead.org; Wed, 02 Jan 2013 22:25:29 +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:25:05 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.51]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 1B.60.01231.1C3B4E05; Thu, 03 Jan 2013 07:25:05 +0900 (KST) X-AuditID: cbfee61a-b7fa66d0000004cf-43-50e4b3c1e2dd Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id FA.60.01231.1C3B4E05; Thu, 03 Jan 2013 07:25:05 +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:05 +0900 (KST) From: Kukjin Kim To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 25/26] ARM: S3C64XX: make regs-sys.h local Date: Wed, 02 Jan 2013 14:24:02 -0800 Message-id: <1357165443-3716-26-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+t8zY92Dm58EGFw8KWex6fE1VgdGj81L 6gMYo7hsUlJzMstSi/TtErgyNs3ay1bw27Ti1tl9bA2ME3S7GDk5JARMJD5OW8IKYYtJXLi3 nq2LkYtDSGAZo8S0hklMXYwcYEX/e8Mg4tMZJWbNfcAM4Wxgknj79RojSDebgIbE4ffP2EEa RAS8JZZfUwQJMwuoSdw49JYZxBYWsJJYsus9O4jNIqAqcWPebRYQm1fAVeLese3sEEcoSnQ/ m8AGYnMCxfs2XgGzhQRcJOafeckM0Ssg8W3yIRaI22QlNh0AO0dC4DqbxNYp+5gh5khKHFxx g2UCo/ACRoZVjKKpBckFxUnpuYZ6xYm5xaV56XrJ+bmbGCEBKLWDcWWDxSFGAQ5GJR5exvon AUKsiWXFlbmHGCU4mJVEeK/nAIV4UxIrq1KL8uOLSnNSiw8x+gBdMpFZSjQ5HxgdeSXxhsbG JmYmpibmlqbmpjiElcR5mz1SAoQE0hNLUrNTUwtSi2DGMXFwSjUw5keXJrVrBtUbZu2el5l8 VnLF4hkb568z2vshd03cre/Td67pXuypqa3VktMs8FNBVtXfeIXpwgP+1Z17dU3O/7+aGXu1 RFX11O2ULY1e/d6/+z+dE8xdZ2+iXjh11r1zy+4d4TyRtEdNkSPrAEPywRPxL5eVV+8M/Hnl 9wkvhg3Mt7Yo3+ivUGIpzkg01GIuKk4EAADSsdltAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkkeLIzCtJLcpLzFFi42I5/e+xoO7BzU8CDA6s57XY9PgaqwOjx+Yl 9QGMUQ2MNhmpiSmpRQqpecn5KZl56bZK3sHxzvGmZgaGuoaWFuZKCnmJuam2Si4+AbpumTlA U5UUyhJzSoFCAYnFxUr6dpgmhIa46VrANEbo+oYEwfUYGaCBhHWMGZtm7WUr+G1acevsPrYG xgm6XYwcHBICJhL/e8O6GDmBTDGJC/fWs3UxcnEICUxnlJg19wEzhLOBSeLt12uMIFVsAhoS h98/YwdpFhHwllh+TREkzCygJnHj0FtmEFtYwEpiya737CA2i4CqxI15t1lAbF4BV4l7x7az QyxTlOh+NoENxOYEivdtvAJmCwm4SMw/85J5AiPvAkaGVYyiqQXJBcVJ6bmGesWJucWleel6 yfm5mxjB4f1MagfjygaLQ4wCHIxKPLyM9U8ChFgTy4orcw8xSnAwK4nwXs8BCvGmJFZWpRbl xxeV5qQWH2L0AbpqIrOUaHI+MPbySuINjU3MjCyNzCyMTMzNcQgrifM2e6QECAmkJ5akZqem FqQWwYxj4uCUamDcwVf57HCub2RyBd/0ePXLzneOeZ3NrxSeaHZ8j37uvhMvmP8F7IgLX9z+ /t2liJmOFTsDTR5v/Hle46FVZc6ey2c2z3vqkB+yvz+4P3rnI4c1i95dLk6+c9MmwnuBCZO/ y55dbVFuh5vSTWe92N8nY78rzuvCnfUWm59M/JaUtFny/CS/4kPflFiKMxINtZiLihMBnYwt QZwCAAA= X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130102_172527_247116_E09210D6 X-CRM114-Status: GOOD ( 17.61 ) 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 The header file can be local in mach-s3c64xx/. Signed-off-by: Kukjin Kim --- arch/arm/mach-s3c64xx/clock.c | 3 ++- arch/arm/mach-s3c64xx/cpuidle.c | 3 ++- arch/arm/mach-s3c64xx/dma.c | 4 ++-- arch/arm/mach-s3c64xx/include/mach/regs-sys.h | 31 ------------------------- arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +- arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +- arch/arm/mach-s3c64xx/pm.c | 2 +- arch/arm/mach-s3c64xx/regs-sys.h | 30 ++++++++++++++++++++++++ arch/arm/mach-s3c64xx/setup-usb-phy.c | 3 ++- 9 files changed, 41 insertions(+), 39 deletions(-) delete mode 100644 arch/arm/mach-s3c64xx/include/mach/regs-sys.h create mode 100644 arch/arm/mach-s3c64xx/regs-sys.h diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c index 803711e..8499415 100644 --- a/arch/arm/mach-s3c64xx/clock.c +++ b/arch/arm/mach-s3c64xx/clock.c @@ -23,7 +23,6 @@ #include #include -#include #include #include @@ -33,6 +32,8 @@ #include #include +#include "regs-sys.h" + /* fin_apll, fin_mpll and fin_epll are all the same clock, which we call * ext_xtal_mux for want of an actual name from the manual. */ diff --git a/arch/arm/mach-s3c64xx/cpuidle.c b/arch/arm/mach-s3c64xx/cpuidle.c index acb197c..e3e455b 100644 --- a/arch/arm/mach-s3c64xx/cpuidle.c +++ b/arch/arm/mach-s3c64xx/cpuidle.c @@ -20,9 +20,10 @@ #include -#include #include +#include "regs-sys.h" + static int s3c64xx_enter_idle(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) diff --git a/arch/arm/mach-s3c64xx/dma.c b/arch/arm/mach-s3c64xx/dma.c index f2a7a17..ec29b35 100644 --- a/arch/arm/mach-s3c64xx/dma.c +++ b/arch/arm/mach-s3c64xx/dma.c @@ -28,10 +28,10 @@ #include #include -#include - #include +#include "regs-sys.h" + /* dma channel state information */ struct s3c64xx_dmac { diff --git a/arch/arm/mach-s3c64xx/include/mach/regs-sys.h b/arch/arm/mach-s3c64xx/include/mach/regs-sys.h deleted file mode 100644 index b91e020..0000000 --- a/arch/arm/mach-s3c64xx/include/mach/regs-sys.h +++ /dev/null @@ -1,31 +0,0 @@ -/* arch/arm/plat-s3c64xx/include/plat/regs-sys.h - * - * Copyright 2008 Openmoko, Inc. - * Copyright 2008 Simtec Electronics - * Ben Dooks - * http://armlinux.simtec.co.uk/ - * - * S3C64XX system register definitions - * - * 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 __PLAT_REGS_SYS_H -#define __PLAT_REGS_SYS_H __FILE__ - -#define S3C_SYSREG(x) (S3C_VA_SYS + (x)) - -#define S3C64XX_AHB_CON0 S3C_SYSREG(0x100) -#define S3C64XX_AHB_CON1 S3C_SYSREG(0x104) -#define S3C64XX_AHB_CON2 S3C_SYSREG(0x108) - -#define S3C64XX_SDMA_SEL S3C_SYSREG(0x110) - -#define S3C64XX_OTHERS S3C_SYSREG(0x900) - -#define S3C64XX_OTHERS_USBMASK (1 << 16) -#define S3C64XX_OTHERS_SYNCMUXSEL (1 << 6) - -#endif /* _PLAT_REGS_SYS_H */ diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c index d254135..8b89e89 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c @@ -50,7 +50,6 @@ #include #include -#include #include #include @@ -71,6 +70,7 @@ #include "crag6410.h" #include "regs-gpio-memport.h" #include "regs-modem.h" +#include "regs-sys.h" /* serial port setup */ diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c index dcf41bd..ddd0eb8 100644 --- a/arch/arm/mach-s3c64xx/mach-smdk6410.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c @@ -58,7 +58,6 @@ #include #include -#include #include #include #include @@ -75,6 +74,7 @@ #include "common.h" #include "regs-modem.h" #include "regs-srom.h" +#include "regs-sys.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/pm.c b/arch/arm/mach-s3c64xx/pm.c index c6eff9f..546d6e0 100644 --- a/arch/arm/mach-s3c64xx/pm.c +++ b/arch/arm/mach-s3c64xx/pm.c @@ -26,13 +26,13 @@ #include #include -#include #include #include #include #include "regs-gpio-memport.h" #include "regs-modem.h" +#include "regs-sys.h" struct s3c64xx_pm_domain { char *const name; diff --git a/arch/arm/mach-s3c64xx/regs-sys.h b/arch/arm/mach-s3c64xx/regs-sys.h new file mode 100644 index 0000000..8c411fb --- /dev/null +++ b/arch/arm/mach-s3c64xx/regs-sys.h @@ -0,0 +1,30 @@ +/* + * Copyright 2008 Openmoko, Inc. + * Copyright 2008 Simtec Electronics + * Ben Dooks + * http://armlinux.simtec.co.uk/ + * + * S3C64XX system register definitions + * + * 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 __MACH_S3C64XX_REGS_SYS_H +#define __MACH_S3C64XX_REGS_SYS_H __FILE__ + +#define S3C_SYSREG(x) (S3C_VA_SYS + (x)) + +#define S3C64XX_AHB_CON0 S3C_SYSREG(0x100) +#define S3C64XX_AHB_CON1 S3C_SYSREG(0x104) +#define S3C64XX_AHB_CON2 S3C_SYSREG(0x108) + +#define S3C64XX_SDMA_SEL S3C_SYSREG(0x110) + +#define S3C64XX_OTHERS S3C_SYSREG(0x900) + +#define S3C64XX_OTHERS_USBMASK (1 << 16) +#define S3C64XX_OTHERS_SYNCMUXSEL (1 << 6) + +#endif /* __MACH_S3C64XX_REGS_SYS_H */ diff --git a/arch/arm/mach-s3c64xx/setup-usb-phy.c b/arch/arm/mach-s3c64xx/setup-usb-phy.c index f6757e0..c8174d9 100644 --- a/arch/arm/mach-s3c64xx/setup-usb-phy.c +++ b/arch/arm/mach-s3c64xx/setup-usb-phy.c @@ -15,11 +15,12 @@ #include #include #include -#include #include #include #include +#include "regs-sys.h" + static int s3c_usb_otgphy_init(struct platform_device *pdev) { struct clk *xusbxti;