v4l: saa7134 cleanups and new cards.
PATCH 1/1 v4l: saa7134 cleanups and new cards.
Hi,
This patch is a update for the saa7134 driver in the linux kernel. Changes:
* kernel thread cleanups (exit/rmmod sync using completions, wait queue fixes).
* add support for more cards.
* improved infrared remote support.
Please apply,
Gerd
drivers/media/video/saa7134/saa7134-cards.c +91 -1
@@ -834,7 +834,7 @@ }}, }, [SAA7134_BOARD_ECS_TVP3XP] = { - .name = "Elitegroup ECS TVP3XP FM1216 Tuner Card", + .name = "Elitegroup ECS TVP3XP FM1216 Tuner Card(PAL-BG,FM) ", .audio_clock = 0x187de7, // xtal 32.1 MHz .tuner_type = TUNER_PHILIPS_PAL, .inputs = {{
@@ -865,6 +865,82 @@ .amux = LINE2, }, }, + [SAA7134_BOARD_ECS_TVP3XP_4CB5 ] = { + .name ="Elitegroup ECS TVP3XP FM1236 Tuner Card (NTSC,FM)" , + .audio_clock =0x187de7 , + .tuner_type =TUNER_PHILIPS_NTSC , + .inputs = {{ + .name = name_tv, + .vmux =1 , + .amux =TV , + .tv =1 , + },{ + .name = name_tv_mono, + .vmux =1 , + .amux =LINE2 , + .tv =1 , + },{ + .name = name_comp1, + .vmux =3 , + .amux =LINE1 , + },{ + .name = name_svideo, + .vmux =8 , + .amux =LINE1 , + },{ + .name ="CVid over SVid" , + .vmux =0 , + .amux =LINE1 , + }}, + .radio = { + .name = name_radio, + .amux =LINE2 , + }, + }, + [SAA7134_BOARD_AVACSSMARTTV ] = { +/* Roman Pszonczenko <[email protected]> */ + .name ="AVACS SmartTV" , + .audio_clock =0x00187de7 , + .tuner_type =TUNER_PHILIPS_PAL , + .inputs = {{ + .name = name_tv, + .vmux =1 , + .amux =TV , + .tv =1 , + },{ + .name = name_tv_mono, + .vmux =1 , + .amux =LINE2 , + .tv =1 , + },{ + .name = name_comp1, + .vmux =0 , + .amux =LINE2 , + },{ + .name = name_comp2, + .vmux =3 , + .amux =LINE2 , + },{ + .name = name_svideo, + .vmux =8 , + .amux =LINE2 , + }}, + .radio = { + .name = name_radio, + .amux =LINE2 , + .gpio =0x200000 , + }, + }, + [SAA7134_BOARD_AVERMEDIA_DVD_EZMAKER ] = { +/* Michael Smith <[email protected]> */ + .name ="AVerMedia DVD EZMaker" , + .audio_clock =0x00187de7 , + .tuner_type =TUNER_ABSENT , + .inputs = {{ + .name = name_comp1, + .vmux =3 , + }}, + }, };const unsigned int saa7134_bcount =ARRAY_SIZE (saa7134_boards);
@@ -1023,6 +1099,12 @@ .subvendor = 0x1461, /* Avermedia Technologies Inc */ .subdevice = 0x2115, .driver_data = SAA7134_BOARD_MD2819, + },{ + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7130, + .subvendor = 0x1461, /* Avermedia Technologies Inc */ + .subdevice = 0x10ff, + .driver_data = SAA7134_BOARD_AVERMEDIA_DVD_EZMAKER, },{/* TransGear 3000TV */ .vendor = PCI_VENDOR_ID_PHILIPS,
@@ -1043,6 +1125,12 @@ .subdevice = 0x4cb4, .driver_data = SAA7134_BOARD_ECS_TVP3XP, },{ + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7133, + .subvendor = 0x1019, + .subdevice = 0x4cb5, + .driver_data = SAA7134_BOARD_ECS_TVP3XP_4CB5, + },{/* --- boards without eeprom + subsystem ID --- */ .vendor = PCI_VENDOR_ID_PHILIPS,
@@ -1149,6 +1237,8 @@break ;case SAA7134_BOARD_CINERGY400 :case SAA7134_BOARD_CINERGY600 : +case SAA7134_BOARD_ECS_TVP3XP : +case SAA7134_BOARD_ECS_TVP3XP_4CB5 : dev->has_remote =1 ;break ; }
drivers/media/video/saa7134/saa7134-input.c +99 -4
164 lines not on this page · raw message
drivers/media/video/saa7134/saa7134-tvaudio.c +31 -43
162 lines not on this page · raw message
drivers/media/video/saa7134/saa7134.h +9 -3
@@ -151,6 +151,9 @@#define SAA7134_BOARD_MANLI_MTV001 28#define SAA7134_BOARD_TG3000TV 29#define SAA7134_BOARD_ECS_TVP3XP 30 +#define SAA7134_BOARD_ECS_TVP3XP_4CB5 31 +#define SAA7134_BOARD_AVACSSMARTTV 32 +#define SAA7134_BOARD_AVERMEDIA_DVD_EZMAKER 33#define SAA7134_INPUT_MAX 8
@@ -212,10 +215,10 @@/* tvaudio thread status */ struct saa7134_thread { -struct task_struct *task; +pid_t pid; +struct completion exit;wait_queue_head_t wq; -struct semaphore *notify; -unsigned int exit; +unsigned int shutdown;unsigned int scan1;unsigned int scan2;unsigned int mode;
@@ -319,6 +322,9 @@u32 mask_keycode;u32 mask_keydown;u32 mask_keyup; +int polling; +u32 last_gpio; +struct timer_list timer; };/* global device status */
Signature · 1 line
"... und auch das ganze Wochenende oll" -- Wetterbericht auf RadioEins