Commit b394eabd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'chrome-platform-v6.14' of... 

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
parents d0f93ac2 fccebbdd

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

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/chrome/google,cros-kbd-led-backlight.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: ChromeOS keyboard backlight LED driver.



maintainers:

  - Tzung-Bi Shih <tzungbi@kernel.org>



properties:

  compatible:

    const: google,cros-kbd-led-backlight



required:

  - compatible



additionalProperties: false



examples:

  - |

    spi {

      #address-cells = <1>;

      #size-cells = <0>;



      cros_ec: ec@0 {

        compatible = "google,cros-ec-spi";

        reg = <0>;

        interrupts = <15 0>;



        kbd-led-backlight {

          compatible = "google,cros-kbd-led-backlight";

        };

      };

    };

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

+0 −3
Original line number Diff line number Diff line
@@ -108,9 +108,6 @@ properties: 
  pwm:

    $ref: /schemas/pwm/google,cros-ec-pwm.yaml#



  kbd-led-backlight:

    $ref: /schemas/chrome/google,cros-kbd-led-backlight.yaml#



  keyboard-controller:

    $ref: /schemas/input/google,cros-ec-keyb.yaml#

drivers/platform/chrome/cros_ec.c

+5 −0
Original line number Diff line number Diff line
@@ -204,6 +204,11 @@ int cros_ec_register(struct cros_ec_device *ec_dev) 
	mutex_init(&ec_dev->lock);

	lockdep_set_class(&ec_dev->lock, &ec_dev->lockdep_key);



	/* Send RWSIG continue to jump to RW for devices using RWSIG. */

	err = cros_ec_rwsig_continue(ec_dev);

	if (err)

		dev_info(dev, "Failed to continue RWSIG: %d\n", err);



	err = cros_ec_query_all(ec_dev);

	if (err) {

		dev_err(dev, "Cannot identify the EC: error %d\n", err);

drivers/platform/chrome/cros_ec_i2c.c

+2 −1
Original line number Diff line number Diff line
@@ -305,7 +305,8 @@ static int cros_ec_i2c_probe(struct i2c_client *client) 
	ec_dev->phys_name = client->adapter->name;

	ec_dev->din_size = sizeof(struct ec_host_response_i2c) +

			   sizeof(struct ec_response_get_protocol_info);

	ec_dev->dout_size = sizeof(struct ec_host_request_i2c);

	ec_dev->dout_size = sizeof(struct ec_host_request_i2c) +

			    sizeof(struct ec_params_rwsig_action);



	err = cros_ec_register(ec_dev);

	if (err) {

drivers/platform/chrome/cros_ec_ishtp.c

+1 −1
Original line number Diff line number Diff line
@@ -557,7 +557,7 @@ static int cros_ec_dev_init(struct ishtp_cl_data *client_data) 
	ec_dev->phys_name = dev_name(dev);

	ec_dev->din_size = sizeof(struct cros_ish_in_msg) +

			   sizeof(struct ec_response_get_protocol_info);

	ec_dev->dout_size = sizeof(struct cros_ish_out_msg);

	ec_dev->dout_size = sizeof(struct cros_ish_out_msg) + sizeof(struct ec_params_rwsig_action);



	return cros_ec_register(ec_dev);

}