[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20220122035421.4086618-3-f.fainelli@gmail.com>
Date: Fri, 21 Jan 2022 19:54:19 -0800
From: Florian Fainelli <f.fainelli@...il.com>
To: linux-arm-kernel@...ts.infradead.org
Cc: Florian Fainelli <f.fainelli@...il.com>,
bcm-kernel-feedback-list@...adcom.com (maintainer:BROADCOM BCM7XXX ARM
ARCHITECTURE), Mark Rutland <mark.rutland@....com>,
Lorenzo Pieralisi <lorenzo.pieralisi@....com>,
linux-kernel@...r.kernel.org (open list)
Subject: [PATCH 2/4] soc: bcm: brcmstb: Make legacy PM code depend on !ARM_PSCI_FW
On ARM 32-bit the legacy PM code would conflict with a PSCI based
implementation that we are going to introduce in subsequent commits.
Make PM_BRCMSTB depend on !ARM_PSCI_FW to exclude the two
implementations from each other.
Signed-off-by: Florian Fainelli <f.fainelli@...il.com>
---
drivers/soc/bcm/brcmstb/pm/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/soc/bcm/brcmstb/pm/Makefile b/drivers/soc/bcm/brcmstb/pm/Makefile
index 8e10abb14f8b..86004458260c 100644
--- a/drivers/soc/bcm/brcmstb/pm/Makefile
+++ b/drivers/soc/bcm/brcmstb/pm/Makefile
@@ -1,4 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-only
+ifndef CONFIG_ARM_PSCI_FW
obj-$(CONFIG_ARM) += s2-arm.o pm-arm.o
AFLAGS_s2-arm.o := -march=armv7-a
+endif
obj-$(CONFIG_BMIPS_GENERIC) += s2-mips.o s3-mips.o pm-mips.o
--
2.25.1
Powered by blists - more mailing lists