renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-28 15:13:55 +08:00
Code

ARM: EXYNOS: Fixup endian in pm/pmu

Browse Source 
Fix the PMU code endian access code to deal with kernels built for big endian
operation.

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
This commit is contained in:
Ben Dooks 2016-06-21 11:20:25 +01:00 committed by Krzysztof Kozlowski
parent 458ad21df1
commit d0ceee0b4d
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-exynos/common.h
View File

@ -174,12 +174,12 @@ extern int exynos_get_boot_addr(u32 core_id, unsigned long *boot_addr);
static inline void pmu_raw_writel(u32 val, u32 offset) static inline void pmu_raw_writel(u32 val, u32 offset)
{ {
__raw_writel(val, pmu_base_addr + offset); writel_relaxed(val, pmu_base_addr + offset);
} }
static inline u32 pmu_raw_readl(u32 offset) static inline u32 pmu_raw_readl(u32 offset)
{ {
return __raw_readl(pmu_base_addr + offset); return readl_relaxed(pmu_base_addr + offset);
} }
#endif /* __ARCH_ARM_MACH_EXYNOS_COMMON_H */ #endif /* __ARCH_ARM_MACH_EXYNOS_COMMON_H */

6
arch/arm/mach-exynos/pm.c
View File

@ -132,9 +132,9 @@ static void exynos_set_wakeupmask(long mask)
static void exynos_cpu_set_boot_vector(long flags) static void exynos_cpu_set_boot_vector(long flags)
{ {
__raw_writel(virt_to_phys(exynos_cpu_resume), writel_relaxed(virt_to_phys(exynos_cpu_resume),
exynos_boot_vector_addr()); exynos_boot_vector_addr());
__raw_writel(flags, exynos_boot_vector_flag()); writel_relaxed(flags, exynos_boot_vector_flag());
} }
static int exynos_aftr_finisher(unsigned long flags) static int exynos_aftr_finisher(unsigned long flags)

6
arch/arm/mach-exynos/pm_domains.c
View File

@ -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);