GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mainboard/intel/kblrvp: Add Chrome EC switch 

Add Chrome EC switch to enable building with/without Chrome EC.

Change-Id: Iaa8102cba0a454a24149d29f044a2284cd29e28b
Signed-off-by: Naresh G Solanki <naresh.solanki@intel.com>
Reviewed-on: https://review.coreboot.org/17248
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
Naresh G Solanki 2016-11-06 14:05:35 +05:30 committed by Martin Roth
parent bc6a389049
commit dd397f0971
3 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mainboard/intel/kblrvp/acpi/ec.asl
View File

@ -22,6 +22,7 @@
/* Enable EC backed PD MCU device in ACPI */ /* Enable EC backed PD MCU device in ACPI */
#define EC_ENABLE_PD_MCU_DEVICE #define EC_ENABLE_PD_MCU_DEVICE
#if IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC)
/* ACPI code for EC functions */ /* ACPI code for EC functions */
#include <ec/google/chromeec/acpi/ec.asl> #include <ec/google/chromeec/acpi/ec.asl>
#endif

2
src/mainboard/intel/kblrvp/acpi/mainboard.asl
View File

@ -16,6 +16,7 @@
#include "../gpio.h" #include "../gpio.h"
#if IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC)
Scope (\_SB) Scope (\_SB)
{ {
Device (LID0) Device (LID0)
@ -34,6 +35,7 @@ Scope (\_SB)
Name (_HID, EisaId ("PNP0C0C")) Name (_HID, EisaId ("PNP0C0C"))
} }
} }
#endif
/* /*
* LPC Trusted Platform Module * LPC Trusted Platform Module

41
src/mainboard/intel/kblrvp/chromeos.c
View File

@ -40,8 +40,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
{-1, ACTIVE_HIGH, get_lid_switch(), "lid"}, {-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
{-1, ACTIVE_HIGH, 0, "power"}, {-1, ACTIVE_HIGH, 0, "power"},
{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"}, {-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
{GPIO_EC_IN_RW, ACTIVE_HIGH,
gpio_get(GPIO_EC_IN_RW), "EC in RW"},
}; };
lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios)); lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios));
} }
@ -49,8 +47,12 @@ void fill_lb_gpios(struct lb_gpios *gpios)
int get_lid_switch(void) int get_lid_switch(void)
{ {
/* Read lid switch state from the EC. */ if (IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC))
return !!(google_chromeec_get_switches() & EC_SWITCH_LID_OPEN); /* Read lid switch state from the EC. */
return !!(google_chromeec_get_switches() & EC_SWITCH_LID_OPEN);
/* Lid always open */
return 1;
} }
int get_developer_mode_switch(void) int get_developer_mode_switch(void)
@ -61,31 +63,40 @@ int get_developer_mode_switch(void)
int get_recovery_mode_switch(void) int get_recovery_mode_switch(void)
{ {
/* Check for dedicated recovery switch first. */ if (IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC)) {
if (google_chromeec_get_switches() & EC_SWITCH_DEDICATED_RECOVERY) /* Check for dedicated recovery switch first. */
if (google_chromeec_get_switches() &
EC_SWITCH_DEDICATED_RECOVERY)
return 1; return 1;
/* Otherwise check if the EC has posted the keyboard recovery event. */ /* Otherwise check if the EC has posted the keyboard recovery
return !!(google_chromeec_get_events_b() & * event. */
EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY)); return !!(google_chromeec_get_events_b() &
EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY));
}
return 0;
} }
int clear_recovery_mode_switch(void) int clear_recovery_mode_switch(void)
{ {
/* Clear keyboard recovery event. */ if (IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC))
return google_chromeec_clear_events_b( /* Clear keyboard recovery event. */
EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY)); return google_chromeec_clear_events_b(
EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY));
return 0;
} }
int get_write_protect_state(void) int get_write_protect_state(void)
{ {
/* Read PCH_WP GPIO. */ /* No write protect */
return gpio_get(GPIO_PCH_WP); return 0;
} }
static const struct cros_gpio cros_gpios[] = { static const struct cros_gpio cros_gpios[] = {
CROS_GPIO_REC_AL(CROS_GPIO_VIRTUAL, CROS_GPIO_DEVICE_NAME), CROS_GPIO_REC_AL(CROS_GPIO_VIRTUAL, CROS_GPIO_DEVICE_NAME),
CROS_GPIO_WP_AH(GPIO_PCH_WP, CROS_GPIO_DEVICE_NAME), CROS_GPIO_WP_AH(CROS_GPIO_VIRTUAL, CROS_GPIO_DEVICE_NAME),
}; };
void mainboard_chromeos_acpi_generate(void) void mainboard_chromeos_acpi_generate(void)