rubenslte/android_kernel_samsung_msm8226-rubenslte
1
Fork 0
forked from rubenslte/android_kernel_samsung_msm8226
Code Pull Requests Activity

leds: leds-pm8xxx: enable setting of max current for individual string

Browse Source 
Max current for all wleds will still be used to set
general properties, such as max brightness, but for
each string an individual max can be set.

CRs-Fixed: 377988
Change-Id: I73284176b04e016e315d36d680cef02119dec370
Signed-off-by: Amy Maloche <amaloche@codeaurora.org>
This commit is contained in:
Amy Maloche
2013-02-27 16:32:24 -08:00
parent e7d7ef3134
commit 59cf818e9d
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/leds/leds-pm8xxx.c
+22 -4
View File
@@ -53,6 +53,9 @@
#define WLED_BOOST_CFG_REG SSBI_REG_ADDR_WLED_CTRL(14)
#define WLED_HIGH_POLE_CAP_REG SSBI_REG_ADDR_WLED_CTRL(16)
#define WLED_STRING_ONE 0 /* Rightmost string */
#define WLED_STRING_TWO 1 /* Middle string */
#define WLED_STRING_THREE 2 /* Leftmost string */
#define WLED_STRINGS 0x03
#define WLED_OVP_VAL_MASK 0x30
#define WLED_OVP_VAL_BIT_SHFT 0x04
@@ -565,7 +568,7 @@ static enum led_brightness pm8xxx_led_get(struct led_classdev *led_cdev)
static int __devinit init_wled(struct pm8xxx_led_data *led)
{
int rc, i;
u8 val;
u8 val, string_max_current;
/* program over voltage protection threshold */
if (led->wled_cfg->ovp_val > WLED_OVP_37V) {
@@ -642,7 +645,7 @@ static int __devinit init_wled(struct pm8xxx_led_data *led)
for (i = 0; i < WLED_STRINGS; i++) {
if (led->wled_cfg->strings && (1 << i)) {
rc = pm8xxx_readb(led->dev->parent,
WLED_MAX_CURR_CFG_REG(i + 2), &val);
WLED_MAX_CURR_CFG_REG(i), &val);
if (rc) {
dev_err(led->dev->parent,
"can't read wled max current"
@@ -668,11 +671,26 @@ static int __devinit init_wled(struct pm8xxx_led_data *led)
"Invalid max current\n");
return -EINVAL;
}
if (led->wled_cfg->max_current_ind) {
switch (i) {
case WLED_STRING_ONE:
string_max_current = led->wled_cfg->max_one;
break;
case WLED_STRING_TWO:
string_max_current = led->wled_cfg->max_two;
break;
case WLED_STRING_THREE:
string_max_current = led->wled_cfg->max_three;
break;
default:
return -EINVAL;
}
val = (val & ~WLED_MAX_CURR_MASK) | string_max_current;
} else
val = (val & ~WLED_MAX_CURR_MASK) | led->max_current;
rc = pm8xxx_writeb(led->dev->parent,
WLED_MAX_CURR_CFG_REG(i + 2), val);
WLED_MAX_CURR_CFG_REG(i), val);
if (rc) {
dev_err(led->dev->parent,
"can't write wled max current"
include/linux/leds-pm8xxx.h
+5
View File
@@ -102,6 +102,11 @@ struct wled_config_data {
bool cs_out_en;
bool op_fdbck;
bool cabc_en;
bool sstart_en;
bool max_current_ind;
u8 max_three;
u8 max_two;
u8 max_one;
};
/**