Commit bbe64532 authored by Kim, Milo's avatar Kim, Milo Committed by Linus Torvalds

leds-lm3530: set the max_brightness to 127

Only 7 bits are used for updating the brightness.  (register address :
A0h) So the max_brightness property of lm3530 should be set to 127.

On initializing registers, maximum initial brightness is limited to
'max_brightness'.

Division-by-two is removed on updating the brightness.  This arithmetic is
not necessary because the range of brightness is 0 ~ 127= .
Signed-off-by: default avatarMilo(Woogyom) Kim <milo.kim@ti.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 16db7f90
...@@ -80,6 +80,9 @@ ...@@ -80,6 +80,9 @@
#define LM3530_DEF_ZT_3 (0x33) #define LM3530_DEF_ZT_3 (0x33)
#define LM3530_DEF_ZT_4 (0x19) #define LM3530_DEF_ZT_4 (0x19)
/* 7 bits are used for the brightness : LM3530_BRT_CTRL_REG */
#define MAX_BRIGHTNESS (127)
struct lm3530_mode_map { struct lm3530_mode_map {
const char *mode; const char *mode;
enum lm3530_mode mode_val; enum lm3530_mode mode_val;
...@@ -207,6 +210,9 @@ static int lm3530_init_registers(struct lm3530_data *drvdata) ...@@ -207,6 +210,9 @@ static int lm3530_init_registers(struct lm3530_data *drvdata)
else else
brightness = drvdata->brightness = pltfm->brt_val; brightness = drvdata->brightness = pltfm->brt_val;
if (brightness > drvdata->led_dev.max_brightness)
brightness = drvdata->led_dev.max_brightness;
reg_val[0] = gen_config; /* LM3530_GEN_CONFIG */ reg_val[0] = gen_config; /* LM3530_GEN_CONFIG */
reg_val[1] = als_config; /* LM3530_ALS_CONFIG */ reg_val[1] = als_config; /* LM3530_ALS_CONFIG */
reg_val[2] = brt_ramp; /* LM3530_BRT_RAMP_RATE */ reg_val[2] = brt_ramp; /* LM3530_BRT_RAMP_RATE */
...@@ -264,12 +270,12 @@ static void lm3530_brightness_set(struct led_classdev *led_cdev, ...@@ -264,12 +270,12 @@ static void lm3530_brightness_set(struct led_classdev *led_cdev,
/* set the brightness in brightness control register*/ /* set the brightness in brightness control register*/
err = i2c_smbus_write_byte_data(drvdata->client, err = i2c_smbus_write_byte_data(drvdata->client,
LM3530_BRT_CTRL_REG, brt_val / 2); LM3530_BRT_CTRL_REG, brt_val);
if (err) if (err)
dev_err(&drvdata->client->dev, dev_err(&drvdata->client->dev,
"Unable to set brightness: %d\n", err); "Unable to set brightness: %d\n", err);
else else
drvdata->brightness = brt_val / 2; drvdata->brightness = brt_val;
if (brt_val == 0) { if (brt_val == 0) {
err = regulator_disable(drvdata->regulator); err = regulator_disable(drvdata->regulator);
...@@ -380,6 +386,7 @@ static int __devinit lm3530_probe(struct i2c_client *client, ...@@ -380,6 +386,7 @@ static int __devinit lm3530_probe(struct i2c_client *client,
drvdata->enable = false; drvdata->enable = false;
drvdata->led_dev.name = LM3530_LED_DEV; drvdata->led_dev.name = LM3530_LED_DEV;
drvdata->led_dev.brightness_set = lm3530_brightness_set; drvdata->led_dev.brightness_set = lm3530_brightness_set;
drvdata->led_dev.max_brightness = MAX_BRIGHTNESS;
i2c_set_clientdata(client, drvdata); i2c_set_clientdata(client, drvdata);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment