From 56919b9b66e7100dd146a88f5e27205735804ac0 Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Wed, 13 Feb 2008 22:47:58 +0000 Subject: [PATCH] Enable Suspend-to-RAM code based on config option. Revert semantics to those we had in v2 and before r385. This causes pm_chipset_init() to be called on Geode LX. Signed-off-by: Carl-Daniel Hailfinger Builds and run to filo. Acked-by: Marc Jones git-svn-id: svn://coreboot.org/repository/coreboot-v3@595 f3766cd6-281f-0410-b1cd-43a5c92072e9 --- device/Kconfig | 10 ++++++++++ southbridge/amd/cs5536/cs5536.c | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/device/Kconfig b/device/Kconfig index bc666ea1bb..044cd711e1 100644 --- a/device/Kconfig +++ b/device/Kconfig @@ -87,3 +87,13 @@ config INITIALIZE_ONBOARD_VGA_FIRST endmenu +menu "Power management" + +config SUSPEND_TO_RAM + bool "Suspend-to-RAM (S3)" + depends EXPERIMENTAL && BROKEN + help + Enable support for Suspend-to-RAM (S3) functionality. + +endmenu + diff --git a/southbridge/amd/cs5536/cs5536.c b/southbridge/amd/cs5536/cs5536.c index 2a19a4a41d..61dea9822d 100644 --- a/southbridge/amd/cs5536/cs5536.c +++ b/southbridge/amd/cs5536/cs5536.c @@ -488,8 +488,9 @@ void chipsetinit(void) } sb = (struct southbridge_amd_cs5536_dts_config *)dev->device_configuration; -#if 0 +#ifdef CONFIG_SUSPEND_TO_RAM if (!IsS3Resume()) +#endif { struct acpi_init *aci = acpi_init_table; for (; aci->ioreg; aci++) { @@ -498,7 +499,6 @@ void chipsetinit(void) } pm_chipset_init(); } -#endif /* Set HD IRQ. */ outl(GPIOL_2_SET, GPIO_IO_BASE + GPIOL_INPUT_ENABLE);