Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/52168 )
Change subject: mb with INTEL_HASWELL: Remove double APM finalize call ......................................................................
mb with INTEL_HASWELL: Remove double APM finalize call
Calling APM_CNT_FINALIZE is already done in southbridge/intel/lynxpoint/lpc.c in lpc_final().
Change-Id: Ic615c39762840de1bd4583a359dd7da74f0ae062 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/mainboard/google/beltino/mainboard.c M src/mainboard/google/slippy/mainboard.c M src/mainboard/intel/baskingridge/mainboard.c 3 files changed, 0 insertions(+), 26 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/68/52168/1
diff --git a/src/mainboard/google/beltino/mainboard.c b/src/mainboard/google/beltino/mainboard.c index 7eba3c2..cb4b454 100644 --- a/src/mainboard/google/beltino/mainboard.c +++ b/src/mainboard/google/beltino/mainboard.c @@ -1,19 +1,10 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <acpi/acpi.h> -#include <cpu/x86/smm.h> #include <device/device.h> -#include <southbridge/intel/lynxpoint/pch.h> #include <vendorcode/google/chromeos/chromeos.h>
#include "onboard.h"
-void mainboard_suspend_resume(void) -{ - /* Call SMM finalize() handlers before resume */ - apm_control(APM_CNT_FINALIZE); -} - static void mainboard_init(struct device *dev) { lan_init(); diff --git a/src/mainboard/google/slippy/mainboard.c b/src/mainboard/google/slippy/mainboard.c index 90f28e7..63d81e5 100644 --- a/src/mainboard/google/slippy/mainboard.c +++ b/src/mainboard/google/slippy/mainboard.c @@ -1,21 +1,13 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <smbios.h> -#include <cpu/x86/smm.h> #include <device/device.h> #include <drivers/intel/gma/int15.h> -#include <acpi/acpi.h> #include <southbridge/intel/lynxpoint/pch.h> #include <vendorcode/google/chromeos/chromeos.h> #include "ec.h" #include "onboard.h"
-void mainboard_suspend_resume(void) -{ - /* Call SMM finalize() handlers before resume */ - apm_control(APM_CNT_FINALIZE); -} - static void mainboard_init(struct device *dev) { mainboard_ec_init(); diff --git a/src/mainboard/intel/baskingridge/mainboard.c b/src/mainboard/intel/baskingridge/mainboard.c index 04803fa..e9583ac 100644 --- a/src/mainboard/intel/baskingridge/mainboard.c +++ b/src/mainboard/intel/baskingridge/mainboard.c @@ -1,18 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <cpu/x86/smm.h> #include <device/device.h> #include <drivers/intel/gma/int15.h> -#include <acpi/acpi.h> -#include <southbridge/intel/lynxpoint/pch.h> #include <vendorcode/google/chromeos/chromeos.h>
-void mainboard_suspend_resume(void) -{ - /* Call SMM finalize() handlers before resume */ - apm_control(APM_CNT_FINALIZE); -} - // mainboard_enable is executed as first thing after // enumerate_buses().