[S] Change in coreboot[main]: mb/google/rauru: Enable ChromeOS EC

[Yu-Ping Wu (Code Review)]

Yu-Ping Wu has submitted this change. ( https://review.coreboot.org/c/coreboot/+/84931?usp=email )

(

9 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
 )Change subject: mb/google/rauru: Enable ChromeOS EC
......................................................................

mb/google/rauru: Enable ChromeOS EC

1. Configure ChromeOS EC
2. Pass GPIO_EC_AP_INT_ODL to the payload

TEST=build pass
BUG=b:317009620

Change-Id: I20828eee93975e75dfb777fe29d5e1c3454b5059
Signed-off-by: Yidi Lin 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/84931
Reviewed-by: Yu-Ping Wu 
Reviewed-by: Yidi Lin 
Tested-by: build bot (Jenkins) 
Reviewed-by: Paul Menzel 
---
M src/mainboard/google/rauru/Kconfig
M src/mainboard/google/rauru/bootblock.c
M src/mainboard/google/rauru/chromeos.c
M src/mainboard/google/rauru/gpio.h
M src/mainboard/google/rauru/reset.c
5 files changed, 19 insertions(+), 2 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Paul Menzel: Looks good to me, but someone else must approve
  Yidi Lin: Looks good to me, approved
  Yu-Ping Wu: Looks good to me, approved

diff --git a/src/mainboard/google/rauru/Kconfig b/src/mainboard/google/rauru/Kconfig
index 457b5fb..c7483e2 100644
--- a/src/mainboard/google/rauru/Kconfig
+++ b/src/mainboard/google/rauru/Kconfig
@@ -10,7 +10,7 @@

config VBOOT
    select VBOOT_VBNV_FLASH
-	select VBOOT_NO_BOARD_SUPPORT
+	select EC_GOOGLE_CHROMEEC_SWITCHES
    select VBOOT_MOCK_SECDATA

config BOARD_SPECIFIC_OPTIONS
@@ -21,6 +21,10 @@
    select COMMON_CBFS_SPI_WRAPPER
    select SPI_FLASH
    select SPI_FLASH_INCLUDE_ALL_DRIVERS
+	select CHROMEOS_USE_EC_WATCHDOG_FLAG if CHROMEOS
+	select EC_GOOGLE_CHROMEEC
+	select EC_GOOGLE_CHROMEEC_BOARDID
+	select EC_GOOGLE_CHROMEEC_SPI

config MAINBOARD_DIR
    string
@@ -35,4 +39,8 @@
 config BOOT_DEVICE_SPI_FLASH_BUS
    int
    default 8
+
+config EC_GOOGLE_CHROMEEC_SPI_BUS
+	hex
+	default 0x1
 endif
diff --git a/src/mainboard/google/rauru/bootblock.c b/src/mainboard/google/rauru/bootblock.c
index e0717aa..bbebf52 100644
--- a/src/mainboard/google/rauru/bootblock.c
+++ b/src/mainboard/google/rauru/bootblock.c
@@ -17,6 +17,7 @@
    if (CONFIG(PCI))
    	mtk_pcie_pre_init();

+	mtk_spi_init(CONFIG_EC_GOOGLE_CHROMEEC_SPI_BUS, SPI_PAD0_MASK, 3 * MHz, 0);
    mtk_snfc_init();
    usb3_hub_reset();
    setup_chromeos_gpios();
diff --git a/src/mainboard/google/rauru/chromeos.c b/src/mainboard/google/rauru/chromeos.c
index 863e9a2..a24995f 100644
--- a/src/mainboard/google/rauru/chromeos.c
+++ b/src/mainboard/google/rauru/chromeos.c
@@ -7,6 +7,8 @@

void setup_chromeos_gpios(void)
 {
+	gpio_input(GPIO_EC_AP_INT_ODL);
+	gpio_output(GPIO_AP_EC_WARM_RST_REQ, 0);
    gpio_output(GPIO_AP_FP_FW_UP_STRAP, 0);
    gpio_output(GPIO_BEEP_ON_OD, 0);
    gpio_output(GPIO_EN_PWR_FP, 0);
@@ -20,6 +22,7 @@
    struct lb_gpio chromeos_gpios[] = {
    	{ GPIO_XHCI_INIT_DONE.id, ACTIVE_HIGH, -1, "XHCI init done" },
    	{ GPIO_EN_SPKR.id, ACTIVE_HIGH, -1, "speaker enable" },
+		{ GPIO_EC_AP_INT_ODL.id, ACTIVE_LOW, -1, "EC interrupt" },
    	{ GPIO_BEEP_ON_OD.id, ACTIVE_HIGH, -1, "beep enable" },
    };
    lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios));
diff --git a/src/mainboard/google/rauru/gpio.h b/src/mainboard/google/rauru/gpio.h
index 870a02f..b8c9a82 100644
--- a/src/mainboard/google/rauru/gpio.h
+++ b/src/mainboard/google/rauru/gpio.h
@@ -7,7 +7,9 @@

#define GPIO_BEEP_ON_OD		GPIO(PERIPHERAL_EN1)
 #define GPIO_EN_SPKR		GPIO(PERIPHERAL_EN0)
+#define GPIO_EC_AP_INT_ODL	GPIO(EINT19)
 #define GPIO_XHCI_INIT_DONE	GPIO(EINT28)
+#define GPIO_AP_EC_WARM_RST_REQ GPIO(EINT29)
 #define GPIO_FP_RST_1V8_S3_L	GPIO(EINT26)
 #define GPIO_AP_FP_FW_UP_STRAP	GPIO(EINT27)
 #define GPIO_EN_PWR_FP		GPIO(PERIPHERAL_EN3)
diff --git a/src/mainboard/google/rauru/reset.c b/src/mainboard/google/rauru/reset.c
index 3eb1390..05a576b 100644
--- a/src/mainboard/google/rauru/reset.c
+++ b/src/mainboard/google/rauru/reset.c
@@ -1,8 +1,11 @@
 /* SPDX-License-Identifier: GPL-2.0-only */

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

+#include "gpio.h"
+
 void do_board_reset(void)
 {
-	/* TODO: add reset function when gpio is ready */
+	gpio_output(GPIO_AP_EC_WARM_RST_REQ, 1);
 }