Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (53 commits)
  Input: synaptics - fix reporting of min coordinates
  Input: tegra-kbc - enable key autorepeat
  Input: kxtj9 - fix locking typo in kxtj9_set_poll()
  Input: kxtj9 - fix bug in probe()
  Input: intel-mid-touch - remove pointless checking for variable 'found'
  Input: hp_sdc - staticize hp_sdc_kicker()
  Input: pmic8xxx-keypad - fix a leak of the IRQ during init failure
  Input: cy8ctmg110_ts - set reset_pin and irq_pin from platform data
  Input: cy8ctmg110_ts - constify i2c_device_id table
  Input: cy8ctmg110_ts - fix checking return value of i2c_master_send
  Input: lifebook - make dmi callback functions return 1
  Input: atkbd - make dmi callback functions return 1
  Input: gpio_keys - switch to using SIMPLE_DEV_PM_OPS
  Input: gpio_keys - add support for device-tree platform data
  Input: aiptek - remove double define
  Input: synaptics - set minimum coordinates as reported by firmware
  Input: synaptics - process button bits in AGM packets
  Input: synaptics - rename set_slot to be more descriptive
  Input: synaptics - fuzz position for touchpad with reduced filtering
  Input: synaptics - set resolution for MT_POSITION_X/Y axes
  ...

7 files changed, 1345 insertions, 3 deletions

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index d1bf8724b58f..c9104bb4db06 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -100,6 +100,27 @@ config INPUT_MAX8925_ONKEY
           To compile this driver as a module, choose M here: the module
           will be called max8925_onkey.
 
+config INPUT_MMA8450
+        tristate "MMA8450 - Freescale's 3-Axis, 8/12-bit Digital Accelerometer"
+        depends on I2C
+        select INPUT_POLLDEV
+        help
+          Say Y here if you want to support Freescale's MMA8450 Accelerometer
+          through I2C interface.
+
+          To compile this driver as a module, choose M here: the
+          module will be called mma8450.
+
+config INPUT_MPU3050
+        tristate "MPU3050 Triaxial gyroscope sensor"
+        depends on I2C
+        help
+          Say Y here if you want to support InvenSense MPU3050
+          connected via an I2C bus.
+
+          To compile this driver as a module, choose M here: the
+          module will be called mpu3050.
+
 config INPUT_APANEL
         tristate "Fujitsu Lifebook Application Panel buttons"
         depends on X86 && I2C && LEDS_CLASS
@@ -209,6 +230,23 @@ config INPUT_KEYSPAN_REMOTE
           To compile this driver as a module, choose M here: the module will
           be called keyspan_remote.
 
+config INPUT_KXTJ9
+        tristate "Kionix KXTJ9 tri-axis digital accelerometer"
+        depends on I2C
+        help
+          Say Y here to enable support for the Kionix KXTJ9 digital tri-axis
+          accelerometer.
+
+          To compile this driver as a module, choose M here: the module will
+          be called kxtj9.
+
+config INPUT_KXTJ9_POLLED_MODE
+        bool "Enable polling mode support"
+        depends on INPUT_KXTJ9
+        select INPUT_POLLDEV
+        help
+          Say Y here if you need accelerometer to work in polling mode.
+
 config INPUT_POWERMATE
         tristate "Griffin PowerMate and Contour Jog support"
         depends on USB_ARCH_HAS_HCD
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index 4da7c3a60e04..299ad5edba84 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -25,8 +25,11 @@ obj-$(CONFIG_INPUT_DM355EVM)		+= dm355evm_keys.o
 obj-$(CONFIG_HP_SDC_RTC)                += hp_sdc_rtc.o
 obj-$(CONFIG_INPUT_IXP4XX_BEEPER)       += ixp4xx-beeper.o
 obj-$(CONFIG_INPUT_KEYSPAN_REMOTE)      += keyspan_remote.o
+obj-$(CONFIG_INPUT_KXTJ9)               += kxtj9.o
 obj-$(CONFIG_INPUT_M68K_BEEP)           += m68kspkr.o
 obj-$(CONFIG_INPUT_MAX8925_ONKEY)       += max8925_onkey.o
+obj-$(CONFIG_INPUT_MMA8450)             += mma8450.o
+obj-$(CONFIG_INPUT_MPU3050)             += mpu3050.o
 obj-$(CONFIG_INPUT_PCAP)                += pcap_keys.o
 obj-$(CONFIG_INPUT_PCF50633_PMU)        += pcf50633-input.o
 obj-$(CONFIG_INPUT_PCF8574)             += pcf8574_keypad.o
@@ -46,4 +49,3 @@ obj-$(CONFIG_INPUT_WISTRON_BTNS)	+= wistron_btns.o
 obj-$(CONFIG_INPUT_WM831X_ON)           += wm831x-on.o
 obj-$(CONFIG_INPUT_XEN_KBDDEV_FRONTEND) += xen-kbdfront.o
 obj-$(CONFIG_INPUT_YEALINK)             += yealink.o
-
diff --git a/drivers/input/misc/bfin_rotary.c b/drivers/input/misc/bfin_rotary.c
index 4f72bdd69410..d00edc9f39d1 100644
--- a/drivers/input/misc/bfin_rotary.c
+++ b/drivers/input/misc/bfin_rotary.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
diff --git a/drivers/input/misc/kxtj9.c b/drivers/input/misc/kxtj9.c
new file mode 100644
index 000000000000..c456f63b6bae
--- /dev/null
+++ b/drivers/input/misc/kxtj9.c
@@ -0,0 +1,671 @@
+/*
+ * Copyright (C) 2011 Kionix, Inc.
+ * Written by Chris Hudson <chudson@kionix.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.
+ *
+ * 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/delay.h>
+#include <linux/i2c.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/slab.h>
+#include <linux/input/kxtj9.h>
+#include <linux/input-polldev.h>
+
+#define NAME                    "kxtj9"
+#define G_MAX                   8000
+/* OUTPUT REGISTERS */
+#define XOUT_L                  0x06
+#define WHO_AM_I                0x0F
+/* CONTROL REGISTERS */
+#define INT_REL                 0x1A
+#define CTRL_REG1               0x1B
+#define INT_CTRL1               0x1E
+#define DATA_CTRL               0x21
+/* CONTROL REGISTER 1 BITS */
+#define PC1_OFF                 0x7F
+#define PC1_ON                  (1 << 7)
+/* Data ready funtion enable bit: set during probe if using irq mode */
+#define DRDYE                   (1 << 5)
+/* INTERRUPT CONTROL REGISTER 1 BITS */
+/* Set these during probe if using irq mode */
+#define KXTJ9_IEL               (1 << 3)
+#define KXTJ9_IEA               (1 << 4)
+#define KXTJ9_IEN               (1 << 5)
+/* INPUT_ABS CONSTANTS */
+#define FUZZ                    3
+#define FLAT                    3
+/* RESUME STATE INDICES */
+#define RES_DATA_CTRL           0
+#define RES_CTRL_REG1           1
+#define RES_INT_CTRL1           2
+#define RESUME_ENTRIES          3
+
+/*
+ * The following table lists the maximum appropriate poll interval for each
+ * available output data rate.
+ */
+static const struct {
+        unsigned int cutoff;
+        u8 mask;
+} kxtj9_odr_table[] = {
+        { 3,    ODR800F },
+        { 5,    ODR400F },
+        { 10,   ODR200F },
+        { 20,   ODR100F },
+        { 40,   ODR50F  },
+        { 80,   ODR25F  },
+        { 0,    ODR12_5F},
+};
+
+struct kxtj9_data {
+        struct i2c_client *client;
+        struct kxtj9_platform_data pdata;
+        struct input_dev *input_dev;
+#ifdef CONFIG_INPUT_KXTJ9_POLLED_MODE
+        struct input_polled_dev *poll_dev;
+#endif
+        unsigned int last_poll_interval;
+        u8 shift;
+        u8 ctrl_reg1;
+        u8 data_ctrl;
+        u8 int_ctrl;
+};
+
+static int kxtj9_i2c_read(struct kxtj9_data *tj9, u8 addr, u8 *data, int len)
+{
+        struct i2c_msg msgs[] = {
+                {
+                        .addr = tj9->client->addr,
+                        .flags = tj9->client->flags,
+                        .len = 1,
+                        .buf = &addr,
+                },
+                {
+                        .addr = tj9->client->addr,
+                        .flags = tj9->client->flags | I2C_M_RD,
+                        .len = len,
+                        .buf = data,
+                },
+        };
+
+        return i2c_transfer(tj9->client->adapter, msgs, 2);
+}
+
+static void kxtj9_report_acceleration_data(struct kxtj9_data *tj9)
+{
+        s16 acc_data[3]; /* Data bytes from hardware xL, xH, yL, yH, zL, zH */
+        s16 x, y, z;
+        int err;
+
+        err = kxtj9_i2c_read(tj9, XOUT_L, (u8 *)acc_data, 6);
+        if (err < 0)
+                dev_err(&tj9->client->dev, "accelerometer data read failed\n");
+
+        x = le16_to_cpu(acc_data[tj9->pdata.axis_map_x]) >> tj9->shift;
+        y = le16_to_cpu(acc_data[tj9->pdata.axis_map_y]) >> tj9->shift;
+        z = le16_to_cpu(acc_data[tj9->pdata.axis_map_z]) >> tj9->shift;
+
+        input_report_abs(tj9->input_dev, ABS_X, tj9->pdata.negate_x ? -x : x);
+        input_report_abs(tj9->input_dev, ABS_Y, tj9->pdata.negate_y ? -y : y);
+        input_report_abs(tj9->input_dev, ABS_Z, tj9->pdata.negate_z ? -z : z);
+        input_sync(tj9->input_dev);
+}
+
+static irqreturn_t kxtj9_isr(int irq, void *dev)
+{
+        struct kxtj9_data *tj9 = dev;
+        int err;
+
+        /* data ready is the only possible interrupt type */
+        kxtj9_report_acceleration_data(tj9);
+
+        err = i2c_smbus_read_byte_data(tj9->client, INT_REL);
+        if (err < 0)
+                dev_err(&tj9->client->dev,
+                        "error clearing interrupt status: %d\n", err);
+
+        return IRQ_HANDLED;
+}
+
+static int kxtj9_update_g_range(struct kxtj9_data *tj9, u8 new_g_range)
+{
+        switch (new_g_range) {
+        case KXTJ9_G_2G:
+                tj9->shift = 4;
+                break;
+        case KXTJ9_G_4G:
+                tj9->shift = 3;
+                break;
+        case KXTJ9_G_8G:
+                tj9->shift = 2;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        tj9->ctrl_reg1 &= 0xe7;
+        tj9->ctrl_reg1 |= new_g_range;
+
+        return 0;
+}
+
+static int kxtj9_update_odr(struct kxtj9_data *tj9, unsigned int poll_interval)
+{
+        int err;
+        int i;
+
+        /* Use the lowest ODR that can support the requested poll interval */
+        for (i = 0; i < ARRAY_SIZE(kxtj9_odr_table); i++) {
+                tj9->data_ctrl = kxtj9_odr_table[i].mask;
+                if (poll_interval < kxtj9_odr_table[i].cutoff)
+                        break;
+        }
+
+        err = i2c_smbus_write_byte_data(tj9->client, CTRL_REG1, 0);
+        if (err < 0)
+                return err;
+
+        err = i2c_smbus_write_byte_data(tj9->client, DATA_CTRL, tj9->data_ctrl);
+        if (err < 0)
+                return err;
+
+        err = i2c_smbus_write_byte_data(tj9->client, CTRL_REG1, tj9->ctrl_reg1);
+        if (err < 0)
+                return err;
+
+        return 0;
+}
+
+static int kxtj9_device_power_on(struct kxtj9_data *tj9)
+{
+        if (tj9->pdata.power_on)
+                return tj9->pdata.power_on();
+
+        return 0;
+}
+
+static void kxtj9_device_power_off(struct kxtj9_data *tj9)
+{
+        int err;
+
+        tj9->ctrl_reg1 &= PC1_OFF;
+        err = i2c_smbus_write_byte_data(tj9->client, CTRL_REG1, tj9->ctrl_reg1);
+        if (err < 0)
+                dev_err(&tj9->client->dev, "soft power off failed\n");
+
+        if (tj9->pdata.power_off)
+                tj9->pdata.power_off();
+}
+
+static int kxtj9_enable(struct kxtj9_data *tj9)
+{
+        int err;
+
+        err = kxtj9_device_power_on(tj9);
+        if (err < 0)
+                return err;
+
+        /* ensure that PC1 is cleared before updating control registers */
+        err = i2c_smbus_write_byte_data(tj9->client, CTRL_REG1, 0);
+        if (err < 0)
+                return err;
+
+        /* only write INT_CTRL_REG1 if in irq mode */
+        if (tj9->client->irq) {
+                err = i2c_smbus_write_byte_data(tj9->client,
+                                                INT_CTRL1, tj9->int_ctrl);
+                if (err < 0)
+                        return err;
+        }
+
+        err = kxtj9_update_g_range(tj9, tj9->pdata.g_range);
+        if (err < 0)
+                return err;
+
+        /* turn on outputs */
+        tj9->ctrl_reg1 |= PC1_ON;
+        err = i2c_smbus_write_byte_data(tj9->client, CTRL_REG1, tj9->ctrl_reg1);
+        if (err < 0)
+                return err;
+
+        err = kxtj9_update_odr(tj9, tj9->last_poll_interval);
+        if (err < 0)
+                return err;
+
+        /* clear initial interrupt if in irq mode */
+        if (tj9->client->irq) {
+                err = i2c_smbus_read_byte_data(tj9->client, INT_REL);
+                if (err < 0) {
+                        dev_err(&tj9->client->dev,
+                                "error clearing interrupt: %d\n", err);
+                        goto fail;
+                }
+        }
+
+        return 0;
+
+fail:
+        kxtj9_device_power_off(tj9);
+        return err;
+}
+
+static void kxtj9_disable(struct kxtj9_data *tj9)
+{
+        kxtj9_device_power_off(tj9);
+}
+
+static int kxtj9_input_open(struct input_dev *input)
+{
+        struct kxtj9_data *tj9 = input_get_drvdata(input);
+
+        return kxtj9_enable(tj9);
+}
+
+static void kxtj9_input_close(struct input_dev *dev)
+{
+        struct kxtj9_data *tj9 = input_get_drvdata(dev);
+
+        kxtj9_disable(tj9);
+}
+
+static void __devinit kxtj9_init_input_device(struct kxtj9_data *tj9,
+                                              struct input_dev *input_dev)
+{
+        __set_bit(EV_ABS, input_dev->evbit);
+        input_set_abs_params(input_dev, ABS_X, -G_MAX, G_MAX, FUZZ, FLAT);
+        input_set_abs_params(input_dev, ABS_Y, -G_MAX, G_MAX, FUZZ, FLAT);
+        input_set_abs_params(input_dev, ABS_Z, -G_MAX, G_MAX, FUZZ, FLAT);
+
+        input_dev->name = "kxtj9_accel";
+        input_dev->id.bustype = BUS_I2C;
+        input_dev->dev.parent = &tj9->client->dev;
+}
+
+static int __devinit kxtj9_setup_input_device(struct kxtj9_data *tj9)
+{
+        struct input_dev *input_dev;
+        int err;
+
+        input_dev = input_allocate_device();
+        if (!input_dev) {
+                dev_err(&tj9->client->dev, "input device allocate failed\n");
+                return -ENOMEM;
+        }
+
+        tj9->input_dev = input_dev;
+
+        input_dev->open = kxtj9_input_open;
+        input_dev->close = kxtj9_input_close;
+        input_set_drvdata(input_dev, tj9);
+
+        kxtj9_init_input_device(tj9, input_dev);
+
+        err = input_register_device(tj9->input_dev);
+        if (err) {
+                dev_err(&tj9->client->dev,
+                        "unable to register input polled device %s: %d\n",
+                        tj9->input_dev->name, err);
+                input_free_device(tj9->input_dev);
+                return err;
+        }
+
+        return 0;
+}
+
+/*
+ * When IRQ mode is selected, we need to provide an interface to allow the user
+ * to change the output data rate of the part.  For consistency, we are using
+ * the set_poll method, which accepts a poll interval in milliseconds, and then
+ * calls update_odr() while passing this value as an argument.  In IRQ mode, the
+ * data outputs will not be read AT the requested poll interval, rather, the
+ * lowest ODR that can support the requested interval.  The client application
+ * will be responsible for retrieving data from the input node at the desired
+ * interval.
+ */
+
+/* Returns currently selected poll interval (in ms) */
+static ssize_t kxtj9_get_poll(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct kxtj9_data *tj9 = i2c_get_clientdata(client);
+
+        return sprintf(buf, "%d\n", tj9->last_poll_interval);
+}
+
+/* Allow users to select a new poll interval (in ms) */
+static ssize_t kxtj9_set_poll(struct device *dev, struct device_attribute *attr,
+                                                const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct kxtj9_data *tj9 = i2c_get_clientdata(client);
+        struct input_dev *input_dev = tj9->input_dev;
+        unsigned int interval;
+        int error;
+
+        error = kstrtouint(buf, 10, &interval);
+        if (error < 0)
+                return error;
+
+        /* Lock the device to prevent races with open/close (and itself) */
+        mutex_lock(&input_dev->mutex);
+
+        disable_irq(client->irq);
+
+        /*
+         * Set current interval to the greater of the minimum interval or
+         * the requested interval
+         */
+        tj9->last_poll_interval = max(interval, tj9->pdata.min_interval);
+
+        kxtj9_update_odr(tj9, tj9->last_poll_interval);
+
+        enable_irq(client->irq);
+        mutex_unlock(&input_dev->mutex);
+
+        return count;
+}
+
+static DEVICE_ATTR(poll, S_IRUGO|S_IWUSR, kxtj9_get_poll, kxtj9_set_poll);
+
+static struct attribute *kxtj9_attributes[] = {
+        &dev_attr_poll.attr,
+        NULL
+};
+
+static struct attribute_group kxtj9_attribute_group = {
+        .attrs = kxtj9_attributes
+};
+
+
+#ifdef CONFIG_INPUT_KXTJ9_POLLED_MODE
+static void kxtj9_poll(struct input_polled_dev *dev)
+{
+        struct kxtj9_data *tj9 = dev->private;
+        unsigned int poll_interval = dev->poll_interval;
+
+        kxtj9_report_acceleration_data(tj9);
+
+        if (poll_interval != tj9->last_poll_interval) {
+                kxtj9_update_odr(tj9, poll_interval);
+                tj9->last_poll_interval = poll_interval;
+        }
+}
+
+static void kxtj9_polled_input_open(struct input_polled_dev *dev)
+{
+        struct kxtj9_data *tj9 = dev->private;
+
+        kxtj9_enable(tj9);
+}
+
+static void kxtj9_polled_input_close(struct input_polled_dev *dev)
+{
+        struct kxtj9_data *tj9 = dev->private;
+
+        kxtj9_disable(tj9);
+}
+
+static int __devinit kxtj9_setup_polled_device(struct kxtj9_data *tj9)
+{
+        int err;
+        struct input_polled_dev *poll_dev;
+        poll_dev = input_allocate_polled_device();
+
+        if (!poll_dev) {
+                dev_err(&tj9->client->dev,
+                        "Failed to allocate polled device\n");
+                return -ENOMEM;
+        }
+
+        tj9->poll_dev = poll_dev;
+        tj9->input_dev = poll_dev->input;
+
+        poll_dev->private = tj9;
+        poll_dev->poll = kxtj9_poll;
+        poll_dev->open = kxtj9_polled_input_open;
+        poll_dev->close = kxtj9_polled_input_close;
+
+        kxtj9_init_input_device(tj9, poll_dev->input);
+
+        err = input_register_polled_device(poll_dev);
+        if (err) {
+                dev_err(&tj9->client->dev,
+                        "Unable to register polled device, err=%d\n", err);
+                input_free_polled_device(poll_dev);
+                return err;
+        }
+
+        return 0;
+}
+
+static void __devexit kxtj9_teardown_polled_device(struct kxtj9_data *tj9)
+{
+        input_unregister_polled_device(tj9->poll_dev);
+        input_free_polled_device(tj9->poll_dev);
+}
+
+#else
+
+static inline int kxtj9_setup_polled_device(struct kxtj9_data *tj9)
+{
+        return -ENOSYS;
+}
+
+static inline void kxtj9_teardown_polled_device(struct kxtj9_data *tj9)
+{
+}
+
+#endif
+
+static int __devinit kxtj9_verify(struct kxtj9_data *tj9)
+{
+        int retval;
+
+        retval = kxtj9_device_power_on(tj9);
+        if (retval < 0)
+                return retval;
+
+        retval = i2c_smbus_read_byte_data(tj9->client, WHO_AM_I);
+        if (retval < 0) {
+                dev_err(&tj9->client->dev, "read err int source\n");
+                goto out;
+        }
+
+        retval = retval != 0x06 ? -EIO : 0;
+
+out:
+        kxtj9_device_power_off(tj9);
+        return retval;
+}
+
+static int __devinit kxtj9_probe(struct i2c_client *client,
+                                 const struct i2c_device_id *id)
+{
+        const struct kxtj9_platform_data *pdata = client->dev.platform_data;
+        struct kxtj9_data *tj9;
+        int err;
+
+        if (!i2c_check_functionality(client->adapter,
+                                I2C_FUNC_I2C | I2C_FUNC_SMBUS_BYTE_DATA)) {
+                dev_err(&client->dev, "client is not i2c capable\n");
+                return -ENXIO;
+        }
+
+        if (!pdata) {
+                dev_err(&client->dev, "platform data is NULL; exiting\n");
+                return -EINVAL;
+        }
+
+        tj9 = kzalloc(sizeof(*tj9), GFP_KERNEL);
+        if (!tj9) {
+                dev_err(&client->dev,
+                        "failed to allocate memory for module data\n");
+                return -ENOMEM;
+        }
+
+        tj9->client = client;
+        tj9->pdata = *pdata;
+
+        if (pdata->init) {
+                err = pdata->init();
+                if (err < 0)
+                        goto err_free_mem;
+        }
+
+        err = kxtj9_verify(tj9);
+        if (err < 0) {
+                dev_err(&client->dev, "device not recognized\n");
+                goto err_pdata_exit;
+        }
+
+        i2c_set_clientdata(client, tj9);
+
+        tj9->ctrl_reg1 = tj9->pdata.res_12bit | tj9->pdata.g_range;
+        tj9->data_ctrl = tj9->pdata.data_odr_init;
+
+        if (client->irq) {
+                /* If in irq mode, populate INT_CTRL_REG1 and enable DRDY. */
+                tj9->int_ctrl |= KXTJ9_IEN | KXTJ9_IEA | KXTJ9_IEL;
+                tj9->ctrl_reg1 |= DRDYE;
+
+                err = kxtj9_setup_input_device(tj9);
+                if (err)
+                        goto err_pdata_exit;
+
+                err = request_threaded_irq(client->irq, NULL, kxtj9_isr,
+                                           IRQF_TRIGGER_RISING | IRQF_ONESHOT,
+                                           "kxtj9-irq", tj9);
+                if (err) {
+                        dev_err(&client->dev, "request irq failed: %d\n", err);
+                        goto err_destroy_input;
+                }
+
+                err = sysfs_create_group(&client->dev.kobj, &kxtj9_attribute_group);
+                if (err) {
+                        dev_err(&client->dev, "sysfs create failed: %d\n", err);
+                        goto err_free_irq;
+                }
+
+        } else {
+                err = kxtj9_setup_polled_device(tj9);
+                if (err)
+                        goto err_pdata_exit;
+        }
+
+        return 0;
+
+err_free_irq:
+        free_irq(client->irq, tj9);
+err_destroy_input:
+        input_unregister_device(tj9->input_dev);
+err_pdata_exit:
+        if (tj9->pdata.exit)
+                tj9->pdata.exit();
+err_free_mem:
+        kfree(tj9);
+        return err;
+}
+
+static int __devexit kxtj9_remove(struct i2c_client *client)
+{
+        struct kxtj9_data *tj9 = i2c_get_clientdata(client);
+
+        if (client->irq) {
+                sysfs_remove_group(&client->dev.kobj, &kxtj9_attribute_group);
+                free_irq(client->irq, tj9);
+                input_unregister_device(tj9->input_dev);
+        } else {
+                kxtj9_teardown_polled_device(tj9);
+        }
+
+        if (tj9->pdata.exit)
+                tj9->pdata.exit();
+
+        kfree(tj9);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int kxtj9_suspend(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct kxtj9_data *tj9 = i2c_get_clientdata(client);
+        struct input_dev *input_dev = tj9->input_dev;
+
+        mutex_lock(&input_dev->mutex);
+
+        if (input_dev->users)
+                kxtj9_disable(tj9);
+
+        mutex_unlock(&input_dev->mutex);
+        return 0;
+}
+
+static int kxtj9_resume(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct kxtj9_data *tj9 = i2c_get_clientdata(client);
+        struct input_dev *input_dev = tj9->input_dev;
+        int retval = 0;
+
+        mutex_lock(&input_dev->mutex);
+
+        if (input_dev->users)
+                kxtj9_enable(tj9);
+
+        mutex_unlock(&input_dev->mutex);
+        return retval;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(kxtj9_pm_ops, kxtj9_suspend, kxtj9_resume);
+
+static const struct i2c_device_id kxtj9_id[] = {
+        { NAME, 0 },
+        { },
+};
+
+MODULE_DEVICE_TABLE(i2c, kxtj9_id);
+
+static struct i2c_driver kxtj9_driver = {
+        .driver = {
+                .name   = NAME,
+                .owner  = THIS_MODULE,
+                .pm     = &kxtj9_pm_ops,
+        },
+        .probe          = kxtj9_probe,
+        .remove         = __devexit_p(kxtj9_remove),
+        .id_table       = kxtj9_id,
+};
+
+static int __init kxtj9_init(void)
+{
+        return i2c_add_driver(&kxtj9_driver);
+}
+module_init(kxtj9_init);
+
+static void __exit kxtj9_exit(void)
+{
+        i2c_del_driver(&kxtj9_driver);
+}
+module_exit(kxtj9_exit);
+
+MODULE_DESCRIPTION("KXTJ9 accelerometer driver");
+MODULE_AUTHOR("Chris Hudson <chudson@kionix.com>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/input/misc/mma8450.c b/drivers/input/misc/mma8450.c
new file mode 100644
index 000000000000..20f8f9284f02
--- /dev/null
+++ b/drivers/input/misc/mma8450.c
@@ -0,0 +1,256 @@
+/*
+ *  Driver for Freescale's 3-Axis Accelerometer MMA8450
+ *
+ *  Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/i2c.h>
+#include <linux/input-polldev.h>
+
+#define MMA8450_DRV_NAME        "mma8450"
+
+#define MODE_CHANGE_DELAY_MS    100
+#define POLL_INTERVAL           100
+#define POLL_INTERVAL_MAX       500
+
+/* register definitions */
+#define MMA8450_STATUS          0x00
+#define MMA8450_STATUS_ZXYDR    0x08
+
+#define MMA8450_OUT_X8          0x01
+#define MMA8450_OUT_Y8          0x02
+#define MMA8450_OUT_Z8          0x03
+
+#define MMA8450_OUT_X_LSB       0x05
+#define MMA8450_OUT_X_MSB       0x06
+#define MMA8450_OUT_Y_LSB       0x07
+#define MMA8450_OUT_Y_MSB       0x08
+#define MMA8450_OUT_Z_LSB       0x09
+#define MMA8450_OUT_Z_MSB       0x0a
+
+#define MMA8450_XYZ_DATA_CFG    0x16
+
+#define MMA8450_CTRL_REG1       0x38
+#define MMA8450_CTRL_REG2       0x39
+
+/* mma8450 status */
+struct mma8450 {
+        struct i2c_client       *client;
+        struct input_polled_dev *idev;
+};
+
+static int mma8450_read(struct mma8450 *m, unsigned off)
+{
+        struct i2c_client *c = m->client;
+        int ret;
+
+        ret = i2c_smbus_read_byte_data(c, off);
+        if (ret < 0)
+                dev_err(&c->dev,
+                        "failed to read register 0x%02x, error %d\n",
+                        off, ret);
+
+        return ret;
+}
+
+static int mma8450_write(struct mma8450 *m, unsigned off, u8 v)
+{
+        struct i2c_client *c = m->client;
+        int error;
+
+        error = i2c_smbus_write_byte_data(c, off, v);
+        if (error < 0) {
+                dev_err(&c->dev,
+                        "failed to write to register 0x%02x, error %d\n",
+                        off, error);
+                return error;
+        }
+
+        return 0;
+}
+
+static int mma8450_read_xyz(struct mma8450 *m, int *x, int *y, int *z)
+{
+        struct i2c_client *c = m->client;
+        u8 buff[6];
+        int err;
+
+        err = i2c_smbus_read_i2c_block_data(c, MMA8450_OUT_X_LSB, 6, buff);
+        if (err < 0) {
+                dev_err(&c->dev,
+                        "failed to read block data at 0x%02x, error %d\n",
+                        MMA8450_OUT_X_LSB, err);
+                return err;
+        }
+
+        *x = ((buff[1] << 4) & 0xff0) | (buff[0] & 0xf);
+        *y = ((buff[3] << 4) & 0xff0) | (buff[2] & 0xf);
+        *z = ((buff[5] << 4) & 0xff0) | (buff[4] & 0xf);
+
+        return 0;
+}
+
+static void mma8450_poll(struct input_polled_dev *dev)
+{
+        struct mma8450 *m = dev->private;
+        int x, y, z;
+        int ret;
+        int err;
+
+        ret = mma8450_read(m, MMA8450_STATUS);
+        if (ret < 0)
+                return;
+
+        if (!(ret & MMA8450_STATUS_ZXYDR))
+                return;
+
+        err = mma8450_read_xyz(m, &x, &y, &z);
+        if (err)
+                return;
+
+        input_report_abs(dev->input, ABS_X, x);
+        input_report_abs(dev->input, ABS_Y, y);
+        input_report_abs(dev->input, ABS_Z, z);
+        input_sync(dev->input);
+}
+
+/* Initialize the MMA8450 chip */
+static void mma8450_open(struct input_polled_dev *dev)
+{
+        struct mma8450 *m = dev->private;
+        int err;
+
+        /* enable all events from X/Y/Z, no FIFO */
+        err = mma8450_write(m, MMA8450_XYZ_DATA_CFG, 0x07);
+        if (err)
+                return;
+
+        /*
+         * Sleep mode poll rate - 50Hz
+         * System output data rate - 400Hz
+         * Full scale selection - Active, +/- 2G
+         */
+        err = mma8450_write(m, MMA8450_CTRL_REG1, 0x01);
+        if (err < 0)
+                return;
+
+        msleep(MODE_CHANGE_DELAY_MS);
+}
+
+static void mma8450_close(struct input_polled_dev *dev)
+{
+        struct mma8450 *m = dev->private;
+
+        mma8450_write(m, MMA8450_CTRL_REG1, 0x00);
+        mma8450_write(m, MMA8450_CTRL_REG2, 0x01);
+}
+
+/*
+ * I2C init/probing/exit functions
+ */
+static int __devinit mma8450_probe(struct i2c_client *c,
+                                   const struct i2c_device_id *id)
+{
+        struct input_polled_dev *idev;
+        struct mma8450 *m;
+        int err;
+
+        m = kzalloc(sizeof(struct mma8450), GFP_KERNEL);
+        idev = input_allocate_polled_device();
+        if (!m || !idev) {
+                err = -ENOMEM;
+                goto err_free_mem;
+        }
+
+        m->client = c;
+        m->idev = idev;
+
+        idev->private           = m;
+        idev->input->name       = MMA8450_DRV_NAME;
+        idev->input->id.bustype = BUS_I2C;
+        idev->poll              = mma8450_poll;
+        idev->poll_interval     = POLL_INTERVAL;
+        idev->poll_interval_max = POLL_INTERVAL_MAX;
+        idev->open              = mma8450_open;
+        idev->close             = mma8450_close;
+
+        __set_bit(EV_ABS, idev->input->evbit);
+        input_set_abs_params(idev->input, ABS_X, -2048, 2047, 32, 32);
+        input_set_abs_params(idev->input, ABS_Y, -2048, 2047, 32, 32);
+        input_set_abs_params(idev->input, ABS_Z, -2048, 2047, 32, 32);
+
+        err = input_register_polled_device(idev);
+        if (err) {
+                dev_err(&c->dev, "failed to register polled input device\n");
+                goto err_free_mem;
+        }
+
+        return 0;
+
+err_free_mem:
+        input_free_polled_device(idev);
+        kfree(m);
+        return err;
+}
+
+static int __devexit mma8450_remove(struct i2c_client *c)
+{
+        struct mma8450 *m = i2c_get_clientdata(c);
+        struct input_polled_dev *idev = m->idev;
+
+        input_unregister_polled_device(idev);
+        input_free_polled_device(idev);
+        kfree(m);
+
+        return 0;
+}
+
+static const struct i2c_device_id mma8450_id[] = {
+        { MMA8450_DRV_NAME, 0 },
+        { },
+};
+MODULE_DEVICE_TABLE(i2c, mma8450_id);
+
+static struct i2c_driver mma8450_driver = {
+        .driver = {
+                .name   = MMA8450_DRV_NAME,
+                .owner  = THIS_MODULE,
+        },
+        .probe          = mma8450_probe,
+        .remove         = __devexit_p(mma8450_remove),
+        .id_table       = mma8450_id,
+};
+
+static int __init mma8450_init(void)
+{
+        return i2c_add_driver(&mma8450_driver);
+}
+module_init(mma8450_init);
+
+static void __exit mma8450_exit(void)
+{
+        i2c_del_driver(&mma8450_driver);
+}
+module_exit(mma8450_exit);
+
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("MMA8450 3-Axis Accelerometer Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/input/misc/mpu3050.c b/drivers/input/misc/mpu3050.c
new file mode 100644
index 000000000000..b95fac15b2ea
--- /dev/null
+++ b/drivers/input/misc/mpu3050.c
@@ -0,0 +1,376 @@
+/*
+ * MPU3050 Tri-axis gyroscope driver
+ *
+ * Copyright (C) 2011 Wistron Co.Ltd
+ * Joseph Lai <joseph_lai@wistron.com>
+ *
+ * Trimmed down by Alan Cox <alan@linux.intel.com> to produce this version
+ *
+ * This is a 'lite' version of the driver, while we consider the right way
+ * to present the other features to user space. In particular it requires the
+ * device has an IRQ, and it only provides an input interface, so is not much
+ * use for device orientation. A fuller version is available from the Meego
+ * tree.
+ *
+ * This program is based on bma023.c.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * 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/module.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <linux/mutex.h>
+#include <linux/err.h>
+#include <linux/i2c.h>
+#include <linux/input.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <linux/pm_runtime.h>
+
+#define MPU3050_CHIP_ID_REG     0x00
+#define MPU3050_CHIP_ID         0x69
+#define MPU3050_XOUT_H          0x1D
+#define MPU3050_PWR_MGM         0x3E
+#define MPU3050_PWR_MGM_POS     6
+#define MPU3050_PWR_MGM_MASK    0x40
+
+#define MPU3050_AUTO_DELAY      1000
+
+#define MPU3050_MIN_VALUE       -32768
+#define MPU3050_MAX_VALUE       32767
+
+struct axis_data {
+        s16 x;
+        s16 y;
+        s16 z;
+};
+
+struct mpu3050_sensor {
+        struct i2c_client *client;
+        struct device *dev;
+        struct input_dev *idev;
+};
+
+/**
+ *      mpu3050_xyz_read_reg    -       read the axes values
+ *      @buffer: provide register addr and get register
+ *      @length: length of register
+ *
+ *      Reads the register values in one transaction or returns a negative
+ *      error code on failure.
+ */
+static int mpu3050_xyz_read_reg(struct i2c_client *client,
+                               u8 *buffer, int length)
+{
+        /*
+         * Annoying we can't make this const because the i2c layer doesn't
+         * declare input buffers const.
+         */
+        char cmd = MPU3050_XOUT_H;
+        struct i2c_msg msg[] = {
+                {
+                        .addr = client->addr,
+                        .flags = 0,
+                        .len = 1,
+                        .buf = &cmd,
+                },
+                {
+                        .addr = client->addr,
+                        .flags = I2C_M_RD,
+                        .len = length,
+                        .buf = buffer,
+                },
+        };
+
+        return i2c_transfer(client->adapter, msg, 2);
+}
+
+/**
+ *      mpu3050_read_xyz        -       get co-ordinates from device
+ *      @client: i2c address of sensor
+ *      @coords: co-ordinates to update
+ *
+ *      Return the converted X Y and Z co-ordinates from the sensor device
+ */
+static void mpu3050_read_xyz(struct i2c_client *client,
+                             struct axis_data *coords)
+{
+        u16 buffer[3];
+
+        mpu3050_xyz_read_reg(client, (u8 *)buffer, 6);
+        coords->x = be16_to_cpu(buffer[0]);
+        coords->y = be16_to_cpu(buffer[1]);
+        coords->z = be16_to_cpu(buffer[2]);
+        dev_dbg(&client->dev, "%s: x %d, y %d, z %d\n", __func__,
+                                        coords->x, coords->y, coords->z);
+}
+
+/**
+ *      mpu3050_set_power_mode  -       set the power mode
+ *      @client: i2c client for the sensor
+ *      @val: value to switch on/off of power, 1: normal power, 0: low power
+ *
+ *      Put device to normal-power mode or low-power mode.
+ */
+static void mpu3050_set_power_mode(struct i2c_client *client, u8 val)
+{
+        u8 value;
+
+        value = i2c_smbus_read_byte_data(client, MPU3050_PWR_MGM);
+        value = (value & ~MPU3050_PWR_MGM_MASK) |
+                (((val << MPU3050_PWR_MGM_POS) & MPU3050_PWR_MGM_MASK) ^
+                 MPU3050_PWR_MGM_MASK);
+        i2c_smbus_write_byte_data(client, MPU3050_PWR_MGM, value);
+}
+
+/**
+ *      mpu3050_input_open      -       called on input event open
+ *      @input: input dev of opened device
+ *
+ *      The input layer calls this function when input event is opened. The
+ *      function will push the device to resume. Then, the device is ready
+ *      to provide data.
+ */
+static int mpu3050_input_open(struct input_dev *input)
+{
+        struct mpu3050_sensor *sensor = input_get_drvdata(input);
+
+        pm_runtime_get(sensor->dev);
+
+        return 0;
+}
+
+/**
+ *      mpu3050_input_close     -       called on input event close
+ *      @input: input dev of closed device
+ *
+ *      The input layer calls this function when input event is closed. The
+ *      function will push the device to suspend.
+ */
+static void mpu3050_input_close(struct input_dev *input)
+{
+        struct mpu3050_sensor *sensor = input_get_drvdata(input);
+
+        pm_runtime_put(sensor->dev);
+}
+
+/**
+ *      mpu3050_interrupt_thread        -       handle an IRQ
+ *      @irq: interrupt numner
+ *      @data: the sensor
+ *
+ *      Called by the kernel single threaded after an interrupt occurs. Read
+ *      the sensor data and generate an input event for it.
+ */
+static irqreturn_t mpu3050_interrupt_thread(int irq, void *data)
+{
+        struct mpu3050_sensor *sensor = data;
+        struct axis_data axis;
+
+        mpu3050_read_xyz(sensor->client, &axis);
+
+        input_report_abs(sensor->idev, ABS_X, axis.x);
+        input_report_abs(sensor->idev, ABS_Y, axis.y);
+        input_report_abs(sensor->idev, ABS_Z, axis.z);
+        input_sync(sensor->idev);
+
+        return IRQ_HANDLED;
+}
+
+/**
+ *      mpu3050_probe   -       device detection callback
+ *      @client: i2c client of found device
+ *      @id: id match information
+ *
+ *      The I2C layer calls us when it believes a sensor is present at this
+ *      address. Probe to see if this is correct and to validate the device.
+ *
+ *      If present install the relevant sysfs interfaces and input device.
+ */
+static int __devinit mpu3050_probe(struct i2c_client *client,
+                                   const struct i2c_device_id *id)
+{
+        struct mpu3050_sensor *sensor;
+        struct input_dev *idev;
+        int ret;
+        int error;
+
+        sensor = kzalloc(sizeof(struct mpu3050_sensor), GFP_KERNEL);
+        idev = input_allocate_device();
+        if (!sensor || !idev) {
+                dev_err(&client->dev, "failed to allocate driver data\n");
+                error = -ENOMEM;
+                goto err_free_mem;
+        }
+
+        sensor->client = client;
+        sensor->dev = &client->dev;
+        sensor->idev = idev;
+
+        mpu3050_set_power_mode(client, 1);
+        msleep(10);
+
+        ret = i2c_smbus_read_byte_data(client, MPU3050_CHIP_ID_REG);
+        if (ret < 0) {
+                dev_err(&client->dev, "failed to detect device\n");
+                error = -ENXIO;
+                goto err_free_mem;
+        }
+
+        if (ret != MPU3050_CHIP_ID) {
+                dev_err(&client->dev, "unsupported chip id\n");
+                error = -ENXIO;
+                goto err_free_mem;
+        }
+
+        idev->name = "MPU3050";
+        idev->id.bustype = BUS_I2C;
+        idev->dev.parent = &client->dev;
+
+        idev->open = mpu3050_input_open;
+        idev->close = mpu3050_input_close;
+
+        __set_bit(EV_ABS, idev->evbit);
+        input_set_abs_params(idev, ABS_X,
+                             MPU3050_MIN_VALUE, MPU3050_MAX_VALUE, 0, 0);
+        input_set_abs_params(idev, ABS_Y,
+                             MPU3050_MIN_VALUE, MPU3050_MAX_VALUE, 0, 0);
+        input_set_abs_params(idev, ABS_Z,
+                             MPU3050_MIN_VALUE, MPU3050_MAX_VALUE, 0, 0);
+
+        input_set_drvdata(idev, sensor);
+
+        pm_runtime_set_active(&client->dev);
+
+        error = request_threaded_irq(client->irq,
+                                     NULL, mpu3050_interrupt_thread,
+                                     IRQF_TRIGGER_RISING,
+                                     "mpu_int", sensor);
+        if (error) {
+                dev_err(&client->dev,
+                        "can't get IRQ %d, error %d\n", client->irq, error);
+                goto err_pm_set_suspended;
+        }
+
+        error = input_register_device(idev);
+        if (error) {
+                dev_err(&client->dev, "failed to register input device\n");
+                goto err_free_irq;
+        }
+
+        pm_runtime_enable(&client->dev);
+        pm_runtime_set_autosuspend_delay(&client->dev, MPU3050_AUTO_DELAY);
+
+        return 0;
+
+err_free_irq:
+        free_irq(client->irq, sensor);
+err_pm_set_suspended:
+        pm_runtime_set_suspended(&client->dev);
+err_free_mem:
+        input_unregister_device(idev);
+        kfree(sensor);
+        return error;
+}
+
+/**
+ *      mpu3050_remove  -       remove a sensor
+ *      @client: i2c client of sensor being removed
+ *
+ *      Our sensor is going away, clean up the resources.
+ */
+static int __devexit mpu3050_remove(struct i2c_client *client)
+{
+        struct mpu3050_sensor *sensor = i2c_get_clientdata(client);
+
+        pm_runtime_disable(&client->dev);
+        pm_runtime_set_suspended(&client->dev);
+
+        free_irq(client->irq, sensor);
+        input_unregister_device(sensor->idev);
+        kfree(sensor);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+/**
+ *      mpu3050_suspend         -       called on device suspend
+ *      @dev: device being suspended
+ *
+ *      Put the device into sleep mode before we suspend the machine.
+ */
+static int mpu3050_suspend(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+
+        mpu3050_set_power_mode(client, 0);
+
+        return 0;
+}
+
+/**
+ *      mpu3050_resume          -       called on device resume
+ *      @dev: device being resumed
+ *
+ *      Put the device into powered mode on resume.
+ */
+static int mpu3050_resume(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+
+        mpu3050_set_power_mode(client, 1);
+        msleep(100);  /* wait for gyro chip resume */
+
+        return 0;
+}
+#endif
+
+static UNIVERSAL_DEV_PM_OPS(mpu3050_pm, mpu3050_suspend, mpu3050_resume, NULL);
+
+static const struct i2c_device_id mpu3050_ids[] = {
+        { "mpu3050", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, mpu3050_ids);
+
+static struct i2c_driver mpu3050_i2c_driver = {
+        .driver = {
+                .name   = "mpu3050",
+                .owner  = THIS_MODULE,
+                .pm     = &mpu3050_pm,
+        },
+        .probe          = mpu3050_probe,
+        .remove         = __devexit_p(mpu3050_remove),
+        .id_table       = mpu3050_ids,
+};
+
+static int __init mpu3050_init(void)
+{
+        return i2c_add_driver(&mpu3050_i2c_driver);
+}
+module_init(mpu3050_init);
+
+static void __exit mpu3050_exit(void)
+{
+        i2c_del_driver(&mpu3050_i2c_driver);
+}
+module_exit(mpu3050_exit);
+
+MODULE_AUTHOR("Wistron Corp.");
+MODULE_DESCRIPTION("MPU3050 Tri-axis gyroscope driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/input/misc/xen-kbdfront.c b/drivers/input/misc/xen-kbdfront.c
index 62bae99424e6..ad2e51c04db8 100644
--- a/drivers/input/misc/xen-kbdfront.c
+++ b/drivers/input/misc/xen-kbdfront.c
@@ -373,7 +373,7 @@ static struct xenbus_driver xenkbd_driver = {
 
 static int __init xenkbd_init(void)
 {
-        if (!xen_pv_domain())
+        if (!xen_domain())
                 return -ENODEV;
 
         /* Nothing to do if running in dom0. */