From 43ab4185e9e5c5b27a25bda26be5ccd24c5e6069 Mon Sep 17 00:00:00 2001 From: Charlie Huang Date: Wed, 31 Aug 2011 19:17:19 -0700 Subject: video: tegra: ov9726: follow linux convention move the set mode table from odm driver to the kernel driver. Bug 856739 Original Gerrit: http://git-master/r/#change,60741 (cherry picked from commit 18e2d9f8b61767a4dc0df7621531d1b040fe3ca0) Change-Id: I22fd3e012c3f91a0c7cd07a00ae25987b4cb75dd Reviewed-on: http://git-master/r/61666 Reviewed-by: Charlie Huang Tested-by: Charlie Huang Reviewed-by: Frank Chen Reviewed-by: Jon Mayo Reviewed-by: Yu-Huan Hsu Rebase-Id: R75397527d8b9b33c186b71d87866f8ca5ab2f9c3 --- include/media/ov9726.h | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'include/media') diff --git a/include/media/ov9726.h b/include/media/ov9726.h index 34678fb0708f..b1e759ba583c 100644 --- a/include/media/ov9726.h +++ b/include/media/ov9726.h @@ -15,7 +15,7 @@ #define OV9726_I2C_ADDR 0x20 -#define OV9726_IOCTL_SET_MODE _IOW('o', 1, struct ov9726_cust_mode) +#define OV9726_IOCTL_SET_MODE _IOW('o', 1, struct ov9726_mode) #define OV9726_IOCTL_SET_FRAME_LENGTH _IOW('o', 2, __u32) #define OV9726_IOCTL_SET_COARSE_TIME _IOW('o', 3, __u32) #define OV9726_IOCTL_SET_GAIN _IOW('o', 4, __u16) @@ -35,15 +35,6 @@ struct ov9726_reg { __u16 val; }; -struct ov9726_cust_mode { - struct ov9726_mode mode; - __u16 reg_num; - struct ov9726_reg *reg_seq; -}; - -#define OV9726_TABLE_WAIT_MS 0 -#define OV9726_TABLE_END 1 - #ifdef __KERNEL__ #define OV9726_REG_FRAME_LENGTH_HI 0x340 #define OV9726_REG_FRAME_LENGTH_LO 0x341 @@ -54,6 +45,9 @@ struct ov9726_cust_mode { #define OV9726_MAX_RETRIES 3 +#define OV9726_TABLE_WAIT_MS 0 +#define OV9726_TABLE_END 1 + struct ov9726_platform_data { int (*power_on)(void); int (*power_off)(void); -- cgit v1.2.3