New subject: Change in coreboot[master]: kodama: add a new configuration for Kodama.

19 Jun 2019

Peichao Li has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/33616
Change subject: kodama: add a new configuration for Kodama.
......................................................................
kodama: add a new configuration for Kodama.
This config file could be configured Kodama project and
 add panel driver for Kodama.
BUG=b:135490566
BRANCH=None
TEST=1. emerge-kukui coreboot depthcharge libpayload \
    chromeos-bootimage
     2. check coreboot binary could be generated under
the /build/chroot/kukui/firmware/.
Signed-off-by: peichao.wang peichao.wang@bitland.corp-partner.google.com
Change-Id: I72e80e800ba041df1dda2b0f84470d1ef58bc946
---
M src/mainboard/google/kukui/Kconfig
M src/mainboard/google/kukui/Kconfig.name
M src/mainboard/google/kukui/Makefile.inc
A src/mainboard/google/kukui/display.c
A src/mainboard/google/kukui/display.h
A src/mainboard/google/kukui/panel_kodama.c
6 files changed, 420 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/33616/1

diff --git a/src/mainboard/google/kukui/Kconfig b/src/mainboard/google/kukui/Kconfig
index 6831d1e..bb496d0 100644
--- a/src/mainboard/google/kukui/Kconfig
+++ b/src/mainboard/google/kukui/Kconfig
@@ -28,6 +28,7 @@
    select SOC_MEDIATEK_MT8183
    select BOARD_ROMSIZE_KB_8192
    select MAINBOARD_HAS_CHROMEOS
+	select CHROMEOS_USE_EC_WATCHDOG_FLAG
    select COMMON_CBFS_SPI_WRAPPER
    select SPI_FLASH
    select FATAL_ASSERTS
@@ -37,6 +38,9 @@
    select EC_GOOGLE_CHROMEEC_SPI
    select MAINBOARD_HAS_SPI_TPM_CR50 if VBOOT
    select MAINBOARD_HAS_TPM2 if VBOOT
+	select MAINBOARD_HAS_NATIVE_VGA_INIT
+	select MAINBOARD_FORCE_NATIVE_VGA_INIT
+	select HAVE_LINEAR_FRAMEBUFFER
config MAINBOARD_DIR
    string
@@ -47,6 +51,7 @@
    default "Kukui" if BOARD_GOOGLE_KUKUI
    default "Krane" if BOARD_GOOGLE_KRANE
    default "Flapjack" if BOARD_GOOGLE_FLAPJACK
+	default "Kodama" if BOARD_GOOGLE_KODAMA
config DRIVER_TPM_SPI_BUS
    hex
@@ -66,5 +71,6 @@
    default "KUKUI TEST 9847" if BOARD_GOOGLE_KUKUI
    default "KRANE TEST 5417" if BOARD_GOOGLE_KRANE
    default "FLAPJACK TEST 4147" if BOARD_GOOGLE_FLAPJACK
+	default "KODAMA TEST 3140" if BOARD_GOOGLE_KODAMA
endif
diff --git a/src/mainboard/google/kukui/Kconfig.name b/src/mainboard/google/kukui/Kconfig.name
index 348be66..d175c73 100644
--- a/src/mainboard/google/kukui/Kconfig.name
+++ b/src/mainboard/google/kukui/Kconfig.name
@@ -11,3 +11,7 @@
 config BOARD_GOOGLE_FLAPJACK
    bool "->  Flapjack"
    select BOARD_GOOGLE_KUKUI_COMMON
+
+config BOARD_GOOGLE_KODAMA
+	bool "->  kodama"
+	select BOARD_GOOGLE_KUKUI_COMMON
diff --git a/src/mainboard/google/kukui/Makefile.inc b/src/mainboard/google/kukui/Makefile.inc
index a0556c1..bbfb90a 100644
--- a/src/mainboard/google/kukui/Makefile.inc
+++ b/src/mainboard/google/kukui/Makefile.inc
@@ -22,6 +22,11 @@
ramstage-y += boardid.c
 ramstage-y += chromeos.c
+ramstage-y += display.c
+ramstage-$(CONFIG_BOARD_GOOGLE_KUKUI) += panel_kukui.c
+ramstage-$(CONFIG_BOARD_GOOGLE_KRANE) += panel_krane.c
+ramstage-$(CONFIG_BOARD_GOOGLE_FLAPJACK) += panel_flapjack.c
+ramstage-&(CONFIG_BOARD_GOOGLE_KODAMA) += panel_kodama.c
 ramstage-y += mainboard.c
 ramstage-y += memlayout.ld
 ramstage-y += reset.c
diff --git a/src/mainboard/google/kukui/display.c b/src/mainboard/google/kukui/display.c
new file mode 100644
index 0000000..c7f7f91
--- /dev/null
+++ b/src/mainboard/google/kukui/display.c
@@ -0,0 +1,127 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2019 Huaqin Telecom Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <console/console.h>
+#include <delay.h>
+#include <device/device.h>
+#include <edid.h>
+#include <gpio.h>
+#include <soc/auxadc.h>
+#include <soc/ddp.h>
+#include <soc/dsi.h>
+#include <soc/gpio.h>
+#include <boardid.h>
+
+#include "display.h"
+#include "gpio.h"
+
+static void _display_startup(struct edid *edid,
+			     struct lcm_init_table *init_table,
+			     u32 init_table_size)
+{
+	int ret = 0;
+	u32 mipi_dsi_flags;
+
+	if ((edid == NULL) || (init_table == NULL)) {
+		printk(BIOS_ERR, "%s: wrong parameters\n", __func__);
+		return;
+	}
+
+	mipi_dsi_flags = MIPI_DSI_MODE_VIDEO |
+	    MIPI_DSI_MODE_VIDEO_SYNC_PULSE | MIPI_DSI_MODE_LPM;
+
+	edid_set_framebuffer_bits_per_pixel(edid, 32, 0);
+
+	mtk_ddp_init();
+	ret = mtk_dsi_init(mipi_dsi_flags, MIPI_DSI_FMT_RGB888, 4,
+			   false, edid, init_table, init_table_size);
+
+	if (ret < 0) {
+		printk(BIOS_ERR, "dsi init fail\n");
+		return;
+	}
+
+	mtk_ddp_mode_set(edid);
+
+	set_vbe_mode_info_valid(edid, (uintptr_t)0);
+}
+
+static struct edid *get_edid(struct board_display_intf *intf)
+{
+	struct panel_info *info = intf->cur_panel_info;
+
+	if (info)
+		return info->edid;
+	return NULL;
+}
+
+static struct lcm_init_table *get_panel_init_table(struct board_display_intf
+						  *intf, u32 *table_size)
+{
+	struct panel_info *info = intf->cur_panel_info;
+
+	if (info) {
+		*table_size = info->table_size;
+		return info->init_table;
+	}
+
+	*table_size = 0;
+	return NULL;
+}
+
+static const char *get_panel_name(struct board_display_intf *intf)
+{
+	struct panel_info *info = intf->cur_panel_info;
+
+	if (info)
+		return info->panel_name;
+	return NULL;
+}
+
+/* Exported Functions */
+
+struct board_display_intf *get_current_display_intf(void)
+{
+	return &panel_display_intf;
+}
+
+int update_panel_info(struct board_display_intf *intf)
+{
+	int i;
+	union panel_id id = intf->get_panel_id(intf);
+
+	if (intf->is_panel_id_valid(id)) {
+		for (i = 0; i < intf->all_panel_info_size; ++i) {
+			if (id.value == intf->all_panel_info[i].disp_id.value) {
+				intf->cur_panel_info = &intf->all_panel_info[i];
+				return 0;
+			}
+		}
+	}
+	return -1;
+}
+
+void display_startup(struct board_display_intf *intf)
+{
+	struct edid *edid;
+	u32 init_table_size;
+	struct lcm_init_table *init_table;
+
+	edid = get_edid(intf);
+	init_table = get_panel_init_table(intf, &init_table_size);
+	printk(BIOS_INFO, "%s: name:%s init_table_size:%d\n",
+	       __func__, get_panel_name(intf), init_table_size);
+	_display_startup(edid, init_table, init_table_size);
+}
diff --git a/src/mainboard/google/kukui/display.h b/src/mainboard/google/kukui/display.h
new file mode 100644
index 0000000..6262b8a
--- /dev/null
+++ b/src/mainboard/google/kukui/display.h
@@ -0,0 +1,120 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2019 Huaqin Telecom Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __MAINBOARD_GOOGLE_DISPLAY_H__
+#define __MAINBOARD_GOOGLE_DISPLAY_H__
+
+#include <soc/dsi.h>
+#include <soc/gpio.h>
+
+#define MAKE_AS_A_STRING(arg) #arg
+
+enum kukui_panel_id {
+	PANEL_KUKUI_FIRST = 0,
+	PANEL_KUKUI_INNOLUX = 0,
+	PANEL_KUKUI_P097PFG_SSD2858,
+	PANEL_KUKUI_UNKNOWN,
+	PANEL_KUKUI_COUNT,
+	PANEL_KUKUI_UNINITIALIZED
+};
+
+enum krane_panel_id {
+	PANEL_KRANE_FIRST = 0,
+	PANEL_KRANE_BOE_TV101WUM_NL6,
+	PANEL_KRANE_UNKNOWN,
+	PANEL_KRANE_COUNT,
+	PANEL_KRANE_UNINITIALIZED
+};
+
+enum flapjack_panel_id {
+	PANEL_FLAPJACK_FIRST = 0,
+	PANEL_FLAPJACK_BOE_TV101WUM_NG0,
+	PANEL_FLAPJACK_BOE_TV080WUM_NG0,
+	PANEL_FLAPJACK_INX_OTA7290D10P,
+	PANEL_FLAPJACK_AUO_NT51021D8P,
+	PANEL_FLAPJACK_UNKNOWN,
+	PANEL_FLAPJACK_COUNT,
+	PANEL_FLAPJACK_UNINITIALIZED
+};
+
+enum kodama_panel_id {
+	PANEL_KODAMA_FIRST = 0,
+	PANEL_KODAMA_INNOLUX = 0,
+	PANEL_KODAMA_BOE_TV101WUM_NL2,
+	PANEL_KODAMA_UNKNOWN,
+	PANEL_KODAMA_COUNT,
+	PANEL_KODAMA_UNINITIALIZED
+};
+
+union panel_id {
+	enum kukui_panel_id kukui_panel;
+	enum krane_panel_id krane_panel;
+	enum flapjack_panel_id flapjack_panel;
+	enum kodama_panel_id kodama_panel;
+	int value;
+};
+
+struct panel_info {
+	union panel_id disp_id;			/* the ID for panel */
+	const char *panel_name;			/* display panel name */
+	int voltage;				/* voltage of LCM_ID */
+	struct edid *edid;			/* edid info of this panel */
+	struct lcm_init_table *init_table;	/* init command table */
+	u32 table_size;				/* init command table size */
+};
+
+#define PANEL(_panel_id, _voltage, _edid, _init_table) \
+	{ \
+	 .disp_id = {_panel_id},\
+	 .panel_name = MAKE_AS_A_STRING(_panel_id),\
+	 .voltage = _voltage,\
+	 .edid = &_edid,\
+	 .init_table = _init_table,\
+	 .table_size = ARRAY_SIZE(_init_table)} \
+
+
+struct board_display_intf {
+	const char *board;			/* board name */
+	struct panel_info *all_panel_info;	/* all supported panel info */
+	u32 all_panel_info_size;		/* num of supported panel */
+	/*
+	 * Runtime member
+	 */
+	struct panel_info *cur_panel_info;	/* detected panel info */
+	/*
+	 * board related functions
+	 */
+
+	union panel_id (*get_panel_id)(struct board_display_intf *intf);
+	bool (*is_panel_id_valid)(union panel_id id);
+	int (*backlight)(struct board_display_intf *intf);
+	int (*power)(struct board_display_intf *intf);
+};
+
+/*
+ * Exported functions
+ */
+
+struct board_display_intf *get_current_display_intf(void);
+int update_panel_info(struct board_display_intf *intf);
+void display_startup(struct board_display_intf *intf);
+
+
+/*
+ * Panel Interface for boards
+ */
+extern struct board_display_intf panel_display_intf;
+
+#endif
diff --git a/src/mainboard/google/kukui/panel_kodama.c b/src/mainboard/google/kukui/panel_kodama.c
new file mode 100644
index 0000000..7efc88f
--- /dev/null
+++ b/src/mainboard/google/kukui/panel_kodama.c
@@ -0,0 +1,158 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2019 Bitland Tech Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <console/console.h>
+#include <delay.h>
+#include <device/device.h>
+#include <edid.h>
+#include <gpio.h>
+#include <soc/auxadc.h>
+#include <soc/ddp.h>
+#include <soc/dsi.h>
+#include <soc/gpio.h>
+#include <boardid.h>
+
+#include "display.h"
+#include "gpio.h"
+
+static struct edid kodama_innolux_edid = {
+	.panel_bits_per_color = 8,
+	.panel_bits_per_pixel = 24,
+	.mode = {
+		.name = "768x1024@60Hz",
+		.pixel_clock = 56900,
+		.lvds_dual_channel = 0,
+		.refresh = 60,
+		.ha = 768, .hbl = 120, .hso = 40, .hspw = 40, .hborder = 0,
+		.va = 1024, .vbl = 44, .vso = 20, .vspw = 4, .vborder = 0,
+		.phsync = '-', .pvsync = '-',
+		.x_mm = 120, .y_mm = 160,
+	},
+};
+
+static struct lcm_init_table lcm_init_cmd[] = {
+	{INIT_DCS_CMD, 1, {MIPI_DCS_EXIT_SLEEP_MODE} },
+	{DELAY_CMD, 120, {} },
+	{INIT_DCS_CMD, 1, {MIPI_DCS_SET_DISPLAY_ON} },
+	{DELAY_CMD, 120, {} },
+};
+
+static struct edid kodama_TV101WUM_NL2_edid = {
+        .panel_bits_per_color = 8,
+        .panel_bits_per_pixel = 24,
+        .mode = {
+                .name = "1200x1920@60Hz",
+                .pixel_clock = 159391,
+                .lvds_dual_channel = 0,
+                .refresh = 60,
+                .ha = 1200, .hbl = 141, .hso = 80, .hspw = 1, .hborder = 0,
+                .va = 1920, .vbl = 61, .vso = 35, .vspw = 1, .vborder = 0,
+                .phsync = '-', .pvsync = '-',
+                .x_mm = 142, .y_mm = 228,
+        },
+};
+
+struct lcm_init_table lcm_TV101WUM_NL2_init_cmd[] = {
+	// full HD
+        {INIT_DCS_CMD, 1, {0x11} },
+        {DELAY_CMD, 800, {} },
+        {INIT_DCS_CMD, 2, {0x36, 0x03} },
+        {INIT_DCS_CMD, 1, {0x29} },
+        {DELAY_CMD, 20, {} },
+	{INIT_DCS_CMD, 2, {0x85, 0x04} },
+	{INIT_DCS_CMD, 2, {0x86, 0x08} },
+	{INIT_DCS_CMD, 2, {0x83, 0xAA} },
+	{INIT_DCS_CMD, 2, {0x84, 0x11} },
+	{INIT_DCS_CMD, 2, {0x98, 0x12} },
+};
+
+struct panel_info kodama_panel_info[] = {
+	PANEL(PANEL_KODAMA_INNOLUX,
+	      74000,
+	      kodama_innolux_edid,
+	      lcm_init_cmd),
+	PANEL(PANEL_KODAMA_BOE_TV101WUM_NL2,
+	      212000,
+	      kodama_TV101WUM_NL2_edid,
+	      lcm_TV101WUM_NL2_init_cmd),
+	{{PANEL_KODAMA_UNKNOWN}, "PANEL_KODAMA_UNKNOWN",
+	      0, NULL, NULL, 0},
+};
+
+static union panel_id kodama_get_panel_id(struct board_display_intf *intf)
+{
+	if (board_id() < 2)
+		return (union panel_id)PANEL_KODAMA_INNOLUX;
+	else {
+		printk(BIOS_ERR, "WPC DEBUG enter kodama driver\n");
+		return (union panel_id)PANEL_KODAMA_BOE_TV101WUM_NL2;
+	}
+};
+
+static bool kodama_is_panel_id_valid(union panel_id id)
+{
+	if (id.value < PANEL_KODAMA_UNKNOWN)
+		return true;
+	return false;
+};
+
+static int kodama_backlight(struct board_display_intf *intf)
+{
+	gpio_output(GPIO(PERIPHERAL_EN13), 1);
+	gpio_output(GPIO(DISP_PWM), 1);	/* DISP_PWM0 */
+
+	return 0;
+};
+
+static int kodama_power(struct board_display_intf *intf)
+{
+	if (board_id() < 2) {
+		/* board from p1 */
+		gpio_output(GPIO(LCM_RST), 0);
+		udelay(100);
+		gpio_output(GPIO(LCM_RST), 1);
+		mdelay(20);
+	} else {
+		/* board from p2 */
+		gpio_output(GPIO(LCM_RST), 0);
+		gpio_output(GPIO(BPI_BUS3), 0);
+		gpio_output(GPIO(MISC_BSI_CK_3), 1);
+		gpio_output(GPIO(PERIPHERAL_EN9), 1);
+		gpio_output(GPIO(SIM2_SRST), 1);
+		gpio_output(GPIO(SIM2_SIO), 1);
+		gpio_output(GPIO(BPI_OLAT1), 1);
+		gpio_output(GPIO(SIM2_SCLK), 1);
+		mdelay(20);
+		gpio_output(GPIO(LCM_RST), 1);
+		mdelay(20);
+		gpio_output(GPIO(BPI_BUS3), 1);
+		mdelay(20);
+	}
+
+	return 0;
+
+};
+
+struct board_display_intf panel_display_intf = {
+	.board			= "kodama",
+	.all_panel_info		= kodama_panel_info,
+	.all_panel_info_size	= ARRAY_SIZE(kodama_panel_info),
+	.cur_panel_info		= NULL,
+	.get_panel_id		= &kodama_get_panel_id,
+	.is_panel_id_valid	= &kodama_is_panel_id_valid,
+	.backlight		= &kodama_backlight,
+	.power			= &kodama_power,
+};
+
-- 
To view, visit https://review.coreboot.org/c/coreboot/+/33616
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I72e80e800ba041df1dda2b0f84470d1ef58bc946
Gerrit-Change-Number: 33616
Gerrit-PatchSet: 1
Gerrit-Owner: Peichao Li peichao.wang@bitland.corp-partner.google.com
Gerrit-MessageType: newchange



    

Change in ...coreboot[master]: kodama: add a new configuration for Kodama.