From: Sheng Nan Date: Wed, 17 Oct 2012 06:14:06 +0000 (+0800) Subject: ENGR00229952 mxc_v4l2_capture: csi ic mem uses hard coded initial DMA base addr X-Git-Tag: v3.0.35-fsl~349 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2e9af42c7fd7bccc2c4b72d69e016d934f99b131;p=karo-tx-linux.git ENGR00229952 mxc_v4l2_capture: csi ic mem uses hard coded initial DMA base addr When setup csi ic mem on the fly channel, the capture output buffer is initialized with hard coded dummy address 0xdeadbeaf This also causes IPU warning when use this channel: imx-ipuv3 imx-ipuv3.0: IDMAC20's EBA0 is not 8-byte aligned - use the pre-allocated dummy_frame.vaddress instead of 0xdeadbeaf Signed-off-by: Sheng Nan --- diff --git a/drivers/media/video/mxc/capture/ipu_prp_enc.c b/drivers/media/video/mxc/capture/ipu_prp_enc.c index def416570de3..a3c90d53f2eb 100644 --- a/drivers/media/video/mxc/capture/ipu_prp_enc.c +++ b/drivers/media/video/mxc/capture/ipu_prp_enc.c @@ -70,7 +70,7 @@ static int prp_enc_setup(cam_data *cam) { ipu_channel_params_t enc; int err = 0; - dma_addr_t dummy = 0xdeadbeaf; + dma_addr_t dummy = cam->dummy_frame.buffer.m.offset; #ifdef CONFIG_MXC_MIPI_CSI2 void *mipi_csi2_info; int ipu_id;