diff options
| author | garyz <garyz@nvidia.com> | 2011-06-14 13:21:03 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:48:01 -0800 |
| commit | ed9ecc5b6025a16cf28ac5488be2683149c712ec (patch) | |
| tree | ceb569b2bd567cc08d9d0e90958c04e66c61b4b3 /include/media | |
| parent | 353a6106f0e3b9c8d7a8585495f3bb02c3974372 (diff) | |
ARM: Tegra: Sh532u: enable focuser attached to right camera
The sh532u focuser is enabled to pair with the stereo right camera
with the required power control configurations.
Bug 827897
Original-Change-Id: Icc21bcd2327671da193a8b8f24c338b0b2f6729c
Reviewed-on: http://git-master/r/36571
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
Rebase-Id: R5c6dcd9b9c2bc7ab89870ee13da408ee0a392276
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/ov5650.h | 1 | ||||
| -rw-r--r-- | include/media/sh532u.h | 1 | ||||
| -rw-r--r-- | include/media/tegra_camera.h | 14 |
3 files changed, 15 insertions, 1 deletions
diff --git a/include/media/ov5650.h b/include/media/ov5650.h index 4a5f5baa5b43..d45a952eecf2 100644 --- a/include/media/ov5650.h +++ b/include/media/ov5650.h @@ -44,6 +44,7 @@ struct ov5650_mode { __u32 coarse_time; __u16 gain; }; + #ifdef __KERNEL__ struct ov5650_platform_data { int (*power_on)(void); diff --git a/include/media/sh532u.h b/include/media/sh532u.h index 5c4ffd9d42f8..166caad65f88 100644 --- a/include/media/sh532u.h +++ b/include/media/sh532u.h @@ -24,6 +24,7 @@ #define SH532U_IOCTL_GET_CONFIG _IOR('o', 1, struct sh532u_config) #define SH532U_IOCTL_SET_POSITION _IOW('o', 2, u32) #define SH532U_IOCTL_GET_MOVE_STATUS _IOW('o', 3, unsigned char) +#define SH532U_IOCTL_SET_CAMERA_MODE _IOW('o', 4, unsigned char) enum sh532u_move_status { SH532U_STATE_UNKNOWN = 1, diff --git a/include/media/tegra_camera.h b/include/media/tegra_camera.h index 3c8ddcab26e3..f88d376e6769 100644 --- a/include/media/tegra_camera.h +++ b/include/media/tegra_camera.h @@ -13,7 +13,8 @@ * GNU General Public License for more details. * */ - +#ifndef TEGRA_CAMERA_H +#define TEGRA_CAMERA_H enum { TEGRA_CAMERA_MODULE_ISP = 0, TEGRA_CAMERA_MODULE_VI, @@ -31,8 +32,19 @@ struct tegra_camera_clk_info { unsigned long rate; }; +enum StereoCameraMode { + Main = 0x0, /* Sets the default camera to Main */ + StereoCameraMode_Left = 0x01, /* the left camera is on. */ + StereoCameraMode_Right = 0x02, /* the right camera is on. */ + StereoCameraMode_Stereo = 0x03, /* both cameras are on. */ + StereoCameraMode_Force32 = 0x7FFFFFFF +}; + + #define TEGRA_CAMERA_IOCTL_ENABLE _IOWR('i', 1, uint) #define TEGRA_CAMERA_IOCTL_DISABLE _IOWR('i', 2, uint) #define TEGRA_CAMERA_IOCTL_CLK_SET_RATE \ _IOWR('i', 3, struct tegra_camera_clk_info) #define TEGRA_CAMERA_IOCTL_RESET _IOWR('i', 4, uint) + +#endif |