Commit a3df1906 authored by Christian Marangi's avatar Christian Marangi Committed by Lee Jones
Browse files

leds: leds-lp55xx: Generalize firmware_loaded function 



Generalize firmware_loaded function as lp55xx based LED driver all share
the same logic.

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-10-ansuelsmth@gmail.com


Signed-off-by: default avatarLee Jones <lee@kernel.org>
parent 31379a57

drivers/leds/leds-lp5521.c

+1 −21
Original line number Diff line number Diff line
@@ -146,26 +146,6 @@ static void lp5521_run_engine(struct lp55xx_chip *chip, bool start) 
		lp5521_wait_enable_done();

}



static void lp5521_firmware_loaded(struct lp55xx_chip *chip)

{

	const struct firmware *fw = chip->fw;



	if (fw->size > LP5521_PROGRAM_LENGTH) {

		dev_err(&chip->cl->dev, "firmware data size overflow: %zu\n",

			fw->size);

		return;

	}



	/*

	 * Program memory sequence

	 *  1) set engine mode to "LOAD"

	 *  2) write firmware data into program memory

	 */



	lp55xx_load_engine(chip);

	lp55xx_update_program_memory(chip, fw->data, fw->size);

}



static int lp5521_post_init_device(struct lp55xx_chip *chip)

{

	int ret;
@@ -413,7 +393,7 @@ static struct lp55xx_device_config lp5521_cfg = { 
	.brightness_fn      = lp5521_led_brightness,

	.multicolor_brightness_fn = lp5521_multicolor_brightness,

	.set_led_current    = lp5521_set_led_current,

	.firmware_cb        = lp5521_firmware_loaded,

	.firmware_cb        = lp55xx_firmware_loaded_cb,

	.run_engine         = lp5521_run_engine,

	.dev_attr_group     = &lp5521_group,

};

drivers/leds/leds-lp5523.c

+1 −21
Original line number Diff line number Diff line
@@ -254,26 +254,6 @@ static int lp5523_init_program_engine(struct lp55xx_chip *chip) 
	return ret;

}



static void lp5523_firmware_loaded(struct lp55xx_chip *chip)

{

	const struct firmware *fw = chip->fw;



	if (fw->size > LP5523_PROGRAM_LENGTH) {

		dev_err(&chip->cl->dev, "firmware data size overflow: %zu\n",

			fw->size);

		return;

	}



	/*

	 * Program memory sequence

	 *  1) set engine mode to "LOAD"

	 *  2) write firmware data into program memory

	 */



	lp55xx_load_engine(chip);

	lp55xx_update_program_memory(chip, fw->data, fw->size);

}



static ssize_t show_engine_mode(struct device *dev,

				struct device_attribute *attr,

				char *buf, int nr)
@@ -785,7 +765,7 @@ static struct lp55xx_device_config lp5523_cfg = { 
	.brightness_fn      = lp5523_led_brightness,

	.multicolor_brightness_fn = lp5523_multicolor_brightness,

	.set_led_current    = lp5523_set_led_current,

	.firmware_cb        = lp5523_firmware_loaded,

	.firmware_cb        = lp55xx_firmware_loaded_cb,

	.run_engine         = lp5523_run_engine,

	.dev_attr_group     = &lp5523_group,

};

drivers/leds/leds-lp5562.c

+1 −25
Original line number Diff line number Diff line
@@ -144,30 +144,6 @@ static void lp5562_run_engine(struct lp55xx_chip *chip, bool start) 
		lp5562_wait_enable_done();

}



static void lp5562_firmware_loaded(struct lp55xx_chip *chip)

{

	const struct firmware *fw = chip->fw;



	/*

	 * the firmware is encoded in ascii hex character, with 2 chars

	 * per byte

	 */

	if (fw->size > (LP5562_PROGRAM_LENGTH * 2)) {

		dev_err(&chip->cl->dev, "firmware data size overflow: %zu\n",

			fw->size);

		return;

	}



	/*

	 * Program memory sequence

	 *  1) set engine mode to "LOAD"

	 *  2) write firmware data into program memory

	 */



	lp55xx_load_engine(chip);

	lp55xx_update_program_memory(chip, fw->data, fw->size);

}



static int lp5562_post_init_device(struct lp55xx_chip *chip)

{

	int ret;
@@ -404,7 +380,7 @@ static struct lp55xx_device_config lp5562_cfg = { 
	.set_led_current    = lp5562_set_led_current,

	.brightness_fn      = lp5562_led_brightness,

	.run_engine         = lp5562_run_engine,

	.firmware_cb        = lp5562_firmware_loaded,

	.firmware_cb        = lp55xx_firmware_loaded_cb,

	.dev_attr_group     = &lp5562_group,

};

drivers/leds/leds-lp55xx-common.c

+25 −0
Original line number Diff line number Diff line
@@ -217,6 +217,31 @@ int lp55xx_update_program_memory(struct lp55xx_chip *chip, 
}

EXPORT_SYMBOL_GPL(lp55xx_update_program_memory);



void lp55xx_firmware_loaded_cb(struct lp55xx_chip *chip)

{

	const struct firmware *fw = chip->fw;



	/*

	 * the firmware is encoded in ascii hex character, with 2 chars

	 * per byte

	 */

	if (fw->size > LP55xx_PROGRAM_LENGTH * 2) {

		dev_err(&chip->cl->dev, "firmware data size overflow: %zu\n",

			fw->size);

		return;

	}



	/*

	 * Program memory sequence

	 *  1) set engine mode to "LOAD"

	 *  2) write firmware data into program memory

	 */



	lp55xx_load_engine(chip);

	lp55xx_update_program_memory(chip, fw->data, fw->size);

}

EXPORT_SYMBOL_GPL(lp55xx_firmware_loaded_cb);



static void lp55xx_reset_device(struct lp55xx_chip *chip)

{

	const struct lp55xx_device_config *cfg = chip->cfg;

drivers/leds/leds-lp55xx-common.h

+1 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ extern void lp55xx_load_engine(struct lp55xx_chip *chip); 
extern int lp55xx_run_engine_common(struct lp55xx_chip *chip);

extern int lp55xx_update_program_memory(struct lp55xx_chip *chip,

					const u8 *data, size_t size);

extern void lp55xx_firmware_loaded_cb(struct lp55xx_chip *chip);



/* common probe/remove function */

extern int lp55xx_probe(struct i2c_client *client);