soc: bcm: bcm2835-power: Resolve ASB register macros

The macros in order to access the ASB registers have a hard coded base
address. So extending them for other platforms would make them harder
to read. As a solution resolve these macros.

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: Peter Robinson <pbrobinson@gmail.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20220625113619.15944-10-stefan.wahren@i2se.com

diff --git a/drivers/soc/bcm/bcm2835-power.c b/drivers/soc/bcm/bcm2835-power.c
index 77dc9e62b207ada23a55c4e4a4ad656d86acc266..9c352f66e6d5bc56e02b5ad785c064d957a76abe 100644 (file)
--- a/drivers/soc/bcm/bcm2835-power.c
+++ b/drivers/soc/bcm/bcm2835-power.c
@@ -126,9 +126,6 @@
 
 #define ASB_AXI_BRDG_ID                        0x20
 
-#define ASB_READ(reg) readl(power->asb + (reg))
-#define ASB_WRITE(reg, val) writel(PM_PASSWORD | (val), power->asb + (reg))
-
 struct bcm2835_power_domain {
        struct generic_pm_domain base;
        struct bcm2835_power *power;
@@ -150,7 +147,9 @@ struct bcm2835_power {
 
 static int bcm2835_asb_control(struct bcm2835_power *power, u32 reg, bool enable)
 {
+       void __iomem *base = power->asb;
        u64 start;
+       u32 val;
 
        if (!reg)
                return 0;
@@ -159,12 +158,13 @@ static int bcm2835_asb_control(struct bcm2835_power *power, u32 reg, bool enable
 
        /* Enable the module's async AXI bridges. */
        if (enable) {
-               ASB_WRITE(reg, ASB_READ(reg) & ~ASB_REQ_STOP);
+               val = readl(base + reg) & ~ASB_REQ_STOP;
        } else {
-               ASB_WRITE(reg, ASB_READ(reg) | ASB_REQ_STOP);
+               val = readl(base + reg) | ASB_REQ_STOP;
        }
+       writel(PM_PASSWORD | val, base + reg);
 
-       while (ASB_READ(reg) & ASB_ACK) {
+       while (readl(base + reg) & ASB_ACK) {
                cpu_relax();
                if (ktime_get_ns() - start >= 1000)
                        return -ETIMEDOUT;
@@ -622,7 +622,7 @@ static int bcm2835_power_probe(struct platform_device *pdev)
        power->base = pm->base;
        power->asb = pm->asb;
 
-       id = ASB_READ(ASB_AXI_BRDG_ID);
+       id = readl(power->asb + ASB_AXI_BRDG_ID);
        if (id != 0x62726467 /* "BRDG" */) {
                dev_err(dev, "ASB register ID returned 0x%08x\n", id);
                return -ENODEV;