redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
hifive-unleashed-5.1
Alexandre Belloni 2017-05-31 03:06:22 +02:00
parent 2d4c44e979
commit b2f0627433
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-at91/Kconfig
View File

@ -60,6 +60,7 @@ config SOC_AT91RM9200
bool "AT91RM9200"
depends on ARCH_MULTI_V4T
select ATMEL_AIC_IRQ
select ATMEL_PM if PM
select ATMEL_ST
select CPU_ARM920T
select HAVE_AT91_USB_CLK
@ -73,6 +74,7 @@ config SOC_AT91SAM9
bool "AT91SAM9"
depends on ARCH_MULTI_V5
select ATMEL_AIC_IRQ
select ATMEL_PM if PM
select ATMEL_SDRAMC
select CPU_ARM926T
select HAVE_AT91_SMD
@ -131,9 +133,13 @@ config SOC_SAM_V7
config SOC_SAMA5
bool
select ATMEL_AIC5_IRQ
select ATMEL_PM if PM
select ATMEL_SDRAMC
select MEMORY
select SOC_SAM_V7
select SRAM if PM
config ATMEL_PM
bool
endif

3
arch/arm/mach-at91/Makefile
View File

@ -9,8 +9,7 @@ obj-$(CONFIG_SOC_SAMA5) += sama5.o
obj-$(CONFIG_SOC_SAMV7) += samv7.o
# Power Management
obj-$(CONFIG_PM) += pm.o
obj-$(CONFIG_PM) += pm_suspend.o
obj-$(CONFIG_ATMEL_PM) += pm.o pm_suspend.o
ifeq ($(CONFIG_CPU_V7),y)
AFLAGS_pm_suspend.o := -march=armv7-a

9
arch/arm/mach-at91/samv7.c
View File

@ -15,6 +15,15 @@
#include <asm/system_misc.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 = {
"atmel,samv7",
NULL