aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathew King <mathewk@chromium.org>2021-02-16 14:05:15 -0700
committerPatrick Georgi <pgeorgi@google.com>2021-02-22 07:28:18 +0000
commit5d478879656b62cc56e0b0fe1f57e35b318e6624 (patch)
treee8baf58133529407a6b0498674a1411747d6946f
parent40f53f4b8790c72247901d05e4369ca3e04b28f8 (diff)
mb/google/guybrush: Enable ACPI tables
BUG=b:180419454 TEST=builds Signed-off-by: Mathew King <mathewk@chromium.org> Change-Id: I1e724e78b5ef378d474063417aa2b7e57a00886f Reviewed-on: https://review.coreboot.org/c/coreboot/+/50814 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Raul Rangel <rrangel@chromium.org> Reviewed-by: EricR Lai <ericr_lai@compal.corp-partner.google.com>
-rw-r--r--src/mainboard/google/guybrush/chromeos.c11
-rw-r--r--src/mainboard/google/guybrush/mainboard.c5
-rw-r--r--src/mainboard/google/guybrush/variants/baseboard/include/baseboard/gpio.h3
3 files changed, 18 insertions, 1 deletions
diff --git a/src/mainboard/google/guybrush/chromeos.c b/src/mainboard/google/guybrush/chromeos.c
index 776637ac2d..d2ef97ef91 100644
--- a/src/mainboard/google/guybrush/chromeos.c
+++ b/src/mainboard/google/guybrush/chromeos.c
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
+#include <baseboard/gpio.h>
#include <boot/coreboot_tables.h>
#include <gpio.h>
#include <vendorcode/google/chromeos/chromeos.h>
@@ -12,3 +13,13 @@ void fill_lb_gpios(struct lb_gpios *gpios)
};
lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios));
}
+
+static const struct cros_gpio cros_gpios[] = {
+ CROS_GPIO_REC_AL(CROS_GPIO_VIRTUAL, GPIO_DEVICE_NAME),
+ CROS_GPIO_WP_AL(CROS_WP_GPIO, GPIO_DEVICE_NAME),
+};
+
+void mainboard_chromeos_acpi_generate(void)
+{
+ chromeos_acpi_gpio_generate(cros_gpios, ARRAY_SIZE(cros_gpios));
+}
diff --git a/src/mainboard/google/guybrush/mainboard.c b/src/mainboard/google/guybrush/mainboard.c
index f4466d1bde..3a45907a7b 100644
--- a/src/mainboard/google/guybrush/mainboard.c
+++ b/src/mainboard/google/guybrush/mainboard.c
@@ -2,6 +2,7 @@
#include <baseboard/variants.h>
#include <device/device.h>
+#include <vendorcode/google/chromeos/chromeos.h>
static void mainboard_configure_gpios(void)
{
@@ -22,7 +23,9 @@ static void mainboard_init(void *chip_info)
static void mainboard_enable(struct device *dev)
{
- /* TODO: Enable mainboard */
+ printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
+
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
}
struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/gpio.h b/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/gpio.h
index b94afac4bf..4c9fc61045 100644
--- a/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/gpio.h
+++ b/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/gpio.h
@@ -3,4 +3,7 @@
#ifndef __BASEBOARD_GPIO_H__
#define __BASEBOARD_GPIO_H__
+/* SPI Write protect */
+#define CROS_WP_GPIO GPIO_67
+
#endif /* __BASEBOARD_GPIO_H__ */