media: imx: imx7-media-csi: Replace CSICR*_RESET_VAL with values

The CSICR*_RESET_VAL macros only obfuscate code. Use their value
directly, replacing the numerical value with the macros that describe
register bits.

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>

diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c
index 174e608ededaba0ba7ef22742bf181c52883bd38..072047e059ef5aa3ce48004393d0c371884cf7c2 100644 (file)
--- a/drivers/staging/media/imx/imx7-media-csi.c
+++ b/drivers/staging/media/imx/imx7-media-csi.c
@@ -32,11 +32,6 @@
 #define IMX7_CSI_PAD_SRC       1
 #define IMX7_CSI_PADS_NUM      2
 
-/* reset values */
-#define CSICR1_RESET_VAL       0x40000800
-#define CSICR2_RESET_VAL       0x0
-#define CSICR3_RESET_VAL       0x0
-
 /* csi control reg 1 */
 #define BIT_SWAP16_EN          BIT(31)
 #define BIT_EXT_VSYNC          BIT(30)
@@ -211,9 +206,9 @@ static void imx7_csi_hw_reset(struct imx7_csi *csi)
                           imx7_csi_reg_read(csi, CSI_CSICR3) | BIT_FRMCNT_RST,
                           CSI_CSICR3);
 
-       imx7_csi_reg_write(csi, CSICR1_RESET_VAL, CSI_CSICR1);
-       imx7_csi_reg_write(csi, CSICR2_RESET_VAL, CSI_CSICR2);
-       imx7_csi_reg_write(csi, CSICR3_RESET_VAL, CSI_CSICR3);
+       imx7_csi_reg_write(csi, BIT_EXT_VSYNC | BIT_HSYNC_POL, CSI_CSICR1);
+       imx7_csi_reg_write(csi, 0, CSI_CSICR2);
+       imx7_csi_reg_write(csi, 0, CSI_CSICR3);
 }
 
 static u32 imx7_csi_irq_clear(struct imx7_csi *csi)