target: msm8952: Add swire control support for AMOLED panels
LAB/IBB voltages for AMOLED panels can be controlled by SWIRE signal
from the panel instead of controlling explicitly in SW. This change
adds support for SWIRE control.
Change-Id: I01f43af194c02014259d43a3e736b94213afe7bf
diff --git a/dev/gcdb/display/include/panel_jdi_4k_dualdsi_video_nofbc.h b/dev/gcdb/display/include/panel_jdi_4k_dualdsi_video_nofbc.h
index ae73869..0fe301a 100644
--- a/dev/gcdb/display/include/panel_jdi_4k_dualdsi_video_nofbc.h
+++ b/dev/gcdb/display/include/panel_jdi_4k_dualdsi_video_nofbc.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, 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
@@ -178,7 +178,7 @@
};
static struct labibb_desc jdi_4k_dualdsi_video_nofbc_labibb = {
- 0, 1, 5500000, 5500000, 5500000, 5500000, 3, 3, 1
+ 0, 1, 5500000, 5500000, 5500000, 5500000, 3, 3, 1, 0
};
#endif /*_PANEL_JDI_4K_DUALDSI_VIDEO_NOFBC__H_*/
diff --git a/dev/gcdb/display/include/panel_nt35597_wqxga_dsc_cmd.h b/dev/gcdb/display/include/panel_nt35597_wqxga_dsc_cmd.h
index f1a39b0..2e8f306 100644
--- a/dev/gcdb/display/include/panel_nt35597_wqxga_dsc_cmd.h
+++ b/dev/gcdb/display/include/panel_nt35597_wqxga_dsc_cmd.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, 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
@@ -319,7 +319,7 @@
};
static struct labibb_desc nt35597_wqxga_dsc_cmd_labibb = {
- 0, 1, 5500000, 5500000, 5500000, 5500000, 3, 3, 1
+ 0, 1, 5500000, 5500000, 5500000, 5500000, 3, 3, 1, 0
};
/*---------------------------------------------------------------------------*/
diff --git a/dev/gcdb/display/include/panel_nt35597_wqxga_dsc_video.h b/dev/gcdb/display/include/panel_nt35597_wqxga_dsc_video.h
index 572d2d5..f1f5247 100644
--- a/dev/gcdb/display/include/panel_nt35597_wqxga_dsc_video.h
+++ b/dev/gcdb/display/include/panel_nt35597_wqxga_dsc_video.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, 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
@@ -306,7 +306,7 @@
};
static struct labibb_desc nt35597_wqxga_dsc_video_labibb = {
- 0, 1, 5500000, 5500000, 5500000, 5500000, 3, 3, 1
+ 0, 1, 5500000, 5500000, 5500000, 5500000, 3, 3, 1, 0
};
/*---------------------------------------------------------------------------*/
diff --git a/dev/gcdb/display/include/panel_nt35597_wqxga_dualdsi_cmd.h b/dev/gcdb/display/include/panel_nt35597_wqxga_dualdsi_cmd.h
index 17248ba..432d40b 100644
--- a/dev/gcdb/display/include/panel_nt35597_wqxga_dualdsi_cmd.h
+++ b/dev/gcdb/display/include/panel_nt35597_wqxga_dualdsi_cmd.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, 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
@@ -260,7 +260,7 @@
};
static struct labibb_desc nt35597_wqxga_dualdsi_cmd_labibb = {
- 0, 1, 5500000, 5500000, 5500000, 5500000, 3, 3, 1
+ 0, 1, 5500000, 5500000, 5500000, 5500000, 3, 3, 1, 0
};
/*---------------------------------------------------------------------------*/
diff --git a/dev/gcdb/display/include/panel_nt35597_wqxga_dualdsi_video.h b/dev/gcdb/display/include/panel_nt35597_wqxga_dualdsi_video.h
index 556d657..bc14996 100644
--- a/dev/gcdb/display/include/panel_nt35597_wqxga_dualdsi_video.h
+++ b/dev/gcdb/display/include/panel_nt35597_wqxga_dualdsi_video.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, 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
@@ -252,7 +252,7 @@
};
static struct labibb_desc nt35597_wqxga_dualdsi_video_labibb = {
- 0, 1, 5500000, 5500000, 5500000, 5500000, 3, 3, 1
+ 0, 1, 5500000, 5500000, 5500000, 5500000, 3, 3, 1, 0
};
/*---------------------------------------------------------------------------*/
diff --git a/dev/gcdb/display/include/panel_r69006_1080p_cmd.h b/dev/gcdb/display/include/panel_r69006_1080p_cmd.h
index dc84080..01c8d17 100755
--- a/dev/gcdb/display/include/panel_r69006_1080p_cmd.h
+++ b/dev/gcdb/display/include/panel_r69006_1080p_cmd.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, 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
@@ -376,10 +376,9 @@
};
static struct labibb_desc r69006_1080p_cmd_labibb = {
- 0, 1, 5700000, 5700000, 5700000, 5700000, 3, 3, 1
+ 0, 1, 5700000, 5700000, 5700000, 5700000, 3, 3, 1, 0
};
-
#define R69006_1080P_CMD_PANEL_ON_DELAY 32
#define R69006_1080P_CMD_SIGNATURE 0xFFFF
diff --git a/dev/gcdb/display/include/panel_r69006_1080p_video.h b/dev/gcdb/display/include/panel_r69006_1080p_video.h
index aaf679c..82be298 100755
--- a/dev/gcdb/display/include/panel_r69006_1080p_video.h
+++ b/dev/gcdb/display/include/panel_r69006_1080p_video.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, 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
@@ -301,7 +301,7 @@
};
static struct labibb_desc r69006_1080p_video_labibb = {
- 0, 1, 5700000, 5700000, 5700000, 5700000, 3, 3, 1
+ 0, 1, 5700000, 5700000, 5700000, 5700000, 3, 3, 1, 0
};
/*---------------------------------------------------------------------------*/
diff --git a/dev/gcdb/display/include/panel_r69007_wqxga_cmd.h b/dev/gcdb/display/include/panel_r69007_wqxga_cmd.h
index 70a5225..dab049b 100644
--- a/dev/gcdb/display/include/panel_r69007_wqxga_cmd.h
+++ b/dev/gcdb/display/include/panel_r69007_wqxga_cmd.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, 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 are
@@ -368,7 +368,7 @@
};
static struct labibb_desc r69007_wqxga_cmd_labibb = {
- 0, 1, 5500000, 5500000, 5500000, 5500000, 3, 3, 1
+ 0, 1, 5500000, 5500000, 5500000, 5500000, 3, 3, 1, 0
};
/*---------------------------------------------------------------------------*/
diff --git a/dev/gcdb/display/include/panel_sharp_wqxga_dualdsi_video.h b/dev/gcdb/display/include/panel_sharp_wqxga_dualdsi_video.h
index 470ddda..f317ed3 100644
--- a/dev/gcdb/display/include/panel_sharp_wqxga_dualdsi_video.h
+++ b/dev/gcdb/display/include/panel_sharp_wqxga_dualdsi_video.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2014-2016, 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
@@ -156,7 +156,7 @@
};
static struct labibb_desc sharp_wqxga_dualdsi_video_labibb = {
- 0, 1, 5500000, 5500000, 5500000, 5500000, 3, 3, 1
+ 0, 1, 5500000, 5500000, 5500000, 5500000, 3, 3, 1, 0
};
/*---------------------------------------------------------------------------*/
diff --git a/platform/msm_shared/include/msm_panel.h b/platform/msm_shared/include/msm_panel.h
index d2a338f..5671e02 100755
--- a/platform/msm_shared/include/msm_panel.h
+++ b/platform/msm_shared/include/msm_panel.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2016, 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 are
@@ -373,6 +373,7 @@
char pwr_up_delay; /* ndx to => 1250, 2500, 5000 and 10000 us */
char pwr_down_delay; /* ndx to => 1250, 2500, 5000 and 10000 us */
char ibb_discharge_en;
+ bool swire_control;
};
struct msm_panel_info {
diff --git a/target/msm8952/target_display.c b/target/msm8952/target_display.c
index 7d3c0d6..fa9faa1 100644
--- a/target/msm8952/target_display.c
+++ b/target/msm8952/target_display.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, 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
@@ -434,39 +434,53 @@
struct qpnp_wled_config_data config = {0};
struct labibb_desc *labibb;
int display_type = 0;
+ bool swire_control = 0;
+ bool wled_avdd_control = 0;
labibb = pinfo->labibb;
if (labibb)
display_type = labibb->amoled_panel;
+ if (display_type) {
+ swire_control = labibb->swire_control;
+ wled_avdd_control = true;
+ } else {
+ swire_control = false;
+ wled_avdd_control = false;
+ }
+
config.display_type = display_type;
config.lab_init_volt = 4600000; /* fixed, see pmi register */
config.ibb_init_volt = 1400000; /* fixed, see pmi register */
+ config.lab_ibb_swire_control = swire_control;
+ config.wled_avdd_control = wled_avdd_control;
- if (labibb && labibb->force_config) {
- config.lab_min_volt = labibb->lab_min_volt;
- config.lab_max_volt = labibb->lab_max_volt;
- config.ibb_min_volt = labibb->ibb_min_volt;
- config.ibb_max_volt = labibb->ibb_max_volt;
- config.pwr_up_delay = labibb->pwr_up_delay;
- config.pwr_down_delay = labibb->pwr_down_delay;
- config.ibb_discharge_en = labibb->ibb_discharge_en;
- } else {
- /* default */
- config.pwr_up_delay = 3;
- config.pwr_down_delay = 3;
- config.ibb_discharge_en = 1;
- if (display_type) { /* amoled */
- config.lab_min_volt = 4600000;
- config.lab_max_volt = 4600000;
- config.ibb_min_volt = 4000000;
- config.ibb_max_volt = 4000000;
- } else { /* lcd */
- config.lab_min_volt = 5500000;
- config.lab_max_volt = 5500000;
- config.ibb_min_volt = 5500000;
- config.ibb_max_volt = 5500000;
+ if(!swire_control) {
+ if (labibb && labibb->force_config) {
+ config.lab_min_volt = labibb->lab_min_volt;
+ config.lab_max_volt = labibb->lab_max_volt;
+ config.ibb_min_volt = labibb->ibb_min_volt;
+ config.ibb_max_volt = labibb->ibb_max_volt;
+ config.pwr_up_delay = labibb->pwr_up_delay;
+ config.pwr_down_delay = labibb->pwr_down_delay;
+ config.ibb_discharge_en = labibb->ibb_discharge_en;
+ } else {
+ /* default */
+ config.pwr_up_delay = 3;
+ config.pwr_down_delay = 3;
+ config.ibb_discharge_en = 1;
+ if (display_type) { /* amoled */
+ config.lab_min_volt = 4600000;
+ config.lab_max_volt = 4600000;
+ config.ibb_min_volt = 4000000;
+ config.ibb_max_volt = 4000000;
+ } else { /* lcd */
+ config.lab_min_volt = 5500000;
+ config.lab_max_volt = 5500000;
+ config.ibb_min_volt = 5500000;
+ config.ibb_max_volt = 5500000;
+ }
}
}