Skip to contentSkip to conversation

saa7134: add RM-K6 remote control support for Avermedia M135A

PATCH New Herton Ronaldo Krzesinski 1 participant 1 message May 10, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 saa7134: add RM-K6 remote control support for Avermedia M135A

This change adds support for one more remote control type for Avermedia M135A (model RM-K6), shipped with Positivo machines.

---
 drivers/media/IR/keymaps/Makefile                  |    2 +-
 .../media/IR/keymaps/rc-avermedia-m135a-rm-jx.c    |   90 ------------
 drivers/media/IR/keymaps/rc-avermedia-m135a.c      |  147 ++++++++++++++++++++
 drivers/media/video/saa7134/saa7134-input.c        |    2 +-
 include/media/rc-map.h                             |    2 +-
 5 files changed, 150 insertions(+), 93 deletions(-)
 delete mode 100644 drivers/media/IR/keymaps/rc-avermedia-m135a-rm-jx.c
 create mode 100644 drivers/media/IR/keymaps/rc-avermedia-m135a.c
drivers/media/IR/keymaps/Makefile +1 -1
index 585f75c..aea649f 100644
@@ -6,7 +6,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
 			rc-avermedia.o \
 			rc-avermedia-cardbus.o \
 			rc-avermedia-dvbt.o \
-			rc-avermedia-m135a-rm-jx.o \
+			rc-avermedia-m135a.o \
 			rc-avermedia-m733a-rm-k6.o \
 			rc-avertv-303.o \
 			rc-behold.o \
drivers/media/IR/keymaps/rc-avermedia-m135a-rm-jx.c deleted +0 -90

90 lines not on this page · raw message

drivers/media/IR/keymaps/rc-avermedia-m135a.c new file +147 -0

147 lines not on this page · raw message

drivers/media/video/saa7134/saa7134-input.c +1 -1
index c44e235..00fa9a9 100644
@@ -656,7 +656,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
 		saa_setb(SAA7134_GPIO_GPSTATUS0, 0x4);
 		break;
 	case SAA7134_BOARD_AVERMEDIA_M135A:
-		ir_codes     = RC_MAP_AVERMEDIA_M135A_RM_JX;
+		ir_codes     = RC_MAP_AVERMEDIA_M135A;
 		mask_keydown = 0x0040000;	/* Enable GPIO18 line on both edges */
 		mask_keyup   = 0x0040000;
 		mask_keycode = 0xffff;
include/media/rc-map.h +1 -1
index 6f1f9f7..c78e99a 100644
@@ -55,7 +55,7 @@ void rc_map_init(void);
 #define RC_MAP_AVERMEDIA_A16D            "rc-avermedia-a16d"
 #define RC_MAP_AVERMEDIA_CARDBUS         "rc-avermedia-cardbus"
 #define RC_MAP_AVERMEDIA_DVBT            "rc-avermedia-dvbt"
-#define RC_MAP_AVERMEDIA_M135A_RM_JX     "rc-avermedia-m135a-rm-jx"
+#define RC_MAP_AVERMEDIA_M135A           "rc-avermedia-m135a"
 #define RC_MAP_AVERMEDIA_M733A_RM_K6     "rc-avermedia-m733a-rm-k6"
 #define RC_MAP_AVERMEDIA                 "rc-avermedia"
 #define RC_MAP_AVERTV_303                "rc-avertv-303"
Signature · 1 line
1.7.1