Skip to content

L
linux
Commit 4d310b96 authored by Christian Marangi's avatar Christian Marangi Committed by Lee Jones
Browse files
Options

leds: leds-lp55xx: Generalize load_engine function 

LED driver based on lp55xx have all a very similar implementation for
load_engine function. Move the function to lp55xx-common and rework the
define to be more dynamic instead of having to declare a temp array for
them.

Engine mask are the same for every LED based on lp55xx.
Suggested-by: default avatarLee Jones <lee@kernel.org>
Signed-off-by: default avatarChristian Marangi <ansuelsmth@gmail.com>
Link: https://lore.kernel.org/r/20240626160027.19703-6-ansuelsmth@gmail.comSigned-off-by: default avatarLee Jones <lee@kernel.org>
parent db30c289
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 84 deletions
drivers/leds/leds-lp5521.c
View file @ 4d310b96
...@@ -115,26 +115,6 @@ static void lp5521_set_led_current(struct lp55xx_led *led, u8 led_current) ...@@ -115,26 +115,6 @@ static void lp5521_set_led_current(struct lp55xx_led *led, u8 led_current)
led_current); led_current);
} }
static void lp5521_load_engine(struct lp55xx_chip *chip)
{
enum lp55xx_engine_index idx = chip->engine_idx;
static const u8 mask[] = {
[LP55XX_ENGINE_1] = LP5521_MODE_R_M,
[LP55XX_ENGINE_2] = LP5521_MODE_G_M,
[LP55XX_ENGINE_3] = LP5521_MODE_B_M,
};
static const u8 val[] = {
[LP55XX_ENGINE_1] = LP5521_LOAD_R,
[LP55XX_ENGINE_2] = LP5521_LOAD_G,
[LP55XX_ENGINE_3] = LP5521_LOAD_B,
};
lp55xx_update_bits(chip, LP5521_REG_OP_MODE, mask[idx], val[idx]);
lp5521_wait_opmode_done();
}
static void lp5521_stop_engine(struct lp55xx_chip *chip) static void lp5521_stop_engine(struct lp55xx_chip *chip)
{ {
enum lp55xx_engine_index idx = chip->engine_idx; enum lp55xx_engine_index idx = chip->engine_idx;
...@@ -264,7 +244,7 @@ static void lp5521_firmware_loaded(struct lp55xx_chip *chip) ...@@ -264,7 +244,7 @@ static void lp5521_firmware_loaded(struct lp55xx_chip *chip)
* 2) write firmware data into program memory * 2) write firmware data into program memory
*/ */
lp5521_load_engine(chip); lp55xx_load_engine(chip);
lp5521_update_program_memory(chip, fw->data, fw->size); lp5521_update_program_memory(chip, fw->data, fw->size);
} }
...@@ -415,7 +395,7 @@ static ssize_t store_engine_mode(struct device *dev, ...@@ -415,7 +395,7 @@ static ssize_t store_engine_mode(struct device *dev,
engine->mode = LP55XX_ENGINE_RUN; engine->mode = LP55XX_ENGINE_RUN;
} else if (!strncmp(buf, "load", 4)) { } else if (!strncmp(buf, "load", 4)) {
lp5521_stop_engine(chip); lp5521_stop_engine(chip);
lp5521_load_engine(chip); lp55xx_load_engine(chip);
engine->mode = LP55XX_ENGINE_LOAD; engine->mode = LP55XX_ENGINE_LOAD;
} else if (!strncmp(buf, "disabled", 8)) { } else if (!strncmp(buf, "disabled", 8)) {
lp5521_stop_engine(chip); lp5521_stop_engine(chip);
...@@ -441,7 +421,7 @@ static ssize_t store_engine_load(struct device *dev, ...@@ -441,7 +421,7 @@ static ssize_t store_engine_load(struct device *dev,
mutex_lock(&chip->lock); mutex_lock(&chip->lock);
chip->engine_idx = nr; chip->engine_idx = nr;
lp5521_load_engine(chip); lp55xx_load_engine(chip);
ret = lp5521_update_program_memory(chip, buf, len); ret = lp5521_update_program_memory(chip, buf, len);
mutex_unlock(&chip->lock); mutex_unlock(&chip->lock);
......
drivers/leds/leds-lp5523.c
View file @ 4d310b96
...@@ -159,26 +159,6 @@ static int lp5523_post_init_device(struct lp55xx_chip *chip) ...@@ -159,26 +159,6 @@ static int lp5523_post_init_device(struct lp55xx_chip *chip)
return lp5523_init_program_engine(chip); return lp5523_init_program_engine(chip);
} }
static void lp5523_load_engine(struct lp55xx_chip *chip)
{
enum lp55xx_engine_index idx = chip->engine_idx;
static const u8 mask[] = {
[LP55XX_ENGINE_1] = LP5523_MODE_ENG1_M,
[LP55XX_ENGINE_2] = LP5523_MODE_ENG2_M,
[LP55XX_ENGINE_3] = LP5523_MODE_ENG3_M,
};
static const u8 val[] = {
[LP55XX_ENGINE_1] = LP5523_LOAD_ENG1,
[LP55XX_ENGINE_2] = LP5523_LOAD_ENG2,
[LP55XX_ENGINE_3] = LP5523_LOAD_ENG3,
};
lp55xx_update_bits(chip, LP5523_REG_OP_MODE, mask[idx], val[idx]);
lp5523_wait_opmode_done();
}
static void lp5523_load_engine_and_select_page(struct lp55xx_chip *chip) static void lp5523_load_engine_and_select_page(struct lp55xx_chip *chip)
{ {
enum lp55xx_engine_index idx = chip->engine_idx; enum lp55xx_engine_index idx = chip->engine_idx;
...@@ -188,7 +168,7 @@ static void lp5523_load_engine_and_select_page(struct lp55xx_chip *chip) ...@@ -188,7 +168,7 @@ static void lp5523_load_engine_and_select_page(struct lp55xx_chip *chip)
[LP55XX_ENGINE_3] = LP5523_PAGE_ENG3, [LP55XX_ENGINE_3] = LP5523_PAGE_ENG3,
}; };
lp5523_load_engine(chip); lp55xx_load_engine(chip);
lp55xx_write(chip, LP5523_REG_PROG_PAGE_SEL, page_sel[idx]); lp55xx_write(chip, LP5523_REG_PROG_PAGE_SEL, page_sel[idx]);
} }
...@@ -425,7 +405,7 @@ static ssize_t store_engine_mode(struct device *dev, ...@@ -425,7 +405,7 @@ static ssize_t store_engine_mode(struct device *dev,
engine->mode = LP55XX_ENGINE_RUN; engine->mode = LP55XX_ENGINE_RUN;
} else if (!strncmp(buf, "load", 4)) { } else if (!strncmp(buf, "load", 4)) {
lp5523_stop_engine(chip); lp5523_stop_engine(chip);
lp5523_load_engine(chip); lp55xx_load_engine(chip);
engine->mode = LP55XX_ENGINE_LOAD; engine->mode = LP55XX_ENGINE_LOAD;
} else if (!strncmp(buf, "disabled", 8)) { } else if (!strncmp(buf, "disabled", 8)) {
lp5523_stop_engine(chip); lp5523_stop_engine(chip);
...@@ -502,7 +482,7 @@ static int lp5523_load_mux(struct lp55xx_chip *chip, u16 mux, int nr) ...@@ -502,7 +482,7 @@ static int lp5523_load_mux(struct lp55xx_chip *chip, u16 mux, int nr)
[LP55XX_ENGINE_3] = LP5523_PAGE_MUX3, [LP55XX_ENGINE_3] = LP5523_PAGE_MUX3,
}; };
lp5523_load_engine(chip); lp55xx_load_engine(chip);
ret = lp55xx_write(chip, LP5523_REG_PROG_PAGE_SEL, mux_page[nr]); ret = lp55xx_write(chip, LP5523_REG_PROG_PAGE_SEL, mux_page[nr]);
if (ret) if (ret)
......
drivers/leds/leds-lp5562.c
View file @ 4d310b96
...@@ -124,26 +124,6 @@ static void lp5562_set_led_current(struct lp55xx_led *led, u8 led_current) ...@@ -124,26 +124,6 @@ static void lp5562_set_led_current(struct lp55xx_led *led, u8 led_current)
lp55xx_write(led->chip, addr[led->chan_nr], led_current); lp55xx_write(led->chip, addr[led->chan_nr], led_current);
} }
static void lp5562_load_engine(struct lp55xx_chip *chip)
{
enum lp55xx_engine_index idx = chip->engine_idx;
static const u8 mask[] = {
[LP55XX_ENGINE_1] = LP5562_MODE_ENG1_M,
[LP55XX_ENGINE_2] = LP5562_MODE_ENG2_M,
[LP55XX_ENGINE_3] = LP5562_MODE_ENG3_M,
};
static const u8 val[] = {
[LP55XX_ENGINE_1] = LP5562_LOAD_ENG1,
[LP55XX_ENGINE_2] = LP5562_LOAD_ENG2,
[LP55XX_ENGINE_3] = LP5562_LOAD_ENG3,
};
lp55xx_update_bits(chip, LP5562_REG_OP_MODE, mask[idx], val[idx]);
lp5562_wait_opmode_done();
}
static void lp5562_run_engine(struct lp55xx_chip *chip, bool start) static void lp5562_run_engine(struct lp55xx_chip *chip, bool start)
{ {
int ret; int ret;
...@@ -270,7 +250,7 @@ static void lp5562_firmware_loaded(struct lp55xx_chip *chip) ...@@ -270,7 +250,7 @@ static void lp5562_firmware_loaded(struct lp55xx_chip *chip)
* 2) write firmware data into program memory * 2) write firmware data into program memory
*/ */
lp5562_load_engine(chip); lp55xx_load_engine(chip);
lp5562_update_firmware(chip, fw->data, fw->size); lp5562_update_firmware(chip, fw->data, fw->size);
} }
...@@ -371,7 +351,7 @@ static int lp5562_run_predef_led_pattern(struct lp55xx_chip *chip, int mode) ...@@ -371,7 +351,7 @@ static int lp5562_run_predef_led_pattern(struct lp55xx_chip *chip, int mode)
/* Load engines */ /* Load engines */
for (i = LP55XX_ENGINE_1; i <= LP55XX_ENGINE_3; i++) { for (i = LP55XX_ENGINE_1; i <= LP55XX_ENGINE_3; i++) {
chip->engine_idx = i; chip->engine_idx = i;
lp5562_load_engine(chip); lp55xx_load_engine(chip);
} }
/* Clear program registers */ /* Clear program registers */
......
drivers/leds/leds-lp55xx-common.c
View file @ 4d310b96
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
* Derived from leds-lp5521.c, leds-lp5523.c * Derived from leds-lp5521.c, leds-lp5523.c
*/ */
#include <linux/bitfield.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/firmware.h> #include <linux/firmware.h>
...@@ -26,8 +27,24 @@ ...@@ -26,8 +27,24 @@
/* OP MODE require at least 153 us to clear regs */ /* OP MODE require at least 153 us to clear regs */
#define LP55XX_CMD_SLEEP 200 #define LP55XX_CMD_SLEEP 200
/* Program Commands */ /*
* Program Memory Operations
* Same Mask for each engine for both mode and exec
* ENG1 GENMASK(3, 2)
* ENG2 GENMASK(5, 4)
* ENG3 GENMASK(7, 6)
*/
#define LP55xx_MODE_DISABLE_ALL_ENG 0x0 #define LP55xx_MODE_DISABLE_ALL_ENG 0x0
#define LP55xx_MODE_ENG_MASK GENMASK(1, 0)
#define LP55xx_MODE_DISABLE_ENG FIELD_PREP_CONST(LP55xx_MODE_ENG_MASK, 0x0)
#define LP55xx_MODE_LOAD_ENG FIELD_PREP_CONST(LP55xx_MODE_ENG_MASK, 0x1)
#define LP55xx_MODE_RUN_ENG FIELD_PREP_CONST(LP55xx_MODE_ENG_MASK, 0x2)
#define LP55xx_MODE_HALT_ENG FIELD_PREP_CONST(LP55xx_MODE_ENG_MASK, 0x3)
#define LP55xx_MODE_ENGn_SHIFT(n, shift) ((shift) + (2 * (3 - (n))))
#define LP55xx_MODE_ENGn_MASK(n, shift) (LP55xx_MODE_ENG_MASK << LP55xx_MODE_ENGn_SHIFT(n, shift))
#define LP55xx_MODE_ENGn_GET(n, mode, shift) \
(((mode) >> LP55xx_MODE_ENGn_SHIFT(n, shift)) & LP55xx_MODE_ENG_MASK)
/* External clock rate */ /* External clock rate */
#define LP55XX_CLK_32K 32768 #define LP55XX_CLK_32K 32768
...@@ -76,6 +93,20 @@ void lp55xx_stop_all_engine(struct lp55xx_chip *chip) ...@@ -76,6 +93,20 @@ void lp55xx_stop_all_engine(struct lp55xx_chip *chip)
} }
EXPORT_SYMBOL_GPL(lp55xx_stop_all_engine); EXPORT_SYMBOL_GPL(lp55xx_stop_all_engine);
void lp55xx_load_engine(struct lp55xx_chip *chip)
{
enum lp55xx_engine_index idx = chip->engine_idx;
const struct lp55xx_device_config *cfg = chip->cfg;
u8 mask, val;
mask = LP55xx_MODE_ENGn_MASK(idx, cfg->reg_op_mode.shift);
val = LP55xx_MODE_LOAD_ENG << LP55xx_MODE_ENGn_SHIFT(idx, cfg->reg_op_mode.shift);
lp55xx_update_bits(chip, cfg->reg_op_mode.addr, mask, val);
lp55xx_wait_opmode_done(chip);
}
EXPORT_SYMBOL_GPL(lp55xx_load_engine);
static void lp55xx_reset_device(struct lp55xx_chip *chip) static void lp55xx_reset_device(struct lp55xx_chip *chip)
{ {
const struct lp55xx_device_config *cfg = chip->cfg; const struct lp55xx_device_config *cfg = chip->cfg;
......
drivers/leds/leds-lp55xx-common.h
View file @ 4d310b96
...@@ -202,6 +202,7 @@ extern bool lp55xx_is_extclk_used(struct lp55xx_chip *chip); ...@@ -202,6 +202,7 @@ extern bool lp55xx_is_extclk_used(struct lp55xx_chip *chip);
/* common chip functions */ /* common chip functions */
extern void lp55xx_stop_all_engine(struct lp55xx_chip *chip); extern void lp55xx_stop_all_engine(struct lp55xx_chip *chip);
extern void lp55xx_load_engine(struct lp55xx_chip *chip);
/* common probe/remove function */ /* common probe/remove function */
extern int lp55xx_probe(struct i2c_client *client); extern int lp55xx_probe(struct i2c_client *client);
......
drivers/leds/leds-lp8501.c
View file @ 4d310b96
...@@ -119,17 +119,6 @@ static int lp8501_post_init_device(struct lp55xx_chip *chip) ...@@ -119,17 +119,6 @@ static int lp8501_post_init_device(struct lp55xx_chip *chip)
static void lp8501_load_engine(struct lp55xx_chip *chip) static void lp8501_load_engine(struct lp55xx_chip *chip)
{ {
enum lp55xx_engine_index idx = chip->engine_idx; enum lp55xx_engine_index idx = chip->engine_idx;
static const u8 mask[] = {
[LP55XX_ENGINE_1] = LP8501_MODE_ENG1_M,
[LP55XX_ENGINE_2] = LP8501_MODE_ENG2_M,
[LP55XX_ENGINE_3] = LP8501_MODE_ENG3_M,
};
static const u8 val[] = {
[LP55XX_ENGINE_1] = LP8501_LOAD_ENG1,
[LP55XX_ENGINE_2] = LP8501_LOAD_ENG2,
[LP55XX_ENGINE_3] = LP8501_LOAD_ENG3,
};
static const u8 page_sel[] = { static const u8 page_sel[] = {
[LP55XX_ENGINE_1] = LP8501_PAGE_ENG1, [LP55XX_ENGINE_1] = LP8501_PAGE_ENG1,
...@@ -137,9 +126,7 @@ static void lp8501_load_engine(struct lp55xx_chip *chip) ...@@ -137,9 +126,7 @@ static void lp8501_load_engine(struct lp55xx_chip *chip)
[LP55XX_ENGINE_3] = LP8501_PAGE_ENG3, [LP55XX_ENGINE_3] = LP8501_PAGE_ENG3,
}; };
lp55xx_update_bits(chip, LP8501_REG_OP_MODE, mask[idx], val[idx]); lp55xx_load_engine(chip);
lp8501_wait_opmode_done();
lp55xx_write(chip, LP8501_REG_PROG_PAGE_SEL, page_sel[idx]); lp55xx_write(chip, LP8501_REG_PROG_PAGE_SEL, page_sel[idx]);
} }
...@@ -287,7 +274,7 @@ static struct lp55xx_device_config lp8501_cfg = { ...@@ -287,7 +274,7 @@ static struct lp55xx_device_config lp8501_cfg = {
}, },
.engine_busy = { .engine_busy = {
.addr = LP8501_REG_STATUS, .addr = LP8501_REG_STATUS,
.maks = LP8501_ENGINE_BUSY, .mask = LP8501_ENGINE_BUSY,
}, },
.reset = { .reset = {
.addr = LP8501_REG_RESET, .addr = LP8501_REG_RESET,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7