From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Nov 2021 19:36:43 +0000 (-0800)
Subject: Merge tag 'tag-chrome-platform-for-v5.16' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d4efc0de00fc10a805ce991ceb6a94ed837a6e71;p=linux.git

Merge tag 'tag-chrome-platform-for-v5.16' of git://git./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
---

d4efc0de00fc10a805ce991ceb6a94ed837a6e71
diff --cc MAINTAINERS
index 5695690cbc131,7cfd34c5a982f..5b7a13f706fa3
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -4490,8 -4426,19 +4487,19 @@@ F:	drivers/power/supply/cros_usbpd-char
  N:	cros_ec
  N:	cros-ec
  
+ CHROMEOS EC USB TYPE-C DRIVER
+ M:	Prashant Malani <pmalani@chromium.org>
+ S:	Maintained
+ F:	drivers/platform/chrome/cros_ec_typec.c
+ 
+ CHROMEOS EC USB PD NOTIFY DRIVER
+ M:	Prashant Malani <pmalani@chromium.org>
+ S:	Maintained
+ F:	drivers/platform/chrome/cros_usbpd_notify.c
+ F:	include/linux/platform_data/cros_usbpd_notify.h
+ 
  CHRONTEL CH7322 CEC DRIVER
 -M:	Jeff Chase <jnchase@google.com>
 +M:	Joe Tessler <jrt@google.com>
  L:	linux-media@vger.kernel.org
  S:	Maintained
  T:	git git://linuxtv.org/media_tree.git