diff options
author | Wenyou Yang <wenyou.yang@atmel.com> | 2015-03-08 23:44:50 -0400 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-03-13 06:12:05 -0400 |
commit | 896bc871a4a2db13212831749d21ffa7f405c73b (patch) | |
tree | ab24f8889e7c6c71bd1e6d3e86068dadcf31d26a /arch/arm/mach-at91 | |
parent | 05d5970c723cb6d11cef793c77cd07d86d5d4a94 (diff) |
ARM: at91: move "select SRAM" under SOC_AT91SAM9 and SOC_SAMA5
To simply the PM config the CONFIG_AT91_SLOW_CLOCK option will be removed,
so move "select SRAM" from under AT91_SLOW_CLOCK, add "select SRAM if PM"
under SOC_AT91SAM9 and SOC_SAMA5
Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Tested-by: Sylvain Rochet <sylvain.rochet@finsecur.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91')
-rw-r--r-- | arch/arm/mach-at91/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index d65981a8a4a9..cd0e996565b3 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig | |||
@@ -24,6 +24,7 @@ config SOC_SAMA5 | |||
24 | select GENERIC_CLOCKEVENTS | 24 | select GENERIC_CLOCKEVENTS |
25 | select MEMORY | 25 | select MEMORY |
26 | select ATMEL_SDRAMC | 26 | select ATMEL_SDRAMC |
27 | select SRAM if PM | ||
27 | 28 | ||
28 | menu "Atmel AT91 System-on-Chip" | 29 | menu "Atmel AT91 System-on-Chip" |
29 | 30 | ||
@@ -80,6 +81,7 @@ config SOC_AT91RM9200 | |||
80 | select CPU_ARM920T | 81 | select CPU_ARM920T |
81 | select GENERIC_CLOCKEVENTS | 82 | select GENERIC_CLOCKEVENTS |
82 | select HAVE_AT91_USB_CLK | 83 | select HAVE_AT91_USB_CLK |
84 | select SRAM if PM | ||
83 | 85 | ||
84 | config SOC_AT91SAM9 | 86 | config SOC_AT91SAM9 |
85 | bool "AT91SAM9" | 87 | bool "AT91SAM9" |
@@ -93,6 +95,7 @@ config SOC_AT91SAM9 | |||
93 | select HAVE_AT91_UTMI | 95 | select HAVE_AT91_UTMI |
94 | select HAVE_FB_ATMEL | 96 | select HAVE_FB_ATMEL |
95 | select MEMORY | 97 | select MEMORY |
98 | select SRAM if PM | ||
96 | help | 99 | help |
97 | Select this if you are using one of those Atmel SoC: | 100 | Select this if you are using one of those Atmel SoC: |
98 | AT91SAM9260 | 101 | AT91SAM9260 |
@@ -117,7 +120,6 @@ comment "AT91 Feature Selections" | |||
117 | 120 | ||
118 | config AT91_SLOW_CLOCK | 121 | config AT91_SLOW_CLOCK |
119 | bool "Suspend-to-RAM disables main oscillator" | 122 | bool "Suspend-to-RAM disables main oscillator" |
120 | select SRAM | ||
121 | depends on SUSPEND | 123 | depends on SUSPEND |
122 | help | 124 | help |
123 | Select this if you want Suspend-to-RAM to save the most power | 125 | Select this if you want Suspend-to-RAM to save the most power |