V4L/DVB (13795): [Mantis/Hopper] Code overhaul, add Hopper devices into the PCI ID list

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 36 insertions, 4 deletions

diff --git a/drivers/media/dvb/mantis/mantis_reg.h b/drivers/media/dvb/mantis/mantis_reg.h
index 6f5cd4936763..0072e149a561 100644
--- a/drivers/media/dvb/mantis/mantis_reg.h
+++ b/drivers/media/dvb/mantis/mantis_reg.h
@@ -21,7 +21,7 @@
 #ifndef __MANTIS_REG_H
 #define __MANTIS_REG_H
 
-// Interrupts
+/* Interrupts */
 #define MANTIS_INT_STAT                 0x00
 #define MANTIS_INT_MASK                 0x04
 
@@ -49,8 +49,12 @@
 #define MANTIS_INT_RISCI                (0x01 <<  1)
 #define MANTIS_INT_I2CDONE              (0x01 <<  0)
 
-// DMA
+/* DMA */
 #define MANTIS_DMA_CTL                  0x08
+#define MANTIS_GPIF_RD                  (0xff << 24)
+#define MANTIS_GPIF_WR                  (0xff << 16)
+#define MANTIS_CPU_DO                   (0x01 << 10)
+#define MANTIS_DRV_DO                   (0x01 <<  9)
 #define MANTIS_I2C_RD                   (0x01 <<  7)
 #define MANTIS_I2C_WR                   (0x01 <<  6)
 #define MANTIS_DCAP_MODE                (0x01 <<  5)
@@ -61,10 +65,16 @@
 #define MANTIS_DCAP_EN                  (0x01 <<  1)
 #define MANTIS_RISC_EN                  (0x01 <<  0)
 
+/* DEBUG */
+#define MANTIS_DEBUGREG                 0x0c
+#define MANTIS_DATINV                   (0x0e <<  7)
+#define MANTIS_TOP_DEBUGSEL             (0x07 <<  4)
+#define MANTIS_PCMCIA_DEBUGSEL          (0x0f <<  0)
+
 #define MANTIS_RISC_START               0x10
 #define MANTIS_RISC_PC                  0x14
 
-// I2C
+/* I2C */
 #define MANTIS_I2CDATA_CTL              0x18
 #define MANTIS_I2C_RATE_1               (0x00 <<  6)
 #define MANTIS_I2C_RATE_2               (0x01 <<  6)
@@ -73,6 +83,28 @@
 #define MANTIS_I2C_STOP                 (0x01 <<  5)
 #define MANTIS_I2C_PGMODE               (0x01 <<  3)
 
+/* DATA */
+#define MANTIS_CMD_DATA_R1              0x20
+#define MANTIS_CMD_DATA_3               (0xff << 24)
+#define MANTIS_CMD_DATA_2               (0xff << 16)
+#define MANTIS_CMD_DATA_1               (0xff <<  8)
+#define MANTIS_CMD_DATA_0               (0xff <<  0)
+
+#define MANTIS_CMD_DATA_R2              0x24
+#define MANTIS_CMD_DATA_7               (0xff << 24)
+#define MANTIS_CMD_DATA_6               (0xff << 16)
+#define MANTIS_CMD_DATA_5               (0xff <<  8)
+#define MANTIS_CMD_DATA_4               (0xff <<  0)
+
+#define MANTIS_CONTROL                  0x28
+#define MANTIS_DET                      (0x01 <<  7)
+#define MANTIS_DAT_CF_EN                (0x01 <<  6)
+#define MANTIS_ACS                      (0x03 <<  4)
+#define MANTIS_VCCEN                    (0x01 <<  3)
+#define MANTIS_BYPASS                   (0x01 <<  2)
+#define MANTIS_MRST                     (0x01 <<  1)
+#define MANTIS_CRST_INT                 (0x01 <<  0)
+
 #define MANTIS_GPIF_CFGSLA              0x84
 #define MANTIS_GPIF_WAITSMPL            (0x07 << 28)
 #define MANTIS_GPIF_BYTEADDRSUB         (0x01 << 25)
@@ -162,4 +194,4 @@
 #define MANTIS_GPIF_LOGICRD             (0xffff         << 16)
 #define MANTIS_GPIF_LOGICRW             (0xffff         <<  0)
 
-#endif //__MANTIS_REG_H
+#endif /* __MANTIS_REG_H */