[PATCH 28/29] PM FIX: convert TI io_p2v() usage to OMAP2_IO_ADDRESS()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
---
 arch/arm/mach-omap2/pm34xx.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index 5242ba0..7436332 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -222,7 +222,7 @@ static void restore_table_entry(void)
 	u32 previous_value, control_reg_value;
 	u32 *address;
 	/* Get virtual address of SCRATCHPAD */
-	scratchpad_address = (u32 *) io_p2v(SCRATCHPAD);
+	scratchpad_address = (u32 *) OMAP2_IO_ADDRESS(SCRATCHPAD);
 	/* Get address of entry that was modified */
 	address = (u32 *) *(scratchpad_address + TABLE_ADDRESS_OFFSET);
 	/* Get the previous value which needs to be restored */
@@ -924,7 +924,7 @@ void clear_scratchpad_contents(void)
 	u32 max_offset = SCRATHPAD_ROM_OFFSET;
 	u32 offset = 0;
 	u32 v;
-	u32 v_addr = io_p2v(SCRATCHPAD_ROM);
+	u32 v_addr = OMAP2_IO_ADDRESS(SCRATCHPAD_ROM);
 	if (__raw_readl(OMAP3430_PRM_RSTST) & 0x1) {
 		for ( ; offset <= max_offset; offset += 0x4)
 			 __raw_writel(0x0, (v_addr + offset));
@@ -942,7 +942,7 @@ void save_scratchpad_contents(void)
 	u32 *sdram_context_address;
 
 	/* Get virtual address of SCRATCHPAD */
-	scratchpad_address = (u32 *) io_p2v(SCRATCHPAD);
+	scratchpad_address = (u32 *) OMAP2_IO_ADDRESS(SCRATCHPAD);
 	/* Get Restore pointer to jump to while waking up from OFF */
 	restore_address = get_restore_pointer();
 	/* Convert it to physical address */
-- 
1.6.0

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Arm (vger)]     [ARM Kernel]     [ARM MSM]     [Linux Tegra]     [Linux WPAN Networking]     [Linux Wireless Networking]     [Maemo Users]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux