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

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

This commit is contained in:
Linux Build Service Account 2015-05-30 16:23:13 -07:00 committed by Gerrit - the friendly Code Review server
parent 2c6ae5c10d 26abf82675
commit 54e4d1c5fe
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/devicetree/bindings/leds/leds-qpnp-flash.txt
View File

@ -52,6 +52,8 @@ Optional properties:
- qcom,power-detect-enabled : Boolean type. This enables driver to get maximum flash LED
current at current battery level to avoid intensity clamp
when battery voltage is low
-qcom,otst2-module-enabled : Boolean type. This enables driver to enable MASK to support
OTST2 connection.
Required properties inside child node. Chile node contains settings for each individual LED:
- label : type of led that will be used, either "flash" or "torch".

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

@ -95,6 +95,7 @@
#define FLASH_LED_HDRM_SNS_ENABLE 0x81
#define FLASH_LED_UA_PER_MA 1000
#define FLASH_LED_MASK_MODULE_MASK2_ENABLE 0x20
#define FLASH_LED_MASK3_ENABLE_SHIFT 7
#define FLASH_UNLOCK_SECURE 0xA5
#define FLASH_LED_TORCH_ENABLE 0x00
@ -183,6 +184,7 @@ struct flash_led_platform_data {
bool hdrm_sns_ch0_en;
bool hdrm_sns_ch1_en;
bool power_detect_en;
bool mask3_en;
};
/*
@ -933,9 +935,11 @@ static int qpnp_flash_led_init_settings(struct qpnp_flash_led *led)
return rc;
}
val = 0x0;
val |= led->pdata->mask3_en << FLASH_LED_MASK3_ENABLE_SHIFT;
val |= FLASH_LED_MASK_MODULE_MASK2_ENABLE;
rc = qpnp_led_masked_write(led->spmi_dev, FLASH_MASK_ENABLE(led->base),
FLASH_MASK_MODULE_CONTRL_MASK,
FLASH_LED_MASK_MODULE_MASK2_ENABLE);
FLASH_MASK_MODULE_CONTRL_MASK, val);
if (rc) {
dev_err(&led->spmi_dev->dev, "Mask module enable failed\n");
return rc;
@ -1312,6 +1316,8 @@ static int qpnp_flash_led_parse_common_dt(
led->pdata->power_detect_en = of_property_read_bool(node,
"qcom,power-detect-enabled");
led->pdata->mask3_en = of_property_read_bool(node,
"qcom,otst2-module-enabled");
led->pinctrl = devm_pinctrl_get(&led->spmi_dev->dev);
if (IS_ERR_OR_NULL(led->pinctrl)) {
dev_err(&led->spmi_dev->dev,