summaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings
diff options
context:
space:
mode:
authorDave Airlie2017-11-22 23:56:34 +0100
committerDave Airlie2017-11-22 23:56:34 +0100
commitaf5ecb53c8333df424aedf97024f38ea4ec5cbb2 (patch)
tree0110e0f29dce3911f27d61dcb8f6b2568cd71356 /Documentation/devicetree/bindings
parentMerge tag 'drm/tegra/for-4.15-rc1-fixes' of git://anongit.freedesktop.org/teg... (diff)
parentgpu: ipu-v3: ipu-dc: Remove unused 'di' variable (diff)
downloadkernel-qcow2-linux-af5ecb53c8333df424aedf97024f38ea4ec5cbb2.tar.gz
kernel-qcow2-linux-af5ecb53c8333df424aedf97024f38ea4ec5cbb2.tar.xz
kernel-qcow2-linux-af5ecb53c8333df424aedf97024f38ea4ec5cbb2.zip
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/devicetree/bindings')
-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";