Commit b2f06274 authored by Alexandre Belloni's avatar Alexandre Belloni

ARM: at91: handle CONFIG_PM for armv7m configurations

There is currently no PM support for samx7 but the symbol can still be
selected. This avoids compilation issues.
Acked-by: default avatarNicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
parent 2d4c44e9
...@@ -60,6 +60,7 @@ config SOC_AT91RM9200 ...@@ -60,6 +60,7 @@ config SOC_AT91RM9200
bool "AT91RM9200" bool "AT91RM9200"
depends on ARCH_MULTI_V4T depends on ARCH_MULTI_V4T
select ATMEL_AIC_IRQ select ATMEL_AIC_IRQ
select ATMEL_PM if PM
select ATMEL_ST select ATMEL_ST
select CPU_ARM920T select CPU_ARM920T
select HAVE_AT91_USB_CLK select HAVE_AT91_USB_CLK
...@@ -73,6 +74,7 @@ config SOC_AT91SAM9 ...@@ -73,6 +74,7 @@ config SOC_AT91SAM9
bool "AT91SAM9" bool "AT91SAM9"
depends on ARCH_MULTI_V5 depends on ARCH_MULTI_V5
select ATMEL_AIC_IRQ select ATMEL_AIC_IRQ
select ATMEL_PM if PM
select ATMEL_SDRAMC select ATMEL_SDRAMC
select CPU_ARM926T select CPU_ARM926T
select HAVE_AT91_SMD select HAVE_AT91_SMD
...@@ -131,9 +133,13 @@ config SOC_SAM_V7 ...@@ -131,9 +133,13 @@ config SOC_SAM_V7
config SOC_SAMA5 config SOC_SAMA5
bool bool
select ATMEL_AIC5_IRQ select ATMEL_AIC5_IRQ
select ATMEL_PM if PM
select ATMEL_SDRAMC select ATMEL_SDRAMC
select MEMORY select MEMORY
select SOC_SAM_V7 select SOC_SAM_V7
select SRAM if PM select SRAM if PM
config ATMEL_PM
bool
endif endif
...@@ -9,8 +9,7 @@ obj-$(CONFIG_SOC_SAMA5) += sama5.o ...@@ -9,8 +9,7 @@ obj-$(CONFIG_SOC_SAMA5) += sama5.o
obj-$(CONFIG_SOC_SAMV7) += samv7.o obj-$(CONFIG_SOC_SAMV7) += samv7.o
# Power Management # Power Management
obj-$(CONFIG_PM) += pm.o obj-$(CONFIG_ATMEL_PM) += pm.o pm_suspend.o
obj-$(CONFIG_PM) += pm_suspend.o
ifeq ($(CONFIG_CPU_V7),y) ifeq ($(CONFIG_CPU_V7),y)
AFLAGS_pm_suspend.o := -march=armv7-a AFLAGS_pm_suspend.o := -march=armv7-a
......
...@@ -15,6 +15,15 @@ ...@@ -15,6 +15,15 @@
#include <asm/system_misc.h> #include <asm/system_misc.h>
#include "generic.h" #include "generic.h"
#ifdef CONFIG_PM
/* This function has to be defined for various drivers that are using it */
int at91_suspend_entering_slow_clock(void)
{
return 0;
}
EXPORT_SYMBOL(at91_suspend_entering_slow_clock);
#endif
static const char *const samv7_dt_board_compat[] __initconst = { static const char *const samv7_dt_board_compat[] __initconst = {
"atmel,samv7", "atmel,samv7",
NULL NULL
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment