History

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

Pull chrome platform updates from Benson Leung: "cros_ec_typec: - Clean up use of cros_ec_check_features cros_ec_*: - Rename and move cros_ec_pd_command to cros_ec_command, and make changes to cros_ec_typec and cros_ec_proto to use the new common command, reducing duplication. sensorhub: - simplify getting .driver_data in cros_ec_sensors_core and cros_ec_sensorhub misc: - Maintainership change. Enric Balletbo i Serra has moved on from Collabora, so removing him from chrome/platform maintainers. Thanks for all of your hard work maintaining this, Enric, and best of luck to you in your new role! - Add Prashant Malani as driver maintainer for cros_ec_typec.c and cros_usbpd_notify. He was already principal contributor of these drivers" * tag 'tag-chrome-platform-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux: platform/chrome: cros_ec_proto: Use ec_command for check_features platform/chrome: cros_ec_proto: Use EC struct for features MAINTAINERS: Chrome: Drop Enric Balletbo i Serra platform/chrome: cros_ec_typec: Use cros_ec_command() platform/chrome: cros_ec_proto: Add version for ec_command platform/chrome: cros_ec_proto: Make data pointers void platform/chrome: cros_usbpd_notify: Move ec_command() platform/chrome: cros_usbpd_notify: Rename cros_ec_pd_command() platform/chrome: cros_ec: Fix spelling mistake "responsed" -> "response" platform/chrome: cros_ec_sensorhub: simplify getting .driver_data iio: common: cros_ec_sensors: simplify getting .driver_data platform/chrome: cros-ec-typec: Cleanup use of check_features platform/chrome: cros_ec_proto: Fix check_features ret val MAINTAINERS: Add Prashant's maintainership of cros_ec drivers

Linus Torvalds committed 5 years ago

Commit d4efc0d2 parents 89fa0be 297d34e9 files · +104 −137Browse files

Showing the changes to include/linux/platform_data (1 of 9 files). Show all

Unified · Split

include/linux/platform_data/cros_ec_proto.h+5−2
@@ -205,7 +205,7 @@ struct cros_ec_dev { · 204 unmodified lines
205 struct cros_ec_debugfs *debug_info;205 struct cros_ec_debugfs *debug_info;
206 bool has_kb_wake_angle;206 bool has_kb_wake_angle;
207 u16 cmd_offset;207 u16 cmd_offset;
208 u32 features[2];208 struct ec_response_get_features features;
209};209};
210 210
211#define to_cros_ec_dev(dev) container_of(dev, struct cros_ec_dev, class_dev)211#define to_cros_ec_dev(dev) container_of(dev, struct cros_ec_dev, class_dev)
@@ -227,10 +227,13 @@ int cros_ec_get_next_event(struct cros_ec_device *ec_dev, · 15 unmodified lines
227 227
228u32 cros_ec_get_host_event(struct cros_ec_device *ec_dev);228u32 cros_ec_get_host_event(struct cros_ec_device *ec_dev);
229 229
230int cros_ec_check_features(struct cros_ec_dev *ec, int feature);230bool cros_ec_check_features(struct cros_ec_dev *ec, int feature);
231 231
232int cros_ec_get_sensor_count(struct cros_ec_dev *ec);232int cros_ec_get_sensor_count(struct cros_ec_dev *ec);
233 233
234int cros_ec_command(struct cros_ec_device *ec_dev, unsigned int version, int command, void *outdata,
235 int outsize, void *indata, int insize);
236
234/**237/**
235 * cros_ec_get_time_ns() - Return time in ns.238 * cros_ec_get_time_ns() - Return time in ns.
236 *239 *