[coreboot-gerrit] Change in coreboot[master]: mb/google/corsola: Enable Chrome EC

[Hung-Te Lin (Code Review)]

Hung-Te Lin has submitted this change. ( https://review.coreboot.org/c/coreboot/+/59941 )

Change subject: mb/google/corsola: Enable Chrome EC
......................................................................

mb/google/corsola: Enable Chrome EC

Initialize SPI bus 1 for Chrome EC control.

TEST=build pass
BUG=b:202871018

Signed-off-by: Rex-BC Chen 
Change-Id: I7d032d595f7ca1dbed3de4dfe308ff4be64333cd
Reviewed-on: https://review.coreboot.org/c/coreboot/+/59941
Tested-by: build bot (Jenkins) 
Reviewed-by: Yu-Ping Wu 
---
M src/mainboard/google/corsola/Kconfig
M src/mainboard/google/corsola/bootblock.c
M src/mainboard/google/corsola/chromeos.c
M src/mainboard/google/corsola/reset.c
4 files changed, 17 insertions(+), 6 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Yu-Ping Wu: Looks good to me, approved

diff --git a/src/mainboard/google/corsola/Kconfig b/src/mainboard/google/corsola/Kconfig
index b57e23b..2a935f3 100644
--- a/src/mainboard/google/corsola/Kconfig
+++ b/src/mainboard/google/corsola/Kconfig
@@ -6,16 +6,24 @@

if BOARD_GOOGLE_CORSOLA_COMMON

+config VBOOT
+	select EC_GOOGLE_CHROMEEC_SWITCHES
+	select VBOOT_VBNV_FLASH
+
 config BOARD_SPECIFIC_OPTIONS
    def_bool y
    select SOC_MEDIATEK_MT8186
    select BOARD_ROMSIZE_KB_8192
    select MAINBOARD_HAS_CHROMEOS
+	select CHROMEOS_USE_EC_WATCHDOG_FLAG if CHROMEOS
    select COMMON_CBFS_SPI_WRAPPER
    select SPI_FLASH
    select SPI_FLASH_INCLUDE_ALL_DRIVERS
    select COMMONLIB_STORAGE
    select COMMONLIB_STORAGE_MMC
+	select EC_GOOGLE_CHROMEEC
+	select EC_GOOGLE_CHROMEEC_BOARDID
+	select EC_GOOGLE_CHROMEEC_SPI

config MAINBOARD_DIR
    string
@@ -34,4 +42,8 @@
 config SDCARD_INIT
    bool
    default n
+
+config EC_GOOGLE_CHROMEEC_SPI_BUS
+	hex
+	default 0x1
 endif
diff --git a/src/mainboard/google/corsola/bootblock.c b/src/mainboard/google/corsola/bootblock.c
index bb76b98..d742074 100644
--- a/src/mainboard/google/corsola/bootblock.c
+++ b/src/mainboard/google/corsola/bootblock.c
@@ -8,6 +8,7 @@

void bootblock_mainboard_init(void)
 {
+	mtk_spi_init(CONFIG_EC_GOOGLE_CHROMEEC_SPI_BUS, SPI_PAD0_MASK, 3 * MHz, 0);
    mtk_snfc_init(SPI_NOR_GPIO_SET0);
    setup_chromeos_gpios();
 }
diff --git a/src/mainboard/google/corsola/chromeos.c b/src/mainboard/google/corsola/chromeos.c
index 6a727c9..63c3f4c 100644
--- a/src/mainboard/google/corsola/chromeos.c
+++ b/src/mainboard/google/corsola/chromeos.c
@@ -26,9 +26,3 @@
    };
    lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios));
 }
-
-int get_recovery_mode_switch(void)
-{
-	/* TODO: use Chrome EC switches when EC support is added */
-	return 0;
-}
diff --git a/src/mainboard/google/corsola/reset.c b/src/mainboard/google/corsola/reset.c
index 3a97ee5..91ee7c0 100644
--- a/src/mainboard/google/corsola/reset.c
+++ b/src/mainboard/google/corsola/reset.c
@@ -1,7 +1,11 @@
 /* SPDX-License-Identifier: GPL-2.0-only */

+#include <gpio.h>
 #include <reset.h>

+#include "gpio.h"
+
 void do_board_reset(void)
 {
+	gpio_output(GPIO_RESET, 1);
 }