Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2f06274 authored by Alexandre Belloni's avatar Alexandre Belloni
Browse files

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

arch/arm/mach-at91/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-at91/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-at91/samv7.c

+9 −0
Original line number Diff line number Diff line
@@ -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