diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2015-04-21 08:15:06 -0500 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2015-04-21 08:15:06 -0500 |
| commit | 7f54cddfc767c29bc030a9f512c1d5e8e33f337d (patch) | |
| tree | e69a57ebce834150e4d28b230eea93ecbb6895de /arch/arm/mach-exynos/exynos.c | |
| parent | 93d431e2909e0ec03127b861f4865cde89d84520 (diff) | |
| parent | 494db70db363f41da78ee5f07096cf04068d7a3e (diff) | |
Merge branch 'linux-linaro-lng-v3.18' into linux-linaro-lng-v3.18-rtlinux-lng-preempt-rt-3.18.11-2015.05linux-lng-preempt-rt-3.18.11-2015.04
Conflicts:
include/linux/interrupt.h
kernel/irq/manage.c
Diffstat (limited to 'arch/arm/mach-exynos/exynos.c')
| -rw-r--r-- | arch/arm/mach-exynos/exynos.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c index 6b283eb3202e..66faeab61f28 100644 --- a/arch/arm/mach-exynos/exynos.c +++ b/arch/arm/mach-exynos/exynos.c @@ -148,15 +148,15 @@ static void exynos_restart(enum reboot_mode mode, const char *cmd) np = of_find_compatible_node(NULL, NULL, "samsung,exynos5440-clock"); addr = of_iomap(np, 0) + 0xbc; - status = __raw_readl(addr); + status = readl_relaxed(addr); addr = of_iomap(np, 0) + 0xcc; - val = __raw_readl(addr); + val = readl_relaxed(addr); val = (val & 0xffff0000) | (status & 0xffff); } - __raw_writel(val, addr); + writel_relaxed(val, addr); } static struct platform_device exynos_cpuidle = { |