[PATCH 0/2] input: add support for HDMI CEC

[PATCH 0/2] input: add support for HDMI CEC

[Hans Verkuil]

From: Hans Verkuil <hans.verkuil@cisco.com>

Hi Dmitry,

This patch series adds input support for the HDMI CEC bus through which
remote control keys can be passed from one HDMI device to another.

This has been posted before as part of the HDMI CEC patch series. We are
going to merge that in linux-media for 4.8, but these two patches have to
go through linux-input.

Only the rc-cec keymap file depends on this, and we will take care of that
dependency (we'll postpone merging that until both these input patches and
our own CEC patches have been merged in mainline).

Regards,

	Hans

Hans Verkuil (1):
  input.h: add BUS_CEC type

Kamil Debski (1):
  HID: add HDMI CEC specific keycodes

 include/uapi/linux/input-event-codes.h | 31 +++++++++++++++++++++++++++++++
 include/uapi/linux/input.h             |  1 +
 2 files changed, 32 insertions(+)

-- 
2.8.1

[PATCH 1/2] input.h: add BUS_CEC type

[Hans Verkuil]

From: Hans Verkuil <hans.verkuil@cisco.com>

Inputs can come in over the HDMI CEC bus, so add a new type for this.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 include/uapi/linux/input.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h
index 0111384..c514941 100644
--- a/include/uapi/linux/input.h
+++ b/include/uapi/linux/input.h
@@ -247,6 +247,7 @@ struct input_mask {
 #define BUS_ATARI		0x1B
 #define BUS_SPI			0x1C
 #define BUS_RMI			0x1D
+#define BUS_CEC			0x1E
 
 /*
  * MT_TOOL types
-- 
2.8.1

[PATCH 2/2] HID: add HDMI CEC specific keycodes

[Hans Verkuil]

From: Kamil Debski <kamil@wypas.org>

Add HDMI CEC specific keycodes to the keycodes definition.

Signed-off-by: Kamil Debski <kamil@wypas.org>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 include/uapi/linux/input-event-codes.h | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
index 87cf351..737fa32 100644
--- a/include/uapi/linux/input-event-codes.h
+++ b/include/uapi/linux/input-event-codes.h
@@ -611,6 +611,37 @@
 #define KEY_KBDINPUTASSIST_ACCEPT		0x264
 #define KEY_KBDINPUTASSIST_CANCEL		0x265
 
+/* Diagonal movement keys */
+#define KEY_RIGHT_UP			0x266
+#define KEY_RIGHT_DOWN			0x267
+#define KEY_LEFT_UP			0x268
+#define KEY_LEFT_DOWN			0x269
+
+#define KEY_ROOT_MENU			0x26a /* Show Device's Root Menu */
+/* Show Top Menu of the Media (e.g. DVD) */
+#define KEY_MEDIA_TOP_MENU		0x26b
+#define KEY_NUMERIC_11			0x26c
+#define KEY_NUMERIC_12			0x26d
+/*
+ * Toggle Audio Description: refers to an audio service that helps blind and
+ * visually impaired consumers understand the action in a program. Note: in
+ * some countries this is referred to as "Video Description".
+ */
+#define KEY_AUDIO_DESC			0x26e
+#define KEY_3D_MODE			0x26f
+#define KEY_NEXT_FAVORITE		0x270
+#define KEY_STOP_RECORD			0x271
+#define KEY_PAUSE_RECORD		0x272
+#define KEY_VOD				0x273 /* Video on Demand */
+#define KEY_UNMUTE			0x274
+#define KEY_FASTREVERSE			0x275
+#define KEY_SLOWREVERSE			0x276
+/*
+ * Control a data application associated with the currently viewed channel,
+ * e.g. teletext or data broadcast application (MHEG, MHP, HbbTV, etc.)
+ */
+#define KEY_DATA			0x275
+
 #define BTN_TRIGGER_HAPPY		0x2c0
 #define BTN_TRIGGER_HAPPY1		0x2c0
 #define BTN_TRIGGER_HAPPY2		0x2c1
-- 
2.8.1

Re: [PATCH 0/2] input: add support for HDMI CEC

[Dmitry Torokhov]

Hi Hans,

On Sat, Jun 18, 2016 at 04:50:26PM +0200, Hans Verkuil wrote:
> From: Hans Verkuil <hans.verkuil@cisco.com>
> 
> Hi Dmitry,
> 
> This patch series adds input support for the HDMI CEC bus through which
> remote control keys can be passed from one HDMI device to another.
> 
> This has been posted before as part of the HDMI CEC patch series. We are
> going to merge that in linux-media for 4.8, but these two patches have to
> go through linux-input.
> 
> Only the rc-cec keymap file depends on this, and we will take care of that
> dependency (we'll postpone merging that until both these input patches and
> our own CEC patches have been merged in mainline).

If it would be easier for you I am perfectly fine with these patches
going through media tree; you have my acks on them.

Thanks.

-- 
Dmitry

Re: [PATCH 0/2] input: add support for HDMI CEC

[Hans Verkuil]

On 06/18/2016 06:26 PM, Dmitry Torokhov wrote:
> Hi Hans,
> 
> On Sat, Jun 18, 2016 at 04:50:26PM +0200, Hans Verkuil wrote:
>> From: Hans Verkuil <hans.verkuil@cisco.com>
>>
>> Hi Dmitry,
>>
>> This patch series adds input support for the HDMI CEC bus through which
>> remote control keys can be passed from one HDMI device to another.
>>
>> This has been posted before as part of the HDMI CEC patch series. We are
>> going to merge that in linux-media for 4.8, but these two patches have to
>> go through linux-input.
>>
>> Only the rc-cec keymap file depends on this, and we will take care of that
>> dependency (we'll postpone merging that until both these input patches and
>> our own CEC patches have been merged in mainline).
> 
> If it would be easier for you I am perfectly fine with these patches
> going through media tree; you have my acks on them.

You're not expecting any changes to these headers for 4.8 that might
cause merge conflicts? That was Mauro's concern.

If not, then I would prefer it to go through the media tree to simplify
the dependencies, but it's up to Mauro.

Regards,

	Hans

Re: [PATCH 0/2] input: add support for HDMI CEC

[Mauro Carvalho Chehab]

Em Sat, 18 Jun 2016 18:56:24 +0200
Hans Verkuil <hverkuil@xs4all.nl> escreveu:

> On 06/18/2016 06:26 PM, Dmitry Torokhov wrote:
> > Hi Hans,
> > 
> > On Sat, Jun 18, 2016 at 04:50:26PM +0200, Hans Verkuil wrote:  
> >> From: Hans Verkuil <hans.verkuil@cisco.com>
> >>
> >> Hi Dmitry,
> >>
> >> This patch series adds input support for the HDMI CEC bus through which
> >> remote control keys can be passed from one HDMI device to another.
> >>
> >> This has been posted before as part of the HDMI CEC patch series. We are
> >> going to merge that in linux-media for 4.8, but these two patches have to
> >> go through linux-input.
> >>
> >> Only the rc-cec keymap file depends on this, and we will take care of that
> >> dependency (we'll postpone merging that until both these input patches and
> >> our own CEC patches have been merged in mainline).  
> > 
> > If it would be easier for you I am perfectly fine with these patches
> > going through media tree; you have my acks on them.  
> 
> You're not expecting any changes to these headers for 4.8 that might
> cause merge conflicts? That was Mauro's concern.
> 
> If not, then I would prefer it to go through the media tree to simplify
> the dependencies, but it's up to Mauro.

Hi Dmitry,

My main concern is with patch 2, as it could conflict with some other
patch on your tree, as I suspect it should be somewhat common to add
new keystrokes from time to time, on your tree. As there's just one patch 
affected by it from Hans CEC patch series, with adds the keymap to be 
used by the remote controller CEC patch, it won't be a big issue to 
delay just that patch to be sent upstream after both your and my trees 
would be merged.

Regards,

Thanks,
Mauro

Re: [PATCH 0/2] input: add support for HDMI CEC

[Dmitry Torokhov]

On Sat, Jun 18, 2016 at 02:44:08PM -0300, Mauro Carvalho Chehab wrote:
> Em Sat, 18 Jun 2016 18:56:24 +0200
> Hans Verkuil <hverkuil@xs4all.nl> escreveu:
> 
> > On 06/18/2016 06:26 PM, Dmitry Torokhov wrote:
> > > Hi Hans,
> > > 
> > > On Sat, Jun 18, 2016 at 04:50:26PM +0200, Hans Verkuil wrote:  
> > >> From: Hans Verkuil <hans.verkuil@cisco.com>
> > >>
> > >> Hi Dmitry,
> > >>
> > >> This patch series adds input support for the HDMI CEC bus through which
> > >> remote control keys can be passed from one HDMI device to another.
> > >>
> > >> This has been posted before as part of the HDMI CEC patch series. We are
> > >> going to merge that in linux-media for 4.8, but these two patches have to
> > >> go through linux-input.
> > >>
> > >> Only the rc-cec keymap file depends on this, and we will take care of that
> > >> dependency (we'll postpone merging that until both these input patches and
> > >> our own CEC patches have been merged in mainline).  
> > > 
> > > If it would be easier for you I am perfectly fine with these patches
> > > going through media tree; you have my acks on them.  
> > 
> > You're not expecting any changes to these headers for 4.8 that might
> > cause merge conflicts? That was Mauro's concern.
> > 
> > If not, then I would prefer it to go through the media tree to simplify
> > the dependencies, but it's up to Mauro.
> 
> Hi Dmitry,
> 
> My main concern is with patch 2, as it could conflict with some other
> patch on your tree, as I suspect it should be somewhat common to add
> new keystrokes from time to time, on your tree. As there's just one patch 
> affected by it from Hans CEC patch series, with adds the keymap to be 
> used by the remote controller CEC patch, it won't be a big issue to 
> delay just that patch to be sent upstream after both your and my trees 
> would be merged.

Mauro,

I created an immutable branch "cec-defines" based on 4.6; I'll also
merge it into 4.7.

Thanks.

-- 
Dmitry