dirty fix to merging

1 files changed, 61 insertions, 0 deletions

diff --git a/drivers/video/wmt/sw_i2c.h b/drivers/video/wmt/sw_i2c.h
new file mode 100644
index 00000000..ab4b8d4c
--- /dev/null
+++ b/drivers/video/wmt/sw_i2c.h
@@ -0,0 +1,61 @@
+/*++
+ * linux/drivers/video/wmt/sw_i2c.h
+ * WonderMedia video post processor (VPP) driver
+ *
+ * Copyright c 2013  WonderMedia  Technologies, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * WonderMedia Technologies, Inc.
+ * 4F, 533, Chung-Cheng Road, Hsin-Tien, Taipei 231, R.O.C
+--*/
+
+#ifndef _SWI2C_H_
+#define _SWI2C_H_
+
+typedef struct {
+	unsigned int bit_mask;
+	unsigned int gpio_en;
+	unsigned int out_en;
+	unsigned int data_in;
+	unsigned int data_out;
+	unsigned int pull_en_bit_mask;
+	unsigned int pull_en;
+} swi2c_reg_t;
+
+typedef struct {
+	swi2c_reg_t *scl_reg;
+	swi2c_reg_t *sda_reg;
+} swi2c_handle_t;
+
+int wmt_swi2c_read(
+	swi2c_handle_t *handle,
+	char addr,
+	char index,
+	char *buf,
+	int cnt
+);
+
+int wmt_swi2c_write(
+	swi2c_handle_t *handle,
+	char addr,
+	char index,
+	char *buf,
+	int cnt
+);
+
+int wmt_swi2c_check(swi2c_handle_t *handle);
+
+#endif
+