From patchwork Mon Feb 4 01:18:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 2088661 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id A2B8D3FCD5 for ; Mon, 4 Feb 2013 01:19:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753781Ab3BDBTf (ORCPT ); Sun, 3 Feb 2013 20:19:35 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:13424 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753730Ab3BDBTe (ORCPT ); Sun, 3 Feb 2013 20:19:34 -0500 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MHO00LZ9905ME20@mailout3.samsung.com> for linux-samsung-soc@vger.kernel.org; Mon, 04 Feb 2013 10:19:29 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.49]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 83.DD.03918.1AC0F015; Mon, 04 Feb 2013 10:19:29 +0900 (KST) X-AuditID: cbfee61a-b7f7d6d000000f4e-de-510f0ca18b58 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 53.DD.03918.1AC0F015; Mon, 04 Feb 2013 10:19:29 +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 <0MHO00CIF90C7U10@mmp2.samsung.com> for linux-samsung-soc@vger.kernel.org; Mon, 04 Feb 2013 10:19:29 +0900 (KST) From: Kukjin Kim To: linux-samsung-soc@vger.kernel.org Cc: Kukjin Kim Subject: [PATCH 2/3] ARM: S3C24XX: header mach/regs-power.h local Date: Sun, 03 Feb 2013 17:18:30 -0800 Message-id: <1359940711-29764-2-git-send-email-kgene.kim@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-reply-to: <1359940711-29764-1-git-send-email-kgene.kim@samsung.com> References: <1359940711-29764-1-git-send-email-kgene.kim@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrILMWRmVeSWpSXmKPExsVy+t8zQ92FPPyBBq9nKFnMOL+PyYHR4/Mm uQDGKC6blNSczLLUIn27BK6Mn+/6mApumVZ8OjSPtYHxpG4XIweHhICJxJ73zl2MnECmmMSF e+vZuhi5OIQEljFK3PxzkQWm5thWZ4j4dEaJnqlTWSGctUwSb99NZQfpZhPQkDj8/hmYLSKg KvG5bQGYzSygJnHj0FtmEFtYwFHi5YZjLCA2C1DNwV07wGxeAVeJr58vMUNcoSjR/WwCG4jN KeAmMWfHRLC4EFDN8xV/2UEWSwicYZPYvr+THWKQgMS3yYegLpWV2HQAao6kxMEVN1gmMAov YGRYxSiaWpBcUJyUnmuoV5yYW1yal66XnJ+7iRESgFI7GFc2WBxiFOBgVOLhZfjFFyjEmlhW XJl7iFGCg1lJhPeqEVCINyWxsiq1KD++qDQntfgQYzLQ8onMUqLJ+cDoyCuJNzQ2NjEzMTUx tzQ1NyVNWEmcl/HUkwAhgfTEktTs1NSC1CKYLUwcnFINjNmfmy5fKvvdZxGzpGONy5vjrneZ HKI1ctv4+lYnBev/u35uwdfDaf7flytOFvzH8l5w1ZqHGtMffLqWkHejc2NpdIcr+6w6sfPH 558O/Pp+95wMZeljDd6ezK+qJJdwbp7uEbWT5XNv3oeUB7nJm+4/+SVUvqHrfs+lF+I/3nV/ 8L9ZeyMz9aQSS3FGoqEWc1FxIgDBFhjwhAIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrIIsWRmVeSWpSXmKPExsVy+t9jQd2FPPyBBut3yFrMOL+PyYHR4/Mm uQDGqAZGm4zUxJTUIoXUvOT8lMy8dFsl7+B453hTMwNDXUNLC3MlhbzE3FRbJRefAF23zByg qUoKZYk5pUChgMTiYiV9O0wTQkPcdC1gGiN0fUOC4HqMDNBAwjrGjJ/v+pgKbplWfDo0j7WB 8aRuFyMHh4SAicSxrc5djJxAppjEhXvr2boYuTiEBKYzSvRMncoK4axlknj7bio7SBWbgIbE 4ffPwGwRAVWJz20LwGxmATWJG4feMoPYwgKOEi83HGMBsVmAag7u2gFm8wq4Snz9fIkZYpui RPezCWwgNqeAm8ScHRPB4kJANc9X/GWfwMi7gJFhFaNoakFyQXFSeq6hXnFibnFpXrpecn7u JkZwgD+T2sG4ssHiEKMAB6MSDy/DL75AIdbEsuLK3EOMEhzMSiK8V42AQrwpiZVVqUX58UWl OanFhxiTga6ayCwlmpwPjL68knhDYxMzI0sjMwsjE3Nz0oSVxHkZTz0JEBJITyxJzU5NLUgt gtnCxMEp1cA4ddc786LWa1dW/7dheOzr4/hR1HNrePXcyffSRB7ffRuyyTpvD0/cg8hazle/ FjPXVDk6cgoIsTJNjeMuzl22/Q8fX5WIpwanf37fC6kq30OdFnkLc61sc54tO5X4MKO2rMnp c0x2e5fY+55HdqrXzj0yUpXxMyi2ZLxTX9LIuolls0DGWyWW4oxEQy3mouJEALJ32VS0AgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org Since header mach/regs-power.h is used only into mach-s3c24xx/, this patch moves the header file in local. Signed-off-by: Kukjin Kim --- arch/arm/mach-s3c24xx/include/mach/regs-power.h | 40 ----------------------- arch/arm/mach-s3c24xx/irq-s3c2412.c | 3 +- arch/arm/mach-s3c24xx/mach-jive.c | 3 +- arch/arm/mach-s3c24xx/pm-s3c2412.c | 2 +- arch/arm/mach-s3c24xx/pm-s3c2416.c | 3 +- arch/arm/mach-s3c24xx/s3c2412-power.h | 37 +++++++++++++++++++++ arch/arm/mach-s3c24xx/s3c2412.c | 2 +- 7 files changed, 45 insertions(+), 45 deletions(-) delete mode 100644 arch/arm/mach-s3c24xx/include/mach/regs-power.h create mode 100644 arch/arm/mach-s3c24xx/s3c2412-power.h diff --git a/arch/arm/mach-s3c24xx/include/mach/regs-power.h b/arch/arm/mach-s3c24xx/include/mach/regs-power.h deleted file mode 100644 index 4932b87..0000000 --- a/arch/arm/mach-s3c24xx/include/mach/regs-power.h +++ /dev/null @@ -1,40 +0,0 @@ -/* arch/arm/mach-s3c2410/include/mach/regs-power.h - * - * Copyright (c) 2003-2006 Simtec Electronics - * http://armlinux.simtec.co.uk/ - * - * 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. - * - * S3C24XX power control register definitions -*/ - -#ifndef __ASM_ARM_REGS_PWR -#define __ASM_ARM_REGS_PWR __FILE__ - -#define S3C24XX_PWRREG(x) ((x) + S3C24XX_VA_CLKPWR) - -#define S3C2412_PWRMODECON S3C24XX_PWRREG(0x20) -#define S3C2412_PWRCFG S3C24XX_PWRREG(0x24) - -#define S3C2412_INFORM0 S3C24XX_PWRREG(0x70) -#define S3C2412_INFORM1 S3C24XX_PWRREG(0x74) -#define S3C2412_INFORM2 S3C24XX_PWRREG(0x78) -#define S3C2412_INFORM3 S3C24XX_PWRREG(0x7C) - -#define S3C2412_PWRCFG_BATF_IRQ (1<<0) -#define S3C2412_PWRCFG_BATF_IGNORE (2<<0) -#define S3C2412_PWRCFG_BATF_SLEEP (3<<0) -#define S3C2412_PWRCFG_BATF_MASK (3<<0) - -#define S3C2412_PWRCFG_STANDBYWFI_IGNORE (0<<6) -#define S3C2412_PWRCFG_STANDBYWFI_IDLE (1<<6) -#define S3C2412_PWRCFG_STANDBYWFI_STOP (2<<6) -#define S3C2412_PWRCFG_STANDBYWFI_SLEEP (3<<6) -#define S3C2412_PWRCFG_STANDBYWFI_MASK (3<<6) - -#define S3C2412_PWRCFG_RTC_MASKIRQ (1<<8) -#define S3C2412_PWRCFG_NAND_NORST (1<<9) - -#endif /* __ASM_ARM_REGS_PWR */ diff --git a/arch/arm/mach-s3c24xx/irq-s3c2412.c b/arch/arm/mach-s3c24xx/irq-s3c2412.c index e65619d..67d7631 100644 --- a/arch/arm/mach-s3c24xx/irq-s3c2412.c +++ b/arch/arm/mach-s3c24xx/irq-s3c2412.c @@ -33,12 +33,13 @@ #include #include -#include #include #include #include +#include "s3c2412-power.h" + #define INTMSK(start, end) ((1 << ((end) + 1 - (start))) - 1) #define INTMSK_SUB(start, end) (INTMSK(start, end) << ((start - S3C2410_IRQSUB(0)))) diff --git a/arch/arm/mach-s3c24xx/mach-jive.c b/arch/arm/mach-s3c24xx/mach-jive.c index c9954e2..0de85e3 100644 --- a/arch/arm/mach-s3c24xx/mach-jive.c +++ b/arch/arm/mach-s3c24xx/mach-jive.c @@ -35,7 +35,6 @@ #include #include -#include #include #include #include @@ -56,6 +55,8 @@ #include #include +#include "s3c2412-power.h" + static struct map_desc jive_iodesc[] __initdata = { }; diff --git a/arch/arm/mach-s3c24xx/pm-s3c2412.c b/arch/arm/mach-s3c24xx/pm-s3c2412.c index 206765c..2ce86a4 100644 --- a/arch/arm/mach-s3c24xx/pm-s3c2412.c +++ b/arch/arm/mach-s3c24xx/pm-s3c2412.c @@ -26,13 +26,13 @@ #include #include -#include #include #include #include #include "regs-dsc.h" +#include "s3c2412-power.h" extern void s3c2412_sleep_enter(void); diff --git a/arch/arm/mach-s3c24xx/pm-s3c2416.c b/arch/arm/mach-s3c24xx/pm-s3c2416.c index 1bd4817..db7435a 100644 --- a/arch/arm/mach-s3c24xx/pm-s3c2416.c +++ b/arch/arm/mach-s3c24xx/pm-s3c2416.c @@ -16,12 +16,13 @@ #include -#include #include #include #include +#include "s3c2412-power.h" + extern void s3c2412_sleep_enter(void); static int s3c2416_cpu_suspend(unsigned long arg) diff --git a/arch/arm/mach-s3c24xx/s3c2412-power.h b/arch/arm/mach-s3c24xx/s3c2412-power.h new file mode 100644 index 0000000..1b02c5d --- /dev/null +++ b/arch/arm/mach-s3c24xx/s3c2412-power.h @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2003-2006 Simtec Electronics + * http://armlinux.simtec.co.uk/ + * + * 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 __ARCH_ARM_MACH_S3C24XX_S3C2412_POWER_H +#define __ARCH_ARM_MACH_S3C24XX_S3C2412_POWER_H __FILE__ + +#define S3C24XX_PWRREG(x) ((x) + S3C24XX_VA_CLKPWR) + +#define S3C2412_PWRMODECON S3C24XX_PWRREG(0x20) +#define S3C2412_PWRCFG S3C24XX_PWRREG(0x24) + +#define S3C2412_INFORM0 S3C24XX_PWRREG(0x70) +#define S3C2412_INFORM1 S3C24XX_PWRREG(0x74) +#define S3C2412_INFORM2 S3C24XX_PWRREG(0x78) +#define S3C2412_INFORM3 S3C24XX_PWRREG(0x7C) + +#define S3C2412_PWRCFG_BATF_IRQ (1 << 0) +#define S3C2412_PWRCFG_BATF_IGNORE (2 << 0) +#define S3C2412_PWRCFG_BATF_SLEEP (3 << 0) +#define S3C2412_PWRCFG_BATF_MASK (3 << 0) + +#define S3C2412_PWRCFG_STANDBYWFI_IGNORE (0 << 6) +#define S3C2412_PWRCFG_STANDBYWFI_IDLE (1 << 6) +#define S3C2412_PWRCFG_STANDBYWFI_STOP (2 << 6) +#define S3C2412_PWRCFG_STANDBYWFI_SLEEP (3 << 6) +#define S3C2412_PWRCFG_STANDBYWFI_MASK (3 << 6) + +#define S3C2412_PWRCFG_RTC_MASKIRQ (1 << 8) +#define S3C2412_PWRCFG_NAND_NORST (1 << 9) + +#endif /* __ARCH_ARM_MACH_S3C24XX_S3C2412_POWER_H */ diff --git a/arch/arm/mach-s3c24xx/s3c2412.c b/arch/arm/mach-s3c24xx/s3c2412.c index ec0b318..0d59215 100644 --- a/arch/arm/mach-s3c24xx/s3c2412.c +++ b/arch/arm/mach-s3c24xx/s3c2412.c @@ -34,7 +34,6 @@ #include #include #include -#include #include #include @@ -49,6 +48,7 @@ #include "common.h" #include "regs-dsc.h" +#include "s3c2412-power.h" #define S3C2412_SWRST (S3C24XX_VA_CLKPWR + 0x30) #define S3C2412_SWRST_RESET (0x533C2412)