summaryrefslogtreecommitdiff
path: root/src/soc/intel
diff options
context:
space:
mode:
authorNico Huber <nico.huber@secunet.com>2020-03-31 17:34:52 +0200
committerMatt DeVillier <matt.devillier@gmail.com>2020-04-02 20:30:22 +0000
commit68680dd7cd1a2678406610e99400bd25bf7fa282 (patch)
treef587cbc24811dd99a40980c2880d042eedfaff7d /src/soc/intel
parent35bff432e5456acec8e68adca6b496fda53c6c57 (diff)
downloadcoreboot-68680dd7cd1a2678406610e99400bd25bf7fa282.tar.xz
Trim `.acpi_fill_ssdt_generator` and `.acpi_inject_dsdt_generator`
These two identifiers were always very confusing. We're not filling and injecting generators. We are filling SSDTs and injecting into the DSDT. So drop the `_generator` suffix. Hopefully, this also makes ACPI look a little less scary. Change-Id: I6f0e79632c9c855f38fe24c0186388a25990c44d Signed-off-by: Nico Huber <nico.huber@secunet.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/39977 Reviewed-by: Felix Held <felix-coreboot@felixheld.de> Reviewed-by: David Guckian Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/intel')
-rw-r--r--src/soc/intel/apollolake/chip.c2
-rw-r--r--src/soc/intel/baytrail/northcluster.c2
-rw-r--r--src/soc/intel/baytrail/southcluster.c2
-rw-r--r--src/soc/intel/braswell/northcluster.c6
-rw-r--r--src/soc/intel/braswell/southcluster.c2
-rw-r--r--src/soc/intel/broadwell/lpc.c2
-rw-r--r--src/soc/intel/broadwell/systemagent.c2
-rw-r--r--src/soc/intel/cannonlake/chip.c2
-rw-r--r--src/soc/intel/common/block/graphics/graphics.c16
-rw-r--r--src/soc/intel/common/block/i2c/i2c.c16
-rw-r--r--src/soc/intel/common/block/lpc/lpc.c16
-rw-r--r--src/soc/intel/common/block/scs/sd.c10
-rw-r--r--src/soc/intel/denverton_ns/chip.c2
-rw-r--r--src/soc/intel/denverton_ns/lpc.c2
-rw-r--r--src/soc/intel/icelake/chip.c2
-rw-r--r--src/soc/intel/jasperlake/chip.c2
-rw-r--r--src/soc/intel/skylake/chip.c2
-rw-r--r--src/soc/intel/tigerlake/chip.c2
-rw-r--r--src/soc/intel/xeon_sp/skx/chip.c2
-rw-r--r--src/soc/intel/xeon_sp/uncore.c2
20 files changed, 47 insertions, 47 deletions
diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c
index 5a652608eb..ee533bb743 100644
--- a/src/soc/intel/apollolake/chip.c
+++ b/src/soc/intel/apollolake/chip.c
@@ -226,7 +226,7 @@ static struct device_operations cpu_bus_ops = {
.enable_resources = DEVICE_NOOP,
.init = apollolake_init_cpus,
.scan_bus = NULL,
- .acpi_fill_ssdt_generator = generate_cpu_entries,
+ .acpi_fill_ssdt = generate_cpu_entries,
};
static void enable_dev(struct device *dev)
diff --git a/src/soc/intel/baytrail/northcluster.c b/src/soc/intel/baytrail/northcluster.c
index d7f17486da..0b61fe7d05 100644
--- a/src/soc/intel/baytrail/northcluster.c
+++ b/src/soc/intel/baytrail/northcluster.c
@@ -136,7 +136,7 @@ static void nc_read_resources(struct device *dev)
static struct device_operations nc_ops = {
.read_resources = nc_read_resources,
- .acpi_fill_ssdt_generator = generate_cpu_entries,
+ .acpi_fill_ssdt = generate_cpu_entries,
.set_resources = NULL,
.enable_resources = NULL,
.init = NULL,
diff --git a/src/soc/intel/baytrail/southcluster.c b/src/soc/intel/baytrail/southcluster.c
index 746a353051..be58f42a58 100644
--- a/src/soc/intel/baytrail/southcluster.c
+++ b/src/soc/intel/baytrail/southcluster.c
@@ -521,7 +521,7 @@ static void southcluster_inject_dsdt(struct device *device)
static struct device_operations device_ops = {
.read_resources = sc_read_resources,
.set_resources = pci_dev_set_resources,
- .acpi_inject_dsdt_generator = southcluster_inject_dsdt,
+ .acpi_inject_dsdt = southcluster_inject_dsdt,
.write_acpi_tables = acpi_write_hpet,
.enable_resources = NULL,
.init = sc_init,
diff --git a/src/soc/intel/braswell/northcluster.c b/src/soc/intel/braswell/northcluster.c
index f8e3391f9e..4acef25d45 100644
--- a/src/soc/intel/braswell/northcluster.c
+++ b/src/soc/intel/braswell/northcluster.c
@@ -166,9 +166,9 @@ static void nc_read_resources(struct device *dev)
}
static struct device_operations nc_ops = {
- .acpi_fill_ssdt_generator = generate_cpu_entries,
- .read_resources = nc_read_resources,
- .ops_pci = &soc_pci_ops,
+ .acpi_fill_ssdt = generate_cpu_entries,
+ .read_resources = nc_read_resources,
+ .ops_pci = &soc_pci_ops,
};
static const struct pci_driver nc_driver __pci_driver = {
diff --git a/src/soc/intel/braswell/southcluster.c b/src/soc/intel/braswell/southcluster.c
index be0d910ed8..aa054d6801 100644
--- a/src/soc/intel/braswell/southcluster.c
+++ b/src/soc/intel/braswell/southcluster.c
@@ -573,7 +573,7 @@ static struct device_operations device_ops = {
.read_resources = sc_read_resources,
.set_resources = pci_dev_set_resources,
.enable_resources = NULL,
- .acpi_inject_dsdt_generator = southcluster_inject_dsdt,
+ .acpi_inject_dsdt = southcluster_inject_dsdt,
.write_acpi_tables = southcluster_write_acpi_tables,
.init = sc_init,
.enable = southcluster_enable_dev,
diff --git a/src/soc/intel/broadwell/lpc.c b/src/soc/intel/broadwell/lpc.c
index 15b383c9e5..bc6bc6b200 100644
--- a/src/soc/intel/broadwell/lpc.c
+++ b/src/soc/intel/broadwell/lpc.c
@@ -623,7 +623,7 @@ static struct device_operations device_ops = {
.read_resources = &pch_lpc_read_resources,
.set_resources = &pci_dev_set_resources,
.enable_resources = &pci_dev_enable_resources,
- .acpi_inject_dsdt_generator = southcluster_inject_dsdt,
+ .acpi_inject_dsdt = southcluster_inject_dsdt,
.write_acpi_tables = broadwell_write_acpi_tables,
.init = &lpc_init,
.scan_bus = &scan_static_bus,
diff --git a/src/soc/intel/broadwell/systemagent.c b/src/soc/intel/broadwell/systemagent.c
index 1af554a669..fdaa9f6541 100644
--- a/src/soc/intel/broadwell/systemagent.c
+++ b/src/soc/intel/broadwell/systemagent.c
@@ -440,7 +440,7 @@ static void systemagent_init(struct device *dev)
static struct device_operations systemagent_ops = {
.read_resources = systemagent_read_resources,
- .acpi_fill_ssdt_generator = generate_cpu_entries,
+ .acpi_fill_ssdt = generate_cpu_entries,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
.init = systemagent_init,
diff --git a/src/soc/intel/cannonlake/chip.c b/src/soc/intel/cannonlake/chip.c
index a53c1a8bef..a2a678ba28 100644
--- a/src/soc/intel/cannonlake/chip.c
+++ b/src/soc/intel/cannonlake/chip.c
@@ -199,7 +199,7 @@ static struct device_operations cpu_bus_ops = {
.set_resources = DEVICE_NOOP,
.enable_resources = DEVICE_NOOP,
.init = DEVICE_NOOP,
- .acpi_fill_ssdt_generator = generate_cpu_entries,
+ .acpi_fill_ssdt = generate_cpu_entries,
};
static void soc_enable(struct device *dev)
diff --git a/src/soc/intel/common/block/graphics/graphics.c b/src/soc/intel/common/block/graphics/graphics.c
index e1eb6fe6fb..55c181b0bd 100644
--- a/src/soc/intel/common/block/graphics/graphics.c
+++ b/src/soc/intel/common/block/graphics/graphics.c
@@ -126,16 +126,16 @@ void graphics_gtt_rmw(unsigned long reg, uint32_t andmask, uint32_t ormask)
}
static const struct device_operations graphics_ops = {
- .read_resources = pci_dev_read_resources,
- .set_resources = pci_dev_set_resources,
- .enable_resources = pci_dev_enable_resources,
- .init = graphics_soc_init,
- .ops_pci = &pci_dev_ops_pci,
+ .read_resources = pci_dev_read_resources,
+ .set_resources = pci_dev_set_resources,
+ .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,
- .acpi_fill_ssdt_generator = gma_generate_ssdt,
+ .write_acpi_tables = graphics_soc_write_acpi_opregion,
+ .acpi_fill_ssdt = gma_generate_ssdt,
#endif
- .scan_bus = scan_generic_bus,
+ .scan_bus = scan_generic_bus,
};
static const unsigned short pci_device_ids[] = {
diff --git a/src/soc/intel/common/block/i2c/i2c.c b/src/soc/intel/common/block/i2c/i2c.c
index b5ea15e0c6..6612210a84 100644
--- a/src/soc/intel/common/block/i2c/i2c.c
+++ b/src/soc/intel/common/block/i2c/i2c.c
@@ -175,15 +175,15 @@ static void dw_i2c_device_init(struct device *dev)
}
static struct device_operations i2c_dev_ops = {
- .read_resources = pci_dev_read_resources,
- .set_resources = pci_dev_set_resources,
- .enable_resources = pci_dev_enable_resources,
- .scan_bus = scan_smbus,
- .ops_i2c_bus = &dw_i2c_bus_ops,
- .ops_pci = &pci_dev_ops_pci,
- .init = dw_i2c_device_init,
+ .read_resources = pci_dev_read_resources,
+ .set_resources = pci_dev_set_resources,
+ .enable_resources = pci_dev_enable_resources,
+ .scan_bus = scan_smbus,
+ .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,
+ .acpi_fill_ssdt = dw_i2c_acpi_fill_ssdt,
#endif
};
diff --git a/src/soc/intel/common/block/lpc/lpc.c b/src/soc/intel/common/block/lpc/lpc.c
index e65beb4a95..4cfd6f4839 100644
--- a/src/soc/intel/common/block/lpc/lpc.c
+++ b/src/soc/intel/common/block/lpc/lpc.c
@@ -108,16 +108,16 @@ static void pch_lpc_set_resources(struct device *dev)
}
static struct device_operations device_ops = {
- .read_resources = pch_lpc_read_resources,
- .set_resources = pch_lpc_set_resources,
- .enable_resources = pci_dev_enable_resources,
+ .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,
+ .write_acpi_tables = southbridge_write_acpi_tables,
+ .acpi_inject_dsdt = southbridge_inject_dsdt,
#endif
- .init = lpc_soc_init,
- .scan_bus = scan_static_bus,
- .ops_pci = &pci_dev_ops_pci,
+ .init = lpc_soc_init,
+ .scan_bus = scan_static_bus,
+ .ops_pci = &pci_dev_ops_pci,
};
static const unsigned short pci_device_ids[] = {
diff --git a/src/soc/intel/common/block/scs/sd.c b/src/soc/intel/common/block/scs/sd.c
index 56af940875..d529faaaca 100644
--- a/src/soc/intel/common/block/scs/sd.c
+++ b/src/soc/intel/common/block/scs/sd.c
@@ -54,13 +54,13 @@ static void sd_fill_ssdt(struct device *dev)
#endif
static struct device_operations dev_ops = {
- .read_resources = pci_dev_read_resources,
- .set_resources = pci_dev_set_resources,
- .enable_resources = pci_dev_enable_resources,
+ .read_resources = pci_dev_read_resources,
+ .set_resources = pci_dev_set_resources,
+ .enable_resources = pci_dev_enable_resources,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_fill_ssdt_generator = sd_fill_ssdt,
+ .acpi_fill_ssdt = sd_fill_ssdt,
#endif
- .ops_pci = &pci_dev_ops_pci,
+ .ops_pci = &pci_dev_ops_pci,
};
static const unsigned short pci_device_ids[] = {
diff --git a/src/soc/intel/denverton_ns/chip.c b/src/soc/intel/denverton_ns/chip.c
index f71b5967e9..c41d857d88 100644
--- a/src/soc/intel/denverton_ns/chip.c
+++ b/src/soc/intel/denverton_ns/chip.c
@@ -48,7 +48,7 @@ static struct device_operations cpu_bus_ops = {
.init = denverton_init_cpus,
.scan_bus = NULL,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_fill_ssdt_generator = generate_cpu_entries,
+ .acpi_fill_ssdt = generate_cpu_entries,
#endif
};
diff --git a/src/soc/intel/denverton_ns/lpc.c b/src/soc/intel/denverton_ns/lpc.c
index bf9263dcd3..f695d6123f 100644
--- a/src/soc/intel/denverton_ns/lpc.c
+++ b/src/soc/intel/denverton_ns/lpc.c
@@ -552,7 +552,7 @@ static struct device_operations device_ops = {
.read_resources = lpc_read_resources,
.set_resources = pci_dev_set_resources,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_inject_dsdt_generator = southcluster_inject_dsdt,
+ .acpi_inject_dsdt = southcluster_inject_dsdt,
.write_acpi_tables = southcluster_write_acpi_tables,
#endif
.enable_resources = lpc_enable_resources,
diff --git a/src/soc/intel/icelake/chip.c b/src/soc/intel/icelake/chip.c
index d2427b931d..304f7e3501 100644
--- a/src/soc/intel/icelake/chip.c
+++ b/src/soc/intel/icelake/chip.c
@@ -155,7 +155,7 @@ static struct device_operations cpu_bus_ops = {
.set_resources = DEVICE_NOOP,
.enable_resources = DEVICE_NOOP,
.init = DEVICE_NOOP,
- .acpi_fill_ssdt_generator = generate_cpu_entries,
+ .acpi_fill_ssdt = generate_cpu_entries,
};
static void soc_enable(struct device *dev)
diff --git a/src/soc/intel/jasperlake/chip.c b/src/soc/intel/jasperlake/chip.c
index b7ed9df3d8..2b00f96e1e 100644
--- a/src/soc/intel/jasperlake/chip.c
+++ b/src/soc/intel/jasperlake/chip.c
@@ -163,7 +163,7 @@ static struct device_operations cpu_bus_ops = {
.enable_resources = DEVICE_NOOP,
.init = DEVICE_NOOP,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_fill_ssdt_generator = generate_cpu_entries,
+ .acpi_fill_ssdt = generate_cpu_entries,
#endif
};
diff --git a/src/soc/intel/skylake/chip.c b/src/soc/intel/skylake/chip.c
index 0ab10ca4c7..40d5b1d66e 100644
--- a/src/soc/intel/skylake/chip.c
+++ b/src/soc/intel/skylake/chip.c
@@ -111,7 +111,7 @@ static struct device_operations cpu_bus_ops = {
.enable_resources = DEVICE_NOOP,
.init = DEVICE_NOOP,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_fill_ssdt_generator = generate_cpu_entries,
+ .acpi_fill_ssdt = generate_cpu_entries,
#endif
};
diff --git a/src/soc/intel/tigerlake/chip.c b/src/soc/intel/tigerlake/chip.c
index 1c7078d6cf..231623ca8d 100644
--- a/src/soc/intel/tigerlake/chip.c
+++ b/src/soc/intel/tigerlake/chip.c
@@ -163,7 +163,7 @@ static struct device_operations cpu_bus_ops = {
.enable_resources = DEVICE_NOOP,
.init = DEVICE_NOOP,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_fill_ssdt_generator = generate_cpu_entries,
+ .acpi_fill_ssdt = generate_cpu_entries,
#endif
};
diff --git a/src/soc/intel/xeon_sp/skx/chip.c b/src/soc/intel/xeon_sp/skx/chip.c
index 7a737ac2b4..764e70fea6 100644
--- a/src/soc/intel/xeon_sp/skx/chip.c
+++ b/src/soc/intel/xeon_sp/skx/chip.c
@@ -489,7 +489,7 @@ static struct device_operations cpu_bus_ops = {
.scan_bus = NULL,
#if CONFIG(HAVE_ACPI_TABLES)
/* defined in src/soc/intel/common/block/acpi/acpi.c */
- .acpi_fill_ssdt_generator = generate_cpu_entries,
+ .acpi_fill_ssdt = generate_cpu_entries,
#endif
};
diff --git a/src/soc/intel/xeon_sp/uncore.c b/src/soc/intel/xeon_sp/uncore.c
index c72c6c3ffc..f549eecd85 100644
--- a/src/soc/intel/xeon_sp/uncore.c
+++ b/src/soc/intel/xeon_sp/uncore.c
@@ -288,7 +288,7 @@ static struct device_operations mmapvtd_ops = {
.init = mmapvtd_init,
.ops_pci = &soc_pci_ops,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_inject_dsdt_generator = NULL,
+ .acpi_inject_dsdt = NULL,
#endif
};