diff options
| -rw-r--r-- | src/soc/amd/common/block/lpc/lpc.c | 11 | ||||
| -rw-r--r-- | src/soc/amd/common/block/smbus/sm.c | 10 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/soc/amd/common/block/lpc/lpc.c b/src/soc/amd/common/block/lpc/lpc.c index 99f84fa508a3..60c85b9ce478 100644 --- a/src/soc/amd/common/block/lpc/lpc.c +++ b/src/soc/amd/common/block/lpc/lpc.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#include <arch/ioapic.h> #include <console/console.h> #include <device/device.h> #include <device/pci.h> @@ -15,6 +16,7 @@ #include <amdblocks/acpi.h> #include <amdblocks/acpimmio.h> #include <amdblocks/espi.h> +#include <amdblocks/ioapic.h> #include <amdblocks/lpc.h> #include <soc/iomap.h> #include <soc/lpc.h> @@ -34,6 +36,12 @@ static void setup_serirq(void) pm_write8(PM_SERIRQ_CONF, byte); } +static void fch_ioapic_init(void) +{ + fch_enable_ioapic_decode(); + setup_ioapic(VIO_APIC_VADDR, FCH_IOAPIC_ID); +} + static void lpc_init(struct device *dev) { u8 byte; @@ -83,6 +91,9 @@ static void lpc_init(struct device *dev) setup_i8254(); setup_serirq(); + + fch_ioapic_init(); + fch_configure_hpet(); } static void lpc_read_resources(struct device *dev) diff --git a/src/soc/amd/common/block/smbus/sm.c b/src/soc/amd/common/block/smbus/sm.c index e8b7c0fce630..801a1543b46e 100644 --- a/src/soc/amd/common/block/smbus/sm.c +++ b/src/soc/amd/common/block/smbus/sm.c @@ -1,20 +1,11 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include <amdblocks/acpimmio.h> -#include <amdblocks/ioapic.h> #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> #include <device/smbus.h> #include <device/smbus_host.h> -#include <arch/ioapic.h> - -static void sm_init(struct device *dev) -{ - fch_enable_ioapic_decode(); - setup_ioapic(VIO_APIC_VADDR, FCH_IOAPIC_ID); - fch_configure_hpet(); -} static u32 get_sm_mmio(struct device *dev) { @@ -77,7 +68,6 @@ static struct device_operations smbus_ops = { .read_resources = noop_read_resources, .set_resources = noop_set_resources, .enable_resources = pci_dev_enable_resources, - .init = sm_init, .scan_bus = scan_smbus, .ops_pci = &pci_dev_ops_pci, .ops_smbus_bus = &lops_smbus_bus, |