aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Documentation/video4linux/CARDLIST.tuner1
-rw-r--r--drivers/media/dvb/bt8xx/bt878.c2
-rw-r--r--drivers/media/dvb/dvb-usb/cxusb.c2
-rw-r--r--drivers/media/dvb/ttpci/av7110.c4
-rw-r--r--drivers/media/video/Makefile3
-rw-r--r--drivers/media/video/arv.c6
-rw-r--r--drivers/media/video/bt832.c2
-rw-r--r--drivers/media/video/btcx-risc.c2
-rw-r--r--drivers/media/video/bttv-cards.c6
-rw-r--r--drivers/media/video/bttv-driver.c87
-rw-r--r--drivers/media/video/bttv-i2c.c6
-rw-r--r--drivers/media/video/bttvp.h5
-rw-r--r--drivers/media/video/cx25840/cx25840-core.c2
-rw-r--r--drivers/media/video/cx88/Makefile1
-rw-r--r--drivers/media/video/cx88/cx88-alsa.c4
-rw-r--r--drivers/media/video/cx88/cx88-vp3054-i2c.c4
-rw-r--r--drivers/media/video/msp3400-driver.c10
-rw-r--r--drivers/media/video/planb.c4
-rw-r--r--drivers/media/video/saa6588.c10
-rw-r--r--drivers/media/video/saa711x.c2
-rw-r--r--drivers/media/video/saa7134/saa7134-core.c2
-rw-r--r--drivers/media/video/tuner-simple.c750
-rw-r--r--drivers/media/video/tuner-types.c1400
-rw-r--r--drivers/media/video/tveeprom.c2
-rw-r--r--include/media/tuner-types.h37
-rw-r--r--include/media/tuner.h2
26 files changed, 1551 insertions, 805 deletions
diff --git a/Documentation/video4linux/CARDLIST.tuner b/Documentation/video4linux/CARDLIST.tuner
index 0bf3d5bf9ef8..f6d0cf7b7922 100644
--- a/Documentation/video4linux/CARDLIST.tuner
+++ b/Documentation/video4linux/CARDLIST.tuner
@@ -68,3 +68,4 @@ tuner=66 - LG NTSC (TALN mini series)
68tuner=67 - Philips TD1316 Hybrid Tuner 68tuner=67 - Philips TD1316 Hybrid Tuner
69tuner=68 - Philips TUV1236D ATSC/NTSC dual in 69tuner=68 - Philips TUV1236D ATSC/NTSC dual in
70tuner=69 - Tena TNF 5335 MF 70tuner=69 - Tena TNF 5335 MF
71tuner=70 - Samsung TCPN 2121P30A
diff --git a/drivers/media/dvb/bt8xx/bt878.c b/drivers/media/dvb/bt8xx/bt878.c
index f29571450038..a04bb61f21f4 100644
--- a/drivers/media/dvb/bt8xx/bt878.c
+++ b/drivers/media/dvb/bt8xx/bt878.c
@@ -542,7 +542,7 @@ static struct pci_driver bt878_pci_driver = {
542 .remove = bt878_remove, 542 .remove = bt878_remove,
543}; 543};
544 544
545static int bt878_pci_driver_registered = 0; 545static int bt878_pci_driver_registered;
546 546
547/*******************************/ 547/*******************************/
548/* Module management functions */ 548/* Module management functions */
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index 18d169836c9c..a7fb06f4cd34 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -691,6 +691,8 @@ module_init (cxusb_module_init);
691module_exit (cxusb_module_exit); 691module_exit (cxusb_module_exit);
692 692
693MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>"); 693MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
694MODULE_AUTHOR("Michael Krufky <mkrufky@m1k.net>");
695MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>");
694MODULE_DESCRIPTION("Driver for Conexant USB2.0 hybrid reference design"); 696MODULE_DESCRIPTION("Driver for Conexant USB2.0 hybrid reference design");
695MODULE_VERSION("1.0-alpha"); 697MODULE_VERSION("1.0-alpha");
696MODULE_LICENSE("GPL"); 698MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 327a8089193b..27494901975f 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -81,7 +81,7 @@ static int adac = DVB_ADAC_TI;
81static int hw_sections; 81static int hw_sections;
82static int rgb_on; 82static int rgb_on;
83static int volume = 255; 83static int volume = 255;
84static int budgetpatch = 0; 84static int budgetpatch;
85 85
86module_param_named(debug, av7110_debug, int, 0644); 86module_param_named(debug, av7110_debug, int, 0644);
87MODULE_PARM_DESC(debug, "debug level (bitmask, default 0)"); 87MODULE_PARM_DESC(debug, "debug level (bitmask, default 0)");
@@ -103,7 +103,7 @@ MODULE_PARM_DESC(budgetpatch, "use budget-patch hardware modification: default 0
103 103
104static void restart_feeds(struct av7110 *av7110); 104static void restart_feeds(struct av7110 *av7110);
105 105
106static int av7110_num = 0; 106static int av7110_num;
107 107
108#define FE_FUNC_OVERRIDE(fe_func, av7110_copy, av7110_func) \ 108#define FE_FUNC_OVERRIDE(fe_func, av7110_copy, av7110_func) \
109{\ 109{\
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index dd24896906fe..faf728366c4e 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -8,7 +8,8 @@ bttv-objs := bttv-driver.o bttv-cards.o bttv-if.o \
8zoran-objs := zr36120.o zr36120_i2c.o zr36120_mem.o 8zoran-objs := zr36120.o zr36120_i2c.o zr36120_mem.o
9zr36067-objs := zoran_procfs.o zoran_device.o \ 9zr36067-objs := zoran_procfs.o zoran_device.o \
10 zoran_driver.o zoran_card.o 10 zoran_driver.o zoran_card.o
11tuner-objs := tuner-core.o tuner-simple.o mt20xx.o tda8290.o tea5767.o 11tuner-objs := tuner-core.o tuner-types.o tuner-simple.o \
12 mt20xx.o tda8290.o tea5767.o
12 13
13msp3400-objs := msp3400-driver.o msp3400-kthreads.o 14msp3400-objs := msp3400-driver.o msp3400-kthreads.o
14 15
diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c
index 7d5a068353f2..994b75fe165a 100644
--- a/drivers/media/video/arv.c
+++ b/drivers/media/video/arv.c
@@ -129,9 +129,9 @@ static unsigned char yuv[MAX_AR_FRAME_BYTES];
129static int freq = DEFAULT_FREQ; /* BCLK: available 50 or 70 (MHz) */ 129static int freq = DEFAULT_FREQ; /* BCLK: available 50 or 70 (MHz) */
130static int vga = 0; /* default mode(0:QVGA mode, other:VGA mode) */ 130static int vga = 0; /* default mode(0:QVGA mode, other:VGA mode) */
131static int vga_interlace = 0; /* 0 is normal mode for, else interlace mode */ 131static int vga_interlace = 0; /* 0 is normal mode for, else interlace mode */
132MODULE_PARM(freq, "i"); 132module_param(freq, int, 0);
133MODULE_PARM(vga, "i"); 133module_param(vga, int, 0);
134MODULE_PARM(vga_interlace, "i"); 134module_param(vga_interlace, int, 0);
135 135
136static int ar_initialize(struct video_device *dev); 136static int ar_initialize(struct video_device *dev);
137 137
diff --git a/drivers/media/video/bt832.c b/drivers/media/video/bt832.c
index 07c78f1f7a44..cc54b62f4601 100644
--- a/drivers/media/video/bt832.c
+++ b/drivers/media/video/bt832.c
@@ -43,7 +43,7 @@ static unsigned short normal_i2c[] = { I2C_BT832_ALT1>>1, I2C_BT832_ALT2>>1,
43 I2C_CLIENT_END }; 43 I2C_CLIENT_END };
44I2C_CLIENT_INSMOD; 44I2C_CLIENT_INSMOD;
45 45
46int debug = 0; /* debug output */ 46int debug; /* debug output */
47module_param(debug, int, 0644); 47module_param(debug, int, 0644);
48 48
49/* ---------------------------------------------------------------------- */ 49/* ---------------------------------------------------------------------- */
diff --git a/drivers/media/video/btcx-risc.c b/drivers/media/video/btcx-risc.c
index a48de3c0e3f0..b4aca7249276 100644
--- a/drivers/media/video/btcx-risc.c
+++ b/drivers/media/video/btcx-risc.c
@@ -37,7 +37,7 @@ MODULE_DESCRIPTION("some code shared by bttv and cx88xx drivers");
37MODULE_AUTHOR("Gerd Knorr"); 37MODULE_AUTHOR("Gerd Knorr");
38MODULE_LICENSE("GPL"); 38MODULE_LICENSE("GPL");
39 39
40static unsigned int debug = 0; 40static unsigned int debug;
41module_param(debug, int, 0644); 41module_param(debug, int, 0644);
42MODULE_PARM_DESC(debug,"debug messages, default is 0 (no)"); 42MODULE_PARM_DESC(debug,"debug messages, default is 0 (no)");
43 43
diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c
index 65323e78d5fd..9749d6ed6231 100644
--- a/drivers/media/video/bttv-cards.c
+++ b/drivers/media/video/bttv-cards.c
@@ -92,8 +92,8 @@ static void identify_by_eeprom(struct bttv *btv,
92static int __devinit pvr_boot(struct bttv *btv); 92static int __devinit pvr_boot(struct bttv *btv);
93 93
94/* config variables */ 94/* config variables */
95static unsigned int triton1=0; 95static unsigned int triton1;
96static unsigned int vsfx=0; 96static unsigned int vsfx;
97static unsigned int latency = UNSET; 97static unsigned int latency = UNSET;
98int no_overlay=-1; 98int no_overlay=-1;
99 99
@@ -106,7 +106,7 @@ static struct bttv *master[BTTV_MAX] = { [ 0 ... (BTTV_MAX-1) ] = NULL };
106#ifdef MODULE 106#ifdef MODULE
107static unsigned int autoload = 1; 107static unsigned int autoload = 1;
108#else 108#else
109static unsigned int autoload = 0; 109static unsigned int autoload;
110#endif 110#endif
111static unsigned int gpiomask = UNSET; 111static unsigned int gpiomask = UNSET;
112static unsigned int audioall = UNSET; 112static unsigned int audioall = UNSET;
diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c
index 0e6970346788..aa4c4c521880 100644
--- a/drivers/media/video/bttv-driver.c
+++ b/drivers/media/video/bttv-driver.c
@@ -48,47 +48,46 @@
48unsigned int bttv_num; /* number of Bt848s in use */ 48unsigned int bttv_num; /* number of Bt848s in use */
49struct bttv bttvs[BTTV_MAX]; 49struct bttv bttvs[BTTV_MAX];
50 50
51unsigned int bttv_debug = 0; 51unsigned int bttv_debug;
52unsigned int bttv_verbose = 1; 52unsigned int bttv_verbose = 1;
53unsigned int bttv_gpio = 0; 53unsigned int bttv_gpio;
54 54
55/* config variables */ 55/* config variables */
56#ifdef __BIG_ENDIAN 56#ifdef __BIG_ENDIAN
57static unsigned int bigendian=1; 57static unsigned int bigendian=1;
58#else 58#else
59static unsigned int bigendian=0; 59static unsigned int bigendian;
60#endif 60#endif
61static unsigned int radio[BTTV_MAX]; 61static unsigned int radio[BTTV_MAX];
62static unsigned int irq_debug = 0; 62static unsigned int irq_debug;
63static unsigned int gbuffers = 8; 63static unsigned int gbuffers = 8;
64static unsigned int gbufsize = 0x208000; 64static unsigned int gbufsize = 0x208000;
65 65
66static int video_nr = -1; 66static int video_nr = -1;
67static int radio_nr = -1; 67static int radio_nr = -1;
68static int vbi_nr = -1; 68static int vbi_nr = -1;
69static int debug_latency = 0; 69static int debug_latency;
70 70
71static unsigned int fdsr = 0; 71static unsigned int fdsr;
72 72
73/* options */ 73/* options */
74static unsigned int combfilter = 0; 74static unsigned int combfilter;
75static unsigned int lumafilter = 0; 75static unsigned int lumafilter;
76static unsigned int automute = 1; 76static unsigned int automute = 1;
77static unsigned int chroma_agc = 0; 77static unsigned int chroma_agc;
78static unsigned int adc_crush = 1; 78static unsigned int adc_crush = 1;
79static unsigned int whitecrush_upper = 0xCF; 79static unsigned int whitecrush_upper = 0xCF;
80static unsigned int whitecrush_lower = 0x7F; 80static unsigned int whitecrush_lower = 0x7F;
81static unsigned int vcr_hack = 0; 81static unsigned int vcr_hack;
82static unsigned int irq_iswitch = 0; 82static unsigned int irq_iswitch;
83static unsigned int uv_ratio = 50; 83static unsigned int uv_ratio = 50;
84static unsigned int full_luma_range = 0; 84static unsigned int full_luma_range;
85static unsigned int coring = 0; 85static unsigned int coring;
86extern int no_overlay; 86extern int no_overlay;
87 87
88/* API features (turn on/off stuff for testing) */ 88/* API features (turn on/off stuff for testing) */
89static unsigned int v4l2 = 1; 89static unsigned int v4l2 = 1;
90 90
91
92/* insmod args */ 91/* insmod args */
93module_param(bttv_verbose, int, 0644); 92module_param(bttv_verbose, int, 0644);
94module_param(bttv_gpio, int, 0644); 93module_param(bttv_gpio, int, 0644);
@@ -685,16 +684,16 @@ int check_alloc_btres(struct bttv *btv, struct bttv_fh *fh, int bit)
685 return 1; 684 return 1;
686 685
687 /* is it free? */ 686 /* is it free? */
688 down(&btv->reslock); 687 mutex_lock(&btv->reslock);
689 if (btv->resources & bit) { 688 if (btv->resources & bit) {
690 /* no, someone else uses it */ 689 /* no, someone else uses it */
691 up(&btv->reslock); 690 mutex_unlock(&btv->reslock);
692 return 0; 691 return 0;
693 } 692 }
694 /* it's free, grab it */ 693 /* it's free, grab it */
695 fh->resources |= bit; 694 fh->resources |= bit;
696 btv->resources |= bit; 695 btv->resources |= bit;
697 up(&btv->reslock); 696 mutex_unlock(&btv->reslock);
698 return 1; 697 return 1;
699} 698}
700 699
@@ -717,10 +716,10 @@ void free_btres(struct bttv *btv, struct bttv_fh *fh, int bits)
717 /* trying to free ressources not allocated by us ... */ 716 /* trying to free ressources not allocated by us ... */
718 printk("bttv: BUG! (btres)\n"); 717 printk("bttv: BUG! (btres)\n");
719 } 718 }
720 down(&btv->reslock); 719 mutex_lock(&btv->reslock);
721 fh->resources &= ~bits; 720 fh->resources &= ~bits;
722 btv->resources &= ~bits; 721 btv->resources &= ~bits;
723 up(&btv->reslock); 722 mutex_unlock(&btv->reslock);
724} 723}
725 724
726/* ----------------------------------------------------------------------- */ 725/* ----------------------------------------------------------------------- */
@@ -1537,12 +1536,12 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
1537 case VIDIOCSFREQ: 1536 case VIDIOCSFREQ:
1538 { 1537 {
1539 unsigned long *freq = arg; 1538 unsigned long *freq = arg;
1540 down(&btv->lock); 1539 mutex_lock(&btv->lock);
1541 btv->freq=*freq; 1540 btv->freq=*freq;
1542 bttv_call_i2c_clients(btv,VIDIOCSFREQ,freq); 1541 bttv_call_i2c_clients(btv,VIDIOCSFREQ,freq);
1543 if (btv->has_matchbox && btv->radio_user) 1542 if (btv->has_matchbox && btv->radio_user)
1544 tea5757_set_freq(btv,*freq); 1543 tea5757_set_freq(btv,*freq);
1545 up(&btv->lock); 1544 mutex_unlock(&btv->lock);
1546 return 0; 1545 return 0;
1547 } 1546 }
1548 1547
@@ -1572,10 +1571,10 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
1572 if (v->mode >= BTTV_TVNORMS) 1571 if (v->mode >= BTTV_TVNORMS)
1573 return -EINVAL; 1572 return -EINVAL;
1574 1573
1575 down(&btv->lock); 1574 mutex_lock(&btv->lock);
1576 set_tvnorm(btv,v->mode); 1575 set_tvnorm(btv,v->mode);
1577 bttv_call_i2c_clients(btv,cmd,v); 1576 bttv_call_i2c_clients(btv,cmd,v);
1578 up(&btv->lock); 1577 mutex_unlock(&btv->lock);
1579 return 0; 1578 return 0;
1580 } 1579 }
1581 1580
@@ -1612,17 +1611,17 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
1612 if (v->norm >= BTTV_TVNORMS) 1611 if (v->norm >= BTTV_TVNORMS)
1613 return -EINVAL; 1612 return -EINVAL;
1614 1613
1615 down(&btv->lock); 1614 mutex_lock(&btv->lock);
1616 if (channel == btv->input && 1615 if (channel == btv->input &&
1617 v->norm == btv->tvnorm) { 1616 v->norm == btv->tvnorm) {
1618 /* nothing to do */ 1617 /* nothing to do */
1619 up(&btv->lock); 1618 mutex_unlock(&btv->lock);
1620 return 0; 1619 return 0;
1621 } 1620 }
1622 1621
1623 btv->tvnorm = v->norm; 1622 btv->tvnorm = v->norm;
1624 set_input(btv,v->channel); 1623 set_input(btv,v->channel);
1625 up(&btv->lock); 1624 mutex_unlock(&btv->lock);
1626 return 0; 1625 return 0;
1627 } 1626 }
1628 1627
@@ -1635,14 +1634,14 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
1635 v->flags |= VIDEO_AUDIO_MUTABLE; 1634 v->flags |= VIDEO_AUDIO_MUTABLE;
1636 v->mode = VIDEO_SOUND_MONO; 1635 v->mode = VIDEO_SOUND_MONO;
1637 1636
1638 down(&btv->lock); 1637 mutex_lock(&btv->lock);
1639 bttv_call_i2c_clients(btv,cmd,v); 1638 bttv_call_i2c_clients(btv,cmd,v);
1640 1639
1641 /* card specific hooks */ 1640 /* card specific hooks */
1642 if (btv->audio_hook) 1641 if (btv->audio_hook)
1643 btv->audio_hook(btv,v,0); 1642 btv->audio_hook(btv,v,0);
1644 1643
1645 up(&btv->lock); 1644 mutex_unlock(&btv->lock);
1646 return 0; 1645 return 0;
1647 } 1646 }
1648 case VIDIOCSAUDIO: 1647 case VIDIOCSAUDIO:
@@ -1653,7 +1652,7 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
1653 if (audio >= bttv_tvcards[btv->c.type].audio_inputs) 1652 if (audio >= bttv_tvcards[btv->c.type].audio_inputs)
1654 return -EINVAL; 1653 return -EINVAL;
1655 1654
1656 down(&btv->lock); 1655 mutex_lock(&btv->lock);
1657 audio_mux(btv, (v->flags&VIDEO_AUDIO_MUTE) ? AUDIO_MUTE : AUDIO_UNMUTE); 1656 audio_mux(btv, (v->flags&VIDEO_AUDIO_MUTE) ? AUDIO_MUTE : AUDIO_UNMUTE);
1658 bttv_call_i2c_clients(btv,cmd,v); 1657 bttv_call_i2c_clients(btv,cmd,v);
1659 1658
@@ -1661,7 +1660,7 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
1661 if (btv->audio_hook) 1660 if (btv->audio_hook)
1662 btv->audio_hook(btv,v,1); 1661 btv->audio_hook(btv,v,1);
1663 1662
1664 up(&btv->lock); 1663 mutex_unlock(&btv->lock);
1665 return 0; 1664 return 0;
1666 } 1665 }
1667 1666
@@ -1695,10 +1694,10 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
1695 if (i == BTTV_TVNORMS) 1694 if (i == BTTV_TVNORMS)
1696 return -EINVAL; 1695 return -EINVAL;
1697 1696
1698 down(&btv->lock); 1697 mutex_lock(&btv->lock);
1699 set_tvnorm(btv,i); 1698 set_tvnorm(btv,i);
1700 i2c_vidiocschan(btv); 1699 i2c_vidiocschan(btv);
1701 up(&btv->lock); 1700 mutex_unlock(&btv->lock);
1702 return 0; 1701 return 0;
1703 } 1702 }
1704 case VIDIOC_QUERYSTD: 1703 case VIDIOC_QUERYSTD:
@@ -1756,9 +1755,9 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
1756 1755
1757 if (*i > bttv_tvcards[btv->c.type].video_inputs) 1756 if (*i > bttv_tvcards[btv->c.type].video_inputs)
1758 return -EINVAL; 1757 return -EINVAL;
1759 down(&btv->lock); 1758 mutex_lock(&btv->lock);
1760 set_input(btv,*i); 1759 set_input(btv,*i);
1761 up(&btv->lock); 1760 mutex_unlock(&btv->lock);
1762 return 0; 1761 return 0;
1763 } 1762 }
1764 1763
@@ -1770,7 +1769,7 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
1770 return -EINVAL; 1769 return -EINVAL;
1771 if (0 != t->index) 1770 if (0 != t->index)
1772 return -EINVAL; 1771 return -EINVAL;
1773 down(&btv->lock); 1772 mutex_lock(&btv->lock);
1774 memset(t,0,sizeof(*t)); 1773 memset(t,0,sizeof(*t));
1775 strcpy(t->name, "Television"); 1774 strcpy(t->name, "Television");
1776 t->type = V4L2_TUNER_ANALOG_TV; 1775 t->type = V4L2_TUNER_ANALOG_TV;
@@ -1805,7 +1804,7 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
1805 } 1804 }
1806 } 1805 }
1807 /* FIXME: fill capability+audmode */ 1806 /* FIXME: fill capability+audmode */
1808 up(&btv->lock); 1807 mutex_unlock(&btv->lock);
1809 return 0; 1808 return 0;
1810 } 1809 }
1811 case VIDIOC_S_TUNER: 1810 case VIDIOC_S_TUNER:
@@ -1816,7 +1815,7 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
1816 return -EINVAL; 1815 return -EINVAL;
1817 if (0 != t->index) 1816 if (0 != t->index)
1818 return -EINVAL; 1817 return -EINVAL;
1819 down(&btv->lock); 1818 mutex_lock(&btv->lock);
1820 { 1819 {
1821 struct video_audio va; 1820 struct video_audio va;
1822 memset(&va, 0, sizeof(struct video_audio)); 1821 memset(&va, 0, sizeof(struct video_audio));
@@ -1833,7 +1832,7 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
1833 if (btv->audio_hook) 1832 if (btv->audio_hook)
1834 btv->audio_hook(btv,&va,1); 1833 btv->audio_hook(btv,&va,1);
1835 } 1834 }
1836 up(&btv->lock); 1835 mutex_unlock(&btv->lock);
1837 return 0; 1836 return 0;
1838 } 1837 }
1839 1838
@@ -1854,12 +1853,12 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
1854 return -EINVAL; 1853 return -EINVAL;
1855 if (unlikely (f->type != V4L2_TUNER_ANALOG_TV)) 1854 if (unlikely (f->type != V4L2_TUNER_ANALOG_TV))
1856 return -EINVAL; 1855 return -EINVAL;
1857 down(&btv->lock); 1856 mutex_lock(&btv->lock);
1858 btv->freq = f->frequency; 1857 btv->freq = f->frequency;
1859 bttv_call_i2c_clients(btv,VIDIOCSFREQ,&btv->freq); 1858 bttv_call_i2c_clients(btv,VIDIOCSFREQ,&btv->freq);
1860 if (btv->has_matchbox && btv->radio_user) 1859 if (btv->has_matchbox && btv->radio_user)
1861 tea5757_set_freq(btv,btv->freq); 1860 tea5757_set_freq(btv,btv->freq);
1862 up(&btv->lock); 1861 mutex_unlock(&btv->lock);
1863 return 0; 1862 return 0;
1864 } 1863 }
1865 case VIDIOC_LOG_STATUS: 1864 case VIDIOC_LOG_STATUS:
@@ -3157,7 +3156,7 @@ static int radio_open(struct inode *inode, struct file *file)
3157 return -ENODEV; 3156 return -ENODEV;
3158 3157
3159 dprintk("bttv%d: open called (radio)\n",btv->c.nr); 3158 dprintk("bttv%d: open called (radio)\n",btv->c.nr);
3160 down(&btv->lock); 3159 mutex_lock(&btv->lock);
3161 3160
3162 btv->radio_user++; 3161 btv->radio_user++;
3163 3162
@@ -3166,7 +3165,7 @@ static int radio_open(struct inode *inode, struct file *file)
3166 bttv_call_i2c_clients(btv,AUDC_SET_RADIO,&btv->tuner_type); 3165 bttv_call_i2c_clients(btv,AUDC_SET_RADIO,&btv->tuner_type);
3167 audio_mux(btv,AUDIO_RADIO); 3166 audio_mux(btv,AUDIO_RADIO);
3168 3167
3169 up(&btv->lock); 3168 mutex_unlock(&btv->lock);
3170 return 0; 3169 return 0;
3171} 3170}
3172 3171
@@ -3921,8 +3920,8 @@ static int __devinit bttv_probe(struct pci_dev *dev,
3921 sprintf(btv->c.name,"bttv%d",btv->c.nr); 3920 sprintf(btv->c.name,"bttv%d",btv->c.nr);
3922 3921
3923 /* initialize structs / fill in defaults */ 3922 /* initialize structs / fill in defaults */
3924 init_MUTEX(&btv->lock); 3923 mutex_init(&btv->lock);
3925 init_MUTEX(&btv->reslock); 3924 mutex_init(&btv->reslock);
3926 spin_lock_init(&btv->s_lock); 3925 spin_lock_init(&btv->s_lock);
3927 spin_lock_init(&btv->gpio_lock); 3926 spin_lock_init(&btv->gpio_lock);
3928 init_waitqueue_head(&btv->gpioq); 3927 init_waitqueue_head(&btv->gpioq);
diff --git a/drivers/media/video/bttv-i2c.c b/drivers/media/video/bttv-i2c.c
index 748d630c7fe4..614c12018557 100644
--- a/drivers/media/video/bttv-i2c.c
+++ b/drivers/media/video/bttv-i2c.c
@@ -41,9 +41,9 @@ static struct i2c_client bttv_i2c_client_template;
41 41
42static int attach_inform(struct i2c_client *client); 42static int attach_inform(struct i2c_client *client);
43 43
44static int i2c_debug = 0; 44static int i2c_debug;
45static int i2c_hw = 0; 45static int i2c_hw;
46static int i2c_scan = 0; 46static int i2c_scan;
47module_param(i2c_debug, int, 0644); 47module_param(i2c_debug, int, 0644);
48module_param(i2c_hw, int, 0444); 48module_param(i2c_hw, int, 0444);
49module_param(i2c_scan, int, 0444); 49module_param(i2c_scan, int, 0444);
diff --git a/drivers/media/video/bttvp.h b/drivers/media/video/bttvp.h
index dd00c20ab95e..9cb72f176f7d 100644
--- a/drivers/media/video/bttvp.h
+++ b/drivers/media/video/bttvp.h
@@ -35,6 +35,7 @@
35#include <linux/videodev.h> 35#include <linux/videodev.h>
36#include <linux/pci.h> 36#include <linux/pci.h>
37#include <linux/input.h> 37#include <linux/input.h>
38#include <linux/mutex.h>
38#include <asm/scatterlist.h> 39#include <asm/scatterlist.h>
39#include <asm/io.h> 40#include <asm/io.h>
40 41
@@ -309,9 +310,9 @@ struct bttv {
309 310
310 /* locking */ 311 /* locking */
311 spinlock_t s_lock; 312 spinlock_t s_lock;
312 struct semaphore lock; 313 struct mutex lock;
313 int resources; 314 int resources;
314 struct semaphore reslock; 315 struct mutex reslock;
315#ifdef VIDIOC_G_PRIORITY 316#ifdef VIDIOC_G_PRIORITY
316 struct v4l2_prio_state prio; 317 struct v4l2_prio_state prio;
317#endif 318#endif
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index 1d75a42629d1..0da744c1d23e 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -43,7 +43,7 @@ MODULE_LICENSE("GPL");
43static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END }; 43static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END };
44 44
45 45
46int cx25840_debug = 0; 46int cx25840_debug;
47 47
48module_param_named(debug,cx25840_debug, int, 0644); 48module_param_named(debug,cx25840_debug, int, 0644);
49 49
diff --git a/drivers/media/video/cx88/Makefile b/drivers/media/video/cx88/Makefile
index e4b2134fe567..6e5eaa22619e 100644
--- a/drivers/media/video/cx88/Makefile
+++ b/drivers/media/video/cx88/Makefile
@@ -5,6 +5,7 @@ cx8802-objs := cx88-mpeg.o
5 5
6obj-$(CONFIG_VIDEO_CX88) += cx88xx.o cx8800.o cx8802.o cx88-blackbird.o 6obj-$(CONFIG_VIDEO_CX88) += cx88xx.o cx8800.o cx8802.o cx88-blackbird.o
7obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o cx88-vp3054-i2c.o 7obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o cx88-vp3054-i2c.o
8obj-$(CONFIG_VIDEO_CX88_ALSA) += cx88-alsa.o
8 9
9EXTRA_CFLAGS += -I$(src)/.. 10EXTRA_CFLAGS += -I$(src)/..
10EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core 11EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core
diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
index 7695b521eb35..fd8bc718f0e3 100644
--- a/drivers/media/video/cx88/cx88-alsa.c
+++ b/drivers/media/video/cx88/cx88-alsa.c
@@ -116,7 +116,7 @@ MODULE_LICENSE("GPL");
116MODULE_SUPPORTED_DEVICE("{{Conexant,23881}," 116MODULE_SUPPORTED_DEVICE("{{Conexant,23881},"
117 "{{Conexant,23882}," 117 "{{Conexant,23882},"
118 "{{Conexant,23883}"); 118 "{{Conexant,23883}");
119static unsigned int debug = 0; 119static unsigned int debug;
120module_param(debug,int,0644); 120module_param(debug,int,0644);
121MODULE_PARM_DESC(debug,"enable debug messages"); 121MODULE_PARM_DESC(debug,"enable debug messages");
122 122
@@ -653,7 +653,7 @@ static void snd_cx88_dev_free(snd_card_t * card)
653 * Alsa Constructor - Component probe 653 * Alsa Constructor - Component probe
654 */ 654 */
655 655
656static int devno=0; 656static int devno;
657static int __devinit snd_cx88_create(snd_card_t *card, struct pci_dev *pci, 657static int __devinit snd_cx88_create(snd_card_t *card, struct pci_dev *pci,
658 snd_cx88_card_t **rchip) 658 snd_cx88_card_t **rchip)
659{ 659{
diff --git a/drivers/media/video/cx88/cx88-vp3054-i2c.c b/drivers/media/video/cx88/cx88-vp3054-i2c.c
index 372cd29cedbd..751a754a45e9 100644
--- a/drivers/media/video/cx88/cx88-vp3054-i2c.c
+++ b/drivers/media/video/cx88/cx88-vp3054-i2c.c
@@ -32,6 +32,10 @@
32#include "cx88-vp3054-i2c.h" 32#include "cx88-vp3054-i2c.h"
33 33
34 34
35MODULE_DESCRIPTION("driver for cx2388x VP3054 design");
36MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>");
37MODULE_LICENSE("GPL");
38
35/* ----------------------------------------------------------------------- */ 39/* ----------------------------------------------------------------------- */
36 40
37static void vp3054_bit_setscl(void *data, int state) 41static void vp3054_bit_setscl(void *data, int state)
diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c
index 9b05a0ab776d..09ff25b554b6 100644
--- a/drivers/media/video/msp3400-driver.c
+++ b/drivers/media/video/msp3400-driver.c
@@ -66,12 +66,12 @@ MODULE_LICENSE("GPL");
66 66
67/* module parameters */ 67/* module parameters */
68static int opmode = OPMODE_AUTO; 68static int opmode = OPMODE_AUTO;
69int msp_debug = 0; /* msp_debug output */ 69int msp_debug; /* msp_debug output */
70int msp_once = 0; /* no continous stereo monitoring */ 70int msp_once; /* no continous stereo monitoring */
71int msp_amsound = 0; /* hard-wire AM sound at 6.5 Hz (france), 71int msp_amsound; /* hard-wire AM sound at 6.5 Hz (france),
72 the autoscan seems work well only with FM... */ 72 the autoscan seems work well only with FM... */
73int msp_standard = 1; /* Override auto detect of audio msp_standard, if needed. */ 73int msp_standard = 1; /* Override auto detect of audio msp_standard, if needed. */
74int msp_dolby = 0; 74int msp_dolby;
75 75
76int msp_stereo_thresh = 0x190; /* a2 threshold for stereo/bilingual 76int msp_stereo_thresh = 0x190; /* a2 threshold for stereo/bilingual
77 (msp34xxg only) 0x00a0-0x03c0 */ 77 (msp34xxg only) 0x00a0-0x03c0 */
diff --git a/drivers/media/video/planb.c b/drivers/media/video/planb.c
index b19c33434eaf..f3fc361bec97 100644
--- a/drivers/media/video/planb.c
+++ b/drivers/media/video/planb.c
@@ -76,9 +76,9 @@ static volatile struct planb_registers *planb_regs;
76static int def_norm = PLANB_DEF_NORM; /* default norm */ 76static int def_norm = PLANB_DEF_NORM; /* default norm */
77static int video_nr = -1; 77static int video_nr = -1;
78 78
79MODULE_PARM(def_norm, "i"); 79module_param(def_norm, int, 0);
80MODULE_PARM_DESC(def_norm, "Default startup norm (0=PAL, 1=NTSC, 2=SECAM)"); 80MODULE_PARM_DESC(def_norm, "Default startup norm (0=PAL, 1=NTSC, 2=SECAM)");
81MODULE_PARM(video_nr,"i"); 81module_param(video_nr, int, 0);
82MODULE_LICENSE("GPL"); 82MODULE_LICENSE("GPL");
83 83
84 84
diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c
index e70b17ef36e9..d17395c4f55c 100644
--- a/drivers/media/video/saa6588.c
+++ b/drivers/media/video/saa6588.c
@@ -50,15 +50,15 @@ static unsigned int rbds = 0;
50static unsigned int plvl = 0; 50static unsigned int plvl = 0;
51static unsigned int bufblocks = 100; 51static unsigned int bufblocks = 100;
52 52
53MODULE_PARM(debug, "i"); 53module_param(debug, int, 0644);
54MODULE_PARM_DESC(debug, "enable debug messages"); 54MODULE_PARM_DESC(debug, "enable debug messages");
55MODULE_PARM(xtal, "i"); 55module_param(xtal, int, 0);
56MODULE_PARM_DESC(xtal, "select oscillator frequency (0..3), default 0"); 56MODULE_PARM_DESC(xtal, "select oscillator frequency (0..3), default 0");
57MODULE_PARM(rbds, "i"); 57module_param(rbds, int, 0);
58MODULE_PARM_DESC(rbds, "select mode, 0=RDS, 1=RBDS, default 0"); 58MODULE_PARM_DESC(rbds, "select mode, 0=RDS, 1=RBDS, default 0");
59MODULE_PARM(plvl, "i"); 59module_param(plvl, int, 0);
60MODULE_PARM_DESC(plvl, "select pause level (0..3), default 0"); 60MODULE_PARM_DESC(plvl, "select pause level (0..3), default 0");
61MODULE_PARM(bufblocks, "i"); 61module_param(bufblocks, int, 0);
62MODULE_PARM_DESC(bufblocks, "number of buffered blocks, default 100"); 62MODULE_PARM_DESC(bufblocks, "number of buffered blocks, default 100");
63 63
64MODULE_DESCRIPTION("v4l2 driver module for SAA6588 RDS decoder"); 64MODULE_DESCRIPTION("v4l2 driver module for SAA6588 RDS decoder");
diff --git a/drivers/media/video/saa711x.c b/drivers/media/video/saa711x.c
index ae53063875f9..6c161f2f5e2c 100644
--- a/drivers/media/video/saa711x.c
+++ b/drivers/media/video/saa711x.c
@@ -52,7 +52,7 @@ MODULE_LICENSE("GPL");
52#include <linux/video_decoder.h> 52#include <linux/video_decoder.h>
53 53
54static int debug = 0; 54static int debug = 0;
55MODULE_PARM(debug, "i"); 55module_param(debug, int, 0644);
56MODULE_PARM_DESC(debug, " Set the default Debug level. Default: 0 (Off) - (0-1)"); 56MODULE_PARM_DESC(debug, " Set the default Debug level. Default: 0 (Off) - (0-1)");
57 57
58 58
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 3983a6524cac..3dd42efe3699 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -140,7 +140,7 @@ static int pending_call(struct notifier_block *self, unsigned long state,
140 return NOTIFY_DONE; 140 return NOTIFY_DONE;
141} 141}
142 142
143static int pending_registered=0; 143static int pending_registered;
144static struct notifier_block pending_notifier = { 144static struct notifier_block pending_notifier = {
145 .notifier_call = pending_call, 145 .notifier_call = pending_call,
146}; 146};
diff --git a/drivers/media/video/tuner-simple.c b/drivers/media/video/tuner-simple.c
index e5fb74365836..3879262cf4ca 100644
--- a/drivers/media/video/tuner-simple.c
+++ b/drivers/media/video/tuner-simple.c
@@ -79,722 +79,16 @@ MODULE_PARM_DESC(offset,"Allows to specify an offset for tuner");
79#define TUNER_PLL_LOCKED 0x40 79#define TUNER_PLL_LOCKED 0x40
80#define TUNER_STEREO_MK3 0x04 80#define TUNER_STEREO_MK3 0x04
81 81
82#define TUNER_MAX_RANGES 3 82#define TUNER_PARAM_ANALOG 0 /* to be removed */
83 83/* FIXME:
84/* ---------------------------------------------------------------------- */ 84 * Right now, all tuners are using the first tuner_params[] array element
85 85 * for analog mode. In the future, we will be merging similar tuner
86struct tunertype 86 * definitions together, such that each tuner definition will have a
87{ 87 * tuner_params struct for each available video standard. At that point,
88 char *name; 88 * TUNER_PARAM_ANALOG will be removed, and the tuner_params[] array
89 89 * element will be chosen based on the video standard in use.
90 int count; 90 *
91 struct {
92 unsigned short thresh;
93 unsigned char cb;
94 } ranges[TUNER_MAX_RANGES];
95 unsigned char config;
96};
97
98/*
99 * The floats in the tuner struct are computed at compile time
100 * by gcc and cast back to integers. Thus we don't violate the
101 * "no float in kernel" rule.
102 */ 91 */
103static struct tunertype tuners[] = {
104 /* 0-9 */
105 [TUNER_TEMIC_PAL] = { /* TEMIC PAL */
106 .name = "Temic PAL (4002 FH5)",
107 .count = 3,
108 .ranges = {
109 { 16 * 140.25 /*MHz*/, 0x02, },
110 { 16 * 463.25 /*MHz*/, 0x04, },
111 { 16 * 999.99 , 0x01, },
112 },
113 .config = 0x8e,
114 },
115 [TUNER_PHILIPS_PAL_I] = { /* Philips PAL_I */
116 .name = "Philips PAL_I (FI1246 and compatibles)",
117 .count = 3,
118 .ranges = {
119 { 16 * 140.25 /*MHz*/, 0xa0, },
120 { 16 * 463.25 /*MHz*/, 0x90, },
121 { 16 * 999.99 , 0x30, },
122 },
123 .config = 0x8e,
124 },
125 [TUNER_PHILIPS_NTSC] = { /* Philips NTSC */
126 .name = "Philips NTSC (FI1236,FM1236 and compatibles)",
127 .count = 3,
128 .ranges = {
129 { 16 * 157.25 /*MHz*/, 0xa0, },
130 { 16 * 451.25 /*MHz*/, 0x90, },
131 { 16 * 999.99 , 0x30, },
132 },
133 .config = 0x8e,
134 },
135 [TUNER_PHILIPS_SECAM] = { /* Philips SECAM */
136 .name = "Philips (SECAM+PAL_BG) (FI1216MF, FM1216MF, FR1216MF)",
137 .count = 3,
138 .ranges = {
139 { 16 * 168.25 /*MHz*/, 0xa7, },
140 { 16 * 447.25 /*MHz*/, 0x97, },
141 { 16 * 999.99 , 0x37, },
142 },
143 .config = 0x8e,
144 },
145 [TUNER_ABSENT] = { /* Tuner Absent */
146 .name = "NoTuner",
147 .count = 1,
148 .ranges = {
149 { 0, 0x00, },
150 },
151 .config = 0x00,
152 },
153 [TUNER_PHILIPS_PAL] = { /* Philips PAL */
154 .name = "Philips PAL_BG (FI1216 and compatibles)",
155 .count = 3,
156 .ranges = {
157 { 16 * 168.25 /*MHz*/, 0xa0, },
158 { 16 * 447.25 /*MHz*/, 0x90, },
159 { 16 * 999.99 , 0x30, },
160 },
161 .config = 0x8e,
162 },
163 [TUNER_TEMIC_NTSC] = { /* TEMIC NTSC */
164 .name = "Temic NTSC (4032 FY5)",
165 .count = 3,
166 .ranges = {
167 { 16 * 157.25 /*MHz*/, 0x02, },
168 { 16 * 463.25 /*MHz*/, 0x04, },
169 { 16 * 999.99 , 0x01, },
170 },
171 .config = 0x8e,
172 },
173 [TUNER_TEMIC_PAL_I] = { /* TEMIC PAL_I */
174 .name = "Temic PAL_I (4062 FY5)",
175 .count = 3,
176 .ranges = {
177 { 16 * 170.00 /*MHz*/, 0x02, },
178 { 16 * 450.00 /*MHz*/, 0x04, },
179 { 16 * 999.99 , 0x01, },
180 },
181 .config = 0x8e,
182 },
183 [TUNER_TEMIC_4036FY5_NTSC] = { /* TEMIC NTSC */
184 .name = "Temic NTSC (4036 FY5)",
185 .count = 3,
186 .ranges = {
187 { 16 * 157.25 /*MHz*/, 0xa0, },
188 { 16 * 463.25 /*MHz*/, 0x90, },
189 { 16 * 999.99 , 0x30, },
190 },
191 .config = 0x8e,
192 },
193 [TUNER_ALPS_TSBH1_NTSC] = { /* TEMIC NTSC */
194 .name = "Alps HSBH1",
195 .count = 3,
196 .ranges = {
197 { 16 * 137.25 /*MHz*/, 0x01, },
198 { 16 * 385.25 /*MHz*/, 0x02, },
199 { 16 * 999.99 , 0x08, },
200 },
201 .config = 0x8e,
202 },
203
204 /* 10-19 */
205 [TUNER_ALPS_TSBE1_PAL] = { /* TEMIC PAL */
206 .name = "Alps TSBE1",
207 .count = 3,
208 .ranges = {
209 { 16 * 137.25 /*MHz*/, 0x01, },
210 { 16 * 385.25 /*MHz*/, 0x02, },
211 { 16 * 999.99 , 0x08, },
212 },
213 .config = 0x8e,
214 },
215 [TUNER_ALPS_TSBB5_PAL_I] = { /* Alps PAL_I */
216 .name = "Alps TSBB5",
217 .count = 3,
218 .ranges = {
219 { 16 * 133.25 /*MHz*/, 0x01, },
220 { 16 * 351.25 /*MHz*/, 0x02, },
221 { 16 * 999.99 , 0x08, },
222 },
223 .config = 0x8e,
224 },
225 [TUNER_ALPS_TSBE5_PAL] = { /* Alps PAL */
226 .name = "Alps TSBE5",
227 .count = 3,
228 .ranges = {
229 { 16 * 133.25 /*MHz*/, 0x01, },
230 { 16 * 351.25 /*MHz*/, 0x02, },
231 { 16 * 999.99 , 0x08, },
232 },
233 .config = 0x8e,
234 },
235 [TUNER_ALPS_TSBC5_PAL] = { /* Alps PAL */
236 .name = "Alps TSBC5",
237 .count = 3,
238 .ranges = {
239 { 16 * 133.25 /*MHz*/, 0x01, },
240 { 16 * 351.25 /*MHz*/, 0x02, },
241 { 16 * 999.99 , 0x08, },
242 },
243 .config = 0x8e,
244 },
245 [TUNER_TEMIC_4006FH5_PAL] = { /* TEMIC PAL */
246 .name = "Temic PAL_BG (4006FH5)",
247 .count = 3,
248 .ranges = {
249 { 16 * 170.00 /*MHz*/, 0xa0, },
250 { 16 * 450.00 /*MHz*/, 0x90, },
251 { 16 * 999.99 , 0x30, },
252 },
253 .config = 0x8e,
254 },
255 [TUNER_ALPS_TSHC6_NTSC] = { /* Alps NTSC */
256 .name = "Alps TSCH6",
257 .count = 3,
258 .ranges = {
259 { 16 * 137.25 /*MHz*/, 0x14, },
260 { 16 * 385.25 /*MHz*/, 0x12, },
261 { 16 * 999.99 , 0x11, },
262 },
263 .config = 0x8e,
264 },
265 [TUNER_TEMIC_PAL_DK] = { /* TEMIC PAL */
266 .name = "Temic PAL_DK (4016 FY5)",
267 .count = 3,
268 .ranges = {
269 { 16 * 168.25 /*MHz*/, 0xa0, },
270 { 16 * 456.25 /*MHz*/, 0x90, },
271 { 16 * 999.99 , 0x30, },
272 },
273 .config = 0x8e,
274 },
275 [TUNER_PHILIPS_NTSC_M] = { /* Philips NTSC */
276 .name = "Philips NTSC_M (MK2)",
277 .count = 3,
278 .ranges = {
279 { 16 * 160.00 /*MHz*/, 0xa0, },
280 { 16 * 454.00 /*MHz*/, 0x90, },
281 { 16 * 999.99 , 0x30, },
282 },
283 .config = 0x8e,
284 },
285 [TUNER_TEMIC_4066FY5_PAL_I] = { /* TEMIC PAL_I */
286 .name = "Temic PAL_I (4066 FY5)",
287 .count = 3,
288 .ranges = {
289 { 16 * 169.00 /*MHz*/, 0xa0, },
290 { 16 * 454.00 /*MHz*/, 0x90, },
291 { 16 * 999.99 , 0x30, },
292 },
293 .config = 0x8e,
294 },
295 [TUNER_TEMIC_4006FN5_MULTI_PAL] = { /* TEMIC PAL */
296 .name = "Temic PAL* auto (4006 FN5)",
297 .count = 3,
298 .ranges = {
299 { 16 * 169.00 /*MHz*/, 0xa0, },
300 { 16 * 454.00 /*MHz*/, 0x90, },
301 { 16 * 999.99 , 0x30, },
302 },
303 .config = 0x8e,
304 },
305
306 /* 20-29 */
307 [TUNER_TEMIC_4009FR5_PAL] = { /* TEMIC PAL */
308 .name = "Temic PAL_BG (4009 FR5) or PAL_I (4069 FR5)",
309 .count = 3,
310 .ranges = {
311 { 16 * 141.00 /*MHz*/, 0xa0, },
312 { 16 * 464.00 /*MHz*/, 0x90, },
313 { 16 * 999.99 , 0x30, },
314 },
315 .config = 0x8e,
316 },
317 [TUNER_TEMIC_4039FR5_NTSC] = { /* TEMIC NTSC */
318 .name = "Temic NTSC (4039 FR5)",
319 .count = 3,
320 .ranges = {
321 { 16 * 158.00 /*MHz*/, 0xa0, },
322 { 16 * 453.00 /*MHz*/, 0x90, },
323 { 16 * 999.99 , 0x30, },
324 },
325 .config = 0x8e,
326 },
327 [TUNER_TEMIC_4046FM5] = { /* TEMIC PAL */
328 .name = "Temic PAL/SECAM multi (4046 FM5)",
329 .count = 3,
330 .ranges = {
331 { 16 * 169.00 /*MHz*/, 0xa0, },
332 { 16 * 454.00 /*MHz*/, 0x90, },
333 { 16 * 999.99 , 0x30, },
334 },
335 .config = 0x8e,
336 },
337 [TUNER_PHILIPS_PAL_DK] = { /* Philips PAL */
338 .name = "Philips PAL_DK (FI1256 and compatibles)",
339 .count = 3,
340 .ranges = {
341 { 16 * 170.00 /*MHz*/, 0xa0, },
342 { 16 * 450.00 /*MHz*/, 0x90, },
343 { 16 * 999.99 , 0x30, },
344 },
345 .config = 0x8e,
346 },
347 [TUNER_PHILIPS_FQ1216ME] = { /* Philips PAL */
348 .name = "Philips PAL/SECAM multi (FQ1216ME)",
349 .count = 3,
350 .ranges = {
351 { 16 * 170.00 /*MHz*/, 0xa0, },
352 { 16 * 450.00 /*MHz*/, 0x90, },
353 { 16 * 999.99 , 0x30, },
354 },
355 .config = 0x8e,
356 },
357 [TUNER_LG_PAL_I_FM] = { /* LGINNOTEK PAL_I */
358 .name = "LG PAL_I+FM (TAPC-I001D)",
359 .count = 3,
360 .ranges = {
361 { 16 * 170.00 /*MHz*/, 0xa0, },
362 { 16 * 450.00 /*MHz*/, 0x90, },
363 { 16 * 999.99 , 0x30, },
364 },
365 .config = 0x8e,
366 },
367 [TUNER_LG_PAL_I] = { /* LGINNOTEK PAL_I */
368 .name = "LG PAL_I (TAPC-I701D)",
369 .count = 3,
370 .ranges = {
371 { 16 * 170.00 /*MHz*/, 0xa0, },
372 { 16 * 450.00 /*MHz*/, 0x90, },
373 { 16 * 999.99 , 0x30, },
374 },
375 .config = 0x8e,
376 },
377 [TUNER_LG_NTSC_FM] = { /* LGINNOTEK NTSC */
378 .name = "LG NTSC+FM (TPI8NSR01F)",
379 .count = 3,
380 .ranges = {
381 { 16 * 210.00 /*MHz*/, 0xa0, },
382 { 16 * 497.00 /*MHz*/, 0x90, },
383 { 16 * 999.99 , 0x30, },
384 },
385 .config = 0x8e,
386 },
387 [TUNER_LG_PAL_FM] = { /* LGINNOTEK PAL */
388 .name = "LG PAL_BG+FM (TPI8PSB01D)",
389 .count = 3,
390 .ranges = {
391 { 16 * 170.00 /*MHz*/, 0xa0, },
392 { 16 * 450.00 /*MHz*/, 0x90, },
393 { 16 * 999.99 , 0x30, },
394 },
395 .config = 0x8e,
396 },
397 [TUNER_LG_PAL] = { /* LGINNOTEK PAL */
398 .name = "LG PAL_BG (TPI8PSB11D)",
399 .count = 3,
400 .ranges = {
401 { 16 * 170.00 /*MHz*/, 0xa0, },
402 { 16 * 450.00 /*MHz*/, 0x90, },
403 { 16 * 999.99 , 0x30, },
404 },
405 .config = 0x8e,
406 },
407
408 /* 30-39 */
409 [TUNER_TEMIC_4009FN5_MULTI_PAL_FM] = { /* TEMIC PAL */
410 .name = "Temic PAL* auto + FM (4009 FN5)",
411 .count = 3,
412 .ranges = {
413 { 16 * 141.00 /*MHz*/, 0xa0, },
414 { 16 * 464.00 /*MHz*/, 0x90, },
415 { 16 * 999.99 , 0x30, },
416 },
417 .config = 0x8e,
418 },
419 [TUNER_SHARP_2U5JF5540_NTSC] = { /* SHARP NTSC */
420 .name = "SHARP NTSC_JP (2U5JF5540)",
421 .count = 3,
422 .ranges = {
423 { 16 * 137.25 /*MHz*/, 0x01, },
424 { 16 * 317.25 /*MHz*/, 0x02, },
425 { 16 * 999.99 , 0x08, },
426 },
427 .config = 0x8e,
428 },
429 [TUNER_Samsung_PAL_TCPM9091PD27] = { /* Samsung PAL */
430 .name = "Samsung PAL TCPM9091PD27",
431 .count = 3,
432 .ranges = {
433 { 16 * 169 /*MHz*/, 0xa0, },
434 { 16 * 464 /*MHz*/, 0x90, },
435 { 16 * 999.99 , 0x30, },
436 },
437 .config = 0x8e,
438 },
439 [TUNER_MT2032] = { /* Microtune PAL|NTSC */
440 .name = "MT20xx universal",
441 /* see mt20xx.c for details */ },
442 [TUNER_TEMIC_4106FH5] = { /* TEMIC PAL */
443 .name = "Temic PAL_BG (4106 FH5)",
444 .count = 3,
445 .ranges = {
446 { 16 * 141.00 /*MHz*/, 0xa0, },
447 { 16 * 464.00 /*MHz*/, 0x90, },
448 { 16 * 999.99 , 0x30, },
449 },
450 .config = 0x8e,
451 },
452 [TUNER_TEMIC_4012FY5] = { /* TEMIC PAL */
453 .name = "Temic PAL_DK/SECAM_L (4012 FY5)",
454 .count = 3,
455 .ranges = {
456 { 16 * 140.25 /*MHz*/, 0x02, },
457 { 16 * 463.25 /*MHz*/, 0x04, },
458 { 16 * 999.99 , 0x01, },
459 },
460 .config = 0x8e,
461 },
462 [TUNER_TEMIC_4136FY5] = { /* TEMIC NTSC */
463 .name = "Temic NTSC (4136 FY5)",
464 .count = 3,
465 .ranges = {
466 { 16 * 158.00 /*MHz*/, 0xa0, },
467 { 16 * 453.00 /*MHz*/, 0x90, },
468 { 16 * 999.99 , 0x30, },
469 },
470 .config = 0x8e,
471 },
472 [TUNER_LG_PAL_NEW_TAPC] = { /* LGINNOTEK PAL */
473 .name = "LG PAL (newer TAPC series)",
474 .count = 3,
475 .ranges = {
476 { 16 * 170.00 /*MHz*/, 0x01, },
477 { 16 * 450.00 /*MHz*/, 0x02, },
478 { 16 * 999.99 , 0x08, },
479 },
480 .config = 0x8e,
481 },
482 [TUNER_PHILIPS_FM1216ME_MK3] = { /* Philips PAL */
483 .name = "Philips PAL/SECAM multi (FM1216ME MK3)",
484 .count = 3,
485 .ranges = {
486 { 16 * 158.00 /*MHz*/, 0x01, },
487 { 16 * 442.00 /*MHz*/, 0x02, },
488 { 16 * 999.99 , 0x04, },
489 },
490 .config = 0x8e,
491 },
492 [TUNER_LG_NTSC_NEW_TAPC] = { /* LGINNOTEK NTSC */
493 .name = "LG NTSC (newer TAPC series)",
494 .count = 3,
495 .ranges = {
496 { 16 * 170.00 /*MHz*/, 0x01, },
497 { 16 * 450.00 /*MHz*/, 0x02, },
498 { 16 * 999.99 , 0x08, },
499 },
500 .config = 0x8e,
501 },
502
503 /* 40-49 */
504 [TUNER_HITACHI_NTSC] = { /* HITACHI NTSC */
505 .name = "HITACHI V7-J180AT",
506 .count = 3,
507 .ranges = {
508 { 16 * 170.00 /*MHz*/, 0x01, },
509 { 16 * 450.00 /*MHz*/, 0x02, },
510 { 16 * 999.99 , 0x08, },
511 },
512 .config = 0x8e,
513 },
514 [TUNER_PHILIPS_PAL_MK] = { /* Philips PAL */
515 .name = "Philips PAL_MK (FI1216 MK)",
516 .count = 3,
517 .ranges = {
518 { 16 * 140.25 /*MHz*/, 0x01, },
519 { 16 * 463.25 /*MHz*/, 0xc2, },
520 { 16 * 999.99 , 0xcf, },
521 },
522 .config = 0x8e,
523 },
524 [TUNER_PHILIPS_ATSC] = { /* Philips ATSC */
525 .name = "Philips 1236D ATSC/NTSC dual in",
526 .count = 3,
527 .ranges = {
528 { 16 * 157.25 /*MHz*/, 0xa0, },
529 { 16 * 454.00 /*MHz*/, 0x90, },
530 { 16 * 999.99 , 0x30, },
531 },
532 .config = 0x8e,
533 },
534 [TUNER_PHILIPS_FM1236_MK3] = { /* Philips NTSC */
535 .name = "Philips NTSC MK3 (FM1236MK3 or FM1236/F)",
536 .count = 3,
537 .ranges = {
538 { 16 * 160.00 /*MHz*/, 0x01, },
539 { 16 * 442.00 /*MHz*/, 0x02, },
540 { 16 * 999.99 , 0x04, },
541 },
542 .config = 0x8e,
543 },
544 [TUNER_PHILIPS_4IN1] = { /* Philips NTSC */
545 .name = "Philips 4 in 1 (ATI TV Wonder Pro/Conexant)",
546 .count = 3,
547 .ranges = {
548 { 16 * 160.00 /*MHz*/, 0x01, },
549 { 16 * 442.00 /*MHz*/, 0x02, },
550 { 16 * 999.99 , 0x04, },
551 },
552 .config = 0x8e,
553 },
554 [TUNER_MICROTUNE_4049FM5] = { /* Microtune PAL */
555 .name = "Microtune 4049 FM5",
556 .count = 3,
557 .ranges = {
558 { 16 * 141.00 /*MHz*/, 0xa0, },
559 { 16 * 464.00 /*MHz*/, 0x90, },
560 { 16 * 999.99 , 0x30, },
561 },
562 .config = 0x8e,
563 },
564 [TUNER_PANASONIC_VP27] = { /* Panasonic NTSC */
565 .name = "Panasonic VP27s/ENGE4324D",
566 .count = 3,
567 .ranges = {
568 { 16 * 160.00 /*MHz*/, 0x01, },
569 { 16 * 454.00 /*MHz*/, 0x02, },
570 { 16 * 999.99 , 0x08, },
571 },
572 .config = 0xce,
573 },
574 [TUNER_LG_NTSC_TAPE] = { /* LGINNOTEK NTSC */
575 .name = "LG NTSC (TAPE series)",
576 .count = 3,
577 .ranges = {
578 { 16 * 160.00 /*MHz*/, 0x01, },
579 { 16 * 442.00 /*MHz*/, 0x02, },
580 { 16 * 999.99 , 0x04, },
581 },
582 .config = 0x8e,
583 },
584 [TUNER_TNF_8831BGFF] = { /* Philips PAL */
585 .name = "Tenna TNF 8831 BGFF)",
586 .count = 3,
587 .ranges = {
588 { 16 * 161.25 /*MHz*/, 0xa0, },
589 { 16 * 463.25 /*MHz*/, 0x90, },
590 { 16 * 999.99 , 0x30, },
591 },
592 .config = 0x8e,
593 },
594 [TUNER_MICROTUNE_4042FI5] = { /* Microtune NTSC */
595 .name = "Microtune 4042 FI5 ATSC/NTSC dual in",
596 .count = 3,
597 .ranges = {
598 { 16 * 162.00 /*MHz*/, 0xa2, },
599 { 16 * 457.00 /*MHz*/, 0x94, },
600 { 16 * 999.99 , 0x31, },
601 },
602 .config = 0x8e,
603 },
604
605 /* 50-59 */
606 [TUNER_TCL_2002N] = { /* TCL NTSC */
607 .name = "TCL 2002N",
608 .count = 3,
609 .ranges = {
610 { 16 * 172.00 /*MHz*/, 0x01, },
611 { 16 * 448.00 /*MHz*/, 0x02, },
612 { 16 * 999.99 , 0x08, },
613 },
614 .config = 0x8e,
615 },
616 [TUNER_PHILIPS_FM1256_IH3] = { /* Philips PAL */
617 .name = "Philips PAL/SECAM_D (FM 1256 I-H3)",
618 .count = 3,
619 .ranges = {
620 { 16 * 160.00 /*MHz*/, 0x01, },
621 { 16 * 442.00 /*MHz*/, 0x02, },
622 { 16 * 999.99 , 0x04, },
623 },
624 .config = 0x8e,
625 },
626 [TUNER_THOMSON_DTT7610] = { /* THOMSON ATSC */
627 .name = "Thomson DTT 7610 (ATSC/NTSC)",
628 .count = 3,
629 .ranges = {
630 { 16 * 157.25 /*MHz*/, 0x39, },
631 { 16 * 454.00 /*MHz*/, 0x3a, },
632 { 16 * 999.99 , 0x3c, },
633 },
634 .config = 0x8e,
635 },
636 [TUNER_PHILIPS_FQ1286] = { /* Philips NTSC */
637 .name = "Philips FQ1286",
638 .count = 3,
639 .ranges = {
640 { 16 * 160.00 /*MHz*/, 0x41, },
641 { 16 * 454.00 /*MHz*/, 0x42, },
642 { 16 * 999.99 , 0x04, },
643 },
644 .config = 0x8e,
645 },
646 [TUNER_PHILIPS_TDA8290] = { /* Philips PAL|NTSC */
647 .name = "tda8290+75",
648 /* see tda8290.c for details */ },
649 [TUNER_TCL_2002MB] = { /* TCL PAL */
650 .name = "TCL 2002MB",
651 .count = 3,
652 .ranges = {
653 { 16 * 170.00 /*MHz*/, 0x01, },
654 { 16 * 450.00 /*MHz*/, 0x02, },
655 { 16 * 999.99 , 0x08, },
656 },
657 .config = 0xce,
658 },
659 [TUNER_PHILIPS_FQ1216AME_MK4] = { /* Philips PAL */
660 .name = "Philips PAL/SECAM multi (FQ1216AME MK4)",
661 .count = 3,
662 .ranges = {
663 { 16 * 160.00 /*MHz*/, 0x01, },
664 { 16 * 442.00 /*MHz*/, 0x02, },
665 { 16 * 999.99 , 0x04, },
666 },
667 .config = 0xce,
668 },
669 [TUNER_PHILIPS_FQ1236A_MK4] = { /* Philips NTSC */
670 .name = "Philips FQ1236A MK4",
671 .count = 3,
672 .ranges = {
673 { 16 * 160.00 /*MHz*/, 0x01, },
674 { 16 * 442.00 /*MHz*/, 0x02, },
675 { 16 * 999.99 , 0x04, },
676 },
677 .config = 0x8e,
678 },
679 [TUNER_YMEC_TVF_8531MF] = { /* Philips NTSC */
680 .name = "Ymec TVision TVF-8531MF/8831MF/8731MF",
681 .count = 3,
682 .ranges = {
683 { 16 * 160.00 /*MHz*/, 0xa0, },
684 { 16 * 454.00 /*MHz*/, 0x90, },
685 { 16 * 999.99 , 0x30, },
686 },
687 .config = 0x8e,
688 },
689 [TUNER_YMEC_TVF_5533MF] = { /* Philips NTSC */
690 .name = "Ymec TVision TVF-5533MF",
691 .count = 3,
692 .ranges = {
693 { 16 * 160.00 /*MHz*/, 0x01, },
694 { 16 * 454.00 /*MHz*/, 0x02, },
695 { 16 * 999.99 , 0x04, },
696 },
697 .config = 0x8e,
698 },
699
700 /* 60-69 */
701 [TUNER_THOMSON_DTT761X] = { /* THOMSON ATSC */
702 /* DTT 7611 7611A 7612 7613 7613A 7614 7615 7615A */
703 .name = "Thomson DTT 761X (ATSC/NTSC)",
704 .count = 3,
705 .ranges = {
706 { 16 * 145.25 /*MHz*/, 0x39, },
707 { 16 * 415.25 /*MHz*/, 0x3a, },
708 { 16 * 999.99 , 0x3c, },
709 },
710 .config = 0x8e,
711 },
712 [TUNER_TENA_9533_DI] = { /* Philips PAL */
713 .name = "Tena TNF9533-D/IF/TNF9533-B/DF",
714 .count = 3,
715 .ranges = {
716 { 16 * 160.25 /*MHz*/, 0x01, },
717 { 16 * 464.25 /*MHz*/, 0x02, },
718 { 16 * 999.99 , 0x04, },
719 },
720 .config = 0x8e,
721 },
722 [TUNER_TEA5767] = { /* Philips RADIO */
723 .name = "Philips TEA5767HN FM Radio",
724 /* see tea5767.c for details */},
725 [TUNER_PHILIPS_FMD1216ME_MK3] = { /* Philips PAL */
726 .name = "Philips FMD1216ME MK3 Hybrid Tuner",
727 .count = 3,
728 .ranges = {
729 { 16 * 160.00 /*MHz*/, 0x51, },
730 { 16 * 442.00 /*MHz*/, 0x52, },
731 { 16 * 999.99 , 0x54, },
732 },
733 .config = 0x86,
734 },
735 [TUNER_LG_TDVS_H062F] = { /* LGINNOTEK ATSC */
736 .name = "LG TDVS-H062F/TUA6034",
737 .count = 3,
738 .ranges = {
739 { 16 * 160.00 /*MHz*/, 0x01 },
740 { 16 * 455.00 /*MHz*/, 0x02 },
741 { 16 * 999.99 , 0x04 },
742 },
743 .config = 0x8e,
744 },
745 [TUNER_YMEC_TVF66T5_B_DFF] = { /* Philips PAL */
746 .name = "Ymec TVF66T5-B/DFF",
747 .count = 3,
748 .ranges = {
749 { 16 * 160.25 /*MHz*/, 0x01, },
750 { 16 * 464.25 /*MHz*/, 0x02, },
751 { 16 * 999.99 , 0x08, },
752 },
753 .config = 0x8e,
754 },
755 [TUNER_LG_NTSC_TALN_MINI] = { /* LGINNOTEK NTSC */
756 .name = "LG NTSC (TALN mini series)",
757 .count = 3,
758 .ranges = {
759 { 16 * 137.25 /*MHz*/, 0x01, },
760 { 16 * 373.25 /*MHz*/, 0x02, },
761 { 16 * 999.99 , 0x08, },
762 },
763 .config = 0x8e,
764 },
765 [TUNER_PHILIPS_TD1316] = { /* Philips PAL */
766 .name = "Philips TD1316 Hybrid Tuner",
767 .count = 3,
768 .ranges = {
769 { 16 * 160.00 /*MHz*/, 0xa1, },
770 { 16 * 442.00 /*MHz*/, 0xa2, },
771 { 16 * 999.99 , 0xa4, },
772 },
773 .config = 0xc8,
774 },
775 [TUNER_PHILIPS_TUV1236D] = { /* Philips ATSC */
776 .name = "Philips TUV1236D ATSC/NTSC dual in",
777 .count = 3,
778 .ranges = {
779 { 16 * 157.25 /*MHz*/, 0x01, },
780 { 16 * 454.00 /*MHz*/, 0x02, },
781 { 16 * 999.99 , 0x04, },
782 },
783 .config = 0xce,
784 },
785 [TUNER_TNF_5335MF] = { /* Philips NTSC */
786 .name = "Tena TNF 5335 MF",
787 .count = 3,
788 .ranges = {
789 { 16 * 157.25 /*MHz*/, 0x01, },
790 { 16 * 454.00 /*MHz*/, 0x02, },
791 { 16 * 999.99 , 0x04, },
792 },
793 .config = 0x8e,
794 },
795};
796
797unsigned const int tuner_count = ARRAY_SIZE(tuners);
798 92
799/* ---------------------------------------------------------------------- */ 93/* ---------------------------------------------------------------------- */
800 94
@@ -843,15 +137,17 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
843 u16 div; 137 u16 div;
844 struct tunertype *tun; 138 struct tunertype *tun;
845 unsigned char buffer[4]; 139 unsigned char buffer[4];
846 int rc, IFPCoff, i; 140 int rc, IFPCoff, i, j;
847 141
848 tun = &tuners[t->type]; 142 tun = &tuners[t->type];
849 for (i = 0; i < tun->count; i++) { 143 j = TUNER_PARAM_ANALOG;
850 if (freq > tun->ranges[i].thresh) 144
145 for (i = 0; i < tun->params[j].count; i++) {
146 if (freq > tun->params[j].ranges[i].limit)
851 continue; 147 continue;
852 break; 148 break;
853 } 149 }
854 config = tun->ranges[i].cb; 150 config = tun->params[j].ranges[i].cb;
855 /* i == 0 -> VHF_LO */ 151 /* i == 0 -> VHF_LO */
856 /* i == 1 -> VHF_HI */ 152 /* i == 1 -> VHF_HI */
857 /* i == 2 -> UHF */ 153 /* i == 2 -> UHF */
@@ -914,7 +210,7 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
914 210
915 case TUNER_MICROTUNE_4042FI5: 211 case TUNER_MICROTUNE_4042FI5:
916 /* Set the charge pump for fast tuning */ 212 /* Set the charge pump for fast tuning */
917 tun->config |= TUNER_CHARGE_PUMP; 213 tun->params[j].config |= TUNER_CHARGE_PUMP;
918 break; 214 break;
919 215
920 case TUNER_PHILIPS_TUV1236D: 216 case TUNER_PHILIPS_TUV1236D:
@@ -989,14 +285,14 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
989 div); 285 div);
990 286
991 if (t->type == TUNER_PHILIPS_SECAM && freq < t->freq) { 287 if (t->type == TUNER_PHILIPS_SECAM && freq < t->freq) {
992 buffer[0] = tun->config; 288 buffer[0] = tun->params[j].config;
993 buffer[1] = config; 289 buffer[1] = config;
994 buffer[2] = (div>>8) & 0x7f; 290 buffer[2] = (div>>8) & 0x7f;
995 buffer[3] = div & 0xff; 291 buffer[3] = div & 0xff;
996 } else { 292 } else {
997 buffer[0] = (div>>8) & 0x7f; 293 buffer[0] = (div>>8) & 0x7f;
998 buffer[1] = div & 0xff; 294 buffer[1] = div & 0xff;
999 buffer[2] = tun->config; 295 buffer[2] = tun->params[j].config;
1000 buffer[3] = config; 296 buffer[3] = config;
1001 } 297 }
1002 tuner_dbg("tv 0x%02x 0x%02x 0x%02x 0x%02x\n", 298 tuner_dbg("tv 0x%02x 0x%02x 0x%02x 0x%02x\n",
@@ -1024,10 +320,10 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
1024 } 320 }
1025 321
1026 /* Set the charge pump for optimized phase noise figure */ 322 /* Set the charge pump for optimized phase noise figure */
1027 tun->config &= ~TUNER_CHARGE_PUMP; 323 tun->params[j].config &= ~TUNER_CHARGE_PUMP;
1028 buffer[0] = (div>>8) & 0x7f; 324 buffer[0] = (div>>8) & 0x7f;
1029 buffer[1] = div & 0xff; 325 buffer[1] = div & 0xff;
1030 buffer[2] = tun->config; 326 buffer[2] = tun->params[j].config;
1031 buffer[3] = config; 327 buffer[3] = config;
1032 tuner_dbg("tv 0x%02x 0x%02x 0x%02x 0x%02x\n", 328 tuner_dbg("tv 0x%02x 0x%02x 0x%02x 0x%02x\n",
1033 buffer[0],buffer[1],buffer[2],buffer[3]); 329 buffer[0],buffer[1],buffer[2],buffer[3]);
@@ -1043,11 +339,13 @@ static void default_set_radio_freq(struct i2c_client *c, unsigned int freq)
1043 struct tuner *t = i2c_get_clientdata(c); 339 struct tuner *t = i2c_get_clientdata(c);
1044 unsigned char buffer[4]; 340 unsigned char buffer[4];
1045 unsigned div; 341 unsigned div;
1046 int rc; 342 int rc, j;
1047 343
1048 tun = &tuners[t->type]; 344 tun = &tuners[t->type];
345 j = TUNER_PARAM_ANALOG;
346
1049 div = (20 * freq / 16000) + (int)(20*10.7); /* IF 10.7 MHz */ 347 div = (20 * freq / 16000) + (int)(20*10.7); /* IF 10.7 MHz */
1050 buffer[2] = (tun->config & ~TUNER_RATIO_MASK) | TUNER_RATIO_SELECT_50; /* 50 kHz step */ 348 buffer[2] = (tun->params[j].config & ~TUNER_RATIO_MASK) | TUNER_RATIO_SELECT_50; /* 50 kHz step */
1051 349
1052 switch (t->type) { 350 switch (t->type) {
1053 case TUNER_TENA_9533_DI: 351 case TUNER_TENA_9533_DI:
diff --git a/drivers/media/video/tuner-types.c b/drivers/media/video/tuner-types.c
new file mode 100644
index 000000000000..32c9be4c5ca6
--- /dev/null
+++ b/drivers/media/video/tuner-types.c
@@ -0,0 +1,1400 @@
1/*
2 *
3 * i2c tv tuner chip device type database.
4 *
5 */
6
7#include <linux/i2c.h>
8#include <media/tuner.h>
9#include <media/tuner-types.h>
10
11/* ---------------------------------------------------------------------- */
12
13/*
14 * The floats in the tuner struct are computed at compile time
15 * by gcc and cast back to integers. Thus we don't violate the
16 * "no float in kernel" rule.
17 *
18 * A tuner_range may be referenced by multiple tuner_params structs.
19 * There are many duplicates in here. Reusing tuner_range structs,
20 * rather than defining new ones for each tuner, will cut down on
21 * memory usage, and is preferred when possible.
22 *
23 * Each tuner_params array may contain one or more elements, one
24 * for each video standard.
25 *
26 * FIXME: Some tuner_range definitions are duplicated, and
27 * should be eliminated.
28 *
29 * FIXME: tunertype struct contains an element, has_tda988x.
30 * We must set this for all tunertypes that contain a tda988x
31 * chip, and then we can remove this setting from the various
32 * card structs.
33 */
34
35/* 0-9 */
36/* ------------ TUNER_TEMIC_PAL - TEMIC PAL ------------ */
37
38static struct tuner_range tuner_temic_pal_ranges[] = {
39 { 16 * 140.25 /*MHz*/, 0x02, },
40 { 16 * 463.25 /*MHz*/, 0x04, },
41 { 16 * 999.99 , 0x01, },
42};
43
44static struct tuner_params tuner_temic_pal_params[] = {
45 {
46 .type = TUNER_PARAM_TYPE_PAL,
47 .ranges = tuner_temic_pal_ranges,
48 .count = ARRAY_SIZE(tuner_temic_pal_ranges),
49 .config = 0x8e,
50 },
51};
52
53/* ------------ TUNER_PHILIPS_PAL_I - Philips PAL_I ------------ */
54
55static struct tuner_range tuner_philips_pal_i_ranges[] = {
56 { 16 * 140.25 /*MHz*/, 0xa0, },
57 { 16 * 463.25 /*MHz*/, 0x90, },
58 { 16 * 999.99 , 0x30, },
59};
60
61static struct tuner_params tuner_philips_pal_i_params[] = {
62 {
63 .type = TUNER_PARAM_TYPE_PAL,
64 .ranges = tuner_philips_pal_i_ranges,
65 .count = ARRAY_SIZE(tuner_philips_pal_i_ranges),
66 .config = 0x8e,
67 },
68};
69
70/* ------------ TUNER_PHILIPS_NTSC - Philips NTSC ------------ */
71
72static struct tuner_range tuner_philips_ntsc_ranges[] = {
73 { 16 * 157.25 /*MHz*/, 0xa0, },
74 { 16 * 451.25 /*MHz*/, 0x90, },
75 { 16 * 999.99 , 0x30, },
76};
77
78static struct tuner_params tuner_philips_ntsc_params[] = {
79 {
80 .type = TUNER_PARAM_TYPE_NTSC,
81 .ranges = tuner_philips_ntsc_ranges,
82 .count = ARRAY_SIZE(tuner_philips_ntsc_ranges),
83 .config = 0x8e,
84 },
85};
86
87/* ------------ TUNER_PHILIPS_SECAM - Philips SECAM ------------ */
88
89static struct tuner_range tuner_philips_secam_ranges[] = {
90 { 16 * 168.25 /*MHz*/, 0xa7, },
91 { 16 * 447.25 /*MHz*/, 0x97, },
92 { 16 * 999.99 , 0x37, },
93};
94
95static struct tuner_params tuner_philips_secam_params[] = {
96 {
97 .type = TUNER_PARAM_TYPE_SECAM,
98 .ranges = tuner_philips_secam_ranges,
99 .count = ARRAY_SIZE(tuner_philips_secam_ranges),
100 .config = 0x8e,
101 },
102};
103
104/* ------------ TUNER_PHILIPS_PAL - Philips PAL ------------ */
105
106static struct tuner_range tuner_philips_pal_ranges[] = {
107 { 16 * 168.25 /*MHz*/, 0xa0, },
108 { 16 * 447.25 /*MHz*/, 0x90, },
109 { 16 * 999.99 , 0x30, },
110};
111
112static struct tuner_params tuner_philips_pal_params[] = {
113 {
114 .type = TUNER_PARAM_TYPE_PAL,
115 .ranges = tuner_philips_pal_ranges,
116 .count = ARRAY_SIZE(tuner_philips_pal_ranges),
117 .config = 0x8e,
118 },
119};
120
121/* ------------ TUNER_TEMIC_NTSC - TEMIC NTSC ------------ */
122
123static struct tuner_range tuner_temic_ntsc_ranges[] = {
124 { 16 * 157.25 /*MHz*/, 0x02, },
125 { 16 * 463.25 /*MHz*/, 0x04, },
126 { 16 * 999.99 , 0x01, },
127};
128
129static struct tuner_params tuner_temic_ntsc_params[] = {
130 {
131 .type = TUNER_PARAM_TYPE_NTSC,
132 .ranges = tuner_temic_ntsc_ranges,
133 .count = ARRAY_SIZE(tuner_temic_ntsc_ranges),
134 .config = 0x8e,
135 },
136};
137
138/* ------------ TUNER_TEMIC_PAL_I - TEMIC PAL_I ------------ */
139
140static struct tuner_range tuner_temic_pal_i_ranges[] = {
141 { 16 * 170.00 /*MHz*/, 0x02, },
142 { 16 * 450.00 /*MHz*/, 0x04, },
143 { 16 * 999.99 , 0x01, },
144};
145
146static struct tuner_params tuner_temic_pal_i_params[] = {
147 {
148 .type = TUNER_PARAM_TYPE_PAL,
149 .ranges = tuner_temic_pal_i_ranges,
150 .count = ARRAY_SIZE(tuner_temic_pal_i_ranges),
151 .config = 0x8e,
152 },
153};
154
155/* ------------ TUNER_TEMIC_4036FY5_NTSC - TEMIC NTSC ------------ */
156
157static struct tuner_range tuner_temic_4036fy5_ntsc_ranges[] = {
158 { 16 * 157.25 /*MHz*/, 0xa0, },
159 { 16 * 463.25 /*MHz*/, 0x90, },
160 { 16 * 999.99 , 0x30, },
161};
162
163static struct tuner_params tuner_temic_4036fy5_ntsc_params[] = {
164 {
165 .type = TUNER_PARAM_TYPE_NTSC,
166 .ranges = tuner_temic_4036fy5_ntsc_ranges,
167 .count = ARRAY_SIZE(tuner_temic_4036fy5_ntsc_ranges),
168 .config = 0x8e,
169 },
170};
171
172/* ------------ TUNER_ALPS_TSBH1_NTSC - TEMIC NTSC ------------ */
173
174static struct tuner_range tuner_alps_tsb_1_ranges[] = {
175 { 16 * 137.25 /*MHz*/, 0x01, },
176 { 16 * 385.25 /*MHz*/, 0x02, },
177 { 16 * 999.99 , 0x08, },
178};
179
180static struct tuner_params tuner_alps_tsbh1_ntsc_params[] = {
181 {
182 .type = TUNER_PARAM_TYPE_NTSC,
183 .ranges = tuner_alps_tsb_1_ranges,
184 .count = ARRAY_SIZE(tuner_alps_tsb_1_ranges),
185 .config = 0x8e,
186 },
187};
188
189/* 10-19 */
190/* ------------ TUNER_ALPS_TSBE1_PAL - TEMIC PAL ------------ */
191
192static struct tuner_params tuner_alps_tsb_1_params[] = {
193 {
194 .type = TUNER_PARAM_TYPE_PAL,
195 .ranges = tuner_alps_tsb_1_ranges,
196 .count = ARRAY_SIZE(tuner_alps_tsb_1_ranges),
197 .config = 0x8e,
198 },
199};
200
201/* ------------ TUNER_ALPS_TSBB5_PAL_I - Alps PAL_I ------------ */
202
203static struct tuner_range tuner_alps_tsb_5_pal_ranges[] = {
204 { 16 * 133.25 /*MHz*/, 0x01, },
205 { 16 * 351.25 /*MHz*/, 0x02, },
206 { 16 * 999.99 , 0x08, },
207};
208
209static struct tuner_params tuner_alps_tsbb5_params[] = {
210 {
211 .type = TUNER_PARAM_TYPE_PAL,
212 .ranges = tuner_alps_tsb_5_pal_ranges,
213 .count = ARRAY_SIZE(tuner_alps_tsb_5_pal_ranges),
214 .config = 0x8e,
215 },
216};
217
218/* ------------ TUNER_ALPS_TSBE5_PAL - Alps PAL ------------ */
219
220static struct tuner_params tuner_alps_tsbe5_params[] = {
221 {
222 .type = TUNER_PARAM_TYPE_PAL,
223 .ranges = tuner_alps_tsb_5_pal_ranges,
224 .count = ARRAY_SIZE(tuner_alps_tsb_5_pal_ranges),
225 .config = 0x8e,
226 },
227};
228
229/* ------------ TUNER_ALPS_TSBC5_PAL - Alps PAL ------------ */
230
231static struct tuner_params tuner_alps_tsbc5_params[] = {
232 {
233 .type = TUNER_PARAM_TYPE_PAL,
234 .ranges = tuner_alps_tsb_5_pal_ranges,
235 .count = ARRAY_SIZE(tuner_alps_tsb_5_pal_ranges),
236 .config = 0x8e,
237 },
238};
239
240/* ------------ TUNER_TEMIC_4006FH5_PAL - TEMIC PAL ------------ */
241
242static struct tuner_range tuner_temic_4006fh5_pal_ranges[] = {
243 { 16 * 170.00 /*MHz*/, 0xa0, },
244 { 16 * 450.00 /*MHz*/, 0x90, },
245 { 16 * 999.99 , 0x30, },
246};
247
248static struct tuner_params tuner_temic_4006fh5_params[] = {
249 {
250 .type = TUNER_PARAM_TYPE_PAL,
251 .ranges = tuner_temic_4006fh5_pal_ranges,
252 .count = ARRAY_SIZE(tuner_temic_4006fh5_pal_ranges),
253 .config = 0x8e,
254 },
255};
256
257/* ------------ TUNER_ALPS_TSHC6_NTSC - Alps NTSC ------------ */
258
259static struct tuner_range tuner_alps_tshc6_ntsc_ranges[] = {
260 { 16 * 137.25 /*MHz*/, 0x14, },
261 { 16 * 385.25 /*MHz*/, 0x12, },
262 { 16 * 999.99 , 0x11, },
263};
264
265static struct tuner_params tuner_alps_tshc6_params[] = {
266 {
267 .type = TUNER_PARAM_TYPE_NTSC,
268 .ranges = tuner_alps_tshc6_ntsc_ranges,
269 .count = ARRAY_SIZE(tuner_alps_tshc6_ntsc_ranges),
270 .config = 0x8e,
271 },
272};
273
274/* ------------ TUNER_TEMIC_PAL_DK - TEMIC PAL ------------ */
275
276static struct tuner_range tuner_temic_pal_dk_ranges[] = {
277 { 16 * 168.25 /*MHz*/, 0xa0, },
278 { 16 * 456.25 /*MHz*/, 0x90, },
279 { 16 * 999.99 , 0x30, },
280};
281
282static struct tuner_params tuner_temic_pal_dk_params[] = {
283 {
284 .type = TUNER_PARAM_TYPE_PAL,
285 .ranges = tuner_temic_pal_dk_ranges,
286 .count = ARRAY_SIZE(tuner_temic_pal_dk_ranges),
287 .config = 0x8e,
288 },
289};
290
291/* ------------ TUNER_PHILIPS_NTSC_M - Philips NTSC ------------ */
292
293static struct tuner_range tuner_philips_ntsc_m_ranges[] = {
294 { 16 * 160.00 /*MHz*/, 0xa0, },
295 { 16 * 454.00 /*MHz*/, 0x90, },
296 { 16 * 999.99 , 0x30, },
297};
298
299static struct tuner_params tuner_philips_ntsc_m_params[] = {
300 {
301 .type = TUNER_PARAM_TYPE_NTSC,
302 .ranges = tuner_philips_ntsc_m_ranges,
303 .count = ARRAY_SIZE(tuner_philips_ntsc_m_ranges),
304 .config = 0x8e,
305 },
306};
307
308/* ------------ TUNER_TEMIC_4066FY5_PAL_I - TEMIC PAL_I ------------ */
309
310static struct tuner_range tuner_temic_40x6f_5_pal_ranges[] = {
311 { 16 * 169.00 /*MHz*/, 0xa0, },
312 { 16 * 454.00 /*MHz*/, 0x90, },
313 { 16 * 999.99 , 0x30, },
314};
315
316static struct tuner_params tuner_temic_4066fy5_pal_i_params[] = {
317 {
318 .type = TUNER_PARAM_TYPE_PAL,
319 .ranges = tuner_temic_40x6f_5_pal_ranges,
320 .count = ARRAY_SIZE(tuner_temic_40x6f_5_pal_ranges),
321 .config = 0x8e,
322 },
323};
324
325/* ------------ TUNER_TEMIC_4006FN5_MULTI_PAL - TEMIC PAL ------------ */
326
327static struct tuner_params tuner_temic_4006fn5_multi_params[] = {
328 {
329 .type = TUNER_PARAM_TYPE_PAL,
330 .ranges = tuner_temic_40x6f_5_pal_ranges,
331 .count = ARRAY_SIZE(tuner_temic_40x6f_5_pal_ranges),
332 .config = 0x8e,
333 },
334};
335
336/* 20-29 */
337/* ------------ TUNER_TEMIC_4009FR5_PAL - TEMIC PAL ------------ */
338
339static struct tuner_range tuner_temic_4009f_5_pal_ranges[] = {
340 { 16 * 141.00 /*MHz*/, 0xa0, },
341 { 16 * 464.00 /*MHz*/, 0x90, },
342 { 16 * 999.99 , 0x30, },
343};
344
345static struct tuner_params tuner_temic_4009f_5_params[] = {
346 {
347 .type = TUNER_PARAM_TYPE_PAL,
348 .ranges = tuner_temic_4009f_5_pal_ranges,
349 .count = ARRAY_SIZE(tuner_temic_4009f_5_pal_ranges),
350 .config = 0x8e,
351 },
352};
353
354/* ------------ TUNER_TEMIC_4039FR5_NTSC - TEMIC NTSC ------------ */
355
356static struct tuner_range tuner_temic_4039fr5_ntsc_ranges[] = {
357 { 16 * 158.00 /*MHz*/, 0xa0, },
358 { 16 * 453.00 /*MHz*/, 0x90, },
359 { 16 * 999.99 , 0x30, },
360};
361
362static struct tuner_params tuner_temic_4039fr5_params[] = {
363 {
364 .type = TUNER_PARAM_TYPE_NTSC,
365 .ranges = tuner_temic_4039fr5_ntsc_ranges,
366 .count = ARRAY_SIZE(tuner_temic_4039fr5_ntsc_ranges),
367 .config = 0x8e,
368 },
369};
370
371/* ------------ TUNER_TEMIC_4046FM5 - TEMIC PAL ------------ */
372
373static struct tuner_range tuner_temic_4046fm5_pal_ranges[] = {
374 { 16 * 169.00 /*MHz*/, 0xa0, },
375 { 16 * 454.00 /*MHz*/, 0x90, },
376 { 16 * 999.99 , 0x30, },
377};
378
379static struct tuner_params tuner_temic_4046fm5_params[] = {
380 {
381 .type = TUNER_PARAM_TYPE_PAL,
382 .ranges = tuner_temic_4046fm5_pal_ranges,
383 .count = ARRAY_SIZE(tuner_temic_4046fm5_pal_ranges),
384 .config = 0x8e,
385 },
386};
387
388/* ------------ TUNER_PHILIPS_PAL_DK - Philips PAL ------------ */
389
390static struct tuner_range tuner_lg_pal_ranges[] = {
391 { 16 * 170.00 /*MHz*/, 0xa0, },
392 { 16 * 450.00 /*MHz*/, 0x90, },
393 { 16 * 999.99 , 0x30, },
394};
395
396static struct tuner_params tuner_philips_pal_dk_params[] = {
397 {
398 .type = TUNER_PARAM_TYPE_PAL,
399 .ranges = tuner_lg_pal_ranges,
400 .count = ARRAY_SIZE(tuner_lg_pal_ranges),
401 .config = 0x8e,
402 },
403};
404
405/* ------------ TUNER_PHILIPS_FQ1216ME - Philips PAL ------------ */
406
407static struct tuner_params tuner_philips_fq1216me_params[] = {
408 {
409 .type = TUNER_PARAM_TYPE_PAL,
410 .ranges = tuner_lg_pal_ranges,
411 .count = ARRAY_SIZE(tuner_lg_pal_ranges),
412 .config = 0x8e,
413 },
414};
415
416/* ------------ TUNER_LG_PAL_I_FM - LGINNOTEK PAL_I ------------ */
417
418static struct tuner_params tuner_lg_pal_i_fm_params[] = {
419 {
420 .type = TUNER_PARAM_TYPE_PAL,
421 .ranges = tuner_lg_pal_ranges,
422 .count = ARRAY_SIZE(tuner_lg_pal_ranges),
423 .config = 0x8e,
424 },
425};
426
427/* ------------ TUNER_LG_PAL_I - LGINNOTEK PAL_I ------------ */
428
429static struct tuner_params tuner_lg_pal_i_params[] = {
430 {
431 .type = TUNER_PARAM_TYPE_PAL,
432 .ranges = tuner_lg_pal_ranges,
433 .count = ARRAY_SIZE(tuner_lg_pal_ranges),
434 .config = 0x8e,
435 },
436};
437
438/* ------------ TUNER_LG_NTSC_FM - LGINNOTEK NTSC ------------ */
439
440static struct tuner_range tuner_lg_ntsc_fm_ranges[] = {
441 { 16 * 210.00 /*MHz*/, 0xa0, },
442 { 16 * 497.00 /*MHz*/, 0x90, },
443 { 16 * 999.99 , 0x30, },
444};
445
446static struct tuner_params tuner_lg_ntsc_fm_params[] = {
447 {
448 .type = TUNER_PARAM_TYPE_NTSC,
449 .ranges = tuner_lg_ntsc_fm_ranges,
450 .count = ARRAY_SIZE(tuner_lg_ntsc_fm_ranges),
451 .config = 0x8e,
452 },
453};
454
455/* ------------ TUNER_LG_PAL_FM - LGINNOTEK PAL ------------ */
456
457static struct tuner_params tuner_lg_pal_fm_params[] = {
458 {
459 .type = TUNER_PARAM_TYPE_PAL,
460 .ranges = tuner_lg_pal_ranges,
461 .count = ARRAY_SIZE(tuner_lg_pal_ranges),
462 .config = 0x8e,
463 },
464};
465
466/* ------------ TUNER_LG_PAL - LGINNOTEK PAL ------------ */
467
468static struct tuner_params tuner_lg_pal_params[] = {
469 {
470 .type = TUNER_PARAM_TYPE_PAL,
471 .ranges = tuner_lg_pal_ranges,
472 .count = ARRAY_SIZE(tuner_lg_pal_ranges),
473 .config = 0x8e,
474 },
475};
476
477/* 30-39 */
478/* ------------ TUNER_TEMIC_4009FN5_MULTI_PAL_FM - TEMIC PAL ------------ */
479
480static struct tuner_params tuner_temic_4009_fn5_multi_pal_fm_params[] = {
481 {
482 .type = TUNER_PARAM_TYPE_PAL,
483 .ranges = tuner_temic_4009f_5_pal_ranges,
484 .count = ARRAY_SIZE(tuner_temic_4009f_5_pal_ranges),
485 .config = 0x8e,
486 },
487};
488
489/* ------------ TUNER_SHARP_2U5JF5540_NTSC - SHARP NTSC ------------ */
490
491static struct tuner_range tuner_sharp_2u5jf5540_ntsc_ranges[] = {
492 { 16 * 137.25 /*MHz*/, 0x01, },
493 { 16 * 317.25 /*MHz*/, 0x02, },
494 { 16 * 999.99 , 0x08, },
495};
496
497static struct tuner_params tuner_sharp_2u5jf5540_params[] = {
498 {
499 .type = TUNER_PARAM_TYPE_NTSC,
500 .ranges = tuner_sharp_2u5jf5540_ntsc_ranges,
501 .count = ARRAY_SIZE(tuner_sharp_2u5jf5540_ntsc_ranges),
502 .config = 0x8e,
503 },
504};
505
506/* ------------ TUNER_Samsung_PAL_TCPM9091PD27 - Samsung PAL ------------ */
507
508static struct tuner_range tuner_samsung_pal_tcpm9091pd27_ranges[] = {
509 { 16 * 169 /*MHz*/, 0xa0, },
510 { 16 * 464 /*MHz*/, 0x90, },
511 { 16 * 999.99 , 0x30, },
512};
513
514static struct tuner_params tuner_samsung_pal_tcpm9091pd27_params[] = {
515 {
516 .type = TUNER_PARAM_TYPE_PAL,
517 .ranges = tuner_samsung_pal_tcpm9091pd27_ranges,
518 .count = ARRAY_SIZE(tuner_samsung_pal_tcpm9091pd27_ranges),
519 .config = 0x8e,
520 },
521};
522
523/* ------------ TUNER_TEMIC_4106FH5 - TEMIC PAL ------------ */
524
525static struct tuner_params tuner_temic_4106fh5_params[] = {
526 {
527 .type = TUNER_PARAM_TYPE_PAL,
528 .ranges = tuner_temic_4009f_5_pal_ranges,
529 .count = ARRAY_SIZE(tuner_temic_4009f_5_pal_ranges),
530 .config = 0x8e,
531 },
532};
533
534/* ------------ TUNER_TEMIC_4012FY5 - TEMIC PAL ------------ */
535
536static struct tuner_range tuner_temic_4012fy5_pal_ranges[] = {
537 { 16 * 140.25 /*MHz*/, 0x02, },
538 { 16 * 463.25 /*MHz*/, 0x04, },
539 { 16 * 999.99 , 0x01, },
540};
541
542static struct tuner_params tuner_temic_4012fy5_params[] = {
543 {
544 .type = TUNER_PARAM_TYPE_PAL,
545 .ranges = tuner_temic_4012fy5_pal_ranges,
546 .count = ARRAY_SIZE(tuner_temic_4012fy5_pal_ranges),
547 .config = 0x8e,
548 },
549};
550
551/* ------------ TUNER_TEMIC_4136FY5 - TEMIC NTSC ------------ */
552
553static struct tuner_range tuner_temic_4136_fy5_ntsc_ranges[] = {
554 { 16 * 158.00 /*MHz*/, 0xa0, },
555 { 16 * 453.00 /*MHz*/, 0x90, },
556 { 16 * 999.99 , 0x30, },
557};
558
559static struct tuner_params tuner_temic_4136_fy5_params[] = {
560 {
561 .type = TUNER_PARAM_TYPE_NTSC,
562 .ranges = tuner_temic_4136_fy5_ntsc_ranges,
563 .count = ARRAY_SIZE(tuner_temic_4136_fy5_ntsc_ranges),
564 .config = 0x8e,
565 },
566};
567
568/* ------------ TUNER_LG_PAL_NEW_TAPC - LGINNOTEK PAL ------------ */
569
570static struct tuner_range tuner_lg_new_tapc_ranges[] = {
571 { 16 * 170.00 /*MHz*/, 0x01, },
572 { 16 * 450.00 /*MHz*/, 0x02, },
573 { 16 * 999.99 , 0x08, },
574};
575
576static struct tuner_params tuner_lg_pal_new_tapc_params[] = {
577 {
578 .type = TUNER_PARAM_TYPE_PAL,
579 .ranges = tuner_lg_new_tapc_ranges,
580 .count = ARRAY_SIZE(tuner_lg_new_tapc_ranges),
581 .config = 0x8e,
582 },
583};
584
585/* ------------ TUNER_PHILIPS_FM1216ME_MK3 - Philips PAL ------------ */
586
587static struct tuner_range tuner_fm1216me_mk3_pal_ranges[] = {
588 { 16 * 158.00 /*MHz*/, 0x01, },
589 { 16 * 442.00 /*MHz*/, 0x02, },
590 { 16 * 999.99 , 0x04, },
591};
592
593static struct tuner_params tuner_fm1216me_mk3_params[] = {
594 {
595 .type = TUNER_PARAM_TYPE_PAL,
596 .ranges = tuner_fm1216me_mk3_pal_ranges,
597 .count = ARRAY_SIZE(tuner_fm1216me_mk3_pal_ranges),
598 .config = 0x8e,
599 },
600};
601
602/* ------------ TUNER_LG_NTSC_NEW_TAPC - LGINNOTEK NTSC ------------ */
603
604static struct tuner_params tuner_lg_ntsc_new_tapc_params[] = {
605 {
606 .type = TUNER_PARAM_TYPE_NTSC,
607 .ranges = tuner_lg_new_tapc_ranges,
608 .count = ARRAY_SIZE(tuner_lg_new_tapc_ranges),
609 .config = 0x8e,
610 },
611};
612
613/* 40-49 */
614/* ------------ TUNER_HITACHI_NTSC - HITACHI NTSC ------------ */
615
616static struct tuner_params tuner_hitachi_ntsc_params[] = {
617 {
618 .type = TUNER_PARAM_TYPE_NTSC,
619 .ranges = tuner_lg_new_tapc_ranges,
620 .count = ARRAY_SIZE(tuner_lg_new_tapc_ranges),
621 .config = 0x8e,
622 },
623};
624
625/* ------------ TUNER_PHILIPS_PAL_MK - Philips PAL ------------ */
626
627static struct tuner_range tuner_philips_pal_mk_pal_ranges[] = {
628 { 16 * 140.25 /*MHz*/, 0x01, },
629 { 16 * 463.25 /*MHz*/, 0xc2, },
630 { 16 * 999.99 , 0xcf, },
631};
632
633static struct tuner_params tuner_philips_pal_mk_params[] = {
634 {
635 .type = TUNER_PARAM_TYPE_PAL,
636 .ranges = tuner_philips_pal_mk_pal_ranges,
637 .count = ARRAY_SIZE(tuner_philips_pal_mk_pal_ranges),
638 .config = 0x8e,
639 },
640};
641
642/* ------------ TUNER_PHILIPS_ATSC - Philips ATSC ------------ */
643
644static struct tuner_range tuner_philips_atsc_ranges[] = {
645 { 16 * 157.25 /*MHz*/, 0xa0, },
646 { 16 * 454.00 /*MHz*/, 0x90, },
647 { 16 * 999.99 , 0x30, },
648};
649
650static struct tuner_params tuner_philips_atsc_params[] = {
651 {
652 .type = TUNER_PARAM_TYPE_NTSC,
653 .ranges = tuner_philips_atsc_ranges,
654 .count = ARRAY_SIZE(tuner_philips_atsc_ranges),
655 .config = 0x8e,
656 },
657};
658
659/* ------------ TUNER_PHILIPS_FM1236_MK3 - Philips NTSC ------------ */
660
661static struct tuner_range tuner_fm1236_mk3_ntsc_ranges[] = {
662 { 16 * 160.00 /*MHz*/, 0x01, },
663 { 16 * 442.00 /*MHz*/, 0x02, },
664 { 16 * 999.99 , 0x04, },
665};
666
667static struct tuner_params tuner_fm1236_mk3_params[] = {
668 {
669 .type = TUNER_PARAM_TYPE_NTSC,
670 .ranges = tuner_fm1236_mk3_ntsc_ranges,
671 .count = ARRAY_SIZE(tuner_fm1236_mk3_ntsc_ranges),
672 .config = 0x8e,
673 },
674};
675
676/* ------------ TUNER_PHILIPS_4IN1 - Philips NTSC ------------ */
677
678static struct tuner_range tuner_philips_4in1_ntsc_ranges[] = {
679 { 16 * 160.00 /*MHz*/, 0x01, },
680 { 16 * 442.00 /*MHz*/, 0x02, },
681 { 16 * 999.99 , 0x04, },
682};
683
684static struct tuner_params tuner_philips_4in1_params[] = {
685 {
686 .type = TUNER_PARAM_TYPE_NTSC,
687 .ranges = tuner_philips_4in1_ntsc_ranges,
688 .count = ARRAY_SIZE(tuner_philips_4in1_ntsc_ranges),
689 .config = 0x8e,
690 },
691};
692
693/* ------------ TUNER_MICROTUNE_4049FM5 - Microtune PAL ------------ */
694
695static struct tuner_params tuner_microtune_4049_fm5_params[] = {
696 {
697 .type = TUNER_PARAM_TYPE_PAL,
698 .ranges = tuner_temic_4009f_5_pal_ranges,
699 .count = ARRAY_SIZE(tuner_temic_4009f_5_pal_ranges),
700 .config = 0x8e,
701 },
702};
703
704/* ------------ TUNER_PANASONIC_VP27 - Panasonic NTSC ------------ */
705
706static struct tuner_range tuner_panasonic_vp27_ntsc_ranges[] = {
707 { 16 * 160.00 /*MHz*/, 0x01, },
708 { 16 * 454.00 /*MHz*/, 0x02, },
709 { 16 * 999.99 , 0x08, },
710};
711
712static struct tuner_params tuner_panasonic_vp27_params[] = {
713 {
714 .type = TUNER_PARAM_TYPE_NTSC,
715 .ranges = tuner_panasonic_vp27_ntsc_ranges,
716 .count = ARRAY_SIZE(tuner_panasonic_vp27_ntsc_ranges),
717 .config = 0xce,
718 },
719};
720
721/* ------------ TUNER_LG_NTSC_TAPE - LGINNOTEK NTSC ------------ */
722
723static struct tuner_range tuner_lg_ntsc_tape_ranges[] = {
724 { 16 * 160.00 /*MHz*/, 0x01, },
725 { 16 * 442.00 /*MHz*/, 0x02, },
726 { 16 * 999.99 , 0x04, },
727};
728
729static struct tuner_params tuner_lg_ntsc_tape_params[] = {
730 {
731 .type = TUNER_PARAM_TYPE_NTSC,
732 .ranges = tuner_lg_ntsc_tape_ranges,
733 .count = ARRAY_SIZE(tuner_lg_ntsc_tape_ranges),
734 .config = 0x8e,
735 },
736};
737
738/* ------------ TUNER_TNF_8831BGFF - Philips PAL ------------ */
739
740static struct tuner_range tuner_tnf_8831bgff_pal_ranges[] = {
741 { 16 * 161.25 /*MHz*/, 0xa0, },
742 { 16 * 463.25 /*MHz*/, 0x90, },
743 { 16 * 999.99 , 0x30, },
744};
745
746static struct tuner_params tuner_tnf_8831bgff_params[] = {
747 {
748 .type = TUNER_PARAM_TYPE_PAL,
749 .ranges = tuner_tnf_8831bgff_pal_ranges,
750 .count = ARRAY_SIZE(tuner_tnf_8831bgff_pal_ranges),
751 .config = 0x8e,
752 },
753};
754
755/* ------------ TUNER_MICROTUNE_4042FI5 - Microtune NTSC ------------ */
756
757static struct tuner_range tuner_microtune_4042fi5_ntsc_ranges[] = {
758 { 16 * 162.00 /*MHz*/, 0xa2, },
759 { 16 * 457.00 /*MHz*/, 0x94, },
760 { 16 * 999.99 , 0x31, },
761};
762
763static struct tuner_params tuner_microtune_4042fi5_params[] = {
764 {
765 .type = TUNER_PARAM_TYPE_NTSC,
766 .ranges = tuner_microtune_4042fi5_ntsc_ranges,
767 .count = ARRAY_SIZE(tuner_microtune_4042fi5_ntsc_ranges),
768 .config = 0x8e,
769 },
770};
771
772/* 50-59 */
773/* ------------ TUNER_TCL_2002N - TCL NTSC ------------ */
774
775static struct tuner_range tuner_tcl_2002n_ntsc_ranges[] = {
776 { 16 * 172.00 /*MHz*/, 0x01, },
777 { 16 * 448.00 /*MHz*/, 0x02, },
778 { 16 * 999.99 , 0x08, },
779};
780
781static struct tuner_params tuner_tcl_2002n_params[] = {
782 {
783 .type = TUNER_PARAM_TYPE_NTSC,
784 .ranges = tuner_tcl_2002n_ntsc_ranges,
785 .count = ARRAY_SIZE(tuner_tcl_2002n_ntsc_ranges),
786 .config = 0x8e,
787 },
788};
789
790/* ------------ TUNER_PHILIPS_FM1256_IH3 - Philips PAL ------------ */
791
792static struct tuner_range tuner_philips_fm1256_ih3_pal_ranges[] = {
793 { 16 * 160.00 /*MHz*/, 0x01, },
794 { 16 * 442.00 /*MHz*/, 0x02, },
795 { 16 * 999.99 , 0x04, },
796};
797
798static struct tuner_params tuner_philips_fm1256_ih3_params[] = {
799 {
800 .type = TUNER_PARAM_TYPE_PAL,
801 .ranges = tuner_philips_fm1256_ih3_pal_ranges,
802 .count = ARRAY_SIZE(tuner_philips_fm1256_ih3_pal_ranges),
803 .config = 0x8e,
804 },
805};
806
807/* ------------ TUNER_THOMSON_DTT7610 - THOMSON ATSC ------------ */
808
809static struct tuner_range tuner_thomson_dtt7610_ntsc_ranges[] = {
810 { 16 * 157.25 /*MHz*/, 0x39, },
811 { 16 * 454.00 /*MHz*/, 0x3a, },
812 { 16 * 999.99 , 0x3c, },
813};
814
815static struct tuner_params tuner_thomson_dtt7610_params[] = {
816 {
817 .type = TUNER_PARAM_TYPE_NTSC,
818 .ranges = tuner_thomson_dtt7610_ntsc_ranges,
819 .count = ARRAY_SIZE(tuner_thomson_dtt7610_ntsc_ranges),
820 .config = 0x8e,
821 },
822};
823
824/* ------------ TUNER_PHILIPS_FQ1286 - Philips NTSC ------------ */
825
826static struct tuner_range tuner_philips_fq1286_ntsc_ranges[] = {
827 { 16 * 160.00 /*MHz*/, 0x41, },
828 { 16 * 454.00 /*MHz*/, 0x42, },
829 { 16 * 999.99 , 0x04, },
830};
831
832static struct tuner_params tuner_philips_fq1286_params[] = {
833 {
834 .type = TUNER_PARAM_TYPE_NTSC,
835 .ranges = tuner_philips_fq1286_ntsc_ranges,
836 .count = ARRAY_SIZE(tuner_philips_fq1286_ntsc_ranges),
837 .config = 0x8e,
838 },
839};
840
841/* ------------ TUNER_TCL_2002MB - TCL PAL ------------ */
842
843static struct tuner_range tuner_tcl_2002mb_pal_ranges[] = {
844 { 16 * 170.00 /*MHz*/, 0x01, },
845 { 16 * 450.00 /*MHz*/, 0x02, },
846 { 16 * 999.99 , 0x08, },
847};
848
849static struct tuner_params tuner_tcl_2002mb_params[] = {
850 {
851 .type = TUNER_PARAM_TYPE_PAL,
852 .ranges = tuner_tcl_2002mb_pal_ranges,
853 .count = ARRAY_SIZE(tuner_tcl_2002mb_pal_ranges),
854 .config = 0xce,
855 },
856};
857
858/* ------------ TUNER_PHILIPS_FQ1216AME_MK4 - Philips PAL ------------ */
859
860static struct tuner_range tuner_philips_fq12_6a___mk4_ranges[] = {
861 { 16 * 160.00 /*MHz*/, 0x01, },
862 { 16 * 442.00 /*MHz*/, 0x02, },
863 { 16 * 999.99 , 0x04, },
864};
865
866static struct tuner_params tuner_philips_fq1216ame_mk4_params[] = {
867 {
868 .type = TUNER_PARAM_TYPE_PAL,
869 .ranges = tuner_philips_fq12_6a___mk4_ranges,
870 .count = ARRAY_SIZE(tuner_philips_fq12_6a___mk4_ranges),
871 .config = 0xce,
872 },
873};
874
875/* ------------ TUNER_PHILIPS_FQ1236A_MK4 - Philips NTSC ------------ */
876
877static struct tuner_params tuner_philips_fq1236a_mk4_params[] = {
878 {
879 .type = TUNER_PARAM_TYPE_NTSC,
880 .ranges = tuner_philips_fq12_6a___mk4_ranges,
881 .count = ARRAY_SIZE(tuner_philips_fq12_6a___mk4_ranges),
882 .config = 0x8e,
883 },
884};
885
886/* ------------ TUNER_YMEC_TVF_8531MF - Philips NTSC ------------ */
887
888static struct tuner_range tuner_ymec_tvf_8531mf_ntsc_ranges[] = {
889 { 16 * 160.00 /*MHz*/, 0xa0, },
890 { 16 * 454.00 /*MHz*/, 0x90, },
891 { 16 * 999.99 , 0x30, },
892};
893
894static struct tuner_params tuner_ymec_tvf_8531mf_params[] = {
895 {
896 .type = TUNER_PARAM_TYPE_NTSC,
897 .ranges = tuner_ymec_tvf_8531mf_ntsc_ranges,
898 .count = ARRAY_SIZE(tuner_ymec_tvf_8531mf_ntsc_ranges),
899 .config = 0x8e,
900 },
901};
902
903/* ------------ TUNER_YMEC_TVF_5533MF - Philips NTSC ------------ */
904
905static struct tuner_range tuner_ymec_tvf_5533mf_ntsc_ranges[] = {
906 { 16 * 160.00 /*MHz*/, 0x01, },
907 { 16 * 454.00 /*MHz*/, 0x02, },
908 { 16 * 999.99 , 0x04, },
909};
910
911static struct tuner_params tuner_ymec_tvf_5533mf_params[] = {
912 {
913 .type = TUNER_PARAM_TYPE_NTSC,
914 .ranges = tuner_ymec_tvf_5533mf_ntsc_ranges,
915 .count = ARRAY_SIZE(tuner_ymec_tvf_5533mf_ntsc_ranges),
916 .config = 0x8e,
917 },
918};
919
920/* 60-69 */
921/* ------------ TUNER_THOMSON_DTT761X - THOMSON ATSC ------------ */
922/* DTT 7611 7611A 7612 7613 7613A 7614 7615 7615A */
923
924static struct tuner_range tuner_thomson_dtt761x_ntsc_ranges[] = {
925 { 16 * 145.25 /*MHz*/, 0x39, },
926 { 16 * 415.25 /*MHz*/, 0x3a, },
927 { 16 * 999.99 , 0x3c, },
928};
929
930
931static struct tuner_params tuner_thomson_dtt761x_params[] = {
932 {
933 .type = TUNER_PARAM_TYPE_NTSC,
934 .ranges = tuner_thomson_dtt761x_ntsc_ranges,
935 .count = ARRAY_SIZE(tuner_thomson_dtt761x_ntsc_ranges),
936 .config = 0x8e,
937 },
938};
939
940/* ------------ TUNER_TENA_9533_DI - Philips PAL ------------ */
941
942static struct tuner_range tuner_tuner_tena_9533_di_pal_ranges[] = {
943 { 16 * 160.25 /*MHz*/, 0x01, },
944 { 16 * 464.25 /*MHz*/, 0x02, },
945 { 16 * 999.99 , 0x04, },
946};
947
948static struct tuner_params tuner_tena_9533_di_params[] = {
949 {
950 .type = TUNER_PARAM_TYPE_PAL,
951 .ranges = tuner_tuner_tena_9533_di_pal_ranges,
952 .count = ARRAY_SIZE(tuner_tuner_tena_9533_di_pal_ranges),
953 .config = 0x8e,
954 },
955};
956
957/* ------------ TUNER_PHILIPS_FMD1216ME_MK3 - Philips PAL ------------ */
958
959static struct tuner_range tuner_philips_fmd1216me_mk3_pal_ranges[] = {
960 { 16 * 160.00 /*MHz*/, 0x51, },
961 { 16 * 442.00 /*MHz*/, 0x52, },
962 { 16 * 999.99 , 0x54, },
963};
964
965
966static struct tuner_params tuner_tuner_philips_fmd1216me_mk3_params[] = {
967 {
968 .type = TUNER_PARAM_TYPE_PAL,
969 .ranges = tuner_philips_fmd1216me_mk3_pal_ranges,
970 .count = ARRAY_SIZE(tuner_philips_fmd1216me_mk3_pal_ranges),
971 .config = 0x86,
972 },
973};
974
975
976/* ------------ TUNER_LG_TDVS_H062F - INFINEON ATSC ------------ */
977
978static struct tuner_range tuner_tua6034_ntsc_ranges[] = {
979 { 16 * 160.00 /*MHz*/, 0x01 },
980 { 16 * 455.00 /*MHz*/, 0x02 },
981 { 16 * 999.99 , 0x04 },
982};
983
984
985static struct tuner_params tuner_tua6034_params[] = {
986 {
987 .type = TUNER_PARAM_TYPE_NTSC,
988 .ranges = tuner_tua6034_ntsc_ranges,
989 .count = ARRAY_SIZE(tuner_tua6034_ntsc_ranges),
990 .config = 0x8e,
991 },
992};
993
994/* ------------ TUNER_YMEC_TVF66T5_B_DFF - Philips PAL ------------ */
995
996static struct tuner_range tuner_ymec_tvf66t5_b_dff_pal_ranges[] = {
997 { 16 * 160.25 /*MHz*/, 0x01, },
998 { 16 * 464.25 /*MHz*/, 0x02, },
999 { 16 * 999.99 , 0x08, },
1000};
1001
1002static struct tuner_params tuner_ymec_tvf66t5_b_dff_params[] = {
1003 {
1004 .type = TUNER_PARAM_TYPE_PAL,
1005 .ranges = tuner_ymec_tvf66t5_b_dff_pal_ranges,
1006 .count = ARRAY_SIZE(tuner_ymec_tvf66t5_b_dff_pal_ranges),
1007 .config = 0x8e,
1008 },
1009};
1010
1011/* ------------ TUNER_LG_NTSC_TALN_MINI - LGINNOTEK NTSC ------------ */
1012
1013static struct tuner_range tuner_lg_taln_mini_ntsc_ranges[] = {
1014 { 16 * 137.25 /*MHz*/, 0x01, },
1015 { 16 * 373.25 /*MHz*/, 0x02, },
1016 { 16 * 999.99 , 0x08, },
1017};
1018
1019static struct tuner_params tuner_lg_taln_mini_params[] = {
1020 {
1021 .type = TUNER_PARAM_TYPE_NTSC,
1022 .ranges = tuner_lg_taln_mini_ntsc_ranges,
1023 .count = ARRAY_SIZE(tuner_lg_taln_mini_ntsc_ranges),
1024 .config = 0x8e,
1025 },
1026};
1027
1028/* ------------ TUNER_PHILIPS_TD1316 - Philips PAL ------------ */
1029
1030static struct tuner_range tuner_philips_td1316_pal_ranges[] = {
1031 { 16 * 160.00 /*MHz*/, 0xa1, },
1032 { 16 * 442.00 /*MHz*/, 0xa2, },
1033 { 16 * 999.99 , 0xa4, },
1034};
1035
1036static struct tuner_params tuner_philips_td1316_params[] = {
1037 {
1038 .type = TUNER_PARAM_TYPE_PAL,
1039 .ranges = tuner_philips_td1316_pal_ranges,
1040 .count = ARRAY_SIZE(tuner_philips_td1316_pal_ranges),
1041 .config = 0xc8,
1042 },
1043};
1044
1045/* ------------ TUNER_PHILIPS_TUV1236D - Philips ATSC ------------ */
1046
1047static struct tuner_range tuner_tuv1236d_ntsc_ranges[] = {
1048 { 16 * 157.25 /*MHz*/, 0x01, },
1049 { 16 * 454.00 /*MHz*/, 0x02, },
1050 { 16 * 999.99 , 0x04, },
1051};
1052
1053
1054static struct tuner_params tuner_tuner_tuv1236d_params[] = {
1055 {
1056 .type = TUNER_PARAM_TYPE_NTSC,
1057 .ranges = tuner_tuv1236d_ntsc_ranges,
1058 .count = ARRAY_SIZE(tuner_tuv1236d_ntsc_ranges),
1059 .config = 0xce,
1060 },
1061};
1062
1063/* ------------ TUNER_TNF_5335MF - Philips NTSC ------------ */
1064
1065static struct tuner_range tuner_tnf_5335mf_ntsc_ranges[] = {
1066 { 16 * 157.25 /*MHz*/, 0x01, },
1067 { 16 * 454.00 /*MHz*/, 0x02, },
1068 { 16 * 999.99 , 0x04, },
1069};
1070
1071static struct tuner_params tuner_tnf_5335mf_params[] = {
1072 {
1073 .type = TUNER_PARAM_TYPE_NTSC,
1074 .ranges = tuner_tnf_5335mf_ntsc_ranges,
1075 .count = ARRAY_SIZE(tuner_tnf_5335mf_ntsc_ranges),
1076 .config = 0x8e,
1077 },
1078};
1079
1080/* 70-79 */
1081/* ------------ TUNER_SAMSUNG_TCPN_2121P30A - Samsung NTSC ------------ */
1082
1083static struct tuner_range tuner_samsung_tcpn_2121p30a_ntsc_ranges[] = {
1084 { 16 * 175.75 /*MHz*/, 0x01, },
1085 { 16 * 410.25 /*MHz*/, 0x02, },
1086 { 16 * 999.99 , 0x08, },
1087};
1088
1089static struct tuner_params tuner_samsung_tcpn_2121p30a_params[] = {
1090 {
1091 .type = TUNER_PARAM_TYPE_NTSC,
1092 .ranges = tuner_samsung_tcpn_2121p30a_ntsc_ranges,
1093 .count = ARRAY_SIZE(tuner_samsung_tcpn_2121p30a_ntsc_ranges),
1094 .config = 0xce,
1095 },
1096};
1097
1098/* --------------------------------------------------------------------- */
1099
1100struct tunertype tuners[] = {
1101 /* 0-9 */
1102 [TUNER_TEMIC_PAL] = { /* TEMIC PAL */
1103 .name = "Temic PAL (4002 FH5)",
1104 .params = tuner_temic_pal_params,
1105 },
1106 [TUNER_PHILIPS_PAL_I] = { /* Philips PAL_I */
1107 .name = "Philips PAL_I (FI1246 and compatibles)",
1108 .params = tuner_philips_pal_i_params,
1109 },
1110 [TUNER_PHILIPS_NTSC] = { /* Philips NTSC */
1111 .name = "Philips NTSC (FI1236,FM1236 and compatibles)",
1112 .params = tuner_philips_ntsc_params,
1113 },
1114 [TUNER_PHILIPS_SECAM] = { /* Philips SECAM */
1115 .name = "Philips (SECAM+PAL_BG) (FI1216MF, FM1216MF, FR1216MF)",
1116 .params = tuner_philips_secam_params,
1117 },
1118 [TUNER_ABSENT] = { /* Tuner Absent */
1119 .name = "NoTuner",
1120 },
1121 [TUNER_PHILIPS_PAL] = { /* Philips PAL */
1122 .name = "Philips PAL_BG (FI1216 and compatibles)",
1123 .params = tuner_philips_pal_params,
1124 },
1125 [TUNER_TEMIC_NTSC] = { /* TEMIC NTSC */
1126 .name = "Temic NTSC (4032 FY5)",
1127 .params = tuner_temic_ntsc_params,
1128 },
1129 [TUNER_TEMIC_PAL_I] = { /* TEMIC PAL_I */
1130 .name = "Temic PAL_I (4062 FY5)",
1131 .params = tuner_temic_pal_i_params,
1132 },
1133 [TUNER_TEMIC_4036FY5_NTSC] = { /* TEMIC NTSC */
1134 .name = "Temic NTSC (4036 FY5)",
1135 .params = tuner_temic_4036fy5_ntsc_params,
1136 },
1137 [TUNER_ALPS_TSBH1_NTSC] = { /* TEMIC NTSC */
1138 .name = "Alps HSBH1",
1139 .params = tuner_alps_tsbh1_ntsc_params,
1140 },
1141
1142 /* 10-19 */
1143 [TUNER_ALPS_TSBE1_PAL] = { /* TEMIC PAL */
1144 .name = "Alps TSBE1",
1145 .params = tuner_alps_tsb_1_params,
1146 },
1147 [TUNER_ALPS_TSBB5_PAL_I] = { /* Alps PAL_I */
1148 .name = "Alps TSBB5",
1149 .params = tuner_alps_tsbb5_params,
1150 },
1151 [TUNER_ALPS_TSBE5_PAL] = { /* Alps PAL */
1152 .name = "Alps TSBE5",
1153 .params = tuner_alps_tsbe5_params,
1154 },
1155 [TUNER_ALPS_TSBC5_PAL] = { /* Alps PAL */
1156 .name = "Alps TSBC5",
1157 .params = tuner_alps_tsbc5_params,
1158 },
1159 [TUNER_TEMIC_4006FH5_PAL] = { /* TEMIC PAL */
1160 .name = "Temic PAL_BG (4006FH5)",
1161 .params = tuner_temic_4006fh5_params,
1162 },
1163 [TUNER_ALPS_TSHC6_NTSC] = { /* Alps NTSC */
1164 .name = "Alps TSCH6",
1165 .params = tuner_alps_tshc6_params,
1166 },
1167 [TUNER_TEMIC_PAL_DK] = { /* TEMIC PAL */
1168 .name = "Temic PAL_DK (4016 FY5)",
1169 .params = tuner_temic_pal_dk_params,
1170 },
1171 [TUNER_PHILIPS_NTSC_M] = { /* Philips NTSC */
1172 .name = "Philips NTSC_M (MK2)",
1173 .params = tuner_philips_ntsc_m_params,
1174 },
1175 [TUNER_TEMIC_4066FY5_PAL_I] = { /* TEMIC PAL_I */
1176 .name = "Temic PAL_I (4066 FY5)",
1177 .params = tuner_temic_4066fy5_pal_i_params,
1178 },
1179 [TUNER_TEMIC_4006FN5_MULTI_PAL] = { /* TEMIC PAL */
1180 .name = "Temic PAL* auto (4006 FN5)",
1181 .params = tuner_temic_4006fn5_multi_params,
1182 },
1183
1184 /* 20-29 */
1185 [TUNER_TEMIC_4009FR5_PAL] = { /* TEMIC PAL */
1186 .name = "Temic PAL_BG (4009 FR5) or PAL_I (4069 FR5)",
1187 .params = tuner_temic_4009f_5_params,
1188 },
1189 [TUNER_TEMIC_4039FR5_NTSC] = { /* TEMIC NTSC */
1190 .name = "Temic NTSC (4039 FR5)",
1191 .params = tuner_temic_4039fr5_params,
1192 },
1193 [TUNER_TEMIC_4046FM5] = { /* TEMIC PAL */
1194 .name = "Temic PAL/SECAM multi (4046 FM5)",
1195 .params = tuner_temic_4046fm5_params,
1196 },
1197 [TUNER_PHILIPS_PAL_DK] = { /* Philips PAL */
1198 .name = "Philips PAL_DK (FI1256 and compatibles)",
1199 .params = tuner_philips_pal_dk_params,
1200 },
1201 [TUNER_PHILIPS_FQ1216ME] = { /* Philips PAL */
1202 .name = "Philips PAL/SECAM multi (FQ1216ME)",
1203 .params = tuner_philips_fq1216me_params,
1204 },
1205 [TUNER_LG_PAL_I_FM] = { /* LGINNOTEK PAL_I */
1206 .name = "LG PAL_I+FM (TAPC-I001D)",
1207 .params = tuner_lg_pal_i_fm_params,
1208 },
1209 [TUNER_LG_PAL_I] = { /* LGINNOTEK PAL_I */
1210 .name = "LG PAL_I (TAPC-I701D)",
1211 .params = tuner_lg_pal_i_params,
1212 },
1213 [TUNER_LG_NTSC_FM] = { /* LGINNOTEK NTSC */
1214 .name = "LG NTSC+FM (TPI8NSR01F)",
1215 .params = tuner_lg_ntsc_fm_params,
1216 },
1217 [TUNER_LG_PAL_FM] = { /* LGINNOTEK PAL */
1218 .name = "LG PAL_BG+FM (TPI8PSB01D)",
1219 .params = tuner_lg_pal_fm_params,
1220 },
1221 [TUNER_LG_PAL] = { /* LGINNOTEK PAL */
1222 .name = "LG PAL_BG (TPI8PSB11D)",
1223 .params = tuner_lg_pal_params,
1224 },
1225
1226 /* 30-39 */
1227 [TUNER_TEMIC_4009FN5_MULTI_PAL_FM] = { /* TEMIC PAL */
1228 .name = "Temic PAL* auto + FM (4009 FN5)",
1229 .params = tuner_temic_4009_fn5_multi_pal_fm_params,
1230 },
1231 [TUNER_SHARP_2U5JF5540_NTSC] = { /* SHARP NTSC */
1232 .name = "SHARP NTSC_JP (2U5JF5540)",
1233 .params = tuner_sharp_2u5jf5540_params,
1234 },
1235 [TUNER_Samsung_PAL_TCPM9091PD27] = { /* Samsung PAL */
1236 .name = "Samsung PAL TCPM9091PD27",
1237 .params = tuner_samsung_pal_tcpm9091pd27_params,
1238 },
1239 [TUNER_MT2032] = { /* Microtune PAL|NTSC */
1240 .name = "MT20xx universal",
1241 /* see mt20xx.c for details */ },
1242 [TUNER_TEMIC_4106FH5] = { /* TEMIC PAL */
1243 .name = "Temic PAL_BG (4106 FH5)",
1244 .params = tuner_temic_4106fh5_params,
1245 },
1246 [TUNER_TEMIC_4012FY5] = { /* TEMIC PAL */
1247 .name = "Temic PAL_DK/SECAM_L (4012 FY5)",
1248 .params = tuner_temic_4012fy5_params,
1249 },
1250 [TUNER_TEMIC_4136FY5] = { /* TEMIC NTSC */
1251 .name = "Temic NTSC (4136 FY5)",
1252 .params = tuner_temic_4136_fy5_params,
1253 },
1254 [TUNER_LG_PAL_NEW_TAPC] = { /* LGINNOTEK PAL */
1255 .name = "LG PAL (newer TAPC series)",
1256 .params = tuner_lg_pal_new_tapc_params,
1257 },
1258 [TUNER_PHILIPS_FM1216ME_MK3] = { /* Philips PAL */
1259 .name = "Philips PAL/SECAM multi (FM1216ME MK3)",
1260 .params = tuner_fm1216me_mk3_params,
1261 },
1262 [TUNER_LG_NTSC_NEW_TAPC] = { /* LGINNOTEK NTSC */
1263 .name = "LG NTSC (newer TAPC series)",
1264 .params = tuner_lg_ntsc_new_tapc_params,
1265 },
1266
1267 /* 40-49 */
1268 [TUNER_HITACHI_NTSC] = { /* HITACHI NTSC */
1269 .name = "HITACHI V7-J180AT",
1270 .params = tuner_hitachi_ntsc_params,
1271 },
1272 [TUNER_PHILIPS_PAL_MK] = { /* Philips PAL */
1273 .name = "Philips PAL_MK (FI1216 MK)",
1274 .params = tuner_philips_pal_mk_params,
1275 },
1276 [TUNER_PHILIPS_ATSC] = { /* Philips ATSC */
1277 .name = "Philips 1236D ATSC/NTSC dual in",
1278 .params = tuner_philips_atsc_params,
1279 },
1280 [TUNER_PHILIPS_FM1236_MK3] = { /* Philips NTSC */
1281 .name = "Philips NTSC MK3 (FM1236MK3 or FM1236/F)",
1282 .params = tuner_fm1236_mk3_params,
1283 },
1284 [TUNER_PHILIPS_4IN1] = { /* Philips NTSC */
1285 .name = "Philips 4 in 1 (ATI TV Wonder Pro/Conexant)",
1286 .params = tuner_philips_4in1_params,
1287 },
1288 [TUNER_MICROTUNE_4049FM5] = { /* Microtune PAL */
1289 .name = "Microtune 4049 FM5",
1290 .params = tuner_microtune_4049_fm5_params,
1291 },
1292 [TUNER_PANASONIC_VP27] = { /* Panasonic NTSC */
1293 .name = "Panasonic VP27s/ENGE4324D",
1294 .params = tuner_panasonic_vp27_params,
1295 },
1296 [TUNER_LG_NTSC_TAPE] = { /* LGINNOTEK NTSC */
1297 .name = "LG NTSC (TAPE series)",
1298 .params = tuner_lg_ntsc_tape_params,
1299 },
1300 [TUNER_TNF_8831BGFF] = { /* Philips PAL */
1301 .name = "Tenna TNF 8831 BGFF)",
1302 .params = tuner_tnf_8831bgff_params,
1303 },
1304 [TUNER_MICROTUNE_4042FI5] = { /* Microtune NTSC */
1305 .name = "Microtune 4042 FI5 ATSC/NTSC dual in",
1306 .params = tuner_microtune_4042fi5_params,
1307 },
1308
1309 /* 50-59 */
1310 [TUNER_TCL_2002N] = { /* TCL NTSC */
1311 .name = "TCL 2002N",
1312 .params = tuner_tcl_2002n_params,
1313 },
1314 [TUNER_PHILIPS_FM1256_IH3] = { /* Philips PAL */
1315 .name = "Philips PAL/SECAM_D (FM 1256 I-H3)",
1316 .params = tuner_philips_fm1256_ih3_params,
1317 },
1318 [TUNER_THOMSON_DTT7610] = { /* THOMSON ATSC */
1319 .name = "Thomson DTT 7610 (ATSC/NTSC)",
1320 .params = tuner_thomson_dtt7610_params,
1321 },
1322 [TUNER_PHILIPS_FQ1286] = { /* Philips NTSC */
1323 .name = "Philips FQ1286",
1324 .params = tuner_philips_fq1286_params,
1325 },
1326 [TUNER_PHILIPS_TDA8290] = { /* Philips PAL|NTSC */
1327 .name = "tda8290+75",
1328 /* see tda8290.c for details */ },
1329 [TUNER_TCL_2002MB] = { /* TCL PAL */
1330 .name = "TCL 2002MB",
1331 .params = tuner_tcl_2002mb_params,
1332 },
1333 [TUNER_PHILIPS_FQ1216AME_MK4] = { /* Philips PAL */
1334 .name = "Philips PAL/SECAM multi (FQ1216AME MK4)",
1335 .params = tuner_philips_fq1216ame_mk4_params,
1336 },
1337 [TUNER_PHILIPS_FQ1236A_MK4] = { /* Philips NTSC */
1338 .name = "Philips FQ1236A MK4",
1339 .params = tuner_philips_fq1236a_mk4_params,
1340 },
1341 [TUNER_YMEC_TVF_8531MF] = { /* Philips NTSC */
1342 .name = "Ymec TVision TVF-8531MF/8831MF/8731MF",
1343 .params = tuner_ymec_tvf_8531mf_params,
1344 },
1345 [TUNER_YMEC_TVF_5533MF] = { /* Philips NTSC */
1346 .name = "Ymec TVision TVF-5533MF",
1347 .params = tuner_ymec_tvf_5533mf_params,
1348 },
1349
1350 /* 60-69 */
1351 [TUNER_THOMSON_DTT761X] = { /* THOMSON ATSC */
1352 /* DTT 7611 7611A 7612 7613 7613A 7614 7615 7615A */
1353 .name = "Thomson DTT 761X (ATSC/NTSC)",
1354 .params = tuner_thomson_dtt761x_params,
1355 },
1356 [TUNER_TENA_9533_DI] = { /* Philips PAL */
1357 .name = "Tena TNF9533-D/IF/TNF9533-B/DF",
1358 .params = tuner_tena_9533_di_params,
1359 },
1360 [TUNER_TEA5767] = { /* Philips RADIO */
1361 .name = "Philips TEA5767HN FM Radio",
1362 /* see tea5767.c for details */
1363 },
1364 [TUNER_PHILIPS_FMD1216ME_MK3] = { /* Philips PAL */
1365 .name = "Philips FMD1216ME MK3 Hybrid Tuner",
1366 .params = tuner_tuner_philips_fmd1216me_mk3_params,
1367 },
1368 [TUNER_LG_TDVS_H062F] = { /* LGINNOTEK ATSC */
1369 .name = "LG TDVS-H062F/TUA6034",
1370 .params = tuner_tua6034_params,
1371 },
1372 [TUNER_YMEC_TVF66T5_B_DFF] = { /* Philips PAL */
1373 .name = "Ymec TVF66T5-B/DFF",
1374 .params = tuner_ymec_tvf66t5_b_dff_params,
1375 },
1376 [TUNER_LG_NTSC_TALN_MINI] = { /* LGINNOTEK NTSC */
1377 .name = "LG NTSC (TALN mini series)",
1378 .params = tuner_lg_taln_mini_params,
1379 },
1380 [TUNER_PHILIPS_TD1316] = { /* Philips PAL */
1381 .name = "Philips TD1316 Hybrid Tuner",
1382 .params = tuner_philips_td1316_params,
1383 },
1384 [TUNER_PHILIPS_TUV1236D] = { /* Philips ATSC */
1385 .name = "Philips TUV1236D ATSC/NTSC dual in",
1386 .params = tuner_tuner_tuv1236d_params,
1387 },
1388 [TUNER_TNF_5335MF] = { /* Philips NTSC */
1389 .name = "Tena TNF 5335 MF",
1390 .params = tuner_tnf_5335mf_params,
1391 },
1392
1393 /* 70-79 */
1394 [TUNER_SAMSUNG_TCPN_2121P30A] = { /* Samsung NTSC */
1395 .name = "Samsung TCPN 2121P30A",
1396 .params = tuner_samsung_tcpn_2121p30a_params,
1397 },
1398};
1399
1400unsigned const int tuner_count = ARRAY_SIZE(tuners);
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 5e71a354e879..582551b0969b 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -190,7 +190,7 @@ hauppauge_tuner[] =
190 { TUNER_LG_PAL_NEW_TAPC, "TCL 2002MI 3"}, 190 { TUNER_LG_PAL_NEW_TAPC, "TCL 2002MI 3"},
191 { TUNER_TCL_2002N, "TCL 2002N 6A"}, 191 { TUNER_TCL_2002N, "TCL 2002N 6A"},
192 { TUNER_PHILIPS_FM1236_MK3, "Philips FQ1236 MK3"}, 192 { TUNER_PHILIPS_FM1236_MK3, "Philips FQ1236 MK3"},
193 { TUNER_ABSENT, "Samsung TCPN 2121P30A"}, 193 { TUNER_SAMSUNG_TCPN_2121P30A, "Samsung TCPN 2121P30A"},
194 { TUNER_ABSENT, "Samsung TCPE 4121P30A"}, 194 { TUNER_ABSENT, "Samsung TCPE 4121P30A"},
195 { TUNER_PHILIPS_FM1216ME_MK3, "TCL MFPE05 2"}, 195 { TUNER_PHILIPS_FM1216ME_MK3, "TCL MFPE05 2"},
196 /* 90-99 */ 196 /* 90-99 */
diff --git a/include/media/tuner-types.h b/include/media/tuner-types.h
new file mode 100644
index 000000000000..64b16b1f1926
--- /dev/null
+++ b/include/media/tuner-types.h
@@ -0,0 +1,37 @@
1/*
2 * descriptions for simple tuners.
3 */
4
5#ifndef __TUNER_TYPES_H__
6#define __TUNER_TYPES_H__
7
8enum param_type {
9 TUNER_PARAM_TYPE_RADIO, \
10 TUNER_PARAM_TYPE_PAL, \
11 TUNER_PARAM_TYPE_SECAM, \
12 TUNER_PARAM_TYPE_NTSC
13};
14
15struct tuner_range {
16 unsigned short limit;
17 unsigned char cb;
18};
19
20struct tuner_params {
21 enum param_type type;
22 unsigned char config; /* to be moved into struct tuner_range for dvb-pll merge */
23
24 unsigned int count;
25 struct tuner_range *ranges;
26};
27
28struct tunertype {
29 char *name;
30 unsigned int has_tda988x:1;
31 struct tuner_params *params;
32};
33
34extern struct tunertype tuners[];
35extern unsigned const int tuner_count;
36
37#endif
diff --git a/include/media/tuner.h b/include/media/tuner.h
index 27cbf08c931d..a1d63787bc08 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -23,6 +23,7 @@
23#define _TUNER_H 23#define _TUNER_H
24 24
25#include <linux/videodev2.h> 25#include <linux/videodev2.h>
26#include <media/tuner-types.h>
26 27
27#define ADDR_UNSET (255) 28#define ADDR_UNSET (255)
28 29
@@ -114,6 +115,7 @@
114 115
115#define TUNER_PHILIPS_TUV1236D 68 /* ATI HDTV Wonder */ 116#define TUNER_PHILIPS_TUV1236D 68 /* ATI HDTV Wonder */
116#define TUNER_TNF_5335MF 69 /* Sabrent Bt848 */ 117#define TUNER_TNF_5335MF 69 /* Sabrent Bt848 */
118#define TUNER_SAMSUNG_TCPN_2121P30A 70 /* Hauppauge PVR-500MCE NTSC */
117 119
118/* tv card specific */ 120/* tv card specific */
119#define TDA9887_PRESENT (1<<0) 121#define TDA9887_PRESENT (1<<0)
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-29 23:40:42 -0500