Commit 7575fdda authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 platform driver fixes from Andy Shevchenko:
 "We have some fixes for Tablet Mode reporting in particular, that users
  are complaining a lot about.

  Summary:

   - Attempt #3 of enabling Tablet Mode reporting w/o regressions

   - Improve battery recognition code in ASUS WMI driver

   - Fix Kconfig dependency warning for Fujitsu and LG laptop drivers

   - Add fixes in Thinkpad ACPI driver for _BCL method and NVRAM polling

   - Fix power supply extended topology in Mellanox driver

   - Fix memory leak in OLPC EC driver

   - Avoid static struct device in Intel PMC core driver

   - Add support for the touchscreen found in MPMAN Converter9 2-in-1

   - Update MAINTAINERS to reflect the real state of affairs"

* tag 'platform-drivers-x86-v5.9-2' of git://git.infradead.org/linux-platform-drivers-x86:
  platform/x86: thinkpad_acpi: re-initialize ACPI buffer size when reuse
  MAINTAINERS: Add Mark Gross and Hans de Goede as x86 platform drivers maintainers
  platform/x86: intel-vbtn: Switch to an allow-list for SW_TABLET_MODE reporting
  platform/x86: intel-vbtn: Revert "Fix SW_TABLET_MODE always reporting 1 on the HP Pavilion 11 x360"
  platform/x86: intel_pmc_core: do not create a static struct device
  platform/x86: mlx-platform: Fix extended topology configuration for power supply units
  platform/x86: pcengines-apuv2: Fix typo on define of AMD_FCH_GPIO_REG_GPIO55_DEVSLP0
  platform/x86: fix kconfig dependency warning for FUJITSU_LAPTOP
  platform/x86: fix kconfig dependency warning for LG_LAPTOP
  platform/x86: thinkpad_acpi: initialize tp_nvram_state variable
  platform/x86: intel-vbtn: Fix SW_TABLET_MODE always reporting 1 on the HP Pavilion 11 x360
  platform/x86: asus-wmi: Add BATC battery name to the list of supported
  platform/x86: asus-nb-wmi: Revert "Do not load on Asus T100TA and T200TA"
  platform/x86: touchscreen_dmi: Add info for the MPMAN Converter9 2-in-1
  Documentation: laptops: thinkpad-acpi: fix underline length build warning
  Platform: OLPC: Fix memleak in olpc_ec_probe
parents 165563c0 720ef73d

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -18890,10 +18890,10 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/mm 
F:	arch/x86/mm/















X86 PLATFORM DRIVERS













M:	Darren Hart <dvhart@infradead.org>













M:	Andy Shevchenko <andy@infradead.org>













M:	Hans de Goede <hdegoede@redhat.com>













M:	Mark Gross <mgross@linux.intel.com>















L:	platform-driver-x86@vger.kernel.org













S:	Odd Fixes













S:	Maintained















T:	git git://git.infradead.org/linux-platform-drivers-x86.git















F:	drivers/platform/olpc/















F:	drivers/platform/x86/

























drivers/platform/olpc/olpc-ec.c



+3
−1






























Original line number
Diff line number
Diff line








@@ -439,7 +439,9 @@ static int olpc_ec_probe(struct platform_device *pdev)













								&config);















	if (IS_ERR(ec->dcon_rdev)) {















		dev_err(&pdev->dev, "failed to register DCON regulator\n");













		return PTR_ERR(ec->dcon_rdev);













		err = PTR_ERR(ec->dcon_rdev);













		kfree(ec);













		return err;















	}































	ec->dbgfs_dir = olpc_ec_setup_debugfs();

































drivers/platform/x86/Kconfig



+2
−0






























Original line number
Diff line number
Diff line








@@ -469,6 +469,7 @@ config FUJITSU_LAPTOP













	depends on BACKLIGHT_CLASS_DEVICE















	depends on ACPI_VIDEO || ACPI_VIDEO = n















	select INPUT_SPARSEKMAP













	select NEW_LEDS















	select LEDS_CLASS















	help















	  This is a driver for laptops built by Fujitsu:










@@ -1112,6 +1113,7 @@ config LG_LAPTOP













	depends on ACPI_WMI















	depends on INPUT















	select INPUT_SPARSEKMAP













	select NEW_LEDS















	select LEDS_CLASS















	help















	 This driver adds support for hotkeys as well as control of keyboard

































drivers/platform/x86/asus-nb-wmi.c



+0
−24






























Original line number
Diff line number
Diff line








@@ -593,33 +593,9 @@ static struct asus_wmi_driver asus_nb_wmi_driver = {













	.detect_quirks = asus_nb_wmi_quirks,















};





























static const struct dmi_system_id asus_nb_wmi_blacklist[] __initconst = {













	{













		/*













		 * asus-nb-wm adds no functionality. The T100TA has a detachable













		 * USB kbd, so no hotkeys and it has no WMI rfkill; and loading













		 * asus-nb-wm causes the camera LED to turn and _stay_ on.













		 */













		.matches = {













			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),













			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100TA"),













		},













	},













	{













		/* The Asus T200TA has the same issue as the T100TA */













		.matches = {













			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),













			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T200TA"),













		},













	},













	{} /* Terminating entry */













};































static int __init asus_nb_wmi_init(void)















{













	if (dmi_check_system(asus_nb_wmi_blacklist))













		return -ENODEV;





























	return asus_wmi_register_driver(&asus_nb_wmi_driver);















}

















































drivers/platform/x86/asus-wmi.c



+1
−0






























Original line number
Diff line number
Diff line








@@ -442,6 +442,7 @@ static int asus_wmi_battery_add(struct power_supply *battery)













	 */















	if (strcmp(battery->desc->name, "BAT0") != 0 &&















	    strcmp(battery->desc->name, "BAT1") != 0 &&













	    strcmp(battery->desc->name, "BATC") != 0 &&















	    strcmp(battery->desc->name, "BATT") != 0)















		return -ENODEV;

























































































CRA Git | Maintained and supported by SUSTech CRA and CCSE