Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
V4L/DVB (3340): Add bttv card MagicTV (rebranded MachTV)
- Add bttv card MagicTV (rebranded MachTV)
Signed-off-by: Julian Calaby <julian.calaby@gmail.com>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
authored by Julian Calaby and committed by Mauro Carvalho Chehab 2d05ae6b 30367bfd
+1
Documentation/video4linux/CARDLIST.bttv
+1
Documentation/video4linux/CARDLIST.bttv
+23
drivers/media/video/bttv-cards.c
+23
drivers/media/video/bttv-cards.c
···
2836
2836
.tuner_addr = ADDR_UNSET,
2837
2837
.radio_addr = ADDR_UNSET,
2838
2838
},
2839
+
[BTTV_BOARD_MACHTV_MAGICTV] = {
2840
+
/* Julian Calaby <julian.calaby@gmail.com>
2841
+
* Slightly different from original MachTV definition (0x60)
2842
+
2843
+
* FIXME: RegSpy says gpiomask should be "0x001c800f", but it
2844
+
* stuffs up remote chip. Bug is a pin on the jaecs is not set
2845
+
* properly (methinks) causing no keyup bits being set */
2846
+
2847
+
.name = "MagicTV", /* rebranded MachTV */
2848
+
.video_inputs = 3,
2849
+
.audio_inputs = 1,
2850
+
.tuner = 0,
2851
+
.svhs = 2,
2852
+
.gpiomask = 7,
2853
+
.muxsel = { 2, 3, 1, 1 },
2854
+
.audiomux = { 0, 1, 2, 3, 4 },
2855
+
.tuner_type = TUNER_TEMIC_4009FR5_PAL,
2856
+
.tuner_addr = ADDR_UNSET,
2857
+
.radio_addr = ADDR_UNSET,
2858
+
.pll = PLL_28,
2859
+
.has_radio = 1,
2860
+
.has_remote = 1,
2861
+
},
2839
2862
};
2840
2863
2841
2864
static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards);
+6
drivers/media/video/bttv-input.c
+6
drivers/media/video/bttv-input.c
···
583
583
btv->custom_irq = bttv_rc5_irq;
584
584
ir->rc5_gpio = 1;
585
585
break;
586
+
case BTTV_BOARD_MACHTV_MAGICTV:
587
+
ir_codes = ir_codes_apac_viewcomp;
588
+
ir->mask_keycode = 0x001F00;
589
+
ir->mask_keyup = 0x004000;
590
+
ir->polling = 50; /* ms */
591
+
break;
586
592
}
587
593
if (NULL == ir_codes) {
588
594
dprintk(KERN_INFO "Ooops: IR config error [card=%d]\n",btv->c.type);