Merge "leds: leds-qpnp-flash: reset module after flash LED ramp down" (b29291bf) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/leds/leds-qpnp-flash.c

+24 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@
		#define FLASH_HDRM_SNS_ENABLE_CTRL0(base) (base + 0x5C)
		#define FLASH_HDRM_SNS_ENABLE_CTRL1(base) (base + 0x5D)
		#define FLASH_LED_UNLOCK_SECURE(base) (base + 0xD0)
		#define FLASH_PERPH_RESET_CTRL(base) (base + 0xDA)
		#define FLASH_TORCH(base) (base + 0xE4)

		#define FLASH_STATUS_REG_MASK 0xFF
		@@ -75,6 +76,7 @@
		#define FLASH_VPH_PWR_DROOP_MASK 0xF3
		#define FLASH_LED_HDRM_SNS_ENABLE_MASK 0x81
		#define FLASH_MASK_MODULE_CONTRL_MASK 0xE0
		#define FLASH_FOLLOW_OTST2_RB_MASK 0x08

		#define FLASH_LED_TRIGGER_DEFAULT "none"
		#define FLASH_LED_HEADROOM_DEFAULT_MV 500
		@@ -1561,6 +1563,28 @@ static int qpnp_flash_led_init_settings(struct qpnp_flash_led *led)
		return rc;
		}

		if (led->pdata->mask3_en) {
		rc = spmi_ext_register_readl(led->spmi_dev->ctrl,
		led->spmi_dev->sid,
		FLASH_PERPH_RESET_CTRL(led->base),
		&val, 1);
		if (rc) {
		dev_err(&led->spmi_dev->dev,
		"Unable to read from address %x, rc(%d)\n",
		FLASH_PERPH_RESET_CTRL(led->base), rc);
		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;
		}
		}

		if (!led->pdata->thermal_derate_en)
		val = 0x0;