Selaa lähdekoodia

[media] saa7134: enable IR support for Hauppauge HVR-1150/1120

Enable the IR support for the Hauppauge HVR-1150 and HVR-1120.

Thanks to Fernando Laudares Camargos for testing the patch.

Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Cc: Fernando Laudares Camargos <fernando.laudares.camargos@gmail.com>
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Devin Heitmueller 14 vuotta sitten
vanhempi
commit
da4b7b2011

+ 1 - 0
drivers/media/video/saa7134/saa7134-cards.c

@@ -7313,6 +7313,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
 		break;
 		break;
 	case SAA7134_BOARD_HAUPPAUGE_HVR1150:
 	case SAA7134_BOARD_HAUPPAUGE_HVR1150:
 	case SAA7134_BOARD_HAUPPAUGE_HVR1120:
 	case SAA7134_BOARD_HAUPPAUGE_HVR1120:
+		dev->has_remote = SAA7134_REMOTE_GPIO;
 		/* GPIO 26 high for digital, low for analog */
 		/* GPIO 26 high for digital, low for analog */
 		saa7134_set_gpio(dev, 26, 0);
 		saa7134_set_gpio(dev, 26, 0);
 		msleep(1);
 		msleep(1);

+ 8 - 0
drivers/media/video/saa7134/saa7134-input.c

@@ -756,6 +756,14 @@ int saa7134_input_init1(struct saa7134_dev *dev)
 		mask_keycode = 0x0ff00;
 		mask_keycode = 0x0ff00;
 		mask_keyup   = 0x040000;
 		mask_keyup   = 0x040000;
 		break;
 		break;
+	case SAA7134_BOARD_HAUPPAUGE_HVR1150:
+	case SAA7134_BOARD_HAUPPAUGE_HVR1120:
+		ir_codes     = RC_MAP_HAUPPAUGE;
+		mask_keydown = 0x0040000;	/* Enable GPIO18 line on both edges */
+		mask_keyup   = 0x0040000;
+		mask_keycode = 0xffff;
+		raw_decode   = true;
+		break;
 	}
 	}
 	if (NULL == ir_codes) {
 	if (NULL == ir_codes) {
 		printk("%s: Oops: IR config error [card=%d]\n",
 		printk("%s: Oops: IR config error [card=%d]\n",