From e916f4cd0bb1f1815fcb5b617fa59ac57b4e7eb5 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Sun, 13 May 2007 11:15:24 -0300
Subject: Backport several i2c cleanups from mainstream

From: Mauro Carvalho Chehab <mchehab@infradead.org>

backport commit 2096b956d24c4b5950b808fc23b218425d79ebb1 from David
Brownell <david-b@pacbell.net>

Maybe I've merged also other i2c cleanups here that happened on Kernel.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 linux/include/linux/i2c-id.h    | 4 +++-
 linux/include/media/ovcamchip.h | 1 -
 linux/include/media/tuner.h     | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'linux/include')

diff --git a/linux/include/linux/i2c-id.h b/linux/include/linux/i2c-id.h
index 9c21dc793..aa83d4163 100644
--- a/linux/include/linux/i2c-id.h
+++ b/linux/include/linux/i2c-id.h
@@ -117,6 +117,7 @@
 #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_I2CDEV	900
 #define I2C_DRIVERID_ARP        902    /* SMBus ARP Client              */
@@ -258,8 +259,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 */
diff --git a/linux/include/media/ovcamchip.h b/linux/include/media/ovcamchip.h
index 9813334d6..9ac7da26e 100644
--- a/linux/include/media/ovcamchip.h
+++ b/linux/include/media/ovcamchip.h
@@ -17,7 +17,6 @@
 #include "compat.h"
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
-#include <linux/i2c.h>
 
 /* --------------------------------- */
 /*           ENUMERATIONS            */
diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h
index 27d2183a4..8e1e4738b 100644
--- a/linux/include/media/tuner.h
+++ b/linux/include/media/tuner.h
@@ -23,6 +23,7 @@
 #define _TUNER_H
 
 #include <linux/videodev2.h>
+#include <linux/i2c.h>
 #include <media/tuner-types.h>
 
 extern int tuner_debug;
-- 
cgit v1.2.3