Merge "avb: Support loading of recovery image"
diff --git a/dev/gcdb/display/include/panel_edo_rm67162_qvga_cmd.h b/dev/gcdb/display/include/panel_edo_rm67162_qvga_cmd.h
new file mode 100644
index 0000000..d91a1b7
--- /dev/null
+++ b/dev/gcdb/display/include/panel_edo_rm67162_qvga_cmd.h
@@ -0,0 +1,203 @@
+/* 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_EDO_RM67162_QVGA_CMD_H_
+#define _PANEL_EDO_RM67162_QVGA_CMD_H_
+/*---------------------------------------------------------------------------*/
+/* HEADER files */
+/*---------------------------------------------------------------------------*/
+#include "panel.h"
+
+/*---------------------------------------------------------------------------*/
+/* Panel configuration */
+/*---------------------------------------------------------------------------*/
+static struct panel_config edo_rm67162_qvga_cmd_panel_data = {
+ "qcom,mdss_dsi_edo_rm67162_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
+};
+
+/*---------------------------------------------------------------------------*/
+/* Panel resolution */
+/*---------------------------------------------------------------------------*/
+static struct panel_resolution edo_rm67162_qvga_cmd_panel_res = {
+ 320, 360, 140, 164, 8, 0, 6, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+/*---------------------------------------------------------------------------*/
+/* Panel color information */
+/*---------------------------------------------------------------------------*/
+static struct color_info edo_rm67162_qvga_cmd_color = {
+ 24, 0, 0xff, 0, 0, 0
+};
+
+/*---------------------------------------------------------------------------*/
+/* Panel on/off command information */
+/*---------------------------------------------------------------------------*/
+static char edo_rm67162_qvga_cmd_on_cmd0[] = {
+ 0x02, 0x00, 0x29, 0xC0,
+ 0xFE, 0x0A, 0xFF, 0xFF,
+};
+
+static char edo_rm67162_qvga_cmd_on_cmd1[] = {
+ 0x02, 0x00, 0x29, 0xC0,
+ 0x29, 0x90, 0xFF, 0xFF,
+};
+
+static char edo_rm67162_qvga_cmd_on_cmd2[] = {
+ 0x02, 0x00, 0x29, 0xC0,
+ 0xFE, 0x05, 0xFF, 0xFF,
+};
+
+static char edo_rm67162_qvga_cmd_on_cmd3[] = {
+ 0x02, 0x00, 0x29, 0xC0,
+ 0x05, 0x00, 0xFF, 0xFF,
+};
+
+static char edo_rm67162_qvga_cmd_on_cmd4[] = {
+ 0x02, 0x00, 0x29, 0xC0,
+ 0xFE, 0x00, 0xFF, 0xFF,
+};
+
+static char edo_rm67162_qvga_cmd_on_cmd5[] = {
+ 0x02, 0x00, 0x29, 0xC0,
+ 0x35, 0x00, 0xFF, 0xFF,
+};
+
+static char edo_rm67162_qvga_cmd_on_cmd6[] = {
+ 0x02, 0x00, 0x29, 0xC0,
+ 0x51, 0x00, 0xFF, 0xFF,
+};
+
+static char edo_rm67162_qvga_cmd_on_cmd7[] = {
+ 0x02, 0x00, 0x29, 0xC0,
+ 0x53, 0x20, 0xFF, 0xFF,
+};
+
+static char edo_rm67162_qvga_cmd_on_cmd8[] = {
+ 0x02, 0x00, 0x29, 0xC0,
+ 0x11, 0x00, 0xFF, 0xFF,
+};
+
+static char edo_rm67162_qvga_cmd_on_cmd9[] = {
+ 0x02, 0x00, 0x29, 0xC0,
+ 0x29, 0x00, 0xFF, 0xFF,
+};
+
+static struct mipi_dsi_cmd edo_rm67162_qvga_cmd_on_command[] = {
+ {0x8, edo_rm67162_qvga_cmd_on_cmd0, 0x00},
+ {0x8, edo_rm67162_qvga_cmd_on_cmd1, 0x00},
+ {0x8, edo_rm67162_qvga_cmd_on_cmd2, 0x00},
+ {0x8, edo_rm67162_qvga_cmd_on_cmd3, 0x00},
+ {0x8, edo_rm67162_qvga_cmd_on_cmd4, 0x00},
+ {0x8, edo_rm67162_qvga_cmd_on_cmd5, 0x00},
+ {0x8, edo_rm67162_qvga_cmd_on_cmd6, 0x00},
+ {0x8, edo_rm67162_qvga_cmd_on_cmd7, 0x00},
+ {0x8, edo_rm67162_qvga_cmd_on_cmd8, 0x78},
+ {0x8, edo_rm67162_qvga_cmd_on_cmd9, 0x05}
+};
+
+#define EDO_RM67162_QVGA_CMD_ON_COMMAND 10
+
+
+static char edo_rm67162_qvga_cmdoff_cmd0[] = {
+ 0x51, 0x00, 0x05, 0x80
+};
+
+static char edo_rm67162_qvga_cmdoff_cmd1[] = {
+ 0x28, 0x00, 0x05, 0x80
+};
+
+static char edo_rm67162_qvga_cmdoff_cmd2[] = {
+ 0x10, 0x00, 0x05, 0x80
+};
+
+static char edo_rm67162_qvga_cmdoff_cmd3[] = {
+ 0x4F, 0x01, 0x05, 0x80
+};
+
+static struct mipi_dsi_cmd edo_rm67162_qvga_cmd_off_command[] = {
+ {0x4, edo_rm67162_qvga_cmdoff_cmd0, 0x05},
+ {0x4, edo_rm67162_qvga_cmdoff_cmd1, 0x14},
+ {0x4, edo_rm67162_qvga_cmdoff_cmd2, 0x78},
+ {0x4, edo_rm67162_qvga_cmdoff_cmd3, 0x14}
+};
+
+#define EDO_RM67162_QVGA_CMD_OFF_COMMAND 4
+
+
+static struct command_state edo_rm67162_qvga_cmd_state = {
+ 0, 1
+};
+
+/*---------------------------------------------------------------------------*/
+/* Command mode panel information */
+/*---------------------------------------------------------------------------*/
+static struct commandpanel_info edo_rm67162_qvga_cmd_command_panel = {
+ 1, 1, 1, 0, 0, 0x2c, 0, 0, 0, 1, 0, 0
+};
+
+/*---------------------------------------------------------------------------*/
+/* Video mode panel information */
+/*---------------------------------------------------------------------------*/
+static struct videopanel_info edo_rm67162_qvga_cmd_video_panel = {
+ 1, 0, 0, 0, 1, 1, 2, 0, 0x9
+};
+
+/*---------------------------------------------------------------------------*/
+/* Lane configuration */
+/*---------------------------------------------------------------------------*/
+static struct lane_configuration edo_rm67162_qvga_cmd_lane_config = {
+ 1, 0, 1, 0, 0, 0
+};
+
+/*---------------------------------------------------------------------------*/
+/* Panel timing */
+/*---------------------------------------------------------------------------*/
+static const uint32_t edo_rm67162_qvga_cmd_12nm_timings[] = {
+ 0x06, 0x05, 0x01, 0x01, 0x00, 0x03, 0x01, 0x03
+};
+
+static struct panel_timing edo_rm67162_qvga_cmd_timing_info = {
+ 0, 4, 0x20, 0x2c
+};
+
+/*---------------------------------------------------------------------------*/
+/* Panel reset sequence */
+/*---------------------------------------------------------------------------*/
+static struct panel_reset_sequence edo_rm67162_qvga_cmd_reset_seq = {
+ {1, 0, 1, }, {1, 12, 12, }, 2
+};
+
+/*---------------------------------------------------------------------------*/
+/* Backlight setting */
+/*---------------------------------------------------------------------------*/
+static struct backlight edo_rm67162_qvga_cmd_backlight = {
+ 1, 1, 4095, 100, 1, "PMIC_8941"
+};
+
+#endif /*_PANEL_EDO_RM67162_QVGA_CMD_H_*/
diff --git a/include/platform.h b/include/platform.h
index 64f683d..6010a26 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -1,7 +1,7 @@
/*
* Copyright (c) 2008 Travis Geiselbrecht
*
- * Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2019, The Linux Foundation. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files
@@ -74,6 +74,7 @@
int platform_is_msm8956();
int platform_is_sdm429();
int platform_is_sdm439();
+int platform_is_sdm429w();
uint32_t platform_is_msm8976_v_1_1();
uint32_t platform_get_tz_app_add();
uint32_t platform_get_tz_app_size();
diff --git a/platform/msm8952/platform.c b/platform/msm8952/platform.c
index 6fa24f2..2b5bdcf 100644
--- a/platform/msm8952/platform.c
+++ b/platform/msm8952/platform.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2016, 2018, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, 2018-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
@@ -313,6 +313,22 @@
return ret;
}
+int platform_is_sdm429w()
+{
+ uint32_t platform = board_platform_id();
+ uint32_t ret = 0;
+
+ switch(platform)
+ {
+ case SDM429W:
+ ret = 1;
+ break;
+ default:
+ ret = 0;
+ };
+
+ return ret;
+}
int platform_is_msm8956()
{
diff --git a/platform/msm_shared/smem.h b/platform/msm_shared/smem.h
index ce035e6..5dfa7c3 100644
--- a/platform/msm_shared/smem.h
+++ b/platform/msm_shared/smem.h
@@ -2,7 +2,7 @@
* Copyright (c) 2009, Google Inc.
* All rights reserved.
*
- * Copyright (c) 2009-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2009-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
@@ -474,7 +474,8 @@
SDM439 = 353,
SDA429 = 364,
SDA439 = 363,
- QM215 = 386
+ QM215 = 386,
+ SDM429W = 416,
};
enum platform {