~lzh/A133.git

..	..	@@ -186,6 +186,10 @@
186	186	__s32 reserved[16];
187	187	};
188	188
	189	+struct dma_merge {
	190	+ __u8 en;
	191	+};
	192	+
189	193	struct vin_top_clk {
190	194	__u32 clk_rate;
191	195	};
..	..	@@ -212,6 +216,11 @@
212	216	__u32 ptn_type;
213	217	};
214	218
	219	+struct buf_merge {
	220	+ __u8 en;
	221	+ __u8 buffer_num;
	222	+};
	223	+
215	224	#define VIDIOC_ISP_AE_STAT_REQ \
216	225	_IOWR('V', BASE_VIDIOC_PRIVATE + 1, struct isp_stat_buf)
217	226	#define VIDIOC_ISP_HIST_STAT_REQ \
..	..	@@ -230,11 +239,14 @@
230	239	_IOWR('V', BASE_VIDIOC_PRIVATE + 8, struct isp_hdr_ctrl)
231	240	#define VIDIOC_SYNC_CTRL \
232	241	_IOWR('V', BASE_VIDIOC_PRIVATE + 9, struct csi_sync_ctrl)
	242	+#define VIDIOC_SET_DMA_MERGE \
	243	+ _IOWR('V', BASE_VIDIOC_PRIVATE + 14, struct dma_merge)
233	244	#define VIDIOC_ISP_DEBUG \
234	245	_IOWR('V', BASE_VIDIOC_PRIVATE + 10, struct isp_debug_mode)
235	246	#define VIDIOC_VIN_PTN_CFG \
236	247	_IOWR('V', BASE_VIDIOC_PRIVATE + 11, struct vin_pattern_config)
237		-
	248	+#define VIDIOC_SET_BUFFER_MERGE \
	249	+ _IOWR('V', BASE_VIDIOC_PRIVATE + 15, struct buf_merge)
238	250	/*
239	251	* Events
240	252	*