summaryrefslogtreecommitdiff
path: root/include/media
diff options
context:
space:
mode:
authorCharlie Huang <chahuang@nvidia.com>2013-08-08 16:41:55 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2013-09-27 12:51:54 -0700
commitd4dc5149f12e11581f7373fd71cb20795d66368d (patch)
tree52d23697249c332965769874403e6d7ee42207bf /include/media
parent88bc7297a746a30be4a1c350600bfb71decc293f (diff)
media: tegra: PCL driver updates
change some dev_err to dev_notice to avoid LNX error filter alarm. synchronize cam_device_layout with odm imager as well as update debugfs prints. change the regulator names of imx132 and ov5693 to avoid name conflict with other sensors. bug 1339839 Change-Id: I134b8b10d5df965bffa8ac0333a0c3775cf882a5 Signed-off-by: Charlie Huang <chahuang@nvidia.com> Reviewed-on: http://git-master/r/259810 (cherry picked from commit 89f7b0768a509fc70e78457c6352ef13f874988f) Reviewed-on: http://git-master/r/272739 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/camera.h17
1 files changed, 16 insertions, 1 deletions
diff --git a/include/media/camera.h b/include/media/camera.h
index deadd9571cca..9f17b7fa2673 100644
--- a/include/media/camera.h
+++ b/include/media/camera.h
@@ -158,14 +158,29 @@ struct cam_update {
u32 size;
};
+enum {
+ DEVICE_SENSOR,
+ DEVICE_FOCUSER,
+ DEVICE_FLASH,
+ DEVICE_ROM,
+ DEVICE_OTHER,
+ DEVICE_OTHER2,
+ DEVICE_OTHER3,
+ DEVICE_OTHER4,
+ DEVICE_MAX_NUM,
+};
+
struct cam_device_layout {
__u64 guid;
__u8 name[CAMERA_MAX_NAME_LENGTH];
+ __u8 type;
__u8 alt_name[CAMERA_MAX_NAME_LENGTH];
- __u8 is_front;
+ __u8 pos;
__u8 bus;
__u8 addr;
__u8 addr_byte;
+ __u32 dev_id;
+ __u32 index;
__u32 reserved1;
__u32 reserved2;
};