Merge tag 'media/v4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab:

 - Documentation improvements: conversion of all non-DocBook documents
   to Sphinx and lots of fixes to the uAPI media book

 - New PCI driver for Techwell TW5864 media grabber boards

 - New SoC driver for ATMEL Image Sensor Controller

 - Removal of some obsolete SoC drivers (s5p-tv driver and soc_camera
   drivers)

 - Addition of ST CEC driver

 - Lots of drivers fixes, improvements and additions

* tag 'media/v4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (464 commits)
  [media] ttusb_dec: avoid the risk of go past buffer
  [media] cx23885: Fix some smatch warnings
  [media] si2165: switch to regmap
  [media] si2165: use i2c_client->dev instead of i2c_adapter->dev for logging
  [media] si2165: Remove legacy attach
  [media] cx231xx: attach si2165 driver via i2c_client
  [media] cx231xx: Prepare for attaching new style i2c_client DVB demod drivers
  [media] cx23885: attach si2165 driver via i2c_client
  [media] si2165: support i2c_client attach
  [media] si2165: avoid division by zero
  [media] rcar-vin: add R-Car gen2 fallback compatibility string
  [media] lgdt3306a: remove 20*50 msec unnecessary timeout
  [media] cx25821: Remove deprecated create_singlethread_workqueue
  [media] cx25821: Drop Freeing of Workqueue
  [media] cxd2841er: force 8MHz bandwidth for DVB-C if specified bw not supported
  [media] redrat3: hardware-specific parameters
  [media] redrat3: remove hw_timeout member
  [media] cxd2841er: BER and SNR reading for ISDB-T
  [media] dvb-usb: avoid link error with dib3000m{b,c|
  [media] dvb-usb: split out common parts of dibusb
  ...

8 files changed, 1411 insertions, 34 deletions

diff --git a/drivers/input/rmi4/Kconfig b/drivers/input/rmi4/Kconfig
index f73df2495fed..4c8a55857e00 100644
--- a/drivers/input/rmi4/Kconfig
+++ b/drivers/input/rmi4/Kconfig
@@ -61,3 +61,14 @@ config RMI4_F30
 
           Function 30 provides GPIO and LED support for RMI4 devices. This
           includes support for buttons on TouchPads and ClickPads.
+
+config RMI4_F54
+        bool "RMI4 Function 54 (Analog diagnostics)"
+        depends on RMI4_CORE
+        depends on VIDEO_V4L2=y || (RMI4_CORE=m && VIDEO_V4L2=m)
+        select VIDEOBUF2_VMALLOC
+        help
+          Say Y here if you want to add support for RMI4 function 54
+
+          Function 54 provides access to various diagnostic features in certain
+          RMI4 touch sensors.
diff --git a/drivers/input/rmi4/Makefile b/drivers/input/rmi4/Makefile
index 95c00a783992..0bafc8502c4b 100644
--- a/drivers/input/rmi4/Makefile
+++ b/drivers/input/rmi4/Makefile
@@ -7,6 +7,7 @@ rmi_core-$(CONFIG_RMI4_2D_SENSOR) += rmi_2d_sensor.o
 rmi_core-$(CONFIG_RMI4_F11) += rmi_f11.o
 rmi_core-$(CONFIG_RMI4_F12) += rmi_f12.o
 rmi_core-$(CONFIG_RMI4_F30) += rmi_f30.o
+rmi_core-$(CONFIG_RMI4_F54) += rmi_f54.o
 
 # Transports
 obj-$(CONFIG_RMI4_I2C) += rmi_i2c.o
diff --git a/drivers/input/rmi4/rmi_bus.c b/drivers/input/rmi4/rmi_bus.c
index a73580654c6b..09c769c6e91f 100644
--- a/drivers/input/rmi4/rmi_bus.c
+++ b/drivers/input/rmi4/rmi_bus.c
@@ -312,6 +312,9 @@ static struct rmi_function_handler *fn_handlers[] = {
 #ifdef CONFIG_RMI4_F30
         &rmi_f30_handler,
 #endif
+#ifdef CONFIG_RMI4_F54
+        &rmi_f54_handler,
+#endif
 };
 
 static void __rmi_unregister_function_handlers(int start_idx)
diff --git a/drivers/input/rmi4/rmi_driver.h b/drivers/input/rmi4/rmi_driver.h
index 6e140fa3cce1..8dfbebe9bf86 100644
--- a/drivers/input/rmi4/rmi_driver.h
+++ b/drivers/input/rmi4/rmi_driver.h
@@ -102,4 +102,5 @@ extern struct rmi_function_handler rmi_f01_handler;
 extern struct rmi_function_handler rmi_f11_handler;
 extern struct rmi_function_handler rmi_f12_handler;
 extern struct rmi_function_handler rmi_f30_handler;
+extern struct rmi_function_handler rmi_f54_handler;
 #endif
diff --git a/drivers/input/rmi4/rmi_f54.c b/drivers/input/rmi4/rmi_f54.c
new file mode 100644
index 000000000000..cf805b960866
--- /dev/null
+++ b/drivers/input/rmi4/rmi_f54.c
@@ -0,0 +1,757 @@
+/*
+ * Copyright (c) 2012-2015 Synaptics Incorporated
+ * Copyright (C) 2016 Zodiac Inflight Innovations
+ *
+ * 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/rmi.h>
+#include <linux/input.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/i2c.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-ioctl.h>
+#include <media/videobuf2-v4l2.h>
+#include <media/videobuf2-vmalloc.h>
+#include "rmi_driver.h"
+
+#define F54_NAME                "rmi4_f54"
+
+/* F54 data offsets */
+#define F54_REPORT_DATA_OFFSET  3
+#define F54_FIFO_OFFSET         1
+#define F54_NUM_TX_OFFSET       1
+#define F54_NUM_RX_OFFSET       0
+
+/* F54 commands */
+#define F54_GET_REPORT          1
+#define F54_FORCE_CAL           2
+
+/* Fixed sizes of reports */
+#define F54_QUERY_LEN                   27
+
+/* F54 capabilities */
+#define F54_CAP_BASELINE        (1 << 2)
+#define F54_CAP_IMAGE8          (1 << 3)
+#define F54_CAP_IMAGE16         (1 << 6)
+
+/**
+ * enum rmi_f54_report_type - RMI4 F54 report types
+ *
+ * @F54_8BIT_IMAGE:     Normalized 8-Bit Image Report. The capacitance variance
+ *                      from baseline for each pixel.
+ *
+ * @F54_16BIT_IMAGE:    Normalized 16-Bit Image Report. The capacitance variance
+ *                      from baseline for each pixel.
+ *
+ * @F54_RAW_16BIT_IMAGE:
+ *                      Raw 16-Bit Image Report. The raw capacitance for each
+ *                      pixel.
+ *
+ * @F54_TRUE_BASELINE:  True Baseline Report. The baseline capacitance for each
+ *                      pixel.
+ *
+ * @F54_FULL_RAW_CAP:   Full Raw Capacitance Report. The raw capacitance with
+ *                      low reference set to its minimum value and high
+ *                      reference set to its maximum value.
+ *
+ * @F54_FULL_RAW_CAP_RX_OFFSET_REMOVED:
+ *                      Full Raw Capacitance with Receiver Offset Removed
+ *                      Report. Set Low reference to its minimum value and high
+ *                      references to its maximum value, then report the raw
+ *                      capacitance for each pixel.
+ */
+enum rmi_f54_report_type {
+        F54_REPORT_NONE = 0,
+        F54_8BIT_IMAGE = 1,
+        F54_16BIT_IMAGE = 2,
+        F54_RAW_16BIT_IMAGE = 3,
+        F54_TRUE_BASELINE = 9,
+        F54_FULL_RAW_CAP = 19,
+        F54_FULL_RAW_CAP_RX_OFFSET_REMOVED = 20,
+        F54_MAX_REPORT_TYPE,
+};
+
+const char *rmi_f54_report_type_names[] = {
+        [F54_REPORT_NONE]               = "Unknown",
+        [F54_8BIT_IMAGE]                = "Normalized 8-Bit Image",
+        [F54_16BIT_IMAGE]               = "Normalized 16-Bit Image",
+        [F54_RAW_16BIT_IMAGE]           = "Raw 16-Bit Image",
+        [F54_TRUE_BASELINE]             = "True Baseline",
+        [F54_FULL_RAW_CAP]              = "Full Raw Capacitance",
+        [F54_FULL_RAW_CAP_RX_OFFSET_REMOVED]
+                                        = "Full Raw Capacitance RX Offset Removed",
+};
+
+struct rmi_f54_reports {
+        int start;
+        int size;
+};
+
+struct f54_data {
+        struct rmi_function *fn;
+
+        u8 qry[F54_QUERY_LEN];
+        u8 num_rx_electrodes;
+        u8 num_tx_electrodes;
+        u8 capabilities;
+        u16 clock_rate;
+        u8 family;
+
+        enum rmi_f54_report_type report_type;
+        u8 *report_data;
+        int report_size;
+        struct rmi_f54_reports standard_report[2];
+
+        bool is_busy;
+        struct mutex status_mutex;
+        struct mutex data_mutex;
+
+        struct workqueue_struct *workqueue;
+        struct delayed_work work;
+        unsigned long timeout;
+
+        struct completion cmd_done;
+
+        /* V4L2 support */
+        struct v4l2_device v4l2;
+        struct v4l2_pix_format format;
+        struct video_device vdev;
+        struct vb2_queue queue;
+        struct mutex lock;
+        int input;
+        enum rmi_f54_report_type inputs[F54_MAX_REPORT_TYPE];
+};
+
+/*
+ * Basic checks on report_type to ensure we write a valid type
+ * to the sensor.
+ */
+static bool is_f54_report_type_valid(struct f54_data *f54,
+                                     enum rmi_f54_report_type reptype)
+{
+        switch (reptype) {
+        case F54_8BIT_IMAGE:
+                return f54->capabilities & F54_CAP_IMAGE8;
+        case F54_16BIT_IMAGE:
+        case F54_RAW_16BIT_IMAGE:
+                return f54->capabilities & F54_CAP_IMAGE16;
+        case F54_TRUE_BASELINE:
+                return f54->capabilities & F54_CAP_IMAGE16;
+        case F54_FULL_RAW_CAP:
+        case F54_FULL_RAW_CAP_RX_OFFSET_REMOVED:
+                return true;
+        default:
+                return false;
+        }
+}
+
+static enum rmi_f54_report_type rmi_f54_get_reptype(struct f54_data *f54,
+                                                unsigned int i)
+{
+        if (i >= F54_MAX_REPORT_TYPE)
+                return F54_REPORT_NONE;
+
+        return f54->inputs[i];
+}
+
+static void rmi_f54_create_input_map(struct f54_data *f54)
+{
+        int i = 0;
+        enum rmi_f54_report_type reptype;
+
+        for (reptype = 1; reptype < F54_MAX_REPORT_TYPE; reptype++) {
+                if (!is_f54_report_type_valid(f54, reptype))
+                        continue;
+
+                f54->inputs[i++] = reptype;
+        }
+
+        /* Remaining values are zero via kzalloc */
+}
+
+static int rmi_f54_request_report(struct rmi_function *fn, u8 report_type)
+{
+        struct f54_data *f54 = dev_get_drvdata(&fn->dev);
+        struct rmi_device *rmi_dev = fn->rmi_dev;
+        int error;
+
+        /* Write Report Type into F54_AD_Data0 */
+        if (f54->report_type != report_type) {
+                error = rmi_write(rmi_dev, f54->fn->fd.data_base_addr,
+                                  report_type);
+                if (error)
+                        return error;
+                f54->report_type = report_type;
+        }
+
+        /*
+         * Small delay after disabling interrupts to avoid race condition
+         * in firmare. This value is a bit higher than absolutely necessary.
+         * Should be removed once issue is resolved in firmware.
+         */
+        usleep_range(2000, 3000);
+
+        mutex_lock(&f54->data_mutex);
+
+        error = rmi_write(rmi_dev, fn->fd.command_base_addr, F54_GET_REPORT);
+        if (error < 0)
+                return error;
+
+        init_completion(&f54->cmd_done);
+
+        f54->is_busy = 1;
+        f54->timeout = jiffies + msecs_to_jiffies(100);
+
+        queue_delayed_work(f54->workqueue, &f54->work, 0);
+
+        mutex_unlock(&f54->data_mutex);
+
+        return 0;
+}
+
+static size_t rmi_f54_get_report_size(struct f54_data *f54)
+{
+        u8 rx = f54->num_rx_electrodes ? : f54->num_rx_electrodes;
+        u8 tx = f54->num_tx_electrodes ? : f54->num_tx_electrodes;
+        size_t size;
+
+        switch (rmi_f54_get_reptype(f54, f54->input)) {
+        case F54_8BIT_IMAGE:
+                size = rx * tx;
+                break;
+        case F54_16BIT_IMAGE:
+        case F54_RAW_16BIT_IMAGE:
+        case F54_TRUE_BASELINE:
+        case F54_FULL_RAW_CAP:
+        case F54_FULL_RAW_CAP_RX_OFFSET_REMOVED:
+                size = sizeof(u16) * rx * tx;
+                break;
+        default:
+                size = 0;
+        }
+
+        return size;
+}
+
+static int rmi_f54_get_pixel_fmt(enum rmi_f54_report_type reptype, u32 *pixfmt)
+{
+        int ret = 0;
+
+        switch (reptype) {
+        case F54_8BIT_IMAGE:
+                *pixfmt = V4L2_TCH_FMT_DELTA_TD08;
+                break;
+
+        case F54_16BIT_IMAGE:
+                *pixfmt = V4L2_TCH_FMT_DELTA_TD16;
+                break;
+
+        case F54_RAW_16BIT_IMAGE:
+        case F54_TRUE_BASELINE:
+        case F54_FULL_RAW_CAP:
+        case F54_FULL_RAW_CAP_RX_OFFSET_REMOVED:
+                *pixfmt = V4L2_TCH_FMT_TU16;
+                break;
+
+        case F54_REPORT_NONE:
+        case F54_MAX_REPORT_TYPE:
+                ret = -EINVAL;
+                break;
+        }
+
+        return ret;
+}
+
+static const struct v4l2_file_operations rmi_f54_video_fops = {
+        .owner = THIS_MODULE,
+        .open = v4l2_fh_open,
+        .release = vb2_fop_release,
+        .unlocked_ioctl = video_ioctl2,
+        .read = vb2_fop_read,
+        .mmap = vb2_fop_mmap,
+        .poll = vb2_fop_poll,
+};
+
+static int rmi_f54_queue_setup(struct vb2_queue *q, unsigned int *nbuffers,
+                               unsigned int *nplanes, unsigned int sizes[],
+                               struct device *alloc_devs[])
+{
+        struct f54_data *f54 = q->drv_priv;
+
+        if (*nplanes)
+                return sizes[0] < rmi_f54_get_report_size(f54) ? -EINVAL : 0;
+
+        *nplanes = 1;
+        sizes[0] = rmi_f54_get_report_size(f54);
+
+        return 0;
+}
+
+static void rmi_f54_buffer_queue(struct vb2_buffer *vb)
+{
+        struct f54_data *f54 = vb2_get_drv_priv(vb->vb2_queue);
+        u16 *ptr;
+        enum vb2_buffer_state state;
+        enum rmi_f54_report_type reptype;
+        int ret;
+
+        mutex_lock(&f54->status_mutex);
+
+        reptype = rmi_f54_get_reptype(f54, f54->input);
+        if (reptype == F54_REPORT_NONE) {
+                state = VB2_BUF_STATE_ERROR;
+                goto done;
+        }
+
+        if (f54->is_busy) {
+                state = VB2_BUF_STATE_ERROR;
+                goto done;
+        }
+
+        ret = rmi_f54_request_report(f54->fn, reptype);
+        if (ret) {
+                dev_err(&f54->fn->dev, "Error requesting F54 report\n");
+                state = VB2_BUF_STATE_ERROR;
+                goto done;
+        }
+
+        /* get frame data */
+        mutex_lock(&f54->data_mutex);
+
+        while (f54->is_busy) {
+                mutex_unlock(&f54->data_mutex);
+                if (!wait_for_completion_timeout(&f54->cmd_done,
+                                                 msecs_to_jiffies(1000))) {
+                        dev_err(&f54->fn->dev, "Timed out\n");
+                        state = VB2_BUF_STATE_ERROR;
+                        goto done;
+                }
+                mutex_lock(&f54->data_mutex);
+        }
+
+        ptr = vb2_plane_vaddr(vb, 0);
+        if (!ptr) {
+                dev_err(&f54->fn->dev, "Error acquiring frame ptr\n");
+                state = VB2_BUF_STATE_ERROR;
+                goto data_done;
+        }
+
+        memcpy(ptr, f54->report_data, f54->report_size);
+        vb2_set_plane_payload(vb, 0, rmi_f54_get_report_size(f54));
+        state = VB2_BUF_STATE_DONE;
+
+data_done:
+        mutex_unlock(&f54->data_mutex);
+done:
+        vb2_buffer_done(vb, state);
+        mutex_unlock(&f54->status_mutex);
+}
+
+/* V4L2 structures */
+static const struct vb2_ops rmi_f54_queue_ops = {
+        .queue_setup            = rmi_f54_queue_setup,
+        .buf_queue              = rmi_f54_buffer_queue,
+        .wait_prepare           = vb2_ops_wait_prepare,
+        .wait_finish            = vb2_ops_wait_finish,
+};
+
+static const struct vb2_queue rmi_f54_queue = {
+        .type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
+        .io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF | VB2_READ,
+        .buf_struct_size = sizeof(struct vb2_buffer),
+        .ops = &rmi_f54_queue_ops,
+        .mem_ops = &vb2_vmalloc_memops,
+        .timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC,
+        .min_buffers_needed = 1,
+};
+
+static int rmi_f54_vidioc_querycap(struct file *file, void *priv,
+                                   struct v4l2_capability *cap)
+{
+        struct f54_data *f54 = video_drvdata(file);
+
+        strlcpy(cap->driver, F54_NAME, sizeof(cap->driver));
+        strlcpy(cap->card, SYNAPTICS_INPUT_DEVICE_NAME, sizeof(cap->card));
+        snprintf(cap->bus_info, sizeof(cap->bus_info),
+                "rmi4:%s", dev_name(&f54->fn->dev));
+
+        return 0;
+}
+
+static int rmi_f54_vidioc_enum_input(struct file *file, void *priv,
+                                     struct v4l2_input *i)
+{
+        struct f54_data *f54 = video_drvdata(file);
+        enum rmi_f54_report_type reptype;
+
+        reptype = rmi_f54_get_reptype(f54, i->index);
+        if (reptype == F54_REPORT_NONE)
+                return -EINVAL;
+
+        i->type = V4L2_INPUT_TYPE_TOUCH;
+
+        strlcpy(i->name, rmi_f54_report_type_names[reptype], sizeof(i->name));
+        return 0;
+}
+
+static int rmi_f54_set_input(struct f54_data *f54, unsigned int i)
+{
+        struct v4l2_pix_format *f = &f54->format;
+        enum rmi_f54_report_type reptype;
+        int ret;
+
+        reptype = rmi_f54_get_reptype(f54, i);
+        if (reptype == F54_REPORT_NONE)
+                return -EINVAL;
+
+        ret = rmi_f54_get_pixel_fmt(reptype, &f->pixelformat);
+        if (ret)
+                return ret;
+
+        f54->input = i;
+
+        f->width = f54->num_rx_electrodes;
+        f->height = f54->num_tx_electrodes;
+        f->field = V4L2_FIELD_NONE;
+        f->colorspace = V4L2_COLORSPACE_RAW;
+        f->bytesperline = f->width * sizeof(u16);
+        f->sizeimage = f->width * f->height * sizeof(u16);
+
+        return 0;
+}
+
+static int rmi_f54_vidioc_s_input(struct file *file, void *priv, unsigned int i)
+{
+        return rmi_f54_set_input(video_drvdata(file), i);
+}
+
+static int rmi_f54_vidioc_g_input(struct file *file, void *priv,
+                                  unsigned int *i)
+{
+        struct f54_data *f54 = video_drvdata(file);
+
+        *i = f54->input;
+
+        return 0;
+}
+
+static int rmi_f54_vidioc_fmt(struct file *file, void *priv,
+                              struct v4l2_format *f)
+{
+        struct f54_data *f54 = video_drvdata(file);
+
+        f->fmt.pix = f54->format;
+
+        return 0;
+}
+
+static int rmi_f54_vidioc_enum_fmt(struct file *file, void *priv,
+                                   struct v4l2_fmtdesc *fmt)
+{
+        if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                return -EINVAL;
+
+        switch (fmt->index) {
+        case 0:
+                fmt->pixelformat = V4L2_TCH_FMT_DELTA_TD16;
+                break;
+
+        case 1:
+                fmt->pixelformat = V4L2_TCH_FMT_DELTA_TD08;
+                break;
+
+        case 2:
+                fmt->pixelformat = V4L2_TCH_FMT_TU16;
+                break;
+
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int rmi_f54_vidioc_g_parm(struct file *file, void *fh,
+                                 struct v4l2_streamparm *a)
+{
+        if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                return -EINVAL;
+
+        a->parm.capture.readbuffers = 1;
+        a->parm.capture.timeperframe.numerator = 1;
+        a->parm.capture.timeperframe.denominator = 10;
+        return 0;
+}
+
+static const struct v4l2_ioctl_ops rmi_f54_video_ioctl_ops = {
+        .vidioc_querycap        = rmi_f54_vidioc_querycap,
+
+        .vidioc_enum_fmt_vid_cap = rmi_f54_vidioc_enum_fmt,
+        .vidioc_s_fmt_vid_cap   = rmi_f54_vidioc_fmt,
+        .vidioc_g_fmt_vid_cap   = rmi_f54_vidioc_fmt,
+        .vidioc_try_fmt_vid_cap = rmi_f54_vidioc_fmt,
+        .vidioc_g_parm          = rmi_f54_vidioc_g_parm,
+
+        .vidioc_enum_input      = rmi_f54_vidioc_enum_input,
+        .vidioc_g_input         = rmi_f54_vidioc_g_input,
+        .vidioc_s_input         = rmi_f54_vidioc_s_input,
+
+        .vidioc_reqbufs         = vb2_ioctl_reqbufs,
+        .vidioc_create_bufs     = vb2_ioctl_create_bufs,
+        .vidioc_querybuf        = vb2_ioctl_querybuf,
+        .vidioc_qbuf            = vb2_ioctl_qbuf,
+        .vidioc_dqbuf           = vb2_ioctl_dqbuf,
+        .vidioc_expbuf          = vb2_ioctl_expbuf,
+
+        .vidioc_streamon        = vb2_ioctl_streamon,
+        .vidioc_streamoff       = vb2_ioctl_streamoff,
+};
+
+static const struct video_device rmi_f54_video_device = {
+        .name = "Synaptics RMI4",
+        .fops = &rmi_f54_video_fops,
+        .ioctl_ops = &rmi_f54_video_ioctl_ops,
+        .release = video_device_release_empty,
+        .device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_TOUCH |
+                       V4L2_CAP_READWRITE | V4L2_CAP_STREAMING,
+};
+
+static void rmi_f54_work(struct work_struct *work)
+{
+        struct f54_data *f54 = container_of(work, struct f54_data, work.work);
+        struct rmi_function *fn = f54->fn;
+        u8 fifo[2];
+        struct rmi_f54_reports *report;
+        int report_size;
+        u8 command;
+        u8 *data;
+        int error;
+
+        data = f54->report_data;
+        report_size = rmi_f54_get_report_size(f54);
+        if (report_size == 0) {
+                dev_err(&fn->dev, "Bad report size, report type=%d\n",
+                                f54->report_type);
+                error = -EINVAL;
+                goto error;     /* retry won't help */
+        }
+        f54->standard_report[0].size = report_size;
+        report = f54->standard_report;
+
+        mutex_lock(&f54->data_mutex);
+
+        /*
+         * Need to check if command has completed.
+         * If not try again later.
+         */
+        error = rmi_read(fn->rmi_dev, f54->fn->fd.command_base_addr,
+                         &command);
+        if (error) {
+                dev_err(&fn->dev, "Failed to read back command\n");
+                goto error;
+        }
+        if (command & F54_GET_REPORT) {
+                if (time_after(jiffies, f54->timeout)) {
+                        dev_err(&fn->dev, "Get report command timed out\n");
+                        error = -ETIMEDOUT;
+                }
+                report_size = 0;
+                goto error;
+        }
+
+        rmi_dbg(RMI_DEBUG_FN, &fn->dev, "Get report command completed, reading data\n");
+
+        report_size = 0;
+        for (; report->size; report++) {
+                fifo[0] = report->start & 0xff;
+                fifo[1] = (report->start >> 8) & 0xff;
+                error = rmi_write_block(fn->rmi_dev,
+                                        fn->fd.data_base_addr + F54_FIFO_OFFSET,
+                                        fifo, sizeof(fifo));
+                if (error) {
+                        dev_err(&fn->dev, "Failed to set fifo start offset\n");
+                        goto abort;
+                }
+
+                error = rmi_read_block(fn->rmi_dev, fn->fd.data_base_addr +
+                                       F54_REPORT_DATA_OFFSET, data,
+                                       report->size);
+                if (error) {
+                        dev_err(&fn->dev, "%s: read [%d bytes] returned %d\n",
+                                __func__, report->size, error);
+                        goto abort;
+                }
+                data += report->size;
+                report_size += report->size;
+        }
+
+abort:
+        f54->report_size = error ? 0 : report_size;
+error:
+        if (error)
+                report_size = 0;
+
+        if (report_size == 0 && !error) {
+                queue_delayed_work(f54->workqueue, &f54->work,
+                                   msecs_to_jiffies(1));
+        } else {
+                f54->is_busy = false;
+                complete(&f54->cmd_done);
+        }
+
+        mutex_unlock(&f54->data_mutex);
+}
+
+static int rmi_f54_attention(struct rmi_function *fn, unsigned long *irqbits)
+{
+        return 0;
+}
+
+static int rmi_f54_config(struct rmi_function *fn)
+{
+        struct rmi_driver *drv = fn->rmi_dev->driver;
+
+        drv->set_irq_bits(fn->rmi_dev, fn->irq_mask);
+
+        return 0;
+}
+
+static int rmi_f54_detect(struct rmi_function *fn)
+{
+        int error;
+        struct f54_data *f54;
+
+        f54 = dev_get_drvdata(&fn->dev);
+
+        error = rmi_read_block(fn->rmi_dev, fn->fd.query_base_addr,
+                               &f54->qry, sizeof(f54->qry));
+        if (error) {
+                dev_err(&fn->dev, "%s: Failed to query F54 properties\n",
+                        __func__);
+                return error;
+        }
+
+        f54->num_rx_electrodes = f54->qry[0];
+        f54->num_tx_electrodes = f54->qry[1];
+        f54->capabilities = f54->qry[2];
+        f54->clock_rate = f54->qry[3] | (f54->qry[4] << 8);
+        f54->family = f54->qry[5];
+
+        rmi_dbg(RMI_DEBUG_FN, &fn->dev, "F54 num_rx_electrodes: %d\n",
+                f54->num_rx_electrodes);
+        rmi_dbg(RMI_DEBUG_FN, &fn->dev, "F54 num_tx_electrodes: %d\n",
+                f54->num_tx_electrodes);
+        rmi_dbg(RMI_DEBUG_FN, &fn->dev, "F54 capabilities: 0x%x\n",
+                f54->capabilities);
+        rmi_dbg(RMI_DEBUG_FN, &fn->dev, "F54 clock rate: 0x%x\n",
+                f54->clock_rate);
+        rmi_dbg(RMI_DEBUG_FN, &fn->dev, "F54 family: 0x%x\n",
+                f54->family);
+
+        f54->is_busy = false;
+
+        return 0;
+}
+
+static int rmi_f54_probe(struct rmi_function *fn)
+{
+        struct f54_data *f54;
+        int ret;
+        u8 rx, tx;
+
+        f54 = devm_kzalloc(&fn->dev, sizeof(struct f54_data), GFP_KERNEL);
+        if (!f54)
+                return -ENOMEM;
+
+        f54->fn = fn;
+        dev_set_drvdata(&fn->dev, f54);
+
+        ret = rmi_f54_detect(fn);
+        if (ret)
+                return ret;
+
+        mutex_init(&f54->data_mutex);
+        mutex_init(&f54->status_mutex);
+
+        rx = f54->num_rx_electrodes;
+        tx = f54->num_tx_electrodes;
+        f54->report_data = devm_kzalloc(&fn->dev,
+                                        sizeof(u16) * tx * rx,
+                                        GFP_KERNEL);
+        if (f54->report_data == NULL)
+                return -ENOMEM;
+
+        INIT_DELAYED_WORK(&f54->work, rmi_f54_work);
+
+        f54->workqueue = create_singlethread_workqueue("rmi4-poller");
+        if (!f54->workqueue)
+                return -ENOMEM;
+
+        rmi_f54_create_input_map(f54);
+
+        /* register video device */
+        strlcpy(f54->v4l2.name, F54_NAME, sizeof(f54->v4l2.name));
+        ret = v4l2_device_register(&fn->dev, &f54->v4l2);
+        if (ret) {
+                dev_err(&fn->dev, "Unable to register video dev.\n");
+                goto remove_wq;
+        }
+
+        /* initialize the queue */
+        mutex_init(&f54->lock);
+        f54->queue = rmi_f54_queue;
+        f54->queue.drv_priv = f54;
+        f54->queue.lock = &f54->lock;
+        f54->queue.dev = &fn->dev;
+
+        ret = vb2_queue_init(&f54->queue);
+        if (ret)
+                goto remove_v4l2;
+
+        f54->vdev = rmi_f54_video_device;
+        f54->vdev.v4l2_dev = &f54->v4l2;
+        f54->vdev.lock = &f54->lock;
+        f54->vdev.vfl_dir = VFL_DIR_RX;
+        f54->vdev.queue = &f54->queue;
+        video_set_drvdata(&f54->vdev, f54);
+
+        ret = video_register_device(&f54->vdev, VFL_TYPE_TOUCH, -1);
+        if (ret) {
+                dev_err(&fn->dev, "Unable to register video subdevice.");
+                goto remove_v4l2;
+        }
+
+        return 0;
+
+remove_v4l2:
+        v4l2_device_unregister(&f54->v4l2);
+remove_wq:
+        cancel_delayed_work_sync(&f54->work);
+        flush_workqueue(f54->workqueue);
+        destroy_workqueue(f54->workqueue);
+        return ret;
+}
+
+static void rmi_f54_remove(struct rmi_function *fn)
+{
+        struct f54_data *f54 = dev_get_drvdata(&fn->dev);
+
+        video_unregister_device(&f54->vdev);
+        v4l2_device_unregister(&f54->v4l2);
+}
+
+struct rmi_function_handler rmi_f54_handler = {
+        .driver = {
+                .name = F54_NAME,
+        },
+        .func = 0x54,
+        .probe = rmi_f54_probe,
+        .config = rmi_f54_config,
+        .attention = rmi_f54_attention,
+        .remove = rmi_f54_remove,
+};
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 507981356921..efca0133e266 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -115,6 +115,15 @@ config TOUCHSCREEN_ATMEL_MXT
           To compile this driver as a module, choose M here: the
           module will be called atmel_mxt_ts.
 
+config TOUCHSCREEN_ATMEL_MXT_T37
+        bool "Support T37 Diagnostic Data"
+        depends on TOUCHSCREEN_ATMEL_MXT
+        depends on VIDEO_V4L2=y || (TOUCHSCREEN_ATMEL_MXT=m && VIDEO_V4L2=m)
+        select VIDEOBUF2_VMALLOC
+        help
+          Say Y here if you want support to output data from the T37
+          Diagnostic Data object using a V4L device.
+
 config TOUCHSCREEN_AUO_PIXCIR
         tristate "AUO in-cell touchscreen using Pixcir ICs"
         depends on I2C
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index 5af7907d0af4..e5d185fe69b9 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2010 Samsung Electronics Co.Ltd
  * Copyright (C) 2011-2014 Atmel Corporation
  * Copyright (C) 2012 Google, Inc.
+ * Copyright (C) 2016 Zodiac Inflight Innovations
  *
  * Author: Joonyoung Shim <jy0922.shim@samsung.com>
  *
@@ -28,6 +29,10 @@
 #include <linux/of.h>
 #include <linux/slab.h>
 #include <asm/unaligned.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-ioctl.h>
+#include <media/videobuf2-v4l2.h>
+#include <media/videobuf2-vmalloc.h>
 
 /* Firmware files */
 #define MXT_FW_NAME             "maxtouch.fw"
@@ -99,6 +104,8 @@ struct t7_config {
 
 /* MXT_TOUCH_MULTI_T9 field */
 #define MXT_T9_CTRL             0
+#define MXT_T9_XSIZE            3
+#define MXT_T9_YSIZE            4
 #define MXT_T9_ORIENT           9
 #define MXT_T9_RANGE            18
 
@@ -119,11 +126,31 @@ struct t9_range {
 
 /* MXT_TOUCH_MULTI_T9 orient */
 #define MXT_T9_ORIENT_SWITCH    (1 << 0)
+#define MXT_T9_ORIENT_INVERTX   (1 << 1)
+#define MXT_T9_ORIENT_INVERTY   (1 << 2)
 
 /* MXT_SPT_COMMSCONFIG_T18 */
 #define MXT_COMMS_CTRL          0
 #define MXT_COMMS_CMD           1
 
+/* MXT_DEBUG_DIAGNOSTIC_T37 */
+#define MXT_DIAGNOSTIC_PAGEUP   0x01
+#define MXT_DIAGNOSTIC_DELTAS   0x10
+#define MXT_DIAGNOSTIC_REFS     0x11
+#define MXT_DIAGNOSTIC_SIZE     128
+
+#define MXT_FAMILY_1386                 160
+#define MXT1386_COLUMNS                 3
+#define MXT1386_PAGES_PER_COLUMN        8
+
+struct t37_debug {
+#ifdef CONFIG_TOUCHSCREEN_ATMEL_MXT_T37
+        u8 mode;
+        u8 page;
+        u8 data[MXT_DIAGNOSTIC_SIZE];
+#endif
+};
+
 /* Define for MXT_GEN_COMMAND_T6 */
 #define MXT_BOOT_VALUE          0xa5
 #define MXT_RESET_VALUE         0x01
@@ -133,10 +160,14 @@ struct t9_range {
 #define MXT_T100_CTRL           0
 #define MXT_T100_CFG1           1
 #define MXT_T100_TCHAUX         3
+#define MXT_T100_XSIZE          9
 #define MXT_T100_XRANGE         13
+#define MXT_T100_YSIZE          20
 #define MXT_T100_YRANGE         24
 
 #define MXT_T100_CFG_SWITCHXY   BIT(5)
+#define MXT_T100_CFG_INVERTY    BIT(6)
+#define MXT_T100_CFG_INVERTX    BIT(7)
 
 #define MXT_T100_TCHAUX_VECT    BIT(0)
 #define MXT_T100_TCHAUX_AMPL    BIT(1)
@@ -205,6 +236,37 @@ struct mxt_object {
         u8 num_report_ids;
 } __packed;
 
+struct mxt_dbg {
+        u16 t37_address;
+        u16 diag_cmd_address;
+        struct t37_debug *t37_buf;
+        unsigned int t37_pages;
+        unsigned int t37_nodes;
+
+        struct v4l2_device v4l2;
+        struct v4l2_pix_format format;
+        struct video_device vdev;
+        struct vb2_queue queue;
+        struct mutex lock;
+        int input;
+};
+
+enum v4l_dbg_inputs {
+        MXT_V4L_INPUT_DELTAS,
+        MXT_V4L_INPUT_REFS,
+        MXT_V4L_INPUT_MAX,
+};
+
+static const struct v4l2_file_operations mxt_video_fops = {
+        .owner = THIS_MODULE,
+        .open = v4l2_fh_open,
+        .release = vb2_fop_release,
+        .unlocked_ioctl = video_ioctl2,
+        .read = vb2_fop_read,
+        .mmap = vb2_fop_mmap,
+        .poll = vb2_fop_poll,
+};
+
 /* Each client has this additional data */
 struct mxt_data {
         struct i2c_client *client;
@@ -216,7 +278,11 @@ struct mxt_data {
         unsigned int irq;
         unsigned int max_x;
         unsigned int max_y;
+        bool invertx;
+        bool inverty;
         bool xy_switch;
+        u8 xsize;
+        u8 ysize;
         bool in_bootloader;
         u16 mem_size;
         u8 t100_aux_ampl;
@@ -233,6 +299,7 @@ struct mxt_data {
         u8 num_touchids;
         u8 multitouch;
         struct t7_config t7_cfg;
+        struct mxt_dbg dbg;
 
         /* Cached parameters from object table */
         u16 T5_address;
@@ -257,6 +324,11 @@ struct mxt_data {
         struct completion crc_completion;
 };
 
+struct mxt_vb2_buffer {
+        struct vb2_buffer       vb;
+        struct list_head        list;
+};
+
 static size_t mxt_obj_size(const struct mxt_object *obj)
 {
         return obj->size_minus_one + 1;
@@ -1503,6 +1575,11 @@ static void mxt_free_input_device(struct mxt_data *data)
 
 static void mxt_free_object_table(struct mxt_data *data)
 {
+#ifdef CONFIG_TOUCHSCREEN_ATMEL_MXT_T37
+        video_unregister_device(&data->dbg.vdev);
+        v4l2_device_unregister(&data->dbg.v4l2);
+#endif
+
         kfree(data->object_table);
         data->object_table = NULL;
         kfree(data->msg_buf);
@@ -1661,6 +1738,18 @@ static int mxt_read_t9_resolution(struct mxt_data *data)
                 return -EINVAL;
 
         error = __mxt_read_reg(client,
+                               object->start_address + MXT_T9_XSIZE,
+                               sizeof(data->xsize), &data->xsize);
+        if (error)
+                return error;
+
+        error = __mxt_read_reg(client,
+                               object->start_address + MXT_T9_YSIZE,
+                               sizeof(data->ysize), &data->ysize);
+        if (error)
+                return error;
+
+        error = __mxt_read_reg(client,
                                object->start_address + MXT_T9_RANGE,
                                sizeof(range), &range);
         if (error)
@@ -1676,6 +1765,8 @@ static int mxt_read_t9_resolution(struct mxt_data *data)
                 return error;
 
         data->xy_switch = orient & MXT_T9_ORIENT_SWITCH;
+        data->invertx = orient & MXT_T9_ORIENT_INVERTX;
+        data->inverty = orient & MXT_T9_ORIENT_INVERTY;
 
         return 0;
 }
@@ -1710,6 +1801,18 @@ static int mxt_read_t100_config(struct mxt_data *data)
 
         data->max_y = get_unaligned_le16(&range_y);
 
+        error = __mxt_read_reg(client,
+                               object->start_address + MXT_T100_XSIZE,
+                               sizeof(data->xsize), &data->xsize);
+        if (error)
+                return error;
+
+        error = __mxt_read_reg(client,
+                               object->start_address + MXT_T100_YSIZE,
+                               sizeof(data->ysize), &data->ysize);
+        if (error)
+                return error;
+
         /* read orientation config */
         error =  __mxt_read_reg(client,
                                 object->start_address + MXT_T100_CFG1,
@@ -1718,6 +1821,8 @@ static int mxt_read_t100_config(struct mxt_data *data)
                 return error;
 
         data->xy_switch = cfg & MXT_T100_CFG_SWITCHXY;
+        data->invertx = cfg & MXT_T100_CFG_INVERTX;
+        data->inverty = cfg & MXT_T100_CFG_INVERTY;
 
         /* allocate aux bytes */
         error =  __mxt_read_reg(client,
@@ -2043,6 +2148,420 @@ recheck:
         return 0;
 }
 
+#ifdef CONFIG_TOUCHSCREEN_ATMEL_MXT_T37
+static u16 mxt_get_debug_value(struct mxt_data *data, unsigned int x,
+                               unsigned int y)
+{
+        struct mxt_info *info = &data->info;
+        struct mxt_dbg *dbg = &data->dbg;
+        unsigned int ofs, page;
+        unsigned int col = 0;
+        unsigned int col_width;
+
+        if (info->family_id == MXT_FAMILY_1386) {
+                col_width = info->matrix_ysize / MXT1386_COLUMNS;
+                col = y / col_width;
+                y = y % col_width;
+        } else {
+                col_width = info->matrix_ysize;
+        }
+
+        ofs = (y + (x * col_width)) * sizeof(u16);
+        page = ofs / MXT_DIAGNOSTIC_SIZE;
+        ofs %= MXT_DIAGNOSTIC_SIZE;
+
+        if (info->family_id == MXT_FAMILY_1386)
+                page += col * MXT1386_PAGES_PER_COLUMN;
+
+        return get_unaligned_le16(&dbg->t37_buf[page].data[ofs]);
+}
+
+static int mxt_convert_debug_pages(struct mxt_data *data, u16 *outbuf)
+{
+        struct mxt_dbg *dbg = &data->dbg;
+        unsigned int x = 0;
+        unsigned int y = 0;
+        unsigned int i, rx, ry;
+
+        for (i = 0; i < dbg->t37_nodes; i++) {
+                /* Handle orientation */
+                rx = data->xy_switch ? y : x;
+                ry = data->xy_switch ? x : y;
+                rx = data->invertx ? (data->xsize - 1 - rx) : rx;
+                ry = data->inverty ? (data->ysize - 1 - ry) : ry;
+
+                outbuf[i] = mxt_get_debug_value(data, rx, ry);
+
+                /* Next value */
+                if (++x >= (data->xy_switch ? data->ysize : data->xsize)) {
+                        x = 0;
+                        y++;
+                }
+        }
+
+        return 0;
+}
+
+static int mxt_read_diagnostic_debug(struct mxt_data *data, u8 mode,
+                                     u16 *outbuf)
+{
+        struct mxt_dbg *dbg = &data->dbg;
+        int retries = 0;
+        int page;
+        int ret;
+        u8 cmd = mode;
+        struct t37_debug *p;
+        u8 cmd_poll;
+
+        for (page = 0; page < dbg->t37_pages; page++) {
+                p = dbg->t37_buf + page;
+
+                ret = mxt_write_reg(data->client, dbg->diag_cmd_address,
+                                    cmd);
+                if (ret)
+                        return ret;
+
+                retries = 0;
+                msleep(20);
+wait_cmd:
+                /* Read back command byte */
+                ret = __mxt_read_reg(data->client, dbg->diag_cmd_address,
+                                     sizeof(cmd_poll), &cmd_poll);
+                if (ret)
+                        return ret;
+
+                /* Field is cleared once the command has been processed */
+                if (cmd_poll) {
+                        if (retries++ > 100)
+                                return -EINVAL;
+
+                        msleep(20);
+                        goto wait_cmd;
+                }
+
+                /* Read T37 page */
+                ret = __mxt_read_reg(data->client, dbg->t37_address,
+                                     sizeof(struct t37_debug), p);
+                if (ret)
+                        return ret;
+
+                if (p->mode != mode || p->page != page) {
+                        dev_err(&data->client->dev, "T37 page mismatch\n");
+                        return -EINVAL;
+                }
+
+                dev_dbg(&data->client->dev, "%s page:%d retries:%d\n",
+                        __func__, page, retries);
+
+                /* For remaining pages, write PAGEUP rather than mode */
+                cmd = MXT_DIAGNOSTIC_PAGEUP;
+        }
+
+        return mxt_convert_debug_pages(data, outbuf);
+}
+
+static int mxt_queue_setup(struct vb2_queue *q,
+                       unsigned int *nbuffers, unsigned int *nplanes,
+                       unsigned int sizes[], struct device *alloc_devs[])
+{
+        struct mxt_data *data = q->drv_priv;
+        size_t size = data->dbg.t37_nodes * sizeof(u16);
+
+        if (*nplanes)
+                return sizes[0] < size ? -EINVAL : 0;
+
+        *nplanes = 1;
+        sizes[0] = size;
+
+        return 0;
+}
+
+static void mxt_buffer_queue(struct vb2_buffer *vb)
+{
+        struct mxt_data *data = vb2_get_drv_priv(vb->vb2_queue);
+        u16 *ptr;
+        int ret;
+        u8 mode;
+
+        ptr = vb2_plane_vaddr(vb, 0);
+        if (!ptr) {
+                dev_err(&data->client->dev, "Error acquiring frame ptr\n");
+                goto fault;
+        }
+
+        switch (data->dbg.input) {
+        case MXT_V4L_INPUT_DELTAS:
+        default:
+                mode = MXT_DIAGNOSTIC_DELTAS;
+                break;
+
+        case MXT_V4L_INPUT_REFS:
+                mode = MXT_DIAGNOSTIC_REFS;
+                break;
+        }
+
+        ret = mxt_read_diagnostic_debug(data, mode, ptr);
+        if (ret)
+                goto fault;
+
+        vb2_set_plane_payload(vb, 0, data->dbg.t37_nodes * sizeof(u16));
+        vb2_buffer_done(vb, VB2_BUF_STATE_DONE);
+        return;
+
+fault:
+        vb2_buffer_done(vb, VB2_BUF_STATE_ERROR);
+}
+
+/* V4L2 structures */
+static const struct vb2_ops mxt_queue_ops = {
+        .queue_setup            = mxt_queue_setup,
+        .buf_queue              = mxt_buffer_queue,
+        .wait_prepare           = vb2_ops_wait_prepare,
+        .wait_finish            = vb2_ops_wait_finish,
+};
+
+static const struct vb2_queue mxt_queue = {
+        .type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
+        .io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF | VB2_READ,
+        .buf_struct_size = sizeof(struct mxt_vb2_buffer),
+        .ops = &mxt_queue_ops,
+        .mem_ops = &vb2_vmalloc_memops,
+        .timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC,
+        .min_buffers_needed = 1,
+};
+
+static int mxt_vidioc_querycap(struct file *file, void *priv,
+                                 struct v4l2_capability *cap)
+{
+        struct mxt_data *data = video_drvdata(file);
+
+        strlcpy(cap->driver, "atmel_mxt_ts", sizeof(cap->driver));
+        strlcpy(cap->card, "atmel_mxt_ts touch", sizeof(cap->card));
+        snprintf(cap->bus_info, sizeof(cap->bus_info),
+                 "I2C:%s", dev_name(&data->client->dev));
+        return 0;
+}
+
+static int mxt_vidioc_enum_input(struct file *file, void *priv,
+                                   struct v4l2_input *i)
+{
+        if (i->index >= MXT_V4L_INPUT_MAX)
+                return -EINVAL;
+
+        i->type = V4L2_INPUT_TYPE_TOUCH;
+
+        switch (i->index) {
+        case MXT_V4L_INPUT_REFS:
+                strlcpy(i->name, "Mutual Capacitance References",
+                        sizeof(i->name));
+                break;
+        case MXT_V4L_INPUT_DELTAS:
+                strlcpy(i->name, "Mutual Capacitance Deltas", sizeof(i->name));
+                break;
+        }
+
+        return 0;
+}
+
+static int mxt_set_input(struct mxt_data *data, unsigned int i)
+{
+        struct v4l2_pix_format *f = &data->dbg.format;
+
+        if (i >= MXT_V4L_INPUT_MAX)
+                return -EINVAL;
+
+        if (i == MXT_V4L_INPUT_DELTAS)
+                f->pixelformat = V4L2_TCH_FMT_DELTA_TD16;
+        else
+                f->pixelformat = V4L2_TCH_FMT_TU16;
+
+        f->width = data->xy_switch ? data->ysize : data->xsize;
+        f->height = data->xy_switch ? data->xsize : data->ysize;
+        f->field = V4L2_FIELD_NONE;
+        f->colorspace = V4L2_COLORSPACE_RAW;
+        f->bytesperline = f->width * sizeof(u16);
+        f->sizeimage = f->width * f->height * sizeof(u16);
+
+        data->dbg.input = i;
+
+        return 0;
+}
+
+static int mxt_vidioc_s_input(struct file *file, void *priv, unsigned int i)
+{
+        return mxt_set_input(video_drvdata(file), i);
+}
+
+static int mxt_vidioc_g_input(struct file *file, void *priv, unsigned int *i)
+{
+        struct mxt_data *data = video_drvdata(file);
+
+        *i = data->dbg.input;
+
+        return 0;
+}
+
+static int mxt_vidioc_fmt(struct file *file, void *priv, struct v4l2_format *f)
+{
+        struct mxt_data *data = video_drvdata(file);
+
+        f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        f->fmt.pix = data->dbg.format;
+
+        return 0;
+}
+
+static int mxt_vidioc_enum_fmt(struct file *file, void *priv,
+                                 struct v4l2_fmtdesc *fmt)
+{
+        if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                return -EINVAL;
+
+        switch (fmt->index) {
+        case 0:
+                fmt->pixelformat = V4L2_TCH_FMT_TU16;
+                break;
+
+        case 1:
+                fmt->pixelformat = V4L2_TCH_FMT_DELTA_TD16;
+                break;
+
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int mxt_vidioc_g_parm(struct file *file, void *fh,
+                             struct v4l2_streamparm *a)
+{
+        if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                return -EINVAL;
+
+        a->parm.capture.readbuffers = 1;
+        a->parm.capture.timeperframe.numerator = 1;
+        a->parm.capture.timeperframe.denominator = 10;
+        return 0;
+}
+
+static const struct v4l2_ioctl_ops mxt_video_ioctl_ops = {
+        .vidioc_querycap        = mxt_vidioc_querycap,
+
+        .vidioc_enum_fmt_vid_cap = mxt_vidioc_enum_fmt,
+        .vidioc_s_fmt_vid_cap   = mxt_vidioc_fmt,
+        .vidioc_g_fmt_vid_cap   = mxt_vidioc_fmt,
+        .vidioc_try_fmt_vid_cap = mxt_vidioc_fmt,
+        .vidioc_g_parm          = mxt_vidioc_g_parm,
+
+        .vidioc_enum_input      = mxt_vidioc_enum_input,
+        .vidioc_g_input         = mxt_vidioc_g_input,
+        .vidioc_s_input         = mxt_vidioc_s_input,
+
+        .vidioc_reqbufs         = vb2_ioctl_reqbufs,
+        .vidioc_create_bufs     = vb2_ioctl_create_bufs,
+        .vidioc_querybuf        = vb2_ioctl_querybuf,
+        .vidioc_qbuf            = vb2_ioctl_qbuf,
+        .vidioc_dqbuf           = vb2_ioctl_dqbuf,
+        .vidioc_expbuf          = vb2_ioctl_expbuf,
+
+        .vidioc_streamon        = vb2_ioctl_streamon,
+        .vidioc_streamoff       = vb2_ioctl_streamoff,
+};
+
+static const struct video_device mxt_video_device = {
+        .name = "Atmel maxTouch",
+        .fops = &mxt_video_fops,
+        .ioctl_ops = &mxt_video_ioctl_ops,
+        .release = video_device_release_empty,
+        .device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_TOUCH |
+                       V4L2_CAP_READWRITE | V4L2_CAP_STREAMING,
+};
+
+static void mxt_debug_init(struct mxt_data *data)
+{
+        struct mxt_info *info = &data->info;
+        struct mxt_dbg *dbg = &data->dbg;
+        struct mxt_object *object;
+        int error;
+
+        object = mxt_get_object(data, MXT_GEN_COMMAND_T6);
+        if (!object)
+                goto error;
+
+        dbg->diag_cmd_address = object->start_address + MXT_COMMAND_DIAGNOSTIC;
+
+        object = mxt_get_object(data, MXT_DEBUG_DIAGNOSTIC_T37);
+        if (!object)
+                goto error;
+
+        if (mxt_obj_size(object) != sizeof(struct t37_debug)) {
+                dev_warn(&data->client->dev, "Bad T37 size");
+                goto error;
+        }
+
+        dbg->t37_address = object->start_address;
+
+        /* Calculate size of data and allocate buffer */
+        dbg->t37_nodes = data->xsize * data->ysize;
+
+        if (info->family_id == MXT_FAMILY_1386)
+                dbg->t37_pages = MXT1386_COLUMNS * MXT1386_PAGES_PER_COLUMN;
+        else
+                dbg->t37_pages = DIV_ROUND_UP(data->xsize *
+                                              data->info.matrix_ysize *
+                                              sizeof(u16),
+                                              sizeof(dbg->t37_buf->data));
+
+        dbg->t37_buf = devm_kmalloc_array(&data->client->dev, dbg->t37_pages,
+                                          sizeof(struct t37_debug), GFP_KERNEL);
+        if (!dbg->t37_buf)
+                goto error;
+
+        /* init channel to zero */
+        mxt_set_input(data, 0);
+
+        /* register video device */
+        snprintf(dbg->v4l2.name, sizeof(dbg->v4l2.name), "%s", "atmel_mxt_ts");
+        error = v4l2_device_register(&data->client->dev, &dbg->v4l2);
+        if (error)
+                goto error;
+
+        /* initialize the queue */
+        mutex_init(&dbg->lock);
+        dbg->queue = mxt_queue;
+        dbg->queue.drv_priv = data;
+        dbg->queue.lock = &dbg->lock;
+        dbg->queue.dev = &data->client->dev;
+
+        error = vb2_queue_init(&dbg->queue);
+        if (error)
+                goto error_unreg_v4l2;
+
+        dbg->vdev = mxt_video_device;
+        dbg->vdev.v4l2_dev = &dbg->v4l2;
+        dbg->vdev.lock = &dbg->lock;
+        dbg->vdev.vfl_dir = VFL_DIR_RX;
+        dbg->vdev.queue = &dbg->queue;
+        video_set_drvdata(&dbg->vdev, data);
+
+        error = video_register_device(&dbg->vdev, VFL_TYPE_TOUCH, -1);
+        if (error)
+                goto error_unreg_v4l2;
+
+        return;
+
+error_unreg_v4l2:
+        v4l2_device_unregister(&dbg->v4l2);
+error:
+        dev_warn(&data->client->dev, "Error initializing T37\n");
+}
+#else
+static void mxt_debug_init(struct mxt_data *data)
+{
+}
+#endif
+
 static int mxt_configure_objects(struct mxt_data *data,
                                  const struct firmware *cfg)
 {
@@ -2070,6 +2589,8 @@ static int mxt_configure_objects(struct mxt_data *data,
                 dev_warn(dev, "No touch object detected\n");
         }
 
+        mxt_debug_init(data);
+
         dev_info(dev,
                  "Family: %u Variant: %u Firmware V%u.%u.%02X Objects: %u\n",
                  info->family_id, info->variant_id, info->version >> 4,
diff --git a/drivers/input/touchscreen/sur40.c b/drivers/input/touchscreen/sur40.c
index 4ea475775d58..aefb6e11f88a 100644
--- a/drivers/input/touchscreen/sur40.c
+++ b/drivers/input/touchscreen/sur40.c
@@ -139,6 +139,27 @@ struct sur40_image_header {
 #define SUR40_GET_STATE   0xc5 /*  4 bytes state (?) */
 #define SUR40_GET_SENSORS 0xb1 /*  8 bytes sensors   */
 
+static const struct v4l2_pix_format sur40_pix_format[] = {
+        {
+                .pixelformat = V4L2_TCH_FMT_TU08,
+                .width  = SENSOR_RES_X / 2,
+                .height = SENSOR_RES_Y / 2,
+                .field = V4L2_FIELD_NONE,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .bytesperline = SENSOR_RES_X / 2,
+                .sizeimage = (SENSOR_RES_X/2) * (SENSOR_RES_Y/2),
+        },
+        {
+                .pixelformat = V4L2_PIX_FMT_GREY,
+                .width  = SENSOR_RES_X / 2,
+                .height = SENSOR_RES_Y / 2,
+                .field = V4L2_FIELD_NONE,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .bytesperline = SENSOR_RES_X / 2,
+                .sizeimage = (SENSOR_RES_X/2) * (SENSOR_RES_Y/2),
+        }
+};
+
 /* master device state */
 struct sur40_state {
 
@@ -149,6 +170,7 @@ struct sur40_state {
         struct v4l2_device v4l2;
         struct video_device vdev;
         struct mutex lock;
+        struct v4l2_pix_format pix_fmt;
 
         struct vb2_queue queue;
         struct list_head buf_list;
@@ -169,7 +191,6 @@ struct sur40_buffer {
 
 /* forward declarations */
 static const struct video_device sur40_video_device;
-static const struct v4l2_pix_format sur40_video_format;
 static const struct vb2_queue sur40_queue;
 static void sur40_process_video(struct sur40_state *sur40);
 
@@ -420,7 +441,7 @@ static void sur40_process_video(struct sur40_state *sur40)
                 goto err_poll;
         }
 
-        if (le32_to_cpu(img->size) != sur40_video_format.sizeimage) {
+        if (le32_to_cpu(img->size) != sur40->pix_fmt.sizeimage) {
                 dev_err(sur40->dev, "image size mismatch\n");
                 goto err_poll;
         }
@@ -431,7 +452,7 @@ static void sur40_process_video(struct sur40_state *sur40)
 
         result = usb_sg_init(&sgr, sur40->usbdev,
                 usb_rcvbulkpipe(sur40->usbdev, VIDEO_ENDPOINT), 0,
-                sgt->sgl, sgt->nents, sur40_video_format.sizeimage, 0);
+                sgt->sgl, sgt->nents, sur40->pix_fmt.sizeimage, 0);
         if (result < 0) {
                 dev_err(sur40->dev, "error %d in usb_sg_init\n", result);
                 goto err_poll;
@@ -586,13 +607,14 @@ static int sur40_probe(struct usb_interface *interface,
         if (error)
                 goto err_unreg_v4l2;
 
+        sur40->pix_fmt = sur40_pix_format[0];
         sur40->vdev = sur40_video_device;
         sur40->vdev.v4l2_dev = &sur40->v4l2;
         sur40->vdev.lock = &sur40->lock;
         sur40->vdev.queue = &sur40->queue;
         video_set_drvdata(&sur40->vdev, sur40);
 
-        error = video_register_device(&sur40->vdev, VFL_TYPE_GRABBER, -1);
+        error = video_register_device(&sur40->vdev, VFL_TYPE_TOUCH, -1);
         if (error) {
                 dev_err(&interface->dev,
                         "Unable to register video subdevice.");
@@ -647,14 +669,16 @@ static int sur40_queue_setup(struct vb2_queue *q,
                        unsigned int *nbuffers, unsigned int *nplanes,
                        unsigned int sizes[], struct device *alloc_devs[])
 {
+        struct sur40_state *sur40 = vb2_get_drv_priv(q);
+
         if (q->num_buffers + *nbuffers < 3)
                 *nbuffers = 3 - q->num_buffers;
 
         if (*nplanes)
-                return sizes[0] < sur40_video_format.sizeimage ? -EINVAL : 0;
+                return sizes[0] < sur40->pix_fmt.sizeimage ? -EINVAL : 0;
 
         *nplanes = 1;
-        sizes[0] = sur40_video_format.sizeimage;
+        sizes[0] = sur40->pix_fmt.sizeimage;
 
         return 0;
 }
@@ -666,7 +690,7 @@ static int sur40_queue_setup(struct vb2_queue *q,
 static int sur40_buffer_prepare(struct vb2_buffer *vb)
 {
         struct sur40_state *sur40 = vb2_get_drv_priv(vb->vb2_queue);
-        unsigned long size = sur40_video_format.sizeimage;
+        unsigned long size = sur40->pix_fmt.sizeimage;
 
         if (vb2_plane_size(vb, 0) < size) {
                 dev_err(&sur40->usbdev->dev, "buffer too small (%lu < %lu)\n",
@@ -741,7 +765,7 @@ static int sur40_vidioc_querycap(struct file *file, void *priv,
         strlcpy(cap->driver, DRIVER_SHORT, sizeof(cap->driver));
         strlcpy(cap->card, DRIVER_LONG, sizeof(cap->card));
         usb_make_path(sur40->usbdev, cap->bus_info, sizeof(cap->bus_info));
-        cap->device_caps = V4L2_CAP_VIDEO_CAPTURE |
+        cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_TOUCH |
                 V4L2_CAP_READWRITE |
                 V4L2_CAP_STREAMING;
         cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
@@ -753,7 +777,7 @@ static int sur40_vidioc_enum_input(struct file *file, void *priv,
 {
         if (i->index != 0)
                 return -EINVAL;
-        i->type = V4L2_INPUT_TYPE_CAMERA;
+        i->type = V4L2_INPUT_TYPE_TOUCH;
         i->std = V4L2_STD_UNKNOWN;
         strlcpy(i->name, "In-Cell Sensor", sizeof(i->name));
         i->capabilities = 0;
@@ -771,19 +795,70 @@ static int sur40_vidioc_g_input(struct file *file, void *priv, unsigned int *i)
         return 0;
 }
 
-static int sur40_vidioc_fmt(struct file *file, void *priv,
+static int sur40_vidioc_try_fmt(struct file *file, void *priv,
+                            struct v4l2_format *f)
+{
+        switch (f->fmt.pix.pixelformat) {
+        case V4L2_PIX_FMT_GREY:
+                f->fmt.pix = sur40_pix_format[1];
+                break;
+
+        default:
+                f->fmt.pix = sur40_pix_format[0];
+                break;
+        }
+
+        return 0;
+}
+
+static int sur40_vidioc_s_fmt(struct file *file, void *priv,
+                            struct v4l2_format *f)
+{
+        struct sur40_state *sur40 = video_drvdata(file);
+
+        switch (f->fmt.pix.pixelformat) {
+        case V4L2_PIX_FMT_GREY:
+                sur40->pix_fmt = sur40_pix_format[1];
+                break;
+
+        default:
+                sur40->pix_fmt = sur40_pix_format[0];
+                break;
+        }
+
+        f->fmt.pix = sur40->pix_fmt;
+        return 0;
+}
+
+static int sur40_vidioc_g_fmt(struct file *file, void *priv,
                             struct v4l2_format *f)
 {
-        f->fmt.pix = sur40_video_format;
+        struct sur40_state *sur40 = video_drvdata(file);
+
+        f->fmt.pix = sur40->pix_fmt;
+        return 0;
+}
+
+static int sur40_ioctl_parm(struct file *file, void *priv,
+                            struct v4l2_streamparm *p)
+{
+        if (p->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                return -EINVAL;
+
+        p->parm.capture.capability = V4L2_CAP_TIMEPERFRAME;
+        p->parm.capture.timeperframe.numerator = 1;
+        p->parm.capture.timeperframe.denominator = 60;
+        p->parm.capture.readbuffers = 3;
         return 0;
 }
 
 static int sur40_vidioc_enum_fmt(struct file *file, void *priv,
                                  struct v4l2_fmtdesc *f)
 {
-        if (f->index != 0)
+        if (f->index >= ARRAY_SIZE(sur40_pix_format))
                 return -EINVAL;
-        f->pixelformat = V4L2_PIX_FMT_GREY;
+
+        f->pixelformat = sur40_pix_format[f->index].pixelformat;
         f->flags = 0;
         return 0;
 }
@@ -791,25 +866,31 @@ static int sur40_vidioc_enum_fmt(struct file *file, void *priv,
 static int sur40_vidioc_enum_framesizes(struct file *file, void *priv,
                                         struct v4l2_frmsizeenum *f)
 {
-        if ((f->index != 0) || (f->pixel_format != V4L2_PIX_FMT_GREY))
+        struct sur40_state *sur40 = video_drvdata(file);
+
+        if ((f->index != 0) || ((f->pixel_format != V4L2_TCH_FMT_TU08)
+                && (f->pixel_format != V4L2_PIX_FMT_GREY)))
                 return -EINVAL;
 
         f->type = V4L2_FRMSIZE_TYPE_DISCRETE;
-        f->discrete.width  = sur40_video_format.width;
-        f->discrete.height = sur40_video_format.height;
+        f->discrete.width  = sur40->pix_fmt.width;
+        f->discrete.height = sur40->pix_fmt.height;
         return 0;
 }
 
 static int sur40_vidioc_enum_frameintervals(struct file *file, void *priv,
                                             struct v4l2_frmivalenum *f)
 {
-        if ((f->index > 1) || (f->pixel_format != V4L2_PIX_FMT_GREY)
-                || (f->width  != sur40_video_format.width)
-                || (f->height != sur40_video_format.height))
-                        return -EINVAL;
+        struct sur40_state *sur40 = video_drvdata(file);
+
+        if ((f->index > 0) || ((f->pixel_format != V4L2_TCH_FMT_TU08)
+                && (f->pixel_format != V4L2_PIX_FMT_GREY))
+                || (f->width  != sur40->pix_fmt.width)
+                || (f->height != sur40->pix_fmt.height))
+                return -EINVAL;
 
         f->type = V4L2_FRMIVAL_TYPE_DISCRETE;
-        f->discrete.denominator  = 60/(f->index+1);
+        f->discrete.denominator  = 60;
         f->discrete.numerator = 1;
         return 0;
 }
@@ -862,13 +943,16 @@ static const struct v4l2_ioctl_ops sur40_video_ioctl_ops = {
         .vidioc_querycap        = sur40_vidioc_querycap,
 
         .vidioc_enum_fmt_vid_cap = sur40_vidioc_enum_fmt,
-        .vidioc_try_fmt_vid_cap = sur40_vidioc_fmt,
-        .vidioc_s_fmt_vid_cap   = sur40_vidioc_fmt,
-        .vidioc_g_fmt_vid_cap   = sur40_vidioc_fmt,
+        .vidioc_try_fmt_vid_cap = sur40_vidioc_try_fmt,
+        .vidioc_s_fmt_vid_cap   = sur40_vidioc_s_fmt,
+        .vidioc_g_fmt_vid_cap   = sur40_vidioc_g_fmt,
 
         .vidioc_enum_framesizes = sur40_vidioc_enum_framesizes,
         .vidioc_enum_frameintervals = sur40_vidioc_enum_frameintervals,
 
+        .vidioc_g_parm = sur40_ioctl_parm,
+        .vidioc_s_parm = sur40_ioctl_parm,
+
         .vidioc_enum_input      = sur40_vidioc_enum_input,
         .vidioc_g_input         = sur40_vidioc_g_input,
         .vidioc_s_input         = sur40_vidioc_s_input,
@@ -891,16 +975,6 @@ static const struct video_device sur40_video_device = {
         .release = video_device_release_empty,
 };
 
-static const struct v4l2_pix_format sur40_video_format = {
-        .pixelformat = V4L2_PIX_FMT_GREY,
-        .width  = SENSOR_RES_X / 2,
-        .height = SENSOR_RES_Y / 2,
-        .field = V4L2_FIELD_NONE,
-        .colorspace = V4L2_COLORSPACE_SRGB,
-        .bytesperline = SENSOR_RES_X / 2,
-        .sizeimage = (SENSOR_RES_X/2) * (SENSOR_RES_Y/2),
-};
-
 /* USB-specific object needed to register this driver with the USB subsystem. */
 static struct usb_driver sur40_driver = {
         .name = DRIVER_SHORT,