Merge "target: msm8909: set AUO_400P_CMD_PANEL as default panel for SWOC P4 platform"
diff --git a/target/msm8909/oem_panel.c b/target/msm8909/oem_panel.c
index 064539c..deb6024 100644
--- a/target/msm8909/oem_panel.c
+++ b/target/msm8909/oem_panel.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2015, 2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2014-2015, 2017-2018, 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
@@ -472,6 +472,7 @@
struct mdss_dsi_phy_ctrl *phy_db)
{
uint32_t hw_id = board_hardware_id();
+ uint32_t platform_type = board_platform_id();
uint32_t platform_subtype = board_hardware_subtype();
int32_t panel_override_id;
@@ -499,7 +500,20 @@
case HW_PLATFORM_SUBTYPE_8909_PM660_V1:
case HW_PLATFORM_SUBTYPE_8909_PM660:
case HW_PLATFORM_SUBTYPE_8909_COMPAL_ALPHA:
- panel_id = AUO_390P_CMD_PANEL;
+ if ((platform_type == MSM8909W) ||
+ (platform_type == APQ8009W))
+ panel_id = AUO_390P_CMD_PANEL;
+ break;
+ case HW_PLATFORM_SUBTYPE_SWOC_TP_CIRC:
+ case HW_PLATFORM_SUBTYPE_SWOC_NOWGR_CIRC:
+ if ((platform_type == MSM8909W) ||
+ (platform_type == APQ8009W))
+ panel_id = AUO_400P_CMD_PANEL;
+ break;
+ case HW_PLATFORM_SUBTYPE_SWOC_WEAR:
+ if ((platform_type == MSM8909W) ||
+ (platform_type == APQ8009W))
+ panel_id = AUO_CX_QVGA_CMD_PANEL;
break;
default:
panel_id = HX8394D_720P_VIDEO_PANEL;