aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArthur Philpott2014-03-11 18:16:16 -0500
committerArthur Philpott2014-03-11 18:25:17 -0500
commit344b268736db5239eca66d065fb3380a8ba093ae (patch)
tree93089995cf235caabe2e1f689563e0345f1b9c90
parent9187df36382f94a02105703f7a4c949ada8863c5 (diff)
downloadkernel-video-344b268736db5239eca66d065fb3380a8ba093ae.tar.gz
kernel-video-344b268736db5239eca66d065fb3380a8ba093ae.tar.xz
kernel-video-344b268736db5239eca66d065fb3380a8ba093ae.zip
v4l: ti-vps: vip: Export vip_s_fmt_vid_cap API
This patch exports the vip_s_fmt_vid_cap API which is needed by earlycamera module to ensure that the proper GPIOs are configured for the appropriate sensor. Change-Id: I2b496622115cd1ce35d0355445368089bd8c6ab9 Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
-rw-r--r--drivers/media/platform/ti-vps/vip.c6
-rw-r--r--drivers/media/platform/ti-vps/vip.h2
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/media/platform/ti-vps/vip.c b/drivers/media/platform/ti-vps/vip.c
index 76eb997674a..baa8994afc0 100644
--- a/drivers/media/platform/ti-vps/vip.c
+++ b/drivers/media/platform/ti-vps/vip.c
@@ -1171,7 +1171,7 @@ static void set_fmt_params(struct vip_stream *stream)
1171 } 1171 }
1172} 1172}
1173 1173
1174static int vip_s_fmt_vid_cap(struct file *file, void *priv, 1174int vip_s_fmt_vid_cap(struct file *file, void *priv,
1175 struct v4l2_format *f) 1175 struct v4l2_format *f)
1176{ 1176{
1177 struct vip_stream *stream = file2stream(file); 1177 struct vip_stream *stream = file2stream(file);
@@ -1186,11 +1186,12 @@ static int vip_s_fmt_vid_cap(struct file *file, void *priv,
1186 if (ret) 1186 if (ret)
1187 return ret; 1187 return ret;
1188 1188
1189#if 0
1189 if (vb2_is_busy(vq)) { 1190 if (vb2_is_busy(vq)) {
1190 v4l2_err(&dev->v4l2_dev, "%s queue busy\n", __func__); 1191 v4l2_err(&dev->v4l2_dev, "%s queue busy\n", __func__);
1191 return -EBUSY; 1192 return -EBUSY;
1192 } 1193 }
1193 1194#endif
1194 port->fmt = find_format(f); 1195 port->fmt = find_format(f);
1195 stream->width = f->fmt.pix.width; 1196 stream->width = f->fmt.pix.width;
1196 stream->height = f->fmt.pix.height; 1197 stream->height = f->fmt.pix.height;
@@ -1232,6 +1233,7 @@ static int vip_s_fmt_vid_cap(struct file *file, void *priv,
1232 1233
1233 return 0; 1234 return 0;
1234} 1235}
1236EXPORT_SYMBOL(vip_s_fmt_vid_cap);
1235 1237
1236static int vip_g_selection(struct file *file, void *fh, 1238static int vip_g_selection(struct file *file, void *fh,
1237 struct v4l2_selection *s) 1239 struct v4l2_selection *s)
diff --git a/drivers/media/platform/ti-vps/vip.h b/drivers/media/platform/ti-vps/vip.h
index dc8262e04e4..f81a1f5133c 100644
--- a/drivers/media/platform/ti-vps/vip.h
+++ b/drivers/media/platform/ti-vps/vip.h
@@ -153,6 +153,8 @@ extern dma_addr_t dma_addr_global_complete;
153 153
154extern int vip_open(struct file *file); 154extern int vip_open(struct file *file);
155extern int vip_release(struct file *file); 155extern int vip_release(struct file *file);
156extern int vip_s_fmt_vid_cap(struct file *file, void *priv,
157 struct v4l2_format *f);
156 158
157/* 159/*
158 * VIP Enumerations 160 * VIP Enumerations