update patch for 4.1.6

1 files changed, 923 insertions, 935 deletions

diff --git a/target/arm/solidrun-imx6/patches/4.1.6/0001-xbian.patch b/target/arm/solidrun-imx6/patches/4.1.6/0001-xbian.patch
index 6286c0868..9f44e6d19 100644
--- a/target/arm/solidrun-imx6/patches/4.1.6/0001-xbian.patch
+++ b/target/arm/solidrun-imx6/patches/4.1.6/0001-xbian.patch
@@ -1,6 +1,6 @@
-diff -Nur linux-4.1.3/arch/arm/boot/dts/imx6dl.dtsi linux-xbian-imx6/arch/arm/boot/dts/imx6dl.dtsi
---- linux-4.1.3/arch/arm/boot/dts/imx6dl.dtsi	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/arch/arm/boot/dts/imx6dl.dtsi	2015-07-27 23:13:00.299912248 +0200
+diff -Nur linux-4.1.6.orig/arch/arm/boot/dts/imx6dl.dtsi linux-4.1.6/arch/arm/boot/dts/imx6dl.dtsi
+--- linux-4.1.6.orig/arch/arm/boot/dts/imx6dl.dtsi	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/arch/arm/boot/dts/imx6dl.dtsi	2015-08-30 07:30:04.480219346 +0200
 @@ -60,17 +60,103 @@
  	};
  
@@ -137,9 +137,9 @@ diff -Nur linux-4.1.3/arch/arm/boot/dts/imx6dl.dtsi linux-xbian-imx6/arch/arm/bo
 -&vpu {
 -	compatible = "fsl,imx6dl-vpu", "cnm,coda960";
 -};
-diff -Nur linux-4.1.3/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-xbian-imx6/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
---- linux-4.1.3/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi	2015-07-27 23:13:00.303898027 +0200
+diff -Nur linux-4.1.6.orig/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-4.1.6/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
+--- linux-4.1.6.orig/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi	2015-08-30 07:30:04.640208956 +0200
 @@ -45,11 +45,22 @@
  #include <dt-bindings/gpio/gpio.h>
  
@@ -308,9 +308,9 @@ diff -Nur linux-4.1.3/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-xbian-imx6/ar
 +	dcic_mux = "dcic-lvds1";
 +	status = "okay";
  };
-diff -Nur linux-4.1.3/arch/arm/boot/dts/imx6qdl.dtsi linux-xbian-imx6/arch/arm/boot/dts/imx6qdl.dtsi
---- linux-4.1.3/arch/arm/boot/dts/imx6qdl.dtsi	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/arch/arm/boot/dts/imx6qdl.dtsi	2015-07-27 23:13:00.303898027 +0200
+diff -Nur linux-4.1.6.orig/arch/arm/boot/dts/imx6qdl.dtsi linux-4.1.6/arch/arm/boot/dts/imx6qdl.dtsi
+--- linux-4.1.6.orig/arch/arm/boot/dts/imx6qdl.dtsi	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/arch/arm/boot/dts/imx6qdl.dtsi	2015-08-30 07:30:04.640208956 +0200
 @@ -14,6 +14,7 @@
  #include <dt-bindings/interrupt-controller/arm-gic.h>
  
@@ -865,9 +865,9 @@ diff -Nur linux-4.1.3/arch/arm/boot/dts/imx6qdl.dtsi linux-xbian-imx6/arch/arm/b
  		};
  	};
  };
-diff -Nur linux-4.1.3/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi linux-xbian-imx6/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
---- linux-4.1.3/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi	2015-07-27 23:13:00.303898027 +0200
+diff -Nur linux-4.1.6.orig/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi linux-4.1.6/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
+--- linux-4.1.6.orig/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi	2015-08-30 07:30:04.640208956 +0200
 @@ -43,8 +43,10 @@
  #include "imx6qdl-microsom-ar8035.dtsi"
  
@@ -1135,9 +1135,9 @@ diff -Nur linux-4.1.3/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi linux-xbian-im
 +	dcic_mux = "dcic-lvds1";
 +	status = "okay";
 +};
-diff -Nur linux-4.1.3/arch/arm/boot/dts/imx6qdl-microsom.dtsi linux-xbian-imx6/arch/arm/boot/dts/imx6qdl-microsom.dtsi
---- linux-4.1.3/arch/arm/boot/dts/imx6qdl-microsom.dtsi	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/arch/arm/boot/dts/imx6qdl-microsom.dtsi	2015-07-27 23:13:00.303898027 +0200
+diff -Nur linux-4.1.6.orig/arch/arm/boot/dts/imx6qdl-microsom.dtsi linux-4.1.6/arch/arm/boot/dts/imx6qdl-microsom.dtsi
+--- linux-4.1.6.orig/arch/arm/boot/dts/imx6qdl-microsom.dtsi	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/arch/arm/boot/dts/imx6qdl-microsom.dtsi	2015-08-30 07:30:04.640208956 +0200
 @@ -39,15 +39,98 @@
   *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
   *     OTHER DEALINGS IN THE SOFTWARE.
@@ -1261,9 +1261,9 @@ diff -Nur linux-4.1.3/arch/arm/boot/dts/imx6qdl-microsom.dtsi linux-xbian-imx6/a
 +	vmmc-supply = <&reg_brcm>;
 +	status = "okay";
 +};
-diff -Nur linux-4.1.3/arch/arm/boot/dts/imx6q.dtsi linux-xbian-imx6/arch/arm/boot/dts/imx6q.dtsi
---- linux-4.1.3/arch/arm/boot/dts/imx6q.dtsi	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/arch/arm/boot/dts/imx6q.dtsi	2015-07-27 23:13:00.303898027 +0200
+diff -Nur linux-4.1.6.orig/arch/arm/boot/dts/imx6q.dtsi linux-4.1.6/arch/arm/boot/dts/imx6q.dtsi
+--- linux-4.1.6.orig/arch/arm/boot/dts/imx6q.dtsi	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/arch/arm/boot/dts/imx6q.dtsi	2015-08-30 07:30:04.640208956 +0200
 @@ -14,6 +14,7 @@
  
  / {
@@ -1569,9 +1569,9 @@ diff -Nur linux-4.1.3/arch/arm/boot/dts/imx6q.dtsi linux-xbian-imx6/arch/arm/boo
 +		      "ldb_di0_div_7", "ldb_di1_div_7",
 +		      "ldb_di0_div_sel", "ldb_di1_div_sel";
  };
-diff -Nur linux-4.1.3/arch/arm/boot/dts/imx6q-hummingboard.dts linux-xbian-imx6/arch/arm/boot/dts/imx6q-hummingboard.dts
---- linux-4.1.3/arch/arm/boot/dts/imx6q-hummingboard.dts	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/arch/arm/boot/dts/imx6q-hummingboard.dts	2015-07-27 23:13:00.303898027 +0200
+diff -Nur linux-4.1.6.orig/arch/arm/boot/dts/imx6q-hummingboard.dts linux-4.1.6/arch/arm/boot/dts/imx6q-hummingboard.dts
+--- linux-4.1.6.orig/arch/arm/boot/dts/imx6q-hummingboard.dts	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/arch/arm/boot/dts/imx6q-hummingboard.dts	2015-08-30 07:30:04.640208956 +0200
 @@ -57,3 +57,7 @@
  	fsl,transmit-atten-16ths = <9>;
  	fsl,receive-eq-mdB = <3000>;
@@ -1580,9 +1580,9 @@ diff -Nur linux-4.1.3/arch/arm/boot/dts/imx6q-hummingboard.dts linux-xbian-imx6/
 +&sgtl5000 {
 +	status = "okay";
 +};
-diff -Nur linux-4.1.3/arch/arm/boot/dts/imx6sl.dtsi linux-xbian-imx6/arch/arm/boot/dts/imx6sl.dtsi
---- linux-4.1.3/arch/arm/boot/dts/imx6sl.dtsi	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/arch/arm/boot/dts/imx6sl.dtsi	2015-07-27 23:13:00.307883804 +0200
+diff -Nur linux-4.1.6.orig/arch/arm/boot/dts/imx6sl.dtsi linux-4.1.6/arch/arm/boot/dts/imx6sl.dtsi
+--- linux-4.1.6.orig/arch/arm/boot/dts/imx6sl.dtsi	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/arch/arm/boot/dts/imx6sl.dtsi	2015-08-30 07:30:04.640208956 +0200
 @@ -457,20 +457,21 @@
  					anatop-min-bit-val = <4>;
  					anatop-min-voltage = <800000>;
@@ -1633,9 +1633,9 @@ diff -Nur linux-4.1.3/arch/arm/boot/dts/imx6sl.dtsi linux-xbian-imx6/arch/arm/bo
  				fsl,anatop = <&anatop>;
  			};
  
-diff -Nur linux-4.1.3/arch/arm/boot/dts/imx6sx.dtsi linux-xbian-imx6/arch/arm/boot/dts/imx6sx.dtsi
---- linux-4.1.3/arch/arm/boot/dts/imx6sx.dtsi	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/arch/arm/boot/dts/imx6sx.dtsi	2015-07-27 23:13:00.307883804 +0200
+diff -Nur linux-4.1.6.orig/arch/arm/boot/dts/imx6sx.dtsi linux-4.1.6/arch/arm/boot/dts/imx6sx.dtsi
+--- linux-4.1.6.orig/arch/arm/boot/dts/imx6sx.dtsi	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/arch/arm/boot/dts/imx6sx.dtsi	2015-08-30 07:30:04.644208697 +0200
 @@ -556,20 +556,21 @@
  					anatop-min-bit-val = <4>;
  					anatop-min-voltage = <800000>;
@@ -1686,9 +1686,9 @@ diff -Nur linux-4.1.3/arch/arm/boot/dts/imx6sx.dtsi linux-xbian-imx6/arch/arm/bo
  				fsl,anatop = <&anatop>;
  			};
  
-diff -Nur linux-4.1.3/arch/arm/include/asm/glue-cache.h linux-xbian-imx6/arch/arm/include/asm/glue-cache.h
---- linux-4.1.3/arch/arm/include/asm/glue-cache.h	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/arch/arm/include/asm/glue-cache.h	2015-07-27 23:13:00.746319518 +0200
+diff -Nur linux-4.1.6.orig/arch/arm/include/asm/glue-cache.h linux-4.1.6/arch/arm/include/asm/glue-cache.h
+--- linux-4.1.6.orig/arch/arm/include/asm/glue-cache.h	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/arch/arm/include/asm/glue-cache.h	2015-08-30 07:30:04.644208697 +0200
 @@ -102,19 +102,19 @@
  #endif
  
@@ -1717,9 +1717,9 @@ diff -Nur linux-4.1.3/arch/arm/include/asm/glue-cache.h linux-xbian-imx6/arch/ar
  #endif
  
  #if defined(CONFIG_CPU_V7M)
-diff -Nur linux-4.1.3/arch/arm/Kconfig linux-xbian-imx6/arch/arm/Kconfig
---- linux-4.1.3/arch/arm/Kconfig	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/arch/arm/Kconfig	2015-07-27 23:13:00.128523741 +0200
+diff -Nur linux-4.1.6.orig/arch/arm/Kconfig linux-4.1.6/arch/arm/Kconfig
+--- linux-4.1.6.orig/arch/arm/Kconfig	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/arch/arm/Kconfig	2015-08-30 07:30:04.644208697 +0200
 @@ -1688,6 +1688,7 @@
  	range 11 64 if ARCH_SHMOBILE_LEGACY
  	default "12" if SOC_AM33XX
@@ -1728,9 +1728,9 @@ diff -Nur linux-4.1.3/arch/arm/Kconfig linux-xbian-imx6/arch/arm/Kconfig
  	default "11"
  	help
  	  The kernel memory allocator divides physically contiguous memory
-diff -Nur linux-4.1.3/arch/arm/mach-imx/busfreq_ddr3.c linux-xbian-imx6/arch/arm/mach-imx/busfreq_ddr3.c
---- linux-4.1.3/arch/arm/mach-imx/busfreq_ddr3.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-xbian-imx6/arch/arm/mach-imx/busfreq_ddr3.c	2015-07-27 23:13:01.073153409 +0200
+diff -Nur linux-4.1.6.orig/arch/arm/mach-imx/busfreq_ddr3.c linux-4.1.6/arch/arm/mach-imx/busfreq_ddr3.c
+--- linux-4.1.6.orig/arch/arm/mach-imx/busfreq_ddr3.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.6/arch/arm/mach-imx/busfreq_ddr3.c	2015-08-30 07:30:04.644208697 +0200
 @@ -0,0 +1,514 @@
 +/*
 + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -2246,9 +2246,9 @@ diff -Nur linux-4.1.3/arch/arm/mach-imx/busfreq_ddr3.c linux-xbian-imx6/arch/arm
 +
 +	return 0;
 +}
-diff -Nur linux-4.1.3/arch/arm/mach-imx/busfreq-imx6.c linux-xbian-imx6/arch/arm/mach-imx/busfreq-imx6.c
---- linux-4.1.3/arch/arm/mach-imx/busfreq-imx6.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-xbian-imx6/arch/arm/mach-imx/busfreq-imx6.c	2015-07-27 23:13:01.073153409 +0200
+diff -Nur linux-4.1.6.orig/arch/arm/mach-imx/busfreq-imx6.c linux-4.1.6/arch/arm/mach-imx/busfreq-imx6.c
+--- linux-4.1.6.orig/arch/arm/mach-imx/busfreq-imx6.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.6/arch/arm/mach-imx/busfreq-imx6.c	2015-08-30 07:30:04.648208437 +0200
 @@ -0,0 +1,984 @@
 +/*
 + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -3234,9 +3234,9 @@ diff -Nur linux-4.1.3/arch/arm/mach-imx/busfreq-imx6.c linux-xbian-imx6/arch/arm
 +MODULE_AUTHOR("Freescale Semiconductor, Inc.");
 +MODULE_DESCRIPTION("BusFreq driver");
 +MODULE_LICENSE("GPL");
-diff -Nur linux-4.1.3/arch/arm/mach-imx/busfreq_lpddr2.c linux-xbian-imx6/arch/arm/mach-imx/busfreq_lpddr2.c
---- linux-4.1.3/arch/arm/mach-imx/busfreq_lpddr2.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-xbian-imx6/arch/arm/mach-imx/busfreq_lpddr2.c	2015-07-27 23:13:01.073153409 +0200
+diff -Nur linux-4.1.6.orig/arch/arm/mach-imx/busfreq_lpddr2.c linux-4.1.6/arch/arm/mach-imx/busfreq_lpddr2.c
+--- linux-4.1.6.orig/arch/arm/mach-imx/busfreq_lpddr2.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.6/arch/arm/mach-imx/busfreq_lpddr2.c	2015-08-30 07:30:04.648208437 +0200
 @@ -0,0 +1,183 @@
 +/*
 + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -3421,9 +3421,9 @@ diff -Nur linux-4.1.3/arch/arm/mach-imx/busfreq_lpddr2.c linux-xbian-imx6/arch/a
 +
 +	return 0;
 +}
-diff -Nur linux-4.1.3/arch/arm/mach-imx/clk.h linux-xbian-imx6/arch/arm/mach-imx/clk.h
---- linux-4.1.3/arch/arm/mach-imx/clk.h	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/arch/arm/mach-imx/clk.h	2015-07-27 23:13:01.085110746 +0200
+diff -Nur linux-4.1.6.orig/arch/arm/mach-imx/clk.h linux-4.1.6/arch/arm/mach-imx/clk.h
+--- linux-4.1.6.orig/arch/arm/mach-imx/clk.h	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/arch/arm/mach-imx/clk.h	2015-08-30 07:30:04.648208437 +0200
 @@ -55,6 +55,34 @@
  			shift, 0, &imx_ccm_lock, share_count);
  }
@@ -3459,9 +3459,9 @@ diff -Nur linux-4.1.3/arch/arm/mach-imx/clk.h linux-xbian-imx6/arch/arm/mach-imx
  struct clk *imx_clk_pfd(const char *name, const char *parent_name,
  		void __iomem *reg, u8 idx);
  
-diff -Nur linux-4.1.3/arch/arm/mach-imx/clk-imx6q.c linux-xbian-imx6/arch/arm/mach-imx/clk-imx6q.c
---- linux-4.1.3/arch/arm/mach-imx/clk-imx6q.c	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/arch/arm/mach-imx/clk-imx6q.c	2015-07-27 23:13:01.081124967 +0200
+diff -Nur linux-4.1.6.orig/arch/arm/mach-imx/clk-imx6q.c linux-4.1.6/arch/arm/mach-imx/clk-imx6q.c
+--- linux-4.1.6.orig/arch/arm/mach-imx/clk-imx6q.c	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/arch/arm/mach-imx/clk-imx6q.c	2015-08-30 07:30:04.652208176 +0200
 @@ -24,7 +24,6 @@
  #include "clk.h"
  #include "common.h"
@@ -3805,9 +3805,9 @@ diff -Nur linux-4.1.3/arch/arm/mach-imx/clk-imx6q.c linux-xbian-imx6/arch/arm/ma
  
  	/* Set initial power mode */
  	imx6q_set_lpm(WAIT_CLOCKED);
-diff -Nur linux-4.1.3/arch/arm/mach-imx/clk-pllv3.c linux-xbian-imx6/arch/arm/mach-imx/clk-pllv3.c
---- linux-4.1.3/arch/arm/mach-imx/clk-pllv3.c	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/arch/arm/mach-imx/clk-pllv3.c	2015-07-27 23:13:01.085110746 +0200
+diff -Nur linux-4.1.6.orig/arch/arm/mach-imx/clk-pllv3.c linux-4.1.6/arch/arm/mach-imx/clk-pllv3.c
+--- linux-4.1.6.orig/arch/arm/mach-imx/clk-pllv3.c	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/arch/arm/mach-imx/clk-pllv3.c	2015-08-30 07:30:04.652208176 +0200
 @@ -23,6 +23,7 @@
  #define PLL_DENOM_OFFSET	0x20
  
@@ -3860,9 +3860,9 @@ diff -Nur linux-4.1.3/arch/arm/mach-imx/clk-pllv3.c linux-xbian-imx6/arch/arm/ma
  }
  
  static const struct clk_ops clk_pllv3_av_ops = {
-diff -Nur linux-4.1.3/arch/arm/mach-imx/common.h linux-xbian-imx6/arch/arm/mach-imx/common.h
---- linux-4.1.3/arch/arm/mach-imx/common.h	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/arch/arm/mach-imx/common.h	2015-07-27 23:13:01.085110746 +0200
+diff -Nur linux-4.1.6.orig/arch/arm/mach-imx/common.h linux-4.1.6/arch/arm/mach-imx/common.h
+--- linux-4.1.6.orig/arch/arm/mach-imx/common.h	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/arch/arm/mach-imx/common.h	2015-08-30 07:30:04.652208176 +0200
 @@ -56,6 +56,7 @@
  void mxc_set_cpu_type(unsigned int type);
  void mxc_restart(enum reboot_mode, const char *);
@@ -3888,9 +3888,9 @@ diff -Nur linux-4.1.3/arch/arm/mach-imx/common.h linux-xbian-imx6/arch/arm/mach-
  void imx_gpc_pre_suspend(bool arm_power_off);
  void imx_gpc_post_resume(void);
  void imx_gpc_mask_all(void);
-diff -Nur linux-4.1.3/arch/arm/mach-imx/ddr3_freq_imx6.S linux-xbian-imx6/arch/arm/mach-imx/ddr3_freq_imx6.S
---- linux-4.1.3/arch/arm/mach-imx/ddr3_freq_imx6.S	1970-01-01 01:00:00.000000000 +0100
-+++ linux-xbian-imx6/arch/arm/mach-imx/ddr3_freq_imx6.S	2015-07-27 23:13:01.089096525 +0200
+diff -Nur linux-4.1.6.orig/arch/arm/mach-imx/ddr3_freq_imx6.S linux-4.1.6/arch/arm/mach-imx/ddr3_freq_imx6.S
+--- linux-4.1.6.orig/arch/arm/mach-imx/ddr3_freq_imx6.S	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.6/arch/arm/mach-imx/ddr3_freq_imx6.S	2015-08-30 07:30:04.652208176 +0200
 @@ -0,0 +1,893 @@
 +/*
 + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -4785,9 +4785,9 @@ diff -Nur linux-4.1.3/arch/arm/mach-imx/ddr3_freq_imx6.S linux-xbian-imx6/arch/a
 +ENTRY(mx6_do_ddr_freq_change)
 +	.word	mx6_ddr3_freq_change
 +	.size	mx6_ddr3_freq_change, . - mx6_ddr3_freq_change
-diff -Nur linux-4.1.3/arch/arm/mach-imx/Kconfig linux-xbian-imx6/arch/arm/mach-imx/Kconfig
---- linux-4.1.3/arch/arm/mach-imx/Kconfig	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/arch/arm/mach-imx/Kconfig	2015-07-27 23:13:01.053224513 +0200
+diff -Nur linux-4.1.6.orig/arch/arm/mach-imx/Kconfig linux-4.1.6/arch/arm/mach-imx/Kconfig
+--- linux-4.1.6.orig/arch/arm/mach-imx/Kconfig	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/arch/arm/mach-imx/Kconfig	2015-08-30 07:30:04.652208176 +0200
 @@ -1,5 +1,6 @@
  menuconfig ARCH_MXC
  	bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7
@@ -4811,9 +4811,9 @@ diff -Nur linux-4.1.3/arch/arm/mach-imx/Kconfig linux-xbian-imx6/arch/arm/mach-i
  
  config IMX_HAVE_IOMUX_V1
  	bool
-diff -Nur linux-4.1.3/arch/arm/mach-imx/lpddr2_freq_imx6.S linux-xbian-imx6/arch/arm/mach-imx/lpddr2_freq_imx6.S
---- linux-4.1.3/arch/arm/mach-imx/lpddr2_freq_imx6.S	1970-01-01 01:00:00.000000000 +0100
-+++ linux-xbian-imx6/arch/arm/mach-imx/lpddr2_freq_imx6.S	2015-07-27 23:13:01.093082305 +0200
+diff -Nur linux-4.1.6.orig/arch/arm/mach-imx/lpddr2_freq_imx6.S linux-4.1.6/arch/arm/mach-imx/lpddr2_freq_imx6.S
+--- linux-4.1.6.orig/arch/arm/mach-imx/lpddr2_freq_imx6.S	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.6/arch/arm/mach-imx/lpddr2_freq_imx6.S	2015-08-30 07:30:04.652208176 +0200
 @@ -0,0 +1,484 @@
 +/*
 + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -5299,9 +5299,9 @@ diff -Nur linux-4.1.3/arch/arm/mach-imx/lpddr2_freq_imx6.S linux-xbian-imx6/arch
 +ENTRY(mx6_lpddr2_do_iram)
 +	.word	mx6_lpddr2_freq_change
 +	.size		mx6_lpddr2_freq_change, . - mx6_lpddr2_freq_change
-diff -Nur linux-4.1.3/arch/arm/mach-imx/mach-imx6q.c linux-xbian-imx6/arch/arm/mach-imx/mach-imx6q.c
---- linux-4.1.3/arch/arm/mach-imx/mach-imx6q.c	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/arch/arm/mach-imx/mach-imx6q.c	2015-07-27 23:13:01.097068084 +0200
+diff -Nur linux-4.1.6.orig/arch/arm/mach-imx/mach-imx6q.c linux-4.1.6/arch/arm/mach-imx/mach-imx6q.c
+--- linux-4.1.6.orig/arch/arm/mach-imx/mach-imx6q.c	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/arch/arm/mach-imx/mach-imx6q.c	2015-08-30 07:30:04.652208176 +0200
 @@ -265,10 +265,12 @@
  static void __init imx6q_init_machine(void)
  {
@@ -5347,9 +5347,9 @@ diff -Nur linux-4.1.3/arch/arm/mach-imx/mach-imx6q.c linux-xbian-imx6/arch/arm/m
  	.dt_compat	= imx6q_dt_compat,
 +	.restart	= mxc_restart,
  MACHINE_END
-diff -Nur linux-4.1.3/arch/arm/mach-imx/Makefile linux-xbian-imx6/arch/arm/mach-imx/Makefile
---- linux-4.1.3/arch/arm/mach-imx/Makefile	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/arch/arm/mach-imx/Makefile	2015-07-27 23:13:01.053224513 +0200
+diff -Nur linux-4.1.6.orig/arch/arm/mach-imx/Makefile linux-4.1.6/arch/arm/mach-imx/Makefile
+--- linux-4.1.6.orig/arch/arm/mach-imx/Makefile	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/arch/arm/mach-imx/Makefile	2015-08-30 07:30:04.652208176 +0200
 @@ -28,6 +28,12 @@
  obj-$(CONFIG_MXC_USE_EPIT) += epit.o
  obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o
@@ -5363,9 +5363,9 @@ diff -Nur linux-4.1.3/arch/arm/mach-imx/Makefile linux-xbian-imx6/arch/arm/mach-
  ifeq ($(CONFIG_CPU_IDLE),y)
  obj-$(CONFIG_SOC_IMX5) += cpuidle-imx5.o
  obj-$(CONFIG_SOC_IMX6Q) += cpuidle-imx6q.o
-diff -Nur linux-4.1.3/arch/arm/mach-imx/src.c linux-xbian-imx6/arch/arm/mach-imx/src.c
---- linux-4.1.3/arch/arm/mach-imx/src.c	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/arch/arm/mach-imx/src.c	2015-07-27 23:13:01.097068084 +0200
+diff -Nur linux-4.1.6.orig/arch/arm/mach-imx/src.c linux-4.1.6/arch/arm/mach-imx/src.c
+--- linux-4.1.6.orig/arch/arm/mach-imx/src.c	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/arch/arm/mach-imx/src.c	2015-08-30 07:30:04.652208176 +0200
 @@ -1,5 +1,5 @@
  /*
 - * Copyright 2011 Freescale Semiconductor, Inc.
@@ -5416,9 +5416,9 @@ diff -Nur linux-4.1.3/arch/arm/mach-imx/src.c linux-xbian-imx6/arch/arm/mach-imx
  	val &= ~(1 << BP_SRC_SCR_WARM_RESET_ENABLE);
  	writel_relaxed(val, src_base + SRC_SCR);
  	spin_unlock(&scr_lock);
-diff -Nur linux-4.1.3/arch/arm/mach-imx/system.c linux-xbian-imx6/arch/arm/mach-imx/system.c
---- linux-4.1.3/arch/arm/mach-imx/system.c	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/arch/arm/mach-imx/system.c	2015-07-27 23:13:01.101053863 +0200
+diff -Nur linux-4.1.6.orig/arch/arm/mach-imx/system.c linux-4.1.6/arch/arm/mach-imx/system.c
+--- linux-4.1.6.orig/arch/arm/mach-imx/system.c	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/arch/arm/mach-imx/system.c	2015-08-30 07:30:04.652208176 +0200
 @@ -34,6 +34,7 @@
  
  static void __iomem *wdog_base;
@@ -5487,18 +5487,18 @@ diff -Nur linux-4.1.3/arch/arm/mach-imx/system.c linux-xbian-imx6/arch/arm/mach-
  #ifdef CONFIG_CACHE_L2X0
  void __init imx_init_l2cache(void)
  {
-diff -Nur linux-4.1.3/arch/arm/mm/cache-v7.S linux-xbian-imx6/arch/arm/mm/cache-v7.S
---- linux-4.1.3/arch/arm/mm/cache-v7.S	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/arch/arm/mm/cache-v7.S	2015-07-27 23:13:01.503617563 +0200
+diff -Nur linux-4.1.6.orig/arch/arm/mm/cache-v7.S linux-4.1.6/arch/arm/mm/cache-v7.S
+--- linux-4.1.6.orig/arch/arm/mm/cache-v7.S	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/arch/arm/mm/cache-v7.S	2015-08-30 07:30:04.652208176 +0200
 @@ -446,3 +446,5 @@
  
  	@ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)
  	define_cache_functions v7
 +
 +	.long	v7_dma_flush_range
-diff -Nur linux-4.1.3/block/bfq-cgroup.c linux-xbian-imx6/block/bfq-cgroup.c
---- linux-4.1.3/block/bfq-cgroup.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-xbian-imx6/block/bfq-cgroup.c	2015-07-27 23:13:03.600137415 +0200
+diff -Nur linux-4.1.6.orig/block/bfq-cgroup.c linux-4.1.6/block/bfq-cgroup.c
+--- linux-4.1.6.orig/block/bfq-cgroup.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.6/block/bfq-cgroup.c	2015-08-30 07:30:04.652208176 +0200
 @@ -0,0 +1,936 @@
 +/*
 + * BFQ: CGROUPS support.
@@ -6436,9 +6436,9 @@ diff -Nur linux-4.1.3/block/bfq-cgroup.c linux-xbian-imx6/block/bfq-cgroup.c
 +	return bfqg;
 +}
 +#endif
-diff -Nur linux-4.1.3/block/bfq.h linux-xbian-imx6/block/bfq.h
---- linux-4.1.3/block/bfq.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-xbian-imx6/block/bfq.h	2015-07-27 23:13:03.604123194 +0200
+diff -Nur linux-4.1.6.orig/block/bfq.h linux-4.1.6/block/bfq.h
+--- linux-4.1.6.orig/block/bfq.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.6/block/bfq.h	2015-08-30 07:30:04.652208176 +0200
 @@ -0,0 +1,811 @@
 +/*
 + * BFQ-v7r7 for 4.0.0: data structures and common functions prototypes.
@@ -7251,9 +7251,9 @@ diff -Nur linux-4.1.3/block/bfq.h linux-xbian-imx6/block/bfq.h
 +static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq);
 +
 +#endif /* _BFQ_H */
-diff -Nur linux-4.1.3/block/bfq-ioc.c linux-xbian-imx6/block/bfq-ioc.c
---- linux-4.1.3/block/bfq-ioc.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-xbian-imx6/block/bfq-ioc.c	2015-07-27 23:13:03.600137415 +0200
+diff -Nur linux-4.1.6.orig/block/bfq-ioc.c linux-4.1.6/block/bfq-ioc.c
+--- linux-4.1.6.orig/block/bfq-ioc.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.6/block/bfq-ioc.c	2015-08-30 07:30:04.652208176 +0200
 @@ -0,0 +1,36 @@
 +/*
 + * BFQ: I/O context handling.
@@ -7291,9 +7291,9 @@ diff -Nur linux-4.1.3/block/bfq-ioc.c linux-xbian-imx6/block/bfq-ioc.c
 +		return icq_to_bic(ioc_lookup_icq(ioc, bfqd->queue));
 +	return NULL;
 +}
-diff -Nur linux-4.1.3/block/bfq-iosched.c linux-xbian-imx6/block/bfq-iosched.c
---- linux-4.1.3/block/bfq-iosched.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-xbian-imx6/block/bfq-iosched.c	2015-07-27 23:13:03.600137415 +0200
+diff -Nur linux-4.1.6.orig/block/bfq-iosched.c linux-4.1.6/block/bfq-iosched.c
+--- linux-4.1.6.orig/block/bfq-iosched.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.6/block/bfq-iosched.c	2015-08-30 07:30:04.656207916 +0200
 @@ -0,0 +1,4223 @@
 +/*
 + * Budget Fair Queueing (BFQ) disk scheduler.
@@ -11518,9 +11518,9 @@ diff -Nur linux-4.1.3/block/bfq-iosched.c linux-xbian-imx6/block/bfq-iosched.c
 +
 +MODULE_AUTHOR("Fabio Checconi, Paolo Valente");
 +MODULE_LICENSE("GPL");
-diff -Nur linux-4.1.3/block/bfq-sched.c linux-xbian-imx6/block/bfq-sched.c
---- linux-4.1.3/block/bfq-sched.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-xbian-imx6/block/bfq-sched.c	2015-07-27 23:13:03.604123194 +0200
+diff -Nur linux-4.1.6.orig/block/bfq-sched.c linux-4.1.6/block/bfq-sched.c
+--- linux-4.1.6.orig/block/bfq-sched.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.6/block/bfq-sched.c	2015-08-30 07:30:04.656207916 +0200
 @@ -0,0 +1,1186 @@
 +/*
 + * BFQ: Hierarchical B-WF2Q+ scheduler.
@@ -12708,9 +12708,9 @@ diff -Nur linux-4.1.3/block/bfq-sched.c linux-xbian-imx6/block/bfq-sched.c
 +	if (bfqq->wr_coeff > 1)
 +		bfqd->wr_busy_queues++;
 +}
-diff -Nur linux-4.1.3/block/Kconfig.iosched linux-xbian-imx6/block/Kconfig.iosched
---- linux-4.1.3/block/Kconfig.iosched	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/block/Kconfig.iosched	2015-07-27 23:13:03.600137415 +0200
+diff -Nur linux-4.1.6.orig/block/Kconfig.iosched linux-4.1.6/block/Kconfig.iosched
+--- linux-4.1.6.orig/block/Kconfig.iosched	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/block/Kconfig.iosched	2015-08-30 07:30:04.656207916 +0200
 @@ -39,6 +39,27 @@
  	---help---
  	  Enable group IO scheduling in CFQ.
@@ -12764,9 +12764,9 @@ diff -Nur linux-4.1.3/block/Kconfig.iosched linux-xbian-imx6/block/Kconfig.iosch
  	default "noop" if DEFAULT_NOOP
  
  endmenu
-diff -Nur linux-4.1.3/block/Makefile linux-xbian-imx6/block/Makefile
---- linux-4.1.3/block/Makefile	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/block/Makefile	2015-07-27 23:13:03.600137415 +0200
+diff -Nur linux-4.1.6.orig/block/Makefile linux-4.1.6/block/Makefile
+--- linux-4.1.6.orig/block/Makefile	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/block/Makefile	2015-08-30 07:30:04.656207916 +0200
 @@ -18,6 +18,7 @@
  obj-$(CONFIG_IOSCHED_NOOP)	+= noop-iosched.o
  obj-$(CONFIG_IOSCHED_DEADLINE)	+= deadline-iosched.o
@@ -12775,9 +12775,9 @@ diff -Nur linux-4.1.3/block/Makefile linux-xbian-imx6/block/Makefile
  
  obj-$(CONFIG_BLOCK_COMPAT)	+= compat_ioctl.o
  obj-$(CONFIG_BLK_CMDLINE_PARSER)	+= cmdline-parser.o
-diff -Nur linux-4.1.3/Documentation/devicetree/bindings/mmc/mmc.txt linux-xbian-imx6/Documentation/devicetree/bindings/mmc/mmc.txt
---- linux-4.1.3/Documentation/devicetree/bindings/mmc/mmc.txt	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/Documentation/devicetree/bindings/mmc/mmc.txt	2015-07-27 23:12:59.335353684 +0200
+diff -Nur linux-4.1.6.orig/Documentation/devicetree/bindings/mmc/mmc.txt linux-4.1.6/Documentation/devicetree/bindings/mmc/mmc.txt
+--- linux-4.1.6.orig/Documentation/devicetree/bindings/mmc/mmc.txt	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/Documentation/devicetree/bindings/mmc/mmc.txt	2015-08-30 07:30:04.656207916 +0200
 @@ -5,6 +5,8 @@
  Interpreted by the OF core:
  - reg: Registers location and length.
@@ -12803,9 +12803,9 @@ diff -Nur linux-4.1.3/Documentation/devicetree/bindings/mmc/mmc.txt linux-xbian-
  *NOTE* on CD and WP polarity. To use common for all SD/MMC host controllers line
  polarity properties, we have to fix the meaning of the "normal" and "inverted"
  line levels. We choose to follow the SDHCI standard, which specifies both those
-diff -Nur linux-4.1.3/Documentation/devicetree/bindings/vendor-prefixes.txt linux-xbian-imx6/Documentation/devicetree/bindings/vendor-prefixes.txt
---- linux-4.1.3/Documentation/devicetree/bindings/vendor-prefixes.txt	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/Documentation/devicetree/bindings/vendor-prefixes.txt	2015-07-27 23:12:59.518699524 +0200
+diff -Nur linux-4.1.6.orig/Documentation/devicetree/bindings/vendor-prefixes.txt linux-4.1.6/Documentation/devicetree/bindings/vendor-prefixes.txt
+--- linux-4.1.6.orig/Documentation/devicetree/bindings/vendor-prefixes.txt	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/Documentation/devicetree/bindings/vendor-prefixes.txt	2015-08-30 07:30:04.656207916 +0200
 @@ -201,6 +201,7 @@
  variscite	Variscite Ltd.
  via	VIA Technologies, Inc.
@@ -12814,9 +12814,9 @@ diff -Nur linux-4.1.3/Documentation/devicetree/bindings/vendor-prefixes.txt linu
  voipac	Voipac Technologies s.r.o.
  winbond Winbond Electronics corp.
  wlf	Wolfson Microelectronics
-diff -Nur linux-4.1.3/drivers/char/frandom.c linux-xbian-imx6/drivers/char/frandom.c
---- linux-4.1.3/drivers/char/frandom.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-xbian-imx6/drivers/char/frandom.c	2015-07-27 23:13:03.986757999 +0200
+diff -Nur linux-4.1.6.orig/drivers/char/frandom.c linux-4.1.6/drivers/char/frandom.c
+--- linux-4.1.6.orig/drivers/char/frandom.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.6/drivers/char/frandom.c	2015-08-30 07:30:04.656207916 +0200
 @@ -0,0 +1,415 @@
 +/*
 +** frandom.c
@@ -13233,9 +13233,9 @@ diff -Nur linux-4.1.3/drivers/char/frandom.c linux-xbian-imx6/drivers/char/frand
 +module_exit(frandom_cleanup_module);
 +
 +EXPORT_SYMBOL(erandom_get_random_bytes);
-diff -Nur linux-4.1.3/drivers/char/Makefile linux-xbian-imx6/drivers/char/Makefile
---- linux-4.1.3/drivers/char/Makefile	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/drivers/char/Makefile	2015-07-27 23:13:03.982772220 +0200
+diff -Nur linux-4.1.6.orig/drivers/char/Makefile linux-4.1.6/drivers/char/Makefile
+--- linux-4.1.6.orig/drivers/char/Makefile	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/drivers/char/Makefile	2015-08-30 07:30:04.656207916 +0200
 @@ -2,6 +2,7 @@
  # Makefile for the kernel character device drivers.
  #
@@ -13244,9 +13244,9 @@ diff -Nur linux-4.1.3/drivers/char/Makefile linux-xbian-imx6/drivers/char/Makefi
  obj-y				+= mem.o random.o
  obj-$(CONFIG_TTY_PRINTK)	+= ttyprintk.o
  obj-y				+= misc.o
-diff -Nur linux-4.1.3/drivers/cpufreq/imx6q-cpufreq.c linux-xbian-imx6/drivers/cpufreq/imx6q-cpufreq.c
---- linux-4.1.3/drivers/cpufreq/imx6q-cpufreq.c	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/drivers/cpufreq/imx6q-cpufreq.c	2015-07-27 23:13:04.158146502 +0200
+diff -Nur linux-4.1.6.orig/drivers/cpufreq/imx6q-cpufreq.c linux-4.1.6/drivers/cpufreq/imx6q-cpufreq.c
+--- linux-4.1.6.orig/drivers/cpufreq/imx6q-cpufreq.c	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/drivers/cpufreq/imx6q-cpufreq.c	2015-08-30 07:30:04.656207916 +0200
 @@ -20,6 +20,8 @@
  #define PU_SOC_VOLTAGE_HIGH	1275000
  #define FREQ_1P2_GHZ		1200000000
@@ -13267,9 +13267,9 @@ diff -Nur linux-4.1.3/drivers/cpufreq/imx6q-cpufreq.c linux-xbian-imx6/drivers/c
  				break;
  			}
  		}
-diff -Nur linux-4.1.3/drivers/crypto/caam/caamalg.c linux-xbian-imx6/drivers/crypto/caam/caamalg.c
---- linux-4.1.3/drivers/crypto/caam/caamalg.c	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/drivers/crypto/caam/caamalg.c	2015-07-27 23:13:04.205975852 +0200
+diff -Nur linux-4.1.6.orig/drivers/crypto/caam/caamalg.c linux-4.1.6/drivers/crypto/caam/caamalg.c
+--- linux-4.1.6.orig/drivers/crypto/caam/caamalg.c	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/drivers/crypto/caam/caamalg.c	2015-08-30 07:30:04.660207658 +0200
 @@ -1,7 +1,7 @@
  /*
   * caam - Freescale FSL CAAM support for crypto API
@@ -17085,9 +17085,9 @@ diff -Nur linux-4.1.3/drivers/crypto/caam/caamalg.c linux-xbian-imx6/drivers/cry
  	return err;
  }
  
-diff -Nur linux-4.1.3/drivers/crypto/caam/caamhash.c linux-xbian-imx6/drivers/crypto/caam/caamhash.c
---- linux-4.1.3/drivers/crypto/caam/caamhash.c	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/drivers/crypto/caam/caamhash.c	2015-07-27 23:13:04.209961631 +0200
+diff -Nur linux-4.1.6.orig/drivers/crypto/caam/caamhash.c linux-4.1.6/drivers/crypto/caam/caamhash.c
+--- linux-4.1.6.orig/drivers/crypto/caam/caamhash.c	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/drivers/crypto/caam/caamhash.c	2015-08-30 07:30:04.712204283 +0200
 @@ -1,7 +1,7 @@
  /*
   * caam - Freescale FSL CAAM support for ahash functions of crypto API
@@ -18454,9 +18454,9 @@ diff -Nur linux-4.1.3/drivers/crypto/caam/caamhash.c linux-xbian-imx6/drivers/cr
  	return err;
  }
  
-diff -Nur linux-4.1.3/drivers/crypto/caam/caam_keyblob.c linux-xbian-imx6/drivers/crypto/caam/caam_keyblob.c
---- linux-4.1.3/drivers/crypto/caam/caam_keyblob.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-xbian-imx6/drivers/crypto/caam/caam_keyblob.c	2015-07-27 23:13:04.205975852 +0200
+diff -Nur linux-4.1.6.orig/drivers/crypto/caam/caam_keyblob.c linux-4.1.6/drivers/crypto/caam/caam_keyblob.c
+--- linux-4.1.6.orig/drivers/crypto/caam/caam_keyblob.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.6/drivers/crypto/caam/caam_keyblob.c	2015-08-30 07:30:04.712204283 +0200
 @@ -0,0 +1,687 @@
 +/*
 + * Key blob driver based on CAAM hardware
@@ -19145,9 +19145,9 @@ diff -Nur linux-4.1.3/drivers/crypto/caam/caam_keyblob.c linux-xbian-imx6/driver
 +MODULE_LICENSE("Dual BSD/GPL");
 +MODULE_DESCRIPTION("FSL CAAM Secure Memory / Keystore");
 +MODULE_AUTHOR("Freescale Semiconductor - NMSG/MAD");
-diff -Nur linux-4.1.3/drivers/crypto/caam/caam_keyblob.h linux-xbian-imx6/drivers/crypto/caam/caam_keyblob.h
---- linux-4.1.3/drivers/crypto/caam/caam_keyblob.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-xbian-imx6/drivers/crypto/caam/caam_keyblob.h	2015-07-27 23:13:04.205975852 +0200
+diff -Nur linux-4.1.6.orig/drivers/crypto/caam/caam_keyblob.h linux-4.1.6/drivers/crypto/caam/caam_keyblob.h
+--- linux-4.1.6.orig/drivers/crypto/caam/caam_keyblob.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.6/drivers/crypto/caam/caam_keyblob.h	2015-08-30 07:30:04.716204024 +0200
 @@ -0,0 +1,45 @@
 +/*
 + * CAAM public-level include definitions for the key blob
@@ -19194,9 +19194,9 @@ diff -Nur linux-4.1.3/drivers/crypto/caam/caam_keyblob.h linux-xbian-imx6/driver
 +#endif
 +
 +#endif /* CAAM_KEYBLOB_H */
-diff -Nur linux-4.1.3/drivers/crypto/caam/caamrng.c linux-xbian-imx6/drivers/crypto/caam/caamrng.c
---- linux-4.1.3/drivers/crypto/caam/caamrng.c	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/drivers/crypto/caam/caamrng.c	2015-07-27 23:13:04.209961631 +0200
+diff -Nur linux-4.1.6.orig/drivers/crypto/caam/caamrng.c linux-4.1.6/drivers/crypto/caam/caamrng.c
+--- linux-4.1.6.orig/drivers/crypto/caam/caamrng.c	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/drivers/crypto/caam/caamrng.c	2015-08-30 07:30:04.716204024 +0200
 @@ -1,7 +1,7 @@
  /*
   * caam - Freescale FSL CAAM support for hw_random
@@ -19453,9 +19453,9 @@ diff -Nur linux-4.1.3/drivers/crypto/caam/caamrng.c linux-xbian-imx6/drivers/cry
  	return hwrng_register(&caam_rng);
  }
  
-diff -Nur linux-4.1.3/drivers/crypto/caam/compat.h linux-xbian-imx6/drivers/crypto/caam/compat.h
---- linux-4.1.3/drivers/crypto/caam/compat.h	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/drivers/crypto/caam/compat.h	2015-07-27 23:13:04.209961631 +0200
+diff -Nur linux-4.1.6.orig/drivers/crypto/caam/compat.h linux-4.1.6/drivers/crypto/caam/compat.h
+--- linux-4.1.6.orig/drivers/crypto/caam/compat.h	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/drivers/crypto/caam/compat.h	2015-08-30 07:30:04.716204024 +0200
 @@ -14,6 +14,8 @@
  #include <linux/hash.h>
  #include <linux/hw_random.h>
@@ -19483,9 +19483,9 @@ diff -Nur linux-4.1.3/drivers/crypto/caam/compat.h linux-xbian-imx6/drivers/cryp
  #include <crypto/des.h>
  #include <crypto/sha.h>
  #include <crypto/md5.h>
-diff -Nur linux-4.1.3/drivers/crypto/caam/ctrl.c linux-xbian-imx6/drivers/crypto/caam/ctrl.c
---- linux-4.1.3/drivers/crypto/caam/ctrl.c	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/drivers/crypto/caam/ctrl.c	2015-07-27 23:13:04.209961631 +0200
+diff -Nur linux-4.1.6.orig/drivers/crypto/caam/ctrl.c linux-4.1.6/drivers/crypto/caam/ctrl.c
+--- linux-4.1.6.orig/drivers/crypto/caam/ctrl.c	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/drivers/crypto/caam/ctrl.c	2015-08-30 07:30:04.720203764 +0200
 @@ -1,405 +1,260 @@
 -/* * CAAM control-plane driver backend
 +/*
@@ -20463,9 +20463,9 @@ diff -Nur linux-4.1.3/drivers/crypto/caam/ctrl.c linux-xbian-imx6/drivers/crypto
  		.of_match_table = caam_match,
  	},
  	.probe       = caam_probe,
-diff -Nur linux-4.1.3/drivers/crypto/caam/ctrl.h linux-xbian-imx6/drivers/crypto/caam/ctrl.h
---- linux-4.1.3/drivers/crypto/caam/ctrl.h	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/drivers/crypto/caam/ctrl.h	2015-07-27 23:13:04.209961631 +0200
+diff -Nur linux-4.1.6.orig/drivers/crypto/caam/ctrl.h linux-4.1.6/drivers/crypto/caam/ctrl.h
+--- linux-4.1.6.orig/drivers/crypto/caam/ctrl.h	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/drivers/crypto/caam/ctrl.h	2015-08-30 07:30:04.720203764 +0200
 @@ -8,6 +8,6 @@
  #define CTRL_H
  
@@ -20474,9 +20474,9 @@ diff -Nur linux-4.1.3/drivers/crypto/caam/ctrl.h linux-xbian-imx6/drivers/crypto
 +int caam_get_era(u64 caam_id);
  
  #endif /* CTRL_H */
-diff -Nur linux-4.1.3/drivers/crypto/caam/desc_constr.h linux-xbian-imx6/drivers/crypto/caam/desc_constr.h
---- linux-4.1.3/drivers/crypto/caam/desc_constr.h	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/drivers/crypto/caam/desc_constr.h	2015-07-27 23:13:04.209961631 +0200
+diff -Nur linux-4.1.6.orig/drivers/crypto/caam/desc_constr.h linux-4.1.6/drivers/crypto/caam/desc_constr.h
+--- linux-4.1.6.orig/drivers/crypto/caam/desc_constr.h	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/drivers/crypto/caam/desc_constr.h	2015-08-30 07:30:04.720203764 +0200
 @@ -10,7 +10,6 @@
  #define CAAM_CMD_SZ sizeof(u32)
  #define CAAM_PTR_SZ sizeof(dma_addr_t)
@@ -20677,9 +20677,9 @@ diff -Nur linux-4.1.3/drivers/crypto/caam/desc_constr.h linux-xbian-imx6/drivers
 -	APPEND_MATH_IMM_u64(LSHIFT, desc, dest, src0, src1, data)
 -#define append_math_rshift_imm_u64(desc, dest, src0, src1, data) \
 -	APPEND_MATH_IMM_u64(RSHIFT, desc, dest, src0, src1, data)
-diff -Nur linux-4.1.3/drivers/crypto/caam/desc.h linux-xbian-imx6/drivers/crypto/caam/desc.h
---- linux-4.1.3/drivers/crypto/caam/desc.h	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/drivers/crypto/caam/desc.h	2015-07-27 23:13:04.209961631 +0200
+diff -Nur linux-4.1.6.orig/drivers/crypto/caam/desc.h linux-4.1.6/drivers/crypto/caam/desc.h
+--- linux-4.1.6.orig/drivers/crypto/caam/desc.h	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/drivers/crypto/caam/desc.h	2015-08-30 07:30:04.724203502 +0200
 @@ -2,19 +2,35 @@
   * CAAM descriptor composition header
   * Definitions to support CAAM descriptor instruction generation
@@ -20877,9 +20877,9 @@ diff -Nur linux-4.1.3/drivers/crypto/caam/desc.h linux-xbian-imx6/drivers/crypto
 -#define FD_CMD_REPLACE_JOB_DESC				0x20000000
  
  #endif /* DESC_H */
-diff -Nur linux-4.1.3/drivers/crypto/caam/error.c linux-xbian-imx6/drivers/crypto/caam/error.c
---- linux-4.1.3/drivers/crypto/caam/error.c	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/drivers/crypto/caam/error.c	2015-07-27 23:13:04.213947410 +0200
+diff -Nur linux-4.1.6.orig/drivers/crypto/caam/error.c linux-4.1.6/drivers/crypto/caam/error.c
+--- linux-4.1.6.orig/drivers/crypto/caam/error.c	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/drivers/crypto/caam/error.c	2015-08-30 07:30:04.724203502 +0200
 @@ -11,243 +11,264 @@
  #include "jr.h"
  #include "error.h"
@@ -21337,9 +21337,9 @@ diff -Nur linux-4.1.3/drivers/crypto/caam/error.c linux-xbian-imx6/drivers/crypt
 +	return outstr;
  }
  EXPORT_SYMBOL(caam_jr_strstatus);
-diff -Nur linux-4.1.3/drivers/crypto/caam/error.h linux-xbian-imx6/drivers/crypto/caam/error.h
---- linux-4.1.3/drivers/crypto/caam/error.h	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/drivers/crypto/caam/error.h	2015-07-27 23:13:04.213947410 +0200
+diff -Nur linux-4.1.6.orig/drivers/crypto/caam/error.h linux-4.1.6/drivers/crypto/caam/error.h
+--- linux-4.1.6.orig/drivers/crypto/caam/error.h	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/drivers/crypto/caam/error.h	2015-08-30 07:30:04.724203502 +0200
 @@ -7,5 +7,5 @@
  #ifndef CAAM_ERROR_H
  #define CAAM_ERROR_H
@@ -21347,9 +21347,9 @@ diff -Nur linux-4.1.3/drivers/crypto/caam/error.h linux-xbian-imx6/drivers/crypt
 -void caam_jr_strstatus(struct device *jrdev, u32 status);
 +extern char *caam_jr_strstatus(char *outstr, u32 status);
  #endif /* CAAM_ERROR_H */
-diff -Nur linux-4.1.3/drivers/crypto/caam/intern.h linux-xbian-imx6/drivers/crypto/caam/intern.h
---- linux-4.1.3/drivers/crypto/caam/intern.h	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/drivers/crypto/caam/intern.h	2015-07-27 23:13:04.213947410 +0200
+diff -Nur linux-4.1.6.orig/drivers/crypto/caam/intern.h linux-4.1.6/drivers/crypto/caam/intern.h
+--- linux-4.1.6.orig/drivers/crypto/caam/intern.h	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/drivers/crypto/caam/intern.h	2015-08-30 07:30:04.724203502 +0200
 @@ -2,13 +2,19 @@
   * CAAM/SEC 4.x driver backend
   * Private/internal definitions between modules
@@ -21447,9 +21447,9 @@ diff -Nur linux-4.1.3/drivers/crypto/caam/intern.h linux-xbian-imx6/drivers/cryp
  	/*
  	 * debugfs entries for developer view into driver/device
  	 * variables at runtime.
-diff -Nur linux-4.1.3/drivers/crypto/caam/jr.c linux-xbian-imx6/drivers/crypto/caam/jr.c
---- linux-4.1.3/drivers/crypto/caam/jr.c	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/drivers/crypto/caam/jr.c	2015-07-27 23:13:04.213947410 +0200
+diff -Nur linux-4.1.6.orig/drivers/crypto/caam/jr.c linux-4.1.6/drivers/crypto/caam/jr.c
+--- linux-4.1.6.orig/drivers/crypto/caam/jr.c	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/drivers/crypto/caam/jr.c	2015-08-30 07:30:04.724203502 +0200
 @@ -2,125 +2,15 @@
   * CAAM/SEC 4.x transport/backend driver
   * JobR backend functionality
@@ -22071,9 +22071,9 @@ diff -Nur linux-4.1.3/drivers/crypto/caam/jr.c linux-xbian-imx6/drivers/crypto/c
 -MODULE_LICENSE("GPL");
 -MODULE_DESCRIPTION("FSL CAAM JR request backend");
 -MODULE_AUTHOR("Freescale Semiconductor - NMG/STC");
-diff -Nur linux-4.1.3/drivers/crypto/caam/jr.h linux-xbian-imx6/drivers/crypto/caam/jr.h
---- linux-4.1.3/drivers/crypto/caam/jr.h	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/drivers/crypto/caam/jr.h	2015-07-27 23:13:04.213947410 +0200
+diff -Nur linux-4.1.6.orig/drivers/crypto/caam/jr.h linux-4.1.6/drivers/crypto/caam/jr.h
+--- linux-4.1.6.orig/drivers/crypto/caam/jr.h	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/drivers/crypto/caam/jr.h	2015-08-30 07:30:04.724203502 +0200
 @@ -1,18 +1,22 @@
  /*
   * CAAM public-level include definitions for the JobR backend
@@ -22100,9 +22100,9 @@ diff -Nur linux-4.1.3/drivers/crypto/caam/jr.h linux-xbian-imx6/drivers/crypto/c
 +extern int caam_jr_shutdown(struct device *dev);
 +extern struct device *caam_get_jrdev(void);
  #endif /* JR_H */
-diff -Nur linux-4.1.3/drivers/crypto/caam/Kconfig linux-xbian-imx6/drivers/crypto/caam/Kconfig
---- linux-4.1.3/drivers/crypto/caam/Kconfig	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/drivers/crypto/caam/Kconfig	2015-07-27 23:13:04.205975852 +0200
+diff -Nur linux-4.1.6.orig/drivers/crypto/caam/Kconfig linux-4.1.6/drivers/crypto/caam/Kconfig
+--- linux-4.1.6.orig/drivers/crypto/caam/Kconfig	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/drivers/crypto/caam/Kconfig	2015-08-30 07:30:04.724203502 +0200
 @@ -1,32 +1,19 @@
  config CRYPTO_DEV_FSL_CAAM
  	tristate "Freescale CAAM-Multicore driver backend"
@@ -22250,9 +22250,9 @@ diff -Nur linux-4.1.3/drivers/crypto/caam/Kconfig linux-xbian-imx6/drivers/crypt
 +	  will be called caam_keyblob.
 +
 +
-diff -Nur linux-4.1.3/drivers/crypto/caam/key_gen.c linux-xbian-imx6/drivers/crypto/caam/key_gen.c
---- linux-4.1.3/drivers/crypto/caam/key_gen.c	2015-07-21 19:10:33.000000000 +0200
-+++ linux-xbian-imx6/drivers/crypto/caam/key_gen.c	2015-07-27 23:13:04.213947410 +0200
+diff -Nur linux-4.1.6.orig/drivers/crypto/caam/key_gen.c linux-4.1.6/drivers/crypto/caam/key_gen.c
+--- linux-4.1.6.orig/drivers/crypto/caam/key_gen.c	2015-08-17 05:52:51.000000000 +0200
++++ linux-4.1.6/drivers/crypto/caam/key_gen.c	2015-08-30 07:30:04.7242035