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>

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 2594b6a412f089be56c156f369e42dd3f0f8e564..7497a28a79d12cbd88c53f05ce9b45743c6855df 100644 (file)
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -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

diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index a189081dccc0602f3adb3dc0c8a3de9b50e41f72..ee34aa34cc51ec284ae2de38376d97f179c414c6 100644 (file)
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -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

diff --git a/arch/arm/mach-at91/samv7.c b/arch/arm/mach-at91/samv7.c
index 11386f190c835039126b2cbe7f59cfec8312ff3a..910f0c68db6290a64263caad842f2c09055fcab4 100644 (file)
--- a/arch/arm/mach-at91/samv7.c
+++ b/arch/arm/mach-at91/samv7.c
@@ -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