Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccd458c1 authored by Kukjin Kim's avatar Kukjin Kim
Browse files

ARM: EXYNOS: move mach/pmu.h file into common.h 



Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent c48bcc2d

arch/arm/mach-exynos/common.c

+0 −1
Original line number Diff line number Diff line
@@ -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>

arch/arm/mach-exynos/common.h

+20 −0
Original line number Diff line number Diff line
@@ -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 */

arch/arm/mach-exynos/cpuidle.c

+2 −1
Original line number Diff line number Diff line
@@ -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))

arch/arm/mach-exynos/include/mach/pmu.h

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
/* 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 */

arch/arm/mach-exynos/pm.c

+2 −1
Original line number Diff line number Diff line
@@ -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, },