summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-06-10 09:35:42 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-06-10 09:35:42 -0300
commitdfffdefa8b7531ed20b3405952eaf52d72b08c8a (patch)
treecfbb7afac8f40e8199a62620fba71b1e7dfa009a /linux/drivers/media/video
parent042fd0f8605186f16b116dc72310b4b4c86b5669 (diff)
downloadmediapointer-dvb-s2-dfffdefa8b7531ed20b3405952eaf52d72b08c8a.tar.gz
mediapointer-dvb-s2-dfffdefa8b7531ed20b3405952eaf52d72b08c8a.tar.bz2
From: Devin Heitmueller <devin.heitmueller@gmail.com>
Add em2860 chip ID em28xx-cards.c em28xx-reg.h - Add em2860 chip ID (seen on Pointnix Intra-Oral Camera) http://www.pointnix.com/ENG/dental/product_02.asp Signed-off-by: Devin Heitmueller <devin.heitmueller@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-cards.c3
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-reg.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-cards.c b/linux/drivers/media/video/em28xx/em28xx-cards.c
index 4c3da9b9c..df0004b1e 100644
--- a/linux/drivers/media/video/em28xx/em28xx-cards.c
+++ b/linux/drivers/media/video/em28xx/em28xx-cards.c
@@ -572,6 +572,9 @@ void em28xx_pre_card_setup(struct em28xx *dev)
rc = em28xx_read_reg(dev, EM28XX_R0A_CHIPID);
if (rc > 0) {
switch (rc) {
+ case CHIP_ID_EM2860:
+ em28xx_info("chip ID is em2860\n");
+ break;
case CHIP_ID_EM2883:
em28xx_info("chip ID is em2882/em2883\n");
dev->wait_after_write = 0;
diff --git a/linux/drivers/media/video/em28xx/em28xx-reg.h b/linux/drivers/media/video/em28xx/em28xx-reg.h
index 9058bed07..fac1ab23f 100644
--- a/linux/drivers/media/video/em28xx/em28xx-reg.h
+++ b/linux/drivers/media/video/em28xx/em28xx-reg.h
@@ -84,5 +84,6 @@
/* FIXME: Need to be populated with the other chip ID's */
enum em28xx_chip_id {
+ CHIP_ID_EM2860 = 34,
CHIP_ID_EM2883 = 36,
};