aboutsummaryrefslogtreecommitdiff
path: root/src/mainboard/google/glados/smihandler.c
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@gmail.com>2018-06-26 13:07:32 -0500
committerMartin Roth <martinroth@google.com>2018-07-21 00:49:25 +0000
commit0b9cfe60b20b91fc172e041d192e48f4548572f5 (patch)
tree281c66387dfc7d883a8d97bdd33a3b86c8112194 /src/mainboard/google/glados/smihandler.c
parent86669939ea80d8c90e6fb2676f2fb524005b565b (diff)
google/glados: Convert to variant setup
Convert Skylake reference board glados to variant setup in preparation for merge with existing Skylake boards chell and lars, and upstreaming of new boards asuka, caroline, cave, and sentry. The following changes have been made: - move DPTF to variant subdir - move non-common EC defs to variant subdir - adjust Kconfig for variant setup - move non-common NHLT config to variant Kconfig - make non-common NHLT ACPI code conditional - move devicetree to variant subdir - move board GPIO defs to variant subdir - move board PEI data to variant subdir - move SPD index calculation to romstage so available for dual-channel determination during PEI for boards which need it - move SPD compilation to variant makefile - add weak function for determination of dual-channel RAM - add weak function for mainboard_gpio_smi_sleep() so SKL-Y variants can override and power down rails as needed Test: build google/glados Change-Id: I41615979dc11b5a10e32d6b5f477a256735cde53 Signed-off-by: Matt DeVillier <matt.devillier@gmail.com> Reviewed-on: https://review.coreboot.org/27411 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'src/mainboard/google/glados/smihandler.c')
-rw-r--r--src/mainboard/google/glados/smihandler.c20
1 files changed, 4 insertions, 16 deletions
diff --git a/src/mainboard/google/glados/smihandler.c b/src/mainboard/google/glados/smihandler.c
index c8319833c3..dd2c4486a8 100644
--- a/src/mainboard/google/glados/smihandler.c
+++ b/src/mainboard/google/glados/smihandler.c
@@ -16,6 +16,7 @@
#include <arch/acpi.h>
#include <arch/io.h>
+#include <baseboard/variant.h>
#include <console/console.h>
#include <cpu/x86/smm.h>
#include <elog.h>
@@ -26,7 +27,7 @@
#include <soc/pm.h>
#include <soc/smm.h>
#include "ec.h"
-#include "gpio.h"
+#include <variant/gpio.h>
int mainboard_io_trap_handler(int smif)
{
@@ -54,21 +55,8 @@ void mainboard_smi_gpi_handler(const struct gpi_status *sts)
chromeec_smi_process_events();
}
-static void mainboard_gpio_smi_sleep(u8 slp_typ)
+__weak void mainboard_gpio_smi_sleep(void)
{
- int i;
-
- /* Power down the rails on any sleep type. */
- gpio_t active_high_signals[] = {
- EN_PP3300_KEPLER,
- EN_PP3300_DX_TOUCH,
- EN_PP3300_DX_EMMC,
- EN_PP1800_DX_EMMC,
- EN_PP3300_DX_CAM,
- };
-
- for (i = 0; i < ARRAY_SIZE(active_high_signals); i++)
- gpio_set(active_high_signals[i], 0);
}
void mainboard_smi_sleep(u8 slp_typ)
@@ -77,7 +65,7 @@ void mainboard_smi_sleep(u8 slp_typ)
chromeec_smi_sleep(slp_typ, MAINBOARD_EC_S3_WAKE_EVENTS,
MAINBOARD_EC_S5_WAKE_EVENTS);
- mainboard_gpio_smi_sleep(slp_typ);
+ mainboard_gpio_smi_sleep();
}
int mainboard_smi_apmc(u8 apmc)