diff options
Diffstat (limited to 'drivers/media/video/omap3isp')
-rw-r--r-- | drivers/media/video/omap3isp/isp.c | 8 | ||||
-rw-r--r-- | drivers/media/video/omap3isp/ispccdc.h | 4 | ||||
-rw-r--r-- | drivers/media/video/omap3isp/ispccp2.c | 2 | ||||
-rw-r--r-- | drivers/media/video/omap3isp/ispcsi2.c | 2 | ||||
-rw-r--r-- | drivers/media/video/omap3isp/isppreview.c | 20 | ||||
-rw-r--r-- | drivers/media/video/omap3isp/isppreview.h | 2 | ||||
-rw-r--r-- | drivers/media/video/omap3isp/ispqueue.h | 4 | ||||
-rw-r--r-- | drivers/media/video/omap3isp/ispresizer.c | 4 | ||||
-rw-r--r-- | drivers/media/video/omap3isp/ispvideo.c | 6 |
9 files changed, 26 insertions, 26 deletions
diff --git a/drivers/media/video/omap3isp/isp.c b/drivers/media/video/omap3isp/isp.c index 1a9963bd6d4..503bd7922bd 100644 --- a/drivers/media/video/omap3isp/isp.c +++ b/drivers/media/video/omap3isp/isp.c | |||
@@ -715,7 +715,7 @@ static int isp_pipeline_link_notify(struct media_pad *source, | |||
715 | * Walk the entities chain starting at the pipeline output video node and start | 715 | * Walk the entities chain starting at the pipeline output video node and start |
716 | * all modules in the chain in the given mode. | 716 | * all modules in the chain in the given mode. |
717 | * | 717 | * |
718 | * Return 0 if successfull, or the return value of the failed video::s_stream | 718 | * Return 0 if successful, or the return value of the failed video::s_stream |
719 | * operation otherwise. | 719 | * operation otherwise. |
720 | */ | 720 | */ |
721 | static int isp_pipeline_enable(struct isp_pipeline *pipe, | 721 | static int isp_pipeline_enable(struct isp_pipeline *pipe, |
@@ -883,7 +883,7 @@ static int isp_pipeline_disable(struct isp_pipeline *pipe) | |||
883 | * Set the pipeline to the given stream state. Pipelines can be started in | 883 | * Set the pipeline to the given stream state. Pipelines can be started in |
884 | * single-shot or continuous mode. | 884 | * single-shot or continuous mode. |
885 | * | 885 | * |
886 | * Return 0 if successfull, or the return value of the failed video::s_stream | 886 | * Return 0 if successful, or the return value of the failed video::s_stream |
887 | * operation otherwise. | 887 | * operation otherwise. |
888 | */ | 888 | */ |
889 | int omap3isp_pipeline_set_stream(struct isp_pipeline *pipe, | 889 | int omap3isp_pipeline_set_stream(struct isp_pipeline *pipe, |
@@ -1283,7 +1283,7 @@ static void __isp_subclk_update(struct isp_device *isp) | |||
1283 | clk |= ISPCTRL_RSZ_CLK_EN; | 1283 | clk |= ISPCTRL_RSZ_CLK_EN; |
1284 | 1284 | ||
1285 | /* NOTE: For CCDC & Preview submodules, we need to affect internal | 1285 | /* NOTE: For CCDC & Preview submodules, we need to affect internal |
1286 | * RAM aswell. | 1286 | * RAM as well. |
1287 | */ | 1287 | */ |
1288 | if (isp->subclk_resources & OMAP3_ISP_SUBCLK_CCDC) | 1288 | if (isp->subclk_resources & OMAP3_ISP_SUBCLK_CCDC) |
1289 | clk |= ISPCTRL_CCDC_CLK_EN | ISPCTRL_CCDC_RAM_EN; | 1289 | clk |= ISPCTRL_CCDC_CLK_EN | ISPCTRL_CCDC_RAM_EN; |
@@ -1431,7 +1431,7 @@ static int isp_get_clocks(struct isp_device *isp) | |||
1431 | * Increment the reference count on the ISP. If the first reference is taken, | 1431 | * Increment the reference count on the ISP. If the first reference is taken, |
1432 | * enable clocks and power-up all submodules. | 1432 | * enable clocks and power-up all submodules. |
1433 | * | 1433 | * |
1434 | * Return a pointer to the ISP device structure, or NULL if an error occured. | 1434 | * Return a pointer to the ISP device structure, or NULL if an error occurred. |
1435 | */ | 1435 | */ |
1436 | struct isp_device *omap3isp_get(struct isp_device *isp) | 1436 | struct isp_device *omap3isp_get(struct isp_device *isp) |
1437 | { | 1437 | { |
diff --git a/drivers/media/video/omap3isp/ispccdc.h b/drivers/media/video/omap3isp/ispccdc.h index d403af5d31d..483a19cac1a 100644 --- a/drivers/media/video/omap3isp/ispccdc.h +++ b/drivers/media/video/omap3isp/ispccdc.h | |||
@@ -150,7 +150,7 @@ struct ispccdc_lsc { | |||
150 | * @input: Active input | 150 | * @input: Active input |
151 | * @output: Active outputs | 151 | * @output: Active outputs |
152 | * @video_out: Output video node | 152 | * @video_out: Output video node |
153 | * @error: A hardware error occured during capture | 153 | * @error: A hardware error occurred during capture |
154 | * @alaw: A-law compression enabled (1) or disabled (0) | 154 | * @alaw: A-law compression enabled (1) or disabled (0) |
155 | * @lpf: Low pass filter enabled (1) or disabled (0) | 155 | * @lpf: Low pass filter enabled (1) or disabled (0) |
156 | * @obclamp: Optical-black clamp enabled (1) or disabled (0) | 156 | * @obclamp: Optical-black clamp enabled (1) or disabled (0) |
@@ -163,7 +163,7 @@ struct ispccdc_lsc { | |||
163 | * @shadow_update: Controls update in progress by userspace | 163 | * @shadow_update: Controls update in progress by userspace |
164 | * @syncif: Interface synchronization configuration | 164 | * @syncif: Interface synchronization configuration |
165 | * @vpcfg: Video port configuration | 165 | * @vpcfg: Video port configuration |
166 | * @underrun: A buffer underrun occured and a new buffer has been queued | 166 | * @underrun: A buffer underrun occurred and a new buffer has been queued |
167 | * @state: Streaming state | 167 | * @state: Streaming state |
168 | * @lock: Serializes shadow_update with interrupt handler | 168 | * @lock: Serializes shadow_update with interrupt handler |
169 | * @wait: Wait queue used to stop the module | 169 | * @wait: Wait queue used to stop the module |
diff --git a/drivers/media/video/omap3isp/ispccp2.c b/drivers/media/video/omap3isp/ispccp2.c index 0efef2e78d9..0e16cab8e08 100644 --- a/drivers/media/video/omap3isp/ispccp2.c +++ b/drivers/media/video/omap3isp/ispccp2.c | |||
@@ -772,7 +772,7 @@ static int ccp2_enum_frame_size(struct v4l2_subdev *sd, | |||
772 | * @sd : pointer to v4l2 subdev structure | 772 | * @sd : pointer to v4l2 subdev structure |
773 | * @fh : V4L2 subdev file handle | 773 | * @fh : V4L2 subdev file handle |
774 | * @fmt : pointer to v4l2 subdev format structure | 774 | * @fmt : pointer to v4l2 subdev format structure |
775 | * return -EINVAL or zero on sucess | 775 | * return -EINVAL or zero on success |
776 | */ | 776 | */ |
777 | static int ccp2_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, | 777 | static int ccp2_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, |
778 | struct v4l2_subdev_format *fmt) | 778 | struct v4l2_subdev_format *fmt) |
diff --git a/drivers/media/video/omap3isp/ispcsi2.c b/drivers/media/video/omap3isp/ispcsi2.c index fb503f3db3b..69161a682b3 100644 --- a/drivers/media/video/omap3isp/ispcsi2.c +++ b/drivers/media/video/omap3isp/ispcsi2.c | |||
@@ -969,7 +969,7 @@ static int csi2_enum_frame_size(struct v4l2_subdev *sd, | |||
969 | * @sd : pointer to v4l2 subdev structure | 969 | * @sd : pointer to v4l2 subdev structure |
970 | * @fh : V4L2 subdev file handle | 970 | * @fh : V4L2 subdev file handle |
971 | * @fmt: pointer to v4l2 subdev format structure | 971 | * @fmt: pointer to v4l2 subdev format structure |
972 | * return -EINVAL or zero on sucess | 972 | * return -EINVAL or zero on success |
973 | */ | 973 | */ |
974 | static int csi2_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, | 974 | static int csi2_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, |
975 | struct v4l2_subdev_format *fmt) | 975 | struct v4l2_subdev_format *fmt) |
diff --git a/drivers/media/video/omap3isp/isppreview.c b/drivers/media/video/omap3isp/isppreview.c index baf9374201d..2b16988a501 100644 --- a/drivers/media/video/omap3isp/isppreview.c +++ b/drivers/media/video/omap3isp/isppreview.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include "ispreg.h" | 34 | #include "ispreg.h" |
35 | #include "isppreview.h" | 35 | #include "isppreview.h" |
36 | 36 | ||
37 | /* Default values in Office Flourescent Light for RGBtoRGB Blending */ | 37 | /* Default values in Office Fluorescent Light for RGBtoRGB Blending */ |
38 | static struct omap3isp_prev_rgbtorgb flr_rgb2rgb = { | 38 | static struct omap3isp_prev_rgbtorgb flr_rgb2rgb = { |
39 | { /* RGB-RGB Matrix */ | 39 | { /* RGB-RGB Matrix */ |
40 | {0x01E2, 0x0F30, 0x0FEE}, | 40 | {0x01E2, 0x0F30, 0x0FEE}, |
@@ -44,7 +44,7 @@ static struct omap3isp_prev_rgbtorgb flr_rgb2rgb = { | |||
44 | {0x0000, 0x0000, 0x0000} | 44 | {0x0000, 0x0000, 0x0000} |
45 | }; | 45 | }; |
46 | 46 | ||
47 | /* Default values in Office Flourescent Light for RGB to YUV Conversion*/ | 47 | /* Default values in Office Fluorescent Light for RGB to YUV Conversion*/ |
48 | static struct omap3isp_prev_csc flr_prev_csc = { | 48 | static struct omap3isp_prev_csc flr_prev_csc = { |
49 | { /* CSC Coef Matrix */ | 49 | { /* CSC Coef Matrix */ |
50 | {66, 129, 25}, | 50 | {66, 129, 25}, |
@@ -54,22 +54,22 @@ static struct omap3isp_prev_csc flr_prev_csc = { | |||
54 | {0x0, 0x0, 0x0} | 54 | {0x0, 0x0, 0x0} |
55 | }; | 55 | }; |
56 | 56 | ||
57 | /* Default values in Office Flourescent Light for CFA Gradient*/ | 57 | /* Default values in Office Fluorescent Light for CFA Gradient*/ |
58 | #define FLR_CFA_GRADTHRS_HORZ 0x28 | 58 | #define FLR_CFA_GRADTHRS_HORZ 0x28 |
59 | #define FLR_CFA_GRADTHRS_VERT 0x28 | 59 | #define FLR_CFA_GRADTHRS_VERT 0x28 |
60 | 60 | ||
61 | /* Default values in Office Flourescent Light for Chroma Suppression*/ | 61 | /* Default values in Office Fluorescent Light for Chroma Suppression*/ |
62 | #define FLR_CSUP_GAIN 0x0D | 62 | #define FLR_CSUP_GAIN 0x0D |
63 | #define FLR_CSUP_THRES 0xEB | 63 | #define FLR_CSUP_THRES 0xEB |
64 | 64 | ||
65 | /* Default values in Office Flourescent Light for Noise Filter*/ | 65 | /* Default values in Office Fluorescent Light for Noise Filter*/ |
66 | #define FLR_NF_STRGTH 0x03 | 66 | #define FLR_NF_STRGTH 0x03 |
67 | 67 | ||
68 | /* Default values for White Balance */ | 68 | /* Default values for White Balance */ |
69 | #define FLR_WBAL_DGAIN 0x100 | 69 | #define FLR_WBAL_DGAIN 0x100 |
70 | #define FLR_WBAL_COEF 0x20 | 70 | #define FLR_WBAL_COEF 0x20 |
71 | 71 | ||
72 | /* Default values in Office Flourescent Light for Black Adjustment*/ | 72 | /* Default values in Office Fluorescent Light for Black Adjustment*/ |
73 | #define FLR_BLKADJ_BLUE 0x0 | 73 | #define FLR_BLKADJ_BLUE 0x0 |
74 | #define FLR_BLKADJ_GREEN 0x0 | 74 | #define FLR_BLKADJ_GREEN 0x0 |
75 | #define FLR_BLKADJ_RED 0x0 | 75 | #define FLR_BLKADJ_RED 0x0 |
@@ -137,7 +137,7 @@ preview_enable_invalaw(struct isp_prev_device *prev, u8 enable) | |||
137 | * @enable: 1 - Enable, 0 - Disable | 137 | * @enable: 1 - Enable, 0 - Disable |
138 | * | 138 | * |
139 | * NOTE: PRV_WSDR_ADDR and PRV_WADD_OFFSET must be set also | 139 | * NOTE: PRV_WSDR_ADDR and PRV_WADD_OFFSET must be set also |
140 | * The proccess is applied for each captured frame. | 140 | * The process is applied for each captured frame. |
141 | */ | 141 | */ |
142 | static void | 142 | static void |
143 | preview_enable_drkframe_capture(struct isp_prev_device *prev, u8 enable) | 143 | preview_enable_drkframe_capture(struct isp_prev_device *prev, u8 enable) |
@@ -157,7 +157,7 @@ preview_enable_drkframe_capture(struct isp_prev_device *prev, u8 enable) | |||
157 | * @enable: 1 - Acquires memory bandwidth since the pixels in each frame is | 157 | * @enable: 1 - Acquires memory bandwidth since the pixels in each frame is |
158 | * subtracted with the pixels in the current frame. | 158 | * subtracted with the pixels in the current frame. |
159 | * | 159 | * |
160 | * The proccess is applied for each captured frame. | 160 | * The process is applied for each captured frame. |
161 | */ | 161 | */ |
162 | static void | 162 | static void |
163 | preview_enable_drkframe(struct isp_prev_device *prev, u8 enable) | 163 | preview_enable_drkframe(struct isp_prev_device *prev, u8 enable) |
@@ -1528,7 +1528,7 @@ static long preview_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg) | |||
1528 | * preview_set_stream - Enable/Disable streaming on preview subdev | 1528 | * preview_set_stream - Enable/Disable streaming on preview subdev |
1529 | * @sd : pointer to v4l2 subdev structure | 1529 | * @sd : pointer to v4l2 subdev structure |
1530 | * @enable: 1 == Enable, 0 == Disable | 1530 | * @enable: 1 == Enable, 0 == Disable |
1531 | * return -EINVAL or zero on sucess | 1531 | * return -EINVAL or zero on success |
1532 | */ | 1532 | */ |
1533 | static int preview_set_stream(struct v4l2_subdev *sd, int enable) | 1533 | static int preview_set_stream(struct v4l2_subdev *sd, int enable) |
1534 | { | 1534 | { |
@@ -1780,7 +1780,7 @@ static int preview_enum_frame_size(struct v4l2_subdev *sd, | |||
1780 | * @sd : pointer to v4l2 subdev structure | 1780 | * @sd : pointer to v4l2 subdev structure |
1781 | * @fh : V4L2 subdev file handle | 1781 | * @fh : V4L2 subdev file handle |
1782 | * @fmt: pointer to v4l2 subdev format structure | 1782 | * @fmt: pointer to v4l2 subdev format structure |
1783 | * return -EINVAL or zero on sucess | 1783 | * return -EINVAL or zero on success |
1784 | */ | 1784 | */ |
1785 | static int preview_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, | 1785 | static int preview_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, |
1786 | struct v4l2_subdev_format *fmt) | 1786 | struct v4l2_subdev_format *fmt) |
diff --git a/drivers/media/video/omap3isp/isppreview.h b/drivers/media/video/omap3isp/isppreview.h index f2d63ca4bd6..fa943bd05c7 100644 --- a/drivers/media/video/omap3isp/isppreview.h +++ b/drivers/media/video/omap3isp/isppreview.h | |||
@@ -163,7 +163,7 @@ struct isptables_update { | |||
163 | * @output: Bitmask of the active output | 163 | * @output: Bitmask of the active output |
164 | * @video_in: Input video entity | 164 | * @video_in: Input video entity |
165 | * @video_out: Output video entity | 165 | * @video_out: Output video entity |
166 | * @error: A hardware error occured during capture | 166 | * @error: A hardware error occurred during capture |
167 | * @params: Module configuration data | 167 | * @params: Module configuration data |
168 | * @shadow_update: If set, update the hardware configured in the next interrupt | 168 | * @shadow_update: If set, update the hardware configured in the next interrupt |
169 | * @underrun: Whether the preview entity has queued buffers on the output | 169 | * @underrun: Whether the preview entity has queued buffers on the output |
diff --git a/drivers/media/video/omap3isp/ispqueue.h b/drivers/media/video/omap3isp/ispqueue.h index 251de3e1679..92c5a12157d 100644 --- a/drivers/media/video/omap3isp/ispqueue.h +++ b/drivers/media/video/omap3isp/ispqueue.h | |||
@@ -46,9 +46,9 @@ struct scatterlist; | |||
46 | * device yet. | 46 | * device yet. |
47 | * @ISP_BUF_STATE_ACTIVE: The buffer is in use for an active video transfer. | 47 | * @ISP_BUF_STATE_ACTIVE: The buffer is in use for an active video transfer. |
48 | * @ISP_BUF_STATE_ERROR: The device is done with the buffer and an error | 48 | * @ISP_BUF_STATE_ERROR: The device is done with the buffer and an error |
49 | * occured. For capture device the buffer likely contains corrupted data or | 49 | * occurred. For capture device the buffer likely contains corrupted data or |
50 | * no data at all. | 50 | * no data at all. |
51 | * @ISP_BUF_STATE_DONE: The device is done with the buffer and no error occured. | 51 | * @ISP_BUF_STATE_DONE: The device is done with the buffer and no error occurred. |
52 | * For capture devices the buffer contains valid data. | 52 | * For capture devices the buffer contains valid data. |
53 | */ | 53 | */ |
54 | enum isp_video_buffer_state { | 54 | enum isp_video_buffer_state { |
diff --git a/drivers/media/video/omap3isp/ispresizer.c b/drivers/media/video/omap3isp/ispresizer.c index 75d39b115d4..653f88ba56d 100644 --- a/drivers/media/video/omap3isp/ispresizer.c +++ b/drivers/media/video/omap3isp/ispresizer.c | |||
@@ -751,7 +751,7 @@ static void resizer_print_status(struct isp_res_device *res) | |||
751 | * ratio will thus result in a resizing factor slightly larger than the | 751 | * ratio will thus result in a resizing factor slightly larger than the |
752 | * requested value. | 752 | * requested value. |
753 | * | 753 | * |
754 | * To accomodate that, and make sure the TRM equations are satisfied exactly, we | 754 | * To accommodate that, and make sure the TRM equations are satisfied exactly, we |
755 | * compute the input crop rectangle as the last step. | 755 | * compute the input crop rectangle as the last step. |
756 | * | 756 | * |
757 | * As if the situation wasn't complex enough, the maximum output width depends | 757 | * As if the situation wasn't complex enough, the maximum output width depends |
@@ -1386,7 +1386,7 @@ static int resizer_enum_frame_size(struct v4l2_subdev *sd, | |||
1386 | * @sd : pointer to v4l2 subdev structure | 1386 | * @sd : pointer to v4l2 subdev structure |
1387 | * @fh : V4L2 subdev file handle | 1387 | * @fh : V4L2 subdev file handle |
1388 | * @fmt : pointer to v4l2 subdev format structure | 1388 | * @fmt : pointer to v4l2 subdev format structure |
1389 | * return -EINVAL or zero on sucess | 1389 | * return -EINVAL or zero on success |
1390 | */ | 1390 | */ |
1391 | static int resizer_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, | 1391 | static int resizer_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, |
1392 | struct v4l2_subdev_format *fmt) | 1392 | struct v4l2_subdev_format *fmt) |
diff --git a/drivers/media/video/omap3isp/ispvideo.c b/drivers/media/video/omap3isp/ispvideo.c index a0bb5db9cb8..208a7ec739d 100644 --- a/drivers/media/video/omap3isp/ispvideo.c +++ b/drivers/media/video/omap3isp/ispvideo.c | |||
@@ -494,12 +494,12 @@ static const struct isp_video_queue_operations isp_video_queue_ops = { | |||
494 | /* | 494 | /* |
495 | * omap3isp_video_buffer_next - Complete the current buffer and return the next | 495 | * omap3isp_video_buffer_next - Complete the current buffer and return the next |
496 | * @video: ISP video object | 496 | * @video: ISP video object |
497 | * @error: Whether an error occured during capture | 497 | * @error: Whether an error occurred during capture |
498 | * | 498 | * |
499 | * Remove the current video buffer from the DMA queue and fill its timestamp, | 499 | * Remove the current video buffer from the DMA queue and fill its timestamp, |
500 | * field count and state fields before waking up its completion handler. | 500 | * field count and state fields before waking up its completion handler. |
501 | * | 501 | * |
502 | * The buffer state is set to VIDEOBUF_DONE if no error occured (@error is 0) | 502 | * The buffer state is set to VIDEOBUF_DONE if no error occurred (@error is 0) |
503 | * or VIDEOBUF_ERROR otherwise (@error is non-zero). | 503 | * or VIDEOBUF_ERROR otherwise (@error is non-zero). |
504 | * | 504 | * |
505 | * The DMA queue is expected to contain at least one buffer. | 505 | * The DMA queue is expected to contain at least one buffer. |
@@ -578,7 +578,7 @@ struct isp_buffer *omap3isp_video_buffer_next(struct isp_video *video, | |||
578 | /* | 578 | /* |
579 | * omap3isp_video_resume - Perform resume operation on the buffers | 579 | * omap3isp_video_resume - Perform resume operation on the buffers |
580 | * @video: ISP video object | 580 | * @video: ISP video object |
581 | * @continuous: Pipeline is in single shot mode if 0 or continous mode otherwise | 581 | * @continuous: Pipeline is in single shot mode if 0 or continuous mode otherwise |
582 | * | 582 | * |
583 | * This function is intended to be used on suspend/resume scenario. It | 583 | * This function is intended to be used on suspend/resume scenario. It |
584 | * requests video queue layer to discard buffers marked as DONE if it's in | 584 | * requests video queue layer to discard buffers marked as DONE if it's in |