Merge tag 'samsung-mach-exynos-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into late/all

update mach-exynos v2 for v3.12
- enable ARCH_HAS_BANDGAP for exynos SoCs
- always enable PM domains for exynos4x12
- skip C1 cpuidle state for exynos5440

* tag 'samsung-mach-exynos-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: Skip C1 cpuidle state for exynos5440
  ARM: EXYNOS: always enable PM domains support for EXYNOS4X12
  ARM: EXYNOS: enable ARCH_HAS_BANDGAP

Signed-off-by: Olof Johansson <olof@lixom.net>

2 files changed, 10 insertions, 0 deletions

diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 5952e68c76c4..56fe819ee10b 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -36,6 +36,7 @@ config CPU_EXYNOS4210
         bool "SAMSUNG EXYNOS4210"
         default y
         depends on ARCH_EXYNOS4
+        select ARCH_HAS_BANDGAP
         select ARM_CPU_SUSPEND if PM
         select PINCTRL_EXYNOS
         select PM_GENERIC_DOMAINS if PM
@@ -49,7 +50,9 @@ config SOC_EXYNOS4212
         bool "SAMSUNG EXYNOS4212"
         default y
         depends on ARCH_EXYNOS4
+        select ARCH_HAS_BANDGAP
         select PINCTRL_EXYNOS
+        select PM_GENERIC_DOMAINS if PM
         select S5P_PM if PM
         select S5P_SLEEP if PM
         select SAMSUNG_DMADEV
@@ -60,7 +63,9 @@ config SOC_EXYNOS4412
         bool "SAMSUNG EXYNOS4412"
         default y
         depends on ARCH_EXYNOS4
+        select ARCH_HAS_BANDGAP
         select PINCTRL_EXYNOS
+        select PM_GENERIC_DOMAINS if PM
         select SAMSUNG_DMADEV
         help
           Enable EXYNOS4412 SoC support
@@ -69,6 +74,7 @@ config SOC_EXYNOS5250
         bool "SAMSUNG EXYNOS5250"
         default y
         depends on ARCH_EXYNOS5
+        select ARCH_HAS_BANDGAP
         select PINCTRL_EXYNOS
         select PM_GENERIC_DOMAINS if PM
         select S5P_PM if PM
@@ -93,6 +99,7 @@ config SOC_EXYNOS5440
         default y
         depends on ARCH_EXYNOS5
         select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
+        select ARCH_HAS_BANDGAP
         select ARCH_HAS_OPP
         select HAVE_ARM_ARCH_TIMER
         select AUTO_ZRELADDR
diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c
index 225ee8431c72..ac139226d63c 100644
--- a/arch/arm/mach-exynos/cpuidle.c
+++ b/arch/arm/mach-exynos/cpuidle.c
@@ -200,6 +200,9 @@ static int __init exynos4_init_cpuidle(void)
         if (soc_is_exynos5250())
                 exynos5_core_down_clk();
 
+        if (soc_is_exynos5440())
+                exynos4_idle_driver.state_count = 1;
+
         ret = cpuidle_register_driver(&exynos4_idle_driver);
         if (ret) {
                 printk(KERN_ERR "CPUidle failed to register driver\n");