Merge "target: msm8226: Move oem_panel.c file to target folder"
diff --git a/dev/gcdb/display/rules.mk b/dev/gcdb/display/rules.mk
index 438c6c7..71e35f2 100755
--- a/dev/gcdb/display/rules.mk
+++ b/dev/gcdb/display/rules.mk
@@ -5,5 +5,4 @@
OBJS += \
$(LOCAL_DIR)/gcdb_display.o \
$(LOCAL_DIR)/panel_display.o \
- $(LOCAL_DIR)/oem_panel.o \
$(LOCAL_DIR)/gcdb_autopll.o
diff --git a/dev/gcdb/display/oem_panel.c b/target/msm8226/oem_panel.c
similarity index 88%
rename from dev/gcdb/display/oem_panel.c
rename to target/msm8226/oem_panel.c
index 228dc6b..57b2238 100755
--- a/dev/gcdb/display/oem_panel.c
+++ b/target/msm8226/oem_panel.c
@@ -231,7 +231,6 @@
struct mdss_dsi_phy_ctrl *phy_db)
{
uint32_t hw_id = board_hardware_id();
- uint32_t platformid = board_platform_id();
uint32_t target_id = board_target_id();
uint32_t nt35590_panel_id = NT35590_720P_VIDEO_PANEL;
@@ -239,56 +238,29 @@
nt35590_panel_id = NT35590_720P_CMD_PANEL;
#endif
- switch (platformid) {
- case MSM8974:
- switch (hw_id) {
- case HW_PLATFORM_FLUID:
- case HW_PLATFORM_MTP:
- case HW_PLATFORM_SURF:
- panel_id = TOSHIBA_720P_VIDEO_PANEL;
- break;
- default:
- dprintf(CRITICAL, "Display not enabled for %d HW type\n"
- , hw_id);
- return false;
+ switch (hw_id) {
+ case HW_PLATFORM_QRD:
+ if (board_hardware_subtype() == 2) {
+ panel_id = NT35521_720P_VIDEO_PANEL;
+ } else {
+ if (((target_id >> 16) & 0xFF) == 0x1) //EVT
+ panel_id = nt35590_panel_id;
+ else if (((target_id >> 16) & 0xFF) == 0x2) //DVT
+ panel_id = HX8394A_720P_VIDEO_PANEL;
+ else {
+ dprintf(CRITICAL, "Not supported device, target_id=%x\n"
+ , target_id);
+ return false;
+ }
}
break;
- case MSM8826:
- case MSM8626:
- case MSM8226:
- case MSM8926:
- case MSM8126:
- case MSM8326:
- case APQ8026:
- switch (hw_id) {
- case HW_PLATFORM_QRD:
- if (board_hardware_subtype() == 2) {
- panel_id = NT35521_720P_VIDEO_PANEL;
- } else {
- if (((target_id >> 16) & 0xFF) == 0x1) //EVT
- panel_id = nt35590_panel_id;
- else if (((target_id >> 16) & 0xFF) == 0x2) //DVT
- panel_id = HX8394A_720P_VIDEO_PANEL;
- else {
- dprintf(CRITICAL, "Not supported device, target_id=%x\n"
- , target_id);
- return false;
- }
- }
- break;
- case HW_PLATFORM_MTP:
- case HW_PLATFORM_SURF:
- panel_id = nt35590_panel_id;
- break;
- default:
- dprintf(CRITICAL, "Display not enabled for %d HW type\n"
- , hw_id);
- return false;
- }
+ case HW_PLATFORM_MTP:
+ case HW_PLATFORM_SURF:
+ panel_id = nt35590_panel_id;
break;
default:
- dprintf(CRITICAL, "GCDB:Display: Platform id:%d not supported\n"
- , platformid);
+ dprintf(CRITICAL, "Display not enabled for %d HW type\n"
+ , hw_id);
return false;
}
diff --git a/target/msm8226/rules.mk b/target/msm8226/rules.mk
index 0d338c8..f5c9596 100755
--- a/target/msm8226/rules.mk
+++ b/target/msm8226/rules.mk
@@ -41,4 +41,5 @@
OBJS += \
$(LOCAL_DIR)/init.o \
$(LOCAL_DIR)/meminfo.o \
- $(LOCAL_DIR)/target_display.o
+ $(LOCAL_DIR)/target_display.o \
+ $(LOCAL_DIR)/oem_panel.o