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

Pull x86 platform driver fixes from Andy Shevchenko:

 - fix a couple of Mellanox driver enumeration issues

 - fix ASUS laptop regression with backlight

 - fix Dell computers that got a wrong mode (tablet versus laptop) after
   resume

* tag 'platform-drivers-x86-v5.2-3' of git://git.infradead.org/linux-platform-drivers-x86:
  platform/mellanox: mlxreg-hotplug: Add devm_free_irq call to remove flow
  platform/x86: mlx-platform: Fix parent device in i2c-mux-reg device registration
  platform/x86: intel-vbtn: Report switch events when event wakes device
  platform/x86: asus-wmi: Only Tell EC the OS will handle display hotkeys from asus_nb_wmi

6 files changed, 26 insertions, 4 deletions

diff --git a/drivers/platform/mellanox/mlxreg-hotplug.c b/drivers/platform/mellanox/mlxreg-hotplug.c
index 687ce6817d0d..f85a1b9d129b 100644
--- a/drivers/platform/mellanox/mlxreg-hotplug.c
+++ b/drivers/platform/mellanox/mlxreg-hotplug.c
@@ -694,6 +694,7 @@ static int mlxreg_hotplug_remove(struct platform_device *pdev)
 
         /* Clean interrupts setup. */
         mlxreg_hotplug_unset_irq(priv);
+        devm_free_irq(&pdev->dev, priv->irq, priv);
 
         return 0;
 }
diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c
index 81642102bf65..8d9e30dbb5af 100644
--- a/drivers/platform/x86/asus-nb-wmi.c
+++ b/drivers/platform/x86/asus-nb-wmi.c
@@ -65,10 +65,12 @@ static bool asus_q500a_i8042_filter(unsigned char data, unsigned char str,
 
 static struct quirk_entry quirk_asus_unknown = {
         .wapf = 0,
+        .wmi_backlight_set_devstate = true,
 };
 
 static struct quirk_entry quirk_asus_q500a = {
         .i8042_filter = asus_q500a_i8042_filter,
+        .wmi_backlight_set_devstate = true,
 };
 
 /*
@@ -79,26 +81,32 @@ static struct quirk_entry quirk_asus_q500a = {
 static struct quirk_entry quirk_asus_x55u = {
         .wapf = 4,
         .wmi_backlight_power = true,
+        .wmi_backlight_set_devstate = true,
         .no_display_toggle = true,
 };
 
 static struct quirk_entry quirk_asus_wapf4 = {
         .wapf = 4,
+        .wmi_backlight_set_devstate = true,
 };
 
 static struct quirk_entry quirk_asus_x200ca = {
         .wapf = 2,
+        .wmi_backlight_set_devstate = true,
 };
 
 static struct quirk_entry quirk_asus_ux303ub = {
         .wmi_backlight_native = true,
+        .wmi_backlight_set_devstate = true,
 };
 
 static struct quirk_entry quirk_asus_x550lb = {
+        .wmi_backlight_set_devstate = true,
         .xusb2pr = 0x01D9,
 };
 
 static struct quirk_entry quirk_asus_forceals = {
+        .wmi_backlight_set_devstate = true,
         .wmi_force_als_set = true,
 };
 
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index 3e4336025e8f..9b18a184e0aa 100644
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -2146,7 +2146,7 @@ static int asus_wmi_add(struct platform_device *pdev)
                 err = asus_wmi_backlight_init(asus);
                 if (err && err != -ENODEV)
                         goto fail_backlight;
-        } else
+        } else if (asus->driver->quirks->wmi_backlight_set_devstate)
                 err = asus_wmi_set_devstate(ASUS_WMI_DEVID_BACKLIGHT, 2, NULL);
 
         if (asus_wmi_has_fnlock_key(asus)) {
diff --git a/drivers/platform/x86/asus-wmi.h b/drivers/platform/x86/asus-wmi.h
index 0930be770688..4f31b68642a0 100644
--- a/drivers/platform/x86/asus-wmi.h
+++ b/drivers/platform/x86/asus-wmi.h
@@ -31,6 +31,7 @@ struct quirk_entry {
         bool store_backlight_power;
         bool wmi_backlight_power;
         bool wmi_backlight_native;
+        bool wmi_backlight_set_devstate;
         bool wmi_force_als_set;
         int wapf;
         /*
diff --git a/drivers/platform/x86/intel-vbtn.c b/drivers/platform/x86/intel-vbtn.c
index 06cd7e818ed5..a0d0cecff55f 100644
--- a/drivers/platform/x86/intel-vbtn.c
+++ b/drivers/platform/x86/intel-vbtn.c
@@ -76,12 +76,24 @@ static void notify_handler(acpi_handle handle, u32 event, void *context)
         struct platform_device *device = context;
         struct intel_vbtn_priv *priv = dev_get_drvdata(&device->dev);
         unsigned int val = !(event & 1); /* Even=press, Odd=release */
-        const struct key_entry *ke_rel;
+        const struct key_entry *ke, *ke_rel;
         bool autorelease;
 
         if (priv->wakeup_mode) {
-                if (sparse_keymap_entry_from_scancode(priv->input_dev, event)) {
+                ke = sparse_keymap_entry_from_scancode(priv->input_dev, event);
+                if (ke) {
                         pm_wakeup_hard_event(&device->dev);
+
+                        /*
+                         * Switch events like tablet mode will wake the device
+                         * and report the new switch position to the input
+                         * subsystem.
+                         */
+                        if (ke->type == KE_SW)
+                                sparse_keymap_report_event(priv->input_dev,
+                                                           event,
+                                                           val,
+                                                           0);
                         return;
                 }
                 goto out_unknown;
diff --git a/drivers/platform/x86/mlx-platform.c b/drivers/platform/x86/mlx-platform.c
index cee039f57499..983f02b5b106 100644
--- a/drivers/platform/x86/mlx-platform.c
+++ b/drivers/platform/x86/mlx-platform.c
@@ -2032,7 +2032,7 @@ static int __init mlxplat_init(void)
 
         for (i = 0; i < ARRAY_SIZE(mlxplat_mux_data); i++) {
                 priv->pdev_mux[i] = platform_device_register_resndata(
-                                                &mlxplat_dev->dev,
+                                                &priv->pdev_i2c->dev,
                                                 "i2c-mux-reg", i, NULL,
                                                 0, &mlxplat_mux_data[i],
                                                 sizeof(mlxplat_mux_data[i]));