mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 17:18:59 +00:00
7d7aa2fd92
This change makes the names of Broadcom targets consistent by using the common notation based on SoC/CPU ID (which is used internally anyway), bcmXXXX instead of brcmXXXX. This is even used for target TITLE in make menuconfig already, only the short target name used brcm so far. Despite, since subtargets range from bcm2708 to bcm2711, it seems appropriate to use bcm27xx instead of bcm2708 (again, as already done for BOARDNAME). This also renames the packages brcm2708-userland and brcm2708-gpu-fw. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Acked-by: Álvaro Fernández Rojas <noltari@gmail.com>
46 lines
1.2 KiB
Diff
46 lines
1.2 KiB
Diff
From ea44a81b7daf511788aecaee7575feff359c5d19 Mon Sep 17 00:00:00 2001
|
|
From: Eric Anholt <eric@anholt.net>
|
|
Date: Fri, 11 Jan 2019 17:29:10 -0800
|
|
Subject: [PATCH] soc: bcm: bcm2835-pm: Fix PM_IMAGE_PERI power domain
|
|
support.
|
|
|
|
We don't have ASB master/slave regs for this domain, so just skip that
|
|
step.
|
|
|
|
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
Fixes: 670c672608a1 ("soc: bcm: bcm2835-pm: Add support for power domains under a new binding.")
|
|
---
|
|
drivers/soc/bcm/bcm2835-power.c | 14 ++++++++++++--
|
|
1 file changed, 12 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/soc/bcm/bcm2835-power.c
|
|
+++ b/drivers/soc/bcm/bcm2835-power.c
|
|
@@ -150,7 +150,12 @@ struct bcm2835_power {
|
|
|
|
static int bcm2835_asb_enable(struct bcm2835_power *power, u32 reg)
|
|
{
|
|
- u64 start = ktime_get_ns();
|
|
+ u64 start;
|
|
+
|
|
+ if (!reg)
|
|
+ return 0;
|
|
+
|
|
+ start = ktime_get_ns();
|
|
|
|
/* Enable the module's async AXI bridges. */
|
|
ASB_WRITE(reg, ASB_READ(reg) & ~ASB_REQ_STOP);
|
|
@@ -165,7 +170,12 @@ static int bcm2835_asb_enable(struct bcm
|
|
|
|
static int bcm2835_asb_disable(struct bcm2835_power *power, u32 reg)
|
|
{
|
|
- u64 start = ktime_get_ns();
|
|
+ u64 start;
|
|
+
|
|
+ if (!reg)
|
|
+ return 0;
|
|
+
|
|
+ start = ktime_get_ns();
|
|
|
|
/* Enable the module's async AXI bridges. */
|
|
ASB_WRITE(reg, ASB_READ(reg) | ASB_REQ_STOP);
|