Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

leds: leds-qpnp-flash: reset module after flash LED ramp down 

Deset bit for FOLLOW_OTST2_RB when MASK3 module is enabled, in
order to prevent device reset before flash LED will get a chance
to ramp down.

Change-Id: I1c77529a1aefeaf68c762ae6755d75d8dceab08e
Signed-off-by: Jigarkumar Kishorkumar Zala <j_zala@codeaurora.org>
This commit is contained in:
Jigarkumar Kishorkumar Zala 2015-07-01 15:48:22 -07:00
parent bb114c9f73
commit 8f11b86b4a
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/leds/leds-qpnp-flash.c
View File

@ -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
@ -1583,6 +1585,29 @@ 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;
else {