diff options
| author | Nickolay V. Shmyrev <devnull@localhost> | 2005-07-01 08:22:24 +0000 |
|---|---|---|
| committer | Nickolay V. Shmyrev <devnull@localhost> | 2005-07-01 08:22:24 +0000 |
| commit | 6913b9a855479fd75506c00df172e6a81e3d4116 (patch) | |
| tree | f7e5b55feb807be7a3d10111b56db60377174389 /linux/drivers/media/video/saa7134 | |
| parent | 8c085981b15c74fd71be6a962cafb5c6fb27475b (diff) | |
| download | mediapointer-dvb-s2-6913b9a855479fd75506c00df172e6a81e3d4116.tar.gz mediapointer-dvb-s2-6913b9a855479fd75506c00df172e6a81e3d4116.tar.bz2 | |
* tuner-core.c:
- Add option to resolve secam norm in tuner.
Signed-Off-By: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
* saa7134-cards.c, saa7134-core.c, saa7134.h:
- Remove irq2_mask field from saa7134_dev structure.
Collect all the bits needed in saa7134_hwinit2() instead.
Signed-Off-By: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to 'linux/drivers/media/video/saa7134')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 6 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 26 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134.h | 3 |
3 files changed, 19 insertions, 16 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index b14c73be5..63d3e36e0 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.75 2005/06/28 23:41:47 mkrufky Exp $ + * $Id: saa7134-cards.c,v 1.76 2005/07/01 08:22:24 nsh Exp $ * * device driver for philips saa7134 based TV cards * card-specific stuff. @@ -2503,10 +2503,6 @@ int saa7134_board_init1(struct saa7134_dev *dev) msleep(1); break; } - if (dev->has_remote) - dev->irq2_mask |= (SAA7134_IRQ2_INTE_GPIO18 | - SAA7134_IRQ2_INTE_GPIO18A | - SAA7134_IRQ2_INTE_GPIO16 ); return 0; } diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index 8fed24e6a..4b53c7f32 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-core.c,v 1.34 2005/06/28 23:41:47 mkrufky Exp $ + * $Id: saa7134-core.c,v 1.35 2005/07/01 08:22:24 nsh Exp $ * * device driver for philips saa7134 based TV cards * driver core @@ -736,14 +736,29 @@ static int saa7134_hwinit1(struct saa7134_dev *dev) /* late init (with i2c + irq) */ static int saa7134_hwinit2(struct saa7134_dev *dev) { + unsigned int irq2_mask; dprintk("hwinit2\n"); saa7134_video_init2(dev); saa7134_tvaudio_init2(dev); /* enable IRQ's */ + irq2_mask = + SAA7134_IRQ2_INTE_DEC3 | + SAA7134_IRQ2_INTE_DEC2 | + SAA7134_IRQ2_INTE_DEC1 | + SAA7134_IRQ2_INTE_DEC0 | + SAA7134_IRQ2_INTE_PE | + SAA7134_IRQ2_INTE_AR; + /*XXX mjt: is this really needed? + * can we enable all them unconditionally? */ + if (dev->has_remote) + irq2_mask |= (SAA7134_IRQ2_INTE_GPIO18 | + SAA7134_IRQ2_INTE_GPIO18A | + SAA7134_IRQ2_INTE_GPIO16 ); + saa_writel(SAA7134_IRQ1, 0); - saa_writel(SAA7134_IRQ2, dev->irq2_mask); + saa_writel(SAA7134_IRQ2, irq2_mask); return 0; } @@ -966,13 +981,6 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, } /* initialize hardware #1 */ - dev->irq2_mask = - SAA7134_IRQ2_INTE_DEC3 | - SAA7134_IRQ2_INTE_DEC2 | - SAA7134_IRQ2_INTE_DEC1 | - SAA7134_IRQ2_INTE_DEC0 | - SAA7134_IRQ2_INTE_PE | - SAA7134_IRQ2_INTE_AR; saa7134_board_init1(dev); saa7134_hwinit1(dev); diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h index 5bebc236d..370c47608 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.47 2005/06/21 03:10:31 mkrufky Exp $ + * $Id: saa7134.h,v 1.48 2005/07/01 08:22:24 nsh Exp $ * * v4l2 device driver for philips saa7134 based TV cards * @@ -425,7 +425,6 @@ struct saa7134_dev { unsigned int tda9887_conf; unsigned int gpio_value; - unsigned int irq2_mask; /* i2c i/o */ struct i2c_adapter i2c_adap; |