summaryrefslogtreecommitdiff
path: root/include/media
diff options
context:
space:
mode:
authorMitch Luban <mluban@nvidia.com>2013-09-07 13:50:27 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2013-09-16 17:41:21 -0700
commita093c58aea099b0bfc0aa7909a6779c21e8cda55 (patch)
treead984fe0f508396a57ab1019dd14a1e167f4e615 /include/media
parente93755b1375becddbdeb2fc8a478a2277673308e (diff)
Revert "media:video:tegra: add HDR for ar0261"
This reverts commit 9de14ad78781f63ed2306f7c6f7c1f328e41e132. Change-Id: I263a614a5afe1eee17cda5e251510e0a205d7256 Signed-off-by: Mitch Luban <mluban@nvidia.com> Reviewed-on: http://git-master/r/271842 Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'include/media')
-rw-r--r--include/media/ar0261.h14
1 files changed, 1 insertions, 13 deletions
diff --git a/include/media/ar0261.h b/include/media/ar0261.h
index 88d156a1a2ba..678dd0ec7dd5 100644
--- a/include/media/ar0261.h
+++ b/include/media/ar0261.h
@@ -20,7 +20,6 @@
#define AR0261_IOCTL_SET_GAIN _IOW('o', 5, __u16)
#define AR0261_IOCTL_GET_SENSORDATA _IOR('o', 6, struct ar0261_sensordata)
#define AR0261_IOCTL_SET_GROUP_HOLD _IOW('o', 7, struct ar0261_ae)
-#define AR0261_IOCTL_SET_HDR_COARSE_TIME _IOW('o', 8, struct ar0261_hdr)
/* AR0261 registers */
#define AR0261_GROUP_PARAM_HOLD (0x0104)
@@ -29,33 +28,22 @@
#define AR0261_ANA_GAIN_GLOBAL (0x305F)
#define AR0261_FRAME_LEN_LINES_15_8 (0x0340)
#define AR0261_FRAME_LEN_LINES_7_0 (0x0341)
-#define AR0261_COARSE_INTEGRATION_SHORT_TIME_15_8 (0x3088)
-#define AR0261_COARSE_INTEGRATION_SHORT_TIME_7_0 (0x3089)
#define NUM_OF_FRAME_LEN_REG 2
#define NUM_OF_COARSE_TIME_REG 2
-#define HDR_MODE_OVERRIDE_REGS 7
-#define NORMAL_MODE_OVERRIDE_REGS 5
+#define NUM_OF_SENSOR_ID_SPECIFIC_REG 8
struct ar0261_mode {
int xres;
int yres;
__u32 frame_length;
__u32 coarse_time;
- __u32 coarse_time_short;
__u16 gain;
- __u8 hdr_en;
-};
-
-struct ar0261_hdr {
- __u32 coarse_time_long;
- __u32 coarse_time_short;
};
struct ar0261_ae {
__u32 frame_length;
__u8 frame_length_enable;
__u32 coarse_time;
- __u32 coarse_time_short;
__u8 coarse_time_enable;
__s32 gain;
__u8 gain_enable;