summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Carikli <denis@eukrea.com>2014-03-14 11:55:52 +0100
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-03-17 12:26:28 +0200
commitcf071d2ab3812f39a62cbe95b407a69f057ff61a (patch)
tree912f16498dd4f9596f9ae9489410b5d1bc0219d4
parent7d3477d801808a5037a511cf5a5aae5718e7ecce (diff)
downloadlinux-cf071d2ab3812f39a62cbe95b407a69f057ff61a.tar.gz
linux-cf071d2ab3812f39a62cbe95b407a69f057ff61a.tar.bz2
linux-cf071d2ab3812f39a62cbe95b407a69f057ff61a.zip
video: imxfb: Add DT default contrast control register property.
Signed-off-by: Denis Carikli <denis@eukrea.com> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Grant Likely <grant.likely@linaro.org> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r--Documentation/devicetree/bindings/video/fsl,imx-fb.txt3
-rw-r--r--drivers/video/imxfb.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/video/fsl,imx-fb.txt b/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
index e6b1ee9b8e2e..0329f60d431e 100644
--- a/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
+++ b/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
@@ -18,6 +18,9 @@ Optional properties:
- lcd-supply: Regulator for LCD supply voltage.
- fsl,dmacr: DMA Control Register value. This is optional. By default, the
register is not modified as recommended by the datasheet.
+- fsl,lpccr: Contrast Control Register value. This property provides the
+ default value for the contrast control register.
+ If that property is ommited, the register is zeroed.
- fsl,lscr1: LCDC Sharp Configuration Register value.
Example:
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
index 086e02431232..f6e621684953 100644
--- a/drivers/video/imxfb.c
+++ b/drivers/video/imxfb.c
@@ -670,6 +670,9 @@ static int imxfb_init_fbinfo(struct platform_device *pdev)
fbi->cmap_static = of_property_read_bool(np, "cmap-static");
fbi->lscr1 = IMXFB_LSCR1_DEFAULT;
+
+ of_property_read_u32(np, "fsl,lpccr", &fbi->pwmr);
+
of_property_read_u32(np, "fsl,lscr1", &fbi->lscr1);
of_property_read_u32(np, "fsl,dmacr", &fbi->dmacr);