redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

MLK-24514-1: staging: media: samsung csi: print message when fail to get gpr 

For iMX8MP platform, csi driver need to get gpr to set isp_dewarp control
in mediamix_gpr registers, but for iMX8MN platform, there is no isp dewarp
module, driver don't need to get gpr property in driver. So only print error
message when there is no gpr property instead of return error.

Signed-off-by: Guoniu.zhou <guoniu.zhou@nxp.com>
Reviewed-by: Robby Cai <robby.cai@nxp.com>
5.4-rM2-2.2.x-imx-squashed
Guoniu.zhou 2020-08-18 15:47:55 +08:00
parent 1d9f743ecc
commit 6bd941f789
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/media/imx/imx8-mipi-csi2-sam.c
View File

@ -657,7 +657,8 @@ static void mipi_csis_phy_reset_mx8mn(struct csi_state *state)
usleep_range(10, 20);
/* temporary place */
regmap_write(state->mix_gpr, 0x138, 0x8d8360);
if (state->mix_gpr)
regmap_write(state->mix_gpr, 0x138, 0x8d8360);
}
static void mipi_csis_system_enable(struct csi_state *state, int on)
@ -1578,11 +1579,10 @@ static int mipi_csis_probe(struct platform_device *pdev)
state->mix_gpr = syscon_regmap_lookup_by_phandle(dev->of_node, "gpr");
if (IS_ERR(state->mix_gpr)) {
dev_err(dev, "failed to get mix gpr\n");
return PTR_ERR(state->mix_gpr);
dev_warn(dev, "failed to get mix gpr\n");
state->mix_gpr = NULL;
}
mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
state->regs = devm_ioremap_resource(dev, mem_res);
if (IS_ERR(state->regs))