Skip to content

Commit 3b09cc7

Browse files
AngeloGioacchino Del RegnoChun-Kuang Hu
authored andcommitted
drm/mediatek: dsi: Use GENMASK() for register mask definitions
Change magic numerical masks with usage of the GENMASK() macro to improve readability. This commit brings no functional changes. Reviewed-by: Alexandre Mergnat <amergnat@baylibre.com> Reviewed-by: CK Hu <ck.hu@mediatek.com> Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Link: https://patchwork.kernel.org/project/dri-devel/patch/20240215085316.56835-2-angelogioacchino.delregno@collabora.com/ Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
1 parent b82a2a4 commit 3b09cc7

1 file changed

Lines changed: 23 additions & 22 deletions

File tree

drivers/gpu/drm/mediatek/mtk_dsi.c

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,18 @@
5858

5959
#define DSI_TXRX_CTRL 0x18
6060
#define VC_NUM BIT(1)
61-
#define LANE_NUM (0xf << 2)
61+
#define LANE_NUM GENMASK(5, 2)
6262
#define DIS_EOT BIT(6)
6363
#define NULL_EN BIT(7)
6464
#define TE_FREERUN BIT(8)
6565
#define EXT_TE_EN BIT(9)
6666
#define EXT_TE_EDGE BIT(10)
67-
#define MAX_RTN_SIZE (0xf << 12)
67+
#define MAX_RTN_SIZE GENMASK(15, 12)
6868
#define HSTX_CKLP_EN BIT(16)
6969

7070
#define DSI_PSCTRL 0x1c
71-
#define DSI_PS_WC 0x3fff
72-
#define DSI_PS_SEL (3 << 16)
71+
#define DSI_PS_WC GENMASK(13, 0)
72+
#define DSI_PS_SEL GENMASK(17, 16)
7373
#define PACKED_PS_16BIT_RGB565 (0 << 16)
7474
#define LOOSELY_PS_18BIT_RGB666 (1 << 16)
7575
#define PACKED_PS_18BIT_RGB666 (2 << 16)
@@ -109,26 +109,26 @@
109109
#define LD0_WAKEUP_EN BIT(2)
110110

111111
#define DSI_PHY_TIMECON0 0x110
112-
#define LPX (0xff << 0)
113-
#define HS_PREP (0xff << 8)
114-
#define HS_ZERO (0xff << 16)
115-
#define HS_TRAIL (0xff << 24)
112+
#define LPX GENMASK(7, 0)
113+
#define HS_PREP GENMASK(15, 8)
114+
#define HS_ZERO GENMASK(23, 16)
115+
#define HS_TRAIL GENMASK(31, 24)
116116

117117
#define DSI_PHY_TIMECON1 0x114
118-
#define TA_GO (0xff << 0)
119-
#define TA_SURE (0xff << 8)
120-
#define TA_GET (0xff << 16)
121-
#define DA_HS_EXIT (0xff << 24)
118+
#define TA_GO GENMASK(7, 0)
119+
#define TA_SURE GENMASK(15, 8)
120+
#define TA_GET GENMASK(23, 16)
121+
#define DA_HS_EXIT GENMASK(31, 24)
122122

123123
#define DSI_PHY_TIMECON2 0x118
124-
#define CONT_DET (0xff << 0)
125-
#define CLK_ZERO (0xff << 16)
126-
#define CLK_TRAIL (0xff << 24)
124+
#define CONT_DET GENMASK(7, 0)
125+
#define CLK_ZERO GENMASK(23, 16)
126+
#define CLK_TRAIL GENMASK(31, 24)
127127

128128
#define DSI_PHY_TIMECON3 0x11c
129-
#define CLK_HS_PREP (0xff << 0)
130-
#define CLK_HS_POST (0xff << 8)
131-
#define CLK_HS_EXIT (0xff << 16)
129+
#define CLK_HS_PREP GENMASK(7, 0)
130+
#define CLK_HS_POST GENMASK(15, 8)
131+
#define CLK_HS_EXIT GENMASK(23, 16)
132132

133133
#define DSI_VM_CMD_CON 0x130
134134
#define VM_CMD_EN BIT(0)
@@ -138,13 +138,14 @@
138138
#define FORCE_COMMIT BIT(0)
139139
#define BYPASS_SHADOW BIT(1)
140140

141-
#define CONFIG (0xff << 0)
141+
/* CMDQ related bits */
142+
#define CONFIG GENMASK(7, 0)
142143
#define SHORT_PACKET 0
143144
#define LONG_PACKET 2
144145
#define BTA BIT(2)
145-
#define DATA_ID (0xff << 8)
146-
#define DATA_0 (0xff << 16)
147-
#define DATA_1 (0xff << 24)
146+
#define DATA_ID GENMASK(15, 8)
147+
#define DATA_0 GENMASK(23, 16)
148+
#define DATA_1 GENMASK(31, 24)
148149

149150
#define NS_TO_CYCLE(n, c) ((n) / (c) + (((n) % (c)) ? 1 : 0))
150151

0 commit comments

Comments
 (0)