From 90cd5a21bc05a3ee049ece6ec00a371ce87d1c6e Mon Sep 17 00:00:00 2001
From: Dave Higham <iphone@dogagent.com>
Date: Wed, 12 Mar 2014 13:52:58 +0000
Subject: [PATCH] core/linux-imx6-cubox-dt add lirc and fix dvi video

---
 core/linux-imx6-cubox-dt/PKGBUILD             | 12 +++++----
 core/linux-imx6-cubox-dt/config               |  2 +-
 .../mxc_hdmi-dont-require-cea-mode.patch      | 25 +++++++++++++++++++
 3 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 core/linux-imx6-cubox-dt/mxc_hdmi-dont-require-cea-mode.patch

diff --git a/core/linux-imx6-cubox-dt/PKGBUILD b/core/linux-imx6-cubox-dt/PKGBUILD
index e0cf8e036..41fb87a47 100644
--- a/core/linux-imx6-cubox-dt/PKGBUILD
+++ b/core/linux-imx6-cubox-dt/PKGBUILD
@@ -15,7 +15,7 @@ _srcname=linux-linaro-stable-mx6-${_commit}
 _kernelname=${pkgname#linux}
 _basekernel=3.10
 pkgver=${_basekernel}.30
-pkgrel=6
+pkgrel=7
 arch=('arm')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -23,10 +23,12 @@ makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'uboot-mkimage' 'git'
 options=('!strip')
 source=("https://github.com/solidrun/linux-linaro-stable-mx6/archive/${_commit}.tar.gz"
         'config'
-        'change-default-console-loglevel.pat')
+        'change-default-console-loglevel.pat'
+        'mxc_hdmi-dont-require-cea-mode.patch')
 md5sums=('40a7283cfa9b3519453928f787f67fe9'
-         '94076788e6115c7a6071a70f8626333d'
-         '9d3c56a4b999c8bfbd4018089a62f662')
+         '40cddccd4c9ad68fcb98a089bde3842a'
+         '9d3c56a4b999c8bfbd4018089a62f662'
+         '8dc29365fc5b0668c10f630cc5b5d82d')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
@@ -43,7 +45,7 @@ prepare() {
   # remove this when a Kconfig knob is made available by upstream
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -Np1 -i "${srcdir}/change-default-console-loglevel.pat"
-
+  patch -Np1 -i "${srcdir}/mxc_hdmi-dont-require-cea-mode.patch"
 }
 
 build() {
diff --git a/core/linux-imx6-cubox-dt/config b/core/linux-imx6-cubox-dt/config
index 34705ce2e..9ab08311d 100644
--- a/core/linux-imx6-cubox-dt/config
+++ b/core/linux-imx6-cubox-dt/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.10.30-5 Kernel Configuration
+# Linux/arm 3.10.30-7 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_MIGHT_HAVE_PCI=y
diff --git a/core/linux-imx6-cubox-dt/mxc_hdmi-dont-require-cea-mode.patch b/core/linux-imx6-cubox-dt/mxc_hdmi-dont-require-cea-mode.patch
new file mode 100644
index 000000000..b6aa43411
--- /dev/null
+++ b/core/linux-imx6-cubox-dt/mxc_hdmi-dont-require-cea-mode.patch
@@ -0,0 +1,25 @@
+This fixes problems with DVI monitors connected to the HDMI port
+via a DVI <-> HDMI cable. With dvi monitors, the list of CEA modes
+is always zero, preventing modes higher than 1024x768 to be used.
+This patch disables the CEA mode check.
+
+Upstream-Status: Pending
+
+diff --git a/drivers/video/mxc/mxc_hdmi.c b/drivers/video/mxc/mxc_hdmi.c
+index 544f352..fa67128 100644
+--- a/drivers/video/mxc/mxc_hdmi.c
++++ b/drivers/video/mxc/mxc_hdmi.c
+@@ -1804,10 +1804,10 @@ static void mxc_hdmi_edid_rebuild_modelist(struct mxc_hdmi *hdmi)
+ 		 */
+ 		mode = &hdmi->fbi->monspecs.modedb[i];
+ 
+-		if (!(mode->vmode & FB_VMODE_INTERLACED) &&
+-				(mxc_edid_mode_to_vic(mode) != 0)) {
++		if (!(mode->vmode & FB_VMODE_INTERLACED)) {
++			int vic = mxc_edid_mode_to_vic(mode);
+ 
+-			dev_dbg(&hdmi->pdev->dev, "Added mode %d:", i);
++			dev_dbg(&hdmi->pdev->dev, "%s: Added mode %d(VIC %u):", __func__, i, vic);
+ 			dev_dbg(&hdmi->pdev->dev,
+ 				"xres = %d, yres = %d, freq = %d, vmode = %d, flag = %d\n",
+ 				hdmi->fbi->monspecs.modedb[i].xres,