Synchronize patch for tuner cards and some V4L chips
Tuner improvements and additions. TEA5767 FM tuner added. Several small fixes.
Signed-off-by Mauro Carvalho Chehab <[email protected]>
Signed-off-by Nickolay V Shmyrev <[email protected]>
drivers/media/video/bt832.c +30 -20
@@ -6,7 +6,7 @@ It outputs an 8-bit 4:2:2 YUV or YCrCb video signal which can be directly connected to bt848/bt878 GPIO pins on this purpose. (see: VLSI Vision Ltd. www.vvl.co.uk for camera datasheets) - + Supported Cards: - Pixelview Rev.4E: 0x8a GPIO 0x400000 toggles Bt832 RESET, and the chip changes to i2c 0x88 !
@@ -31,16 +31,16 @@#include <linux/errno.h> #include <linux/slab.h> -#include "id.h" -#include "audiochip.h" +#include <media/audiochip.h> +#include <media/id.h> #include "bttv.h" #include "bt832.h" MODULE_LICENSE ("GPL" );/* Addresses to scan */ -static unsigned short normal_i2c[] = {I2C_BT832_ALT1 >>1 ,I2C_BT832_ALT2 >>1 , -I2C_CLIENT_END }; +static unsigned short normal_i2c[] = {I2C_CLIENT_END }; +static unsigned short normal_i2c_range[] = {I2C_BT832_ALT1 >>1 ,I2C_BT832_ALT2 >>1 ,I2C_CLIENT_END };I2C_CLIENT_INSMOD ;/* ---------------------------------------------------------------------- */
@@ -95,7 +95,7 @@ buf=kmalloc (65 ,GFP_KERNEL );bt832_hexdump (i2c_client_s,buf); - +if (buf[0x40 ] !=0x31 ) {printk ("bt832: this i2c chip is no bt832 (id=%02x). Detaching.\n" ,buf[0x40 ]);kfree (buf);
@@ -135,7 +135,7 @@ buf[1 ]=0x27 & (~0x01 );// Default | !skip if (2 != (rc =i2c_master_send (i2c_client_s,buf,2 )))printk ("bt832: i2c i/o error EO: rc == %d (should be 2)\n" ,rc); - +bt832_hexdump (i2c_client_s,buf);#if 0
@@ -168,8 +168,7 @@ -static int bt832_attach (struct i2c_adapter *adap,int addr, -unsigned short flags,int kind) +static int bt832_attach (struct i2c_adapter *adap,int addr,int kind) {struct bt832 *t;
@@ -184,27 +183,32 @@return -ENOMEM ;memset (t,0 ,sizeof (*t)); t->client = client_template; - t->client.data = t; +i2c_set_clientdata (&t->client, t);i2c_attach_client (&t->client);if (!bt832_init (&t->client)) {bt832_detach (&t->client);return -1 ; } - +return 0 ; }static int bt832_probe (struct i2c_adapter *adap) { +#ifdef I2C_CLASS_TV_ANALOG if (adap->class &I2C_CLASS_TV_ANALOG )return i2c_probe (adap, &addr_data, bt832_attach); +#else +if (adap->id == (I2C_ALGO_BIT |I2C_HW_B_BT848 )) +return i2c_probe (adap, &addr_data, bt832_attach); +#endif return 0 ; }static int bt832_detach (struct i2c_client *client) { -struct bt832 *t = (struct bt832 *)client->data; +struct bt832 *t =i2c_get_clientdata (client);printk ("bt832: detach.\n" );i2c_detach_client (client);
@@ -215,7 +219,7 @@static int bt832_command (struct i2c_client *client,unsigned int cmd,void *arg) { -struct bt832 *t = (struct bt832 *)client->data; +struct bt832 *t =i2c_get_clientdata (client);printk ("bt832: command %x\n" ,cmd);
@@ -249,19 +253,18 @@ };static struct i2c_client client_template = { - .name ="bt832" , - .flags =I2C_CLIENT_ALLOW_USE , - .driver = &driver, +I2C_DEVNAME ("bt832" ), + .flags =I2C_CLIENT_ALLOW_USE , + .driver = &driver, }; -int bt832_init_module (void ) +static int __init bt832_init_module (void ) { -i2c_add_driver (&driver); -return 0 ; +return i2c_add_driver (&driver); } -static void bt832_cleanup_module (void ) +static void __exit bt832_cleanup_module(void) {i2c_del_driver (&driver); }
@@ -269,3 +272,10 @@module_init (bt832_init_module);module_exit (bt832_cleanup_module); +/* +* Overrides for Emacs so that we follow Linus's tabbing style. +* --------------------------------------------------------------------------- +* Local variables: +* c-basic-offset: 8 +* End: +*/
drivers/media/video/bt832.h +18 -18
@@ -1,6 +1,6 @@/* Bt832 CMOS Camera Video Processor (VP) -The Bt832 CMOS Camera Video Processor chip connects a Quartsight CMOS +The Bt832 CMOS Camera Video Processor chip connects a Quartsight CMOS color digital camera directly to video capture devices via an 8-bit, 4:2:2 YUV or YCrCb video interface.
@@ -85,7 +85,7 @@#define BT832_DEVICE_ID 63# define BT832_DEVICE_ID__31 0x31 // Bt832 has ID 0x31 -/* STMicroelectronivcs VV5404 camera module +/* STMicroelectronivcs VV5404 camera module i2c: 0x20: sensor address i2c: 0xa0: eeprom for ccd defect map */
@@ -256,26 +256,26 @@//=========================================================================== // Timing generator SRAM table values for CCIR601 720x480 NTSC //=========================================================================== -// For NTSC CCIR656 +// For NTSC CCIR656 BYTE BtCard::SRAMTable_NTSC[] = {// SRAM Timing Table for NTSC -0x0c ,0xc0 ,0x00 , -0x00 ,0x90 ,0xc2 , -0x03 ,0x10 ,0x03 , -0x06 ,0x10 ,0x34 , -0x12 ,0x12 ,0x65 , -0x02 ,0x13 ,0x24 , -0x19 ,0x00 ,0x24 , -0x39 ,0x00 ,0x96 , -0x59 ,0x08 ,0x93 , +0x0c ,0xc0 ,0x00 , +0x00 ,0x90 ,0xc2 , +0x03 ,0x10 ,0x03 , +0x06 ,0x10 ,0x34 , +0x12 ,0x12 ,0x65 , +0x02 ,0x13 ,0x24 , +0x19 ,0x00 ,0x24 , +0x39 ,0x00 ,0x96 , +0x59 ,0x08 ,0x93 ,0x83 ,0x08 ,0x97 , -0x03 ,0x50 ,0x30 , -0xc0 ,0x40 ,0x30 , -0x86 ,0x01 ,0x01 , -0xa6 ,0x0d ,0x62 , -0x03 ,0x11 ,0x61 , -0x05 ,0x37 ,0x30 , +0x03 ,0x50 ,0x30 , +0xc0 ,0x40 ,0x30 , +0x86 ,0x01 ,0x01 , +0xa6 ,0x0d ,0x62 , +0x03 ,0x11 ,0x61 , +0x05 ,0x37 ,0x30 ,0xac ,0x21 ,0x50 };
include/media/ir-common.h +1 -1
@@ -1,5 +1,5 @@/* -* $Id: ir-common.h,v 1.8 2005/02/22 12:28:40 kraxel Exp $ +* $Id: ir-common.h,v 1.9 2005/05/15 19:01:26 mchehab Exp $ * * some common structs and functions to handle infrared remotes via * input layer ...
drivers/media/common/ir-common.c +26 -13
@@ -1,5 +1,5 @@/* -* $Id: ir-common.c,v 1.8 2005/02/22 12:28:40 kraxel Exp $ +* $Id: ir-common.c,v 1.10 2005/05/22 19:23:39 nsh Exp $ * * some common structs and functions to handle infrared remotes via * input layer ...
@@ -131,10 +131,10 @@ [ 18 ] = KEY_KP0, [ 0 ] = KEY_POWER, - [ 27 ] = KEY_LANGUAGE, //MTS button +// [ 27 ] = MTS button [ 2 ] = KEY_TUNER, // TV/FM [ 30 ] = KEY_VIDEO, - [ 22 ] = KEY_INFO, //display button +// [ 22 ] = display button [ 4 ] = KEY_VOLUMEUP, [ 8 ] = KEY_VOLUMEDOWN, [ 12 ] = KEY_CHANNELUP,
@@ -142,7 +142,7 @@ [ 3 ] = KEY_ZOOM, // fullscreen [ 31 ] = KEY_SUBTITLE, // closed caption/teletext [ 32 ] = KEY_SLEEP, - [ 41 ] = KEY_SEARCH, //boss key +// [ 41 ] = boss key [ 20 ] = KEY_MUTE, [ 43 ] = KEY_RED, [ 44 ] = KEY_GREEN,
@@ -150,17 +150,17 @@ [ 46 ] = KEY_BLUE, [ 24 ] = KEY_KPPLUS, //fine tune + [ 25 ] = KEY_KPMINUS, //fine tune - - [ 42 ] = KEY_ANGLE, //picture in picture - [ 33 ] = KEY_KPDOT, +// [ 42 ] = picture in picture + [ 33 ] = KEY_KPDOT, [ 19 ] = KEY_KPENTER, - [ 17 ] = KEY_AGAIN, //recall +// [ 17 ] = recall [ 34 ] = KEY_BACK, [ 35 ] = KEY_PLAYPAUSE, [ 36 ] = KEY_NEXT, - [ 37 ] = KEY_T, //time shifting +// [ 37 ] = time shifting [ 38 ] = KEY_STOP, - [ 39 ] = KEY_RECORD, - [ 40 ] = KEY_SHUFFLE //snapshot + [39 ] =KEY_RECORD +// [ 40 ] = snapshot };EXPORT_SYMBOL_GPL (ir_codes_winfast);
@@ -184,18 +184,30 @@ [ 0x07 ] = KEY_KP7, // 7 [ 0x08 ] = KEY_KP8, // 8 [ 0x09 ] = KEY_KP9, // 9 + [ 0x0a ] = KEY_TEXT, // keypad asterisk as well [ 0x0b ] = KEY_RED, // red button - [ 0x0c ] = KEY_OPTION, // black key without text + [ 0x0c ] = KEY_RADIO, // radio [ 0x0d ] = KEY_MENU, // menu + [ 0x0e ] = KEY_SUBTITLE, // also the # key [ 0x0f ] = KEY_MUTE, // mute [ 0x10 ] = KEY_VOLUMEUP, // volume + [ 0x11 ] = KEY_VOLUMEDOWN, // volume - - [ 0x1e ] = KEY_NEXT, // skip >| + [ 0x12 ] = KEY_PREVIOUS, // previous channel + [ 0x14 ] = KEY_UP, // up + [ 0x15 ] = KEY_DOWN, // down + [ 0x16 ] = KEY_LEFT, // left + [ 0x17 ] = KEY_RIGHT, // right + [ 0x18 ] = KEY_VIDEO, // Videos + [ 0x19 ] = KEY_AUDIO, // Music + [ 0x1a ] = KEY_MHP, // Pictures - presume this means "Multimedia Home Platform"- no "PICTURES" key in input.h + [ 0x1b ] = KEY_EPG, // Guide + [ 0x1c ] = KEY_TV, // TV + [ 0x1e ] = KEY_NEXTSONG, // skip >| [ 0x1f ] = KEY_EXIT, // back/exit [ 0x20 ] = KEY_CHANNELUP, // channel / program + [ 0x21 ] = KEY_CHANNELDOWN, // channel / program - [ 0x22 ] = KEY_CHANNEL, // source (old black remote) - [ 0x24 ] = KEY_PREVIOUS, // replay |< + [ 0x24 ] = KEY_PREVIOUSSONG, // replay |< [ 0x25 ] = KEY_ENTER, // OK [ 0x26 ] = KEY_SLEEP, // minimize (old black remote) [ 0x29 ] = KEY_BLUE, // blue key
@@ -412,3 +424,4 @@* c-basic-offset: 8 * End: */ +
include/media/audiochip.h +4 -0
@@ -1,3 +1,7 @@ +/* +* $Id: audiochip.h,v 1.3 2005/06/12 04:19:19 mchehab Exp $ +*/ +#ifndef AUDIOCHIP_H #define AUDIOCHIP_H
include/media/id.h +4 -0
@@ -1,3 +1,7 @@ +/* +* $Id: id.h,v 1.4 2005/06/12 04:19:19 mchehab Exp $ +*/ +/* FIXME: this temporarely, until these are included in linux/i2c-id.h */ /* drivers */
drivers/media/video/msp3400.c +5 -8
@@ -147,6 +147,7 @@I2C_MSP3400C_ALT >>1 , I2C_CLIENT_END }; +static unsigned short normal_i2c_range[] = {I2C_CLIENT_END ,I2C_CLIENT_END };I2C_CLIENT_INSMOD ;/* ----------------------------------------------------------------------- */
@@ -735,7 +736,6 @@ {DECLARE_WAITQUEUE (wait, current); -again:add_wait_queue (&msp->wq, &wait);if (!kthread_should_stop ()) {if (timeout <0 ) {
@@ -751,12 +751,9 @@#endif } } - +if (current->flags &PF_FREEZE ) +refrigerator (PF_FREEZE );remove_wait_queue (&msp->wq, &wait); - -if (try_to_freeze (PF_FREEZE )) - goto again; -return msp->restart; }
@@ -1436,7 +1433,7 @@static int msp_probe (struct i2c_adapter *adap);static int msp_command (struct i2c_client *client,unsigned int cmd,void *arg); -static int msp_suspend (struct device * dev,pm_message_t state,u32 level); +static int msp_suspend (struct device * dev,u32 state,u32 level);static int msp_resume (struct device * dev,u32 level);static void msp_wake_thread (struct i2c_client *client);
@@ -1841,7 +1838,7 @@return 0 ; } -static int msp_suspend (struct device * dev,pm_message_t state,u32 level) +static int msp_suspend (struct device * dev,u32 state,u32 level) { struct i2c_client *c = container_of(dev, struct i2c_client, dev);
drivers/media/video/msp3400.h +4 -0
@@ -1,3 +1,7 @@ +/* +* $Id: msp3400.h,v 1.3 2005/06/12 04:19:19 mchehab Exp $ +*/ +#ifndef MSP3400_H #define MSP3400_H
drivers/media/video/tda7432.c +1 -0
@@ -74,6 +74,7 @@I2C_TDA7432 >>1 , I2C_CLIENT_END, }; +static unsigned short normal_i2c_range[] = {I2C_CLIENT_END ,I2C_CLIENT_END };I2C_CLIENT_INSMOD ;/* Structure of address and subaddresses for the tda7432 */
drivers/media/video/tda9875.c +1 -0
@@ -44,6 +44,7 @@I2C_TDA9875 >>1 , I2C_CLIENT_END }; +static unsigned short normal_i2c_range[] = {I2C_CLIENT_END };I2C_CLIENT_INSMOD ;/* This is a superset of the TDA9875 */
drivers/media/video/tvaudio.c +1 -1
@@ -148,6 +148,7 @@I2C_TDA9874 >>1 ,I2C_PIC16C54 >>1 , I2C_CLIENT_END }; +static unsigned short normal_i2c_range[2 ] = {I2C_CLIENT_END ,I2C_CLIENT_END };I2C_CLIENT_INSMOD ;static struct i2c_driver driver;
@@ -285,7 +286,6 @@schedule (); }remove_wait_queue (&chip->wq, &wait); -try_to_freeze (PF_FREEZE );if (chip->done ||signal_pending (current))break ;dprintk ("%s: thread wakeup\n" ,i2c_clientname (&chip->c));
drivers/media/video/tvmixer.c +4 -0
@@ -1,3 +1,7 @@ +/* +* $Id: tvmixer.c,v 1.8 2005/06/12 04:19:19 mchehab Exp $ +*/ +#include <linux/module.h> #include <linux/moduleparam.h> #include <linux/kernel.h>
include/media/tuner.h +21 -3
@@ -25,6 +25,8 @@#include "id.h" +#define ADDR_UNSET (255) +#define TUNER_TEMIC_PAL 0/* 4002 FH5 (3X 7756, 9483) */ #define TUNER_PHILIPS_PAL_I 1#define TUNER_PHILIPS_NTSC 2
@@ -100,6 +102,11 @@#define TUNER_YMEC_TVF_8531MF 58#define TUNER_YMEC_TVF_5533MF 59/* Pixelview Pro Ultra NTSC */ +#define TUNER_THOMSON_DTT7611 60 +#define TUNER_TENA_9533_DI 61 +#define TUNER_TEA5767 62/* Only FM Radio Tuner */ + +#define TEA5767_TUNER_NAME "Philips TEA5767HN FM Radio"#define NOTUNER 0#define PAL 1/* PAL_BG */
@@ -107,6 +114,7 @@#define NTSC 3#define SECAM 4#define ATSC 5 +#define RADIO 6#define NoTuner 0#define Philips 1
@@ -122,9 +130,17 @@#define TCL 11#define THOMSON 12 +enum v4l_radio_tuner { +TEA5767_LOW_LO_32768 =0 , +TEA5767_HIGH_LO_32768 =1 , + TEA5767_LOW_LO_13MHz =2 , + TEA5767_HIGH_LO_13MHz =3 , +}; + +#define TUNER_SET_TYPE _IOW('t',1,int)/* set tuner type */ #define TUNER_SET_TVFREQ _IOW('t',2,int)/* set tv freq */ -#define TUNER_SET_ADDR _IOW('T',3,int)/* Chooses tuner I2C address */ +#define TUNER_SET_TYPE_ADDR _IOW('T',3,int)/* set tuner type and I2C addr */ #define TDA9887_SET_CONFIG _IOW('t',5,int)
@@ -149,8 +165,9 @@#define I2C_ADDR_TDA8275 0x61struct tuner_addr { -enum v4l2_tuner_type type; -unsigned short addr; +enum v4l2_tuner_type v4l2_tuner; +unsigned int type; +unsigned short addr; };struct tuner {
@@ -187,6 +204,7 @@extern int microtune_init (struct i2c_client *c);extern int tda8290_init (struct i2c_client *c); +extern int tea5767_tuner_init (struct i2c_client *c);extern int default_tuner_init (struct i2c_client *c); #define tuner_warn(fmt, arg...) \
drivers/media/video/tuner-core.c +151 -70
390 lines not on this page · raw message
drivers/media/video/tuner-simple.c +34 -21
98 lines not on this page · raw message
drivers/media/video/tda8290.c +2 -2
@@ -194,12 +194,12 @@ {unsigned char i2c_get_afc[1 ] = {0x1B };unsigned char afc =0 ; - +i2c_master_send (c, i2c_get_afc,ARRAY_SIZE (i2c_get_afc));i2c_master_recv (c, &afc,1 );return (afc &0x80 )?65535 :0 ; } - +int tda8290_init (struct i2c_client *c) {struct tuner *t =i2c_get_clientdata (c);
drivers/media/video/tda9887.c +36 -5
100 lines not on this page · raw message