aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMatus Ujhelyi <ujhelyi.m@gmail.com>2013-04-29 19:18:08 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-29 21:28:19 -0400
commit4d22f8c306233433bdf9298b2e7806e9c71674bc (patch)
tree49b3a37f0cb85d98936d4e02b66e85f27f50c158 /drivers
parent17e45db62a4683a7318294d652895dfad575da41 (diff)
drivers/video/backlight/tps65217_bl.c add default brightness value option
Signed-off-by: Matus Ujhelyi <matus.ujhelyi@streamunlimited.com> Cc: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/backlight/tps65217_bl.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/drivers/video/backlight/tps65217_bl.c b/drivers/video/backlight/tps65217_bl.c
index 70881633b45a..05782312aeb3 100644
--- a/drivers/video/backlight/tps65217_bl.c
+++ b/drivers/video/backlight/tps65217_bl.c
@@ -245,6 +245,18 @@ tps65217_bl_parse_dt(struct platform_device *pdev)
245 } 245 }
246 } 246 }
247 247
248 if (!of_property_read_u32(node, "default-brightness", &val)) {
249 if (val < 0 ||
250 val > 100) {
251 dev_err(&pdev->dev,
252 "invalid 'default-brightness' value in the device tree\n");
253 err = ERR_PTR(-EINVAL);
254 goto err;
255 }
256
257 pdata->dft_brightness = val;
258 }
259
248 of_node_put(node); 260 of_node_put(node);
249 261
250 return pdata; 262 return pdata;
@@ -311,7 +323,8 @@ static int tps65217_bl_probe(struct platform_device *pdev)
311 return PTR_ERR(tps65217_bl->bl); 323 return PTR_ERR(tps65217_bl->bl);
312 } 324 }
313 325
314 tps65217_bl->bl->props.brightness = 0; 326 tps65217_bl->bl->props.brightness = pdata->dft_brightness;
327 backlight_update_status(tps65217_bl->bl);
315 platform_set_drvdata(pdev, tps65217_bl); 328 platform_set_drvdata(pdev, tps65217_bl);
316 329
317 return 0; 330 return 0;