summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-02-15 07:27:36 +0300
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2021-03-11 13:59:53 +0300
commitd73228a730d877fbbd2f64bc4f6a8e8f9f8f7dcc (patch)
tree60d693d087d13348bfbbdc01cb2db12b7d712c18
parent6eac0eecd092c92f870e76af6c9a5c26fa647e55 (diff)
downloadlinux-d73228a730d877fbbd2f64bc4f6a8e8f9f8f7dcc.tar.xz
media: imx: imx7_mipi_csis: Fully initialize MIPI_CSIS_DPHYCTRL register
When setting the CSIS parameters, write the MIPI_CSIS_DPHYCTRL register fully instead of modifying selected fields, as the register doesn't contain any reserved fields that need to be preserved. This simplifies initialization slightly, and ensures that the register value doesn't depend on its previous state (before a warm reboot for instance). Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Rui Miguel Silva <rmfrfs@gmail.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
-rw-r--r--drivers/staging/media/imx/imx7-mipi-csis.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/media/imx/imx7-mipi-csis.c b/drivers/staging/media/imx/imx7-mipi-csis.c
index 597d7dbde537..a059beeaf5d2 100644
--- a/drivers/staging/media/imx/imx7-mipi-csis.c
+++ b/drivers/staging/media/imx/imx7-mipi-csis.c
@@ -536,10 +536,8 @@ static void mipi_csis_set_params(struct csi_state *state)
__mipi_csis_set_format(state);
- val = mipi_csis_read(state, MIPI_CSIS_DPHYCTRL);
- val = (val & ~MIPI_CSIS_DPHYCTRL_HSSETTLE_MASK)
- | MIPI_CSIS_DPHYCTRL_HSSETTLE(state->hs_settle);
- mipi_csis_write(state, MIPI_CSIS_DPHYCTRL, val);
+ mipi_csis_write(state, MIPI_CSIS_DPHYCTRL,
+ MIPI_CSIS_DPHYCTRL_HSSETTLE(state->hs_settle));
val = (0 << MIPI_CSIS_ISPSYNC_HSYNC_LINTV_OFFSET) |
(0 << MIPI_CSIS_ISPSYNC_VSYNC_SINTV_OFFSET) |