diff options
| author | Frank Chen <frankc@nvidia.com> | 2014-03-07 16:50:56 -0800 |
|---|---|---|
| committer | Mitch Luban <mluban@nvidia.com> | 2014-03-19 16:56:17 -0700 |
| commit | 8316a5f9abb7dd1fa01089cb949451002e019e90 (patch) | |
| tree | d4ba82d27d729d6a40f85500e469a3fed78922a5 /include/media | |
| parent | ad8caa9c93e56b0158fc9c55411a41094b1e59a5 (diff) | |
media: platform: tegra: Dual ov5693 support
Update OV5693 driver to support multiple
OV5693 in the same system.
Bug 1465726
Change-Id: Ic23ddbaf80068142e8354f313b76c17a9b2a3b7f
Signed-off-by: Frank Chen <frankc@nvidia.com>
Reviewed-on: http://git-master/r/379242
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Philip Breczinski <pbreczinski@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: David Schalig <dschalig@nvidia.com>
Tested-by: David Schalig <dschalig@nvidia.com>
Reviewed-by: Mitch Luban <mluban@nvidia.com>
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/nvc_image.h | 5 | ||||
| -rw-r--r-- | include/media/ov5693.h | 13 |
2 files changed, 15 insertions, 3 deletions
diff --git a/include/media/nvc_image.h b/include/media/nvc_image.h index aa56a4103a55..c9f1286d1db8 100644 --- a/include/media/nvc_image.h +++ b/include/media/nvc_image.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2012 NVIDIA Corporation. +/* + * Copyright (c) 2013-2014, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -205,7 +206,7 @@ struct nvc_imager_cap { __u32 cap_version; __u8 flash_control_enabled; __u8 adjustable_flash_timing; - __u8 align4; + __u8 is_hdr; __u8 align5; } __packed; diff --git a/include/media/ov5693.h b/include/media/ov5693.h index 60f06ddddcac..877365d6cebd 100644 --- a/include/media/ov5693.h +++ b/include/media/ov5693.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2013-2014, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -41,6 +41,8 @@ struct ov5693_cal_data) #define OV5693_IOCTL_GET_EEPROM_DATA _IOR('o', 20, __u8 *) #define OV5693_IOCTL_SET_EEPROM_DATA _IOW('o', 21, __u8 *) +#define OV5693_IOCTL_GET_CAPS _IOR('o', 22, struct nvc_imager_cap) +#define OV5693_IOCTL_SET_POWER _IOW('o', 23, __u32) #define OV5693_INVALID_COARSE_TIME -1 @@ -113,6 +115,12 @@ struct ov5693_power_rail { struct regulator *dovdd; }; +struct ov5693_regulators { + char *avdd; + char *dvdd; + char *dovdd; +}; + struct ov5693_platform_data { unsigned cfg; unsigned num; @@ -129,6 +137,9 @@ struct ov5693_platform_data { int (*power_on)(struct ov5693_power_rail *); int (*power_off)(struct ov5693_power_rail *); const char *mclk_name; + struct nvc_imager_cap *cap; + struct ov5693_regulators regulators; + bool has_eeprom; }; #endif /* __OV5693_H__ */ |