mpq8064: fix target id and keypad detect
Target id is not getting detected correctly for MPQ target leading
to panic during uart init.
Also, gpio keypad was not being initialized leading to failure
to detect key press for entering fastboot mode.
Change-Id: Ic551eb830d1184ae310e6de90e17ba381e4ffedb
diff --git a/platform/msm_shared/board.c b/platform/msm_shared/board.c
index 94bcd4c..0748837 100644
--- a/platform/msm_shared/board.c
+++ b/platform/msm_shared/board.c
@@ -123,7 +123,21 @@
default:
target_id = LINUX_MACHTYPE_8627_CDP;
}
- } else if ((platform_id == APQ8064) || (platform_id == MPQ8064)) {
+ } else if (platform_id == MPQ8064) {
+ switch (platform_hw) {
+ case HW_PLATFORM_SURF:
+ target_id = LINUX_MACHTYPE_8064_MPQ_CDP;
+ break;
+ case HW_PLATFORM_HRD:
+ target_id = LINUX_MACHTYPE_8064_HRD;
+ break;
+ case HW_PLATFORM_DTV:
+ target_id = LINUX_MACHTYPE_8064_DTV;
+ break;
+ default:
+ target_id = LINUX_MACHTYPE_8064_MPQ_CDP;
+ }
+ } else if ((platform_id == APQ8064)) {
switch (platform_hw) {
case HW_PLATFORM_SURF:
target_id = LINUX_MACHTYPE_8064_CDP;
@@ -134,12 +148,6 @@
case HW_PLATFORM_LIQUID:
target_id = LINUX_MACHTYPE_8064_LIQUID;
break;
- case HW_PLATFORM_HRD:
- target_id = LINUX_MACHTYPE_8064_HRD;
- break;
- case HW_PLATFORM_DTV:
- target_id = LINUX_MACHTYPE_8064_DTV;
- break;
default:
target_id = LINUX_MACHTYPE_8064_CDP;
}
@@ -167,6 +175,8 @@
baseband = BASEBAND_APQ;
else if (platform_id == APQ8064)
baseband = BASEBAND_APQ;
+ else if (platform_id == MPQ8064)
+ baseband = BASEBAND_APQ;
else
baseband = BASEBAND_MSM;