Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f82fbb41 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "leds: qpnp-flash-v2: Change minimum current configuration" into msm-4.9

parents bb14944e 8798ab17

drivers/leds/leds-qpnp-flash-v2.c

+10 −10
Original line number Diff line number Diff line
@@ -152,7 +152,6 @@ 
#define	FLASH_LED_MOD_ENABLE			BIT(7)

#define	FLASH_LED_DISABLE			0x00

#define	FLASH_LED_SAFETY_TMR_DISABLED		0x13

#define	FLASH_LED_MIN_CURRENT_MA		25

#define	FLASH_LED_MAX_TOTAL_CURRENT_MA		3750



/* notifier call chain for flash-led irqs */
@@ -880,11 +879,12 @@ static int qpnp_flash_led_get_max_avail_current(struct qpnp_flash_led *led) 
static void qpnp_flash_led_node_set(struct flash_node_data *fnode, int value)

{

	int prgm_current_ma = value;

	int min_ma = fnode->ires_ua / 1000;



	if (value <= 0)

		prgm_current_ma = 0;

	else if (value < FLASH_LED_MIN_CURRENT_MA)

		prgm_current_ma = FLASH_LED_MIN_CURRENT_MA;

	else if (value < min_ma)

		prgm_current_ma = min_ma;



	prgm_current_ma = min(prgm_current_ma, fnode->max_current);

	fnode->current_ma = prgm_current_ma;
@@ -1336,7 +1336,7 @@ static int qpnp_flash_led_parse_each_led_dt(struct qpnp_flash_led *led, 
			struct flash_node_data *fnode, struct device_node *node)

{

	const char *temp_string;

	int rc;

	int rc, min_ma;

	u32 val;

	bool strobe_sel = 0, edge_trigger = 0, active_high = 0;
@@ -1392,10 +1392,11 @@ static int qpnp_flash_led_parse_each_led_dt(struct qpnp_flash_led *led, 
		return rc;

	}



	min_ma = fnode->ires_ua / 1000;

	rc = of_property_read_u32(node, "qcom,max-current", &val);

	if (!rc) {

		if (val < FLASH_LED_MIN_CURRENT_MA)

			val = FLASH_LED_MIN_CURRENT_MA;

		if (val < min_ma)

			val = min_ma;

		fnode->max_current = val;

		fnode->cdev.max_brightness = val;

	} else {
@@ -1405,11 +1406,10 @@ static int qpnp_flash_led_parse_each_led_dt(struct qpnp_flash_led *led, 


	rc = of_property_read_u32(node, "qcom,current-ma", &val);

	if (!rc) {

		if (val < FLASH_LED_MIN_CURRENT_MA ||

				val > fnode->max_current)

		if (val < min_ma || val > fnode->max_current)

			pr_warn("Invalid operational current specified, capping it\n");

		if (val < FLASH_LED_MIN_CURRENT_MA)

			val = FLASH_LED_MIN_CURRENT_MA;

		if (val < min_ma)

			val = min_ma;

		if (val > fnode->max_current)

			val = fnode->max_current;

		fnode->current_ma = val;