[V4,11/11] soc: bcm: bcm2835-power: Bypass power_on/off() calls

Commit Message

Stefan Wahren June 25, 2022, 11:36 a.m. UTC

From: Nicolas Saenz Julienne <[e-mail]>

Bypass power_on/power_off() when running on BCM2711 as they are not
needed.

Signed-off-by: Nicolas Saenz Julienne <[e-mail]>
Signed-off-by: Stefan Wahren <[e-mail]>
Reviewed-by: Peter Robinson <[e-mail]>
---
 drivers/soc/bcm/bcm2835-power.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Florian Fainelli June 27, 2022, 5:28 p.m. UTC | #1

On Sat, 25 Jun 2022 13:36:19 +0200, Stefan Wahren <[e-mail]> wrote:
> From: Nicolas Saenz Julienne <[e-mail]>
> 
> Bypass power_on/power_off() when running on BCM2711 as they are not
> needed.
> 
> Signed-off-by: Nicolas Saenz Julienne <[e-mail]>
> Signed-off-by: Stefan Wahren <[e-mail]>
> Reviewed-by: Peter Robinson <[e-mail]>
> ---

Applied to https://github.com/Broadcom/stblinux/commits/drivers/next, thanks!
--
Florian

Florian Fainelli June 28, 2022, 4:26 p.m. UTC | #2

On 6/25/22 04:36, Stefan Wahren wrote:
> From: Nicolas Saenz Julienne <[e-mail]>
> 
> Bypass power_on/power_off() when running on BCM2711 as they are not
> needed.
> 
> Signed-off-by: Nicolas Saenz Julienne <[e-mail]>
> Signed-off-by: Stefan Wahren <[e-mail]>
> Reviewed-by: Peter Robinson <[e-mail]>

Acked-by: Florian Fainelli <[e-mail]>

Patch

diff --git a/drivers/soc/bcm/bcm2835-power.c b/drivers/soc/bcm/bcm2835-power.c
index 1e06d91c0739..5bcd047768b6 100644
--- a/drivers/soc/bcm/bcm2835-power.c
+++ b/drivers/soc/bcm/bcm2835-power.c
@@ -198,6 +198,10 @@  static int bcm2835_power_power_off(struct bcm2835_power_domain *pd, u32 pm_reg)
 {
 	struct bcm2835_power *power = pd->power;
 
+	/* We don't run this on BCM2711 */
+	if (power->rpivid_asb)
+		return 0;
+
 	/* Enable functional isolation */
 	PM_WRITE(pm_reg, PM_READ(pm_reg) & ~PM_ISFUNC);
 
@@ -219,6 +223,10 @@  static int bcm2835_power_power_on(struct bcm2835_power_domain *pd, u32 pm_reg)
 	int inrush;
 	bool powok;
 
+	/* We don't run this on BCM2711 */
+	if (power->rpivid_asb)
+		return 0;
+
 	/* If it was already powered on by the fw, leave it that way. */
 	if (PM_READ(pm_reg) & PM_POWUP)
 		return 0;