Commit 45aee68e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v5.3-3' of git://git.infradead.org/linux-platform-drivers-x86 

Pull x86 platform driver fixes from Andy Shevchenko:
 "Business as usual, a few fixes and new IDs:

   - PC Engines APU got one fix for software dependencies to
     automatically load them and another fix for mapping of key button
     in the front to issue restart event.

   - OLPC driver is now probed automatically based on module device
     table.

   - Intel PMC core driver supports Intel Ice Lake NNPI processor.

   - WMI driver missed description of a new field in the structure that
     has been added"

* tag 'platform-drivers-x86-v5.3-3' of git://git.infradead.org/linux-platform-drivers-x86:
  platform/x86: pcengines-apuv2: use KEY_RESTART for front button
  platform/x86: intel_pmc_core: Add ICL-NNPI support to PMC Core
  Platform: OLPC: add SPI MODULE_DEVICE_TABLE
  platform/x86: wmi: add missing struct parameter description
  platform/x86: pcengines-apuv2: Fix softdep statement
parents 609488bc f14312a9

drivers/platform/olpc/olpc-xo175-ec.c

+6 −0
Original line number Diff line number Diff line
@@ -736,6 +736,12 @@ static const struct of_device_id olpc_xo175_ec_of_match[] = { 
};

MODULE_DEVICE_TABLE(of, olpc_xo175_ec_of_match);



static const struct spi_device_id olpc_xo175_ec_id_table[] = {

	{ "xo1.75-ec", 0 },

	{}

};

MODULE_DEVICE_TABLE(spi, olpc_xo175_ec_id_table);



static struct spi_driver olpc_xo175_ec_spi_driver = {

	.driver = {

		.name	= "olpc-xo175-ec",

drivers/platform/x86/intel_pmc_core.c

+1 −0
Original line number Diff line number Diff line
@@ -812,6 +812,7 @@ static const struct x86_cpu_id intel_pmc_core_ids[] = { 
	INTEL_CPU_FAM6(KABYLAKE_DESKTOP, spt_reg_map),

	INTEL_CPU_FAM6(CANNONLAKE_MOBILE, cnp_reg_map),

	INTEL_CPU_FAM6(ICELAKE_MOBILE, icl_reg_map),

	INTEL_CPU_FAM6(ICELAKE_NNPI, icl_reg_map),

	{}

};

drivers/platform/x86/pcengines-apuv2.c

+2 −4
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static struct gpiod_lookup_table gpios_led_table = { 


static struct gpio_keys_button apu2_keys_buttons[] = {

	{

		.code			= KEY_SETUP,

		.code			= KEY_RESTART,

		.active_low		= 1,

		.desc			= "front button",

		.type			= EV_KEY,
@@ -255,6 +255,4 @@ MODULE_DESCRIPTION("PC Engines APUv2/APUv3 board GPIO/LED/keys driver"); 
MODULE_LICENSE("GPL");

MODULE_DEVICE_TABLE(dmi, apu_gpio_dmi_table);

MODULE_ALIAS("platform:pcengines-apuv2");

MODULE_SOFTDEP("pre: platform:" AMD_FCH_GPIO_DRIVER_NAME);

MODULE_SOFTDEP("pre: platform:leds-gpio");

MODULE_SOFTDEP("pre: platform:gpio_keys_polled");
 
MODULE_SOFTDEP("pre: platform:" AMD_FCH_GPIO_DRIVER_NAME " platform:leds-gpio platform:gpio_keys_polled");

include/linux/mod_devicetable.h

+1 −0
Original line number Diff line number Diff line
@@ -814,6 +814,7 @@ struct tee_client_device_id { 
/**

 * struct wmi_device_id - WMI device identifier

 * @guid_string: 36 char string of the form fa50ff2b-f2e8-45de-83fa-65417f2f49ba

 * @context: pointer to driver specific data

 */

struct wmi_device_id {

	const char guid_string[UUID_STRING_LEN+1];

CRA Git | Maintained and supported by SUSTech CRA and CCSE