commit 2292f6d539de8d6e7737cd461153df91b389bee0
author Linux Build Service Account <lnxbuild@localhost> Thu Sep 10 23:27:14 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Sep 10 23:27:14 2015 -0700
tree 136e44c63e8bd9a31bc2f07fdd736c13d34fc1f1
parent 56c6764fdadf3a6ea9debbf70a99175a197acf30
parent 028544e5b968917a6d25db2e72b8b1fd700ccdbe

Merge "target: msm8952: Add panel support for msm8952 skum DVT2"

target/msm8952/oem_panel.c

diff --git a/target/msm8952/oem_panel.c b/target/msm8952/oem_panel.c
index 4d448bf..30a56e9 100644
--- a/target/msm8952/oem_panel.c
+++ b/target/msm8952/oem_panel.c
@@ -462,6 +462,7 @@
 {
 	uint32_t hw_id = board_hardware_id();
 	int32_t panel_override_id;
+	uint32_t target_id, plat_hw_ver_major;
 
 	if (panel_name) {
 		panel_override_id = panel_name_to_id(supp_panels,
@@ -495,7 +496,17 @@
 			panel_id = TRULY_1080P_VIDEO_PANEL;
 		break;
 	case HW_PLATFORM_QRD:
-		panel_id = OTM1906C_1080P_CMD_PANEL;
+		target_id = board_target_id();
+		plat_hw_ver_major = ((target_id >> 16) & 0xFF);
+
+		/*
+		 * 8952 SKUM DVT2 - HX8399A 1080p video panel
+		 * 8952 SKUM EVT1/EVT2 - OTM1906C 1080p cmd panel
+		 */
+		if (plat_hw_ver_major >= 4)
+			panel_id = HX8399A_1080P_VIDEO_PANEL;
+		else
+			panel_id = OTM1906C_1080P_CMD_PANEL;
 
 		/* QRD EVT1 uses OTM1906C, and EVT2 uses HX8399A */
 		if (platform_is_msm8956()) {