diff options
| author | Sheng Nan <b38800@freescale.com> | 2012-10-15 20:00:25 +0800 |
|---|---|---|
| committer | Liu Ying <Ying.Liu@freescale.com> | 2012-10-16 17:41:40 +0800 |
| commit | aaf9bf68ada11a1817f5778c6a4d116908a5ecc3 (patch) | |
| tree | 5ddba4b5f3665271db895c7b317e1b5b3f7d0032 /drivers | |
| parent | 5b2960c13fa5408eb8b7e2a09d081b200902667f (diff) | |
ENGR00224964-3 IPU: Capture: add csi wait4eof support of CSI-IC channel
current _ipu_csi_wait4eof only support CSI-->MEM channel
- add support of CSI_PRP_ENC_MEM
- add support of CSI_PRP_VF_MEM
Signed-off-by: Sheng Nan <b38800@freescale.com>
(cherry picked from commit 4ddc27dff9b806d8c21dbcf7a57a3608c422d1a4)
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mxc/ipu3/ipu_capture.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/mxc/ipu3/ipu_capture.c b/drivers/mxc/ipu3/ipu_capture.c index dae3a7596bc9..f463836e28ad 100644 --- a/drivers/mxc/ipu3/ipu_capture.c +++ b/drivers/mxc/ipu3/ipu_capture.c @@ -792,8 +792,12 @@ void _ipu_csi_wait4eof(struct ipu_soc *ipu, ipu_channel_t channel) irq = IPU_IRQ_CSI2_OUT_EOF; else if (channel == CSI_MEM3) irq = IPU_IRQ_CSI3_OUT_EOF; + else if (channel == CSI_PRP_ENC_MEM) + irq = IPU_IRQ_PRP_ENC_OUT_EOF; + else if (channel == CSI_PRP_VF_MEM) + irq = IPU_IRQ_PRP_VF_OUT_EOF; else{ - dev_err(ipu->dev, "Not a CSI SMFC channel\n"); + dev_err(ipu->dev, "Not a CSI channel\n"); return; } |