diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-12-23 19:57:17 +0100 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-12-23 19:57:17 +0100 |
| commit | ac2c9fd519acfcea10f4b1b17b69e9f3d8f49555 (patch) | |
| tree | 3aa28180723e897e8ae6704940ed70d0679ed680 /linux/drivers/media/video/bt8xx/bttv-cards.c | |
| parent | e3ed9d5ccedc1a7a60c7cf106fbfb795448b32ea (diff) | |
| parent | d8fa5b2669acb99dcbc246d93bef9f2028c1aff0 (diff) | |
| download | mediapointer-dvb-s2-ac2c9fd519acfcea10f4b1b17b69e9f3d8f49555.tar.gz mediapointer-dvb-s2-ac2c9fd519acfcea10f4b1b17b69e9f3d8f49555.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/bt8xx/bttv-cards.c')
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-cards.c | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-cards.c b/linux/drivers/media/video/bt8xx/bttv-cards.c index a00228893..aea093419 100644 --- a/linux/drivers/media/video/bt8xx/bttv-cards.c +++ b/linux/drivers/media/video/bt8xx/bttv-cards.c @@ -41,14 +41,10 @@ #include "bttvp.h" #include <media/v4l2-common.h> #include <media/tvaudio.h> -#if 0 /* not working yet */ -#include "bt832.h" -#endif #include "bttv-audio-hook.h" /* fwd decl */ static void boot_msp34xx(struct bttv *btv, int pin); -static void boot_bt832(struct bttv *btv); static void hauppauge_eeprom(struct bttv *btv); static void avermedia_eeprom(struct bttv *btv); static void osprey_eeprom(struct bttv *btv, const u8 ee[256]); @@ -3762,13 +3758,6 @@ void __devinit bttv_init_card2(struct bttv *btv) if (bttv_tvcards[btv->c.type].audio_mode_gpio) btv->audio_mode_gpio=bttv_tvcards[btv->c.type].audio_mode_gpio; - if (bttv_tvcards[btv->c.type].digital_mode == DIGITAL_MODE_CAMERA) { - /* detect Bt832 chip for quartzsight digital camera */ - if ((bttv_I2CRead(btv, I2C_ADDR_BT832_ALT1, "Bt832") >=0) || - (bttv_I2CRead(btv, I2C_ADDR_BT832_ALT2, "Bt832") >=0)) - boot_bt832(btv); - } - if (!autoload) return; @@ -4172,40 +4161,6 @@ static void __devinit boot_msp34xx(struct bttv *btv, int pin) "init [%d]\n", btv->c.nr, pin); } -static void __devinit boot_bt832(struct bttv *btv) -{ -#if 0 /* not working yet */ - int resetbit=0; - - switch (btv->c.type) { - case BTTV_BOARD_PXELVWPLTVPAK: - resetbit = 0x400000; - break; - case BTTV_BOARD_MODTEC_205: - resetbit = 1<<9; - break; - default: - BUG(); - } - - request_module("bt832"); - bttv_call_i2c_clients(btv, BT832_HEXDUMP, NULL); - - printk("bttv%d: Reset Bt832 [line=0x%x]\n",btv->c.nr,resetbit); - gpio_write(0); - gpio_inout(resetbit, resetbit); - udelay(5); - gpio_bits(resetbit, resetbit); - udelay(5); - gpio_bits(resetbit, 0); - udelay(5); - - /* bt832 on pixelview changes from i2c 0x8a to 0x88 after - * being reset as above. So we must follow by this: */ - bttv_call_i2c_clients(btv, BT832_REATTACH, NULL); -#endif -} - /* ----------------------------------------------------------------------- */ /* Imagenation L-Model PXC200 Framegrabber */ /* This is basically the same procedure as |