media: ti-vpe: cal: switch BIT_MASK to BIT
authorBenoit Parrot <bparrot@ti.com>
Tue, 12 Nov 2019 14:53:30 +0000 (15:53 +0100)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Mon, 9 Dec 2019 10:20:48 +0000 (11:20 +0100)
Looks like the preferred macro to define a single bit mask is BIT() and
not BIT_MASK().

Signed-off-by: Benoit Parrot <bparrot@ti.com>
[hverkuil-cisco@xs4all.nl: fix checkpatch warnings for CAL_HL_IRQ_MASK]
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/platform/ti-vpe/cal_regs.h

index 68cfc92..de2dac2 100644 (file)
 #define CAL_HL_HWINFO_NPPI_CONTEXTS_EIGHT              2
 #define CAL_HL_HWINFO_NPPI_CONTEXTS_RESERVED           3
 
-#define CAL_HL_SYSCONFIG_SOFTRESET_MASK                BIT_MASK(0)
+#define CAL_HL_SYSCONFIG_SOFTRESET_MASK                BIT(0)
 #define CAL_HL_SYSCONFIG_SOFTRESET_DONE                        0x0
 #define CAL_HL_SYSCONFIG_SOFTRESET_PENDING             0x1
 #define CAL_HL_SYSCONFIG_SOFTRESET_NOACTION            0x0
 #define CAL_HL_SYSCONFIG_IDLEMODE_SMART1               2
 #define CAL_HL_SYSCONFIG_IDLEMODE_SMART2               3
 
-#define CAL_HL_IRQ_EOI_LINE_NUMBER_MASK                BIT_MASK(0)
+#define CAL_HL_IRQ_EOI_LINE_NUMBER_MASK                BIT(0)
 #define CAL_HL_IRQ_EOI_LINE_NUMBER_READ0               0
 #define CAL_HL_IRQ_EOI_LINE_NUMBER_EOI0                        0
 
-#define CAL_HL_IRQ_MASK(m)                     BIT_MASK(m-1)
+#define CAL_HL_IRQ_MASK(m)                     BIT((m) - 1)
 #define CAL_HL_IRQ_NOACTION                            0x0
 #define CAL_HL_IRQ_ENABLE                              0x1
 #define CAL_HL_IRQ_CLEAR                               0x1
 #define CAL_HL_IRQ_ENABLED                             0x1
 #define CAL_HL_IRQ_PENDING                             0x1
 
-#define CAL_PIX_PROC_EN_MASK                   BIT_MASK(0)
+#define CAL_PIX_PROC_EN_MASK                   BIT(0)
 #define CAL_PIX_PROC_EXTRACT_MASK              GENMASK(4, 1)
 #define CAL_PIX_PROC_EXTRACT_B6                                0x0
 #define CAL_PIX_PROC_EXTRACT_B7                                0x1
 #define CAL_PIX_PROC_PACK_ARGB                         0x6
 #define CAL_PIX_PROC_CPORT_MASK                        GENMASK(23, 19)
 
-#define CAL_CTRL_POSTED_WRITES_MASK            BIT_MASK(0)
+#define CAL_CTRL_POSTED_WRITES_MASK            BIT(0)
 #define CAL_CTRL_POSTED_WRITES_NONPOSTED               0
 #define CAL_CTRL_POSTED_WRITES                         1
 #define CAL_CTRL_TAGCNT_MASK                   GENMASK(4, 1)
 #define CAL_CTRL_BURSTSIZE_BURST128                    0x3
 #define CAL_CTRL_LL_FORCE_STATE_MASK           GENMASK(12, 7)
 #define CAL_CTRL_MFLAGL_MASK                   GENMASK(20, 13)
-#define CAL_CTRL_PWRSCPCLK_MASK                        BIT_MASK(21)
+#define CAL_CTRL_PWRSCPCLK_MASK                        BIT(21)
 #define CAL_CTRL_PWRSCPCLK_AUTO                                0
 #define CAL_CTRL_PWRSCPCLK_FORCE                       1
-#define CAL_CTRL_RD_DMA_STALL_MASK             BIT_MASK(22)
+#define CAL_CTRL_RD_DMA_STALL_MASK             BIT(22)
 #define CAL_CTRL_MFLAGH_MASK                   GENMASK(31, 24)
 
 #define CAL_CTRL1_PPI_GROUPING_MASK            GENMASK(1, 0)
 #define CAL_VPORT_CTRL1_PCLK_MASK              GENMASK(16, 0)
 #define CAL_VPORT_CTRL1_XBLK_MASK              GENMASK(24, 17)
 #define CAL_VPORT_CTRL1_YBLK_MASK              GENMASK(30, 25)
-#define CAL_VPORT_CTRL1_WIDTH_MASK             BIT_MASK(31)
+#define CAL_VPORT_CTRL1_WIDTH_MASK             BIT(31)
 #define CAL_VPORT_CTRL1_WIDTH_ONE                      0
 #define CAL_VPORT_CTRL1_WIDTH_TWO                      1
 
 #define CAL_VPORT_CTRL2_CPORT_MASK             GENMASK(4, 0)
-#define CAL_VPORT_CTRL2_FREERUNNING_MASK       BIT_MASK(15)
+#define CAL_VPORT_CTRL2_FREERUNNING_MASK       BIT(15)
 #define CAL_VPORT_CTRL2_FREERUNNING_GATED              0
 #define CAL_VPORT_CTRL2_FREERUNNING_FREE               1
-#define CAL_VPORT_CTRL2_FS_RESETS_MASK         BIT_MASK(16)
+#define CAL_VPORT_CTRL2_FS_RESETS_MASK         BIT(16)
 #define CAL_VPORT_CTRL2_FS_RESETS_NO                   0
 #define CAL_VPORT_CTRL2_FS_RESETS_YES                  1
-#define CAL_VPORT_CTRL2_FSM_RESET_MASK         BIT_MASK(17)
+#define CAL_VPORT_CTRL2_FSM_RESET_MASK         BIT(17)
 #define CAL_VPORT_CTRL2_FSM_RESET_NOEFFECT             0
 #define CAL_VPORT_CTRL2_FSM_RESET                      1
 #define CAL_VPORT_CTRL2_RDY_THR_MASK           GENMASK(31, 18)
 #define CAL_BYS_CTRL1_PCLK_MASK                        GENMASK(16, 0)
 #define CAL_BYS_CTRL1_XBLK_MASK                        GENMASK(24, 17)
 #define CAL_BYS_CTRL1_YBLK_MASK                        GENMASK(30, 25)
-#define CAL_BYS_CTRL1_BYSINEN_MASK             BIT_MASK(31)
+#define CAL_BYS_CTRL1_BYSINEN_MASK             BIT(31)
 
 #define CAL_BYS_CTRL2_CPORTIN_MASK             GENMASK(4, 0)
 #define CAL_BYS_CTRL2_CPORTOUT_MASK            GENMASK(9, 5)
-#define CAL_BYS_CTRL2_DUPLICATEDDATA_MASK      BIT_MASK(10)
+#define CAL_BYS_CTRL2_DUPLICATEDDATA_MASK      BIT(10)
 #define CAL_BYS_CTRL2_DUPLICATEDDATA_NO                        0
 #define CAL_BYS_CTRL2_DUPLICATEDDATA_YES               1
-#define CAL_BYS_CTRL2_FREERUNNING_MASK         BIT_MASK(11)
+#define CAL_BYS_CTRL2_FREERUNNING_MASK         BIT(11)
 #define CAL_BYS_CTRL2_FREERUNNING_NO                   0
 #define CAL_BYS_CTRL2_FREERUNNING_YES                  1
 
-#define CAL_RD_DMA_CTRL_GO_MASK                        BIT_MASK(0)
+#define CAL_RD_DMA_CTRL_GO_MASK                        BIT(0)
 #define CAL_RD_DMA_CTRL_GO_DIS                         0
 #define CAL_RD_DMA_CTRL_GO_EN                          1
 #define CAL_RD_DMA_CTRL_GO_IDLE                                0
 #define CAL_RD_DMA_CTRL_GO_BUSY                                1
-#define CAL_RD_DMA_CTRL_INIT_MASK              BIT_MASK(1)
+#define CAL_RD_DMA_CTRL_INIT_MASK              BIT(1)
 #define CAL_RD_DMA_CTRL_BW_LIMITER_MASK                GENMASK(10, 2)
 #define CAL_RD_DMA_CTRL_OCP_TAG_CNT_MASK       GENMASK(14, 11)
 #define CAL_RD_DMA_CTRL_PCLK_MASK              GENMASK(31, 15)
 #define CAL_RD_DMA_CTRL2_CIRC_MODE_SIXTEEN             3
 #define CAL_RD_DMA_CTRL2_CIRC_MODE_SIXTYFOUR           4
 #define CAL_RD_DMA_CTRL2_CIRC_MODE_RESERVED            5
-#define CAL_RD_DMA_CTRL2_ICM_CSTART_MASK       BIT_MASK(3)
+#define CAL_RD_DMA_CTRL2_ICM_CSTART_MASK       BIT(3)
 #define CAL_RD_DMA_CTRL2_PATTERN_MASK          GENMASK(5, 4)
 #define CAL_RD_DMA_CTRL2_PATTERN_LINEAR                        0
 #define CAL_RD_DMA_CTRL2_PATTERN_YUV420                        1
 #define CAL_RD_DMA_CTRL2_PATTERN_RD2SKIP2              2
 #define CAL_RD_DMA_CTRL2_PATTERN_RD2SKIP4              3
-#define CAL_RD_DMA_CTRL2_BYSOUT_LE_WAIT_MASK   BIT_MASK(6)
+#define CAL_RD_DMA_CTRL2_BYSOUT_LE_WAIT_MASK   BIT(6)
 #define CAL_RD_DMA_CTRL2_BYSOUT_LE_WAIT_FREERUNNING    0
 #define CAL_RD_DMA_CTRL2_BYSOUT_LE_WAIT_WAITFORBYSOUT  1
 #define CAL_RD_DMA_CTRL2_CIRC_SIZE_MASK                GENMASK(29, 16)
 #define CAL_WR_DMA_CTRL_PATTERN_WR2SKIP2               2
 #define CAL_WR_DMA_CTRL_PATTERN_WR2SKIP4               3
 #define CAL_WR_DMA_CTRL_PATTERN_RESERVED               1
-#define CAL_WR_DMA_CTRL_ICM_PSTART_MASK                BIT_MASK(5)
+#define CAL_WR_DMA_CTRL_ICM_PSTART_MASK                BIT(5)
 #define CAL_WR_DMA_CTRL_DTAG_MASK              GENMASK(8, 6)
 #define CAL_WR_DMA_CTRL_DTAG_ATT_HDR                   0
 #define CAL_WR_DMA_CTRL_DTAG_ATT_DAT                   1
 #define CAL_WR_DMA_CTRL_DTAG_D6                                6
 #define CAL_WR_DMA_CTRL_DTAG_D7                                7
 #define CAL_WR_DMA_CTRL_CPORT_MASK             GENMASK(13, 9)
-#define CAL_WR_DMA_CTRL_STALL_RD_MASK          BIT_MASK(14)
+#define CAL_WR_DMA_CTRL_STALL_RD_MASK          BIT(14)
 #define CAL_WR_DMA_CTRL_YSIZE_MASK             GENMASK(31, 18)
 
 #define CAL_WR_DMA_ADDR_MASK                   GENMASK(31, 4)
 #define CAL_WR_DMA_XSIZE_XSKIP_MASK            GENMASK(15, 3)
 #define CAL_WR_DMA_XSIZE_MASK                  GENMASK(31, 19)
 
-#define CAL_CSI2_PPI_CTRL_IF_EN_MASK           BIT_MASK(0)
-#define CAL_CSI2_PPI_CTRL_ECC_EN_MASK          BIT_MASK(2)
-#define CAL_CSI2_PPI_CTRL_FRAME_MASK           BIT_MASK(3)
+#define CAL_CSI2_PPI_CTRL_IF_EN_MASK           BIT(0)
+#define CAL_CSI2_PPI_CTRL_ECC_EN_MASK          BIT(2)
+#define CAL_CSI2_PPI_CTRL_FRAME_MASK           BIT(3)
 #define CAL_CSI2_PPI_CTRL_FRAME_IMMEDIATE              0
 #define CAL_CSI2_PPI_CTRL_FRAME                                1
 
 #define CAL_CSI2_COMPLEXIO_CFG_POSITION_2                      2
 #define CAL_CSI2_COMPLEXIO_CFG_POSITION_1                      1
 #define CAL_CSI2_COMPLEXIO_CFG_POSITION_NOT_USED               0
-#define CAL_CSI2_COMPLEXIO_CFG_CLOCK_POL_MASK          BIT_MASK(3)
+#define CAL_CSI2_COMPLEXIO_CFG_CLOCK_POL_MASK          BIT(3)
 #define CAL_CSI2_COMPLEXIO_CFG_POL_PLUSMINUS                   0
 #define CAL_CSI2_COMPLEXIO_CFG_POL_MINUSPLUS                   1
 #define CAL_CSI2_COMPLEXIO_CFG_DATA1_POSITION_MASK     GENMASK(6, 4)
-#define CAL_CSI2_COMPLEXIO_CFG_DATA1_POL_MASK          BIT_MASK(7)
+#define CAL_CSI2_COMPLEXIO_CFG_DATA1_POL_MASK          BIT(7)
 #define CAL_CSI2_COMPLEXIO_CFG_DATA2_POSITION_MASK     GENMASK(10, 8)
-#define CAL_CSI2_COMPLEXIO_CFG_DATA2_POL_MASK          BIT_MASK(11)
+#define CAL_CSI2_COMPLEXIO_CFG_DATA2_POL_MASK          BIT(11)
 #define CAL_CSI2_COMPLEXIO_CFG_DATA3_POSITION_MASK     GENMASK(14, 12)
-#define CAL_CSI2_COMPLEXIO_CFG_DATA3_POL_MASK          BIT_MASK(15)
+#define CAL_CSI2_COMPLEXIO_CFG_DATA3_POL_MASK          BIT(15)
 #define CAL_CSI2_COMPLEXIO_CFG_DATA4_POSITION_MASK     GENMASK(18, 16)
-#define CAL_CSI2_COMPLEXIO_CFG_DATA4_POL_MASK          BIT_MASK(19)
-#define CAL_CSI2_COMPLEXIO_CFG_PWR_AUTO_MASK           BIT_MASK(24)
+#define CAL_CSI2_COMPLEXIO_CFG_DATA4_POL_MASK          BIT(19)
+#define CAL_CSI2_COMPLEXIO_CFG_PWR_AUTO_MASK           BIT(24)
 #define CAL_CSI2_COMPLEXIO_CFG_PWR_STATUS_MASK         GENMASK(26, 25)
 #define CAL_CSI2_COMPLEXIO_CFG_PWR_STATUS_STATE_OFF            0
 #define CAL_CSI2_COMPLEXIO_CFG_PWR_STATUS_STATE_ON             1
 #define CAL_CSI2_COMPLEXIO_CFG_PWR_CMD_STATE_OFF               0
 #define CAL_CSI2_COMPLEXIO_CFG_PWR_CMD_STATE_ON                        1
 #define CAL_CSI2_COMPLEXIO_CFG_PWR_CMD_STATE_ULP               2
-#define CAL_CSI2_COMPLEXIO_CFG_RESET_DONE_MASK         BIT_MASK(29)
+#define CAL_CSI2_COMPLEXIO_CFG_RESET_DONE_MASK         BIT(29)
 #define CAL_CSI2_COMPLEXIO_CFG_RESET_DONE_RESETCOMPLETED       1
 #define CAL_CSI2_COMPLEXIO_CFG_RESET_DONE_RESETONGOING         0
-#define CAL_CSI2_COMPLEXIO_CFG_RESET_CTRL_MASK         BIT_MASK(30)
+#define CAL_CSI2_COMPLEXIO_CFG_RESET_CTRL_MASK         BIT(30)
 #define CAL_CSI2_COMPLEXIO_CFG_RESET_CTRL                      0
 #define CAL_CSI2_COMPLEXIO_CFG_RESET_CTRL_OPERATIONAL          1
 
 #define CAL_CSI2_SHORT_PACKET_MASK     GENMASK(23, 0)
 
-#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTHS1_MASK          BIT_MASK(0)
-#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTHS2_MASK          BIT_MASK(1)
-#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTHS3_MASK          BIT_MASK(2)
-#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTHS4_MASK          BIT_MASK(3)
-#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTHS5_MASK          BIT_MASK(4)
-#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTSYNCHS1_MASK      BIT_MASK(5)
-#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTSYNCHS2_MASK      BIT_MASK(6)
-#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTSYNCHS3_MASK      BIT_MASK(7)
-#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTSYNCHS4_MASK      BIT_MASK(8)
-#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTSYNCHS5_MASK      BIT_MASK(9)
-#define CAL_CSI2_COMPLEXIO_IRQ_ERRESC1_MASK            BIT_MASK(10)
-#define CAL_CSI2_COMPLEXIO_IRQ_ERRESC2_MASK            BIT_MASK(11)
-#define CAL_CSI2_COMPLEXIO_IRQ_ERRESC3_MASK            BIT_MASK(12)
-#define CAL_CSI2_COMPLEXIO_IRQ_ERRESC4_MASK            BIT_MASK(13)
-#define CAL_CSI2_COMPLEXIO_IRQ_ERRESC5_MASK            BIT_MASK(14)
-#define CAL_CSI2_COMPLEXIO_IRQ_ERRCONTROL1_MASK                BIT_MASK(15)
-#define CAL_CSI2_COMPLEXIO_IRQ_ERRCONTROL2_MASK                BIT_MASK(16)
-#define CAL_CSI2_COMPLEXIO_IRQ_ERRCONTROL3_MASK                BIT_MASK(17)
-#define CAL_CSI2_COMPLEXIO_IRQ_ERRCONTROL4_MASK                BIT_MASK(18)
-#define CAL_CSI2_COMPLEXIO_IRQ_ERRCONTROL5_MASK                BIT_MASK(19)
-#define CAL_CSI2_COMPLEXIO_IRQ_STATEULPM1_MASK         BIT_MASK(20)
-#define CAL_CSI2_COMPLEXIO_IRQ_STATEULPM2_MASK         BIT_MASK(21)
-#define CAL_CSI2_COMPLEXIO_IRQ_STATEULPM3_MASK         BIT_MASK(22)
-#define CAL_CSI2_COMPLEXIO_IRQ_STATEULPM4_MASK         BIT_MASK(23)
-#define CAL_CSI2_COMPLEXIO_IRQ_STATEULPM5_MASK         BIT_MASK(24)
-#define CAL_CSI2_COMPLEXIO_IRQ_STATEALLULPMENTER_MASK  BIT_MASK(25)
-#define CAL_CSI2_COMPLEXIO_IRQ_STATEALLULPMEXIT_MASK   BIT_MASK(26)
-#define CAL_CSI2_COMPLEXIO_IRQ_FIFO_OVR_MASK           BIT_MASK(27)
-#define CAL_CSI2_COMPLEXIO_IRQ_SHORT_PACKET_MASK       BIT_MASK(28)
-#define CAL_CSI2_COMPLEXIO_IRQ_ECC_NO_CORRECTION_MASK  BIT_MASK(30)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTHS1_MASK          BIT(0)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTHS2_MASK          BIT(1)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTHS3_MASK          BIT(2)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTHS4_MASK          BIT(3)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTHS5_MASK          BIT(4)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTSYNCHS1_MASK      BIT(5)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTSYNCHS2_MASK      BIT(6)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTSYNCHS3_MASK      BIT(7)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTSYNCHS4_MASK      BIT(8)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTSYNCHS5_MASK      BIT(9)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRESC1_MASK            BIT(10)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRESC2_MASK            BIT(11)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRESC3_MASK            BIT(12)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRESC4_MASK            BIT(13)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRESC5_MASK            BIT(14)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRCONTROL1_MASK                BIT(15)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRCONTROL2_MASK                BIT(16)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRCONTROL3_MASK                BIT(17)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRCONTROL4_MASK                BIT(18)
+#define CAL_CSI2_COMPLEXIO_IRQ_ERRCONTROL5_MASK                BIT(19)
+#define CAL_CSI2_COMPLEXIO_IRQ_STATEULPM1_MASK         BIT(20)
+#define CAL_CSI2_COMPLEXIO_IRQ_STATEULPM2_MASK         BIT(21)
+#define CAL_CSI2_COMPLEXIO_IRQ_STATEULPM3_MASK         BIT(22)
+#define CAL_CSI2_COMPLEXIO_IRQ_STATEULPM4_MASK         BIT(23)
+#define CAL_CSI2_COMPLEXIO_IRQ_STATEULPM5_MASK         BIT(24)
+#define CAL_CSI2_COMPLEXIO_IRQ_STATEALLULPMENTER_MASK  BIT(25)
+#define CAL_CSI2_COMPLEXIO_IRQ_STATEALLULPMEXIT_MASK   BIT(26)
+#define CAL_CSI2_COMPLEXIO_IRQ_FIFO_OVR_MASK           BIT(27)
+#define CAL_CSI2_COMPLEXIO_IRQ_SHORT_PACKET_MASK       BIT(28)
+#define CAL_CSI2_COMPLEXIO_IRQ_ECC_NO_CORRECTION_MASK  BIT(30)
 
 #define CAL_CSI2_TIMING_STOP_STATE_COUNTER_IO1_MASK    GENMASK(12, 0)
-#define CAL_CSI2_TIMING_STOP_STATE_X4_IO1_MASK         BIT_MASK(13)
-#define CAL_CSI2_TIMING_STOP_STATE_X16_IO1_MASK                BIT_MASK(14)
-#define CAL_CSI2_TIMING_FORCE_RX_MODE_IO1_MASK         BIT_MASK(15)
-
-#define CAL_CSI2_VC_IRQ_FS_IRQ_0_MASK                  BIT_MASK(0)
-#define CAL_CSI2_VC_IRQ_FE_IRQ_0_MASK                  BIT_MASK(1)
-#define CAL_CSI2_VC_IRQ_LS_IRQ_0_MASK                  BIT_MASK(2)
-#define CAL_CSI2_VC_IRQ_LE_IRQ_0_MASK                  BIT_MASK(3)
-#define CAL_CSI2_VC_IRQ_CS_IRQ_0_MASK                  BIT_MASK(4)
-#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_0_MASK     BIT_MASK(5)
-#define CAL_CSI2_VC_IRQ_FS_IRQ_1_MASK                  BIT_MASK(8)
-#define CAL_CSI2_VC_IRQ_FE_IRQ_1_MASK                  BIT_MASK(9)
-#define CAL_CSI2_VC_IRQ_LS_IRQ_1_MASK                  BIT_MASK(10)
-#define CAL_CSI2_VC_IRQ_LE_IRQ_1_MASK                  BIT_MASK(11)
-#define CAL_CSI2_VC_IRQ_CS_IRQ_1_MASK                  BIT_MASK(12)
-#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_1_MASK     BIT_MASK(13)
-#define CAL_CSI2_VC_IRQ_FS_IRQ_2_MASK                  BIT_MASK(16)
-#define CAL_CSI2_VC_IRQ_FE_IRQ_2_MASK                  BIT_MASK(17)
-#define CAL_CSI2_VC_IRQ_LS_IRQ_2_MASK                  BIT_MASK(18)
-#define CAL_CSI2_VC_IRQ_LE_IRQ_2_MASK                  BIT_MASK(19)
-#define CAL_CSI2_VC_IRQ_CS_IRQ_2_MASK                  BIT_MASK(20)
-#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_2_MASK     BIT_MASK(21)
-#define CAL_CSI2_VC_IRQ_FS_IRQ_3_MASK                  BIT_MASK(24)
-#define CAL_CSI2_VC_IRQ_FE_IRQ_3_MASK                  BIT_MASK(25)
-#define CAL_CSI2_VC_IRQ_LS_IRQ_3_MASK                  BIT_MASK(26)
-#define CAL_CSI2_VC_IRQ_LE_IRQ_3_MASK                  BIT_MASK(27)
-#define CAL_CSI2_VC_IRQ_CS_IRQ_3_MASK                  BIT_MASK(28)
-#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_3_MASK     BIT_MASK(29)
+#define CAL_CSI2_TIMING_STOP_STATE_X4_IO1_MASK         BIT(13)
+#define CAL_CSI2_TIMING_STOP_STATE_X16_IO1_MASK                BIT(14)
+#define CAL_CSI2_TIMING_FORCE_RX_MODE_IO1_MASK         BIT(15)
+
+#define CAL_CSI2_VC_IRQ_FS_IRQ_0_MASK                  BIT(0)
+#define CAL_CSI2_VC_IRQ_FE_IRQ_0_MASK                  BIT(1)
+#define CAL_CSI2_VC_IRQ_LS_IRQ_0_MASK                  BIT(2)
+#define CAL_CSI2_VC_IRQ_LE_IRQ_0_MASK                  BIT(3)
+#define CAL_CSI2_VC_IRQ_CS_IRQ_0_MASK                  BIT(4)
+#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_0_MASK     BIT(5)
+#define CAL_CSI2_VC_IRQ_FS_IRQ_1_MASK                  BIT(8)
+#define CAL_CSI2_VC_IRQ_FE_IRQ_1_MASK                  BIT(9)
+#define CAL_CSI2_VC_IRQ_LS_IRQ_1_MASK                  BIT(10)
+#define CAL_CSI2_VC_IRQ_LE_IRQ_1_MASK                  BIT(11)
+#define CAL_CSI2_VC_IRQ_CS_IRQ_1_MASK                  BIT(12)
+#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_1_MASK     BIT(13)
+#define CAL_CSI2_VC_IRQ_FS_IRQ_2_MASK                  BIT(16)
+#define CAL_CSI2_VC_IRQ_FE_IRQ_2_MASK                  BIT(17)
+#define CAL_CSI2_VC_IRQ_LS_IRQ_2_MASK                  BIT(18)
+#define CAL_CSI2_VC_IRQ_LE_IRQ_2_MASK                  BIT(19)
+#define CAL_CSI2_VC_IRQ_CS_IRQ_2_MASK                  BIT(20)
+#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_2_MASK     BIT(21)
+#define CAL_CSI2_VC_IRQ_FS_IRQ_3_MASK                  BIT(24)
+#define CAL_CSI2_VC_IRQ_FE_IRQ_3_MASK                  BIT(25)
+#define CAL_CSI2_VC_IRQ_LS_IRQ_3_MASK                  BIT(26)
+#define CAL_CSI2_VC_IRQ_LE_IRQ_3_MASK                  BIT(27)
+#define CAL_CSI2_VC_IRQ_CS_IRQ_3_MASK                  BIT(28)
+#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_3_MASK     BIT(29)
 
 #define CAL_CSI2_CTX_DT_MASK           GENMASK(5, 0)
 #define CAL_CSI2_CTX_VC_MASK           GENMASK(7, 6)
 #define CAL_CSI2_CTX_CPORT_MASK                GENMASK(12, 8)
-#define CAL_CSI2_CTX_ATT_MASK          BIT_MASK(13)
+#define CAL_CSI2_CTX_ATT_MASK          BIT(13)
 #define CAL_CSI2_CTX_ATT_PIX                   0
 #define CAL_CSI2_CTX_ATT                       1
-#define CAL_CSI2_CTX_PACK_MODE_MASK    BIT_MASK(14)
+#define CAL_CSI2_CTX_PACK_MODE_MASK    BIT(14)
 #define CAL_CSI2_CTX_PACK_MODE_LINE            0
 #define CAL_CSI2_CTX_PACK_MODE_FRAME           1
 #define CAL_CSI2_CTX_LINES_MASK                GENMASK(29, 16)
 
 #define CAL_CSI2_PHY_REG0_THS_SETTLE_MASK      GENMASK(7, 0)
 #define CAL_CSI2_PHY_REG0_THS_TERM_MASK                GENMASK(15, 8)
-#define CAL_CSI2_PHY_REG0_HSCLOCKCONFIG_MASK   BIT_MASK(24)
+#define CAL_CSI2_PHY_REG0_HSCLOCKCONFIG_MASK   BIT(24)
 #define CAL_CSI2_PHY_REG0_HSCLOCKCONFIG_DISABLE                1
 #define CAL_CSI2_PHY_REG0_HSCLOCKCONFIG_ENABLE         0
 
 #define CAL_CSI2_PHY_REG1_CTRLCLK_DIV_FACTOR_MASK              GENMASK(9, 8)
 #define CAL_CSI2_PHY_REG1_DPHY_HS_SYNC_PATTERN_MASK            GENMASK(17, 10)
 #define CAL_CSI2_PHY_REG1_TCLK_TERM_MASK                       GENMASK(24, 18)
-#define CAL_CSI2_PHY_REG1_CLOCK_MISS_DETECTOR_STATUS_MASK      BIT_MASK(25)
+#define CAL_CSI2_PHY_REG1_CLOCK_MISS_DETECTOR_STATUS_MASK      BIT(25)
 #define CAL_CSI2_PHY_REG1_CLOCK_MISS_DETECTOR_STATUS_ERROR             1
 #define CAL_CSI2_PHY_REG1_CLOCK_MISS_DETECTOR_STATUS_SUCCESS           0
 #define CAL_CSI2_PHY_REG1_RESET_DONE_STATUS_MASK               GENMASK(29, 28)
 #define CAL_CSI2_PHY_REG2_TRIGGER_CMD_RXTRIGESC1_MASK          GENMASK(29, 28)
 #define CAL_CSI2_PHY_REG2_TRIGGER_CMD_RXTRIGESC0_MASK          GENMASK(31, 30)
 
-#define CM_CAMERRX_CTRL_CSI1_CTRLCLKEN_MASK                    BIT_MASK(0)
+#define CM_CAMERRX_CTRL_CSI1_CTRLCLKEN_MASK                    BIT(0)
 #define CM_CAMERRX_CTRL_CSI1_CAMMODE_MASK                      GENMASK(2, 1)
 #define CM_CAMERRX_CTRL_CSI1_LANEENABLE_MASK                   GENMASK(4, 3)
-#define CM_CAMERRX_CTRL_CSI1_MODE_MASK                         BIT_MASK(5)
-#define CM_CAMERRX_CTRL_CSI0_CTRLCLKEN_MASK                    BIT_MASK(10)
+#define CM_CAMERRX_CTRL_CSI1_MODE_MASK                         BIT(5)
+#define CM_CAMERRX_CTRL_CSI0_CTRLCLKEN_MASK                    BIT(10)
 #define CM_CAMERRX_CTRL_CSI0_CAMMODE_MASK                      GENMASK(12, 11)
 #define CM_CAMERRX_CTRL_CSI0_LANEENABLE_MASK                   GENMASK(16, 13)
-#define CM_CAMERRX_CTRL_CSI0_MODE_MASK                         BIT_MASK(17)
+#define CM_CAMERRX_CTRL_CSI0_MODE_MASK                         BIT(17)
 
 #endif