aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2017-08-24 13:44:54 +0200
committerNicolas Ferre <nicolas.ferre@microchip.com>2017-09-18 10:05:38 +0200
commit093d79f62a89f47d9b5fd0746768146d9696535c (patch)
tree6974ad3e9a837f1ae5ad61a657c787f5e28fa72d
parentARM: dts: at91: sama5d27_som1_ek: fix USB host vbus (diff)
downloadlinux-dev-093d79f62a89f47d9b5fd0746768146d9696535c.tar.xz
linux-dev-093d79f62a89f47d9b5fd0746768146d9696535c.zip
ARM: at91: Replace uses of virt_to_phys with __pa_symbol
The PM code wrongly uses virt_to_phys() instead of __pa_symbol() and was not updated by commit 64fc2a947a98 ("ARM: 8641/1: treewide: Replace uses of virt_to_phys with __pa_symbol") because it was not yet in tree. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
-rw-r--r--arch/arm/mach-at91/pm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index 5036f996e694..849014c01cf4 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -533,8 +533,8 @@ static void __init at91_pm_backup_init(void)
}
pm_bu->suspended = 0;
- pm_bu->canary = virt_to_phys(&canary);
- pm_bu->resume = virt_to_phys(cpu_resume);
+ pm_bu->canary = __pa_symbol(&canary);
+ pm_bu->resume = __pa_symbol(cpu_resume);
return;