Merge tag 'v3.14-rc4' into next

Merge with Linux 3.14-rc4 to bring devm_request_any_context_irq().

11 files changed, 57 insertions, 31 deletions

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 692435a321af..1c4c0db05550 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -1909,6 +1909,10 @@ void input_set_capability(struct input_dev *dev, unsigned int type, unsigned int
                 break;
 
         case EV_ABS:
+                input_alloc_absinfo(dev);
+                if (!dev->absinfo)
+                        return;
+
                 __set_bit(code, dev->absbit);
                 break;
 
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 618ea0acb86f..603fe0dd3682 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -124,6 +124,8 @@ static const struct xpad_device {
         { 0x045e, 0x0291, "Xbox 360 Wireless Receiver (XBOX)", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W },
         { 0x045e, 0x0719, "Xbox 360 Wireless Receiver", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W },
         { 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX },
+        { 0x046d, 0xc21d, "Logitech Gamepad F310", 0, XTYPE_XBOX360 },
+        { 0x046d, 0xc21f, "Logitech Gamepad F710", 0, XTYPE_XBOX360 },
         { 0x046d, 0xc242, "Logitech Chillstream Controller", 0, XTYPE_XBOX360 },
         { 0x046d, 0xca84, "Logitech Xbox Cordless Controller", 0, XTYPE_XBOX },
         { 0x046d, 0xca88, "Logitech Compact Controller for Xbox", 0, XTYPE_XBOX },
@@ -165,8 +167,8 @@ static const struct xpad_device {
         { 0x1430, 0x4748, "RedOctane Guitar Hero X-plorer", 0, XTYPE_XBOX360 },
         { 0x1430, 0x8888, "TX6500+ Dance Pad (first generation)", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
         { 0x146b, 0x0601, "BigBen Interactive XBOX 360 Controller", 0, XTYPE_XBOX360 },
-        { 0x1689, 0xfd00, "Razer Onza Tournament Edition", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },
-        { 0x1689, 0xfd01, "Razer Onza Classic Edition", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },
+        { 0x1689, 0xfd00, "Razer Onza Tournament Edition", 0, XTYPE_XBOX360 },
+        { 0x1689, 0xfd01, "Razer Onza Classic Edition", 0, XTYPE_XBOX360 },
         { 0x1bad, 0x0002, "Harmonix Rock Band Guitar", 0, XTYPE_XBOX360 },
         { 0x1bad, 0x0003, "Harmonix Rock Band Drumkit", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },
         { 0x1bad, 0xf016, "Mad Catz Xbox 360 Controller", 0, XTYPE_XBOX360 },
diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c
index 8508879f6faf..9757a58bc897 100644
--- a/drivers/input/keyboard/tegra-kbc.c
+++ b/drivers/input/keyboard/tegra-kbc.c
@@ -31,7 +31,7 @@
 #include <linux/clk.h>
 #include <linux/slab.h>
 #include <linux/input/matrix_keypad.h>
-#include <linux/clk/tegra.h>
+#include <linux/reset.h>
 #include <linux/err.h>
 
 #define KBC_MAX_KPENT   8
@@ -116,6 +116,7 @@ struct tegra_kbc {
         u32 wakeup_key;
         struct timer_list timer;
         struct clk *clk;
+        struct reset_control *rst;
         const struct tegra_kbc_hw_support *hw_support;
         int max_keys;
         int num_rows_and_columns;
@@ -373,9 +374,9 @@ static int tegra_kbc_start(struct tegra_kbc *kbc)
         clk_prepare_enable(kbc->clk);
 
         /* Reset the KBC controller to clear all previous status.*/
-        tegra_periph_reset_assert(kbc->clk);
+        reset_control_assert(kbc->rst);
         udelay(100);
-        tegra_periph_reset_deassert(kbc->clk);
+        reset_control_assert(kbc->rst);
         udelay(100);
 
         tegra_kbc_config_pins(kbc);
@@ -663,6 +664,12 @@ static int tegra_kbc_probe(struct platform_device *pdev)
                 return PTR_ERR(kbc->clk);
         }
 
+        kbc->rst = devm_reset_control_get(&pdev->dev, "kbc");
+        if (IS_ERR(kbc->rst)) {
+                dev_err(&pdev->dev, "failed to get keyboard reset\n");
+                return PTR_ERR(kbc->rst);
+        }
+
         /*
          * The time delay between two consecutive reads of the FIFO is
          * the sum of the repeat time and the time taken for scanning
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 4ffc39732513..7904ab05527a 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -168,7 +168,7 @@ config INPUT_MAX8997_HAPTIC
 
 config INPUT_MC13783_PWRBUTTON
         tristate "MC13783 ON buttons"
-        depends on MFD_MC13783
+        depends on MFD_MC13XXX
         help
           Support the ON buttons of MC13783 PMIC as an input device
           reporting power button status.
diff --git a/drivers/input/misc/atlas_btns.c b/drivers/input/misc/atlas_btns.c
index c0c5b63af90a..638165c78e75 100644
--- a/drivers/input/misc/atlas_btns.c
+++ b/drivers/input/misc/atlas_btns.c
@@ -27,8 +27,8 @@
 #include <linux/module.h>
 #include <linux/input.h>
 #include <linux/types.h>
+#include <linux/acpi.h>
 #include <asm/uaccess.h>
-#include <acpi/acpi_drivers.h>
 
 #define ACPI_ATLAS_NAME         "Atlas ACPI"
 #define ACPI_ATLAS_CLASS        "Atlas"
diff --git a/drivers/input/misc/xen-kbdfront.c b/drivers/input/misc/xen-kbdfront.c
index e21c1816a8f9..fbfdc10573be 100644
--- a/drivers/input/misc/xen-kbdfront.c
+++ b/drivers/input/misc/xen-kbdfront.c
@@ -29,6 +29,7 @@
 #include <xen/interface/io/fbif.h>
 #include <xen/interface/io/kbdif.h>
 #include <xen/xenbus.h>
+#include <xen/platform_pci.h>
 
 struct xenkbd_info {
         struct input_dev *kbd;
@@ -380,6 +381,9 @@ static int __init xenkbd_init(void)
         if (xen_initial_domain())
                 return -ENODEV;
 
+        if (!xen_has_pv_devices())
+                return -ENODEV;
+
         return xenbus_register_frontend(&xenkbd_driver);
 }
 
diff --git a/drivers/input/serio/ambakmi.c b/drivers/input/serio/ambakmi.c
index 3e3776c7bd21..762b08432de0 100644
--- a/drivers/input/serio/ambakmi.c
+++ b/drivers/input/serio/ambakmi.c
@@ -166,8 +166,6 @@ static int amba_kmi_remove(struct amba_device *dev)
 {
         struct amba_kmi_port *kmi = amba_get_drvdata(dev);
 
-        amba_set_drvdata(dev, NULL);
-
         serio_unregister_port(kmi->io);
         clk_put(kmi->clk);
         iounmap(kmi->base);
diff --git a/drivers/input/serio/serport.c b/drivers/input/serio/serport.c
index 8755f5f3ad37..0cb7ef59071b 100644
--- a/drivers/input/serio/serport.c
+++ b/drivers/input/serio/serport.c
@@ -124,7 +124,7 @@ static void serport_ldisc_receive(struct tty_struct *tty, const unsigned char *c
 {
         struct serport *serport = (struct serport*) tty->disc_data;
         unsigned long flags;
-        unsigned int ch_flags;
+        unsigned int ch_flags = 0;
         int i;
 
         spin_lock_irqsave(&serport->lock, flags);
@@ -133,18 +133,20 @@ static void serport_ldisc_receive(struct tty_struct *tty, const unsigned char *c
                 goto out;
 
         for (i = 0; i < count; i++) {
-                switch (fp[i]) {
-                case TTY_FRAME:
-                        ch_flags = SERIO_FRAME;
-                        break;
-
-                case TTY_PARITY:
-                        ch_flags = SERIO_PARITY;
-                        break;
-
-                default:
-                        ch_flags = 0;
-                        break;
+                if (fp) {
+                        switch (fp[i]) {
+                        case TTY_FRAME:
+                                ch_flags = SERIO_FRAME;
+                                break;
+
+                        case TTY_PARITY:
+                                ch_flags = SERIO_PARITY;
+                                break;
+
+                        default:
+                                ch_flags = 0;
+                                break;
+                        }
                 }
 
                 serio_interrupt(serport->serio, cp[i], ch_flags);
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 961d58d32647..07e9e82029d1 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -717,7 +717,7 @@ config TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_MC13783
         tristate "Freescale MC13783 touchscreen input driver"
-        depends on MFD_MC13783
+        depends on MFD_MC13XXX
         help
           Say Y here if you have an Freescale MC13783 PMIC on your
           board and want to use its touchscreen
diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c
index 6c9cd1268dc3..4e793a17361f 100644
--- a/drivers/input/touchscreen/ti_am335x_tsc.c
+++ b/drivers/input/touchscreen/ti_am335x_tsc.c
@@ -197,7 +197,7 @@ static void titsc_step_config(struct titsc *ts_dev)
         /* The steps1 … end and bit 0 for TS_Charge */
         stepenable = (1 << (end_step + 2)) - 1;
         ts_dev->step_mask = stepenable;
-        am335x_tsc_se_set(ts_dev->mfd_tscadc, ts_dev->step_mask);
+        am335x_tsc_se_set_cache(ts_dev->mfd_tscadc, ts_dev->step_mask);
 }
 
 static void titsc_read_coordinates(struct titsc *ts_dev,
@@ -321,7 +321,7 @@ static irqreturn_t titsc_irq(int irq, void *dev)
 
         if (irqclr) {
                 titsc_writel(ts_dev, REG_IRQSTATUS, irqclr);
-                am335x_tsc_se_set(ts_dev->mfd_tscadc, ts_dev->step_mask);
+                am335x_tsc_se_set_cache(ts_dev->mfd_tscadc, ts_dev->step_mask);
                 return IRQ_HANDLED;
         }
         return IRQ_NONE;
diff --git a/drivers/input/touchscreen/zforce_ts.c b/drivers/input/touchscreen/zforce_ts.c
index bdc936cb8445..01d30cedde46 100644
--- a/drivers/input/touchscreen/zforce_ts.c
+++ b/drivers/input/touchscreen/zforce_ts.c
@@ -461,7 +461,18 @@ static void zforce_complete(struct zforce_ts *ts, int cmd, int result)
         }
 }
 
-static irqreturn_t zforce_interrupt(int irq, void *dev_id)
+static irqreturn_t zforce_irq(int irq, void *dev_id)
+{
+        struct zforce_ts *ts = dev_id;
+        struct i2c_client *client = ts->client;
+
+        if (ts->suspended && device_may_wakeup(&client->dev))
+                pm_wakeup_event(&client->dev, 500);
+
+        return IRQ_WAKE_THREAD;
+}
+
+static irqreturn_t zforce_irq_thread(int irq, void *dev_id)
 {
         struct zforce_ts *ts = dev_id;
         struct i2c_client *client = ts->client;
@@ -471,12 +482,10 @@ static irqreturn_t zforce_interrupt(int irq, void *dev_id)
         u8 *payload;
 
         /*
-         * When suspended, emit a wakeup signal if necessary and return.
+         * When still suspended, return.
          * Due to the level-interrupt we will get re-triggered later.
          */
         if (ts->suspended) {
-                if (device_may_wakeup(&client->dev))
-                        pm_wakeup_event(&client->dev, 500);
                 msleep(20);
                 return IRQ_HANDLED;
         }
@@ -814,8 +823,8 @@ static int zforce_probe(struct i2c_client *client,
          * Therefore we can trigger the interrupt anytime it is low and do
          * not need to limit it to the interrupt edge.
          */
-        ret = devm_request_threaded_irq(&client->dev, client->irq, NULL,
-                                        zforce_interrupt,
+        ret = devm_request_threaded_irq(&client->dev, client->irq,
+                                        zforce_irq, zforce_irq_thread,
                                         IRQF_TRIGGER_LOW | IRQF_ONESHOT,
                                         input_dev->name, ts);
         if (ret) {