From d2b542cd7fee9873b78635f5ebcdbe44fe7c70f7 Mon Sep 17 00:00:00 2001
From: Matus Ujhelyi <ujhelyi.m@gmail.com>
Date: Mon, 29 Apr 2013 16:18:08 -0700
Subject: [PATCH] --- yaml --- r: 365663 b: refs/heads/master c:
 4d22f8c306233433bdf9298b2e7806e9c71674bc h: refs/heads/master i:   365661:
 73d448fdba44f9f0e1c8cad953ef0fe1f6e7f66e   365659:
 449821f9305de5611eee8110ecd8a53752779ed3   365655:
 37659b50d8d36bc211f477c2909604d664be16d5   365647:
 da08b72da86165f742f5e0e6313ea718aca01894   365631:
 0aeba03491fd92a7b5b8887bf7a1c1906fd4fbb4 v: v3

---
 [refs]                                            |  2 +-
 .../video/backlight/tps65217-backlight.txt        |  3 +++
 trunk/drivers/video/backlight/tps65217_bl.c       | 15 ++++++++++++++-
 trunk/include/linux/mfd/tps65217.h                |  1 +
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 930c87f23e42..980f5e428fdc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17e45db62a4683a7318294d652895dfad575da41
+refs/heads/master: 4d22f8c306233433bdf9298b2e7806e9c71674bc
diff --git a/trunk/Documentation/devicetree/bindings/video/backlight/tps65217-backlight.txt b/trunk/Documentation/devicetree/bindings/video/backlight/tps65217-backlight.txt
index 76485247b35d..5fb9279ac287 100644
--- a/trunk/Documentation/devicetree/bindings/video/backlight/tps65217-backlight.txt
+++ b/trunk/Documentation/devicetree/bindings/video/backlight/tps65217-backlight.txt
@@ -9,6 +9,7 @@ Required properties:
 - backlight: node for specifying WLED1 and WLED2 lines in TPS65217
 - isel: selection bit, valid values: 1 for ISEL1 (low-level) and 2 for ISEL2 (high-level)
 - fdim: PWM dimming frequency, valid values: 100, 200, 500, 1000
+- default-brightness: valid values: 0-100
 
 Each regulator is defined using the standard binding for regulators.
 
@@ -20,5 +21,7 @@ Example:
 		backlight {
 			isel = <1>;  /* 1 - ISET1, 2 ISET2 */
 			fdim = <100>; /* TPS65217_BL_FDIM_100HZ */
+			default-brightness = <50>;
 		};
 	};
+
diff --git a/trunk/drivers/video/backlight/tps65217_bl.c b/trunk/drivers/video/backlight/tps65217_bl.c
index 70881633b45a..05782312aeb3 100644
--- a/trunk/drivers/video/backlight/tps65217_bl.c
+++ b/trunk/drivers/video/backlight/tps65217_bl.c
@@ -245,6 +245,18 @@ tps65217_bl_parse_dt(struct platform_device *pdev)
 		}
 	}
 
+	if (!of_property_read_u32(node, "default-brightness", &val)) {
+		if (val < 0 ||
+			val > 100) {
+			dev_err(&pdev->dev,
+				"invalid 'default-brightness' value in the device tree\n");
+			err = ERR_PTR(-EINVAL);
+			goto err;
+		}
+
+		pdata->dft_brightness = val;
+	}
+
 	of_node_put(node);
 
 	return pdata;
@@ -311,7 +323,8 @@ static int tps65217_bl_probe(struct platform_device *pdev)
 		return PTR_ERR(tps65217_bl->bl);
 	}
 
-	tps65217_bl->bl->props.brightness = 0;
+	tps65217_bl->bl->props.brightness = pdata->dft_brightness;
+	backlight_update_status(tps65217_bl->bl);
 	platform_set_drvdata(pdev, tps65217_bl);
 
 	return 0;
diff --git a/trunk/include/linux/mfd/tps65217.h b/trunk/include/linux/mfd/tps65217.h
index 290762f93930..29eab2bd3dfa 100644
--- a/trunk/include/linux/mfd/tps65217.h
+++ b/trunk/include/linux/mfd/tps65217.h
@@ -228,6 +228,7 @@ enum tps65217_bl_fdim {
 struct tps65217_bl_pdata {
 	enum tps65217_bl_isel isel;
 	enum tps65217_bl_fdim fdim;
+	int dft_brightness;
 };
 
 /**