Merge "msm8226: mmc: Fix glitch observed during sd clock switch"
diff --git a/platform/msm_shared/smem.h b/platform/msm_shared/smem.h
index 39d53e8..be5160d 100755
--- a/platform/msm_shared/smem.h
+++ b/platform/msm_shared/smem.h
@@ -302,6 +302,7 @@
HW_PLATFORM_MTP = 8,
HW_PLATFORM_LIQUID = 9,
HW_PLATFORM_DRAGON = 10,
+ HW_PLATFORM_QRD = 11,
HW_PLATFORM_HRD = 13,
HW_PLATFORM_DTV = 14,
HW_PLATFORM_RUMI = 15,
diff --git a/project/msm8974.mk b/project/msm8974.mk
index f8dd988..ab53f9f 100644
--- a/project/msm8974.mk
+++ b/project/msm8974.mk
@@ -14,3 +14,6 @@
DEFINES += DEVICE_TREE=1
#DEFINES += MMC_BOOT_BAM=1
DEFINES += CRYPTO_BAM=1
+
+#Disable thumb mode
+ENABLE_THUMB := false
diff --git a/target/msm8960/include/target/board.h b/target/msm8960/include/target/board.h
index 9a6f150..3a46801 100644
--- a/target/msm8960/include/target/board.h
+++ b/target/msm8960/include/target/board.h
@@ -49,6 +49,7 @@
#define LINUX_MACHTYPE_8930_CDP 3727
#define LINUX_MACHTYPE_8930_MTP 3728
#define LINUX_MACHTYPE_8930_FLUID 3729
+#define LINUX_MACHTYPE_8930_EVT 4558
/* 8064 */
#define LINUX_MACHTYPE_8064_SIM 3572
diff --git a/target/msm8960/init.c b/target/msm8960/init.c
index 52e34f7..f26f982 100755
--- a/target/msm8960/init.c
+++ b/target/msm8960/init.c
@@ -289,6 +289,7 @@
case LINUX_MACHTYPE_8930_CDP:
case LINUX_MACHTYPE_8930_MTP:
case LINUX_MACHTYPE_8930_FLUID:
+ case LINUX_MACHTYPE_8930_EVT:
uart_dm_init(5, 0x16400000, 0x16440000);
break;
@@ -378,6 +379,9 @@
case HW_PLATFORM_FLUID:
target_id = LINUX_MACHTYPE_8930_FLUID;
break;
+ case HW_PLATFORM_QRD:
+ target_id = LINUX_MACHTYPE_8930_EVT;
+ break;
default:
target_id = LINUX_MACHTYPE_8930_CDP;
}