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>
diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c
index 317cd48..6eded1d 100644
--- a/src/arch/x86/acpi.c
+++ b/src/arch/x86/acpi.c
@@ -430,8 +430,8 @@
{
struct device *dev;
for (dev = all_devices; dev; dev = dev->next)
- if (dev->ops && dev->ops->acpi_fill_ssdt_generator)
- dev->ops->acpi_fill_ssdt_generator(dev);
+ if (dev->ops && dev->ops->acpi_fill_ssdt)
+ dev->ops->acpi_fill_ssdt(dev);
current = (unsigned long) acpigen_get_current();
}
@@ -1366,8 +1366,8 @@
acpigen_set_current((char *) current);
for (dev = all_devices; dev; dev = dev->next)
- if (dev->ops && dev->ops->acpi_inject_dsdt_generator)
- dev->ops->acpi_inject_dsdt_generator(dev);
+ if (dev->ops && dev->ops->acpi_inject_dsdt)
+ dev->ops->acpi_inject_dsdt(dev);
current = (unsigned long) acpigen_get_current();
memcpy((char *)current,
(char *)dsdt_file + sizeof(acpi_header_t),
diff --git a/src/device/pci_device.c b/src/device/pci_device.c
index b1e88a6..0cbb02d 100644
--- a/src/device/pci_device.c
+++ b/src/device/pci_device.c
@@ -768,7 +768,7 @@
.enable_resources = pci_dev_enable_resources,
#if CONFIG(HAVE_ACPI_TABLES)
.write_acpi_tables = pci_rom_write_acpi_tables,
- .acpi_fill_ssdt_generator = pci_rom_ssdt,
+ .acpi_fill_ssdt = pci_rom_ssdt,
#endif
.init = pci_dev_init,
.scan_bus = 0,
diff --git a/src/drivers/crb/tis.c b/src/drivers/crb/tis.c
index b1fbad0..32d1550 100644
--- a/src/drivers/crb/tis.c
+++ b/src/drivers/crb/tis.c
@@ -141,7 +141,7 @@
.set_resources = DEVICE_NOOP,
#if CONFIG(HAVE_ACPI_TABLES)
.acpi_name = crb_tpm_acpi_name,
- .acpi_fill_ssdt_generator = crb_tpm_fill_ssdt,
+ .acpi_fill_ssdt = crb_tpm_fill_ssdt,
#endif
};
diff --git a/src/drivers/generic/adau7002/adau7002.c b/src/drivers/generic/adau7002/adau7002.c
index 7f73cef..0a3d623 100644
--- a/src/drivers/generic/adau7002/adau7002.c
+++ b/src/drivers/generic/adau7002/adau7002.c
@@ -65,12 +65,12 @@
#endif
static struct device_operations adau7002_ops = {
- .read_resources = DEVICE_NOOP,
- .set_resources = DEVICE_NOOP,
- .enable_resources = DEVICE_NOOP,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_name = adau7002_acpi_name,
- .acpi_fill_ssdt_generator = adau7002_fill_ssdt,
+ .acpi_name = adau7002_acpi_name,
+ .acpi_fill_ssdt = adau7002_fill_ssdt,
#endif
};
diff --git a/src/drivers/generic/generic/generic.c b/src/drivers/generic/generic/generic.c
index c68fa3a..0ba2d53 100644
--- a/src/drivers/generic/generic/generic.c
+++ b/src/drivers/generic/generic/generic.c
@@ -78,11 +78,11 @@
}
static struct device_operations generic_dev_ops = {
- .read_resources = DEVICE_NOOP,
- .set_resources = DEVICE_NOOP,
- .enable_resources = DEVICE_NOOP,
- .acpi_name = generic_dev_acpi_name,
- .acpi_fill_ssdt_generator = generic_dev_fill_ssdt_generator,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
+ .acpi_name = generic_dev_acpi_name,
+ .acpi_fill_ssdt = generic_dev_fill_ssdt_generator,
};
static void generic_dev_enable(struct device *dev)
diff --git a/src/drivers/generic/gpio_keys/gpio_keys.c b/src/drivers/generic/gpio_keys/gpio_keys.c
index 753a555..67c5913 100644
--- a/src/drivers/generic/gpio_keys/gpio_keys.c
+++ b/src/drivers/generic/gpio_keys/gpio_keys.c
@@ -112,11 +112,11 @@
}
static struct device_operations gpio_keys_ops = {
- .read_resources = DEVICE_NOOP,
- .set_resources = DEVICE_NOOP,
- .enable_resources = DEVICE_NOOP,
- .acpi_name = gpio_keys_acpi_name,
- .acpi_fill_ssdt_generator = gpio_keys_fill_ssdt_generator,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
+ .acpi_name = gpio_keys_acpi_name,
+ .acpi_fill_ssdt = gpio_keys_fill_ssdt_generator,
};
static void gpio_keys_enable(struct device *dev)
diff --git a/src/drivers/generic/gpio_regulator/gpio_regulator.c b/src/drivers/generic/gpio_regulator/gpio_regulator.c
index 23c044d..b476126 100644
--- a/src/drivers/generic/gpio_regulator/gpio_regulator.c
+++ b/src/drivers/generic/gpio_regulator/gpio_regulator.c
@@ -73,7 +73,7 @@
.set_resources = DEVICE_NOOP,
.enable_resources = DEVICE_NOOP,
.acpi_name = gpio_regulator_acpi_name,
- .acpi_fill_ssdt_generator = gpio_regulator_fill_ssdt_generator,
+ .acpi_fill_ssdt = gpio_regulator_fill_ssdt_generator,
};
static void gpio_regulator_enable(struct device *dev)
diff --git a/src/drivers/generic/max98357a/max98357a.c b/src/drivers/generic/max98357a/max98357a.c
index 56fd26c3..6f724f8 100644
--- a/src/drivers/generic/max98357a/max98357a.c
+++ b/src/drivers/generic/max98357a/max98357a.c
@@ -80,12 +80,12 @@
#endif
static struct device_operations max98357a_ops = {
- .read_resources = DEVICE_NOOP,
- .set_resources = DEVICE_NOOP,
- .enable_resources = DEVICE_NOOP,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_name = max98357a_acpi_name,
- .acpi_fill_ssdt_generator = max98357a_fill_ssdt,
+ .acpi_name = max98357a_acpi_name,
+ .acpi_fill_ssdt = max98357a_fill_ssdt,
#endif
};
diff --git a/src/drivers/gfx/generic/generic.c b/src/drivers/gfx/generic/generic.c
index 9e952e8..a20279f 100644
--- a/src/drivers/gfx/generic/generic.c
+++ b/src/drivers/gfx/generic/generic.c
@@ -151,8 +151,8 @@
}
static struct device_operations gfx_ops = {
- .acpi_name = gfx_acpi_name,
- .acpi_fill_ssdt_generator = gfx_fill_ssdt_generator,
+ .acpi_name = gfx_acpi_name,
+ .acpi_fill_ssdt = gfx_fill_ssdt_generator,
};
static void gfx_enable(struct device *dev)
diff --git a/src/drivers/i2c/da7219/da7219.c b/src/drivers/i2c/da7219/da7219.c
index f82cd9f..5c67eda 100644
--- a/src/drivers/i2c/da7219/da7219.c
+++ b/src/drivers/i2c/da7219/da7219.c
@@ -108,12 +108,12 @@
#endif
static struct device_operations da7219_ops = {
- .read_resources = DEVICE_NOOP,
- .set_resources = DEVICE_NOOP,
- .enable_resources = DEVICE_NOOP,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_name = da7219_acpi_name,
- .acpi_fill_ssdt_generator = da7219_fill_ssdt,
+ .acpi_name = da7219_acpi_name,
+ .acpi_fill_ssdt = da7219_fill_ssdt,
#endif
};
diff --git a/src/drivers/i2c/generic/generic.c b/src/drivers/i2c/generic/generic.c
index 0b36e5f..592e791 100644
--- a/src/drivers/i2c/generic/generic.c
+++ b/src/drivers/i2c/generic/generic.c
@@ -190,12 +190,12 @@
#endif
static struct device_operations i2c_generic_ops = {
- .read_resources = DEVICE_NOOP,
- .set_resources = DEVICE_NOOP,
- .enable_resources = DEVICE_NOOP,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_name = i2c_generic_acpi_name,
- .acpi_fill_ssdt_generator = i2c_generic_fill_ssdt_generator,
+ .acpi_name = i2c_generic_acpi_name,
+ .acpi_fill_ssdt = i2c_generic_fill_ssdt_generator,
#endif
};
diff --git a/src/drivers/i2c/hid/hid.c b/src/drivers/i2c/hid/hid.c
index b8185d0..6e4169e 100644
--- a/src/drivers/i2c/hid/hid.c
+++ b/src/drivers/i2c/hid/hid.c
@@ -47,12 +47,12 @@
#endif
static struct device_operations i2c_hid_ops = {
- .read_resources = DEVICE_NOOP,
- .set_resources = DEVICE_NOOP,
- .enable_resources = DEVICE_NOOP,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_name = i2c_hid_acpi_name,
- .acpi_fill_ssdt_generator = i2c_hid_fill_ssdt_generator,
+ .acpi_name = i2c_hid_acpi_name,
+ .acpi_fill_ssdt = i2c_hid_fill_ssdt_generator,
#endif
};
diff --git a/src/drivers/i2c/max98373/max98373.c b/src/drivers/i2c/max98373/max98373.c
index 48db3e1..71ba75b 100644
--- a/src/drivers/i2c/max98373/max98373.c
+++ b/src/drivers/i2c/max98373/max98373.c
@@ -85,11 +85,11 @@
}
static struct device_operations max98373_ops = {
- .read_resources = DEVICE_NOOP,
- .set_resources = DEVICE_NOOP,
- .enable_resources = DEVICE_NOOP,
- .acpi_name = max98373_acpi_name,
- .acpi_fill_ssdt_generator = max98373_fill_ssdt,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
+ .acpi_name = max98373_acpi_name,
+ .acpi_fill_ssdt = max98373_fill_ssdt,
};
static void max98373_enable(struct device *dev)
diff --git a/src/drivers/i2c/max98927/max98927.c b/src/drivers/i2c/max98927/max98927.c
index 1cc72d3..7979fe3 100644
--- a/src/drivers/i2c/max98927/max98927.c
+++ b/src/drivers/i2c/max98927/max98927.c
@@ -81,11 +81,11 @@
}
static struct device_operations max98927_ops = {
- .read_resources = DEVICE_NOOP,
- .set_resources = DEVICE_NOOP,
- .enable_resources = DEVICE_NOOP,
- .acpi_name = max98927_acpi_name,
- .acpi_fill_ssdt_generator = max98927_fill_ssdt,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
+ .acpi_name = max98927_acpi_name,
+ .acpi_fill_ssdt = max98927_fill_ssdt,
};
static void max98927_enable(struct device *dev)
diff --git a/src/drivers/i2c/nau8825/nau8825.c b/src/drivers/i2c/nau8825/nau8825.c
index 33b3421..5d56b24 100644
--- a/src/drivers/i2c/nau8825/nau8825.c
+++ b/src/drivers/i2c/nau8825/nau8825.c
@@ -96,12 +96,12 @@
#endif
static struct device_operations nau8825_ops = {
- .read_resources = DEVICE_NOOP,
- .set_resources = DEVICE_NOOP,
- .enable_resources = DEVICE_NOOP,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_name = nau8825_acpi_name,
- .acpi_fill_ssdt_generator = nau8825_fill_ssdt,
+ .acpi_name = nau8825_acpi_name,
+ .acpi_fill_ssdt = nau8825_fill_ssdt,
#endif
};
diff --git a/src/drivers/i2c/rt1011/rt1011.c b/src/drivers/i2c/rt1011/rt1011.c
index 8dc3cd9..cfaeae8 100644
--- a/src/drivers/i2c/rt1011/rt1011.c
+++ b/src/drivers/i2c/rt1011/rt1011.c
@@ -99,7 +99,7 @@
.set_resources = DEVICE_NOOP,
.enable_resources = DEVICE_NOOP,
.acpi_name = rt1011_acpi_name,
- .acpi_fill_ssdt_generator = rt1011_fill_ssdt,
+ .acpi_fill_ssdt = rt1011_fill_ssdt,
};
static void rt1011_enable(struct device *dev)
diff --git a/src/drivers/i2c/rt5663/rt5663.c b/src/drivers/i2c/rt5663/rt5663.c
index 6f4e032..15014cd 100644
--- a/src/drivers/i2c/rt5663/rt5663.c
+++ b/src/drivers/i2c/rt5663/rt5663.c
@@ -85,11 +85,11 @@
}
static struct device_operations rt5663_ops = {
- .read_resources = DEVICE_NOOP,
- .set_resources = DEVICE_NOOP,
- .enable_resources = DEVICE_NOOP,
- .acpi_name = rt5663_acpi_name,
- .acpi_fill_ssdt_generator = rt5663_fill_ssdt,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
+ .acpi_name = rt5663_acpi_name,
+ .acpi_fill_ssdt = rt5663_fill_ssdt,
};
static void rt5663_enable(struct device *dev)
diff --git a/src/drivers/i2c/sx9310/sx9310.c b/src/drivers/i2c/sx9310/sx9310.c
index 9da6875..781d09d 100644
--- a/src/drivers/i2c/sx9310/sx9310.c
+++ b/src/drivers/i2c/sx9310/sx9310.c
@@ -89,11 +89,11 @@
}
static struct device_operations i2c_sx9310_ops = {
- .read_resources = DEVICE_NOOP,
- .set_resources = DEVICE_NOOP,
- .enable_resources = DEVICE_NOOP,
- .acpi_name = i2c_sx9310_acpi_name,
- .acpi_fill_ssdt_generator = i2c_sx9310_fill_ssdt,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
+ .acpi_name = i2c_sx9310_acpi_name,
+ .acpi_fill_ssdt = i2c_sx9310_fill_ssdt,
};
static void i2c_sx9310_enable(struct device *dev)
diff --git a/src/drivers/i2c/tpm/chip.c b/src/drivers/i2c/tpm/chip.c
index b13f6667..d36e4c2 100644
--- a/src/drivers/i2c/tpm/chip.c
+++ b/src/drivers/i2c/tpm/chip.c
@@ -72,11 +72,11 @@
}
static struct device_operations i2c_tpm_ops = {
- .read_resources = DEVICE_NOOP,
- .set_resources = DEVICE_NOOP,
- .enable_resources = DEVICE_NOOP,
- .acpi_name = i2c_tpm_acpi_name,
- .acpi_fill_ssdt_generator = i2c_tpm_fill_ssdt,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
+ .acpi_name = i2c_tpm_acpi_name,
+ .acpi_fill_ssdt = i2c_tpm_fill_ssdt,
};
static void i2c_tpm_enable(struct device *dev)
diff --git a/src/drivers/intel/ish/ish.c b/src/drivers/intel/ish/ish.c
index d542bd3..256b486 100644
--- a/src/drivers/intel/ish/ish.c
+++ b/src/drivers/intel/ish/ish.c
@@ -40,10 +40,10 @@
}
static struct device_operations intel_ish_ops = {
- .read_resources = DEVICE_NOOP,
- .set_resources = DEVICE_NOOP,
- .enable_resources = DEVICE_NOOP,
- .acpi_fill_ssdt_generator = ish_fill_ssdt_generator,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
+ .acpi_fill_ssdt = ish_fill_ssdt_generator,
};
static void intel_ish_enable(struct device *dev)
diff --git a/src/drivers/intel/mipi_camera/camera.c b/src/drivers/intel/mipi_camera/camera.c
index 0cada81..92fa00b 100644
--- a/src/drivers/intel/mipi_camera/camera.c
+++ b/src/drivers/intel/mipi_camera/camera.c
@@ -78,11 +78,11 @@
}
static struct device_operations camera_ops = {
- .read_resources = DEVICE_NOOP,
- .set_resources = DEVICE_NOOP,
- .enable_resources = DEVICE_NOOP,
- .acpi_name = camera_acpi_name,
- .acpi_fill_ssdt_generator = camera_fill_ssdt,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
+ .acpi_name = camera_acpi_name,
+ .acpi_fill_ssdt = camera_fill_ssdt,
};
static void camera_enable(struct device *dev)
diff --git a/src/drivers/intel/wifi/wifi.c b/src/drivers/intel/wifi/wifi.c
index e5efbe1..af7407d 100644
--- a/src/drivers/intel/wifi/wifi.c
+++ b/src/drivers/intel/wifi/wifi.c
@@ -90,17 +90,17 @@
};
struct device_operations device_ops = {
- .read_resources = pci_dev_read_resources,
- .set_resources = pci_dev_set_resources,
- .enable_resources = pci_dev_enable_resources,
- .init = wifi_pci_dev_init,
+ .read_resources = pci_dev_read_resources,
+ .set_resources = pci_dev_set_resources,
+ .enable_resources = pci_dev_enable_resources,
+ .init = wifi_pci_dev_init,
#if CONFIG(GENERATE_SMBIOS_TABLES)
- .get_smbios_data = smbios_write_wifi,
+ .get_smbios_data = smbios_write_wifi,
#endif
- .ops_pci = &pci_ops,
+ .ops_pci = &pci_ops,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_name = generic_wifi_acpi_name,
- .acpi_fill_ssdt_generator = intel_wifi_fill_ssdt,
+ .acpi_name = generic_wifi_acpi_name,
+ .acpi_fill_ssdt = intel_wifi_fill_ssdt,
#endif
};
diff --git a/src/drivers/ipmi/ipmi_kcs_ops.c b/src/drivers/ipmi/ipmi_kcs_ops.c
index e0fa1b0..e5f60fe 100644
--- a/src/drivers/ipmi/ipmi_kcs_ops.c
+++ b/src/drivers/ipmi/ipmi_kcs_ops.c
@@ -362,7 +362,7 @@
.init = ipmi_kcs_init,
#if CONFIG(HAVE_ACPI_TABLES)
.write_acpi_tables = ipmi_write_acpi_tables,
- .acpi_fill_ssdt_generator = ipmi_ssdt,
+ .acpi_fill_ssdt = ipmi_ssdt,
#endif
#if CONFIG(GENERATE_SMBIOS_TABLES)
.get_smbios_data = ipmi_smbios_data,
diff --git a/src/drivers/net/r8168.c b/src/drivers/net/r8168.c
index a3e1e1b..c764b43 100644
--- a/src/drivers/net/r8168.c
+++ b/src/drivers/net/r8168.c
@@ -374,8 +374,8 @@
.init = r8168_init,
.scan_bus = 0,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_name = r8168_net_acpi_name,
- .acpi_fill_ssdt_generator = r8168_net_fill_ssdt,
+ .acpi_name = r8168_net_acpi_name,
+ .acpi_fill_ssdt = r8168_net_fill_ssdt,
#endif
};
diff --git a/src/drivers/pc80/tpm/tis.c b/src/drivers/pc80/tpm/tis.c
index a35ef83..b9fd0cf 100644
--- a/src/drivers/pc80/tpm/tis.c
+++ b/src/drivers/pc80/tpm/tis.c
@@ -988,8 +988,8 @@
.read_resources = lpc_tpm_read_resources,
.set_resources = lpc_tpm_set_resources,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_name = lpc_tpm_acpi_name,
- .acpi_fill_ssdt_generator = lpc_tpm_fill_ssdt,
+ .acpi_name = lpc_tpm_acpi_name,
+ .acpi_fill_ssdt = lpc_tpm_fill_ssdt,
#endif
};
diff --git a/src/drivers/spi/acpi/acpi.c b/src/drivers/spi/acpi/acpi.c
index 7e107d6..30a8126 100644
--- a/src/drivers/spi/acpi/acpi.c
+++ b/src/drivers/spi/acpi/acpi.c
@@ -200,11 +200,11 @@
}
static struct device_operations spi_acpi_ops = {
- .read_resources = DEVICE_NOOP,
- .set_resources = DEVICE_NOOP,
- .enable_resources = DEVICE_NOOP,
- .acpi_name = spi_acpi_name,
- .acpi_fill_ssdt_generator = spi_acpi_fill_ssdt_generator,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
+ .acpi_name = spi_acpi_name,
+ .acpi_fill_ssdt = spi_acpi_fill_ssdt_generator,
};
static void spi_acpi_enable(struct device *dev)
diff --git a/src/drivers/usb/acpi/usb_acpi.c b/src/drivers/usb/acpi/usb_acpi.c
index a312c88..2402e8b 100644
--- a/src/drivers/usb/acpi/usb_acpi.c
+++ b/src/drivers/usb/acpi/usb_acpi.c
@@ -80,11 +80,11 @@
}
static struct device_operations usb_acpi_ops = {
- .read_resources = DEVICE_NOOP,
- .set_resources = DEVICE_NOOP,
- .enable_resources = DEVICE_NOOP,
- .scan_bus = scan_static_bus,
- .acpi_fill_ssdt_generator = usb_acpi_fill_ssdt_generator,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
+ .scan_bus = scan_static_bus,
+ .acpi_fill_ssdt = usb_acpi_fill_ssdt_generator,
};
static void usb_acpi_enable(struct device *dev)
diff --git a/src/ec/google/chromeec/ec_lpc.c b/src/ec/google/chromeec/ec_lpc.c
index 4b97ff9..c621a39 100644
--- a/src/ec/google/chromeec/ec_lpc.c
+++ b/src/ec/google/chromeec/ec_lpc.c
@@ -452,8 +452,8 @@
.enable_resources = DEVICE_NOOP,
.set_resources = DEVICE_NOOP,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_name = google_chromeec_acpi_name,
- .acpi_fill_ssdt_generator = google_chromeec_fill_ssdt_generator,
+ .acpi_name = google_chromeec_acpi_name,
+ .acpi_fill_ssdt = google_chromeec_fill_ssdt_generator,
#endif
};
diff --git a/src/ec/google/wilco/chip.c b/src/ec/google/wilco/chip.c
index e1181ee..acbd487 100644
--- a/src/ec/google/wilco/chip.c
+++ b/src/ec/google/wilco/chip.c
@@ -228,12 +228,12 @@
}
static struct device_operations ops = {
- .init = wilco_ec_init,
- .read_resources = wilco_ec_read_resources,
- .enable_resources = DEVICE_NOOP,
- .set_resources = DEVICE_NOOP,
- .acpi_fill_ssdt_generator = wilco_ec_fill_ssdt_generator,
- .acpi_name = wilco_ec_acpi_name,
+ .init = wilco_ec_init,
+ .read_resources = wilco_ec_read_resources,
+ .enable_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .acpi_fill_ssdt = wilco_ec_fill_ssdt_generator,
+ .acpi_name = wilco_ec_acpi_name,
};
static struct pnp_info info[] = {
diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c
index cafbe64..3bdb50d 100644
--- a/src/ec/lenovo/h8/h8.c
+++ b/src/ec/lenovo/h8/h8.c
@@ -227,7 +227,7 @@
.get_smbios_strings = h8_smbios_strings,
#endif
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_fill_ssdt_generator = h8_ssdt_generator,
+ .acpi_fill_ssdt = h8_ssdt_generator,
.acpi_name = h8_acpi_name,
#endif
.init = h8_init,
diff --git a/src/include/device/device.h b/src/include/device/device.h
index 333ac5d..9ba4d31 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -50,8 +50,8 @@
#if CONFIG(HAVE_ACPI_TABLES)
unsigned long (*write_acpi_tables)(struct device *dev,
unsigned long start, struct acpi_rsdp *rsdp);
- void (*acpi_fill_ssdt_generator)(struct device *dev);
- void (*acpi_inject_dsdt_generator)(struct device *dev);
+ void (*acpi_fill_ssdt)(struct device *dev);
+ void (*acpi_inject_dsdt)(struct device *dev);
const char *(*acpi_name)(const struct device *dev);
/* Returns the optional _HID (Hardware ID) */
const char *(*acpi_hid)(const struct device *dev);
diff --git a/src/mainboard/google/auron/mainboard.c b/src/mainboard/google/auron/mainboard.c
index da72d8f..3cb44f9 100644
--- a/src/mainboard/google/auron/mainboard.c
+++ b/src/mainboard/google/auron/mainboard.c
@@ -41,7 +41,7 @@
{
dev->ops->init = mainboard_init;
dev->ops->get_smbios_data = mainboard_smbios_data;
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ 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/google/beltino/mainboard.c b/src/mainboard/google/beltino/mainboard.c
index 2b42ceb..43f8010 100644
--- a/src/mainboard/google/beltino/mainboard.c
+++ b/src/mainboard/google/beltino/mainboard.c
@@ -40,7 +40,7 @@
static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
}
struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/google/butterfly/mainboard.c b/src/mainboard/google/butterfly/mainboard.c
index 37c17ee..03a1df4 100644
--- a/src/mainboard/google/butterfly/mainboard.c
+++ b/src/mainboard/google/butterfly/mainboard.c
@@ -271,7 +271,7 @@
{
dev->ops->init = mainboard_init;
dev->ops->get_smbios_data = butterfly_onboard_smbios_data;
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS, GMA_INT15_PANEL_FIT_DEFAULT, GMA_INT15_BOOT_DISPLAY_DEFAULT, 0);
}
diff --git a/src/mainboard/google/cyan/mainboard.c b/src/mainboard/google/cyan/mainboard.c
index 0d137f1..2ef44d4 100644
--- a/src/mainboard/google/cyan/mainboard.c
+++ b/src/mainboard/google/cyan/mainboard.c
@@ -28,7 +28,7 @@
static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
}
diff --git a/src/mainboard/google/dedede/mainboard.c b/src/mainboard/google/dedede/mainboard.c
index 4df190c..aa2de37 100644
--- a/src/mainboard/google/dedede/mainboard.c
+++ b/src/mainboard/google/dedede/mainboard.c
@@ -35,7 +35,7 @@
{
dev->ops->init = mainboard_dev_init;
dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
}
struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/google/deltaur/mainboard.c b/src/mainboard/google/deltaur/mainboard.c
index eca5ee8..0a906d6 100644
--- a/src/mainboard/google/deltaur/mainboard.c
+++ b/src/mainboard/google/deltaur/mainboard.c
@@ -14,7 +14,7 @@
static void mainboard_enable(struct device *dev)
{
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
}
static void mainboard_chip_init(void *chip_info)
diff --git a/src/mainboard/google/dragonegg/mainboard.c b/src/mainboard/google/dragonegg/mainboard.c
index 64f7a92..225b072 100644
--- a/src/mainboard/google/dragonegg/mainboard.c
+++ b/src/mainboard/google/dragonegg/mainboard.c
@@ -34,7 +34,7 @@
static void mainboard_enable(struct device *dev)
{
dev->ops->write_acpi_tables = NULL;
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
}
struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/google/drallion/ramstage.c b/src/mainboard/google/drallion/ramstage.c
index 38dc1333..1c537d5 100644
--- a/src/mainboard/google/drallion/ramstage.c
+++ b/src/mainboard/google/drallion/ramstage.c
@@ -69,7 +69,7 @@
static void mainboard_enable(struct device *dev)
{
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
}
struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/google/eve/mainboard.c b/src/mainboard/google/eve/mainboard.c
index 37b4b67..106d6ac 100644
--- a/src/mainboard/google/eve/mainboard.c
+++ b/src/mainboard/google/eve/mainboard.c
@@ -70,7 +70,7 @@
static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
}
diff --git a/src/mainboard/google/fizz/mainboard.c b/src/mainboard/google/fizz/mainboard.c
index 6bb298b..ef23dc5 100644
--- a/src/mainboard/google/fizz/mainboard.c
+++ b/src/mainboard/google/fizz/mainboard.c
@@ -230,7 +230,7 @@
mainboard_set_power_limits(conf);
dev->ops->init = mainboard_init;
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
}
diff --git a/src/mainboard/google/glados/mainboard.c b/src/mainboard/google/glados/mainboard.c
index 1f5f6a8..4f58599 100644
--- a/src/mainboard/google/glados/mainboard.c
+++ b/src/mainboard/google/glados/mainboard.c
@@ -108,7 +108,7 @@
{
dev->ops->init = mainboard_init;
dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
}
static void mainboard_chip_init(void *chip_info)
diff --git a/src/mainboard/google/hatch/ramstage.c b/src/mainboard/google/hatch/ramstage.c
index 005a1a9..9b940b4 100644
--- a/src/mainboard/google/hatch/ramstage.c
+++ b/src/mainboard/google/hatch/ramstage.c
@@ -48,7 +48,7 @@
static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
variant_mainboard_enable(dev);
}
diff --git a/src/mainboard/google/jecht/mainboard.c b/src/mainboard/google/jecht/mainboard.c
index 2a8a7fc..0c621cd 100644
--- a/src/mainboard/google/jecht/mainboard.c
+++ b/src/mainboard/google/jecht/mainboard.c
@@ -34,7 +34,7 @@
static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
}
struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/google/kahlee/mainboard.c b/src/mainboard/google/kahlee/mainboard.c
index 9650298..968cd7c 100644
--- a/src/mainboard/google/kahlee/mainboard.c
+++ b/src/mainboard/google/kahlee/mainboard.c
@@ -169,7 +169,7 @@
/* Initialize the PIRQ data structures for consumption */
pirq_setup();
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
}
diff --git a/src/mainboard/google/link/mainboard.c b/src/mainboard/google/link/mainboard.c
index 4551be8..23ae30b 100644
--- a/src/mainboard/google/link/mainboard.c
+++ b/src/mainboard/google/link/mainboard.c
@@ -184,7 +184,7 @@
{
dev->ops->init = mainboard_init;
dev->ops->get_smbios_data = link_onboard_smbios_data;
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
#if CONFIG(VGA_ROM_RUN)
/* Install custom int15 handler for VGA OPROM */
mainboard_interrupt_handlers(0x15, &int15_handler);
diff --git a/src/mainboard/google/octopus/mainboard.c b/src/mainboard/google/octopus/mainboard.c
index 6dc661d..7b73b9d 100644
--- a/src/mainboard/google/octopus/mainboard.c
+++ b/src/mainboard/google/octopus/mainboard.c
@@ -108,7 +108,7 @@
static void mainboard_enable(struct device *dev)
{
dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
}
struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/google/parrot/mainboard.c b/src/mainboard/google/parrot/mainboard.c
index 6b242ff..98939b4 100644
--- a/src/mainboard/google/parrot/mainboard.c
+++ b/src/mainboard/google/parrot/mainboard.c
@@ -74,7 +74,7 @@
{
dev->ops->init = mainboard_init;
dev->ops->get_smbios_data = parrot_onboard_smbios_data;
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_EDP, GMA_INT15_PANEL_FIT_DEFAULT, GMA_INT15_BOOT_DISPLAY_DEFAULT, 0);
}
diff --git a/src/mainboard/google/poppy/mainboard.c b/src/mainboard/google/poppy/mainboard.c
index 4c75a10..a375d1f 100644
--- a/src/mainboard/google/poppy/mainboard.c
+++ b/src/mainboard/google/poppy/mainboard.c
@@ -59,7 +59,7 @@
static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
}
diff --git a/src/mainboard/google/rambi/mainboard.c b/src/mainboard/google/rambi/mainboard.c
index 4ecb08e..4a1fd91 100644
--- a/src/mainboard/google/rambi/mainboard.c
+++ b/src/mainboard/google/rambi/mainboard.c
@@ -161,7 +161,7 @@
{
dev->ops->init = mainboard_init;
dev->ops->get_smbios_data = mainboard_smbios_data;
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
#if CONFIG(VGA_ROM_RUN)
/* Install custom int15 handler for VGA OPROM */
mainboard_interrupt_handlers(0x15, &int15_handler);
diff --git a/src/mainboard/google/reef/mainboard.c b/src/mainboard/google/reef/mainboard.c
index 2ba1e67..ec09963 100644
--- a/src/mainboard/google/reef/mainboard.c
+++ b/src/mainboard/google/reef/mainboard.c
@@ -137,7 +137,7 @@
static void mainboard_enable(struct device *dev)
{
dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
}
struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/google/sarien/ramstage.c b/src/mainboard/google/sarien/ramstage.c
index 7df73b0..6676e91 100644
--- a/src/mainboard/google/sarien/ramstage.c
+++ b/src/mainboard/google/sarien/ramstage.c
@@ -81,7 +81,7 @@
static void mainboard_enable(struct device *dev)
{
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
}
struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/google/slippy/mainboard.c b/src/mainboard/google/slippy/mainboard.c
index b7af366..2a2b13b 100644
--- a/src/mainboard/google/slippy/mainboard.c
+++ b/src/mainboard/google/slippy/mainboard.c
@@ -81,7 +81,7 @@
{
dev->ops->init = mainboard_init;
dev->ops->get_smbios_data = mainboard_smbios_data;
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ 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/google/stout/mainboard.c b/src/mainboard/google/stout/mainboard.c
index 23d2889..b411763 100644
--- a/src/mainboard/google/stout/mainboard.c
+++ b/src/mainboard/google/stout/mainboard.c
@@ -57,7 +57,7 @@
static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS, GMA_INT15_PANEL_FIT_DEFAULT, GMA_INT15_BOOT_DISPLAY_DEFAULT, 0);
}
diff --git a/src/mainboard/google/volteer/mainboard.c b/src/mainboard/google/volteer/mainboard.c
index 2d505e1..4e9843c 100644
--- a/src/mainboard/google/volteer/mainboard.c
+++ b/src/mainboard/google/volteer/mainboard.c
@@ -24,7 +24,7 @@
static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
}
static void mainboard_chip_init(void *chip_info)
diff --git a/src/mainboard/intel/baskingridge/mainboard.c b/src/mainboard/intel/baskingridge/mainboard.c
index 28dabf0..d60d3bf 100644
--- a/src/mainboard/intel/baskingridge/mainboard.c
+++ b/src/mainboard/intel/baskingridge/mainboard.c
@@ -31,7 +31,7 @@
static void mainboard_enable(struct device *dev)
{
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ 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/cannonlake_rvp/mainboard.c b/src/mainboard/intel/cannonlake_rvp/mainboard.c
index 7cf4bfa..3f6174d 100644
--- a/src/mainboard/intel/cannonlake_rvp/mainboard.c
+++ b/src/mainboard/intel/cannonlake_rvp/mainboard.c
@@ -58,7 +58,7 @@
static void mainboard_enable(struct device *dev)
{
dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
}
struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/intel/coffeelake_rvp/mainboard.c b/src/mainboard/intel/coffeelake_rvp/mainboard.c
index 6343f88..6077cbf 100644
--- a/src/mainboard/intel/coffeelake_rvp/mainboard.c
+++ b/src/mainboard/intel/coffeelake_rvp/mainboard.c
@@ -57,7 +57,7 @@
static void mainboard_enable(struct device *dev)
{
dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ 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 d6141c7..74c365b 100644
--- a/src/mainboard/intel/emeraldlake2/mainboard.c
+++ b/src/mainboard/intel/emeraldlake2/mainboard.c
@@ -24,7 +24,7 @@
static void mainboard_enable(struct device *dev)
{
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ 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 139d879..0670afe 100644
--- a/src/mainboard/intel/glkrvp/mainboard.c
+++ b/src/mainboard/intel/glkrvp/mainboard.c
@@ -67,7 +67,7 @@
static void mainboard_enable(struct device *dev)
{
dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ 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 051c6a6..2f6595f 100644
--- a/src/mainboard/intel/icelake_rvp/mainboard.c
+++ b/src/mainboard/intel/icelake_rvp/mainboard.c
@@ -30,7 +30,7 @@
static void mainboard_enable(struct device *dev)
{
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
}
struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/intel/jasperlake_rvp/mainboard.c b/src/mainboard/intel/jasperlake_rvp/mainboard.c
index 2f84d7a..b765eec 100644
--- a/src/mainboard/intel/jasperlake_rvp/mainboard.c
+++ b/src/mainboard/intel/jasperlake_rvp/mainboard.c
@@ -29,7 +29,7 @@
static void mainboard_enable(struct device *dev)
{
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
}
struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/intel/kblrvp/mainboard.c b/src/mainboard/intel/kblrvp/mainboard.c
index 46c35cb..7e2df10 100644
--- a/src/mainboard/intel/kblrvp/mainboard.c
+++ b/src/mainboard/intel/kblrvp/mainboard.c
@@ -33,7 +33,7 @@
static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ 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 40275fd..41453d4 100644
--- a/src/mainboard/intel/kunimitsu/mainboard.c
+++ b/src/mainboard/intel/kunimitsu/mainboard.c
@@ -95,7 +95,7 @@
{
dev->ops->init = mainboard_init;
dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
}
struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/intel/strago/mainboard.c b/src/mainboard/intel/strago/mainboard.c
index 8e7deff..16c89fc 100644
--- a/src/mainboard/intel/strago/mainboard.c
+++ b/src/mainboard/intel/strago/mainboard.c
@@ -30,7 +30,7 @@
static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
}
diff --git a/src/mainboard/intel/tglrvp/mainboard.c b/src/mainboard/intel/tglrvp/mainboard.c
index 1f24e8b..680472b 100644
--- a/src/mainboard/intel/tglrvp/mainboard.c
+++ b/src/mainboard/intel/tglrvp/mainboard.c
@@ -40,7 +40,7 @@
static void mainboard_enable(struct device *dev)
{
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
}
struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/intel/wtm2/mainboard.c b/src/mainboard/intel/wtm2/mainboard.c
index fbe3981..aa4a707 100644
--- a/src/mainboard/intel/wtm2/mainboard.c
+++ b/src/mainboard/intel/wtm2/mainboard.c
@@ -30,7 +30,7 @@
static void mainboard_enable(struct device *dev)
{
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ 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/lenovo/x200/mainboard.c b/src/mainboard/lenovo/x200/mainboard.c
index 37823bc..3406689 100644
--- a/src/mainboard/lenovo/x200/mainboard.c
+++ b/src/mainboard/lenovo/x200/mainboard.c
@@ -28,7 +28,7 @@
GMA_INT15_PANEL_FIT_CENTERING,
GMA_INT15_BOOT_DISPLAY_DEFAULT, 2);
- dev->ops->acpi_fill_ssdt_generator = fill_ssdt;
+ dev->ops->acpi_fill_ssdt = fill_ssdt;
if (CONFIG(BOARD_LENOVO_X200))
init_dock();
}
diff --git a/src/mainboard/lenovo/x201/mainboard.c b/src/mainboard/lenovo/x201/mainboard.c
index 212f3a9..dbbb755 100644
--- a/src/mainboard/lenovo/x201/mainboard.c
+++ b/src/mainboard/lenovo/x201/mainboard.c
@@ -29,7 +29,7 @@
static void mainboard_enable(struct device *dev)
{
- dev->ops->acpi_fill_ssdt_generator = fill_ssdt;
+ dev->ops->acpi_fill_ssdt = fill_ssdt;
/* If we're resuming from suspend, blink suspend LED */
if (acpi_is_wakeup_s3())
diff --git a/src/mainboard/lenovo/x60/mainboard.c b/src/mainboard/lenovo/x60/mainboard.c
index 7b399e4..839fdab 100644
--- a/src/mainboard/lenovo/x60/mainboard.c
+++ b/src/mainboard/lenovo/x60/mainboard.c
@@ -119,7 +119,7 @@
static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
- dev->ops->acpi_fill_ssdt_generator = fill_ssdt;
+ dev->ops->acpi_fill_ssdt = fill_ssdt;
}
struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/samsung/lumpy/mainboard.c b/src/mainboard/samsung/lumpy/mainboard.c
index 44360ee..fcf4140 100644
--- a/src/mainboard/samsung/lumpy/mainboard.c
+++ b/src/mainboard/samsung/lumpy/mainboard.c
@@ -90,7 +90,7 @@
{
dev->ops->init = mainboard_init;
dev->ops->get_smbios_data = lumpy_onboard_smbios_data;
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS, GMA_INT15_PANEL_FIT_DEFAULT, GMA_INT15_BOOT_DISPLAY_DEFAULT, 0);
}
diff --git a/src/mainboard/samsung/stumpy/mainboard.c b/src/mainboard/samsung/stumpy/mainboard.c
index 45a60c6..757f2fd 100644
--- a/src/mainboard/samsung/stumpy/mainboard.c
+++ b/src/mainboard/samsung/stumpy/mainboard.c
@@ -23,7 +23,7 @@
static void mainboard_enable(struct device *dev)
{
- dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ 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/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c
index 1ac5a69..a1d3457 100644
--- a/src/northbridge/amd/agesa/family14/northbridge.c
+++ b/src/northbridge/amd/agesa/family14/northbridge.c
@@ -807,7 +807,7 @@
.read_resources = nb_read_resources,
.set_resources = nb_set_resources,
.enable_resources = pci_dev_enable_resources,
- .acpi_fill_ssdt_generator = northbridge_fill_ssdt_generator,
+ .acpi_fill_ssdt = northbridge_fill_ssdt_generator,
.write_acpi_tables = agesa_write_acpi_tables,
.init = northbridge_init,
.enable = 0,.ops_pci = 0,
diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c
index a62e12e..c5f649e 100644
--- a/src/northbridge/amd/agesa/family15tn/northbridge.c
+++ b/src/northbridge/amd/agesa/family15tn/northbridge.c
@@ -561,7 +561,7 @@
.set_resources = nb_set_resources,
.enable_resources = pci_dev_enable_resources,
.init = DEVICE_NOOP,
- .acpi_fill_ssdt_generator = northbridge_fill_ssdt_generator,
+ .acpi_fill_ssdt = northbridge_fill_ssdt_generator,
.write_acpi_tables = agesa_write_acpi_tables,
.enable = 0,
.ops_pci = 0,
diff --git a/src/northbridge/amd/agesa/family16kb/northbridge.c b/src/northbridge/amd/agesa/family16kb/northbridge.c
index 2cdcb58..d9c3c36 100644
--- a/src/northbridge/amd/agesa/family16kb/northbridge.c
+++ b/src/northbridge/amd/agesa/family16kb/northbridge.c
@@ -560,7 +560,7 @@
.set_resources = set_resources,
.enable_resources = pci_dev_enable_resources,
.init = DEVICE_NOOP,
- .acpi_fill_ssdt_generator = northbridge_fill_ssdt_generator,
+ .acpi_fill_ssdt = northbridge_fill_ssdt_generator,
.write_acpi_tables = agesa_write_acpi_tables,
.enable = 0,
.ops_pci = 0,
diff --git a/src/northbridge/amd/pi/00630F01/northbridge.c b/src/northbridge/amd/pi/00630F01/northbridge.c
index e90848a..30c68d8 100644
--- a/src/northbridge/amd/pi/00630F01/northbridge.c
+++ b/src/northbridge/amd/pi/00630F01/northbridge.c
@@ -555,7 +555,7 @@
.set_resources = set_resources,
.enable_resources = pci_dev_enable_resources,
.init = DEVICE_NOOP,
- .acpi_fill_ssdt_generator = northbridge_fill_ssdt_generator,
+ .acpi_fill_ssdt = northbridge_fill_ssdt_generator,
.write_acpi_tables = agesa_write_acpi_tables,
.enable = 0,
.ops_pci = 0,
diff --git a/src/northbridge/amd/pi/00660F01/northbridge.c b/src/northbridge/amd/pi/00660F01/northbridge.c
index 2005086..44ff370 100644
--- a/src/northbridge/amd/pi/00660F01/northbridge.c
+++ b/src/northbridge/amd/pi/00660F01/northbridge.c
@@ -545,7 +545,7 @@
.set_resources = set_resources,
.enable_resources = pci_dev_enable_resources,
.init = northbridge_init,
- .acpi_fill_ssdt_generator = northbridge_fill_ssdt_generator,
+ .acpi_fill_ssdt = northbridge_fill_ssdt_generator,
.write_acpi_tables = agesa_write_acpi_tables,
.enable = 0,
.ops_pci = 0,
diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c
index f611bd6..0a07dfa 100644
--- a/src/northbridge/amd/pi/00730F01/northbridge.c
+++ b/src/northbridge/amd/pi/00730F01/northbridge.c
@@ -775,7 +775,7 @@
.set_resources = set_resources,
.enable_resources = pci_dev_enable_resources,
.init = northbridge_init,
- .acpi_fill_ssdt_generator = northbridge_fill_ssdt_generator,
+ .acpi_fill_ssdt = northbridge_fill_ssdt_generator,
.write_acpi_tables = agesa_write_acpi_tables,
.enable = 0,
.ops_pci = 0,
diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
index eed0b92..821487a 100644
--- a/src/northbridge/intel/gm45/gma.c
+++ b/src/northbridge/intel/gm45/gma.c
@@ -279,7 +279,7 @@
.read_resources = pci_dev_read_resources,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
- .acpi_fill_ssdt_generator = gma_ssdt,
+ .acpi_fill_ssdt = gma_ssdt,
.init = gma_func0_init,
.scan_bus = 0,
.enable = 0,
diff --git a/src/northbridge/intel/gm45/northbridge.c b/src/northbridge/intel/gm45/northbridge.c
index a0ff04f..9484cd9 100644
--- a/src/northbridge/intel/gm45/northbridge.c
+++ b/src/northbridge/intel/gm45/northbridge.c
@@ -233,7 +233,7 @@
.init = mch_domain_init,
.scan_bus = pci_domain_scan_bus,
.write_acpi_tables = northbridge_write_acpi_tables,
- .acpi_fill_ssdt_generator = generate_cpu_entries,
+ .acpi_fill_ssdt = generate_cpu_entries,
.acpi_name = northbridge_acpi_name,
};
diff --git a/src/northbridge/intel/haswell/gma.c b/src/northbridge/intel/haswell/gma.c
index 65c5cf3..c0eaf6d 100644
--- a/src/northbridge/intel/haswell/gma.c
+++ b/src/northbridge/intel/haswell/gma.c
@@ -573,15 +573,15 @@
};
static struct device_operations gma_func0_ops = {
- .read_resources = pci_dev_read_resources,
- .set_resources = pci_dev_set_resources,
- .enable_resources = pci_dev_enable_resources,
- .init = gma_func0_init,
- .acpi_fill_ssdt_generator = gma_ssdt,
- .scan_bus = NULL,
- .enable = NULL,
- .ops_pci = &gma_pci_ops,
- .write_acpi_tables = gma_write_acpi_tables,
+ .read_resources = pci_dev_read_resources,
+ .set_resources = pci_dev_set_resources,
+ .enable_resources = pci_dev_enable_resources,
+ .init = gma_func0_init,
+ .acpi_fill_ssdt = gma_ssdt,
+ .scan_bus = NULL,
+ .enable = NULL,
+ .ops_pci = &gma_pci_ops,
+ .write_acpi_tables = gma_write_acpi_tables,
};
static const unsigned short pci_device_ids[] = {
diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c
index c8273a1..4e16ca0 100644
--- a/src/northbridge/intel/haswell/northbridge.c
+++ b/src/northbridge/intel/haswell/northbridge.c
@@ -472,13 +472,13 @@
};
static struct device_operations mc_ops = {
- .read_resources = mc_read_resources,
- .set_resources = pci_dev_set_resources,
- .enable_resources = pci_dev_enable_resources,
- .init = northbridge_init,
- .acpi_fill_ssdt_generator = generate_cpu_entries,
- .scan_bus = NULL,
- .ops_pci = &intel_pci_ops,
+ .read_resources = mc_read_resources,
+ .set_resources = pci_dev_set_resources,
+ .enable_resources = pci_dev_enable_resources,
+ .init = northbridge_init,
+ .acpi_fill_ssdt = generate_cpu_entries,
+ .scan_bus = NULL,
+ .ops_pci = &intel_pci_ops,
};
static const unsigned short mc_pci_device_ids[] = {
diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c
index f4d6aaf..c26ffb4 100644
--- a/src/northbridge/intel/i945/gma.c
+++ b/src/northbridge/intel/i945/gma.c
@@ -829,7 +829,7 @@
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
.init = gma_func0_init,
- .acpi_fill_ssdt_generator = gma_ssdt,
+ .acpi_fill_ssdt = gma_ssdt,
.scan_bus = 0,
.enable = 0,
.disable = gma_func0_disable,
diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c
index a91efbf..16cf5e6 100644
--- a/src/northbridge/intel/i945/northbridge.c
+++ b/src/northbridge/intel/i945/northbridge.c
@@ -195,7 +195,7 @@
.read_resources = mc_read_resources,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
- .acpi_fill_ssdt_generator = generate_cpu_entries,
+ .acpi_fill_ssdt = generate_cpu_entries,
.scan_bus = 0,
.ops_pci = &intel_pci_ops,
};
diff --git a/src/northbridge/intel/ironlake/gma.c b/src/northbridge/intel/ironlake/gma.c
index cba25aa..b35305b 100644
--- a/src/northbridge/intel/ironlake/gma.c
+++ b/src/northbridge/intel/ironlake/gma.c
@@ -269,7 +269,7 @@
.read_resources = gma_read_resources,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
- .acpi_fill_ssdt_generator = gma_ssdt,
+ .acpi_fill_ssdt = gma_ssdt,
.init = gma_func0_init,
.scan_bus = 0,
.enable = 0,
diff --git a/src/northbridge/intel/ironlake/northbridge.c b/src/northbridge/intel/ironlake/northbridge.c
index 1af4a1c..4637175 100644
--- a/src/northbridge/intel/ironlake/northbridge.c
+++ b/src/northbridge/intel/ironlake/northbridge.c
@@ -255,7 +255,7 @@
.set_resources = mc_set_resources,
.enable_resources = pci_dev_enable_resources,
.init = northbridge_init,
- .acpi_fill_ssdt_generator = generate_cpu_entries,
+ .acpi_fill_ssdt = generate_cpu_entries,
.scan_bus = 0,
.ops_pci = &intel_pci_ops,
};
diff --git a/src/northbridge/intel/pineview/gma.c b/src/northbridge/intel/pineview/gma.c
index 0b04ade..307529d 100644
--- a/src/northbridge/intel/pineview/gma.c
+++ b/src/northbridge/intel/pineview/gma.c
@@ -334,16 +334,16 @@
};
static struct device_operations gma_func0_ops = {
- .read_resources = pci_dev_read_resources,
- .set_resources = pci_dev_set_resources,
- .enable_resources = pci_dev_enable_resources,
- .acpi_fill_ssdt_generator = NULL,
- .init = gma_func0_init,
- .scan_bus = NULL,
- .enable = NULL,
- .ops_pci = &gma_pci_ops,
- .acpi_name = gma_acpi_name,
- .write_acpi_tables = gma_write_acpi_tables,
+ .read_resources = pci_dev_read_resources,
+ .set_resources = pci_dev_set_resources,
+ .enable_resources = pci_dev_enable_resources,
+ .acpi_fill_ssdt = NULL,
+ .init = gma_func0_init,
+ .scan_bus = NULL,
+ .enable = NULL,
+ .ops_pci = &gma_pci_ops,
+ .acpi_name = gma_acpi_name,
+ .write_acpi_tables = gma_write_acpi_tables,
};
static const unsigned short pci_device_ids[] =
diff --git a/src/northbridge/intel/pineview/northbridge.c b/src/northbridge/intel/pineview/northbridge.c
index 727db82..87443ca 100644
--- a/src/northbridge/intel/pineview/northbridge.c
+++ b/src/northbridge/intel/pineview/northbridge.c
@@ -184,12 +184,12 @@
}
static struct device_operations pci_domain_ops = {
- .read_resources = mch_domain_read_resources,
- .set_resources = mch_domain_set_resources,
- .init = mch_domain_init,
- .scan_bus = pci_domain_scan_bus,
- .acpi_fill_ssdt_generator = generate_cpu_entries,
- .acpi_name = northbridge_acpi_name,
+ .read_resources = mch_domain_read_resources,
+ .set_resources = mch_domain_set_resources,
+ .init = mch_domain_init,
+ .scan_bus = pci_domain_scan_bus,
+ .acpi_fill_ssdt = generate_cpu_entries,
+ .acpi_name = northbridge_acpi_name,
};
static struct device_operations cpu_bus_ops = {
diff --git a/src/northbridge/intel/sandybridge/gma.c b/src/northbridge/intel/sandybridge/gma.c
index 1680b1e..e79277c 100644
--- a/src/northbridge/intel/sandybridge/gma.c
+++ b/src/northbridge/intel/sandybridge/gma.c
@@ -707,17 +707,17 @@
};
static struct device_operations gma_func0_ops = {
- .read_resources = pci_dev_read_resources,
- .set_resources = pci_dev_set_resources,
- .enable_resources = pci_dev_enable_resources,
- .acpi_fill_ssdt_generator = gma_ssdt,
- .init = gma_func0_init,
- .scan_bus = NULL,
- .enable = NULL,
- .disable = gma_func0_disable,
- .ops_pci = &gma_pci_ops,
- .acpi_name = gma_acpi_name,
- .write_acpi_tables = gma_write_acpi_tables,
+ .read_resources = pci_dev_read_resources,
+ .set_resources = pci_dev_set_resources,
+ .enable_resources = pci_dev_enable_resources,
+ .acpi_fill_ssdt = gma_ssdt,
+ .init = gma_func0_init,
+ .scan_bus = NULL,
+ .enable = NULL,
+ .disable = gma_func0_disable,
+ .ops_pci = &gma_pci_ops,
+ .acpi_name = gma_acpi_name,
+ .write_acpi_tables = gma_write_acpi_tables,
};
static const unsigned short pci_device_ids[] = {
diff --git a/src/northbridge/intel/sandybridge/northbridge.c b/src/northbridge/intel/sandybridge/northbridge.c
index ef03865..ff5d7f2 100644
--- a/src/northbridge/intel/sandybridge/northbridge.c
+++ b/src/northbridge/intel/sandybridge/northbridge.c
@@ -440,13 +440,13 @@
};
static struct device_operations mc_ops = {
- .read_resources = mc_read_resources,
- .set_resources = pci_dev_set_resources,
- .enable_resources = pci_dev_enable_resources,
- .init = northbridge_init,
- .scan_bus = NULL,
- .ops_pci = &intel_pci_ops,
- .acpi_fill_ssdt_generator = generate_cpu_entries,
+ .read_resources = mc_read_resources,
+ .set_resources = pci_dev_set_resources,
+ .enable_resources = pci_dev_enable_resources,
+ .init = northbridge_init,
+ .scan_bus = NULL,
+ .ops_pci = &intel_pci_ops,
+ .acpi_fill_ssdt = generate_cpu_entries,
};
static const unsigned short pci_device_ids[] = {
diff --git a/src/northbridge/intel/x4x/gma.c b/src/northbridge/intel/x4x/gma.c
index d43ddf9..ff8820c 100644
--- a/src/northbridge/intel/x4x/gma.c
+++ b/src/northbridge/intel/x4x/gma.c
@@ -149,7 +149,7 @@
.read_resources = pci_dev_read_resources,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
- .acpi_fill_ssdt_generator = gma_ssdt,
+ .acpi_fill_ssdt = gma_ssdt,
.init = gma_func0_init,
.ops_pci = &gma_pci_ops,
.disable = gma_func0_disable,
diff --git a/src/northbridge/intel/x4x/northbridge.c b/src/northbridge/intel/x4x/northbridge.c
index 732d97e..63243f1 100644
--- a/src/northbridge/intel/x4x/northbridge.c
+++ b/src/northbridge/intel/x4x/northbridge.c
@@ -183,7 +183,7 @@
.init = mch_domain_init,
.scan_bus = pci_domain_scan_bus,
.write_acpi_tables = northbridge_write_acpi_tables,
- .acpi_fill_ssdt_generator = generate_cpu_entries,
+ .acpi_fill_ssdt = generate_cpu_entries,
.acpi_name = northbridge_acpi_name,
};
diff --git a/src/soc/amd/common/block/lpc/lpc.c b/src/soc/amd/common/block/lpc/lpc.c
index ff7d561..7f9b715 100644
--- a/src/soc/amd/common/block/lpc/lpc.c
+++ b/src/soc/amd/common/block/lpc/lpc.c
@@ -325,7 +325,7 @@
.read_resources = lpc_read_resources,
.set_resources = lpc_set_resources,
.enable_resources = lpc_enable_resources,
- .acpi_inject_dsdt_generator = southbridge_inject_dsdt,
+ .acpi_inject_dsdt = southbridge_inject_dsdt,
.write_acpi_tables = southbridge_write_acpi_tables,
.init = lpc_init,
.scan_bus = scan_static_bus,
diff --git a/src/soc/amd/picasso/chip.c b/src/soc/amd/picasso/chip.c
index a7b0c26..cf9bd54 100644
--- a/src/soc/amd/picasso/chip.c
+++ b/src/soc/amd/picasso/chip.c
@@ -34,7 +34,7 @@
.set_resources = DEVICE_NOOP,
.enable_resources = DEVICE_NOOP,
.init = picasso_init_cpus,
- .acpi_fill_ssdt_generator = generate_cpu_entries,
+ .acpi_fill_ssdt = generate_cpu_entries,
};
const char *soc_acpi_name(const struct device *dev)
diff --git a/src/soc/amd/picasso/i2c.c b/src/soc/amd/picasso/i2c.c
index 5e5db9e..e2da961 100644
--- a/src/soc/amd/picasso/i2c.c
+++ b/src/soc/amd/picasso/i2c.c
@@ -144,7 +144,7 @@
.enable_resources = DEVICE_NOOP,
.scan_bus = scan_smbus,
.acpi_name = i2c_acpi_name,
- .acpi_fill_ssdt_generator = dw_i2c_acpi_fill_ssdt,
+ .acpi_fill_ssdt = dw_i2c_acpi_fill_ssdt,
};
/*
diff --git a/src/soc/amd/picasso/northbridge.c b/src/soc/amd/picasso/northbridge.c
index 7be5aef..20589a9 100644
--- a/src/soc/amd/picasso/northbridge.c
+++ b/src/soc/amd/picasso/northbridge.c
@@ -203,7 +203,7 @@
.read_resources = read_resources,
.set_resources = set_resources,
.enable_resources = pci_dev_enable_resources,
- .acpi_fill_ssdt_generator = northbridge_fill_ssdt_generator,
+ .acpi_fill_ssdt = northbridge_fill_ssdt_generator,
.write_acpi_tables = agesa_write_acpi_tables,
.enable = 0,
.ops_pci = 0,
diff --git a/src/soc/amd/stoneyridge/chip.c b/src/soc/amd/stoneyridge/chip.c
index f08c12f..caf9c63 100644
--- a/src/soc/amd/stoneyridge/chip.c
+++ b/src/soc/amd/stoneyridge/chip.c
@@ -39,7 +39,7 @@
.set_resources = DEVICE_NOOP,
.enable_resources = DEVICE_NOOP,
.init = stoney_init_cpus,
- .acpi_fill_ssdt_generator = generate_cpu_entries,
+ .acpi_fill_ssdt = generate_cpu_entries,
};
const char *soc_acpi_name(const struct device *dev)
diff --git a/src/soc/amd/stoneyridge/i2c.c b/src/soc/amd/stoneyridge/i2c.c
index e5c2d98..8db2638 100644
--- a/src/soc/amd/stoneyridge/i2c.c
+++ b/src/soc/amd/stoneyridge/i2c.c
@@ -141,7 +141,7 @@
.enable_resources = DEVICE_NOOP,
.scan_bus = scan_smbus,
.acpi_name = i2c_acpi_name,
- .acpi_fill_ssdt_generator = dw_i2c_acpi_fill_ssdt,
+ .acpi_fill_ssdt = dw_i2c_acpi_fill_ssdt,
};
/*
diff --git a/src/soc/amd/stoneyridge/northbridge.c b/src/soc/amd/stoneyridge/northbridge.c
index 3707049..afcd498 100644
--- a/src/soc/amd/stoneyridge/northbridge.c
+++ b/src/soc/amd/stoneyridge/northbridge.c
@@ -356,7 +356,7 @@
.set_resources = set_resources,
.enable_resources = pci_dev_enable_resources,
.init = northbridge_init,
- .acpi_fill_ssdt_generator = northbridge_fill_ssdt_generator,
+ .acpi_fill_ssdt = northbridge_fill_ssdt_generator,
.write_acpi_tables = agesa_write_acpi_tables,
.enable = 0,
.ops_pci = 0,
diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c
index 5a65260..ee533bb 100644
--- a/src/soc/intel/apollolake/chip.c
+++ b/src/soc/intel/apollolake/chip.c
@@ -226,7 +226,7 @@
.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 d7f1748..0b61fe7 100644
--- a/src/soc/intel/baytrail/northcluster.c
+++ b/src/soc/intel/baytrail/northcluster.c
@@ -136,7 +136,7 @@
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 746a353..be58f42 100644
--- a/src/soc/intel/baytrail/southcluster.c
+++ b/src/soc/intel/baytrail/southcluster.c
@@ -521,7 +521,7 @@
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 f8e3391..4acef25 100644
--- a/src/soc/intel/braswell/northcluster.c
+++ b/src/soc/intel/braswell/northcluster.c
@@ -166,9 +166,9 @@
}
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 be0d910..aa054d6 100644
--- a/src/soc/intel/braswell/southcluster.c
+++ b/src/soc/intel/braswell/southcluster.c
@@ -573,7 +573,7 @@
.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 15b383c..bc6bc6b 100644
--- a/src/soc/intel/broadwell/lpc.c
+++ b/src/soc/intel/broadwell/lpc.c
@@ -623,7 +623,7 @@
.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 1af554a..fdaa9f6 100644
--- a/src/soc/intel/broadwell/systemagent.c
+++ b/src/soc/intel/broadwell/systemagent.c
@@ -440,7 +440,7 @@
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 a53c1a8..a2a678b 100644
--- a/src/soc/intel/cannonlake/chip.c
+++ b/src/soc/intel/cannonlake/chip.c
@@ -199,7 +199,7 @@
.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 e1eb6fe..55c181b 100644
--- a/src/soc/intel/common/block/graphics/graphics.c
+++ b/src/soc/intel/common/block/graphics/graphics.c
@@ -126,16 +126,16 @@
}
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 b5ea15e..6612210 100644
--- a/src/soc/intel/common/block/i2c/i2c.c
+++ b/src/soc/intel/common/block/i2c/i2c.c
@@ -175,15 +175,15 @@
}
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 e65beb4..4cfd6f4 100644
--- a/src/soc/intel/common/block/lpc/lpc.c
+++ b/src/soc/intel/common/block/lpc/lpc.c
@@ -108,16 +108,16 @@
}
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 56af940..d529faa 100644
--- a/src/soc/intel/common/block/scs/sd.c
+++ b/src/soc/intel/common/block/scs/sd.c
@@ -54,13 +54,13 @@
#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 f71b596..c41d857 100644
--- a/src/soc/intel/denverton_ns/chip.c
+++ b/src/soc/intel/denverton_ns/chip.c
@@ -48,7 +48,7 @@
.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 bf9263d..f695d61 100644
--- a/src/soc/intel/denverton_ns/lpc.c
+++ b/src/soc/intel/denverton_ns/lpc.c
@@ -552,7 +552,7 @@
.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 d2427b9..304f7e3 100644
--- a/src/soc/intel/icelake/chip.c
+++ b/src/soc/intel/icelake/chip.c
@@ -155,7 +155,7 @@
.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 b7ed9df..2b00f96 100644
--- a/src/soc/intel/jasperlake/chip.c
+++ b/src/soc/intel/jasperlake/chip.c
@@ -163,7 +163,7 @@
.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 0ab10ca..40d5b1d 100644
--- a/src/soc/intel/skylake/chip.c
+++ b/src/soc/intel/skylake/chip.c
@@ -111,7 +111,7 @@
.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 1c7078d..231623c 100644
--- a/src/soc/intel/tigerlake/chip.c
+++ b/src/soc/intel/tigerlake/chip.c
@@ -163,7 +163,7 @@
.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 7a737ac..764e70f 100644
--- a/src/soc/intel/xeon_sp/skx/chip.c
+++ b/src/soc/intel/xeon_sp/skx/chip.c
@@ -489,7 +489,7 @@
.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 c72c6c3..f549eec 100644
--- a/src/soc/intel/xeon_sp/uncore.c
+++ b/src/soc/intel/xeon_sp/uncore.c
@@ -288,7 +288,7 @@
.init = mmapvtd_init,
.ops_pci = &soc_pci_ops,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_inject_dsdt_generator = NULL,
+ .acpi_inject_dsdt = NULL,
#endif
};
diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c
index 46ab5fc..1f92193 100644
--- a/src/southbridge/intel/bd82x6x/lpc.c
+++ b/src/southbridge/intel/bd82x6x/lpc.c
@@ -884,8 +884,8 @@
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
.write_acpi_tables = acpi_write_hpet,
- .acpi_inject_dsdt_generator = southbridge_inject_dsdt,
- .acpi_fill_ssdt_generator = southbridge_fill_ssdt,
+ .acpi_inject_dsdt = southbridge_inject_dsdt,
+ .acpi_fill_ssdt = southbridge_fill_ssdt,
.acpi_name = lpc_acpi_name,
.init = lpc_init,
.final = lpc_final,
diff --git a/src/southbridge/intel/bd82x6x/sata.c b/src/southbridge/intel/bd82x6x/sata.c
index ba3630a..4d2ac1c 100644
--- a/src/southbridge/intel/bd82x6x/sata.c
+++ b/src/southbridge/intel/bd82x6x/sata.c
@@ -255,8 +255,7 @@
.read_resources = pci_dev_read_resources,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
- .acpi_fill_ssdt_generator
- = sata_fill_ssdt,
+ .acpi_fill_ssdt = sata_fill_ssdt,
.init = sata_init,
.enable = sata_enable,
.scan_bus = 0,
diff --git a/src/southbridge/intel/i82371eb/isa.c b/src/southbridge/intel/i82371eb/isa.c
index 6e1347d..7fe243f 100644
--- a/src/southbridge/intel/i82371eb/isa.c
+++ b/src/southbridge/intel/i82371eb/isa.c
@@ -130,8 +130,8 @@
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
#if CONFIG(HAVE_ACPI_TABLES)
- .write_acpi_tables = acpi_write_hpet,
- .acpi_fill_ssdt_generator = southbridge_acpi_fill_ssdt_generator,
+ .write_acpi_tables = acpi_write_hpet,
+ .acpi_fill_ssdt = southbridge_acpi_fill_ssdt_generator,
#endif
.init = isa_init,
.scan_bus = scan_static_bus,
diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c
index 743dbba..db0dc41 100644
--- a/src/southbridge/intel/i82801gx/lpc.c
+++ b/src/southbridge/intel/i82801gx/lpc.c
@@ -684,9 +684,9 @@
.read_resources = i82801gx_lpc_read_resources,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
- .acpi_inject_dsdt_generator = southbridge_inject_dsdt,
+ .acpi_inject_dsdt = southbridge_inject_dsdt,
.write_acpi_tables = acpi_write_hpet,
- .acpi_fill_ssdt_generator = southbridge_fill_ssdt,
+ .acpi_fill_ssdt = southbridge_fill_ssdt,
.acpi_name = lpc_acpi_name,
.init = lpc_init,
.scan_bus = scan_static_bus,
diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c
index 8b5efd9..6260164 100644
--- a/src/southbridge/intel/i82801ix/lpc.c
+++ b/src/southbridge/intel/i82801ix/lpc.c
@@ -530,9 +530,9 @@
.read_resources = i82801ix_lpc_read_resources,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
- .acpi_inject_dsdt_generator = southbridge_inject_dsdt,
+ .acpi_inject_dsdt = southbridge_inject_dsdt,
.write_acpi_tables = acpi_write_hpet,
- .acpi_fill_ssdt_generator = southbridge_fill_ssdt,
+ .acpi_fill_ssdt = southbridge_fill_ssdt,
.acpi_name = lpc_acpi_name,
.init = lpc_init,
.scan_bus = scan_static_bus,
diff --git a/src/southbridge/intel/i82801jx/lpc.c b/src/southbridge/intel/i82801jx/lpc.c
index e3fdde7..5f02d74 100644
--- a/src/southbridge/intel/i82801jx/lpc.c
+++ b/src/southbridge/intel/i82801jx/lpc.c
@@ -688,9 +688,9 @@
.read_resources = i82801jx_lpc_read_resources,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
- .acpi_inject_dsdt_generator = southbridge_inject_dsdt,
+ .acpi_inject_dsdt = southbridge_inject_dsdt,
.write_acpi_tables = acpi_write_hpet,
- .acpi_fill_ssdt_generator = southbridge_fill_ssdt,
+ .acpi_fill_ssdt = southbridge_fill_ssdt,
.acpi_name = lpc_acpi_name,
.init = lpc_init,
.scan_bus = scan_static_bus,
diff --git a/src/southbridge/intel/ibexpeak/lpc.c b/src/southbridge/intel/ibexpeak/lpc.c
index 0062e09..5f76313 100644
--- a/src/southbridge/intel/ibexpeak/lpc.c
+++ b/src/southbridge/intel/ibexpeak/lpc.c
@@ -765,8 +765,8 @@
.read_resources = pch_lpc_read_resources,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
- .acpi_inject_dsdt_generator = southbridge_inject_dsdt,
- .acpi_fill_ssdt_generator = southbridge_fill_ssdt,
+ .acpi_inject_dsdt = southbridge_inject_dsdt,
+ .acpi_fill_ssdt = southbridge_fill_ssdt,
.acpi_name = lpc_acpi_name,
.write_acpi_tables = acpi_write_hpet,
.init = lpc_init,
diff --git a/src/southbridge/intel/ibexpeak/sata.c b/src/southbridge/intel/ibexpeak/sata.c
index 33437ef..555b5ca 100644
--- a/src/southbridge/intel/ibexpeak/sata.c
+++ b/src/southbridge/intel/ibexpeak/sata.c
@@ -240,7 +240,7 @@
.enable_resources = pci_dev_enable_resources,
.init = sata_init,
.enable = sata_enable,
- .acpi_fill_ssdt_generator = sata_fill_ssdt,
+ .acpi_fill_ssdt = sata_fill_ssdt,
.scan_bus = 0,
.ops_pci = &sata_pci_ops,
};
diff --git a/src/southbridge/intel/lynxpoint/lpc.c b/src/southbridge/intel/lynxpoint/lpc.c
index 745c231..f0b88b2 100644
--- a/src/southbridge/intel/lynxpoint/lpc.c
+++ b/src/southbridge/intel/lynxpoint/lpc.c
@@ -963,8 +963,8 @@
.read_resources = pch_lpc_read_resources,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
- .acpi_fill_ssdt_generator = southbridge_fill_ssdt,
- .acpi_inject_dsdt_generator = southbridge_inject_dsdt,
+ .acpi_fill_ssdt = southbridge_fill_ssdt,
+ .acpi_inject_dsdt = southbridge_inject_dsdt,
.acpi_name = lpc_acpi_name,
.write_acpi_tables = southbridge_write_acpi_tables,
.init = lpc_init,
diff --git a/src/superio/aspeed/ast2400/superio.c b/src/superio/aspeed/ast2400/superio.c
index 4867f6e..a896b64 100644
--- a/src/superio/aspeed/ast2400/superio.c
+++ b/src/superio/aspeed/ast2400/superio.c
@@ -66,7 +66,7 @@
.init = ast2400_init,
.ops_pnp_mode = &pnp_conf_mode_a5a5_aa,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_fill_ssdt_generator = superio_common_fill_ssdt_generator,
+ .acpi_fill_ssdt = superio_common_fill_ssdt_generator,
.acpi_name = superio_common_ldn_acpi_name,
.acpi_hid = ast2400_acpi_hid,
#endif
diff --git a/src/superio/common/generic.c b/src/superio/common/generic.c
index 809f886..20ffb3d 100644
--- a/src/superio/common/generic.c
+++ b/src/superio/common/generic.c
@@ -300,8 +300,8 @@
.enable_resources = DEVICE_NOOP,
.scan_bus = scan_static_bus,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_fill_ssdt_generator = generic_ssdt,
- .acpi_name = generic_acpi_name,
+ .acpi_fill_ssdt = generic_ssdt,
+ .acpi_name = generic_acpi_name,
#endif
};
diff --git a/src/superio/nuvoton/nct5539d/superio.c b/src/superio/nuvoton/nct5539d/superio.c
index 5402b2e..9a620c9 100644
--- a/src/superio/nuvoton/nct5539d/superio.c
+++ b/src/superio/nuvoton/nct5539d/superio.c
@@ -52,9 +52,9 @@
.init = nct5539d_init,
.ops_pnp_mode = &pnp_conf_mode_8787_aa,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_fill_ssdt_generator = superio_common_fill_ssdt_generator,
- .acpi_name = superio_common_ldn_acpi_name,
- .acpi_hid = nct5539d_acpi_hid,
+ .acpi_fill_ssdt = superio_common_fill_ssdt_generator,
+ .acpi_name = superio_common_ldn_acpi_name,
+ .acpi_hid = nct5539d_acpi_hid,
#endif
};
diff --git a/src/superio/nuvoton/nct6791d/superio.c b/src/superio/nuvoton/nct6791d/superio.c
index a8e267b..e04a923 100644
--- a/src/superio/nuvoton/nct6791d/superio.c
+++ b/src/superio/nuvoton/nct6791d/superio.c
@@ -50,9 +50,9 @@
.init = nct6791d_init,
.ops_pnp_mode = &pnp_conf_mode_8787_aa,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_fill_ssdt_generator = superio_common_fill_ssdt_generator,
- .acpi_name = superio_common_ldn_acpi_name,
- .acpi_hid = nct6791d_acpi_hid,
+ .acpi_fill_ssdt = superio_common_fill_ssdt_generator,
+ .acpi_name = superio_common_ldn_acpi_name,
+ .acpi_hid = nct6791d_acpi_hid,
#endif
};
diff --git a/src/superio/nuvoton/npcd378/superio.c b/src/superio/nuvoton/npcd378/superio.c
index 95a4babb..94b42a0 100644
--- a/src/superio/nuvoton/npcd378/superio.c
+++ b/src/superio/nuvoton/npcd378/superio.c
@@ -422,16 +422,16 @@
#endif
static struct device_operations ops = {
- .read_resources = pnp_read_resources,
- .set_resources = pnp_set_resources,
- .enable_resources = pnp_enable_resources,
- .enable = pnp_alt_enable,
- .init = npcd378_init,
- .ops_pnp_mode = &pnp_conf_mode_8787_aa,
+ .read_resources = pnp_read_resources,
+ .set_resources = pnp_set_resources,
+ .enable_resources = pnp_enable_resources,
+ .enable = pnp_alt_enable,
+ .init = npcd378_init,
+ .ops_pnp_mode = &pnp_conf_mode_8787_aa,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_fill_ssdt_generator = npcd378_fill_ssdt_generator,
- .acpi_name = superio_common_ldn_acpi_name,
- .acpi_hid = npcd378_acpi_hid,
+ .acpi_fill_ssdt = npcd378_fill_ssdt_generator,
+ .acpi_name = superio_common_ldn_acpi_name,
+ .acpi_hid = npcd378_acpi_hid,
#endif
};