From da774bdf988463fbe8de734ea8c3d9551c67279a Mon Sep 17 00:00:00 2001 From: "Kim, Milo" Date: Fri, 23 Mar 2012 15:02:11 -0700 Subject: [PATCH] --- yaml --- r: 295191 b: refs/heads/master c: bbe6453204c568723679212f6d0653b92b3d6244 h: refs/heads/master i: 295189: 271b786a91b1f3dd3b7b34d53a6cd4e3aa806bff 295187: 93d283bcd0744415808d53b69054e8006f1db024 295183: db5d1c20f3751ff2eaff495254f3370c54202bf2 v: v3 --- [refs] | 2 +- trunk/drivers/leds/leds-lm3530.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e45f4368ddeb..4ecdeb7cd33c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16db7f9095bf6bb394c9ddb64e738e64a0fea733 +refs/heads/master: bbe6453204c568723679212f6d0653b92b3d6244 diff --git a/trunk/drivers/leds/leds-lm3530.c b/trunk/drivers/leds/leds-lm3530.c index e59c166a0ce2..2c32a8c45f89 100644 --- a/trunk/drivers/leds/leds-lm3530.c +++ b/trunk/drivers/leds/leds-lm3530.c @@ -80,6 +80,9 @@ #define LM3530_DEF_ZT_3 (0x33) #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 { const char *mode; enum lm3530_mode mode_val; @@ -207,6 +210,9 @@ static int lm3530_init_registers(struct lm3530_data *drvdata) else 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[1] = als_config; /* LM3530_ALS_CONFIG */ reg_val[2] = brt_ramp; /* LM3530_BRT_RAMP_RATE */ @@ -264,12 +270,12 @@ static void lm3530_brightness_set(struct led_classdev *led_cdev, /* set the brightness in brightness control register*/ err = i2c_smbus_write_byte_data(drvdata->client, - LM3530_BRT_CTRL_REG, brt_val / 2); + LM3530_BRT_CTRL_REG, brt_val); if (err) dev_err(&drvdata->client->dev, "Unable to set brightness: %d\n", err); else - drvdata->brightness = brt_val / 2; + drvdata->brightness = brt_val; if (brt_val == 0) { err = regulator_disable(drvdata->regulator); @@ -380,6 +386,7 @@ static int __devinit lm3530_probe(struct i2c_client *client, drvdata->enable = false; drvdata->led_dev.name = LM3530_LED_DEV; drvdata->led_dev.brightness_set = lm3530_brightness_set; + drvdata->led_dev.max_brightness = MAX_BRIGHTNESS; i2c_set_clientdata(client, drvdata);