Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86

Pull x86 platform driver updates from Matthew Garrett:
 "Some significant improvements for the Sony driver on newer machines,
  but other than that mostly just minor fixes and a patch to remove the
  broken rfkill code from the Dell driver."

* 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86: (35 commits)
  apple-gmux: Fix up the suspend/resume patch
  dell-laptop: Remove rfkill code
  toshiba_acpi: Fix mis-merge
  dell-laptop: Add touchpad led support for Dell V3450
  acer-wmi: add 3 laptops to video backlight vendor mode quirk table
  sony-laptop: add touchpad enable/disable function
  sony-laptop: add missing Fn key combos for 0x100 handlers
  sony-laptop: add support for more WWAN modems
  sony-laptop: new keyboard backlight handle
  sony-laptop: add high speed battery charging function
  sony-laptop: support automatic resume on lid open
  sony-laptop: adjust error handling in finding SNC handles
  sony-laptop: add thermal profiles support
  sony-laptop: support battery care functions
  sony-laptop: additional debug statements
  sony-laptop: improve SNC initialization and acpi notify callback code
  sony-laptop: use kstrtoul to parse sysfs values
  sony-laptop: generalise ACPI calls into SNC functions
  sony-laptop: fix return path when no ACPI buffer is allocated
  sony-laptop: use soft rfkill status stored in hw
  ...

11 files changed, 1416 insertions, 629 deletions

diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index c1a3fd8e1243..ce875dc365e5 100644
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -523,6 +523,30 @@ static const struct dmi_system_id video_vendor_dmi_table[] = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4750"),
                 },
         },
+        {
+                .callback = video_set_backlight_video_vendor,
+                .ident = "Acer Extensa 5235",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Extensa 5235"),
+                },
+        },
+        {
+                .callback = video_set_backlight_video_vendor,
+                .ident = "Acer TravelMate 5760",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 5760"),
+                },
+        },
+        {
+                .callback = video_set_backlight_video_vendor,
+                .ident = "Acer Aspire 5750",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5750"),
+                },
+        },
         {}
 };
 
diff --git a/drivers/platform/x86/apple-gmux.c b/drivers/platform/x86/apple-gmux.c
index 8a582bdfdc76..694a15a56230 100644
--- a/drivers/platform/x86/apple-gmux.c
+++ b/drivers/platform/x86/apple-gmux.c
@@ -87,6 +87,9 @@ static int gmux_update_status(struct backlight_device *bd)
         struct apple_gmux_data *gmux_data = bl_get_data(bd);
         u32 brightness = bd->props.brightness;
 
+        if (bd->props.state & BL_CORE_SUSPENDED)
+                return 0;
+
         /*
          * Older gmux versions require writing out lower bytes first then
          * setting the upper byte to 0 to flush the values. Newer versions
@@ -102,6 +105,7 @@ static int gmux_update_status(struct backlight_device *bd)
 }
 
 static const struct backlight_ops gmux_bl_ops = {
+        .options = BL_CORE_SUSPENDRESUME,
         .get_brightness = gmux_get_brightness,
         .update_status = gmux_update_status,
 };
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
index e6c08ee8d46c..5f78aac9b163 100644
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -21,7 +21,6 @@
 #include <linux/err.h>
 #include <linux/dmi.h>
 #include <linux/io.h>
-#include <linux/rfkill.h>
 #include <linux/power_supply.h>
 #include <linux/acpi.h>
 #include <linux/mm.h>
@@ -90,11 +89,8 @@ static struct platform_driver platform_driver = {
 
 static struct platform_device *platform_device;
 static struct backlight_device *dell_backlight_device;
-static struct rfkill *wifi_rfkill;
-static struct rfkill *bluetooth_rfkill;
-static struct rfkill *wwan_rfkill;
 
-static const struct dmi_system_id __initdata dell_device_table[] = {
+static const struct dmi_system_id dell_device_table[] __initconst = {
         {
                 .ident = "Dell laptop",
                 .matches = {
@@ -119,96 +115,94 @@ static const struct dmi_system_id __initdata dell_device_table[] = {
 };
 MODULE_DEVICE_TABLE(dmi, dell_device_table);
 
-static struct dmi_system_id __devinitdata dell_blacklist[] = {
-        /* Supported by compal-laptop */
-        {
-                .ident = "Dell Mini 9",
-                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 910"),
-                },
-        },
+static struct dmi_system_id __devinitdata dell_quirks[] = {
         {
-                .ident = "Dell Mini 10",
+                .callback = dmi_matched,
+                .ident = "Dell Vostro V130",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1010"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V130"),
                 },
+                .driver_data = &quirk_dell_vostro_v130,
         },
         {
-                .ident = "Dell Mini 10v",
+                .callback = dmi_matched,
+                .ident = "Dell Vostro V131",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1011"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V131"),
                 },
+                .driver_data = &quirk_dell_vostro_v130,
         },
         {
-                .ident = "Dell Mini 1012",
+                .callback = dmi_matched,
+                .ident = "Dell Vostro 3350",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1012"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 3350"),
                 },
+                .driver_data = &quirk_dell_vostro_v130,
         },
         {
-                .ident = "Dell Inspiron 11z",
+                .callback = dmi_matched,
+                .ident = "Dell Vostro 3555",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1110"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 3555"),
                 },
+                .driver_data = &quirk_dell_vostro_v130,
         },
         {
-                .ident = "Dell Mini 12",
+                .callback = dmi_matched,
+                .ident = "Dell Inspiron N311z",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1210"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron