diff options
| -rw-r--r-- | arch/arm/mach-exynos/Kconfig | 7 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/cpuidle.c | 3 |
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 | |||
| 36 | bool "SAMSUNG EXYNOS4210" | 36 | bool "SAMSUNG EXYNOS4210" |
| 37 | default y | 37 | default y |
| 38 | depends on ARCH_EXYNOS4 | 38 | depends on ARCH_EXYNOS4 |
| 39 | select ARCH_HAS_BANDGAP | ||
| 39 | select ARM_CPU_SUSPEND if PM | 40 | select ARM_CPU_SUSPEND if PM |
| 40 | select PINCTRL_EXYNOS | 41 | select PINCTRL_EXYNOS |
| 41 | select PM_GENERIC_DOMAINS if PM | 42 | select PM_GENERIC_DOMAINS if PM |
| @@ -49,7 +50,9 @@ config SOC_EXYNOS4212 | |||
| 49 | bool "SAMSUNG EXYNOS4212" | 50 | bool "SAMSUNG EXYNOS4212" |
| 50 | default y | 51 | default y |
| 51 | depends on ARCH_EXYNOS4 | 52 | depends on ARCH_EXYNOS4 |
| 53 | select ARCH_HAS_BANDGAP | ||
| 52 | select PINCTRL_EXYNOS | 54 | select PINCTRL_EXYNOS |
| 55 | select PM_GENERIC_DOMAINS if PM | ||
| 53 | select S5P_PM if PM | 56 | select S5P_PM if PM |
| 54 | select S5P_SLEEP if PM | 57 | select S5P_SLEEP if PM |
| 55 | select SAMSUNG_DMADEV | 58 | select SAMSUNG_DMADEV |
| @@ -60,7 +63,9 @@ config SOC_EXYNOS4412 | |||
| 60 | bool "SAMSUNG EXYNOS4412" | 63 | bool "SAMSUNG EXYNOS4412" |
| 61 | default y | 64 | default y |
| 62 | depends on ARCH_EXYNOS4 | 65 | depends on ARCH_EXYNOS4 |
| 66 | select ARCH_HAS_BANDGAP | ||
| 63 | select PINCTRL_EXYNOS | 67 | select PINCTRL_EXYNOS |
| 68 | select PM_GENERIC_DOMAINS if PM | ||
| 64 | select SAMSUNG_DMADEV | 69 | select SAMSUNG_DMADEV |
| 65 | help | 70 | help |
| 66 | Enable EXYNOS4412 SoC support | 71 | Enable EXYNOS4412 SoC support |
| @@ -69,6 +74,7 @@ config SOC_EXYNOS5250 | |||
| 69 | bool "SAMSUNG EXYNOS5250" | 74 | bool "SAMSUNG EXYNOS5250" |
| 70 | default y | 75 | default y |
| 71 | depends on ARCH_EXYNOS5 | 76 | depends on ARCH_EXYNOS5 |
| 77 | select ARCH_HAS_BANDGAP | ||
| 72 | select PINCTRL_EXYNOS | 78 | select PINCTRL_EXYNOS |
| 73 | select PM_GENERIC_DOMAINS if PM | 79 | select PM_GENERIC_DOMAINS if PM |
| 74 | select S5P_PM if PM | 80 | select S5P_PM if PM |
| @@ -93,6 +99,7 @@ config SOC_EXYNOS5440 | |||
| 93 | default y | 99 | default y |
| 94 | depends on ARCH_EXYNOS5 | 100 | depends on ARCH_EXYNOS5 |
| 95 | select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE | 101 | select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE |
| 102 | select ARCH_HAS_BANDGAP | ||
| 96 | select ARCH_HAS_OPP | 103 | select ARCH_HAS_OPP |
| 97 | select HAVE_ARM_ARCH_TIMER | 104 | select HAVE_ARM_ARCH_TIMER |
| 98 | select AUTO_ZRELADDR | 105 | 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) | |||
| 200 | if (soc_is_exynos5250()) | 200 | if (soc_is_exynos5250()) |
| 201 | exynos5_core_down_clk(); | 201 | exynos5_core_down_clk(); |
| 202 | 202 | ||
| 203 | if (soc_is_exynos5440()) | ||
| 204 | exynos4_idle_driver.state_count = 1; | ||
| 205 | |||
| 203 | ret = cpuidle_register_driver(&exynos4_idle_driver); | 206 | ret = cpuidle_register_driver(&exynos4_idle_driver); |
| 204 | if (ret) { | 207 | if (ret) { |
| 205 | printk(KERN_ERR "CPUidle failed to register driver\n"); | 208 | printk(KERN_ERR "CPUidle failed to register driver\n"); |
