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

Pull chrome platform updates from Benson Leung:
 "CrOS EC / MFD Migration:
    - Move cros_ec core driver from mfd into chrome platform.

  Wilco EC:
    - Add batt_ppid_info command to Wilco telemetry driver.

  CrOS EC:
    - cros_ec_rpmsg : Add support to inform EC of suspend/resume status
    - cros_ec_rpmsg : Fix race condition on probe failed
    - cros_ec_chardev : Add a poll handler to receive MKBP events

  Misc:
    - bugfixes in cros_usbpd_logger and cros_ec_ishtp"

* tag 'tag-chrome-platform-for-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux:
  platform/chrome: cros_usbpd_logger: null check create_singlethread_workqueue
  platform/chrome: cros_ec_chardev: Add a poll handler to receive MKBP events
  platform/chrome: cros_ec_rpmsg: Fix race with host command when probe failed
  platform/chrome: chromeos_tbmc: Report wake events
  mfd: cros_ec: Use mfd_add_hotplug_devices() helper
  mfd: cros_ec: Add convenience struct to define autodetectable CrOS EC subdevices
  mfd: cros_ec: Add convenience struct to define dedicated CrOS EC MCUs
  mfd: cros_ec: Use kzalloc and cros_ec_cmd_xfer_status helper
  mfd / platform: cros_ec: Reorganize platform and mfd includes
  mfd / platform: cros_ec: Rename config to a better name
  mfd: cros_ec: Switch to use the new cros-ec-chardev driver
  mfd / platform: cros_ec: Miscellaneous character device to talk with the EC
  mfd / platform: cros_ec: Move cros-ec core driver out from MFD
  mfd / platform: cros_ec: Handle chained ECs as platform devices
  platform/chrome: cros_ec_rpmsg: Add host command AP sleep state support
  platform/chrome: chromeos_laptop: drop checks of NULL-safe functions
  platform/chrome: wilco_ec: Add batt_ppid_info command to telemetry driver

diff --cc drivers/i2c/busses/Kconfig
Simple merge

diff --cc drivers/iio/accel/cros_ec_accel_legacy.c
Simple merge

diff --cc drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
Simple merge

diff --cc drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
Simple merge

diff --cc drivers/iio/light/cros_ec_light_prox.c
Simple merge

diff --cc drivers/iio/pressure/cros_ec_baro.c
Simple merge

diff --cc drivers/input/keyboard/Kconfig
Simple merge

diff --cc drivers/input/keyboard/cros_ec_keyb.c
Simple merge

diff --cc drivers/media/platform/Kconfig
Simple merge

diff --cc drivers/media/platform/cros-ec-cec/cros-ec-cec.c
Simple merge

diff --cc drivers/mfd/Kconfig
Simple merge

diff --cc drivers/platform/chrome/cros_ec_spi.c
Simple merge

diff --cc include/Kbuild
Simple merge

diff --cc include/linux/iio/common/cros_ec_sensors_core.h
Simple merge

diff --cc sound/soc/codecs/Kconfig
Simple merge