From: Nick Dyer <nick.dyer@itdev.co.uk>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Hans Verkuil <hverkuil@xs4all.nl>
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-media@vger.kernel.org,
Benjamin Tissoires <benjamin.tissoires@redhat.com>,
Benson Leung <bleung@chromium.org>,
Alan Bowens <Alan.Bowens@atmel.com>,
Javier Martinez Canillas <javier@osg.samsung.com>,
Chris Healy <cphealy@gmail.com>,
Henrik Rydberg <rydberg@bitmath.org>,
Andrew Duggan <aduggan@synaptics.com>,
James Chen <james.chen@emc.com.tw>, Dudley Du <dudl@cypress.com>,
Andrew de los Reyes <adlr@chromium.org>,
sheckylin@chromium.org, Peter Hutterer <peter.hutterer@who-t.net>,
Florian Echtler <floe@butterbrot.org>,
mchehab@osg.samsung.com, nick.dyer@itdev.co.uk
Subject: [PATCH v5 9/9] Input: sur40 - use new V4L2 touch input type
Date: Wed, 22 Jun 2016 23:08:33 +0100 [thread overview]
Message-ID: <1466633313-15339-10-git-send-email-nick.dyer@itdev.co.uk> (raw)
In-Reply-To: <1466633313-15339-1-git-send-email-nick.dyer@itdev.co.uk>
Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk>
---
drivers/input/touchscreen/sur40.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/input/touchscreen/sur40.c b/drivers/input/touchscreen/sur40.c
index 880c40b..841e045 100644
--- a/drivers/input/touchscreen/sur40.c
+++ b/drivers/input/touchscreen/sur40.c
@@ -599,7 +599,7 @@ static int sur40_probe(struct usb_interface *interface,
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.");
@@ -763,7 +763,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;
@@ -794,7 +794,7 @@ static int sur40_vidioc_enum_fmt(struct file *file, void *priv,
if (f->index != 0)
return -EINVAL;
strlcpy(f->description, "8-bit greyscale", sizeof(f->description));
- f->pixelformat = V4L2_PIX_FMT_GREY;
+ f->pixelformat = V4L2_TCH_FMT_TU08;
f->flags = 0;
return 0;
}
@@ -802,7 +802,7 @@ 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))
+ if ((f->index != 0) || (f->pixel_format != V4L2_TCH_FMT_TU08))
return -EINVAL;
f->type = V4L2_FRMSIZE_TYPE_DISCRETE;
@@ -814,7 +814,7 @@ static int sur40_vidioc_enum_framesizes(struct file *file, void *priv,
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)
+ if ((f->index > 1) || (f->pixel_format != V4L2_TCH_FMT_TU08)
|| (f->width != sur40_video_format.width)
|| (f->height != sur40_video_format.height))
return -EINVAL;
@@ -903,7 +903,7 @@ static const struct video_device sur40_video_device = {
};
static const struct v4l2_pix_format sur40_video_format = {
- .pixelformat = V4L2_PIX_FMT_GREY,
+ .pixelformat = V4L2_TCH_FMT_TU08,
.width = SENSOR_RES_X / 2,
.height = SENSOR_RES_Y / 2,
.field = V4L2_FIELD_NONE,
--
2.5.0
next prev parent reply other threads:[~2016-06-22 22:08 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-22 22:08 [PATCH v5 0/9] Output raw touch data via V4L2 Nick Dyer
2016-06-22 22:08 ` [PATCH v5 1/9] [media] v4l2-core: Add support for touch devices Nick Dyer
2016-06-23 22:41 ` Dmitry Torokhov
2016-06-24 13:48 ` Nick Dyer
2016-06-27 11:02 ` Hans Verkuil
2016-06-22 22:08 ` [PATCH v5 2/9] Input: atmel_mxt_ts - add support for T37 diagnostic data Nick Dyer
2016-06-22 22:08 ` [PATCH v5 3/9] Input: atmel_mxt_ts - output diagnostic debug via v4l2 device Nick Dyer
2016-06-27 11:10 ` Hans Verkuil
2016-06-22 22:08 ` [PATCH v5 4/9] Input: atmel_mxt_ts - read touchscreen size Nick Dyer
2016-06-22 22:08 ` [PATCH v5 5/9] Input: atmel_mxt_ts - handle diagnostic data orientation Nick Dyer
2016-06-22 22:08 ` [PATCH v5 6/9] Input: atmel_mxt_ts - add diagnostic data support for mXT1386 Nick Dyer
2016-06-22 22:08 ` [PATCH v5 7/9] Input: atmel_mxt_ts - add support for reference data Nick Dyer
2016-06-27 11:11 ` Hans Verkuil
2016-06-22 22:08 ` [PATCH v5 8/9] Input: synaptics-rmi4 - add support for F54 diagnostics Nick Dyer
2016-06-23 17:04 ` Dmitry Torokhov
2016-06-27 11:19 ` Hans Verkuil
2016-06-22 22:08 ` Nick Dyer [this message]
2016-06-23 6:41 ` [PATCH v5 9/9] Input: sur40 - use new V4L2 touch input type Florian Echtler
2016-06-27 11:06 ` Hans Verkuil
2016-06-27 11:26 ` [PATCH v5 0/9] Output raw touch data via V4L2 Hans Verkuil
2016-06-27 11:57 ` Nick Dyer
2016-06-27 12:22 ` Hans Verkuil
2016-06-27 12:51 ` Nick Dyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1466633313-15339-10-git-send-email-nick.dyer@itdev.co.uk \
--to=nick.dyer@itdev.co.uk \
--cc=Alan.Bowens@atmel.com \
--cc=adlr@chromium.org \
--cc=aduggan@synaptics.com \
--cc=benjamin.tissoires@redhat.com \
--cc=bleung@chromium.org \
--cc=cphealy@gmail.com \
--cc=dmitry.torokhov@gmail.com \
--cc=dudl@cypress.com \
--cc=floe@butterbrot.org \
--cc=hverkuil@xs4all.nl \
--cc=james.chen@emc.com.tw \
--cc=javier@osg.samsung.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@osg.samsung.com \
--cc=peter.hutterer@who-t.net \
--cc=rydberg@bitmath.org \
--cc=sheckylin@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).