History

Merge tag 'tag-chrome-platform-for-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux

Pull chrome platform updates from Tzung-Bi Shih: "cros_ec_proto: - Leverage Kunit and add Kunit test cases - Clean-ups - Fix typo cros_ec_commands: - Fix typo - Fix compile errors cros_kbd_led_backlight: - Support OF match - Support EC PWM backend cros_ec: - Always expose the last resume result to fix sleep hang detection on ARM-based chromebooks wilco_ec: - Fix typo cros_ec_typec: - Clean-ups - Use Type-C framework utilities to manage altmode structs" * tag 'tag-chrome-platform-for-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux: (59 commits) platform/chrome: cros_kunit_util: add default value for `msg->result` platform/chrome: merge Kunit utils and test cases platform/chrome: cros_kbd_led_backlight: fix build warning platform/chrome: cros_ec_proto: add Kunit test for cros_ec_cmd() platform/chrome: cros_ec_proto: add Kunit tests for get_sensor_count platform/chrome: cros_ec_proto: add Kunit tests for check_features platform/chrome: cros_ec_proto: add Kunit tests for get_host_event platform/chrome: cros_ec_proto: add Kunit tests for get_next_event platform/chrome: cros_ec_proto: add Kunit test for cros_ec_map_error() platform/chrome: cros_ec_proto: add Kunit tests for cmd_xfer_status platform/chrome: cros_ec_proto: return -EPROTO if empty payload platform/chrome: cros_ec_proto: add Kunit test for empty payload platform/chrome: cros_ec_proto: return -EAGAIN when retries timed out platform/chrome: cros_ec_proto: change Kunit expectation when timed out platform/chrome: cros_ec_proto: separate cros_ec_wait_until_complete() platform/chrome: cros_ec_proto: separate cros_ec_xfer_command() platform/chrome: cros_ec_proto: add Kunit tests for cros_ec_send_command() platform/chrome: cros_ec_proto: add Kunit tests for cros_ec_cmd_xfer() platform/chrome: cros_ec_proto: add "cros_ec_" prefix to send_command() platform/chrome: cros_ec_typec: Register port altmodes ...

Linus Torvalds committed 4 years ago

Commit 5bb3bf22 parents da8d07a afef1e118 files · +3490 −335Browse files

Showing the changes to include/linux/platform_data (2 of 18 files). Show all

Unified · Split

2 files
  1. include/linux/platform_data/cros_ec_commands.h +3 −3
  2. include/linux/platform_data/cros_ec_proto.h +5 −2
include/linux/platform_data/cros_ec_commands.h+3−3
@@ -13,8 +13,8 @@ · 12 unmodified lines
13#ifndef __CROS_EC_COMMANDS_H13#ifndef __CROS_EC_COMMANDS_H
14#define __CROS_EC_COMMANDS_H14#define __CROS_EC_COMMANDS_H
15 15
16 16#include <linux/bits.h>
17 17#include <linux/types.h>
18 18
19#define BUILD_ASSERT(_cond)19#define BUILD_ASSERT(_cond)
20 20
@@ -787,7 +787,7 @@ struct ec_host_response { · 766 unmodified lines
787 *787 *
788 * Packets always start with a request or response header. They are followed788 * Packets always start with a request or response header. They are followed
789 * by data_len bytes of data. If the data_crc_present flag is set, the data789 * by data_len bytes of data. If the data_crc_present flag is set, the data
790 * bytes are followed by a CRC-8 of that data, using using x^8 + x^2 + x + 1790 * bytes are followed by a CRC-8 of that data, using x^8 + x^2 + x + 1
791 * polynomial.791 * polynomial.
792 *792 *
793 * Host algorithm when sending a request q:793 * Host algorithm when sending a request q:
include/linux/platform_data/cros_ec_proto.h+5−2
@@ -21,6 +21,9 @@ · 20 unmodified lines
21#define CROS_EC_DEV_SCP_NAME "cros_scp"21#define CROS_EC_DEV_SCP_NAME "cros_scp"
22#define CROS_EC_DEV_TP_NAME "cros_tp"22#define CROS_EC_DEV_TP_NAME "cros_tp"
23 23
24#define CROS_EC_DEV_EC_INDEX 0
25#define CROS_EC_DEV_PD_INDEX 1
26
24/*27/*
25 * The EC is unresponsive for a time after a reboot command. Add a28 * The EC is unresponsive for a time after a reboot command. Add a
26 * simple delay to make sure that the bus stays locked.29 * simple delay to make sure that the bus stays locked.
@@ -231,8 +234,8 @@ bool cros_ec_check_features(struct cros_ec_dev *ec, int feature); · 204 unmodified lines
231 234
232int cros_ec_get_sensor_count(struct cros_ec_dev *ec);235int cros_ec_get_sensor_count(struct cros_ec_dev *ec);
233 236
234int cros_ec_command(struct cros_ec_device *ec_dev, unsigned int version, int command, void *outdata,237int cros_ec_cmd(struct cros_ec_device *ec_dev, unsigned int version, int command, void *outdata,
235 int outsize, void *indata, int insize);238 size_t outsize, void *indata, size_t insize);
236 239
237/**240/**
238 * cros_ec_get_time_ns() - Return time in ns.241 * cros_ec_get_time_ns() - Return time in ns.