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

Commit 8983db66 authored by Chun Zhang's avatar Chun Zhang Committed by Gerrit - the friendly Code Review server
Browse files

leds: leds-qpnp-flash: unlock secure register before access 



PERPH_RESET should be set in order to prevent flash LED module reset
before flash LED get chance to ramp down. To access PERPH_RESET register
we need to write to secure register to unlock the access.

Change-Id: I159317743ad8e64f616175a157313afb50fdcf7c
Signed-off-by: default avatarChun Zhang <chunz@codeaurora.org>
parent b9ae0269

drivers/leds/leds-qpnp-flash.c

+34 −6
Original line number Diff line number Diff line
@@ -1591,7 +1591,6 @@ static int qpnp_flash_led_init_settings(struct qpnp_flash_led *led) 
		return rc;

	}



	if (led->pdata->mask3_en && led->pdata->follow_rb_disable) {

	rc = spmi_ext_register_readl(led->spmi_dev->ctrl,

			led->spmi_dev->sid,

			FLASH_PERPH_RESET_CTRL(led->base),
@@ -1603,6 +1602,35 @@ static int qpnp_flash_led_init_settings(struct qpnp_flash_led *led) 
		return -EINVAL;

	}



	if (led->pdata->follow_rb_disable) {

		rc = qpnp_led_masked_write(led->spmi_dev,

				FLASH_LED_UNLOCK_SECURE(led->base),

				FLASH_SECURE_MASK, FLASH_UNLOCK_SECURE);

		if (rc) {

			dev_err(&led->spmi_dev->dev,

				"Secure reg write failed\n");

			return -EINVAL;

		}



		val |= FLASH_FOLLOW_OTST2_RB_MASK;

		rc = qpnp_led_masked_write(led->spmi_dev,

				FLASH_PERPH_RESET_CTRL(led->base),

				FLASH_FOLLOW_OTST2_RB_MASK, val);

		if (rc) {

			dev_err(&led->spmi_dev->dev,

				"failed to reset OTST2_RB bit\n");

			return rc;

		}

	} else {

		rc = qpnp_led_masked_write(led->spmi_dev,

				FLASH_LED_UNLOCK_SECURE(led->base),

				FLASH_SECURE_MASK, FLASH_UNLOCK_SECURE);

		if (rc) {

			dev_err(&led->spmi_dev->dev,

				"Secure reg write failed\n");

			return -EINVAL;

		}



		val &= ~FLASH_FOLLOW_OTST2_RB_MASK;

		rc = qpnp_led_masked_write(led->spmi_dev,

				FLASH_PERPH_RESET_CTRL(led->base),