Merge "target: msm8226: disable panel auto-detect for QRD 8926"
diff --git a/platform/msm8916/include/platform/iomap.h b/platform/msm8916/include/platform/iomap.h
index 00c6bdf..94fd16d 100644
--- a/platform/msm8916/include/platform/iomap.h
+++ b/platform/msm8916/include/platform/iomap.h
@@ -29,12 +29,12 @@
#ifndef _PLATFORM_MSM8916_IOMAP_H_
#define _PLATFORM_MSM8916_IOMAP_H_
-#define MSM_IOMAP_BASE 0xF9000000
-#define MSM_IOMAP_END 0xFEFFFFFF
+#define MSM_IOMAP_BASE 0x0B000000
+#define MSM_IOMAP_END 0xBEFFFFF
#define SDRAM_START_ADDR 0x80000000
-#define MSM_SHARED_BASE 0xFA000000
+#define MSM_SHARED_BASE 0x8E380000
#define APPS_SS_BASE 0x0B000000
@@ -64,15 +64,15 @@
#define SPMI_GENI_BASE (SPMI_BASE + 0xA000)
#define SPMI_PIC_BASE (SPMI_BASE + 0xB000)
-#define MSM_CE1_BAM_BASE 0xFD404000
-#define MSM_CE1_BASE 0xFD41A000
+#define MSM_CE1_BAM_BASE 0x00704000
+#define MSM_CE1_BASE 0x0073A000
-#define TLMM_BASE_ADDR 0xFD510000
+#define TLMM_BASE_ADDR 0x1000000
#define GPIO_CONFIG_ADDR(x) (TLMM_BASE_ADDR + 0x1000 + (x)*0x10)
#define GPIO_IN_OUT_ADDR(x) (TLMM_BASE_ADDR + 0x1004 + (x)*0x10)
-#define MPM2_MPM_CTRL_BASE 0xFC4A1000
-#define MPM2_MPM_PS_HOLD 0xFC4AB000
+#define MPM2_MPM_CTRL_BASE 0x004A1000
+#define MPM2_MPM_PS_HOLD 0x004AB0000
/* CE 2 */
#define GCC_CE2_BCR (CLK_CTL_BASE + 0x1080)
diff --git a/platform/msm_shared/scm.c b/platform/msm_shared/scm.c
index 5592f20..db09374 100644
--- a/platform/msm_shared/scm.c
+++ b/platform/msm_shared/scm.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011-2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2011-2014, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -69,6 +69,7 @@
cmd = memalign(CACHE_LINE, ROUNDUP(len, CACHE_LINE));
if (cmd) {
+ memset(cmd, 0, len);
cmd->len = len;
cmd->buf_offset = offsetof(struct scm_command, buf);
cmd->resp_hdr_offset = cmd->buf_offset + cmd_size;
diff --git a/platform/msm_shared/usb30_dwc.c b/platform/msm_shared/usb30_dwc.c
index 9aa36cc..35b5c6c 100644
--- a/platform/msm_shared/usb30_dwc.c
+++ b/platform/msm_shared/usb30_dwc.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -867,6 +867,12 @@
switch (event_id)
{
+ case DWC_EVENT_EP_CMD_COMPLETE:
+ {
+ dwc_dep_cmd_id_t cmd = DWC_EVENT_EP_EVENT_CMD_TYPE(*event);
+ DBG("\n cmd = %s has no action. ignored.", cmd_lookup[cmd]);
+ }
+ break;
case DWC_EVENT_EP_XFER_NOT_READY:
{
if (event_ctrl_stage == CONTROL_DATA_REQUEST)
@@ -923,6 +929,12 @@
switch (event_id)
{
+ case DWC_EVENT_EP_CMD_COMPLETE:
+ {
+ dwc_dep_cmd_id_t cmd = DWC_EVENT_EP_EVENT_CMD_TYPE(*event);
+ DBG("\n cmd = %s has no action. ignored.", cmd_lookup[cmd]);
+ }
+ break;
case DWC_EVENT_EP_XFER_NOT_READY:
{
if (event_ctrl_stage == CONTROL_DATA_REQUEST)/* data request */
diff --git a/target/apq8084/init.c b/target/apq8084/init.c
index 2e29138..f2f1f7b 100644
--- a/target/apq8084/init.c
+++ b/target/apq8084/init.c
@@ -122,6 +122,7 @@
struct ufs_dev ufs_device;
extern void ulpi_write(unsigned val, unsigned reg);
+extern int _emmc_recovery_init(void);
void target_early_init(void)
{
@@ -568,6 +569,11 @@
}
}
+int emmc_recovery_init(void)
+{
+ return _emmc_recovery_init();
+}
+
unsigned check_reboot_mode(void)
{
uint32_t restart_reason = 0;