diff options
| author | Wu Guoxing <b39297@freescale.com> | 2012-05-21 09:24:29 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2012-07-20 13:37:48 +0800 |
| commit | 243302c429aa9c8f4961feb16b1c8197ae602f7b (patch) | |
| tree | ee3007960d4140ab30db54d287b7ef4e14a91f45 /drivers/media/video/mxc/capture/ipu_prp_enc.c | |
| parent | 0ee00b963d29bc4bccbf4933e0003d05fde07900 (diff) | |
| download | linux-243302c429aa9c8f4961feb16b1c8197ae602f7b.tar.gz | |
ENGR00209062-2: mx6dq and mx6dl dual camera support
dual camera support for mx6q and mx6dl:
1. let mipi and parallel camera working on different csi
2. the two camera can work independently and synchronously
3. the two camera will be registered and different video
device(/dev/video0, /dev/video1)
4. when both camera are working, the can not use the same
ipu channel, that is, when camera one using PRP_ENC_MEM
or PRP_VF_MEM channel, the other one can only use CSI_MEM
this is the driver part.
Signed-off-by: Wu Guoxing <b39297@freescale.com>
Diffstat (limited to 'drivers/media/video/mxc/capture/ipu_prp_enc.c')
| -rw-r--r-- | drivers/media/video/mxc/capture/ipu_prp_enc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/mxc/capture/ipu_prp_enc.c b/drivers/media/video/mxc/capture/ipu_prp_enc.c index 6710cba5d817..02515b35ba03 100644 --- a/drivers/media/video/mxc/capture/ipu_prp_enc.c +++ b/drivers/media/video/mxc/capture/ipu_prp_enc.c @@ -1,5 +1,5 @@ /* - * Copyright 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2004-2012 Freescale Semiconductor, Inc. All Rights Reserved. */ /* @@ -170,7 +170,8 @@ static int prp_enc_setup(cam_data *cam) return err; } - ipu_csi_enable_mclk_if(cam->ipu, CSI_MCLK_ENC, cam->csi, true, true); + ipu_csi_enable_mclk_if(cam->ipu, CSI_MCLK_ENC, + cam->mclk_source, true, true); grotation = cam->rotation; if (cam->rotation >= IPU_ROTATE_90_RIGHT) { |