Skip to contentSkip to conversation

ARM: EXYNOS: local regs-pmu.h header file

PATCH New kgene at kernel.org 3 participants 3 messages Dec 17, 2013 – Jan 4, 2014

Subsystems (4)
lore
Share & tools
lore

kgene at kernel.org

author maintainer
#0 lore raw

PATCH 3/11 ARM: EXYNOS: local regs-pmu.h header file

From: Kukjin Kim <[email protected]>

This moves regs-pmu.h file into mach-exynos directory.

---
 arch/arm/mach-exynos/common.c                      |    3 ++-
 arch/arm/mach-exynos/cpuidle.c                     |    2 +-
 arch/arm/mach-exynos/hotplug.c                     |    2 +-
 arch/arm/mach-exynos/mach-exynos5-dt.c             |    2 +-
 arch/arm/mach-exynos/platsmp.c                     |    2 +-
 arch/arm/mach-exynos/pm.c                          |    2 +-
 arch/arm/mach-exynos/pm_domains.c                  |    3 ++-
 arch/arm/mach-exynos/pmu.c                         |    2 +-
 arch/arm/mach-exynos/{include/mach => }/regs-pmu.h |    0
 9 files changed, 10 insertions(+), 8 deletions(-)
 rename arch/arm/mach-exynos/{include/mach => }/regs-pmu.h (100%)
arch/arm/mach-exynos/common.c +2 -1
index 61d2906..1fc0424 100644
@@ -38,13 +38,14 @@
 #include <asm/cacheflush.h>
 
 #include <mach/regs-irq.h>
-#include <mach/regs-pmu.h>
 
 #include <plat/cpu.h>
 #include <plat/pm.h>
 #include <plat/regs-serial.h>
 
 #include "common.h"
+#include "regs-pmu.h"
+
 #define L2_AUX_VAL 0x7C470001
 #define L2_AUX_MASK 0xC200ffff
 
arch/arm/mach-exynos/cpuidle.c +1 -1
index ddbfe87..6ba13ea 100644
@@ -23,12 +23,12 @@
 #include <asm/unified.h>
 #include <asm/cpuidle.h>
 #include <mach/regs-clock.h>
-#include <mach/regs-pmu.h>
 
 #include <plat/cpu.h>
 #include <plat/pm.h>
 
 #include "common.h"
+#include "regs-pmu.h"
 
 #define REG_DIRECTGO_ADDR	(samsung_rev() == EXYNOS4210_REV_1_1 ? \
 			S5P_INFORM7 : (samsung_rev() == EXYNOS4210_REV_1_0 ?
\
arch/arm/mach-exynos/hotplug.c +1 -1
index af90cfa..5eead53 100644
@@ -19,10 +19,10 @@
 #include <asm/cp15.h>
 #include <asm/smp_plat.h>
 
-#include <mach/regs-pmu.h>
 #include <plat/cpu.h>
 
 #include "common.h"
+#include "regs-pmu.h"
 
 static inline void cpu_enter_lowpower_a9(void)
 {
(quoted diff) +0 -0

b/arch/arm/mach-exynos/mach-exynos5-dt.c
index 1fe075a..65a4646 100644

arch/arm/mach-exynos/mach-exynos5-dt.c +1 -1
@@ -14,10 +14,10 @@
 #include <linux/io.h>
 
 #include <asm/mach/arch.h>
-#include <mach/regs-pmu.h>
 #include <plat/mfc.h>
 
 #include "common.h"
+#include "regs-pmu.h"
 
 static void __init exynos5_dt_machine_init(void)
 {
arch/arm/mach-exynos/platsmp.c +1 -1
index 58b43e6..b5b34f8 100644
@@ -28,11 +28,11 @@
 
 #include <mach/hardware.h>
 #include <mach/regs-clock.h>
-#include <mach/regs-pmu.h>
 
 #include <plat/cpu.h>
 
 #include "common.h"
+#include "regs-pmu.h"
 
 extern void exynos4_secondary_startup(void);
 
arch/arm/mach-exynos/pm.c +1 -1
index c679db5..717c6a6 100644
@@ -31,10 +31,10 @@
 
 #include <mach/regs-irq.h>
 #include <mach/regs-clock.h>
-#include <mach/regs-pmu.h>
 #include <mach/pm-core.h>
 
 #include "common.h"
+#include "regs-pmu.h"
 
 static struct sleep_save exynos4_set_clksrc[] = {
 	{ .reg = EXYNOS4_CLKSRC_MASK_TOP		, .val = 0x00000001,

},

(quoted diff) +0 -0

b/arch/arm/mach-exynos/pm_domains.c
index 1703593..ff50836 100644

arch/arm/mach-exynos/pm_domains.c +2 -1
@@ -22,9 +22,10 @@
 #include <linux/of_platform.h>
 #include <linux/sched.h>
 
-#include <mach/regs-pmu.h>
 #include <plat/devs.h>
 
+#include "regs-pmu.h"
+
 /*
  * Exynos specific wrapper around the generic power domain
  */
arch/arm/mach-exynos/pmu.c +1 -1
index 9062b58..0116d5b 100644
@@ -14,9 +14,9 @@
 #include <linux/bug.h>
 
 #include <mach/regs-clock.h>
-#include <mach/regs-pmu.h>
 
 #include "common.h"
+#include "regs-pmu.h"
 
 static struct exynos_pmu_conf *exynos_pmu_config;
 
(quoted diff) +0 -0

b/arch/arm/mach-exynos/regs-pmu.h
similarity index 100%
rename from arch/arm/mach-exynos/include/mach/regs-pmu.h rename to arch/arm/mach-exynos/regs-pmu.h

Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 3/11 ARM: EXYNOS: local regs-pmu.h header file

Hi,

Quoted 5 lines · On Tue, Dec 17, 2013 at 3:52 AM, <[email protected]> wrote:

From: Kukjin Kim <[email protected]>

This moves regs-pmu.h file into mach-exynos directory.

Quoted 12 lines
---
 arch/arm/mach-exynos/common.c                      |    3 ++-
 arch/arm/mach-exynos/cpuidle.c                     |    2 +-
 arch/arm/mach-exynos/hotplug.c                     |    2 +-
 arch/arm/mach-exynos/mach-exynos5-dt.c             |    2 +-
 arch/arm/mach-exynos/platsmp.c                     |    2 +-
 arch/arm/mach-exynos/pm.c                          |    2 +-
 arch/arm/mach-exynos/pm_domains.c                  |    3 ++-
 arch/arm/mach-exynos/pmu.c                         |    2 +-
 arch/arm/mach-exynos/{include/mach => }/regs-pmu.h |    0
 9 files changed, 10 insertions(+), 8 deletions(-)
 rename arch/arm/mach-exynos/{include/mach => }/regs-pmu.h (100%)

This looks OK, but when you committed, you did the move of the include file in another commit (e44de221d3ddb99387b04cfd49483bcd05daa6fb). That means that between that commit and this patch, there's build breakage. Please try to avoid that in the future since if something needs to be bisected near here it can cause problems.

-Olof

#2 lore raw

PATCH 3/11 ARM: EXYNOS: local regs-pmu.h header file

Quoted 3 lines · Olof Johansson

Hi,

Hi,

Quoted 20 lines · On Tue, Dec 17, 2013 at 3:52 AM, <[email protected]> wrote:
Quoted 5 lines

From: Kukjin Kim <[email protected]>

This moves regs-pmu.h file into mach-exynos directory.

Quoted 12 lines
---
 arch/arm/mach-exynos/common.c                      |    3 ++-
 arch/arm/mach-exynos/cpuidle.c                     |    2 +-
 arch/arm/mach-exynos/hotplug.c                     |    2 +-
 arch/arm/mach-exynos/mach-exynos5-dt.c             |    2 +-
 arch/arm/mach-exynos/platsmp.c                     |    2 +-
 arch/arm/mach-exynos/pm.c                          |    2 +-
 arch/arm/mach-exynos/pm_domains.c                  |    3 ++-
 arch/arm/mach-exynos/pmu.c                         |    2 +-
 arch/arm/mach-exynos/{include/mach => }/regs-pmu.h |    0
 9 files changed, 10 insertions(+), 8 deletions(-)
 rename arch/arm/mach-exynos/{include/mach => }/regs-pmu.h (100%)
Quoted 6 lines

This looks OK, but when you committed, you did the move of the include file in another commit (e44de221d3ddb99387b04cfd49483bcd05daa6fb). That means that between that commit and this patch, there's build breakage. Please try to avoid that in the future since if something needs to be bisected near here it can cause problems.

Yeah, you're right. Sorry and I'll try to avoid that per your suggestion.

Thanks,
Kukjin