Merge branch 'next' into for-linus

Merge first round of changes for 3.13 merge window.

9 files changed, 43 insertions, 38 deletions

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 269d4c3658cb..bb174c1a9886 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -2,7 +2,7 @@
 # Input core configuration
 #
 menuconfig INPUT_KEYBOARD
-        bool "Keyboards" if EXPERT || !X86
+        bool "Keyboards"
         default y
         help
           Say Y here, and a list of supported keyboards will be displayed.
@@ -67,7 +67,7 @@ config KEYBOARD_ATARI
           module will be called atakbd.
 
 config KEYBOARD_ATKBD
-        tristate "AT keyboard" if EXPERT || !X86
+        tristate "AT keyboard"
         default y
         select SERIO
         select SERIO_LIBPS2
@@ -224,7 +224,7 @@ config KEYBOARD_TCA6416
 
 config KEYBOARD_TCA8418
         tristate "TCA8418 Keypad Support"
-        depends on I2C && GENERIC_HARDIRQS
+        depends on I2C
         select INPUT_MATRIXKMAP
         help
           This driver implements basic keypad functionality
@@ -303,7 +303,7 @@ config KEYBOARD_HP7XX
 
 config KEYBOARD_LM8323
         tristate "LM8323 keypad chip"
-        depends on I2C && GENERIC_HARDIRQS
+        depends on I2C
         depends on LEDS_CLASS
         help
           If you say yes here you get support for the National Semiconductor
@@ -525,7 +525,7 @@ config KEYBOARD_SUNKBD
 
 config KEYBOARD_SH_KEYSC
         tristate "SuperH KEYSC keypad support"
-        depends on SUPERH || ARCH_SHMOBILE
+        depends on SUPERH || ARM || COMPILE_TEST
         help
           Say Y here if you want to use a keypad attached to the KEYSC block
           on SuperH processors such as sh7722 and sh7343.
diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c
index 49557f27bfa6..7e8b0a52af25 100644
--- a/drivers/input/keyboard/cros_ec_keyb.c
+++ b/drivers/input/keyboard/cros_ec_keyb.c
@@ -206,33 +206,6 @@ static int cros_ec_keyb_work(struct notifier_block *nb,
         return NOTIFY_DONE;
 }
 
-/* Clear any keys in the buffer */
-static void cros_ec_keyb_clear_keyboard(struct cros_ec_keyb *ckdev)
-{
-        uint8_t old_state[ckdev->cols];
-        uint8_t new_state[ckdev->cols];
-        unsigned long duration;
-        int i, ret;
-
-        /*
-         * Keep reading until we see that the scan state does not change.
-         * That indicates that we are done.
-         *
-         * Assume that the EC keyscan buffer is at most 32 deep.
-         */
-        duration = jiffies;
-        ret = cros_ec_keyb_get_state(ckdev, new_state);
-        for (i = 1; !ret && i < 32; i++) {
-                memcpy(old_state, new_state, sizeof(old_state));
-                ret = cros_ec_keyb_get_state(ckdev, new_state);
-                if (0 == memcmp(old_state, new_state, sizeof(old_state)))
-                        break;
-        }
-        duration = jiffies - duration;
-        dev_info(ckdev->dev, "Discarded %d keyscan(s) in %dus\n", i,
-                jiffies_to_usecs(duration));
-}
-
 static int cros_ec_keyb_probe(struct platform_device *pdev)
 {
         struct cros_ec_device *ec = dev_get_drvdata(pdev->dev.parent);
@@ -299,6 +272,33 @@ static int cros_ec_keyb_probe(struct platform_device *pdev)
 }
 
 #ifdef CONFIG_PM_SLEEP
+/* Clear any keys in the buffer */
+static void cros_ec_keyb_clear_keyboard(struct cros_ec_keyb *ckdev)
+{
+        uint8_t old_state[ckdev->cols];
+        uint8_t new_state[ckdev->cols];
+        unsigned long duration;
+        int i, ret;
+
+        /*
+         * Keep reading until we see that the scan state does not change.
+         * That indicates that we are done.
+         *
+         * Assume that the EC keyscan buffer is at most 32 deep.
+         */
+        duration = jiffies;
+        ret = cros_ec_keyb_get_state(ckdev, new_state);
+        for (i = 1; !ret && i < 32; i++) {
+                memcpy(old_state, new_state, sizeof(old_state));
+                ret = cros_ec_keyb_get_state(ckdev, new_state);
+                if (0 == memcmp(old_state, new_state, sizeof(old_state)))
+                        break;
+        }
+        duration = jiffies - duration;
+        dev_info(ckdev->dev, "Discarded %d keyscan(s) in %dus\n", i,
+                jiffies_to_usecs(duration));
+}
+
 static int cros_ec_keyb_resume(struct device *dev)
 {
         struct cros_ec_keyb *ckdev = dev_get_drvdata(dev);
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index 440ce32462ba..2db13246eb8e 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -26,6 +26,7 @@
 #include <linux/gpio_keys.h>
 #include <linux/workqueue.h>
 #include <linux/gpio.h>
+#include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/of_gpio.h>
 #include <linux/spinlock.h>
diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c
index cd5ed9e22168..4e428199e580 100644
--- a/drivers/input/keyboard/gpio_keys_polled.c
+++ b/drivers/input/keyboard/gpio_keys_polled.c
@@ -25,6 +25,7 @@
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
 #include <linux/gpio_keys.h>
+#include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/of_gpio.h>
 
diff --git a/drivers/input/keyboard/lpc32xx-keys.c b/drivers/input/keyboard/lpc32xx-keys.c
index 42181435fe67..8b1b01361ec6 100644
--- a/drivers/input/keyboard/lpc32xx-keys.c
+++ b/drivers/input/keyboard/lpc32xx-keys.c
@@ -383,7 +383,7 @@ static struct platform_driver lpc32xx_kscan_driver = {
                 .name   = DRV_NAME,
                 .owner  = THIS_MODULE,
                 .pm     = &lpc32xx_kscan_pm_ops,
-                .of_match_table = of_match_ptr(lpc32xx_kscan_match),
+                .of_match_table = lpc32xx_kscan_match,
         }
 };
 
diff --git a/drivers/input/keyboard/nspire-keypad.c b/drivers/input/keyboard/nspire-keypad.c
index b3e3edab6d9f..b31064981e96 100644
--- a/drivers/input/keyboard/nspire-keypad.c
+++ b/drivers/input/keyboard/nspire-keypad.c
@@ -143,8 +143,10 @@ static int nspire_keypad_open(struct input_dev *input)
                 return error;
 
         error = nspire_keypad_chip_init(keypad);
-        if (error)
+        if (error) {
+                clk_disable_unprepare(keypad->clk);
                 return error;
+        }
 
         return 0;
 }
@@ -267,7 +269,7 @@ static struct platform_driver nspire_keypad_driver = {
         .driver = {
                 .name = "nspire-keypad",
                 .owner = THIS_MODULE,
-                .of_match_table = of_match_ptr(nspire_keypad_dt_match),
+                .of_match_table = nspire_keypad_dt_match,
         },
         .probe = nspire_keypad_probe,
 };
diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c
index a2e758d27584..186138c720c7 100644
--- a/drivers/input/keyboard/pxa27x_keypad.c
+++ b/drivers/input/keyboard/pxa27x_keypad.c
@@ -27,6 +27,7 @@
 #include <linux/err.h>
 #include <linux/input/matrix_keypad.h>
 #include <linux/slab.h>
+#include <linux/of.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c
index 9cd20e6905a0..8508879f6faf 100644
--- a/drivers/input/keyboard/tegra-kbc.c
+++ b/drivers/input/keyboard/tegra-kbc.c
@@ -614,7 +614,7 @@ static int tegra_kbc_probe(struct platform_device *pdev)
         unsigned int keymap_rows;
         const struct of_device_id *match;
 
-        match = of_match_device(of_match_ptr(tegra_kbc_of_match), &pdev->dev);
+        match = of_match_device(tegra_kbc_of_match, &pdev->dev);
 
         kbc = devm_kzalloc(&pdev->dev, sizeof(*kbc), GFP_KERNEL);
         if (!kbc) {
diff --git a/drivers/input/keyboard/tnetv107x-keypad.c b/drivers/input/keyboard/tnetv107x-keypad.c
index 5f7b427dd7ed..8bd24d52bf1b 100644
--- a/drivers/input/keyboard/tnetv107x-keypad.c
+++ b/drivers/input/keyboard/tnetv107x-keypad.c
@@ -60,8 +60,8 @@ struct keypad_data {
         struct clk                      *clk;
         struct device                   *dev;
         spinlock_t                      lock;
-        u32                             irq_press;
-        u32                             irq_release;
+        int                             irq_press;
+        int                             irq_release;
         int                             rows, cols, row_shift;
         int                             debounce_ms, active_low;
         u32                             prev_keys[3];