Merge "dev: gcdb: display: add panel header for Truly 720p panel" into lk.lnx.1.0-dev.1.0
diff --git a/dev/gcdb/display/include/panel_r69006_1080p_cmd.h b/dev/gcdb/display/include/panel_r69006_1080p_cmd.h
old mode 100644
new mode 100755
index 8aac2c9..4fb01a2
--- a/dev/gcdb/display/include/panel_r69006_1080p_cmd.h
+++ b/dev/gcdb/display/include/panel_r69006_1080p_cmd.h
@@ -66,35 +66,35 @@
/* Panel on/off command information */
/*---------------------------------------------------------------------------*/
static char r69006_1080p_cmd_on_cmd0[] = {
- 0XB0, 0x00, 0x23, 0x80
+ 0xB0, 0x00, 0x23, 0x80
};
static char r69006_1080p_cmd_on_cmd1[] = {
0x06, 0x00, 0x29, 0xC0,
- 0XB3, 0x04, 0x10, 0x00,
+ 0xB3, 0x04, 0x10, 0x00,
0x00, 0x00, 0xFF, 0xFF,
};
static char r69006_1080p_cmd_on_cmd2[] = {
0x03, 0x00, 0x29, 0xC0,
- 0XB4, 0x0c, 0x00, 0xFF,
+ 0xB4, 0x0C, 0x00, 0xFF,
};
static char r69006_1080p_cmd_on_cmd3[] = {
0x04, 0x00, 0x29, 0xC0,
- 0XB6, 0x3b, 0xc3, 0x00,
+ 0xB6, 0x3B, 0xD3, 0x00,
};
static char r69006_1080p_cmd_on_cmd4[] = {
- 0XC0, 0x00, 0x23, 0x80
+ 0xC0, 0x00, 0x23, 0x80
};
static char r69006_1080p_cmd_on_cmd5[] = {
- 0X36, 0x98, 0x15, 0x80
+ 0x36, 0x98, 0x15, 0x80
};
static char r69006_1080p_cmd_on_cmd6[] = {
- 0XCC, 0x04, 0x23, 0x80
+ 0xCC, 0x04, 0x23, 0x80
};
static char r69006_1080p_cmd_on_cmd7[] = {
@@ -125,13 +125,13 @@
static char r69006_1080p_cmd_on_cmd10[] = {
0x07, 0x00, 0x29, 0xC0,
- 0XC3, 0x55, 0x01, 0x00,
+ 0xC3, 0x55, 0x01, 0x00,
0x01, 0x00, 0x00, 0xFF,
};
static char r69006_1080p_cmd_on_cmd11[] = {
0x12, 0x00, 0x29, 0xC0,
- 0XC4, 0x70, 0x00, 0x00,
+ 0xC4, 0x70, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x02, 0x01,
0x00, 0x05, 0x01, 0x00,
@@ -140,31 +140,31 @@
static char r69006_1080p_cmd_on_cmd12[] = {
0x0F, 0x00, 0x29, 0xC0,
- 0xC6, 0x59, 0x07, 0x4a,
- 0x07, 0x4a, 0x01, 0x0E,
+ 0xC6, 0x57, 0x07, 0x4A,
+ 0x07, 0x4A, 0x01, 0x0E,
0x01, 0x02, 0x01, 0x02,
0x09, 0x15, 0x07, 0xFF,
};
static char r69006_1080p_cmd_on_cmd13[] = {
0x1F, 0x00, 0x29, 0xC0,
- 0XC7, 0x00, 0x30, 0x32,
- 0x34, 0x42, 0x4E, 0x56,
- 0x62, 0x44, 0x4A, 0x54,
- 0x62, 0x6B, 0x73, 0x7F,
- 0x08, 0x30, 0x32, 0x34,
- 0x42, 0x4E, 0x56, 0x62,
- 0x44, 0x4A, 0x54, 0x62,
- 0x6B, 0x73, 0x7F, 0xFF,
+ 0xC7, 0x00, 0x13, 0x1E,
+ 0x2A, 0x3A, 0x47, 0x50,
+ 0x5D, 0x40, 0x48, 0x52,
+ 0x5F, 0x67, 0x6F, 0x7A,
+ 0x00, 0x13, 0x1E, 0x2A,
+ 0x3A, 0x47, 0x50, 0x5D,
+ 0x40, 0x48, 0x52, 0x5F,
+ 0x67, 0x6F, 0x7A, 0xFF,
};
static char r69006_1080p_cmd_on_cmd14[] = {
0x14, 0x00, 0x29, 0xC0,
- 0xC8, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0xFC, 0x00,
- 0x00, 0x00, 0x00, 0x00,
- 0xFC, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0xFC, 0x00,
+ 0xC8, 0x00, 0x00, 0xFE,
+ 0x01, 0x08, 0xE7, 0x00,
+ 0x00, 0xFD, 0x02, 0x03,
+ 0xA8, 0x00, 0x00, 0xFC,
+ 0xE7, 0xE9, 0xC9, 0x00,
};
static char r69006_1080p_cmd_on_cmd15[] = {
@@ -188,7 +188,7 @@
0xD3, 0x1B, 0x3B, 0xBB,
0xAD, 0xA5, 0x33, 0x33,
0x33, 0x00, 0x80, 0xAD,
- 0xA8, 0x6f, 0x6f, 0x33,
+ 0xA8, 0x5B, 0x5B, 0x33,
0x33, 0x33, 0xF7, 0xF2,
0x1F, 0x7D, 0x7C, 0xFF,
0x0F, 0x99, 0x00, 0xFF,
@@ -202,23 +202,75 @@
static char r69006_1080p_cmd_on_cmd19[] = {
0x0C, 0x00, 0x29, 0xC0,
- 0XD5, 0x66, 0x00, 0x00,
- 0x01, 0x27, 0x01, 0x27,
- 0x00, 0x6D, 0x00, 0x6D,
+ 0xD5, 0x66, 0x00, 0x00,
+ 0x01, 0x33, 0x01, 0x33,
+ 0x00, 0x43, 0x00, 0x43,
};
static char r69006_1080p_cmd_on_cmd20[] = {
- 0xD6, 0x81, 0x23, 0x80
+ 0x02, 0x00, 0x29, 0xC0,
+ 0xBE, 0x04, 0xFF, 0xFF,
};
static char r69006_1080p_cmd_on_cmd21[] = {
- 0x11, 0x00, 0x05, 0x80
+ 0x11, 0x00, 0x29, 0xC0,
+ 0xCF, 0x40, 0x10, 0x00,
+ 0x00, 0x00, 0x00, 0x32,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0xFF, 0xFF, 0xFF,
};
static char r69006_1080p_cmd_on_cmd22[] = {
+ 0x06, 0x00, 0x29, 0xC0,
+ 0xDE, 0x00, 0x00, 0x3F,
+ 0xFF, 0x10, 0xFF, 0xFF,
+};
+
+static char r69006_1080p_cmd_on_cmd23[] = {
+ 0x02, 0x00, 0x29, 0xC0,
+ 0xE9, 0x00, 0xFF, 0xFF,
+};
+
+static char r69006_1080p_cmd_on_cmd24[] = {
+ 0x02, 0x00, 0x29, 0xC0,
+ 0xF2, 0x00, 0xFF, 0xFF,
+};
+
+static char r69006_1080p_cmd_on_cmd25[] = {
+ 0xD6, 0x01, 0x23, 0x80
+};
+
+static char r69006_1080p_cmd_on_cmd26[] = {
+ 0x02, 0x00, 0x39, 0xC0,
+ 0x35, 0x00, 0xFF, 0xFF,
+};
+
+static char r69006_1080p_cmd_on_cmd27[] = {
+ 0x02, 0x00, 0x39, 0xC0,
+ 0x51, 0xff, 0xFF, 0xFF,
+};
+
+static char r69006_1080p_cmd_on_cmd28[] = {
+ 0x02, 0x00, 0x39, 0xC0,
+ 0x53, 0x2c, 0xFF, 0xFF,
+};
+
+static char r69006_1080p_cmd_on_cmd29[] = {
+ 0x02, 0x00, 0x39, 0xC0,
+ 0x55, 0x00, 0xFF, 0xFF,
+};
+
+
+static char r69006_1080p_cmd_on_cmd30[] = {
0x29, 0x00, 0x05, 0x80
};
+static char r69006_1080p_cmd_on_cmd31[] = {
+ 0x11, 0x00, 0x05, 0x80
+};
+
+
static struct mipi_dsi_cmd r69006_1080p_cmd_on_command[] = {
{0x4, r69006_1080p_cmd_on_cmd0, 0x00},
{0xc, r69006_1080p_cmd_on_cmd1, 0x00},
@@ -240,12 +292,21 @@
{0x24, r69006_1080p_cmd_on_cmd17, 0x00},
{0x8, r69006_1080p_cmd_on_cmd18, 0x00},
{0x10, r69006_1080p_cmd_on_cmd19, 0x00},
- {0x4, r69006_1080p_cmd_on_cmd20, 0x00},
- {0x4, r69006_1080p_cmd_on_cmd21, 0x78},
- {0x4, r69006_1080p_cmd_on_cmd22, 0x78}
+ {0x8, r69006_1080p_cmd_on_cmd20, 0x00},
+ {0x18, r69006_1080p_cmd_on_cmd21, 0x00},
+ {0xc, r69006_1080p_cmd_on_cmd22, 0x00},
+ {0x8, r69006_1080p_cmd_on_cmd23, 0x00},
+ {0x8, r69006_1080p_cmd_on_cmd24, 0x00},
+ {0x4, r69006_1080p_cmd_on_cmd25, 0x00},
+ {0x8, r69006_1080p_cmd_on_cmd26, 0x00},
+ {0x8, r69006_1080p_cmd_on_cmd27, 0x00},
+ {0x8, r69006_1080p_cmd_on_cmd28, 0x00},
+ {0x8, r69006_1080p_cmd_on_cmd29, 0x14},
+ {0x4, r69006_1080p_cmd_on_cmd30, 0x14},
+ {0x4, r69006_1080p_cmd_on_cmd31, 0x78}
};
-#define R69006_1080P_CMD_ON_COMMAND 23
+#define R69006_1080P_CMD_ON_COMMAND 32
static char r69006_1080p_cmdoff_cmd0[] = {
@@ -293,7 +354,7 @@
/* Panel timing */
/*---------------------------------------------------------------------------*/
static const uint32_t r69006_1080p_cmd_timings[] = {
- 0x7d, 0x25, 0x1d, 0x00, 0x37, 0x33, 0x22, 0x27, 0x1e, 0x03, 0x04, 0x00
+ 0x6E, 0x3F, 0x36, 0x00, 0x5A, 0x4F, 0x38, 0x41, 0x54, 0x03, 0x04, 0x00
};
static struct panel_timing r69006_1080p_cmd_timing_info = {
@@ -314,6 +375,11 @@
1, 1, 4095, 100, 1, "PMIC_8941"
};
+static struct labibb_desc r69006_1080p_cmd_labibb = {
+ 0, 1, 5700000, 5700000, 5700000, 5700000, 3, 3, 1
+};
+
+
#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 e9c5d26..aaf679c 100755
--- a/dev/gcdb/display/include/panel_r69006_1080p_video.h
+++ b/dev/gcdb/display/include/panel_r69006_1080p_video.h
@@ -300,6 +300,10 @@
0, 4, 0x20, 0x2c
};
+static struct labibb_desc r69006_1080p_video_labibb = {
+ 0, 1, 5700000, 5700000, 5700000, 5700000, 3, 3, 1
+};
+
/*---------------------------------------------------------------------------*/
/* Panel reset sequence */
/*---------------------------------------------------------------------------*/
diff --git a/platform/msmtitanium/include/platform/iomap.h b/platform/msmtitanium/include/platform/iomap.h
index 833520a..a57769b 100755
--- a/platform/msmtitanium/include/platform/iomap.h
+++ b/platform/msmtitanium/include/platform/iomap.h
@@ -88,7 +88,7 @@
/* GPLL */
-#define GPLL0_STATUS (CLK_CTL_BASE + 0x2101C)
+#define GPLL0_MODE (CLK_CTL_BASE + 0x21000)
#define APCS_GPLL_ENA_VOTE (CLK_CTL_BASE + 0x45000)
#define APCS_CLOCK_BRANCH_ENA_VOTE (CLK_CTL_BASE + 0x45004)
#define GPLL4_MODE (CLK_CTL_BASE + 0x24000)
diff --git a/platform/msmtitanium/msmtitanium-clock.c b/platform/msmtitanium/msmtitanium-clock.c
index 092ca54..ee831b2 100644
--- a/platform/msmtitanium/msmtitanium-clock.c
+++ b/platform/msmtitanium/msmtitanium-clock.c
@@ -101,8 +101,8 @@
{
.en_reg = (void *) APCS_GPLL_ENA_VOTE,
.en_mask = BIT(0),
- .status_reg = (void *) GPLL0_STATUS,
- .status_mask = BIT(17),
+ .status_reg = (void *) GPLL0_MODE,
+ .status_mask = BIT(30),
.parent = &cxo_clk_src.c,
.c = {
diff --git a/target/msm8952/oem_panel.c b/target/msm8952/oem_panel.c
old mode 100644
new mode 100755
index 241d100..cada80c
--- a/target/msm8952/oem_panel.c
+++ b/target/msm8952/oem_panel.c
@@ -496,6 +496,7 @@
panelstruct->panelresetseq
= &r69006_1080p_cmd_reset_seq;
panelstruct->backlightinfo = &r69006_1080p_cmd_backlight;
+ pinfo->labibb = &r69006_1080p_cmd_labibb;
pinfo->mipi.panel_on_cmds
= r69006_1080p_cmd_on_command;
pinfo->mipi.num_of_panel_on_cmds
@@ -521,6 +522,7 @@
panelstruct->panelresetseq
= &r69006_1080p_video_reset_seq;
panelstruct->backlightinfo = &r69006_1080p_video_backlight;
+ pinfo->labibb = &r69006_1080p_video_labibb;
pinfo->mipi.panel_on_cmds
= r69006_1080p_video_on_command;
pinfo->mipi.num_of_panel_on_cmds