diff options
| author | Benson Leung <bleung@chromium.org> | 2018-04-10 22:29:14 -0700 |
|---|---|---|
| committer | Benson Leung <bleung@chromium.org> | 2018-04-10 22:30:34 -0700 |
| commit | c171d3b8a67e08884d915ffbb1dbc475747d7df2 (patch) | |
| tree | d2061a569bffc691e9dde9c994e1889f5658bd9d /include/linux | |
| parent | 72655f6cf7fe04b867776bb7120fbdb84dee4f61 (diff) | |
| parent | c1d1e91aff3d1183d6b16a282c2575e3e006cee4 (diff) | |
| download | linux-stable-c171d3b8a67e08884d915ffbb1dbc475747d7df2.tar.gz linux-stable-c171d3b8a67e08884d915ffbb1dbc475747d7df2.tar.bz2 linux-stable-c171d3b8a67e08884d915ffbb1dbc475747d7df2.zip | |
Merge remote-tracking branch 'origin/ib-chrome-platform-cros-ec-sysfs-debugfs-for-v4.17' into working-branch-for-4.17
Merging Enric's cros-ec sysfs and debugfs fixes from immutable branch.
Signed-off-by: Benson Leung <bleung@chromium.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mfd/cros_ec.h | 2 | ||||
| -rw-r--r-- | include/linux/mfd/cros_ec_commands.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/mfd/cros_ec.h b/include/linux/mfd/cros_ec.h index c61535979b8f..2d4e23c9ea0a 100644 --- a/include/linux/mfd/cros_ec.h +++ b/include/linux/mfd/cros_ec.h @@ -183,6 +183,7 @@ struct cros_ec_debugfs; * @ec_dev: cros_ec_device structure to talk to the physical device * @dev: pointer to the platform device * @debug_info: cros_ec_debugfs structure for debugging information + * @has_kb_wake_angle: true if at least 2 accelerometer are connected to the EC. * @cmd_offset: offset to apply for each command. */ struct cros_ec_dev { @@ -191,6 +192,7 @@ struct cros_ec_dev { struct cros_ec_device *ec_dev; struct device *dev; struct cros_ec_debugfs *debug_info; + bool has_kb_wake_angle; u16 cmd_offset; u32 features[2]; }; diff --git a/include/linux/mfd/cros_ec_commands.h b/include/linux/mfd/cros_ec_commands.h index 2b96e630e3b6..f2edd9969b40 100644 --- a/include/linux/mfd/cros_ec_commands.h +++ b/include/linux/mfd/cros_ec_commands.h @@ -2948,6 +2948,9 @@ struct ec_response_usb_pd_control_v1 { #define EC_CMD_USB_PD_PORTS 0x102 +/* Maximum number of PD ports on a device, num_ports will be <= this */ +#define EC_USB_PD_MAX_PORTS 8 + struct ec_response_usb_pd_ports { uint8_t num_ports; } __packed; |