summaryrefslogtreecommitdiff
path: root/src/southbridge/intel
diff options
context:
space:
mode:
Diffstat (limited to 'src/southbridge/intel')
-rw-r--r--src/southbridge/intel/i82801gx/lpc.c9
-rw-r--r--src/southbridge/intel/i82801jx/lpc.c9
2 files changed, 6 insertions, 12 deletions
diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c
index 6236ebd800..4e2f9f959e 100644
--- a/src/southbridge/intel/i82801gx/lpc.c
+++ b/src/southbridge/intel/i82801gx/lpc.c
@@ -331,8 +331,7 @@ static void enable_clock_gating(void)
RCBA32(CG) = reg32;
}
-#if CONFIG(HAVE_SMI_HANDLER)
-static void i82801gx_lock_smm(struct device *dev)
+static void i82801gx_set_acpi_mode(struct device *dev)
{
if (!acpi_is_wakeup_s3()) {
#if ENABLE_ACPI_MODE_IN_COREBOOT
@@ -349,7 +348,6 @@ static void i82801gx_lock_smm(struct device *dev)
outb(APM_CNT_ACPI_ENABLE, APM_CNT);
}
}
-#endif
#define SPIBASE 0x3020
static void i82801gx_spi_init(void)
@@ -415,9 +413,8 @@ static void lpc_init(struct device *dev)
/* Interrupt 9 should be level triggered (SCI) */
i8259_configure_irq_trigger(9, 1);
-#if CONFIG(HAVE_SMI_HANDLER)
- i82801gx_lock_smm(dev);
-#endif
+ if (CONFIG(HAVE_SMI_HANDLER))
+ i82801gx_set_acpi_mode(dev);
i82801gx_spi_init();
diff --git a/src/southbridge/intel/i82801jx/lpc.c b/src/southbridge/intel/i82801jx/lpc.c
index 5373ba2022..0fcb521430 100644
--- a/src/southbridge/intel/i82801jx/lpc.c
+++ b/src/southbridge/intel/i82801jx/lpc.c
@@ -371,8 +371,7 @@ static void enable_clock_gating(void)
RCBA32(0x38c0) |= 7;
}
-#if CONFIG(HAVE_SMI_HANDLER)
-static void i82801jx_lock_smm(struct device *dev)
+static void i82801jx_set_acpi_mode(struct device *dev)
{
if (!acpi_is_wakeup_s3()) {
#if ENABLE_ACPI_MODE_IN_COREBOOT
@@ -389,7 +388,6 @@ static void i82801jx_lock_smm(struct device *dev)
outb(APM_CNT_ACPI_ENABLE, APM_CNT);
}
}
-#endif
static void lpc_init(struct device *dev)
{
@@ -431,9 +429,8 @@ static void lpc_init(struct device *dev)
/* Interrupt 9 should be level triggered (SCI) */
i8259_configure_irq_trigger(9, 1);
-#if CONFIG(HAVE_SMI_HANDLER)
- i82801jx_lock_smm(dev);
-#endif
+ if (CONFIG(HAVE_SMI_HANDLER))
+ i82801jx_set_acpi_mode(dev);
}
unsigned long acpi_fill_madt(unsigned long current)