Merge omap-drivers

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

diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index 6bead729e96a84d24df0e4dedf6f3764f587221b..6fd01d79dc4cd8ea35edd95397af45c758d9ffad 100644 (file)
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -117,6 +117,9 @@
 #define I2C_DRIVERID_ISL1208   88      /* Intersil ISL1208 RTC         */
 #define I2C_DRIVERID_WM8731            89      /* Wolfson WM8731 audio codec */
 #define I2C_DRIVERID_WM8750            90      /* Wolfson WM8750 audio codec */
+#define I2C_DRIVERID_WM8753            91      /* Wolfson WM8753 audio codec */
+
+#define I2C_DRIVERID_MISC      99      /* Whatever until sorted out    */
 
 #define I2C_DRIVERID_MISC      99      /* Whatever until sorted out    */
 
@@ -260,8 +263,9 @@
 /* --- MCP107 adapter */
 #define I2C_HW_MPC107          0x0d0000
 
-/* --- Marvell mv64xxx i2c adapter */
+/* --- Embedded adapters */
 #define I2C_HW_MV64XXX         0x190000
+#define I2C_HW_BLACKFIN                0x190001 /* ADI Blackfin I2C TWI driver */
 
 /* --- Miscellaneous adapters */
 #define I2C_HW_SAA7146         0x060000 /* SAA7146 video decoder bus */