Merge "target: msm8974: Add delay for gpio config to take effect"
diff --git a/platform/fsm9900/include/platform/iomap.h b/platform/fsm9900/include/platform/iomap.h
index c8fdcf9..4cc017b 100644
--- a/platform/fsm9900/include/platform/iomap.h
+++ b/platform/fsm9900/include/platform/iomap.h
@@ -85,6 +85,8 @@
#define BLSP2_UART4_BASE (PERIPH_SS_BASE + 0x00161000)
#define BLSP2_UART5_BASE (PERIPH_SS_BASE + 0x00162000)
+#define MSM_USB_BASE (PERIPH_SS_BASE + 0x00255000)
+
#define CLK_CTL_BASE 0xFC400000
#define GCC_WDOG_DEBUG (CLK_CTL_BASE + 0x00001780)
diff --git a/target/msm8226/init.c b/target/msm8226/init.c
index 6def2a6..7b31f43 100644
--- a/target/msm8226/init.c
+++ b/target/msm8226/init.c
@@ -423,7 +423,6 @@
unsigned target_pause_for_battery_charge(void)
{
-#if 0
uint8_t pon_reason = pm8x41_get_pon_reason();
uint8_t is_cold_boot = pm8x41_get_is_cold_boot();
dprintf(INFO, "%s : pon_reason is %d cold_boot:%d\n", __func__,
@@ -439,7 +438,6 @@
((pon_reason & USB_CHG) || (pon_reason & DC_CHG)))
return 1;
else
-#endif
return 0;
}