summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Knorr <devnull@localhost>2004-11-22 18:10:55 +0000
committerGerd Knorr <devnull@localhost>2004-11-22 18:10:55 +0000
commitabccbffb04ea8eb0f90bec0077b06f1215e6875e (patch)
treef00a57974cba142d7072413d10420f4411f89986
parentae8a1a4fd0b3006214448772adff3b04fc88d57a (diff)
downloadmediapointer-dvb-s2-abccbffb04ea8eb0f90bec0077b06f1215e6875e.tar.gz
mediapointer-dvb-s2-abccbffb04ea8eb0f90bec0077b06f1215e6875e.tar.bz2
- saa7134: misc card-specific tweaks + new entries.
Diffstat
-rw-r--r--linux/drivers/media/video/saa6752hs.c6
-rw-r--r--linux/drivers/media/video/saa7134/saa6752hs.c6
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-cards.c97
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-input.c3
-rw-r--r--linux/drivers/media/video/saa7134/saa7134.h4
-rw-r--r--linux/drivers/media/video/tda9887.c1
6 files changed, 99 insertions, 18 deletions
diff --git a/linux/drivers/media/video/saa6752hs.c b/linux/drivers/media/video/saa6752hs.c
index d37215ebb..cea922a8b 100644
--- a/linux/drivers/media/video/saa6752hs.c
+++ b/linux/drivers/media/video/saa6752hs.c
@@ -262,8 +262,8 @@ static int saa6752hs_set_bitrate(struct i2c_client* client,
}
-static int saa6752hs_set_params(struct i2c_client* client,
- struct v4l2_mpeg_compression* params)
+static void saa6752hs_set_params(struct i2c_client* client,
+ struct v4l2_mpeg_compression* params)
{
struct saa6752hs_state *h = i2c_get_clientdata(client);
@@ -459,7 +459,7 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)
saa6752hs_init(client);
break;
}
- err = saa6752hs_set_params(client, params);
+ saa6752hs_set_params(client, params);
/* fall through */
case VIDIOC_G_MPEGCOMP:
*params = h->params;
diff --git a/linux/drivers/media/video/saa7134/saa6752hs.c b/linux/drivers/media/video/saa7134/saa6752hs.c
index d37215ebb..cea922a8b 100644
--- a/linux/drivers/media/video/saa7134/saa6752hs.c
+++ b/linux/drivers/media/video/saa7134/saa6752hs.c
@@ -262,8 +262,8 @@ static int saa6752hs_set_bitrate(struct i2c_client* client,
}
-static int saa6752hs_set_params(struct i2c_client* client,
- struct v4l2_mpeg_compression* params)
+static void saa6752hs_set_params(struct i2c_client* client,
+ struct v4l2_mpeg_compression* params)
{
struct saa6752hs_state *h = i2c_get_clientdata(client);
@@ -459,7 +459,7 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)
saa6752hs_init(client);
break;
}
- err = saa6752hs_set_params(client, params);
+ saa6752hs_set_params(client, params);
/* fall through */
case VIDIOC_G_MPEGCOMP:
*params = h->params;
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c
index 7f0b0a477..1b211911e 100644
--- a/linux/drivers/media/video/saa7134/saa7134-cards.c
+++ b/linux/drivers/media/video/saa7134/saa7134-cards.c
@@ -1,5 +1,5 @@
/*
- * $Id: saa7134-cards.c,v 1.41 2004/11/19 18:07:12 kraxel Exp $
+ * $Id: saa7134-cards.c,v 1.42 2004/11/22 18:10:55 kraxel Exp $
*
* device driver for philips saa7134 based TV cards
* card-specific stuff.
@@ -1108,23 +1108,23 @@ struct saa7134_board saa7134_boards[] = {
.name = name_svideo,
.vmux = 8,
.amux = LINE1,
- .gpio = 0x00080
+ .gpio = 0x00080,
},{
.name = name_comp1,
.vmux = 3,
.amux = LINE1,
- .gpio = 0x00080
+ .gpio = 0x00080,
},{
.name = name_tv,
.vmux = 1,
.amux = LINE2,
.tv = 1,
- .gpio = 0x00080
+ .gpio = 0x00080,
}},
.radio = {
- .name = name_radio,
- .amux = LINE2,
- .gpio = 0x80000
+ .name = name_radio,
+ .amux = LINE2,
+ .gpio = 0x80000,
},
.mute = {
.name = name_mute,
@@ -1275,7 +1275,8 @@ struct saa7134_board saa7134_boards[] = {
[SAA7134_BOARD_CINERGY400_CARDBUS] = {
.name = "Terratec Cinergy 400 mobile",
.audio_clock = 0x187de7,
- .tuner_type = UNSET /* not supported yet :/ */,
+ .tuner_type = TUNER_ALPS_TSBE5_PAL,
+ .tda9887_conf = TDA9887_PRESENT,
.inputs = {{
.name = name_tv,
.vmux = 5,
@@ -1290,6 +1291,68 @@ struct saa7134_board saa7134_boards[] = {
.amux = LINE1,
}},
},
+ [SAA7134_BOARD_CINERGY600_MK3] = {
+ .name = "Terratec Cinergy 600 TV MK3",
+ .audio_clock = 0x00200000,
+ .tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
+ .tda9887_conf = TDA9887_PRESENT,
+ .inputs = {{
+ .name = name_tv,
+ .vmux = 1,
+ .amux = TV,
+ .tv = 1,
+ },{
+ .name = name_comp1,
+ .vmux = 4,
+ .amux = LINE1,
+ },{
+ .name = name_svideo,
+ .vmux = 8,
+ .amux = LINE1,
+ },{
+ .name = name_comp2, // CVideo over SVideo Connector
+ .vmux = 0,
+ .amux = LINE1,
+ }},
+ .radio = {
+ .name = name_radio,
+ .amux = LINE2,
+ },
+ },
+ [SAA7134_BOARD_VIDEOMATE_GOLD_PLUS] = {
+ /* Dylan Walkden <dylan_walkden@hotmail.com> */
+ .name = "Compro VideoMate Gold+ Pal",
+ .audio_clock = 0x00187de7,
+ .tuner_type = TUNER_PHILIPS_PAL,
+ .gpiomask = 0x1ce780,
+ .inputs = {{
+ .name = name_svideo,
+ .vmux = 0, // CVideo over SVideo Connector - ok?
+ .amux = LINE1,
+ .gpio = 0x008080,
+ },{
+ .name = name_comp1,
+ .vmux = 3,
+ .amux = LINE1,
+ .gpio = 0x008080,
+ },{
+ .name = name_tv,
+ .vmux = 1,
+ .amux = TV,
+ .tv = 1,
+ .gpio = 0x008080,
+ }},
+ .radio = {
+ .name = name_radio,
+ .amux = LINE2,
+ .gpio = 0x80000,
+ },
+ .mute = {
+ .name = name_mute,
+ .amux = LINE2,
+ .gpio = 0x0c8000,
+ },
+ },
};
const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -1334,6 +1397,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
.subdevice = 0x1143,
.driver_data = SAA7134_BOARD_CINERGY600,
},{
+ .vendor = PCI_VENDOR_ID_PHILIPS,
+ .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
+ .subvendor = 0x153B,
+ .subdevice = 0x1158,
+ .driver_data = SAA7134_BOARD_CINERGY600_MK3,
+ },{
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
.subvendor = 0x153b,
@@ -1538,9 +1607,15 @@ struct pci_device_id saa7134_pci_tbl[] = {
},{
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
- .subvendor = 0x1461, /* Avermedia Technologies Inc */
- .subdevice = 0x9715,
+ .subvendor = 0x1461, /* Avermedia Technologies Inc */
+ .subdevice = 0x9715,
.driver_data = SAA7134_BOARD_AVERMEDIA_307,
+ },{
+ .vendor = PCI_VENDOR_ID_PHILIPS,
+ .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
+ .subvendor = 0x185b,
+ .subdevice = 0xc200,
+ .driver_data = SAA7134_BOARD_VIDEOMATE_GOLD_PLUS,
},{
/* --- boards without eeprom + subsystem ID --- */
@@ -1655,6 +1730,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
break;
case SAA7134_BOARD_CINERGY400:
case SAA7134_BOARD_CINERGY600:
+ case SAA7134_BOARD_CINERGY600_MK3:
case SAA7134_BOARD_ECS_TVP3XP:
case SAA7134_BOARD_ECS_TVP3XP_4CB5:
case SAA7134_BOARD_MD2819:
@@ -1676,6 +1752,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
/* power-up tuner chip */
saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, 0x00040000, 0x00040000);
saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x00040000, 0x00000000);
+ msleep(1);
break;
}
if (dev->has_remote)
diff --git a/linux/drivers/media/video/saa7134/saa7134-input.c b/linux/drivers/media/video/saa7134/saa7134-input.c
index b925aad68..54d42d1f0 100644
--- a/linux/drivers/media/video/saa7134/saa7134-input.c
+++ b/linux/drivers/media/video/saa7134/saa7134-input.c
@@ -1,5 +1,5 @@
/*
- * $Id: saa7134-input.c,v 1.13 2004/11/10 11:07:24 kraxel Exp $
+ * $Id: saa7134-input.c,v 1.14 2004/11/22 18:10:55 kraxel Exp $
*
* handle saa7134 IR remotes via linux kernel input layer.
*
@@ -335,6 +335,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
break;
case SAA7134_BOARD_CINERGY400:
case SAA7134_BOARD_CINERGY600:
+ case SAA7134_BOARD_CINERGY600_MK3:
ir_codes = cinergy_codes;
mask_keycode = 0x00003f;
mask_keyup = 0x040000;
diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h
index 2d7c95892..a14445fe4 100644
--- a/linux/drivers/media/video/saa7134/saa7134.h
+++ b/linux/drivers/media/video/saa7134/saa7134.h
@@ -1,5 +1,5 @@
/*
- * $Id: saa7134.h,v 1.29 2004/11/19 18:07:12 kraxel Exp $
+ * $Id: saa7134.h,v 1.30 2004/11/22 18:10:55 kraxel Exp $
*
* v4l2 device driver for philips saa7134 based TV cards
*
@@ -188,6 +188,8 @@ struct saa7134_format {
#define SAA7134_BOARD_AVERMEDIA_307 45
#define SAA7134_BOARD_AVERMEDIA_CARDBUS 46
#define SAA7134_BOARD_CINERGY400_CARDBUS 47
+#define SAA7134_BOARD_CINERGY600_MK3 48
+#define SAA7134_BOARD_VIDEOMATE_GOLD_PLUS 49
#define SAA7134_MAXBOARDS 8
#define SAA7134_INPUT_MAX 8
diff --git a/linux/drivers/media/video/tda9887.c b/linux/drivers/media/video/tda9887.c
index b9c11ca25..d63e466b4 100644
--- a/linux/drivers/media/video/tda9887.c
+++ b/linux/drivers/media/video/tda9887.c
@@ -35,6 +35,7 @@
/* Addresses to scan */
static unsigned short normal_i2c[] = {
+ 0x84 >>1,
0x86 >>1,
0x96 >>1,
I2C_CLIENT_END,
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-08 19:40:17 +0000