Skip to content

Commit

Permalink
soc: bcm: bcm2835-pm: Fix PM_IMAGE_PERI power domain support.
Browse files Browse the repository at this point in the history
We don't have ASB master/slave regs for this domain, so just skip that
step.

Signed-off-by: Eric Anholt <[email protected]>
Fixes: 670c672 ("soc: bcm: bcm2835-pm: Add support for power domains under a new binding.")
  • Loading branch information
anholt committed Mar 4, 2019
1 parent e1dc2b2 commit 7f3d6c8
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions drivers/soc/bcm/bcm2835-power.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -165,7 +170,12 @@ static int bcm2835_asb_enable(struct bcm2835_power *power, u32 reg)

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);
Expand Down

0 comments on commit 7f3d6c8

Please sign in to comment.