Skip to content

Commit b394eab

Browse files
committed
Merge tag 'chrome-platform-v6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux
Pull chrome platform updates from Tzung-Bi Shih: "New: - Support new EC if the memory region information comes from the CRS ACPI resource descriptor in cros_ec_lpc Improvements: - Make sure EC is in RW before probing - Only check events on MKBP notifies to reduce the number of query commands in cros_ec_lpc Cleanups: - Remove unused code and DT bindings for cros-kbd-led-backlight - Constify 'struct bin_attribute' in cros_ec_vbc - Use str_enabled_disabled() in cros_usbpd_logger" * tag 'chrome-platform-v6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux: platform/chrome: cros_ec_lpc: Handle EC without CRS section platform/chrome: cros_usbpd_logger: Use str_enabled_disabled() helper platform/chrome: cros_ec_lpc: Support direct EC register memory access platform/chrome: cros_ec_lpc: Merge lpc_driver_ops into ec private structure platform/chrome: Update ChromeOS EC command tracing platform/chrome: cros_ec_lpc: Only check for events on MKBP notifies platform/chrome: cros_ec_vbc: Constify 'struct bin_attribute' dt-bindings: cros-ec: Remove google,cros-kbd-led-backlight platform/chrome: cros_kbd_led_backlight: Remove OF match platform/chrome: cros_ec_proto: remove unnecessary retries platform/chrome: cros_ec: jump to RW before probing platform/chrome: cros_kbd_led_backlight: remove unneeded if-statement
2 parents d0f93ac + fccebbd commit b394eab

File tree

15 files changed

+251
-187
lines changed

15 files changed

+251
-187
lines changed

Documentation/devicetree/bindings/chrome/google,cros-kbd-led-backlight.yaml

Lines changed: 0 additions & 36 deletions
This file was deleted.

Documentation/devicetree/bindings/mfd/google,cros-ec.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,6 @@ properties:
108108
pwm:
109109
$ref: /schemas/pwm/google,cros-ec-pwm.yaml#
110110

111-
kbd-led-backlight:
112-
$ref: /schemas/chrome/google,cros-kbd-led-backlight.yaml#
113-
114111
keyboard-controller:
115112
$ref: /schemas/input/google,cros-ec-keyb.yaml#
116113

drivers/platform/chrome/cros_ec.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,11 @@ int cros_ec_register(struct cros_ec_device *ec_dev)
204204
mutex_init(&ec_dev->lock);
205205
lockdep_set_class(&ec_dev->lock, &ec_dev->lockdep_key);
206206

207+
/* Send RWSIG continue to jump to RW for devices using RWSIG. */
208+
err = cros_ec_rwsig_continue(ec_dev);
209+
if (err)
210+
dev_info(dev, "Failed to continue RWSIG: %d\n", err);
211+
207212
err = cros_ec_query_all(ec_dev);
208213
if (err) {
209214
dev_err(dev, "Cannot identify the EC: error %d\n", err);

drivers/platform/chrome/cros_ec_i2c.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,8 @@ static int cros_ec_i2c_probe(struct i2c_client *client)
305305
ec_dev->phys_name = client->adapter->name;
306306
ec_dev->din_size = sizeof(struct ec_host_response_i2c) +
307307
sizeof(struct ec_response_get_protocol_info);
308-
ec_dev->dout_size = sizeof(struct ec_host_request_i2c);
308+
ec_dev->dout_size = sizeof(struct ec_host_request_i2c) +
309+
sizeof(struct ec_params_rwsig_action);
309310

310311
err = cros_ec_register(ec_dev);
311312
if (err) {

drivers/platform/chrome/cros_ec_ishtp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ static int cros_ec_dev_init(struct ishtp_cl_data *client_data)
557557
ec_dev->phys_name = dev_name(dev);
558558
ec_dev->din_size = sizeof(struct cros_ish_in_msg) +
559559
sizeof(struct ec_response_get_protocol_info);
560-
ec_dev->dout_size = sizeof(struct cros_ish_out_msg);
560+
ec_dev->dout_size = sizeof(struct cros_ish_out_msg) + sizeof(struct ec_params_rwsig_action);
561561

562562
return cros_ec_register(ec_dev);
563563
}

0 commit comments

Comments
 (0)