Skip to content

Commit 9bef141

Browse files
AngeloGioacchino Del Regnolag-linaro
AngeloGioacchino Del Regno
authored and
lag-linaro
committed
leds: leds-mt6323: Drop MT6323_ prefix from macros and defines
This renames all definitions and macros to drop the MT6323_ prefix, since it is now possible to easily add support to more PMICs in this driver. While at it, also fix related formatting where possible. This commit brings no functional changes. Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Reviewed-by: Alexandre Mergnat <amergnat@baylibre.com> Signed-off-by: Lee Jones <lee@kernel.org> Link: https://lore.kernel.org/r/20230601110813.2373764-6-angelogioacchino.delregno@collabora.com
1 parent 3ec0b29 commit 9bef141

1 file changed

Lines changed: 60 additions & 63 deletions

File tree

‎drivers/leds/leds-mt6323.c‎

Lines changed: 60 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -14,50 +14,47 @@
1414
#include <linux/regmap.h>
1515

1616
/*
17-
* Register field for MT6323_TOP_CKPDN0 to enable
17+
* Register field for TOP_CKPDN0 to enable
1818
* 32K clock common for LED device.
1919
*/
20-
#define MT6323_RG_DRV_32K_CK_PDN BIT(11)
21-
#define MT6323_RG_DRV_32K_CK_PDN_MASK BIT(11)
20+
#define RG_DRV_32K_CK_PDN BIT(11)
21+
#define RG_DRV_32K_CK_PDN_MASK BIT(11)
2222

2323
/*
24-
* Register field for MT6323_TOP_CKPDN2 to enable
24+
* Register field for TOP_CKPDN2 to enable
2525
* individual clock for LED device.
2626
*/
27-
#define MT6323_RG_ISINK_CK_PDN(i) BIT(i)
28-
#define MT6323_RG_ISINK_CK_PDN_MASK(i) BIT(i)
27+
#define RG_ISINK_CK_PDN(i) BIT(i)
28+
#define RG_ISINK_CK_PDN_MASK(i) BIT(i)
2929

3030
/*
31-
* Register field for MT6323_TOP_CKCON1 to select
31+
* Register field for TOP_CKCON1 to select
3232
* clock source.
3333
*/
34-
#define MT6323_RG_ISINK_CK_SEL_MASK(i) (BIT(10) << (i))
34+
#define RG_ISINK_CK_SEL_MASK(i) (BIT(10) << (i))
3535

36-
#define MT6323_ISINK_CON(r, i) (r + 0x8 * (i))
36+
#define ISINK_CON(r, i) (r + 0x8 * (i))
3737

3838
/* ISINK_CON0: Register to setup the duty cycle of the blink. */
39-
#define MT6323_ISINK_DIM_DUTY_MASK (0x1f << 8)
40-
#define MT6323_ISINK_DIM_DUTY(i) (((i) << 8) & \
41-
MT6323_ISINK_DIM_DUTY_MASK)
39+
#define ISINK_DIM_DUTY_MASK (0x1f << 8)
40+
#define ISINK_DIM_DUTY(i) (((i) << 8) & ISINK_DIM_DUTY_MASK)
4241

4342
/* ISINK_CON1: Register to setup the period of the blink. */
44-
#define MT6323_ISINK_DIM_FSEL_MASK (0xffff)
45-
#define MT6323_ISINK_DIM_FSEL(i) ((i) & MT6323_ISINK_DIM_FSEL_MASK)
43+
#define ISINK_DIM_FSEL_MASK (0xffff)
44+
#define ISINK_DIM_FSEL(i) ((i) & ISINK_DIM_FSEL_MASK)
4645

4746
/* ISINK_CON2: Register to control the brightness. */
48-
#define MT6323_ISINK_CH_STEP_SHIFT 12
49-
#define MT6323_ISINK_CH_STEP_MASK (0x7 << 12)
50-
#define MT6323_ISINK_CH_STEP(i) (((i) << 12) & \
51-
MT6323_ISINK_CH_STEP_MASK)
52-
#define MT6323_ISINK_SFSTR0_TC_MASK (0x3 << 1)
53-
#define MT6323_ISINK_SFSTR0_TC(i) (((i) << 1) & \
54-
MT6323_ISINK_SFSTR0_TC_MASK)
55-
#define MT6323_ISINK_SFSTR0_EN_MASK BIT(0)
56-
#define MT6323_ISINK_SFSTR0_EN BIT(0)
47+
#define ISINK_CH_STEP_SHIFT 12
48+
#define ISINK_CH_STEP_MASK (0x7 << 12)
49+
#define ISINK_CH_STEP(i) (((i) << 12) & ISINK_CH_STEP_MASK)
50+
#define ISINK_SFSTR0_TC_MASK (0x3 << 1)
51+
#define ISINK_SFSTR0_TC(i) (((i) << 1) & ISINK_SFSTR0_TC_MASK)
52+
#define ISINK_SFSTR0_EN_MASK BIT(0)
53+
#define ISINK_SFSTR0_EN BIT(0)
5754

5855
/* Register to LED channel enablement. */
59-
#define MT6323_ISINK_CH_EN_MASK(i) BIT(i)
60-
#define MT6323_ISINK_CH_EN(i) BIT(i)
56+
#define ISINK_CH_EN_MASK(i) BIT(i)
57+
#define ISINK_CH_EN(i) BIT(i)
6158

6259
#define MAX_SUPPORTED_LEDS 8
6360
#define MT6323_CAL_HW_DUTY(o, p, u) DIV_ROUND_CLOSEST((o) * 100000ul,\
@@ -159,14 +156,14 @@ static int mt6323_led_hw_brightness(struct led_classdev *cdev,
159156
* Setup current output for the corresponding
160157
* brightness level.
161158
*/
162-
con2_mask |= MT6323_ISINK_CH_STEP_MASK |
163-
MT6323_ISINK_SFSTR0_TC_MASK |
164-
MT6323_ISINK_SFSTR0_EN_MASK;
165-
con2_val |= MT6323_ISINK_CH_STEP(brightness - 1) |
166-
MT6323_ISINK_SFSTR0_TC(2) |
167-
MT6323_ISINK_SFSTR0_EN;
168-
169-
ret = regmap_update_bits(regmap, MT6323_ISINK_CON(regs->isink_con[2], led->id),
159+
con2_mask |= ISINK_CH_STEP_MASK |
160+
ISINK_SFSTR0_TC_MASK |
161+
ISINK_SFSTR0_EN_MASK;
162+
con2_val |= ISINK_CH_STEP(brightness - 1) |
163+
ISINK_SFSTR0_TC(2) |
164+
ISINK_SFSTR0_EN;
165+
166+
ret = regmap_update_bits(regmap, ISINK_CON(regs->isink_con[2], led->id),
170167
con2_mask, con2_val);
171168
return ret;
172169
}
@@ -180,16 +177,16 @@ static int mt6323_led_hw_off(struct led_classdev *cdev)
180177
unsigned int status;
181178
int ret;
182179

183-
status = MT6323_ISINK_CH_EN(led->id);
180+
status = ISINK_CH_EN(led->id);
184181
ret = regmap_update_bits(regmap, regs->isink_en_ctrl,
185-
MT6323_ISINK_CH_EN_MASK(led->id), ~status);
182+
ISINK_CH_EN_MASK(led->id), ~status);
186183
if (ret < 0)
187184
return ret;
188185

189186
usleep_range(100, 300);
190187
ret = regmap_update_bits(regmap, regs->top_ckpdn[2],
191-
MT6323_RG_ISINK_CK_PDN_MASK(led->id),
192-
MT6323_RG_ISINK_CK_PDN(led->id));
188+
RG_ISINK_CK_PDN_MASK(led->id),
189+
RG_ISINK_CK_PDN(led->id));
193190
if (ret < 0)
194191
return ret;
195192

@@ -210,22 +207,22 @@ mt6323_get_led_hw_brightness(struct led_classdev *cdev)
210207
if (ret < 0)
211208
return ret;
212209

213-
if (status & MT6323_RG_ISINK_CK_PDN_MASK(led->id))
210+
if (status & RG_ISINK_CK_PDN_MASK(led->id))
214211
return 0;
215212

216213
ret = regmap_read(regmap, regs->isink_en_ctrl, &status);
217214
if (ret < 0)
218215
return ret;
219216

220-
if (!(status & MT6323_ISINK_CH_EN(led->id)))
217+
if (!(status & ISINK_CH_EN(led->id)))
221218
return 0;
222219

223-
ret = regmap_read(regmap, MT6323_ISINK_CON(regs->isink_con[2], led->id), &status);
220+
ret = regmap_read(regmap, ISINK_CON(regs->isink_con[2], led->id), &status);
224221
if (ret < 0)
225222
return ret;
226223

227-
return ((status & MT6323_ISINK_CH_STEP_MASK)
228-
>> MT6323_ISINK_CH_STEP_SHIFT) + 1;
224+
return ((status & ISINK_CH_STEP_MASK)
225+
>> ISINK_CH_STEP_SHIFT) + 1;
229226
}
230227

231228
static int mt6323_led_hw_on(struct led_classdev *cdev,
@@ -244,38 +241,38 @@ static int mt6323_led_hw_on(struct led_classdev *cdev,
244241
* the default.
245242
*/
246243
ret = regmap_update_bits(regmap, regs->top_ckcon[1],
247-
MT6323_RG_ISINK_CK_SEL_MASK(led->id), 0);
244+
RG_ISINK_CK_SEL_MASK(led->id), 0);
248245
if (ret < 0)
249246
return ret;
250247

251-
status = MT6323_RG_ISINK_CK_PDN(led->id);
248+
status = RG_ISINK_CK_PDN(led->id);
252249
ret = regmap_update_bits(regmap, regs->top_ckpdn[2],
253-
MT6323_RG_ISINK_CK_PDN_MASK(led->id),
250+
RG_ISINK_CK_PDN_MASK(led->id),
254251
~status);
255252
if (ret < 0)
256253
return ret;
257254

258255
usleep_range(100, 300);
259256

260257
ret = regmap_update_bits(regmap, regs->isink_en_ctrl,
261-
MT6323_ISINK_CH_EN_MASK(led->id),
262-
MT6323_ISINK_CH_EN(led->id));
258+
ISINK_CH_EN_MASK(led->id),
259+
ISINK_CH_EN(led->id));
263260
if (ret < 0)
264261
return ret;
265262

266263
ret = mt6323_led_hw_brightness(cdev, brightness);
267264
if (ret < 0)
268265
return ret;
269266

270-
ret = regmap_update_bits(regmap, MT6323_ISINK_CON(regs->isink_con[0], led->id),
271-
MT6323_ISINK_DIM_DUTY_MASK,
272-
MT6323_ISINK_DIM_DUTY(31));
267+
ret = regmap_update_bits(regmap, ISINK_CON(regs->isink_con[0], led->id),
268+
ISINK_DIM_DUTY_MASK,
269+
ISINK_DIM_DUTY(31));
273270
if (ret < 0)
274271
return ret;
275272

276-
ret = regmap_update_bits(regmap, MT6323_ISINK_CON(regs->isink_con[1], led->id),
277-
MT6323_ISINK_DIM_FSEL_MASK,
278-
MT6323_ISINK_DIM_FSEL(1000));
273+
ret = regmap_update_bits(regmap, ISINK_CON(regs->isink_con[1], led->id),
274+
ISINK_DIM_FSEL_MASK,
275+
ISINK_DIM_FSEL(1000));
279276
if (ret < 0)
280277
return ret;
281278

@@ -337,15 +334,15 @@ static int mt6323_led_set_blink(struct led_classdev *cdev,
337334
led->current_brightness = cdev->max_brightness;
338335
}
339336

340-
ret = regmap_update_bits(regmap, MT6323_ISINK_CON(regs->isink_con[0], led->id),
341-
MT6323_ISINK_DIM_DUTY_MASK,
342-
MT6323_ISINK_DIM_DUTY(duty_hw - 1));
337+
ret = regmap_update_bits(regmap, ISINK_CON(regs->isink_con[0], led->id),
338+
ISINK_DIM_DUTY_MASK,
339+
ISINK_DIM_DUTY(duty_hw - 1));
343340
if (ret < 0)
344341
goto out;
345342

346-
ret = regmap_update_bits(regmap, MT6323_ISINK_CON(regs->isink_con[1], led->id),
347-
MT6323_ISINK_DIM_FSEL_MASK,
348-
MT6323_ISINK_DIM_FSEL(period - 1));
343+
ret = regmap_update_bits(regmap, ISINK_CON(regs->isink_con[1], led->id),
344+
ISINK_DIM_FSEL_MASK,
345+
ISINK_DIM_FSEL(period - 1));
349346
out:
350347
mutex_unlock(&leds->lock);
351348

@@ -439,9 +436,9 @@ static int mt6323_led_probe(struct platform_device *pdev)
439436
leds->hw = hw;
440437
mutex_init(&leds->lock);
441438

442-
status = MT6323_RG_DRV_32K_CK_PDN;
439+
status = RG_DRV_32K_CK_PDN;
443440
ret = regmap_update_bits(leds->hw->regmap, regs->top_ckpdn[0],
444-
MT6323_RG_DRV_32K_CK_PDN_MASK, ~status);
441+
RG_DRV_32K_CK_PDN_MASK, ~status);
445442
if (ret < 0) {
446443
dev_err(leds->dev,
447444
"Failed to update TOP_CKPDN0 Register\n");
@@ -515,8 +512,8 @@ static int mt6323_led_remove(struct platform_device *pdev)
515512
mt6323_led_hw_off(&leds->led[i]->cdev);
516513

517514
regmap_update_bits(leds->hw->regmap, regs->top_ckpdn[0],
518-
MT6323_RG_DRV_32K_CK_PDN_MASK,
519-
MT6323_RG_DRV_32K_CK_PDN);
515+
RG_DRV_32K_CK_PDN_MASK,
516+
RG_DRV_32K_CK_PDN);
520517

521518
mutex_destroy(&leds->lock);
522519

0 commit comments

Comments
 (0)