From: Olof Johansson <olof@lixom.net>
Date: Thu, 29 May 2014 18:28:10 +0000 (-0700)
Subject: Merge branch 'next/drivers' into for-next
X-Git-Tag: next-20140530~119^2~7
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=196a2f5f9aa2d83bdbbe1771d07e1c2cdad73917;p=karo-tx-linux.git

Merge branch 'next/drivers' into for-next

* next/drivers: (21 commits)
  ARM: EXYNOS: Fix kernel panic when unplugging CPU1 on exynos
  ARM: EXYNOS: Move the driver to drivers/cpuidle directory
  ARM: EXYNOS: Cleanup all unneeded headers from cpuidle.c
  ARM: EXYNOS: Pass the AFTR callback to the platform_data
  ARM: EXYNOS: Move S5P_CHECK_SLEEP into pm.c
  ARM: EXYNOS: Move the power sequence call in the cpu_pm notifier
  ARM: EXYNOS: Move the AFTR state function into pm.c
  ARM: EXYNOS: Encapsulate the AFTR code into a function
  ARM: EXYNOS: Disable cpuidle for exynos5440
  ARM: EXYNOS: Encapsulate boot vector code into a function for cpuidle
  ARM: EXYNOS: Pass wakeup mask parameter to function for cpuidle
  ARM: EXYNOS: Remove ifdef for scu_enable in pm
  ARM: EXYNOS: Move scu_enable in the cpu_pm notifier
  ARM: EXYNOS: Use the cpu_pm notifier for pm
  ARM: EXYNOS: Fix S5P_WAKEUP_STAT call for cpuidle
  ARM: EXYNOS: Move some code inside the idle_finisher for cpuidle
  ARM: EXYNOS: Encapsulate register access inside a function for pm
  ARM: EXYNOS: Change function name prefix for cpuidle
  ARM: EXYNOS: Use cpuidle_register
  ARM: EXYNOS: Prevent forward declaration for cpuidle
  ...

Conflicts:
	arch/arm/mach-exynos/cpuidle.c
---

196a2f5f9aa2d83bdbbe1771d07e1c2cdad73917
diff --cc arch/arm/mach-exynos/Makefile
index 2e0666d31e75,3705048f744a..df809039b017
--- a/arch/arm/mach-exynos/Makefile
+++ b/arch/arm/mach-exynos/Makefile
@@@ -16,8 -16,9 +16,7 @@@ obj-$(CONFIG_ARCH_EXYNOS)	+= exynos.o p
  
  obj-$(CONFIG_PM_SLEEP)		+= pm.o sleep.o
  obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o
- obj-$(CONFIG_CPU_IDLE)		+= cpuidle.o
  
 -obj-$(CONFIG_ARCH_EXYNOS)	+= pmu.o
 -
  obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o
  
  obj-$(CONFIG_HOTPLUG_CPU)	+= hotplug.o
diff --cc arch/arm/mach-exynos/common.h
index ae5f64808b16,5848d3cc29e9..a012bc15e083
--- a/arch/arm/mach-exynos/common.h
+++ b/arch/arm/mach-exynos/common.h
@@@ -138,8 -70,6 +139,9 @@@ extern int  exynos_cpu_power_state(int 
  extern void exynos_cluster_power_down(int cluster);
  extern void exynos_cluster_power_up(int cluster);
  extern int  exynos_cluster_power_state(int cluster);
+ extern void exynos_enter_aftr(void);
  
 +extern void s5p_init_cpu(void __iomem *cpuid_addr);
 +extern unsigned int samsung_rev(void);
 +
  #endif /* __ARCH_ARM_MACH_EXYNOS_COMMON_H */