[PATCH 3/7] leds: leds-mt6323: Drop MT6323_ prefix from macros and defines

From: AngeloGioacchino Del Regno
Date: Thu Sep 15 2022 - 05:13:28 EST

Next message: AngeloGioacchino Del Regno: "[PATCH 7/7] leds: leds-mt6323: Add support for WLEDs and MT6332"
Previous message: AngeloGioacchino Del Regno: "[PATCH 4/7] dt-bindings: leds: leds-mt6323: Document mt6331 compatible"
In reply to: AngeloGioacchino Del Regno: "[PATCH 4/7] dt-bindings: leds: leds-mt6323: Document mt6331 compatible"
Next in thread: AngeloGioacchino Del Regno: "[PATCH 7/7] leds: leds-mt6323: Add support for WLEDs and MT6332"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

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@xxxxxxxxxxxxx>
---
drivers/leds/leds-mt6323.c | 125 ++++++++++++++++++-------------------
1 file changed, 61 insertions(+), 64 deletions(-)

diff --git a/drivers/leds/leds-mt6323.c b/drivers/leds/leds-mt6323.c
index fa9d251e9efa..26f06452a860 100644
--- a/drivers/leds/leds-mt6323.c
+++ b/drivers/leds/leds-mt6323.c
@@ -14,52 +14,49 @@
#include <linux/regmap.h>

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

/*
- * Register field for MT6323_TOP_CKPDN2 to enable
+ * Register field for TOP_CKPDN2 to enable
* individual clock for LED device.
*/
-#define MT6323_RG_ISINK_CK_PDN(i) BIT(i)
-#define MT6323_RG_ISINK_CK_PDN_MASK(i) BIT(i)
+#define RG_ISINK_CK_PDN(i) BIT(i)
+#define RG_ISINK_CK_PDN_MASK(i) BIT(i)

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

/*
- * Register for MT6323_ISINK_CON0 to setup the
+ * Register for ISINK_CON0 to setup the
* duty cycle of the blink.
*/
-#define MT6323_ISINK_CON(r, i) (r + 0x8 * (i))
-#define MT6323_ISINK_DIM_DUTY_MASK (0x1f << 8)
-#define MT6323_ISINK_DIM_DUTY(i) (((i) << 8) & \
- MT6323_ISINK_DIM_DUTY_MASK)
+#define ISINK_CON(r, i) (r + 0x8 * (i))
+#define ISINK_DIM_DUTY_MASK (0x1f << 8)
+#define ISINK_DIM_DUTY(i) (((i) << 8) & ISINK_DIM_DUTY_MASK)

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

/* ISINK_CON2: Register to control the brightness. */
-#define MT6323_ISINK_CH_STEP_SHIFT 12
-#define MT6323_ISINK_CH_STEP_MASK (0x7 << 12)
-#define MT6323_ISINK_CH_STEP(i) (((i) << 12) & \
- MT6323_ISINK_CH_STEP_MASK)
-#define MT6323_ISINK_SFSTR0_TC_MASK (0x3 << 1)
-#define MT6323_ISINK_SFSTR0_TC(i) (((i) << 1) & \
- MT6323_ISINK_SFSTR0_TC_MASK)
-#define MT6323_ISINK_SFSTR0_EN_MASK BIT(0)
-#define MT6323_ISINK_SFSTR0_EN BIT(0)
+#define ISINK_CH_STEP_SHIFT 12
+#define ISINK_CH_STEP_MASK (0x7 << 12)
+#define ISINK_CH_STEP(i) (((i) << 12) & ISINK_CH_STEP_MASK)
+#define ISINK_SFSTR0_TC_MASK (0x3 << 1)
+#define ISINK_SFSTR0_TC(i) (((i) << 1) & ISINK_SFSTR0_TC_MASK)
+#define ISINK_SFSTR0_EN_MASK BIT(0)
+#define ISINK_SFSTR0_EN BIT(0)

/* Register to LED channel enablement. */
-#define MT6323_ISINK_CH_EN_MASK(i) BIT(i)
-#define MT6323_ISINK_CH_EN(i) BIT(i)
+#define ISINK_CH_EN_MASK(i) BIT(i)
+#define ISINK_CH_EN(i) BIT(i)

#define MAX_SUPPORTED_LEDS 8

@@ -159,14 +156,14 @@ static int mt6323_led_hw_brightness(struct led_classdev *cdev,
* Setup current output for the corresponding
* brightness level.
*/
- con2_mask |= MT6323_ISINK_CH_STEP_MASK |
- MT6323_ISINK_SFSTR0_TC_MASK |
- MT6323_ISINK_SFSTR0_EN_MASK;
- con2_val |= MT6323_ISINK_CH_STEP(brightness - 1) |
- MT6323_ISINK_SFSTR0_TC(2) |
- MT6323_ISINK_SFSTR0_EN;
-
- ret = regmap_update_bits(regmap, MT6323_ISINK_CON(regs->isink_con[2], led->id),
+ con2_mask |= ISINK_CH_STEP_MASK |
+ ISINK_SFSTR0_TC_MASK |
+ ISINK_SFSTR0_EN_MASK;
+ con2_val |= ISINK_CH_STEP(brightness - 1) |
+ ISINK_SFSTR0_TC(2) |
+ ISINK_SFSTR0_EN;
+
+ ret = regmap_update_bits(regmap, ISINK_CON(regs->isink_con[2], led->id),
con2_mask, con2_val);
return ret;
}
@@ -180,16 +177,16 @@ static int mt6323_led_hw_off(struct led_classdev *cdev)
unsigned int status;
int ret;

- status = MT6323_ISINK_CH_EN(led->id);
+ status = ISINK_CH_EN(led->id);
ret = regmap_update_bits(regmap, regs->isink_en_ctrl,
- MT6323_ISINK_CH_EN_MASK(led->id), ~status);
+ ISINK_CH_EN_MASK(led->id), ~status);
if (ret < 0)
return ret;

usleep_range(100, 300);
ret = regmap_update_bits(regmap, regs->top_ckpdn[2],
- MT6323_RG_ISINK_CK_PDN_MASK(led->id),
- MT6323_RG_ISINK_CK_PDN(led->id));
+ RG_ISINK_CK_PDN_MASK(led->id),
+ RG_ISINK_CK_PDN(led->id));
if (ret < 0)
return ret;

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

- if (status & MT6323_RG_ISINK_CK_PDN_MASK(led->id))
+ if (status & RG_ISINK_CK_PDN_MASK(led->id))
return 0;

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

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

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

- return ((status & MT6323_ISINK_CH_STEP_MASK)
- >> MT6323_ISINK_CH_STEP_SHIFT) + 1;
+ return ((status & ISINK_CH_STEP_MASK)
+ >> ISINK_CH_STEP_SHIFT) + 1;
}

static int mt6323_led_hw_on(struct led_classdev *cdev,
@@ -244,13 +241,13 @@ static int mt6323_led_hw_on(struct led_classdev *cdev,
* the default.
*/
ret = regmap_update_bits(regmap, regs->top_ckcon[1],
- MT6323_RG_ISINK_CK_SEL_MASK(led->id), 0);
+ RG_ISINK_CK_SEL_MASK(led->id), 0);
if (ret < 0)
return ret;

- status = MT6323_RG_ISINK_CK_PDN(led->id);
+ status = RG_ISINK_CK_PDN(led->id);
ret = regmap_update_bits(regmap, regs->top_ckpdn[2],
- MT6323_RG_ISINK_CK_PDN_MASK(led->id),
+ RG_ISINK_CK_PDN_MASK(led->id),
~status);
if (ret < 0)
return ret;
@@ -258,8 +255,8 @@ static int mt6323_led_hw_on(struct led_classdev *cdev,
usleep_range(100, 300);

ret = regmap_update_bits(regmap, regs->isink_en_ctrl,
- MT6323_ISINK_CH_EN_MASK(led->id),
- MT6323_ISINK_CH_EN(led->id));
+ ISINK_CH_EN_MASK(led->id),
+ ISINK_CH_EN(led->id));
if (ret < 0)
return ret;

@@ -267,15 +264,15 @@ static int mt6323_led_hw_on(struct led_classdev *cdev,
if (ret < 0)
return ret;

- ret = regmap_update_bits(regmap, MT6323_ISINK_CON(regs->isink_con[0], led->id),
- MT6323_ISINK_DIM_DUTY_MASK,
- MT6323_ISINK_DIM_DUTY(31));
+ ret = regmap_update_bits(regmap, ISINK_CON(regs->isink_con[0], led->id),
+ ISINK_DIM_DUTY_MASK,
+ ISINK_DIM_DUTY(31));
if (ret < 0)
return ret;

- ret = regmap_update_bits(regmap, MT6323_ISINK_CON(regs->isink_con[1], led->id),
- MT6323_ISINK_DIM_FSEL_MASK,
- MT6323_ISINK_DIM_FSEL(1000));
+ ret = regmap_update_bits(regmap, ISINK_CON(regs->isink_con[1], led->id),
+ ISINK_DIM_FSEL_MASK,
+ ISINK_DIM_FSEL(1000));
if (ret < 0)
return ret;

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

- ret = regmap_update_bits(regmap, MT6323_ISINK_CON(regs->isink_con[0], led->id),
- MT6323_ISINK_DIM_DUTY_MASK,
- MT6323_ISINK_DIM_DUTY(duty_hw - 1));
+ ret = regmap_update_bits(regmap, ISINK_CON(regs->isink_con[0], led->id),
+ ISINK_DIM_DUTY_MASK,
+ ISINK_DIM_DUTY(duty_hw - 1));
if (ret < 0)
goto out;

- ret = regmap_update_bits(regmap, MT6323_ISINK_CON(regs->isink_con[1], led->id),
- MT6323_ISINK_DIM_FSEL_MASK,
- MT6323_ISINK_DIM_FSEL(period - 1));
+ ret = regmap_update_bits(regmap, ISINK_CON(regs->isink_con[1], led->id),
+ ISINK_DIM_FSEL_MASK,
+ ISINK_DIM_FSEL(period - 1));
out:
mutex_unlock(&leds->lock);

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

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

regmap_update_bits(leds->hw->regmap, regs->top_ckpdn[0],
- MT6323_RG_DRV_32K_CK_PDN_MASK,
- MT6323_RG_DRV_32K_CK_PDN);
+ RG_DRV_32K_CK_PDN_MASK,
+ RG_DRV_32K_CK_PDN);

mutex_destroy(&leds->lock);

--
2.37.2

Next message: AngeloGioacchino Del Regno: "[PATCH 7/7] leds: leds-mt6323: Add support for WLEDs and MT6332"
Previous message: AngeloGioacchino Del Regno: "[PATCH 4/7] dt-bindings: leds: leds-mt6323: Document mt6331 compatible"
In reply to: AngeloGioacchino Del Regno: "[PATCH 4/7] dt-bindings: leds: leds-mt6323: Document mt6331 compatible"
Next in thread: AngeloGioacchino Del Regno: "[PATCH 7/7] leds: leds-mt6323: Add support for WLEDs and MT6332"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]