patch-2.4.0-prerelease linux/drivers/video/matrox/matroxfb_DAC1064.h

• Lines: 36
• Date: Fri Dec 29 14:07:23 2000
• Orig file: v2.4.0-test12/linux/drivers/video/matrox/matroxfb_DAC1064.h
• Orig date: Wed Jul 5 11:55:45 2000

diff -u --recursive --new-file v2.4.0-test12/linux/drivers/video/matrox/matroxfb_DAC1064.h linux/drivers/video/matrox/matroxfb_DAC1064.h
@@ -63,6 +63,8 @@
 #define      M1064_XPIXCLKCTRL_SRC_PCI		0x00
 #define      M1064_XPIXCLKCTRL_SRC_PLL		0x01
 #define      M1064_XPIXCLKCTRL_SRC_EXT		0x02
+#define	     M1064_XPIXCLKCTRL_SRC_SYS		0x03	/* G200/G400 */
+#define      M1064_XPIXCLKCTRL_SRC_PLL2		0x03	/* G450 */
 #define      M1064_XPIXCLKCTRL_SRC_MASK		0x03
 #define      M1064_XPIXCLKCTRL_EN		0x00
 #define      M1064_XPIXCLKCTRL_DIS		0x04
@@ -132,6 +134,16 @@
 #define M1064_XPIXPLLCP		0x4E
 #define M1064_XPIXPLLSTAT	0x4F
 
+#define M1064_XTVO_IDX		0x87
+#define M1064_XTVO_DATA		0x88
+
+#define M1064_XOUTPUTCONN	0x8A
+#define M1064_X8B		0x8B
+#define M1064_XPIXPLL2STAT	0x8C
+#define M1064_XPIXPLL2P		0x8D
+#define M1064_XPIXPLL2N		0x8E
+#define M1064_XPIXPLL2M		0x8F
+
 enum POS1064 {
 	POS1064_XCURADDL=0, POS1064_XCURADDH, POS1064_XCURCTRL,
 	POS1064_XCURCOL0RED, POS1064_XCURCOL0GREEN, POS1064_XCURCOL0BLUE,
@@ -141,7 +153,8 @@
 	POS1064_XMISCCTRL,
 	POS1064_XGENIOCTRL, POS1064_XGENIODATA, POS1064_XZOOMCTRL, POS1064_XSENSETEST,
 	POS1064_XCRCBITSEL,
-	POS1064_XCOLKEYMASKL, POS1064_XCOLKEYMASKH, POS1064_XCOLKEYL, POS1064_XCOLKEYH };
+	POS1064_XCOLKEYMASKL, POS1064_XCOLKEYMASKH, POS1064_XCOLKEYL, POS1064_XCOLKEYH,
+	POS1064_XOUTPUTCONN };
 
 
 #endif	/* __MATROXFB_DAC1064_H__ */