Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758985AbcJTJmX (ORCPT ); Thu, 20 Oct 2016 05:42:23 -0400 Received: from up.free-electrons.com ([163.172.77.33]:54077 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750845AbcJTJln (ORCPT ); Thu, 20 Oct 2016 05:41:43 -0400 From: Alexandre Belloni To: Nicolas Ferre Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Szemz=C5=91=20Andr=C3=A1s?= , Alexandre Belloni Subject: [PATCH v2 4/6] ARM: at91: handle CONFIG_PM for armv7m configurations Date: Thu, 20 Oct 2016 11:41:33 +0200 Message-Id: <20161020094135.18221-5-alexandre.belloni@free-electrons.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161020094135.18221-1-alexandre.belloni@free-electrons.com> References: <20161020094135.18221-1-alexandre.belloni@free-electrons.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2219 Lines: 80 There is currently no PM support for samx7 but the symbol can still be selected. This avoids compilation issues. Signed-off-by: Alexandre Belloni --- arch/arm/mach-at91/Kconfig | 6 ++++++ arch/arm/mach-at91/Makefile | 3 +-- arch/arm/mach-at91/samx7.c | 9 +++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index bade64e0cb49..34fa561aa853 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -59,6 +59,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 @@ -72,6 +73,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 @@ -130,9 +132,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 84956a18d604..116691714bb8 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -10,8 +10,7 @@ obj-$(CONFIG_SOC_SAMA5) += sama5.o obj-$(CONFIG_SOC_SAMX7) += samx7.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/samx7.c b/arch/arm/mach-at91/samx7.c index bd33bc56278e..5bd76cb5076c 100644 --- a/arch/arm/mach-at91/samx7.c +++ b/arch/arm/mach-at91/samx7.c @@ -16,6 +16,15 @@ #include "generic.h" #include "soc.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 struct at91_soc samx7_socs[] = { AT91_SOC(SAME70Q21_CIDR_MATCH, SAME70Q21_EXID_MATCH, "same70q21", "samx7"), -- 2.9.3