From 78dde70072cfa54b25a782b5c024b1c4f742368c Mon Sep 17 00:00:00 2001
From: CrawX <crux@project-insanity.org>
Date: Sun, 3 Aug 2014 13:36:21 +0200
Subject: [PATCH 1/2] core/linux-wandboard enable cec

---
 core/linux-wandboard/PKGBUILD         | 20 +++++++++++++++++---
 core/linux-wandboard/enable-cec.patch | 21 +++++++++++++++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 core/linux-wandboard/enable-cec.patch

diff --git a/core/linux-wandboard/PKGBUILD b/core/linux-wandboard/PKGBUILD
index 6d22f6c20..c8a71de10 100644
--- a/core/linux-wandboard/PKGBUILD
+++ b/core/linux-wandboard/PKGBUILD
@@ -9,7 +9,7 @@ _srcname=linux-${_commit}
 _kernelname=${pkgbase#linux}
 _desc="i.MX6 Wandboard"
 pkgver=3.10.17
-pkgrel=3
+pkgrel=4
 arch=('armv7h')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -17,10 +17,17 @@ makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git')
 options=('!strip')
 source=("https://github.com/wandboard-org/linux/archive/${_commit}.tar.gz"
         '0001-Swap-usdhc1-and-usdhc3.patch'
-        'config')
+        'config'
+	'https://github.com/wolfgar/linux-linaro-stable-mx6/commit/74fc2e85c080b0ddc2a4b2565eda97c55300303d.patch'
+	'https://github.com/wolfgar/linux-linaro-stable-mx6/commit/76796e32b20dd8f34aadad8fd91672017d143812.patch'
+	'enable-cec.patch')
+
 md5sums=('e10cf2d6b0e82303be6ea384aa2880fb'
          '1edf745b39c715206fbe327c60f6cf76'
-         '87706fcb5d01bf5a1722c6c9de5be83f')
+         '87706fcb5d01bf5a1722c6c9de5be83f'
+         '405499490b9a83adea6e8d911af2eb7e'
+         '20b58d28255361e6f0b4fb0ef9c04647'
+         'ecb5cb4aa94aeb2ad6a643cc057e3192')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
@@ -29,6 +36,13 @@ prepare() {
 
   patch -p1 -i ../0001-Swap-usdhc1-and-usdhc3.patch
 
+  # add cec driver patches
+  patch -Np1 < ../74fc2e85c080b0ddc2a4b2565eda97c55300303d.patch
+  patch -Np1 < ../76796e32b20dd8f34aadad8fd91672017d143812.patch
+
+  # enable cec in dts
+  patch -Np1 -l < ../enable-cec.patch
+
   # add pkgrel to extraversion
   sed -ri "s|^(EXTRAVERSION =)(.*)|\1 \2-${pkgrel}|" Makefile
 
diff --git a/core/linux-wandboard/enable-cec.patch b/core/linux-wandboard/enable-cec.patch
new file mode 100644
index 000000000..c55d8caff
--- /dev/null
+++ b/core/linux-wandboard/enable-cec.patch
@@ -0,0 +1,21 @@
+ff --git a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi.orig b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
+index 30f197f..7359aea 100644
+--- a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
++++ b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
+@@ -228,10 +228,16 @@
+        fsl,phy_reg_vlev = <0x0294>;
+        fsl,phy_reg_cksymtx = <0x800d>;
+        status = "okay";
+ };
+ 
++&hdmi_cec {
++        pinctrl-names = "default";
++        pinctrl-0 = <&pinctrl_hdmi_cec_2>;
++        status = "okay";
++};
++
+ &i2c1 {
+        clock-frequency = <100000>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c1_1>;
+        status = "okay";

From aceb32fd00a0b3a1c9ac5e0538000c1095bf415b Mon Sep 17 00:00:00 2001
From: CrawX <crux@project-insanity.org>
Date: Sun, 3 Aug 2014 14:13:42 +0200
Subject: [PATCH 2/2] core/linux-wandboard fix tabs

---
 core/linux-wandboard/PKGBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/linux-wandboard/PKGBUILD b/core/linux-wandboard/PKGBUILD
index c8a71de10..c2c979432 100644
--- a/core/linux-wandboard/PKGBUILD
+++ b/core/linux-wandboard/PKGBUILD
@@ -18,9 +18,9 @@ options=('!strip')
 source=("https://github.com/wandboard-org/linux/archive/${_commit}.tar.gz"
         '0001-Swap-usdhc1-and-usdhc3.patch'
         'config'
-	'https://github.com/wolfgar/linux-linaro-stable-mx6/commit/74fc2e85c080b0ddc2a4b2565eda97c55300303d.patch'
-	'https://github.com/wolfgar/linux-linaro-stable-mx6/commit/76796e32b20dd8f34aadad8fd91672017d143812.patch'
-	'enable-cec.patch')
+        'https://github.com/wolfgar/linux-linaro-stable-mx6/commit/74fc2e85c080b0ddc2a4b2565eda97c55300303d.patch'
+        'https://github.com/wolfgar/linux-linaro-stable-mx6/commit/76796e32b20dd8f34aadad8fd91672017d143812.patch'
+        'enable-cec.patch')
 
 md5sums=('e10cf2d6b0e82303be6ea384aa2880fb'
          '1edf745b39c715206fbe327c60f6cf76'