r2870 - in trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian: . patches patches/series
Simon Horman
horms@costa.debian.org
Thu, 31 Mar 2005 09:59:07 +0000
Author: horms
Date: 2005-03-31 09:59:06 +0000 (Thu, 31 Mar 2005)
New Revision: 2870
Added:
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-media-video-tuner-update-1.patch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-media-video-tuner-update-2.patch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-media-video-v4l-mpeg-support.patch
Modified:
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-2
Log:
some tuner and mpeg updates needed for the saa7134. mmm, perhaps this should be backed out all together. any offended parties, please do so
Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog 2005-03-31 08:00:52 UTC (rev 2869)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog 2005-03-31 09:59:06 UTC (rev 2870)
@@ -40,9 +40,15 @@
(closes: #301936, #301603) (Simon Horman)
* drivers-media-video-saa7134-update.patch
+ drivers-media-video-tuner-update-1.patch
+ drivers-media-video-tuner-update-2.patch
+ drivers-media-video-v4l-mpeg-support.patch
saa7134 update (closes: #302252) Simon Horman
+ N.B: This is a lot more extensive and not as self contained as
+ I had hoped. Might be better to back it out. But I will
+ leave it here for now.
- -- Simon Horman <horms@debian.org> Thu, 31 Mar 2005 16:58:00 +0900
+ -- Simon Horman <horms@debian.org> Thu, 31 Mar 2005 18:52:02 +0900
kernel-source-2.6.11 (2.6.11-1) unstable; urgency=low
Added: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-media-video-tuner-update-1.patch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-media-video-tuner-update-1.patch 2005-03-31 08:00:52 UTC (rev 2869)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-media-video-tuner-update-1.patch 2005-03-31 09:59:06 UTC (rev 2870)
@@ -0,0 +1,1988 @@
+# origin: kraxel (BitKeeper)
+# cset: 1.1994.11.128 (2.6) key=422de71aLWE4Q6Tx_fP_AQJc3sEeIw
+# URL: http://linux.bkbits.net:8080/linux-2.6/cset@422de71aLWE4Q6Tx_fP_AQJc3sEeIw
+# inclusion: upstream
+# descrition: [PATCH] tv tuner module update.
+# revision date: Thu, 31 Mar 2005 18:05:02 +0900
+#
+# S rset: ChangeSet|1.1994.11.127..1.1994.11.128
+# I rset: drivers/media/video/Makefile|1.29..1.30
+# I rset: include/media/tuner.h|1.16..1.17
+# I rset: drivers/media/video/tveeprom.c|1.1..1.2
+# I rset: drivers/media/video/tda9887.c|1.21..1.22
+# I rset: BitKeeper/deleted/.del-tuner.c~f6eebc25b85fe165|1.37..1.38
+# I rset: drivers/media/video/mt20xx.c|1.0..1.1
+# I rset: drivers/media/video/tuner-core.c|1.0..1.1
+# I rset: drivers/media/video/tda8290.c|1.0..1.1
+# I rset: drivers/media/video/tuner-simple.c|1.0..1.1
+#
+# Key:
+# S: Skipped ChangeSet file only
+# O: Original Followed by Updated
+# U: Updated Included with updated range of versions
+# I: Included Included verbatim
+# E: Excluded Excluded on request from user
+# D: Deleted Manually deleted by subsequent user edit
+# R: Revised Manually revised by subsequent user edit
+#
+#
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/03/08 09:55:38-08:00 kraxel@bytesex.org
+# [PATCH] tv tuner module update.
+#
+# Did some code reorganization: split up the source into four files:
+# - tuner-core.c for all the interfacing stuff (register driver,
+# handle insmod options, react on v4l ioctls, ...),
+# - tuner-simple.c for all those trivial 4-byte-command-sequence tuner
+# chips.
+# - mt20xx.c for the mt2032 and mt2050 tuners.
+# - tda8290.c for the tda8290/8272 combo (this code is new).
+#
+# I also did a number of cleanups like using dev_printk() for the
+# messages everythere. There should be no functional changes beside
+# the new support for the tda8290 tuner.
+#
+# Signed-off-by: Gerd Knorr <kraxel@bytesex.org>
+# Signed-off-by: Andrew Morton <akpm@osdl.org>
+# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+#
+# drivers/media/video/tuner-simple.c
+# 2005/03/08 09:55:29-08:00 kraxel@bytesex.org +467 -0
+#
+# drivers/media/video/tuner-core.c
+# 2005/03/08 09:55:29-08:00 kraxel@bytesex.org +443 -0
+#
+# drivers/media/video/tda8290.c
+# 2005/03/08 09:55:29-08:00 kraxel@bytesex.org +224 -0
+#
+# include/media/tuner.h
+# 2005/03/07 20:41:40-08:00 kraxel@bytesex.org +73 -4
+# tv tuner module update.
+#
+# drivers/media/video/tveeprom.c
+# 2005/03/07 20:41:40-08:00 kraxel@bytesex.org +1 -0
+# tv tuner module update.
+#
+# drivers/media/video/tuner-simple.c
+# 2005/03/08 09:55:29-08:00 kraxel@bytesex.org +0 -0
+# BitKeeper file /home/torvalds/v2.6/linux/drivers/media/video/tuner-simple.c
+#
+# drivers/media/video/tuner-core.c
+# 2005/03/08 09:55:29-08:00 kraxel@bytesex.org +0 -0
+# BitKeeper file /home/torvalds/v2.6/linux/drivers/media/video/tuner-core.c
+#
+# drivers/media/video/tda9887.c
+# 2005/03/07 20:41:40-08:00 kraxel@bytesex.org +1 -1
+# tv tuner module update.
+#
+# drivers/media/video/tda8290.c
+# 2005/03/08 09:55:29-08:00 kraxel@bytesex.org +0 -0
+# BitKeeper file /home/torvalds/v2.6/linux/drivers/media/video/tda8290.c
+#
+# drivers/media/video/mt20xx.c
+# 2005/03/08 09:55:28-08:00 kraxel@bytesex.org +557 -0
+#
+# drivers/media/video/Makefile
+# 2005/03/07 20:41:40-08:00 kraxel@bytesex.org +1 -0
+# tv tuner module update.
+#
+# drivers/media/video/mt20xx.c
+# 2005/03/08 09:55:28-08:00 kraxel@bytesex.org +0 -0
+# BitKeeper file /home/torvalds/v2.6/linux/drivers/media/video/mt20xx.c
+#
+# BitKeeper/deleted/.del-tuner.c~f6eebc25b85fe165
+# 2005/03/08 09:55:28-08:00 kraxel@bytesex.org +0 -0
+# Delete: drivers/media/video/tuner.c
+#
+#
+===== drivers/media/video/Makefile 1.29 vs 1.30 =====
+--- 1.29/drivers/media/video/Makefile 2005-01-26 06:50:26 +09:00
++++ 1.30/drivers/media/video/Makefile 2005-03-08 13:41:40 +09:00
+@@ -7,6 +7,7 @@ bttv-objs := bttv-driver.o bttv-cards.o
+ zoran-objs := zr36120.o zr36120_i2c.o zr36120_mem.o
+ zr36067-objs := zoran_procfs.o zoran_device.o \
+ zoran_driver.o zoran_card.o
++tuner-objs := tuner-core.o tuner-simple.o mt20xx.o tda8290.o
+
+ obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o v4l1-compat.o
+
+===== include/media/tuner.h 1.16 vs 1.17 =====
+--- 1.16/include/media/tuner.h 2005-01-26 06:50:26 +09:00
++++ 1.17/include/media/tuner.h 2005-03-08 13:41:40 +09:00
+@@ -29,55 +29,70 @@
+ #define TUNER_PHILIPS_PAL_I 1
+ #define TUNER_PHILIPS_NTSC 2
+ #define TUNER_PHILIPS_SECAM 3 /* you must actively select B/G, L, L` */
++
+ #define TUNER_ABSENT 4
+ #define TUNER_PHILIPS_PAL 5
+ #define TUNER_TEMIC_NTSC 6 /* 4032 FY5 (3X 7004, 9498, 9789) */
+ #define TUNER_TEMIC_PAL_I 7 /* 4062 FY5 (3X 8501, 9957) */
++
+ #define TUNER_TEMIC_4036FY5_NTSC 8 /* 4036 FY5 (3X 1223, 1981, 7686) */
+ #define TUNER_ALPS_TSBH1_NTSC 9
+ #define TUNER_ALPS_TSBE1_PAL 10
+ #define TUNER_ALPS_TSBB5_PAL_I 11
++
+ #define TUNER_ALPS_TSBE5_PAL 12
+ #define TUNER_ALPS_TSBC5_PAL 13
+ #define TUNER_TEMIC_4006FH5_PAL 14 /* 4006 FH5 (3X 9500, 9501, 7291) */
+ #define TUNER_ALPS_TSHC6_NTSC 15
++
+ #define TUNER_TEMIC_PAL_DK 16 /* 4016 FY5 (3X 1392, 1393) */
+ #define TUNER_PHILIPS_NTSC_M 17
+ #define TUNER_TEMIC_4066FY5_PAL_I 18 /* 4066 FY5 (3X 7032, 7035) */
+ #define TUNER_TEMIC_4006FN5_MULTI_PAL 19 /* B/G, I and D/K autodetected (3X 7595, 7606, 7657)*/
++
+ #define TUNER_TEMIC_4009FR5_PAL 20 /* incl. FM radio (3X 7607, 7488, 7711)*/
+ #define TUNER_TEMIC_4039FR5_NTSC 21 /* incl. FM radio (3X 7246, 7578, 7732)*/
+ #define TUNER_TEMIC_4046FM5 22 /* you must actively select B/G, D/K, I, L, L` ! (3X 7804, 7806, 8103, 8104)*/
+ #define TUNER_PHILIPS_PAL_DK 23
++
+ #define TUNER_PHILIPS_FQ1216ME 24 /* you must actively select B/G/D/K, I, L, L` */
+ #define TUNER_LG_PAL_I_FM 25
+ #define TUNER_LG_PAL_I 26
+ #define TUNER_LG_NTSC_FM 27
++
+ #define TUNER_LG_PAL_FM 28
+ #define TUNER_LG_PAL 29
+ #define TUNER_TEMIC_4009FN5_MULTI_PAL_FM 30 /* B/G, I and D/K autodetected (3X 8155, 8160, 8163)*/
+ #define TUNER_SHARP_2U5JF5540_NTSC 31
++
+ #define TUNER_Samsung_PAL_TCPM9091PD27 32
+ #define TUNER_MT2032 33
+ #define TUNER_TEMIC_4106FH5 34 /* 4106 FH5 (3X 7808, 7865)*/
+ #define TUNER_TEMIC_4012FY5 35 /* 4012 FY5 (3X 0971, 1099)*/
++
+ #define TUNER_TEMIC_4136FY5 36 /* 4136 FY5 (3X 7708, 7746)*/
+ #define TUNER_LG_PAL_NEW_TAPC 37
+ #define TUNER_PHILIPS_FM1216ME_MK3 38
+ #define TUNER_LG_NTSC_NEW_TAPC 39
++
+ #define TUNER_HITACHI_NTSC 40
+ #define TUNER_PHILIPS_PAL_MK 41
+ #define TUNER_PHILIPS_ATSC 42
+ #define TUNER_PHILIPS_FM1236_MK3 43
++
+ #define TUNER_PHILIPS_4IN1 44 /* ATI TV Wonder Pro - Conexant */
+ /* Microtune mergeged with Temic 12/31/1999 partially financed by Alps - these may be similar to Temic */
+ #define TUNER_MICROTUNE_4049FM5 45
+ #define TUNER_LG_NTSC_TAPE 47
++
+ #define TUNER_TNF_8831BGFF 48
+ #define TUNER_MICROTUNE_4042FI5 49 /* FusionHDTV 3 Gold - 4042 FI5 (3X 8147) */
+ #define TUNER_TCL_2002N 50
+ #define TUNER_PHILIPS_FM1256_IH3 51
++
+ #define TUNER_THOMSON_DTT7610 52
++#define TUNER_PHILIPS_FQ1286 53
++#define TUNER_PHILIPS_TDA8290 54
+
+ #define NOTUNER 0
+ #define PAL 1 /* PAL_BG */
+@@ -102,10 +117,6 @@
+
+ #define TUNER_SET_TYPE _IOW('t',1,int) /* set tuner type */
+ #define TUNER_SET_TVFREQ _IOW('t',2,int) /* set tv freq */
+-#if 0 /* obsolete */
+-# define TUNER_SET_RADIOFREQ _IOW('t',3,int) /* set radio freq */
+-# define TUNER_SET_MODE _IOW('t',4,int) /* set tuner mode */
+-#endif
+
+ #define TDA9887_SET_CONFIG _IOW('t',5,int)
+ /* tv card specific */
+@@ -123,4 +134,62 @@
+ # define TDA9887_DEEMPHASIS_75 (3<<16)
+ # define TDA9887_AUTOMUTE (1<<18)
+
++#ifdef __KERNEL__
++
++#define I2C_ADDR_TDA8290 0x4b
++#define I2C_ADDR_TDA8275 0x61
++
++struct tuner {
++ /* device */
++ struct i2c_client i2c;
++
++ /* state + config */
++ unsigned int initialized;
++ unsigned int type; /* chip type */
++ unsigned int freq; /* keep track of the current settings */
++ v4l2_std_id std;
++ int using_v4l2;
++
++ enum v4l2_tuner_type mode;
++ unsigned int input;
++
++ /* used by MT2032 */
++ unsigned int xogc;
++ unsigned int radio_if2;
++
++ /* used by tda8290 */
++ unsigned char i2c_easy_mode[2];
++ unsigned char i2c_set_freq[8];
++
++ /* function ptrs */
++ void (*tv_freq)(struct i2c_client *c, unsigned int freq);
++ void (*radio_freq)(struct i2c_client *c, unsigned int freq);
++ int (*has_signal)(struct i2c_client *c);
++ int (*is_stereo)(struct i2c_client *c);
++};
++
++extern unsigned int tuner_debug;
++extern unsigned const int tuner_count;
++
++extern int microtune_init(struct i2c_client *c);
++extern int tda8290_init(struct i2c_client *c);
++extern int default_tuner_init(struct i2c_client *c);
++
++#define tuner_warn(fmt, arg...) \
++ dev_printk(KERN_WARNING , &t->i2c.dev , fmt , ## arg)
++#define tuner_info(fmt, arg...) \
++ dev_printk(KERN_INFO , &t->i2c.dev , fmt , ## arg)
++#define tuner_dbg(fmt, arg...) \
++ if (tuner_debug) dev_printk(KERN_DEBUG , &t->i2c.dev , fmt , ## arg)
++
++#endif /* __KERNEL__ */
++
+ #endif
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-basic-offset: 8
++ * End:
++ */
+===== drivers/media/video/tveeprom.c 1.1 vs 1.2 =====
+--- 1.1/drivers/media/video/tveeprom.c 2005-01-26 06:50:26 +09:00
++++ 1.2/drivers/media/video/tveeprom.c 2005-03-08 13:41:40 +09:00
+@@ -34,6 +34,7 @@
+ #include <linux/kernel.h>
+ #include <linux/init.h>
+ #include <linux/types.h>
++#include <linux/videodev.h>
+ #include <linux/i2c.h>
+
+ #include <media/tuner.h>
+===== drivers/media/video/tda9887.c 1.21 vs 1.22 =====
+--- 1.21/drivers/media/video/tda9887.c 2005-02-05 00:54:57 +09:00
++++ 1.22/drivers/media/video/tda9887.c 2005-03-08 13:41:40 +09:00
+@@ -557,7 +557,7 @@ static int tda9887_configure(struct tda9
+ #if 0
+ /* This as-is breaks some cards, must be fixed in a
+ * card-specific way, probably using TDA9887_SET_CONFIG to
+- * turn on/off port2 */
++ * turn on/off port2 */
+ if (t->std & V4L2_STD_SECAM_L) {
+ /* secam fixup (FIXME: move this to tvnorms array?) */
+ buf[1] &= ~cOutputPort2Inactive;
+===== drivers/media/video/mt20xx.c 1.0 vs 1.1 =====
+--- /dev/null 2005-03-25 10:55:53 +09:00
++++ 1.1/drivers/media/video/mt20xx.c 2005-03-09 02:55:28 +09:00
+@@ -0,0 +1,557 @@
++/*
++ * $Id: mt20xx.c,v 1.3 2005/02/15 15:59:35 kraxel Exp $
++ *
++ * i2c tv tuner chip device driver
++ * controls microtune tuners, mt2032 + mt2050 at the moment.
++ */
++#include <linux/delay.h>
++#include <linux/i2c.h>
++#include <linux/videodev.h>
++#include <media/tuner.h>
++
++/* ---------------------------------------------------------------------- */
++
++static unsigned int optimize_vco = 1;
++module_param(optimize_vco, int, 0644);
++
++static unsigned int tv_antenna = 1;
++module_param(tv_antenna, int, 0644);
++
++static unsigned int radio_antenna = 0;
++module_param(radio_antenna, int, 0644);
++
++/* ---------------------------------------------------------------------- */
++
++#define MT2032 0x04
++#define MT2030 0x06
++#define MT2040 0x07
++#define MT2050 0x42
++
++static char *microtune_part[] = {
++ [ MT2030 ] = "MT2030",
++ [ MT2032 ] = "MT2032",
++ [ MT2040 ] = "MT2040",
++ [ MT2050 ] = "MT2050",
++};
++
++// IsSpurInBand()?
++static int mt2032_spurcheck(struct i2c_client *c,
++ int f1, int f2, int spectrum_from,int spectrum_to)
++{
++ struct tuner *t = i2c_get_clientdata(c);
++ int n1=1,n2,f;
++
++ f1=f1/1000; //scale to kHz to avoid 32bit overflows
++ f2=f2/1000;
++ spectrum_from/=1000;
++ spectrum_to/=1000;
++
++ tuner_dbg("spurcheck f1=%d f2=%d from=%d to=%d\n",
++ f1,f2,spectrum_from,spectrum_to);
++
++ do {
++ n2=-n1;
++ f=n1*(f1-f2);
++ do {
++ n2--;
++ f=f-f2;
++ tuner_dbg("spurtest n1=%d n2=%d ftest=%d\n",n1,n2,f);
++
++ if( (f>spectrum_from) && (f<spectrum_to))
++ tuner_dbg("mt2032 spurcheck triggered: %d\n",n1);
++ } while ( (f>(f2-spectrum_to)) || (n2>-5));
++ n1++;
++ } while (n1<5);
++
++ return 1;
++}
++
++static int mt2032_compute_freq(struct i2c_client *c,
++ unsigned int rfin,
++ unsigned int if1, unsigned int if2,
++ unsigned int spectrum_from,
++ unsigned int spectrum_to,
++ unsigned char *buf,
++ int *ret_sel,
++ unsigned int xogc) //all in Hz
++{
++ struct tuner *t = i2c_get_clientdata(c);
++ unsigned int fref,lo1,lo1n,lo1a,s,sel,lo1freq, desired_lo1,
++ desired_lo2,lo2,lo2n,lo2a,lo2num,lo2freq;
++
++ fref= 5250 *1000; //5.25MHz
++ desired_lo1=rfin+if1;
++
++ lo1=(2*(desired_lo1/1000)+(fref/1000)) / (2*fref/1000);
++ lo1n=lo1/8;
++ lo1a=lo1-(lo1n*8);
++
++ s=rfin/1000/1000+1090;
++
++ if(optimize_vco) {
++ if(s>1890) sel=0;
++ else if(s>1720) sel=1;
++ else if(s>1530) sel=2;
++ else if(s>1370) sel=3;
++ else sel=4; // >1090
++ }
++ else {
++ if(s>1790) sel=0; // <1958
++ else if(s>1617) sel=1;
++ else if(s>1449) sel=2;
++ else if(s>1291) sel=3;
++ else sel=4; // >1090
++ }
++ *ret_sel=sel;
++
++ lo1freq=(lo1a+8*lo1n)*fref;
++
++ tuner_dbg("mt2032: rfin=%d lo1=%d lo1n=%d lo1a=%d sel=%d, lo1freq=%d\n",
++ rfin,lo1,lo1n,lo1a,sel,lo1freq);
++
++ desired_lo2=lo1freq-rfin-if2;
++ lo2=(desired_lo2)/fref;
++ lo2n=lo2/8;
++ lo2a=lo2-(lo2n*8);
++ lo2num=((desired_lo2/1000)%(fref/1000))* 3780/(fref/1000); //scale to fit in 32bit arith
++ lo2freq=(lo2a+8*lo2n)*fref + lo2num*(fref/1000)/3780*1000;
++
++ tuner_dbg("mt2032: rfin=%d lo2=%d lo2n=%d lo2a=%d num=%d lo2freq=%d\n",
++ rfin,lo2,lo2n,lo2a,lo2num,lo2freq);
++
++ if(lo1a<0 || lo1a>7 || lo1n<17 ||lo1n>48 || lo2a<0 ||lo2a >7 ||lo2n<17 || lo2n>30) {
++ tuner_info("mt2032: frequency parameters out of range: %d %d %d %d\n",
++ lo1a, lo1n, lo2a,lo2n);
++ return(-1);
++ }
++
++ mt2032_spurcheck(c, lo1freq, desired_lo2, spectrum_from, spectrum_to);
++ // should recalculate lo1 (one step up/down)
++
++ // set up MT2032 register map for transfer over i2c
++ buf[0]=lo1n-1;
++ buf[1]=lo1a | (sel<<4);
++ buf[2]=0x86; // LOGC
++ buf[3]=0x0f; //reserved
++ buf[4]=0x1f;
++ buf[5]=(lo2n-1) | (lo2a<<5);
++ if(rfin >400*1000*1000)
++ buf[6]=0xe4;
++ else
++ buf[6]=0xf4; // set PKEN per rev 1.2
++ buf[7]=8+xogc;
++ buf[8]=0xc3; //reserved
++ buf[9]=0x4e; //reserved
++ buf[10]=0xec; //reserved
++ buf[11]=(lo2num&0xff);
++ buf[12]=(lo2num>>8) |0x80; // Lo2RST
++
++ return 0;
++}
++
++static int mt2032_check_lo_lock(struct i2c_client *c)
++{
++ struct tuner *t = i2c_get_clientdata(c);
++ int try,lock=0;
++ unsigned char buf[2];
++
++ for(try=0;try<10;try++) {
++ buf[0]=0x0e;
++ i2c_master_send(c,buf,1);
++ i2c_master_recv(c,buf,1);
++ tuner_dbg("mt2032 Reg.E=0x%02x\n",buf[0]);
++ lock=buf[0] &0x06;
++
++ if (lock==6)
++ break;
++
++ tuner_dbg("mt2032: pll wait 1ms for lock (0x%2x)\n",buf[0]);
++ udelay(1000);
++ }
++ return lock;
++}
++
++static int mt2032_optimize_vco(struct i2c_client *c,int sel,int lock)
++{
++ struct tuner *t = i2c_get_clientdata(c);
++ unsigned char buf[2];
++ int tad1;
++
++ buf[0]=0x0f;
++ i2c_master_send(c,buf,1);
++ i2c_master_recv(c,buf,1);
++ tuner_dbg("mt2032 Reg.F=0x%02x\n",buf[0]);
++ tad1=buf[0]&0x07;
++
++ if(tad1 ==0) return lock;
++ if(tad1 ==1) return lock;
++
++ if(tad1==2) {
++ if(sel==0)
++ return lock;
++ else sel--;
++ }
++ else {
++ if(sel<4)
++ sel++;
++ else
++ return lock;
++ }
++
++ tuner_dbg("mt2032 optimize_vco: sel=%d\n",sel);
++
++ buf[0]=0x0f;
++ buf[1]=sel;
++ i2c_master_send(c,buf,2);
++ lock=mt2032_check_lo_lock(c);
++ return lock;
++}
++
++
++static void mt2032_set_if_freq(struct i2c_client *c, unsigned int rfin,
++ unsigned int if1, unsigned int if2,
++ unsigned int from, unsigned int to)
++{
++ unsigned char buf[21];
++ int lint_try,ret,sel,lock=0;
++ struct tuner *t = i2c_get_clientdata(c);
++
++ tuner_dbg("mt2032_set_if_freq rfin=%d if1=%d if2=%d from=%d to=%d\n",
++ rfin,if1,if2,from,to);
++
++ buf[0]=0;
++ ret=i2c_master_send(c,buf,1);
++ i2c_master_recv(c,buf,21);
++
++ buf[0]=0;
++ ret=mt2032_compute_freq(c,rfin,if1,if2,from,to,&buf[1],&sel,t->xogc);
++ if (ret<0)
++ return;
++
++ // send only the relevant registers per Rev. 1.2
++ buf[0]=0;
++ ret=i2c_master_send(c,buf,4);
++ buf[5]=5;
++ ret=i2c_master_send(c,buf+5,4);
++ buf[11]=11;
++ ret=i2c_master_send(c,buf+11,3);
++ if(ret!=3)
++ tuner_warn("i2c i/o error: rc == %d (should be 3)\n",ret);
++
++ // wait for PLLs to lock (per manual), retry LINT if not.
++ for(lint_try=0; lint_try<2; lint_try++) {
++ lock=mt2032_check_lo_lock(c);
++
++ if(optimize_vco)
++ lock=mt2032_optimize_vco(c,sel,lock);
++ if(lock==6) break;
++
++ tuner_dbg("mt2032: re-init PLLs by LINT\n");
++ buf[0]=7;
++ buf[1]=0x80 +8+t->xogc; // set LINT to re-init PLLs
++ i2c_master_send(c,buf,2);
++ mdelay(10);
++ buf[1]=8+t->xogc;
++ i2c_master_send(c,buf,2);
++ }
++
++ if (lock!=6)
++ tuner_warn("MT2032 Fatal Error: PLLs didn't lock.\n");
++
++ buf[0]=2;
++ buf[1]=0x20; // LOGC for optimal phase noise
++ ret=i2c_master_send(c,buf,2);
++ if (ret!=2)
++ tuner_warn("i2c i/o error: rc == %d (should be 2)\n",ret);
++}
++
++
++static void mt2032_set_tv_freq(struct i2c_client *c, unsigned int freq)
++{
++ struct tuner *t = i2c_get_clientdata(c);
++ int if2,from,to;
++
++ // signal bandwidth and picture carrier
++ if (t->std & V4L2_STD_525_60) {
++ // NTSC
++ from = 40750*1000;
++ to = 46750*1000;
++ if2 = 45750*1000;
++ } else {
++ // PAL
++ from = 32900*1000;
++ to = 39900*1000;
++ if2 = 38900*1000;
++ }
++
++ mt2032_set_if_freq(c, freq*62500 /* freq*1000*1000/16 */,
++ 1090*1000*1000, if2, from, to);
++}
++
++static void mt2032_set_radio_freq(struct i2c_client *c, unsigned int freq)
++{
++ struct tuner *t = i2c_get_clientdata(c);
++ int if2 = t->radio_if2;
++
++ // per Manual for FM tuning: first if center freq. 1085 MHz
++ mt2032_set_if_freq(c, freq*62500 /* freq*1000*1000/16 */,
++ 1085*1000*1000,if2,if2,if2);
++}
++
++// Initalization as described in "MT203x Programming Procedures", Rev 1.2, Feb.2001
++static int mt2032_init(struct i2c_client *c)
++{
++ struct tuner *t = i2c_get_clientdata(c);
++ unsigned char buf[21];
++ int ret,xogc,xok=0;
++
++ // Initialize Registers per spec.
++ buf[1]=2; // Index to register 2
++ buf[2]=0xff;
++ buf[3]=0x0f;
++ buf[4]=0x1f;
++ ret=i2c_master_send(c,buf+1,4);
++
++ buf[5]=6; // Index register 6
++ buf[6]=0xe4;
++ buf[7]=0x8f;
++ buf[8]=0xc3;
++ buf[9]=0x4e;
++ buf[10]=0xec;
++ ret=i2c_master_send(c,buf+5,6);
++
++ buf[12]=13; // Index register 13
++ buf[13]=0x32;
++ ret=i2c_master_send(c,buf+12,2);
++
++ // Adjust XOGC (register 7), wait for XOK
++ xogc=7;
++ do {
++ tuner_dbg("mt2032: xogc = 0x%02x\n",xogc&0x07);
++ mdelay(10);
++ buf[0]=0x0e;
++ i2c_master_send(c,buf,1);
++ i2c_master_recv(c,buf,1);
++ xok=buf[0]&0x01;
++ tuner_dbg("mt2032: xok = 0x%02x\n",xok);
++ if (xok == 1) break;
++
++ xogc--;
++ tuner_dbg("mt2032: xogc = 0x%02x\n",xogc&0x07);
++ if (xogc == 3) {
++ xogc=4; // min. 4 per spec
++ break;
++ }
++ buf[0]=0x07;
++ buf[1]=0x88 + xogc;
++ ret=i2c_master_send(c,buf,2);
++ if (ret!=2)
++ tuner_warn("i2c i/o error: rc == %d (should be 2)\n",ret);
++ } while (xok != 1 );
++ t->xogc=xogc;
++
++ t->tv_freq = mt2032_set_tv_freq;
++ t->radio_freq = mt2032_set_radio_freq;
++ return(1);
++}
++
++static void mt2050_set_antenna(struct i2c_client *c, unsigned char antenna)
++{
++ struct tuner *t = i2c_get_clientdata(c);
++ unsigned char buf[2];
++ int ret;
++
++ buf[0] = 6;
++ buf[1] = antenna ? 0x11 : 0x10;
++ ret=i2c_master_send(c,buf,2);
++ tuner_dbg("mt2050: enabled antenna connector %d\n", antenna);
++}
++
++static void mt2050_set_if_freq(struct i2c_client *c,unsigned int freq, unsigned int if2)
++{
++ struct tuner *t = i2c_get_clientdata(c);
++ unsigned int if1=1218*1000*1000;
++ unsigned int f_lo1,f_lo2,lo1,lo2,f_lo1_modulo,f_lo2_modulo,num1,num2,div1a,div1b,div2a,div2b;
++ int ret;
++ unsigned char buf[6];
++
++ tuner_dbg("mt2050_set_if_freq freq=%d if1=%d if2=%d\n",
++ freq,if1,if2);
++
++ f_lo1=freq+if1;
++ f_lo1=(f_lo1/1000000)*1000000;
++
++ f_lo2=f_lo1-freq-if2;
++ f_lo2=(f_lo2/50000)*50000;
++
++ lo1=f_lo1/4000000;
++ lo2=f_lo2/4000000;
++
++ f_lo1_modulo= f_lo1-(lo1*4000000);
++ f_lo2_modulo= f_lo2-(lo2*4000000);
++
++ num1=4*f_lo1_modulo/4000000;
++ num2=4096*(f_lo2_modulo/1000)/4000;
++
++ // todo spurchecks
++
++ div1a=(lo1/12)-1;
++ div1b=lo1-(div1a+1)*12;
++
++ div2a=(lo2/8)-1;
++ div2b=lo2-(div2a+1)*8;
++
++ if (tuner_debug > 1) {
++ tuner_dbg("lo1 lo2 = %d %d\n", lo1, lo2);
++ tuner_dbg("num1 num2 div1a div1b div2a div2b= %x %x %x %x %x %x\n",
++ num1,num2,div1a,div1b,div2a,div2b);
++ }
++
++ buf[0]=1;
++ buf[1]= 4*div1b + num1;
++ if(freq<275*1000*1000) buf[1] = buf[1]|0x80;
++
++ buf[2]=div1a;
++ buf[3]=32*div2b + num2/256;
++ buf[4]=num2-(num2/256)*256;
++ buf[5]=div2a;
++ if(num2!=0) buf[5]=buf[5]|0x40;
++
++ if (tuner_debug > 1) {
++ int i;
++ tuner_dbg("bufs is: ");
++ for(i=0;i<6;i++)
++ printk("%x ",buf[i]);
++ printk("\n");
++ }
++
++ ret=i2c_master_send(c,buf,6);
++ if (ret!=6)
++ tuner_warn("i2c i/o error: rc == %d (should be 6)\n",ret);
++}
++
++static void mt2050_set_tv_freq(struct i2c_client *c, unsigned int freq)
++{
++ struct tuner *t = i2c_get_clientdata(c);
++ unsigned int if2;
++
++ if (t->std & V4L2_STD_525_60) {
++ // NTSC
++ if2 = 45750*1000;
++ } else {
++ // PAL
++ if2 = 38900*1000;
++ }
++ if (V4L2_TUNER_DIGITAL_TV == t->mode) {
++ // DVB (pinnacle 300i)
++ if2 = 36150*1000;
++ }
++ mt2050_set_if_freq(c, freq*62500, if2);
++ mt2050_set_antenna(c, tv_antenna);
++}
++
++static void mt2050_set_radio_freq(struct i2c_client *c, unsigned int freq)
++{
++ struct tuner *t = i2c_get_clientdata(c);
++ int if2 = t->radio_if2;
++
++ mt2050_set_if_freq(c, freq*62500, if2);
++ mt2050_set_antenna(c, radio_antenna);
++}
++
++static int mt2050_init(struct i2c_client *c)
++{
++ struct tuner *t = i2c_get_clientdata(c);
++ unsigned char buf[2];
++ int ret;
++
++ buf[0]=6;
++ buf[1]=0x10;
++ ret=i2c_master_send(c,buf,2); // power
++
++ buf[0]=0x0f;
++ buf[1]=0x0f;
++ ret=i2c_master_send(c,buf,2); // m1lo
++
++ buf[0]=0x0d;
++ ret=i2c_master_send(c,buf,1);
++ i2c_master_recv(c,buf,1);
++
++ tuner_dbg("mt2050: sro is %x\n",buf[0]);
++ t->tv_freq = mt2050_set_tv_freq;
++ t->radio_freq = mt2050_set_radio_freq;
++ return 0;
++}
++
++int microtune_init(struct i2c_client *c)
++{
++ struct tuner *t = i2c_get_clientdata(c);
++ char *name;
++ unsigned char buf[21];
++ int company_code;
++
++ memset(buf,0,sizeof(buf));
++ t->tv_freq = NULL;
++ t->radio_freq = NULL;
++ name = "unknown";
++
++ i2c_master_send(c,buf,1);
++ i2c_master_recv(c,buf,21);
++ if (tuner_debug) {
++ int i;
++ tuner_dbg("MT20xx hexdump:");
++ for(i=0;i<21;i++) {
++ printk(" %02x",buf[i]);
++ if(((i+1)%8)==0) printk(" ");
++ }
++ printk("\n");
++ }
++ company_code = buf[0x11] << 8 | buf[0x12];
++ tuner_info("microtune: companycode=%04x part=%02x rev=%02x\n",
++ company_code,buf[0x13],buf[0x14]);
++
++#if 0
++ /* seems to cause more problems than it solves ... */
++ switch (company_code) {
++ case 0x30bf:
++ case 0x3cbf:
++ case 0x3dbf:
++ case 0x4d54:
++ case 0x8e81:
++ case 0x8e91:
++ /* ok (?) */
++ break;
++ default:
++ tuner_warn("tuner: microtune: unknown companycode\n");
++ return 0;
++ }
++#endif
++
++ if (buf[0x13] < ARRAY_SIZE(microtune_part) &&
++ NULL != microtune_part[buf[0x13]])
++ name = microtune_part[buf[0x13]];
++ switch (buf[0x13]) {
++ case MT2032:
++ mt2032_init(c);
++ break;
++ case MT2050:
++ mt2050_init(c);
++ break;
++ default:
++ tuner_info("microtune %s found, not (yet?) supported, sorry :-/\n",
++ name);
++ return 0;
++ }
++
++ strlcpy(c->name, name, sizeof(c->name));
++ tuner_info("microtune %s found, OK\n",name);
++ return 0;
++}
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-basic-offset: 8
++ * End:
++ */
+===== drivers/media/video/tuner-core.c 1.0 vs 1.1 =====
+--- /dev/null 2005-03-25 10:55:53 +09:00
++++ 1.1/drivers/media/video/tuner-core.c 2005-03-09 02:55:29 +09:00
+@@ -0,0 +1,443 @@
++/*
++ * $Id: tuner-core.c,v 1.5 2005/02/15 15:59:35 kraxel Exp $
++ *
++ * i2c tv tuner chip device driver
++ * core core, i.e. kernel interfaces, registering and so on
++ */
++
++#include <linux/module.h>
++#include <linux/moduleparam.h>
++#include <linux/kernel.h>
++#include <linux/sched.h>
++#include <linux/string.h>
++#include <linux/timer.h>
++#include <linux/delay.h>
++#include <linux/errno.h>
++#include <linux/slab.h>
++#include <linux/poll.h>
++#include <linux/i2c.h>
++#include <linux/types.h>
++#include <linux/videodev.h>
++#include <linux/init.h>
++
++#include <media/tuner.h>
++#include <media/audiochip.h>
++
++#define UNSET (-1U)
++
++/* standard i2c insmod options */
++static unsigned short normal_i2c[] = {
++ 0x4b, /* tda8290 */
++ I2C_CLIENT_END
++};
++static unsigned short normal_i2c_range[] = {
++ 0x60, 0x6f,
++ I2C_CLIENT_END
++};
++I2C_CLIENT_INSMOD;
++
++/* insmod options used at init time => read/only */
++static unsigned int addr = 0;
++module_param(addr, int, 0444);
++
++/* insmod options used at runtime => read/write */
++unsigned int tuner_debug = 0;
++module_param(tuner_debug, int, 0644);
++
++static unsigned int tv_range[2] = { 44, 958 };
++static unsigned int radio_range[2] = { 65, 108 };
++
++module_param_array(tv_range, int, NULL, 0644);
++module_param_array(radio_range, int, NULL, 0644);
++
++MODULE_DESCRIPTION("device driver for various TV and TV+FM radio tuners");
++MODULE_AUTHOR("Ralph Metzler, Gerd Knorr, Gunther Mayer");
++MODULE_LICENSE("GPL");
++
++static int this_adap;
++
++static struct i2c_driver driver;
++static struct i2c_client client_template;
++
++/* ---------------------------------------------------------------------- */
++
++// Set tuner frequency, freq in Units of 62.5kHz = 1/16MHz
++static void set_tv_freq(struct i2c_client *c, unsigned int freq)
++{
++ struct tuner *t = i2c_get_clientdata(c);
++
++ if (t->type == UNSET) {
++ tuner_info("tuner type not set\n");
++ return;
++ }
++ if (NULL == t->tv_freq) {
++ tuner_info("Huh? tv_set is NULL?\n");
++ return;
++ }
++ if (freq < tv_range[0]*16 || freq > tv_range[1]*16) {
++ /* FIXME: better do that chip-specific, but
++ right now we don't have that in the config
++ struct and this way is still better than no
++ check at all */
++ tuner_info("TV freq (%d.%02d) out of range (%d-%d)\n",
++ freq/16,freq%16*100/16,tv_range[0],tv_range[1]);
++ return;
++ }
++ t->tv_freq(c,freq);
++}
++
++static void set_radio_freq(struct i2c_client *c, unsigned int freq)
++{
++ struct tuner *t = i2c_get_clientdata(c);
++
++ if (t->type == UNSET) {
++ tuner_info("tuner type not set\n");
++ return;
++ }
++ if (NULL == t->radio_freq) {
++ tuner_info("no radio tuning for this one, sorry.\n");
++ return;
++ }
++ if (freq < radio_range[0]*16 || freq > radio_range[1]*16) {
++ tuner_info("radio freq (%d.%02d) out of range (%d-%d)\n",
++ freq/16,freq%16*100/16,
++ radio_range[0],radio_range[1]);
++ return;
++ }
++ t->radio_freq(c,freq);
++}
++
++static void set_freq(struct i2c_client *c, unsigned long freq)
++{
++ struct tuner *t = i2c_get_clientdata(c);
++
++ switch (t->mode) {
++ case V4L2_TUNER_RADIO:
++ tuner_dbg("radio freq set to %lu.%02lu\n",
++ freq/16,freq%16*100/16);
++ set_radio_freq(c,freq);
++ break;
++ case V4L2_TUNER_ANALOG_TV:
++ case V4L2_TUNER_DIGITAL_TV:
++ tuner_dbg("tv freq set to %lu.%02lu\n",
++ freq/16,freq%16*100/16);
++ set_tv_freq(c, freq);
++ break;
++ }
++ t->freq = freq;
++}
++
++static void set_type(struct i2c_client *c, unsigned int type)
++{
++ struct tuner *t = i2c_get_clientdata(c);
++
++ /* sanity check */
++ if (type == UNSET || type == TUNER_ABSENT)
++ return;
++ if (type >= tuner_count)
++ return;
++
++ if (NULL == t->i2c.dev.driver) {
++ /* not registered yet */
++ t->type = type;
++ return;
++ }
++ if (t->initialized)
++ /* run only once */
++ return;
++
++ t->initialized = 1;
++ t->type = type;
++ switch (t->type) {
++ case TUNER_MT2032:
++ microtune_init(c);
++ break;
++ case TUNER_PHILIPS_TDA8290:
++ tda8290_init(c);
++ break;
++ default:
++ default_tuner_init(c);
++ break;
++ }
++}
++
++static char pal[] = "-";
++module_param_string(pal, pal, 0644, sizeof(pal));
++
++static int tuner_fixup_std(struct tuner *t)
++{
++ if ((t->std & V4L2_STD_PAL) == V4L2_STD_PAL) {
++ /* get more precise norm info from insmod option */
++ switch (pal[0]) {
++ case 'b':
++ case 'B':
++ case 'g':
++ case 'G':
++ tuner_dbg("insmod fixup: PAL => PAL-BG\n");
++ t->std = V4L2_STD_PAL_BG;
++ break;
++ case 'i':
++ case 'I':
++ tuner_dbg("insmod fixup: PAL => PAL-I\n");
++ t->std = V4L2_STD_PAL_I;
++ break;
++ case 'd':
++ case 'D':
++ case 'k':
++ case 'K':
++ tuner_dbg("insmod fixup: PAL => PAL-DK\n");
++ t->std = V4L2_STD_PAL_DK;
++ break;
++ }
++ }
++ return 0;
++}
++
++/* ---------------------------------------------------------------------- */
++
++static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
++{
++ struct tuner *t;
++
++ if (this_adap > 0)
++ return -1;
++ this_adap++;
++
++ client_template.adapter = adap;
++ client_template.addr = addr;
++
++ t = kmalloc(sizeof(struct tuner),GFP_KERNEL);
++ if (NULL == t)
++ return -ENOMEM;
++ memset(t,0,sizeof(struct tuner));
++ memcpy(&t->i2c,&client_template,sizeof(struct i2c_client));
++ i2c_set_clientdata(&t->i2c, t);
++ t->type = UNSET;
++ t->radio_if2 = 10700*1000; // 10.7MHz - FM radio
++
++ i2c_attach_client(&t->i2c);
++ tuner_info("chip found @ 0x%x (%s)\n",
++ addr << 1, adap->name);
++ set_type(&t->i2c, t->type);
++ return 0;
++}
++
++static int tuner_probe(struct i2c_adapter *adap)
++{
++ if (0 != addr) {
++ normal_i2c[0] = addr;
++ normal_i2c_range[0] = addr;
++ normal_i2c_range[1] = addr;
++ }
++ this_adap = 0;
++
++ if (adap->class & I2C_CLASS_TV_ANALOG)
++ return i2c_probe(adap, &addr_data, tuner_attach);
++ return 0;
++}
++
++static int tuner_detach(struct i2c_client *client)
++{
++ struct tuner *t = i2c_get_clientdata(client);
++
++ i2c_detach_client(&t->i2c);
++ kfree(t);
++ return 0;
++}
++
++#define SWITCH_V4L2 if (!t->using_v4l2 && tuner_debug) \
++ tuner_info("switching to v4l2\n"); \
++ t->using_v4l2 = 1;
++#define CHECK_V4L2 if (t->using_v4l2) { if (tuner_debug) \
++ tuner_info("ignore v4l1 call\n"); \
++ return 0; }
++
++static int
++tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
++{
++ struct tuner *t = i2c_get_clientdata(client);
++ unsigned int *iarg = (int*)arg;
++
++ switch (cmd) {
++
++ /* --- configuration --- */
++ case TUNER_SET_TYPE:
++ set_type(client,*iarg);
++ break;
++ case AUDC_SET_RADIO:
++ if (V4L2_TUNER_RADIO != t->mode) {
++ set_tv_freq(client,400 * 16);
++ t->mode = V4L2_TUNER_RADIO;
++ }
++ break;
++ case AUDC_CONFIG_PINNACLE:
++ switch (*iarg) {
++ case 2:
++ tuner_dbg("pinnacle pal\n");
++ t->radio_if2 = 33300 * 1000;
++ break;
++ case 3:
++ tuner_dbg("pinnacle ntsc\n");
++ t->radio_if2 = 41300 * 1000;
++ break;
++ }
++ break;
++
++ /* --- v4l ioctls --- */
++ /* take care: bttv does userspace copying, we'll get a
++ kernel pointer here... */
++ case VIDIOCSCHAN:
++ {
++ static const v4l2_std_id map[] = {
++ [ VIDEO_MODE_PAL ] = V4L2_STD_PAL,
++ [ VIDEO_MODE_NTSC ] = V4L2_STD_NTSC_M,
++ [ VIDEO_MODE_SECAM ] = V4L2_STD_SECAM,
++ [ 4 /* bttv */ ] = V4L2_STD_PAL_M,
++ [ 5 /* bttv */ ] = V4L2_STD_PAL_N,
++ [ 6 /* bttv */ ] = V4L2_STD_NTSC_M_JP,
++ };
++ struct video_channel *vc = arg;
++
++ CHECK_V4L2;
++ t->mode = V4L2_TUNER_ANALOG_TV;
++ if (vc->norm < ARRAY_SIZE(map))
++ t->std = map[vc->norm];
++ tuner_fixup_std(t);
++ if (t->freq)
++ set_tv_freq(client,t->freq);
++ return 0;
++ }
++ case VIDIOCSFREQ:
++ {
++ unsigned long *v = arg;
++
++ CHECK_V4L2;
++ set_freq(client,*v);
++ return 0;
++ }
++ case VIDIOCGTUNER:
++ {
++ struct video_tuner *vt = arg;
++
++ CHECK_V4L2;
++ if (V4L2_TUNER_RADIO == t->mode && t->has_signal)
++ vt->signal = t->has_signal(client);
++ return 0;
++ }
++ case VIDIOCGAUDIO:
++ {
++ struct video_audio *va = arg;
++
++ CHECK_V4L2;
++ if (V4L2_TUNER_RADIO == t->mode && t->is_stereo)
++ va->mode = t->is_stereo(client)
++ ? VIDEO_SOUND_STEREO
++ : VIDEO_SOUND_MONO;
++ return 0;
++ }
++
++ case VIDIOC_S_STD:
++ {
++ v4l2_std_id *id = arg;
++
++ SWITCH_V4L2;
++ t->mode = V4L2_TUNER_ANALOG_TV;
++ t->std = *id;
++ tuner_fixup_std(t);
++ if (t->freq)
++ set_freq(client,t->freq);
++ break;
++ }
++ case VIDIOC_S_FREQUENCY:
++ {
++ struct v4l2_frequency *f = arg;
++
++ SWITCH_V4L2;
++ if (V4L2_TUNER_RADIO == f->type &&
++ V4L2_TUNER_RADIO != t->mode)
++ set_tv_freq(client,400*16);
++ t->mode = f->type;
++ t->freq = f->frequency;
++ set_freq(client,t->freq);
++ break;
++ }
++ case VIDIOC_G_TUNER:
++ {
++ struct v4l2_tuner *tuner = arg;
++
++ SWITCH_V4L2;
++ if (V4L2_TUNER_RADIO == t->mode && t->has_signal)
++ tuner->signal = t->has_signal(client);
++ break;
++ }
++ default:
++ /* nothing */
++ break;
++ }
++
++ return 0;
++}
++
++static int tuner_suspend(struct device * dev, u32 state, u32 level)
++{
++ struct i2c_client *c = container_of(dev, struct i2c_client, dev);
++ struct tuner *t = i2c_get_clientdata(c);
++
++ tuner_dbg("suspend\n");
++ /* FIXME: power down ??? */
++ return 0;
++}
++
++static int tuner_resume(struct device * dev, u32 level)
++{
++ struct i2c_client *c = container_of(dev, struct i2c_client, dev);
++ struct tuner *t = i2c_get_clientdata(c);
++
++ tuner_dbg("resume\n");
++ if (t->freq)
++ set_freq(c,t->freq);
++ return 0;
++}
++
++/* ----------------------------------------------------------------------- */
++
++static struct i2c_driver driver = {
++ .owner = THIS_MODULE,
++ .name = "tuner",
++ .id = I2C_DRIVERID_TUNER,
++ .flags = I2C_DF_NOTIFY,
++ .attach_adapter = tuner_probe,
++ .detach_client = tuner_detach,
++ .command = tuner_command,
++ .driver = {
++ .suspend = tuner_suspend,
++ .resume = tuner_resume,
++ },
++};
++static struct i2c_client client_template =
++{
++ I2C_DEVNAME("(tuner unset)"),
++ .flags = I2C_CLIENT_ALLOW_USE,
++ .driver = &driver,
++};
++
++static int __init tuner_init_module(void)
++{
++ return i2c_add_driver(&driver);
++}
++
++static void __exit tuner_cleanup_module(void)
++{
++ i2c_del_driver(&driver);
++}
++
++module_init(tuner_init_module);
++module_exit(tuner_cleanup_module);
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-basic-offset: 8
++ * End:
++ */
+===== drivers/media/video/tda8290.c 1.0 vs 1.1 =====
+--- /dev/null 2005-03-25 10:55:53 +09:00
++++ 1.1/drivers/media/video/tda8290.c 2005-03-09 02:55:29 +09:00
+@@ -0,0 +1,224 @@
++/*
++ * $Id: tda8290.c,v 1.5 2005/02/15 15:59:35 kraxel Exp $
++ *
++ * i2c tv tuner chip device driver
++ * controls the philips tda8290+75 tuner chip combo.
++ */
++#include <linux/i2c.h>
++#include <linux/videodev.h>
++#include <linux/delay.h>
++#include <media/tuner.h>
++
++/* ---------------------------------------------------------------------- */
++
++struct freq_entry {
++ u16 freq;
++ u8 value;
++};
++
++static struct freq_entry band_table[] = {
++ { 0x2DF4, 0x1C },
++ { 0x2574, 0x14 },
++ { 0x22B4, 0x0C },
++ { 0x20D4, 0x0B },
++ { 0x1E74, 0x3B },
++ { 0x1C34, 0x33 },
++ { 0x16F4, 0x5B },
++ { 0x1454, 0x53 },
++ { 0x12D4, 0x52 },
++ { 0x1034, 0x4A },
++ { 0x0EE4, 0x7A },
++ { 0x0D34, 0x72 },
++ { 0x0B54, 0x9A },
++ { 0x0914, 0x91 },
++ { 0x07F4, 0x89 },
++ { 0x0774, 0xB9 },
++ { 0x067B, 0xB1 },
++ { 0x0634, 0xD9 },
++ { 0x05A4, 0xD8 }, // FM radio
++ { 0x0494, 0xD0 },
++ { 0x03BC, 0xC8 },
++ { 0x0394, 0xF8 }, // 57250000 Hz
++ { 0x0000, 0xF0 }, // 0
++};
++
++static struct freq_entry div_table[] = {
++ { 0x1C34, 3 },
++ { 0x0D34, 2 },
++ { 0x067B, 1 },
++ { 0x0000, 0 },
++};
++
++static struct freq_entry agc_table[] = {
++ { 0x22B4, 0x8F },
++ { 0x0B54, 0x9F },
++ { 0x09A4, 0x8F },
++ { 0x0554, 0x9F },
++ { 0x0000, 0xBF },
++};
++
++static __u8 get_freq_entry( struct freq_entry* table, __u16 freq)
++{
++ while(table->freq && table->freq > freq)
++ table++;
++ return table->value;
++}
++
++/* ---------------------------------------------------------------------- */
++
++static unsigned char i2c_enable_bridge[2] = { 0x21, 0xC0 };
++static unsigned char i2c_disable_bridge[2] = { 0x21, 0x80 };
++static unsigned char i2c_init_tda8275[14] = { 0x00, 0x00, 0x00, 0x00,
++ 0x7C, 0x04, 0xA3, 0x3F,
++ 0x2A, 0x04, 0xFF, 0x00,
++ 0x00, 0x40 };
++static unsigned char i2c_set_VS[2] = { 0x30, 0x6F };
++static unsigned char i2c_set_GP01_CF[2] = { 0x20, 0x0B };
++static unsigned char i2c_tda8290_reset[2] = { 0x00, 0x00 };
++static unsigned char i2c_gainset_off[2] = { 0x28, 0x14 };
++static unsigned char i2c_gainset_on[2] = { 0x28, 0x54 };
++static unsigned char i2c_agc3_00[2] = { 0x80, 0x00 };
++static unsigned char i2c_agc2_BF[2] = { 0x60, 0xBF };
++static unsigned char i2c_cb1_D2[2] = { 0x30, 0xD2 };
++static unsigned char i2c_cb1_56[2] = { 0x30, 0x56 };
++static unsigned char i2c_cb1_52[2] = { 0x30, 0x52 };
++static unsigned char i2c_cb1_50[2] = { 0x30, 0x50 };
++static unsigned char i2c_agc2_7F[2] = { 0x60, 0x7F };
++static unsigned char i2c_agc3_08[2] = { 0x80, 0x08 };
++
++static struct i2c_msg i2c_msg_init[] = {
++ { I2C_ADDR_TDA8275, 0, ARRAY_SIZE(i2c_init_tda8275), i2c_init_tda8275 },
++ { I2C_ADDR_TDA8290, 0, ARRAY_SIZE(i2c_disable_bridge), i2c_disable_bridge },
++ { I2C_ADDR_TDA8290, 0, ARRAY_SIZE(i2c_set_VS), i2c_set_VS },
++ { I2C_ADDR_TDA8290, 0, ARRAY_SIZE(i2c_set_GP01_CF), i2c_set_GP01_CF },
++};
++
++static struct i2c_msg i2c_msg_prolog[] = {
++// { I2C_ADDR_TDA8290, 0, ARRAY_SIZE(i2c_easy_mode), i2c_easy_mode },
++ { I2C_ADDR_TDA8290, 0, ARRAY_SIZE(i2c_gainset_off), i2c_gainset_off },
++ { I2C_ADDR_TDA8290, 0, ARRAY_SIZE(i2c_tda8290_reset), i2c_tda8290_reset },
++ { I2C_ADDR_TDA8290, 0, ARRAY_SIZE(i2c_enable_bridge), i2c_enable_bridge },
++};
++
++static struct i2c_msg i2c_msg_config[] = {
++// { I2C_ADDR_TDA8275, 0, ARRAY_SIZE(i2c_set_freq), i2c_set_freq },
++ { I2C_ADDR_TDA8275, 0, ARRAY_SIZE(i2c_agc3_00), i2c_agc3_00 },
++ { I2C_ADDR_TDA8275, 0, ARRAY_SIZE(i2c_agc2_BF), i2c_agc2_BF },
++ { I2C_ADDR_TDA8275, 0, ARRAY_SIZE(i2c_cb1_D2), i2c_cb1_D2 },
++ { I2C_ADDR_TDA8275, 0, ARRAY_SIZE(i2c_cb1_56), i2c_cb1_56 },
++ { I2C_ADDR_TDA8275, 0, ARRAY_SIZE(i2c_cb1_52), i2c_cb1_52 },
++};
++
++static struct i2c_msg i2c_msg_epilog[] = {
++ { I2C_ADDR_TDA8275, 0, ARRAY_SIZE(i2c_cb1_50), i2c_cb1_50 },
++ { I2C_ADDR_TDA8275, 0, ARRAY_SIZE(i2c_agc2_7F), i2c_agc2_7F },
++ { I2C_ADDR_TDA8275, 0, ARRAY_SIZE(i2c_agc3_08), i2c_agc3_08 },
++ { I2C_ADDR_TDA8290, 0, ARRAY_SIZE(i2c_disable_bridge), i2c_disable_bridge },
++ { I2C_ADDR_TDA8290, 0, ARRAY_SIZE(i2c_gainset_on), i2c_gainset_on },
++};
++
++static int tda8290_tune(struct i2c_client *c)
++{
++ struct tuner *t = i2c_get_clientdata(c);
++ struct i2c_msg easy_mode =
++ { I2C_ADDR_TDA8290, 0, 2, t->i2c_easy_mode };
++ struct i2c_msg set_freq =
++ { I2C_ADDR_TDA8290, 0, 8, t->i2c_set_freq };
++
++ i2c_transfer(c->adapter, &easy_mode, 1);
++ i2c_transfer(c->adapter, i2c_msg_prolog, ARRAY_SIZE(i2c_msg_prolog));
++
++ i2c_transfer(c->adapter, &set_freq, 1);
++ i2c_transfer(c->adapter, i2c_msg_config, ARRAY_SIZE(i2c_msg_config));
++
++ msleep(550);
++ i2c_transfer(c->adapter, i2c_msg_epilog, ARRAY_SIZE(i2c_msg_epilog));
++ return 0;
++}
++
++static void set_frequency(struct tuner *t, u16 ifc)
++{
++ u32 N = (((t->freq<<3)+ifc)&0x3fffc);
++
++ N = N >> get_freq_entry(div_table, t->freq);
++ t->i2c_set_freq[0] = 0;
++ t->i2c_set_freq[1] = (unsigned char)(N>>8);
++ t->i2c_set_freq[2] = (unsigned char) N;
++ t->i2c_set_freq[3] = 0x40;
++ t->i2c_set_freq[4] = 0x52;
++ t->i2c_set_freq[5] = get_freq_entry(band_table, t->freq);
++ t->i2c_set_freq[6] = get_freq_entry(agc_table, t->freq);
++ t->i2c_set_freq[7] = 0x8f;
++}
++
++#define V4L2_STD_MN (V4L2_STD_PAL_M|V4L2_STD_PAL_N|V4L2_STD_PAL_Nc|V4L2_STD_NTSC)
++#define V4L2_STD_B (V4L2_STD_PAL_B|V4L2_STD_PAL_B1|V4L2_STD_SECAM_B)
++#define V4L2_STD_GH (V4L2_STD_PAL_G|V4L2_STD_PAL_H|V4L2_STD_SECAM_G|V4L2_STD_SECAM_H)
++#define V4L2_STD_DK (V4L2_STD_PAL_DK|V4L2_STD_SECAM_DK)
++
++static void set_audio(struct tuner *t)
++{
++ t->i2c_easy_mode[0] = 0x01;
++
++ if (t->std & V4L2_STD_MN)
++ t->i2c_easy_mode[1] = 0x01;
++ else if (t->std & V4L2_STD_B)
++ t->i2c_easy_mode[1] = 0x02;
++ else if (t->std & V4L2_STD_GH)
++ t->i2c_easy_mode[1] = 0x04;
++ else if (t->std & V4L2_STD_PAL_I)
++ t->i2c_easy_mode[1] = 0x08;
++ else if (t->std & V4L2_STD_DK)
++ t->i2c_easy_mode[1] = 0x10;
++ else if (t->std & V4L2_STD_SECAM_L)
++ t->i2c_easy_mode[1] = 0x20;
++}
++
++static void set_tv_freq(struct i2c_client *c, unsigned int freq)
++{
++ struct tuner *t = i2c_get_clientdata(c);
++
++ set_audio(t);
++ set_frequency(t, 864);
++ tda8290_tune(c);
++}
++
++static void set_radio_freq(struct i2c_client *c, unsigned int freq)
++{
++ struct tuner *t = i2c_get_clientdata(c);
++ set_frequency(t, 704);
++ tda8290_tune(c);
++}
++
++static int has_signal(struct i2c_client *c)
++{
++ unsigned char i2c_get_afc[1] = { 0x1B };
++ unsigned char afc = 0;
++
++ i2c_master_send(c, i2c_get_afc, ARRAY_SIZE(i2c_get_afc));
++ i2c_master_recv(c, &afc, 1);
++ return (afc & 0x80)? 65535:0;
++}
++
++int tda8290_init(struct i2c_client *c)
++{
++ struct tuner *t = i2c_get_clientdata(c);
++
++ strlcpy(c->name, "tda8290+75", sizeof(c->name));
++ tuner_info("tuner: type set to %s\n", c->name);
++ t->tv_freq = set_tv_freq;
++ t->radio_freq = set_radio_freq;
++ t->has_signal = has_signal;
++
++ i2c_master_send(c, i2c_enable_bridge, ARRAY_SIZE(i2c_enable_bridge));
++ i2c_transfer(c->adapter, i2c_msg_init, ARRAY_SIZE(i2c_msg_init));
++ return 0;
++}
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-basic-offset: 8
++ * End:
++ */
+===== drivers/media/video/tuner-simple.c 1.0 vs 1.1 =====
+--- /dev/null 2005-03-25 10:55:53 +09:00
++++ 1.1/drivers/media/video/tuner-simple.c 2005-03-09 02:55:29 +09:00
+@@ -0,0 +1,467 @@
++/*
++ * $Id: tuner-simple.c,v 1.4 2005/02/15 15:59:35 kraxel Exp $
++ *
++ * i2c tv tuner chip device driver
++ * controls all those simple 4-control-bytes style tuners.
++ */
++#include <linux/delay.h>
++#include <linux/i2c.h>
++#include <linux/videodev.h>
++#include <media/tuner.h>
++
++/* ---------------------------------------------------------------------- */
++
++/* tv standard selection for Temic 4046 FM5
++ this value takes the low bits of control byte 2
++ from datasheet Rev.01, Feb.00
++ standard BG I L L2 D
++ picture IF 38.9 38.9 38.9 33.95 38.9
++ sound 1 33.4 32.9 32.4 40.45 32.4
++ sound 2 33.16
++ NICAM 33.05 32.348 33.05 33.05
++ */
++#define TEMIC_SET_PAL_I 0x05
++#define TEMIC_SET_PAL_DK 0x09
++#define TEMIC_SET_PAL_L 0x0a // SECAM ?
++#define TEMIC_SET_PAL_L2 0x0b // change IF !
++#define TEMIC_SET_PAL_BG 0x0c
++
++/* tv tuner system standard selection for Philips FQ1216ME
++ this value takes the low bits of control byte 2
++ from datasheet "1999 Nov 16" (supersedes "1999 Mar 23")
++ standard BG DK I L L`
++ picture carrier 38.90 38.90 38.90 38.90 33.95
++ colour 34.47 34.47 34.47 34.47 38.38
++ sound 1 33.40 32.40 32.90 32.40 40.45
++ sound 2 33.16 - - - -
++ NICAM 33.05 33.05 32.35 33.05 39.80
++ */
++#define PHILIPS_SET_PAL_I 0x01 /* Bit 2 always zero !*/
++#define PHILIPS_SET_PAL_BGDK 0x09
++#define PHILIPS_SET_PAL_L2 0x0a
++#define PHILIPS_SET_PAL_L 0x0b
++
++/* system switching for Philips FI1216MF MK2
++ from datasheet "1996 Jul 09",
++ standard BG L L'
++ picture carrier 38.90 38.90 33.95
++ colour 34.47 34.37 38.38
++ sound 1 33.40 32.40 40.45
++ sound 2 33.16 - -
++ NICAM 33.05 33.05 39.80
++ */
++#define PHILIPS_MF_SET_BG 0x01 /* Bit 2 must be zero, Bit 3 is system output */
++#define PHILIPS_MF_SET_PAL_L 0x03 // France
++#define PHILIPS_MF_SET_PAL_L2 0x02 // L'
++
++
++/* ---------------------------------------------------------------------- */
++
++struct tunertype
++{
++ char *name;
++ unsigned char Vendor;
++ unsigned char Type;
++
++ unsigned short thresh1; /* band switch VHF_LO <=> VHF_HI */
++ unsigned short thresh2; /* band switch VHF_HI <=> UHF */
++ unsigned char VHF_L;
++ unsigned char VHF_H;
++ unsigned char UHF;
++ unsigned char config;
++ unsigned short IFPCoff; /* 622.4=16*38.90 MHz PAL,
++ 732 =16*45.75 NTSCi,
++ 940 =16*58.75 NTSC-Japan
++ 704 =16*44 ATSC */
++};
++
++/*
++ * The floats in the tuner struct are computed at compile time
++ * by gcc and cast back to integers. Thus we don't violate the
++ * "no float in kernel" rule.
++ */
++static struct tunertype tuners[] = {
++ { "Temic PAL (4002 FH5)", TEMIC, PAL,
++ 16*140.25,16*463.25,0x02,0x04,0x01,0x8e,623},
++ { "Philips PAL_I (FI1246 and compatibles)", Philips, PAL_I,
++ 16*140.25,16*463.25,0xa0,0x90,0x30,0x8e,623},
++ { "Philips NTSC (FI1236,FM1236 and compatibles)", Philips, NTSC,
++ 16*157.25,16*451.25,0xA0,0x90,0x30,0x8e,732},
++ { "Philips (SECAM+PAL_BG) (FI1216MF, FM1216MF, FR1216MF)", Philips, SECAM,
++ 16*168.25,16*447.25,0xA7,0x97,0x37,0x8e,623},
++
++ { "NoTuner", NoTuner, NOTUNER,
++ 0,0,0x00,0x00,0x00,0x00,0x00},
++ { "Philips PAL_BG (FI1216 and compatibles)", Philips, PAL,
++ 16*168.25,16*447.25,0xA0,0x90,0x30,0x8e,623},
++ { "Temic NTSC (4032 FY5)", TEMIC, NTSC,
++ 16*157.25,16*463.25,0x02,0x04,0x01,0x8e,732},
++ { "Temic PAL_I (4062 FY5)", TEMIC, PAL_I,
++ 16*170.00,16*450.00,0x02,0x04,0x01,0x8e,623},
++
++ { "Temic NTSC (4036 FY5)", TEMIC, NTSC,
++ 16*157.25,16*463.25,0xa0,0x90,0x30,0x8e,732},
++ { "Alps HSBH1", TEMIC, NTSC,
++ 16*137.25,16*385.25,0x01,0x02,0x08,0x8e,732},
++ { "Alps TSBE1",TEMIC,PAL,
++ 16*137.25,16*385.25,0x01,0x02,0x08,0x8e,732},
++ { "Alps TSBB5", Alps, PAL_I, /* tested (UK UHF) with Modulartech MM205 */
++ 16*133.25,16*351.25,0x01,0x02,0x08,0x8e,632},
++
++ { "Alps TSBE5", Alps, PAL, /* untested - data sheet guess. Only IF differs. */
++ 16*133.25,16*351.25,0x01,0x02,0x08,0x8e,622},
++ { "Alps TSBC5", Alps, PAL, /* untested - data sheet guess. Only IF differs. */
++ 16*133.25,16*351.25,0x01,0x02,0x08,0x8e,608},
++ { "Temic PAL_BG (4006FH5)", TEMIC, PAL,
++ 16*170.00,16*450.00,0xa0,0x90,0x30,0x8e,623},
++ { "Alps TSCH6",Alps,NTSC,
++ 16*137.25,16*385.25,0x14,0x12,0x11,0x8e,732},
++
++ { "Temic PAL_DK (4016 FY5)",TEMIC,PAL,
++ 16*168.25,16*456.25,0xa0,0x90,0x30,0x8e,623},
++ { "Philips NTSC_M (MK2)",Philips,NTSC,
++ 16*160.00,16*454.00,0xa0,0x90,0x30,0x8e,732},
++ { "Temic PAL_I (4066 FY5)", TEMIC, PAL_I,
++ 16*169.00, 16*454.00, 0xa0,0x90,0x30,0x8e,623},
++ { "Temic PAL* auto (4006 FN5)", TEMIC, PAL,
++ 16*169.00, 16*454.00, 0xa0,0x90,0x30,0x8e,623},
++
++ { "Temic PAL_BG (4009 FR5) or PAL_I (4069 FR5)", TEMIC, PAL,
++ 16*141.00, 16*464.00, 0xa0,0x90,0x30,0x8e,623},
++ { "Temic NTSC (4039 FR5)", TEMIC, NTSC,
++ 16*158.00, 16*453.00, 0xa0,0x90,0x30,0x8e,732},
++ { "Temic PAL/SECAM multi (4046 FM5)", TEMIC, PAL,
++ 16*169.00, 16*454.00, 0xa0,0x90,0x30,0x8e,623},
++ { "Philips PAL_DK (FI1256 and compatibles)", Philips, PAL,
++ 16*170.00,16*450.00,0xa0,0x90,0x30,0x8e,623},
++
++ { "Philips PAL/SECAM multi (FQ1216ME)", Philips, PAL,
++ 16*170.00,16*450.00,0xa0,0x90,0x30,0x8e,623},
++ { "LG PAL_I+FM (TAPC-I001D)", LGINNOTEK, PAL_I,
++ 16*170.00,16*450.00,0xa0,0x90,0x30,0x8e,623},
++ { "LG PAL_I (TAPC-I701D)", LGINNOTEK, PAL_I,
++ 16*170.00,16*450.00,0xa0,0x90,0x30,0x8e,623},
++ { "LG NTSC+FM (TPI8NSR01F)", LGINNOTEK, NTSC,
++ 16*210.00,16*497.00,0xa0,0x90,0x30,0x8e,732},
++
++ { "LG PAL_BG+FM (TPI8PSB01D)", LGINNOTEK, PAL,
++ 16*170.00,16*450.00,0xa0,0x90,0x30,0x8e,623},
++ { "LG PAL_BG (TPI8PSB11D)", LGINNOTEK, PAL,
++ 16*170.00,16*450.00,0xa0,0x90,0x30,0x8e,623},
++ { "Temic PAL* auto + FM (4009 FN5)", TEMIC, PAL,
++ 16*141.00, 16*464.00, 0xa0,0x90,0x30,0x8e,623},
++ { "SHARP NTSC_JP (2U5JF5540)", SHARP, NTSC, /* 940=16*58.75 NTSC@Japan */
++ 16*137.25,16*317.25,0x01,0x02,0x08,0x8e,940 },
++
++ { "Samsung PAL TCPM9091PD27", Samsung, PAL, /* from sourceforge v3tv */
++ 16*169,16*464,0xA0,0x90,0x30,0x8e,623},
++ { "MT20xx universal", Microtune,PAL|NTSC,
++ /* see mt20xx.c for details */ },
++ { "Temic PAL_BG (4106 FH5)", TEMIC, PAL,
++ 16*141.00, 16*464.00, 0xa0,0x90,0x30,0x8e,623},
++ { "Temic PAL_DK/SECAM_L (4012 FY5)", TEMIC, PAL,
++ 16*140.25, 16*463.25, 0x02,0x04,0x01,0x8e,623},
++
++ { "Temic NTSC (4136 FY5)", TEMIC, NTSC,
++ 16*158.00, 16*453.00, 0xa0,0x90,0x30,0x8e,732},
++ { "LG PAL (newer TAPC series)", LGINNOTEK, PAL,
++ 16*170.00, 16*450.00, 0x01,0x02,0x08,0x8e,623},
++ { "Philips PAL/SECAM multi (FM1216ME MK3)", Philips, PAL,
++ 16*160.00,16*442.00,0x01,0x02,0x04,0x8e,623 },
++ { "LG NTSC (newer TAPC series)", LGINNOTEK, NTSC,
++ 16*170.00, 16*450.00, 0x01,0x02,0x08,0x8e,732},
++
++ { "HITACHI V7-J180AT", HITACHI, NTSC,
++ 16*170.00, 16*450.00, 0x01,0x02,0x08,0x8e,940 },
++ { "Philips PAL_MK (FI1216 MK)", Philips, PAL,
++ 16*140.25,16*463.25,0x01,0xc2,0xcf,0x8e,623},
++ { "Philips 1236D ATSC/NTSC daul in",Philips,ATSC,
++ 16*157.25,16*454.00,0xa0,0x90,0x30,0x8e,732},
++ { "Philips NTSC MK3 (FM1236MK3 or FM1236/F)", Philips, NTSC,
++ 16*160.00,16*442.00,0x01,0x02,0x04,0x8e,732},
++
++ { "Philips 4 in 1 (ATI TV Wonder Pro/Conexant)", Philips, NTSC,
++ 16*160.00,16*442.00,0x01,0x02,0x04,0x8e,732},
++ { "Microtune 4049 FM5",Microtune,PAL,
++ 16*141.00,16*464.00,0xa0,0x90,0x30,0x8e,623},
++ { "Panasonic VP27s/ENGE4324D", Panasonic, NTSC,
++ 16*160.00,16*454.00,0x01,0x02,0x08,0xce,940},
++ { "LG NTSC (TAPE series)", LGINNOTEK, NTSC,
++ 16*160.00,16*442.00,0x01,0x02,0x04,0x8e,732 },
++
++ { "Tenna TNF 8831 BGFF)", Philips, PAL,
++ 16*161.25,16*463.25,0xa0,0x90,0x30,0x8e,623},
++ { "Microtune 4042 FI5 ATSC/NTSC dual in", Microtune, NTSC,
++ 16*162.00,16*457.00,0xa2,0x94,0x31,0x8e,732},
++ { "TCL 2002N", TCL, NTSC,
++ 16*172.00,16*448.00,0x01,0x02,0x08,0x8e,732},
++ { "Philips PAL/SECAM_D (FM 1256 I-H3)", Philips, PAL,
++ 16*160.00,16*442.00,0x01,0x02,0x04,0x8e,623 },
++
++ { "Thomson DDT 7610 (ATSC/NTSC)", THOMSON, ATSC,
++ 16*157.25,16*454.00,0x39,0x3a,0x3c,0x8e,732},
++ { "Philips FQ1286", Philips, NTSC,
++ 16*160.00,16*454.00,0x41,0x42,0x04,0x8e,940}, // UHF band untested
++ { "tda8290+75", Philips,PAL|NTSC,
++ /* see tda8290.c for details */ },
++
++};
++unsigned const int tuner_count = ARRAY_SIZE(tuners);
++
++/* ---------------------------------------------------------------------- */
++
++static int tuner_getstatus(struct i2c_client *c)
++{
++ unsigned char byte;
++
++ if (1 != i2c_master_recv(c,&byte,1))
++ return 0;
++ return byte;
++}
++
++#define TUNER_POR 0x80
++#define TUNER_FL 0x40
++#define TUNER_MODE 0x38
++#define TUNER_AFC 0x07
++
++#define TUNER_STEREO 0x10 /* radio mode */
++#define TUNER_SIGNAL 0x07 /* radio mode */
++
++static int tuner_signal(struct i2c_client *c)
++{
++ return (tuner_getstatus(c) & TUNER_SIGNAL)<<13;
++}
++
++static int tuner_stereo(struct i2c_client *c)
++{
++ return (tuner_getstatus (c) & TUNER_STEREO);
++}
++
++#if 0 /* unused */
++static int tuner_islocked (struct i2c_client *c)
++{
++ return (tuner_getstatus (c) & TUNER_FL);
++}
++
++static int tuner_afcstatus (struct i2c_client *c)
++{
++ return (tuner_getstatus (c) & TUNER_AFC) - 2;
++}
++
++static int tuner_mode (struct i2c_client *c)
++{
++ return (tuner_getstatus (c) & TUNER_MODE) >> 3;
++}
++#endif
++
++/* ---------------------------------------------------------------------- */
++
++static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
++{
++ struct tuner *t = i2c_get_clientdata(c);
++ u8 config;
++ u16 div;
++ struct tunertype *tun;
++ unsigned char buffer[4];
++ int rc;
++
++ tun = &tuners[t->type];
++ if (freq < tun->thresh1) {
++ config = tun->VHF_L;
++ tuner_dbg("tv: VHF lowrange\n");
++ } else if (freq < tun->thresh2) {
++ config = tun->VHF_H;
++ tuner_dbg("tv: VHF high range\n");
++ } else {
++ config = tun->UHF;
++ tuner_dbg("tv: UHF range\n");
++ }
++
++
++ /* tv norm specific stuff for multi-norm tuners */
++ switch (t->type) {
++ case TUNER_PHILIPS_SECAM: // FI1216MF
++ /* 0x01 -> ??? no change ??? */
++ /* 0x02 -> PAL BDGHI / SECAM L */
++ /* 0x04 -> ??? PAL others / SECAM others ??? */
++ config &= ~0x02;
++ if (t->std & V4L2_STD_SECAM)
++ config |= 0x02;
++ break;
++
++ case TUNER_TEMIC_4046FM5:
++ config &= ~0x0f;
++
++ if (t->std & V4L2_STD_PAL_BG) {
++ config |= TEMIC_SET_PAL_BG;
++
++ } else if (t->std & V4L2_STD_PAL_I) {
++ config |= TEMIC_SET_PAL_I;
++
++ } else if (t->std & V4L2_STD_PAL_DK) {
++ config |= TEMIC_SET_PAL_DK;
++
++ } else if (t->std & V4L2_STD_SECAM_L) {
++ config |= TEMIC_SET_PAL_L;
++
++ }
++ break;
++
++ case TUNER_PHILIPS_FQ1216ME:
++ config &= ~0x0f;
++
++ if (t->std & (V4L2_STD_PAL_BG|V4L2_STD_PAL_DK)) {
++ config |= PHILIPS_SET_PAL_BGDK;
++
++ } else if (t->std & V4L2_STD_PAL_I) {
++ config |= PHILIPS_SET_PAL_I;
++
++ } else if (t->std & V4L2_STD_SECAM_L) {
++ config |= PHILIPS_SET_PAL_L;
++
++ }
++ break;
++
++ case TUNER_PHILIPS_ATSC:
++ /* 0x00 -> ATSC antenna input 1 */
++ /* 0x01 -> ATSC antenna input 2 */
++ /* 0x02 -> NTSC antenna input 1 */
++ /* 0x03 -> NTSC antenna input 2 */
++ config &= ~0x03;
++ if (!(t->std & V4L2_STD_ATSC))
++ config |= 2;
++ /* FIXME: input */
++ break;
++
++ case TUNER_MICROTUNE_4042FI5:
++ /* Set the charge pump for fast tuning */
++ tun->config |= 0x40;
++ break;
++ }
++
++ /*
++ * Philips FI1216MK2 remark from specification :
++ * for channel selection involving band switching, and to ensure
++ * smooth tuning to the desired channel without causing
++ * unnecessary charge pump action, it is recommended to consider
++ * the difference between wanted channel frequency and the
++ * current channel frequency. Unnecessary charge pump action
++ * will result in very low tuning voltage which may drive the
++ * oscillator to extreme conditions.
++ *
++ * Progfou: specification says to send config data before
++ * frequency in case (wanted frequency < current frequency).
++ */
++
++ div=freq + tun->IFPCoff;
++ if (t->type == TUNER_PHILIPS_SECAM && freq < t->freq) {
++ buffer[0] = tun->config;
++ buffer[1] = config;
++ buffer[2] = (div>>8) & 0x7f;
++ buffer[3] = div & 0xff;
++ } else {
++ buffer[0] = (div>>8) & 0x7f;
++ buffer[1] = div & 0xff;
++ buffer[2] = tun->config;
++ buffer[3] = config;
++ }
++ tuner_dbg("tv 0x%02x 0x%02x 0x%02x 0x%02x\n",
++ buffer[0],buffer[1],buffer[2],buffer[3]);
++
++ if (4 != (rc = i2c_master_send(c,buffer,4)))
++ tuner_warn("i2c i/o error: rc == %d (should be 4)\n",rc);
++
++ if (t->type == TUNER_MICROTUNE_4042FI5) {
++ // FIXME - this may also work for other tuners
++ unsigned long timeout = jiffies + msecs_to_jiffies(1);
++ u8 status_byte = 0;
++
++ /* Wait until the PLL locks */
++ for (;;) {
++ if (time_after(jiffies,timeout))
++ return;
++ if (1 != (rc = i2c_master_recv(c,&status_byte,1))) {
++ tuner_warn("i2c i/o read error: rc == %d (should be 1)\n",rc);
++ break;
++ }
++ /* bit 6 is PLL locked indicator */
++ if (status_byte & 0x40)
++ break;
++ udelay(10);
++ }
++
++ /* Set the charge pump for optimized phase noise figure */
++ tun->config &= ~0x40;
++ buffer[0] = (div>>8) & 0x7f;
++ buffer[1] = div & 0xff;
++ buffer[2] = tun->config;
++ buffer[3] = config;
++ tuner_dbg("tv 0x%02x 0x%02x 0x%02x 0x%02x\n",
++ buffer[0],buffer[1],buffer[2],buffer[3]);
++
++ if (4 != (rc = i2c_master_send(c,buffer,4)))
++ tuner_warn("i2c i/o error: rc == %d (should be 4)\n",rc);
++ }
++}
++
++static void default_set_radio_freq(struct i2c_client *c, unsigned int freq)
++{
++ struct tunertype *tun;
++ struct tuner *t = i2c_get_clientdata(c);
++ unsigned char buffer[4];
++ unsigned div;
++ int rc;
++
++ tun=&tuners[t->type];
++ div = freq + (int)(16*10.7);
++ buffer[2] = tun->config;
++
++ switch (t->type) {
++ case TUNER_PHILIPS_FM1216ME_MK3:
++ case TUNER_PHILIPS_FM1236_MK3:
++ buffer[3] = 0x19;
++ break;
++ case TUNER_PHILIPS_FM1256_IH3:
++ div = (20 * freq)/16 + 333 * 2;
++ buffer[2] = 0x80;
++ buffer[3] = 0x19;
++ break;
++ case TUNER_LG_PAL_FM:
++ buffer[3] = 0xa5;
++ break;
++ default:
++ buffer[3] = 0xa4;
++ break;
++ }
++ buffer[0] = (div>>8) & 0x7f;
++ buffer[1] = div & 0xff;
++
++ tuner_dbg("radio 0x%02x 0x%02x 0x%02x 0x%02x\n",
++ buffer[0],buffer[1],buffer[2],buffer[3]);
++
++ if (4 != (rc = i2c_master_send(c,buffer,4)))
++ tuner_warn("i2c i/o error: rc == %d (should be 4)\n",rc);
++}
++
++int default_tuner_init(struct i2c_client *c)
++{
++ struct tuner *t = i2c_get_clientdata(c);
++
++ tuner_info("type set to %d (%s)\n",
++ t->type, tuners[t->type].name);
++ strlcpy(c->name, tuners[t->type].name, sizeof(c->name));
++
++ t->tv_freq = default_set_tv_freq;
++ t->radio_freq = default_set_radio_freq;
++ t->has_signal = tuner_signal;
++ t->is_stereo = tuner_stereo;
++ return 0;
++}
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-basic-offset: 8
++ * End:
++ */
Added: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-media-video-tuner-update-2.patch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-media-video-tuner-update-2.patch 2005-03-31 08:00:52 UTC (rev 2869)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-media-video-tuner-update-2.patch 2005-03-31 09:59:06 UTC (rev 2870)
@@ -0,0 +1,128 @@
+# origin: kraxel (BitKeeper)
+# cset: 1.2009.15.31 (2.6) key=423318cekH84kN_J7JItaVUrMfgvtQ
+# URL: http://linux.bkbits.net:8080/linux-2.6/cset@423318cekH84kN_J7JItaVUrMfgvtQ
+# inclusion: upstream
+# descrition: [PATCH] v4l: tuner update
+# revision date: Thu, 31 Mar 2005 18:05:13 +0900
+#
+# S rset: ChangeSet|1.2009.15.30..1.2009.15.31
+# I rset: drivers/media/video/mt20xx.c|1.1..1.2
+# I rset: drivers/media/video/tda8290.c|1.1..1.2
+# I rset: include/media/tuner.h|1.17..1.18
+# I rset: drivers/media/video/tuner-simple.c|1.1..1.2
+#
+# Key:
+# S: Skipped ChangeSet file only
+# O: Original Followed by Updated
+# U: Updated Included with updated range of versions
+# I: Included Included verbatim
+# E: Excluded Excluded on request from user
+# D: Deleted Manually deleted by subsequent user edit
+# R: Revised Manually revised by subsequent user edit
+#
+#
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/03/12 08:29:02-08:00 kraxel@bytesex.org
+# [PATCH] v4l: tuner update
+#
+# Minor update for the tuner module: Add some new entries,
+# fix a bug in the tda8290 driver.
+#
+# Signed-off-by: Gerd Knorr <kraxel@bytesex.org>
+# Signed-off-by: Andrew Morton <akpm@osdl.org>
+# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+#
+# include/media/tuner.h
+# 2005/03/11 12:32:18-08:00 kraxel@bytesex.org +4 -0
+# v4l: tuner update
+#
+# drivers/media/video/tuner-simple.c
+# 2005/03/11 12:32:18-08:00 kraxel@bytesex.org +8 -1
+# v4l: tuner update
+#
+# drivers/media/video/tda8290.c
+# 2005/03/11 12:32:18-08:00 kraxel@bytesex.org +2 -2
+# v4l: tuner update
+#
+# drivers/media/video/mt20xx.c
+# 2005/03/11 12:32:18-08:00 kraxel@bytesex.org +2 -1
+# v4l: tuner update
+#
+#
+===== drivers/media/video/mt20xx.c 1.1 vs 1.2 =====
+--- 1.1/drivers/media/video/mt20xx.c 2005-03-09 02:55:28 +09:00
++++ 1.2/drivers/media/video/mt20xx.c 2005-03-12 05:32:18 +09:00
+@@ -1,5 +1,5 @@
+ /*
+- * $Id: mt20xx.c,v 1.3 2005/02/15 15:59:35 kraxel Exp $
++ * $Id: mt20xx.c,v 1.4 2005/03/04 09:24:56 kraxel Exp $
+ *
+ * i2c tv tuner chip device driver
+ * controls microtune tuners, mt2032 + mt2050 at the moment.
+@@ -7,6 +7,7 @@
+ #include <linux/delay.h>
+ #include <linux/i2c.h>
+ #include <linux/videodev.h>
++#include <linux/moduleparam.h>
+ #include <media/tuner.h>
+
+ /* ---------------------------------------------------------------------- */
+===== drivers/media/video/tda8290.c 1.1 vs 1.2 =====
+--- 1.1/drivers/media/video/tda8290.c 2005-03-09 02:55:29 +09:00
++++ 1.2/drivers/media/video/tda8290.c 2005-03-12 05:32:18 +09:00
+@@ -1,5 +1,5 @@
+ /*
+- * $Id: tda8290.c,v 1.5 2005/02/15 15:59:35 kraxel Exp $
++ * $Id: tda8290.c,v 1.7 2005/03/07 12:01:51 kraxel Exp $
+ *
+ * i2c tv tuner chip device driver
+ * controls the philips tda8290+75 tuner chip combo.
+@@ -123,7 +123,7 @@ static int tda8290_tune(struct i2c_clien
+ struct i2c_msg easy_mode =
+ { I2C_ADDR_TDA8290, 0, 2, t->i2c_easy_mode };
+ struct i2c_msg set_freq =
+- { I2C_ADDR_TDA8290, 0, 8, t->i2c_set_freq };
++ { I2C_ADDR_TDA8275, 0, 8, t->i2c_set_freq };
+
+ i2c_transfer(c->adapter, &easy_mode, 1);
+ i2c_transfer(c->adapter, i2c_msg_prolog, ARRAY_SIZE(i2c_msg_prolog));
+===== include/media/tuner.h 1.17 vs 1.18 =====
+--- 1.17/include/media/tuner.h 2005-03-08 13:41:40 +09:00
++++ 1.18/include/media/tuner.h 2005-03-12 05:32:18 +09:00
+@@ -93,6 +93,10 @@
+ #define TUNER_THOMSON_DTT7610 52
+ #define TUNER_PHILIPS_FQ1286 53
+ #define TUNER_PHILIPS_TDA8290 54
++#define TUNER_LG_PAL_TAPE 55 /* Hauppauge PVR-150 PAL */
++
++#define TUNER_PHILIPS_FQ1216AME_MK4 56 /* Hauppauge PVR-150 PAL */
++#define TUNER_PHILIPS_FQ1236A_MK4 57 /* Hauppauge PVR-500MCE NTSC */
+
+ #define NOTUNER 0
+ #define PAL 1 /* PAL_BG */
+===== drivers/media/video/tuner-simple.c 1.1 vs 1.2 =====
+--- 1.1/drivers/media/video/tuner-simple.c 2005-03-09 02:55:29 +09:00
++++ 1.2/drivers/media/video/tuner-simple.c 2005-03-12 05:32:18 +09:00
+@@ -1,5 +1,5 @@
+ /*
+- * $Id: tuner-simple.c,v 1.4 2005/02/15 15:59:35 kraxel Exp $
++ * $Id: tuner-simple.c,v 1.10 2005/03/08 08:38:00 kraxel Exp $
+ *
+ * i2c tv tuner chip device driver
+ * controls all those simple 4-control-bytes style tuners.
+@@ -204,6 +204,13 @@ static struct tunertype tuners[] = {
+ 16*160.00,16*454.00,0x41,0x42,0x04,0x8e,940}, // UHF band untested
+ { "tda8290+75", Philips,PAL|NTSC,
+ /* see tda8290.c for details */ },
++ { "LG PAL (TAPE series)", LGINNOTEK, PAL,
++ 16*170.00, 16*450.00, 0x01,0x02,0x08,0xce,623},
++
++ { "Philips PAL/SECAM multi (FQ1216AME MK4)", Philips, PAL,
++ 16*160.00,16*442.00,0x01,0x02,0x04,0xce,623 },
++ { "Philips FQ1236A MK4", Philips, NTSC,
++ 16*160.00,16*442.00,0x01,0x02,0x04,0x8e,732 },
+
+ };
+ unsigned const int tuner_count = ARRAY_SIZE(tuners);
Added: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-media-video-v4l-mpeg-support.patch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-media-video-v4l-mpeg-support.patch 2005-03-31 08:00:52 UTC (rev 2869)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-media-video-v4l-mpeg-support.patch 2005-03-31 09:59:06 UTC (rev 2870)
@@ -0,0 +1,201 @@
+# origin: kraxel (BitKeeper)
+# cset: 1.2009.15.46 (2.6) key=423319c4qwfw4CUTlxpdFDt7aZsCcA
+# URL: http://linux.bkbits.net:8080/linux-2.6/cset@423319c4qwfw4CUTlxpdFDt7aZsCcA
+# inclusion: upstream
+# descrition: [PATCH] v4l2 api: mpeg encoder support
+# revision date: Thu, 31 Mar 2005 18:07:34 +0900
+#
+# S rset: ChangeSet|1.2009.15.45..1.2009.15.46
+# I rset: include/linux/videodev2.h|1.12..1.13
+#
+# Key:
+# S: Skipped ChangeSet file only
+# O: Original Followed by Updated
+# U: Updated Included with updated range of versions
+# I: Included Included verbatim
+# E: Excluded Excluded on request from user
+# D: Deleted Manually deleted by subsequent user edit
+# R: Revised Manually revised by subsequent user edit
+#
+#
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/03/12 08:33:08-08:00 kraxel@bytesex.org
+# [PATCH] v4l2 api: mpeg encoder support
+#
+# Add a ioctl to set mpeg hardware encoder parameters.
+#
+# Signed-off-by: Gerd Knorr <kraxel@bytesex.org>
+# Signed-off-by: Andrew Morton <akpm@osdl.org>
+# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+#
+# include/linux/videodev2.h
+# 2005/03/11 12:32:22-08:00 kraxel@bytesex.org +86 -58
+# v4l2 api: mpeg encoder support
+#
+#
+===== include/linux/videodev2.h 1.12 vs 1.13 =====
+--- 1.12/include/linux/videodev2.h 2005-01-26 06:50:26 +09:00
++++ 1.13/include/linux/videodev2.h 2005-03-12 05:32:22 +09:00
+@@ -268,64 +268,92 @@ struct v4l2_timecode
+ /* The above is based on SMPTE timecodes */
+
+
++#if 1
+ /*
+- * C O M P R E S S I O N P A R A M E T E R S
++ * M P E G C O M P R E S S I O N P A R A M E T E R S
++ *
++ * ### WARNING: this is still work-in-progress right now, most likely
++ * ### there will be some incompatible changes.
++ *
+ */
+-#if 0
+-/* ### generic compression settings don't work, there is too much
+- * ### codec-specific stuff. Maybe reuse that for MPEG codec settings
+- * ### later ... */
+-struct v4l2_compression
+-{
+- __u32 quality;
+- __u32 keyframerate;
+- __u32 pframerate;
+- __u32 reserved[5];
+-
+-/* what we'll need for MPEG, extracted from some postings on
+- the v4l list (Gert Vervoort, PlasmaJohn).
+-
+-system stream:
+- - type: elementary stream(ES), packatised elementary stream(s) (PES)
+- program stream(PS), transport stream(TS)
+- - system bitrate
+- - PS packet size (DVD: 2048 bytes, VCD: 2324 bytes)
+- - TS video PID
+- - TS audio PID
+- - TS PCR PID
+- - TS system information tables (PAT, PMT, CAT, NIT and SIT)
+- - (MPEG-1 systems stream vs. MPEG-2 program stream (TS not supported
+- by MPEG-1 systems)
+-
+-audio:
+- - type: MPEG (+Layer I,II,III), AC-3, LPCM
+- - bitrate
+- - sampling frequency (DVD: 48 Khz, VCD: 44.1 KHz, 32 kHz)
+- - Trick Modes? (ff, rew)
+- - Copyright
+- - Inverse Telecine
+-
+-video:
+- - picturesize (SIF, 1/2 D1, 2/3 D1, D1) and PAL/NTSC norm can be set
+- through excisting V4L2 controls
+- - noise reduction, parameters encoder specific?
+- - MPEG video version: MPEG-1, MPEG-2
+- - GOP (Group Of Pictures) definition:
+- - N: number of frames per GOP
+- - M: distance between reference (I,P) frames
+- - open/closed GOP
+- - quantiser matrix: inter Q matrix (64 bytes) and intra Q matrix (64 bytes)
+- - quantiser scale: linear or logarithmic
+- - scanning: alternate or zigzag
+- - bitrate mode: CBR (constant bitrate) or VBR (variable bitrate).
+- - target video bitrate for CBR
+- - target video bitrate for VBR
+- - maximum video bitrate for VBR - min. quantiser value for VBR
+- - max. quantiser value for VBR
+- - adaptive quantisation value
+- - return the number of bytes per GOP or bitrate for bitrate monitoring
+
+-*/
++
++enum v4l2_bitrate_mode {
++ V4L2_BITRATE_NONE = 0, /* not specified */
++ V4L2_BITRATE_CBR, /* constant bitrate */
++ V4L2_BITRATE_VBR, /* variable bitrate */
++};
++struct v4l2_bitrate {
++ /* rates are specified in kbit/sec */
++ enum v4l2_bitrate_mode mode;
++ __u32 min;
++ __u32 target; /* use this one for CBR */
++ __u32 max;
++};
++
++enum v4l2_mpeg_streamtype {
++ V4L2_MPEG_SS_1, /* MPEG-1 system stream */
++ V4L2_MPEG_PS_2, /* MPEG-2 program stream */
++ V4L2_MPEG_TS_2, /* MPEG-2 transport stream */
++ V4L2_MPEG_PS_DVD, /* MPEG-2 program stream with DVD header fixups */
++};
++enum v4l2_mpeg_audiotype {
++ V4L2_MPEG_AU_2_I, /* MPEG-2 layer 1 */
++ V4L2_MPEG_AU_2_II, /* MPEG-2 layer 2 */
++ V4L2_MPEG_AU_2_III, /* MPEG-2 layer 3 */
++ V4L2_MPEG_AC3, /* AC3 */
++ V4L2_MPEG_LPCM, /* LPCM */
++};
++enum v4l2_mpeg_videotype {
++ V4L2_MPEG_VI_1, /* MPEG-1 */
++ V4L2_MPEG_VI_2, /* MPEG-2 */
++};
++enum v4l2_mpeg_aspectratio {
++ V4L2_MPEG_ASPECT_SQUARE = 1, /* square pixel */
++ V4L2_MPEG_ASPECT_4_3 = 2, /* 4 : 3 */
++ V4L2_MPEG_ASPECT_16_9 = 3, /* 16 : 9 */
++ V4L2_MPEG_ASPECT_1_221 = 4, /* 1 : 2,21 */
++};
++
++struct v4l2_mpeg_compression {
++ /* general */
++ enum v4l2_mpeg_streamtype st_type;
++ struct v4l2_bitrate st_bitrate;
++
++ /* transport streams */
++ __u16 ts_pid_pmt;
++ __u16 ts_pid_audio;
++ __u16 ts_pid_video;
++ __u16 ts_pid_pcr;
++
++ /* program stream */
++ __u16 ps_size;
++ __u16 reserved_1; /* align */
++
++ /* audio */
++ enum v4l2_mpeg_audiotype au_type;
++ struct v4l2_bitrate au_bitrate;
++ __u32 au_sample_rate;
++ __u8 au_pesid;
++ __u8 reserved_2[3]; /* align */
++
++ /* video */
++ enum v4l2_mpeg_videotype vi_type;
++ enum v4l2_mpeg_aspectratio vi_aspect_ratio;
++ struct v4l2_bitrate vi_bitrate;
++ __u32 vi_frame_rate;
++ __u16 vi_frames_per_gop;
++ __u16 vi_bframes_count;
++ __u8 vi_pesid;
++ __u8 reserved_3[3]; /* align */
++
++ /* misc flags */
++ __u32 closed_gops:1;
++ __u32 pulldown:1;
++ __u32 reserved_4:30; /* align */
++
++ /* I don't expect the above being perfect yet ;) */
++ __u32 reserved_5[8];
+ };
+ #endif
+
+@@ -841,9 +869,9 @@ struct v4l2_streamparm
+ #define VIDIOC_ENUM_FMT _IOWR ('V', 2, struct v4l2_fmtdesc)
+ #define VIDIOC_G_FMT _IOWR ('V', 4, struct v4l2_format)
+ #define VIDIOC_S_FMT _IOWR ('V', 5, struct v4l2_format)
+-#if 0
+-#define VIDIOC_G_COMP _IOR ('V', 6, struct v4l2_compression)
+-#define VIDIOC_S_COMP _IOW ('V', 7, struct v4l2_compression)
++#if 1 /* experimental */
++#define VIDIOC_G_MPEGCOMP _IOR ('V', 6, struct v4l2_mpeg_compression)
++#define VIDIOC_S_MPEGCOMP _IOW ('V', 7, struct v4l2_mpeg_compression)
+ #endif
+ #define VIDIOC_REQBUFS _IOWR ('V', 8, struct v4l2_requestbuffers)
+ #define VIDIOC_QUERYBUF _IOWR ('V', 9, struct v4l2_buffer)
Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-2
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-2 2005-03-31 08:00:52 UTC (rev 2869)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-2 2005-03-31 09:59:06 UTC (rev 2870)
@@ -12,3 +12,7 @@
X drivers/scsi/qla2xxx/Kconfig
+ qla2xxx-removed.patch
+ drivers-media-video-saa7134-update.patch
++ drivers-media-video-tuner-update-1.patch
++ drivers-media-video-tuner-update-2.patch
++ drivers-media-video-v4l-mpeg-support.patch
+