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>
This commit is contained in:
Karthikeyan Ramasubramanian 2020-01-09 11:32:16 -07:00 committed by Patrick Rudolph
parent b71fb5282e
commit 0e971e11a0
4 changed files with 8 additions and 0 deletions

View File

@ -117,7 +117,9 @@ static const struct device_operations graphics_ops = {
.enable_resources = pci_dev_enable_resources, .enable_resources = pci_dev_enable_resources,
.init = graphics_soc_init, .init = graphics_soc_init,
.ops_pci = &pci_dev_ops_pci, .ops_pci = &pci_dev_ops_pci,
#if CONFIG(HAVE_ACPI_TABLES)
.write_acpi_tables = graphics_soc_write_acpi_opregion, .write_acpi_tables = graphics_soc_write_acpi_opregion,
#endif
.scan_bus = scan_generic_bus, .scan_bus = scan_generic_bus,
}; };

View File

@ -183,7 +183,9 @@ static struct device_operations i2c_dev_ops = {
.ops_i2c_bus = &dw_i2c_bus_ops, .ops_i2c_bus = &dw_i2c_bus_ops,
.ops_pci = &pci_dev_ops_pci, .ops_pci = &pci_dev_ops_pci,
.init = dw_i2c_device_init, .init = dw_i2c_device_init,
#if CONFIG(HAVE_ACPI_TABLES)
.acpi_fill_ssdt_generator = dw_i2c_acpi_fill_ssdt, .acpi_fill_ssdt_generator = dw_i2c_acpi_fill_ssdt,
#endif
}; };
static const unsigned short pci_device_ids[] = { static const unsigned short pci_device_ids[] = {

View File

@ -112,8 +112,10 @@ static struct device_operations device_ops = {
.read_resources = pch_lpc_read_resources, .read_resources = pch_lpc_read_resources,
.set_resources = pch_lpc_set_resources, .set_resources = pch_lpc_set_resources,
.enable_resources = pci_dev_enable_resources, .enable_resources = pci_dev_enable_resources,
#if CONFIG(HAVE_ACPI_TABLES)
.write_acpi_tables = southbridge_write_acpi_tables, .write_acpi_tables = southbridge_write_acpi_tables,
.acpi_inject_dsdt_generator = southbridge_inject_dsdt, .acpi_inject_dsdt_generator = southbridge_inject_dsdt,
#endif
.init = lpc_soc_init, .init = lpc_soc_init,
.scan_bus = scan_static_bus, .scan_bus = scan_static_bus,
.ops_pci = &pci_dev_ops_pci, .ops_pci = &pci_dev_ops_pci,

View File

@ -156,7 +156,9 @@ static struct device_operations cpu_bus_ops = {
.set_resources = DEVICE_NOOP, .set_resources = DEVICE_NOOP,
.enable_resources = DEVICE_NOOP, .enable_resources = DEVICE_NOOP,
.init = DEVICE_NOOP, .init = DEVICE_NOOP,
#if CONFIG(HAVE_ACPI_TABLES)
.acpi_fill_ssdt_generator = generate_cpu_entries, .acpi_fill_ssdt_generator = generate_cpu_entries,
#endif
}; };
static void soc_enable(struct device *dev) static void soc_enable(struct device *dev)