summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorKarthikeyan Ramasubramanian <kramasub@google.com>2020-01-09 11:32:16 -0700
committerPatrick Rudolph <siro@das-labor.org>2020-01-12 18:12:14 +0000
commit0e971e11a03afc6a983445c63737e9aae4c97840 (patch)
treec29c1323f34debd24c7e1d092f6d09f61cebe745 /src/soc
parentb71fb5282eaeccc1b35cc0ace6260c7beaa15d0d (diff)
downloadcoreboot-0e971e11a03afc6a983445c63737e9aae4c97840.tar.xz
soc/intel: Fix ACPI device operations initialization
Initialize ACPI device operations only when CONFIG_HAVE_ACPI_TABLES is enabled. BUG=None TEST=Build Test Change-Id: I5c5266885d8b08338d17a87bb95110765882120e Signed-off-by: Karthikeyan Ramasubramanian <kramasub@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/38309 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org> Reviewed-by: Furquan Shaikh <furquan@google.com>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/intel/common/block/graphics/graphics.c2
-rw-r--r--src/soc/intel/common/block/i2c/i2c.c2
-rw-r--r--src/soc/intel/common/block/lpc/lpc.c2
-rw-r--r--src/soc/intel/tigerlake/chip.c2
4 files changed, 8 insertions, 0 deletions
diff --git a/src/soc/intel/common/block/graphics/graphics.c b/src/soc/intel/common/block/graphics/graphics.c
index 90931ebd4c..98730590e1 100644
--- a/src/soc/intel/common/block/graphics/graphics.c
+++ b/src/soc/intel/common/block/graphics/graphics.c
@@ -117,7 +117,9 @@ static const struct device_operations graphics_ops = {
.enable_resources = pci_dev_enable_resources,
.init = graphics_soc_init,
.ops_pci = &pci_dev_ops_pci,
+#if CONFIG(HAVE_ACPI_TABLES)
.write_acpi_tables = graphics_soc_write_acpi_opregion,
+#endif
.scan_bus = scan_generic_bus,
};
diff --git a/src/soc/intel/common/block/i2c/i2c.c b/src/soc/intel/common/block/i2c/i2c.c
index 70f2c21f74..ffcc4a6e99 100644
--- a/src/soc/intel/common/block/i2c/i2c.c
+++ b/src/soc/intel/common/block/i2c/i2c.c
@@ -183,7 +183,9 @@ static struct device_operations i2c_dev_ops = {
.ops_i2c_bus = &dw_i2c_bus_ops,
.ops_pci = &pci_dev_ops_pci,
.init = dw_i2c_device_init,
+#if CONFIG(HAVE_ACPI_TABLES)
.acpi_fill_ssdt_generator = dw_i2c_acpi_fill_ssdt,
+#endif
};
static const unsigned short pci_device_ids[] = {
diff --git a/src/soc/intel/common/block/lpc/lpc.c b/src/soc/intel/common/block/lpc/lpc.c
index 258975ce76..9e86486dcf 100644
--- a/src/soc/intel/common/block/lpc/lpc.c
+++ b/src/soc/intel/common/block/lpc/lpc.c
@@ -112,8 +112,10 @@ static struct device_operations device_ops = {
.read_resources = pch_lpc_read_resources,
.set_resources = pch_lpc_set_resources,
.enable_resources = pci_dev_enable_resources,
+#if CONFIG(HAVE_ACPI_TABLES)
.write_acpi_tables = southbridge_write_acpi_tables,
.acpi_inject_dsdt_generator = southbridge_inject_dsdt,
+#endif
.init = lpc_soc_init,
.scan_bus = scan_static_bus,
.ops_pci = &pci_dev_ops_pci,
diff --git a/src/soc/intel/tigerlake/chip.c b/src/soc/intel/tigerlake/chip.c
index 530893ceca..d05fbdfdde 100644
--- a/src/soc/intel/tigerlake/chip.c
+++ b/src/soc/intel/tigerlake/chip.c
@@ -156,7 +156,9 @@ static struct device_operations cpu_bus_ops = {
.set_resources = DEVICE_NOOP,
.enable_resources = DEVICE_NOOP,
.init = DEVICE_NOOP,
+#if CONFIG(HAVE_ACPI_TABLES)
.acpi_fill_ssdt_generator = generate_cpu_entries,
+#endif
};
static void soc_enable(struct device *dev)