aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorPeter Missel <peter.missel@onlinehome.de>2005-05-01 08:59:05 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-01 08:59:05 -0700
commit0c8b971ebb21dc33271c38d17fd58b8072009dc5 (patch)
tree0c31a9f86da98a45a69c98c728f32b93e0d0dfcf /drivers
parent9a3bb3017383fbb6fe56431d17f60bd0d50f0717 (diff)
[PATCH] LifeView FlyTV Platinum FM: Remote Control support
Subject says it ... this card's IR microcontroller design and attachment are compatible to the company's previous designs, so the patch was as simple as it gets. DESC LifeView FlyTV Platinum FM: GPIO usage EDESC From: Peter Missel <peter.missel@onlinehome.de> This is take two of a patch that should have appeared two days ago, before yesterday's "remote control" patch for the same card. This patch sets unconnected GPIO to Output to keep them from floating (just good driver writing practice, being nice to the chip), and uses GPIO16 to switch TV vs. FM - this pin switches inputs onto the tuner, as well as the audio output from the tuner into the 7135 SIF input. Consequently, FM radio support is being un-commented because it's now working (sort of, see below). These two patches get the card almost fully operational; there appears to be a bug in tda8290.c remaining that puts an offset onto the tuned frequency in FM radio mode. We're investigating. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c1
-rw-r--r--drivers/media/video/saa7134/saa7134-input.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 180d3175ea5..cfe4b57dbd6 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -1948,6 +1948,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
dev->has_remote = 1;
board_flyvideo(dev);
break;
+ case SAA7134_BOARD_FLYTVPLATINUM_FM:
case SAA7134_BOARD_CINERGY400:
case SAA7134_BOARD_CINERGY600:
case SAA7134_BOARD_CINERGY600_MK3:
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index 727d437e07d..ca50cf531f2 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -379,6 +379,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
switch (dev->board) {
case SAA7134_BOARD_FLYVIDEO2000:
case SAA7134_BOARD_FLYVIDEO3000:
+ case SAA7134_BOARD_FLYTVPLATINUM_FM:
ir_codes = flyvideo_codes;
mask_keycode = 0xEC00000;
mask_keydown = 0x0040000;