Merge commit 'v2.6.34-rc1' into for-linus

9 files changed, 418 insertions, 5 deletions

diff --git a/drivers/input/input-compat.h b/drivers/input/input-compat.h
index 47cd9eaee66a..4d8ea32e8a00 100644
--- a/drivers/input/input-compat.h
+++ b/drivers/input/input-compat.h
@@ -21,8 +21,6 @@
    you why the ifdefs are needed? Think about it again. -AK */
 #ifdef CONFIG_X86_64
 #  define INPUT_COMPAT_TEST is_compat_task()
-#elif defined(CONFIG_IA64)
-#  define INPUT_COMPAT_TEST IS_IA32_PROCESS(task_pt_regs(current))
 #elif defined(CONFIG_S390)
 #  define INPUT_COMPAT_TEST test_thread_flag(TIF_31BIT)
 #elif defined(CONFIG_MIPS)
diff --git a/drivers/input/misc/88pm860x_onkey.c b/drivers/input/misc/88pm860x_onkey.c
new file mode 100644
index 000000000000..69a48e8701b9
--- /dev/null
+++ b/drivers/input/misc/88pm860x_onkey.c
@@ -0,0 +1,155 @@
+/*
+ * 88pm860x_onkey.c - Marvell 88PM860x ONKEY driver
+ *
+ * Copyright (C) 2009-2010 Marvell International Ltd.
+ *      Haojian Zhuang <haojian.zhuang@marvell.com>
+ *
+ * This file is subject to the terms and conditions of the GNU General
+ * Public License. See the file "COPYING" in the main directory of this
+ * archive for more details.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/i2c.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/mfd/88pm860x.h>
+
+#define PM8607_WAKEUP           0x0b
+
+#define LONG_ONKEY_EN           (1 << 1)
+#define ONKEY_STATUS            (1 << 0)
+
+struct pm860x_onkey_info {
+        struct input_dev        *idev;
+        struct pm860x_chip      *chip;
+        struct i2c_client       *i2c;
+        struct device           *dev;
+        int                     irq;
+};
+
+/* 88PM860x gives us an interrupt when ONKEY is held */
+static irqreturn_t pm860x_onkey_handler(int irq, void *data)
+{
+        struct pm860x_onkey_info *info = data;
+        int ret;
+
+        ret = pm860x_reg_read(info->i2c, PM8607_STATUS_2);
+        ret &= ONKEY_STATUS;
+        input_report_key(info->idev, KEY_POWER, ret);
+        input_sync(info->idev);
+
+        /* Enable 8-second long onkey detection */
+        pm860x_set_bits(info->i2c, PM8607_WAKEUP, 3, LONG_ONKEY_EN);
+        return IRQ_HANDLED;
+}
+
+static int __devinit pm860x_onkey_probe(struct platform_device *pdev)
+{
+        struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);
+        struct pm860x_onkey_info *info;
+        int irq, ret;
+
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0) {
+                dev_err(&pdev->dev, "No IRQ resource!\n");
+                return -EINVAL;
+        }
+
+        info = kzalloc(sizeof(struct pm860x_onkey_info), GFP_KERNEL);
+        if (!info)
+                return -ENOMEM;
+        info->chip = chip;
+        info->i2c = (chip->id == CHIP_PM8607) ? chip->client : chip->companion;
+        info->dev = &pdev->dev;
+        info->irq = irq + chip->irq_base;
+
+        info->idev = input_allocate_device();
+        if (!info->idev) {
+                dev_err(chip->dev, "Failed to allocate input dev\n");
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        info->idev->name = "88pm860x_on";
+        info->idev->phys = "88pm860x_on/input0";
+        info->idev->id.bustype = BUS_I2C;
+        info->idev->dev.parent = &pdev->dev;
+        info->irq = irq;
+        info->idev->evbit[0] = BIT_MASK(EV_KEY);
+        info->idev->keybit[BIT_WORD(KEY_POWER)] = BIT_MASK(KEY_POWER);
+
+        ret = input_register_device(info->idev);
+        if (ret) {
+                dev_err(chip->dev, "Can't register input device: %d\n", ret);
+                goto out_reg;
+        }
+
+        ret = request_threaded_irq(info->irq, NULL, pm860x_onkey_handler,
+                                   IRQF_ONESHOT, "onkey", info);
+        if (ret < 0) {
+                dev_err(chip->dev, "Failed to request IRQ: #%d: %d\n",
+                        info->irq, ret);
+                goto out_irq;
+        }
+
+        platform_set_drvdata(pdev, info);
+        return 0;
+
+out_irq:
+        input_unregister_device(info->idev);
+        kfree(info);
+        return ret;
+
+out_reg:
+        input_free_device(info->idev);
+out:
+        kfree(info);
+        return ret;
+}
+
+static int __devexit pm860x_onkey_remove(struct platform_device *pdev)
+{
+        struct pm860x_onkey_info *info = platform_get_drvdata(pdev);
+
+        free_irq(info->irq, info);
+        input_unregister_device(info->idev);
+        kfree(info);
+        return 0;
+}
+
+static struct platform_driver pm860x_onkey_driver = {
+        .driver         = {
+                .name   = "88pm860x-onkey",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = pm860x_onkey_probe,
+        .remove         = __devexit_p(pm860x_onkey_remove),
+};
+
+static int __init pm860x_onkey_init(void)
+{
+        return platform_driver_register(&pm860x_onkey_driver);
+}
+module_init(pm860x_onkey_init);
+
+static void __exit pm860x_onkey_exit(void)
+{
+        platform_driver_unregister(&pm860x_onkey_driver);
+}
+module_exit(pm860x_onkey_exit);
+
+MODULE_DESCRIPTION("Marvell 88PM860x ONKEY driver");
+MODULE_AUTHOR("Haojian Zhuang <haojian.zhuang@marvell.com>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 16ec5233441c..7097bfe581d7 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -12,6 +12,16 @@ menuconfig INPUT_MISC
 
 if INPUT_MISC
 
+config INPUT_88PM860X_ONKEY
+        tristate "88PM860x ONKEY support"
+        depends on MFD_88PM860X
+        help
+          Support the ONKEY of Marvell 88PM860x PMICs as an input device
+          reporting power button status.
+
+          To compile this driver as a module, choose M here: the module
+          will be called 88pm860x_onkey.
+
 config INPUT_PCSPKR
         tristate "PC Speaker support"
         depends on PCSPKR_PLATFORM
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index a8b84854fb7b..b611615e24ad 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -4,6 +4,7 @@
 
 # Each configuration option enables a list of files.
 
+obj-$(CONFIG_INPUT_88PM860X_ONKEY)      += 88pm860x_onkey.o
 obj-$(CONFIG_INPUT_APANEL)              += apanel.o
 obj-$(CONFIG_INPUT_ATI_REMOTE)          += ati_remote.o
 obj-$(CONFIG_INPUT_ATI_REMOTE2)         += ati_remote2.o
diff --git a/drivers/input/misc/atlas_btns.c b/drivers/input/misc/atlas_btns.c
index 1b871917340a..dfaa9a045ed8 100644
--- a/drivers/input/misc/atlas_btns.c
+++ b/drivers/input/misc/atlas_btns.c
@@ -47,7 +47,7 @@ static acpi_status acpi_atlas_button_setup(acpi_handle region_handle,
 
 static acpi_status acpi_atlas_button_handler(u32 function,
                       acpi_physical_address address,
-                      u32 bit_width, acpi_integer *value,
+                      u32 bit_width, u64 *value,
                       void *handler_context, void *region_context)
 {
         acpi_status status;
diff --git a/drivers/input/touchscreen/88pm860x-ts.c b/drivers/input/touchscreen/88pm860x-ts.c
new file mode 100644
index 000000000000..286bb490a9f2
--- /dev/null
+++ b/drivers/input/touchscreen/88pm860x-ts.c
@@ -0,0 +1,236 @@
+/*
+ * Touchscreen driver for Marvell 88PM860x
+ *
+ * Copyright (C) 2009 Marvell International Ltd.
+ *      Haojian Zhuang <haojian.zhuang@marvell.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/i2c.h>
+#include <linux/input.h>
+#include <linux/mfd/88pm860x.h>
+
+#define MEAS_LEN                (8)
+#define ACCURATE_BIT            (12)
+
+/* touch register */
+#define MEAS_EN3                (0x52)
+
+#define MEAS_TSIX_1             (0x8D)
+#define MEAS_TSIX_2             (0x8E)
+#define MEAS_TSIY_1             (0x8F)
+#define MEAS_TSIY_2             (0x90)
+#define MEAS_TSIZ1_1            (0x91)
+#define MEAS_TSIZ1_2            (0x92)
+#define MEAS_TSIZ2_1            (0x93)
+#define MEAS_TSIZ2_2            (0x94)
+
+/* bit definitions of touch */
+#define MEAS_PD_EN              (1 << 3)
+#define MEAS_TSIX_EN            (1 << 4)
+#define MEAS_TSIY_EN            (1 << 5)
+#define MEAS_TSIZ1_EN           (1 << 6)
+#define MEAS_TSIZ2_EN           (1 << 7)
+
+struct pm860x_touch {
+        struct input_dev *idev;
+        struct i2c_client *i2c;
+        struct pm860x_chip *chip;
+        int irq;
+        int res_x;              /* resistor of Xplate */
+};
+
+static irqreturn_t pm860x_touch_handler(int irq, void *data)
+{
+        struct pm860x_touch *touch = data;
+        struct pm860x_chip *chip = touch->chip;
+        unsigned char buf[MEAS_LEN];
+        int x, y, pen_down;
+        int z1, z2, rt = 0;
+        int ret;
+
+        ret = pm860x_bulk_read(touch->i2c, MEAS_TSIX_1, MEAS_LEN, buf);
+        if (ret < 0)
+                goto out;
+
+        pen_down = buf[1] & (1 << 6);
+        x = ((buf[0] & 0xFF) << 4) | (buf[1] & 0x0F);
+        y = ((buf[2] & 0xFF) << 4) | (buf[3] & 0x0F);
+        z1 = ((buf[4] & 0xFF) << 4) | (buf[5] & 0x0F);
+        z2 = ((buf[6] & 0xFF) << 4) | (buf[7] & 0x0F);
+
+        if (pen_down) {
+                if ((x != 0) && (z1 != 0) && (touch->res_x != 0)) {
+                        rt = z2 / z1 - 1;
+                        rt = (rt * touch->res_x * x) >> ACCURATE_BIT;
+                        dev_dbg(chip->dev, "z1:%d, z2:%d, rt:%d\n",
+                                z1, z2, rt);
+                }
+                input_report_abs(touch->idev, ABS_X, x);
+                input_report_abs(touch->idev, ABS_Y, y);
+                input_report_abs(touch->idev, ABS_PRESSURE, rt);
+                input_report_key(touch->idev, BTN_TOUCH, 1);
+                dev_dbg(chip->dev, "pen down at [%d, %d].\n", x, y);
+        } else {
+                input_report_abs(touch->idev, ABS_PRESSURE, 0);
+                input_report_key(touch->idev, BTN_TOUCH, 0);
+                dev_dbg(chip->dev, "pen release\n");
+        }
+        input_sync(touch->idev);
+
+out:
+        return IRQ_HANDLED;
+}
+
+static int pm860x_touch_open(struct input_dev *dev)
+{
+        struct pm860x_touch *touch = input_get_drvdata(dev);
+        int data, ret;
+
+        data = MEAS_PD_EN | MEAS_TSIX_EN | MEAS_TSIY_EN
+                | MEAS_TSIZ1_EN | MEAS_TSIZ2_EN;
+        ret = pm860x_set_bits(touch->i2c, MEAS_EN3, data, data);
+        if (ret < 0)
+                goto out;
+        return 0;
+out:
+        return ret;
+}
+
+static void pm860x_touch_close(struct input_dev *dev)
+{
+        struct pm860x_touch *touch = input_get_drvdata(dev);
+        int data;
+
+        data = MEAS_PD_EN | MEAS_TSIX_EN | MEAS_TSIY_EN
+                | MEAS_TSIZ1_EN | MEAS_TSIZ2_EN;
+        pm860x_set_bits(touch->i2c, MEAS_EN3, data, 0);
+}
+
+static int __devinit pm860x_touch_probe(struct platform_device *pdev)
+{
+        struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);
+        struct pm860x_platform_data *pm860x_pdata =             \
+                                pdev->dev.parent->platform_data;
+        struct pm860x_touch_pdata *pdata = NULL;
+        struct pm860x_touch *touch;
+        int irq, ret;
+
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0) {
+                dev_err(&pdev->dev, "No IRQ resource!\n");
+                return -EINVAL;
+        }
+
+        if (!pm860x_pdata) {
+                dev_err(&pdev->dev, "platform data is missing\n");
+                return -EINVAL;
+        }
+
+        pdata = pm860x_pdata->touch;
+        if (!pdata) {
+                dev_err(&pdev->dev, "touchscreen data is missing\n");
+                return -EINVAL;
+        }
+
+        touch = kzalloc(sizeof(struct pm860x_touch), GFP_KERNEL);
+        if (touch == NULL)
+                return -ENOMEM;
+        dev_set_drvdata(&pdev->dev, touch);
+
+        touch->idev = input_allocate_device();
+        if (touch->idev == NULL) {
+                dev_err(&pdev->dev, "Failed to allocate input device!\n");
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        touch->idev->name = "88pm860x-touch";
+        touch->idev->phys = "88pm860x/input0";
+        touch->idev->id.bustype = BUS_I2C;
+        touch->idev->dev.parent = &pdev->dev;
+        touch->idev->open = pm860x_touch_open;
+        touch->idev->close = pm860x_touch_close;
+        touch->chip = chip;
+        touch->i2c = (chip->id == CHIP_PM8607) ? chip->client : chip->companion;
+        touch->irq = irq + chip->irq_base;
+        touch->res_x = pdata->res_x;
+        input_set_drvdata(touch->idev, touch);
+
+        ret = request_threaded_irq(touch->irq, NULL, pm860x_touch_handler,
+                                   IRQF_ONESHOT, "touch", touch);
+        if (ret < 0)
+                goto out_irq;
+
+        __set_bit(EV_ABS, touch->idev->evbit);
+        __set_bit(ABS_X, touch->idev->absbit);
+        __set_bit(ABS_Y, touch->idev->absbit);
+        __set_bit(ABS_PRESSURE, touch->idev->absbit);
+        __set_bit(EV_SYN, touch->idev->evbit);
+        __set_bit(EV_KEY, touch->idev->evbit);
+        __set_bit(BTN_TOUCH, touch->idev->keybit);
+
+        input_set_abs_params(touch->idev, ABS_X, 0, 1 << ACCURATE_BIT, 0, 0);
+        input_set_abs_params(touch->idev, ABS_Y, 0, 1 << ACCURATE_BIT, 0, 0);
+        input_set_abs_params(touch->idev, ABS_PRESSURE, 0, 1 << ACCURATE_BIT,
+                                0, 0);
+
+        ret = input_register_device(touch->idev);
+        if (ret < 0) {
+                dev_err(chip->dev, "Failed to register touch!\n");
+                goto out_rg;
+        }
+
+        platform_set_drvdata(pdev, touch);
+        return 0;
+out_rg:
+        free_irq(touch->irq, touch);
+out_irq:
+        input_free_device(touch->idev);
+out:
+        kfree(touch);
+        return ret;
+}
+
+static int __devexit pm860x_touch_remove(struct platform_device *pdev)
+{
+        struct pm860x_touch *touch = platform_get_drvdata(pdev);
+
+        input_unregister_device(touch->idev);
+        free_irq(touch->irq, touch);
+        platform_set_drvdata(pdev, NULL);
+        kfree(touch);
+        return 0;
+}
+
+static struct platform_driver pm860x_touch_driver = {
+        .driver = {
+                .name   = "88pm860x-touch",
+                .owner  = THIS_MODULE,
+        },
+        .probe  = pm860x_touch_probe,
+        .remove = __devexit_p(pm860x_touch_remove),
+};
+
+static int __init pm860x_touch_init(void)
+{
+        return platform_driver_register(&pm860x_touch_driver);
+}
+module_init(pm860x_touch_init);
+
+static void __exit pm860x_touch_exit(void)
+{
+        platform_driver_unregister(&pm860x_touch_driver);
+}
+module_exit(pm860x_touch_exit);
+
+MODULE_DESCRIPTION("Touchscreen driver for Marvell Semiconductor 88PM860x");
+MODULE_AUTHOR("Haojian Zhuang <haojian.zhuang@marvell.com>");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:88pm860x-touch");
+
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 6457e060ae49..7208654a94ae 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -11,6 +11,18 @@ menuconfig INPUT_TOUCHSCREEN
 
 if INPUT_TOUCHSCREEN
 
+config TOUCHSCREEN_88PM860X
+        tristate "Marvell 88PM860x touchscreen"
+        depends on MFD_88PM860X
+        help
+          Say Y here if you have a 88PM860x PMIC and want to enable
+          support for the built-in touchscreen.
+
+          If unsure, say N.
+
+          To compile this driver as a module, choose M here: the
+          module will be called 88pm860x-ts.
+
 config TOUCHSCREEN_ADS7846
         tristate "ADS7846/TSC2046 and ADS7843 based touchscreens"
         depends on SPI_MASTER
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
index d61a3b4def9a..7fef7d5cca23 100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -6,6 +6,7 @@
 
 wm97xx-ts-y := wm97xx-core.o
 
+obj-$(CONFIG_TOUCHSCREEN_88PM860X)      += 88pm860x-ts.o
 obj-$(CONFIG_TOUCHSCREEN_AD7877)        += ad7877.o
 obj-$(CONFIG_TOUCHSCREEN_AD7879)        += ad7879.o
 obj-$(CONFIG_TOUCHSCREEN_ADS7846)       += ads7846.o
diff --git a/drivers/input/touchscreen/mc13783_ts.c b/drivers/input/touchscreen/mc13783_ts.c
index be115b3b65eb..be54fd639aca 100644
--- a/drivers/input/touchscreen/mc13783_ts.c
+++ b/drivers/input/touchscreen/mc13783_ts.c
@@ -44,7 +44,7 @@ static irqreturn_t mc13783_ts_handler(int irq, void *data)
 {
         struct mc13783_ts_priv *priv = data;
 
-        mc13783_ackirq(priv->mc13783, irq);
+        mc13783_irq_ack(priv->mc13783, irq);
 
         /*
          * Kick off reading coordinates. Note that if work happens already
@@ -135,7 +135,7 @@ static int mc13783_ts_open(struct input_dev *dev)
 
         mc13783_lock(priv->mc13783);
 
-        mc13783_ackirq(priv->mc13783, MC13783_IRQ_TS);
+        mc13783_irq_ack(priv->mc13783, MC13783_IRQ_TS);
 
         ret = mc13783_irq_request(priv->mc13783, MC13783_IRQ_TS,
                 mc13783_ts_handler, MC13783_TS_NAME, priv);