acpi: Remove monolithic ACPI
All boards now use per-device ACPI. This patch finishes migration by removing transitional kludges. Change-Id: Ie4577f89bf3bb17b310b7b0a84b2c54e404b1606 Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com> Reviewed-on: http://review.coreboot.org/7372 Tested-by: build bot (Jenkins) Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
This commit is contained in:
@@ -328,7 +328,7 @@ static struct pci_operations lops_pci = {
|
||||
static struct device_operations lpc_ops = {
|
||||
.read_resources = hudson_lpc_read_resources,
|
||||
.set_resources = hudson_lpc_set_resources,
|
||||
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES)
|
||||
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
|
||||
.write_acpi_tables = acpi_write_hpet,
|
||||
#endif
|
||||
.enable_resources = hudson_lpc_enable_resources,
|
||||
|
@@ -11,7 +11,7 @@
|
||||
#include <pc80/isa-dma.h>
|
||||
#include <cpu/x86/lapic.h>
|
||||
#include <arch/ioapic.h>
|
||||
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES)
|
||||
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
|
||||
#include <arch/acpi.h>
|
||||
#include <arch/acpigen.h>
|
||||
#include <cpu/amd/powernow.h>
|
||||
@@ -118,7 +118,7 @@ static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)
|
||||
((device & 0xffff) << 16) | (vendor & 0xffff));
|
||||
}
|
||||
|
||||
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES)
|
||||
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
|
||||
|
||||
extern u16 pm_base;
|
||||
|
||||
@@ -147,7 +147,7 @@ static struct device_operations lpc_ops = {
|
||||
.set_resources = pci_dev_set_resources,
|
||||
.enable_resources = pci_dev_enable_resources,
|
||||
.init = lpc_init,
|
||||
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES)
|
||||
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
|
||||
.write_acpi_tables = acpi_write_hpet,
|
||||
.acpi_fill_ssdt_generator = southbridge_acpi_fill_ssdt_generator,
|
||||
#endif
|
||||
|
@@ -107,7 +107,7 @@ static struct device_operations lpc_ops = {
|
||||
.read_resources = lpc_read_resources,
|
||||
.set_resources = lpc_set_resources,
|
||||
.enable_resources = lpc_enable_resources,
|
||||
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES)
|
||||
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
|
||||
.write_acpi_tables = acpi_write_hpet,
|
||||
#endif
|
||||
.init = lpc_init,
|
||||
|
@@ -157,7 +157,7 @@ static struct device_operations lpc_ops = {
|
||||
.read_resources = lpc_read_resources,
|
||||
.set_resources = lpc_set_resources,
|
||||
.enable_resources = pci_dev_enable_resources,
|
||||
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES)
|
||||
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
|
||||
.write_acpi_tables = acpi_write_hpet,
|
||||
#endif
|
||||
.init = lpc_init,
|
||||
|
@@ -129,7 +129,7 @@ static struct device_operations lpc_ops = {
|
||||
.set_resources = lpc_set_resources,
|
||||
.enable_resources = lpc_enable_resources,
|
||||
.init = lpc_init,
|
||||
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES)
|
||||
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
|
||||
.write_acpi_tables = acpi_write_hpet,
|
||||
#endif
|
||||
.scan_bus = scan_static_bus,
|
||||
|
@@ -336,7 +336,7 @@ static struct device_operations lpc_ops = {
|
||||
.read_resources = hudson_lpc_read_resources,
|
||||
.set_resources = hudson_lpc_set_resources,
|
||||
.enable_resources = hudson_lpc_enable_resources,
|
||||
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES)
|
||||
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
|
||||
.write_acpi_tables = acpi_write_hpet,
|
||||
#endif
|
||||
.init = lpc_init,
|
||||
|
@@ -219,7 +219,7 @@ static void sb600_lpc_enable_resources(device_t dev)
|
||||
sb600_lpc_enable_childrens_resources(dev);
|
||||
}
|
||||
|
||||
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES)
|
||||
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
|
||||
|
||||
extern u16 pm_base;
|
||||
|
||||
|
@@ -265,7 +265,7 @@ static void sb700_lpc_enable_resources(device_t dev)
|
||||
sb700_lpc_enable_childrens_resources(dev);
|
||||
}
|
||||
|
||||
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES)
|
||||
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
|
||||
|
||||
static void southbridge_acpi_fill_ssdt_generator(void) {
|
||||
amd_generate_powernow(ACPI_CPU_CONTROL, 6, 1);
|
||||
@@ -282,7 +282,7 @@ static struct device_operations lpc_ops = {
|
||||
.read_resources = sb700_lpc_read_resources,
|
||||
.set_resources = sb700_lpc_set_resources,
|
||||
.enable_resources = sb700_lpc_enable_resources,
|
||||
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES)
|
||||
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
|
||||
.write_acpi_tables = acpi_write_hpet,
|
||||
.acpi_fill_ssdt_generator = southbridge_acpi_fill_ssdt_generator,
|
||||
#endif
|
||||
|
@@ -250,7 +250,7 @@ static struct device_operations lpc_ops = {
|
||||
.read_resources = sb800_lpc_read_resources,
|
||||
.set_resources = sb800_lpc_set_resources,
|
||||
.enable_resources = sb800_lpc_enable_resources,
|
||||
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES)
|
||||
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
|
||||
.write_acpi_tables = acpi_write_hpet,
|
||||
#endif
|
||||
.init = lpc_init,
|
||||
|
Reference in New Issue
Block a user