diff options
author | Devin Heitmueller <dheitmueller@linuxtv.org> | 2008-12-16 21:15:33 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 06:39:18 -0500 |
commit | b1fa26c66c975bbd3173a45ef673870fd1d52dea (patch) | |
tree | 72f7362e3afbfb540f2eb3754e81a8e12ffef09e /drivers | |
parent | 793927372626bae48b32db24dddde40d73923a9c (diff) |
V4L/DVB (9921): em28xx: add chip id for em2874
Add the em2870 to the list of known em28xx chip ids.
Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 4 | ||||
-rw-r--r-- | drivers/media/video/em28xx/em28xx-reg.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index fecfe170b36e..4b78a03528f5 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c | |||
@@ -1409,6 +1409,10 @@ void em28xx_pre_card_setup(struct em28xx *dev) | |||
1409 | case CHIP_ID_EM2860: | 1409 | case CHIP_ID_EM2860: |
1410 | em28xx_info("chip ID is em2860\n"); | 1410 | em28xx_info("chip ID is em2860\n"); |
1411 | break; | 1411 | break; |
1412 | case CHIP_ID_EM2870: | ||
1413 | em28xx_info("chip ID is em2870\n"); | ||
1414 | dev->wait_after_write = 0; | ||
1415 | break; | ||
1412 | case CHIP_ID_EM2874: | 1416 | case CHIP_ID_EM2874: |
1413 | em28xx_info("chip ID is em2874\n"); | 1417 | em28xx_info("chip ID is em2874\n"); |
1414 | dev->reg_gpio_num = EM2874_R80_GPIO; | 1418 | dev->reg_gpio_num = EM2874_R80_GPIO; |
diff --git a/drivers/media/video/em28xx/em28xx-reg.h b/drivers/media/video/em28xx/em28xx-reg.h index 45d588c3a6c5..a459b7c6a6c9 100644 --- a/drivers/media/video/em28xx/em28xx-reg.h +++ b/drivers/media/video/em28xx/em28xx-reg.h | |||
@@ -151,6 +151,7 @@ enum em28xx_chip_id { | |||
151 | CHIP_ID_EM2840 = 20, | 151 | CHIP_ID_EM2840 = 20, |
152 | CHIP_ID_EM2750 = 33, | 152 | CHIP_ID_EM2750 = 33, |
153 | CHIP_ID_EM2860 = 34, | 153 | CHIP_ID_EM2860 = 34, |
154 | CHIP_ID_EM2870 = 35, | ||
154 | CHIP_ID_EM2883 = 36, | 155 | CHIP_ID_EM2883 = 36, |
155 | CHIP_ID_EM2874 = 65, | 156 | CHIP_ID_EM2874 = 65, |
156 | }; | 157 | }; |