Merge tag 'v3.9-rc3' into next

Merge with mainline to bring in module_platform_driver_probe() and
devm_ioremap_resource().

3 files changed, 15 insertions, 4 deletions

diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index dbb170916dd1..aebfe3ecb945 100644
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -22,7 +22,7 @@ config SERIO_I8042
         tristate "i8042 PC Keyboard controller" if EXPERT || !X86
         default y
         depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \
-                   (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN
+                   (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN && !S390
         help
           i8042 is the chip over which the standard AT keyboard and PS/2
           mouse are connected to the computer. If you use these devices,
@@ -36,6 +36,7 @@ config SERIO_I8042
 config SERIO_SERPORT
         tristate "Serial port line discipline"
         default y
+        depends on TTY
         help
           Say Y here if you plan to use an input device (mouse, joystick,
           tablet, 6dof) that communicates over the RS232 serial (COM) port.
diff --git a/drivers/input/serio/arc_ps2.c b/drivers/input/serio/arc_ps2.c
index b571eb3e4efc..c52e3e589f72 100644
--- a/drivers/input/serio/arc_ps2.c
+++ b/drivers/input/serio/arc_ps2.c
@@ -8,6 +8,7 @@
  * Driver is originally developed by Pavel Sokolov <psokolov@synopsys.com>
  */
 
+#include <linux/err.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/input.h>
@@ -206,9 +207,9 @@ static int arc_ps2_probe(struct platform_device *pdev)
                 return -ENOMEM;
         }
 
-        arc_ps2->addr = devm_request_and_ioremap(&pdev->dev, res);
-        if (!arc_ps2->addr)
-                return -EBUSY;
+        arc_ps2->addr = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(arc_ps2->addr))
+                return PTR_ERR(arc_ps2->addr);
 
         dev_info(&pdev->dev, "irq = %d, address = 0x%p, ports = %i\n",
                  irq, arc_ps2->addr, ARC_PS2_PORTS);
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index d6cc77a53c7e..5f306f79da0c 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -921,6 +921,7 @@ static int __init i8042_platform_init(void)
         int retval;
 
 #ifdef CONFIG_X86
+        u8 a20_on = 0xdf;
         /* Just return if pre-detection shows no i8042 controller exist */
         if (!x86_platform.i8042_detect())
                 return -ENODEV;
@@ -960,6 +961,14 @@ static int __init i8042_platform_init(void)
 
         if (dmi_check_system(i8042_dmi_dritek_table))
                 i8042_dritek = true;
+
+        /*
+         * A20 was already enabled during early kernel init. But some buggy
+         * BIOSes (in MSI Laptops) require A20 to be enabled using 8042 to
+         * resume from S3. So we do it here and hope that nothing breaks.
+         */
+        i8042_command(&a20_on, 0x10d1);
+        i8042_command(NULL, 0x00ff);    /* Null command for SMM firmware */
 #endif /* CONFIG_X86 */
 
         return retval;