 +		dglnt,edid-i2c = <&i2c1>;
 +	};
 diff --git a/drivers/gpu/drm/xilinx/Kconfig b/drivers/gpu/drm/xilinx/Kconfig
-index 12b548c2a9..c3e2562e53 100644
+index 57e18a9..d9ecff2 100644
 --- a/drivers/gpu/drm/xilinx/Kconfig
 +++ b/drivers/gpu/drm/xilinx/Kconfig
-@@ -57,3 +57,9 @@ config DRM_XILINX_SDI
- 	depends on DRM_XILINX
+@@ -33,6 +33,12 @@ config DRM_XILINX_DP_SUB
  	help
  	  DRM driver for Xilinx Display Port Subsystem.
-+
+ 
 +config DRM_DIGILENT_ENCODER
 +   tristate "Digilent VGA/HDMI DRM Encoder Driver"
 +   depends on DRM_XILINX
 +   help
 +     DRM slave encoder for Video-out on Digilent boards.
++
+ config DRM_XILINX_DP_SUB_DEBUG_FS
+ 	bool "Xilinx DRM DPSUB debugfs"
+ 	depends on DEBUG_FS && DRM_XILINX_DP_SUB
 diff --git a/drivers/gpu/drm/xilinx/Makefile b/drivers/gpu/drm/xilinx/Makefile
-index 19bc1541ca..c2717e40ea 100644
+index 19bc154..c2717e40 100644
 --- a/drivers/gpu/drm/xilinx/Makefile
 +++ b/drivers/gpu/drm/xilinx/Makefile
 @@ -7,6 +7,7 @@ xilinx_drm-y := xilinx_drm_crtc.o xilinx_drm_connector.o xilinx_drm_drv.o \

From c1bf9e8c50baa237b514715dcb9c8fd367694c93 Mon Sep 17 00:00:00 2001
From: Jason Wu <jason.wu.misc@gmail.com>
Date: Sun, 10 Apr 2016 13:14:13 +1000
Subject: [PATCH 1/3] drm: xilinx: Add encoder for Digilent boards


diff --git a/Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt b/Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt
new file mode 100644
index 0000000..242b24e
--- /dev/null
+++ b/Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt
@@ -0,0 +1,23 @@
