aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Trumtrar <s.trumtrar@pengutronix.de>2013-05-27 08:33:34 -0400
committerDave Airlie <airlied@redhat.com>2013-06-03 04:42:34 -0400
commit2d178a4abb33916fb8e1dea540921acdafe53875 (patch)
treeda9081e054eb7d3a35af5544394af5135bb87802
parent267fdd92bb1a6da6beee5db476a7880269ac352d (diff)
video: of: display_timing: add doubleclk flag
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--Documentation/devicetree/bindings/video/display-timing.txt1
-rw-r--r--drivers/video/of_display_timing.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/video/display-timing.txt b/Documentation/devicetree/bindings/video/display-timing.txt
index 150038552bc3..e1d4a0b59612 100644
--- a/Documentation/devicetree/bindings/video/display-timing.txt
+++ b/Documentation/devicetree/bindings/video/display-timing.txt
@@ -34,6 +34,7 @@ optional properties:
34 - ignored = ignored 34 - ignored = ignored
35 - interlaced (bool): boolean to enable interlaced mode 35 - interlaced (bool): boolean to enable interlaced mode
36 - doublescan (bool): boolean to enable doublescan mode 36 - doublescan (bool): boolean to enable doublescan mode
37 - doubleclk (bool): boolean to enable doubleclock mode
37 38
38All the optional properties that are not bool follow the following logic: 39All the optional properties that are not bool follow the following logic:
39 <1>: high active 40 <1>: high active
diff --git a/drivers/video/of_display_timing.c b/drivers/video/of_display_timing.c
index 85c1a419270f..2894e0300a33 100644
--- a/drivers/video/of_display_timing.c
+++ b/drivers/video/of_display_timing.c
@@ -98,6 +98,8 @@ static struct display_timing *of_get_display_timing(const struct device_node
98 dt->flags |= DISPLAY_FLAGS_INTERLACED; 98 dt->flags |= DISPLAY_FLAGS_INTERLACED;
99 if (of_property_read_bool(np, "doublescan")) 99 if (of_property_read_bool(np, "doublescan"))
100 dt->flags |= DISPLAY_FLAGS_DOUBLESCAN; 100 dt->flags |= DISPLAY_FLAGS_DOUBLESCAN;
101 if (of_property_read_bool(np, "doubleclk"))
102 dt->flags |= DISPLAY_FLAGS_DOUBLECLK;
101 103
102 if (ret) { 104 if (ret) {
103 pr_err("%s: error reading timing properties\n", 105 pr_err("%s: error reading timing properties\n",