vserver 2.0 rc7

[linux-2.6.git] / include / linux / i2c-id.h

diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index 8ac11f5..89270ce 100644 (file)
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -20,8 +20,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.               */
 /* ------------------------------------------------------------------------- */
 
-/* $Id: i2c-id.h,v 1.68 2003/02/25 02:55:18 mds Exp $ */
-
 #ifndef LINUX_I2C_ID_H
 #define LINUX_I2C_ID_H
 
@@ -196,11 +194,15 @@
 #define I2C_ALGO_OCP    0x120000       /* IBM or otherwise On-chip I2C algorithm */
 #define I2C_ALGO_BITHS 0x130000        /* enhanced bit style adapters  */
 #define I2C_ALGO_IOP3XX        0x140000        /* XSCALE IOP3XX On-chip I2C alg */
-#define I2C_ALGO_PCA   0x150000        /* PCA 9564 style adapters      */
-
 #define I2C_ALGO_SIBYTE 0x150000       /* Broadcom SiByte SOCs         */
-#define I2C_ALGO_SGI   0x160000        /* SGI algorithm                */
-#define I2C_ALGO_AU1550        0x170000        /* Au1550 PSC algorithm         */
+#define I2C_ALGO_SGI   0x160000        /* SGI algorithm                */
+
+#define I2C_ALGO_USB   0x170000        /* USB algorithm                */
+#define I2C_ALGO_VIRT  0x180000        /* Virtual bus adapter          */
+
+#define I2C_ALGO_MV64XXX 0x190000      /* Marvell mv64xxx i2c ctlr     */
+#define I2C_ALGO_PCA   0x1a0000        /* PCA 9564 style adapters      */
+#define I2C_ALGO_AU1550        0x1b0000        /* Au1550 PSC algorithm         */
 
 #define I2C_ALGO_EXP   0x800000        /* experimental                 */
 
@@ -240,6 +242,7 @@
 #define I2C_HW_B_IXP4XX 0x17   /* GPIO on IXP4XX systems               */
 #define I2C_HW_B_S3VIA 0x18    /* S3Via ProSavage adapter              */
 #define I2C_HW_B_ZR36067 0x19  /* Zoran-36057/36067 based boards       */
+#define I2C_HW_B_PCILYNX 0x1a  /* TI PCILynx I2C adapter               */
 #define I2C_HW_B_CX2388x 0x1b  /* connexant 2388x based tv cards       */
 
 /* --- PCF 8584 based algorithms                                       */
@@ -310,4 +313,7 @@
 /* --- MCP107 adapter */
 #define I2C_HW_MPC107 0x00
 
+/* --- Marvell mv64xxx i2c adapter */
+#define I2C_HW_MV64XXX 0x00
+
 #endif /* LINUX_I2C_ID_H */