diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-09-04 18:08:26 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-09-04 18:08:33 +0200 |
| commit | 520388f1c178a402280d3995ee1aec914fa8e7ed (patch) | |
| tree | 03809a7343c42ac3ab08c97f7eefd077c43a81e5 | |
| parent | 2a1a43ead0c628f356a84ac46d4be8aa5615fc4c (diff) | |
update patch for 4.1.6
| -rw-r--r-- | target/arm/solidrun-imx6/patches/4.1.6/0001-xbian.patch | 1858 |
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 = <®_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.724203502 +0200 @@ -1,7 +1,7 @@ /* * CAAM/SEC 4.x functions for handling key-generation jobs @@ -22341,9 +22341,9 @@ diff -Nur linux-4.1.3/drivers/crypto/caam/key_gen.c linux-xbian-imx6/drivers/cry dma_unmap_single(jrdev, dma_addr_out, split_key_pad_len, DMA_FROM_DEVICE); out_unmap_in: -diff -Nur linux-4.1.3/drivers/crypto/caam/Makefile linux-xbian-imx6/drivers/crypto/caam/Makefile ---- linux-4.1.3/drivers/crypto/caam/Makefile 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/crypto/caam/Makefile 2015-07-27 23:13:04.205975852 +0200 +diff -Nur linux-4.1.6.orig/drivers/crypto/caam/Makefile linux-4.1.6/drivers/crypto/caam/Makefile +--- linux-4.1.6.orig/drivers/crypto/caam/Makefile 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/crypto/caam/Makefile 2015-08-30 07:30:04.724203502 +0200 @@ -1,15 +1,14 @@ # # Makefile for the CAAM backend and dependent components @@ -22365,9 +22365,9 @@ diff -Nur linux-4.1.3/drivers/crypto/caam/Makefile linux-xbian-imx6/drivers/cryp -caam-objs := ctrl.o -caam_jr-objs := jr.o key_gen.o error.o +caam-objs := ctrl.o jr.o error.o key_gen.o -diff -Nur linux-4.1.3/drivers/crypto/caam/pdb.h linux-xbian-imx6/drivers/crypto/caam/pdb.h ---- linux-4.1.3/drivers/crypto/caam/pdb.h 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/crypto/caam/pdb.h 2015-07-27 23:13:04.213947410 +0200 +diff -Nur linux-4.1.6.orig/drivers/crypto/caam/pdb.h linux-4.1.6/drivers/crypto/caam/pdb.h +--- linux-4.1.6.orig/drivers/crypto/caam/pdb.h 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/crypto/caam/pdb.h 2015-08-30 07:30:04.724203502 +0200 @@ -44,7 +44,6 @@ #define PDBOPTS_ESP_IPHDRSRC 0x08 /* IP header comes from PDB (encap) */ #define PDBOPTS_ESP_INCIPHDR 0x04 /* Prepend IP header to output frame */ @@ -22376,9 +22376,9 @@ diff -Nur linux-4.1.3/drivers/crypto/caam/pdb.h linux-xbian-imx6/drivers/crypto/ #define PDBOPTS_ESP_TUNNEL 0x01 /* tunnel mode next-header byte */ #define PDBOPTS_ESP_IPV6 0x02 /* ip header version is V6 */ #define PDBOPTS_ESP_DIFFSERV 0x40 /* copy TOS/TC from inner iphdr */ -diff -Nur linux-4.1.3/drivers/crypto/caam/regs.h linux-xbian-imx6/drivers/crypto/caam/regs.h ---- linux-4.1.3/drivers/crypto/caam/regs.h 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/crypto/caam/regs.h 2015-07-27 23:13:04.213947410 +0200 +diff -Nur linux-4.1.6.orig/drivers/crypto/caam/regs.h linux-4.1.6/drivers/crypto/caam/regs.h +--- linux-4.1.6.orig/drivers/crypto/caam/regs.h 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/crypto/caam/regs.h 2015-08-30 07:30:04.724203502 +0200 @@ -1,7 +1,7 @@ /* * CAAM hardware register-level view @@ -22942,9 +22942,9 @@ diff -Nur linux-4.1.3/drivers/crypto/caam/regs.h linux-xbian-imx6/drivers/crypto +}; + #endif /* REGS_H */ -diff -Nur linux-4.1.3/drivers/crypto/caam/secvio.c linux-xbian-imx6/drivers/crypto/caam/secvio.c ---- linux-4.1.3/drivers/crypto/caam/secvio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/crypto/caam/secvio.c 2015-07-27 23:13:04.213947410 +0200 +diff -Nur linux-4.1.6.orig/drivers/crypto/caam/secvio.c linux-4.1.6/drivers/crypto/caam/secvio.c +--- linux-4.1.6.orig/drivers/crypto/caam/secvio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/crypto/caam/secvio.c 2015-08-30 07:30:04.724203502 +0200 @@ -0,0 +1,290 @@ + +/* @@ -23236,9 +23236,9 @@ diff -Nur linux-4.1.3/drivers/crypto/caam/secvio.c linux-xbian-imx6/drivers/cryp +MODULE_DESCRIPTION("FSL SNVS Security Violation Handler"); +MODULE_AUTHOR("Freescale Semiconductor - MCU"); + -diff -Nur linux-4.1.3/drivers/crypto/caam/secvio.h linux-xbian-imx6/drivers/crypto/caam/secvio.h ---- linux-4.1.3/drivers/crypto/caam/secvio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/crypto/caam/secvio.h 2015-07-27 23:13:04.213947410 +0200 +diff -Nur linux-4.1.6.orig/drivers/crypto/caam/secvio.h linux-4.1.6/drivers/crypto/caam/secvio.h +--- linux-4.1.6.orig/drivers/crypto/caam/secvio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/crypto/caam/secvio.h 2015-08-30 07:30:04.724203502 +0200 @@ -0,0 +1,66 @@ + +/* @@ -23306,9 +23306,9 @@ diff -Nur linux-4.1.3/drivers/crypto/caam/secvio.h linux-xbian-imx6/drivers/cryp +}; + +#endif /* SECVIO_H */ -diff -Nur linux-4.1.3/drivers/crypto/caam/sg_sw_sec4.h linux-xbian-imx6/drivers/crypto/caam/sg_sw_sec4.h ---- linux-4.1.3/drivers/crypto/caam/sg_sw_sec4.h 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/crypto/caam/sg_sw_sec4.h 2015-07-27 23:13:04.213947410 +0200 +diff -Nur linux-4.1.6.orig/drivers/crypto/caam/sg_sw_sec4.h linux-4.1.6/drivers/crypto/caam/sg_sw_sec4.h +--- linux-4.1.6.orig/drivers/crypto/caam/sg_sw_sec4.h 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/crypto/caam/sg_sw_sec4.h 2015-08-30 07:30:04.724203502 +0200 @@ -1,7 +1,7 @@ /* * CAAM/SEC 4.x functions for using scatterlists in caam driver @@ -23395,9 +23395,9 @@ diff -Nur linux-4.1.3/drivers/crypto/caam/sg_sw_sec4.h linux-xbian-imx6/drivers/ + if (end - sg_index) + sg_copy(dest + cpy_index, current_sg, end - sg_index); +} -diff -Nur linux-4.1.3/drivers/crypto/caam/sm.h linux-xbian-imx6/drivers/crypto/caam/sm.h ---- linux-4.1.3/drivers/crypto/caam/sm.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/crypto/caam/sm.h 2015-07-27 23:13:04.213947410 +0200 +diff -Nur linux-4.1.6.orig/drivers/crypto/caam/sm.h linux-4.1.6/drivers/crypto/caam/sm.h +--- linux-4.1.6.orig/drivers/crypto/caam/sm.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/crypto/caam/sm.h 2015-08-30 07:30:04.724203502 +0200 @@ -0,0 +1,88 @@ + +/* @@ -23487,9 +23487,9 @@ diff -Nur linux-4.1.3/drivers/crypto/caam/sm.h linux-xbian-imx6/drivers/crypto/c +}; + +#endif /* SM_H */ -diff -Nur linux-4.1.3/drivers/crypto/caam/sm_store.c linux-xbian-imx6/drivers/crypto/caam/sm_store.c ---- linux-4.1.3/drivers/crypto/caam/sm_store.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/crypto/caam/sm_store.c 2015-07-27 23:13:04.213947410 +0200 +diff -Nur linux-4.1.6.orig/drivers/crypto/caam/sm_store.c linux-4.1.6/drivers/crypto/caam/sm_store.c +--- linux-4.1.6.orig/drivers/crypto/caam/sm_store.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/crypto/caam/sm_store.c 2015-08-30 07:30:04.724203502 +0200 @@ -0,0 +1,896 @@ + +/* @@ -24387,9 +24387,9 @@ diff -Nur linux-4.1.3/drivers/crypto/caam/sm_store.c linux-xbian-imx6/drivers/cr +MODULE_DESCRIPTION("FSL CAAM Secure Memory / Keystore"); +MODULE_AUTHOR("Freescale Semiconductor - NMSG/MAD"); +#endif -diff -Nur linux-4.1.3/drivers/crypto/caam/sm_test.c linux-xbian-imx6/drivers/crypto/caam/sm_test.c ---- linux-4.1.3/drivers/crypto/caam/sm_test.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/crypto/caam/sm_test.c 2015-07-27 23:13:04.213947410 +0200 +diff -Nur linux-4.1.6.orig/drivers/crypto/caam/sm_test.c linux-4.1.6/drivers/crypto/caam/sm_test.c +--- linux-4.1.6.orig/drivers/crypto/caam/sm_test.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/crypto/caam/sm_test.c 2015-08-30 07:30:04.728203241 +0200 @@ -0,0 +1,844 @@ +/* + * Secure Memory / Keystore Exemplification Module @@ -25235,9 +25235,9 @@ diff -Nur linux-4.1.3/drivers/crypto/caam/sm_test.c linux-xbian-imx6/drivers/cry +MODULE_DESCRIPTION("FSL CAAM Keystore Usage Example"); +MODULE_AUTHOR("Freescale Semiconductor - NMSG/MAD"); +#endif -diff -Nur linux-4.1.3/drivers/crypto/caam/snvsregs.h linux-xbian-imx6/drivers/crypto/caam/snvsregs.h ---- linux-4.1.3/drivers/crypto/caam/snvsregs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/crypto/caam/snvsregs.h 2015-07-27 23:13:04.213947410 +0200 +diff -Nur linux-4.1.6.orig/drivers/crypto/caam/snvsregs.h linux-4.1.6/drivers/crypto/caam/snvsregs.h +--- linux-4.1.6.orig/drivers/crypto/caam/snvsregs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/crypto/caam/snvsregs.h 2015-08-30 07:30:04.728203241 +0200 @@ -0,0 +1,237 @@ +/* + * SNVS hardware register-level view @@ -25476,9 +25476,9 @@ diff -Nur linux-4.1.3/drivers/crypto/caam/snvsregs.h linux-xbian-imx6/drivers/cr +}; + +#endif /* SNVSREGS_H */ -diff -Nur linux-4.1.3/drivers/dma/imx-sdma.c linux-xbian-imx6/drivers/dma/imx-sdma.c ---- linux-4.1.3/drivers/dma/imx-sdma.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/dma/imx-sdma.c 2015-07-27 23:13:04.285691435 +0200 +diff -Nur linux-4.1.6.orig/drivers/dma/imx-sdma.c linux-4.1.6/drivers/dma/imx-sdma.c +--- linux-4.1.6.orig/drivers/dma/imx-sdma.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/dma/imx-sdma.c 2015-08-30 07:30:04.728203241 +0200 @@ -29,6 +29,7 @@ #include <linux/semaphore.h> #include <linux/spinlock.h> @@ -26120,18 +26120,18 @@ diff -Nur linux-4.1.3/drivers/dma/imx-sdma.c linux-xbian-imx6/drivers/dma/imx-sd MODULE_AUTHOR("Sascha Hauer, Pengutronix <s.hauer@pengutronix.de>"); MODULE_DESCRIPTION("i.MX SDMA driver"); -diff -Nur linux-4.1.3/drivers/gpu/drm/Kconfig linux-xbian-imx6/drivers/gpu/drm/Kconfig ---- linux-4.1.3/drivers/gpu/drm/Kconfig 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/gpu/drm/Kconfig 2015-07-27 23:13:04.353449682 +0200 +diff -Nur linux-4.1.6.orig/drivers/gpu/drm/Kconfig linux-4.1.6/drivers/gpu/drm/Kconfig +--- linux-4.1.6.orig/drivers/gpu/drm/Kconfig 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/gpu/drm/Kconfig 2015-08-30 07:30:04.728203241 +0200 @@ -217,3 +217,5 @@ source "drivers/gpu/drm/amd/amdkfd/Kconfig" source "drivers/gpu/drm/imx/Kconfig" + +source "drivers/gpu/drm/vivante/Kconfig" -diff -Nur linux-4.1.3/drivers/gpu/drm/Makefile linux-xbian-imx6/drivers/gpu/drm/Makefile ---- linux-4.1.3/drivers/gpu/drm/Makefile 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/gpu/drm/Makefile 2015-07-27 23:13:04.353449682 +0200 +diff -Nur linux-4.1.6.orig/drivers/gpu/drm/Makefile linux-4.1.6/drivers/gpu/drm/Makefile +--- linux-4.1.6.orig/drivers/gpu/drm/Makefile 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/gpu/drm/Makefile 2015-08-30 07:30:04.748201945 +0200 @@ -67,6 +67,7 @@ obj-$(CONFIG_DRM_TEGRA) += tegra/ obj-$(CONFIG_DRM_STI) += sti/ @@ -26140,9 +26140,9 @@ diff -Nur linux-4.1.3/drivers/gpu/drm/Makefile linux-xbian-imx6/drivers/gpu/drm/ obj-y += i2c/ obj-y += panel/ obj-y += bridge/ -diff -Nur linux-4.1.3/drivers/gpu/drm/vivante/Kconfig linux-xbian-imx6/drivers/gpu/drm/vivante/Kconfig ---- linux-4.1.3/drivers/gpu/drm/vivante/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/gpu/drm/vivante/Kconfig 2015-07-27 23:13:04.744056042 +0200 +diff -Nur linux-4.1.6.orig/drivers/gpu/drm/vivante/Kconfig linux-4.1.6/drivers/gpu/drm/vivante/Kconfig +--- linux-4.1.6.orig/drivers/gpu/drm/vivante/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/gpu/drm/vivante/Kconfig 2015-08-30 07:30:04.748201945 +0200 @@ -0,0 +1,6 @@ +config DRM_VIVANTE + tristate "Vivante GCCore" @@ -26150,9 +26150,9 @@ diff -Nur linux-4.1.3/drivers/gpu/drm/vivante/Kconfig linux-xbian-imx6/drivers/g + help + Choose this option if you have a Vivante graphics card. + If M is selected, the module will be called vivante. -diff -Nur linux-4.1.3/drivers/gpu/drm/vivante/Makefile linux-xbian-imx6/drivers/gpu/drm/vivante/Makefile ---- linux-4.1.3/drivers/gpu/drm/vivante/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/gpu/drm/vivante/Makefile 2015-07-27 23:13:04.744056042 +0200 +diff -Nur linux-4.1.6.orig/drivers/gpu/drm/vivante/Makefile linux-4.1.6/drivers/gpu/drm/vivante/Makefile +--- linux-4.1.6.orig/drivers/gpu/drm/vivante/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/gpu/drm/vivante/Makefile 2015-08-30 07:30:04.748201945 +0200 @@ -0,0 +1,29 @@ +############################################################################## +# @@ -26183,9 +26183,9 @@ diff -Nur linux-4.1.3/drivers/gpu/drm/vivante/Makefile linux-xbian-imx6/drivers/ +vivante-y := vivante_drv.o + +obj-$(CONFIG_DRM_VIVANTE) += vivante.o -diff -Nur linux-4.1.3/drivers/gpu/drm/vivante/vivante_drv.c linux-xbian-imx6/drivers/gpu/drm/vivante/vivante_drv.c ---- linux-4.1.3/drivers/gpu/drm/vivante/vivante_drv.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/gpu/drm/vivante/vivante_drv.c 2015-07-27 23:13:04.744056042 +0200 +diff -Nur linux-4.1.6.orig/drivers/gpu/drm/vivante/vivante_drv.c linux-4.1.6/drivers/gpu/drm/vivante/vivante_drv.c +--- linux-4.1.6.orig/drivers/gpu/drm/vivante/vivante_drv.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/gpu/drm/vivante/vivante_drv.c 2015-08-30 07:30:04.748201945 +0200 @@ -0,0 +1,112 @@ +/**************************************************************************** +* @@ -26299,9 +26299,9 @@ diff -Nur linux-4.1.3/drivers/gpu/drm/vivante/vivante_drv.c linux-xbian-imx6/dri +MODULE_AUTHOR(DRIVER_AUTHOR); +MODULE_DESCRIPTION(DRIVER_DESC); +MODULE_LICENSE("GPL and additional rights"); -diff -Nur linux-4.1.3/drivers/gpu/drm/vivante/vivante_drv.h linux-xbian-imx6/drivers/gpu/drm/vivante/vivante_drv.h ---- linux-4.1.3/drivers/gpu/drm/vivante/vivante_drv.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/gpu/drm/vivante/vivante_drv.h 2015-07-27 23:13:04.744056042 +0200 +diff -Nur linux-4.1.6.orig/drivers/gpu/drm/vivante/vivante_drv.h linux-4.1.6/drivers/gpu/drm/vivante/vivante_drv.h +--- linux-4.1.6.orig/drivers/gpu/drm/vivante/vivante_drv.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/gpu/drm/vivante/vivante_drv.h 2015-08-30 07:30:04.748201945 +0200 @@ -0,0 +1,69 @@ +/**************************************************************************** +* @@ -26372,9 +26372,9 @@ diff -Nur linux-4.1.3/drivers/gpu/drm/vivante/vivante_drv.h linux-xbian-imx6/dri +#define DRIVER_PATCHLEVEL 0 + +#endif -diff -Nur linux-4.1.3/drivers/Kconfig linux-xbian-imx6/drivers/Kconfig ---- linux-4.1.3/drivers/Kconfig 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/Kconfig 2015-07-27 23:13:03.699781896 +0200 +diff -Nur linux-4.1.6.orig/drivers/Kconfig linux-4.1.6/drivers/Kconfig +--- linux-4.1.6.orig/drivers/Kconfig 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/Kconfig 2015-08-30 07:30:04.748201945 +0200 @@ -182,4 +182,6 @@ source "drivers/android/Kconfig" @@ -26382,17 +26382,17 @@ diff -Nur linux-4.1.3/drivers/Kconfig linux-xbian-imx6/drivers/Kconfig +source "drivers/mxc/Kconfig" + endmenu -diff -Nur linux-4.1.3/drivers/Makefile linux-xbian-imx6/drivers/Makefile ---- linux-4.1.3/drivers/Makefile 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/Makefile 2015-07-27 23:13:03.699781896 +0200 +diff -Nur linux-4.1.6.orig/drivers/Makefile linux-4.1.6/drivers/Makefile +--- linux-4.1.6.orig/drivers/Makefile 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/Makefile 2015-08-30 07:30:04.748201945 +0200 @@ -165,3 +165,4 @@ obj-$(CONFIG_THUNDERBOLT) += thunderbolt/ obj-$(CONFIG_CORESIGHT) += hwtracing/coresight/ obj-$(CONFIG_ANDROID) += android/ +obj-y += mxc/ -diff -Nur linux-4.1.3/drivers/mfd/Kconfig linux-xbian-imx6/drivers/mfd/Kconfig ---- linux-4.1.3/drivers/mfd/Kconfig 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/mfd/Kconfig 2015-07-27 23:13:06.023491162 +0200 +diff -Nur linux-4.1.6.orig/drivers/mfd/Kconfig linux-4.1.6/drivers/mfd/Kconfig +--- linux-4.1.6.orig/drivers/mfd/Kconfig 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/mfd/Kconfig 2015-08-30 07:30:04.748201945 +0200 @@ -207,6 +207,13 @@ Additional drivers must be enabled in order to use the specific features of the device. @@ -26407,17 +26407,17 @@ diff -Nur linux-4.1.3/drivers/mfd/Kconfig linux-xbian-imx6/drivers/mfd/Kconfig config MFD_DLN2 tristate "Diolan DLN2 support" select MFD_CORE -diff -Nur linux-4.1.3/drivers/mfd/Makefile linux-xbian-imx6/drivers/mfd/Makefile ---- linux-4.1.3/drivers/mfd/Makefile 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/mfd/Makefile 2015-07-27 23:13:06.023491162 +0200 +diff -Nur linux-4.1.6.orig/drivers/mfd/Makefile linux-4.1.6/drivers/mfd/Makefile +--- linux-4.1.6.orig/drivers/mfd/Makefile 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/mfd/Makefile 2015-08-30 07:30:04.748201945 +0200 @@ -185,3 +185,4 @@ intel-soc-pmic-objs := intel_soc_pmic_core.o intel_soc_pmic_crc.o obj-$(CONFIG_INTEL_SOC_PMIC) += intel-soc-pmic.o obj-$(CONFIG_MFD_MT6397) += mt6397-core.o +obj-$(CONFIG_MFD_MXC_HDMI) += mxc-hdmi-core.o -diff -Nur linux-4.1.3/drivers/mfd/mxc-hdmi-core.c linux-xbian-imx6/drivers/mfd/mxc-hdmi-core.c ---- linux-4.1.3/drivers/mfd/mxc-hdmi-core.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mfd/mxc-hdmi-core.c 2015-07-27 23:13:06.051391618 +0200 +diff -Nur linux-4.1.6.orig/drivers/mfd/mxc-hdmi-core.c linux-4.1.6/drivers/mfd/mxc-hdmi-core.c +--- linux-4.1.6.orig/drivers/mfd/mxc-hdmi-core.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mfd/mxc-hdmi-core.c 2015-08-30 07:30:04.752201686 +0200 @@ -0,0 +1,723 @@ +/* + * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. @@ -27142,9 +27142,9 @@ diff -Nur linux-4.1.3/drivers/mfd/mxc-hdmi-core.c linux-xbian-imx6/drivers/mfd/m +MODULE_DESCRIPTION("Core driver for Freescale i.Mx on-chip HDMI"); +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.3/drivers/misc/sram.c linux-xbian-imx6/drivers/misc/sram.c ---- linux-4.1.3/drivers/misc/sram.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/misc/sram.c 2015-07-27 23:13:06.095235186 +0200 +diff -Nur linux-4.1.6.orig/drivers/misc/sram.c linux-4.1.6/drivers/misc/sram.c +--- linux-4.1.6.orig/drivers/misc/sram.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/misc/sram.c 2015-08-30 07:30:04.752201686 +0200 @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. @@ -27153,9 +27153,9 @@ diff -Nur linux-4.1.3/drivers/misc/sram.c linux-xbian-imx6/drivers/misc/sram.c #include <linux/kernel.h> #include <linux/init.h> -diff -Nur linux-4.1.3/drivers/mmc/core/core.c linux-xbian-imx6/drivers/mmc/core/core.c ---- linux-4.1.3/drivers/mmc/core/core.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/mmc/core/core.c 2015-07-27 23:13:06.115164084 +0200 +diff -Nur linux-4.1.6.orig/drivers/mmc/core/core.c linux-4.1.6/drivers/mmc/core/core.c +--- linux-4.1.6.orig/drivers/mmc/core/core.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/mmc/core/core.c 2015-08-30 07:30:04.752201686 +0200 @@ -13,11 +13,13 @@ #include <linux/module.h> #include <linux/init.h> @@ -27233,9 +27233,9 @@ diff -Nur linux-4.1.3/drivers/mmc/core/core.c linux-xbian-imx6/drivers/mmc/core/ mmc_power_up(host, ocr); } -diff -Nur linux-4.1.3/drivers/mmc/core/host.c linux-xbian-imx6/drivers/mmc/core/host.c ---- linux-4.1.3/drivers/mmc/core/host.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/mmc/core/host.c 2015-07-27 23:13:06.115164084 +0200 +diff -Nur linux-4.1.6.orig/drivers/mmc/core/host.c linux-4.1.6/drivers/mmc/core/host.c +--- linux-4.1.6.orig/drivers/mmc/core/host.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/mmc/core/host.c 2015-08-30 07:30:04.752201686 +0200 @@ -12,14 +12,18 @@ * MMC host class device management */ @@ -27333,9 +27333,9 @@ diff -Nur linux-4.1.3/drivers/mmc/core/host.c linux-xbian-imx6/drivers/mmc/core/ WARN_ON((host->caps & MMC_CAP_SDIO_IRQ) && !host->ops->enable_sdio_irq); -diff -Nur linux-4.1.3/drivers/mmc/core/mmc_ops.c linux-xbian-imx6/drivers/mmc/core/mmc_ops.c ---- linux-4.1.3/drivers/mmc/core/mmc_ops.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/mmc/core/mmc_ops.c 2015-07-27 23:13:06.115164084 +0200 +diff -Nur linux-4.1.6.orig/drivers/mmc/core/mmc_ops.c linux-4.1.6/drivers/mmc/core/mmc_ops.c +--- linux-4.1.6.orig/drivers/mmc/core/mmc_ops.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/mmc/core/mmc_ops.c 2015-08-30 07:30:04.756201426 +0200 @@ -513,6 +513,12 @@ return 0; @@ -27349,9 +27349,9 @@ diff -Nur linux-4.1.3/drivers/mmc/core/mmc_ops.c linux-xbian-imx6/drivers/mmc/co * CRC errors shall only be ignored in cases were CMD13 is used to poll * to detect busy completion. */ -diff -Nur linux-4.1.3/drivers/mmc/core/sd.c linux-xbian-imx6/drivers/mmc/core/sd.c ---- linux-4.1.3/drivers/mmc/core/sd.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/mmc/core/sd.c 2015-07-27 23:13:06.119149862 +0200 +diff -Nur linux-4.1.6.orig/drivers/mmc/core/sd.c linux-4.1.6/drivers/mmc/core/sd.c +--- linux-4.1.6.orig/drivers/mmc/core/sd.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/mmc/core/sd.c 2015-08-30 07:30:04.756201426 +0200 @@ -521,6 +521,13 @@ else { mmc_set_timing(card->host, timing); @@ -27366,9 +27366,9 @@ diff -Nur linux-4.1.3/drivers/mmc/core/sd.c linux-xbian-imx6/drivers/mmc/core/sd } return 0; -diff -Nur linux-4.1.3/drivers/mmc/host/sdhci-esdhc-imx.c linux-xbian-imx6/drivers/mmc/host/sdhci-esdhc-imx.c ---- linux-4.1.3/drivers/mmc/host/sdhci-esdhc-imx.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/mmc/host/sdhci-esdhc-imx.c 2015-07-27 23:13:06.131107202 +0200 +diff -Nur linux-4.1.6.orig/drivers/mmc/host/sdhci-esdhc-imx.c linux-4.1.6/drivers/mmc/host/sdhci-esdhc-imx.c +--- linux-4.1.6.orig/drivers/mmc/host/sdhci-esdhc-imx.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/mmc/host/sdhci-esdhc-imx.c 2015-08-30 07:30:04.756201426 +0200 @@ -65,6 +65,8 @@ /* NOTE: the minimum valid tuning start tap for mx6sl is 1 */ #define ESDHC_TUNING_START_TAP 0x1 @@ -27527,9 +27527,9 @@ diff -Nur linux-4.1.3/drivers/mmc/host/sdhci-esdhc-imx.c linux-xbian-imx6/driver boarddata = &imx_data->boarddata; if (sdhci_esdhc_imx_probe_dt(pdev, host, boarddata) < 0) { -diff -Nur linux-4.1.3/drivers/mxc/asrc/Kconfig linux-xbian-imx6/drivers/mxc/asrc/Kconfig ---- linux-4.1.3/drivers/mxc/asrc/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/asrc/Kconfig 2015-07-27 23:13:06.166979215 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/asrc/Kconfig linux-4.1.6/drivers/mxc/asrc/Kconfig +--- linux-4.1.6.orig/drivers/mxc/asrc/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/asrc/Kconfig 2015-08-30 07:30:04.756201426 +0200 @@ -0,0 +1,14 @@ +# +# ASRC configuration @@ -27545,17 +27545,17 @@ diff -Nur linux-4.1.3/drivers/mxc/asrc/Kconfig linux-xbian-imx6/drivers/mxc/asrc + Say Y to get the ASRC service. + +endmenu -diff -Nur linux-4.1.3/drivers/mxc/asrc/Makefile linux-xbian-imx6/drivers/mxc/asrc/Makefile ---- linux-4.1.3/drivers/mxc/asrc/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/asrc/Makefile 2015-07-27 23:13:06.166979215 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/asrc/Makefile linux-4.1.6/drivers/mxc/asrc/Makefile +--- linux-4.1.6.orig/drivers/mxc/asrc/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/asrc/Makefile 2015-08-30 07:30:04.756201426 +0200 @@ -0,0 +1,4 @@ +# +# Makefile for the kernel Asynchronous Sample Rate Converter driver +# +obj-$(CONFIG_MXC_ASRC) += mxc_asrc.o -diff -Nur linux-4.1.3/drivers/mxc/asrc/mxc_asrc.c linux-xbian-imx6/drivers/mxc/asrc/mxc_asrc.c ---- linux-4.1.3/drivers/mxc/asrc/mxc_asrc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/asrc/mxc_asrc.c 2015-07-27 23:13:06.166979215 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/asrc/mxc_asrc.c linux-4.1.6/drivers/mxc/asrc/mxc_asrc.c +--- linux-4.1.6.orig/drivers/mxc/asrc/mxc_asrc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/asrc/mxc_asrc.c 2015-08-30 07:30:04.760201166 +0200 @@ -0,0 +1,2045 @@ +/* + * Freescale Asynchronous Sample Rate Converter (ASRC) driver @@ -29602,9 +29602,9 @@ diff -Nur linux-4.1.3/drivers/mxc/asrc/mxc_asrc.c linux-xbian-imx6/drivers/mxc/a +MODULE_DESCRIPTION("Asynchronous Sample Rate Converter"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:mxc_asrc"); -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c linux-xbian-imx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c ---- linux-4.1.3/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c 2015-07-27 23:13:06.166979215 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c linux-4.1.6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c 2015-08-30 07:30:04.760201166 +0200 @@ -0,0 +1,932 @@ +/**************************************************************************** +* @@ -30538,9 +30538,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_ha + +#endif /* gcdENABLE_VG */ + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h linux-xbian-imx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h ---- linux-4.1.3/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h 2015-07-27 23:13:06.166979215 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h linux-4.1.6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h 2015-08-30 07:30:04.760201166 +0200 @@ -0,0 +1,319 @@ +/**************************************************************************** +* @@ -30861,9 +30861,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_ha + +#endif /* __gc_hal_kernel_hardware_command_h_ */ + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c linux-xbian-imx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c ---- linux-4.1.3/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c 2015-07-27 23:13:06.166979215 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c linux-4.1.6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c 2015-08-30 07:30:04.760201166 +0200 @@ -0,0 +1,2114 @@ +/**************************************************************************** +* @@ -32979,9 +32979,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_ha +} +#endif /* gcdENABLE_VG */ + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h linux-xbian-imx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h ---- linux-4.1.3/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h 2015-07-27 23:13:06.166979215 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h linux-4.1.6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h 2015-08-30 07:30:04.760201166 +0200 @@ -0,0 +1,75 @@ +/**************************************************************************** +* @@ -33058,9 +33058,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_ha + +#endif /* __gc_hal_kernel_hardware_h_ */ + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c linux-xbian-imx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c ---- linux-4.1.3/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c 2015-07-27 23:13:06.170964992 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c linux-4.1.6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c 2015-08-30 07:30:04.764200906 +0200 @@ -0,0 +1,1735 @@ +/**************************************************************************** +* @@ -34797,9 +34797,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_con +#endif +} + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h linux-xbian-imx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h ---- linux-4.1.3/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h 2015-07-27 23:13:06.170964992 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h linux-4.1.6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h 2015-08-30 07:30:04.764200906 +0200 @@ -0,0 +1,157 @@ +/**************************************************************************** +* @@ -34958,9 +34958,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_con + +#endif /* __gc_hal_kernel_context_h_ */ + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c linux-xbian-imx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c ---- linux-4.1.3/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c 2015-07-27 23:13:06.170964992 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c linux-4.1.6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c 2015-08-30 07:30:04.768200645 +0200 @@ -0,0 +1,7280 @@ +/**************************************************************************** +* @@ -42242,9 +42242,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_har +#endif + + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h linux-xbian-imx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h ---- linux-4.1.3/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h 2015-07-27 23:13:06.170964992 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h linux-4.1.6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h 2015-08-30 07:30:04.768200645 +0200 @@ -0,0 +1,136 @@ +/**************************************************************************** +* @@ -42382,9 +42382,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_har + +#endif /* __gc_hal_kernel_hardware_h_ */ + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/config linux-xbian-imx6/drivers/mxc/gpu-viv/config ---- linux-4.1.3/drivers/mxc/gpu-viv/config 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/config 2015-07-27 23:13:06.170964992 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/config linux-4.1.6/drivers/mxc/gpu-viv/config +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/config 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/config 2015-08-30 07:30:04.768200645 +0200 @@ -0,0 +1,38 @@ +############################################################################## +# @@ -42424,9 +42424,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/config linux-xbian-imx6/drivers/mxc/gp +BANK_CHANNEL_BIT ?= 12 +ENABLE_GPU_CLOCK_BY_DRIVER = 1 + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.c 2015-07-27 23:13:06.186908111 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.c linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.c 2015-08-30 07:30:04.768200645 +0200 @@ -0,0 +1,2317 @@ +/**************************************************************************** +* @@ -44745,9 +44745,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context. + return status; +} + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.h 2015-07-27 23:13:06.186908111 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.h linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.h 2015-08-30 07:30:04.768200645 +0200 @@ -0,0 +1,183 @@ +/**************************************************************************** +* @@ -44932,9 +44932,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context. + +#endif /* __gc_hal_kernel_context_h_ */ + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.c 2015-07-27 23:13:06.186908111 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.c linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.c 2015-08-30 07:30:04.776200125 +0200 @@ -0,0 +1,8036 @@ +/**************************************************************************** +* @@ -52972,9 +52972,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware +} + + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.h 2015-07-27 23:13:06.186908111 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.h linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.h 2015-08-30 07:30:04.776200125 +0200 @@ -0,0 +1,160 @@ +/**************************************************************************** +* @@ -53136,9 +53136,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware + +#endif /* __gc_hal_kernel_hardware_h_ */ + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_recorder.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_recorder.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_recorder.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_recorder.c 2015-07-27 23:13:06.190893891 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_recorder.c linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_recorder.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_recorder.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_recorder.c 2015-08-30 07:30:04.776200125 +0200 @@ -0,0 +1,679 @@ +/**************************************************************************** +* @@ -53819,9 +53819,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_recorder +} + + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.c 2015-07-27 23:13:06.190893891 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.c linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.c 2015-08-30 07:30:04.776200125 +0200 @@ -0,0 +1,932 @@ +/**************************************************************************** +* @@ -54755,9 +54755,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardwa + +#endif /* gcdENABLE_VG */ + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.h 2015-07-27 23:13:06.190893891 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.h linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.h 2015-08-30 07:30:04.776200125 +0200 @@ -0,0 +1,319 @@ +/**************************************************************************** +* @@ -55078,9 +55078,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardwa + +#endif /* __gc_hal_kernel_hardware_command_h_ */ + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.c 2015-07-27 23:13:06.190893891 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.c linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.c 2015-08-30 07:30:04.776200125 +0200 @@ -0,0 +1,2119 @@ +/**************************************************************************** +* @@ -57201,9 +57201,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardwa +} +#endif /* gcdENABLE_VG */ + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.h 2015-07-27 23:13:06.190893891 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.h linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.h 2015-08-30 07:30:04.776200125 +0200 @@ -0,0 +1,74 @@ +/**************************************************************************** +* @@ -57279,9 +57279,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardwa + +#endif /* __gc_hal_kernel_hardware_h_ */ + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c 2015-07-27 23:13:06.190893891 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c 2015-08-30 07:30:04.780199867 +0200 @@ -0,0 +1,3976 @@ +/**************************************************************************** +* @@ -61259,9 +61259,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c linux-xbian +***** Test Code **************************************************************** +*******************************************************************************/ + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c 2015-07-27 23:13:06.190893891 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c 2015-08-30 07:30:04.780199867 +0200 @@ -0,0 +1,3042 @@ +/**************************************************************************** +* @@ -64305,9 +64305,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c lin +#endif +} +#endif -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c 2015-07-27 23:13:06.190893891 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c 2015-08-30 07:30:04.784199608 +0200 @@ -0,0 +1,3678 @@ +/**************************************************************************** +* @@ -67987,9 +67987,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c +} + +#endif /* gcdENABLE_VG */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c 2015-07-27 23:13:06.190893891 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c 2015-08-30 07:30:04.784199608 +0200 @@ -0,0 +1,1618 @@ +/**************************************************************************** +* @@ -69609,9 +69609,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c linux-xb + gcmkFOOTER_NO(); + return gcvSTATUS_OK; +} -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c 2015-07-27 23:13:06.190893891 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c 2015-08-30 07:30:04.784199608 +0200 @@ -0,0 +1,2559 @@ +/**************************************************************************** +* @@ -72172,9 +72172,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c linux + return "nil"; + } +} -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c 2015-07-27 23:13:06.194879670 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c 2015-08-30 07:30:04.784199608 +0200 @@ -0,0 +1,2898 @@ +/**************************************************************************** +* @@ -75074,9 +75074,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c linux + + return gcvSTATUS_OK; +} -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h 2015-07-27 23:13:06.190893891 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h 2015-08-30 07:30:04.788199348 +0200 @@ -0,0 +1,1007 @@ +/**************************************************************************** +* @@ -76085,9 +76085,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h linux-xbian +#endif + +#endif /* __gc_hal_kernel_h_ */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c 2015-07-27 23:13:06.194879670 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c 2015-08-30 07:30:04.788199348 +0200 @@ -0,0 +1,859 @@ +/**************************************************************************** +* @@ -76948,9 +76948,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c linux- +***** Test Code **************************************************************** +*******************************************************************************/ + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c 2015-07-27 23:13:06.194879670 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c 2015-08-30 07:30:04.788199348 +0200 @@ -0,0 +1,877 @@ +/**************************************************************************** +* @@ -77829,9 +77829,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg. +} + +#endif /* gcdENABLE_VG */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c 2015-07-27 23:13:06.194879670 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c 2015-08-30 07:30:04.788199348 +0200 @@ -0,0 +1,1982 @@ +/**************************************************************************** +* @@ -79815,9 +79815,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c linux-x +****************************** T E S T C O D E ****************************** +******************************************************************************/ + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c 2015-07-27 23:13:06.194879670 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c 2015-08-30 07:30:04.788199348 +0200 @@ -0,0 +1,522 @@ +/**************************************************************************** +* @@ -80341,9 +80341,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c linu +} + +#endif /* gcdENABLE_VG */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c 2015-07-27 23:13:06.194879670 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c 2015-08-30 07:30:04.788199348 +0200 @@ -0,0 +1,347 @@ +/**************************************************************************** +* @@ -80692,9 +80692,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c linux + return gcvSTATUS_OK; +} +#endif -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h 2015-07-27 23:13:06.194879670 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h 2015-08-30 07:30:04.788199348 +0200 @@ -0,0 +1,29 @@ +/**************************************************************************** +* @@ -80725,9 +80725,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h lin +#include "gc_hal_kernel.h" + +#endif /* __gc_hal_kernel_precomp_h_ */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_security.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_security.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_security.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_security.c 2015-07-27 23:13:06.194879670 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_security.c linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_security.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_security.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_security.c 2015-08-30 07:30:04.788199348 +0200 @@ -0,0 +1,239 @@ +/**************************************************************************** +* @@ -80968,9 +80968,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_security.c li +} + +#endif -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c 2015-07-27 23:13:06.194879670 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c 2015-08-30 07:30:04.788199348 +0200 @@ -0,0 +1,896 @@ +/**************************************************************************** +* @@ -81868,9 +81868,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c linux-xb +} + +#endif /* gcdENABLE_VG */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h 2015-07-27 23:13:06.194879670 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h 2015-08-30 07:30:04.788199348 +0200 @@ -0,0 +1,85 @@ +/**************************************************************************** +* @@ -81957,9 +81957,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h linux-xb +}; + +#endif /* __gc_hal_kernel_h_ */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c 2015-07-27 23:13:06.194879670 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c 2015-08-30 07:30:04.792199087 +0200 @@ -0,0 +1,2229 @@ +/**************************************************************************** +* @@ -84190,9 +84190,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory. + gcmkFOOTER(); + return status; +} -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h 2015-07-27 23:13:06.210822785 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h 2015-08-30 07:30:04.792199087 +0200 @@ -0,0 +1,3896 @@ +/**************************************************************************** +* @@ -88090,9 +88090,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h linux-xbi +#endif + +#endif /* __gc_hal_base_h_ */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h 2015-07-27 23:13:06.210822785 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h 2015-08-30 07:30:04.792199087 +0200 @@ -0,0 +1,4356 @@ +/**************************************************************************** +* @@ -92450,9 +92450,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h linux + +#endif /* VIVANTE_NO_3D */ +#endif /* __gc_hal_compiler_h_ */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h 2015-07-27 23:13:06.210822785 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h 2015-08-30 07:30:04.796198827 +0200 @@ -0,0 +1,1051 @@ +/**************************************************************************** +* @@ -93505,9 +93505,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h linux-x +#endif + +#endif /* __gc_hal_driver_h_ */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h 2015-07-27 23:13:06.210822785 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h 2015-08-30 07:30:04.796198827 +0200 @@ -0,0 +1,270 @@ +/**************************************************************************** +* @@ -93779,9 +93779,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h linu +#endif + +#endif /* __gc_hal_driver_h_ */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h 2015-07-27 23:13:06.210822785 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h 2015-08-30 07:30:04.796198827 +0200 @@ -0,0 +1,88 @@ +/**************************************************************************** +* @@ -93871,9 +93871,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h linux-xbi + +#endif /* __gc_hal_dump_h_ */ + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h 2015-07-27 23:13:06.210822785 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h 2015-08-30 07:30:04.796198827 +0200 @@ -0,0 +1,627 @@ +/**************************************************************************** +* @@ -94502,9 +94502,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h li +#endif + +#endif /* __gc_hal_eglplatform_h_ */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h 2015-07-27 23:13:06.210822785 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h 2015-08-30 07:30:04.796198827 +0200 @@ -0,0 +1,286 @@ +/**************************************************************************** +* @@ -94792,9 +94792,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type +#endif + +#endif /* __gc_hal_eglplatform_type_h_ */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h 2015-07-27 23:13:06.214808565 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h 2015-08-30 07:30:04.796198827 +0200 @@ -0,0 +1,2053 @@ +/**************************************************************************** +* @@ -96849,9 +96849,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h linux-x + +#endif /* VIVANTE_NO_3D */ +#endif /* __gc_hal_engine_h_ */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h 2015-07-27 23:13:06.214808565 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h 2015-08-30 07:30:04.796198827 +0200 @@ -0,0 +1,904 @@ +/**************************************************************************** +* @@ -97757,9 +97757,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h linu +#endif + +#endif /* __gc_hal_vg_h_ */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h 2015-07-27 23:13:06.214808565 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h 2015-08-30 07:30:04.796198827 +0200 @@ -0,0 +1,965 @@ +/**************************************************************************** +* @@ -98726,9 +98726,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h linux-xbi +#endif + +#endif /* __gc_hal_enum_h_ */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h 2015-07-27 23:13:06.194879670 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h 2015-08-30 07:30:04.796198827 +0200 @@ -0,0 +1,2671 @@ +/**************************************************************************** +* @@ -101401,9 +101401,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h linux-xbian-im +#endif + +#endif /* __gc_hal_h_ */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h 2015-07-27 23:13:06.214808565 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h 2015-08-30 07:30:04.800198567 +0200 @@ -0,0 +1,185 @@ +/**************************************************************************** +* @@ -101590,9 +101590,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h +#endif + +#endif /* __gc_hal_kernel_buffer_h_ */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h 2015-07-27 23:13:06.214808565 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h 2015-08-30 07:30:04.800198567 +0200 @@ -0,0 +1,530 @@ +/**************************************************************************** +* @@ -102124,9 +102124,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h linux-xbia + +#endif /* VIVANTE_NO_3D */ +#endif /* __gc_hal_mem_h_ */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h 2015-07-27 23:13:06.214808565 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h 2015-08-30 07:30:04.800198567 +0200 @@ -0,0 +1,947 @@ +/**************************************************************************** +* @@ -103075,9 +103075,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h linux- +#endif + +#endif /* __gc_hal_options_h_ */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h 2015-07-27 23:13:06.214808565 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h 2015-08-30 07:30:04.800198567 +0200 @@ -0,0 +1,584 @@ +/**************************************************************************** +* @@ -103663,9 +103663,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h linux +#endif + +#endif /* __gc_hal_profiler_h_ */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h 2015-07-27 23:13:06.218794344 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h 2015-08-30 07:30:04.800198567 +0200 @@ -0,0 +1,1010 @@ +/**************************************************************************** +* @@ -104677,9 +104677,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h linux-x +#endif + +#endif /* __gc_hal_raster_h_ */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h 2015-07-27 23:13:06.218794344 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h 2015-08-30 07:30:04.800198567 +0200 @@ -0,0 +1,248 @@ +/**************************************************************************** +* @@ -104929,9 +104929,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h linux-x +#endif + +#endif /* __gc_hal_rename_h_ */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_security_interface.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_security_interface.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_security_interface.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_security_interface.h 2015-07-27 23:13:06.218794344 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_security_interface.h linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_security_interface.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_security_interface.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_security_interface.h 2015-08-30 07:30:04.800198567 +0200 @@ -0,0 +1,137 @@ +/**************************************************************************** +* @@ -105070,9 +105070,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_security_interfa +}; + +#endif -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h 2015-07-27 23:13:06.218794344 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h 2015-08-30 07:30:04.800198567 +0200 @@ -0,0 +1,115 @@ +/**************************************************************************** +* @@ -105189,9 +105189,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h lin + +#endif /*__gc_hal_statistics_h_ */ + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h 2015-07-27 23:13:06.218794344 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h 2015-08-30 07:30:04.800198567 +0200 @@ -0,0 +1,1088 @@ +/**************************************************************************** +* @@ -106281,9 +106281,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h linux-xb +#endif + +#endif /* __gc_hal_types_h_ */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h 2015-07-27 23:13:06.218794344 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h 2015-08-30 07:30:04.800198567 +0200 @@ -0,0 +1,37 @@ +/**************************************************************************** +* @@ -106322,9 +106322,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h linux- +#define gcvVERSION_TIME __TIME__ + +#endif /* __gc_hal_version_h_ */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h 2015-07-27 23:13:06.218794344 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h 2015-08-30 07:30:04.800198567 +0200 @@ -0,0 +1,913 @@ +/**************************************************************************** +* @@ -107239,9 +107239,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h linux-xbian +#endif + +#endif /* __gc_hal_h_ */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/default/gc_hal_kernel_allocator_array.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/default/gc_hal_kernel_allocator_array.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/default/gc_hal_kernel_allocator_array.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/default/gc_hal_kernel_allocator_array.h 2015-07-27 23:13:06.218794344 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/default/gc_hal_kernel_allocator_array.h linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/default/gc_hal_kernel_allocator_array.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/default/gc_hal_kernel_allocator_array.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/default/gc_hal_kernel_allocator_array.h 2015-08-30 07:30:04.800198567 +0200 @@ -0,0 +1,34 @@ +/**************************************************************************** +* @@ -107277,9 +107277,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/default/ +}; + + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_array.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_array.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_array.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_array.h 2015-07-27 23:13:06.218794344 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_array.h linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_array.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_array.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_array.h 2015-08-30 07:30:04.800198567 +0200 @@ -0,0 +1,45 @@ +/**************************************************************************** +* @@ -107326,9 +107326,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescal +}; + + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_cma.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_cma.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_cma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_cma.c 2015-07-27 23:13:06.218794344 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_cma.c linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_cma.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_cma.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_cma.c 2015-08-30 07:30:04.800198567 +0200 @@ -0,0 +1,412 @@ +/**************************************************************************** +* @@ -107742,9 +107742,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescal + return status; +} + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.c 2015-07-27 23:13:06.222780123 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.c linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.c 2015-08-30 07:30:04.804198309 +0200 @@ -0,0 +1,938 @@ +/**************************************************************************** +* @@ -108684,9 +108684,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allo + return gcvSTATUS_OK; +} + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.h 2015-07-27 23:13:06.222780123 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.h linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.h 2015-08-30 07:30:04.804198309 +0200 @@ -0,0 +1,400 @@ +/**************************************************************************** +* @@ -109088,9 +109088,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allo + +*/ +#endif -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c 2015-07-27 23:13:06.222780123 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c 2015-08-30 07:30:04.804198309 +0200 @@ -0,0 +1,795 @@ +/**************************************************************************** +* @@ -109887,9 +109887,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debu +{ + gcmkDBGFSPRINT ( _GetArgumentSize ( Message ) , Message ) ; +} -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h 2015-07-27 23:13:06.222780123 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h 2015-08-30 07:30:04.804198309 +0200 @@ -0,0 +1,84 @@ +/**************************************************************************** +* @@ -109975,9 +109975,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debu +#endif + + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h 2015-07-27 23:13:06.222780123 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h 2015-08-30 07:30:04.804198309 +0200 @@ -0,0 +1,102 @@ +/**************************************************************************** +* @@ -110081,9 +110081,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debu +#endif + +#endif /* __gc_hal_kernel_debug_h_ */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c 2015-07-27 23:13:06.222780123 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c 2015-08-30 07:30:04.804198309 +0200 @@ -0,0 +1,1676 @@ +/**************************************************************************** +* @@ -111761,9 +111761,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_devi + gcmkFOOTER(); + return status; +} -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h 2015-07-27 23:13:06.222780123 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h 2015-08-30 07:30:04.804198309 +0200 @@ -0,0 +1,192 @@ +/**************************************************************************** +* @@ -111957,9 +111957,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_devi + ); + +#endif /* __gc_hal_kernel_device_h_ */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c 2015-07-27 23:13:06.222780123 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c 2015-08-30 07:30:04.804198309 +0200 @@ -0,0 +1,1476 @@ +/**************************************************************************** +* @@ -113437,9 +113437,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driv +module_exit(gpu_exit); + +#endif -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_iommu.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_iommu.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_iommu.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_iommu.c 2015-07-27 23:13:06.222780123 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_iommu.c linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_iommu.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_iommu.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_iommu.c 2015-08-30 07:30:04.804198309 +0200 @@ -0,0 +1,216 @@ +/**************************************************************************** +* @@ -113657,9 +113657,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_iomm + return gcvSTATUS_OK; +} + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c 2015-07-27 23:13:06.222780123 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c 2015-08-30 07:30:04.804198309 +0200 @@ -0,0 +1,481 @@ +/**************************************************************************** +* @@ -114142,9 +114142,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linu + gcmkFOOTER_ARG("Settings->signal=%d", Settings->signal); + return gcvSTATUS_OK; +} -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h 2015-07-27 23:13:06.222780123 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h 2015-08-30 07:30:04.804198309 +0200 @@ -0,0 +1,94 @@ +/**************************************************************************** +* @@ -114240,9 +114240,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linu +} + +#endif /* __gc_hal_kernel_linux_h_ */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c 2015-07-27 23:13:06.222780123 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c 2015-08-30 07:30:04.804198309 +0200 @@ -0,0 +1,32 @@ +/**************************************************************************** +* @@ -114276,9 +114276,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math + if(Y ==0) {return 0;} + else {return X % Y;} +} -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c 2015-07-27 23:13:06.226765901 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c 2015-08-30 07:30:04.808198050 +0200 @@ -0,0 +1,9078 @@ +/**************************************************************************** +* @@ -123358,9 +123358,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c + return status; +} +#endif -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h 2015-07-27 23:13:06.226765901 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h 2015-08-30 07:30:04.808198050 +0200 @@ -0,0 +1,83 @@ +/**************************************************************************** +* @@ -123445,9 +123445,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h +DRIVER_ARGS; + +#endif /* __gc_hal_kernel_os_h_ */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_platform.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_platform.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_platform.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_platform.h 2015-07-27 23:13:06.226765901 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_platform.h linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_platform.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_platform.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_platform.h 2015-08-30 07:30:04.808198050 +0200 @@ -0,0 +1,279 @@ +/**************************************************************************** +* @@ -123728,9 +123728,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_plat + ); + +#endif -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_probe.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_probe.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_probe.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_probe.c 2015-07-27 23:13:06.226765901 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_probe.c linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_probe.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_probe.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_probe.c 2015-08-30 07:30:04.808198050 +0200 @@ -0,0 +1,1347 @@ +/**************************************************************************** +* @@ -125079,9 +125079,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_prob +module_exit(gpu_exit); + +#endif -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_security_channel.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_security_channel.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_security_channel.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_security_channel.c 2015-07-27 23:13:06.226765901 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_security_channel.c linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_security_channel.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_security_channel.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_security_channel.c 2015-08-30 07:30:04.812197790 +0200 @@ -0,0 +1,385 @@ +/**************************************************************************** +* @@ -125468,9 +125468,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_secu + gcmkFOOTER(); + return status; +} -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c 2015-07-27 23:13:06.226765901 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c 2015-08-30 07:30:04.812197790 +0200 @@ -0,0 +1,174 @@ +/**************************************************************************** +* @@ -125646,9 +125646,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync +} + +#endif -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h 2015-07-27 23:13:06.226765901 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h 2015-08-30 07:30:04.812197790 +0200 @@ -0,0 +1,71 @@ +/**************************************************************************** +* @@ -125721,9 +125721,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync + ); + +#endif /* __gc_hal_kernel_sync_h_ */ -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c 2015-07-27 23:13:06.226765901 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c 2015-08-30 07:30:04.812197790 +0200 @@ -0,0 +1,880 @@ +/**************************************************************************** +* @@ -126605,9 +126605,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale + *Operations = &platformOperations; +} + -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.config linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.config ---- linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.config 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.config 2015-07-27 23:13:06.226765901 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.config linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.config +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.config 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.config 2015-08-30 07:30:04.812197790 +0200 @@ -0,0 +1,15 @@ +EXTRA_CFLAGS += -DgcdDEFAULT_CONTIGUOUS_SIZE=134217728 + @@ -126624,9 +126624,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale +EXTRA_CFLAGS += -DLINUX_CMA_FSL=1 +ALLOCATOR_ARRAY_H_LOCATION := $(OS_KERNEL_DIR)/allocator/freescale +CUSTOMER_ALLOCATOR_OBJS := $(ALLOCATOR_ARRAY_H_LOCATION)/gc_hal_kernel_allocator_cma.o -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/Kbuild linux-xbian-imx6/drivers/mxc/gpu-viv/Kbuild ---- linux-4.1.3/drivers/mxc/gpu-viv/Kbuild 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/Kbuild 2015-07-27 23:13:06.166979215 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/Kbuild linux-4.1.6/drivers/mxc/gpu-viv/Kbuild +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/Kbuild 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/Kbuild 2015-08-30 07:30:04.812197790 +0200 @@ -0,0 +1,236 @@ +############################################################################## +# @@ -126864,9 +126864,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/Kbuild linux-xbian-imx6/drivers/mxc/gp +galcore-objs := $(OBJS) + +endif -diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/Kconfig linux-xbian-imx6/drivers/mxc/gpu-viv/Kconfig ---- linux-4.1.3/drivers/mxc/gpu-viv/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/gpu-viv/Kconfig 2015-07-27 23:13:06.166979215 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/gpu-viv/Kconfig linux-4.1.6/drivers/mxc/gpu-viv/Kconfig +--- linux-4.1.6.orig/drivers/mxc/gpu-viv/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/gpu-viv/Kconfig 2015-08-30 07:30:04.812197790 +0200 @@ -0,0 +1,9 @@ +menu "MXC Vivante GPU support" + depends on SOC_IMX6Q @@ -126877,9 +126877,9 @@ diff -Nur linux-4.1.3/drivers/mxc/gpu-viv/Kconfig linux-xbian-imx6/drivers/mxc/g + Say Y to get the GPU driver support. + +endmenu -diff -Nur linux-4.1.3/drivers/mxc/hdmi-cec/Kconfig linux-xbian-imx6/drivers/mxc/hdmi-cec/Kconfig ---- linux-4.1.3/drivers/mxc/hdmi-cec/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/hdmi-cec/Kconfig 2015-07-27 23:13:06.226765901 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/hdmi-cec/Kconfig linux-4.1.6/drivers/mxc/hdmi-cec/Kconfig +--- linux-4.1.6.orig/drivers/mxc/hdmi-cec/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/hdmi-cec/Kconfig 2015-08-30 07:30:04.812197790 +0200 @@ -0,0 +1,11 @@ + +menu "MXC HDMI CEC (Consumer Electronics Control) support" @@ -126892,14 +126892,14 @@ diff -Nur linux-4.1.3/drivers/mxc/hdmi-cec/Kconfig linux-xbian-imx6/drivers/mxc/ + The HDMI CEC device implement low level protocol on i.MX6x platforms. + +endmenu -diff -Nur linux-4.1.3/drivers/mxc/hdmi-cec/Makefile linux-xbian-imx6/drivers/mxc/hdmi-cec/Makefile ---- linux-4.1.3/drivers/mxc/hdmi-cec/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/hdmi-cec/Makefile 2015-07-27 23:13:06.226765901 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/hdmi-cec/Makefile linux-4.1.6/drivers/mxc/hdmi-cec/Makefile +--- linux-4.1.6.orig/drivers/mxc/hdmi-cec/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/hdmi-cec/Makefile 2015-08-30 07:30:04.812197790 +0200 @@ -0,0 +1 @@ +obj-$(CONFIG_MXC_HDMI_CEC) += mxc_hdmi-cec.o -diff -Nur linux-4.1.3/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c linux-xbian-imx6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c ---- linux-4.1.3/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c 2015-07-27 23:13:06.226765901 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c linux-4.1.6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c +--- linux-4.1.6.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c 2015-08-30 07:30:04.812197790 +0200 @@ -0,0 +1,786 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -127687,9 +127687,9 @@ diff -Nur linux-4.1.3/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c linux-xbian-imx6/drive +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:mxc_hdmi_cec"); + -diff -Nur linux-4.1.3/drivers/mxc/hdmi-cec/mxc_hdmi-cec.debug.c linux-xbian-imx6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.debug.c ---- linux-4.1.3/drivers/mxc/hdmi-cec/mxc_hdmi-cec.debug.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.debug.c 2015-07-27 23:13:06.226765901 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.debug.c linux-4.1.6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.debug.c +--- linux-4.1.6.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.debug.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.debug.c 2015-08-30 07:30:04.812197790 +0200 @@ -0,0 +1,765 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -128456,9 +128456,9 @@ diff -Nur linux-4.1.3/drivers/mxc/hdmi-cec/mxc_hdmi-cec.debug.c linux-xbian-imx6 +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:mxc_hdmi_cec"); + -diff -Nur linux-4.1.3/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h linux-xbian-imx6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h ---- linux-4.1.3/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h 2015-07-27 23:13:06.226765901 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h linux-4.1.6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h +--- linux-4.1.6.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h 2015-08-30 07:30:04.812197790 +0200 @@ -0,0 +1,53 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -128513,9 +128513,9 @@ diff -Nur linux-4.1.3/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h linux-xbian-imx6/drive + +#endif /* !_HDMICEC_H_ */ + -diff -Nur linux-4.1.3/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c linux-xbian-imx6/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c ---- linux-4.1.3/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c 2015-07-27 23:13:06.226765901 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c linux-4.1.6/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c +--- linux-4.1.6.orig/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c 2015-08-30 07:30:04.812197790 +0200 @@ -0,0 +1,495 @@ +/* + * Copyright 2009-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -129012,9 +129012,9 @@ diff -Nur linux-4.1.3/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c linux-xbian-imx6 + return status; +} +EXPORT_SYMBOL(ipu_calc_stripes_sizes); -diff -Nur linux-4.1.3/drivers/mxc/ipu3/ipu_capture.c linux-xbian-imx6/drivers/mxc/ipu3/ipu_capture.c ---- linux-4.1.3/drivers/mxc/ipu3/ipu_capture.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/ipu3/ipu_capture.c 2015-07-27 23:13:06.226765901 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/ipu3/ipu_capture.c linux-4.1.6/drivers/mxc/ipu3/ipu_capture.c +--- linux-4.1.6.orig/drivers/mxc/ipu3/ipu_capture.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/ipu3/ipu_capture.c 2015-08-30 07:30:04.812197790 +0200 @@ -0,0 +1,816 @@ +/* + * Copyright 2008-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -129832,9 +129832,9 @@ diff -Nur linux-4.1.3/drivers/mxc/ipu3/ipu_capture.c linux-xbian-imx6/drivers/mx + ipu_free_irq(ipu, irq, ipu); + dev_dbg(ipu->dev, "CSI stop timeout - %d * 10ms\n", 5 - ret); +} -diff -Nur linux-4.1.3/drivers/mxc/ipu3/ipu_common.c linux-xbian-imx6/drivers/mxc/ipu3/ipu_common.c ---- linux-4.1.3/drivers/mxc/ipu3/ipu_common.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/ipu3/ipu_common.c 2015-07-27 23:13:06.226765901 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/ipu3/ipu_common.c linux-4.1.6/drivers/mxc/ipu3/ipu_common.c +--- linux-4.1.6.orig/drivers/mxc/ipu3/ipu_common.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/ipu3/ipu_common.c 2015-08-30 07:30:04.816197530 +0200 @@ -0,0 +1,3151 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -132987,9 +132987,9 @@ diff -Nur linux-4.1.3/drivers/mxc/ipu3/ipu_common.c linux-xbian-imx6/drivers/mxc + +MODULE_DESCRIPTION("i.MX IPU v3 driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.3/drivers/mxc/ipu3/ipu_device.c linux-xbian-imx6/drivers/mxc/ipu3/ipu_device.c ---- linux-4.1.3/drivers/mxc/ipu3/ipu_device.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/ipu3/ipu_device.c 2015-07-27 23:13:06.226765901 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/ipu3/ipu_device.c linux-4.1.6/drivers/mxc/ipu3/ipu_device.c +--- linux-4.1.6.orig/drivers/mxc/ipu3/ipu_device.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/ipu3/ipu_device.c 2015-08-30 07:30:04.816197530 +0200 @@ -0,0 +1,3725 @@ +/* + * Copyright 2005-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -136716,9 +136716,9 @@ diff -Nur linux-4.1.3/drivers/mxc/ipu3/ipu_device.c linux-xbian-imx6/drivers/mxc + major = 0; + } +} -diff -Nur linux-4.1.3/drivers/mxc/ipu3/ipu_disp.c linux-xbian-imx6/drivers/mxc/ipu3/ipu_disp.c ---- linux-4.1.3/drivers/mxc/ipu3/ipu_disp.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/ipu3/ipu_disp.c 2015-07-27 23:13:06.226765901 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/ipu3/ipu_disp.c linux-4.1.6/drivers/mxc/ipu3/ipu_disp.c +--- linux-4.1.6.orig/drivers/mxc/ipu3/ipu_disp.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/ipu3/ipu_disp.c 2015-08-30 07:30:04.816197530 +0200 @@ -0,0 +1,1956 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -138676,9 +138676,9 @@ diff -Nur linux-4.1.3/drivers/mxc/ipu3/ipu_disp.c linux-xbian-imx6/drivers/mxc/i + _ipu_init_dc_mappings(ipu); + _ipu_dmfc_init(ipu, DMFC_NORMAL, 1); +} -diff -Nur linux-4.1.3/drivers/mxc/ipu3/ipu_ic.c linux-xbian-imx6/drivers/mxc/ipu3/ipu_ic.c ---- linux-4.1.3/drivers/mxc/ipu3/ipu_ic.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/ipu3/ipu_ic.c 2015-07-27 23:13:06.226765901 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/ipu3/ipu_ic.c linux-4.1.6/drivers/mxc/ipu3/ipu_ic.c +--- linux-4.1.6.orig/drivers/mxc/ipu3/ipu_ic.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/ipu3/ipu_ic.c 2015-08-30 07:30:04.816197530 +0200 @@ -0,0 +1,924 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -139604,9 +139604,9 @@ diff -Nur linux-4.1.3/drivers/mxc/ipu3/ipu_ic.c linux-xbian-imx6/drivers/mxc/ipu + + ipu_vdi_write(ipu, reg, VDI_C); +} -diff -Nur linux-4.1.3/drivers/mxc/ipu3/ipu_param_mem.h linux-xbian-imx6/drivers/mxc/ipu3/ipu_param_mem.h ---- linux-4.1.3/drivers/mxc/ipu3/ipu_param_mem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/ipu3/ipu_param_mem.h 2015-07-27 23:13:06.226765901 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/ipu3/ipu_param_mem.h linux-4.1.6/drivers/mxc/ipu3/ipu_param_mem.h +--- linux-4.1.6.orig/drivers/mxc/ipu3/ipu_param_mem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/ipu3/ipu_param_mem.h 2015-08-30 07:30:04.816197530 +0200 @@ -0,0 +1,921 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -140529,9 +140529,9 @@ diff -Nur linux-4.1.3/drivers/mxc/ipu3/ipu_param_mem.h linux-xbian-imx6/drivers/ + return false; +} +#endif -diff -Nur linux-4.1.3/drivers/mxc/ipu3/ipu_pixel_clk.c linux-xbian-imx6/drivers/mxc/ipu3/ipu_pixel_clk.c ---- linux-4.1.3/drivers/mxc/ipu3/ipu_pixel_clk.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/ipu3/ipu_pixel_clk.c 2015-07-27 23:13:06.226765901 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/ipu3/ipu_pixel_clk.c linux-4.1.6/drivers/mxc/ipu3/ipu_pixel_clk.c +--- linux-4.1.6.orig/drivers/mxc/ipu3/ipu_pixel_clk.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/ipu3/ipu_pixel_clk.c 2015-08-30 07:30:04.820197269 +0200 @@ -0,0 +1,317 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -140850,9 +140850,9 @@ diff -Nur linux-4.1.3/drivers/mxc/ipu3/ipu_pixel_clk.c linux-xbian-imx6/drivers/ + + return clk; +} -diff -Nur linux-4.1.3/drivers/mxc/ipu3/ipu_prv.h linux-xbian-imx6/drivers/mxc/ipu3/ipu_prv.h ---- linux-4.1.3/drivers/mxc/ipu3/ipu_prv.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/ipu3/ipu_prv.h 2015-07-27 23:13:06.226765901 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/ipu3/ipu_prv.h linux-4.1.6/drivers/mxc/ipu3/ipu_prv.h +--- linux-4.1.6.orig/drivers/mxc/ipu3/ipu_prv.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/ipu3/ipu_prv.h 2015-08-30 07:30:04.820197269 +0200 @@ -0,0 +1,363 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -141217,9 +141217,9 @@ diff -Nur linux-4.1.3/drivers/mxc/ipu3/ipu_prv.h linux-xbian-imx6/drivers/mxc/ip + const char *parent_name, unsigned long flags, + u8 ipu_id, u8 di_id, u8 clk_gate_flags); +#endif /* __INCLUDE_IPU_PRV_H__ */ -diff -Nur linux-4.1.3/drivers/mxc/ipu3/ipu_regs.h linux-xbian-imx6/drivers/mxc/ipu3/ipu_regs.h ---- linux-4.1.3/drivers/mxc/ipu3/ipu_regs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/ipu3/ipu_regs.h 2015-07-27 23:13:06.226765901 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/ipu3/ipu_regs.h linux-4.1.6/drivers/mxc/ipu3/ipu_regs.h +--- linux-4.1.6.orig/drivers/mxc/ipu3/ipu_regs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/ipu3/ipu_regs.h 2015-08-30 07:30:04.820197269 +0200 @@ -0,0 +1,749 @@ +/* + * Copyright (C) 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -141970,23 +141970,23 @@ diff -Nur linux-4.1.3/drivers/mxc/ipu3/ipu_regs.h linux-xbian-imx6/drivers/mxc/i +#define WRG (0x01) + +#endif -diff -Nur linux-4.1.3/drivers/mxc/ipu3/Kconfig linux-xbian-imx6/drivers/mxc/ipu3/Kconfig ---- linux-4.1.3/drivers/mxc/ipu3/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/ipu3/Kconfig 2015-07-27 23:13:06.226765901 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/ipu3/Kconfig linux-4.1.6/drivers/mxc/ipu3/Kconfig +--- linux-4.1.6.orig/drivers/mxc/ipu3/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/ipu3/Kconfig 2015-08-30 07:30:04.820197269 +0200 @@ -0,0 +1,2 @@ +config MXC_IPU_V3_FSL + bool -diff -Nur linux-4.1.3/drivers/mxc/ipu3/Makefile linux-xbian-imx6/drivers/mxc/ipu3/Makefile ---- linux-4.1.3/drivers/mxc/ipu3/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/ipu3/Makefile 2015-07-27 23:13:06.226765901 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/ipu3/Makefile linux-4.1.6/drivers/mxc/ipu3/Makefile +--- linux-4.1.6.orig/drivers/mxc/ipu3/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/ipu3/Makefile 2015-08-30 07:30:04.820197269 +0200 @@ -0,0 +1,4 @@ +obj-$(CONFIG_MXC_IPU_V3_FSL) = mxc_ipu.o + +mxc_ipu-objs := ipu_common.o ipu_ic.o ipu_disp.o ipu_capture.o ipu_device.o \ + ipu_calc_stripes_sizes.o vdoa.o ipu_pixel_clk.o -diff -Nur linux-4.1.3/drivers/mxc/ipu3/vdoa.c linux-xbian-imx6/drivers/mxc/ipu3/vdoa.c ---- linux-4.1.3/drivers/mxc/ipu3/vdoa.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/ipu3/vdoa.c 2015-07-27 23:13:06.230751680 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/ipu3/vdoa.c linux-4.1.6/drivers/mxc/ipu3/vdoa.c +--- linux-4.1.6.orig/drivers/mxc/ipu3/vdoa.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/ipu3/vdoa.c 2015-08-30 07:30:04.820197269 +0200 @@ -0,0 +1,547 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -142535,9 +142535,9 @@ diff -Nur linux-4.1.3/drivers/mxc/ipu3/vdoa.c linux-xbian-imx6/drivers/mxc/ipu3/ +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("i.MX Video Data Order Adapter(VDOA) driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.3/drivers/mxc/ipu3/vdoa.h linux-xbian-imx6/drivers/mxc/ipu3/vdoa.h ---- linux-4.1.3/drivers/mxc/ipu3/vdoa.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/ipu3/vdoa.h 2015-07-27 23:13:06.230751680 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/ipu3/vdoa.h linux-4.1.6/drivers/mxc/ipu3/vdoa.h +--- linux-4.1.6.orig/drivers/mxc/ipu3/vdoa.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/ipu3/vdoa.h 2015-08-30 07:30:04.820197269 +0200 @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -142608,9 +142608,9 @@ diff -Nur linux-4.1.3/drivers/mxc/ipu3/vdoa.h linux-xbian-imx6/drivers/mxc/ipu3/ +void vdoa_get_handle(vdoa_handle_t *handle); +void vdoa_put_handle(vdoa_handle_t *handle); +#endif -diff -Nur linux-4.1.3/drivers/mxc/Kconfig linux-xbian-imx6/drivers/mxc/Kconfig ---- linux-4.1.3/drivers/mxc/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/Kconfig 2015-07-27 23:13:06.166979215 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/Kconfig linux-4.1.6/drivers/mxc/Kconfig +--- linux-4.1.6.orig/drivers/mxc/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/Kconfig 2015-08-30 07:30:04.820197269 +0200 @@ -0,0 +1,25 @@ +# drivers/mxc/Kconfig + @@ -142637,9 +142637,9 @@ diff -Nur linux-4.1.3/drivers/mxc/Kconfig linux-xbian-imx6/drivers/mxc/Kconfig +endmenu + +endif -diff -Nur linux-4.1.3/drivers/mxc/Makefile linux-xbian-imx6/drivers/mxc/Makefile ---- linux-4.1.3/drivers/mxc/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/Makefile 2015-07-27 23:13:06.166979215 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/Makefile linux-4.1.6/drivers/mxc/Makefile +--- linux-4.1.6.orig/drivers/mxc/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/Makefile 2015-08-30 07:30:04.820197269 +0200 @@ -0,0 +1,7 @@ +obj-$(CONFIG_MXC_GPU_VIV) += gpu-viv/ +obj-$(CONFIG_MXC_IPU_V3_FSL) += ipu3/ @@ -142648,9 +142648,9 @@ diff -Nur linux-4.1.3/drivers/mxc/Makefile linux-xbian-imx6/drivers/mxc/Makefile +obj-$(CONFIG_MXC_HDMI_CEC) += hdmi-cec/ +obj-$(CONFIG_MXC_MIPI_CSI2) += mipi/ +obj-$(CONFIG_MXC_MLB) += mlb/ -diff -Nur linux-4.1.3/drivers/mxc/mipi/Kconfig linux-xbian-imx6/drivers/mxc/mipi/Kconfig ---- linux-4.1.3/drivers/mxc/mipi/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/mipi/Kconfig 2015-07-27 23:13:06.230751680 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/mipi/Kconfig linux-4.1.6/drivers/mxc/mipi/Kconfig +--- linux-4.1.6.orig/drivers/mxc/mipi/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/mipi/Kconfig 2015-08-30 07:30:04.820197269 +0200 @@ -0,0 +1,14 @@ +# +# MIPI configuration @@ -142666,17 +142666,17 @@ diff -Nur linux-4.1.3/drivers/mxc/mipi/Kconfig linux-xbian-imx6/drivers/mxc/mipi + Say Y to get the MIPI CSI2 support. + +endmenu -diff -Nur linux-4.1.3/drivers/mxc/mipi/Makefile linux-xbian-imx6/drivers/mxc/mipi/Makefile ---- linux-4.1.3/drivers/mxc/mipi/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/mipi/Makefile 2015-07-27 23:13:06.230751680 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/mipi/Makefile linux-4.1.6/drivers/mxc/mipi/Makefile +--- linux-4.1.6.orig/drivers/mxc/mipi/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/mipi/Makefile 2015-08-30 07:30:04.820197269 +0200 @@ -0,0 +1,4 @@ +# +# Makefile for the mipi interface driver +# +obj-$(CONFIG_MXC_MIPI_CSI2) += mxc_mipi_csi2.o -diff -Nur linux-4.1.3/drivers/mxc/mipi/mxc_mipi_csi2.c linux-xbian-imx6/drivers/mxc/mipi/mxc_mipi_csi2.c ---- linux-4.1.3/drivers/mxc/mipi/mxc_mipi_csi2.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/mipi/mxc_mipi_csi2.c 2015-07-27 23:13:06.230751680 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/mipi/mxc_mipi_csi2.c linux-4.1.6/drivers/mxc/mipi/mxc_mipi_csi2.c +--- linux-4.1.6.orig/drivers/mxc/mipi/mxc_mipi_csi2.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/mipi/mxc_mipi_csi2.c 2015-08-30 07:30:04.820197269 +0200 @@ -0,0 +1,540 @@ +/* + * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -143218,9 +143218,9 @@ diff -Nur linux-4.1.3/drivers/mxc/mipi/mxc_mipi_csi2.c linux-xbian-imx6/drivers/ +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("i.MX MIPI CSI2 driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.3/drivers/mxc/mipi/mxc_mipi_csi2.h linux-xbian-imx6/drivers/mxc/mipi/mxc_mipi_csi2.h ---- linux-4.1.3/drivers/mxc/mipi/mxc_mipi_csi2.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/mipi/mxc_mipi_csi2.h 2015-07-27 23:13:06.230751680 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/mipi/mxc_mipi_csi2.h linux-4.1.6/drivers/mxc/mipi/mxc_mipi_csi2.h +--- linux-4.1.6.orig/drivers/mxc/mipi/mxc_mipi_csi2.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/mipi/mxc_mipi_csi2.h 2015-08-30 07:30:04.820197269 +0200 @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -143268,9 +143268,9 @@ diff -Nur linux-4.1.3/drivers/mxc/mipi/mxc_mipi_csi2.h linux-xbian-imx6/drivers/ +}; + +#endif -diff -Nur linux-4.1.3/drivers/mxc/mlb/Kconfig linux-xbian-imx6/drivers/mxc/mlb/Kconfig ---- linux-4.1.3/drivers/mxc/mlb/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/mlb/Kconfig 2015-07-27 23:13:06.230751680 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/mlb/Kconfig linux-4.1.6/drivers/mxc/mlb/Kconfig +--- linux-4.1.6.orig/drivers/mxc/mlb/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/mlb/Kconfig 2015-08-30 07:30:04.820197269 +0200 @@ -0,0 +1,17 @@ +# +# MLB150 configuration @@ -143289,18 +143289,18 @@ diff -Nur linux-4.1.3/drivers/mxc/mlb/Kconfig linux-xbian-imx6/drivers/mxc/mlb/K + Say Y to get the MLB150 support. + +endmenu -diff -Nur linux-4.1.3/drivers/mxc/mlb/Makefile linux-xbian-imx6/drivers/mxc/mlb/Makefile ---- linux-4.1.3/drivers/mxc/mlb/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/mlb/Makefile 2015-07-27 23:13:06.230751680 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/mlb/Makefile linux-4.1.6/drivers/mxc/mlb/Makefile +--- linux-4.1.6.orig/drivers/mxc/mlb/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/mlb/Makefile 2015-08-30 07:30:04.820197269 +0200 @@ -0,0 +1,5 @@ +# +# Makefile for the i.MX6Q/DL MLB150 driver +# + +obj-$(CONFIG_MXC_MLB150) += mxc_mlb150.o -diff -Nur linux-4.1.3/drivers/mxc/mlb/mxc_mlb150.c linux-xbian-imx6/drivers/mxc/mlb/mxc_mlb150.c ---- linux-4.1.3/drivers/mxc/mlb/mxc_mlb150.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/mlb/mxc_mlb150.c 2015-07-27 23:13:06.230751680 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/mlb/mxc_mlb150.c linux-4.1.6/drivers/mxc/mlb/mxc_mlb150.c +--- linux-4.1.6.orig/drivers/mxc/mlb/mxc_mlb150.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/mlb/mxc_mlb150.c 2015-08-30 07:30:04.820197269 +0200 @@ -0,0 +1,2778 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -146080,9 +146080,9 @@ diff -Nur linux-4.1.3/drivers/mxc/mlb/mxc_mlb150.c linux-xbian-imx6/drivers/mxc/ +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("MLB150 low level driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.3/drivers/mxc/vpu/Kconfig linux-xbian-imx6/drivers/mxc/vpu/Kconfig ---- linux-4.1.3/drivers/mxc/vpu/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/vpu/Kconfig 2015-07-27 23:13:06.230751680 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/vpu/Kconfig linux-4.1.6/drivers/mxc/vpu/Kconfig +--- linux-4.1.6.orig/drivers/mxc/vpu/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/vpu/Kconfig 2015-08-30 07:30:04.820197269 +0200 @@ -0,0 +1,31 @@ +# +# Codec configuration @@ -146115,9 +146115,9 @@ diff -Nur linux-4.1.3/drivers/mxc/vpu/Kconfig linux-xbian-imx6/drivers/mxc/vpu/K + This config is used for special VPU use case. + +endmenu -diff -Nur linux-4.1.3/drivers/mxc/vpu/Makefile linux-xbian-imx6/drivers/mxc/vpu/Makefile ---- linux-4.1.3/drivers/mxc/vpu/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/vpu/Makefile 2015-07-27 23:13:06.230751680 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/vpu/Makefile linux-4.1.6/drivers/mxc/vpu/Makefile +--- linux-4.1.6.orig/drivers/mxc/vpu/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/vpu/Makefile 2015-08-30 07:30:04.820197269 +0200 @@ -0,0 +1,9 @@ +# +# Makefile for the VPU drivers. @@ -146128,9 +146128,9 @@ diff -Nur linux-4.1.3/drivers/mxc/vpu/Makefile linux-xbian-imx6/drivers/mxc/vpu/ +ifeq ($(CONFIG_MXC_VPU_DEBUG),y) +EXTRA_CFLAGS += -DDEBUG +endif -diff -Nur linux-4.1.3/drivers/mxc/vpu/mxc_vpu.c linux-xbian-imx6/drivers/mxc/vpu/mxc_vpu.c ---- linux-4.1.3/drivers/mxc/vpu/mxc_vpu.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/mxc/vpu/mxc_vpu.c 2015-07-27 23:13:06.230751680 +0200 +diff -Nur linux-4.1.6.orig/drivers/mxc/vpu/mxc_vpu.c linux-4.1.6/drivers/mxc/vpu/mxc_vpu.c +--- linux-4.1.6.orig/drivers/mxc/vpu/mxc_vpu.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/mxc/vpu/mxc_vpu.c 2015-08-30 07:30:04.824197009 +0200 @@ -0,0 +1,1344 @@ +/* + * Copyright 2006-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -147476,9 +147476,9 @@ diff -Nur linux-4.1.3/drivers/mxc/vpu/mxc_vpu.c linux-xbian-imx6/drivers/mxc/vpu + +module_init(vpu_init); +module_exit(vpu_exit); -diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c ---- linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c 2015-07-27 23:13:06.848547454 +0200 +diff -Nur linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +--- linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c 2015-08-30 07:30:04.824197009 +0200 @@ -1011,6 +1011,14 @@ return 0; } @@ -147523,9 +147523,9 @@ diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c linux-xbi return 0; } -diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c ---- linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c 2015-07-27 23:13:06.848547454 +0200 +diff -Nur linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c +--- linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c 2015-08-30 07:30:04.824197009 +0200 @@ -129,13 +129,47 @@ RATETAB_ENT(BRCM_RATE_54M, 0), }; @@ -147840,9 +147840,9 @@ diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c linux-x kfree(wiphy->iface_combinations); if (wiphy->bands[IEEE80211_BAND_2GHZ]) { kfree(wiphy->bands[IEEE80211_BAND_2GHZ]->channels); -diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/commonring.c linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/commonring.c ---- linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/commonring.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/commonring.c 2015-07-27 23:13:06.848547454 +0200 +diff -Nur linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/commonring.c linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/commonring.c +--- linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/commonring.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/commonring.c 2015-08-30 07:30:04.824197009 +0200 @@ -22,17 +22,6 @@ #include "core.h" #include "commonring.h" @@ -147885,9 +147885,9 @@ diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/commonring.c linux return ret_addr; } -diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/core.c linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/core.c ---- linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/core.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/core.c 2015-07-27 23:13:06.848547454 +0200 +diff -Nur linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/core.c linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/core.c +--- linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/core.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/core.c 2015-08-30 07:30:04.824197009 +0200 @@ -791,15 +791,15 @@ * in case we missed the BRCMF_E_IF_DEL event. */ @@ -147907,9 +147907,9 @@ diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/core.c linux-xbian return ERR_PTR(-EINVAL); } } -diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/feature.c linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/feature.c ---- linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/feature.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/feature.c 2015-07-27 23:13:06.848547454 +0200 +diff -Nur linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/feature.c linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/feature.c +--- linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/feature.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/feature.c 2015-08-30 07:30:04.824197009 +0200 @@ -124,9 +124,11 @@ struct brcmf_if *ifp = drvr->iflist[0]; @@ -147923,9 +147923,9 @@ diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/feature.c linux-xb brcmf_feat_iovar_int_set(ifp, BRCMF_FEAT_MBSS, "mbss", 0); /* set chip related quirks */ -diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/feature.h linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/feature.h ---- linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/feature.h 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/feature.h 2015-07-27 23:13:06.848547454 +0200 +diff -Nur linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/feature.h linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/feature.h +--- linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/feature.h 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/feature.h 2015-08-30 07:30:04.824197009 +0200 @@ -19,11 +19,15 @@ /* * Features: @@ -147942,9 +147942,9 @@ diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/feature.h linux-xb BRCMF_FEAT_DEF(WOWL) /* * Quirks: -diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/firmware.c linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/firmware.c ---- linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/firmware.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/firmware.c 2015-07-27 23:13:06.848547454 +0200 +diff -Nur linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/firmware.c linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/firmware.c +--- linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/firmware.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/firmware.c 2015-08-30 07:30:04.824197009 +0200 @@ -23,6 +23,10 @@ #include "debug.h" #include "firmware.h" @@ -148228,9 +148228,9 @@ diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/firmware.c linux-x + 0); +} + -diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/firmware.h linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/firmware.h ---- linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/firmware.h 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/firmware.h 2015-07-27 23:13:06.848547454 +0200 +diff -Nur linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/firmware.h linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/firmware.h +--- linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/firmware.h 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/firmware.h 2015-08-30 07:30:04.824197009 +0200 @@ -32,6 +32,12 @@ * fails it will not use the callback, but call device_release_driver() * instead which will call the driver .remove() callback. @@ -148244,9 +148244,9 @@ diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/firmware.h linux-x int brcmf_fw_get_firmwares(struct device *dev, u16 flags, const char *code, const char *nvram, void (*fw_cb)(struct device *dev, -diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/flowring.c linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/flowring.c ---- linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/flowring.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/flowring.c 2015-07-27 23:13:06.848547454 +0200 +diff -Nur linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/flowring.c linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/flowring.c +--- linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/flowring.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/flowring.c 2015-08-30 07:30:04.824197009 +0200 @@ -249,8 +249,8 @@ } @@ -148266,9 +148266,9 @@ diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/flowring.c linux-x } -diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/flowring.h linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/flowring.h ---- linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/flowring.h 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/flowring.h 2015-07-27 23:13:06.848547454 +0200 +diff -Nur linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/flowring.h linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/flowring.h +--- linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/flowring.h 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/flowring.h 2015-08-30 07:30:04.824197009 +0200 @@ -64,8 +64,8 @@ void brcmf_flowring_delete(struct brcmf_flowring *flow, u8 flowid); void brcmf_flowring_open(struct brcmf_flowring *flow, u8 flowid); @@ -148280,9 +148280,9 @@ diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/flowring.h linux-x struct sk_buff *brcmf_flowring_dequeue(struct brcmf_flowring *flow, u8 flowid); void brcmf_flowring_reinsert(struct brcmf_flowring *flow, u8 flowid, struct sk_buff *skb); -diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c ---- linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c 2015-07-27 23:13:06.860504792 +0200 +diff -Nur linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c +--- linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c 2015-08-30 07:30:04.824197009 +0200 @@ -635,7 +635,7 @@ return 0; } @@ -148292,9 +148292,9 @@ diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c linux-x u32 slot_id, struct sk_buff **pktout, bool remove_item) { -diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c ---- linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c 2015-07-27 23:13:06.860504792 +0200 +diff -Nur linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c +--- linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c 2015-08-30 07:30:04.888192855 +0200 @@ -73,7 +73,7 @@ #define BRCMF_MSGBUF_TX_FLUSH_CNT1 32 #define BRCMF_MSGBUF_TX_FLUSH_CNT2 96 @@ -148350,9 +148350,9 @@ diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c linux-xbi return 0; } -diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/of.c linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/of.c ---- linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/of.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/of.c 2015-07-27 23:13:06.868476350 +0200 +diff -Nur linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/of.c linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/of.c +--- linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/of.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/of.c 2015-08-30 07:30:04.888192855 +0200 @@ -39,10 +39,16 @@ if (!sdiodev->pdata) return; @@ -148379,9 +148379,9 @@ diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/of.c linux-xbian-i - if (of_property_read_u32(np, "brcm,drive-strength", &val) == 0) - sdiodev->pdata->drive_strength = val; } -diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/pcie.c linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/pcie.c ---- linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/pcie.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/pcie.c 2015-07-27 23:13:06.868476350 +0200 +diff -Nur linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/pcie.c linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/pcie.c +--- linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/pcie.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/pcie.c 2015-08-30 07:30:04.888192855 +0200 @@ -110,10 +110,12 @@ BRCMF_PCIE_MB_INT_D2H3_DB0 | \ BRCMF_PCIE_MB_INT_D2H3_DB1) @@ -148713,9 +148713,9 @@ diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/pcie.c linux-xbian if (ret == 0) return 0; fail_bus: -diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/sdio.c linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/sdio.c ---- linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/sdio.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/sdio.c 2015-07-27 23:13:06.872462130 +0200 +diff -Nur linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio.c linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/sdio.c +--- linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/sdio.c 2015-08-30 07:30:04.888192855 +0200 @@ -3550,10 +3550,6 @@ return; } @@ -148727,9 +148727,9 @@ diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/sdio.c linux-xbian /* Count the interrupt call */ bus->sdcnt.intrcount++; if (in_interrupt()) -diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/usb.c linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/usb.c ---- linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2015-07-27 23:13:06.872462130 +0200 +diff -Nur linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/usb.c linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/usb.c +--- linux-4.1.6.orig/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2015-08-30 07:30:04.888192855 +0200 @@ -1270,8 +1270,13 @@ bus->chiprev = bus_pub->chiprev; @@ -148746,9 +148746,9 @@ diff -Nur linux-4.1.3/drivers/net/wireless/brcm80211/brcmfmac/usb.c linux-xbian- return 0; fail: -diff -Nur linux-4.1.3/drivers/spi/spi-imx.c linux-xbian-imx6/drivers/spi/spi-imx.c ---- linux-4.1.3/drivers/spi/spi-imx.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/spi/spi-imx.c 2015-07-27 23:13:07.837020693 +0200 +diff -Nur linux-4.1.6.orig/drivers/spi/spi-imx.c linux-4.1.6/drivers/spi/spi-imx.c +--- linux-4.1.6.orig/drivers/spi/spi-imx.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/spi/spi-imx.c 2015-08-30 07:30:04.888192855 +0200 @@ -1,5 +1,5 @@ /* - * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved. @@ -148797,19 +148797,7 @@ diff -Nur linux-4.1.3/drivers/spi/spi-imx.c linux-xbian-imx6/drivers/spi/spi-imx static inline int is_imx27_cspi(struct spi_imx_data *d) { return d->devtype_data->devtype == IMX27_CSPI; -@@ -201,8 +210,9 @@ - { - struct spi_imx_data *spi_imx = spi_master_get_devdata(master); - -- if (spi_imx->dma_is_inited && (transfer->len > spi_imx->rx_wml) -- && (transfer->len > spi_imx->tx_wml)) -+ if (spi_imx->dma_is_inited && -+ (transfer->len > spi_imx_get_fifosize(spi_imx)) && -+ (transfer->len > spi_imx_get_fifosize(spi_imx))) - return true; - return false; - } -@@ -227,6 +237,7 @@ +@@ -228,6 +237,7 @@ #define MX51_ECSPI_INT 0x10 #define MX51_ECSPI_INT_TEEN (1 << 0) #define MX51_ECSPI_INT_RREN (1 << 3) @@ -148817,7 +148805,7 @@ diff -Nur linux-4.1.3/drivers/spi/spi-imx.c linux-xbian-imx6/drivers/spi/spi-imx #define MX51_ECSPI_DMA 0x14 #define MX51_ECSPI_DMA_TX_WML_OFFSET 0 -@@ -291,17 +302,21 @@ +@@ -292,17 +302,21 @@ if (enable & MXC_INT_RR) val |= MX51_ECSPI_INT_RREN; @@ -148842,7 +148830,7 @@ diff -Nur linux-4.1.3/drivers/spi/spi-imx.c linux-xbian-imx6/drivers/spi/spi-imx else reg &= ~MX51_ECSPI_CTRL_SMC; writel(reg, spi_imx->base + MX51_ECSPI_CTRL); -@@ -311,7 +326,6 @@ +@@ -312,7 +326,6 @@ struct spi_imx_config *config) { u32 ctrl = MX51_ECSPI_CTRL_ENABLE, cfg = 0, dma = 0; @@ -148850,7 +148838,7 @@ diff -Nur linux-4.1.3/drivers/spi/spi-imx.c linux-xbian-imx6/drivers/spi/spi-imx u32 clk = config->speed_hz, delay; /* -@@ -368,20 +382,10 @@ +@@ -369,20 +382,10 @@ * and enable DMA request. */ if (spi_imx->dma_is_inited) { @@ -148875,7 +148863,7 @@ diff -Nur linux-4.1.3/drivers/spi/spi-imx.c linux-xbian-imx6/drivers/spi/spi-imx writel(dma, spi_imx->base + MX51_ECSPI_DMA); } -@@ -768,6 +772,7 @@ +@@ -769,6 +772,7 @@ { struct spi_imx_data *spi_imx = spi_master_get_devdata(spi->master); struct spi_imx_config config; @@ -148883,7 +148871,7 @@ diff -Nur linux-4.1.3/drivers/spi/spi-imx.c linux-xbian-imx6/drivers/spi/spi-imx config.bpw = t ? t->bits_per_word : spi->bits_per_word; config.speed_hz = t ? t->speed_hz : spi->max_speed_hz; -@@ -783,12 +788,35 @@ +@@ -784,12 +788,35 @@ if (config.bpw <= 8) { spi_imx->rx = spi_imx_buf_rx_u8; spi_imx->tx = spi_imx_buf_tx_u8; @@ -148919,7 +148907,7 @@ diff -Nur linux-4.1.3/drivers/spi/spi-imx.c linux-xbian-imx6/drivers/spi/spi-imx } spi_imx->devtype_data->config(spi_imx, &config); -@@ -817,7 +845,6 @@ +@@ -818,7 +845,6 @@ struct spi_master *master, const struct resource *res) { @@ -148927,7 +148915,7 @@ diff -Nur linux-4.1.3/drivers/spi/spi-imx.c linux-xbian-imx6/drivers/spi/spi-imx int ret; /* use pio mode for i.mx6dl chip TKT238285 */ -@@ -832,11 +859,11 @@ +@@ -833,11 +859,11 @@ goto err; } @@ -148944,7 +148932,7 @@ diff -Nur linux-4.1.3/drivers/spi/spi-imx.c linux-xbian-imx6/drivers/spi/spi-imx if (ret) { dev_err(dev, "error in TX dma configuration.\n"); goto err; -@@ -850,11 +877,11 @@ +@@ -851,11 +877,11 @@ goto err; } @@ -148961,7 +148949,7 @@ diff -Nur linux-4.1.3/drivers/spi/spi-imx.c linux-xbian-imx6/drivers/spi/spi-imx if (ret) { dev_err(dev, "error in RX dma configuration.\n"); goto err; -@@ -890,14 +917,33 @@ +@@ -891,14 +917,33 @@ complete(&spi_imx->dma_tx_completion); } @@ -148998,7 +148986,7 @@ diff -Nur linux-4.1.3/drivers/spi/spi-imx.c linux-xbian-imx6/drivers/spi/spi-imx struct spi_master *master = spi_imx->bitbang.master; struct sg_table *tx = &transfer->tx_sg, *rx = &transfer->rx_sg; -@@ -914,6 +960,18 @@ +@@ -915,6 +960,18 @@ } if (rx) { @@ -149017,7 +149005,7 @@ diff -Nur linux-4.1.3/drivers/spi/spi-imx.c linux-xbian-imx6/drivers/spi/spi-imx desc_rx = dmaengine_prep_slave_sg(master->dma_rx, rx->sgl, rx->nents, DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); -@@ -929,46 +987,50 @@ +@@ -930,46 +987,50 @@ reinit_completion(&spi_imx->dma_tx_completion); /* Trigger the cspi module. */ @@ -149094,7 +149082,7 @@ diff -Nur linux-4.1.3/drivers/spi/spi-imx.c linux-xbian-imx6/drivers/spi/spi-imx ret = -ETIMEDOUT; else ret = transfer->len; -@@ -1013,6 +1075,7 @@ +@@ -1014,6 +1075,7 @@ spi_imx_can_dma(spi_imx->bitbang.master, spi, transfer)) { spi_imx->usedma = true; ret = spi_imx_dma_transfer(spi_imx, transfer); @@ -149102,7 +149090,7 @@ diff -Nur linux-4.1.3/drivers/spi/spi-imx.c linux-xbian-imx6/drivers/spi/spi-imx if (ret != -EAGAIN) return ret; } -@@ -1200,6 +1263,7 @@ +@@ -1201,6 +1263,7 @@ goto out_clk_put; } @@ -149110,9 +149098,9 @@ diff -Nur linux-4.1.3/drivers/spi/spi-imx.c linux-xbian-imx6/drivers/spi/spi-imx dev_info(&pdev->dev, "probed\n"); clk_disable(spi_imx->clk_ipg); -diff -Nur linux-4.1.3/drivers/video/fbdev/core/fbmon.c linux-xbian-imx6/drivers/video/fbdev/core/fbmon.c ---- linux-4.1.3/drivers/video/fbdev/core/fbmon.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/video/fbdev/core/fbmon.c 2015-07-27 23:13:08.674034323 +0200 +diff -Nur linux-4.1.6.orig/drivers/video/fbdev/core/fbmon.c linux-4.1.6/drivers/video/fbdev/core/fbmon.c +--- linux-4.1.6.orig/drivers/video/fbdev/core/fbmon.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/video/fbdev/core/fbmon.c 2015-08-30 07:30:04.888192855 +0200 @@ -494,7 +494,7 @@ static int get_std_timing(unsigned char *block, struct fb_videomode *mode, int ver, int rev, const struct fb_monspecs *specs) @@ -149155,9 +149143,9 @@ diff -Nur linux-4.1.3/drivers/video/fbdev/core/fbmon.c linux-xbian-imx6/drivers/ if (i < DMT_SIZE && dmt_modes[i].mode) { /* DMT mode found */ *mode = *dmt_modes[i].mode; -diff -Nur linux-4.1.3/drivers/video/fbdev/core/fbsysfs.c linux-xbian-imx6/drivers/video/fbdev/core/fbsysfs.c ---- linux-4.1.3/drivers/video/fbdev/core/fbsysfs.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/video/fbdev/core/fbsysfs.c 2015-07-27 23:13:08.674034323 +0200 +diff -Nur linux-4.1.6.orig/drivers/video/fbdev/core/fbsysfs.c linux-4.1.6/drivers/video/fbdev/core/fbsysfs.c +--- linux-4.1.6.orig/drivers/video/fbdev/core/fbsysfs.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/video/fbdev/core/fbsysfs.c 2015-08-30 07:30:04.892192594 +0200 @@ -20,6 +20,7 @@ #include <linux/fb.h> #include <linux/console.h> @@ -149182,9 +149170,9 @@ diff -Nur linux-4.1.3/drivers/video/fbdev/core/fbsysfs.c linux-xbian-imx6/driver return snprintf(&buf[offset], PAGE_SIZE - offset, "%c:%dx%d%c-%d\n", m, mode->xres, mode->yres, v, mode->refresh); } -diff -Nur linux-4.1.3/drivers/video/Kconfig linux-xbian-imx6/drivers/video/Kconfig ---- linux-4.1.3/drivers/video/Kconfig 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/video/Kconfig 2015-07-27 23:13:08.626204974 +0200 +diff -Nur linux-4.1.6.orig/drivers/video/Kconfig linux-4.1.6/drivers/video/Kconfig +--- linux-4.1.6.orig/drivers/video/Kconfig 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/video/Kconfig 2015-08-30 07:30:04.892192594 +0200 @@ -30,6 +30,8 @@ source "drivers/video/fbdev/Kconfig" endmenu @@ -149194,9 +149182,9 @@ diff -Nur linux-4.1.3/drivers/video/Kconfig linux-xbian-imx6/drivers/video/Kconf source "drivers/video/backlight/Kconfig" config VGASTATE -diff -Nur linux-4.1.3/drivers/video/Makefile linux-xbian-imx6/drivers/video/Makefile ---- linux-4.1.3/drivers/video/Makefile 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/drivers/video/Makefile 2015-07-27 23:13:08.626204974 +0200 +diff -Nur linux-4.1.6.orig/drivers/video/Makefile linux-4.1.6/drivers/video/Makefile +--- linux-4.1.6.orig/drivers/video/Makefile 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/video/Makefile 2015-08-30 07:30:04.892192594 +0200 @@ -6,6 +6,7 @@ obj-y += backlight/ @@ -149205,9 +149193,9 @@ diff -Nur linux-4.1.3/drivers/video/Makefile linux-xbian-imx6/drivers/video/Make obj-$(CONFIG_VIDEOMODE_HELPERS) += display_timing.o videomode.o ifeq ($(CONFIG_OF),y) -diff -Nur linux-4.1.3/drivers/video/mxc/Kconfig linux-xbian-imx6/drivers/video/mxc/Kconfig ---- linux-4.1.3/drivers/video/mxc/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/video/mxc/Kconfig 2015-07-27 23:13:08.749764128 +0200 +diff -Nur linux-4.1.6.orig/drivers/video/mxc/Kconfig linux-4.1.6/drivers/video/mxc/Kconfig +--- linux-4.1.6.orig/drivers/video/mxc/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/video/mxc/Kconfig 2015-08-30 07:30:04.892192594 +0200 @@ -0,0 +1,55 @@ +config FB_MXC + tristate "MXC Framebuffer support" @@ -149264,9 +149252,9 @@ diff -Nur linux-4.1.3/drivers/video/mxc/Kconfig linux-xbian-imx6/drivers/video/m + depends on FB_MXC && I2C + tristate "MXC EDID support" + default y -diff -Nur linux-4.1.3/drivers/video/mxc/ldb.c linux-xbian-imx6/drivers/video/mxc/ldb.c ---- linux-4.1.3/drivers/video/mxc/ldb.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/video/mxc/ldb.c 2015-07-27 23:13:08.749764128 +0200 +diff -Nur linux-4.1.6.orig/drivers/video/mxc/ldb.c linux-4.1.6/drivers/video/mxc/ldb.c +--- linux-4.1.6.orig/drivers/video/mxc/ldb.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/video/mxc/ldb.c 2015-08-30 07:30:04.896192334 +0200 @@ -0,0 +1,1036 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -150304,9 +150292,9 @@ diff -Nur linux-4.1.3/drivers/video/mxc/ldb.c linux-xbian-imx6/drivers/video/mxc +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("MXC LDB driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.3/drivers/video/mxc/Makefile linux-xbian-imx6/drivers/video/mxc/Makefile ---- linux-4.1.3/drivers/video/mxc/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/video/mxc/Makefile 2015-07-27 23:13:08.749764128 +0200 +diff -Nur linux-4.1.6.orig/drivers/video/mxc/Makefile linux-4.1.6/drivers/video/mxc/Makefile +--- linux-4.1.6.orig/drivers/video/mxc/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/video/mxc/Makefile 2015-08-30 07:30:04.896192334 +0200 @@ -0,0 +1,7 @@ +obj-$(CONFIG_FB_MXC_LDB) += ldb.o +obj-$(CONFIG_FB_MXC_MIPI_DSI) += mipi_dsi.o @@ -150315,9 +150303,9 @@ diff -Nur linux-4.1.3/drivers/video/mxc/Makefile linux-xbian-imx6/drivers/video/ +obj-$(CONFIG_FB_MXC_EDID) += mxc_edid.o +obj-$(CONFIG_FB_MXC_SYNC_PANEL) += mxc_dispdrv.o mxc_lcdif.o mxc_ipuv3_fb.o +obj-$(CONFIG_FB_MXC_DCIC) += mxc_dcic.o -diff -Nur linux-4.1.3/drivers/video/mxc/mipi_dsi.c linux-xbian-imx6/drivers/video/mxc/mipi_dsi.c ---- linux-4.1.3/drivers/video/mxc/mipi_dsi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/video/mxc/mipi_dsi.c 2015-07-27 23:13:08.749764128 +0200 +diff -Nur linux-4.1.6.orig/drivers/video/mxc/mipi_dsi.c linux-4.1.6/drivers/video/mxc/mipi_dsi.c +--- linux-4.1.6.orig/drivers/video/mxc/mipi_dsi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/video/mxc/mipi_dsi.c 2015-08-30 07:30:04.896192334 +0200 @@ -0,0 +1,953 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -151272,9 +151260,9 @@ diff -Nur linux-4.1.3/drivers/video/mxc/mipi_dsi.c linux-xbian-imx6/drivers/vide +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("i.MX MIPI DSI driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.3/drivers/video/mxc/mipi_dsi.h linux-xbian-imx6/drivers/video/mxc/mipi_dsi.h ---- linux-4.1.3/drivers/video/mxc/mipi_dsi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/video/mxc/mipi_dsi.h 2015-07-27 23:13:08.749764128 +0200 +diff -Nur linux-4.1.6.orig/drivers/video/mxc/mipi_dsi.h linux-4.1.6/drivers/video/mxc/mipi_dsi.h +--- linux-4.1.6.orig/drivers/video/mxc/mipi_dsi.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/video/mxc/mipi_dsi.h 2015-08-30 07:30:04.896192334 +0200 @@ -0,0 +1,112 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -151388,9 +151376,9 @@ diff -Nur linux-4.1.3/drivers/video/mxc/mipi_dsi.h linux-xbian-imx6/drivers/vide +#endif + +#endif -diff -Nur linux-4.1.3/drivers/video/mxc/mxc_dcic.c linux-xbian-imx6/drivers/video/mxc/mxc_dcic.c ---- linux-4.1.3/drivers/video/mxc/mxc_dcic.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/video/mxc/mxc_dcic.c 2015-07-27 23:13:08.749764128 +0200 +diff -Nur linux-4.1.6.orig/drivers/video/mxc/mxc_dcic.c linux-4.1.6/drivers/video/mxc/mxc_dcic.c +--- linux-4.1.6.orig/drivers/video/mxc/mxc_dcic.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/video/mxc/mxc_dcic.c 2015-08-30 07:30:04.900192075 +0200 @@ -0,0 +1,697 @@ +/* + * Copyright (C) 2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -152089,9 +152077,9 @@ diff -Nur linux-4.1.3/drivers/video/mxc/mxc_dcic.c linux-xbian-imx6/drivers/vide +MODULE_DESCRIPTION("MXC DCIC driver"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:" DRIVER_NAME); -diff -Nur linux-4.1.3/drivers/video/mxc/mxc_dispdrv.c linux-xbian-imx6/drivers/video/mxc/mxc_dispdrv.c ---- linux-4.1.3/drivers/video/mxc/mxc_dispdrv.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/video/mxc/mxc_dispdrv.c 2015-07-27 23:13:08.749764128 +0200 +diff -Nur linux-4.1.6.orig/drivers/video/mxc/mxc_dispdrv.c linux-4.1.6/drivers/video/mxc/mxc_dispdrv.c +--- linux-4.1.6.orig/drivers/video/mxc/mxc_dispdrv.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/video/mxc/mxc_dispdrv.c 2015-08-30 07:30:04.900192075 +0200 @@ -0,0 +1,150 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -152243,9 +152231,9 @@ diff -Nur linux-4.1.3/drivers/video/mxc/mxc_dispdrv.c linux-xbian-imx6/drivers/v + return ERR_PTR(-EINVAL); +} +EXPORT_SYMBOL_GPL(mxc_dispdrv_getdata); -diff -Nur linux-4.1.3/drivers/video/mxc/mxc_dispdrv.h linux-xbian-imx6/drivers/video/mxc/mxc_dispdrv.h ---- linux-4.1.3/drivers/video/mxc/mxc_dispdrv.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/video/mxc/mxc_dispdrv.h 2015-07-27 23:13:08.749764128 +0200 +diff -Nur linux-4.1.6.orig/drivers/video/mxc/mxc_dispdrv.h linux-4.1.6/drivers/video/mxc/mxc_dispdrv.h +--- linux-4.1.6.orig/drivers/video/mxc/mxc_dispdrv.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/video/mxc/mxc_dispdrv.h 2015-08-30 07:30:04.900192075 +0200 @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -152301,9 +152289,9 @@ diff -Nur linux-4.1.3/drivers/video/mxc/mxc_dispdrv.h linux-xbian-imx6/drivers/v +int mxc_dispdrv_setdata(struct mxc_dispdrv_handle *handle, void *data); +void *mxc_dispdrv_getdata(struct mxc_dispdrv_handle *handle); +#endif -diff -Nur linux-4.1.3/drivers/video/mxc/mxc_edid.c linux-xbian-imx6/drivers/video/mxc/mxc_edid.c ---- linux-4.1.3/drivers/video/mxc/mxc_edid.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/video/mxc/mxc_edid.c 2015-07-27 23:13:08.753749907 +0200 +diff -Nur linux-4.1.6.orig/drivers/video/mxc/mxc_edid.c linux-4.1.6/drivers/video/mxc/mxc_edid.c +--- linux-4.1.6.orig/drivers/video/mxc/mxc_edid.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/video/mxc/mxc_edid.c 2015-08-30 07:30:04.900192075 +0200 @@ -0,0 +1,828 @@ +/* + * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -153133,9 +153121,9 @@ diff -Nur linux-4.1.3/drivers/video/mxc/mxc_edid.c linux-xbian-imx6/drivers/vide + return best; +} +EXPORT_SYMBOL(mxc_fb_find_nearest_mode); -diff -Nur linux-4.1.3/drivers/video/mxc/mxcfb_hx8369_wvga.c linux-xbian-imx6/drivers/video/mxc/mxcfb_hx8369_wvga.c ---- linux-4.1.3/drivers/video/mxc/mxcfb_hx8369_wvga.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/video/mxc/mxcfb_hx8369_wvga.c 2015-07-27 23:13:08.753749907 +0200 +diff -Nur linux-4.1.6.orig/drivers/video/mxc/mxcfb_hx8369_wvga.c linux-4.1.6/drivers/video/mxc/mxcfb_hx8369_wvga.c +--- linux-4.1.6.orig/drivers/video/mxc/mxcfb_hx8369_wvga.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/video/mxc/mxcfb_hx8369_wvga.c 2015-08-30 07:30:04.904191817 +0200 @@ -0,0 +1,449 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -153586,9 +153574,9 @@ diff -Nur linux-4.1.3/drivers/video/mxc/mxcfb_hx8369_wvga.c linux-xbian-imx6/dri + mipid_bl_update_status(bl); + return 0; +} -diff -Nur linux-4.1.3/drivers/video/mxc/mxc_hdmi.c linux-xbian-imx6/drivers/video/mxc/mxc_hdmi.c ---- linux-4.1.3/drivers/video/mxc/mxc_hdmi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/video/mxc/mxc_hdmi.c 2015-07-27 23:13:08.753749907 +0200 +diff -Nur linux-4.1.6.orig/drivers/video/mxc/mxc_hdmi.c linux-4.1.6/drivers/video/mxc/mxc_hdmi.c +--- linux-4.1.6.orig/drivers/video/mxc/mxc_hdmi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/video/mxc/mxc_hdmi.c 2015-08-30 07:30:04.904191817 +0200 @@ -0,0 +1,3404 @@ +/* + * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. @@ -156994,9 +156982,9 @@ diff -Nur linux-4.1.3/drivers/video/mxc/mxc_hdmi.c linux-xbian-imx6/drivers/vide +module_exit(mxc_hdmi_i2c_exit); + +MODULE_AUTHOR("Freescale Semiconductor, Inc."); -diff -Nur linux-4.1.3/drivers/video/mxc/mxc_ipuv3_fb.c linux-xbian-imx6/drivers/video/mxc/mxc_ipuv3_fb.c ---- linux-4.1.3/drivers/video/mxc/mxc_ipuv3_fb.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/video/mxc/mxc_ipuv3_fb.c 2015-07-27 23:13:08.753749907 +0200 +diff -Nur linux-4.1.6.orig/drivers/video/mxc/mxc_ipuv3_fb.c linux-4.1.6/drivers/video/mxc/mxc_ipuv3_fb.c +--- linux-4.1.6.orig/drivers/video/mxc/mxc_ipuv3_fb.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/video/mxc/mxc_ipuv3_fb.c 2015-08-30 07:30:04.904191817 +0200 @@ -0,0 +1,2579 @@ +/* + * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -159577,9 +159565,9 @@ diff -Nur linux-4.1.3/drivers/video/mxc/mxc_ipuv3_fb.c linux-xbian-imx6/drivers/ +MODULE_DESCRIPTION("MXC framebuffer driver"); +MODULE_LICENSE("GPL"); +MODULE_SUPPORTED_DEVICE("fb"); -diff -Nur linux-4.1.3/drivers/video/mxc/mxc_lcdif.c linux-xbian-imx6/drivers/video/mxc/mxc_lcdif.c ---- linux-4.1.3/drivers/video/mxc/mxc_lcdif.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/drivers/video/mxc/mxc_lcdif.c 2015-07-27 23:13:08.753749907 +0200 +diff -Nur linux-4.1.6.orig/drivers/video/mxc/mxc_lcdif.c linux-4.1.6/drivers/video/mxc/mxc_lcdif.c +--- linux-4.1.6.orig/drivers/video/mxc/mxc_lcdif.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/drivers/video/mxc/mxc_lcdif.c 2015-08-30 07:30:04.904191817 +0200 @@ -0,0 +1,241 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -159822,9 +159810,9 @@ diff -Nur linux-4.1.3/drivers/video/mxc/mxc_lcdif.c linux-xbian-imx6/drivers/vid +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("i.MX ipuv3 LCD extern port driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.3/firmware/imx/sdma/sdma-imx6q.bin.ihex linux-xbian-imx6/firmware/imx/sdma/sdma-imx6q.bin.ihex ---- linux-4.1.3/firmware/imx/sdma/sdma-imx6q.bin.ihex 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/firmware/imx/sdma/sdma-imx6q.bin.ihex 2015-07-27 23:13:08.841437049 +0200 +diff -Nur linux-4.1.6.orig/firmware/imx/sdma/sdma-imx6q.bin.ihex linux-4.1.6/firmware/imx/sdma/sdma-imx6q.bin.ihex +--- linux-4.1.6.orig/firmware/imx/sdma/sdma-imx6q.bin.ihex 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/firmware/imx/sdma/sdma-imx6q.bin.ihex 2015-08-30 07:30:04.904191817 +0200 @@ -0,0 +1,116 @@ +:1000000053444D4101000000010000001C000000AD +:1000100026000000B40000007A0600008202000002 @@ -159942,9 +159930,9 @@ diff -Nur linux-4.1.3/firmware/imx/sdma/sdma-imx6q.bin.ihex linux-xbian-imx6/fir +:10071000DD6F087FD169010FC86FDD6F037F0101B5 +:0E0720000004129B0700FF680C680002129B89 +:00000001FF -diff -Nur linux-4.1.3/firmware/Makefile linux-xbian-imx6/firmware/Makefile ---- linux-4.1.3/firmware/Makefile 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/firmware/Makefile 2015-07-27 23:13:08.809550816 +0200 +diff -Nur linux-4.1.6.orig/firmware/Makefile linux-4.1.6/firmware/Makefile +--- linux-4.1.6.orig/firmware/Makefile 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/firmware/Makefile 2015-08-30 07:30:04.904191817 +0200 @@ -62,6 +62,7 @@ radeon/RV730_pfp.bin radeon/RV730_me.bin \ radeon/RV710_pfp.bin radeon/RV710_me.bin @@ -159953,9 +159941,9 @@ diff -Nur linux-4.1.3/firmware/Makefile linux-xbian-imx6/firmware/Makefile fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \ e100/d102e_ucode.bin -diff -Nur linux-4.1.3/fs/btrfs/compression.c linux-xbian-imx6/fs/btrfs/compression.c ---- linux-4.1.3/fs/btrfs/compression.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/fs/btrfs/compression.c 2015-07-27 23:13:08.905209516 +0200 +diff -Nur linux-4.1.6.orig/fs/btrfs/compression.c linux-4.1.6/fs/btrfs/compression.c +--- linux-4.1.6.orig/fs/btrfs/compression.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/fs/btrfs/compression.c 2015-08-30 07:30:04.904191817 +0200 @@ -753,6 +753,8 @@ static const struct btrfs_compress_op * const btrfs_compress_op[] = { &btrfs_zlib_compress, @@ -159965,9 +159953,9 @@ diff -Nur linux-4.1.3/fs/btrfs/compression.c linux-xbian-imx6/fs/btrfs/compressi }; void __init btrfs_init_compress(void) -diff -Nur linux-4.1.3/fs/btrfs/compression.h linux-xbian-imx6/fs/btrfs/compression.h ---- linux-4.1.3/fs/btrfs/compression.h 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/fs/btrfs/compression.h 2015-07-27 23:13:08.905209516 +0200 +diff -Nur linux-4.1.6.orig/fs/btrfs/compression.h linux-4.1.6/fs/btrfs/compression.h +--- linux-4.1.6.orig/fs/btrfs/compression.h 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/fs/btrfs/compression.h 2015-08-30 07:30:04.904191817 +0200 @@ -79,5 +79,7 @@ extern const struct btrfs_compress_op btrfs_zlib_compress; @@ -159976,9 +159964,9 @@ diff -Nur linux-4.1.3/fs/btrfs/compression.h linux-xbian-imx6/fs/btrfs/compressi +extern const struct btrfs_compress_op btrfs_lz4hc_compress; #endif -diff -Nur linux-4.1.3/fs/btrfs/ctree.h linux-xbian-imx6/fs/btrfs/ctree.h ---- linux-4.1.3/fs/btrfs/ctree.h 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/fs/btrfs/ctree.h 2015-07-27 23:13:08.909195295 +0200 +diff -Nur linux-4.1.6.orig/fs/btrfs/ctree.h linux-4.1.6/fs/btrfs/ctree.h +--- linux-4.1.6.orig/fs/btrfs/ctree.h 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/fs/btrfs/ctree.h 2015-08-30 07:30:04.908191558 +0200 @@ -504,13 +504,7 @@ #define BTRFS_FEATURE_INCOMPAT_DEFAULT_SUBVOL (1ULL << 1) #define BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS (1ULL << 2) @@ -160015,9 +160003,9 @@ diff -Nur linux-4.1.3/fs/btrfs/ctree.h linux-xbian-imx6/fs/btrfs/ctree.h }; struct btrfs_inode_item { -diff -Nur linux-4.1.3/fs/btrfs/disk-io.c linux-xbian-imx6/fs/btrfs/disk-io.c ---- linux-4.1.3/fs/btrfs/disk-io.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/fs/btrfs/disk-io.c 2015-07-27 23:13:08.909195295 +0200 +diff -Nur linux-4.1.6.orig/fs/btrfs/disk-io.c linux-4.1.6/fs/btrfs/disk-io.c +--- linux-4.1.6.orig/fs/btrfs/disk-io.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/fs/btrfs/disk-io.c 2015-08-30 07:30:04.908191558 +0200 @@ -2703,6 +2703,10 @@ if (tree_root->fs_info->compress_type == BTRFS_COMPRESS_LZO) features |= BTRFS_FEATURE_INCOMPAT_COMPRESS_LZO; @@ -160029,9 +160017,9 @@ diff -Nur linux-4.1.3/fs/btrfs/disk-io.c linux-xbian-imx6/fs/btrfs/disk-io.c if (features & BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA) printk(KERN_INFO "BTRFS: has skinny extents\n"); -diff -Nur linux-4.1.3/fs/btrfs/ioctl.c linux-xbian-imx6/fs/btrfs/ioctl.c ---- linux-4.1.3/fs/btrfs/ioctl.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/fs/btrfs/ioctl.c 2015-07-27 23:13:08.921152633 +0200 +diff -Nur linux-4.1.6.orig/fs/btrfs/ioctl.c linux-4.1.6/fs/btrfs/ioctl.c +--- linux-4.1.6.orig/fs/btrfs/ioctl.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/fs/btrfs/ioctl.c 2015-08-30 07:30:04.948188959 +0200 @@ -1439,6 +1439,10 @@ if (range->compress_type == BTRFS_COMPRESS_LZO) { btrfs_set_fs_incompat(root->fs_info, COMPRESS_LZO); @@ -160043,9 +160031,9 @@ diff -Nur linux-4.1.3/fs/btrfs/ioctl.c linux-xbian-imx6/fs/btrfs/ioctl.c ret = defrag_count; -diff -Nur linux-4.1.3/fs/btrfs/lz4_wrapper.c linux-xbian-imx6/fs/btrfs/lz4_wrapper.c ---- linux-4.1.3/fs/btrfs/lz4_wrapper.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/fs/btrfs/lz4_wrapper.c 2015-07-27 23:13:08.921152633 +0200 +diff -Nur linux-4.1.6.orig/fs/btrfs/lz4_wrapper.c linux-4.1.6/fs/btrfs/lz4_wrapper.c +--- linux-4.1.6.orig/fs/btrfs/lz4_wrapper.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/fs/btrfs/lz4_wrapper.c 2015-08-30 07:30:04.948188959 +0200 @@ -0,0 +1,487 @@ +/* + * Copyright (C) 2008 Oracle. All rights reserved. @@ -160534,9 +160522,9 @@ diff -Nur linux-4.1.3/fs/btrfs/lz4_wrapper.c linux-xbian-imx6/fs/btrfs/lz4_wrapp + .decompress_biovec = lz4_decompress_biovec, + .decompress = lz4_decompress_wrapper, +}; -diff -Nur linux-4.1.3/fs/btrfs/Makefile linux-xbian-imx6/fs/btrfs/Makefile ---- linux-4.1.3/fs/btrfs/Makefile 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/fs/btrfs/Makefile 2015-07-27 23:13:08.901223737 +0200 +diff -Nur linux-4.1.6.orig/fs/btrfs/Makefile linux-4.1.6/fs/btrfs/Makefile +--- linux-4.1.6.orig/fs/btrfs/Makefile 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/fs/btrfs/Makefile 2015-08-30 07:30:04.948188959 +0200 @@ -9,7 +9,7 @@ export.o tree-log.o free-space-cache.o zlib.o lzo.o \ compression.o delayed-ref.o relocation.o delayed-inode.o scrub.o \ @@ -160546,9 +160534,9 @@ diff -Nur linux-4.1.3/fs/btrfs/Makefile linux-xbian-imx6/fs/btrfs/Makefile btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o btrfs-$(CONFIG_BTRFS_FS_CHECK_INTEGRITY) += check-integrity.o -diff -Nur linux-4.1.3/fs/btrfs/super.c linux-xbian-imx6/fs/btrfs/super.c ---- linux-4.1.3/fs/btrfs/super.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/fs/btrfs/super.c 2015-07-27 23:13:08.961010425 +0200 +diff -Nur linux-4.1.6.orig/fs/btrfs/super.c linux-4.1.6/fs/btrfs/super.c +--- linux-4.1.6.orig/fs/btrfs/super.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/fs/btrfs/super.c 2015-08-30 07:30:04.952188699 +0200 @@ -492,6 +492,20 @@ btrfs_clear_opt(info->mount_opt, COMPRESS); btrfs_clear_opt(info->mount_opt, FORCE_COMPRESS); @@ -160586,9 +160574,9 @@ diff -Nur linux-4.1.3/fs/btrfs/super.c linux-xbian-imx6/fs/btrfs/super.c if (btrfs_test_opt(root, FORCE_COMPRESS)) seq_printf(seq, ",compress-force=%s", compress_type); else -diff -Nur linux-4.1.3/include/dt-bindings/clock/imx6qdl-clock.h linux-xbian-imx6/include/dt-bindings/clock/imx6qdl-clock.h ---- linux-4.1.3/include/dt-bindings/clock/imx6qdl-clock.h 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/include/dt-bindings/clock/imx6qdl-clock.h 2015-07-27 23:13:09.467204382 +0200 +diff -Nur linux-4.1.6.orig/include/dt-bindings/clock/imx6qdl-clock.h linux-4.1.6/include/dt-bindings/clock/imx6qdl-clock.h +--- linux-4.1.6.orig/include/dt-bindings/clock/imx6qdl-clock.h 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/include/dt-bindings/clock/imx6qdl-clock.h 2015-08-30 07:30:04.952188699 +0200 @@ -86,8 +86,6 @@ #define IMX6QDL_CLK_GPU3D_SHADER 74 #define IMX6QDL_CLK_IPU1_PODF 75 @@ -160613,9 +160601,9 @@ diff -Nur linux-4.1.3/include/dt-bindings/clock/imx6qdl-clock.h linux-xbian-imx6 +#define IMX6QDL_CLK_END 248 #endif /* __DT_BINDINGS_CLOCK_IMX6QDL_H */ -diff -Nur linux-4.1.3/include/linux/busfreq-imx6.h linux-xbian-imx6/include/linux/busfreq-imx6.h ---- linux-4.1.3/include/linux/busfreq-imx6.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/include/linux/busfreq-imx6.h 2015-07-27 23:13:09.479161721 +0200 +diff -Nur linux-4.1.6.orig/include/linux/busfreq-imx6.h linux-4.1.6/include/linux/busfreq-imx6.h +--- linux-4.1.6.orig/include/linux/busfreq-imx6.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/include/linux/busfreq-imx6.h 2015-08-30 07:30:04.952188699 +0200 @@ -0,0 +1,23 @@ +/* + * Copyright 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -160640,9 +160628,9 @@ diff -Nur linux-4.1.3/include/linux/busfreq-imx6.h linux-xbian-imx6/include/linu +void request_bus_freq(enum bus_freq_mode mode); +void release_bus_freq(enum bus_freq_mode mode); +#endif -diff -Nur linux-4.1.3/include/linux/cgroup_subsys.h linux-xbian-imx6/include/linux/cgroup_subsys.h ---- linux-4.1.3/include/linux/cgroup_subsys.h 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/include/linux/cgroup_subsys.h 2015-07-27 23:13:09.483147501 +0200 +diff -Nur linux-4.1.6.orig/include/linux/cgroup_subsys.h linux-4.1.6/include/linux/cgroup_subsys.h +--- linux-4.1.6.orig/include/linux/cgroup_subsys.h 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/include/linux/cgroup_subsys.h 2015-08-30 07:30:04.952188699 +0200 @@ -35,6 +35,10 @@ SUBSYS(net_cls) #endif @@ -160654,9 +160642,9 @@ diff -Nur linux-4.1.3/include/linux/cgroup_subsys.h linux-xbian-imx6/include/lin #if IS_ENABLED(CONFIG_CGROUP_PERF) SUBSYS(perf_event) #endif -diff -Nur linux-4.1.3/include/linux/device_cooling.h linux-xbian-imx6/include/linux/device_cooling.h ---- linux-4.1.3/include/linux/device_cooling.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/include/linux/device_cooling.h 2015-07-27 23:13:09.491119057 +0200 +diff -Nur linux-4.1.6.orig/include/linux/device_cooling.h linux-4.1.6/include/linux/device_cooling.h +--- linux-4.1.6.orig/include/linux/device_cooling.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/include/linux/device_cooling.h 2015-08-30 07:30:04.952188699 +0200 @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -160703,9 +160691,9 @@ diff -Nur linux-4.1.3/include/linux/device_cooling.h linux-xbian-imx6/include/li +} +#endif +#endif /* __DEVICE_THERMAL_H__ */ -diff -Nur linux-4.1.3/include/linux/fb.h linux-xbian-imx6/include/linux/fb.h ---- linux-4.1.3/include/linux/fb.h 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/include/linux/fb.h 2015-07-27 23:13:09.495104834 +0200 +diff -Nur linux-4.1.6.orig/include/linux/fb.h linux-4.1.6/include/linux/fb.h +--- linux-4.1.6.orig/include/linux/fb.h 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/include/linux/fb.h 2015-08-30 07:30:04.952188699 +0200 @@ -702,7 +702,8 @@ #define FB_MODE_IS_VESA 4 #define FB_MODE_IS_CALCULATED 8 @@ -160716,9 +160704,9 @@ diff -Nur linux-4.1.3/include/linux/fb.h linux-xbian-imx6/include/linux/fb.h extern int fbmon_dpms(const struct fb_info *fb_info); extern int fb_get_mode(int flags, u32 val, struct fb_var_screeninfo *var, -diff -Nur linux-4.1.3/include/linux/ipu.h linux-xbian-imx6/include/linux/ipu.h ---- linux-4.1.3/include/linux/ipu.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/include/linux/ipu.h 2015-07-27 23:13:09.542934188 +0200 +diff -Nur linux-4.1.6.orig/include/linux/ipu.h linux-4.1.6/include/linux/ipu.h +--- linux-4.1.6.orig/include/linux/ipu.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/include/linux/ipu.h 2015-08-30 07:30:04.952188699 +0200 @@ -0,0 +1,38 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. @@ -160758,9 +160746,9 @@ diff -Nur linux-4.1.3/include/linux/ipu.h linux-xbian-imx6/include/linux/ipu.h +int ipu_check_task(struct ipu_task *task); + +#endif -diff -Nur linux-4.1.3/include/linux/ipu-v3.h linux-xbian-imx6/include/linux/ipu-v3.h ---- linux-4.1.3/include/linux/ipu-v3.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/include/linux/ipu-v3.h 2015-07-27 23:13:09.542934188 +0200 +diff -Nur linux-4.1.6.orig/include/linux/ipu-v3.h linux-4.1.6/include/linux/ipu-v3.h +--- linux-4.1.6.orig/include/linux/ipu-v3.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/include/linux/ipu-v3.h 2015-08-30 07:30:04.952188699 +0200 @@ -0,0 +1,752 @@ +/* + * Copyright (c) 2010 Sascha Hauer <s.hauer@pengutronix.de> @@ -161514,9 +161502,9 @@ diff -Nur linux-4.1.3/include/linux/ipu-v3.h linux-xbian-imx6/include/linux/ipu- +}; + +#endif /* __LINUX_IPU_V3_H_ */ -diff -Nur linux-4.1.3/include/linux/mfd/mxc-hdmi-core.h linux-xbian-imx6/include/linux/mfd/mxc-hdmi-core.h ---- linux-4.1.3/include/linux/mfd/mxc-hdmi-core.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/include/linux/mfd/mxc-hdmi-core.h 2015-07-27 23:13:09.586777757 +0200 +diff -Nur linux-4.1.6.orig/include/linux/mfd/mxc-hdmi-core.h linux-4.1.6/include/linux/mfd/mxc-hdmi-core.h +--- linux-4.1.6.orig/include/linux/mfd/mxc-hdmi-core.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/include/linux/mfd/mxc-hdmi-core.h 2015-08-30 07:30:04.952188699 +0200 @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -161586,9 +161574,9 @@ diff -Nur linux-4.1.3/include/linux/mfd/mxc-hdmi-core.h linux-xbian-imx6/include +void hdmi_cec_stop_device(void); + +#endif -diff -Nur linux-4.1.3/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h linux-xbian-imx6/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h ---- linux-4.1.3/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h 2015-07-27 23:13:09.590763539 +0200 +diff -Nur linux-4.1.6.orig/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h linux-4.1.6/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h +--- linux-4.1.6.orig/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h 2015-08-30 07:30:04.952188699 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Freescale Semiconductor, Inc. @@ -161682,9 +161670,9 @@ diff -Nur linux-4.1.3/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h linux-xbian-im +#define IMX6SX_GPR12_RX_EQ_MASK (0x7 << 0) +#define IMX6SX_GPR12_RX_EQ_2 (0x2 << 0) #endif /* __LINUX_IMX6Q_IOMUXC_GPR_H */ -diff -Nur linux-4.1.3/include/linux/mipi_csi2.h linux-xbian-imx6/include/linux/mipi_csi2.h ---- linux-4.1.3/include/linux/mipi_csi2.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/include/linux/mipi_csi2.h 2015-07-27 23:13:09.598735098 +0200 +diff -Nur linux-4.1.6.orig/include/linux/mipi_csi2.h linux-4.1.6/include/linux/mipi_csi2.h +--- linux-4.1.6.orig/include/linux/mipi_csi2.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/include/linux/mipi_csi2.h 2015-08-30 07:30:04.952188699 +0200 @@ -0,0 +1,93 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -161779,9 +161767,9 @@ diff -Nur linux-4.1.3/include/linux/mipi_csi2.h linux-xbian-imx6/include/linux/m +int mipi_csi2_reset(struct mipi_csi2_info *info); + +#endif -diff -Nur linux-4.1.3/include/linux/mipi_dsi.h linux-xbian-imx6/include/linux/mipi_dsi.h ---- linux-4.1.3/include/linux/mipi_dsi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/include/linux/mipi_dsi.h 2015-07-27 23:13:09.598735098 +0200 +diff -Nur linux-4.1.6.orig/include/linux/mipi_dsi.h linux-4.1.6/include/linux/mipi_dsi.h +--- linux-4.1.6.orig/include/linux/mipi_dsi.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/include/linux/mipi_dsi.h 2015-08-30 07:30:04.952188699 +0200 @@ -0,0 +1,171 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -161954,9 +161942,9 @@ diff -Nur linux-4.1.3/include/linux/mipi_dsi.h linux-xbian-imx6/include/linux/mi +#define DSI_PHY_CLK_INIT_COMMAND (0x44) +#define DSI_GEN_PLD_DATA_BUF_SIZE (0x4) +#endif -diff -Nur linux-4.1.3/include/linux/mmc/host.h linux-xbian-imx6/include/linux/mmc/host.h ---- linux-4.1.3/include/linux/mmc/host.h 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/include/linux/mmc/host.h 2015-07-27 23:13:09.602720875 +0200 +diff -Nur linux-4.1.6.orig/include/linux/mmc/host.h linux-4.1.6/include/linux/mmc/host.h +--- linux-4.1.6.orig/include/linux/mmc/host.h 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/include/linux/mmc/host.h 2015-08-30 07:30:04.952188699 +0200 @@ -300,6 +300,11 @@ unsigned long clkgate_delay; #endif @@ -161969,9 +161957,9 @@ diff -Nur linux-4.1.3/include/linux/mmc/host.h linux-xbian-imx6/include/linux/mm /* host specific block data */ unsigned int max_seg_size; /* see blk_queue_max_segment_size */ unsigned short max_segs; /* see blk_queue_max_segments */ -diff -Nur linux-4.1.3/include/linux/mm_types.h linux-xbian-imx6/include/linux/mm_types.h ---- linux-4.1.3/include/linux/mm_types.h 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/include/linux/mm_types.h 2015-07-27 23:13:09.602720875 +0200 +diff -Nur linux-4.1.6.orig/include/linux/mm_types.h linux-4.1.6/include/linux/mm_types.h +--- linux-4.1.6.orig/include/linux/mm_types.h 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/include/linux/mm_types.h 2015-08-30 07:30:04.952188699 +0200 @@ -23,7 +23,7 @@ struct address_space; struct mem_cgroup; @@ -161981,9 +161969,9 @@ diff -Nur linux-4.1.3/include/linux/mm_types.h linux-xbian-imx6/include/linux/mm #define USE_SPLIT_PMD_PTLOCKS (USE_SPLIT_PTE_PTLOCKS && \ IS_ENABLED(CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK)) #define ALLOC_SPLIT_PTLOCKS (SPINLOCK_SIZE > BITS_PER_LONG/8) -diff -Nur linux-4.1.3/include/linux/mxc_asrc.h linux-xbian-imx6/include/linux/mxc_asrc.h ---- linux-4.1.3/include/linux/mxc_asrc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/include/linux/mxc_asrc.h 2015-07-27 23:13:09.606706653 +0200 +diff -Nur linux-4.1.6.orig/include/linux/mxc_asrc.h linux-4.1.6/include/linux/mxc_asrc.h +--- linux-4.1.6.orig/include/linux/mxc_asrc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/include/linux/mxc_asrc.h 2015-08-30 07:30:04.952188699 +0200 @@ -0,0 +1,389 @@ +/* + * Copyright 2008-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -162374,9 +162362,9 @@ diff -Nur linux-4.1.3/include/linux/mxc_asrc.h linux-xbian-imx6/include/linux/mx + u32 in_wm, u32 out_wm); + +#endif/* __MXC_ASRC_H__ */ -diff -Nur linux-4.1.3/include/linux/mxc_dcic.h linux-xbian-imx6/include/linux/mxc_dcic.h ---- linux-4.1.3/include/linux/mxc_dcic.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/include/linux/mxc_dcic.h 2015-07-27 23:13:09.606706653 +0200 +diff -Nur linux-4.1.6.orig/include/linux/mxc_dcic.h linux-4.1.6/include/linux/mxc_dcic.h +--- linux-4.1.6.orig/include/linux/mxc_dcic.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/include/linux/mxc_dcic.h 2015-08-30 07:30:04.952188699 +0200 @@ -0,0 +1,139 @@ +/* + * Copyright (C) 2014 Freescale Semiconductor, Inc. All Rights Reserved @@ -162517,9 +162505,9 @@ diff -Nur linux-4.1.3/include/linux/mxc_dcic.h linux-xbian-imx6/include/linux/mx + u16 client_id; +}; +#endif -diff -Nur linux-4.1.3/include/linux/mxc_vpu.h linux-xbian-imx6/include/linux/mxc_vpu.h ---- linux-4.1.3/include/linux/mxc_vpu.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/include/linux/mxc_vpu.h 2015-07-27 23:13:09.606706653 +0200 +diff -Nur linux-4.1.6.orig/include/linux/mxc_vpu.h linux-4.1.6/include/linux/mxc_vpu.h +--- linux-4.1.6.orig/include/linux/mxc_vpu.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/include/linux/mxc_vpu.h 2015-08-30 07:30:04.952188699 +0200 @@ -0,0 +1,118 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -162639,9 +162627,9 @@ diff -Nur linux-4.1.3/include/linux/mxc_vpu.h linux-xbian-imx6/include/linux/mxc +void vl2cc_cleanup(void); + +#endif -diff -Nur linux-4.1.3/include/linux/platform_data/dma-imx.h linux-xbian-imx6/include/linux/platform_data/dma-imx.h ---- linux-4.1.3/include/linux/platform_data/dma-imx.h 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/include/linux/platform_data/dma-imx.h 2015-07-27 23:13:09.622649772 +0200 +diff -Nur linux-4.1.6.orig/include/linux/platform_data/dma-imx.h linux-4.1.6/include/linux/platform_data/dma-imx.h +--- linux-4.1.6.orig/include/linux/platform_data/dma-imx.h 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/include/linux/platform_data/dma-imx.h 2015-08-30 07:30:04.952188699 +0200 @@ -17,31 +17,30 @@ * This enumerates peripheral types. Used for SDMA. */ @@ -162706,9 +162694,9 @@ diff -Nur linux-4.1.3/include/linux/platform_data/dma-imx.h linux-xbian-imx6/inc }; static inline int imx_dma_is_ipu(struct dma_chan *chan) -diff -Nur linux-4.1.3/include/linux/pxp_device.h linux-xbian-imx6/include/linux/pxp_device.h ---- linux-4.1.3/include/linux/pxp_device.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/include/linux/pxp_device.h 2015-07-27 23:13:09.634607108 +0200 +diff -Nur linux-4.1.6.orig/include/linux/pxp_device.h linux-4.1.6/include/linux/pxp_device.h +--- linux-4.1.6.orig/include/linux/pxp_device.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/include/linux/pxp_device.h 2015-08-30 07:30:04.952188699 +0200 @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2013-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -162778,9 +162766,9 @@ diff -Nur linux-4.1.3/include/linux/pxp_device.h linux-xbian-imx6/include/linux/ +}; + +#endif -diff -Nur linux-4.1.3/include/linux/pxp_dma.h linux-xbian-imx6/include/linux/pxp_dma.h ---- linux-4.1.3/include/linux/pxp_dma.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/include/linux/pxp_dma.h 2015-07-27 23:13:09.634607108 +0200 +diff -Nur linux-4.1.6.orig/include/linux/pxp_dma.h linux-4.1.6/include/linux/pxp_dma.h +--- linux-4.1.6.orig/include/linux/pxp_dma.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/include/linux/pxp_dma.h 2015-08-30 07:30:04.952188699 +0200 @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -162854,9 +162842,9 @@ diff -Nur linux-4.1.3/include/linux/pxp_dma.h linux-xbian-imx6/include/linux/pxp +#endif + +#endif -diff -Nur linux-4.1.3/include/mmc-mxcmmc.h linux-xbian-imx6/include/mmc-mxcmmc.h ---- linux-4.1.3/include/mmc-mxcmmc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/include/mmc-mxcmmc.h 2015-07-27 23:13:09.770123601 +0200 +diff -Nur linux-4.1.6.orig/include/mmc-mxcmmc.h linux-4.1.6/include/mmc-mxcmmc.h +--- linux-4.1.6.orig/include/mmc-mxcmmc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/include/mmc-mxcmmc.h 2015-08-30 07:30:04.952188699 +0200 @@ -0,0 +1,39 @@ +#ifndef ASMARM_ARCH_MMC_H +#define ASMARM_ARCH_MMC_H @@ -162897,9 +162885,9 @@ diff -Nur linux-4.1.3/include/mmc-mxcmmc.h linux-xbian-imx6/include/mmc-mxcmmc.h +}; + +#endif -diff -Nur linux-4.1.3/include/mtd-mxc_nand.h linux-xbian-imx6/include/mtd-mxc_nand.h ---- linux-4.1.3/include/mtd-mxc_nand.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/include/mtd-mxc_nand.h 2015-07-27 23:13:09.770123601 +0200 +diff -Nur linux-4.1.6.orig/include/mtd-mxc_nand.h linux-4.1.6/include/mtd-mxc_nand.h +--- linux-4.1.6.orig/include/mtd-mxc_nand.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/include/mtd-mxc_nand.h 2015-08-30 07:30:04.952188699 +0200 @@ -0,0 +1,32 @@ +/* + * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved. @@ -162933,9 +162921,9 @@ diff -Nur linux-4.1.3/include/mtd-mxc_nand.h linux-xbian-imx6/include/mtd-mxc_na + int nr_parts; /* size of parts */ +}; +#endif /* __ASM_ARCH_NAND_H */ -diff -Nur linux-4.1.3/include/sound/soc.h linux-xbian-imx6/include/sound/soc.h ---- linux-4.1.3/include/sound/soc.h 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/include/sound/soc.h 2015-07-27 23:13:09.837881847 +0200 +diff -Nur linux-4.1.6.orig/include/sound/soc.h linux-4.1.6/include/sound/soc.h +--- linux-4.1.6.orig/include/sound/soc.h 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/include/sound/soc.h 2015-08-30 07:30:04.952188699 +0200 @@ -28,6 +28,18 @@ #include <sound/control.h> #include <sound/ac97_codec.h> @@ -162980,9 +162968,9 @@ diff -Nur linux-4.1.3/include/sound/soc.h linux-xbian-imx6/include/sound/soc.h /* component */ struct snd_soc_component component; -diff -Nur linux-4.1.3/include/sync.h linux-xbian-imx6/include/sync.h ---- linux-4.1.3/include/sync.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/include/sync.h 2015-07-27 23:13:09.837881847 +0200 +diff -Nur linux-4.1.6.orig/include/sync.h linux-4.1.6/include/sync.h +--- linux-4.1.6.orig/include/sync.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/include/sync.h 2015-08-30 07:30:04.952188699 +0200 @@ -0,0 +1,356 @@ +/* + * include/linux/sync.h @@ -163340,9 +163328,9 @@ diff -Nur linux-4.1.3/include/sync.h linux-xbian-imx6/include/sync.h + int wake_flags, void *key); + +#endif /* _LINUX_SYNC_H */ -diff -Nur linux-4.1.3/include/uapi/linux/fb.h linux-xbian-imx6/include/uapi/linux/fb.h ---- linux-4.1.3/include/uapi/linux/fb.h 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/include/uapi/linux/fb.h 2015-07-27 23:13:09.853824963 +0200 +diff -Nur linux-4.1.6.orig/include/uapi/linux/fb.h linux-4.1.6/include/uapi/linux/fb.h +--- linux-4.1.6.orig/include/uapi/linux/fb.h 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/include/uapi/linux/fb.h 2015-08-30 07:30:04.956188439 +0200 @@ -217,14 +217,45 @@ #define FB_SYNC_ON_GREEN 32 /* sync on green */ @@ -163397,9 +163385,9 @@ diff -Nur linux-4.1.3/include/uapi/linux/fb.h linux-xbian-imx6/include/uapi/linu /* * Display rotation support -diff -Nur linux-4.1.3/include/uapi/linux/ipu.h linux-xbian-imx6/include/uapi/linux/ipu.h ---- linux-4.1.3/include/uapi/linux/ipu.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/include/uapi/linux/ipu.h 2015-07-27 23:13:09.861796522 +0200 +diff -Nur linux-4.1.6.orig/include/uapi/linux/ipu.h linux-4.1.6/include/uapi/linux/ipu.h +--- linux-4.1.6.orig/include/uapi/linux/ipu.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/include/uapi/linux/ipu.h 2015-08-30 07:30:04.956188439 +0200 @@ -0,0 +1,282 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved @@ -163683,9 +163671,9 @@ diff -Nur linux-4.1.3/include/uapi/linux/ipu.h linux-xbian-imx6/include/uapi/lin +#define IPU_FREE _IOW('I', 0x4, int) + +#endif -diff -Nur linux-4.1.3/include/uapi/linux/Kbuild linux-xbian-imx6/include/uapi/linux/Kbuild ---- linux-4.1.3/include/uapi/linux/Kbuild 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/include/uapi/linux/Kbuild 2015-07-27 23:13:09.849839184 +0200 +diff -Nur linux-4.1.6.orig/include/uapi/linux/Kbuild linux-4.1.6/include/uapi/linux/Kbuild +--- linux-4.1.6.orig/include/uapi/linux/Kbuild 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/include/uapi/linux/Kbuild 2015-08-30 07:30:04.956188439 +0200 @@ -266,6 +266,9 @@ header-y += msdos_fs.h header-y += msg.h @@ -163703,9 +163691,9 @@ diff -Nur linux-4.1.3/include/uapi/linux/Kbuild linux-xbian-imx6/include/uapi/li + +header-y += pxp_device.h +header-y += pxp_dma.h -diff -Nur linux-4.1.3/include/uapi/linux/mxc_asrc.h linux-xbian-imx6/include/uapi/linux/mxc_asrc.h ---- linux-4.1.3/include/uapi/linux/mxc_asrc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/include/uapi/linux/mxc_asrc.h 2015-07-27 23:13:09.865782301 +0200 +diff -Nur linux-4.1.6.orig/include/uapi/linux/mxc_asrc.h linux-4.1.6/include/uapi/linux/mxc_asrc.h +--- linux-4.1.6.orig/include/uapi/linux/mxc_asrc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/include/uapi/linux/mxc_asrc.h 2015-08-30 07:30:04.956188439 +0200 @@ -0,0 +1,143 @@ +/* + * Copyright 2008-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -163850,9 +163838,9 @@ diff -Nur linux-4.1.3/include/uapi/linux/mxc_asrc.h linux-xbian-imx6/include/uap + ASRC_INPUT_BUFFER_UNDERRUN = 0x10, +}; +#endif/* __MXC_ASRC_UAPI_H__ */ -diff -Nur linux-4.1.3/include/uapi/linux/mxc_dcic.h linux-xbian-imx6/include/uapi/linux/mxc_dcic.h ---- linux-4.1.3/include/uapi/linux/mxc_dcic.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/include/uapi/linux/mxc_dcic.h 2015-07-27 23:13:09.865782301 +0200 +diff -Nur linux-4.1.6.orig/include/uapi/linux/mxc_dcic.h linux-4.1.6/include/uapi/linux/mxc_dcic.h +--- linux-4.1.6.orig/include/uapi/linux/mxc_dcic.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/include/uapi/linux/mxc_dcic.h 2015-08-30 07:30:04.956188439 +0200 @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2014 Freescale Semiconductor, Inc. All Rights Reserved @@ -163903,9 +163891,9 @@ diff -Nur linux-4.1.3/include/uapi/linux/mxc_dcic.h linux-xbian-imx6/include/uap +}; + +#endif -diff -Nur linux-4.1.3/include/uapi/linux/mxcfb.h linux-xbian-imx6/include/uapi/linux/mxcfb.h ---- linux-4.1.3/include/uapi/linux/mxcfb.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/include/uapi/linux/mxcfb.h 2015-07-27 23:13:09.865782301 +0200 +diff -Nur linux-4.1.6.orig/include/uapi/linux/mxcfb.h linux-4.1.6/include/uapi/linux/mxcfb.h +--- linux-4.1.6.orig/include/uapi/linux/mxcfb.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/include/uapi/linux/mxcfb.h 2015-08-30 07:30:04.956188439 +0200 @@ -0,0 +1,176 @@ +/* + * Copyright (C) 2013-2014 Freescale Semiconductor, Inc. All Rights Reserved @@ -164083,9 +164071,9 @@ diff -Nur linux-4.1.3/include/uapi/linux/mxcfb.h linux-xbian-imx6/include/uapi/l +#define MXCFB_DISABLE_EPDC_ACCESS _IO('F', 0x35) +#define MXCFB_ENABLE_EPDC_ACCESS _IO('F', 0x36) +#endif -diff -Nur linux-4.1.3/include/uapi/linux/mxc_mlb.h linux-xbian-imx6/include/uapi/linux/mxc_mlb.h ---- linux-4.1.3/include/uapi/linux/mxc_mlb.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/include/uapi/linux/mxc_mlb.h 2015-07-27 23:13:09.865782301 +0200 +diff -Nur linux-4.1.6.orig/include/uapi/linux/mxc_mlb.h linux-4.1.6/include/uapi/linux/mxc_mlb.h +--- linux-4.1.6.orig/include/uapi/linux/mxc_mlb.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/include/uapi/linux/mxc_mlb.h 2015-08-30 07:30:04.956188439 +0200 @@ -0,0 +1,55 @@ +/* + * mxc_mlb.h @@ -164142,9 +164130,9 @@ diff -Nur linux-4.1.3/include/uapi/linux/mxc_mlb.h linux-xbian-imx6/include/uapi + + +#endif /* _MXC_MLB_H */ -diff -Nur linux-4.1.3/include/uapi/linux/mxc_v4l2.h linux-xbian-imx6/include/uapi/linux/mxc_v4l2.h ---- linux-4.1.3/include/uapi/linux/mxc_v4l2.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/include/uapi/linux/mxc_v4l2.h 2015-07-27 23:13:09.865782301 +0200 +diff -Nur linux-4.1.6.orig/include/uapi/linux/mxc_v4l2.h linux-4.1.6/include/uapi/linux/mxc_v4l2.h +--- linux-4.1.6.orig/include/uapi/linux/mxc_v4l2.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/include/uapi/linux/mxc_v4l2.h 2015-08-30 07:30:04.956188439 +0200 @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved @@ -164202,9 +164190,9 @@ diff -Nur linux-4.1.3/include/uapi/linux/mxc_v4l2.h linux-xbian-imx6/include/uap +}; + +#endif -diff -Nur linux-4.1.3/include/uapi/linux/pxp_device.h linux-xbian-imx6/include/uapi/linux/pxp_device.h ---- linux-4.1.3/include/uapi/linux/pxp_device.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/include/uapi/linux/pxp_device.h 2015-07-27 23:13:09.941512106 +0200 +diff -Nur linux-4.1.6.orig/include/uapi/linux/pxp_device.h linux-4.1.6/include/uapi/linux/pxp_device.h +--- linux-4.1.6.orig/include/uapi/linux/pxp_device.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/include/uapi/linux/pxp_device.h 2015-08-30 07:30:04.956188439 +0200 @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2013-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -164269,9 +164257,9 @@ diff -Nur linux-4.1.3/include/uapi/linux/pxp_device.h linux-xbian-imx6/include/u +#define CACHE_FLUSH 0x4 + +#endif -diff -Nur linux-4.1.3/include/uapi/linux/pxp_dma.h linux-xbian-imx6/include/uapi/linux/pxp_dma.h ---- linux-4.1.3/include/uapi/linux/pxp_dma.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/include/uapi/linux/pxp_dma.h 2015-07-27 23:13:09.941512106 +0200 +diff -Nur linux-4.1.6.orig/include/uapi/linux/pxp_dma.h linux-4.1.6/include/uapi/linux/pxp_dma.h +--- linux-4.1.6.orig/include/uapi/linux/pxp_dma.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/include/uapi/linux/pxp_dma.h 2015-08-30 07:30:04.956188439 +0200 @@ -0,0 +1,173 @@ +/* + * Copyright (C) 2013-2015 Freescale Semiconductor, Inc. All Rights Reserved. @@ -164446,9 +164434,9 @@ diff -Nur linux-4.1.3/include/uapi/linux/pxp_dma.h linux-xbian-imx6/include/uapi + + +#endif -diff -Nur linux-4.1.3/include/uapi/sync.h linux-xbian-imx6/include/uapi/sync.h ---- linux-4.1.3/include/uapi/sync.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/include/uapi/sync.h 2015-07-27 23:13:09.977384118 +0200 +diff -Nur linux-4.1.6.orig/include/uapi/sync.h linux-4.1.6/include/uapi/sync.h +--- linux-4.1.6.orig/include/uapi/sync.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/include/uapi/sync.h 2015-08-30 07:30:04.956188439 +0200 @@ -0,0 +1,97 @@ +/* + * Copyright (C) 2012 Google, Inc. @@ -164547,9 +164535,9 @@ diff -Nur linux-4.1.3/include/uapi/sync.h linux-xbian-imx6/include/uapi/sync.h + struct sync_fence_info_data) + +#endif /* _UAPI_LINUX_SYNC_H */ -diff -Nur linux-4.1.3/include/usb-ehci-mxc.h linux-xbian-imx6/include/usb-ehci-mxc.h ---- linux-4.1.3/include/usb-ehci-mxc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/include/usb-ehci-mxc.h 2015-07-27 23:13:09.981369897 +0200 +diff -Nur linux-4.1.6.orig/include/usb-ehci-mxc.h linux-4.1.6/include/usb-ehci-mxc.h +--- linux-4.1.6.orig/include/usb-ehci-mxc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/include/usb-ehci-mxc.h 2015-08-30 07:30:04.956188439 +0200 @@ -0,0 +1,13 @@ +#ifndef __INCLUDE_ASM_ARCH_MXC_EHCI_H +#define __INCLUDE_ASM_ARCH_MXC_EHCI_H @@ -164564,9 +164552,9 @@ diff -Nur linux-4.1.3/include/usb-ehci-mxc.h linux-xbian-imx6/include/usb-ehci-m + +#endif /* __INCLUDE_ASM_ARCH_MXC_EHCI_H */ + -diff -Nur linux-4.1.3/include/video/mxc_edid.h linux-xbian-imx6/include/video/mxc_edid.h ---- linux-4.1.3/include/video/mxc_edid.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/include/video/mxc_edid.h 2015-07-27 23:13:09.981369897 +0200 +diff -Nur linux-4.1.6.orig/include/video/mxc_edid.h linux-4.1.6/include/video/mxc_edid.h +--- linux-4.1.6.orig/include/video/mxc_edid.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/include/video/mxc_edid.h 2015-08-30 07:30:04.956188439 +0200 @@ -0,0 +1,108 @@ +/* + * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -164676,9 +164664,9 @@ diff -Nur linux-4.1.3/include/video/mxc_edid.h linux-xbian-imx6/include/video/mx +int mxc_edid_fb_mode_is_equal(bool use_aspect, const struct fb_videomode *mode1, + const struct fb_videomode *mode2, u32 mode_mask); +#endif -diff -Nur linux-4.1.3/include/video/mxc_hdmi.h linux-xbian-imx6/include/video/mxc_hdmi.h ---- linux-4.1.3/include/video/mxc_hdmi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/include/video/mxc_hdmi.h 2015-07-27 23:13:09.981369897 +0200 +diff -Nur linux-4.1.6.orig/include/video/mxc_hdmi.h linux-4.1.6/include/video/mxc_hdmi.h +--- linux-4.1.6.orig/include/video/mxc_hdmi.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/include/video/mxc_hdmi.h 2015-08-30 07:30:04.956188439 +0200 @@ -0,0 +1,1027 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. @@ -165707,9 +165695,9 @@ diff -Nur linux-4.1.3/include/video/mxc_hdmi.h linux-xbian-imx6/include/video/mx + + +#endif /* __MXC_HDMI_H__ */ -diff -Nur linux-4.1.3/sound/soc/codecs/hdmi.c linux-xbian-imx6/sound/soc/codecs/hdmi.c ---- linux-4.1.3/sound/soc/codecs/hdmi.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/sound/soc/codecs/hdmi.c 2015-07-27 23:13:11.073473395 +0200 +diff -Nur linux-4.1.6.orig/sound/soc/codecs/hdmi.c linux-4.1.6/sound/soc/codecs/hdmi.c +--- linux-4.1.6.orig/sound/soc/codecs/hdmi.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/sound/soc/codecs/hdmi.c 2015-08-30 07:30:04.956188439 +0200 @@ -47,7 +47,7 @@ SNDRV_PCM_RATE_176400 | SNDRV_PCM_RATE_192000, .formats = SNDRV_PCM_FMTBIT_S16_LE | @@ -165719,9 +165707,9 @@ diff -Nur linux-4.1.3/sound/soc/codecs/hdmi.c linux-xbian-imx6/sound/soc/codecs/ }, .capture = { .stream_name = "Capture", -diff -Nur linux-4.1.3/sound/soc/codecs/sgtl5000.c linux-xbian-imx6/sound/soc/codecs/sgtl5000.c ---- linux-4.1.3/sound/soc/codecs/sgtl5000.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/sound/soc/codecs/sgtl5000.c 2015-07-27 23:13:11.085430733 +0200 +diff -Nur linux-4.1.6.orig/sound/soc/codecs/sgtl5000.c linux-4.1.6/sound/soc/codecs/sgtl5000.c +--- linux-4.1.6.orig/sound/soc/codecs/sgtl5000.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/sound/soc/codecs/sgtl5000.c 2015-08-30 07:30:05.012184804 +0200 @@ -16,7 +16,6 @@ #include <linux/pm.h> #include <linux/i2c.h> @@ -166275,9 +166263,9 @@ diff -Nur linux-4.1.3/sound/soc/codecs/sgtl5000.c linux-xbian-imx6/sound/soc/cod i2c_set_clientdata(client, sgtl5000); /* Ensure sgtl5000 will start with sane register values */ -diff -Nur linux-4.1.3/sound/soc/fsl/fsl_asrc.h linux-xbian-imx6/sound/soc/fsl/fsl_asrc.h ---- linux-4.1.3/sound/soc/fsl/fsl_asrc.h 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/sound/soc/fsl/fsl_asrc.h 2015-07-27 23:13:11.149203200 +0200 +diff -Nur linux-4.1.6.orig/sound/soc/fsl/fsl_asrc.h linux-4.1.6/sound/soc/fsl/fsl_asrc.h +--- linux-4.1.6.orig/sound/soc/fsl/fsl_asrc.h 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/sound/soc/fsl/fsl_asrc.h 2015-08-30 07:30:05.012184804 +0200 @@ -326,7 +326,7 @@ OUTCLK_ASRCK1_CLK = 0x0f, }; @@ -166287,9 +166275,9 @@ diff -Nur linux-4.1.3/sound/soc/fsl/fsl_asrc.h linux-xbian-imx6/sound/soc/fsl/fs enum asrc_word_width { ASRC_WIDTH_24_BIT = 0, -diff -Nur linux-4.1.3/sound/soc/fsl/fsl_esai.c linux-xbian-imx6/sound/soc/fsl/fsl_esai.c ---- linux-4.1.3/sound/soc/fsl/fsl_esai.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/sound/soc/fsl/fsl_esai.c 2015-07-27 23:13:11.149203200 +0200 +diff -Nur linux-4.1.6.orig/sound/soc/fsl/fsl_esai.c linux-4.1.6/sound/soc/fsl/fsl_esai.c +--- linux-4.1.6.orig/sound/soc/fsl/fsl_esai.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/sound/soc/fsl/fsl_esai.c 2015-08-30 07:30:05.012184804 +0200 @@ -839,7 +839,7 @@ return ret; } @@ -166299,9 +166287,9 @@ diff -Nur linux-4.1.3/sound/soc/fsl/fsl_esai.c linux-xbian-imx6/sound/soc/fsl/fs if (ret) dev_err(&pdev->dev, "failed to init imx pcm dma: %d\n", ret); -diff -Nur linux-4.1.3/sound/soc/fsl/fsl_hdmi.c linux-xbian-imx6/sound/soc/fsl/fsl_hdmi.c ---- linux-4.1.3/sound/soc/fsl/fsl_hdmi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/sound/soc/fsl/fsl_hdmi.c 2015-07-27 23:13:11.149203200 +0200 +diff -Nur linux-4.1.6.orig/sound/soc/fsl/fsl_hdmi.c linux-4.1.6/sound/soc/fsl/fsl_hdmi.c +--- linux-4.1.6.orig/sound/soc/fsl/fsl_hdmi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/sound/soc/fsl/fsl_hdmi.c 2015-08-30 07:30:05.012184804 +0200 @@ -0,0 +1,614 @@ +/* + * ALSA SoC HDMI Audio Layer for Freescale i.MX @@ -166917,9 +166905,9 @@ diff -Nur linux-4.1.3/sound/soc/fsl/fsl_hdmi.c linux-xbian-imx6/sound/soc/fsl/fs +MODULE_DESCRIPTION("IMX HDMI TX DAI"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:fsl-hdmi-dai"); -diff -Nur linux-4.1.3/sound/soc/fsl/fsl_sai.c linux-xbian-imx6/sound/soc/fsl/fsl_sai.c ---- linux-4.1.3/sound/soc/fsl/fsl_sai.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/sound/soc/fsl/fsl_sai.c 2015-07-27 23:13:11.149203200 +0200 +diff -Nur linux-4.1.6.orig/sound/soc/fsl/fsl_sai.c linux-4.1.6/sound/soc/fsl/fsl_sai.c +--- linux-4.1.6.orig/sound/soc/fsl/fsl_sai.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/sound/soc/fsl/fsl_sai.c 2015-08-30 07:30:05.012184804 +0200 @@ -1,7 +1,7 @@ /* * Freescale ALSA SoC Digital Audio Interface (SAI) driver. @@ -166938,9 +166926,9 @@ diff -Nur linux-4.1.3/sound/soc/fsl/fsl_sai.c linux-xbian-imx6/sound/soc/fsl/fsl else return devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, SND_DMAENGINE_PCM_FLAG_NO_RESIDUE); -diff -Nur linux-4.1.3/sound/soc/fsl/fsl_spdif.c linux-xbian-imx6/sound/soc/fsl/fsl_spdif.c ---- linux-4.1.3/sound/soc/fsl/fsl_spdif.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/sound/soc/fsl/fsl_spdif.c 2015-07-27 23:13:11.149203200 +0200 +diff -Nur linux-4.1.6.orig/sound/soc/fsl/fsl_spdif.c linux-4.1.6/sound/soc/fsl/fsl_spdif.c +--- linux-4.1.6.orig/sound/soc/fsl/fsl_spdif.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/sound/soc/fsl/fsl_spdif.c 2015-08-30 07:30:05.012184804 +0200 @@ -1,7 +1,7 @@ /* * Freescale S/PDIF ALSA SoC Digital Audio Interface (DAI) driver @@ -167212,9 +167200,9 @@ diff -Nur linux-4.1.3/sound/soc/fsl/fsl_spdif.c linux-xbian-imx6/sound/soc/fsl/f }, .probe = fsl_spdif_probe, }; -diff -Nur linux-4.1.3/sound/soc/fsl/fsl_ssi.c linux-xbian-imx6/sound/soc/fsl/fsl_ssi.c ---- linux-4.1.3/sound/soc/fsl/fsl_ssi.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/sound/soc/fsl/fsl_ssi.c 2015-07-27 23:13:11.153188979 +0200 +diff -Nur linux-4.1.6.orig/sound/soc/fsl/fsl_ssi.c linux-4.1.6/sound/soc/fsl/fsl_ssi.c +--- linux-4.1.6.orig/sound/soc/fsl/fsl_ssi.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/sound/soc/fsl/fsl_ssi.c 2015-08-30 07:30:05.156175457 +0200 @@ -3,7 +3,7 @@ * * Author: Timur Tabi <timur@freescale.com> @@ -169292,9 +169280,9 @@ diff -Nur linux-4.1.3/sound/soc/fsl/fsl_ssi.c linux-xbian-imx6/sound/soc/fsl/fsl }, .probe = fsl_ssi_probe, .remove = fsl_ssi_remove, -diff -Nur linux-4.1.3/sound/soc/fsl/fsl_ssi.h linux-xbian-imx6/sound/soc/fsl/fsl_ssi.h ---- linux-4.1.3/sound/soc/fsl/fsl_ssi.h 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/sound/soc/fsl/fsl_ssi.h 2015-07-27 23:13:11.153188979 +0200 +diff -Nur linux-4.1.6.orig/sound/soc/fsl/fsl_ssi.h linux-4.1.6/sound/soc/fsl/fsl_ssi.h +--- linux-4.1.6.orig/sound/soc/fsl/fsl_ssi.h 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/sound/soc/fsl/fsl_ssi.h 2015-08-30 07:30:05.160175197 +0200 @@ -12,32 +12,33 @@ #ifndef _MPC8610_I2S_H #define _MPC8610_I2S_H @@ -169420,9 +169408,9 @@ diff -Nur linux-4.1.3/sound/soc/fsl/fsl_ssi.h linux-xbian-imx6/sound/soc/fsl/fsl - #endif + -diff -Nur linux-4.1.3/sound/soc/fsl/hdmi_pcm.S linux-xbian-imx6/sound/soc/fsl/hdmi_pcm.S ---- linux-4.1.3/sound/soc/fsl/hdmi_pcm.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/sound/soc/fsl/hdmi_pcm.S 2015-07-27 23:13:11.153188979 +0200 +diff -Nur linux-4.1.6.orig/sound/soc/fsl/hdmi_pcm.S linux-4.1.6/sound/soc/fsl/hdmi_pcm.S +--- linux-4.1.6.orig/sound/soc/fsl/hdmi_pcm.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/sound/soc/fsl/hdmi_pcm.S 2015-08-30 07:30:05.160175197 +0200 @@ -0,0 +1,246 @@ +/** + * Copyright (C) 2010-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -169670,9 +169658,9 @@ diff -Nur linux-4.1.3/sound/soc/fsl/hdmi_pcm.S linux-xbian-imx6/sound/soc/fsl/hd + + vpop {d8} + mov pc, lr -diff -Nur linux-4.1.3/sound/soc/fsl/imx-audmux.c linux-xbian-imx6/sound/soc/fsl/imx-audmux.c ---- linux-4.1.3/sound/soc/fsl/imx-audmux.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/sound/soc/fsl/imx-audmux.c 2015-07-27 23:13:11.153188979 +0200 +diff -Nur linux-4.1.6.orig/sound/soc/fsl/imx-audmux.c linux-4.1.6/sound/soc/fsl/imx-audmux.c +--- linux-4.1.6.orig/sound/soc/fsl/imx-audmux.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/sound/soc/fsl/imx-audmux.c 2015-08-30 07:30:05.160175197 +0200 @@ -67,7 +67,7 @@ { ssize_t ret; @@ -169715,9 +169703,9 @@ diff -Nur linux-4.1.3/sound/soc/fsl/imx-audmux.c linux-xbian-imx6/sound/soc/fsl/ .of_match_table = imx_audmux_dt_ids, } }; -diff -Nur linux-4.1.3/sound/soc/fsl/imx-hdmi.c linux-xbian-imx6/sound/soc/fsl/imx-hdmi.c ---- linux-4.1.3/sound/soc/fsl/imx-hdmi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/sound/soc/fsl/imx-hdmi.c 2015-07-27 23:13:11.153188979 +0200 +diff -Nur linux-4.1.6.orig/sound/soc/fsl/imx-hdmi.c linux-4.1.6/sound/soc/fsl/imx-hdmi.c +--- linux-4.1.6.orig/sound/soc/fsl/imx-hdmi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/sound/soc/fsl/imx-hdmi.c 2015-08-30 07:30:05.160175197 +0200 @@ -0,0 +1,114 @@ +/* + * ASoC HDMI Transmitter driver for IMX development boards @@ -169833,9 +169821,9 @@ diff -Nur linux-4.1.3/sound/soc/fsl/imx-hdmi.c linux-xbian-imx6/sound/soc/fsl/im +MODULE_DESCRIPTION("IMX HDMI TX ASoC driver"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:imx-audio-hdmi"); -diff -Nur linux-4.1.3/sound/soc/fsl/imx-hdmi-dma.c linux-xbian-imx6/sound/soc/fsl/imx-hdmi-dma.c ---- linux-4.1.3/sound/soc/fsl/imx-hdmi-dma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/sound/soc/fsl/imx-hdmi-dma.c 2015-07-27 23:13:11.153188979 +0200 +diff -Nur linux-4.1.6.orig/sound/soc/fsl/imx-hdmi-dma.c linux-4.1.6/sound/soc/fsl/imx-hdmi-dma.c +--- linux-4.1.6.orig/sound/soc/fsl/imx-hdmi-dma.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/sound/soc/fsl/imx-hdmi-dma.c 2015-08-30 07:30:05.164174937 +0200 @@ -0,0 +1,1256 @@ +/* + * imx-hdmi-dma.c -- HDMI DMA driver for ALSA Soc Audio Layer @@ -171093,9 +171081,9 @@ diff -Nur linux-4.1.3/sound/soc/fsl/imx-hdmi-dma.c linux-xbian-imx6/sound/soc/fs +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("i.MX HDMI audio DMA"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.3/sound/soc/fsl/imx-hdmi.h linux-xbian-imx6/sound/soc/fsl/imx-hdmi.h ---- linux-4.1.3/sound/soc/fsl/imx-hdmi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-xbian-imx6/sound/soc/fsl/imx-hdmi.h 2015-07-27 23:13:11.153188979 +0200 +diff -Nur linux-4.1.6.orig/sound/soc/fsl/imx-hdmi.h linux-4.1.6/sound/soc/fsl/imx-hdmi.h +--- linux-4.1.6.orig/sound/soc/fsl/imx-hdmi.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.6/sound/soc/fsl/imx-hdmi.h 2015-08-30 07:30:05.164174937 +0200 @@ -0,0 +1,106 @@ +/* + * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. @@ -171203,9 +171191,9 @@ diff -Nur linux-4.1.3/sound/soc/fsl/imx-hdmi.h linux-xbian-imx6/sound/soc/fsl/im + } while (0) + +#endif /* __IMX_HDMI_H */ -diff -Nur linux-4.1.3/sound/soc/fsl/imx-pcm-dma.c linux-xbian-imx6/sound/soc/fsl/imx-pcm-dma.c ---- linux-4.1.3/sound/soc/fsl/imx-pcm-dma.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/sound/soc/fsl/imx-pcm-dma.c 2015-07-27 23:13:11.153188979 +0200 +diff -Nur linux-4.1.6.orig/sound/soc/fsl/imx-pcm-dma.c linux-4.1.6/sound/soc/fsl/imx-pcm-dma.c +--- linux-4.1.6.orig/sound/soc/fsl/imx-pcm-dma.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/sound/soc/fsl/imx-pcm-dma.c 2015-08-30 07:30:05.164174937 +0200 @@ -43,7 +43,7 @@ .buffer_bytes_max = IMX_SSI_DMABUF_SIZE, .period_bytes_min = 128, @@ -171245,9 +171233,9 @@ diff -Nur linux-4.1.3/sound/soc/fsl/imx-pcm-dma.c linux-xbian-imx6/sound/soc/fsl SND_DMAENGINE_PCM_FLAG_COMPAT); } EXPORT_SYMBOL_GPL(imx_pcm_dma_init); -diff -Nur linux-4.1.3/sound/soc/fsl/imx-pcm.h linux-xbian-imx6/sound/soc/fsl/imx-pcm.h ---- linux-4.1.3/sound/soc/fsl/imx-pcm.h 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/sound/soc/fsl/imx-pcm.h 2015-07-27 23:13:11.153188979 +0200 +diff -Nur linux-4.1.6.orig/sound/soc/fsl/imx-pcm.h linux-4.1.6/sound/soc/fsl/imx-pcm.h +--- linux-4.1.6.orig/sound/soc/fsl/imx-pcm.h 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/sound/soc/fsl/imx-pcm.h 2015-08-30 07:30:05.164174937 +0200 @@ -19,6 +19,10 @@ * Do not change this as the FIQ handler depends on this size */ @@ -171271,9 +171259,9 @@ diff -Nur linux-4.1.3/sound/soc/fsl/imx-pcm.h linux-xbian-imx6/sound/soc/fsl/imx { return -ENODEV; } -diff -Nur linux-4.1.3/sound/soc/fsl/imx-sgtl5000.c linux-xbian-imx6/sound/soc/fsl/imx-sgtl5000.c ---- linux-4.1.3/sound/soc/fsl/imx-sgtl5000.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/sound/soc/fsl/imx-sgtl5000.c 2015-07-27 23:13:11.153188979 +0200 +diff -Nur linux-4.1.6.orig/sound/soc/fsl/imx-sgtl5000.c linux-4.1.6/sound/soc/fsl/imx-sgtl5000.c +--- linux-4.1.6.orig/sound/soc/fsl/imx-sgtl5000.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/sound/soc/fsl/imx-sgtl5000.c 2015-08-30 07:30:05.164174937 +0200 @@ -175,8 +175,10 @@ fail: if (data && !IS_ERR(data->codec_clk)) @@ -171295,9 +171283,9 @@ diff -Nur linux-4.1.3/sound/soc/fsl/imx-sgtl5000.c linux-xbian-imx6/sound/soc/fs .pm = &snd_soc_pm_ops, .of_match_table = imx_sgtl5000_dt_ids, }, -diff -Nur linux-4.1.3/sound/soc/fsl/imx-spdif.c linux-xbian-imx6/sound/soc/fsl/imx-spdif.c ---- linux-4.1.3/sound/soc/fsl/imx-spdif.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/sound/soc/fsl/imx-spdif.c 2015-07-27 23:13:11.153188979 +0200 +diff -Nur linux-4.1.6.orig/sound/soc/fsl/imx-spdif.c linux-4.1.6/sound/soc/fsl/imx-spdif.c +--- linux-4.1.6.orig/sound/soc/fsl/imx-spdif.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/sound/soc/fsl/imx-spdif.c 2015-08-30 07:30:05.168174677 +0200 @@ -66,16 +66,18 @@ if (ret) goto end; @@ -171329,9 +171317,9 @@ diff -Nur linux-4.1.3/sound/soc/fsl/imx-spdif.c linux-xbian-imx6/sound/soc/fsl/i .of_match_table = imx_spdif_dt_ids, }, .probe = imx_spdif_audio_probe, -diff -Nur linux-4.1.3/sound/soc/fsl/imx-ssi.c linux-xbian-imx6/sound/soc/fsl/imx-ssi.c ---- linux-4.1.3/sound/soc/fsl/imx-ssi.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/sound/soc/fsl/imx-ssi.c 2015-07-27 23:13:11.153188979 +0200 +diff -Nur linux-4.1.6.orig/sound/soc/fsl/imx-ssi.c linux-4.1.6/sound/soc/fsl/imx-ssi.c +--- linux-4.1.6.orig/sound/soc/fsl/imx-ssi.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/sound/soc/fsl/imx-ssi.c 2015-08-30 07:30:05.168174677 +0200 @@ -603,7 +603,7 @@ ssi->fiq_params.dma_params_tx = &ssi->dma_params_tx; @@ -171341,9 +171329,9 @@ diff -Nur linux-4.1.3/sound/soc/fsl/imx-ssi.c linux-xbian-imx6/sound/soc/fsl/imx if (ssi->fiq_init && ssi->dma_init) { ret = ssi->fiq_init; -diff -Nur linux-4.1.3/sound/soc/fsl/Kconfig linux-xbian-imx6/sound/soc/fsl/Kconfig ---- linux-4.1.3/sound/soc/fsl/Kconfig 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/sound/soc/fsl/Kconfig 2015-07-27 23:13:11.149203200 +0200 +diff -Nur linux-4.1.6.orig/sound/soc/fsl/Kconfig linux-4.1.6/sound/soc/fsl/Kconfig +--- linux-4.1.6.orig/sound/soc/fsl/Kconfig 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/sound/soc/fsl/Kconfig 2015-08-30 07:30:05.168174677 +0200 @@ -55,6 +55,9 @@ This option is only useful for out-of-tree drivers since in-tree drivers select it automatically. @@ -171404,9 +171392,9 @@ diff -Nur linux-4.1.3/sound/soc/fsl/Kconfig linux-xbian-imx6/sound/soc/fsl/Kconf config SND_SOC_FSL_ASOC_CARD tristate "Generic ASoC Sound Card with ASRC support" depends on OF && I2C -diff -Nur linux-4.1.3/sound/soc/fsl/Makefile linux-xbian-imx6/sound/soc/fsl/Makefile ---- linux-4.1.3/sound/soc/fsl/Makefile 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/sound/soc/fsl/Makefile 2015-07-27 23:13:11.149203200 +0200 +diff -Nur linux-4.1.6.orig/sound/soc/fsl/Makefile linux-4.1.6/sound/soc/fsl/Makefile +--- linux-4.1.6.orig/sound/soc/fsl/Makefile 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/sound/soc/fsl/Makefile 2015-08-30 07:30:05.168174677 +0200 @@ -15,7 +15,8 @@ snd-soc-fsl-asrc-objs := fsl_asrc.o fsl_asrc_dma.o snd-soc-fsl-sai-objs := fsl_sai.o @@ -171449,9 +171437,9 @@ diff -Nur linux-4.1.3/sound/soc/fsl/Makefile linux-xbian-imx6/sound/soc/fsl/Make +obj-$(CONFIG_SND_SOC_IMX_HDMI) += snd-soc-imx-hdmi.o + +AFLAGS_hdmi_pcm.o := -march=armv7-a -mtune=cortex-a9 -mfpu=neon -mfloat-abi=softfp -diff -Nur linux-4.1.3/sound/soc/soc-io.c linux-xbian-imx6/sound/soc/soc-io.c ---- linux-4.1.3/sound/soc/soc-io.c 2015-07-21 19:10:33.000000000 +0200 -+++ linux-xbian-imx6/sound/soc/soc-io.c 2015-07-27 23:13:11.344506380 +0200 +diff -Nur linux-4.1.6.orig/sound/soc/soc-io.c linux-4.1.6/sound/soc/soc-io.c +--- linux-4.1.6.orig/sound/soc/soc-io.c 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/sound/soc/soc-io.c 2015-08-30 07:30:05.168174677 +0200 @@ -17,6 +17,8 @@ #include <linux/export.h> #include <sound/soc.h> |