diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-09 09:47:22 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-09 09:47:22 -0700 |
commit | ed63b9c873601ca113da5c7b1745e3946493e9f3 (patch) | |
tree | 94e96db2b79a8d123c0645dd64b3830bc4d20bfe /drivers/media/rc/keymaps/rc-it913x-v2.c | |
parent | 947fbd4ca9fb38f320b076e68cfccab977c5ea01 (diff) | |
parent | f81cbfc4f82a75ca0a2dc181a9c93b88f0e6509d (diff) | |
download | linux-ed63b9c873601ca113da5c7b1745e3946493e9f3.tar.gz |
Merge tag 'media/v5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media updates from Mauro Carvalho Chehab:
- new Atmel microship ISC driver
- coda has gained support for mpeg2 and mpeg4
- cxusb gained support for analog TV
- rockchip staging driver was split into two separate staging drivers
- added a new staging driver for Allegro DVT video IP core
- added a new staging driver for Amlogic Meson video decoder
- lots of improvements and cleanups
* tag 'media/v5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (398 commits)
media: allegro: use new v4l2_m2m_ioctl_try_encoder_cmd funcs
media: doc-rst: Fix typos
media: radio-raremono: change devm_k*alloc to k*alloc
media: stv0297: fix frequency range limit
media: rc: Prefer KEY_NUMERIC_* for number buttons on remotes
media: dvb_frontend: split dvb_frontend_handle_ioctl function
media: mceusb: disable "nonsensical irdata" messages
media: rc: remove redundant dev_err message
media: cec-notifier: add new notifier functions
media: cec: add struct cec_connector_info support
media: cec-notifier: rename variables, check kstrdup and n->conn_name
media: MAINTAINERS: Add maintainers for Media Controller
media: staging: media: tegra-vde: Defer dmabuf's unmapping
media: staging: media: tegra-vde: Add IOMMU support
media: hdpvr: fix locking and a missing msleep
media: v4l2: Test type instead of cfg->type in v4l2_ctrl_new_custom()
media: atmel: atmel-isc: fix i386 build error
media: v4l2-ctrl: Move compound control initialization
media: hantro: Use vb2_get_buffer
media: pci: cx88: Change the type of 'missed' to u64
...
Diffstat (limited to 'drivers/media/rc/keymaps/rc-it913x-v2.c')
-rw-r--r-- | drivers/media/rc/keymaps/rc-it913x-v2.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/drivers/media/rc/keymaps/rc-it913x-v2.c b/drivers/media/rc/keymaps/rc-it913x-v2.c index 26747a327d91..da3107da26b7 100644 --- a/drivers/media/rc/keymaps/rc-it913x-v2.c +++ b/drivers/media/rc/keymaps/rc-it913x-v2.c @@ -20,31 +20,31 @@ static struct rc_map_table it913x_v2_rc[] = { { 0x807f04, KEY_VOLUMEUP }, /* Volume- */ { 0x807f05, KEY_SCREEN }, /* FullScreen */ { 0x807f06, KEY_VOLUMEDOWN }, /* Volume- */ - { 0x807f07, KEY_0 }, /* 0 */ + { 0x807f07, KEY_NUMERIC_0 }, /* 0 */ { 0x807f08, KEY_CHANNELDOWN }, /* Channel- */ { 0x807f09, KEY_PREVIOUS }, /* Recall */ - { 0x807f0a, KEY_1 }, /* 1 */ - { 0x807f1b, KEY_2 }, /* 2 */ - { 0x807f1f, KEY_3 }, /* 3 */ - { 0x807f0c, KEY_4 }, /* 4 */ - { 0x807f0d, KEY_5 }, /* 5 */ - { 0x807f0e, KEY_6 }, /* 6 */ - { 0x807f00, KEY_7 }, /* 7 */ - { 0x807f0f, KEY_8 }, /* 8 */ - { 0x807f19, KEY_9 }, /* 9 */ + { 0x807f0a, KEY_NUMERIC_1 }, /* 1 */ + { 0x807f1b, KEY_NUMERIC_2 }, /* 2 */ + { 0x807f1f, KEY_NUMERIC_3 }, /* 3 */ + { 0x807f0c, KEY_NUMERIC_4 }, /* 4 */ + { 0x807f0d, KEY_NUMERIC_5 }, /* 5 */ + { 0x807f0e, KEY_NUMERIC_6 }, /* 6 */ + { 0x807f00, KEY_NUMERIC_7 }, /* 7 */ + { 0x807f0f, KEY_NUMERIC_8 }, /* 8 */ + { 0x807f19, KEY_NUMERIC_9 }, /* 9 */ /* Type 2 */ /* keys stereo, snapshot unassigned */ - { 0x866b00, KEY_0 }, - { 0x866b01, KEY_1 }, - { 0x866b02, KEY_2 }, - { 0x866b03, KEY_3 }, - { 0x866b04, KEY_4 }, - { 0x866b05, KEY_5 }, - { 0x866b06, KEY_6 }, - { 0x866b07, KEY_7 }, - { 0x866b08, KEY_8 }, - { 0x866b09, KEY_9 }, + { 0x866b00, KEY_NUMERIC_0 }, + { 0x866b01, KEY_NUMERIC_1 }, + { 0x866b02, KEY_NUMERIC_2 }, + { 0x866b03, KEY_NUMERIC_3 }, + { 0x866b04, KEY_NUMERIC_4 }, + { 0x866b05, KEY_NUMERIC_5 }, + { 0x866b06, KEY_NUMERIC_6 }, + { 0x866b07, KEY_NUMERIC_7 }, + { 0x866b08, KEY_NUMERIC_8 }, + { 0x866b09, KEY_NUMERIC_9 }, { 0x866b12, KEY_POWER }, { 0x866b13, KEY_MUTE }, { 0x866b0a, KEY_PREVIOUS }, /* Recall */ |