All of lore.kernel.org
 help / color / mirror / Atom feed
From: Florian Fainelli <f.fainelli@gmail.com>
To: linux-arm-kernel@lists.infradead.org
Cc: Florian Fainelli <f.fainelli@gmail.com>,
	bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM
	BCM7XXX ARM ARCHITECTURE), Mark Rutland <mark.rutland@arm.com>,
	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
	linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 2/4] soc: bcm: brcmstb: Make legacy PM code depend on !ARM_PSCI_FW
Date: Fri, 21 Jan 2022 19:54:19 -0800	[thread overview]
Message-ID: <20220122035421.4086618-3-f.fainelli@gmail.com> (raw)
In-Reply-To: <20220122035421.4086618-1-f.fainelli@gmail.com>

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@gmail.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


WARNING: multiple messages have this Message-ID (diff)
From: Florian Fainelli <f.fainelli@gmail.com>
To: linux-arm-kernel@lists.infradead.org
Cc: Florian Fainelli <f.fainelli@gmail.com>,
	bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM
	BCM7XXX ARM ARCHITECTURE), Mark Rutland <mark.rutland@arm.com>,
	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
	linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 2/4] soc: bcm: brcmstb: Make legacy PM code depend on !ARM_PSCI_FW
Date: Fri, 21 Jan 2022 19:54:19 -0800	[thread overview]
Message-ID: <20220122035421.4086618-3-f.fainelli@gmail.com> (raw)
In-Reply-To: <20220122035421.4086618-1-f.fainelli@gmail.com>

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@gmail.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


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2022-01-22  3:55 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-22  3:54 [PATCH 0/4] Broadcom STB PM PSCI extensions Florian Fainelli
2022-01-22  3:54 ` Florian Fainelli
2022-01-22  3:54 ` [PATCH 1/4] firmware: psci: Export a couple of suspend symbols Florian Fainelli
2022-01-22  3:54   ` Florian Fainelli
2022-01-22 12:22   ` kernel test robot
2022-01-22 12:22     ` kernel test robot
2022-01-22  3:54 ` Florian Fainelli [this message]
2022-01-22  3:54   ` [PATCH 2/4] soc: bcm: brcmstb: Make legacy PM code depend on !ARM_PSCI_FW Florian Fainelli
2022-01-22  3:54 ` [PATCH 3/4] soc: bcm: brcmstb: Added support for PSCI system suspend operations Florian Fainelli
2022-01-22  3:54   ` Florian Fainelli
2022-01-22  6:09   ` kernel test robot
2022-01-22  6:09     ` kernel test robot
2022-01-22  7:10   ` kernel test robot
2022-01-22  7:10     ` kernel test robot
2022-02-03 12:09   ` Mark Rutland
2022-02-03 12:09     ` Mark Rutland
2022-02-03 18:45     ` Florian Fainelli
2022-02-03 18:45       ` Florian Fainelli
2022-01-22  3:54 ` [PATCH 4/4] Documentation: ABI: Document Broadcom STB PSCI firmware files Florian Fainelli
2022-01-22  3:54   ` Florian Fainelli
2022-01-27  3:55 ` [PATCH 0/4] Broadcom STB PM PSCI extensions Florian Fainelli
2022-01-27  3:55   ` Florian Fainelli
2022-02-03 10:47 ` Mark Rutland
2022-02-03 10:47   ` Mark Rutland
2022-02-03 18:32   ` Florian Fainelli
2022-02-03 18:32     ` Florian Fainelli
2022-02-03 11:14 ` Sudeep Holla
2022-02-03 11:14   ` Sudeep Holla
2022-02-03 17:36   ` Florian Fainelli
2022-02-03 17:36     ` Florian Fainelli
2022-02-03 18:52     ` Sudeep Holla
2022-02-03 18:52       ` Sudeep Holla
2022-02-03 19:33       ` Florian Fainelli
2022-02-03 19:33         ` Florian Fainelli
2022-02-07 16:27         ` Sudeep Holla
2022-02-07 16:27           ` Sudeep Holla
2022-02-14 18:12           ` Florian Fainelli
2022-02-14 18:12             ` Florian Fainelli

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220122035421.4086618-3-f.fainelli@gmail.com \
    --to=f.fainelli@gmail.com \
    --cc=bcm-kernel-feedback-list@broadcom.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lorenzo.pieralisi@arm.com \
    --cc=mark.rutland@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.