|
@@ -70,12 +70,12 @@ static int exynos_pd_power(struct generic_pm_domain *domain, bool power_on)
|
|
}
|
|
}
|
|
|
|
|
|
pwr = power_on ? INT_LOCAL_PWR_EN : 0;
|
|
pwr = power_on ? INT_LOCAL_PWR_EN : 0;
|
|
- __raw_writel(pwr, base);
|
|
|
|
|
|
+ writel_relaxed(pwr, base);
|
|
|
|
|
|
/* Wait max 1ms */
|
|
/* Wait max 1ms */
|
|
timeout = 10;
|
|
timeout = 10;
|
|
|
|
|
|
- while ((__raw_readl(base + 0x4) & INT_LOCAL_PWR_EN) != pwr) {
|
|
|
|
|
|
+ while ((readl_relaxed(base + 0x4) & INT_LOCAL_PWR_EN) != pwr) {
|
|
if (!timeout) {
|
|
if (!timeout) {
|
|
op = (power_on) ? "enable" : "disable";
|
|
op = (power_on) ? "enable" : "disable";
|
|
pr_err("Power domain %s %s failed\n", domain->name, op);
|
|
pr_err("Power domain %s %s failed\n", domain->name, op);
|
|
@@ -185,7 +185,7 @@ static __init int exynos4_pm_init_power_domain(void)
|
|
clk_put(pd->oscclk);
|
|
clk_put(pd->oscclk);
|
|
|
|
|
|
no_clk:
|
|
no_clk:
|
|
- on = __raw_readl(pd->base + 0x4) & INT_LOCAL_PWR_EN;
|
|
|
|
|
|
+ on = readl_relaxed(pd->base + 0x4) & INT_LOCAL_PWR_EN;
|
|
|
|
|
|
pm_genpd_init(&pd->pd, NULL, !on);
|
|
pm_genpd_init(&pd->pd, NULL, !on);
|
|
of_genpd_add_provider_simple(np, &pd->pd);
|
|
of_genpd_add_provider_simple(np, &pd->pd);
|