From 3fb05200e07a43724ea3737f55ec7552cf4e8ad5 Mon Sep 17 00:00:00 2001 From: "Guoniu.zhou" Date: Mon, 16 Mar 2020 17:32:51 +0800 Subject: [PATCH] MLK-23578-1: media: m2m: enable ISI m2m feature for i.MX865 Enable ISI m2m feature for i.MX865. For i.MX8QXP and QM, ISI use port 5 as image source port from memory, but for i.MX865, it change to port 2, so add this info as platform data and configure image source port selection according to the data. Signed-off-by: Guoniu.zhou Reviewed-by: Sandor Yu --- drivers/staging/media/imx/imx8-isi-core.c | 2 ++ drivers/staging/media/imx/imx8-isi-hw.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/staging/media/imx/imx8-isi-core.c b/drivers/staging/media/imx/imx8-isi-core.c index 9c1e8ea866b6..937be9ed6176 100644 --- a/drivers/staging/media/imx/imx8-isi-core.c +++ b/drivers/staging/media/imx/imx8-isi-core.c @@ -321,6 +321,8 @@ static void mxc_imx8mn_clk_disable(struct mxc_isi_dev *mxc_isi) static struct mxc_isi_chan_src mxc_imx8mn_chan_src = { .src_mipi0 = 0, .src_mipi1 = 1, + /* For i.MX8MP */ + .src_mem = 2, }; static struct mxc_isi_dev_ops mxc_imx8mn_clk_ops = { diff --git a/drivers/staging/media/imx/imx8-isi-hw.c b/drivers/staging/media/imx/imx8-isi-hw.c index 662eb3578db0..00d74605c9fd 100644 --- a/drivers/staging/media/imx/imx8-isi-hw.c +++ b/drivers/staging/media/imx/imx8-isi-hw.c @@ -641,7 +641,7 @@ void mxc_isi_channel_enable(struct mxc_isi_dev *mxc_isi, bool m2m_enabled) if (m2m_enabled) { val &= ~(CHNL_CTRL_SRC_TYPE_MASK | CHNL_CTRL_SRC_INPUT_MASK); - val |= (CHNL_CTRL_SRC_INPUT_MEMORY << CHNL_CTRL_SRC_INPUT_OFFSET | + val |= (mxc_isi->pdata->chan_src->src_mem << CHNL_CTRL_SRC_INPUT_OFFSET | CHNL_CTRL_SRC_TYPE_MEMORY << CHNL_CTRL_SRC_TYPE_OFFSET); }