Merge branch 'for-linus' of git://neil.brown.name/md

[pandora-kernel.git] / drivers / media / video / em28xx / em28xx-reg.h

diff --git a/drivers/media/video/em28xx/em28xx-reg.h b/drivers/media/video/em28xx/em28xx-reg.h
index 24e39c5..6bf84bd 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-reg.h
+++ b/drivers/media/video/em28xx/em28xx-reg.h
@@ -27,6 +27,22 @@
 #define EM28XX_CHIPCFG_AC97                    0x10
 #define EM28XX_CHIPCFG_AUDIOMASK               0x30
 
+#define EM28XX_R01_CHIPCFG2    0x01
+
+/* em28xx Chip Configuration 2 0x01 */
+#define EM28XX_CHIPCFG2_TS_PRESENT             0x10
+#define EM28XX_CHIPCFG2_TS_REQ_INTERVAL_MASK   0x0c /* bits 3-2 */
+#define EM28XX_CHIPCFG2_TS_REQ_INTERVAL_1MF    0x00
+#define EM28XX_CHIPCFG2_TS_REQ_INTERVAL_2MF    0x04
+#define EM28XX_CHIPCFG2_TS_REQ_INTERVAL_4MF    0x08
+#define EM28XX_CHIPCFG2_TS_REQ_INTERVAL_8MF    0x0c
+#define EM28XX_CHIPCFG2_TS_PACKETSIZE_MASK     0x03 /* bits 0-1 */
+#define EM28XX_CHIPCFG2_TS_PACKETSIZE_188      0x00
+#define EM28XX_CHIPCFG2_TS_PACKETSIZE_376      0x01
+#define EM28XX_CHIPCFG2_TS_PACKETSIZE_564      0x02
+#define EM28XX_CHIPCFG2_TS_PACKETSIZE_752      0x03
+
+
        /* GPIO/GPO registers */
 #define EM2880_R04_GPO 0x04    /* em2880-em2883 only */
 #define EM28XX_R08_GPIO        0x08    /* em2820 or upper */
@@ -160,7 +176,8 @@
 
 /* FIXME: Need to be populated with the other chip ID's */
 enum em28xx_chip_id {
-       CHIP_ID_EM2820 = 18,    /* Also used by em2710 */
+       CHIP_ID_EM2710 = 17,
+       CHIP_ID_EM2820 = 18,    /* Also used by some em2710 */
        CHIP_ID_EM2840 = 20,
        CHIP_ID_EM2750 = 33,
        CHIP_ID_EM2860 = 34,