aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@brturbo.com.br>2005-06-24 01:02:43 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-24 03:05:31 -0400
commit391cd727eac2e10be7685efd739a3ea9de87393c (patch)
tree564ac5faefc87d6a8806d56a82d22a0404da0fdc /include/media
parent55f51efdb696ff6e9d2056377d05268a97f3d4e4 (diff)
[PATCH] tuner-core.c improvments and Ymec Tvision TVF8533MF support
tuner-core.c, tuner.h: - tuner-core changed to support multiple I2C devices used on some adapters; - Kconfig now has an option (CONFIG_TUNER_MULTI_I2C) to enable this new behavor; - By default, even enabling CONFIG_TUNER_MULTI_I2C, tuner-core emulates the old behavor, using first I2C device for both FM and TV; - There is a new i2c command (TUNER_SET_ADDR) to allow tuner clients to select I2C address for FM or TV tuner; - Tuner I2C dettach now generates a warning on syslog if failed. tuner-simple.c: - TVision TVF-8531MF and TVF-5533 MF tuner included. It uses, by default, I2C on 0xC2 address for TV and on 0xC0 for Radio. Both TV and FM Radio mode are working. Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/tuner.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/include/media/tuner.h b/include/media/tuner.h
index 156a9c51ffec..6d29d8db0c83 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -98,6 +98,9 @@
98#define TUNER_PHILIPS_FQ1216AME_MK4 56 /* Hauppauge PVR-150 PAL */ 98#define TUNER_PHILIPS_FQ1216AME_MK4 56 /* Hauppauge PVR-150 PAL */
99#define TUNER_PHILIPS_FQ1236A_MK4 57 /* Hauppauge PVR-500MCE NTSC */ 99#define TUNER_PHILIPS_FQ1236A_MK4 57 /* Hauppauge PVR-500MCE NTSC */
100 100
101#define TUNER_YMEC_TVF_8531MF 58
102#define TUNER_YMEC_TVF_5533MF 59 /* Pixelview Pro Ultra NTSC */
103
101#define NOTUNER 0 104#define NOTUNER 0
102#define PAL 1 /* PAL_BG */ 105#define PAL 1 /* PAL_BG */
103#define PAL_I 2 106#define PAL_I 2
@@ -121,8 +124,10 @@
121 124
122#define TUNER_SET_TYPE _IOW('t',1,int) /* set tuner type */ 125#define TUNER_SET_TYPE _IOW('t',1,int) /* set tuner type */
123#define TUNER_SET_TVFREQ _IOW('t',2,int) /* set tv freq */ 126#define TUNER_SET_TVFREQ _IOW('t',2,int) /* set tv freq */
127#define TUNER_SET_ADDR _IOW('T',3,int) /* Chooses tuner I2C address */
124 128
125#define TDA9887_SET_CONFIG _IOW('t',5,int) 129#define TDA9887_SET_CONFIG _IOW('t',5,int)
130
126/* tv card specific */ 131/* tv card specific */
127# define TDA9887_PRESENT (1<<0) 132# define TDA9887_PRESENT (1<<0)
128# define TDA9887_PORT1_INACTIVE (1<<1) 133# define TDA9887_PORT1_INACTIVE (1<<1)
@@ -143,6 +148,11 @@
143#define I2C_ADDR_TDA8290 0x4b 148#define I2C_ADDR_TDA8290 0x4b
144#define I2C_ADDR_TDA8275 0x61 149#define I2C_ADDR_TDA8275 0x61
145 150
151struct tuner_addr {
152 enum v4l2_tuner_type type;
153 unsigned short addr;
154};
155
146struct tuner { 156struct tuner {
147 /* device */ 157 /* device */
148 struct i2c_client i2c; 158 struct i2c_client i2c;