Merge change I9650197f
* changes:
[platform/msm7k]: Add code to wait till the mARM is ready to initialize the clocks
diff --git a/platform/msm7k/acpuclock.c b/platform/msm7k/acpuclock.c
index 938df99..0516a57 100755
--- a/platform/msm7k/acpuclock.c
+++ b/platform/msm7k/acpuclock.c
@@ -88,6 +88,13 @@
{
unsigned i;
+#if (!ENABLE_NANDWRITE)
+ int *modem_stat_check = (MSM_SHARED_BASE + 0x14);
+
+ /* Wait for modem to be ready before clock init */
+ while (readl(modem_stat_check) != 1);
+#endif
+
/* Increase VDD level to the final value. */
writel((1 << 7) | (VDD_LEVEL << 3), VDD_SVS_PLEVEL_ADDR);
thread_sleep(1);
diff --git a/project/msm7627_ffa_nandwrite.mk b/project/msm7627_ffa_nandwrite.mk
index 64cfa3a..db0da10 100644
--- a/project/msm7627_ffa_nandwrite.mk
+++ b/project/msm7627_ffa_nandwrite.mk
@@ -7,6 +7,7 @@
MODULES += app/nandwrite
DEFINES += WITH_DEBUG_JTAG=1
+DEFINES += ENABLE_NANDWRITE=1
#DEFINES += WITH_DEBUG_DCC=1
#DEFINES += WITH_DEBUG_UART=1
#DEFINES += WITH_DEBUG_FBCON=1
diff --git a/project/msm7627_surf_nandwrite.mk b/project/msm7627_surf_nandwrite.mk
index 98d365a..7daac2c 100644
--- a/project/msm7627_surf_nandwrite.mk
+++ b/project/msm7627_surf_nandwrite.mk
@@ -7,6 +7,7 @@
MODULES += app/nandwrite
DEFINES += WITH_DEBUG_JTAG=1
+DEFINES += ENABLE_NANDWRITE=1
#DEFINES += WITH_DEBUG_DCC=1
#DEFINES += WITH_DEBUG_UART=1
#DEFINES += WITH_DEBUG_FBCON=1