Merge "leds: qpnp-flash-v2: Disable the safety timer by default" (16f5fb7c) · Commits · e / devices / android_kernel_fairphone_FP3

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -438,6 +438,12 @@ static int qpnp_flash_led_init_settings(struct qpnp_flash_led *led)

		val \|= 0x1 << led->fnode[i].id;

		rc = qpnp_flash_led_write(led,
		FLASH_LED_REG_SAFETY_TMR(led->base + addr_offset),
		FLASH_LED_SAFETY_TMR_DISABLED);
		if (rc < 0)
		return rc;

		if (led->fnode[i].strobe_sel == HW_STROBE) {
		if (led->fnode[i].id == LED3)
		strobe_mask \|= LED3_FLASH_ONCE_ONLY_BIT;
		@@ -1324,6 +1330,12 @@ static int qpnp_flash_led_switch_disable(struct flash_switch_data *snode)
		if (rc < 0)
		return rc;

		rc = qpnp_flash_led_write(led,
		FLASH_LED_REG_SAFETY_TMR(led->base + addr_offset),
		FLASH_LED_SAFETY_TMR_DISABLED);
		if (rc < 0)
		return rc;

		led->fnode[i].led_on = false;

		if (led->fnode[i].strobe_sel == HW_STROBE) {