Commit b44c4d3f authored by Douglas Anderson's avatar Douglas Anderson Committed by Lee Jones

mfd: cros-ec: Update cros_ec_commands.h for buttons and switches

Add the defines for the new buttons and switches connected to the CrosEC.
Signed-off-by: default avatarDouglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 7ce7d89f
...@@ -1839,18 +1839,69 @@ struct ec_response_tmp006_get_raw { ...@@ -1839,18 +1839,69 @@ struct ec_response_tmp006_get_raw {
* *
* Returns raw data for keyboard cols; see ec_response_mkbp_info.cols for * Returns raw data for keyboard cols; see ec_response_mkbp_info.cols for
* expected response size. * expected response size.
*
* NOTE: This has been superseded by EC_CMD_MKBP_GET_NEXT_EVENT. If you wish
* to obtain the instantaneous state, use EC_CMD_MKBP_INFO with the type
* EC_MKBP_INFO_CURRENT and event EC_MKBP_EVENT_KEY_MATRIX.
*/ */
#define EC_CMD_MKBP_STATE 0x60 #define EC_CMD_MKBP_STATE 0x60
/* Provide information about the matrix : number of rows and columns */ /*
* Provide information about various MKBP things. See enum ec_mkbp_info_type.
*/
#define EC_CMD_MKBP_INFO 0x61 #define EC_CMD_MKBP_INFO 0x61
struct ec_response_mkbp_info { struct ec_response_mkbp_info {
uint32_t rows; uint32_t rows;
uint32_t cols; uint32_t cols;
uint8_t switches; /* Formerly "switches", which was 0. */
uint8_t reserved;
} __packed; } __packed;
struct ec_params_mkbp_info {
uint8_t info_type;
uint8_t event_type;
} __packed;
enum ec_mkbp_info_type {
/*
* Info about the keyboard matrix: number of rows and columns.
*
* Returns struct ec_response_mkbp_info.
*/
EC_MKBP_INFO_KBD = 0,
/*
* For buttons and switches, info about which specifically are
* supported. event_type must be set to one of the values in enum
* ec_mkbp_event.
*
* For EC_MKBP_EVENT_BUTTON and EC_MKBP_EVENT_SWITCH, returns a 4 byte
* bitmask indicating which buttons or switches are present. See the
* bit inidices below.
*/
EC_MKBP_INFO_SUPPORTED = 1,
/*
* Instantaneous state of buttons and switches.
*
* event_type must be set to one of the values in enum ec_mkbp_event.
*
* For EC_MKBP_EVENT_KEY_MATRIX, returns uint8_t key_matrix[13]
* indicating the current state of the keyboard matrix.
*
* For EC_MKBP_EVENT_HOST_EVENT, return uint32_t host_event, the raw
* event state.
*
* For EC_MKBP_EVENT_BUTTON, returns uint32_t buttons, indicating the
* state of supported buttons.
*
* For EC_MKBP_EVENT_SWITCH, returns uint32_t switches, indicating the
* state of supported switches.
*/
EC_MKBP_INFO_CURRENT = 2,
};
/* Simulate key press */ /* Simulate key press */
#define EC_CMD_MKBP_SIMULATE_KEY 0x62 #define EC_CMD_MKBP_SIMULATE_KEY 0x62
...@@ -1983,6 +2034,12 @@ enum ec_mkbp_event { ...@@ -1983,6 +2034,12 @@ enum ec_mkbp_event {
/* New Sensor FIFO data. The event data is fifo_info structure. */ /* New Sensor FIFO data. The event data is fifo_info structure. */
EC_MKBP_EVENT_SENSOR_FIFO = 2, EC_MKBP_EVENT_SENSOR_FIFO = 2,
/* The state of the non-matrixed buttons have changed. */
EC_MKBP_EVENT_BUTTON = 3,
/* The state of the switches have changed. */
EC_MKBP_EVENT_SWITCH = 4,
/* Number of MKBP events */ /* Number of MKBP events */
EC_MKBP_EVENT_COUNT, EC_MKBP_EVENT_COUNT,
}; };
...@@ -1992,6 +2049,9 @@ union ec_response_get_next_data { ...@@ -1992,6 +2049,9 @@ union ec_response_get_next_data {
/* Unaligned */ /* Unaligned */
uint32_t host_event; uint32_t host_event;
uint32_t buttons;
uint32_t switches;
} __packed; } __packed;
struct ec_response_get_next_event { struct ec_response_get_next_event {
...@@ -2000,6 +2060,15 @@ struct ec_response_get_next_event { ...@@ -2000,6 +2060,15 @@ struct ec_response_get_next_event {
union ec_response_get_next_data data; union ec_response_get_next_data data;
} __packed; } __packed;
/* Bit indices for buttons and switches.*/
/* Buttons */
#define EC_MKBP_POWER_BUTTON 0
#define EC_MKBP_VOL_UP 1
#define EC_MKBP_VOL_DOWN 2
/* Switches */
#define EC_MKBP_LID_OPEN 0
/*****************************************************************************/ /*****************************************************************************/
/* Temperature sensor commands */ /* Temperature sensor commands */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment