From patchwork Tue Feb 22 15:08:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= X-Patchwork-Id: 12755397 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D89B8C433F5 for ; Tue, 22 Feb 2022 15:21:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=JkISUm7pU/DHUJQhSbmzj4UZZo8488G1YFCoyKSH7jo=; b=2F7Bh2Dd/kQT3G TuastumtQfjKwz5ZiRpDnM/S+zoW6jd4pJoRPub+pAQLXR7JxSZIdoSr2AiOPsE7CYw3aoZYGSGqW 1a/bEWMTOHIVsi+tJVSDN2m0fbGK7LO+xmnHJ2MMOOAaeXzLrOIUMwVhqq7atFZaxOFQ9IWGBxQRg pXHztnTi5HsGpS/XKFYqvbhIAAJahVeIzPRKrk2FlxEMVmDq40BOk16K5Zc8wpSKodfcCfDl3bYjD sZTCn+hiDSuQ620Q0AQe6SIm1pmuSs4FKZFTHoNEUQvdNtE1EOzIz/DHyT900pWaQoB+sEPE2Xg+f IIq0EchslYuehXKUdE7Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nMWxK-00AA52-DO; Tue, 22 Feb 2022 15:20:00 +0000 Received: from relay9-d.mail.gandi.net ([2001:4b98:dc4:8::229]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nMWoR-00A5sF-Cg for linux-arm-kernel@lists.infradead.org; Tue, 22 Feb 2022 15:10:49 +0000 Received: (Authenticated sender: clement.leger@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 898D9FF810; Tue, 22 Feb 2022 15:10:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1645542645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OOzUysK3jq7AptlFGEUXnbGP4YiZSWMiMjPJXH0yfpY=; b=KoqrDVr6S5OlXWjEh9c4iYJKN8olSySo1900gjM5a4ZLYyl6bswEjGjPjdRduSC94LCTO5 kj2rP9rEZ4nYnOwyqg10Fb1H74hEgYfy4E3V73F6j35Q0cSdz88m0kdOxtzB1kTan/mjXw 17Q9zmwPbQLPOQFB+CmydJ/NQy0CsVigvKTaoB5Wb0YAhre5bN9NyRtEpSKk6IKygezoxK +whlrdy29Xm7kZjgkZwugh/wIV0UlY55jBFvvV5ybxVzVL4cOmYr7XU05ZhNsEzCOuSCQF WGagLCDdZDvqrh0wlILMqm5AbS4ItvD/njce9TQMRQX3+3vwLOlF7DIGgmG0Ew== From: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= To: Russell King , Nicolas Ferre , Alexandre Belloni , Ludovic Desroches Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Thomas Petazzoni , =?utf-8?b?Q2zDqW1lbnQgTMOp?= =?utf-8?b?Z2Vy?= Subject: [PATCH 4/4] ARM: at91: pm: fix defines to select *_pm_init functions Date: Tue, 22 Feb 2022 16:08:46 +0100 Message-Id: <20220222150846.255307-5-clement.leger@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220222150846.255307-1-clement.leger@bootlin.com> References: <20220222150846.255307-1-clement.leger@bootlin.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220222_071047_674663_A256730F X-CRM114-Status: GOOD ( 11.15 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org These defines actually don't depend on CONFIG_PM but CONFIG_ATMEL_PM. In the same time, add a "or" with CONFIG_ATMEL_SECURE_PM since it can also provides these functions. Signed-off-by: Clément Léger --- arch/arm/mach-at91/generic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h index 0c3960a8b3eb..279ab7e0cdca 100644 --- a/arch/arm/mach-at91/generic.h +++ b/arch/arm/mach-at91/generic.h @@ -8,7 +8,7 @@ #ifndef _AT91_GENERIC_H #define _AT91_GENERIC_H -#ifdef CONFIG_PM +#if defined(CONFIG_ATMEL_PM) || defined(CONFIG_ATMEL_SECURE_PM) extern void __init at91rm9200_pm_init(void); extern void __init at91sam9_pm_init(void); extern void __init sam9x60_pm_init(void);