Commit 62c1fb20 authored by Fabio Baltieri's avatar Fabio Baltieri Committed by Benjamin Cabé
Browse files

led: drop min/max brightness from struct led_data 

This is always 0 to 100, hardcode the range.

Signed-off-by: default avatarFabio Baltieri <fabiobaltieri@google.com>
parent 69e73935

drivers/led/ht16k33.c

+1 −5
Changes for drivers/led/ht16k33.c: 1 added line, 5 removed lines.
Original line number Diff line number Diff line
@@ -130,12 +130,10 @@ static int ht16k33_led_set_brightness(const struct device *dev, uint32_t led, 
	ARG_UNUSED(led);



	const struct ht16k33_cfg *config = dev->config;

	struct ht16k33_data *data = dev->data;

	struct led_data *dev_data = &data->dev_data;

	uint8_t dim;

	uint8_t cmd;



	dim = (value * (HT16K33_DIMMING_LEVELS - 1)) / dev_data->max_brightness;

	dim = (value * (HT16K33_DIMMING_LEVELS - 1)) / LED_BRIGTHNESS_MAX;

	cmd = HT16K33_CMD_DIMMING_SET | dim;



	if (i2c_write_dt(&config->i2c, &cmd, sizeof(cmd))) {
@@ -299,8 +297,6 @@ static int ht16k33_init(const struct device *dev) 
	/* Hardware specific limits */

	dev_data->min_period = 0U;

	dev_data->max_period = 2000U;

	dev_data->min_brightness = 0U;

	dev_data->max_brightness = LED_BRIGTHNESS_MAX;



	/* System oscillator on */

	cmd[0] = HT16K33_CMD_SYSTEM_SETUP | HT16K33_OPT_S;

drivers/led/led_context.h

+0 −4
Changes for drivers/led/led_context.h: 0 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -25,10 +25,6 @@ struct led_data { 
	uint32_t min_period;

	/* Maximum acceptable LED blinking time period (in ms) */

	uint32_t max_period;

	/* Minimum acceptable LED brightness value */

	uint16_t min_brightness;

	/* Maximum acceptable LED brightness value */

	uint16_t max_brightness;

};



#ifdef __cplusplus

drivers/led/lp3943.c

+1 −5
Changes for drivers/led/lp3943.c: 1 added line, 5 removed lines.
Original line number Diff line number Diff line
@@ -169,8 +169,6 @@ static int lp3943_led_set_brightness(const struct device *dev, uint32_t led, 
				     uint8_t value)

{

	const struct lp3943_config *config = dev->config;

	struct lp3943_data *data = dev->data;

	struct led_data *dev_data = &data->dev_data;

	int ret;

	uint8_t reg, val, mode;
@@ -187,7 +185,7 @@ static int lp3943_led_set_brightness(const struct device *dev, uint32_t led, 
		reg = LP3943_PWM1;

	}



	val = (value * 255U) / dev_data->max_brightness;

	val = (value * 255U) / LED_BRIGTHNESS_MAX;

	if (i2c_reg_write_byte_dt(&config->bus, reg, val)) {

		LOG_ERR("LED write failed");

		return -EIO;
@@ -258,8 +256,6 @@ static int lp3943_led_init(const struct device *dev) 
	/* Hardware specific limits */

	dev_data->min_period = 0U;

	dev_data->max_period = 1600U;

	dev_data->min_brightness = 0U;

	dev_data->max_brightness = LED_BRIGTHNESS_MAX;



	return 0;

}

drivers/led/lp5562.c

+6 −24
Changes for drivers/led/lp5562.c: 6 added lines, 24 removed lines.
Original line number Diff line number Diff line
@@ -79,10 +79,6 @@ LOG_MODULE_REGISTER(lp5562); 
 */

#define LP5562_MIN_BLINK_PERIOD 1



/* Brightness limits in percent */

#define LP5562_MIN_BRIGHTNESS 0

#define LP5562_MAX_BRIGHTNESS LED_BRIGTHNESS_MAX



/* Output current limits in 0.1 mA */

#define LP5562_MIN_CURRENT_SETTING 0

#define LP5562_MAX_CURRENT_SETTING 255
@@ -609,11 +605,9 @@ static int lp5562_program_set_brightness(const struct device *dev, 
					 uint8_t command_index,

					 uint8_t brightness)

{

	struct lp5562_data *data = dev->data;

	struct led_data *dev_data = &data->dev_data;

	uint8_t val;



	val = (brightness * 0xFF) / dev_data->max_brightness;

	val = (brightness * 0xFF) / LED_BRIGTHNESS_MAX;



	return lp5562_program_command(dev, engine, command_index,

			LP5562_PROG_COMMAND_SET_PWM, val);
@@ -763,8 +757,6 @@ static int lp5562_update_blinking_brightness(const struct device *dev, 
static int lp5562_led_blink(const struct device *dev, uint32_t led,

			    uint32_t delay_on, uint32_t delay_off)

{

	struct lp5562_data *data = dev->data;

	struct led_data *dev_data = &data->dev_data;

	int ret;

	enum lp5562_led_sources engine;

	uint8_t command_index = 0U;
@@ -798,7 +790,7 @@ static int lp5562_led_blink(const struct device *dev, uint32_t led, 
	}



	ret = lp5562_program_set_brightness(dev, engine, command_index,

			dev_data->max_brightness);

			LED_BRIGTHNESS_MAX);

	if (ret) {

		return ret;

	}
@@ -809,7 +801,7 @@ static int lp5562_led_blink(const struct device *dev, uint32_t led, 
	}



	ret = lp5562_program_set_brightness(dev, engine, ++command_index,

			dev_data->min_brightness);

			LED_BRIGTHNESS_MAX);

	if (ret) {

		return ret;

	}
@@ -837,8 +829,6 @@ static int lp5562_led_set_brightness(const struct device *dev, uint32_t led, 
				     uint8_t value)

{

	const struct lp5562_config *config = dev->config;

	struct lp5562_data *data = dev->data;

	struct led_data *dev_data = &data->dev_data;

	int ret;

	uint8_t val, reg;

	enum lp5562_led_sources current_source;
@@ -864,7 +854,7 @@ static int lp5562_led_set_brightness(const struct device *dev, uint32_t led, 
		}

	}



	val = (value * 0xFF) / dev_data->max_brightness;

	val = (value * 0xFF) / LED_BRIGTHNESS_MAX;



	ret = lp5562_get_pwm_reg(led, &reg);

	if (ret) {
@@ -881,17 +871,11 @@ static int lp5562_led_set_brightness(const struct device *dev, uint32_t led, 


static inline int lp5562_led_on(const struct device *dev, uint32_t led)

{

	struct lp5562_data *data = dev->data;

	struct led_data *dev_data = &data->dev_data;



	return lp5562_led_set_brightness(dev, led, dev_data->max_brightness);

	return lp5562_led_set_brightness(dev, led, LED_BRIGTHNESS_MAX);

}



static inline int lp5562_led_off(const struct device *dev, uint32_t led)

{

	struct lp5562_data *data = dev->data;

	struct led_data *dev_data = &data->dev_data;



	int ret;

	enum lp5562_led_sources current_source;
@@ -907,7 +891,7 @@ static inline int lp5562_led_off(const struct device *dev, uint32_t led) 
		}

	}



	return lp5562_led_set_brightness(dev, led, dev_data->min_brightness);

	return lp5562_led_set_brightness(dev, led, LED_BRIGTHNESS_MAX);

}



static int lp5562_led_update_current(const struct device *dev)
@@ -1029,8 +1013,6 @@ static int lp5562_led_init(const struct device *dev) 
	/* Hardware specific limits */

	dev_data->min_period = LP5562_MIN_BLINK_PERIOD;

	dev_data->max_period = LP5562_MAX_BLINK_PERIOD;

	dev_data->min_brightness = LP5562_MIN_BRIGHTNESS;

	dev_data->max_brightness = LP5562_MAX_BRIGHTNESS;



	ret = lp5562_led_update_current(dev);

	if (ret) {

drivers/led/pca9633.c

+1 −5
Changes for drivers/led/pca9633.c: 1 added line, 5 removed lines.
Original line number Diff line number Diff line
@@ -121,12 +121,10 @@ static int pca9633_led_set_brightness(const struct device *dev, uint32_t led, 
				      uint8_t value)

{

	const struct pca9633_config *config = dev->config;

	struct pca9633_data *data = dev->data;

	struct led_data *dev_data = &data->dev_data;

	uint8_t val;



	/* Set the LED brightness value */

	val = (value * 255U) / dev_data->max_brightness;

	val = (value * 255U) / LED_BRIGTHNESS_MAX;

	if (i2c_reg_write_byte_dt(&config->i2c,

			       PCA9633_PWM_BASE + led,

			       val)) {
@@ -205,8 +203,6 @@ static int pca9633_led_init(const struct device *dev) 
	/* Hardware specific limits */

	dev_data->min_period = 41U;

	dev_data->max_period = 10667U;

	dev_data->min_brightness = 0U;

	dev_data->max_brightness = LED_BRIGTHNESS_MAX;



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE