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

Commit 89693016 authored by Amit Daniel Kachhap's avatar Amit Daniel Kachhap Committed by Kukjin Kim
Browse files

ARM: SAMSUNG: Add SAMSUNG_PM config option to select pm 



This patch enables the selection of samsung pm related stuffs
when SAMSUNG_PM config is enabled and not just when generic PM
config is enabled. Power management for s3c64XX and s3c24XX
is enabled by default and for other platform depends on S5P_PM.
This patch also fixes the following compilation error's when compiling
a platform like exynos5440 which does not select pm stuffs.

arch/arm/mach-exynos/built-in.o: In function '__virt_to_phys':
linux/arch/arm/include/asm/memory.h:175: undefined reference to 's3c_cpu_resume'
linux/arch/arm/include/asm/memory.h:175: undefined reference to 's3c_cpu_resume'
linux/arch/arm/include/asm/memory.h:175: undefined reference to 's3c_cpu_resume'
linux/arch/arm/include/asm/memory.h:175: undefined reference to 's3c_cpu_resume'
arch/arm/mach-exynos/built-in.o: In function 'exynos5_init_irq':
linux/arch/arm/mach-exynos/common.c:492: undefined reference to 's3c_irq_wake'
linux/arch/arm/mach-exynos/common.c:492: undefined reference to 's3c_irq_wake'
arch/arm/mach-exynos/built-in.o: In function 'exynos4_init_irq':
linux/arch/arm/mach-exynos/common.c:476: undefined reference to 's3c_irq_wake'
linux/arch/arm/mach-exynos/common.c:476: undefined reference to 's3c_irq_wake'
arch/arm/plat-samsung/built-in.o: In function 's3c_irqext_wake':
linux/arch/arm/plat-samsung/pm.c:144: undefined reference to 's3c_irqwake_eintallow'
linux/arch/arm/plat-samsung/pm.c:144: undefined reference to 's3c_irqwake_eintallow'
arch/arm/plat-samsung/built-in.o: In function 's3c_pm_enter':
linux/arch/arm/plat-samsung/pm.c:263: undefined reference to 's3c_irqwake_intallow'
linux/arch/arm/plat-samsung/pm.c:263: undefined reference to 's3c_irqwake_intallow'
linux/arch/arm/plat-samsung/pm.c:264: undefined reference to 's3c_irqwake_eintallow'
linux/arch/arm/plat-samsung/pm.c:264: undefined reference to 's3c_irqwake_eintallow'
linux/arch/arm/plat-samsung/pm.c:275: undefined reference to 's3c_pm_save_core'
linux/arch/arm/plat-samsung/pm.c:279: undefined reference to 's3c_pm_configure_extint'
linux/arch/arm/plat-samsung/pm.c:310: undefined reference to 's3c_pm_restore_core'
make: *** [vmlinux] Error 1

Signed-off-by: default avatarAmit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent d817468c

arch/arm/mach-exynos/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ obj- := 


obj-$(CONFIG_ARCH_EXYNOS)	+= common.o



obj-$(CONFIG_PM)		+= pm.o

obj-$(CONFIG_S5P_PM)		+= pm.o

obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o

obj-$(CONFIG_CPU_IDLE)		+= cpuidle.o

arch/arm/mach-exynos/common.h

+0 −1
Original line number Diff line number Diff line
@@ -97,6 +97,5 @@ struct exynos_pmu_conf { 
};



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

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <mach/regs-pmu.h>



#include <plat/cpu.h>

#include <plat/pm.h>



#include "common.h"

arch/arm/plat-samsung/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -29,6 +29,13 @@ config PLAT_S5P 
	help

	  Base platform code for Samsung's S5P series SoC.



config SAMSUNG_PM

	bool

	depends on PM && (PLAT_S3C24XX || ARCH_S3C64XX || ARCH_S5P64X0 || S5P_PM)

	default y

	help

	  Base platform power management code for samsung code



if PLAT_SAMSUNG



# boot configurations

arch/arm/plat-samsung/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ obj-$(CONFIG_SAMSUNG_DMADEV) += dma-ops.o 


# PM support



obj-$(CONFIG_PM)		+= pm.o

obj-$(CONFIG_SAMSUNG_PM)	+= pm.o

obj-$(CONFIG_SAMSUNG_PM_GPIO)	+= pm-gpio.o

obj-$(CONFIG_SAMSUNG_PM_CHECK)	+= pm-check.o