Commit 8b6bed67 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Geert Uytterhoeven

soc: renesas: rmobile-sysc: Stop using __raw_*() I/O accessors

There is no reason to keep on using the __raw_{read,write}l() I/O
accessors in Renesas ARM driver code.  Switch to using the plain
{read,write}l() I/O accessors, to have a chance that this works on
big-endian.
Suggested-by: default avatarArnd Bergmann <arnd@kernel.org>
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20201119125214.4065925-1-geert+renesas@glider.be
parent cf25d802
...@@ -57,19 +57,19 @@ static int rmobile_pd_power_down(struct generic_pm_domain *genpd) ...@@ -57,19 +57,19 @@ static int rmobile_pd_power_down(struct generic_pm_domain *genpd)
return ret; return ret;
} }
if (__raw_readl(rmobile_pd->base + PSTR) & mask) { if (readl(rmobile_pd->base + PSTR) & mask) {
unsigned int retry_count; unsigned int retry_count;
__raw_writel(mask, rmobile_pd->base + SPDCR); writel(mask, rmobile_pd->base + SPDCR);
for (retry_count = PSTR_RETRIES; retry_count; retry_count--) { for (retry_count = PSTR_RETRIES; retry_count; retry_count--) {
if (!(__raw_readl(rmobile_pd->base + SPDCR) & mask)) if (!(readl(rmobile_pd->base + SPDCR) & mask))
break; break;
cpu_relax(); cpu_relax();
} }
} }
pr_debug("%s: Power off, 0x%08x -> PSTR = 0x%08x\n", genpd->name, mask, pr_debug("%s: Power off, 0x%08x -> PSTR = 0x%08x\n", genpd->name, mask,
__raw_readl(rmobile_pd->base + PSTR)); readl(rmobile_pd->base + PSTR));
return 0; return 0;
} }
...@@ -80,13 +80,13 @@ static int __rmobile_pd_power_up(struct rmobile_pm_domain *rmobile_pd) ...@@ -80,13 +80,13 @@ static int __rmobile_pd_power_up(struct rmobile_pm_domain *rmobile_pd)
unsigned int retry_count; unsigned int retry_count;
int ret = 0; int ret = 0;
if (__raw_readl(rmobile_pd->base + PSTR) & mask) if (readl(rmobile_pd->base + PSTR) & mask)
return ret; return ret;
__raw_writel(mask, rmobile_pd->base + SWUCR); writel(mask, rmobile_pd->base + SWUCR);
for (retry_count = 2 * PSTR_RETRIES; retry_count; retry_count--) { for (retry_count = 2 * PSTR_RETRIES; retry_count; retry_count--) {
if (!(__raw_readl(rmobile_pd->base + SWUCR) & mask)) if (!(readl(rmobile_pd->base + SWUCR) & mask))
break; break;
if (retry_count > PSTR_RETRIES) if (retry_count > PSTR_RETRIES)
udelay(PSTR_DELAY_US); udelay(PSTR_DELAY_US);
...@@ -98,7 +98,7 @@ static int __rmobile_pd_power_up(struct rmobile_pm_domain *rmobile_pd) ...@@ -98,7 +98,7 @@ static int __rmobile_pd_power_up(struct rmobile_pm_domain *rmobile_pd)
pr_debug("%s: Power on, 0x%08x -> PSTR = 0x%08x\n", pr_debug("%s: Power on, 0x%08x -> PSTR = 0x%08x\n",
rmobile_pd->genpd.name, mask, rmobile_pd->genpd.name, mask,
__raw_readl(rmobile_pd->base + PSTR)); readl(rmobile_pd->base + PSTR));
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment