summaryrefslogtreecommitdiff
path: root/src/mainboard/intel
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2021-06-13 15:57:06 +0300
committerFelix Held <felix-coreboot@felixheld.de>2021-12-23 21:18:25 +0000
commitff01bca624283ba149c90a32d8f5655f27749a85 (patch)
tree9f4a2acbcd62ea69b726b0034808ade61f1b4483 /src/mainboard/intel
parentad489b8a2719e85933e21b14dede0a7f5833bcf9 (diff)
ChromeOS: Refactor ACPI CNVS generation
Remove chromeos_dsdt_generator() calls under mainboard, it is possible to make the single call to fill \CNVS and \OIPG without leveraging device operations. Change-Id: Id79af96bb6c038d273ac9c4afc723437fc1f3fc9 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/55502 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Diffstat (limited to 'src/mainboard/intel')
-rw-r--r--src/mainboard/intel/adlrvp/mainboard.c3
-rw-r--r--src/mainboard/intel/baskingridge/mainboard.c2
-rw-r--r--src/mainboard/intel/coffeelake_rvp/mainboard.c2
-rw-r--r--src/mainboard/intel/emeraldlake2/mainboard.c2
-rw-r--r--src/mainboard/intel/glkrvp/mainboard.c2
-rw-r--r--src/mainboard/intel/icelake_rvp/mainboard.c7
-rw-r--r--src/mainboard/intel/jasperlake_rvp/mainboard.c7
-rw-r--r--src/mainboard/intel/kblrvp/mainboard.c2
-rw-r--r--src/mainboard/intel/kunimitsu/mainboard.c2
-rw-r--r--src/mainboard/intel/shadowmountain/mainboard.c7
-rw-r--r--src/mainboard/intel/strago/mainboard.c2
-rw-r--r--src/mainboard/intel/tglrvp/mainboard.c7
-rw-r--r--src/mainboard/intel/wtm2/mainboard.c2
13 files changed, 0 insertions, 47 deletions
diff --git a/src/mainboard/intel/adlrvp/mainboard.c b/src/mainboard/intel/adlrvp/mainboard.c
index 904673e340..f929b10d77 100644
--- a/src/mainboard/intel/adlrvp/mainboard.c
+++ b/src/mainboard/intel/adlrvp/mainboard.c
@@ -6,7 +6,6 @@
#include <drivers/intel/gma/opregion.h>
#include <ec/ec.h>
#include <soc/gpio.h>
-#include <vendorcode/google/chromeos/chromeos.h>
#include <smbios.h>
#include <stdint.h>
#include <string.h>
@@ -57,8 +56,6 @@ static void mainboard_smbios_strings(struct device *dev, struct smbios_type11 *t
static void mainboard_enable(struct device *dev)
{
- dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
-
#if CONFIG(BOARD_INTEL_ADLRVP_M_EXT_EC)
dev->ops->get_smbios_strings = mainboard_smbios_strings;
#endif
diff --git a/src/mainboard/intel/baskingridge/mainboard.c b/src/mainboard/intel/baskingridge/mainboard.c
index 04803fa37b..73fa9aa65c 100644
--- a/src/mainboard/intel/baskingridge/mainboard.c
+++ b/src/mainboard/intel/baskingridge/mainboard.c
@@ -5,7 +5,6 @@
#include <drivers/intel/gma/int15.h>
#include <acpi/acpi.h>
#include <southbridge/intel/lynxpoint/pch.h>
-#include <vendorcode/google/chromeos/chromeos.h>
void mainboard_suspend_resume(void)
{
@@ -18,7 +17,6 @@ void mainboard_suspend_resume(void)
static void mainboard_enable(struct device *dev)
{
- dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_EDP, GMA_INT15_PANEL_FIT_CENTERING, GMA_INT15_BOOT_DISPLAY_DEFAULT, 0);
}
diff --git a/src/mainboard/intel/coffeelake_rvp/mainboard.c b/src/mainboard/intel/coffeelake_rvp/mainboard.c
index aa073bcc8c..eb9a316a34 100644
--- a/src/mainboard/intel/coffeelake_rvp/mainboard.c
+++ b/src/mainboard/intel/coffeelake_rvp/mainboard.c
@@ -6,7 +6,6 @@
#include <nhlt.h>
#include <soc/gpio.h>
#include <soc/nhlt.h>
-#include <vendorcode/google/chromeos/chromeos.h>
static void mainboard_init(void *chip_info)
{
@@ -45,7 +44,6 @@ static unsigned long mainboard_write_acpi_tables(const struct device *device,
static void mainboard_enable(struct device *dev)
{
dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
- dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
}
struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/intel/emeraldlake2/mainboard.c b/src/mainboard/intel/emeraldlake2/mainboard.c
index 6291d60993..3b6727b057 100644
--- a/src/mainboard/intel/emeraldlake2/mainboard.c
+++ b/src/mainboard/intel/emeraldlake2/mainboard.c
@@ -4,14 +4,12 @@
#include <drivers/intel/gma/int15.h>
#include <acpi/acpi.h>
#include <southbridge/intel/bd82x6x/pch.h>
-#include <vendorcode/google/chromeos/chromeos.h>
// mainboard_enable is executed as first thing after
// enumerate_buses().
static void mainboard_enable(struct device *dev)
{
- dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_EDP, GMA_INT15_PANEL_FIT_CENTERING, GMA_INT15_BOOT_DISPLAY_DEFAULT, 0);
}
diff --git a/src/mainboard/intel/glkrvp/mainboard.c b/src/mainboard/intel/glkrvp/mainboard.c
index cfbaf0d6c8..1cfa4e06d5 100644
--- a/src/mainboard/intel/glkrvp/mainboard.c
+++ b/src/mainboard/intel/glkrvp/mainboard.c
@@ -9,7 +9,6 @@
#include <nhlt.h>
#include <soc/gpio.h>
#include <soc/nhlt.h>
-#include <vendorcode/google/chromeos/chromeos.h>
#include <variant/ec.h>
#include <variant/gpio.h>
@@ -55,7 +54,6 @@ static unsigned long mainboard_write_acpi_tables(
static void mainboard_enable(struct device *dev)
{
dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
- dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
}
struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/intel/icelake_rvp/mainboard.c b/src/mainboard/intel/icelake_rvp/mainboard.c
index c8e9e411ea..2440651499 100644
--- a/src/mainboard/intel/icelake_rvp/mainboard.c
+++ b/src/mainboard/intel/icelake_rvp/mainboard.c
@@ -5,7 +5,6 @@
#include <baseboard/variants.h>
#include <device/device.h>
#include <soc/gpio.h>
-#include <vendorcode/google/chromeos/chromeos.h>
static void mainboard_init(void *chip_info)
{
@@ -16,12 +15,6 @@ static void mainboard_init(void *chip_info)
gpio_configure_pads(pads, num);
}
-static void mainboard_enable(struct device *dev)
-{
- dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
-}
-
struct chip_operations mainboard_ops = {
.init = mainboard_init,
- .enable_dev = mainboard_enable,
};
diff --git a/src/mainboard/intel/jasperlake_rvp/mainboard.c b/src/mainboard/intel/jasperlake_rvp/mainboard.c
index 315d47d2b0..efba386cf9 100644
--- a/src/mainboard/intel/jasperlake_rvp/mainboard.c
+++ b/src/mainboard/intel/jasperlake_rvp/mainboard.c
@@ -7,7 +7,6 @@
#include <soc/gpio.h>
#include <soc/pcr_ids.h>
#include <smbios.h>
-#include <vendorcode/google/chromeos/chromeos.h>
#define SERIAL_IO_PCR_GPPRVRW4 0x60C
@@ -23,11 +22,6 @@ static void mainboard_init(void *chip_info)
pcr_write32(PID_SERIALIO, SERIAL_IO_PCR_GPPRVRW4, BIT8);
}
-static void mainboard_enable(struct device *dev)
-{
- dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
-}
-
const char *smbios_system_sku(void)
{
static const char *sku_str = "sku2147483647"; /* sku{0-1} */
@@ -36,5 +30,4 @@ const char *smbios_system_sku(void)
struct chip_operations mainboard_ops = {
.init = mainboard_init,
- .enable_dev = mainboard_enable,
};
diff --git a/src/mainboard/intel/kblrvp/mainboard.c b/src/mainboard/intel/kblrvp/mainboard.c
index e502d84632..2b09df4596 100644
--- a/src/mainboard/intel/kblrvp/mainboard.c
+++ b/src/mainboard/intel/kblrvp/mainboard.c
@@ -4,7 +4,6 @@
#include <device/device.h>
#include <gpio.h>
#include <soc/nhlt.h>
-#include <vendorcode/google/chromeos/chromeos.h>
#include "ec.h"
#include <variant/gpio.h>
@@ -21,7 +20,6 @@ static void mainboard_init(struct device *dev)
static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
- dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
}
struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/intel/kunimitsu/mainboard.c b/src/mainboard/intel/kunimitsu/mainboard.c
index 4136c368fd..b7c61f5058 100644
--- a/src/mainboard/intel/kunimitsu/mainboard.c
+++ b/src/mainboard/intel/kunimitsu/mainboard.c
@@ -5,7 +5,6 @@
#include <device/device.h>
#include <gpio.h>
#include <soc/nhlt.h>
-#include <vendorcode/google/chromeos/chromeos.h>
#include "ec.h"
#include "gpio.h"
@@ -82,7 +81,6 @@ static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
- dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
}
struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/intel/shadowmountain/mainboard.c b/src/mainboard/intel/shadowmountain/mainboard.c
index 2783b4d2ce..f035aa9b53 100644
--- a/src/mainboard/intel/shadowmountain/mainboard.c
+++ b/src/mainboard/intel/shadowmountain/mainboard.c
@@ -5,7 +5,6 @@
#include <device/device.h>
#include <ec/ec.h>
#include <soc/gpio.h>
-#include <vendorcode/google/chromeos/chromeos.h>
static void mainboard_init(void *chip_info)
{
@@ -21,12 +20,6 @@ static void mainboard_init(void *chip_info)
mainboard_ec_init();
}
-static void mainboard_enable(struct device *dev)
-{
- dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
-}
-
struct chip_operations mainboard_ops = {
.init = mainboard_init,
- .enable_dev = mainboard_enable,
};
diff --git a/src/mainboard/intel/strago/mainboard.c b/src/mainboard/intel/strago/mainboard.c
index 82f46294cb..447ae31355 100644
--- a/src/mainboard/intel/strago/mainboard.c
+++ b/src/mainboard/intel/strago/mainboard.c
@@ -2,7 +2,6 @@
#include <device/device.h>
#include <soc/gpio.h>
-#include <vendorcode/google/chromeos/chromeos.h>
#include "ec.h"
static void mainboard_init(struct device *dev)
@@ -17,7 +16,6 @@ static void mainboard_init(struct device *dev)
static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
- dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
}
struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/intel/tglrvp/mainboard.c b/src/mainboard/intel/tglrvp/mainboard.c
index 82877ed28e..bbce9278df 100644
--- a/src/mainboard/intel/tglrvp/mainboard.c
+++ b/src/mainboard/intel/tglrvp/mainboard.c
@@ -5,7 +5,6 @@
#include <device/device.h>
#include <ec/ec.h>
#include <soc/gpio.h>
-#include <vendorcode/google/chromeos/chromeos.h>
#include <smbios.h>
#include <string.h>
@@ -29,12 +28,6 @@ static void mainboard_init(void *chip_info)
mainboard_ec_init();
}
-static void mainboard_enable(struct device *dev)
-{
- dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
-}
-
struct chip_operations mainboard_ops = {
.init = mainboard_init,
- .enable_dev = mainboard_enable,
};
diff --git a/src/mainboard/intel/wtm2/mainboard.c b/src/mainboard/intel/wtm2/mainboard.c
index e9583acbfc..d17645ff03 100644
--- a/src/mainboard/intel/wtm2/mainboard.c
+++ b/src/mainboard/intel/wtm2/mainboard.c
@@ -2,14 +2,12 @@
#include <device/device.h>
#include <drivers/intel/gma/int15.h>
-#include <vendorcode/google/chromeos/chromeos.h>
// mainboard_enable is executed as first thing after
// enumerate_buses().
static void mainboard_enable(struct device *dev)
{
- dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_EDP, GMA_INT15_PANEL_FIT_CENTERING, GMA_INT15_BOOT_DISPLAY_DEFAULT, 0);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-31 16:51:06 +0000