aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134-cards.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-10-03 07:01:26 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-29 08:16:28 -0200
commitf0551efc77b0f34a93a14d2bf96051612e352a39 (patch)
treec8646df928ebca0572fe1ce8046a6470a5e976d4 /drivers/media/video/saa7134/saa7134-cards.c
parent68541cdaadecbc280cd50122f11fdbb249a2ae29 (diff)
downloadkernel_samsung_espresso10-f0551efc77b0f34a93a14d2bf96051612e352a39.zip
kernel_samsung_espresso10-f0551efc77b0f34a93a14d2bf96051612e352a39.tar.gz
kernel_samsung_espresso10-f0551efc77b0f34a93a14d2bf96051612e352a39.tar.bz2
[media] Add DVB support for SAA7134_BOARD_KWORLD_PCI_SBTVD_FULLSEG
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-cards.c')
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 58c8c03..ff23e6e 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -5179,12 +5179,23 @@ struct saa7134_board saa7134_boards[] = {
[SAA7134_BOARD_KWORLD_PCI_SBTVD_FULLSEG] = {
.name = "Kworld PCI SBTVD/ISDB-T Full-Seg Hybrid",
.audio_clock = 0x00187de7,
+#if 0
+ /*
+ * FIXME: Analog mode doesn't work, if digital is enabled. The proper
+ * fix is to use tda8290 driver, but Kworld seems to use an
+ * unsupported version of tda8295.
+ */
.tuner_type = TUNER_NXP_TDA18271, /* TUNER_PHILIPS_TDA8290 */
- .radio_type = UNSET,
.tuner_addr = 0x60,
+#else
+ .tuner_type = UNSET,
+ .tuner_addr = ADDR_UNSET,
+#endif
+ .radio_type = UNSET,
.radio_addr = ADDR_UNSET,
.gpiomask = 0x8e054000,
.mpeg = SAA7134_MPEG_DVB,
+ .ts_type = SAA7134_MPEG_TS_PARALLEL,
.inputs = { {
.name = name_tv,
.vmux = 1,
@@ -7623,16 +7634,6 @@ int saa7134_board_init2(struct saa7134_dev *dev)
{0x45, 0x97},
{0x45, 0xc1},
};
-
- saa_writel(SAA7134_GPIO_GPMODE0 >> 2, 0x0000);
- saa_writel(SAA7134_GPIO_GPSTATUS0 >> 2, 0x0000);
- saa_writel(SAA7134_GPIO_GPMODE0 >> 2, 0x0000);
- saa_writel(SAA7134_GPIO_GPMODE0 >> 2, 0x4000);
- saa_writel(SAA7134_GPIO_GPSTATUS0 >> 2, 0x0000);
- saa_writel(SAA7134_GPIO_GPMODE0 >> 2, 0x4000);
- saa_writel(SAA7134_GPIO_GPSTATUS0 >> 2, 0x4000);
- saa_writel(SAA7134_GPIO_GPMODE0 >> 2, 0x4000);
- saa_writel(SAA7134_GPIO_GPSTATUS0 >> 2, 0x0000);
saa_writel(SAA7134_GPIO_GPMODE0 >> 2, 0x4000);
saa_writel(SAA7134_GPIO_GPSTATUS0 >> 2, 0x4000);