diff options
| author | Robby Cai <robby.cai@nxp.com> | 2018-06-11 10:38:43 +0800 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:32:08 +0800 |
| commit | 86ff2008b5a33d4233c33c2e662f8391cc474db2 (patch) | |
| tree | 602526e886deabdf5dd57844fabf51febcbc4234 /drivers | |
| parent | d31dd61a47ae6c1f9565067c2a078b861e2383b4 (diff) | |
MLK-18552-2 media: mipi_csi: enable disp_axi and disp_apb before the access
On i.MX8MM, IC design uses registers from CSI to do MIPI PHY reset. Need enable
disp_axi and disp_apb before the access, otherwise meet hang issue.
Signed-off-by: Robby Cai <robby.cai@nxp.com>
Reviewed-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/platform/mxc/capture/mxc_mipi_csi.c | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/drivers/media/platform/mxc/capture/mxc_mipi_csi.c b/drivers/media/platform/mxc/capture/mxc_mipi_csi.c index d1741473b5d5..f9346f127785 100644 --- a/drivers/media/platform/mxc/capture/mxc_mipi_csi.c +++ b/drivers/media/platform/mxc/capture/mxc_mipi_csi.c @@ -275,6 +275,8 @@ struct csi_state { void __iomem *regs; struct clk *mipi_clk; struct clk *phy_clk; + struct clk *disp_axi; + struct clk *disp_apb; int irq; u32 flags; @@ -545,12 +547,20 @@ static void mipi_csis_clk_enable(struct csi_state *state) { clk_prepare_enable(state->mipi_clk); clk_prepare_enable(state->phy_clk); + if (state->disp_axi) + clk_prepare_enable(state->disp_axi); + if (state->disp_apb) + clk_prepare_enable(state->disp_apb); } static void mipi_csis_clk_disable(struct csi_state *state) { clk_disable_unprepare(state->mipi_clk); clk_disable_unprepare(state->phy_clk); + if (state->disp_axi) + clk_disable_unprepare(state->disp_axi); + if (state->disp_apb) + clk_disable_unprepare(state->disp_apb); } static int mipi_csis_clk_get(struct csi_state *state) @@ -570,6 +580,18 @@ static int mipi_csis_clk_get(struct csi_state *state) return -ENODEV; } + state->disp_axi = devm_clk_get(dev, "disp_axi"); + if (IS_ERR(state->disp_axi)) { + dev_warn(dev, "Could not get disp_axi clock\n"); + state->disp_axi = NULL; + } + + state->disp_apb = devm_clk_get(dev, "disp_apb"); + if (IS_ERR(state->disp_apb)) { + dev_warn(dev, "Could not get disp apb clock\n"); + state->disp_apb = NULL; + } + /* Set clock rate */ if (state->clk_frequency) ret = clk_set_rate(state->mipi_clk, @@ -1081,7 +1103,6 @@ static int mipi_csis_probe(struct platform_device *pdev) return -EINVAL; phy_reset_fn = of_id->data; - phy_reset_fn(state); mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); state->regs = devm_ioremap_resource(dev, mem_res); @@ -1100,6 +1121,8 @@ static int mipi_csis_probe(struct platform_device *pdev) mipi_csis_clk_enable(state); + phy_reset_fn(state); + ret = devm_request_irq(dev, state->irq, mipi_csis_irq_handler, 0, dev_name(dev), state); if (ret) { |