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

Commit 46ec1b26 authored by Eric Miao's avatar Eric Miao Committed by Shawn Guo
Browse files

ARM: imx6q: build pm code only when CONFIG_PM selected 



Signed-off-by: default avatarEric Miao <eric.miao@linaro.org>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent 010dc8af

arch/arm/mach-imx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -595,6 +595,7 @@ comment "i.MX6 family:" 


config SOC_IMX6Q

	bool "i.MX6 Quad support"

	select ARM_CPU_SUSPEND if PM

	select ARM_GIC

	select CACHE_L2X0

	select CPU_V7

arch/arm/mach-imx/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -70,4 +70,8 @@ AFLAGS_head-v7.o :=-Wa,-march=armv7-a 
obj-$(CONFIG_SMP) += platsmp.o

obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o

obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o

obj-$(CONFIG_SOC_IMX6Q) += clock-imx6q.o mach-imx6q.o pm-imx6q.o
 
obj-$(CONFIG_SOC_IMX6Q) += clock-imx6q.o mach-imx6q.o



ifeq ($(CONFIG_PM),y)

obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o

endif

arch/arm/mach-imx/head-v7.S

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ ENTRY(v7_secondary_startup) 
ENDPROC(v7_secondary_startup)

#endif



#ifdef CONFIG_PM

/*

 * The following code is located into the .data section.  This is to

 * allow phys_l2x0_saved_regs to be accessed with a relative load
@@ -97,3 +98,4 @@ ENDPROC(v7_cpu_resume) 
	.globl	phys_l2x0_saved_regs

phys_l2x0_saved_regs:

        .long   0

#endif

arch/arm/plat-mxc/include/mach/common.h

+7 −1
Original line number Diff line number Diff line
@@ -131,6 +131,12 @@ extern void imx53_evk_common_init(void); 
extern void imx53_qsb_common_init(void);

extern void imx53_smd_common_init(void);

extern int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode);

extern void imx6q_pm_init(void);

extern void imx6q_clock_map_io(void);



#ifdef CONFIG_PM

extern void imx6q_pm_init(void);

#else

static inline void imx6q_pm_init(void) {}

#endif



#endif