Commit 25aeb418 authored by Lad, Prabhakar's avatar Lad, Prabhakar Committed by Mauro Carvalho Chehab
parent e72ed08e
...@@ -391,7 +391,7 @@ static void isp_disable_interrupts(struct isp_device *isp) ...@@ -391,7 +391,7 @@ static void isp_disable_interrupts(struct isp_device *isp)
* @isp: OMAP3 ISP device * @isp: OMAP3 ISP device
* @idle: Consider idle state. * @idle: Consider idle state.
* *
* Set the power settings for the ISP and SBL bus and cConfigure the HS/VS * Set the power settings for the ISP and SBL bus and configure the HS/VS
* interrupt source. * interrupt source.
* *
* We need to configure the HS/VS interrupt source before interrupts get * We need to configure the HS/VS interrupt source before interrupts get
......
...@@ -293,7 +293,7 @@ static int __ccdc_lsc_enable(struct isp_ccdc_device *ccdc, int enable) ...@@ -293,7 +293,7 @@ static int __ccdc_lsc_enable(struct isp_ccdc_device *ccdc, int enable)
isp_reg_clr(isp, OMAP3_ISP_IOMEM_CCDC, isp_reg_clr(isp, OMAP3_ISP_IOMEM_CCDC,
ISPCCDC_LSC_CONFIG, ISPCCDC_LSC_ENABLE); ISPCCDC_LSC_CONFIG, ISPCCDC_LSC_ENABLE);
ccdc->lsc.state = LSC_STATE_STOPPED; ccdc->lsc.state = LSC_STATE_STOPPED;
dev_warn(to_device(ccdc), "LSC prefecth timeout\n"); dev_warn(to_device(ccdc), "LSC prefetch timeout\n");
return -ETIMEDOUT; return -ETIMEDOUT;
} }
ccdc->lsc.state = LSC_STATE_RUNNING; ccdc->lsc.state = LSC_STATE_RUNNING;
......
...@@ -518,7 +518,7 @@ static void ccp2_mem_configure(struct isp_ccp2_device *ccp2, ...@@ -518,7 +518,7 @@ static void ccp2_mem_configure(struct isp_ccp2_device *ccp2,
ISPCCP2_LCM_IRQSTATUS_EOF_IRQ, ISPCCP2_LCM_IRQSTATUS_EOF_IRQ,
OMAP3_ISP_IOMEM_CCP2, ISPCCP2_LCM_IRQSTATUS); OMAP3_ISP_IOMEM_CCP2, ISPCCP2_LCM_IRQSTATUS);
/* Enable LCM interupts */ /* Enable LCM interrupts */
isp_reg_set(isp, OMAP3_ISP_IOMEM_CCP2, ISPCCP2_LCM_IRQENABLE, isp_reg_set(isp, OMAP3_ISP_IOMEM_CCP2, ISPCCP2_LCM_IRQENABLE,
ISPCCP2_LCM_IRQSTATUS_EOF_IRQ | ISPCCP2_LCM_IRQSTATUS_EOF_IRQ |
ISPCCP2_LCM_IRQSTATUS_OCPERROR_IRQ); ISPCCP2_LCM_IRQSTATUS_OCPERROR_IRQ);
...@@ -1096,7 +1096,7 @@ static int ccp2_init_entities(struct isp_ccp2_device *ccp2) ...@@ -1096,7 +1096,7 @@ static int ccp2_init_entities(struct isp_ccp2_device *ccp2)
* implementation we use a fixed 32 bytes alignment regardless of the * implementation we use a fixed 32 bytes alignment regardless of the
* input format and width. If strict 128 bits alignment support is * input format and width. If strict 128 bits alignment support is
* required ispvideo will need to be made aware of this special dual * required ispvideo will need to be made aware of this special dual
* alignement requirements. * alignment requirements.
*/ */
ccp2->video_in.type = V4L2_BUF_TYPE_VIDEO_OUTPUT; ccp2->video_in.type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
ccp2->video_in.bpl_alignment = 32; ccp2->video_in.bpl_alignment = 32;
......
...@@ -351,7 +351,7 @@ static int hist_validate_params(struct ispstat *hist, void *new_conf) ...@@ -351,7 +351,7 @@ static int hist_validate_params(struct ispstat *hist, void *new_conf)
buf_size = hist_get_buf_size(user_cfg); buf_size = hist_get_buf_size(user_cfg);
if (buf_size > user_cfg->buf_size) if (buf_size > user_cfg->buf_size)
/* User's buf_size request wasn't enoght */ /* User's buf_size request wasn't enough */
user_cfg->buf_size = buf_size; user_cfg->buf_size = buf_size;
else if (user_cfg->buf_size > OMAP3ISP_HIST_MAX_BUF_SIZE) else if (user_cfg->buf_size > OMAP3ISP_HIST_MAX_BUF_SIZE)
user_cfg->buf_size = OMAP3ISP_HIST_MAX_BUF_SIZE; user_cfg->buf_size = OMAP3ISP_HIST_MAX_BUF_SIZE;
......
...@@ -122,7 +122,7 @@ static struct omap3isp_prev_csc flr_prev_csc = { ...@@ -122,7 +122,7 @@ static struct omap3isp_prev_csc flr_prev_csc = {
#define PREV_MAX_OUT_WIDTH_REV_15 4096 #define PREV_MAX_OUT_WIDTH_REV_15 4096
/* /*
* Coeficient Tables for the submodules in Preview. * Coefficient Tables for the submodules in Preview.
* Array is initialised with the values from.the tables text file. * Array is initialised with the values from.the tables text file.
*/ */
...@@ -1372,7 +1372,7 @@ static void preview_init_params(struct isp_prev_device *prev) ...@@ -1372,7 +1372,7 @@ static void preview_init_params(struct isp_prev_device *prev)
} }
/* /*
* preview_max_out_width - Handle previewer hardware ouput limitations * preview_max_out_width - Handle previewer hardware output limitations
* @isp_revision : ISP revision * @isp_revision : ISP revision
* returns maximum width output for current isp revision * returns maximum width output for current isp revision
*/ */
......
...@@ -597,7 +597,7 @@ static int isp_video_buffer_wait(struct isp_video_buffer *buf, int nonblocking) ...@@ -597,7 +597,7 @@ static int isp_video_buffer_wait(struct isp_video_buffer *buf, int nonblocking)
* isp_video_queue_free - Free video buffers memory * isp_video_queue_free - Free video buffers memory
* *
* Buffers can only be freed if the queue isn't streaming and if no buffer is * Buffers can only be freed if the queue isn't streaming and if no buffer is
* mapped to userspace. Return -EBUSY if those conditions aren't statisfied. * mapped to userspace. Return -EBUSY if those conditions aren't satisfied.
* *
* This function must be called with the queue lock held. * This function must be called with the queue lock held.
*/ */
......
...@@ -30,12 +30,12 @@ ...@@ -30,12 +30,12 @@
#include <linux/types.h> #include <linux/types.h>
/* /*
* Constants for filter coefficents count * Constants for filter coefficients count
*/ */
#define COEFF_CNT 32 #define COEFF_CNT 32
/* /*
* struct isprsz_coef - Structure for resizer filter coeffcients. * struct isprsz_coef - Structure for resizer filter coefficients.
* @h_filter_coef_4tap: Horizontal filter coefficients for 8-phase/4-tap * @h_filter_coef_4tap: Horizontal filter coefficients for 8-phase/4-tap
* mode (.5x-4x) * mode (.5x-4x)
* @v_filter_coef_4tap: Vertical filter coefficients for 8-phase/4-tap * @v_filter_coef_4tap: Vertical filter coefficients for 8-phase/4-tap
......
...@@ -144,7 +144,7 @@ static int isp_stat_buf_check_magic(struct ispstat *stat, ...@@ -144,7 +144,7 @@ static int isp_stat_buf_check_magic(struct ispstat *stat,
for (w = buf->virt_addr + buf_size, end = w + MAGIC_SIZE; for (w = buf->virt_addr + buf_size, end = w + MAGIC_SIZE;
w < end; w++) { w < end; w++) {
if (unlikely(*w != MAGIC_NUM)) { if (unlikely(*w != MAGIC_NUM)) {
dev_dbg(stat->isp->dev, "%s: endding magic check does " dev_dbg(stat->isp->dev, "%s: ending magic check does "
"not match.\n", stat->subdev.name); "not match.\n", stat->subdev.name);
return -EINVAL; return -EINVAL;
} }
...@@ -841,7 +841,7 @@ int omap3isp_stat_s_stream(struct v4l2_subdev *subdev, int enable) ...@@ -841,7 +841,7 @@ int omap3isp_stat_s_stream(struct v4l2_subdev *subdev, int enable)
if (enable) { if (enable) {
/* /*
* Only set enable PCR bit if the module was previously * Only set enable PCR bit if the module was previously
* enabled through ioct. * enabled through ioctl.
*/ */
isp_stat_try_enable(stat); isp_stat_try_enable(stat);
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment