Merge "drivers: media: rc: Disable auto repeat" (f90b2931) · Commits · e / devices / android_kernel_sony_msm8998

drivers/media/rc/keymaps/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -104,4 +104,6 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
		rc-videomate-tv-pvr.o \
		rc-winfast.o \
		rc-winfast-usbii-deluxe.o \
		rc-rc6-p2fp.o \
		rc-tvx-hd-nec.o \
		rc-su3000.o

drivers/media/rc/keymaps/rc-rc6-p2fp.c

0 → 100644

+81 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017, The Linux Foundation. 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 version 2 and
		* only 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.
		*/

		#include <media/rc-map.h>
		#include <linux/module.h>

		static struct rc_map_table rc_rc6_p2fp[] = {
		{ 12, KEY_POWER}, /* power */
		{ 13, KEY_MUTE}, /* mute */
		{ 1, KEY_1},
		{ 2, KEY_2},
		{ 3, KEY_3},
		{ 4, KEY_4},
		{ 5, KEY_5},
		{ 6, KEY_6},
		{ 7, KEY_7},
		{ 8, KEY_8},
		{ 9, KEY_9},
		{ 0, KEY_0},
		{ 76, KEY_CHANNELUP},
		{ 77, KEY_CHANNELDOWN},
		{ 16, KEY_VOLUMEUP},
		{ 17, KEY_VOLUMEDOWN},
		{ 92, KEY_ENTER},
		{ 88, KEY_UP},
		{ 90, KEY_LEFT},
		{ 91, KEY_RIGHT},
		{ 89, KEY_DOWN},
		{ 10, KEY_BACK},
		{ 55, KEY_RECORD},
		{ 204, KEY_PROGRAM},
		{ 44, KEY_PLAY},
		{ 48, KEY_PAUSECD},
		{ 43, KEY_REWIND},
		{ 40, KEY_FASTFORWARD},
		{ 49, KEY_STOPCD},
		{ 15, KEY_INFO},
		{ 84, KEY_HOMEPAGE},
		{ 109, KEY_RED},
		{ 110, KEY_GREEN},
		{ 111, KEY_YELLOW},
		{ 112, KEY_BLUE},
		{ 64, KEY_MENU},
		{ 210, KEY_LIST},
		{ 75, KEY_SUBTITLE},
		{ 159, KEY_TV},
		{ 38, KEY_SWITCHVIDEOMODE},
		};

		static struct rc_map_list rc_rc6_p2fp_map = {
		.map = {
		.scan = rc_rc6_p2fp,
		.size = ARRAY_SIZE(rc_rc6_p2fp),
		.rc_type = RC_TYPE_RC6_6A_20, /RC6 IR type /
		.name = RC_MAP_RC6_P2FP,
		}
		};

		static int __init init_rc_map_rc_rc6_p2fp(void)
		{
		return rc_map_register(&rc_rc6_p2fp_map);
		}

		static void __exit exit_rc_map_rc_rc6_p2fp(void)
		{
		rc_map_unregister(&rc_rc6_p2fp_map);
		}

		module_init(init_rc_map_rc_rc6_p2fp)
		module_exit(exit_rc_map_rc_rc6_p2fp)

		MODULE_LICENSE("GPL v2");

drivers/media/rc/keymaps/rc-tvx-hd-nec.c

0 → 100644

+63 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017, The Linux Foundation. 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 version 2 and
		* only 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.
		*/

		#include <media/rc-map.h>
		#include <linux/module.h>

		static struct rc_map_table tvx_HD_nec[] = {
		{ 1768554496, KEY_POWER}, /* power */
		{ 1769603072, KEY_MUTE}, /* mute */
		{ 1775763456, KEY_1},
		{ 1776549888, KEY_2},
		{ 1775501312, KEY_3},
		{ 1776812032, KEY_4},
		{ 1762000896, KEY_5},
		{ 1764098048, KEY_6},
		{ 1763311616, KEY_7},
		{ 1765408768, KEY_8},
		{ 1763049472, KEY_9},
		{ 1774714880, KEY_0},
		{ 1770258432, KEY_CHANNELUP},
		{ 1771569152, KEY_CHANNELDOWN},
		{ 1772355584, KEY_VOLUMEUP},
		{ 1772617728, KEY_VOLUMEDOWN},
		{ 1769340928, KEY_ENTER},
		{ 1770389504, KEY_UP},
		{ 1775632384, KEY_LEFT},
		{ 1777729536, KEY_RIGHT},
		{ 1774583808, KEY_DOWN},
		{ 1766457344, KEY_BACK},
		};

		static struct rc_map_list tvx_HD_nec_map = {
		.map = {
		.scan = tvx_HD_nec,
		.size = ARRAY_SIZE(tvx_HD_nec),
		.rc_type = RC_TYPE_NEC, /* NEC IR type */
		.name = RC_MAP_TVX_HD_NEC,
		}
		};

		static int __init init_rc_map_tvx_HD_nec(void)
		{
		return rc_map_register(&tvx_HD_nec_map);
		}

		static void __exit exit_rc_map_tvx_HD_nec(void)
		{
		rc_map_unregister(&tvx_HD_nec_map);
		}

		module_init(init_rc_map_tvx_HD_nec)
		module_exit(exit_rc_map_tvx_HD_nec)

		MODULE_LICENSE("GPL v2");

drivers/media/rc/rc-main.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -1347,7 +1347,6 @@ int rc_register_device(struct rc_dev *dev)
		return -EINVAL;

		set_bit(EV_KEY, dev->input_dev->evbit);
		set_bit(EV_REP, dev->input_dev->evbit);
		set_bit(EV_MSC, dev->input_dev->evbit);
		set_bit(MSC_SCAN, dev->input_dev->mscbit);
		if (dev->open)

include/media/rc-map.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -205,6 +205,8 @@ void rc_map_init(void);
		#define RC_MAP_TOTAL_MEDIA_IN_HAND_02 "rc-total-media-in-hand-02"
		#define RC_MAP_TREKSTOR "rc-trekstor"
		#define RC_MAP_TT_1500 "rc-tt-1500"
		#define RC_MAP_TVX_HD_NEC "rc-tvx-hd-nec"
		#define RC_MAP_RC6_PHILIPS "rc-rc6-p2fp"
		#define RC_MAP_TWINHAN_DTV_CAB_CI "rc-twinhan-dtv-cab-ci"
		#define RC_MAP_TWINHAN_VP1027_DVBS "rc-twinhan1027"
		#define RC_MAP_VIDEOMATE_K100 "rc-videomate-k100"