diff options
author | Ricardo Cerqueira <v4l@cerqueira.org> | 2005-11-09 00:38:47 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 10:56:30 -0500 |
commit | cb2444dfa203b5b5c76d63c0ce8593e4e0385719 (patch) | |
tree | ee62805570a23eb9d44acfafe01b6657f2cc38d1 /drivers/media/video/saa7134/saa7134-cards.c | |
parent | f1bcef8874ab33b1e517b79a9b9df7309a996877 (diff) |
[PATCH] V4L: 913: saa713x cards with i2c remotes now autoload ir-kbd-i2c
SAA713x cards with i2c remotes now autoload ir-kbd-i2c (disable_ir works, as
it does for GPIO remotes)
Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-cards.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index ac361858901a..135fd59a6b20 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
@@ -3038,7 +3038,7 @@ int saa7134_board_init1(struct saa7134_dev *dev) | |||
3038 | switch (dev->board) { | 3038 | switch (dev->board) { |
3039 | case SAA7134_BOARD_FLYVIDEO2000: | 3039 | case SAA7134_BOARD_FLYVIDEO2000: |
3040 | case SAA7134_BOARD_FLYVIDEO3000: | 3040 | case SAA7134_BOARD_FLYVIDEO3000: |
3041 | dev->has_remote = 1; | 3041 | dev->has_remote = SAA7134_REMOTE_GPIO; |
3042 | board_flyvideo(dev); | 3042 | board_flyvideo(dev); |
3043 | break; | 3043 | break; |
3044 | case SAA7134_BOARD_FLYTVPLATINUM_MINI2: | 3044 | case SAA7134_BOARD_FLYTVPLATINUM_MINI2: |
@@ -3068,7 +3068,7 @@ int saa7134_board_init1(struct saa7134_dev *dev) | |||
3068 | case SAA7134_BOARD_GOTVIEW_7135: | 3068 | case SAA7134_BOARD_GOTVIEW_7135: |
3069 | case SAA7134_BOARD_KWORLD_TERMINATOR: | 3069 | case SAA7134_BOARD_KWORLD_TERMINATOR: |
3070 | case SAA7134_BOARD_PCTV_CARDBUS: | 3070 | case SAA7134_BOARD_PCTV_CARDBUS: |
3071 | dev->has_remote = 1; | 3071 | dev->has_remote = SAA7134_REMOTE_GPIO; |
3072 | break; | 3072 | break; |
3073 | case SAA7134_BOARD_MD5044: | 3073 | case SAA7134_BOARD_MD5044: |
3074 | printk("%s: seems there are two different versions of the MD5044\n" | 3074 | printk("%s: seems there are two different versions of the MD5044\n" |
@@ -3108,6 +3108,11 @@ int saa7134_board_init1(struct saa7134_dev *dev) | |||
3108 | 3108 | ||
3109 | saa_writeb (SAA7134_PRODUCTION_TEST_MODE, 0x00); | 3109 | saa_writeb (SAA7134_PRODUCTION_TEST_MODE, 0x00); |
3110 | break; | 3110 | break; |
3111 | /* i2c remotes */ | ||
3112 | case SAA7134_BOARD_PINNACLE_PCTV_110i: | ||
3113 | case SAA7134_BOARD_UPMOST_PURPLE_TV: | ||
3114 | dev->has_remote = SAA7134_REMOTE_I2C; | ||
3115 | break; | ||
3111 | } | 3116 | } |
3112 | return 0; | 3117 | return 0; |
3113 | } | 3118 | } |