Merge git://oak/home/sfr/kernels/iseries/work

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

diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index 44f3087..74abaec 100644 (file)
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -27,10 +27,10 @@
  * ---- Driver types -----------------------------------------------------
  *       device id name + number        function description, i2c address(es)
  *
- *  Range 1000-1999 range is defined in sensors/sensors.h 
- *  Range 0x100 - 0x1ff is for V4L2 Common Components 
+ *  Range 1000-1999 range is defined in sensors/sensors.h
+ *  Range 0x100 - 0x1ff is for V4L2 Common Components
  *  Range 0xf000 - 0xffff is reserved for local experimentation, and should
- *        never be used in official drivers 
+ *        never be used in official drivers
  */
 
 #define I2C_DRIVERID_MSP3400    1
@@ -99,7 +99,14 @@
 #define I2C_DRIVERID_MAX6900   63      /* MAX6900 real-time clock      */
 #define I2C_DRIVERID_SAA7114H  64      /* video decoder                */
 #define I2C_DRIVERID_DS1374    65      /* DS1374 real time clock       */
-
+#define I2C_DRIVERID_TDA9874   66      /* TV sound decoder             */
+#define I2C_DRIVERID_SAA6752HS 67      /* MPEG2 encoder                */
+#define I2C_DRIVERID_TVEEPROM  68      /* TV EEPROM                    */
+#define I2C_DRIVERID_WM8775    69      /* wm8775 audio processor       */
+#define I2C_DRIVERID_CS53L32A  70      /* cs53l32a audio processor     */
+#define I2C_DRIVERID_CX25840   71      /* cx2584x video encoder        */
+#define I2C_DRIVERID_SAA7127   72      /* saa7124 video encoder        */
+#define I2C_DRIVERID_SAA711X   73      /* saa711x video encoders       */
 
 #define I2C_DRIVERID_EXP0      0xF0    /* experimental use id's        */
 #define I2C_DRIVERID_EXP1      0xF1
@@ -111,7 +118,7 @@
 #define I2C_DRIVERID_ARP        902    /* SMBus ARP Client              */
 #define I2C_DRIVERID_ALERT      903    /* SMBus Alert Responder Client  */
 
-/* IDs --   Use DRIVERIDs 1000-1999 for sensors. 
+/* IDs --   Use DRIVERIDs 1000-1999 for sensors.
    These were originally in sensors.h in the lm_sensors package */
 #define I2C_DRIVERID_LM78 1002
 #define I2C_DRIVERID_LM75 1003
@@ -164,10 +171,7 @@
 
 /* --- Bit algorithm adapters                                          */
 #define I2C_HW_B_LP            0x010000 /* Parallel port Philips style */
-#define I2C_HW_B_LPC           0x010001 /* Parallel port control reg. */
 #define I2C_HW_B_SER           0x010002 /* Serial line interface */
-#define I2C_HW_B_ELV           0x010003 /* ELV Card */
-#define I2C_HW_B_VELLE         0x010004 /* Vellemann K8000 */
 #define I2C_HW_B_BT848         0x010005 /* BT848 video boards */
 #define I2C_HW_B_WNV           0x010006 /* Winnov Videums */
 #define I2C_HW_B_VIA           0x010007 /* Via vt82c586b */
@@ -193,6 +197,7 @@
 #define I2C_HW_B_NVIDIA                0x01001c /* nvidia framebuffer driver */
 #define I2C_HW_B_SAVAGE                0x01001d /* savage framebuffer driver */
 #define I2C_HW_B_RADEON                0x01001e /* radeon framebuffer driver */
+#define I2C_HW_B_EM28XX                0x01001f /* em28xx video capture cards */
 
 /* --- PCF 8584 based algorithms                                       */
 #define I2C_HW_P_LP            0x020000 /* Parallel port interface */