diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-30 03:08:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-30 03:08:53 -0400 |
commit | 664a41b8a91bf78a01a751e15175e0008977685a (patch) | |
tree | d9dc15c83400ad2dfb430ff27ae3e7fdc9395856 /drivers/media/video/saa7134/saa7134-dvb.c | |
parent | 983236b5741e557451f3ed4ec5ebf1f62a5b2c15 (diff) | |
parent | ee2ce3a0b43d14d792d34cf88e7bc2091096744b (diff) |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (430 commits)
[media] ir-mce_kbd-decoder: include module.h for its facilities
[media] ov5642: include module.h for its facilities
[media] em28xx: Fix DVB-C maxsize for em2884
[media] tda18271c2dd: Fix saw filter configuration for DVB-C @6MHz
[media] v4l: mt9v032: Fix Bayer pattern
[media] V4L: mt9m111: rewrite set_pixfmt
[media] V4L: mt9m111: fix missing return value check mt9m111_reg_clear
[media] V4L: initial driver for ov5642 CMOS sensor
[media] V4L: sh_mobile_ceu_camera: fix Oops when USERPTR mapping fails
[media] V4L: soc-camera: remove soc-camera bus and devices on it
[media] V4L: soc-camera: un-export the soc-camera bus
[media] V4L: sh_mobile_csi2: switch away from using the soc-camera bus notifier
[media] V4L: add media bus configuration subdev operations
[media] V4L: soc-camera: group struct field initialisations together
[media] V4L: soc-camera: remove now unused soc-camera specific PM hooks
[media] V4L: pxa-camera: switch to using standard PM hooks
[media] NetUP Dual DVB-T/C CI RF: force card hardware revision by module param
[media] Don't OOPS if videobuf_dvb_get_frontend return NULL
[media] NetUP Dual DVB-T/C CI RF: load firmware according card revision
[media] omap3isp: Support configurable HS/VS polarities
...
Fix up conflicts:
- arch/arm/mach-omap2/board-rx51-peripherals.c:
cleanup regulator supply definitions in mach-omap2
vs
OMAP3: RX-51: define vdds_csib regulator supply
- drivers/staging/tm6000/tm6000-alsa.c (trivial)
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-dvb.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-dvb.c | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c index 996a206c6d7..1e4ef166988 100644 --- a/drivers/media/video/saa7134/saa7134-dvb.c +++ b/drivers/media/video/saa7134/saa7134-dvb.c | |||
@@ -56,6 +56,7 @@ | |||
56 | #include "lgs8gxx.h" | 56 | #include "lgs8gxx.h" |
57 | 57 | ||
58 | #include "zl10353.h" | 58 | #include "zl10353.h" |
59 | #include "qt1010.h" | ||
59 | 60 | ||
60 | #include "zl10036.h" | 61 | #include "zl10036.h" |
61 | #include "zl10039.h" | 62 | #include "zl10039.h" |
@@ -939,6 +940,18 @@ static struct zl10353_config behold_x7_config = { | |||
939 | .disable_i2c_gate_ctrl = 1, | 940 | .disable_i2c_gate_ctrl = 1, |
940 | }; | 941 | }; |
941 | 942 | ||
943 | static struct zl10353_config videomate_t750_zl10353_config = { | ||
944 | .demod_address = 0x0f, | ||
945 | .no_tuner = 1, | ||
946 | .parallel_ts = 1, | ||
947 | .disable_i2c_gate_ctrl = 1, | ||
948 | }; | ||
949 | |||
950 | static struct qt1010_config videomate_t750_qt1010_config = { | ||
951 | .i2c_address = 0x62 | ||
952 | }; | ||
953 | |||
954 | |||
942 | /* ================================================================== | 955 | /* ================================================================== |
943 | * tda10086 based DVB-S cards, helper functions | 956 | * tda10086 based DVB-S cards, helper functions |
944 | */ | 957 | */ |
@@ -1650,6 +1663,18 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1650 | __func__); | 1663 | __func__); |
1651 | 1664 | ||
1652 | break; | 1665 | break; |
1666 | case SAA7134_BOARD_VIDEOMATE_T750: | ||
1667 | fe0->dvb.frontend = dvb_attach(zl10353_attach, | ||
1668 | &videomate_t750_zl10353_config, | ||
1669 | &dev->i2c_adap); | ||
1670 | if (fe0->dvb.frontend != NULL) { | ||
1671 | if (dvb_attach(qt1010_attach, | ||
1672 | fe0->dvb.frontend, | ||
1673 | &dev->i2c_adap, | ||
1674 | &videomate_t750_qt1010_config) == NULL) | ||
1675 | wprintk("error attaching QT1010\n"); | ||
1676 | } | ||
1677 | break; | ||
1653 | case SAA7134_BOARD_ZOLID_HYBRID_PCI: | 1678 | case SAA7134_BOARD_ZOLID_HYBRID_PCI: |
1654 | fe0->dvb.frontend = dvb_attach(tda10048_attach, | 1679 | fe0->dvb.frontend = dvb_attach(tda10048_attach, |
1655 | &zolid_tda10048_config, | 1680 | &zolid_tda10048_config, |