aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Carikli <denis@eukrea.com>2014-03-14 06:55:52 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-03-17 06:26:28 -0400
commitcf071d2ab3812f39a62cbe95b407a69f057ff61a (patch)
tree912f16498dd4f9596f9ae9489410b5d1bc0219d4
parent7d3477d801808a5037a511cf5a5aae5718e7ecce (diff)
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:
18- lcd-supply: Regulator for LCD supply voltage. 18- lcd-supply: Regulator for LCD supply voltage.
19- fsl,dmacr: DMA Control Register value. This is optional. By default, the 19- fsl,dmacr: DMA Control Register value. This is optional. By default, the
20 register is not modified as recommended by the datasheet. 20 register is not modified as recommended by the datasheet.
21- fsl,lpccr: Contrast Control Register value. This property provides the
22 default value for the contrast control register.
23 If that property is ommited, the register is zeroed.
21- fsl,lscr1: LCDC Sharp Configuration Register value. 24- fsl,lscr1: LCDC Sharp Configuration Register value.
22 25
23Example: 26Example:
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)
670 fbi->cmap_static = of_property_read_bool(np, "cmap-static"); 670 fbi->cmap_static = of_property_read_bool(np, "cmap-static");
671 671
672 fbi->lscr1 = IMXFB_LSCR1_DEFAULT; 672 fbi->lscr1 = IMXFB_LSCR1_DEFAULT;
673
674 of_property_read_u32(np, "fsl,lpccr", &fbi->pwmr);
675
673 of_property_read_u32(np, "fsl,lscr1", &fbi->lscr1); 676 of_property_read_u32(np, "fsl,lscr1", &fbi->lscr1);
674 677
675 of_property_read_u32(np, "fsl,dmacr", &fbi->dmacr); 678 of_property_read_u32(np, "fsl,dmacr", &fbi->dmacr);