|
@@ -28,7 +28,7 @@
|
|
|
*/
|
|
|
unsigned int __init scu_get_core_count(void __iomem *scu_base)
|
|
|
{
|
|
|
- unsigned int ncores = __raw_readl(scu_base + SCU_CONFIG);
|
|
|
+ unsigned int ncores = readl_relaxed(scu_base + SCU_CONFIG);
|
|
|
return (ncores & 0x03) + 1;
|
|
|
}
|
|
|
|
|
@@ -42,19 +42,19 @@ void scu_enable(void __iomem *scu_base)
|
|
|
#ifdef CONFIG_ARM_ERRATA_764369
|
|
|
/* Cortex-A9 only */
|
|
|
if ((read_cpuid_id() & 0xff0ffff0) == 0x410fc090) {
|
|
|
- scu_ctrl = __raw_readl(scu_base + 0x30);
|
|
|
+ scu_ctrl = readl_relaxed(scu_base + 0x30);
|
|
|
if (!(scu_ctrl & 1))
|
|
|
- __raw_writel(scu_ctrl | 0x1, scu_base + 0x30);
|
|
|
+ writel_relaxed(scu_ctrl | 0x1, scu_base + 0x30);
|
|
|
}
|
|
|
#endif
|
|
|
|
|
|
- scu_ctrl = __raw_readl(scu_base + SCU_CTRL);
|
|
|
+ scu_ctrl = readl_relaxed(scu_base + SCU_CTRL);
|
|
|
/* already enabled? */
|
|
|
if (scu_ctrl & 1)
|
|
|
return;
|
|
|
|
|
|
scu_ctrl |= 1;
|
|
|
- __raw_writel(scu_ctrl, scu_base + SCU_CTRL);
|
|
|
+ writel_relaxed(scu_ctrl, scu_base + SCU_CTRL);
|
|
|
|
|
|
/*
|
|
|
* Ensure that the data accessed by CPU0 before the SCU was
|
|
@@ -80,9 +80,9 @@ int scu_power_mode(void __iomem *scu_base, unsigned int mode)
|
|
|
if (mode > 3 || mode == 1 || cpu > 3)
|
|
|
return -EINVAL;
|
|
|
|
|
|
- val = __raw_readb(scu_base + SCU_CPU_STATUS + cpu) & ~0x03;
|
|
|
+ val = readb_relaxed(scu_base + SCU_CPU_STATUS + cpu) & ~0x03;
|
|
|
val |= mode;
|
|
|
- __raw_writeb(val, scu_base + SCU_CPU_STATUS + cpu);
|
|
|
+ writeb_relaxed(val, scu_base + SCU_CPU_STATUS + cpu);
|
|
|
|
|
|
return 0;
|
|
|
}
|