From: kgene.kim@samsung.com (Kukjin Kim)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 07/26] ARM: EXYNOS: move mach/pmu.h file into common.h
Date: Wed, 02 Jan 2013 14:23:44 -0800 [thread overview]
Message-ID: <1357165443-3716-8-git-send-email-kgene.kim@samsung.com> (raw)
In-Reply-To: <1357165443-3716-1-git-send-email-kgene.kim@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
---
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 <mach/regs-irq.h>
#include <mach/regs-pmu.h>
#include <mach/regs-gpio.h>
-#include <mach/pmu.h>
#include <plat/cpu.h>
#include <plat/clock.h>
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 <asm/cpuidle.h>
#include <mach/regs-clock.h>
#include <mach/regs-pmu.h>
-#include <mach/pmu.h>
#include <plat/cpu.h>
+#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 <mach/regs-clock.h>
#include <mach/regs-pmu.h>
#include <mach/pm-core.h>
-#include <mach/pmu.h>
+
+#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 <linux/bug.h>
#include <mach/regs-clock.h>
-#include <mach/pmu.h>
+
+#include "common.h"
static struct exynos_pmu_conf *exynos_pmu_config;
--
1.7.10.4
next prev parent reply other threads:[~2013-01-02 22:23 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-02 22:23 [PATCH 00/26] ARM: SAMSUNG: cleanup header files Kukjin Kim
2013-01-02 22:23 ` [PATCH 01/26] gpio: samsung: remove inclusion <mach/regs-clock.h> Kukjin Kim
2013-01-10 10:52 ` Linus Walleij
2013-01-10 18:41 ` Kukjin Kim
2013-01-17 10:50 ` Linus Walleij
2013-01-02 22:23 ` [PATCH 02/26] cpufreq: exynos: cleanup exynos-cpufreq header Kukjin Kim
2013-01-02 22:23 ` [PATCH 03/26] ARM: S5P64X0: remove gpiolib.c file in mach-s5p64x0 Kukjin Kim
2013-01-02 22:23 ` [PATCH 04/26] ARM: S5P64X0: move i2c.h into local directory Kukjin Kim
2013-01-02 22:23 ` [PATCH 05/26] ARM: S5P64X0: move s5p64x0-clock.h " Kukjin Kim
2013-01-02 22:23 ` [PATCH 06/26] ARM: S5PV210: move regs-sys.h into setup-usb-phy.c file Kukjin Kim
2013-01-02 22:23 ` Kukjin Kim [this message]
2013-01-02 22:23 ` [PATCH 08/26] ARM: SAMSUNG: cleanup mach/regs-audss.h file Kukjin Kim
2013-01-02 22:23 ` [PATCH 09/26] ARM: SAMSUNG: cleanup mach/gpio-fns.h gpio-track.h and gpio-nrs.h Kukjin Kim
2013-01-10 10:53 ` Linus Walleij
2013-01-10 18:44 ` Kukjin Kim
2013-01-02 22:23 ` [PATCH 10/26] ARM: S3C24XX: make anubis-cpld, anubis-irq and anubis-map local Kukjin Kim
2013-01-02 22:23 ` [PATCH 11/26] ARM: S3C24XX: make bast-cpld.h, bast-irq.h and bast-map.h local Kukjin Kim
2013-01-02 22:23 ` [PATCH 12/26] ARM: S3C24XX: make gta02.h local Kukjin Kim
2013-01-02 22:23 ` [PATCH 13/26] ARM: S3C24XX: make h1940.h and h1940-latch.h local Kukjin Kim
2013-01-02 22:23 ` [PATCH 14/26] ARM: S3C24XX: make osiris-cpld.h and osiris-map.h local Kukjin Kim
2013-01-02 22:23 ` [PATCH 15/26] ARM: S3C24XX: make otom-map.h local Kukjin Kim
2013-01-02 22:23 ` [PATCH 16/26] ARM: S3C24XX: make vr1000-cpld.h, vr1000-irq.h and vr1000-map.h local Kukjin Kim
2013-01-02 22:23 ` [PATCH 17/26] ARM: S3C2416: remove regs-s3c2416-mem.h and regs-s3c2416.h Kukjin Kim
2013-01-02 22:23 ` [PATCH 18/26] ARM: S3C2412: cleanup regs-s3c2412.h Kukjin Kim
2013-01-02 22:23 ` [PATCH 19/26] ARM: S3C24XX: remove idle.h Kukjin Kim
2013-01-02 22:23 ` [PATCH 20/26] ARM: S3C24XX: remove dsc.c and make regs-dsc.h local Kukjin Kim
2013-01-02 22:23 ` [PATCH 21/26] ARM: S3C64XX: make crag6410.h local Kukjin Kim
2013-01-02 22:23 ` [PATCH 22/26] ARM: S3C64XX: make regs-gpio-memport.h local Kukjin Kim
2013-01-02 22:24 ` [PATCH 23/26] ARM: S3C64XX: make regs-modem.h local Kukjin Kim
2013-01-02 22:24 ` [PATCH 24/26] ARM: S3C64XX: make regs-srom.h local Kukjin Kim
2013-01-02 22:24 ` [PATCH 25/26] ARM: S3C64XX: make regs-sys.h local Kukjin Kim
2013-01-02 22:24 ` [PATCH 26/26] ARM: S3C64XX: make regs-syscon-power.h local Kukjin Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1357165443-3716-8-git-send-email-kgene.kim@samsung.com \
--to=kgene.kim@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox