summaryrefslogtreecommitdiff
path: root/cleopatre/linux-2.6.25.10-spc300/arch
diff options
context:
space:
mode:
authorOlivier Dufour2013-01-30 11:45:11 +0100
committerCyril Jourdan2013-02-11 13:33:20 +0100
commit45ac0f8ef99ab35762bcef7ec00e413028d86d84 (patch)
tree239716413713f1789fdd8452201264c782d46d2c /cleopatre/linux-2.6.25.10-spc300/arch
parent2710bd3f2c76ab7d596ef68d994b5e3352232a83 (diff)
common/inc/asm/arch: rename SRAM_DATA_PTR macro, refs #3693
This macro is using virtual addresses, so we rename it SRAM_DATA_VA_PTR.
Diffstat (limited to 'cleopatre/linux-2.6.25.10-spc300/arch')
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/mse500-autoswitch.c2
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-pm.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/mse500-autoswitch.c b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/mse500-autoswitch.c
index 223c09f995..e8568a2992 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/mse500-autoswitch.c
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/mse500-autoswitch.c
@@ -115,7 +115,7 @@ static int __init mse500_autoswitch_init (void)
printk ("Autoswitch init\n");
sram_autoswitch_data = (volatile sram_autoswitch_data_t *)
- SRAM_DATA_PTR (autoswitch);
+ SRAM_DATA_VA_PTR (autoswitch);
memset ((void *) sram_autoswitch_data->magic, 0,
MSE500_AUTOSWITCH_MAGIC_SIZE);
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-pm.c b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-pm.c
index a5465dea07..8ffeb04b0f 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-pm.c
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-pm.c
@@ -97,7 +97,7 @@ static int spc300_pm_enter(suspend_state_t state)
/* Map the required registers. */
map_extra_registers();
/* Copy data structure in SRAM. */
- memcpy ((void *)SRAM_DATA_PTR(pm), &sram_pm_data, sizeof(sram_pm_data));
+ memcpy ((void *)SRAM_DATA_VA_PTR(pm), &sram_pm_data, sizeof(sram_pm_data));
spc300_irq_suspend();
local_irq_disable();
spc300_wdt_set_irq_mode();
@@ -106,7 +106,7 @@ static int spc300_pm_enter(suspend_state_t state)
pm_process();
/* Copy data structure from SRAM. */
- memcpy (&sram_pm_data, (void *)SRAM_DATA_PTR(pm), sizeof(sram_pm_data));
+ memcpy (&sram_pm_data, (void *)SRAM_DATA_VA_PTR(pm), sizeof(sram_pm_data));
/* Unmap the registers. */
unmap_extra_registers();
/* Update system time. */