From d1d2e3ed15addbd68f4070bf04460438f3a5b6c4 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 8 Sep 2014 18:28:23 +0200
Subject: update glibc to latest stable

---
 target/config/Config.in.libc.choice  |  5 +++++
 target/config/Config.in.libc.default |  2 +-
 toolchain/glibc/Makefile.inc         | 11 +++++++++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/target/config/Config.in.libc.choice b/target/config/Config.in.libc.choice
index 609ab5cdb..31a626664 100644
--- a/target/config/Config.in.libc.choice
+++ b/target/config/Config.in.libc.choice
@@ -72,6 +72,11 @@ config ADK_TARGET_LIB_UCLIBC_NG_GIT
 	select ADK_DISABLE_CHECKSUM
 	depends on ADK_TARGET_LIB_UCLIBC_NG
 
+config ADK_TARGET_LIB_GLIBC_2_20
+	prompt "2.20"
+	boolean
+	depends on ADK_TARGET_LIB_GLIBC
+
 config ADK_TARGET_LIB_GLIBC_2_19
 	prompt "2.19"
 	boolean
diff --git a/target/config/Config.in.libc.default b/target/config/Config.in.libc.default
index f0daedd2d..04c6b4204 100644
--- a/target/config/Config.in.libc.default
+++ b/target/config/Config.in.libc.default
@@ -24,7 +24,7 @@ config ADK_LIBC_VERSION
 	string
 	default "1.1.4" if ADK_TARGET_LIB_MUSL_1_1_4
 	default "0.9.33.2" if ADK_TARGET_LIB_UCLIBC_0_9_33_2
-	default "2.19" if ADK_TARGET_LIB_GLIBC_2_19
+	default "2.20" if ADK_TARGET_LIB_GLIBC_2_20
 	default "git" if ADK_TARGET_LIB_UCLIBC_NG_GIT || \
 		         ADK_TARGET_LIB_UCLIBC_GIT || \
 		         ADK_TARGET_LIB_MUSL_GIT || \
diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc
index 5b0677c9b..68607e954 100644
--- a/toolchain/glibc/Makefile.inc
+++ b/toolchain/glibc/Makefile.inc
@@ -5,12 +5,19 @@ PKG_NAME:=		glibc
 ifeq ($(ADK_LIBC_VERSION),git)
 PKG_VERSION:=		2.19.90
 PKG_REPO:=		git://sourceware.org/git/glibc.git
-else
-PKG_VERSION:=		$(ADK_LIBC_VERSION)
+endif
+ifeq ($(ADK_TARGET_LIB_GLIBC_2_20),y)
+PKG_VERSION:=		2.20
 PKG_SITES:=		${MASTER_SITE_GNU:=glibc/}
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		948a6e06419a01bd51e97206861595b0
 endif
+ifeq ($(ADK_TARGET_LIB_GLIBC_2_19),y)
+PKG_VERSION:=		2.19
+PKG_SITES:=		${MASTER_SITE_GNU:=glibc/}
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		e26b8cc666b162f999404b03970f14e4
+endif
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.xz
 GLIBC_CONFOPTS:=	--build=$(GNU_HOST_NAME) \
 			--host=$(GNU_TARGET_NAME) \
-- 
cgit v1.2.3


From 685789d32423ad15dcb901353b2e268e83cd1e9d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 6 Aug 2014 21:34:29 +0200
Subject: allow to configure page size for mips64

---
 target/linux/config/Config.in.kernel | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index 3f2541a7c..fee170b73 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -104,13 +104,6 @@ config ADK_KERNEL_CPU_MIPS64_R1
 config ADK_KERNEL_CPU_MIPS64_R2
 	boolean
 
-# page size
-config ADK_KERNEL_PAGE_SIZE_4KB
-	boolean
-
-config ADK_KERNEL_PAGE_SIZE_16KB
-	boolean
-
 # ARM specific
 config ADK_KERNEL_AEABI
 	boolean
@@ -212,4 +205,22 @@ config ADK_KERNEL_CC_OPTIMIZE_FOR_SIZE
 	depends on !ADK_LINUX_MICROBLAZE
 	default y
 
+choice
+prompt "Page size"
+depends on ADK_LINUX_MIPS64
+
+config ADK_KERNEL_PAGE_SIZE_4KB
+	prompt "4kB"
+	boolean
+
+config ADK_KERNEL_PAGE_SIZE_16KB
+	prompt "16kB"
+	boolean
+
+config ADK_KERNEL_PAGE_SIZE_64KB
+	prompt "64kB"
+	boolean
+
+endchoice
+
 endmenu
-- 
cgit v1.2.3


From 02a125c1a2fcd9068752800d370d84cc9a9fad7f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 8 Sep 2014 18:49:22 +0200
Subject: set default page size for lemote

---
 target/linux/config/Config.in.kernel | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index fee170b73..461605efd 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -208,6 +208,8 @@ config ADK_KERNEL_CC_OPTIMIZE_FOR_SIZE
 choice
 prompt "Page size"
 depends on ADK_LINUX_MIPS64
+default ADK_KERNEL_PAGE_SIZE_16KB if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+default ADK_KERNEL_PAGE_SIZE_4KB
 
 config ADK_KERNEL_PAGE_SIZE_4KB
 	prompt "4kB"
@@ -222,5 +224,4 @@ config ADK_KERNEL_PAGE_SIZE_64KB
 	boolean
 
 endchoice
-
 endmenu
-- 
cgit v1.2.3


From e829d07cc582110e3a6c961c1475b204c1a8b8ca Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 9 Sep 2014 08:37:52 +0200
Subject: fix dev package

---
 package/uclibc-ng/Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/package/uclibc-ng/Makefile b/package/uclibc-ng/Makefile
index adf9140d4..e8a28d148 100644
--- a/package/uclibc-ng/Makefile
+++ b/package/uclibc-ng/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:=		embedded c library
 PKG_SECTION:=		base/libs
 PKG_OPTS:=		noremove nostaging noscripts
 PKG_VERSION:=		1.0.0-git
+PKG_VER:=		1.0.0
 
 PKG_SUBPKGS:=		UCLIBC_NG UCLIBC_NG_DEV UCLIBC_NG_TEST
 PKGSD_UCLIBC_NG_DEV:=	development files for uclibc-ng
@@ -67,7 +68,7 @@ uclibc-ng-dev-install:
 		$(KERNEL_MAKE_OPTS) \
 		INSTALL_HDR_PATH=$(IDIR_UCLIBC_NG_DEV)/usr \
 		headers_install
-	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_DIR)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION} \
+	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VER)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VER} \
 		PREFIX=$(IDIR_UCLIBC_NG_DEV)/ \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=$(IDIR_UCLIBC_NG_DEV)/ \
@@ -81,9 +82,9 @@ uclibc-ng-test-install:
 	${INSTALL_DIR} ${IDIR_UCLIBC_NG_TEST}/etc
 	echo '00:11:22:33:44:55 teeth' > ${IDIR_UCLIBC_NG_TEST}/etc/ethers
 	${INSTALL_DIR} ${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng
-	${CP} $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION}/test \
+	${CP} $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VER)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VER}/test \
 		${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng
-	${CP} $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION}/{Rules.mak,.config} \
+	${CP} $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VER)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VER}/{Rules.mak,.config} \
 		${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng
 	@find ${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng -name \*.o -exec rm {} \;
 
-- 
cgit v1.2.3


From 6a5fadd91a8c551bf02b05e269f9e2415e0e6737 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 9 Sep 2014 10:24:28 +0200
Subject: sync patch with upstream

---
 .../solidrun-imx6/patches/3.14.17/solidrun.patch   | 11202 +++++++++++++------
 1 file changed, 8063 insertions(+), 3139 deletions(-)

diff --git a/target/arm/solidrun-imx6/patches/3.14.17/solidrun.patch b/target/arm/solidrun-imx6/patches/3.14.17/solidrun.patch
index ac5ee0237..f1851a7b3 100644
--- a/target/arm/solidrun-imx6/patches/3.14.17/solidrun.patch
+++ b/target/arm/solidrun-imx6/patches/3.14.17/solidrun.patch
@@ -1,6 +1,6 @@
-diff -Nur linux-3.14.15/arch/arm/boot/dts/clcd-panels.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/clcd-panels.dtsi
---- linux-3.14.15/arch/arm/boot/dts/clcd-panels.dtsi	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/clcd-panels.dtsi	2014-08-20 19:23:45.534811583 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/clcd-panels.dtsi linux-imx6-3.14/arch/arm/boot/dts/clcd-panels.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/clcd-panels.dtsi	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/clcd-panels.dtsi	2014-09-09 10:13:47.196940658 +0200
 @@ -0,0 +1,52 @@
 +/*
 + * ARM Ltd. Versatile Express
@@ -54,9 +54,20 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/clcd-panels.dtsi linux-linaro-stable-m
 +		};
 +	};
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/efm32gg-dk3750.dts linux-linaro-stable-mx6/arch/arm/boot/dts/efm32gg-dk3750.dts
---- linux-3.14.15/arch/arm/boot/dts/efm32gg-dk3750.dts	2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/efm32gg-dk3750.dts	2014-08-20 19:31:39.860842101 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/dra7-evm.dts linux-imx6-3.14/arch/arm/boot/dts/dra7-evm.dts
+--- linux-3.14.17/arch/arm/boot/dts/dra7-evm.dts	2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/dra7-evm.dts	2014-09-09 10:13:47.196940658 +0200
+@@ -182,7 +182,6 @@
+ 					regulator-name = "ldo3";
+ 					regulator-min-microvolt = <1800000>;
+ 					regulator-max-microvolt = <1800000>;
+-					regulator-always-on;
+ 					regulator-boot-on;
+ 				};
+ 
+diff -Nur linux-3.14.17/arch/arm/boot/dts/efm32gg-dk3750.dts linux-imx6-3.14/arch/arm/boot/dts/efm32gg-dk3750.dts
+--- linux-3.14.17/arch/arm/boot/dts/efm32gg-dk3750.dts	2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/efm32gg-dk3750.dts	2014-09-09 10:13:47.208940757 +0200
 @@ -26,7 +26,7 @@
  		};
  
@@ -66,9 +77,21 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/efm32gg-dk3750.dts linux-linaro-stable
  			status = "ok";
  
  			temp@48 {
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx23.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx23.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx23.dtsi	2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx23.dtsi	2014-08-20 19:31:39.884842204 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/hi3620.dtsi linux-imx6-3.14/arch/arm/boot/dts/hi3620.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/hi3620.dtsi	2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/hi3620.dtsi	2014-09-09 10:13:47.216940821 +0200
+@@ -73,7 +73,7 @@
+ 
+ 		L2: l2-cache {
+ 			compatible = "arm,pl310-cache";
+-			reg = <0x100000 0x100000>;
++			reg = <0xfc10000 0x100000>;
+ 			interrupts = <0 15 4>;
+ 			cache-unified;
+ 			cache-level = <2>;
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx23.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx23.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx23.dtsi	2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx23.dtsi	2014-09-09 10:13:47.216940821 +0200
 @@ -363,7 +363,8 @@
  				compatible = "fsl,imx23-lcdif";
  				reg = <0x80030000 2000>;
@@ -79,9 +102,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx23.dtsi linux-linaro-stable-mx6/arc
  				status = "disabled";
  			};
  
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx25.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx25.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx25.dtsi	2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx25.dtsi	2014-08-20 19:31:39.888842222 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx25.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx25.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx25.dtsi	2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx25.dtsi	2014-09-09 10:13:47.220940854 +0200
 @@ -13,6 +13,7 @@
  
  / {
@@ -98,9 +121,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx25.dtsi linux-linaro-stable-mx6/arc
  			clock-frequency = <24000000>;
  		};
  	};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx25-karo-tx25.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx25-karo-tx25.dts
---- linux-3.14.15/arch/arm/boot/dts/imx25-karo-tx25.dts	2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx25-karo-tx25.dts	2014-08-20 19:31:39.884842204 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx25-karo-tx25.dts linux-imx6-3.14/arch/arm/boot/dts/imx25-karo-tx25.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx25-karo-tx25.dts	2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx25-karo-tx25.dts	2014-09-09 10:13:47.220940854 +0200
 @@ -16,6 +16,10 @@
  	model = "Ka-Ro TX25";
  	compatible = "karo,imx25-tx25", "fsl,imx25";
@@ -112,9 +135,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx25-karo-tx25.dts linux-linaro-stabl
  	memory {
  		reg = <0x80000000 0x02000000 0x90000000 0x02000000>;
  	};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx27-apf27.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx27-apf27.dts
---- linux-3.14.15/arch/arm/boot/dts/imx27-apf27.dts	2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx27-apf27.dts	2014-08-20 19:31:39.888842222 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx27-apf27.dts linux-imx6-3.14/arch/arm/boot/dts/imx27-apf27.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx27-apf27.dts	2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx27-apf27.dts	2014-09-09 10:13:47.220940854 +0200
 @@ -29,6 +29,7 @@
  
  		osc26m {
@@ -123,9 +146,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx27-apf27.dts linux-linaro-stable-mx
  			clock-frequency = <0>;
  		};
  	};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx27.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx27.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx27.dtsi	2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx27.dtsi	2014-08-20 19:31:39.892842237 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx27.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx27.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx27.dtsi	2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx27.dtsi	2014-09-09 10:13:47.220940854 +0200
 @@ -13,6 +13,7 @@
  
  / {
@@ -142,9 +165,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx27.dtsi linux-linaro-stable-mx6/arc
  			clock-frequency = <26000000>;
  		};
  	};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts
---- linux-3.14.15/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts	2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts	2014-08-20 19:31:39.888842222 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts linux-imx6-3.14/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts	2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts	2014-09-09 10:13:47.220940854 +0200
 @@ -15,6 +15,10 @@
  	model = "Phytec pca100 rapid development kit";
  	compatible = "phytec,imx27-pca100-rdk", "phytec,imx27-pca100", "fsl,imx27";
@@ -156,9 +179,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts linux-l
  	display: display {
  		model = "Primeview-PD050VL1";
  		native-mode = <&timing0>;
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx28.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx28.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx28.dtsi	2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx28.dtsi	2014-08-20 19:31:39.892842237 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx28.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx28.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx28.dtsi	2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx28.dtsi	2014-09-09 10:13:47.224940887 +0200
 @@ -840,7 +840,8 @@
  				compatible = "fsl,imx28-lcdif";
  				reg = <0x80030000 0x2000>;
@@ -169,9 +192,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx28.dtsi linux-linaro-stable-mx6/arc
  				dmas = <&dma_apbh 13>;
  				dma-names = "rx";
  				status = "disabled";
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx51-babbage.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx51-babbage.dts
---- linux-3.14.15/arch/arm/boot/dts/imx51-babbage.dts	2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx51-babbage.dts	2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx51-babbage.dts linux-imx6-3.14/arch/arm/boot/dts/imx51-babbage.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx51-babbage.dts	2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx51-babbage.dts	2014-09-09 10:13:47.224940887 +0200
 @@ -17,6 +17,10 @@
  	model = "Freescale i.MX51 Babbage Board";
  	compatible = "fsl,imx51-babbage", "fsl,imx51";
@@ -183,9 +206,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx51-babbage.dts linux-linaro-stable-
  	memory {
  		reg = <0x90000000 0x20000000>;
  	};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx51.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx51.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx51.dtsi	2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx51.dtsi	2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx51.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx51.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx51.dtsi	2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx51.dtsi	2014-09-09 10:13:47.224940887 +0200
 @@ -15,6 +15,7 @@
  
  / {
@@ -220,9 +243,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx51.dtsi linux-linaro-stable-mx6/arc
  			clock-frequency = <24000000>;
  		};
  	};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx53.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx53.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx53.dtsi	2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx53.dtsi	2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx53.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx53.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx53.dtsi	2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx53.dtsi	2014-09-09 10:13:47.224940887 +0200
 @@ -15,6 +15,7 @@
  
  / {
@@ -257,9 +280,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx53.dtsi linux-linaro-stable-mx6/arc
  			clock-frequency = <24000000>;
  		};
  	};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx53-mba53.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-mba53.dts
---- linux-3.14.15/arch/arm/boot/dts/imx53-mba53.dts	2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-mba53.dts	2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx53-mba53.dts linux-imx6-3.14/arch/arm/boot/dts/imx53-mba53.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx53-mba53.dts	2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx53-mba53.dts	2014-09-09 10:13:47.224940887 +0200
 @@ -25,6 +25,10 @@
  		enable-active-low;
  	};
@@ -271,9 +294,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx53-mba53.dts linux-linaro-stable-mx
  	backlight {
  		compatible = "pwm-backlight";
  		pwms = <&pwm2 0 50000>;
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts	2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts	2014-09-09 10:13:47.224940887 +0200
 @@ -0,0 +1,23 @@
 +/*
 + * Copyright 2013 Sascha Hauer <s.hauer@pengutronix.de>
@@ -298,9 +321,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts linux-linaro-
 +	model = "DFI FS700-M60-6DL i.MX6dl Q7 Board";
 +	compatible = "dfi,fs700-m60-6dl", "dfi,fs700e-m60", "fsl,imx6dl";
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6dl.dtsi	2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl.dtsi	2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6dl.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl.dtsi	2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl.dtsi	2014-09-09 10:13:47.228940921 +0200
 @@ -8,6 +8,7 @@
   *
   */
@@ -466,9 +489,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl.dtsi linux-linaro-stable-mx6/ar
  				status = "disabled";
  			};
  		};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-gw51xx.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-gw51xx.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6dl-gw51xx.dts	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-gw51xx.dts	2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-gw51xx.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw51xx.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl-gw51xx.dts	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw51xx.dts	2014-09-09 10:13:47.224940887 +0200
 @@ -0,0 +1,19 @@
 +/*
 + * Copyright 2013 Gateworks Corporation
@@ -489,9 +512,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-gw51xx.dts linux-linaro-stable-
 +	model = "Gateworks Ventana i.MX6 DualLite GW51XX";
 +	compatible = "gw,imx6dl-gw51xx", "gw,ventana", "fsl,imx6dl";
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-gw52xx.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-gw52xx.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6dl-gw52xx.dts	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-gw52xx.dts	2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-gw52xx.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw52xx.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl-gw52xx.dts	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw52xx.dts	2014-09-09 10:13:47.224940887 +0200
 @@ -0,0 +1,19 @@
 +/*
 + * Copyright 2013 Gateworks Corporation
@@ -512,9 +535,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-gw52xx.dts linux-linaro-stable-
 +	model = "Gateworks Ventana i.MX6 DualLite GW52XX";
 +	compatible = "gw,imx6dl-gw52xx", "gw,ventana", "fsl,imx6dl";
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-gw53xx.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-gw53xx.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6dl-gw53xx.dts	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-gw53xx.dts	2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-gw53xx.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw53xx.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl-gw53xx.dts	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw53xx.dts	2014-09-09 10:13:47.224940887 +0200
 @@ -0,0 +1,19 @@
 +/*
 + * Copyright 2013 Gateworks Corporation
@@ -535,9 +558,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-gw53xx.dts linux-linaro-stable-
 +	model = "Gateworks Ventana i.MX6 DualLite GW53XX";
 +	compatible = "gw,imx6dl-gw53xx", "gw,ventana", "fsl,imx6dl";
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-gw54xx.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-gw54xx.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6dl-gw54xx.dts	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-gw54xx.dts	2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-gw54xx.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw54xx.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl-gw54xx.dts	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw54xx.dts	2014-09-09 10:13:47.224940887 +0200
 @@ -0,0 +1,19 @@
 +/*
 + * Copyright 2013 Gateworks Corporation
@@ -558,9 +581,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-gw54xx.dts linux-linaro-stable-
 +	model = "Gateworks Ventana i.MX6 DualLite GW54XX";
 +	compatible = "gw,imx6dl-gw54xx", "gw,ventana", "fsl,imx6dl";
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-hummingboard.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-hummingboard.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6dl-hummingboard.dts	2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-hummingboard.dts	2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-hummingboard.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-hummingboard.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl-hummingboard.dts	2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-hummingboard.dts	2014-09-09 10:13:47.224940887 +0200
 @@ -1,163 +1,13 @@
  /*
 - * Copyright (C) 2013,2014 Russell King
@@ -730,9 +753,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-hummingboard.dts linux-linaro-s
 +	model = "SolidRun HummingBoard Solo/DualLite";
 +	compatible = "solidrun,hummingboard/dl", "fsl,imx6dl";
  };
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-nitrogen6x.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-nitrogen6x.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6dl-nitrogen6x.dts	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-nitrogen6x.dts	2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-nitrogen6x.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-nitrogen6x.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl-nitrogen6x.dts	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-nitrogen6x.dts	2014-09-09 10:13:47.224940887 +0200
 @@ -0,0 +1,21 @@
 +/*
 + * Copyright 2013 Boundary Devices, Inc.
@@ -755,9 +778,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-nitrogen6x.dts linux-linaro-sta
 +	model = "Freescale i.MX6 DualLite Nitrogen6x Board";
 +	compatible = "fsl,imx6dl-nitrogen6x", "fsl,imx6dl";
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts	2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts	2014-09-09 10:13:47.224940887 +0200
 @@ -0,0 +1,19 @@
 +/*
 + * Copyright 2013 Christian Hemp, Phytec Messtechnik GmbH
@@ -778,9 +801,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts linux-linaro-
 +	model = "Phytec phyFLEX-i.MX6 DualLite/Solo Carrier-Board";
 +	compatible = "phytec,imx6dl-pbab01", "phytec,imx6dl-pfla02", "fsl,imx6dl";
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi	2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi	2014-09-09 10:13:47.224940887 +0200
 @@ -0,0 +1,22 @@
 +/*
 + * Copyright 2013 Christian Hemp, Phytec Messtechnik GmbH
@@ -804,9 +827,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi linux-linaro
 +		reg = <0x10000000 0x20000000>;
 +	};
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-pinfunc.h linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-pinfunc.h
---- linux-3.14.15/arch/arm/boot/dts/imx6dl-pinfunc.h	2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-pinfunc.h	2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-pinfunc.h linux-imx6-3.14/arch/arm/boot/dts/imx6dl-pinfunc.h
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl-pinfunc.h	2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-pinfunc.h	2014-09-09 10:13:47.224940887 +0200
 @@ -755,6 +755,7 @@
  #define MX6QDL_PAD_GPIO_5__I2C3_SCL                 0x230 0x600 0x878 0x6 0x2
  #define MX6QDL_PAD_GPIO_5__ARM_EVENTI               0x230 0x600 0x000 0x7 0x0
@@ -823,9 +846,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-pinfunc.h linux-linaro-stable-m
  #define MX6QDL_PAD_SD1_CLK__GPT_CLKIN               0x2dc 0x6c4 0x000 0x3 0x0
  #define MX6QDL_PAD_SD1_CLK__GPIO1_IO20              0x2dc 0x6c4 0x000 0x5 0x0
  #define MX6QDL_PAD_SD1_CMD__SD1_CMD                 0x2e0 0x6c8 0x000 0x0 0x0
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-sabreauto.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabreauto.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6dl-sabreauto.dts	2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabreauto.dts	2014-08-20 19:23:45.542811617 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-sabreauto.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-sabreauto.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl-sabreauto.dts	2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-sabreauto.dts	2014-09-09 10:13:47.224940887 +0200
 @@ -15,3 +15,16 @@
  	model = "Freescale i.MX6 DualLite/Solo SABRE Automotive Board";
  	compatible = "fsl,imx6dl-sabreauto", "fsl,imx6dl";
@@ -843,9 +866,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-sabreauto.dts linux-linaro-stab
 +&mxcfb2 {
 +	status = "okay";
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-sabrelite.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabrelite.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6dl-sabrelite.dts	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabrelite.dts	2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-sabrelite.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-sabrelite.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl-sabrelite.dts	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-sabrelite.dts	2014-09-09 10:13:47.224940887 +0200
 @@ -0,0 +1,20 @@
 +/*
 + * Copyright 2011 Freescale Semiconductor, Inc.
@@ -867,9 +890,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-sabrelite.dts linux-linaro-stab
 +	model = "Freescale i.MX6 DualLite SABRE Lite Board";
 +	compatible = "fsl,imx6dl-sabrelite", "fsl,imx6dl";
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-sabresd.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabresd.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6dl-sabresd.dts	2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabresd.dts	2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-sabresd.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-sabresd.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl-sabresd.dts	2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-sabresd.dts	2014-09-09 10:13:47.224940887 +0200
 @@ -15,3 +15,20 @@
  	model = "Freescale i.MX6 DualLite SABRE Smart Device Board";
  	compatible = "fsl,imx6dl-sabresd", "fsl,imx6dl";
@@ -891,9 +914,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-sabresd.dts linux-linaro-stable
 +&mxcfb2 {
 +	status = "okay";
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts	2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts	2014-09-09 10:13:47.224940887 +0200
 @@ -0,0 +1,19 @@
 +/*
 + * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -914,9 +937,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts linux-linaro-s
 +&i2c2 {
 +	status = "disable";
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-arm2.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-arm2.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-arm2.dts	2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-arm2.dts	2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-arm2.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-arm2.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-arm2.dts	2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-arm2.dts	2014-09-09 10:13:47.228940921 +0200
 @@ -23,14 +23,27 @@
  
  	regulators {
@@ -1127,9 +1150,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-arm2.dts linux-linaro-stable-mx6
 +	pinctrl-0 = <&pinctrl_uart4>;
  	status = "okay";
  };
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-arm2-hsic.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-arm2-hsic.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-arm2-hsic.dts	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-arm2-hsic.dts	2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-arm2-hsic.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-arm2-hsic.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-arm2-hsic.dts	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-arm2-hsic.dts	2014-09-09 10:13:47.228940921 +0200
 @@ -0,0 +1,32 @@
 +/*
 + * Copyright 2013 Freescale Semiconductor, Inc.
@@ -1163,9 +1186,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-arm2-hsic.dts linux-linaro-stabl
 +	osc-clkgate-delay = <0x3>;
 +	status = "okay";
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-cm-fx6.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-cm-fx6.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-cm-fx6.dts	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-cm-fx6.dts	2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-cm-fx6.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-cm-fx6.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-cm-fx6.dts	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-cm-fx6.dts	2014-09-09 10:13:47.228940921 +0200
 @@ -0,0 +1,107 @@
 +/*
 + * Copyright 2013 CompuLab Ltd.
@@ -1274,9 +1297,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-cm-fx6.dts linux-linaro-stable-m
 +	pinctrl-0 = <&pinctrl_uart4>;
 +	status = "okay";
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-cubox-i.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-cubox-i.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-cubox-i.dts	2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-cubox-i.dts	2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-cubox-i.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-cubox-i.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-cubox-i.dts	2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-cubox-i.dts	2014-09-09 10:13:47.228940921 +0200
 @@ -13,4 +13,8 @@
  
  &sata {
@@ -1286,9 +1309,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-cubox-i.dts linux-linaro-stable-
 +	fsl,transmit-atten-16ths = <9>;
 +	fsl,no-spread-spectrum;
  };
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts	2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts	2014-09-09 10:13:47.228940921 +0200
 @@ -0,0 +1,23 @@
 +/*
 + * Copyright 2013 Sascha Hauer <s.hauer@pengutronix.de>
@@ -1313,13 +1336,17 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts linux-linaro-s
 +	model = "DFI FS700-M60-6QD i.MX6qd Q7 Board";
 +	compatible = "dfi,fs700-m60-6qd", "dfi,fs700e-m60", "fsl,imx6q";
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi	2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi	2014-08-20 19:31:39.900842271 +0200
-@@ -5,6 +5,10 @@
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi	2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi	2014-09-09 10:13:47.228940921 +0200
+@@ -5,11 +5,33 @@
  #include "imx6qdl-microsom-ar8035.dtsi"
  
  / {
++	chosen {
++		bootargs = "quiet console=ttymxc0,115200 root=/dev/mmcblk0p2 rw";
++	};
++
 +	aliases {
 +                mxcfb0 = &mxcfb1;
 +	};
@@ -1327,10 +1354,11 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-linaro-stab
  	ir_recv: ir-receiver {
  		compatible = "gpio-ir-receiver";
  		gpios = <&gpio3 9 1>;
-@@ -12,6 +16,19 @@
+ 		pinctrl-names = "default";
  		pinctrl-0 = <&pinctrl_cubox_i_ir>;
- 	};
- 
++		linux,rc-map-name = "rc-rc6-mce";
++	};
++
 +	pwmleds {
 +		compatible = "pwm-leds";
 +		pinctrl-names = "default";
@@ -1342,12 +1370,10 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-linaro-stab
 +			max-brightness = <248>;
 +			pwms = <&pwm1 0 50000>;
 +		};
-+	};
-+
- 	regulators {
- 		compatible = "simple-bus";
+ 	};
  
-@@ -49,10 +66,62 @@
+ 	regulators {
+@@ -49,10 +71,62 @@
  	sound-spdif {
  		compatible = "fsl,imx-audio-spdif";
  		model = "imx-spdif";
@@ -1411,7 +1437,7 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-linaro-stab
  };
  
  &i2c3 {
-@@ -69,6 +138,19 @@
+@@ -69,6 +143,19 @@
  
  &iomuxc {
  	cubox_i {
@@ -1431,7 +1457,7 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-linaro-stab
  		pinctrl_cubox_i_i2c3: cubox-i-i2c3 {
  			fsl,pins = <
  				MX6QDL_PAD_EIM_D17__I2C3_SCL 0x4001b8b1
-@@ -82,16 +164,35 @@
+@@ -82,16 +169,35 @@
  			>;
  		};
  
@@ -1469,7 +1495,7 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-linaro-stab
  		};
  
  		pinctrl_cubox_i_usdhc2_aux: cubox-i-usdhc2-aux {
-@@ -111,29 +212,76 @@
+@@ -111,29 +217,76 @@
  				MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x13059
  			>;
  		};
@@ -1547,9 +1573,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-linaro-stab
 +        fsl,cpu_pdnscr_iso2sw = <0x1>;
 +        fsl,cpu_pdnscr_iso = <0x1>;
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi	2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi	2014-09-09 10:13:47.228940921 +0200
 @@ -0,0 +1,199 @@
 +/ {
 +	regulators {
@@ -1750,9 +1776,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi linux-linar
 +	non-removable;
 +	status = "okay";
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl.dtsi	2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl.dtsi	2014-08-20 19:31:39.904842290 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl.dtsi	2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl.dtsi	2014-09-09 10:13:47.228940921 +0200
 @@ -10,10 +10,16 @@
   * http://www.gnu.org/copyleft/gpl.html
   */
@@ -1869,16 +1895,16 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl.dtsi linux-linaro-stable-mx6/a
 -			interrupts = <0 123 0x04>;
 -			clocks = <&clks 189>, <&clks 187>, <&clks 206>, <&clks 144>;
 -			clock-names = "pcie_ref_125m", "sata_ref_100m", "lvds_gate", "pcie_axi";
-+			interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
-+			interrupt-names = "msi";
++			interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>;
++			interrupt-names = "pme";
 +			#interrupt-cells = <1>;
 +			interrupt-map-mask = <0 0 0 0x7>;
 +			interrupt-map = <0 0 0 1 &intc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
 +			                <0 0 0 2 &intc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
 +			                <0 0 0 3 &intc GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
 +			                <0 0 0 4 &intc GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&clks 144>, <&clks 206>, <&clks 189>, <&clks 221>;
-+			clock-names = "pcie", "pcie_bus", "pcie_phy", "lvds_gate";
++			clocks = <&clks 144>, <&clks 221>, <&clks 189>, <&clks 187>;
++			clock-names = "pcie_axi", "lvds_gate", "pcie_ref_125m", "sata_ref_100m";
  			status = "disabled";
  		};
  
@@ -3444,9 +3470,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl.dtsi linux-linaro-stable-mx6/a
  		};
  	};
  };
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi	2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi	2014-09-09 10:13:47.228940921 +0200
 @@ -0,0 +1,374 @@
 +/*
 + * Copyright 2013 Gateworks Corporation
@@ -3822,9 +3848,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi linux-linaro-stabl
 +&usbh1 {
 +	status = "okay";
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi	2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi	2014-09-09 10:13:47.228940921 +0200
 @@ -0,0 +1,527 @@
 +/*
 + * Copyright 2013 Gateworks Corporation
@@ -4353,9 +4379,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi linux-linaro-stabl
 +	vmmc-supply = <&reg_3p3v>;
 +	status = "okay";
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi	2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi	2014-09-09 10:13:47.228940921 +0200
 @@ -0,0 +1,572 @@
 +/*
 + * Copyright 2013 Gateworks Corporation
@@ -4929,9 +4955,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi linux-linaro-stabl
 +	vmmc-supply = <&reg_3p3v>;
 +	status = "okay";
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi	2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi	2014-09-09 10:13:47.228940921 +0200
 @@ -0,0 +1,599 @@
 +/*
 + * Copyright 2013 Gateworks Corporation
@@ -5532,10 +5558,10 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi linux-linaro-stabl
 +	vmmc-supply = <&reg_3p3v>;
 +	status = "okay";
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi	2014-08-20 19:31:39.900842271 +0200
-@@ -0,0 +1,315 @@
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi	2014-09-09 10:13:47.228940921 +0200
+@@ -0,0 +1,339 @@
 +/*
 + * Copyright (C) 2013,2014 Russell King
 + */
@@ -5543,15 +5569,20 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi linux-linaro
 +#include "imx6qdl-microsom-ar8035.dtsi"
 +
 +/ {
++	chosen {
++		bootargs = "quiet console=ttymxc0,115200 root=/dev/mmcblk0p2 rw";
++	};
++
 +	aliases {
 +		mxcfb0 = &mxcfb1;
 +	};
 +
 +	ir_recv: ir-receiver {
 +		compatible = "gpio-ir-receiver";
-+		gpios = <&gpio1 2 1>;
++		gpios = <&gpio3 5 1>;
 +		pinctrl-names = "default";
-+		pinctrl-0 = <&pinctrl_hummingboard_gpio1_2>;
++		pinctrl-0 = <&pinctrl_hummingboard_gpio3_5>;
++		linux,rc-map-name = "rc-rc6-mce";
 +	};
 +
 +	regulators {
@@ -5671,6 +5702,7 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi linux-linaro
 +};
 +
 +&i2c1 {
++	clock-frequency = <100000>;
 +	pinctrl-names = "default";
 +	pinctrl-0 = <&pinctrl_hummingboard_i2c1>;
 +	status = "okay";
@@ -5704,29 +5736,32 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi linux-linaro
 +				 * numbering as following -
 +				 * GPIO number | GPIO (bank,num) |  PIN number
 +				 * ------------+-----------------+------------
-+				 * gpio1       | (1,1)	   | IO7
-+				 * gpio73      | (3,9)	   | IO11
-+				 * gpio72      | (3,8)	   | IO12
-+				 * gpio71      | (3,7)	   | IO13
-+				 * gpio70      | (3,6)	   | IO15
-+				 * gpio194     | (7,2)	   | IO16
-+				 * gpio195     | (7,3)	   | IO18
-+				 * gpio67      | (3,3)	   | IO22
++				 * gpio1       | (1,1)           | IO7
++				 * gpio73      | (3,9)           | IO11
++				 * gpio72      | (3,8)           | IO12
++				 * gpio71      | (3,7)           | IO13
++				 * gpio70      | (3,6)           | IO15
++				 * gpio194     | (7,2)           | IO16
++				 * gpio195     | (7,3)           | IO18
++				 * gpio67      | (3,3)           | IO22
++				 *
++				 * Notice the gpioX and GPIO (Y,Z) mapping forumla :
++				 * X = (Y-1) * 32 + Z
 +				 */
-+				MX6QDL_PAD_GPIO_1__GPIO1_IO01 0x8001b0b1
-+				MX6QDL_PAD_EIM_DA9__GPIO3_IO09 0x8001b0b1
-+				MX6QDL_PAD_EIM_DA8__GPIO3_IO08 0x8001b0b1
-+				MX6QDL_PAD_EIM_DA7__GPIO3_IO07 0x8001b0b1
-+				MX6QDL_PAD_EIM_DA6__GPIO3_IO06 0x8001b0b1
-+				MX6QDL_PAD_SD3_CMD__GPIO7_IO02 0x8001b0b1
-+				MX6QDL_PAD_SD3_CLK__GPIO7_IO03 0x8001b0b1
-+				MX6QDL_PAD_EIM_DA3__GPIO3_IO03 0x8001b0b1
++				MX6QDL_PAD_GPIO_1__GPIO1_IO01 0x400130b1
++				MX6QDL_PAD_EIM_DA9__GPIO3_IO09 0x400130b1
++				MX6QDL_PAD_EIM_DA8__GPIO3_IO08 0x400130b1
++				MX6QDL_PAD_EIM_DA7__GPIO3_IO07 0x400130b1
++				MX6QDL_PAD_EIM_DA6__GPIO3_IO06 0x400130b1
++				MX6QDL_PAD_SD3_CMD__GPIO7_IO02 0x400130b1
++				MX6QDL_PAD_SD3_CLK__GPIO7_IO03 0x400130b1
++				MX6QDL_PAD_EIM_DA3__GPIO3_IO03 0x400130b1
 +			>;
 +		};
 +
-+		pinctrl_hummingboard_gpio1_2: hummingboard-gpio1_2 {
++		pinctrl_hummingboard_gpio3_5: hummingboard-gpio3_5 {
 +			fsl,pins = <
-+				MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000
++				MX6QDL_PAD_EIM_DA5__GPIO3_IO05 0x80000000
 +			>;
 +		};
 +
@@ -5796,6 +5831,12 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi linux-linaro
 +				MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x13059
 +			>;
 +		};
++
++		pinctrl_hummingboard_pcie_reset: hummingboard-pcie-reset {
++			fsl,pins = <
++				MX6QDL_PAD_EIM_DA4__GPIO3_IO04 0x80000000
++			>;
++		};
 +	};
 +};
 +
@@ -5851,9 +5892,18 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi linux-linaro
 +	fsl,cpu_pdnscr_iso2sw = <0x1>;
 +	fsl,cpu_pdnscr_iso = <0x1>;
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi	2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi	2014-08-20 19:31:39.900842271 +0200
++
++&pcie {
++	pinctrl-names = "default";
++	pinctrl-0 = <
++		&pinctrl_hummingboard_pcie_reset
++	>;
++	reset-gpio = <&gpio3 4 0>;
++	status = "okay";
++};
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi	2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi	2014-09-09 10:13:47.228940921 +0200
 @@ -17,7 +17,7 @@
  	enet {
  		pinctrl_microsom_enet_ar8035: microsom-enet-ar8035 {
@@ -5900,9 +5950,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi linux-lin
  
  				/*
  				 * As the RMII pins are also connected to RGMII
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-microsom.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-microsom.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-microsom.dtsi	2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-microsom.dtsi	2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-microsom.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-microsom.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-microsom.dtsi	2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-microsom.dtsi	2014-09-09 10:13:47.228940921 +0200
 @@ -1,9 +1,69 @@
  /*
   * Copyright (C) 2013,2014 Russell King
@@ -6030,9 +6080,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-microsom.dtsi linux-linaro-sta
 +	status = "okay";
  };
 +
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi	2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi	2014-09-09 10:13:47.228940921 +0200
 @@ -0,0 +1,426 @@
 +/*
 + * Copyright 2013 Boundary Devices, Inc.
@@ -6460,9 +6510,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi linux-linaro-s
 +	vmmc-supply = <&reg_3p3v>;
 +	status = "okay";
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi	2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi	2014-09-09 10:13:47.228940921 +0200
 @@ -0,0 +1,98 @@
 +/*
 + * Copyright 2013 Christian Hemp, Phytec Messtechnik GmbH
@@ -6562,9 +6612,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi linux-linar
 +		>;
 +	};
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi	2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi	2014-09-09 10:13:47.228940921 +0200
 @@ -0,0 +1,356 @@
 +/*
 + * Copyright 2013 Christian Hemp, Phytec Messtechnik GmbH
@@ -6922,9 +6972,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi linux-linar
 +        wp-gpios = <&gpio1 29 0>;
 +        status = "disabled";
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi	2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi	2014-08-20 19:31:39.904842290 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi	2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi	2014-09-09 10:13:47.228940921 +0200
 @@ -10,17 +10,146 @@
   * http://www.gnu.org/copyleft/gpl.html
   */
@@ -7623,9 +7673,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi linux-linaro-st
 +	fsl,cpu_pdnscr_iso2sw = <0x1>;
 +	fsl,cpu_pdnscr_iso = <0x1>;
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi	2014-08-20 19:31:39.904842290 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi	2014-09-09 10:13:47.228940921 +0200
 @@ -0,0 +1,427 @@
 +/*
 + * Copyright 2011 Freescale Semiconductor, Inc.
@@ -8054,9 +8104,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi linux-linaro-st
 +	vmmc-supply = <&reg_3p3v>;
 +	status = "okay";
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-sabresd.dtsi	2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-sabresd.dtsi	2014-08-20 19:31:39.904842290 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-sabresd.dtsi	2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-sabresd.dtsi	2014-09-09 10:13:47.228940921 +0200
 @@ -10,16 +10,33 @@
   * http://www.gnu.org/copyleft/gpl.html
   */
@@ -8749,9 +8799,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-linaro-stab
 +	fsl,cpu_pdnscr_iso2sw = <0x1>;
 +	fsl,cpu_pdnscr_iso = <0x1>;
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-wandboard.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-wandboard.dtsi	2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-wandboard.dtsi	2014-08-20 19:31:39.904842290 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-wandboard.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-wandboard.dtsi	2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-wandboard.dtsi	2014-09-09 10:13:47.228940921 +0200
 @@ -12,17 +12,21 @@
  / {
  	regulators {
@@ -8976,9 +9026,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-wandboard.dtsi linux-linaro-st
  	cd-gpios = <&gpio3 9 0>;
  	status = "okay";
  };
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts	2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts	2014-09-09 10:13:47.228940921 +0200
 @@ -0,0 +1,432 @@
 +/*
 + * Copyright 2013 Data Modul AG
@@ -9412,9 +9462,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts linux-linaro-sta
 +	bus-width = <8>;
 +	status = "okay";
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6q.dtsi	2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q.dtsi	2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6q.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6q.dtsi	2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q.dtsi	2014-09-09 10:13:47.228940921 +0200
 @@ -8,10 +8,16 @@
   *
   */
@@ -9611,9 +9661,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q.dtsi linux-linaro-stable-mx6/arc
 -		crtcs = <&ipu1 0>, <&ipu1 1>, <&ipu2 0>, <&ipu2 1>;
 -	};
 -};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-gk802.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gk802.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-gk802.dts	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gk802.dts	2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-gk802.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-gk802.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-gk802.dts	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-gk802.dts	2014-09-09 10:13:47.228940921 +0200
 @@ -0,0 +1,229 @@
 +/*
 + * Copyright (C) 2013 Philipp Zabel
@@ -9844,9 +9894,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-gk802.dts linux-linaro-stable-mx
 +	vmmc-supply = <&reg_3p3v>;
 +	status = "okay";
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-gw51xx.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw51xx.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-gw51xx.dts	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw51xx.dts	2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-gw51xx.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw51xx.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-gw51xx.dts	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw51xx.dts	2014-09-09 10:13:47.228940921 +0200
 @@ -0,0 +1,19 @@
 +/*
 + * Copyright 2013 Gateworks Corporation
@@ -9867,9 +9917,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-gw51xx.dts linux-linaro-stable-m
 +	model = "Gateworks Ventana i.MX6 Quad GW51XX";
 +	compatible = "gw,imx6q-gw51xx", "gw,ventana", "fsl,imx6q";
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-gw52xx.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw52xx.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-gw52xx.dts	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw52xx.dts	2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-gw52xx.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw52xx.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-gw52xx.dts	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw52xx.dts	2014-09-09 10:13:47.228940921 +0200
 @@ -0,0 +1,23 @@
 +/*
 + * Copyright 2013 Gateworks Corporation
@@ -9894,9 +9944,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-gw52xx.dts linux-linaro-stable-m
 +&sata {
 +	status = "okay";
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-gw53xx.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw53xx.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-gw53xx.dts	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw53xx.dts	2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-gw53xx.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw53xx.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-gw53xx.dts	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw53xx.dts	2014-09-09 10:13:47.228940921 +0200
 @@ -0,0 +1,23 @@
 +/*
 + * Copyright 2013 Gateworks Corporation
@@ -9921,9 +9971,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-gw53xx.dts linux-linaro-stable-m
 +&sata {
 +	status = "okay";
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-gw5400-a.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw5400-a.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-gw5400-a.dts	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw5400-a.dts	2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-gw5400-a.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw5400-a.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-gw5400-a.dts	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw5400-a.dts	2014-09-09 10:13:47.228940921 +0200
 @@ -0,0 +1,543 @@
 +/*
 + * Copyright 2013 Gateworks Corporation
@@ -10468,9 +10518,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-gw5400-a.dts linux-linaro-stable
 +	vmmc-supply = <&reg_3p3v>;
 +	status = "okay";
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-gw54xx.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw54xx.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-gw54xx.dts	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw54xx.dts	2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-gw54xx.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw54xx.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-gw54xx.dts	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw54xx.dts	2014-09-09 10:13:47.228940921 +0200
 @@ -0,0 +1,23 @@
 +/*
 + * Copyright 2013 Gateworks Corporation
@@ -10495,9 +10545,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-gw54xx.dts linux-linaro-stable-m
 +&sata {
 +	status = "okay";
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-hummingboard.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-hummingboard.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-hummingboard.dts	1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-hummingboard.dts	2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-hummingboard.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-hummingboard.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-hummingboard.dts	1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-hummingboard.dts	2014-09-09 10:13:47.228940921 +0200
 @@ -0,0 +1,21 @@
 +/*
 + * Copyright (C) 2014 Rabeeh Khoury (rabeeh@solid-run.com)
@@ -10520,9 +10570,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-hummingboard.dts linux-linaro-st
 +	fsl,transmit-atten-16ths = <9>;
 +	fsl,no-spread-spectrum;
 +};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-nitrogen6x.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-nitrogen6x.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-nitrogen6x.dts	1970-01-01 01:00:00.000000000 +0100
-