mb/google/hatch: Make puff and variants share common ec.h
Here we consolidate some of the ec.h duplication between Puff and it's variants. BUG=b:154071868 BRANCH=none TEST=none Change-Id: I13dfe09da5c7a19677b156063bb51a58bc059b93 Signed-off-by: Edward O'Callaghan <quasisec@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/42552 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Sam McNally <sammc@google.com>
This commit is contained in:
Edward O'Callaghan
Edward O'Callaghan
parent
7896b8ce59
commit
4119616718
|
|
@ -0,0 +1,59 @@
|
||||||
|
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||||
|
|
||||||
|
#ifndef __BASEBOARD_EC_H__
|
||||||
|
#define __BASEBOARD_EC_H__
|
||||||
|
|
||||||
|
#include <ec/google/chromeec/ec_commands.h>
|
||||||
|
#include <variant/gpio.h>
|
||||||
|
|
||||||
|
#define MAINBOARD_EC_SCI_EVENTS \
|
||||||
|
(EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_CONNECTED) |\
|
||||||
|
EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_DISCONNECTED) |\
|
||||||
|
EC_HOST_EVENT_MASK(EC_HOST_EVENT_THERMAL_THRESHOLD) |\
|
||||||
|
EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_START) |\
|
||||||
|
EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_STOP) |\
|
||||||
|
EC_HOST_EVENT_MASK(EC_HOST_EVENT_PD_MCU) |\
|
||||||
|
EC_HOST_EVENT_MASK(EC_HOST_EVENT_MKBP))
|
||||||
|
|
||||||
|
#define MAINBOARD_EC_SMI_EVENTS 0
|
||||||
|
|
||||||
|
/* EC can wake from S5 with power button */
|
||||||
|
#define MAINBOARD_EC_S5_WAKE_EVENTS \
|
||||||
|
(EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON))
|
||||||
|
|
||||||
|
/* EC can wake from S3 with power button */
|
||||||
|
#define MAINBOARD_EC_S3_WAKE_EVENTS (MAINBOARD_EC_S5_WAKE_EVENTS)
|
||||||
|
|
||||||
|
#define MAINBOARD_EC_S0IX_WAKE_EVENTS \
|
||||||
|
(MAINBOARD_EC_S3_WAKE_EVENTS | \
|
||||||
|
EC_HOST_EVENT_MASK(EC_HOST_EVENT_HANG_DETECT))
|
||||||
|
|
||||||
|
/* Log EC wake events plus EC shutdown events */
|
||||||
|
#define MAINBOARD_EC_LOG_EVENTS \
|
||||||
|
(EC_HOST_EVENT_MASK(EC_HOST_EVENT_THERMAL_SHUTDOWN) |\
|
||||||
|
EC_HOST_EVENT_MASK(EC_HOST_EVENT_PANIC))
|
||||||
|
|
||||||
|
/*
|
||||||
|
* ACPI related definitions for ASL code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* Enable cros_ec_keyb device */
|
||||||
|
#define EC_ENABLE_MKBP_DEVICE
|
||||||
|
|
||||||
|
/* Enable EC backed PD MCU device in ACPI */
|
||||||
|
#define EC_ENABLE_PD_MCU_DEVICE
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Defines EC wake pin route.
|
||||||
|
* Note that GPE_EC_WAKE is defined, confusingly, as GPE_LAN_WAK which is GPD2/LAN_WAKE#
|
||||||
|
* on the PCH or as the line EC_PCH_WAKE_ODL on the schematic.
|
||||||
|
*/
|
||||||
|
#define EC_ENABLE_WAKE_PIN GPE_EC_WAKE
|
||||||
|
|
||||||
|
#define SIO_EC_MEMMAP_ENABLE /* EC Memory Map Resources */
|
||||||
|
#define SIO_EC_HOST_ENABLE /* EC Host Interface Resources */
|
||||||
|
|
||||||
|
/* Enable EC sync interrupt, EC_SYNC_IRQ is defined in baseboard/gpio.h */
|
||||||
|
#define EC_ENABLE_SYNC_IRQ
|
||||||
|
|
||||||
|
#endif /* __BASEBOARD_EC_H__ */
|
||||||
|
|
@ -3,57 +3,6 @@
|
||||||
#ifndef VARIANT_EC_H
|
#ifndef VARIANT_EC_H
|
||||||
#define VARIANT_EC_H
|
#define VARIANT_EC_H
|
||||||
|
|
||||||
#include <ec/google/chromeec/ec_commands.h>
|
#include <puff/ec.h>
|
||||||
#include <variant/gpio.h>
|
|
||||||
|
|
||||||
#define MAINBOARD_EC_SCI_EVENTS \
|
#endif
|
||||||
(EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_CONNECTED) |\
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_DISCONNECTED) |\
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_THERMAL_THRESHOLD) |\
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_START) |\
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_STOP) |\
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_PD_MCU) |\
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_MKBP))
|
|
||||||
|
|
||||||
#define MAINBOARD_EC_SMI_EVENTS 0
|
|
||||||
|
|
||||||
/* EC can wake from S5 with power button */
|
|
||||||
#define MAINBOARD_EC_S5_WAKE_EVENTS \
|
|
||||||
(EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON))
|
|
||||||
|
|
||||||
/* EC can wake from S3 with power button */
|
|
||||||
#define MAINBOARD_EC_S3_WAKE_EVENTS (MAINBOARD_EC_S5_WAKE_EVENTS)
|
|
||||||
|
|
||||||
#define MAINBOARD_EC_S0IX_WAKE_EVENTS \
|
|
||||||
(MAINBOARD_EC_S3_WAKE_EVENTS | \
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_HANG_DETECT))
|
|
||||||
|
|
||||||
/* Log EC wake events plus EC shutdown events */
|
|
||||||
#define MAINBOARD_EC_LOG_EVENTS \
|
|
||||||
(EC_HOST_EVENT_MASK(EC_HOST_EVENT_THERMAL_SHUTDOWN) |\
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_PANIC))
|
|
||||||
|
|
||||||
/*
|
|
||||||
* ACPI related definitions for ASL code.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* Enable cros_ec_keyb device */
|
|
||||||
#define EC_ENABLE_MKBP_DEVICE
|
|
||||||
|
|
||||||
/* Enable EC backed PD MCU device in ACPI */
|
|
||||||
#define EC_ENABLE_PD_MCU_DEVICE
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Defines EC wake pin route.
|
|
||||||
* Note that GPE_EC_WAKE is defined, confusingly, as GPE_LAN_WAK which is GPD2/LAN_WAKE#
|
|
||||||
* on the PCH or as the line EC_PCH_WAKE_ODL on the schematic.
|
|
||||||
*/
|
|
||||||
#define EC_ENABLE_WAKE_PIN GPE_EC_WAKE
|
|
||||||
|
|
||||||
#define SIO_EC_MEMMAP_ENABLE /* EC Memory Map Resources */
|
|
||||||
#define SIO_EC_HOST_ENABLE /* EC Host Interface Resources */
|
|
||||||
|
|
||||||
/* Enable EC sync interrupt, EC_SYNC_IRQ is defined in baseboard/gpio.h */
|
|
||||||
#define EC_ENABLE_SYNC_IRQ
|
|
||||||
|
|
||||||
#endif /* VARIANT_EC_H */
|
|
||||||
|
|
|
||||||
|
|
@ -3,57 +3,6 @@
|
||||||
#ifndef VARIANT_EC_H
|
#ifndef VARIANT_EC_H
|
||||||
#define VARIANT_EC_H
|
#define VARIANT_EC_H
|
||||||
|
|
||||||
#include <ec/google/chromeec/ec_commands.h>
|
#include <puff/ec.h>
|
||||||
#include <variant/gpio.h>
|
|
||||||
|
|
||||||
#define MAINBOARD_EC_SCI_EVENTS \
|
#endif
|
||||||
(EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_CONNECTED) |\
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_DISCONNECTED) |\
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_THERMAL_THRESHOLD) |\
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_START) |\
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_STOP) |\
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_PD_MCU) |\
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_MKBP))
|
|
||||||
|
|
||||||
#define MAINBOARD_EC_SMI_EVENTS 0
|
|
||||||
|
|
||||||
/* EC can wake from S5 with power button */
|
|
||||||
#define MAINBOARD_EC_S5_WAKE_EVENTS \
|
|
||||||
(EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON))
|
|
||||||
|
|
||||||
/* EC can wake from S3 with power button */
|
|
||||||
#define MAINBOARD_EC_S3_WAKE_EVENTS (MAINBOARD_EC_S5_WAKE_EVENTS)
|
|
||||||
|
|
||||||
#define MAINBOARD_EC_S0IX_WAKE_EVENTS \
|
|
||||||
(MAINBOARD_EC_S3_WAKE_EVENTS | \
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_HANG_DETECT))
|
|
||||||
|
|
||||||
/* Log EC wake events plus EC shutdown events */
|
|
||||||
#define MAINBOARD_EC_LOG_EVENTS \
|
|
||||||
(EC_HOST_EVENT_MASK(EC_HOST_EVENT_THERMAL_SHUTDOWN) |\
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_PANIC))
|
|
||||||
|
|
||||||
/*
|
|
||||||
* ACPI related definitions for ASL code.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* Enable cros_ec_keyb device */
|
|
||||||
#define EC_ENABLE_MKBP_DEVICE
|
|
||||||
|
|
||||||
/* Enable EC backed PD MCU device in ACPI */
|
|
||||||
#define EC_ENABLE_PD_MCU_DEVICE
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Defines EC wake pin route.
|
|
||||||
* Note that GPE_EC_WAKE is defined, confusingly, as GPE_LAN_WAK which is GPD2/LAN_WAKE#
|
|
||||||
* on the PCH or as the line EC_PCH_WAKE_ODL on the schematic.
|
|
||||||
*/
|
|
||||||
#define EC_ENABLE_WAKE_PIN GPE_EC_WAKE
|
|
||||||
|
|
||||||
#define SIO_EC_MEMMAP_ENABLE /* EC Memory Map Resources */
|
|
||||||
#define SIO_EC_HOST_ENABLE /* EC Host Interface Resources */
|
|
||||||
|
|
||||||
/* Enable EC sync interrupt, EC_SYNC_IRQ is defined in baseboard/gpio.h */
|
|
||||||
#define EC_ENABLE_SYNC_IRQ
|
|
||||||
|
|
||||||
#endif /* VARIANT_EC_H */
|
|
||||||
|
|
|
||||||
|
|
@ -3,57 +3,6 @@
|
||||||
#ifndef VARIANT_EC_H
|
#ifndef VARIANT_EC_H
|
||||||
#define VARIANT_EC_H
|
#define VARIANT_EC_H
|
||||||
|
|
||||||
#include <ec/google/chromeec/ec_commands.h>
|
#include <puff/ec.h>
|
||||||
#include <variant/gpio.h>
|
|
||||||
|
|
||||||
#define MAINBOARD_EC_SCI_EVENTS \
|
#endif
|
||||||
(EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_CONNECTED) |\
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_DISCONNECTED) |\
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_THERMAL_THRESHOLD) |\
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_START) |\
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_STOP) |\
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_PD_MCU) |\
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_MKBP))
|
|
||||||
|
|
||||||
#define MAINBOARD_EC_SMI_EVENTS 0
|
|
||||||
|
|
||||||
/* EC can wake from S5 with power button */
|
|
||||||
#define MAINBOARD_EC_S5_WAKE_EVENTS \
|
|
||||||
(EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON))
|
|
||||||
|
|
||||||
/* EC can wake from S3 with power button */
|
|
||||||
#define MAINBOARD_EC_S3_WAKE_EVENTS (MAINBOARD_EC_S5_WAKE_EVENTS)
|
|
||||||
|
|
||||||
#define MAINBOARD_EC_S0IX_WAKE_EVENTS \
|
|
||||||
(MAINBOARD_EC_S3_WAKE_EVENTS | \
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_HANG_DETECT))
|
|
||||||
|
|
||||||
/* Log EC wake events plus EC shutdown events */
|
|
||||||
#define MAINBOARD_EC_LOG_EVENTS \
|
|
||||||
(EC_HOST_EVENT_MASK(EC_HOST_EVENT_THERMAL_SHUTDOWN) |\
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_PANIC))
|
|
||||||
|
|
||||||
/*
|
|
||||||
* ACPI related definitions for ASL code.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* Enable cros_ec_keyb device */
|
|
||||||
#define EC_ENABLE_MKBP_DEVICE
|
|
||||||
|
|
||||||
/* Enable EC backed PD MCU device in ACPI */
|
|
||||||
#define EC_ENABLE_PD_MCU_DEVICE
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Defines EC wake pin route.
|
|
||||||
* Note that GPE_EC_WAKE is defined, confusingly, as GPE_LAN_WAK which is GPD2/LAN_WAKE#
|
|
||||||
* on the PCH or as the line EC_PCH_WAKE_ODL on the schematic.
|
|
||||||
*/
|
|
||||||
#define EC_ENABLE_WAKE_PIN GPE_EC_WAKE
|
|
||||||
|
|
||||||
#define SIO_EC_MEMMAP_ENABLE /* EC Memory Map Resources */
|
|
||||||
#define SIO_EC_HOST_ENABLE /* EC Host Interface Resources */
|
|
||||||
|
|
||||||
/* Enable EC sync interrupt, EC_SYNC_IRQ is defined in baseboard/gpio.h */
|
|
||||||
#define EC_ENABLE_SYNC_IRQ
|
|
||||||
|
|
||||||
#endif /* VARIANT_EC_H */
|
|
||||||
|
|
|
||||||
|
|
@ -3,57 +3,6 @@
|
||||||
#ifndef VARIANT_EC_H
|
#ifndef VARIANT_EC_H
|
||||||
#define VARIANT_EC_H
|
#define VARIANT_EC_H
|
||||||
|
|
||||||
#include <ec/google/chromeec/ec_commands.h>
|
#include <puff/ec.h>
|
||||||
#include <variant/gpio.h>
|
|
||||||
|
|
||||||
#define MAINBOARD_EC_SCI_EVENTS \
|
#endif
|
||||||
(EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_CONNECTED) |\
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_DISCONNECTED) |\
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_THERMAL_THRESHOLD) |\
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_START) |\
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_STOP) |\
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_PD_MCU) |\
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_MKBP))
|
|
||||||
|
|
||||||
#define MAINBOARD_EC_SMI_EVENTS 0
|
|
||||||
|
|
||||||
/* EC can wake from S5 with power button */
|
|
||||||
#define MAINBOARD_EC_S5_WAKE_EVENTS \
|
|
||||||
(EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON))
|
|
||||||
|
|
||||||
/* EC can wake from S3 with power button */
|
|
||||||
#define MAINBOARD_EC_S3_WAKE_EVENTS (MAINBOARD_EC_S5_WAKE_EVENTS)
|
|
||||||
|
|
||||||
#define MAINBOARD_EC_S0IX_WAKE_EVENTS \
|
|
||||||
(MAINBOARD_EC_S3_WAKE_EVENTS | \
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_HANG_DETECT))
|
|
||||||
|
|
||||||
/* Log EC wake events plus EC shutdown events */
|
|
||||||
#define MAINBOARD_EC_LOG_EVENTS \
|
|
||||||
(EC_HOST_EVENT_MASK(EC_HOST_EVENT_THERMAL_SHUTDOWN) |\
|
|
||||||
EC_HOST_EVENT_MASK(EC_HOST_EVENT_PANIC))
|
|
||||||
|
|
||||||
/*
|
|
||||||
* ACPI related definitions for ASL code.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* Enable cros_ec_keyb device */
|
|
||||||
#define EC_ENABLE_MKBP_DEVICE
|
|
||||||
|
|
||||||
/* Enable EC backed PD MCU device in ACPI */
|
|
||||||
#define EC_ENABLE_PD_MCU_DEVICE
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Defines EC wake pin route.
|
|
||||||
* Note that GPE_EC_WAKE is defined, confusingly, as GPE_LAN_WAK which is GPD2/LAN_WAKE#
|
|
||||||
* on the PCH or as the line EC_PCH_WAKE_ODL on the schematic.
|
|
||||||
*/
|
|
||||||
#define EC_ENABLE_WAKE_PIN GPE_EC_WAKE
|
|
||||||
|
|
||||||
#define SIO_EC_MEMMAP_ENABLE /* EC Memory Map Resources */
|
|
||||||
#define SIO_EC_HOST_ENABLE /* EC Host Interface Resources */
|
|
||||||
|
|
||||||
/* Enable EC sync interrupt, EC_SYNC_IRQ is defined in baseboard/gpio.h */
|
|
||||||
#define EC_ENABLE_SYNC_IRQ
|
|
||||||
|
|
||||||
#endif /* VARIANT_EC_H */
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue