summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2017-11-23 08:56:34 +1000
committerDave Airlie <airlied@redhat.com>2017-11-23 08:56:34 +1000
commitaf5ecb53c8333df424aedf97024f38ea4ec5cbb2 (patch)
tree0110e0f29dce3911f27d61dcb8f6b2568cd71356 /Documentation
parent2d56131006f6208e6e7acba4a750c40ed7df6f34 (diff)
parente64b9189bfd58e215ee44159767b39b8cf6fa302 (diff)
downloadlinux-af5ecb53c8333df424aedf97024f38ea4ec5cbb2.tar.bz2
Merge tag 'imx-drm-next-2017-10-18' of git://git.pengutronix.de/git/pza/linux into drm-next
drm/imx: various cleanups - Switch to drm_*_get/put() helpers - Use correct parallel-display connector enum: DPI instead of VGA - Remove incorrect unit name from device tree binding documentation example - Remove an unused variable * tag 'imx-drm-next-2017-10-18' of git://git.pengutronix.de/git/pza/linux: gpu: ipu-v3: ipu-dc: Remove unused 'di' variable dt-bindings: fsl-imx-drm: Remove incorrect "@di0" usage drm/imx: parallel-display: use correct connector enum drm/imx: switch to drm_*_get(), drm_*_put() helpers
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/display/imx/fsl-imx-drm.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/display/imx/fsl-imx-drm.txt b/Documentation/devicetree/bindings/display/imx/fsl-imx-drm.txt
index f79854783c2c..5bf77f6dd19d 100644
--- a/Documentation/devicetree/bindings/display/imx/fsl-imx-drm.txt
+++ b/Documentation/devicetree/bindings/display/imx/fsl-imx-drm.txt
@@ -129,7 +129,7 @@ Optional properties:
example:
-display@di0 {
+disp0 {
compatible = "fsl,imx-parallel-display";
edid = [edid-data];
interface-pix-fmt = "rgb24";