Commit 59729c8a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tag-chrome-platform-for-v6.10' of... 

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

Pull chrome platform updates from Tzung-Bi Shih:
 "New:
   - Support Framework Laptop 13 and 16 (AMD Ryzen)

  Improvements:
   - Use sysfs_emit() instead of sprintf() for sysfs' show()

  Fixes:
   - Fix flex-array-member-not-at-end compiler warnings by using
     DEFINE_RAW_FLEX()
   - Add HAS_IOPORT dependencies
   - Fix long pending events during suspend after resume

  Misc cleanups:
   - Provide ID tables for avoiding fallback match
   - Replace deprecated UNIVERSAL_DEV_PM_OPS()"

* tag 'tag-chrome-platform-for-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux: (22 commits)
  platform/chrome: cros_ec: Handle events during suspend after resume completion
  platform/chrome: cros_ec_lpc: add quirks for the Framework Laptop (AMD)
  platform/chrome: cros_ec_lpc: add a "quirks" system
  platform/chrome: cros_ec_lpc: pass driver_data from DMI to the device
  platform/chrome: cros_ec_lpc: introduce a priv struct for the lpc device
  platform/chrome: add HAS_IOPORT dependencies
  platform/chrome: cros_hps_i2c: Replace deprecated UNIVERSAL_DEV_PM_OPS()
  platform/chrome: cros_kbd_led_backlight: provide ID table for avoiding fallback match
  platform/chrome: wilco_ec: core: provide ID table for avoiding fallback match
  platform/chrome: wilco_ec: event: remove redundant MODULE_ALIAS
  platform/chrome: wilco_ec: debugfs: provide ID table for avoiding fallback match
  platform/chrome: wilco_ec: telemetry: provide ID table for avoiding fallback match
  platform/chrome: cros_ec_vbc: provide ID table for avoiding fallback match
  platform/chrome: cros_ec_lightbar: provide ID table for avoiding fallback match
  platform/chrome: cros_ec_sysfs: provide ID table for avoiding fallback match
  platform/chrome: cros_ec_debugfs: provide ID table for avoiding fallback match
  platform/chrome: cros_ec_chardev: provide ID table for avoiding fallback match
  platform/chrome: cros_usbpd_notify: provide ID table for avoiding fallback match
  platform/chrome: cros_usbpd_logger: provide ID table for avoiding fallback match
  platform/chrome: cros_ec_sensorhub: provide ID table for avoiding fallback match
  ...
parents 8f5b5f78 2fbe479c

drivers/platform/chrome/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ config CROS_EC_UART 
config CROS_EC_LPC

	tristate "ChromeOS Embedded Controller (LPC)"

	depends on CROS_EC && ACPI && (X86 || COMPILE_TEST)

	depends on HAS_IOPORT

	help

	  If you say Y here, you get support for talking to the ChromeOS EC

	  over an LPC bus, including the LPC Microchip EC (MEC) variant.

drivers/platform/chrome/cros_ec.c

+8 −8
Original line number Diff line number Diff line
@@ -432,6 +432,12 @@ static void cros_ec_send_resume_event(struct cros_ec_device *ec_dev) 
void cros_ec_resume_complete(struct cros_ec_device *ec_dev)

{

	cros_ec_send_resume_event(ec_dev);



	/*

	 * Let the mfd devices know about events that occur during

	 * suspend. This way the clients know what to do with them.

	 */

	cros_ec_report_events_during_suspend(ec_dev);

}

EXPORT_SYMBOL(cros_ec_resume_complete);
@@ -442,12 +448,6 @@ static void cros_ec_enable_irq(struct cros_ec_device *ec_dev) 


	if (ec_dev->wake_enabled)

		disable_irq_wake(ec_dev->irq);



	/*

	 * Let the mfd devices know about events that occur during

	 * suspend. This way the clients know what to do with them.

	 */

	cros_ec_report_events_during_suspend(ec_dev);

}



/**
@@ -475,8 +475,8 @@ EXPORT_SYMBOL(cros_ec_resume_early); 
 */

int cros_ec_resume(struct cros_ec_device *ec_dev)

{

	cros_ec_enable_irq(ec_dev);

	cros_ec_send_resume_event(ec_dev);

	cros_ec_resume_early(ec_dev);

	cros_ec_resume_complete(ec_dev);

	return 0;

}

EXPORT_SYMBOL(cros_ec_resume);

drivers/platform/chrome/cros_ec_chardev.c

+8 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/device.h>

#include <linux/fs.h>

#include <linux/miscdevice.h>

#include <linux/mod_devicetable.h>

#include <linux/module.h>

#include <linux/notifier.h>

#include <linux/platform_data/cros_ec_chardev.h>
@@ -403,17 +404,23 @@ static void cros_ec_chardev_remove(struct platform_device *pdev) 
	misc_deregister(&data->misc);

}



static const struct platform_device_id cros_ec_chardev_id[] = {

	{ DRV_NAME, 0 },

	{}

};

MODULE_DEVICE_TABLE(platform, cros_ec_chardev_id);



static struct platform_driver cros_ec_chardev_driver = {

	.driver = {

		.name = DRV_NAME,

	},

	.probe = cros_ec_chardev_probe,

	.remove_new = cros_ec_chardev_remove,

	.id_table = cros_ec_chardev_id,

};



module_platform_driver(cros_ec_chardev_driver);



MODULE_ALIAS("platform:" DRV_NAME);

MODULE_AUTHOR("Enric Balletbo i Serra <enric.balletbo@collabora.com>");

MODULE_DESCRIPTION("ChromeOS EC Miscellaneous Character Driver");

MODULE_LICENSE("GPL");

drivers/platform/chrome/cros_ec_debugfs.c

+8 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/debugfs.h>

#include <linux/delay.h>

#include <linux/fs.h>

#include <linux/mod_devicetable.h>

#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/platform_data/cros_ec_commands.h>
@@ -564,6 +565,12 @@ static int __maybe_unused cros_ec_debugfs_resume(struct device *dev) 
static SIMPLE_DEV_PM_OPS(cros_ec_debugfs_pm_ops,

			 cros_ec_debugfs_suspend, cros_ec_debugfs_resume);



static const struct platform_device_id cros_ec_debugfs_id[] = {

	{ DRV_NAME, 0 },

	{}

};

MODULE_DEVICE_TABLE(platform, cros_ec_debugfs_id);



static struct platform_driver cros_ec_debugfs_driver = {

	.driver = {

		.name = DRV_NAME,
@@ -572,10 +579,10 @@ static struct platform_driver cros_ec_debugfs_driver = { 
	},

	.probe = cros_ec_debugfs_probe,

	.remove_new = cros_ec_debugfs_remove,

	.id_table = cros_ec_debugfs_id,

};



module_platform_driver(cros_ec_debugfs_driver);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Debug logs for ChromeOS EC");
 
MODULE_ALIAS("platform:" DRV_NAME);

drivers/platform/chrome/cros_ec_lightbar.c

+8 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/fs.h>

#include <linux/kobject.h>

#include <linux/kstrtox.h>

#include <linux/mod_devicetable.h>

#include <linux/module.h>

#include <linux/platform_data/cros_ec_commands.h>

#include <linux/platform_data/cros_ec_proto.h>
@@ -594,6 +595,12 @@ static int __maybe_unused cros_ec_lightbar_suspend(struct device *dev) 
static SIMPLE_DEV_PM_OPS(cros_ec_lightbar_pm_ops,

			 cros_ec_lightbar_suspend, cros_ec_lightbar_resume);



static const struct platform_device_id cros_ec_lightbar_id[] = {

	{ DRV_NAME, 0 },

	{}

};

MODULE_DEVICE_TABLE(platform, cros_ec_lightbar_id);



static struct platform_driver cros_ec_lightbar_driver = {

	.driver = {

		.name = DRV_NAME,
@@ -602,10 +609,10 @@ static struct platform_driver cros_ec_lightbar_driver = { 
	},

	.probe = cros_ec_lightbar_probe,

	.remove_new = cros_ec_lightbar_remove,

	.id_table = cros_ec_lightbar_id,

};



module_platform_driver(cros_ec_lightbar_driver);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Expose the Chromebook Pixel's lightbar to userspace");
 
MODULE_ALIAS("platform:" DRV_NAME);