summaryrefslogtreecommitdiff
path: root/include/media
diff options
context:
space:
mode:
authorCharlie Huang <chahuang@nvidia.com>2014-04-10 11:30:37 -0700
committerSeema Khowala <seemaj@nvidia.com>2014-04-23 14:06:39 -0700
commite3a89886d876620f3988ca4e0f79dfdcbe8505a8 (patch)
treeb51e18901b1f252b812db2ee6eeb1ce8f5cec301 /include/media
parenta959153e145161d591085367c1d1da092f3f9170 (diff)
drivers: media: tegra: camera: auto-detect notice
- display notice, for auto detect showing the begin of auto-detect. - add read-in-write feature, camera_dev_wr_table can read device while parsing scripts. - return error state in table write. - camera_app_remove will not throw out warnings when shutdown. - code optimization, add camera_get_params to replace duplicated code. bug 1472043 Change-Id: I9ee683bade00ea738a1c8edc282c40ad30d57c7f Signed-off-by: Charlie Huang <chahuang@nvidia.com> Reviewed-on: http://git-master/r/394834 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Frank Chen <frankc@nvidia.com> Reviewed-by: Gary Fitzer <gfitzer@nvidia.com> Reviewed-by: David Wang (SW-TEGRA) <davidw@nvidia.com> Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/camera.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/media/camera.h b/include/media/camera.h
index 16f9d6499221..a0381f371cc0 100644
--- a/include/media/camera.h
+++ b/include/media/camera.h
@@ -43,6 +43,8 @@
#define CAMERA_TABLE_INX_CGATE (CAMERA_INT_MASK | 51)
#define CAMERA_TABLE_EDP_STATE (CAMERA_INT_MASK | 60)
+#define CAMERA_TABLE_DEV_READ 0xe0000000
+
#define CAMERA_TABLE_PWR_FLAG_MASK 0xf0000000
#define CAMERA_TABLE_PWR_FLAG_ON 0x80000000
#define CAMERA_TABLE_PINMUX_FLAG_MASK 0xf0000000
@@ -69,6 +71,7 @@
#define PCLLK_IOCTL_PARAM_RD _IOWR('o', 141, struct nvc_param)
#define PCLLK_IOCTL_DRV_ADD _IOW('o', 150, struct nvc_param)
#define PCLLK_IOCTL_DT_GET _IOWR('o', 160, struct nvc_param)
+#define PCLLK_IOCTL_MSG _IOWR('o', 170, struct nvc_param)
#define CAMERA_MAX_EDP_ENTRIES 16
#define CAMERA_MAX_NAME_LENGTH 32
@@ -356,7 +359,7 @@ int camera_regulator_get(struct device *, struct nvc_regulator *, char *);
/* device access functions */
int camera_dev_parser(
- struct camera_device *, u32, u32, struct camera_seq_status *
+ struct camera_device *, u32, u32 *, struct camera_seq_status *
);
int camera_dev_wr_table(
struct camera_device *, struct camera_reg *, struct camera_seq_status *