From patchwork Wed Jan 2 22:23:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 1925251 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 42A99DF230 for ; Wed, 2 Jan 2013 22:29:45 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TqWlE-0001DZ-Dj; Wed, 02 Jan 2013 22:26:08 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TqWjw-0000qz-4N for linux-arm-kernel@lists.infradead.org; Wed, 02 Jan 2013 22:24:49 +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:43 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.47]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id E1.F0.12699.BA3B4E05; Thu, 03 Jan 2013 07:24:43 +0900 (KST) X-AuditID: cbfee61b-b7f616d00000319b-8f-50e4b3ab464d Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id B1.F0.12699.BA3B4E05; Thu, 03 Jan 2013 07:24:43 +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:43 +0900 (KST) From: Kukjin Kim To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 07/26] ARM: EXYNOS: move mach/pmu.h file into common.h Date: Wed, 02 Jan 2013 14:23:44 -0800 Message-id: <1357165443-3716-8-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+NgFrrNLMWRmVeSWpSXmKPExsVy+t8zfd3Vm58EGExo0bPY9PgaqwOjx+Yl 9QGMUVw2Kak5mWWpRfp2CVwZ959+YSxoVahob3/K0sD4VKqLkZNDQsBE4sH9rUwQtpjEhXvr 2boYuTiEBJYxSrzuuMcOU3R10kNmiMR0Rol9a9oYIZwNTBJHez8wglSxCWhIHH7/DKiDg0NE wFti+TVFkDCzgJrEjUNvmUFsYQE3iX0XJoHZLAKqErsWt4DZvAIuEq97zrJBLFOU6H42Aczm FHCV6Nt4BcwWAqqZf+YlVK+AxLfJh1hAVkkIyEpsOgB2m4TAGTaJf4s/MkLMkZQ4uOIGywRG 4QWMDKsYRVMLkguKk9JzjfSKE3OLS/PS9ZLzczcxQkJQegfjqgaLQ4wCHIxKPLyM9U8ChFgT y4orcw8xSnAwK4nwXs8BCvGmJFZWpRblxxeV5qQWH2L0AbpkIrOUaHI+MD7ySuINjY1NzExM TcwtTc1NcQgrifM2e6QECAmkJ5akZqemFqQWwYxj4uCUamBkm8+mInZp0cEXz8Lv2prv+VvR vYezymBj4f2gb59dDU7cOyIdUHB8764swTARx8zUpxuKeKW8LxTJSWUrm2bXz5bYkTlrrtE+ q0PFP95kFXauisr9P6vcytP4Rx+vqPUVbh+D/phbEfHaaxqDVnm7L9V5cVfN4UGh1Z9kPs3Z JbY+KzRKGJRYijMSDbWYi4oTASR0fjduAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupikeLIzCtJLcpLzFFi42I5/e+xoO7qzU8CDP53allsenyN1YHRY/OS +gDGqAZGm4zUxJTUIoXUvOT8lMy8dFsl7+B453hTMwNDXUNLC3MlhbzE3FRbJRefAF23zByg qUoKZYk5pUChgMTiYiV9O0wTQkPcdC1gGiN0fUOC4HqMDNBAwjrGjPtPvzAWtCpUtLc/ZWlg fCrVxcjJISFgInF10kNmCFtM4sK99WxdjFwcQgLTGSX2rWljhHA2MEkc7f3ACFLFJqAhcfj9 M/YuRg4OEQFvieXXFEHCzAJqEjcOvQUbJCzgJrHvwiQwm0VAVWLX4hYwm1fAReJ1z1k2iGWK Et3PJoDZnAKuEn0br4DZQkA188+8ZJ7AyLuAkWEVo2hqQXJBcVJ6rpFecWJucWleul5yfu4m RnCAP5PewbiqweIQowAHoxIPL2P9kwAh1sSy4srcQ4wSHMxKIrzXc4BCvCmJlVWpRfnxRaU5 qcWHGH2ArprILCWanA+MvrySeENjEzMjSyMzCyMTc3McwkrivM0eKQFCAumJJanZqakFqUUw 45g4OKUaGMsPZeossLgYLD7fcnXNMp8vrx7LChoGVvzYUch9hJNN7auiXWSN6/nzQo9nLlpW pBH80TTeal3gloNuU9UW6+ydcnlKDHfOO+dN8jv/8Yn52NV1c/Ksvmjl/kbEcOGT2R0M34US Hti7WOdbKwX6XzJ+/dPbaC3XdZ1vVsE5S+RLPMqMo9r/K7EUZyQaajEXFScCANZJNCudAgAA X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130102_172448_559865_786457EF X-CRM114-Status: GOOD ( 15.45 ) 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 Signed-off-by: Kukjin Kim --- arch/arm/mach-exynos/common.c | 1 - arch/arm/mach-exynos/common.h | 20 ++++++++++++++++++ arch/arm/mach-exynos/cpuidle.c | 3 ++- arch/arm/mach-exynos/include/mach/pmu.h | 34 ------------------------------- arch/arm/mach-exynos/pm.c | 3 ++- arch/arm/mach-exynos/pmu.c | 3 ++- 6 files changed, 26 insertions(+), 38 deletions(-) delete mode 100644 arch/arm/mach-exynos/include/mach/pmu.h diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index d6d0dc6..bec1c92 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -35,7 +35,6 @@ #include #include #include -#include #include #include diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h index 04744f9..e1af3a9 100644 --- a/arch/arm/mach-exynos/common.h +++ b/arch/arm/mach-exynos/common.h @@ -64,4 +64,24 @@ extern struct smp_operations exynos_smp_ops; extern void exynos_cpu_die(unsigned int cpu); +/* PMU(Power Management Unit) support */ + +#define PMU_TABLE_END NULL + +enum sys_powerdown { + SYS_AFTR, + SYS_LPA, + SYS_SLEEP, + NUM_SYS_POWERDOWN, +}; + +extern unsigned long l2x0_regs_phys; +struct exynos_pmu_conf { + void __iomem *reg; + unsigned int val[NUM_SYS_POWERDOWN]; +}; + +extern void exynos_sys_powerdown_conf(enum sys_powerdown mode); +extern void s3c_cpu_resume(void); + #endif /* __ARCH_ARM_MACH_EXYNOS_COMMON_H */ diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c index 0509241..fcfe025 100644 --- a/arch/arm/mach-exynos/cpuidle.c +++ b/arch/arm/mach-exynos/cpuidle.c @@ -23,10 +23,11 @@ #include #include #include -#include #include +#include "common.h" + #define REG_DIRECTGO_ADDR (samsung_rev() == EXYNOS4210_REV_1_1 ? \ S5P_INFORM7 : (samsung_rev() == EXYNOS4210_REV_1_0 ? \ (S5P_VA_SYSRAM + 0x24) : S5P_INFORM0)) diff --git a/arch/arm/mach-exynos/include/mach/pmu.h b/arch/arm/mach-exynos/include/mach/pmu.h deleted file mode 100644 index 7c27c2d..0000000 --- a/arch/arm/mach-exynos/include/mach/pmu.h +++ /dev/null @@ -1,34 +0,0 @@ -/* linux/arch/arm/mach-exynos4/include/mach/pmu.h - * - * Copyright (c) 2011 Samsung Electronics Co., Ltd. - * http://www.samsung.com/ - * - * EXYNOS4210 - PMU(Power Management Unit) support - * - * 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_PMU_H -#define __ASM_ARCH_PMU_H __FILE__ - -#define PMU_TABLE_END NULL - -enum sys_powerdown { - SYS_AFTR, - SYS_LPA, - SYS_SLEEP, - NUM_SYS_POWERDOWN, -}; - -extern unsigned long l2x0_regs_phys; -struct exynos_pmu_conf { - void __iomem *reg; - unsigned int val[NUM_SYS_POWERDOWN]; -}; - -extern void exynos_sys_powerdown_conf(enum sys_powerdown mode); -extern void s3c_cpu_resume(void); - -#endif /* __ASM_ARCH_PMU_H */ diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c index b9b539c..f459afd 100644 --- a/arch/arm/mach-exynos/pm.c +++ b/arch/arm/mach-exynos/pm.c @@ -34,7 +34,8 @@ #include #include #include -#include + +#include "common.h" static struct sleep_save exynos4_set_clksrc[] = { { .reg = EXYNOS4_CLKSRC_MASK_TOP , .val = 0x00000001, }, diff --git a/arch/arm/mach-exynos/pmu.c b/arch/arm/mach-exynos/pmu.c index 3a48c85..daebc1a 100644 --- a/arch/arm/mach-exynos/pmu.c +++ b/arch/arm/mach-exynos/pmu.c @@ -14,7 +14,8 @@ #include #include -#include + +#include "common.h" static struct exynos_pmu_conf *exynos_pmu_config;