Skip to content

Commit 372a927

Browse files
Andy Yanmmind
authored andcommitted
drm/rockchip: inno_hdmi: Refactor register macros to make checkpatch happy
1. Prefer using the BIT macro 2. Macro argument 'n' as '(n)' to avoid precedence issues 3. Add a blank line after enum declarations Signed-off-by: Andy Yan <andy.yan@rock-chips.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de> Link: https://lore.kernel.org/r/20250512124615.2848731-3-andyshrk@163.com
1 parent 9c3111d commit 372a927

1 file changed

Lines changed: 113 additions & 101 deletions

File tree

drivers/gpu/drm/rockchip/inno_hdmi.c

Lines changed: 113 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -39,32 +39,32 @@
3939
#define DDC_BUS_FREQ_H 0x4c
4040

4141
#define HDMI_SYS_CTRL 0x00
42-
#define m_RST_ANALOG (1 << 6)
42+
#define m_RST_ANALOG BIT(6)
4343
#define v_RST_ANALOG (0 << 6)
44-
#define v_NOT_RST_ANALOG (1 << 6)
45-
#define m_RST_DIGITAL (1 << 5)
44+
#define v_NOT_RST_ANALOG BIT(6)
45+
#define m_RST_DIGITAL BIT(5)
4646
#define v_RST_DIGITAL (0 << 5)
47-
#define v_NOT_RST_DIGITAL (1 << 5)
48-
#define m_REG_CLK_INV (1 << 4)
47+
#define v_NOT_RST_DIGITAL BIT(5)
48+
#define m_REG_CLK_INV BIT(4)
4949
#define v_REG_CLK_NOT_INV (0 << 4)
50-
#define v_REG_CLK_INV (1 << 4)
51-
#define m_VCLK_INV (1 << 3)
50+
#define v_REG_CLK_INV BIT(4)
51+
#define m_VCLK_INV BIT(3)
5252
#define v_VCLK_NOT_INV (0 << 3)
53-
#define v_VCLK_INV (1 << 3)
54-
#define m_REG_CLK_SOURCE (1 << 2)
53+
#define v_VCLK_INV BIT(3)
54+
#define m_REG_CLK_SOURCE BIT(2)
5555
#define v_REG_CLK_SOURCE_TMDS (0 << 2)
56-
#define v_REG_CLK_SOURCE_SYS (1 << 2)
57-
#define m_POWER (1 << 1)
56+
#define v_REG_CLK_SOURCE_SYS BIT(2)
57+
#define m_POWER BIT(1)
5858
#define v_PWR_ON (0 << 1)
59-
#define v_PWR_OFF (1 << 1)
60-
#define m_INT_POL (1 << 0)
59+
#define v_PWR_OFF BIT(1)
60+
#define m_INT_POL BIT(0)
6161
#define v_INT_POL_HIGH 1
6262
#define v_INT_POL_LOW 0
6363

6464
#define HDMI_VIDEO_CONTRL1 0x01
6565
#define m_VIDEO_INPUT_FORMAT (7 << 1)
66-
#define m_DE_SOURCE (1 << 0)
67-
#define v_VIDEO_INPUT_FORMAT(n) (n << 1)
66+
#define m_DE_SOURCE BIT(0)
67+
#define v_VIDEO_INPUT_FORMAT(n) ((n) << 1)
6868
#define v_DE_EXTERNAL 1
6969
#define v_DE_INTERNAL 0
7070
enum {
@@ -76,10 +76,10 @@ enum {
7676
#define HDMI_VIDEO_CONTRL2 0x02
7777
#define m_VIDEO_OUTPUT_COLOR (3 << 6)
7878
#define m_VIDEO_INPUT_BITS (3 << 4)
79-
#define m_VIDEO_INPUT_CSP (1 << 0)
79+
#define m_VIDEO_INPUT_CSP BIT(0)
8080
#define v_VIDEO_OUTPUT_COLOR(n) (((n) & 0x3) << 6)
81-
#define v_VIDEO_INPUT_BITS(n) (n << 4)
82-
#define v_VIDEO_INPUT_CSP(n) (n << 0)
81+
#define v_VIDEO_INPUT_BITS(n) ((n) << 4)
82+
#define v_VIDEO_INPUT_CSP(n) ((n) << 0)
8383
enum {
8484
VIDEO_INPUT_12BITS = 0,
8585
VIDEO_INPUT_10BITS = 1,
@@ -88,10 +88,10 @@ enum {
8888
};
8989

9090
#define HDMI_VIDEO_CONTRL 0x03
91-
#define m_VIDEO_AUTO_CSC (1 << 7)
92-
#define v_VIDEO_AUTO_CSC(n) (n << 7)
93-
#define m_VIDEO_C0_C2_SWAP (1 << 0)
94-
#define v_VIDEO_C0_C2_SWAP(n) (n << 0)
91+
#define m_VIDEO_AUTO_CSC BIT(7)
92+
#define v_VIDEO_AUTO_CSC(n) ((n) << 7)
93+
#define m_VIDEO_C0_C2_SWAP BIT(0)
94+
#define v_VIDEO_C0_C2_SWAP(n) ((n) << 0)
9595
enum {
9696
C0_C2_CHANGE_ENABLE = 0,
9797
C0_C2_CHANGE_DISABLE = 1,
@@ -100,33 +100,33 @@ enum {
100100
};
101101

102102
#define HDMI_VIDEO_CONTRL3 0x04
103-
#define m_COLOR_DEPTH_NOT_INDICATED (1 << 4)
104-
#define m_SOF (1 << 3)
105-
#define m_COLOR_RANGE (1 << 2)
106-
#define m_CSC (1 << 0)
103+
#define m_COLOR_DEPTH_NOT_INDICATED BIT(4)
104+
#define m_SOF BIT(3)
105+
#define m_COLOR_RANGE BIT(2)
106+
#define m_CSC BIT(0)
107107
#define v_COLOR_DEPTH_NOT_INDICATED(n) ((n) << 4)
108108
#define v_SOF_ENABLE (0 << 3)
109-
#define v_SOF_DISABLE (1 << 3)
110-
#define v_COLOR_RANGE_FULL (1 << 2)
109+
#define v_SOF_DISABLE BIT(3)
110+
#define v_COLOR_RANGE_FULL BIT(2)
111111
#define v_COLOR_RANGE_LIMITED (0 << 2)
112112
#define v_CSC_ENABLE 1
113113
#define v_CSC_DISABLE 0
114114

115115
#define HDMI_AV_MUTE 0x05
116-
#define m_AVMUTE_CLEAR (1 << 7)
117-
#define m_AVMUTE_ENABLE (1 << 6)
118-
#define m_AUDIO_MUTE (1 << 1)
119-
#define m_VIDEO_BLACK (1 << 0)
120-
#define v_AVMUTE_CLEAR(n) (n << 7)
121-
#define v_AVMUTE_ENABLE(n) (n << 6)
122-
#define v_AUDIO_MUTE(n) (n << 1)
123-
#define v_VIDEO_MUTE(n) (n << 0)
116+
#define m_AVMUTE_CLEAR BIT(7)
117+
#define m_AVMUTE_ENABLE BIT(6)
118+
#define m_AUDIO_MUTE BIT(1)
119+
#define m_VIDEO_BLACK BIT(0)
120+
#define v_AVMUTE_CLEAR(n) ((n) << 7)
121+
#define v_AVMUTE_ENABLE(n) ((n) << 6)
122+
#define v_AUDIO_MUTE(n) ((n) << 1)
123+
#define v_VIDEO_MUTE(n) ((n) << 0)
124124

125125
#define HDMI_VIDEO_TIMING_CTL 0x08
126-
#define v_HSYNC_POLARITY(n) (n << 3)
127-
#define v_VSYNC_POLARITY(n) (n << 2)
128-
#define v_INETLACE(n) (n << 1)
129-
#define v_EXTERANL_VIDEO(n) (n << 0)
126+
#define v_HSYNC_POLARITY(n) ((n) << 3)
127+
#define v_VSYNC_POLARITY(n) ((n) << 2)
128+
#define v_INETLACE(n) ((n) << 1)
129+
#define v_EXTERANL_VIDEO(n) ((n) << 0)
130130

131131
#define HDMI_VIDEO_EXT_HTOTAL_L 0x09
132132
#define HDMI_VIDEO_EXT_HTOTAL_H 0x0a
@@ -149,31 +149,37 @@ enum {
149149
CTS_SOURCE_INTERNAL = 0,
150150
CTS_SOURCE_EXTERNAL = 1,
151151
};
152-
#define v_CTS_SOURCE(n) (n << 7)
152+
153+
#define v_CTS_SOURCE(n) ((n) << 7)
153154

154155
enum {
155156
DOWNSAMPLE_DISABLE = 0,
156157
DOWNSAMPLE_1_2 = 1,
157158
DOWNSAMPLE_1_4 = 2,
158159
};
159-
#define v_DOWN_SAMPLE(n) (n << 5)
160+
161+
#define v_DOWN_SAMPLE(n) ((n) << 5)
160162

161163
enum {
162164
AUDIO_SOURCE_IIS = 0,
163165
AUDIO_SOURCE_SPDIF = 1,
164166
};
165-
#define v_AUDIO_SOURCE(n) (n << 3)
166167

167-
#define v_MCLK_ENABLE(n) (n << 2)
168+
#define v_AUDIO_SOURCE(n) ((n) << 3)
169+
170+
#define v_MCLK_ENABLE(n) ((n) << 2)
171+
168172
enum {
169173
MCLK_128FS = 0,
170174
MCLK_256FS = 1,
171175
MCLK_384FS = 2,
172176
MCLK_512FS = 3,
173177
};
178+
174179
#define v_MCLK_RATIO(n) (n)
175180

176181
#define AUDIO_SAMPLE_RATE 0x37
182+
177183
enum {
178184
AUDIO_32K = 0x3,
179185
AUDIO_441K = 0x0,
@@ -185,18 +191,22 @@ enum {
185191
};
186192

187193
#define AUDIO_I2S_MODE 0x38
194+
188195
enum {
189196
I2S_CHANNEL_1_2 = 1,
190197
I2S_CHANNEL_3_4 = 3,
191198
I2S_CHANNEL_5_6 = 7,
192199
I2S_CHANNEL_7_8 = 0xf
193200
};
201+
194202
#define v_I2S_CHANNEL(n) ((n) << 2)
203+
195204
enum {
196205
I2S_STANDARD = 0,
197206
I2S_LEFT_JUSTIFIED = 1,
198207
I2S_RIGHT_JUSTIFIED = 2,
199208
};
209+
200210
#define v_I2S_MODE(n) (n)
201211

202212
#define AUDIO_I2S_MAP 0x39
@@ -212,12 +222,12 @@ enum {
212222
#define N_192K 0x6000
213223

214224
#define HDMI_AUDIO_CHANNEL_STATUS 0x3e
215-
#define m_AUDIO_STATUS_NLPCM (1 << 7)
216-
#define m_AUDIO_STATUS_USE (1 << 6)
217-
#define m_AUDIO_STATUS_COPYRIGHT (1 << 5)
225+
#define m_AUDIO_STATUS_NLPCM BIT(7)
226+
#define m_AUDIO_STATUS_USE BIT(6)
227+
#define m_AUDIO_STATUS_COPYRIGHT BIT(5)
218228
#define m_AUDIO_STATUS_ADDITION (3 << 2)
219229
#define m_AUDIO_STATUS_CLK_ACCURACY (2 << 0)
220-
#define v_AUDIO_STATUS_NLPCM(n) ((n & 1) << 7)
230+
#define v_AUDIO_STATUS_NLPCM(n) (((n) & 1) << 7)
221231
#define AUDIO_N_H 0x3f
222232
#define AUDIO_N_M 0x40
223233
#define AUDIO_N_L 0x41
@@ -236,16 +246,17 @@ enum {
236246

237247
#define HDMI_PACKET_SEND_MANUAL 0x9c
238248
#define HDMI_PACKET_SEND_AUTO 0x9d
239-
#define m_PACKET_GCP_EN (1 << 7)
240-
#define m_PACKET_MSI_EN (1 << 6)
241-
#define m_PACKET_SDI_EN (1 << 5)
242-
#define m_PACKET_VSI_EN (1 << 4)
243-
#define v_PACKET_GCP_EN(n) ((n & 1) << 7)
244-
#define v_PACKET_MSI_EN(n) ((n & 1) << 6)
245-
#define v_PACKET_SDI_EN(n) ((n & 1) << 5)
246-
#define v_PACKET_VSI_EN(n) ((n & 1) << 4)
249+
#define m_PACKET_GCP_EN BIT(7)
250+
#define m_PACKET_MSI_EN BIT(6)
251+
#define m_PACKET_SDI_EN BIT(5)
252+
#define m_PACKET_VSI_EN BIT(4)
253+
#define v_PACKET_GCP_EN(n) (((n) & 1) << 7)
254+
#define v_PACKET_MSI_EN(n) (((n) & 1) << 6)
255+
#define v_PACKET_SDI_EN(n) (((n) & 1) << 5)
256+
#define v_PACKET_VSI_EN(n) (((n) & 1) << 4)
247257

248258
#define HDMI_CONTROL_PACKET_BUF_INDEX 0x9f
259+
249260
enum {
250261
INFOFRAME_VSI = 0x05,
251262
INFOFRAME_AVI = 0x06,
@@ -254,6 +265,7 @@ enum {
254265

255266
#define HDMI_CONTROL_PACKET_ADDR 0xa0
256267
#define HDMI_MAXIMUM_INFO_FRAME_SIZE 0x11
268+
257269
enum {
258270
AVI_COLOR_MODE_RGB = 0,
259271
AVI_COLOR_MODE_YCBCR422 = 1,
@@ -275,76 +287,76 @@ enum {
275287
};
276288

277289
#define HDMI_HDCP_CTRL 0x52
278-
#define m_HDMI_DVI (1 << 1)
279-
#define v_HDMI_DVI(n) (n << 1)
290+
#define m_HDMI_DVI BIT(1)
291+
#define v_HDMI_DVI(n) ((n) << 1)
280292

281293
#define HDMI_INTERRUPT_MASK1 0xc0
282294
#define HDMI_INTERRUPT_STATUS1 0xc1
283-
#define m_INT_ACTIVE_VSYNC (1 << 5)
284-
#define m_INT_EDID_READY (1 << 2)
295+
#define m_INT_ACTIVE_VSYNC BIT(5)
296+
#define m_INT_EDID_READY BIT(2)
285297

286298
#define HDMI_INTERRUPT_MASK2 0xc2
287299
#define HDMI_INTERRUPT_STATUS2 0xc3
288-
#define m_INT_HDCP_ERR (1 << 7)
289-
#define m_INT_BKSV_FLAG (1 << 6)
290-
#define m_INT_HDCP_OK (1 << 4)
300+
#define m_INT_HDCP_ERR BIT(7)
301+
#define m_INT_BKSV_FLAG BIT(6)
302+
#define m_INT_HDCP_OK BIT(4)
291303

292304
#define HDMI_STATUS 0xc8
293-
#define m_HOTPLUG (1 << 7)
294-
#define m_MASK_INT_HOTPLUG (1 << 5)
295-
#define m_INT_HOTPLUG (1 << 1)
296-
#define v_MASK_INT_HOTPLUG(n) ((n & 0x1) << 5)
305+
#define m_HOTPLUG BIT(7)
306+
#define m_MASK_INT_HOTPLUG BIT(5)
307+
#define m_INT_HOTPLUG BIT(1)
308+
#define v_MASK_INT_HOTPLUG(n) (((n) & 0x1) << 5)
297309

298310
#define HDMI_COLORBAR 0xc9
299311

300312
#define HDMI_PHY_SYNC 0xce
301313
#define HDMI_PHY_SYS_CTL 0xe0
302-
#define m_TMDS_CLK_SOURCE (1 << 5)
314+
#define m_TMDS_CLK_SOURCE BIT(5)
303315
#define v_TMDS_FROM_PLL (0 << 5)
304-
#define v_TMDS_FROM_GEN (1 << 5)
305-
#define m_PHASE_CLK (1 << 4)
316+
#define v_TMDS_FROM_GEN BIT(5)
317+
#define m_PHASE_CLK BIT(4)
306318
#define v_DEFAULT_PHASE (0 << 4)
307-
#define v_SYNC_PHASE (1 << 4)
308-
#define m_TMDS_CURRENT_PWR (1 << 3)
319+
#define v_SYNC_PHASE BIT(4)
320+
#define m_TMDS_CURRENT_PWR BIT(3)
309321
#define v_TURN_ON_CURRENT (0 << 3)
310-
#define v_CAT_OFF_CURRENT (1 << 3)
311-
#define m_BANDGAP_PWR (1 << 2)
322+
#define v_CAT_OFF_CURRENT BIT(3)
323+
#define m_BANDGAP_PWR BIT(2)
312324
#define v_BANDGAP_PWR_UP (0 << 2)
313-
#define v_BANDGAP_PWR_DOWN (1 << 2)
314-
#define m_PLL_PWR (1 << 1)
325+
#define v_BANDGAP_PWR_DOWN BIT(2)
326+
#define m_PLL_PWR BIT(1)
315327
#define v_PLL_PWR_UP (0 << 1)
316-
#define v_PLL_PWR_DOWN (1 << 1)
317-
#define m_TMDS_CHG_PWR (1 << 0)
328+
#define v_PLL_PWR_DOWN BIT(1)
329+
#define m_TMDS_CHG_PWR BIT(0)
318330
#define v_TMDS_CHG_PWR_UP (0 << 0)
319-
#define v_TMDS_CHG_PWR_DOWN (1 << 0)
331+
#define v_TMDS_CHG_PWR_DOWN BIT(0)
320332

321333
#define HDMI_PHY_CHG_PWR 0xe1
322-
#define v_CLK_CHG_PWR(n) ((n & 1) << 3)
323-
#define v_DATA_CHG_PWR(n) ((n & 7) << 0)
334+
#define v_CLK_CHG_PWR(n) (((n) & 1) << 3)
335+
#define v_DATA_CHG_PWR(n) (((n) & 7) << 0)
324336

325337
#define HDMI_PHY_DRIVER 0xe2
326-
#define v_CLK_MAIN_DRIVER(n) (n << 4)
327-
#define v_DATA_MAIN_DRIVER(n) (n << 0)
338+
#define v_CLK_MAIN_DRIVER(n) ((n) << 4)
339+
#define v_DATA_MAIN_DRIVER(n) ((n) << 0)
328340

329341
#define HDMI_PHY_PRE_EMPHASIS 0xe3
330-
#define v_PRE_EMPHASIS(n) ((n & 7) << 4)
331-
#define v_CLK_PRE_DRIVER(n) ((n & 3) << 2)
332-
#define v_DATA_PRE_DRIVER(n) ((n & 3) << 0)
342+
#define v_PRE_EMPHASIS(n) (((n) & 7) << 4)
343+
#define v_CLK_PRE_DRIVER(n) (((n) & 3) << 2)
344+
#define v_DATA_PRE_DRIVER(n) (((n) & 3) << 0)
333345

334346
#define HDMI_PHY_FEEDBACK_DIV_RATIO_LOW 0xe7
335-
#define v_FEEDBACK_DIV_LOW(n) (n & 0xff)
347+
#define v_FEEDBACK_DIV_LOW(n) ((n) & 0xff)
336348
#define HDMI_PHY_FEEDBACK_DIV_RATIO_HIGH 0xe8
337-
#define v_FEEDBACK_DIV_HIGH(n) (n & 1)
349+
#define v_FEEDBACK_DIV_HIGH(n) ((n) & 1)
338350

339351
#define HDMI_PHY_PRE_DIV_RATIO 0xed
340-
#define v_PRE_DIV_RATIO(n) (n & 0x1f)
352+
#define v_PRE_DIV_RATIO(n) ((n) & 0x1f)
341353

342354
#define HDMI_CEC_CTRL 0xd0
343-
#define m_ADJUST_FOR_HISENSE (1 << 6)
344-
#define m_REJECT_RX_BROADCAST (1 << 5)
345-
#define m_BUSFREETIME_ENABLE (1 << 2)
346-
#define m_REJECT_RX (1 << 1)
347-
#define m_START_TX (1 << 0)
355+
#define m_ADJUST_FOR_HISENSE BIT(6)
356+
#define m_REJECT_RX_BROADCAST BIT(5)
357+
#define m_BUSFREETIME_ENABLE BIT(2)
358+
#define m_REJECT_RX BIT(1)
359+
#define m_START_TX BIT(0)
348360

349361
#define HDMI_CEC_DATA 0xd1
350362
#define HDMI_CEC_TX_OFFSET 0xd2
@@ -354,15 +366,15 @@ enum {
354366
#define HDMI_CEC_TX_LENGTH 0xd6
355367
#define HDMI_CEC_RX_LENGTH 0xd7
356368
#define HDMI_CEC_TX_INT_MASK 0xd8
357-
#define m_TX_DONE (1 << 3)
358-
#define m_TX_NOACK (1 << 2)
359-
#define m_TX_BROADCAST_REJ (1 << 1)
360-
#define m_TX_BUSNOTFREE (1 << 0)
369+
#define m_TX_DONE BIT(3)
370+
#define m_TX_NOACK BIT(2)
371+
#define m_TX_BROADCAST_REJ BIT(1)
372+
#define m_TX_BUSNOTFREE BIT(0)
361373

362374
#define HDMI_CEC_RX_INT_MASK 0xd9
363-
#define m_RX_LA_ERR (1 << 4)
364-
#define m_RX_GLITCH (1 << 3)
365-
#define m_RX_DONE (1 << 0)
375+
#define m_RX_LA_ERR BIT(4)
376+
#define m_RX_GLITCH BIT(3)
377+
#define m_RX_DONE BIT(0)
366378

367379
#define HDMI_CEC_TX_INT 0xda
368380
#define HDMI_CEC_RX_INT 0xdb

0 commit comments

Comments
 (0)