Merge tag 'tag-chrome-platform-for-v5.4' of... (32b90daf) · Commits · 戴 / test

Merge tag 'tag-chrome-platform-for-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux 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

drivers/extcon/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -181,7 +181,7 @@ config EXTCON_USB_GPIO

		config EXTCON_USBC_CROS_EC
		tristate "ChromeOS Embedded Controller EXTCON support"
		depends on MFD_CROS_EC
		depends on CROS_EC
		help
		Say Y here to enable USB Type C cable detection extcon support when
		using Chrome OS EC based USB Type-C ports.

drivers/extcon/extcon-usbc-cros-ec.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -6,10 +6,11 @@

		#include <linux/extcon-provider.h>
		#include <linux/kernel.h>
		#include <linux/mfd/cros_ec.h>
		#include <linux/module.h>
		#include <linux/notifier.h>
		#include <linux/of.h>
		#include <linux/platform_data/cros_ec_commands.h>
		#include <linux/platform_data/cros_ec_proto.h>
		#include <linux/platform_device.h>
		#include <linux/slab.h>
		#include <linux/sched.h>

drivers/hid/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -376,7 +376,7 @@ config HOLTEK_FF

		config HID_GOOGLE_HAMMER
		tristate "Google Hammer Keyboard"
		depends on USB_HID && LEDS_CLASS && MFD_CROS_EC
		depends on USB_HID && LEDS_CLASS && CROS_EC
		---help---
		Say Y here if you have a Google Hammer device.

drivers/hid/hid-google-hammer.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -16,9 +16,9 @@
		#include <linux/acpi.h>
		#include <linux/hid.h>
		#include <linux/leds.h>
		#include <linux/mfd/cros_ec.h>
		#include <linux/mfd/cros_ec_commands.h>
		#include <linux/module.h>
		#include <linux/platform_data/cros_ec_commands.h>
		#include <linux/platform_data/cros_ec_proto.h>
		#include <linux/platform_device.h>
		#include <linux/pm_wakeup.h>
		#include <asm/unaligned.h>

drivers/i2c/busses/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -1345,7 +1345,7 @@ config I2C_SIBYTE

		config I2C_CROS_EC_TUNNEL
		tristate "ChromeOS EC tunnel I2C bus"
		depends on MFD_CROS_EC
		depends on CROS_EC
		help
		If you say yes here you get an I2C bus that will tunnel i2c commands
		through to the other side of the ChromeOS EC to the i2c bus

Admin message