msm: pm2: fix warm boot address on 7x27A and 7x27
Change the boot reset vector address from virtual to physical.
Change-Id: Idac115eb89a03578460adee941606c1a5746bbac
Signed-off-by: Sravan Kumar Ambapuram <asravan@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-msm7x27.c b/arch/arm/mach-msm/board-msm7x27.c
index a09485a..53ea8c1 100644
--- a/arch/arm/mach-msm/board-msm7x27.c
+++ b/arch/arm/mach-msm/board-msm7x27.c
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2007 Google, Inc.
- * Copyright (c) 2008-2011, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2008-2012, Code Aurora Forum. All rights reserved.
* Author: Brian Swetland <swetland@google.com>
*
* This software is licensed under the terms of the GNU General Public
@@ -1626,8 +1626,8 @@
};
static struct msm_pm_boot_platform_data msm_pm_boot_pdata __initdata = {
- .mode = MSM_PM_BOOT_CONFIG_RESET_VECTOR_VIRT,
- .v_addr = (uint32_t *)PAGE_OFFSET,
+ .mode = MSM_PM_BOOT_CONFIG_RESET_VECTOR_PHYS,
+ .p_addr = 0,
};
static void
diff --git a/arch/arm/mach-msm/board-msm7x27a.c b/arch/arm/mach-msm/board-msm7x27a.c
index 7540aa9..db63f53 100644
--- a/arch/arm/mach-msm/board-msm7x27a.c
+++ b/arch/arm/mach-msm/board-msm7x27a.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
+/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -377,8 +377,8 @@
};
static struct msm_pm_boot_platform_data msm_pm_boot_pdata __initdata = {
- .mode = MSM_PM_BOOT_CONFIG_RESET_VECTOR_VIRT,
- .v_addr = (uint32_t *)PAGE_OFFSET,
+ .mode = MSM_PM_BOOT_CONFIG_RESET_VECTOR_PHYS,
+ .p_addr = 0,
};
static struct android_pmem_platform_data android_pmem_adsp_pdata = {
diff --git a/arch/arm/mach-msm/board-qrd7627a.c b/arch/arm/mach-msm/board-qrd7627a.c
index f3efb3a..cc5af6a 100644
--- a/arch/arm/mach-msm/board-qrd7627a.c
+++ b/arch/arm/mach-msm/board-qrd7627a.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
+/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -440,8 +440,8 @@
};
static struct msm_pm_boot_platform_data msm_pm_boot_pdata __initdata = {
- .mode = MSM_PM_BOOT_CONFIG_RESET_VECTOR_VIRT,
- .v_addr = (uint32_t *)PAGE_OFFSET,
+ .mode = MSM_PM_BOOT_CONFIG_RESET_VECTOR_PHYS,
+ .p_addr = 0,
};
static struct android_pmem_platform_data android_pmem_adsp_pdata = {
diff --git a/arch/arm/mach-msm/pm-boot.c b/arch/arm/mach-msm/pm-boot.c
index 24cd26a..ce09f9f 100644
--- a/arch/arm/mach-msm/pm-boot.c
+++ b/arch/arm/mach-msm/pm-boot.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
+/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -109,8 +109,6 @@
msm_pm_boot_after_pc = NULL;
break;
case MSM_PM_BOOT_CONFIG_RESET_VECTOR_PHYS:
- if (!pdata->p_addr)
- return -ENODEV;
pdata->v_addr = ioremap(pdata->p_addr, PAGE_SIZE);
/* Fall through */
case MSM_PM_BOOT_CONFIG_RESET_VECTOR_VIRT: