Merge "leds: leds-qpnp-flash: enable MASK module for flash LED"

#define FLASH_LED_TMR_CTRL(base)				(base + 0x48)

#define FLASH_HEADROOM(base)					(base + 0x4A)

#define	FLASH_STARTUP_DELAY(base)				(base + 0x4B)

#define FLASH_MASK_ENABLE(base)					(base + 0x4C)

#define FLASH_VREG_OK_FORCE(base)				(base + 0x4F)

#define FLASH_FAULT_DETECT(base)				(base + 0x51)

#define	FLASH_THERMAL_DRATE(base)				(base + 0x52)

#define FLASH_CURRENT_RAMP_MASK					0xBF

#define FLASH_VPH_PWR_DROOP_MASK				0xF3

#define FLASH_LED_HDRM_SNS_ENABLE_MASK				0x81

#define	FLASH_MASK_MODULE_CONTRL_MASK				0xE0

#define FLASH_LED_TRIGGER_DEFAULT				"none"

#define FLASH_LED_HEADROOM_DEFAULT_MV				500

#define	FLASH_LED_VPH_DROOP_THRESHOLD_DIVIDER			100

#define FLASH_LED_HDRM_SNS_ENABLE				0x81

#define	FLASH_LED_UA_PER_MA					1000

#define	FLASH_LED_MASK_MODULE_MASK2_ENABLE			0x20

#define FLASH_UNLOCK_SECURE					0xA5

#define FLASH_LED_TORCH_ENABLE					0x00

		return rc;

	}

	rc = qpnp_led_masked_write(led->spmi_dev, FLASH_MASK_ENABLE(led->base),

				FLASH_MASK_MODULE_CONTRL_MASK,

				FLASH_LED_MASK_MODULE_MASK2_ENABLE);

	if (rc) {

		dev_err(&led->spmi_dev->dev, "Mask module enable failed\n");

		return rc;

	}

	if (!led->pdata->thermal_derate_en)

		val = 0x0;

	else {