Merge "target: msm8952: Enable RM69090 truly cmd mode panel support"
diff --git a/dev/gcdb/display/include/panel_truly_rm69090_qvga_cmd.h b/dev/gcdb/display/include/panel_truly_rm69090_qvga_cmd.h
new file mode 100644
index 0000000..b0f7109
--- /dev/null
+++ b/dev/gcdb/display/include/panel_truly_rm69090_qvga_cmd.h
@@ -0,0 +1,177 @@
+/* Copyright (c) 2019, 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
+ * met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ * * Neither the name of The Linux Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _PANEL_TRULY_RM69090_QVGA_CMD_H_
+#define _PANEL_TRULY_RM69090_QVGA_CMD_H_
+/*---------------------------------------------------------------------------*/
+/* HEADER files */
+/*---------------------------------------------------------------------------*/
+#include "panel.h"
+
+/*---------------------------------------------------------------------------*/
+/* Panel configuration */
+/*---------------------------------------------------------------------------*/
+static struct panel_config truly_rm69090_qvga_cmd_panel_data = {
+ "qcom,mdss_dsi_truly_rm69090_qvga_cmd", "dsi:0:", "qcom,mdss-dsi-panel",
+ 10, 1, "DISPLAY_1", 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL
+};
+
+/*---------------------------------------------------------------------------*/
+/* Panel resolution */
+/*---------------------------------------------------------------------------*/
+static struct panel_resolution truly_rm69090_qvga_cmd_panel_res = {
+ 368, 448, 40, 20, 2, 0, 6, 8, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+/*---------------------------------------------------------------------------*/
+/* Panel color information */
+/*---------------------------------------------------------------------------*/
+static struct color_info truly_rm69090_qvga_cmd_color = {
+ 24, 0, 0xff, 0, 0, 0
+};
+
+/*---------------------------------------------------------------------------*/
+/* Panel on/off command information */
+/*---------------------------------------------------------------------------*/
+static char truly_rm69090_qvga_cmd_on_cmd0[] = {
+ 0xFE, 0x00, 0x15, 0x80
+};
+
+static char truly_rm69090_qvga_cmd_on_cmd1[] = {
+ 0x35, 0x00, 0x15, 0x80
+};
+
+static char truly_rm69090_qvga_cmd_on_cmd2[] = {
+ 0x51, 0x80, 0x15, 0x80
+};
+
+static char truly_rm69090_qvga_cmd_on_cmd3[] = {
+ 0x05, 0x00, 0x39, 0xC0,
+ 0x2A, 0x00, 0x10, 0x01,
+ 0x7F, 0xFF, 0xFF, 0xFF,
+};
+
+static char truly_rm69090_qvga_cmd_on_cmd4[] = {
+ 0x05, 0x00, 0x39, 0xC0,
+ 0x2B, 0x00, 0x00, 0x01,
+ 0xBF, 0xFF, 0xFF, 0xFF,
+};
+
+static char truly_rm69090_qvga_cmd_on_cmd5[] = {
+ 0x11, 0x00, 0x05, 0x80
+};
+
+static char truly_rm69090_qvga_cmd_on_cmd6[] = {
+ 0x29, 0x00, 0x05, 0x80
+};
+
+static struct mipi_dsi_cmd truly_rm69090_qvga_cmd_on_command[] = {
+ {0x4, truly_rm69090_qvga_cmd_on_cmd0, 0x00},
+ {0x4, truly_rm69090_qvga_cmd_on_cmd1, 0x00},
+ {0x4, truly_rm69090_qvga_cmd_on_cmd2, 0x00},
+ {0xc, truly_rm69090_qvga_cmd_on_cmd3, 0x00},
+ {0xc, truly_rm69090_qvga_cmd_on_cmd4, 0x00},
+ {0x4, truly_rm69090_qvga_cmd_on_cmd5, 0x78},
+ {0x4, truly_rm69090_qvga_cmd_on_cmd6, 0x40}
+};
+
+#define TRULY_RM69090_QVGA_CMD_ON_COMMAND 7
+
+
+static char truly_rm69090_qvga_cmdoff_cmd0[] = {
+ 0x28, 0x00, 0x05, 0x80
+};
+
+static char truly_rm69090_qvga_cmdoff_cmd1[] = {
+ 0x10, 0x00, 0x05, 0x80
+};
+
+static char truly_rm69090_qvga_cmdoff_cmd2[] = {
+ 0x4F, 0x01, 0x15, 0x80
+};
+
+static struct mipi_dsi_cmd truly_rm69090_qvga_cmd_off_command[] = {
+ {0x4, truly_rm69090_qvga_cmdoff_cmd0, 0x28},
+ {0x4, truly_rm69090_qvga_cmdoff_cmd1, 0x78},
+ {0x4, truly_rm69090_qvga_cmdoff_cmd2, 0x00}
+};
+
+#define TRULY_RM69090_QVGA_CMD_OFF_COMMAND 3
+
+
+static struct command_state truly_rm69090_qvga_cmd_state = {
+ 0, 1
+};
+
+/*---------------------------------------------------------------------------*/
+/* Command mode panel information */
+/*---------------------------------------------------------------------------*/
+static struct commandpanel_info truly_rm69090_qvga_cmd_command_panel = {
+ 1, 1, 1, 0, 0, 0x2c, 0, 0, 0, 1, 0, 0
+};
+
+/*---------------------------------------------------------------------------*/
+/* Video mode panel information */
+/*---------------------------------------------------------------------------*/
+static struct videopanel_info truly_rm69090_qvga_cmd_video_panel = {
+ 1, 0, 0, 0, 1, 1, 2, 0, 0x9
+};
+
+/*---------------------------------------------------------------------------*/
+/* Lane configuration */
+/*---------------------------------------------------------------------------*/
+static struct lane_configuration truly_rm69090_qvga_cmd_lane_config = {
+ 1, 0, 1, 0, 0, 0, 0
+};
+
+/*---------------------------------------------------------------------------*/
+/* Panel timing */
+/*---------------------------------------------------------------------------*/
+static const uint32_t truly_rm69090_qvga_cmd_12nm_timings[] = {
+ 0x04, 0x04, 0x01, 0x08, 0x00, 0x03, 0x01, 0x0D
+};
+
+static struct panel_timing truly_rm69090_qvga_cmd_timing_info = {
+ 0, 4, 0x09, 0x2c
+};
+
+/*---------------------------------------------------------------------------*/
+/* Panel reset sequence */
+/*---------------------------------------------------------------------------*/
+static struct panel_reset_sequence truly_rm69090_qvga_cmd_reset_seq = {
+ {1, 0, 1, }, {1, 12, 12, }, 2
+};
+
+/*---------------------------------------------------------------------------*/
+/* Backlight setting */
+/*---------------------------------------------------------------------------*/
+static struct backlight truly_rm69090_qvga_cmd_backlight = {
+ 2, 1, 255, 100, 2, "BL_CTL_DCS"
+};
+
+#endif /*_PANEL_TRULY_RM69090_QVGA_CMD_H_*/
diff --git a/target/msm8952/oem_panel.c b/target/msm8952/oem_panel.c
index e49252c..e594258 100644
--- a/target/msm8952/oem_panel.c
+++ b/target/msm8952/oem_panel.c
@@ -66,6 +66,7 @@
#include "include/panel_hx8399c_fhd_pluse_video.h"
#include "include/panel_hx8399c_hd_plus_video.h"
#include "include/panel_edo_rm67162_qvga_cmd.h"
+#include "include/panel_truly_rm69090_qvga_cmd.h"
#include "include/panel_nt35695b_truly_fhd_video.h"
#include "include/panel_nt35695b_truly_fhd_cmd.h"
@@ -96,6 +97,7 @@
NT35695B_TRULY_FHD_VIDEO_PANEL,
NT35695B_TRULY_FHD_CMD_PANEL,
RM67162_QVGA_CMD_PANEL,
+ RM69090_QVGA_CMD_PANEL,
UNKNOWN_PANEL
};
@@ -131,6 +133,7 @@
{"nt35695b_truly_fhd_video", NT35695B_TRULY_FHD_VIDEO_PANEL},
{"nt35695b_truly_fhd_cmd", NT35695B_TRULY_FHD_CMD_PANEL},
{"rm67162_qvga_cmd", RM67162_QVGA_CMD_PANEL},
+ {"rm69090_qvga_cmd", RM69090_QVGA_CMD_PANEL},
};
static uint32_t panel_id;
@@ -849,6 +852,37 @@
TIMING_SIZE_12NM);
pinfo->mipi.tx_eot_append = true;
break;
+ case RM69090_QVGA_CMD_PANEL:
+ panelstruct->paneldata = &truly_rm69090_qvga_cmd_panel_data;
+ panelstruct->panelres = &truly_rm69090_qvga_cmd_panel_res;
+ panelstruct->color = &truly_rm69090_qvga_cmd_color;
+ panelstruct->videopanel =
+ &truly_rm69090_qvga_cmd_video_panel;
+ panelstruct->commandpanel =
+ &truly_rm69090_qvga_cmd_command_panel;
+ panelstruct->state = &truly_rm69090_qvga_cmd_state;
+ panelstruct->laneconfig =
+ &truly_rm69090_qvga_cmd_lane_config;
+ panelstruct->paneltiminginfo
+ = &truly_rm69090_qvga_cmd_timing_info;
+ panelstruct->panelresetseq
+ = &truly_rm69090_qvga_cmd_reset_seq;
+ panelstruct->backlightinfo = &truly_rm69090_qvga_cmd_backlight;
+ pinfo->labibb = NULL;
+ pinfo->mipi.panel_on_cmds
+ = truly_rm69090_qvga_cmd_on_command;
+ pinfo->mipi.num_of_panel_on_cmds
+ = TRULY_RM69090_QVGA_CMD_ON_COMMAND;
+ pinfo->mipi.panel_off_cmds
+ = truly_rm69090_qvga_cmd_off_command;
+ pinfo->mipi.num_of_panel_off_cmds
+ = TRULY_RM69090_QVGA_CMD_OFF_COMMAND;
+ if (phy_db->pll_type == DSI_PLL_TYPE_12NM)
+ memcpy(phy_db->timing,
+ truly_rm69090_qvga_cmd_12nm_timings,
+ TIMING_SIZE_12NM);
+ pinfo->mipi.tx_eot_append = true;
+ break;
case NT35695B_TRULY_FHD_VIDEO_PANEL:
panelstruct->paneldata = &nt35695b_truly_fhd_video_panel_data;
panelstruct->panelres = &nt35695b_truly_fhd_video_panel_res;
@@ -1042,9 +1076,13 @@
}
if (platform_is_sdm429() || platform_is_sdm429w()) {
- if (hw_subtype == HW_PLATFORM_SUBTYPE_429W_PM660) /* Spyro target */
- panel_id = RM67162_QVGA_CMD_PANEL;
- else
+ if (hw_subtype == HW_PLATFORM_SUBTYPE_429W_PM660) {
+ /* Spyro target */
+ if (plat_hw_ver_major == 1) /* WDP 2700 */
+ panel_id = RM69090_QVGA_CMD_PANEL;
+ else /* WTP 2700 DVT */
+ panel_id = RM67162_QVGA_CMD_PANEL;
+ } else
panel_id = HX8399C_HD_PLUS_VIDEO_PANEL;
}
diff --git a/target/msm8952/target_display.c b/target/msm8952/target_display.c
index 43a3382..b74c4a5 100644
--- a/target/msm8952/target_display.c
+++ b/target/msm8952/target_display.c
@@ -63,6 +63,8 @@
#define TRULY_VID_PANEL_STRING "1:dsi:0:qcom,mdss_dsi_truly_720p_video:1:none:cfg:single_dsi"
#define TRULY_CMD_PANEL_STRING "1:dsi:0:qcom,mdss_dsi_truly_720p_cmd:1:none:cfg:single_dsi"
+#define VARIANT_MAJOR_MASK (0x00ff0000)
+
/*---------------------------------------------------------------------------*/
/* GPIO configuration */
/*---------------------------------------------------------------------------*/
@@ -484,6 +486,13 @@
.out_strength = PM_GPIO_OUT_DRIVE_HIGH,
};
+ if (((board_target_id() & VARIANT_MAJOR_MASK)) &&
+ platform_is_sdm429w()) {
+ /* enable PM660 GPIO-12 for backlight enable */
+ bkl_en_gpio.pin_id = 12;
+ gpio_param.inv_int_pol = PM_GPIO_INVERT;
+ }
+
dprintf(SPEW, "%s: gpio=%d enable=%d\n", __func__,
bkl_en_gpio.pin_id, enable);