[kernel] Add patch for i.MX6 Utilite device dtb, drop old exynos patch

[Peter Robinson]

commit ac67590916a449d1e71a791f6a0c3688251ec074
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Oct 24 20:29:40 2013 +0100

    Add patch for i.MX6 Utilite device dtb, drop old exynos patch

 arm-exynos-mp.patch    |  408 ------------------------------------------------
 arm-imx6-utilite.patch |   84 ++++++++++
 config-arm-generic     |    2 -
 config-armv7           |    1 +
 kernel.spec            |   10 +-
 5 files changed, 93 insertions(+), 412 deletions(-)
---
diff --git a/arm-imx6-utilite.patch b/arm-imx6-utilite.patch
new file mode 100644
index 0000000..8f942f0
--- /dev/null
+++ b/arm-imx6-utilite.patch
@@ -0,0 +1,84 @@
+Add initial support for cm-fx6 module.
+
+cm-fx6 is a module based on mx6q SoC with the following features:
+- Up to 4GB of DDR3
+- 1 LCD/DVI output port
+- 1 HDMI output port
+- 2 LVDS LCD ports
+- Gigabit Ethernet
+- Analog Audio
+- CAN
+- SATA
+- NAND
+- PCIE
+
+This patch allows to boot up the module, configures the serial console,
+the Ethernet adapter and the hearbeat led.
+
+Signed-off-by: Valentin Raevsky <valentin at xxxxxxxxxxxxxx>
+Acked-by: Igor Grinberg <grinberg at xxxxxxxxxxxxxx>
+---
+ arch/arm/boot/dts/cm-fx6.dts |   51 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 51 insertions(+)
+ create mode 100644 arch/arm/boot/dts/cm-fx6.dts
+
+diff --git a/arch/arm/boot/dts/cm-fx6.dts b/arch/arm/boot/dts/cm-fx6.dts
+new file mode 100644
+index 0000000..1080215
+--- /dev/null
++++ b/arch/arm/boot/dts/cm-fx6.dts
+@@ -0,0 +1,51 @@
++/*
++ * Copyright 2013 CompuLab Ltd.
++ *
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++
++/dts-v1/;
++#include "imx6q.dtsi"
++
++/ {
++	model = "CompuLab CM-FX6";
++	compatible = "compulab,cm-fx6", "fsl,imx6q";
++
++	memory {
++		reg = <0x10000000 0x80000000>;
++	};
++
++	leds {
++		compatible = "gpio-leds";
++
++		debug-led {
++			label = "Heartbeat";
++			gpios = <&gpio2 31 0>;
++			linux,default-trigger = "heartbeat";
++		};
++	};
++};
++
++&gpmi {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_gpmi_nand_1>;
++	status = "okay";
++};
++
++&fec {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_enet_1>;
++	phy-mode = "rgmii";
++	status = "okay";
++};
++
++&uart4 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_uart4_1>;
++	status = "okay";
++};
+-- 
+1.7.9.5
+
diff --git a/config-arm-generic b/config-arm-generic
index 96a95e5..aaa88ee 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -114,8 +114,6 @@ CONFIG_MFD_CORE=m
 CONFIG_SMC91X=m
 CONFIG_SMC911X=m
 
-CONFIG_VIRTIO_CONSOLE=m
-
 # CONFIG_CRYPTO_TEST is not set
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
 # CONFIG_XEN is not set
diff --git a/config-armv7 b/config-armv7
index cd0abf2..dfdc7cf 100644
--- a/config-armv7
+++ b/config-armv7
@@ -397,6 +397,7 @@ CONFIG_PWM_IMX=m
 CONFIG_BACKLIGHT_PWM=m
 CONFIG_DRM_IMX=m
 CONFIG_DRM_IMX_FB_HELPER=m
+CONFIG_DRM_IMX_HDMI=m
 CONFIG_DRM_IMX_IPUV3_CORE=m
 CONFIG_DRM_IMX_IPUV3=m
 # CONFIG_DRM_IMX_LDB is not set
diff --git a/kernel.spec b/kernel.spec
index d1ea97d..19e9e4e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -675,7 +675,6 @@ Patch15000: nowatchdog-on-virt.patch
 # lpae
 Patch21001: arm-lpae-ax88796.patch
 Patch21004: arm-sound-soc-samsung-dma-avoid-another-64bit-division.patch
-Patch21005: arm-exynos-mp.patch
 
 # ARM omap
 Patch21010: arm-omap-load-tfp410.patch
@@ -683,6 +682,10 @@ Patch21010: arm-omap-load-tfp410.patch
 # ARM tegra
 Patch21020: arm-tegra-usb-no-reset-linux33.patch
 
+# ARM i.MX6
+# http://www.spinics.net/lists/devicetree/msg08276.html
+Patch21030: arm-imx6-utilite.patch
+
 #rhbz 754518
 Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
 
@@ -1280,9 +1283,9 @@ ApplyOptionalPatch upstream-reverts.patch -R
 #
 ApplyPatch arm-lpae-ax88796.patch
 ApplyPatch arm-sound-soc-samsung-dma-avoid-another-64bit-division.patch
-#pplyPatch arm-exynos-mp.patch
 ApplyPatch arm-omap-load-tfp410.patch
 ApplyPatch arm-tegra-usb-no-reset-linux33.patch
+ApplyPatch arm-imx6-utilite.patch
 
 #
 # bugfixes to drivers and filesystems
@@ -2235,6 +2238,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Thu Oct 24 2013 Peter Robinson <pbrobinson at fedoraproject.org>
+- Add patch for i.MX6 Utilite device dtb
+
 * Thu Oct 24 2013 Josh Boyer <jwboyer at fedoraproject.org> - 3.12.0-0.rc6.git3.1
 - Linux v3.12-rc6-284-ge6036c0