summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-10-11 18:12:51 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2015-10-11 18:15:39 +0200
commitefbbee334e940d9f9c7634c27ed5604d42c137b0 (patch)
tree53c0025ef37536b0514e7d0200a47873d1533a93 /target
parent8c0b9f4e09abf2f748b6badcc9f3fc5e390b8caf (diff)
fix patch and compile error for 4.1.10 + solidrun
Diffstat (limited to 'target')
-rw-r--r--target/arm/solidrun-imx6/patches/4.1.10/0001-xbian.patch3508
-rw-r--r--target/linux/config/Config.in.graphics2
2 files changed, 1463 insertions, 2047 deletions
diff --git a/target/arm/solidrun-imx6/patches/4.1.10/0001-xbian.patch b/target/arm/solidrun-imx6/patches/4.1.10/0001-xbian.patch
index a8bf90ef0..d2ea38153 100644
--- a/target/arm/solidrun-imx6/patches/4.1.10/0001-xbian.patch
+++ b/target/arm/solidrun-imx6/patches/4.1.10/0001-xbian.patch
@@ -1,6 +1,6 @@
-diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6dl.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6dl.dtsi
---- linux-4.1.6/arch/arm/boot/dts/imx6dl.dtsi 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/boot/dts/imx6dl.dtsi 2015-09-11 17:46:08.539024112 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6dl.dtsi linux-4.1.10/arch/arm/boot/dts/imx6dl.dtsi
+--- linux-4.1.10.orig/arch/arm/boot/dts/imx6dl.dtsi 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/boot/dts/imx6dl.dtsi 2015-10-10 16:41:04.845313887 +0200
@@ -30,7 +30,7 @@
/* kHz uV */
996000 1250000
@@ -157,9 +157,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6dl.dtsi xbian-sources-kernel/arch/ar
-&vpu {
- compatible = "fsl,imx6dl-vpu", "cnm,coda960";
-};
-diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6dl-hummingboard2.dts xbian-sources-kernel/arch/arm/boot/dts/imx6dl-hummingboard2.dts
---- linux-4.1.6/arch/arm/boot/dts/imx6dl-hummingboard2.dts 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/arch/arm/boot/dts/imx6dl-hummingboard2.dts 2015-09-11 17:46:08.539024112 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6dl-hummingboard2.dts linux-4.1.10/arch/arm/boot/dts/imx6dl-hummingboard2.dts
+--- linux-4.1.10.orig/arch/arm/boot/dts/imx6dl-hummingboard2.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/arch/arm/boot/dts/imx6dl-hummingboard2.dts 2015-10-10 16:41:04.965313892 +0200
@@ -0,0 +1,52 @@
+/*
+ * Device Tree file for SolidRun HummingBoard2
@@ -213,9 +213,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6dl-hummingboard2.dts xbian-sources-k
+ model = "SolidRun HummingBoard2 Solo/DualLite";
+ compatible = "solidrun,hummingboard2/dl", "fsl,imx6dl";
+};
-diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
---- linux-4.1.6/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2015-09-11 17:46:08.555023041 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-4.1.10/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
+--- linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2015-10-10 16:41:04.965313892 +0200
@@ -45,11 +45,22 @@
#include <dt-bindings/gpio/gpio.h>
@@ -384,9 +384,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi xbian-sources-kerne
+ dcic_mux = "dcic-lvds1";
+ status = "okay";
};
-diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl.dtsi
---- linux-4.1.6/arch/arm/boot/dts/imx6qdl.dtsi 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl.dtsi 2015-09-11 17:46:08.571021970 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl.dtsi linux-4.1.10/arch/arm/boot/dts/imx6qdl.dtsi
+--- linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl.dtsi 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/boot/dts/imx6qdl.dtsi 2015-10-10 16:41:04.965313892 +0200
@@ -14,6 +14,7 @@
#include <dt-bindings/interrupt-controller/arm-gic.h>
@@ -956,9 +956,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl.dtsi xbian-sources-kernel/arch/a
};
};
};
-diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
---- linux-4.1.6/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi 2015-09-11 17:46:08.571021970 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
+--- linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi 2015-10-10 16:41:04.969313893 +0200
@@ -0,0 +1,686 @@
+/*
+ * Device Tree file for SolidRun HummingBoard2
@@ -1646,9 +1646,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi xbian-sources
+ pinctrl-0 = <&pinctrl_hummingboard2_uart3>;
+ status = "okay";
+};
-diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
---- linux-4.1.6/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi 2015-09-11 17:46:08.571021970 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
+--- linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi 2015-10-10 16:41:04.969313893 +0200
@@ -43,8 +43,11 @@
#include "imx6qdl-microsom-ar8035.dtsi"
@@ -2082,9 +2082,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi xbian-sources-
+ dcic_mux = "dcic-lvds1";
+ status = "okay";
+};
-diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-microsom.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-microsom.dtsi
---- linux-4.1.6/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2015-09-11 17:46:08.571021970 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-microsom.dtsi linux-4.1.10/arch/arm/boot/dts/imx6qdl-microsom.dtsi
+--- linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2015-10-10 16:41:04.969313893 +0200
@@ -39,15 +39,98 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
@@ -2208,9 +2208,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-microsom.dtsi xbian-sources-kern
+ vmmc-supply = <&reg_brcm>;
+ status = "okay";
+};
-diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-sabresd.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
---- linux-4.1.6/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2015-09-11 17:46:08.571021970 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-4.1.10/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+--- linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2015-10-10 16:41:04.969313893 +0200
@@ -57,6 +57,13 @@
enable-active-high;
};
@@ -2284,9 +2284,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-sabresd.dtsi xbian-sources-kerne
&pwm1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pwm1>;
-diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6q.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6q.dtsi
---- linux-4.1.6/arch/arm/boot/dts/imx6q.dtsi 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/boot/dts/imx6q.dtsi 2015-09-11 17:46:08.555023041 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6q.dtsi linux-4.1.10/arch/arm/boot/dts/imx6q.dtsi
+--- linux-4.1.10.orig/arch/arm/boot/dts/imx6q.dtsi 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/boot/dts/imx6q.dtsi 2015-10-10 16:41:04.969313893 +0200
@@ -14,6 +14,7 @@
/ {
@@ -2593,9 +2593,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6q.dtsi xbian-sources-kernel/arch/arm
+ "ldb_di0_div_7", "ldb_di1_div_7",
+ "ldb_di0_div_sel", "ldb_di1_div_sel";
};
-diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6q-hummingboard2.dts xbian-sources-kernel/arch/arm/boot/dts/imx6q-hummingboard2.dts
---- linux-4.1.6/arch/arm/boot/dts/imx6q-hummingboard2.dts 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/arch/arm/boot/dts/imx6q-hummingboard2.dts 2015-09-11 17:46:08.555023041 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6q-hummingboard2.dts linux-4.1.10/arch/arm/boot/dts/imx6q-hummingboard2.dts
+--- linux-4.1.10.orig/arch/arm/boot/dts/imx6q-hummingboard2.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/arch/arm/boot/dts/imx6q-hummingboard2.dts 2015-10-10 16:41:04.973313893 +0200
@@ -0,0 +1,60 @@
+/*
+ * Device Tree file for SolidRun HummingBoard2
@@ -2657,9 +2657,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6q-hummingboard2.dts xbian-sources-ke
+ fsl,transmit-atten-16ths = <9>;
+ fsl,no-spread-spectrum;
+};
-diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6q-hummingboard.dts xbian-sources-kernel/arch/arm/boot/dts/imx6q-hummingboard.dts
---- linux-4.1.6/arch/arm/boot/dts/imx6q-hummingboard.dts 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/boot/dts/imx6q-hummingboard.dts 2015-09-11 17:46:08.555023041 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6q-hummingboard.dts linux-4.1.10/arch/arm/boot/dts/imx6q-hummingboard.dts
+--- linux-4.1.10.orig/arch/arm/boot/dts/imx6q-hummingboard.dts 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/boot/dts/imx6q-hummingboard.dts 2015-10-10 16:41:04.973313893 +0200
@@ -48,6 +48,10 @@
/ {
model = "SolidRun HummingBoard Dual/Quad";
@@ -2679,9 +2679,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6q-hummingboard.dts xbian-sources-ker
+&sgtl5000 {
+ status = "okay";
+};
-diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6sl.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6sl.dtsi
---- linux-4.1.6/arch/arm/boot/dts/imx6sl.dtsi 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/boot/dts/imx6sl.dtsi 2015-09-11 17:46:08.571021970 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6sl.dtsi linux-4.1.10/arch/arm/boot/dts/imx6sl.dtsi
+--- linux-4.1.10.orig/arch/arm/boot/dts/imx6sl.dtsi 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/boot/dts/imx6sl.dtsi 2015-10-10 16:41:04.973313893 +0200
@@ -457,20 +457,21 @@
anatop-min-bit-val = <4>;
anatop-min-voltage = <800000>;
@@ -2732,9 +2732,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6sl.dtsi xbian-sources-kernel/arch/ar
fsl,anatop = <&anatop>;
};
-diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6sx.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6sx.dtsi
---- linux-4.1.6/arch/arm/boot/dts/imx6sx.dtsi 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/boot/dts/imx6sx.dtsi 2015-09-11 17:46:08.571021970 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6sx.dtsi linux-4.1.10/arch/arm/boot/dts/imx6sx.dtsi
+--- linux-4.1.10.orig/arch/arm/boot/dts/imx6sx.dtsi 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/boot/dts/imx6sx.dtsi 2015-10-10 16:41:04.973313893 +0200
@@ -556,20 +556,21 @@
anatop-min-bit-val = <4>;
anatop-min-voltage = <800000>;
@@ -2785,9 +2785,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6sx.dtsi xbian-sources-kernel/arch/ar
fsl,anatop = <&anatop>;
};
-diff -Nur linux-4.1.6/arch/arm/boot/dts/Makefile xbian-sources-kernel/arch/arm/boot/dts/Makefile
---- linux-4.1.6/arch/arm/boot/dts/Makefile 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/boot/dts/Makefile 2015-09-11 17:46:08.487027594 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/Makefile linux-4.1.10/arch/arm/boot/dts/Makefile
+--- linux-4.1.10.orig/arch/arm/boot/dts/Makefile 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/boot/dts/Makefile 2015-10-10 16:41:04.973313893 +0200
@@ -264,6 +264,7 @@
imx6dl-gw54xx.dtb \
imx6dl-gw552x.dtb \
@@ -2804,9 +2804,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/Makefile xbian-sources-kernel/arch/arm/b
imx6q-nitrogen6x.dtb \
imx6q-phytec-pbab01.dtb \
imx6q-rex-pro.dtb \
-diff -Nur linux-4.1.6/arch/arm/configs/imx_v7_cbi_hb_base_defconfig xbian-sources-kernel/arch/arm/configs/imx_v7_cbi_hb_base_defconfig
---- linux-4.1.6/arch/arm/configs/imx_v7_cbi_hb_base_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/arch/arm/configs/imx_v7_cbi_hb_base_defconfig 2015-09-11 17:46:08.655016347 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/configs/imx_v7_cbi_hb_base_defconfig linux-4.1.10/arch/arm/configs/imx_v7_cbi_hb_base_defconfig
+--- linux-4.1.10.orig/arch/arm/configs/imx_v7_cbi_hb_base_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/arch/arm/configs/imx_v7_cbi_hb_base_defconfig 2015-10-10 16:41:04.981313892 +0200
@@ -0,0 +1,367 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_KERNEL_LZO=y
@@ -3175,9 +3175,9 @@ diff -Nur linux-4.1.6/arch/arm/configs/imx_v7_cbi_hb_base_defconfig xbian-source
+CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_IR_GPIO_CIR=m
-diff -Nur linux-4.1.6/arch/arm/configs/imx_v7_cbi_hb_defconfig xbian-sources-kernel/arch/arm/configs/imx_v7_cbi_hb_defconfig
---- linux-4.1.6/arch/arm/configs/imx_v7_cbi_hb_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/arch/arm/configs/imx_v7_cbi_hb_defconfig 2015-09-11 17:46:08.655016347 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/configs/imx_v7_cbi_hb_defconfig linux-4.1.10/arch/arm/configs/imx_v7_cbi_hb_defconfig
+--- linux-4.1.10.orig/arch/arm/configs/imx_v7_cbi_hb_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/arch/arm/configs/imx_v7_cbi_hb_defconfig 2015-10-10 16:41:04.985313893 +0200
@@ -0,0 +1,5139 @@
+#
+# Automatically generated make config: don't edit
@@ -8318,9 +8318,9 @@ diff -Nur linux-4.1.6/arch/arm/configs/imx_v7_cbi_hb_defconfig xbian-sources-ker
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_PROC_DEVICETREE=y
+
-diff -Nur linux-4.1.6/arch/arm/configs/imx_v7_defconfig xbian-sources-kernel/arch/arm/configs/imx_v7_defconfig
---- linux-4.1.6/arch/arm/configs/imx_v7_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/arch/arm/configs/imx_v7_defconfig 2015-09-11 17:46:08.655016347 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/configs/imx_v7_defconfig linux-4.1.10/arch/arm/configs/imx_v7_defconfig
+--- linux-4.1.10.orig/arch/arm/configs/imx_v7_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/arch/arm/configs/imx_v7_defconfig 2015-10-10 16:41:04.985313893 +0200
@@ -0,0 +1,414 @@
+CONFIG_KERNEL_LZO=y
+CONFIG_SYSVIPC=y
@@ -8736,9 +8736,9 @@ diff -Nur linux-4.1.6/arch/arm/configs/imx_v7_defconfig xbian-sources-kernel/arc
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
-diff -Nur linux-4.1.6/arch/arm/configs/imx_v7_mfg_defconfig xbian-sources-kernel/arch/arm/configs/imx_v7_mfg_defconfig
---- linux-4.1.6/arch/arm/configs/imx_v7_mfg_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/arch/arm/configs/imx_v7_mfg_defconfig 2015-09-11 17:46:08.655016347 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/configs/imx_v7_mfg_defconfig linux-4.1.10/arch/arm/configs/imx_v7_mfg_defconfig
+--- linux-4.1.10.orig/arch/arm/configs/imx_v7_mfg_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/arch/arm/configs/imx_v7_mfg_defconfig 2015-10-10 16:41:04.985313893 +0200
@@ -0,0 +1,332 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_KERNEL_LZO=y
@@ -9072,9 +9072,9 @@ diff -Nur linux-4.1.6/arch/arm/configs/imx_v7_mfg_defconfig xbian-sources-kernel
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
-diff -Nur linux-4.1.6/arch/arm/include/asm/glue-cache.h xbian-sources-kernel/arch/arm/include/asm/glue-cache.h
---- linux-4.1.6/arch/arm/include/asm/glue-cache.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/include/asm/glue-cache.h 2015-09-11 17:46:08.695013671 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/include/asm/glue-cache.h linux-4.1.10/arch/arm/include/asm/glue-cache.h
+--- linux-4.1.10.orig/arch/arm/include/asm/glue-cache.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/include/asm/glue-cache.h 2015-10-10 16:41:04.985313893 +0200
@@ -102,19 +102,19 @@
#endif
@@ -9103,10 +9103,10 @@ diff -Nur linux-4.1.6/arch/arm/include/asm/glue-cache.h xbian-sources-kernel/arc
#endif
#if defined(CONFIG_CPU_V7M)
-diff -Nur linux-4.1.6/arch/arm/Kconfig xbian-sources-kernel/arch/arm/Kconfig
---- linux-4.1.6/arch/arm/Kconfig 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/Kconfig 2015-09-11 17:46:08.487027594 +0200
-@@ -1688,6 +1688,7 @@
+diff -Nur linux-4.1.10.orig/arch/arm/Kconfig linux-4.1.10/arch/arm/Kconfig
+--- linux-4.1.10.orig/arch/arm/Kconfig 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/Kconfig 2015-10-10 16:41:05.233313895 +0200
+@@ -1689,6 +1689,7 @@
range 11 64 if ARCH_SHMOBILE_LEGACY
default "12" if SOC_AM33XX
default "9" if SA1111 || ARCH_EFM32
@@ -9114,197 +9114,9 @@ diff -Nur linux-4.1.6/arch/arm/Kconfig xbian-sources-kernel/arch/arm/Kconfig
default "11"
help
The kernel memory allocator divides physically contiguous memory
-diff -Nur linux-4.1.6/arch/arm/mach-bcm/brcmstb.h xbian-sources-kernel/arch/arm/mach-bcm/brcmstb.h
---- linux-4.1.6/arch/arm/mach-bcm/brcmstb.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-bcm/brcmstb.h 1970-01-01 01:00:00.000000000 +0100
-@@ -1,19 +0,0 @@
--/*
-- * Copyright (C) 2013-2014 Broadcom Corporation
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License as
-- * published by the Free Software Foundation version 2.
-- *
-- * This program is distributed "as is" WITHOUT ANY WARRANTY of any
-- * kind, whether express or implied; without even the implied warranty
-- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- * GNU General Public License for more details.
-- */
--
--#ifndef __BRCMSTB_H__
--#define __BRCMSTB_H__
--
--void brcmstb_secondary_startup(void);
--
--#endif /* __BRCMSTB_H__ */
-diff -Nur linux-4.1.6/arch/arm/mach-bcm/headsmp-brcmstb.S xbian-sources-kernel/arch/arm/mach-bcm/headsmp-brcmstb.S
---- linux-4.1.6/arch/arm/mach-bcm/headsmp-brcmstb.S 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-bcm/headsmp-brcmstb.S 1970-01-01 01:00:00.000000000 +0100
-@@ -1,33 +0,0 @@
--/*
-- * SMP boot code for secondary CPUs
-- * Based on arch/arm/mach-tegra/headsmp.S
-- *
-- * Copyright (C) 2010 NVIDIA, Inc.
-- * Copyright (C) 2013-2014 Broadcom Corporation
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License as
-- * published by the Free Software Foundation version 2.
-- *
-- * This program is distributed "as is" WITHOUT ANY WARRANTY of any
-- * kind, whether express or implied; without even the implied warranty
-- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- * GNU General Public License for more details.
-- */
--
--#include <asm/assembler.h>
--#include <linux/linkage.h>
--#include <linux/init.h>
--
-- .section ".text.head", "ax"
--
--ENTRY(brcmstb_secondary_startup)
-- /*
-- * Ensure CPU is in a sane state by disabling all IRQs and switching
-- * into SVC mode.
-- */
-- setmode PSR_I_BIT | PSR_F_BIT | SVC_MODE, r0
--
-- bl v7_invalidate_l1
-- b secondary_startup
--ENDPROC(brcmstb_secondary_startup)
-diff -Nur linux-4.1.6/arch/arm/mach-bcm/Makefile xbian-sources-kernel/arch/arm/mach-bcm/Makefile
---- linux-4.1.6/arch/arm/mach-bcm/Makefile 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-bcm/Makefile 2015-09-11 17:46:08.747010190 +0200
-@@ -43,5 +43,5 @@
- ifeq ($(CONFIG_ARCH_BRCMSTB),y)
- CFLAGS_platsmp-brcmstb.o += -march=armv7-a
- obj-y += brcmstb.o
--obj-$(CONFIG_SMP) += headsmp-brcmstb.o platsmp-brcmstb.o
-+obj-$(CONFIG_SMP) += platsmp-brcmstb.o
- endif
-diff -Nur linux-4.1.6/arch/arm/mach-bcm/platsmp-brcmstb.c xbian-sources-kernel/arch/arm/mach-bcm/platsmp-brcmstb.c
---- linux-4.1.6/arch/arm/mach-bcm/platsmp-brcmstb.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-bcm/platsmp-brcmstb.c 2015-09-11 17:46:08.747010190 +0200
-@@ -30,8 +30,6 @@
- #include <asm/mach-types.h>
- #include <asm/smp_plat.h>
-
--#include "brcmstb.h"
--
- enum {
- ZONE_MAN_CLKEN_MASK = BIT(0),
- ZONE_MAN_RESET_CNTL_MASK = BIT(1),
-@@ -153,7 +151,7 @@
- * Set the reset vector to point to the secondary_startup
- * routine
- */
-- cpu_set_boot_addr(cpu, virt_to_phys(brcmstb_secondary_startup));
-+ cpu_set_boot_addr(cpu, virt_to_phys(secondary_startup));
-
- /* Unhalt the cpu */
- cpu_rst_cfg_set(cpu, 0);
-diff -Nur linux-4.1.6/arch/arm/mach-berlin/headsmp.S xbian-sources-kernel/arch/arm/mach-berlin/headsmp.S
---- linux-4.1.6/arch/arm/mach-berlin/headsmp.S 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-berlin/headsmp.S 2015-09-11 17:46:08.747010190 +0200
-@@ -12,12 +12,6 @@
- #include <linux/init.h>
- #include <asm/assembler.h>
-
--ENTRY(berlin_secondary_startup)
-- ARM_BE8(setend be)
-- bl v7_invalidate_l1
-- b secondary_startup
--ENDPROC(berlin_secondary_startup)
--
- /*
- * If the following instruction is set in the reset exception vector, CPUs
- * will fetch the value of the software reset address vector when being
-diff -Nur linux-4.1.6/arch/arm/mach-berlin/platsmp.c xbian-sources-kernel/arch/arm/mach-berlin/platsmp.c
---- linux-4.1.6/arch/arm/mach-berlin/platsmp.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-berlin/platsmp.c 2015-09-11 17:46:08.747010190 +0200
-@@ -22,7 +22,6 @@
- #define RESET_VECT 0x00
- #define SW_RESET_ADDR 0x94
-
--extern void berlin_secondary_startup(void);
- extern u32 boot_inst;
-
- static void __iomem *cpu_ctrl;
-@@ -85,7 +84,7 @@
- * Write the secondary startup address into the SW reset address
- * vector. This is used by boot_inst.
- */
-- writel(virt_to_phys(berlin_secondary_startup), vectors_base + SW_RESET_ADDR);
-+ writel(virt_to_phys(secondary_startup), vectors_base + SW_RESET_ADDR);
-
- iounmap(vectors_base);
- unmap_scu:
-diff -Nur linux-4.1.6/arch/arm/mach-hisi/core.h xbian-sources-kernel/arch/arm/mach-hisi/core.h
---- linux-4.1.6/arch/arm/mach-hisi/core.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-hisi/core.h 2015-09-11 17:46:08.795006977 +0200
-@@ -12,7 +12,6 @@
- extern int hi3xxx_cpu_kill(unsigned int cpu);
- extern void hi3xxx_set_cpu(int cpu, bool enable);
-
--extern void hisi_secondary_startup(void);
- extern struct smp_operations hix5hd2_smp_ops;
- extern void hix5hd2_set_cpu(int cpu, bool enable);
- extern void hix5hd2_cpu_die(unsigned int cpu);
-diff -Nur linux-4.1.6/arch/arm/mach-hisi/headsmp.S xbian-sources-kernel/arch/arm/mach-hisi/headsmp.S
---- linux-4.1.6/arch/arm/mach-hisi/headsmp.S 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-hisi/headsmp.S 1970-01-01 01:00:00.000000000 +0100
-@@ -1,16 +0,0 @@
--/*
-- * Copyright (c) 2014 Hisilicon Limited.
-- * Copyright (c) 2014 Linaro Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License version 2 as
-- * published by the Free Software Foundation.
-- */
--#include <linux/linkage.h>
--#include <linux/init.h>
--
-- __CPUINIT
--
--ENTRY(hisi_secondary_startup)
-- bl v7_invalidate_l1
-- b secondary_startup
-diff -Nur linux-4.1.6/arch/arm/mach-hisi/Makefile xbian-sources-kernel/arch/arm/mach-hisi/Makefile
---- linux-4.1.6/arch/arm/mach-hisi/Makefile 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-hisi/Makefile 2015-09-11 17:46:08.795006977 +0200
-@@ -6,4 +6,4 @@
-
- obj-y += hisilicon.o
- obj-$(CONFIG_MCPM) += platmcpm.o
--obj-$(CONFIG_SMP) += platsmp.o hotplug.o headsmp.o
-+obj-$(CONFIG_SMP) += platsmp.o hotplug.o
-diff -Nur linux-4.1.6/arch/arm/mach-hisi/platsmp.c xbian-sources-kernel/arch/arm/mach-hisi/platsmp.c
---- linux-4.1.6/arch/arm/mach-hisi/platsmp.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-hisi/platsmp.c 2015-09-11 17:46:08.795006977 +0200
-@@ -118,7 +118,7 @@
- {
- phys_addr_t jumpaddr;
-
-- jumpaddr = virt_to_phys(hisi_secondary_startup);
-+ jumpaddr = virt_to_phys(secondary_startup);
- hix5hd2_set_scu_boot_addr(HIX5HD2_BOOT_ADDRESS, jumpaddr);
- hix5hd2_set_cpu(cpu, true);
- arch_send_wakeup_ipi_mask(cpumask_of(cpu));
-@@ -156,7 +156,7 @@
- struct device_node *node;
-
-
-- jumpaddr = virt_to_phys(hisi_secondary_startup);
-+ jumpaddr = virt_to_phys(secondary_startup);
- hip01_set_boot_addr(HIP01_BOOT_ADDRESS, jumpaddr);
-
- node = of_find_compatible_node(NULL, NULL, "hisilicon,hip01-sysctrl");
-diff -Nur linux-4.1.6/arch/arm/mach-imx/busfreq_ddr3.c xbian-sources-kernel/arch/arm/mach-imx/busfreq_ddr3.c
---- linux-4.1.6/arch/arm/mach-imx/busfreq_ddr3.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/arch/arm/mach-imx/busfreq_ddr3.c 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/busfreq_ddr3.c linux-4.1.10/arch/arm/mach-imx/busfreq_ddr3.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/busfreq_ddr3.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/arch/arm/mach-imx/busfreq_ddr3.c 2015-10-10 16:41:25.125309040 +0200
@@ -0,0 +1,519 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -9825,9 +9637,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/busfreq_ddr3.c xbian-sources-kernel/arch
+
+ return 0;
+}
-diff -Nur linux-4.1.6/arch/arm/mach-imx/busfreq-imx6.c xbian-sources-kernel/arch/arm/mach-imx/busfreq-imx6.c
---- linux-4.1.6/arch/arm/mach-imx/busfreq-imx6.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/arch/arm/mach-imx/busfreq-imx6.c 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/busfreq-imx6.c linux-4.1.10/arch/arm/mach-imx/busfreq-imx6.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/busfreq-imx6.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/arch/arm/mach-imx/busfreq-imx6.c 2015-10-10 16:41:25.125309040 +0200
@@ -0,0 +1,994 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -10823,9 +10635,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/busfreq-imx6.c xbian-sources-kernel/arch
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("BusFreq driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-4.1.6/arch/arm/mach-imx/busfreq_lpddr2.c xbian-sources-kernel/arch/arm/mach-imx/busfreq_lpddr2.c
---- linux-4.1.6/arch/arm/mach-imx/busfreq_lpddr2.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/arch/arm/mach-imx/busfreq_lpddr2.c 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/busfreq_lpddr2.c linux-4.1.10/arch/arm/mach-imx/busfreq_lpddr2.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/busfreq_lpddr2.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/arch/arm/mach-imx/busfreq_lpddr2.c 2015-10-10 16:41:25.125309040 +0200
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2011-2015 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -11010,9 +10822,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/busfreq_lpddr2.c xbian-sources-kernel/ar
+
+ return 0;
+}
-diff -Nur linux-4.1.6/arch/arm/mach-imx/clk.h xbian-sources-kernel/arch/arm/mach-imx/clk.h
---- linux-4.1.6/arch/arm/mach-imx/clk.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/clk.h 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk.h linux-4.1.10/arch/arm/mach-imx/clk.h
+--- linux-4.1.10.orig/arch/arm/mach-imx/clk.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/clk.h 2015-10-10 16:41:25.129309291 +0200
@@ -55,6 +55,34 @@
shift, 0, &imx_ccm_lock, share_count);
}
@@ -11064,9 +10876,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk.h xbian-sources-kernel/arch/arm/mach
static inline struct clk *imx_clk_fixed_factor(const char *name,
const char *parent, unsigned int mult, unsigned int div)
{
-diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx1.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx1.c
---- linux-4.1.6/arch/arm/mach-imx/clk-imx1.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx1.c 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk-imx1.c linux-4.1.10/arch/arm/mach-imx/clk-imx1.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/clk-imx1.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/clk-imx1.c 2015-10-10 16:41:25.129309291 +0200
@@ -75,7 +75,8 @@
int __init mx1_clocks_init(unsigned long fref)
@@ -11086,9 +10898,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx1.c xbian-sources-kernel/arch/arm
return 0;
}
-diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx21.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx21.c
---- linux-4.1.6/arch/arm/mach-imx/clk-imx21.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx21.c 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk-imx21.c linux-4.1.10/arch/arm/mach-imx/clk-imx21.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/clk-imx21.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/clk-imx21.c 2015-10-10 16:41:25.129309291 +0200
@@ -153,7 +153,7 @@
clk_register_clkdev(clk[IMX21_CLK_I2C_GATE], NULL, "imx21-i2c.0");
clk_register_clkdev(clk[IMX21_CLK_OWIRE_GATE], NULL, "mxc_w1.0");
@@ -11098,9 +10910,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx21.c xbian-sources-kernel/arch/ar
return 0;
}
-diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx27.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx27.c
---- linux-4.1.6/arch/arm/mach-imx/clk-imx27.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx27.c 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk-imx27.c linux-4.1.10/arch/arm/mach-imx/clk-imx27.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/clk-imx27.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/clk-imx27.c 2015-10-10 16:41:25.129309291 +0200
@@ -229,7 +229,7 @@
clk_register_clkdev(clk[IMX27_CLK_EMMA_AHB_GATE], "ahb", "m2m-emmaprp.0");
clk_register_clkdev(clk[IMX27_CLK_EMMA_IPG_GATE], "ipg", "m2m-emmaprp.0");
@@ -11110,9 +10922,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx27.c xbian-sources-kernel/arch/ar
return 0;
}
-diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx31.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx31.c
---- linux-4.1.6/arch/arm/mach-imx/clk-imx31.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx31.c 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk-imx31.c linux-4.1.10/arch/arm/mach-imx/clk-imx31.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/clk-imx31.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/clk-imx31.c 2015-10-10 16:41:25.129309291 +0200
@@ -50,9 +50,12 @@
int __init mx31_clocks_init(unsigned long fref)
@@ -11136,9 +10948,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx31.c xbian-sources-kernel/arch/ar
return 0;
}
-diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx35.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx35.c
---- linux-4.1.6/arch/arm/mach-imx/clk-imx35.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx35.c 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk-imx35.c linux-4.1.10/arch/arm/mach-imx/clk-imx35.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/clk-imx35.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/clk-imx35.c 2015-10-10 16:41:25.129309291 +0200
@@ -71,11 +71,14 @@
int __init mx35_clocks_init(void)
@@ -11164,9 +10976,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx35.c xbian-sources-kernel/arch/ar
#endif
return 0;
-diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx6q.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx6q.c
---- linux-4.1.6/arch/arm/mach-imx/clk-imx6q.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx6q.c 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk-imx6q.c linux-4.1.10/arch/arm/mach-imx/clk-imx6q.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/clk-imx6q.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/clk-imx6q.c 2015-10-10 16:41:25.133309588 +0200
@@ -24,7 +24,6 @@
#include "clk.h"
#include "common.h"
@@ -11489,9 +11301,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx6q.c xbian-sources-kernel/arch/ar
+ }
}
CLK_OF_DECLARE(imx6q, "fsl,imx6q-ccm", imx6q_clocks_init);
-diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx6sl.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx6sl.c
---- linux-4.1.6/arch/arm/mach-imx/clk-imx6sl.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx6sl.c 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk-imx6sl.c linux-4.1.10/arch/arm/mach-imx/clk-imx6sl.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/clk-imx6sl.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/clk-imx6sl.c 2015-10-10 16:41:25.133309588 +0200
@@ -288,9 +288,6 @@
WARN_ON(!base);
ccm_base = base;
@@ -11511,9 +11323,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx6sl.c xbian-sources-kernel/arch/a
- imx6q_set_lpm(WAIT_CLOCKED);
}
CLK_OF_DECLARE(imx6sl, "fsl,imx6sl-ccm", imx6sl_clocks_init);
-diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx6sx.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx6sx.c
---- linux-4.1.6/arch/arm/mach-imx/clk-imx6sx.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx6sx.c 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk-imx6sx.c linux-4.1.10/arch/arm/mach-imx/clk-imx6sx.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/clk-imx6sx.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/clk-imx6sx.c 2015-10-10 16:41:25.133309588 +0200
@@ -268,8 +268,6 @@
base = of_iomap(np, 0);
WARN_ON(!base);
@@ -11532,9 +11344,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx6sx.c xbian-sources-kernel/arch/a
- imx6q_set_lpm(WAIT_CLOCKED);
}
CLK_OF_DECLARE(imx6sx, "fsl,imx6sx-ccm", imx6sx_clocks_init);
-diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-pllv3.c xbian-sources-kernel/arch/arm/mach-imx/clk-pllv3.c
---- linux-4.1.6/arch/arm/mach-imx/clk-pllv3.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/clk-pllv3.c 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk-pllv3.c linux-4.1.10/arch/arm/mach-imx/clk-pllv3.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/clk-pllv3.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/clk-pllv3.c 2015-10-10 16:41:25.133309588 +0200
@@ -23,6 +23,7 @@
#define PLL_DENOM_OFFSET 0x20
@@ -11587,9 +11399,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-pllv3.c xbian-sources-kernel/arch/ar
}
static const struct clk_ops clk_pllv3_av_ops = {
-diff -Nur linux-4.1.6/arch/arm/mach-imx/common.h xbian-sources-kernel/arch/arm/mach-imx/common.h
---- linux-4.1.6/arch/arm/mach-imx/common.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/common.h 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/common.h linux-4.1.10/arch/arm/mach-imx/common.h
+--- linux-4.1.10.orig/arch/arm/mach-imx/common.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/common.h 2015-10-10 16:41:25.133309588 +0200
@@ -44,7 +44,7 @@
void imx31_soc_init(void);
void imx35_soc_init(void);
@@ -11650,9 +11462,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/common.h xbian-sources-kernel/arch/arm/m
#ifdef CONFIG_PM
void imx51_pm_init(void);
-diff -Nur linux-4.1.6/arch/arm/mach-imx/common-imx6.c xbian-sources-kernel/arch/arm/mach-imx/common-imx6.c
---- linux-4.1.6/arch/arm/mach-imx/common-imx6.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/arch/arm/mach-imx/common-imx6.c 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/common-imx6.c linux-4.1.10/arch/arm/mach-imx/common-imx6.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/common-imx6.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/arch/arm/mach-imx/common-imx6.c 2015-10-10 16:41:25.137309900 +0200
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2011-2015 Freescale Semiconductor, Inc.
@@ -11750,9 +11562,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/common-imx6.c xbian-sources-kernel/arch/
+ }
+}
+
-diff -Nur linux-4.1.6/arch/arm/mach-imx/cpuidle-imx6q.c xbian-sources-kernel/arch/arm/mach-imx/cpuidle-imx6q.c
---- linux-4.1.6/arch/arm/mach-imx/cpuidle-imx6q.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/cpuidle-imx6q.c 2015-09-11 17:46:08.815005638 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/cpuidle-imx6q.c linux-4.1.10/arch/arm/mach-imx/cpuidle-imx6q.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/cpuidle-imx6q.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/cpuidle-imx6q.c 2015-10-10 16:41:25.137309900 +0200
@@ -27,9 +27,9 @@
*/
if (!spin_trylock(&master_lock))
@@ -11765,9 +11577,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/cpuidle-imx6q.c xbian-sources-kernel/arc
spin_unlock(&master_lock);
goto done;
}
-diff -Nur linux-4.1.6/arch/arm/mach-imx/cpuidle-imx6sl.c xbian-sources-kernel/arch/arm/mach-imx/cpuidle-imx6sl.c
---- linux-4.1.6/arch/arm/mach-imx/cpuidle-imx6sl.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/cpuidle-imx6sl.c 2015-09-11 17:46:08.815005638 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/cpuidle-imx6sl.c linux-4.1.10/arch/arm/mach-imx/cpuidle-imx6sl.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/cpuidle-imx6sl.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/cpuidle-imx6sl.c 2015-10-10 16:41:25.137309900 +0200
@@ -16,7 +16,7 @@
static int imx6sl_enter_wait(struct cpuidle_device *dev,
struct cpuidle_driver *drv, int index)
@@ -11786,9 +11598,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/cpuidle-imx6sl.c xbian-sources-kernel/ar
return index;
}
-diff -Nur linux-4.1.6/arch/arm/mach-imx/cpuidle-imx6sx.c xbian-sources-kernel/arch/arm/mach-imx/cpuidle-imx6sx.c
---- linux-4.1.6/arch/arm/mach-imx/cpuidle-imx6sx.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/cpuidle-imx6sx.c 2015-09-11 17:46:08.815005638 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/cpuidle-imx6sx.c linux-4.1.10/arch/arm/mach-imx/cpuidle-imx6sx.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/cpuidle-imx6sx.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/cpuidle-imx6sx.c 2015-10-10 16:41:25.137309900 +0200
@@ -25,7 +25,7 @@
static int imx6sx_enter_wait(struct cpuidle_device *dev,
struct cpuidle_driver *drv, int index)
@@ -11807,9 +11619,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/cpuidle-imx6sx.c xbian-sources-kernel/ar
return index;
}
-diff -Nur linux-4.1.6/arch/arm/mach-imx/ddr3_freq_imx6.S xbian-sources-kernel/arch/arm/mach-imx/ddr3_freq_imx6.S
---- linux-4.1.6/arch/arm/mach-imx/ddr3_freq_imx6.S 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/arch/arm/mach-imx/ddr3_freq_imx6.S 2015-09-11 17:46:08.815005638 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/ddr3_freq_imx6.S linux-4.1.10/arch/arm/mach-imx/ddr3_freq_imx6.S
+--- linux-4.1.10.orig/arch/arm/mach-imx/ddr3_freq_imx6.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/arch/arm/mach-imx/ddr3_freq_imx6.S 2015-10-10 16:41:25.137309900 +0200
@@ -0,0 +1,893 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -12704,20 +12516,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/ddr3_freq_imx6.S xbian-sources-kernel/ar
+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.6/arch/arm/mach-imx/headsmp.S xbian-sources-kernel/arch/arm/mach-imx/headsmp.S
---- linux-4.1.6/arch/arm/mach-imx/headsmp.S 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/headsmp.S 2015-09-11 17:46:08.815005638 +0200
-@@ -25,7 +25,6 @@
- .endm
-
- ENTRY(v7_secondary_startup)
-- bl v7_invalidate_l1
- set_diag_reg
- b secondary_startup
- ENDPROC(v7_secondary_startup)
-diff -Nur linux-4.1.6/arch/arm/mach-imx/Kconfig xbian-sources-kernel/arch/arm/mach-imx/Kconfig
---- linux-4.1.6/arch/arm/mach-imx/Kconfig 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/Kconfig 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/Kconfig linux-4.1.10/arch/arm/mach-imx/Kconfig
+--- linux-4.1.10.orig/arch/arm/mach-imx/Kconfig 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/Kconfig 2015-10-10 16:41:28.701314199 +0200
@@ -1,5 +1,6 @@
menuconfig ARCH_MXC
bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7
@@ -12741,9 +12542,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/Kconfig xbian-sources-kernel/arch/arm/ma
config IMX_HAVE_IOMUX_V1
bool
-diff -Nur linux-4.1.6/arch/arm/mach-imx/lpddr2_freq_imx6.S xbian-sources-kernel/arch/arm/mach-imx/lpddr2_freq_imx6.S
---- linux-4.1.6/arch/arm/mach-imx/lpddr2_freq_imx6.S 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/arch/arm/mach-imx/lpddr2_freq_imx6.S 2015-09-11 17:46:08.819005369 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/lpddr2_freq_imx6.S linux-4.1.10/arch/arm/mach-imx/lpddr2_freq_imx6.S
+--- linux-4.1.10.orig/arch/arm/mach-imx/lpddr2_freq_imx6.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/arch/arm/mach-imx/lpddr2_freq_imx6.S 2015-10-10 16:41:28.701314199 +0200
@@ -0,0 +1,484 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13229,9 +13030,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/lpddr2_freq_imx6.S xbian-sources-kernel/
+ENTRY(mx6_lpddr2_do_iram)
+ .word mx6_lpddr2_freq_change
+ .size mx6_lpddr2_freq_change, . - mx6_lpddr2_freq_change
-diff -Nur linux-4.1.6/arch/arm/mach-imx/mach-imx6q.c xbian-sources-kernel/arch/arm/mach-imx/mach-imx6q.c
---- linux-4.1.6/arch/arm/mach-imx/mach-imx6q.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/mach-imx6q.c 2015-09-11 17:46:08.819005369 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/mach-imx6q.c linux-4.1.10/arch/arm/mach-imx/mach-imx6q.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/mach-imx6q.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/mach-imx6q.c 2015-10-10 16:41:28.701314199 +0200
@@ -31,6 +31,9 @@
#include <linux/micrel_phy.h>
#include <linux/mfd/syscon.h>
@@ -13436,9 +13237,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/mach-imx6q.c xbian-sources-kernel/arch/a
.dt_compat = imx6q_dt_compat,
+ .restart = mxc_restart,
MACHINE_END
-diff -Nur linux-4.1.6/arch/arm/mach-imx/mach-imx6sl.c xbian-sources-kernel/arch/arm/mach-imx/mach-imx6sl.c
---- linux-4.1.6/arch/arm/mach-imx/mach-imx6sl.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/mach-imx6sl.c 2015-09-11 17:46:08.819005369 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/mach-imx6sl.c linux-4.1.10/arch/arm/mach-imx/mach-imx6sl.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/mach-imx6sl.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/mach-imx6sl.c 2015-10-10 16:41:28.701314199 +0200
@@ -48,6 +48,8 @@
{
struct device *parent;
@@ -13462,9 +13263,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/mach-imx6sl.c xbian-sources-kernel/arch/
.dt_compat = imx6sl_dt_compat,
+ .restart = mxc_restart,
MACHINE_END
-diff -Nur linux-4.1.6/arch/arm/mach-imx/mach-imx6sx.c xbian-sources-kernel/arch/arm/mach-imx/mach-imx6sx.c
---- linux-4.1.6/arch/arm/mach-imx/mach-imx6sx.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/mach-imx6sx.c 2015-09-11 17:46:08.819005369 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/mach-imx6sx.c linux-4.1.10/arch/arm/mach-imx/mach-imx6sx.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/mach-imx6sx.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/mach-imx6sx.c 2015-10-10 16:41:28.705314126 +0200
@@ -12,12 +12,135 @@
#include <linux/regmap.h>
#include <linux/mfd/syscon.h>
@@ -13628,9 +13429,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/mach-imx6sx.c xbian-sources-kernel/arch/
}
static void __init imx6sx_init_late(void)
-diff -Nur linux-4.1.6/arch/arm/mach-imx/Makefile xbian-sources-kernel/arch/arm/mach-imx/Makefile
---- linux-4.1.6/arch/arm/mach-imx/Makefile 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/Makefile 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/Makefile linux-4.1.10/arch/arm/mach-imx/Makefile
+--- linux-4.1.10.orig/arch/arm/mach-imx/Makefile 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/Makefile 2015-10-10 16:41:28.705314126 +0200
@@ -28,6 +28,14 @@
obj-$(CONFIG_MXC_USE_EPIT) += epit.o
obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o
@@ -13659,9 +13460,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/Makefile xbian-sources-kernel/arch/arm/m
ifeq ($(CONFIG_SUSPEND),y)
AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a
-diff -Nur linux-4.1.6/arch/arm/mach-imx/pm-imx6.c xbian-sources-kernel/arch/arm/mach-imx/pm-imx6.c
---- linux-4.1.6/arch/arm/mach-imx/pm-imx6.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/pm-imx6.c 2015-09-11 17:46:08.827004835 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/pm-imx6.c linux-4.1.10/arch/arm/mach-imx/pm-imx6.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/pm-imx6.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/pm-imx6.c 2015-10-10 16:41:28.705314126 +0200
@@ -89,6 +89,7 @@
struct imx6_pm_socdata {
@@ -13815,9 +13616,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/pm-imx6.c xbian-sources-kernel/arch/arm/
void __init imx6q_pm_init(void)
{
imx6_pm_common_init(&imx6q_pm_data);
-diff -Nur linux-4.1.6/arch/arm/mach-imx/src.c xbian-sources-kernel/arch/arm/mach-imx/src.c
---- linux-4.1.6/arch/arm/mach-imx/src.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/src.c 2015-09-11 17:46:08.827004835 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/src.c linux-4.1.10/arch/arm/mach-imx/src.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/src.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/src.c 2015-10-10 16:41:28.705314126 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2011 Freescale Semiconductor, Inc.
@@ -13868,9 +13669,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/src.c xbian-sources-kernel/arch/arm/mach
val &= ~(1 << BP_SRC_SCR_WARM_RESET_ENABLE);
writel_relaxed(val, src_base + SRC_SCR);
spin_unlock(&scr_lock);
-diff -Nur linux-4.1.6/arch/arm/mach-imx/system.c xbian-sources-kernel/arch/arm/mach-imx/system.c
---- linux-4.1.6/arch/arm/mach-imx/system.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/system.c 2015-09-11 17:46:08.831004567 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/system.c linux-4.1.10/arch/arm/mach-imx/system.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/system.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/system.c 2015-10-10 16:41:28.705314126 +0200
@@ -34,6 +34,7 @@
static void __iomem *wdog_base;
@@ -13939,9 +13740,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/system.c xbian-sources-kernel/arch/arm/m
#ifdef CONFIG_CACHE_L2X0
void __init imx_init_l2cache(void)
{
-diff -Nur linux-4.1.6/arch/arm/mach-imx/time.c xbian-sources-kernel/arch/arm/mach-imx/time.c
---- linux-4.1.6/arch/arm/mach-imx/time.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/time.c 2015-09-11 17:46:08.831004567 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/time.c linux-4.1.10/arch/arm/mach-imx/time.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/time.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/time.c 2015-10-10 16:41:28.709314238 +0200
@@ -28,6 +28,7 @@
#include <linux/delay.h>
#include <linux/err.h>
@@ -14245,287 +14046,18 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/time.c xbian-sources-kernel/arch/arm/mac
}
CLOCKSOURCE_OF_DECLARE(mx1_timer, "fsl,imx1-gpt", mxc_timer_init_dt);
CLOCKSOURCE_OF_DECLARE(mx25_timer, "fsl,imx25-gpt", mxc_timer_init_dt);
-diff -Nur linux-4.1.6/arch/arm/mach-mvebu/headsmp-a9.S xbian-sources-kernel/arch/arm/mach-mvebu/headsmp-a9.S
---- linux-4.1.6/arch/arm/mach-mvebu/headsmp-a9.S 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-mvebu/headsmp-a9.S 2015-09-11 17:46:08.855002960 +0200
-@@ -21,7 +21,6 @@
-
- ENTRY(mvebu_cortex_a9_secondary_startup)
- ARM_BE8(setend be)
-- bl v7_invalidate_l1
- bl armada_38x_scu_power_up
- b secondary_startup
- ENDPROC(mvebu_cortex_a9_secondary_startup)
-diff -Nur linux-4.1.6/arch/arm/mach-prima2/headsmp.S xbian-sources-kernel/arch/arm/mach-prima2/headsmp.S
---- linux-4.1.6/arch/arm/mach-prima2/headsmp.S 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-prima2/headsmp.S 2015-09-11 17:46:08.954996266 +0200
-@@ -15,7 +15,6 @@
- * ready for them to initialise.
- */
- ENTRY(sirfsoc_secondary_startup)
-- bl v7_invalidate_l1
- mrc p15, 0, r0, c0, c0, 5
- and r0, r0, #15
- adr r4, 1f
-diff -Nur linux-4.1.6/arch/arm/mach-rockchip/core.h xbian-sources-kernel/arch/arm/mach-rockchip/core.h
---- linux-4.1.6/arch/arm/mach-rockchip/core.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-rockchip/core.h 2015-09-11 17:46:08.994993589 +0200
-@@ -17,4 +17,3 @@
- extern char rockchip_secondary_trampoline_end;
-
- extern unsigned long rockchip_boot_fn;
--extern void rockchip_secondary_startup(void);
-diff -Nur linux-4.1.6/arch/arm/mach-rockchip/headsmp.S xbian-sources-kernel/arch/arm/mach-rockchip/headsmp.S
---- linux-4.1.6/arch/arm/mach-rockchip/headsmp.S 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-rockchip/headsmp.S 2015-09-11 17:46:08.994993589 +0200
-@@ -15,14 +15,6 @@
- #include <linux/linkage.h>
- #include <linux/init.h>
-
--ENTRY(rockchip_secondary_startup)
-- mrc p15, 0, r0, c0, c0, 0 @ read main ID register
-- ldr r1, =0x00000c09 @ Cortex-A9 primary part number
-- teq r0, r1
-- beq v7_invalidate_l1
-- b secondary_startup
--ENDPROC(rockchip_secondary_startup)
--
- ENTRY(rockchip_secondary_trampoline)
- ldr pc, 1f
- ENDPROC(rockchip_secondary_trampoline)
-diff -Nur linux-4.1.6/arch/arm/mach-rockchip/platsmp.c xbian-sources-kernel/arch/arm/mach-rockchip/platsmp.c
---- linux-4.1.6/arch/arm/mach-rockchip/platsmp.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-rockchip/platsmp.c 2015-09-11 17:46:08.994993589 +0200
-@@ -149,8 +149,7 @@
- * sram_base_addr + 8: start address for pc
- * */
- udelay(10);
-- writel(virt_to_phys(rockchip_secondary_startup),
-- sram_base_addr + 8);
-+ writel(virt_to_phys(secondary_startup), sram_base_addr + 8);
- writel(0xDEADBEAF, sram_base_addr + 4);
- dsb_sev();
- }
-@@ -189,7 +188,7 @@
- }
-
- /* set the boot function for the sram code */
-- rockchip_boot_fn = virt_to_phys(rockchip_secondary_startup);
-+ rockchip_boot_fn = virt_to_phys(secondary_startup);
-
- /* copy the trampoline to sram, that runs during startup of the core */
- memcpy(sram_base_addr, &rockchip_secondary_trampoline, trampoline_sz);
-diff -Nur linux-4.1.6/arch/arm/mach-shmobile/common.h xbian-sources-kernel/arch/arm/mach-shmobile/common.h
---- linux-4.1.6/arch/arm/mach-shmobile/common.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-shmobile/common.h 2015-09-11 17:46:09.022991714 +0200
-@@ -14,7 +14,6 @@
- extern void shmobile_smp_hook(unsigned int cpu, unsigned long fn,
- unsigned long arg);
- extern int shmobile_smp_cpu_disable(unsigned int cpu);
--extern void shmobile_invalidate_start(void);
- extern void shmobile_boot_scu(void);
- extern void shmobile_smp_scu_prepare_cpus(unsigned int max_cpus);
- extern void shmobile_smp_scu_cpu_die(unsigned int cpu);
-diff -Nur linux-4.1.6/arch/arm/mach-shmobile/headsmp.S xbian-sources-kernel/arch/arm/mach-shmobile/headsmp.S
---- linux-4.1.6/arch/arm/mach-shmobile/headsmp.S 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-shmobile/headsmp.S 2015-09-11 17:46:09.022991714 +0200
-@@ -16,13 +16,6 @@
- #include <asm/assembler.h>
- #include <asm/memory.h>
-
--#ifdef CONFIG_SMP
--ENTRY(shmobile_invalidate_start)
-- bl v7_invalidate_l1
-- b secondary_startup
--ENDPROC(shmobile_invalidate_start)
--#endif
--
- /*
- * Reset vector for secondary CPUs.
- * This will be mapped at address 0 by SBAR register.
-diff -Nur linux-4.1.6/arch/arm/mach-shmobile/headsmp-scu.S xbian-sources-kernel/arch/arm/mach-shmobile/headsmp-scu.S
---- linux-4.1.6/arch/arm/mach-shmobile/headsmp-scu.S 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-shmobile/headsmp-scu.S 2015-09-11 17:46:09.022991714 +0200
-@@ -22,7 +22,7 @@
- * Boot code for secondary CPUs.
- *
- * First we turn on L1 cache coherency for our CPU. Then we jump to
-- * shmobile_invalidate_start that invalidates the cache and hands over control
-+ * secondary_startup that invalidates the cache and hands over control
- * to the common ARM startup code.
- */
- ENTRY(shmobile_boot_scu)
-@@ -36,7 +36,7 @@
- bic r2, r2, r3 @ Clear bits of our CPU (Run Mode)
- str r2, [r0, #8] @ write back
-
-- b shmobile_invalidate_start
-+ b secondary_startup
- ENDPROC(shmobile_boot_scu)
-
- .text
-diff -Nur linux-4.1.6/arch/arm/mach-shmobile/platsmp-apmu.c xbian-sources-kernel/arch/arm/mach-shmobile/platsmp-apmu.c
---- linux-4.1.6/arch/arm/mach-shmobile/platsmp-apmu.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-shmobile/platsmp-apmu.c 2015-09-11 17:46:09.042990376 +0200
-@@ -133,7 +133,7 @@
- int shmobile_smp_apmu_boot_secondary(unsigned int cpu, struct task_struct *idle)
- {
- /* For this particular CPU register boot vector */
-- shmobile_smp_hook(cpu, virt_to_phys(shmobile_invalidate_start), 0);
-+ shmobile_smp_hook(cpu, virt_to_phys(secondary_startup), 0);
-
- return apmu_wrap(cpu, apmu_power_on);
- }
-diff -Nur linux-4.1.6/arch/arm/mach-socfpga/core.h xbian-sources-kernel/arch/arm/mach-socfpga/core.h
---- linux-4.1.6/arch/arm/mach-socfpga/core.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-socfpga/core.h 2015-09-11 17:46:09.046990108 +0200
-@@ -31,7 +31,6 @@
-
- #define RSTMGR_MPUMODRST_CPU1 0x2 /* CPU1 Reset */
-
--extern void socfpga_secondary_startup(void);
- extern void __iomem *socfpga_scu_base_addr;
-
- extern void socfpga_init_clocks(void);
-diff -Nur linux-4.1.6/arch/arm/mach-socfpga/headsmp.S xbian-sources-kernel/arch/arm/mach-socfpga/headsmp.S
---- linux-4.1.6/arch/arm/mach-socfpga/headsmp.S 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-socfpga/headsmp.S 2015-09-11 17:46:09.046990108 +0200
-@@ -30,8 +30,3 @@
- 1: .long .
- .long socfpga_cpu1start_addr
- ENTRY(secondary_trampoline_end)
--
--ENTRY(socfpga_secondary_startup)
-- bl v7_invalidate_l1
-- b secondary_startup
--ENDPROC(socfpga_secondary_startup)
-diff -Nur linux-4.1.6/arch/arm/mach-socfpga/platsmp.c xbian-sources-kernel/arch/arm/mach-socfpga/platsmp.c
---- linux-4.1.6/arch/arm/mach-socfpga/platsmp.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-socfpga/platsmp.c 2015-09-11 17:46:09.046990108 +0200
-@@ -40,7 +40,7 @@
-
- memcpy(phys_to_virt(0), &secondary_trampoline, trampoline_size);
-
-- writel(virt_to_phys(socfpga_secondary_startup),
-+ writel(virt_to_phys(secondary_startup),
- sys_manager_base_addr + (socfpga_cpu1start_addr & 0x000000ff));
-
- flush_cache_all();
-diff -Nur linux-4.1.6/arch/arm/mach-tegra/headsmp.S xbian-sources-kernel/arch/arm/mach-tegra/headsmp.S
---- linux-4.1.6/arch/arm/mach-tegra/headsmp.S 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-tegra/headsmp.S 1970-01-01 01:00:00.000000000 +0100
-@@ -1,12 +0,0 @@
--#include <linux/linkage.h>
--#include <linux/init.h>
--
--#include "sleep.h"
--
-- .section ".text.head", "ax"
--
--ENTRY(tegra_secondary_startup)
-- check_cpu_part_num 0xc09, r8, r9
-- bleq v7_invalidate_l1
-- b secondary_startup
--ENDPROC(tegra_secondary_startup)
-diff -Nur linux-4.1.6/arch/arm/mach-tegra/Makefile xbian-sources-kernel/arch/arm/mach-tegra/Makefile
---- linux-4.1.6/arch/arm/mach-tegra/Makefile 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-tegra/Makefile 2015-09-11 17:46:09.050989839 +0200
-@@ -19,7 +19,7 @@
- ifeq ($(CONFIG_CPU_IDLE),y)
- obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += cpuidle-tegra30.o
- endif
--obj-$(CONFIG_SMP) += platsmp.o headsmp.o
-+obj-$(CONFIG_SMP) += platsmp.o
- obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
-
- obj-$(CONFIG_ARCH_TEGRA_114_SOC) += sleep-tegra30.o
-diff -Nur linux-4.1.6/arch/arm/mach-tegra/reset.c xbian-sources-kernel/arch/arm/mach-tegra/reset.c
---- linux-4.1.6/arch/arm/mach-tegra/reset.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-tegra/reset.c 2015-09-11 17:46:09.050989839 +0200
-@@ -94,7 +94,7 @@
- __tegra_cpu_reset_handler_data[TEGRA_RESET_MASK_PRESENT] =
- *((u32 *)cpu_possible_mask);
- __tegra_cpu_reset_handler_data[TEGRA_RESET_STARTUP_SECONDARY] =
-- virt_to_phys((void *)tegra_secondary_startup);
-+ virt_to_phys((void *)secondary_startup);
- #endif
-
- #ifdef CONFIG_PM_SLEEP
-diff -Nur linux-4.1.6/arch/arm/mach-tegra/reset.h xbian-sources-kernel/arch/arm/mach-tegra/reset.h
---- linux-4.1.6/arch/arm/mach-tegra/reset.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-tegra/reset.h 2015-09-11 17:46:09.050989839 +0200
-@@ -37,7 +37,6 @@
- void __tegra_cpu_reset_handler(void);
- void __tegra20_cpu1_resettable_status_offset(void);
- void __tegra_cpu_reset_handler_end(void);
--void tegra_secondary_startup(void);
-
- #ifdef CONFIG_PM_SLEEP
- #define tegra_cpu_lp1_mask \
-diff -Nur linux-4.1.6/arch/arm/mach-zynq/common.h xbian-sources-kernel/arch/arm/mach-zynq/common.h
---- linux-4.1.6/arch/arm/mach-zynq/common.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-zynq/common.h 2015-09-11 17:46:09.078987966 +0200
-@@ -17,8 +17,6 @@
- #ifndef __MACH_ZYNQ_COMMON_H__
- #define __MACH_ZYNQ_COMMON_H__
-
--void zynq_secondary_startup(void);
--
- extern int zynq_slcr_init(void);
- extern int zynq_early_slcr_init(void);
- extern void zynq_slcr_system_reset(void);
-diff -Nur linux-4.1.6/arch/arm/mach-zynq/headsmp.S xbian-sources-kernel/arch/arm/mach-zynq/headsmp.S
---- linux-4.1.6/arch/arm/mach-zynq/headsmp.S 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-zynq/headsmp.S 2015-09-11 17:46:09.078987966 +0200
-@@ -22,8 +22,3 @@
- .globl zynq_secondary_trampoline_end
- zynq_secondary_trampoline_end:
- ENDPROC(zynq_secondary_trampoline)
--
--ENTRY(zynq_secondary_startup)
-- bl v7_invalidate_l1
-- b secondary_startup
--ENDPROC(zynq_secondary_startup)
-diff -Nur linux-4.1.6/arch/arm/mach-zynq/platsmp.c xbian-sources-kernel/arch/arm/mach-zynq/platsmp.c
---- linux-4.1.6/arch/arm/mach-zynq/platsmp.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-zynq/platsmp.c 2015-09-11 17:46:09.078987966 +0200
-@@ -87,10 +87,9 @@
- }
- EXPORT_SYMBOL(zynq_cpun_start);
-
--static int zynq_boot_secondary(unsigned int cpu,
-- struct task_struct *idle)
-+static int zynq_boot_secondary(unsigned int cpu, struct task_struct *idle)
- {
-- return zynq_cpun_start(virt_to_phys(zynq_secondary_startup), cpu);
-+ return zynq_cpun_start(virt_to_phys(secondary_startup), cpu);
- }
-
- /*
-diff -Nur linux-4.1.6/arch/arm/mm/cache-v7.S xbian-sources-kernel/arch/arm/mm/cache-v7.S
---- linux-4.1.6/arch/arm/mm/cache-v7.S 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mm/cache-v7.S 2015-09-11 17:46:09.078987966 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mm/cache-v7.S linux-4.1.10/arch/arm/mm/cache-v7.S
+--- linux-4.1.10.orig/arch/arm/mm/cache-v7.S 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mm/cache-v7.S 2015-10-10 16:41:41.873314826 +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.6/arch/arm/mm/proc-v7.S xbian-sources-kernel/arch/arm/mm/proc-v7.S
---- linux-4.1.6/arch/arm/mm/proc-v7.S 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mm/proc-v7.S 2015-09-11 17:46:09.090987163 +0200
-@@ -336,7 +336,7 @@
- __v7_setup:
- adr r12, __v7_setup_stack @ the local stack
- stmia r12, {r0-r5, r7, r9, r11, lr}
-- bl v7_flush_dcache_louis
-+ bl v7_invalidate_l1
- ldmia r12, {r0-r5, r7, r9, r11, lr}
-
- mrc p15, 0, r0, c0, c0, 0 @ read main ID register
-diff -Nur linux-4.1.6/block/bfq-cgroup.c xbian-sources-kernel/block/bfq-cgroup.c
---- linux-4.1.6/block/bfq-cgroup.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/block/bfq-cgroup.c 2015-09-11 17:46:11.298839361 +0200
+diff -Nur linux-4.1.10.orig/block/bfq-cgroup.c linux-4.1.10/block/bfq-cgroup.c
+--- linux-4.1.10.orig/block/bfq-cgroup.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/block/bfq-cgroup.c 2015-10-10 16:41:42.089314835 +0200
@@ -0,0 +1,936 @@
+/*
+ * BFQ: CGROUPS support.
@@ -15463,9 +14995,9 @@ diff -Nur linux-4.1.6/block/bfq-cgroup.c xbian-sources-kernel/block/bfq-cgroup.c
+ return bfqg;
+}
+#endif
-diff -Nur linux-4.1.6/block/bfq.h xbian-sources-kernel/block/bfq.h
---- linux-4.1.6/block/bfq.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/block/bfq.h 2015-09-11 17:46:11.302839093 +0200
+diff -Nur linux-4.1.10.orig/block/bfq.h linux-4.1.10/block/bfq.h
+--- linux-4.1.10.orig/block/bfq.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/block/bfq.h 2015-10-10 16:41:42.093314836 +0200
@@ -0,0 +1,811 @@
+/*
+ * BFQ-v7r7 for 4.0.0: data structures and common functions prototypes.
@@ -16278,9 +15810,9 @@ diff -Nur linux-4.1.6/block/bfq.h xbian-sources-kernel/block/bfq.h
+static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq);
+
+#endif /* _BFQ_H */
-diff -Nur linux-4.1.6/block/bfq-ioc.c xbian-sources-kernel/block/bfq-ioc.c
---- linux-4.1.6/block/bfq-ioc.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/block/bfq-ioc.c 2015-09-11 17:46:11.298839361 +0200
+diff -Nur linux-4.1.10.orig/block/bfq-ioc.c linux-4.1.10/block/bfq-ioc.c
+--- linux-4.1.10.orig/block/bfq-ioc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/block/bfq-ioc.c 2015-10-10 16:41:42.093314836 +0200
@@ -0,0 +1,36 @@
+/*
+ * BFQ: I/O context handling.
@@ -16318,9 +15850,9 @@ diff -Nur linux-4.1.6/block/bfq-ioc.c xbian-sources-kernel/block/bfq-ioc.c
+ return icq_to_bic(ioc_lookup_icq(ioc, bfqd->queue));
+ return NULL;
+}
-diff -Nur linux-4.1.6/block/bfq-iosched.c xbian-sources-kernel/block/bfq-iosched.c
---- linux-4.1.6/block/bfq-iosched.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/block/bfq-iosched.c 2015-09-11 17:46:11.298839361 +0200
+diff -Nur linux-4.1.10.orig/block/bfq-iosched.c linux-4.1.10/block/bfq-iosched.c
+--- linux-4.1.10.orig/block/bfq-iosched.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/block/bfq-iosched.c 2015-10-10 16:41:42.101314834 +0200
@@ -0,0 +1,4223 @@
+/*
+ * Budget Fair Queueing (BFQ) disk scheduler.
@@ -20545,9 +20077,9 @@ diff -Nur linux-4.1.6/block/bfq-iosched.c xbian-sources-kernel/block/bfq-iosched
+
+MODULE_AUTHOR("Fabio Checconi, Paolo Valente");
+MODULE_LICENSE("GPL");
-diff -Nur linux-4.1.6/block/bfq-sched.c xbian-sources-kernel/block/bfq-sched.c
---- linux-4.1.6/block/bfq-sched.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/block/bfq-sched.c 2015-09-11 17:46:11.302839093 +0200
+diff -Nur linux-4.1.10.orig/block/bfq-sched.c linux-4.1.10/block/bfq-sched.c
+--- linux-4.1.10.orig/block/bfq-sched.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/block/bfq-sched.c 2015-10-10 16:41:42.101314834 +0200
@@ -0,0 +1,1186 @@
+/*
+ * BFQ: Hierarchical B-WF2Q+ scheduler.
@@ -21735,9 +21267,9 @@ diff -Nur linux-4.1.6/block/bfq-sched.c xbian-sources-kernel/block/bfq-sched.c
+ if (bfqq->wr_coeff > 1)
+ bfqd->wr_busy_queues++;
+}
-diff -Nur linux-4.1.6/block/Kconfig.iosched xbian-sources-kernel/block/Kconfig.iosched
---- linux-4.1.6/block/Kconfig.iosched 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/block/Kconfig.iosched 2015-09-11 17:46:11.298839361 +0200
+diff -Nur linux-4.1.10.orig/block/Kconfig.iosched linux-4.1.10/block/Kconfig.iosched
+--- linux-4.1.10.orig/block/Kconfig.iosched 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/block/Kconfig.iosched 2015-10-10 16:41:42.101314834 +0200
@@ -39,6 +39,27 @@
---help---
Enable group IO scheduling in CFQ.
@@ -21791,9 +21323,9 @@ diff -Nur linux-4.1.6/block/Kconfig.iosched xbian-sources-kernel/block/Kconfig.i
default "noop" if DEFAULT_NOOP
endmenu
-diff -Nur linux-4.1.6/block/Makefile xbian-sources-kernel/block/Makefile
---- linux-4.1.6/block/Makefile 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/block/Makefile 2015-09-11 17:46:11.298839361 +0200
+diff -Nur linux-4.1.10.orig/block/Makefile linux-4.1.10/block/Makefile
+--- linux-4.1.10.orig/block/Makefile 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/block/Makefile 2015-10-10 16:41:42.101314834 +0200
@@ -18,6 +18,7 @@
obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o
obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o
@@ -21802,9 +21334,9 @@ diff -Nur linux-4.1.6/block/Makefile xbian-sources-kernel/block/Makefile
obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o
obj-$(CONFIG_BLK_CMDLINE_PARSER) += cmdline-parser.o
-diff -Nur linux-4.1.6/Documentation/devicetree/bindings/mmc/mmc.txt xbian-sources-kernel/Documentation/devicetree/bindings/mmc/mmc.txt
---- linux-4.1.6/Documentation/devicetree/bindings/mmc/mmc.txt 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/Documentation/devicetree/bindings/mmc/mmc.txt 2015-09-11 17:46:08.151050086 +0200
+diff -Nur linux-4.1.10.orig/Documentation/devicetree/bindings/mmc/mmc.txt linux-4.1.10/Documentation/devicetree/bindings/mmc/mmc.txt
+--- linux-4.1.10.orig/Documentation/devicetree/bindings/mmc/mmc.txt 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/Documentation/devicetree/bindings/mmc/mmc.txt 2015-10-10 16:41:42.101314834 +0200
@@ -5,6 +5,8 @@
Interpreted by the OF core:
- reg: Registers location and length.
@@ -21830,9 +21362,9 @@ diff -Nur linux-4.1.6/Documentation/devicetree/bindings/mmc/mmc.txt xbian-source
*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.6/Documentation/devicetree/bindings/vendor-prefixes.txt xbian-sources-kernel/Documentation/devicetree/bindings/vendor-prefixes.txt
---- linux-4.1.6/Documentation/devicetree/bindings/vendor-prefixes.txt 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/Documentation/devicetree/bindings/vendor-prefixes.txt 2015-09-11 17:46:08.235044463 +0200
+diff -Nur linux-4.1.10.orig/Documentation/devicetree/bindings/vendor-prefixes.txt linux-4.1.10/Documentation/devicetree/bindings/vendor-prefixes.txt
+--- linux-4.1.10.orig/Documentation/devicetree/bindings/vendor-prefixes.txt 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/Documentation/devicetree/bindings/vendor-prefixes.txt 2015-10-10 16:41:42.101314834 +0200
@@ -201,6 +201,7 @@
variscite Variscite Ltd.
via VIA Technologies, Inc.
@@ -21841,9 +21373,9 @@ diff -Nur linux-4.1.6/Documentation/devicetree/bindings/vendor-prefixes.txt xbia
voipac Voipac Technologies s.r.o.
winbond Winbond Electronics corp.
wlf Wolfson Microelectronics
-diff -Nur linux-4.1.6/drivers/bluetooth/bt3c_cs.c xbian-sources-kernel/drivers/bluetooth/bt3c_cs.c
---- linux-4.1.6/drivers/bluetooth/bt3c_cs.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/bluetooth/bt3c_cs.c 2015-09-11 17:46:11.554822223 +0200
+diff -Nur linux-4.1.10.orig/drivers/bluetooth/bt3c_cs.c linux-4.1.10/drivers/bluetooth/bt3c_cs.c
+--- linux-4.1.10.orig/drivers/bluetooth/bt3c_cs.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/bluetooth/bt3c_cs.c 2015-10-10 16:41:42.101314834 +0200
@@ -202,9 +202,8 @@
/* Send frame */
len = bt3c_write(iobase, 256, skb->data, skb->len);
@@ -21855,9 +21387,9 @@ diff -Nur linux-4.1.6/drivers/bluetooth/bt3c_cs.c xbian-sources-kernel/drivers/b
kfree_skb(skb);
-diff -Nur linux-4.1.6/drivers/bluetooth/btbcm.c xbian-sources-kernel/drivers/bluetooth/btbcm.c
---- linux-4.1.6/drivers/bluetooth/btbcm.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/bluetooth/btbcm.c 2015-09-11 17:46:11.554822223 +0200
+diff -Nur linux-4.1.10.orig/drivers/bluetooth/btbcm.c linux-4.1.10/drivers/bluetooth/btbcm.c
+--- linux-4.1.10.orig/drivers/bluetooth/btbcm.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/bluetooth/btbcm.c 2015-10-10 16:41:42.101314834 +0200
@@ -33,6 +33,7 @@
#define VERSION "0.1"
@@ -22072,9 +21604,9 @@ diff -Nur linux-4.1.6/drivers/bluetooth/btbcm.c xbian-sources-kernel/drivers/blu
/* Reset */
err = btbcm_reset(hdev);
-diff -Nur linux-4.1.6/drivers/bluetooth/btbcm.h xbian-sources-kernel/drivers/bluetooth/btbcm.h
---- linux-4.1.6/drivers/bluetooth/btbcm.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/bluetooth/btbcm.h 2015-09-11 17:46:11.554822223 +0200
+diff -Nur linux-4.1.10.orig/drivers/bluetooth/btbcm.h linux-4.1.10/drivers/bluetooth/btbcm.h
+--- linux-4.1.10.orig/drivers/bluetooth/btbcm.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/bluetooth/btbcm.h 2015-10-10 16:41:42.101314834 +0200
@@ -21,15 +21,61 @@
*
*/
@@ -22164,9 +21696,9 @@ diff -Nur linux-4.1.6/drivers/bluetooth/btbcm.h xbian-sources-kernel/drivers/blu
+}
#endif
-diff -Nur linux-4.1.6/drivers/bluetooth/btintel.c xbian-sources-kernel/drivers/bluetooth/btintel.c
---- linux-4.1.6/drivers/bluetooth/btintel.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/bluetooth/btintel.c 2015-09-11 17:46:11.554822223 +0200
+diff -Nur linux-4.1.10.orig/drivers/bluetooth/btintel.c linux-4.1.10/drivers/bluetooth/btintel.c
+--- linux-4.1.10.orig/drivers/bluetooth/btintel.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/bluetooth/btintel.c 2015-10-10 16:41:42.101314834 +0200
@@ -53,12 +53,6 @@
}
@@ -22180,9 +21712,9 @@ diff -Nur linux-4.1.6/drivers/bluetooth/btintel.c xbian-sources-kernel/drivers/b
/* For some Intel based controllers, the default Bluetooth device
* address 00:03:19:9E:8B:00 can be found. These controllers are
-diff -Nur linux-4.1.6/drivers/bluetooth/btmrvl_sdio.c xbian-sources-kernel/drivers/bluetooth/btmrvl_sdio.c
---- linux-4.1.6/drivers/bluetooth/btmrvl_sdio.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/bluetooth/btmrvl_sdio.c 2015-09-11 17:46:11.558821956 +0200
+diff -Nur linux-4.1.10.orig/drivers/bluetooth/btmrvl_sdio.c linux-4.1.10/drivers/bluetooth/btmrvl_sdio.c
+--- linux-4.1.10.orig/drivers/bluetooth/btmrvl_sdio.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/bluetooth/btmrvl_sdio.c 2015-10-10 16:41:42.101314834 +0200
@@ -1217,7 +1217,7 @@
unsigned int reg, reg_start, reg_end;
enum rdwr_status stat;
@@ -22192,9 +21724,9 @@ diff -Nur linux-4.1.6/drivers/bluetooth/btmrvl_sdio.c xbian-sources-kernel/drive
u32 memory_size, fw_dump_len = 0;
/* dump sdio register first */
-diff -Nur linux-4.1.6/drivers/bluetooth/btrtl.c xbian-sources-kernel/drivers/bluetooth/btrtl.c
---- linux-4.1.6/drivers/bluetooth/btrtl.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/bluetooth/btrtl.c 2015-09-11 17:46:11.558821956 +0200
+diff -Nur linux-4.1.10.orig/drivers/bluetooth/btrtl.c linux-4.1.10/drivers/bluetooth/btrtl.c
+--- linux-4.1.10.orig/drivers/bluetooth/btrtl.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/bluetooth/btrtl.c 2015-10-10 16:41:42.101314834 +0200
@@ -0,0 +1,390 @@
+/*
+ * Bluetooth support for Realtek devices
@@ -22586,9 +22118,9 @@ diff -Nur linux-4.1.6/drivers/bluetooth/btrtl.c xbian-sources-kernel/drivers/blu
+MODULE_DESCRIPTION("Bluetooth support for Realtek devices ver " VERSION);
+MODULE_VERSION(VERSION);
+MODULE_LICENSE("GPL");
-diff -Nur linux-4.1.6/drivers/bluetooth/btrtl.h xbian-sources-kernel/drivers/bluetooth/btrtl.h
---- linux-4.1.6/drivers/bluetooth/btrtl.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/bluetooth/btrtl.h 2015-09-11 17:46:11.558821956 +0200
+diff -Nur linux-4.1.10.orig/drivers/bluetooth/btrtl.h linux-4.1.10/drivers/bluetooth/btrtl.h
+--- linux-4.1.10.orig/drivers/bluetooth/btrtl.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/bluetooth/btrtl.h 2015-10-10 16:41:42.101314834 +0200
@@ -0,0 +1,52 @@
+/*
+ * Bluetooth support for Realtek devices
@@ -22642,9 +22174,9 @@ diff -Nur linux-4.1.6/drivers/bluetooth/btrtl.h xbian-sources-kernel/drivers/blu
+}
+
+#endif
-diff -Nur linux-4.1.6/drivers/bluetooth/btusb.c xbian-sources-kernel/drivers/bluetooth/btusb.c
---- linux-4.1.6/drivers/bluetooth/btusb.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/bluetooth/btusb.c 2015-09-11 17:46:11.558821956 +0200
+diff -Nur linux-4.1.10.orig/drivers/bluetooth/btusb.c linux-4.1.10/drivers/bluetooth/btusb.c
+--- linux-4.1.10.orig/drivers/bluetooth/btusb.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/bluetooth/btusb.c 2015-10-10 16:41:42.101314834 +0200
@@ -31,13 +31,14 @@
#include "btintel.h"
@@ -23296,9 +22828,9 @@ diff -Nur linux-4.1.6/drivers/bluetooth/btusb.c xbian-sources-kernel/drivers/blu
return 0;
}
-diff -Nur linux-4.1.6/drivers/bluetooth/btwilink.c xbian-sources-kernel/drivers/bluetooth/btwilink.c
---- linux-4.1.6/drivers/bluetooth/btwilink.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/bluetooth/btwilink.c 2015-09-11 17:46:11.558821956 +0200
+diff -Nur linux-4.1.10.orig/drivers/bluetooth/btwilink.c linux-4.1.10/drivers/bluetooth/btwilink.c
+--- linux-4.1.10.orig/drivers/bluetooth/btwilink.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/bluetooth/btwilink.c 2015-10-10 16:41:42.105314832 +0200
@@ -22,7 +22,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
@@ -23308,9 +22840,9 @@ diff -Nur linux-4.1.6/drivers/bluetooth/btwilink.c xbian-sources-kernel/drivers/
#include <linux/platform_device.h>
#include <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h>
-diff -Nur linux-4.1.6/drivers/bluetooth/hci_ath.c xbian-sources-kernel/drivers/bluetooth/hci_ath.c
---- linux-4.1.6/drivers/bluetooth/hci_ath.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/bluetooth/hci_ath.c 2015-09-11 17:46:11.558821956 +0200
+diff -Nur linux-4.1.10.orig/drivers/bluetooth/hci_ath.c linux-4.1.10/drivers/bluetooth/hci_ath.c
+--- linux-4.1.10.orig/drivers/bluetooth/hci_ath.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/bluetooth/hci_ath.c 2015-10-10 16:41:42.209314836 +0200
@@ -192,6 +192,7 @@
if (IS_ERR(ath->rx_skb)) {
int err = PTR_ERR(ath->rx_skb);
@@ -23319,9 +22851,9 @@ diff -Nur linux-4.1.6/drivers/bluetooth/hci_ath.c xbian-sources-kernel/drivers/b
return err;
}
-diff -Nur linux-4.1.6/drivers/bluetooth/hci_bcm.c xbian-sources-kernel/drivers/bluetooth/hci_bcm.c
---- linux-4.1.6/drivers/bluetooth/hci_bcm.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/bluetooth/hci_bcm.c 2015-09-11 17:46:11.558821956 +0200
+diff -Nur linux-4.1.10.orig/drivers/bluetooth/hci_bcm.c linux-4.1.10/drivers/bluetooth/hci_bcm.c
+--- linux-4.1.10.orig/drivers/bluetooth/hci_bcm.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/bluetooth/hci_bcm.c 2015-10-10 16:41:42.209314836 +0200
@@ -24,6 +24,7 @@
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -23472,9 +23004,9 @@ diff -Nur linux-4.1.6/drivers/bluetooth/hci_bcm.c xbian-sources-kernel/drivers/b
.recv = bcm_recv,
.enqueue = bcm_enqueue,
.dequeue = bcm_dequeue,
-diff -Nur linux-4.1.6/drivers/bluetooth/hci_bcsp.c xbian-sources-kernel/drivers/bluetooth/hci_bcsp.c
---- linux-4.1.6/drivers/bluetooth/hci_bcsp.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/bluetooth/hci_bcsp.c 2015-09-11 17:46:11.558821956 +0200
+diff -Nur linux-4.1.10.orig/drivers/bluetooth/hci_bcsp.c linux-4.1.10/drivers/bluetooth/hci_bcsp.c
+--- linux-4.1.10.orig/drivers/bluetooth/hci_bcsp.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/bluetooth/hci_bcsp.c 2015-10-10 16:41:42.209314836 +0200
@@ -47,8 +47,8 @@
#include "hci_uart.h"
@@ -23543,9 +23075,9 @@ diff -Nur linux-4.1.6/drivers/bluetooth/hci_bcsp.c xbian-sources-kernel/drivers/
bcsp->rx_skb->data[0] & 0x07, bcsp->rxseq_txack);
kfree_skb(bcsp->rx_skb);
-diff -Nur linux-4.1.6/drivers/bluetooth/hci_h4.c xbian-sources-kernel/drivers/bluetooth/hci_h4.c
---- linux-4.1.6/drivers/bluetooth/hci_h4.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/bluetooth/hci_h4.c 2015-09-11 17:46:11.558821956 +0200
+diff -Nur linux-4.1.10.orig/drivers/bluetooth/hci_h4.c linux-4.1.10/drivers/bluetooth/hci_h4.c
+--- linux-4.1.10.orig/drivers/bluetooth/hci_h4.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/bluetooth/hci_h4.c 2015-10-10 16:41:42.209314836 +0200
@@ -133,6 +133,7 @@
if (IS_ERR(h4->rx_skb)) {
int err = PTR_ERR(h4->rx_skb);
@@ -23554,9 +23086,9 @@ diff -Nur linux-4.1.6/drivers/bluetooth/hci_h4.c xbian-sources-kernel/drivers/bl
return err;
}
-diff -Nur linux-4.1.6/drivers/bluetooth/hci_ldisc.c xbian-sources-kernel/drivers/bluetooth/hci_ldisc.c
---- linux-4.1.6/drivers/bluetooth/hci_ldisc.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/bluetooth/hci_ldisc.c 2015-09-11 17:46:11.570821152 +0200
+diff -Nur linux-4.1.10.orig/drivers/bluetooth/hci_ldisc.c linux-4.1.10/drivers/bluetooth/hci_ldisc.c
+--- linux-4.1.10.orig/drivers/bluetooth/hci_ldisc.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/bluetooth/hci_ldisc.c 2015-10-10 16:41:42.209314836 +0200
@@ -40,6 +40,7 @@
#include <linux/signal.h>
#include <linux/ioctl.h>
@@ -23699,9 +23231,9 @@ diff -Nur linux-4.1.6/drivers/bluetooth/hci_ldisc.c xbian-sources-kernel/drivers
if (hu->proto->setup)
return hu->proto->setup(hu);
-diff -Nur linux-4.1.6/drivers/bluetooth/hci_uart.h xbian-sources-kernel/drivers/bluetooth/hci_uart.h
---- linux-4.1.6/drivers/bluetooth/hci_uart.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/bluetooth/hci_uart.h 2015-09-11 17:46:11.570821152 +0200
+diff -Nur linux-4.1.10.orig/drivers/bluetooth/hci_uart.h linux-4.1.10/drivers/bluetooth/hci_uart.h
+--- linux-4.1.10.orig/drivers/bluetooth/hci_uart.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/bluetooth/hci_uart.h 2015-10-10 16:41:42.209314836 +0200
@@ -58,10 +58,13 @@
struct hci_uart_proto {
unsigned int id;
@@ -23738,9 +23270,9 @@ diff -Nur linux-4.1.6/drivers/bluetooth/hci_uart.h xbian-sources-kernel/drivers/
#ifdef CONFIG_BT_HCIUART_H4
int h4_init(void);
-diff -Nur linux-4.1.6/drivers/bluetooth/hci_vhci.c xbian-sources-kernel/drivers/bluetooth/hci_vhci.c
---- linux-4.1.6/drivers/bluetooth/hci_vhci.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/bluetooth/hci_vhci.c 2015-09-11 17:46:11.574820885 +0200
+diff -Nur linux-4.1.10.orig/drivers/bluetooth/hci_vhci.c linux-4.1.10/drivers/bluetooth/hci_vhci.c
+--- linux-4.1.10.orig/drivers/bluetooth/hci_vhci.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/bluetooth/hci_vhci.c 2015-10-10 16:41:42.209314836 +0200
@@ -366,7 +366,7 @@
.llseek = no_llseek,
};
@@ -23750,9 +23282,9 @@ diff -Nur linux-4.1.6/drivers/bluetooth/hci_vhci.c xbian-sources-kernel/drivers/
.name = "vhci",
.fops = &vhci_fops,
.minor = VHCI_MINOR,
-diff -Nur linux-4.1.6/drivers/bluetooth/Kconfig xbian-sources-kernel/drivers/bluetooth/Kconfig
---- linux-4.1.6/drivers/bluetooth/Kconfig 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/bluetooth/Kconfig 2015-09-11 17:46:11.550822492 +0200
+diff -Nur linux-4.1.10.orig/drivers/bluetooth/Kconfig linux-4.1.10/drivers/bluetooth/Kconfig
+--- linux-4.1.10.orig/drivers/bluetooth/Kconfig 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/bluetooth/Kconfig 2015-10-10 16:41:42.209314836 +0200
@@ -9,6 +9,10 @@
tristate
select FW_LOADER
@@ -23782,9 +23314,9 @@ diff -Nur linux-4.1.6/drivers/bluetooth/Kconfig xbian-sources-kernel/drivers/blu
config BT_HCIBTSDIO
tristate "HCI SDIO driver"
depends on MMC
-diff -Nur linux-4.1.6/drivers/bluetooth/Makefile xbian-sources-kernel/drivers/bluetooth/Makefile
---- linux-4.1.6/drivers/bluetooth/Makefile 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/bluetooth/Makefile 2015-09-11 17:46:11.550822492 +0200
+diff -Nur linux-4.1.10.orig/drivers/bluetooth/Makefile linux-4.1.10/drivers/bluetooth/Makefile
+--- linux-4.1.10.orig/drivers/bluetooth/Makefile 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/bluetooth/Makefile 2015-10-10 16:41:42.209314836 +0200
@@ -21,6 +21,7 @@
obj-$(CONFIG_BT_MRVL_SDIO) += btmrvl_sdio.o
obj-$(CONFIG_BT_WILINK) += btwilink.o
@@ -23793,9 +23325,9 @@ diff -Nur linux-4.1.6/drivers/bluetooth/Makefile xbian-sources-kernel/drivers/bl
btmrvl-y := btmrvl_main.o
btmrvl-$(CONFIG_DEBUG_FS) += btmrvl_debugfs.o
-diff -Nur linux-4.1.6/drivers/char/frandom.c xbian-sources-kernel/drivers/char/frandom.c
---- linux-4.1.6/drivers/char/frandom.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/char/frandom.c 2015-09-11 17:46:11.586820081 +0200
+diff -Nur linux-4.1.10.orig/drivers/char/frandom.c linux-4.1.10/drivers/char/frandom.c
+--- linux-4.1.10.orig/drivers/char/frandom.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/char/frandom.c 2015-10-10 16:41:42.209314836 +0200
@@ -0,0 +1,415 @@
+/*
+** frandom.c
@@ -24212,9 +23744,9 @@ diff -Nur linux-4.1.6/drivers/char/frandom.c xbian-sources-kernel/drivers/char/f
+module_exit(frandom_cleanup_module);
+
+EXPORT_SYMBOL(erandom_get_random_bytes);
-diff -Nur linux-4.1.6/drivers/char/Makefile xbian-sources-kernel/drivers/char/Makefile
---- linux-4.1.6/drivers/char/Makefile 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/char/Makefile 2015-09-11 17:46:11.578820618 +0200
+diff -Nur linux-4.1.10.orig/drivers/char/Makefile linux-4.1.10/drivers/char/Makefile
+--- linux-4.1.10.orig/drivers/char/Makefile 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/char/Makefile 2015-10-10 16:41:42.209314836 +0200
@@ -2,6 +2,7 @@
# Makefile for the kernel character device drivers.
#
@@ -24223,9 +23755,9 @@ diff -Nur linux-4.1.6/drivers/char/Makefile xbian-sources-kernel/drivers/char/Ma
obj-y += mem.o random.o
obj-$(CONFIG_TTY_PRINTK) += ttyprintk.o
obj-y += misc.o
-diff -Nur linux-4.1.6/drivers/cpufreq/imx6q-cpufreq.c xbian-sources-kernel/drivers/cpufreq/imx6q-cpufreq.c
---- linux-4.1.6/drivers/cpufreq/imx6q-cpufreq.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/cpufreq/imx6q-cpufreq.c 2015-09-11 17:46:11.734810174 +0200
+diff -Nur linux-4.1.10.orig/drivers/cpufreq/imx6q-cpufreq.c linux-4.1.10/drivers/cpufreq/imx6q-cpufreq.c
+--- linux-4.1.10.orig/drivers/cpufreq/imx6q-cpufreq.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/cpufreq/imx6q-cpufreq.c 2015-10-10 16:41:42.209314836 +0200
@@ -20,6 +20,8 @@
#define PU_SOC_VOLTAGE_HIGH 1275000
#define FREQ_1P2_GHZ 1200000000
@@ -24246,9 +23778,9 @@ diff -Nur linux-4.1.6/drivers/cpufreq/imx6q-cpufreq.c xbian-sources-kernel/drive
break;
}
}
-diff -Nur linux-4.1.6/drivers/crypto/caam/caamalg.c xbian-sources-kernel/drivers/crypto/caam/caamalg.c
---- linux-4.1.6/drivers/crypto/caam/caamalg.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/crypto/caam/caamalg.c 2015-09-11 17:46:11.766808032 +0200
+diff -Nur linux-4.1.10.orig/drivers/crypto/caam/caamalg.c linux-4.1.10/drivers/crypto/caam/caamalg.c
+--- linux-4.1.10.orig/drivers/crypto/caam/caamalg.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/crypto/caam/caamalg.c 2015-10-10 16:41:42.217314835 +0200
@@ -1,7 +1,7 @@
/*
* caam - Freescale FSL CAAM support for crypto API
@@ -28064,9 +27596,9 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamalg.c xbian-sources-kernel/drivers
return err;
}
-diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/drivers/crypto/caam/caamhash.c
---- linux-4.1.6/drivers/crypto/caam/caamhash.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/crypto/caam/caamhash.c 2015-09-11 17:46:11.766808032 +0200
+diff -Nur linux-4.1.10.orig/drivers/crypto/caam/caamhash.c linux-4.1.10/drivers/crypto/caam/caamhash.c
+--- linux-4.1.10.orig/drivers/crypto/caam/caamhash.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/crypto/caam/caamhash.c 2015-10-10 16:41:42.221314836 +0200
@@ -1,7 +1,7 @@
/*
* caam - Freescale FSL CAAM support for ahash functions of crypto API
@@ -28669,11 +28201,11 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
- caam_jr_strstatus(jrdev, err);
+ if (err) {
+ char tmp[CAAM_ERROR_STR_MAX];
-+
-+ dev_err(jrdev, "%08x: %s\n", err, caam_jr_strstatus(tmp, err));
-+ }
- ahash_unmap_ctx(jrdev, edesc, req, digestsize, DMA_TO_DEVICE);
++ dev_err(jrdev, "%08x: %s\n", err, caam_jr_strstatus(tmp, err));
++ }
++
+ ahash_unmap_ctx(jrdev, edesc, req, digestsize, DMA_FROM_DEVICE);
kfree(edesc);
@@ -28696,11 +28228,11 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
- caam_jr_strstatus(jrdev, err);
+ if (err) {
+ char tmp[CAAM_ERROR_STR_MAX];
-
-- ahash_unmap_ctx(jrdev, edesc, req, ctx->ctx_len, DMA_FROM_DEVICE);
++
+ dev_err(jrdev, "%08x: %s\n", err, caam_jr_strstatus(tmp, err));
+ }
-+
+
+- ahash_unmap_ctx(jrdev, edesc, req, ctx->ctx_len, DMA_FROM_DEVICE);
+ ahash_unmap_ctx(jrdev, edesc, req, ctx->ctx_len, DMA_TO_DEVICE);
kfree(edesc);
@@ -28779,75 +28311,7 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
DUMP_PREFIX_ADDRESS, 16, 4, next_buf,
*next_buflen, 1);
#endif
-@@ -909,16 +1141,17 @@
- state->buflen_1;
- u32 *sh_desc = ctx->sh_desc_fin, *desc;
- dma_addr_t ptr = ctx->sh_desc_fin_dma;
-- int sec4_sg_bytes;
-+ int sec4_sg_bytes, sec4_sg_src_index;
- int digestsize = crypto_ahash_digestsize(ahash);
- struct ahash_edesc *edesc;
- int ret = 0;
- int sh_len;
-
-- sec4_sg_bytes = (1 + (buflen ? 1 : 0)) * sizeof(struct sec4_sg_entry);
-+ sec4_sg_src_index = 1 + (buflen ? 1 : 0);
-+ sec4_sg_bytes = sec4_sg_src_index * sizeof(struct sec4_sg_entry);
-
- /* allocate space for base edesc and hw desc commands, link tables */
-- edesc = kmalloc(sizeof(struct ahash_edesc) + DESC_JOB_IO_LEN +
-+ edesc = kzalloc(sizeof(struct ahash_edesc) + DESC_JOB_IO_LEN +
- sec4_sg_bytes, GFP_DMA | flags);
- if (!edesc) {
- dev_err(jrdev, "could not allocate extended descriptor\n");
-@@ -932,37 +1165,29 @@
- edesc->sec4_sg_bytes = sec4_sg_bytes;
- edesc->sec4_sg = (void *)edesc + sizeof(struct ahash_edesc) +
- DESC_JOB_IO_LEN;
-+ edesc->sec4_sg_dma = dma_map_single(jrdev, edesc->sec4_sg,
-+ sec4_sg_bytes, DMA_TO_DEVICE);
- edesc->src_nents = 0;
-
-- ret = ctx_map_to_sec4_sg(desc, jrdev, state, ctx->ctx_len,
-- edesc->sec4_sg, DMA_TO_DEVICE);
-- if (ret)
-- return ret;
-+ ctx_map_to_sec4_sg(desc, jrdev, state, ctx->ctx_len, edesc->sec4_sg,
-+ DMA_TO_DEVICE);
-
- state->buf_dma = try_buf_map_to_sec4_sg(jrdev, edesc->sec4_sg + 1,
- buf, state->buf_dma, buflen,
- last_buflen);
-- (edesc->sec4_sg + sec4_sg_bytes - 1)->len |= SEC4_SG_LEN_FIN;
--
-- edesc->sec4_sg_dma = dma_map_single(jrdev, edesc->sec4_sg,
-- sec4_sg_bytes, DMA_TO_DEVICE);
-- if (dma_mapping_error(jrdev, edesc->sec4_sg_dma)) {
-- dev_err(jrdev, "unable to map S/G table\n");
-- return -ENOMEM;
-- }
-+ (edesc->sec4_sg + sec4_sg_src_index - 1)->len |= SEC4_SG_LEN_FIN;
-
- append_seq_in_ptr(desc, edesc->sec4_sg_dma, ctx->ctx_len + buflen,
- LDST_SGF);
-
- edesc->dst_dma = map_seq_out_ptr_result(desc, jrdev, req->result,
- digestsize);
-- if (dma_mapping_error(jrdev, edesc->dst_dma)) {
-- dev_err(jrdev, "unable to map dst\n");
-- return -ENOMEM;
-- }
-+
-+ dma_sync_single_for_device(jrdev, edesc->sec4_sg_dma, sec4_sg_bytes,
-+ DMA_TO_DEVICE);
-
- #ifdef DEBUG
-- print_hex_dump(KERN_ERR, "jobdesc@"__stringify(__LINE__)": ",
-+ print_hex_dump(KERN_ERR, "jobdesc@"xstr(__LINE__)": ",
- DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);
- #endif
-
-@@ -1005,7 +1230,7 @@
+@@ -1006,7 +1238,7 @@
sizeof(struct sec4_sg_entry);
/* allocate space for base edesc and hw desc commands, link tables */
@@ -28856,7 +28320,7 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
sec4_sg_bytes, GFP_DMA | flags);
if (!edesc) {
dev_err(jrdev, "could not allocate extended descriptor\n");
-@@ -1021,11 +1246,11 @@
+@@ -1022,11 +1254,11 @@
edesc->sec4_sg_bytes = sec4_sg_bytes;
edesc->sec4_sg = (void *)edesc + sizeof(struct ahash_edesc) +
DESC_JOB_IO_LEN;
@@ -28872,7 +28336,7 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
state->buf_dma = try_buf_map_to_sec4_sg(jrdev, edesc->sec4_sg + 1,
buf, state->buf_dma, buflen,
-@@ -1034,25 +1259,17 @@
+@@ -1035,25 +1267,17 @@
src_map_to_sec4_sg(jrdev, req->src, src_nents, edesc->sec4_sg +
sec4_sg_src_index, chained);
@@ -28902,7 +28366,7 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);
#endif
-@@ -1091,7 +1308,7 @@
+@@ -1092,7 +1316,7 @@
sec4_sg_bytes = src_nents * sizeof(struct sec4_sg_entry);
/* allocate space for base edesc and hw desc commands, link tables */
@@ -28911,7 +28375,7 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
DESC_JOB_IO_LEN, GFP_DMA | flags);
if (!edesc) {
dev_err(jrdev, "could not allocate extended descriptor\n");
-@@ -1099,6 +1316,8 @@
+@@ -1100,6 +1324,8 @@
}
edesc->sec4_sg = (void *)edesc + sizeof(struct ahash_edesc) +
DESC_JOB_IO_LEN;
@@ -28920,7 +28384,7 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
edesc->sec4_sg_bytes = sec4_sg_bytes;
edesc->src_nents = src_nents;
edesc->chained = chained;
-@@ -1109,12 +1328,6 @@
+@@ -1110,12 +1336,6 @@
if (src_nents) {
sg_to_sec4_sg_last(req->src, src_nents, edesc->sec4_sg, 0);
@@ -28933,7 +28397,7 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
src_dma = edesc->sec4_sg_dma;
options = LDST_SGF;
} else {
-@@ -1123,15 +1336,14 @@
+@@ -1124,15 +1344,14 @@
}
append_seq_in_ptr(desc, src_dma, req->nbytes, options);
@@ -28953,7 +28417,7 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);
#endif
-@@ -1165,7 +1377,7 @@
+@@ -1166,7 +1385,7 @@
int sh_len;
/* allocate space for base edesc and hw desc commands, link tables */
@@ -28962,7 +28426,7 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
GFP_DMA | flags);
if (!edesc) {
dev_err(jrdev, "could not allocate extended descriptor\n");
-@@ -1178,23 +1390,17 @@
+@@ -1179,23 +1398,17 @@
init_job_desc_shared(desc, ptr, sh_len, HDR_SHARE_DEFER | HDR_REVERSE);
state->buf_dma = dma_map_single(jrdev, buf, buflen, DMA_TO_DEVICE);
@@ -28989,7 +28453,7 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);
#endif
-@@ -1245,7 +1451,7 @@
+@@ -1246,7 +1459,7 @@
* allocate space for base edesc and hw desc commands,
* link tables
*/
@@ -28998,7 +28462,7 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
sec4_sg_bytes, GFP_DMA | flags);
if (!edesc) {
dev_err(jrdev,
-@@ -1258,7 +1464,9 @@
+@@ -1259,7 +1472,9 @@
edesc->sec4_sg_bytes = sec4_sg_bytes;
edesc->sec4_sg = (void *)edesc + sizeof(struct ahash_edesc) +
DESC_JOB_IO_LEN;
@@ -29009,7 +28473,7 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
state->buf_dma = buf_map_to_sec4_sg(jrdev, edesc->sec4_sg,
buf, *buflen);
-@@ -1276,22 +1484,14 @@
+@@ -1277,22 +1492,14 @@
init_job_desc_shared(desc, ptr, sh_len, HDR_SHARE_DEFER |
HDR_REVERSE);
@@ -29036,7 +28500,7 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
DUMP_PREFIX_ADDRESS, 16, 4, desc,
desc_bytes(desc), 1);
#endif
-@@ -1314,9 +1514,9 @@
+@@ -1315,9 +1522,9 @@
*next_buflen = 0;
}
#ifdef DEBUG
@@ -29048,7 +28512,7 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
DUMP_PREFIX_ADDRESS, 16, 4, next_buf,
*next_buflen, 1);
#endif
-@@ -1352,7 +1552,7 @@
+@@ -1353,7 +1560,7 @@
sizeof(struct sec4_sg_entry);
/* allocate space for base edesc and hw desc commands, link tables */
@@ -29057,7 +28521,7 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
sec4_sg_bytes, GFP_DMA | flags);
if (!edesc) {
dev_err(jrdev, "could not allocate extended descriptor\n");
-@@ -1368,6 +1568,8 @@
+@@ -1369,6 +1576,8 @@
edesc->sec4_sg_bytes = sec4_sg_bytes;
edesc->sec4_sg = (void *)edesc + sizeof(struct ahash_edesc) +
DESC_JOB_IO_LEN;
@@ -29066,7 +28530,7 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
state->buf_dma = try_buf_map_to_sec4_sg(jrdev, edesc->sec4_sg, buf,
state->buf_dma, buflen,
-@@ -1376,25 +1578,17 @@
+@@ -1377,25 +1586,17 @@
src_map_to_sec4_sg(jrdev, req->src, src_nents, edesc->sec4_sg + 1,
chained);
@@ -29096,7 +28560,7 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);
#endif
-@@ -1447,7 +1641,7 @@
+@@ -1448,7 +1649,7 @@
* allocate space for base edesc and hw desc commands,
* link tables
*/
@@ -29105,7 +28569,7 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
sec4_sg_bytes, GFP_DMA | flags);
if (!edesc) {
dev_err(jrdev,
-@@ -1460,19 +1654,13 @@
+@@ -1461,19 +1662,13 @@
edesc->sec4_sg_bytes = sec4_sg_bytes;
edesc->sec4_sg = (void *)edesc + sizeof(struct ahash_edesc) +
DESC_JOB_IO_LEN;
@@ -29128,7 +28592,7 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
src_dma = edesc->sec4_sg_dma;
options = LDST_SGF;
} else {
-@@ -1491,12 +1679,12 @@
+@@ -1492,12 +1687,12 @@
append_seq_in_ptr(desc, src_dma, to_hash, options);
@@ -29145,7 +28609,7 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
DUMP_PREFIX_ADDRESS, 16, 4, desc,
desc_bytes(desc), 1);
#endif
-@@ -1521,7 +1709,7 @@
+@@ -1522,7 +1717,7 @@
req->nbytes, 0);
}
#ifdef DEBUG
@@ -29154,7 +28618,7 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
DUMP_PREFIX_ADDRESS, 16, 4, next_buf,
*next_buflen, 1);
#endif
-@@ -1735,10 +1923,33 @@
+@@ -1736,10 +1931,33 @@
.alg_type = OP_ALG_ALGSEL_MD5,
.alg_op = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC,
},
@@ -29188,7 +28652,7 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
int alg_type;
int alg_op;
struct ahash_alg ahash_alg;
-@@ -1755,6 +1966,7 @@
+@@ -1756,6 +1974,7 @@
struct caam_hash_alg *caam_hash =
container_of(alg, struct caam_hash_alg, ahash_alg);
struct caam_hash_ctx *ctx = crypto_tfm_ctx(tfm);
@@ -29196,7 +28660,7 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
/* Sizes for MDHA running digests: MD5, SHA1, 224, 256, 384, 512 */
static const u8 runninglen[] = { HASH_MSG_LEN + MD5_DIGEST_SIZE,
HASH_MSG_LEN + SHA1_DIGEST_SIZE,
-@@ -1762,17 +1974,15 @@
+@@ -1763,17 +1982,15 @@
HASH_MSG_LEN + SHA256_DIGEST_SIZE,
HASH_MSG_LEN + 64,
HASH_MSG_LEN + SHA512_DIGEST_SIZE };
@@ -29218,7 +28682,7 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
/* copy descriptor header template value */
ctx->alg_type = OP_TYPE_CLASS2_ALG | caam_hash->alg_type;
ctx->alg_op = OP_TYPE_CLASS2_ALG | caam_hash->alg_op;
-@@ -1788,6 +1998,39 @@
+@@ -1789,6 +2006,39 @@
return ret;
}
@@ -29258,7 +28722,7 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
static void caam_hash_cra_exit(struct crypto_tfm *tfm)
{
struct caam_hash_ctx *ctx = crypto_tfm_ctx(tfm);
-@@ -1815,35 +2058,57 @@
+@@ -1816,35 +2066,57 @@
!dma_mapping_error(ctx->jrdev, ctx->sh_desc_finup_dma))
dma_unmap_single(ctx->jrdev, ctx->sh_desc_finup_dma,
desc_bytes(ctx->sh_desc_finup), DMA_TO_DEVICE);
@@ -29285,18 +28749,18 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
+ pdev = of_find_device_by_node(dev_node);
+ if (!pdev) {
+ of_node_put(dev_node);
- return;
++ return;
+ }
-
-- list_for_each_entry_safe(t_alg, n, &hash_list, entry) {
++
+ ctrldev = &pdev->dev;
+ priv = dev_get_drvdata(ctrldev);
+
+ if (!priv->hash_list.next) {
+ of_node_put(dev_node);
-+ return;
+ return;
+ }
-+
+
+- list_for_each_entry_safe(t_alg, n, &hash_list, entry) {
+ list_for_each_entry_safe(t_alg, n, &priv->hash_list, entry) {
crypto_unregister_ahash(&t_alg->ahash_alg);
list_del(&t_alg->entry);
@@ -29323,7 +28787,7 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
return ERR_PTR(-ENOMEM);
}
-@@ -1863,7 +2128,11 @@
+@@ -1864,7 +2136,11 @@
template->driver_name);
}
alg->cra_module = THIS_MODULE;
@@ -29336,7 +28800,7 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
alg->cra_exit = caam_hash_cra_exit;
alg->cra_ctxsize = sizeof(struct caam_hash_ctx);
alg->cra_priority = CAAM_CRA_PRIORITY;
-@@ -1874,6 +2143,7 @@
+@@ -1875,6 +2151,7 @@
t_alg->alg_type = template->alg_type;
t_alg->alg_op = template->alg_op;
@@ -29344,7 +28808,7 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
return t_alg;
}
-@@ -1883,8 +2153,9 @@
+@@ -1884,8 +2161,9 @@
struct device_node *dev_node;
struct platform_device *pdev;
struct device *ctrldev;
@@ -29356,7 +28820,7 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
dev_node = of_find_compatible_node(NULL, NULL, "fsl,sec-v4.0");
if (!dev_node) {
-@@ -1898,60 +2169,68 @@
+@@ -1899,60 +2177,68 @@
of_node_put(dev_node);
return -ENODEV;
}
@@ -29446,9 +28910,9 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamhash.c xbian-sources-kernel/driver
return err;
}
-diff -Nur linux-4.1.6/drivers/crypto/caam/caam_keyblob.c xbian-sources-kernel/drivers/crypto/caam/caam_keyblob.c
---- linux-4.1.6/drivers/crypto/caam/caam_keyblob.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/crypto/caam/caam_keyblob.c 2015-09-11 17:46:11.762808301 +0200
+diff -Nur linux-4.1.10.orig/drivers/crypto/caam/caam_keyblob.c linux-4.1.10/drivers/crypto/caam/caam_keyblob.c
+--- linux-4.1.10.orig/drivers/crypto/caam/caam_keyblob.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/crypto/caam/caam_keyblob.c 2015-10-10 16:41:42.221314836 +0200
@@ -0,0 +1,687 @@
+/*
+ * Key blob driver based on CAAM hardware
@@ -30137,9 +29601,9 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caam_keyblob.c xbian-sources-kernel/dr
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_DESCRIPTION("FSL CAAM Secure Memory / Keystore");
+MODULE_AUTHOR("Freescale Semiconductor - NMSG/MAD");
-diff -Nur linux-4.1.6/drivers/crypto/caam/caam_keyblob.h xbian-sources-kernel/drivers/crypto/caam/caam_keyblob.h
---- linux-4.1.6/drivers/crypto/caam/caam_keyblob.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/crypto/caam/caam_keyblob.h 2015-09-11 17:46:11.762808301 +0200
+diff -Nur linux-4.1.10.orig/drivers/crypto/caam/caam_keyblob.h linux-4.1.10/drivers/crypto/caam/caam_keyblob.h
+--- linux-4.1.10.orig/drivers/crypto/caam/caam_keyblob.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/crypto/caam/caam_keyblob.h 2015-10-10 16:41:42.221314836 +0200
@@ -0,0 +1,45 @@
+/*
+ * CAAM public-level include definitions for the key blob
@@ -30186,9 +29650,9 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caam_keyblob.h xbian-sources-kernel/dr
+#endif
+
+#endif /* CAAM_KEYBLOB_H */
-diff -Nur linux-4.1.6/drivers/crypto/caam/caamrng.c xbian-sources-kernel/drivers/crypto/caam/caamrng.c
---- linux-4.1.6/drivers/crypto/caam/caamrng.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/crypto/caam/caamrng.c 2015-09-11 17:46:11.766808032 +0200
+diff -Nur linux-4.1.10.orig/drivers/crypto/caam/caamrng.c linux-4.1.10/drivers/crypto/caam/caamrng.c
+--- linux-4.1.10.orig/drivers/crypto/caam/caamrng.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/crypto/caam/caamrng.c 2015-10-10 16:41:42.221314836 +0200
@@ -1,7 +1,7 @@
/*
* caam - Freescale FSL CAAM support for hw_random
@@ -30445,9 +29909,9 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/caamrng.c xbian-sources-kernel/drivers
return hwrng_register(&caam_rng);
}
-diff -Nur linux-4.1.6/drivers/crypto/caam/compat.h xbian-sources-kernel/drivers/crypto/caam/compat.h
---- linux-4.1.6/drivers/crypto/caam/compat.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/crypto/caam/compat.h 2015-09-11 17:46:11.766808032 +0200
+diff -Nur linux-4.1.10.orig/drivers/crypto/caam/compat.h linux-4.1.10/drivers/crypto/caam/compat.h
+--- linux-4.1.10.orig/drivers/crypto/caam/compat.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/crypto/caam/compat.h 2015-10-10 16:41:42.221314836 +0200
@@ -14,6 +14,8 @@
#include <linux/hash.h>
#include <linux/hw_random.h>
@@ -30475,9 +29939,9 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/compat.h xbian-sources-kernel/drivers/
#include <crypto/des.h>
#include <crypto/sha.h>
#include <crypto/md5.h>
-diff -Nur linux-4.1.6/drivers/crypto/caam/ctrl.c xbian-sources-kernel/drivers/crypto/caam/ctrl.c
---- linux-4.1.6/drivers/crypto/caam/ctrl.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/crypto/caam/ctrl.c 2015-09-11 17:46:11.766808032 +0200
+diff -Nur linux-4.1.10.orig/drivers/crypto/caam/ctrl.c linux-4.1.10/drivers/crypto/caam/ctrl.c
+--- linux-4.1.10.orig/drivers/crypto/caam/ctrl.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/crypto/caam/ctrl.c 2015-10-10 16:41:42.221314836 +0200
@@ -1,405 +1,260 @@
-/* * CAAM control-plane driver backend
+/*
@@ -31455,9 +30919,9 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/ctrl.c xbian-sources-kernel/drivers/cr
.of_match_table = caam_match,
},
.probe = caam_probe,
-diff -Nur linux-4.1.6/drivers/crypto/caam/ctrl.h xbian-sources-kernel/drivers/crypto/caam/ctrl.h
---- linux-4.1.6/drivers/crypto/caam/ctrl.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/crypto/caam/ctrl.h 2015-09-11 17:46:11.766808032 +0200
+diff -Nur linux-4.1.10.orig/drivers/crypto/caam/ctrl.h linux-4.1.10/drivers/crypto/caam/ctrl.h
+--- linux-4.1.10.orig/drivers/crypto/caam/ctrl.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/crypto/caam/ctrl.h 2015-10-10 16:41:42.221314836 +0200
@@ -8,6 +8,6 @@
#define CTRL_H
@@ -31466,9 +30930,9 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/ctrl.h xbian-sources-kernel/drivers/cr
+int caam_get_era(u64 caam_id);
#endif /* CTRL_H */
-diff -Nur linux-4.1.6/drivers/crypto/caam/desc_constr.h xbian-sources-kernel/drivers/crypto/caam/desc_constr.h
---- linux-4.1.6/drivers/crypto/caam/desc_constr.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/crypto/caam/desc_constr.h 2015-09-11 17:46:11.766808032 +0200
+diff -Nur linux-4.1.10.orig/drivers/crypto/caam/desc_constr.h linux-4.1.10/drivers/crypto/caam/desc_constr.h
+--- linux-4.1.10.orig/drivers/crypto/caam/desc_constr.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/crypto/caam/desc_constr.h 2015-10-10 16:41:42.221314836 +0200
@@ -10,7 +10,6 @@
#define CAAM_CMD_SZ sizeof(u32)
#define CAAM_PTR_SZ sizeof(dma_addr_t)
@@ -31669,9 +31133,9 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/desc_constr.h xbian-sources-kernel/dri
- 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.6/drivers/crypto/caam/desc.h xbian-sources-kernel/drivers/crypto/caam/desc.h
---- linux-4.1.6/drivers/crypto/caam/desc.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/crypto/caam/desc.h 2015-09-11 17:46:11.766808032 +0200
+diff -Nur linux-4.1.10.orig/drivers/crypto/caam/desc.h linux-4.1.10/drivers/crypto/caam/desc.h
+--- linux-4.1.10.orig/drivers/crypto/caam/desc.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/crypto/caam/desc.h 2015-10-10 16:41:42.221314836 +0200
@@ -2,19 +2,35 @@
* CAAM descriptor composition header
* Definitions to support CAAM descriptor instruction generation
@@ -31869,9 +31333,9 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/desc.h xbian-sources-kernel/drivers/cr
-#define FD_CMD_REPLACE_JOB_DESC 0x20000000
#endif /* DESC_H */
-diff -Nur linux-4.1.6/drivers/crypto/caam/error.c xbian-sources-kernel/drivers/crypto/caam/error.c
---- linux-4.1.6/drivers/crypto/caam/error.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/crypto/caam/error.c 2015-09-11 17:46:11.766808032 +0200
+diff -Nur linux-4.1.10.orig/drivers/crypto/caam/error.c linux-4.1.10/drivers/crypto/caam/error.c
+--- linux-4.1.10.orig/drivers/crypto/caam/error.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/crypto/caam/error.c 2015-10-10 16:41:42.225314837 +0200
@@ -11,243 +11,264 @@
#include "jr.h"
#include "error.h"
@@ -32329,9 +31793,9 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/error.c xbian-sources-kernel/drivers/c
+ return outstr;
}
EXPORT_SYMBOL(caam_jr_strstatus);
-diff -Nur linux-4.1.6/drivers/crypto/caam/error.h xbian-sources-kernel/drivers/crypto/caam/error.h
---- linux-4.1.6/drivers/crypto/caam/error.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/crypto/caam/error.h 2015-09-11 17:46:11.766808032 +0200
+diff -Nur linux-4.1.10.orig/drivers/crypto/caam/error.h linux-4.1.10/drivers/crypto/caam/error.h
+--- linux-4.1.10.orig/drivers/crypto/caam/error.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/crypto/caam/error.h 2015-10-10 16:41:42.225314837 +0200
@@ -7,5 +7,5 @@
#ifndef CAAM_ERROR_H
#define CAAM_ERROR_H
@@ -32339,9 +31803,9 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/error.h xbian-sources-kernel/drivers/c
-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.6/drivers/crypto/caam/intern.h xbian-sources-kernel/drivers/crypto/caam/intern.h
---- linux-4.1.6/drivers/crypto/caam/intern.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/crypto/caam/intern.h 2015-09-11 17:46:11.766808032 +0200
+diff -Nur linux-4.1.10.orig/drivers/crypto/caam/intern.h linux-4.1.10/drivers/crypto/caam/intern.h
+--- linux-4.1.10.orig/drivers/crypto/caam/intern.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/crypto/caam/intern.h 2015-10-10 16:41:42.245314837 +0200
@@ -2,13 +2,19 @@
* CAAM/SEC 4.x driver backend
* Private/internal definitions between modules
@@ -32439,9 +31903,9 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/intern.h xbian-sources-kernel/drivers/
/*
* debugfs entries for developer view into driver/device
* variables at runtime.
-diff -Nur linux-4.1.6/drivers/crypto/caam/jr.c xbian-sources-kernel/drivers/crypto/caam/jr.c
---- linux-4.1.6/drivers/crypto/caam/jr.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/crypto/caam/jr.c 2015-09-11 17:46:11.766808032 +0200
+diff -Nur linux-4.1.10.orig/drivers/crypto/caam/jr.c linux-4.1.10/drivers/crypto/caam/jr.c
+--- linux-4.1.10.orig/drivers/crypto/caam/jr.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/crypto/caam/jr.c 2015-10-10 16:41:42.245314837 +0200
@@ -2,125 +2,15 @@
* CAAM/SEC 4.x transport/backend driver
* JobR backend functionality
@@ -33063,9 +32527,9 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/jr.c xbian-sources-kernel/drivers/cryp
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("FSL CAAM JR request backend");
-MODULE_AUTHOR("Freescale Semiconductor - NMG/STC");
-diff -Nur linux-4.1.6/drivers/crypto/caam/jr.h xbian-sources-kernel/drivers/crypto/caam/jr.h
---- linux-4.1.6/drivers/crypto/caam/jr.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/crypto/caam/jr.h 2015-09-11 17:46:11.766808032 +0200
+diff -Nur linux-4.1.10.orig/drivers/crypto/caam/jr.h linux-4.1.10/drivers/crypto/caam/jr.h
+--- linux-4.1.10.orig/drivers/crypto/caam/jr.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/crypto/caam/jr.h 2015-10-10 16:41:42.245314837 +0200
@@ -1,18 +1,22 @@
/*
* CAAM public-level include definitions for the JobR backend
@@ -33092,9 +32556,9 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/jr.h xbian-sources-kernel/drivers/cryp
+extern int caam_jr_shutdown(struct device *dev);
+extern struct device *caam_get_jrdev(void);
#endif /* JR_H */
-diff -Nur linux-4.1.6/drivers/crypto/caam/Kconfig xbian-sources-kernel/drivers/crypto/caam/Kconfig
---- linux-4.1.6/drivers/crypto/caam/Kconfig 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/crypto/caam/Kconfig 2015-09-11 17:46:11.750809103 +0200
+diff -Nur linux-4.1.10.orig/drivers/crypto/caam/Kconfig linux-4.1.10/drivers/crypto/caam/Kconfig
+--- linux-4.1.10.orig/drivers/crypto/caam/Kconfig 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/crypto/caam/Kconfig 2015-10-10 16:41:42.245314837 +0200
@@ -1,32 +1,19 @@
config CRYPTO_DEV_FSL_CAAM
tristate "Freescale CAAM-Multicore driver backend"
@@ -33242,9 +32706,9 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/Kconfig xbian-sources-kernel/drivers/c
+ will be called caam_keyblob.
+
+
-diff -Nur linux-4.1.6/drivers/crypto/caam/key_gen.c xbian-sources-kernel/drivers/crypto/caam/key_gen.c
---- linux-4.1.6/drivers/crypto/caam/key_gen.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/crypto/caam/key_gen.c 2015-09-11 17:46:11.766808032 +0200
+diff -Nur linux-4.1.10.orig/drivers/crypto/caam/key_gen.c linux-4.1.10/drivers/crypto/caam/key_gen.c
+--- linux-4.1.10.orig/drivers/crypto/caam/key_gen.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/crypto/caam/key_gen.c 2015-10-10 16:41:42.245314837 +0200
@@ -1,7 +1,7 @@
/*
* CAAM/SEC 4.x functions for handling key-generation jobs
@@ -33333,9 +32797,9 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/key_gen.c xbian-sources-kernel/drivers
dma_unmap_single(jrdev, dma_addr_out, split_key_pad_len,
DMA_FROM_DEVICE);
out_unmap_in:
-diff -Nur linux-4.1.6/drivers/crypto/caam/Makefile xbian-sources-kernel/drivers/crypto/caam/Makefile
---- linux-4.1.6/drivers/crypto/caam/Makefile 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/crypto/caam/Makefile 2015-09-11 17:46:11.762808301 +0200
+diff -Nur linux-4.1.10.orig/drivers/crypto/caam/Makefile linux-4.1.10/drivers/crypto/caam/Makefile
+--- linux-4.1.10.orig/drivers/crypto/caam/Makefile 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/crypto/caam/Makefile 2015-10-10 16:41:42.249314838 +0200
@@ -1,15 +1,14 @@
#
# Makefile for the CAAM backend and dependent components
@@ -33357,9 +32821,9 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/Makefile xbian-sources-kernel/drivers/
-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.6/drivers/crypto/caam/pdb.h xbian-sources-kernel/drivers/crypto/caam/pdb.h
---- linux-4.1.6/drivers/crypto/caam/pdb.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/crypto/caam/pdb.h 2015-09-11 17:46:11.766808032 +0200
+diff -Nur linux-4.1.10.orig/drivers/crypto/caam/pdb.h linux-4.1.10/drivers/crypto/caam/pdb.h
+--- linux-4.1.10.orig/drivers/crypto/caam/pdb.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/crypto/caam/pdb.h 2015-10-10 16:41:42.249314838 +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 */
@@ -33368,9 +32832,9 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/pdb.h xbian-sources-kernel/drivers/cry
#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.6/drivers/crypto/caam/regs.h xbian-sources-kernel/drivers/crypto/caam/regs.h
---- linux-4.1.6/drivers/crypto/caam/regs.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/crypto/caam/regs.h 2015-09-11 17:46:11.766808032 +0200
+diff -Nur linux-4.1.10.orig/drivers/crypto/caam/regs.h linux-4.1.10/drivers/crypto/caam/regs.h
+--- linux-4.1.10.orig/drivers/crypto/caam/regs.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/crypto/caam/regs.h 2015-10-10 16:41:42.249314838 +0200
@@ -1,7 +1,7 @@
/*
* CAAM hardware register-level view
@@ -33934,9 +33398,9 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/regs.h xbian-sources-kernel/drivers/cr
+};
+
#endif /* REGS_H */
-diff -Nur linux-4.1.6/drivers/crypto/caam/secvio.c xbian-sources-kernel/drivers/crypto/caam/secvio.c
---- linux-4.1.6/drivers/crypto/caam/secvio.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/crypto/caam/secvio.c 2015-09-11 17:46:11.766808032 +0200
+diff -Nur linux-4.1.10.orig/drivers/crypto/caam/secvio.c linux-4.1.10/drivers/crypto/caam/secvio.c
+--- linux-4.1.10.orig/drivers/crypto/caam/secvio.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/crypto/caam/secvio.c 2015-10-10 16:41:42.249314838 +0200
@@ -0,0 +1,290 @@
+
+/*
@@ -34228,9 +33692,9 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/secvio.c xbian-sources-kernel/drivers/
+MODULE_DESCRIPTION("FSL SNVS Security Violation Handler");
+MODULE_AUTHOR("Freescale Semiconductor - MCU");
+
-diff -Nur linux-4.1.6/drivers/crypto/caam/secvio.h xbian-sources-kernel/drivers/crypto/caam/secvio.h
---- linux-4.1.6/drivers/crypto/caam/secvio.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/crypto/caam/secvio.h 2015-09-11 17:46:11.766808032 +0200
+diff -Nur linux-4.1.10.orig/drivers/crypto/caam/secvio.h linux-4.1.10/drivers/crypto/caam/secvio.h
+--- linux-4.1.10.orig/drivers/crypto/caam/secvio.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/crypto/caam/secvio.h 2015-10-10 16:41:42.253314839 +0200
@@ -0,0 +1,66 @@
+
+/*
@@ -34298,9 +33762,9 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/secvio.h xbian-sources-kernel/drivers/
+};
+
+#endif /* SECVIO_H */
-diff -Nur linux-4.1.6/drivers/crypto/caam/sg_sw_sec4.h xbian-sources-kernel/drivers/crypto/caam/sg_sw_sec4.h
---- linux-4.1.6/drivers/crypto/caam/sg_sw_sec4.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/crypto/caam/sg_sw_sec4.h 2015-09-11 17:46:11.766808032 +0200
+diff -Nur linux-4.1.10.orig/drivers/crypto/caam/sg_sw_sec4.h linux-4.1.10/drivers/crypto/caam/sg_sw_sec4.h
+--- linux-4.1.10.orig/drivers/crypto/caam/sg_sw_sec4.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/crypto/caam/sg_sw_sec4.h 2015-10-10 16:41:42.253314839 +0200
@@ -1,7 +1,7 @@
/*
* CAAM/SEC 4.x functions for using scatterlists in caam driver
@@ -34387,9 +33851,9 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/sg_sw_sec4.h xbian-sources-kernel/driv
+ if (end - sg_index)
+ sg_copy(dest + cpy_index, current_sg, end - sg_index);
+}
-diff -Nur linux-4.1.6/drivers/crypto/caam/sm.h xbian-sources-kernel/drivers/crypto/caam/sm.h
---- linux-4.1.6/drivers/crypto/caam/sm.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/crypto/caam/sm.h 2015-09-11 17:46:11.766808032 +0200
+diff -Nur linux-4.1.10.orig/drivers/crypto/caam/sm.h linux-4.1.10/drivers/crypto/caam/sm.h
+--- linux-4.1.10.orig/drivers/crypto/caam/sm.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/crypto/caam/sm.h 2015-10-10 16:41:42.253314839 +0200
@@ -0,0 +1,88 @@
+
+/*
@@ -34479,9 +33943,9 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/sm.h xbian-sources-kernel/drivers/cryp
+};
+
+#endif /* SM_H */
-diff -Nur linux-4.1.6/drivers/crypto/caam/sm_store.c xbian-sources-kernel/drivers/crypto/caam/sm_store.c
---- linux-4.1.6/drivers/crypto/caam/sm_store.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/crypto/caam/sm_store.c 2015-09-11 17:46:11.766808032 +0200
+diff -Nur linux-4.1.10.orig/drivers/crypto/caam/sm_store.c linux-4.1.10/drivers/crypto/caam/sm_store.c
+--- linux-4.1.10.orig/drivers/crypto/caam/sm_store.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/crypto/caam/sm_store.c 2015-10-10 16:41:42.253314839 +0200
@@ -0,0 +1,896 @@
+
+/*
@@ -35379,9 +34843,9 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/sm_store.c xbian-sources-kernel/driver
+MODULE_DESCRIPTION("FSL CAAM Secure Memory / Keystore");
+MODULE_AUTHOR("Freescale Semiconductor - NMSG/MAD");
+#endif
-diff -Nur linux-4.1.6/drivers/crypto/caam/sm_test.c xbian-sources-kernel/drivers/crypto/caam/sm_test.c
---- linux-4.1.6/drivers/crypto/caam/sm_test.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/crypto/caam/sm_test.c 2015-09-11 17:46:11.766808032 +0200
+diff -Nur linux-4.1.10.orig/drivers/crypto/caam/sm_test.c linux-4.1.10/drivers/crypto/caam/sm_test.c
+--- linux-4.1.10.orig/drivers/crypto/caam/sm_test.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/crypto/caam/sm_test.c 2015-10-10 16:41:42.257314838 +0200
@@ -0,0 +1,844 @@
+/*
+ * Secure Memory / Keystore Exemplification Module
@@ -36227,9 +35691,9 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/sm_test.c xbian-sources-kernel/drivers
+MODULE_DESCRIPTION("FSL CAAM Keystore Usage Example");
+MODULE_AUTHOR("Freescale Semiconductor - NMSG/MAD");
+#endif
-diff -Nur linux-4.1.6/drivers/crypto/caam/snvsregs.h xbian-sources-kernel/drivers/crypto/caam/snvsregs.h
---- linux-4.1.6/drivers/crypto/caam/snvsregs.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/crypto/caam/snvsregs.h 2015-09-11 17:46:11.766808032 +0200
+diff -Nur linux-4.1.10.orig/drivers/crypto/caam/snvsregs.h linux-4.1.10/drivers/crypto/caam/snvsregs.h
+--- linux-4.1.10.orig/drivers/crypto/caam/snvsregs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/crypto/caam/snvsregs.h 2015-10-10 16:41:42.257314838 +0200
@@ -0,0 +1,237 @@
+/*
+ * SNVS hardware register-level view
@@ -36468,9 +35932,9 @@ diff -Nur linux-4.1.6/drivers/crypto/caam/snvsregs.h xbian-sources-kernel/driver
+};
+
+#endif /* SNVSREGS_H */
-diff -Nur linux-4.1.6/drivers/dma/imx-sdma.c xbian-sources-kernel/drivers/dma/imx-sdma.c
---- linux-4.1.6/drivers/dma/imx-sdma.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/dma/imx-sdma.c 2015-09-11 17:46:11.806805356 +0200
+diff -Nur linux-4.1.10.orig/drivers/dma/imx-sdma.c linux-4.1.10/drivers/dma/imx-sdma.c
+--- linux-4.1.10.orig/drivers/dma/imx-sdma.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/dma/imx-sdma.c 2015-10-10 16:41:42.257314838 +0200
@@ -29,6 +29,7 @@
#include <linux/semaphore.h>
#include <linux/spinlock.h>
@@ -37112,18 +36576,18 @@ diff -Nur linux-4.1.6/drivers/dma/imx-sdma.c xbian-sources-kernel/drivers/dma/im
MODULE_AUTHOR("Sascha Hauer, Pengutronix <s.hauer@pengutronix.de>");
MODULE_DESCRIPTION("i.MX SDMA driver");
-diff -Nur linux-4.1.6/drivers/gpu/drm/Kconfig xbian-sources-kernel/drivers/gpu/drm/Kconfig
---- linux-4.1.6/drivers/gpu/drm/Kconfig 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/gpu/drm/Kconfig 2015-09-11 17:46:11.866801338 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/drm/Kconfig linux-4.1.10/drivers/gpu/drm/Kconfig
+--- linux-4.1.10.orig/drivers/gpu/drm/Kconfig 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/gpu/drm/Kconfig 2015-10-10 16:41:42.257314838 +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.6/drivers/gpu/drm/Makefile xbian-sources-kernel/drivers/gpu/drm/Makefile
---- linux-4.1.6/drivers/gpu/drm/Makefile 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/gpu/drm/Makefile 2015-09-11 17:46:11.866801338 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/drm/Makefile linux-4.1.10/drivers/gpu/drm/Makefile
+--- linux-4.1.10.orig/drivers/gpu/drm/Makefile 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/gpu/drm/Makefile 2015-10-10 16:41:42.257314838 +0200
@@ -67,6 +67,7 @@
obj-$(CONFIG_DRM_TEGRA) += tegra/
obj-$(CONFIG_DRM_STI) += sti/
@@ -37132,9 +36596,9 @@ diff -Nur linux-4.1.6/drivers/gpu/drm/Makefile xbian-sources-kernel/drivers/gpu/
obj-y += i2c/
obj-y += panel/
obj-y += bridge/
-diff -Nur linux-4.1.6/drivers/gpu/drm/vivante/Kconfig xbian-sources-kernel/drivers/gpu/drm/vivante/Kconfig
---- linux-4.1.6/drivers/gpu/drm/vivante/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/drm/vivante/Kconfig 2015-09-11 17:46:12.358768404 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/drm/vivante/Kconfig linux-4.1.10/drivers/gpu/drm/vivante/Kconfig
+--- linux-4.1.10.orig/drivers/gpu/drm/vivante/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/drm/vivante/Kconfig 2015-10-10 16:41:42.257314838 +0200
@@ -0,0 +1,6 @@
+config DRM_VIVANTE
+ tristate "Vivante GCCore"
@@ -37142,9 +36606,9 @@ diff -Nur linux-4.1.6/drivers/gpu/drm/vivante/Kconfig xbian-sources-kernel/drive
+ 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.6/drivers/gpu/drm/vivante/Makefile xbian-sources-kernel/drivers/gpu/drm/vivante/Makefile
---- linux-4.1.6/drivers/gpu/drm/vivante/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/drm/vivante/Makefile 2015-09-11 17:46:12.358768404 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/drm/vivante/Makefile linux-4.1.10/drivers/gpu/drm/vivante/Makefile
+--- linux-4.1.10.orig/drivers/gpu/drm/vivante/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/drm/vivante/Makefile 2015-10-10 16:41:42.281314835 +0200
@@ -0,0 +1,29 @@
+##############################################################################
+#
@@ -37175,9 +36639,9 @@ diff -Nur linux-4.1.6/drivers/gpu/drm/vivante/Makefile xbian-sources-kernel/driv
+vivante-y := vivante_drv.o
+
+obj-$(CONFIG_DRM_VIVANTE) += vivante.o
-diff -Nur linux-4.1.6/drivers/gpu/drm/vivante/vivante_drv.c xbian-sources-kernel/drivers/gpu/drm/vivante/vivante_drv.c
---- linux-4.1.6/drivers/gpu/drm/vivante/vivante_drv.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/drm/vivante/vivante_drv.c 2015-09-11 17:46:12.358768404 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/drm/vivante/vivante_drv.c linux-4.1.10/drivers/gpu/drm/vivante/vivante_drv.c
+--- linux-4.1.10.orig/drivers/gpu/drm/vivante/vivante_drv.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/drm/vivante/vivante_drv.c 2015-10-10 16:41:42.281314835 +0200
@@ -0,0 +1,112 @@
+/****************************************************************************
+*
@@ -37291,9 +36755,9 @@ diff -Nur linux-4.1.6/drivers/gpu/drm/vivante/vivante_drv.c xbian-sources-kernel
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL and additional rights");
-diff -Nur linux-4.1.6/drivers/gpu/drm/vivante/vivante_drv.h xbian-sources-kernel/drivers/gpu/drm/vivante/vivante_drv.h
---- linux-4.1.6/drivers/gpu/drm/vivante/vivante_drv.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/drm/vivante/vivante_drv.h 2015-09-11 17:46:12.358768404 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/drm/vivante/vivante_drv.h linux-4.1.10/drivers/gpu/drm/vivante/vivante_drv.h
+--- linux-4.1.10.orig/drivers/gpu/drm/vivante/vivante_drv.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/drm/vivante/vivante_drv.h 2015-10-10 16:41:42.281314835 +0200
@@ -0,0 +1,69 @@
+/****************************************************************************
+*
@@ -37364,9 +36828,9 @@ diff -Nur linux-4.1.6/drivers/gpu/drm/vivante/vivante_drv.h xbian-sources-kernel
+#define DRIVER_PATCHLEVEL 0
+
+#endif
-diff -Nur linux-4.1.6/drivers/gpu/galcore/allocator/default/gc_hal_kernel_allocator_array.h xbian-sources-kernel/drivers/gpu/galcore/allocator/default/gc_hal_kernel_allocator_array.h
---- linux-4.1.6/drivers/gpu/galcore/allocator/default/gc_hal_kernel_allocator_array.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/allocator/default/gc_hal_kernel_allocator_array.h 2015-09-11 17:46:12.362768137 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/allocator/default/gc_hal_kernel_allocator_array.h linux-4.1.10/drivers/gpu/galcore/allocator/default/gc_hal_kernel_allocator_array.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/allocator/default/gc_hal_kernel_allocator_array.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/allocator/default/gc_hal_kernel_allocator_array.h 2015-10-10 16:41:42.281314835 +0200
@@ -0,0 +1,34 @@
+/****************************************************************************
+*
@@ -37402,9 +36866,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/allocator/default/gc_hal_kernel_alloca
+};
+
+
-diff -Nur linux-4.1.6/drivers/gpu/galcore/allocator/freescale/gc_hal_kernel_allocator_array.h xbian-sources-kernel/drivers/gpu/galcore/allocator/freescale/gc_hal_kernel_allocator_array.h
---- linux-4.1.6/drivers/gpu/galcore/allocator/freescale/gc_hal_kernel_allocator_array.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/allocator/freescale/gc_hal_kernel_allocator_array.h 2015-09-11 17:46:12.362768137 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/allocator/freescale/gc_hal_kernel_allocator_array.h linux-4.1.10/drivers/gpu/galcore/allocator/freescale/gc_hal_kernel_allocator_array.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/allocator/freescale/gc_hal_kernel_allocator_array.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/allocator/freescale/gc_hal_kernel_allocator_array.h 2015-10-10 16:41:42.281314835 +0200
@@ -0,0 +1,45 @@
+/****************************************************************************
+*
@@ -37451,9 +36915,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/allocator/freescale/gc_hal_kernel_allo
+};
+
+
-diff -Nur linux-4.1.6/drivers/gpu/galcore/allocator/freescale/gc_hal_kernel_allocator_cma.c xbian-sources-kernel/drivers/gpu/galcore/allocator/freescale/gc_hal_kernel_allocator_cma.c
---- linux-4.1.6/drivers/gpu/galcore/allocator/freescale/gc_hal_kernel_allocator_cma.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/allocator/freescale/gc_hal_kernel_allocator_cma.c 2015-09-11 17:46:12.362768137 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/allocator/freescale/gc_hal_kernel_allocator_cma.c linux-4.1.10/drivers/gpu/galcore/allocator/freescale/gc_hal_kernel_allocator_cma.c
+--- linux-4.1.10.orig/drivers/gpu/galcore/allocator/freescale/gc_hal_kernel_allocator_cma.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/allocator/freescale/gc_hal_kernel_allocator_cma.c 2015-10-10 16:41:42.281314835 +0200
@@ -0,0 +1,386 @@
+/****************************************************************************
+*
@@ -37841,9 +37305,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/allocator/freescale/gc_hal_kernel_allo
+ return status;
+}
+
-diff -Nur linux-4.1.6/drivers/gpu/galcore/arch/gc_hal_kernel_context.c xbian-sources-kernel/drivers/gpu/galcore/arch/gc_hal_kernel_context.c
---- linux-4.1.6/drivers/gpu/galcore/arch/gc_hal_kernel_context.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/arch/gc_hal_kernel_context.c 2015-09-11 17:46:12.362768137 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/arch/gc_hal_kernel_context.c linux-4.1.10/drivers/gpu/galcore/arch/gc_hal_kernel_context.c
+--- linux-4.1.10.orig/drivers/gpu/galcore/arch/gc_hal_kernel_context.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/arch/gc_hal_kernel_context.c 2015-10-10 16:41:42.281314835 +0200
@@ -0,0 +1,2252 @@
+/****************************************************************************
+*
@@ -40097,9 +39561,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/arch/gc_hal_kernel_context.c xbian-sou
+ return status;
+}
+
-diff -Nur linux-4.1.6/drivers/gpu/galcore/arch/gc_hal_kernel_context.h xbian-sources-kernel/drivers/gpu/galcore/arch/gc_hal_kernel_context.h
---- linux-4.1.6/drivers/gpu/galcore/arch/gc_hal_kernel_context.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/arch/gc_hal_kernel_context.h 2015-09-11 17:46:12.362768137 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/arch/gc_hal_kernel_context.h linux-4.1.10/drivers/gpu/galcore/arch/gc_hal_kernel_context.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/arch/gc_hal_kernel_context.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/arch/gc_hal_kernel_context.h 2015-10-10 16:41:42.281314835 +0200
@@ -0,0 +1,178 @@
+/****************************************************************************
+*
@@ -40279,9 +39743,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/arch/gc_hal_kernel_context.h xbian-sou
+
+#endif /* __gc_hal_kernel_context_h_ */
+
-diff -Nur linux-4.1.6/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.c xbian-sources-kernel/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.c
---- linux-4.1.6/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.c 2015-09-11 17:46:12.366767870 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.c linux-4.1.10/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.c
+--- linux-4.1.10.orig/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.c 2015-10-10 16:41:42.293314842 +0200
@@ -0,0 +1,7719 @@
+/****************************************************************************
+*
@@ -48002,9 +47466,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.c xbian-so
+}
+
+
-diff -Nur linux-4.1.6/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.h xbian-sources-kernel/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.h
---- linux-4.1.6/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.h 2015-09-11 17:46:12.366767870 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.h linux-4.1.10/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.h 2015-10-10 16:41:42.293314842 +0200
@@ -0,0 +1,160 @@
+/****************************************************************************
+*
@@ -48166,9 +47630,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.h xbian-so
+
+#endif /* __gc_hal_kernel_hardware_h_ */
+
-diff -Nur linux-4.1.6/drivers/gpu/galcore/arch/gc_hal_kernel_recorder.c xbian-sources-kernel/drivers/gpu/galcore/arch/gc_hal_kernel_recorder.c
---- linux-4.1.6/drivers/gpu/galcore/arch/gc_hal_kernel_recorder.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/arch/gc_hal_kernel_recorder.c 2015-09-11 17:46:12.374767333 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/arch/gc_hal_kernel_recorder.c linux-4.1.10/drivers/gpu/galcore/arch/gc_hal_kernel_recorder.c
+--- linux-4.1.10.orig/drivers/gpu/galcore/arch/gc_hal_kernel_recorder.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/arch/gc_hal_kernel_recorder.c 2015-10-10 16:41:42.293314842 +0200
@@ -0,0 +1,679 @@
+/****************************************************************************
+*
@@ -48849,9 +48313,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/arch/gc_hal_kernel_recorder.c xbian-so
+}
+
+
-diff -Nur linux-4.1.6/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_command_vg.c xbian-sources-kernel/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_command_vg.c
---- linux-4.1.6/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_command_vg.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_command_vg.c 2015-09-11 17:46:12.374767333 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_command_vg.c linux-4.1.10/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_command_vg.c
+--- linux-4.1.10.orig/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_command_vg.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_command_vg.c 2015-10-10 16:41:42.293314842 +0200
@@ -0,0 +1,932 @@
+/****************************************************************************
+*
@@ -49785,9 +49249,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_command_
+
+#endif /* gcdENABLE_VG */
+
-diff -Nur linux-4.1.6/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_command_vg.h xbian-sources-kernel/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_command_vg.h
---- linux-4.1.6/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_command_vg.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_command_vg.h 2015-09-11 17:46:12.374767333 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_command_vg.h linux-4.1.10/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_command_vg.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_command_vg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_command_vg.h 2015-10-10 16:41:42.293314842 +0200
@@ -0,0 +1,319 @@
+/****************************************************************************
+*
@@ -50108,9 +49572,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_command_
+
+#endif /* __gc_hal_kernel_hardware_command_h_ */
+
-diff -Nur linux-4.1.6/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_vg.c xbian-sources-kernel/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_vg.c
---- linux-4.1.6/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_vg.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_vg.c 2015-09-11 17:46:12.374767333 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_vg.c linux-4.1.10/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_vg.c
+--- linux-4.1.10.orig/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_vg.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_vg.c 2015-10-10 16:41:42.297314842 +0200
@@ -0,0 +1,2119 @@
+/****************************************************************************
+*
@@ -52231,9 +51695,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_vg.c xbi
+}
+#endif /* gcdENABLE_VG */
+
-diff -Nur linux-4.1.6/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_vg.h xbian-sources-kernel/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_vg.h
---- linux-4.1.6/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_vg.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_vg.h 2015-09-11 17:46:12.374767333 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_vg.h linux-4.1.10/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_vg.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_vg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_vg.h 2015-10-10 16:41:42.297314842 +0200
@@ -0,0 +1,74 @@
+/****************************************************************************
+*
@@ -52309,9 +51773,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_vg.h xbi
+
+#endif /* __gc_hal_kernel_hardware_h_ */
+
-diff -Nur linux-4.1.6/drivers/gpu/galcore/config xbian-sources-kernel/drivers/gpu/galcore/config
---- linux-4.1.6/drivers/gpu/galcore/config 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/config 2015-09-11 17:46:12.374767333 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/config linux-4.1.10/drivers/gpu/galcore/config
+--- linux-4.1.10.orig/drivers/gpu/galcore/config 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/config 2015-10-10 16:41:42.297314842 +0200
@@ -0,0 +1,35 @@
+##############################################################################
+#
@@ -52348,9 +51812,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/config xbian-sources-kernel/drivers/gp
+BANK_CHANNEL_BIT ?= 12
+PLATFORM ?= freescale/gc_hal_kernel_platform_imx6q14
+DEBUG ?= 0
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_allocator.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_allocator.c
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_allocator.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_allocator.c 2015-09-11 17:46:12.374767333 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_allocator.c linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_allocator.c
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_allocator.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_allocator.c 2015-10-10 16:41:42.297314842 +0200
@@ -0,0 +1,884 @@
+/****************************************************************************
+*
@@ -53236,9 +52700,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_allocator.c xbian-source
+ return gcvSTATUS_OK;
+}
+
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_allocator.h xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_allocator.h
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_allocator.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_allocator.h 2015-09-11 17:46:12.374767333 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_allocator.h linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_allocator.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_allocator.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_allocator.h 2015-10-10 16:41:42.297314842 +0200
@@ -0,0 +1,400 @@
+/****************************************************************************
+*
@@ -53640,9 +53104,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_allocator.h xbian-source
+
+*/
+#endif
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel.c
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel.c 2015-09-11 17:46:12.374767333 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel.c linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel.c
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel.c 2015-10-10 16:41:42.297314842 +0200
@@ -0,0 +1,4244 @@
+/****************************************************************************
+*
@@ -57888,9 +57352,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel.c xbian-sources-kernel/d
+***** Test Code ****************************************************************
+*******************************************************************************/
+
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_command.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_command.c
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_command.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_command.c 2015-09-11 17:46:12.374767333 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_command.c linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_command.c
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_command.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_command.c 2015-10-10 16:41:42.301314840 +0200
@@ -0,0 +1,3075 @@
+/****************************************************************************
+*
@@ -60967,9 +60431,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_command.c xbian-sources-
+ *In = in;
+ return gcvSTATUS_OK;
+}
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_command_vg.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_command_vg.c
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_command_vg.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_command_vg.c 2015-09-11 17:46:12.374767333 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_command_vg.c linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_command_vg.c
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_command_vg.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_command_vg.c 2015-10-10 16:41:42.469314841 +0200
@@ -0,0 +1,3678 @@
+/****************************************************************************
+*
@@ -64649,9 +64113,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_command_vg.c xbian-sourc
+}
+
+#endif /* gcdENABLE_VG */
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_db.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_db.c
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_db.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_db.c 2015-09-11 17:46:12.374767333 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_db.c linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_db.c
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_db.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_db.c 2015-10-10 16:41:42.473314841 +0200
@@ -0,0 +1,1758 @@
+/****************************************************************************
+*
@@ -66411,9 +65875,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_db.c xbian-sources-kerne
+ gcmkFOOTER();
+ return status;
+}
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_debug.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_debug.c
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_debug.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_debug.c 2015-09-11 17:46:12.374767333 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_debug.c linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_debug.c
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_debug.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_debug.c 2015-10-10 16:41:42.473314841 +0200
@@ -0,0 +1,2766 @@
+/****************************************************************************
+*
@@ -69181,9 +68645,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_debug.c xbian-sources-ke
+ gckOS_WriteToRingBuffer(buffer, (gctUINT32)(payload - buffer));
+}
+
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_debugfs.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_debugfs.c
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_debugfs.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_debugfs.c 2015-09-11 17:46:12.374767333 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_debugfs.c linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_debugfs.c
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_debugfs.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_debugfs.c 2015-10-10 16:41:42.473314841 +0200
@@ -0,0 +1,1137 @@
+/****************************************************************************
+*
@@ -70322,9 +69786,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_debugfs.c xbian-sources-
+ gcmkDEBUGFS_PRINT ( _GetArgumentSize ( Message ) , Message ) ;
+ return _debugfs_res;
+}
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_debugfs.h xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_debugfs.h
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_debugfs.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_debugfs.h 2015-09-11 17:46:12.374767333 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_debugfs.h linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_debugfs.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_debugfs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_debugfs.h 2015-10-10 16:41:42.473314841 +0200
@@ -0,0 +1,135 @@
+/****************************************************************************
+*
@@ -70461,9 +69925,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_debugfs.h xbian-sources-
+#endif
+
+
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_debug.h xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_debug.h
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_debug.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_debug.h 2015-09-11 17:46:12.374767333 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_debug.h linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_debug.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_debug.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_debug.h 2015-10-10 16:41:42.473314841 +0200
@@ -0,0 +1,103 @@
+/****************************************************************************
+*
@@ -70568,9 +70032,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_debug.h xbian-sources-ke
+#endif
+
+#endif /* __gc_hal_kernel_debug_h_ */
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_device.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_device.c
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_device.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_device.c 2015-09-11 17:46:12.378767066 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_device.c linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_device.c
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_device.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_device.c 2015-10-10 16:41:42.477314843 +0200
@@ -0,0 +1,1938 @@
+/****************************************************************************
+*
@@ -72510,9 +71974,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_device.c xbian-sources-k
+ gcmkFOOTER();
+ return status;
+}
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_device.h xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_device.h
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_device.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_device.h 2015-09-11 17:46:12.378767066 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_device.h linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_device.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_device.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_device.h 2015-10-10 16:41:42.477314843 +0200
@@ -0,0 +1,185 @@
+/****************************************************************************
+*
@@ -72699,9 +72163,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_device.h xbian-sources-k
+ );
+
+#endif /* __gc_hal_kernel_device_h_ */
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_event.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_event.c
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_event.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_event.c 2015-09-11 17:46:12.378767066 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_event.c linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_event.c
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_event.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_event.c 2015-10-10 16:41:42.477314843 +0200
@@ -0,0 +1,2859 @@
+/****************************************************************************
+*
@@ -75562,9 +75026,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_event.c xbian-sources-ke
+ return gcvSTATUS_OK;
+}
+
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel.h xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel.h
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel.h 2015-09-11 17:46:12.374767333 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel.h linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel.h 2015-10-10 16:41:42.477314843 +0200
@@ -0,0 +1,1353 @@
+/****************************************************************************
+*
@@ -76919,9 +76383,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel.h xbian-sources-kernel/d
+#endif
+
+#endif /* __gc_hal_kernel_h_ */
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_interrupt_vg.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_interrupt_vg.c
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_interrupt_vg.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_interrupt_vg.c 2015-09-11 17:46:12.378767066 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_interrupt_vg.c linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_interrupt_vg.c
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_interrupt_vg.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_interrupt_vg.c 2015-10-10 16:41:42.477314843 +0200
@@ -0,0 +1,858 @@
+/****************************************************************************
+*
@@ -77781,9 +77245,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_interrupt_vg.c xbian-sou
+}
+
+#endif /* gcdENABLE_VG */
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_iommu.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_iommu.c
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_iommu.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_iommu.c 2015-09-11 17:46:12.378767066 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_iommu.c linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_iommu.c
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_iommu.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_iommu.c 2015-10-10 16:41:42.477314843 +0200
@@ -0,0 +1,202 @@
+/****************************************************************************
+*
@@ -77987,9 +77451,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_iommu.c xbian-sources-ke
+ return gcvSTATUS_OK;
+}
+
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_linux.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_linux.c
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_linux.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_linux.c 2015-09-11 17:46:12.378767066 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_linux.c linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_linux.c
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_linux.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_linux.c 2015-10-10 16:41:42.477314843 +0200
@@ -0,0 +1,487 @@
+/****************************************************************************
+*
@@ -78478,9 +77942,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_linux.c xbian-sources-ke
+ gcmkFOOTER_ARG("Settings->signal=%d", Settings->signal);
+ return gcvSTATUS_OK;
+}
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_linux.h xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_linux.h
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_linux.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_linux.h 2015-09-11 17:46:12.378767066 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_linux.h linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_linux.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_linux.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_linux.h 2015-10-10 16:41:42.481314844 +0200
@@ -0,0 +1,364 @@
+/****************************************************************************
+*
@@ -78846,9 +78310,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_linux.h xbian-sources-ke
+#endif
+
+#endif /* __gc_hal_kernel_linux_h_ */
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_math.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_math.c
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_math.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_math.c 2015-09-11 17:46:12.378767066 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_math.c linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_math.c
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_math.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_math.c 2015-10-10 16:41:42.481314844 +0200
@@ -0,0 +1,32 @@
+/****************************************************************************
+*
@@ -78882,9 +78346,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_math.c xbian-sources-ker
+ if(Y ==0) {return 0;}
+ else {return X % Y;}
+}
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_mmu.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_mmu.c
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_mmu.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_mmu.c 2015-09-11 17:46:12.378767066 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_mmu.c linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_mmu.c
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_mmu.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_mmu.c 2015-10-10 16:41:42.481314844 +0200
@@ -0,0 +1,2260 @@
+/****************************************************************************
+*
@@ -81146,9 +80610,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_mmu.c xbian-sources-kern
+****************************** T E S T C O D E ******************************
+******************************************************************************/
+
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_mmu_vg.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_mmu_vg.c
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_mmu_vg.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_mmu_vg.c 2015-09-11 17:46:12.378767066 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_mmu_vg.c linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_mmu_vg.c
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_mmu_vg.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_mmu_vg.c 2015-10-10 16:41:42.481314844 +0200
@@ -0,0 +1,522 @@
+/****************************************************************************
+*
@@ -81672,9 +81136,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_mmu_vg.c xbian-sources-k
+}
+
+#endif /* gcdENABLE_VG */
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_os.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_os.c
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_os.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_os.c 2015-09-11 17:46:12.378767066 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_os.c linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_os.c
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_os.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_os.c 2015-10-10 16:41:42.485314845 +0200
@@ -0,0 +1,8062 @@
+/****************************************************************************
+*
@@ -89738,9 +89202,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_os.c xbian-sources-kerne
+
+ return gcvSTATUS_OK;
+}
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_os.h xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_os.h
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_os.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_os.h 2015-09-11 17:46:12.378767066 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_os.h linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_os.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_os.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_os.h 2015-10-10 16:41:42.485314845 +0200
@@ -0,0 +1,88 @@
+/****************************************************************************
+*
@@ -89830,9 +89294,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_os.h xbian-sources-kerne
+DRIVER_ARGS;
+
+#endif /* __gc_hal_kernel_os_h_ */
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_platform.h xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_platform.h
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_platform.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_platform.h 2015-09-11 17:46:12.378767066 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_platform.h linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_platform.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_platform.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_platform.h 2015-10-10 16:41:42.485314845 +0200
@@ -0,0 +1,270 @@
+/****************************************************************************
+*
@@ -90104,9 +89568,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_platform.h xbian-sources
+ );
+
+#endif
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_power.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_power.c
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_power.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_power.c 2015-09-11 17:46:12.378767066 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_power.c linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_power.c
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_power.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_power.c 2015-10-10 16:41:42.485314845 +0200
@@ -0,0 +1,347 @@
+/****************************************************************************
+*
@@ -90455,9 +89919,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_power.c xbian-sources-ke
+ return gcvSTATUS_OK;
+}
+#endif
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_precomp.h xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_precomp.h
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_precomp.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_precomp.h 2015-09-11 17:46:12.378767066 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_precomp.h linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_precomp.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_precomp.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_precomp.h 2015-10-10 16:41:42.485314845 +0200
@@ -0,0 +1,29 @@
+/****************************************************************************
+*
@@ -90488,9 +89952,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_precomp.h xbian-sources-
+#include "gc_hal_kernel.h"
+
+#endif /* __gc_hal_kernel_precomp_h_ */
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_probe.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_probe.c
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_probe.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_probe.c 2015-09-11 17:46:12.378767066 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_probe.c linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_probe.c
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_probe.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_probe.c 2015-10-10 16:41:42.485314845 +0200
@@ -0,0 +1,1252 @@
+/****************************************************************************
+*
@@ -91744,9 +91208,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_probe.c xbian-sources-ke
+
+module_init(gpu_init);
+module_exit(gpu_exit);
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_sync.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_sync.c
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_sync.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_sync.c 2015-09-11 17:46:12.378767066 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_sync.c linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_sync.c
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_sync.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_sync.c 2015-10-10 16:41:42.485314845 +0200
@@ -0,0 +1,177 @@
+/****************************************************************************
+*
@@ -91925,9 +91389,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_sync.c xbian-sources-ker
+}
+
+#endif
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_sync.h xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_sync.h
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_sync.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_sync.h 2015-09-11 17:46:12.378767066 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_sync.h linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_sync.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_sync.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_sync.h 2015-10-10 16:41:42.485314845 +0200
@@ -0,0 +1,72 @@
+/****************************************************************************
+*
@@ -92001,9 +91465,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_sync.h xbian-sources-ker
+ );
+
+#endif /* __gc_hal_kernel_sync_h_ */
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_vg.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_vg.c
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_vg.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_vg.c 2015-09-11 17:46:12.378767066 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_vg.c linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_vg.c
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_vg.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_vg.c 2015-10-10 16:41:42.489314844 +0200
@@ -0,0 +1,831 @@
+/****************************************************************************
+*
@@ -92836,9 +92300,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_vg.c xbian-sources-kerne
+}
+
+#endif /* gcdENABLE_VG */
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_vg.h xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_vg.h
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_vg.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_vg.h 2015-09-11 17:46:12.378767066 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_vg.h linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_vg.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_vg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_vg.h 2015-10-10 16:41:42.489314844 +0200
@@ -0,0 +1,85 @@
+/****************************************************************************
+*
@@ -92925,9 +92389,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_vg.h xbian-sources-kerne
+};
+
+#endif /* __gc_hal_kernel_h_ */
-diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_video_memory.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_video_memory.c
---- linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_video_memory.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_video_memory.c 2015-09-11 17:46:12.382766799 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_video_memory.c linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_video_memory.c
+--- linux-4.1.10.orig/drivers/gpu/galcore/gc_hal_kernel_video_memory.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_video_memory.c 2015-10-10 16:41:42.489314844 +0200
@@ -0,0 +1,2734 @@
+/****************************************************************************
+*
@@ -95663,14 +95127,14 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/gc_hal_kernel_video_memory.c xbian-sou
+ return status;
+}
+
-diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/aqHal.h xbian-sources-kernel/drivers/gpu/galcore/inc/aqHal.h
---- linux-4.1.6/drivers/gpu/galcore/inc/aqHal.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/inc/aqHal.h 2015-09-11 17:46:12.382766799 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/inc/aqHal.h linux-4.1.10/drivers/gpu/galcore/inc/aqHal.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/inc/aqHal.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/inc/aqHal.h 2015-10-10 16:41:42.489314844 +0200
@@ -0,0 +1 @@
+#include "HAL/gc_hal.h"
-diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_base.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_base.h
---- linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_base.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_base.h 2015-09-11 17:46:12.382766799 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_base.h linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_base.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_base.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_base.h 2015-10-10 16:41:42.493314842 +0200
@@ -0,0 +1,5538 @@
+/****************************************************************************
+*
@@ -101210,9 +100674,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_base.h xbian-sources-kernel
+#endif
+
+#endif /* __gc_hal_base_h_ */
-diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_driver.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_driver.h
---- linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_driver.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_driver.h 2015-09-11 17:46:12.382766799 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_driver.h linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_driver.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_driver.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_driver.h 2015-10-10 16:41:42.493314842 +0200
@@ -0,0 +1,1064 @@
+/****************************************************************************
+*
@@ -102278,9 +101742,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_driver.h xbian-sources-kern
+#endif
+
+#endif /* __gc_hal_driver_h_ */
-diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_driver_vg.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_driver_vg.h
---- linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_driver_vg.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_driver_vg.h 2015-09-11 17:46:12.382766799 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_driver_vg.h linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_driver_vg.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_driver_vg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_driver_vg.h 2015-10-10 16:41:42.493314842 +0200
@@ -0,0 +1,265 @@
+/****************************************************************************
+*
@@ -102547,9 +102011,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_driver_vg.h xbian-sources-k
+#endif
+
+#endif /* __gc_hal_driver_h_ */
-diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_dump.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_dump.h
---- linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_dump.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_dump.h 2015-09-11 17:46:12.382766799 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_dump.h linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_dump.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_dump.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_dump.h 2015-10-10 16:41:42.493314842 +0200
@@ -0,0 +1,89 @@
+/****************************************************************************
+*
@@ -102640,9 +102104,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_dump.h xbian-sources-kernel
+
+#endif /* __gc_hal_dump_h_ */
+
-diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_eglplatform.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_eglplatform.h
---- linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_eglplatform.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_eglplatform.h 2015-09-11 17:46:12.382766799 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_eglplatform.h linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_eglplatform.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_eglplatform.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_eglplatform.h 2015-10-10 16:41:42.493314842 +0200
@@ -0,0 +1,651 @@
+/****************************************************************************
+*
@@ -103295,9 +102759,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_eglplatform.h xbian-sources
+
+#endif /* __gc_hal_eglplatform_h_ */
+
-diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_eglplatform_type.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_eglplatform_type.h
---- linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_eglplatform_type.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_eglplatform_type.h 2015-09-11 17:46:12.382766799 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_eglplatform_type.h linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_eglplatform_type.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_eglplatform_type.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_eglplatform_type.h 2015-10-10 16:41:42.493314842 +0200
@@ -0,0 +1,280 @@
+/****************************************************************************
+*
@@ -103579,9 +103043,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_eglplatform_type.h xbian-so
+#endif
+
+#endif /* __gc_hal_eglplatform_type_h_ */
-diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_engine.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_engine.h
---- linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_engine.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_engine.h 2015-09-11 17:46:12.382766799 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_engine.h linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_engine.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_engine.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_engine.h 2015-10-10 16:41:42.493314842 +0200
@@ -0,0 +1,2587 @@
+/****************************************************************************
+*
@@ -106170,9 +105634,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_engine.h xbian-sources-kern
+
+#endif /* gcdENABLE_3D */
+#endif /* __gc_hal_engine_h_ */
-diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_engine_vg.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_engine_vg.h
---- linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_engine_vg.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_engine_vg.h 2015-09-11 17:46:12.382766799 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_engine_vg.h linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_engine_vg.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_engine_vg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_engine_vg.h 2015-10-10 16:41:42.493314842 +0200
@@ -0,0 +1,1215 @@
+/****************************************************************************
+*
@@ -107389,9 +106853,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_engine_vg.h xbian-sources-k
+#endif
+
+#endif /* __gc_hal_vg_h_ */
-diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_enum.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_enum.h
---- linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_enum.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_enum.h 2015-09-11 17:46:12.382766799 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_enum.h linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_enum.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_enum.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_enum.h 2015-10-10 16:41:42.497314840 +0200
@@ -0,0 +1,1605 @@
+/****************************************************************************
+*
@@ -108998,9 +108462,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_enum.h xbian-sources-kernel
+#endif
+
+#endif /* __gc_hal_enum_h_ */
-diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal.h
---- linux-4.1.6/drivers/gpu/galcore/inc/gc_hal.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal.h 2015-09-11 17:46:12.382766799 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal.h linux-4.1.10/drivers/gpu/galcore/inc/gc_hal.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/inc/gc_hal.h 2015-10-10 16:41:42.497314840 +0200
@@ -0,0 +1,2677 @@
+/****************************************************************************
+*
@@ -111679,9 +111143,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal.h xbian-sources-kernel/driv
+#endif
+
+#endif /* __gc_hal_h_ */
-diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_kernel_buffer.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_kernel_buffer.h
---- linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_kernel_buffer.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_kernel_buffer.h 2015-09-11 17:46:12.382766799 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_kernel_buffer.h linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_kernel_buffer.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_kernel_buffer.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_kernel_buffer.h 2015-10-10 16:41:42.497314840 +0200
@@ -0,0 +1,218 @@
+/****************************************************************************
+*
@@ -111901,9 +111365,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_kernel_buffer.h xbian-sourc
+#endif
+
+#endif /* __gc_hal_kernel_buffer_h_ */
-diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_mem.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_mem.h
---- linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_mem.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_mem.h 2015-09-11 17:46:12.382766799 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_mem.h linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_mem.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_mem.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_mem.h 2015-10-10 16:41:42.497314840 +0200
@@ -0,0 +1,530 @@
+/****************************************************************************
+*
@@ -112435,9 +111899,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_mem.h xbian-sources-kernel/
+
+#endif /* (gcdENABLE_3D || gcdENABLE_VG) */
+#endif /* __gc_hal_mem_h_ */
-diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_options.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_options.h
---- linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_options.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_options.h 2015-09-11 17:46:12.382766799 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_options.h linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_options.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_options.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_options.h 2015-10-10 16:41:42.497314840 +0200
@@ -0,0 +1,1194 @@
+/****************************************************************************
+*
@@ -113633,9 +113097,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_options.h xbian-sources-ker
+#endif
+
+#endif /* __gc_hal_options_h_ */
-diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_profiler.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_profiler.h
---- linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_profiler.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_profiler.h 2015-09-11 17:46:12.382766799 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_profiler.h linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_profiler.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_profiler.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_profiler.h 2015-10-10 16:41:42.497314840 +0200
@@ -0,0 +1,585 @@
+/****************************************************************************
+*
@@ -114222,9 +113686,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_profiler.h xbian-sources-ke
+#endif
+
+#endif /* __gc_hal_profiler_h_ */
-diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_raster.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_raster.h
---- linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_raster.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_raster.h 2015-09-11 17:46:12.382766799 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_raster.h linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_raster.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_raster.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_raster.h 2015-10-10 16:41:42.501314841 +0200
@@ -0,0 +1,1038 @@
+/****************************************************************************
+*
@@ -115264,9 +114728,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_raster.h xbian-sources-kern
+#endif
+
+#endif /* __gc_hal_raster_h_ */
-diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_rename.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_rename.h
---- linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_rename.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_rename.h 2015-09-11 17:46:12.382766799 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_rename.h linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_rename.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_rename.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_rename.h 2015-10-10 16:41:42.501314841 +0200
@@ -0,0 +1,243 @@
+/****************************************************************************
+*
@@ -115511,9 +114975,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_rename.h xbian-sources-kern
+#endif
+
+#endif /* __gc_hal_rename_h_ */
-diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_statistics.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_statistics.h
---- linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_statistics.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_statistics.h 2015-09-11 17:46:12.382766799 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_statistics.h linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_statistics.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_statistics.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_statistics.h 2015-10-10 16:41:42.501314841 +0200
@@ -0,0 +1,99 @@
+/****************************************************************************
+*
@@ -115614,9 +115078,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_statistics.h xbian-sources-
+
+#endif /*__gc_hal_statistics_h_ */
+
-diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_types.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_types.h
---- linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_types.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_types.h 2015-09-11 17:46:12.382766799 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_types.h linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_types.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_types.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_types.h 2015-10-10 16:41:42.501314841 +0200
@@ -0,0 +1,911 @@
+/****************************************************************************
+*
@@ -116529,9 +115993,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_types.h xbian-sources-kerne
+#endif
+
+#endif /* __gc_hal_types_h_ */
-diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_version.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_version.h
---- linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_version.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_version.h 2015-09-11 17:46:12.382766799 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_version.h linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_version.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_version.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_version.h 2015-10-10 16:41:42.501314841 +0200
@@ -0,0 +1,39 @@
+/****************************************************************************
+*
@@ -116572,9 +116036,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_version.h xbian-sources-ker
+#define gcvVERSION_TIME __TIME__
+
+#endif /* __gc_hal_version_h_ */
-diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_vg.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_vg.h
---- linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_vg.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_vg.h 2015-09-11 17:46:12.382766799 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_vg.h linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_vg.h
+--- linux-4.1.10.orig/drivers/gpu/galcore/inc/gc_hal_vg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_vg.h 2015-10-10 16:41:42.501314841 +0200
@@ -0,0 +1,863 @@
+/****************************************************************************
+*
@@ -117439,9 +116903,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/inc/gc_hal_vg.h xbian-sources-kernel/d
+#endif
+
+#endif /* __gc_hal_h_ */
-diff -Nur linux-4.1.6/drivers/gpu/galcore/Kbuild xbian-sources-kernel/drivers/gpu/galcore/Kbuild
---- linux-4.1.6/drivers/gpu/galcore/Kbuild 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/Kbuild 2015-09-11 17:46:12.362768137 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/Kbuild linux-4.1.10/drivers/gpu/galcore/Kbuild
+--- linux-4.1.10.orig/drivers/gpu/galcore/Kbuild 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/Kbuild 2015-10-10 16:41:42.501314841 +0200
@@ -0,0 +1,233 @@
+##############################################################################
+#
@@ -117676,9 +117140,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/Kbuild xbian-sources-kernel/drivers/gp
+galcore-objs := $(OBJS)
+
+endif
-diff -Nur linux-4.1.6/drivers/gpu/galcore/platform/freescale/gc_hal_kernel_platform_imx6q14.c xbian-sources-kernel/drivers/gpu/galcore/platform/freescale/gc_hal_kernel_platform_imx6q14.c
---- linux-4.1.6/drivers/gpu/galcore/platform/freescale/gc_hal_kernel_platform_imx6q14.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/platform/freescale/gc_hal_kernel_platform_imx6q14.c 2015-09-11 17:46:12.382766799 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/platform/freescale/gc_hal_kernel_platform_imx6q14.c linux-4.1.10/drivers/gpu/galcore/platform/freescale/gc_hal_kernel_platform_imx6q14.c
+--- linux-4.1.10.orig/drivers/gpu/galcore/platform/freescale/gc_hal_kernel_platform_imx6q14.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/platform/freescale/gc_hal_kernel_platform_imx6q14.c 2015-10-10 16:41:42.501314841 +0200
@@ -0,0 +1,693 @@
+/****************************************************************************
+*
@@ -118373,9 +117837,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/platform/freescale/gc_hal_kernel_platf
+ *Operations = &platformOperations;
+}
+
-diff -Nur linux-4.1.6/drivers/gpu/galcore/platform/freescale/gc_hal_kernel_platform_imx6q14.config xbian-sources-kernel/drivers/gpu/galcore/platform/freescale/gc_hal_kernel_platform_imx6q14.config
---- linux-4.1.6/drivers/gpu/galcore/platform/freescale/gc_hal_kernel_platform_imx6q14.config 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/gpu/galcore/platform/freescale/gc_hal_kernel_platform_imx6q14.config 2015-09-11 17:46:12.382766799 +0200
+diff -Nur linux-4.1.10.orig/drivers/gpu/galcore/platform/freescale/gc_hal_kernel_platform_imx6q14.config linux-4.1.10/drivers/gpu/galcore/platform/freescale/gc_hal_kernel_platform_imx6q14.config
+--- linux-4.1.10.orig/drivers/gpu/galcore/platform/freescale/gc_hal_kernel_platform_imx6q14.config 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/gpu/galcore/platform/freescale/gc_hal_kernel_platform_imx6q14.config 2015-10-10 16:41:42.501314841 +0200
@@ -0,0 +1,15 @@
+EXTRA_CFLAGS += -DgcdDEFAULT_CONTIGUOUS_SIZE=134217728
+
@@ -118392,9 +117856,9 @@ diff -Nur linux-4.1.6/drivers/gpu/galcore/platform/freescale/gc_hal_kernel_platf
+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.6/drivers/Kconfig xbian-sources-kernel/drivers/Kconfig
---- linux-4.1.6/drivers/Kconfig 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/Kconfig 2015-09-11 17:46:11.342836415 +0200
+diff -Nur linux-4.1.10.orig/drivers/Kconfig linux-4.1.10/drivers/Kconfig
+--- linux-4.1.10.orig/drivers/Kconfig 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/Kconfig 2015-10-10 16:41:42.501314841 +0200
@@ -182,4 +182,6 @@
source "drivers/android/Kconfig"
@@ -118402,17 +117866,17 @@ diff -Nur linux-4.1.6/drivers/Kconfig xbian-sources-kernel/drivers/Kconfig
+source "drivers/mxc/Kconfig"
+
endmenu
-diff -Nur linux-4.1.6/drivers/Makefile xbian-sources-kernel/drivers/Makefile
---- linux-4.1.6/drivers/Makefile 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/Makefile 2015-09-11 17:46:11.342836415 +0200
+diff -Nur linux-4.1.10.orig/drivers/Makefile linux-4.1.10/drivers/Makefile
+--- linux-4.1.10.orig/drivers/Makefile 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/Makefile 2015-10-10 16:41:42.533314845 +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.6/drivers/media/platform/Kconfig xbian-sources-kernel/drivers/media/platform/Kconfig
---- linux-4.1.6/drivers/media/platform/Kconfig 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/media/platform/Kconfig 2015-09-11 17:46:13.810671208 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/platform/Kconfig linux-4.1.10/drivers/media/platform/Kconfig
+--- linux-4.1.10.orig/drivers/media/platform/Kconfig 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/media/platform/Kconfig 2015-10-10 16:41:42.533314845 +0200
@@ -114,6 +114,22 @@
To compile this driver as a module, choose M here: the module
will be called s3c-camif.
@@ -118436,9 +117900,9 @@ diff -Nur linux-4.1.6/drivers/media/platform/Kconfig xbian-sources-kernel/driver
source "drivers/media/platform/soc_camera/Kconfig"
source "drivers/media/platform/exynos4-is/Kconfig"
source "drivers/media/platform/s5p-tv/Kconfig"
-diff -Nur linux-4.1.6/drivers/media/platform/Makefile xbian-sources-kernel/drivers/media/platform/Makefile
---- linux-4.1.6/drivers/media/platform/Makefile 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/media/platform/Makefile 2015-09-11 17:46:13.810671208 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/platform/Makefile linux-4.1.10/drivers/media/platform/Makefile
+--- linux-4.1.10.orig/drivers/media/platform/Makefile 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/media/platform/Makefile 2015-10-10 16:41:42.533314845 +0200
@@ -50,4 +50,9 @@
obj-$(CONFIG_VIDEO_XILINX) += xilinx/
@@ -118449,9 +117913,9 @@ diff -Nur linux-4.1.6/drivers/media/platform/Makefile xbian-sources-kernel/drive
+obj-y += mxc/output/
+
ccflags-y += -I$(srctree)/drivers/media/i2c
-diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/adv7180.c xbian-sources-kernel/drivers/media/platform/mxc/capture/adv7180.c
---- linux-4.1.6/drivers/media/platform/mxc/capture/adv7180.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/media/platform/mxc/capture/adv7180.c 2015-09-11 17:46:13.846668799 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/platform/mxc/capture/adv7180.c linux-4.1.10/drivers/media/platform/mxc/capture/adv7180.c
+--- linux-4.1.10.orig/drivers/media/platform/mxc/capture/adv7180.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/media/platform/mxc/capture/adv7180.c 2015-10-10 16:41:42.533314845 +0200
@@ -0,0 +1,1344 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -119797,9 +119261,9 @@ diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/adv7180.c xbian-sources
+MODULE_AUTHOR("Freescale Semiconductor");
+MODULE_DESCRIPTION("Anolog Device ADV7180 video decoder driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/csi_v4l2_capture.c xbian-sources-kernel/drivers/media/platform/mxc/capture/csi_v4l2_capture.c
---- linux-4.1.6/drivers/media/platform/mxc/capture/csi_v4l2_capture.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/media/platform/mxc/capture/csi_v4l2_capture.c 2015-09-11 17:46:13.858667995 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/platform/mxc/capture/csi_v4l2_capture.c linux-4.1.10/drivers/media/platform/mxc/capture/csi_v4l2_capture.c
+--- linux-4.1.10.orig/drivers/media/platform/mxc/capture/csi_v4l2_capture.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/media/platform/mxc/capture/csi_v4l2_capture.c 2015-10-10 16:41:42.533314845 +0200
@@ -0,0 +1,2047 @@
+/*
+ * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -121848,9 +121312,9 @@ diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/csi_v4l2_capture.c xbia
+MODULE_DESCRIPTION("V4L2 capture driver for Mx25 based cameras");
+MODULE_LICENSE("GPL");
+MODULE_SUPPORTED_DEVICE("video");
-diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/fsl_csi.c xbian-sources-kernel/drivers/media/platform/mxc/capture/fsl_csi.c
---- linux-4.1.6/drivers/media/platform/mxc/capture/fsl_csi.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/media/platform/mxc/capture/fsl_csi.c 2015-09-11 17:46:13.858667995 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/platform/mxc/capture/fsl_csi.c linux-4.1.10/drivers/media/platform/mxc/capture/fsl_csi.c
+--- linux-4.1.10.orig/drivers/media/platform/mxc/capture/fsl_csi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/media/platform/mxc/capture/fsl_csi.c 2015-10-10 16:41:42.533314845 +0200
@@ -0,0 +1,302 @@
+/*
+ * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -122154,9 +121618,9 @@ diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/fsl_csi.c xbian-sources
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("fsl CSI driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/fsl_csi.h xbian-sources-kernel/drivers/media/platform/mxc/capture/fsl_csi.h
---- linux-4.1.6/drivers/media/platform/mxc/capture/fsl_csi.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/media/platform/mxc/capture/fsl_csi.h 2015-09-11 17:46:13.858667995 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/platform/mxc/capture/fsl_csi.h linux-4.1.10/drivers/media/platform/mxc/capture/fsl_csi.h
+--- linux-4.1.10.orig/drivers/media/platform/mxc/capture/fsl_csi.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/media/platform/mxc/capture/fsl_csi.h 2015-10-10 16:41:42.533314845 +0200
@@ -0,0 +1,198 @@
+/*
+ * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -122356,9 +121820,9 @@ diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/fsl_csi.h xbian-sources
+void csi_mclk_disable(void);
+void csi_dmareq_rff_enable(void);
+void csi_dmareq_rff_disable(void);
-diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c xbian-sources-kernel/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c
---- linux-4.1.6/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c 2015-09-11 17:46:13.858667995 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c linux-4.1.10/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c
+--- linux-4.1.10.orig/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c 2015-10-10 16:41:42.533314845 +0200
@@ -0,0 +1,493 @@
+
+/*
@@ -122853,9 +122317,9 @@ diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c xb
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("IPU PRP VF SDC Backgroud Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/ipu_csi_enc.c xbian-sources-kernel/drivers/media/platform/mxc/capture/ipu_csi_enc.c
---- linux-4.1.6/drivers/media/platform/mxc/capture/ipu_csi_enc.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/media/platform/mxc/capture/ipu_csi_enc.c 2015-09-11 17:46:13.858667995 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/platform/mxc/capture/ipu_csi_enc.c linux-4.1.10/drivers/media/platform/mxc/capture/ipu_csi_enc.c
+--- linux-4.1.10.orig/drivers/media/platform/mxc/capture/ipu_csi_enc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/media/platform/mxc/capture/ipu_csi_enc.c 2015-10-10 16:41:42.533314845 +0200
@@ -0,0 +1,371 @@
+/*
+ * Copyright 2009-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -123228,9 +122692,9 @@ diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/ipu_csi_enc.c xbian-sou
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("CSI ENC Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c xbian-sources-kernel/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c
---- linux-4.1.6/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c 2015-09-11 17:46:13.858667995 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c linux-4.1.10/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c
+--- linux-4.1.10.orig/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c 2015-10-10 16:41:42.533314845 +0200
@@ -0,0 +1,580 @@
+/*
+ * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -123812,9 +123276,9 @@ diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c xb
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("IPU PRP VF SDC Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/ipu_prp_enc.c xbian-sources-kernel/drivers/media/platform/mxc/capture/ipu_prp_enc.c
---- linux-4.1.6/drivers/media/platform/mxc/capture/ipu_prp_enc.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/media/platform/mxc/capture/ipu_prp_enc.c 2015-09-11 17:46:13.858667995 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/platform/mxc/capture/ipu_prp_enc.c linux-4.1.10/drivers/media/platform/mxc/capture/ipu_prp_enc.c
+--- linux-4.1.10.orig/drivers/media/platform/mxc/capture/ipu_prp_enc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/media/platform/mxc/capture/ipu_prp_enc.c 2015-10-10 16:41:42.533314845 +0200
@@ -0,0 +1,538 @@
+/*
+ * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -124354,9 +123818,9 @@ diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/ipu_prp_enc.c xbian-sou
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("IPU PRP ENC Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/ipu_prp_sw.h xbian-sources-kernel/drivers/media/platform/mxc/capture/ipu_prp_sw.h
---- linux-4.1.6/drivers/media/platform/mxc/capture/ipu_prp_sw.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/media/platform/mxc/capture/ipu_prp_sw.h 2015-09-11 17:46:13.858667995 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/platform/mxc/capture/ipu_prp_sw.h linux-4.1.10/drivers/media/platform/mxc/capture/ipu_prp_sw.h
+--- linux-4.1.10.orig/drivers/media/platform/mxc/capture/ipu_prp_sw.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/media/platform/mxc/capture/ipu_prp_sw.h 2015-10-10 16:41:42.533314845 +0200
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -124401,9 +123865,9 @@ diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/ipu_prp_sw.h xbian-sour
+int prp_still_deselect(void *private);
+
+#endif
-diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c xbian-sources-kernel/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c
---- linux-4.1.6/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c 2015-09-11 17:46:13.858667995 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c linux-4.1.10/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c
+--- linux-4.1.10.orig/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c 2015-10-10 16:41:42.533314845 +0200
@@ -0,0 +1,472 @@
+/*
+ * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -124877,9 +124341,9 @@ diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c xbi
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("IPU PRP VF SDC Backgroud Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c xbian-sources-kernel/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c
---- linux-4.1.6/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c 2015-09-11 17:46:13.858667995 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c linux-4.1.10/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c
+--- linux-4.1.10.orig/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c 2015-10-10 16:41:42.533314845 +0200
@@ -0,0 +1,528 @@
+/*
+ * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -125409,9 +124873,9 @@ diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c xbian-
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("IPU PRP VF SDC Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/ipu_still.c xbian-sources-kernel/drivers/media/platform/mxc/capture/ipu_still.c
---- linux-4.1.6/drivers/media/platform/mxc/capture/ipu_still.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/media/platform/mxc/capture/ipu_still.c 2015-09-11 17:46:13.858667995 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/platform/mxc/capture/ipu_still.c linux-4.1.10/drivers/media/platform/mxc/capture/ipu_still.c
+--- linux-4.1.10.orig/drivers/media/platform/mxc/capture/ipu_still.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/media/platform/mxc/capture/ipu_still.c 2015-10-10 16:41:42.533314845 +0200
@@ -0,0 +1,269 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -125682,9 +125146,9 @@ diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/ipu_still.c xbian-sourc
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("IPU PRP STILL IMAGE Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/Kconfig xbian-sources-kernel/drivers/media/platform/mxc/capture/Kconfig
---- linux-4.1.6/drivers/media/platform/mxc/capture/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/media/platform/mxc/capture/Kconfig 2015-09-11 17:46:13.846668799 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/platform/mxc/capture/Kconfig linux-4.1.10/drivers/media/platform/mxc/capture/Kconfig
+--- linux-4.1.10.orig/drivers/media/platform/mxc/capture/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/media/platform/mxc/capture/Kconfig 2015-10-10 16:41:42.533314845 +0200
@@ -0,0 +1,92 @@
+if VIDEO_MXC_CAPTURE
+
@@ -125778,9 +125242,9 @@ diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/Kconfig xbian-sources-k
+endmenu
+
+endif
-diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/Makefile xbian-sources-kernel/drivers/media/platform/mxc/capture/Makefile
---- linux-4.1.6/drivers/media/platform/mxc/capture/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/media/platform/mxc/capture/Makefile 2015-09-11 17:46:13.846668799 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/platform/mxc/capture/Makefile linux-4.1.10/drivers/media/platform/mxc/capture/Makefile
+--- linux-4.1.10.orig/drivers/media/platform/mxc/capture/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/media/platform/mxc/capture/Makefile 2015-10-10 16:41:42.533314845 +0200
@@ -0,0 +1,24 @@
+obj-$(CONFIG_VIDEO_MXC_CSI_CAMERA) += fsl_csi.o csi_v4l2_capture.o
+
@@ -125806,9 +125270,9 @@ diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/Makefile xbian-sources-
+
+adv7180_tvin-objs := adv7180.o
+obj-$(CONFIG_MXC_TVIN_ADV7180) += adv7180_tvin.o
-diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c xbian-sources-kernel/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c
---- linux-4.1.6/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c 2015-09-11 17:46:13.858667995 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c linux-4.1.10/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c
+--- linux-4.1.10.orig/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c 2015-10-10 16:41:42.533314845 +0200
@@ -0,0 +1,3328 @@
+/*
+ * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -129138,9 +128602,9 @@ diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c xbia
+MODULE_DESCRIPTION("V4L2 capture driver for Mxc based cameras");
+MODULE_LICENSE("GPL");
+MODULE_SUPPORTED_DEVICE("video");
-diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h xbian-sources-kernel/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h
---- linux-4.1.6/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h 2015-09-11 17:46:13.858667995 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h linux-4.1.10/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h
+--- linux-4.1.10.orig/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h 2015-10-10 16:41:42.537314846 +0200
@@ -0,0 +1,355 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -129497,9 +128961,9 @@ diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h xbia
+ return 0;
+}
+#endif /* __MXC_V4L2_CAPTURE_H__ */
-diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/ov5640.c xbian-sources-kernel/drivers/media/platform/mxc/capture/ov5640.c
---- linux-4.1.6/drivers/media/platform/mxc/capture/ov5640.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/media/platform/mxc/capture/ov5640.c 2015-09-11 17:46:13.858667995 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/platform/mxc/capture/ov5640.c linux-4.1.10/drivers/media/platform/mxc/capture/ov5640.c
+--- linux-4.1.10.orig/drivers/media/platform/mxc/capture/ov5640.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/media/platform/mxc/capture/ov5640.c 2015-10-10 16:41:42.537314846 +0200
@@ -0,0 +1,1959 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -131460,9 +130924,9 @@ diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/ov5640.c xbian-sources-
+MODULE_LICENSE("GPL");
+MODULE_VERSION("1.0");
+MODULE_ALIAS("CSI");
-diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/ov5640_mipi.c xbian-sources-kernel/drivers/media/platform/mxc/capture/ov5640_mipi.c
---- linux-4.1.6/drivers/media/platform/mxc/capture/ov5640_mipi.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/media/platform/mxc/capture/ov5640_mipi.c 2015-09-11 17:46:13.858667995 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/platform/mxc/capture/ov5640_mipi.c linux-4.1.10/drivers/media/platform/mxc/capture/ov5640_mipi.c
+--- linux-4.1.10.orig/drivers/media/platform/mxc/capture/ov5640_mipi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/media/platform/mxc/capture/ov5640_mipi.c 2015-10-10 16:41:42.537314846 +0200
@@ -0,0 +1,2193 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -133657,9 +133121,9 @@ diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/ov5640_mipi.c xbian-sou
+MODULE_LICENSE("GPL");
+MODULE_VERSION("1.0");
+MODULE_ALIAS("CSI");
-diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/ov5642.c xbian-sources-kernel/drivers/media/platform/mxc/capture/ov5642.c
---- linux-4.1.6/drivers/media/platform/mxc/capture/ov5642.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/media/platform/mxc/capture/ov5642.c 2015-09-11 17:46:13.858667995 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/platform/mxc/capture/ov5642.c linux-4.1.10/drivers/media/platform/mxc/capture/ov5642.c
+--- linux-4.1.10.orig/drivers/media/platform/mxc/capture/ov5642.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/media/platform/mxc/capture/ov5642.c 2015-10-10 16:41:42.545314843 +0200
@@ -0,0 +1,6294 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -139955,9 +139419,9 @@ diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/ov5642.c xbian-sources-
+MODULE_LICENSE("GPL");
+MODULE_VERSION("1.0");
+MODULE_ALIAS("CSI");
-diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/ov5647_mipi.c xbian-sources-kernel/drivers/media/platform/mxc/capture/ov5647_mipi.c
---- linux-4.1.6/drivers/media/platform/mxc/capture/ov5647_mipi.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/media/platform/mxc/capture/ov5647_mipi.c 2015-09-11 17:46:13.858667995 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/platform/mxc/capture/ov5647_mipi.c linux-4.1.10/drivers/media/platform/mxc/capture/ov5647_mipi.c
+--- linux-4.1.10.orig/drivers/media/platform/mxc/capture/ov5647_mipi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/media/platform/mxc/capture/ov5647_mipi.c 2015-10-10 16:41:42.549314841 +0200
@@ -0,0 +1,3781 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -143740,23 +143204,23 @@ diff -Nur linux-4.1.6/drivers/media/platform/mxc/capture/ov5647_mipi.c xbian-sou
+MODULE_LICENSE("GPL");
+MODULE_VERSION("1.0");
+MODULE_ALIAS("CSI");
-diff -Nur linux-4.1.6/drivers/media/platform/mxc/output/Kconfig xbian-sources-kernel/drivers/media/platform/mxc/output/Kconfig
---- linux-4.1.6/drivers/media/platform/mxc/output/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/media/platform/mxc/output/Kconfig 2015-09-11 17:46:13.862667728 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/platform/mxc/output/Kconfig linux-4.1.10/drivers/media/platform/mxc/output/Kconfig
+--- linux-4.1.10.orig/drivers/media/platform/mxc/output/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/media/platform/mxc/output/Kconfig 2015-10-10 16:41:42.549314841 +0200
@@ -0,0 +1,5 @@
+config VIDEO_MXC_IPU_OUTPUT
+ tristate "IPU v4l2 output support"
+ depends on VIDEO_MXC_OUTPUT && MXC_IPU
+ ---help---
+ This is the video4linux2 driver for IPU post processing video output.
-diff -Nur linux-4.1.6/drivers/media/platform/mxc/output/Makefile xbian-sources-kernel/drivers/media/platform/mxc/output/Makefile
---- linux-4.1.6/drivers/media/platform/mxc/output/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/media/platform/mxc/output/Makefile 2015-09-11 17:46:13.862667728 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/platform/mxc/output/Makefile linux-4.1.10/drivers/media/platform/mxc/output/Makefile
+--- linux-4.1.10.orig/drivers/media/platform/mxc/output/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/media/platform/mxc/output/Makefile 2015-10-10 16:41:42.549314841 +0200
@@ -0,0 +1 @@
+obj-$(CONFIG_VIDEO_MXC_IPU_OUTPUT) += mxc_vout.o
-diff -Nur linux-4.1.6/drivers/media/platform/mxc/output/mxc_vout.c xbian-sources-kernel/drivers/media/platform/mxc/output/mxc_vout.c
---- linux-4.1.6/drivers/media/platform/mxc/output/mxc_vout.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/media/platform/mxc/output/mxc_vout.c 2015-09-11 17:46:13.862667728 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/platform/mxc/output/mxc_vout.c linux-4.1.10/drivers/media/platform/mxc/output/mxc_vout.c
+--- linux-4.1.10.orig/drivers/media/platform/mxc/output/mxc_vout.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/media/platform/mxc/output/mxc_vout.c 2015-10-10 16:41:42.549314841 +0200
@@ -0,0 +1,2265 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -146023,9 +145487,9 @@ diff -Nur linux-4.1.6/drivers/media/platform/mxc/output/mxc_vout.c xbian-sources
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("V4L2-driver for MXC video output");
+MODULE_LICENSE("GPL");
-diff -Nur linux-4.1.6/drivers/media/platform/mxc/v4l2-extra.h xbian-sources-kernel/drivers/media/platform/mxc/v4l2-extra.h
---- linux-4.1.6/drivers/media/platform/mxc/v4l2-extra.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/media/platform/mxc/v4l2-extra.h 2015-09-11 17:46:13.862667728 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/platform/mxc/v4l2-extra.h linux-4.1.10/drivers/media/platform/mxc/v4l2-extra.h
+--- linux-4.1.10.orig/drivers/media/platform/mxc/v4l2-extra.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/media/platform/mxc/v4l2-extra.h 2015-10-10 16:41:42.549314841 +0200
@@ -0,0 +1,11 @@
+/*
+struct v4l2_send_command_control {
@@ -146038,9 +145502,9 @@ diff -Nur linux-4.1.6/drivers/media/platform/mxc/v4l2-extra.h xbian-sources-kern
+
+#define VIDIOC_SEND_COMMAND _IOWR('V', 92, struct v4l2_send_command_control)
+
-diff -Nur linux-4.1.6/drivers/media/platform/v4l2-int-device.c xbian-sources-kernel/drivers/media/platform/v4l2-int-device.c
---- linux-4.1.6/drivers/media/platform/v4l2-int-device.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/media/platform/v4l2-int-device.c 2015-09-11 17:46:13.918663980 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/platform/v4l2-int-device.c linux-4.1.10/drivers/media/platform/v4l2-int-device.c
+--- linux-4.1.10.orig/drivers/media/platform/v4l2-int-device.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/media/platform/v4l2-int-device.c 2015-10-10 16:41:42.549314841 +0200
@@ -0,0 +1,164 @@
+/*
+ * drivers/media/video/v4l2-int-device.c
@@ -146206,9 +145670,9 @@ diff -Nur linux-4.1.6/drivers/media/platform/v4l2-int-device.c xbian-sources-ker
+EXPORT_SYMBOL_GPL(v4l2_int_ioctl_1);
+
+MODULE_LICENSE("GPL");
-diff -Nur linux-4.1.6/drivers/media/v4l2-core/Kconfig xbian-sources-kernel/drivers/media/v4l2-core/Kconfig
---- linux-4.1.6/drivers/media/v4l2-core/Kconfig 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/media/v4l2-core/Kconfig 2015-09-11 17:46:14.166647379 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/v4l2-core/Kconfig linux-4.1.10/drivers/media/v4l2-core/Kconfig
+--- linux-4.1.10.orig/drivers/media/v4l2-core/Kconfig 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/media/v4l2-core/Kconfig 2015-10-10 16:41:42.549314841 +0200
@@ -44,6 +44,10 @@
tristate
depends on VIDEOBUF2_CORE
@@ -146220,9 +145684,9 @@ diff -Nur linux-4.1.6/drivers/media/v4l2-core/Kconfig xbian-sources-kernel/drive
# Used by drivers that need Videobuf modules
config VIDEOBUF_GEN
tristate
-diff -Nur linux-4.1.6/drivers/media/v4l2-core/Makefile xbian-sources-kernel/drivers/media/v4l2-core/Makefile
---- linux-4.1.6/drivers/media/v4l2-core/Makefile 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/media/v4l2-core/Makefile 2015-09-11 17:46:14.166647379 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/v4l2-core/Makefile linux-4.1.10/drivers/media/v4l2-core/Makefile
+--- linux-4.1.10.orig/drivers/media/v4l2-core/Makefile 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/media/v4l2-core/Makefile 2015-10-10 16:41:42.641314846 +0200
@@ -21,6 +21,7 @@
obj-$(CONFIG_VIDEO_TUNER) += tuner.o
@@ -146231,9 +145695,9 @@ diff -Nur linux-4.1.6/drivers/media/v4l2-core/Makefile xbian-sources-kernel/driv
obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o
obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o
-diff -Nur linux-4.1.6/drivers/media/v4l2-core/v4l2-compat-ioctl32.c xbian-sources-kernel/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
---- linux-4.1.6/drivers/media/v4l2-core/v4l2-compat-ioctl32.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/media/v4l2-core/v4l2-compat-ioctl32.c 2015-09-11 17:46:14.166647379 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/v4l2-core/v4l2-compat-ioctl32.c linux-4.1.10/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
+--- linux-4.1.10.orig/drivers/media/v4l2-core/v4l2-compat-ioctl32.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/media/v4l2-core/v4l2-compat-ioctl32.c 2015-10-10 16:41:42.641314846 +0200
@@ -251,7 +251,8 @@
static int put_v4l2_format32(struct v4l2_format *kp, struct v4l2_format32 __user *up)
@@ -146567,9 +146031,9 @@ diff -Nur linux-4.1.6/drivers/media/v4l2-core/v4l2-compat-ioctl32.c xbian-source
return ret;
}
EXPORT_SYMBOL_GPL(v4l2_compat_ioctl32);
-diff -Nur linux-4.1.6/drivers/media/v4l2-core/v4l2-dev.c xbian-sources-kernel/drivers/media/v4l2-core/v4l2-dev.c
---- linux-4.1.6/drivers/media/v4l2-core/v4l2-dev.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/media/v4l2-core/v4l2-dev.c 2015-09-11 17:46:14.170647110 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/v4l2-core/v4l2-dev.c linux-4.1.10/drivers/media/v4l2-core/v4l2-dev.c
+--- linux-4.1.10.orig/drivers/media/v4l2-core/v4l2-dev.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/media/v4l2-core/v4l2-dev.c 2015-10-10 16:41:42.641314846 +0200
@@ -563,6 +563,7 @@
set_bit(_IOC_NR(VIDIOC_DBG_G_REGISTER), valid_ioctls);
set_bit(_IOC_NR(VIDIOC_DBG_S_REGISTER), valid_ioctls);
@@ -146578,9 +146042,9 @@ diff -Nur linux-4.1.6/drivers/media/v4l2-core/v4l2-dev.c xbian-sources-kernel/dr
/* yes, really vidioc_subscribe_event */
SET_VALID_IOCTL(ops, VIDIOC_DQEVENT, vidioc_subscribe_event);
SET_VALID_IOCTL(ops, VIDIOC_SUBSCRIBE_EVENT, vidioc_subscribe_event);
-diff -Nur linux-4.1.6/drivers/media/v4l2-core/v4l2-ioctl.c xbian-sources-kernel/drivers/media/v4l2-core/v4l2-ioctl.c
---- linux-4.1.6/drivers/media/v4l2-core/v4l2-ioctl.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/media/v4l2-core/v4l2-ioctl.c 2015-09-11 17:46:14.170647110 +0200
+diff -Nur linux-4.1.10.orig/drivers/media/v4l2-core/v4l2-ioctl.c linux-4.1.10/drivers/media/v4l2-core/v4l2-ioctl.c
+--- linux-4.1.10.orig/drivers/media/v4l2-core/v4l2-ioctl.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/media/v4l2-core/v4l2-ioctl.c 2015-10-10 16:41:42.641314846 +0200
@@ -26,6 +26,7 @@
#include <media/v4l2-fh.h>
#include <media/v4l2-event.h>
@@ -146637,9 +146101,9 @@ diff -Nur linux-4.1.6/drivers/media/v4l2-core/v4l2-ioctl.c xbian-sources-kernel/
IOCTL_INFO_FNC(VIDIOC_S_HW_FREQ_SEEK, v4l_s_hw_freq_seek, v4l_print_hw_freq_seek, INFO_FL_PRIO),
IOCTL_INFO_STD(VIDIOC_S_DV_TIMINGS, vidioc_s_dv_timings, v4l_print_dv_timings, INFO_FL_PRIO),
IOCTL_INFO_STD(VIDIOC_G_DV_TIMINGS, vidioc_g_dv_timings, v4l_print_dv_timings, 0),
-diff -Nur linux-4.1.6/drivers/mfd/Kconfig xbian-sources-kernel/drivers/mfd/Kconfig
---- linux-4.1.6/drivers/mfd/Kconfig 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/mfd/Kconfig 2015-09-11 17:46:14.210644434 +0200
+diff -Nur linux-4.1.10.orig/drivers/mfd/Kconfig linux-4.1.10/drivers/mfd/Kconfig
+--- linux-4.1.10.orig/drivers/mfd/Kconfig 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/mfd/Kconfig 2015-10-10 16:41:42.641314846 +0200
@@ -207,6 +207,13 @@
Additional drivers must be enabled in order to use the specific
features of the device.
@@ -146654,17 +146118,17 @@ diff -Nur linux-4.1.6/drivers/mfd/Kconfig xbian-sources-kernel/drivers/mfd/Kconf
config MFD_DLN2
tristate "Diolan DLN2 support"
select MFD_CORE
-diff -Nur linux-4.1.6/drivers/mfd/Makefile xbian-sources-kernel/drivers/mfd/Makefile
---- linux-4.1.6/drivers/mfd/Makefile 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/mfd/Makefile 2015-09-11 17:46:14.210644434 +0200
+diff -Nur linux-4.1.10.orig/drivers/mfd/Makefile linux-4.1.10/drivers/mfd/Makefile
+--- linux-4.1.10.orig/drivers/mfd/Makefile 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/mfd/Makefile 2015-10-10 16:41:42.641314846 +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.6/drivers/mfd/mxc-hdmi-core.c xbian-sources-kernel/drivers/mfd/mxc-hdmi-core.c
---- linux-4.1.6/drivers/mfd/mxc-hdmi-core.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mfd/mxc-hdmi-core.c 2015-09-11 17:46:14.226643363 +0200
+diff -Nur linux-4.1.10.orig/drivers/mfd/mxc-hdmi-core.c linux-4.1.10/drivers/mfd/mxc-hdmi-core.c
+--- linux-4.1.10.orig/drivers/mfd/mxc-hdmi-core.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mfd/mxc-hdmi-core.c 2015-10-10 16:41:42.641314846 +0200
@@ -0,0 +1,782 @@
+/*
+ * Copyright (C) 2011-2014 Freescale Semiconductor, Inc.
@@ -147448,9 +146912,9 @@ diff -Nur linux-4.1.6/drivers/mfd/mxc-hdmi-core.c xbian-sources-kernel/drivers/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.6/drivers/misc/sram.c xbian-sources-kernel/drivers/misc/sram.c
---- linux-4.1.6/drivers/misc/sram.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/misc/sram.c 2015-09-11 17:46:14.306638007 +0200
+diff -Nur linux-4.1.10.orig/drivers/misc/sram.c linux-4.1.10/drivers/misc/sram.c
+--- linux-4.1.10.orig/drivers/misc/sram.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/misc/sram.c 2015-10-10 16:41:42.641314846 +0200
@@ -17,6 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
@@ -147459,9 +146923,9 @@ diff -Nur linux-4.1.6/drivers/misc/sram.c xbian-sources-kernel/drivers/misc/sram
#include <linux/kernel.h>
#include <linux/init.h>
-diff -Nur linux-4.1.6/drivers/mmc/core/core.c xbian-sources-kernel/drivers/mmc/core/core.c
---- linux-4.1.6/drivers/mmc/core/core.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/mmc/core/core.c 2015-09-11 17:46:14.338635865 +0200
+diff -Nur linux-4.1.10.orig/drivers/mmc/core/core.c linux-4.1.10/drivers/mmc/core/core.c
+--- linux-4.1.10.orig/drivers/mmc/core/core.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/mmc/core/core.c 2015-10-10 16:41:42.645314847 +0200
@@ -13,11 +13,13 @@
#include <linux/module.h>
#include <linux/init.h>
@@ -147476,7 +146940,7 @@ diff -Nur linux-4.1.6/drivers/mmc/core/core.c xbian-sources-kernel/drivers/mmc/c
#include <linux/leds.h>
#include <linux/scatterlist.h>
#include <linux/log2.h>
-@@ -1551,8 +1553,8 @@
+@@ -1553,8 +1555,8 @@
goto power_cycle;
}
@@ -147487,7 +146951,7 @@ diff -Nur linux-4.1.6/drivers/mmc/core/core.c xbian-sources-kernel/drivers/mmc/c
host->ios.clock = clock;
mmc_set_ios(host);
-@@ -1601,6 +1603,43 @@
+@@ -1603,6 +1605,43 @@
mmc_host_clk_release(host);
}
@@ -147531,7 +146995,7 @@ diff -Nur linux-4.1.6/drivers/mmc/core/core.c xbian-sources-kernel/drivers/mmc/c
/*
* Apply power to the MMC stack. This is a two-stage process.
* First, we enable power to the card without the clock running.
-@@ -1661,6 +1700,9 @@
+@@ -1663,6 +1702,9 @@
if (host->ios.power_mode == MMC_POWER_OFF)
return;
@@ -147541,7 +147005,7 @@ diff -Nur linux-4.1.6/drivers/mmc/core/core.c xbian-sources-kernel/drivers/mmc/c
mmc_host_clk_hold(host);
mmc_pwrseq_power_off(host);
-@@ -1686,7 +1728,7 @@
+@@ -1688,7 +1730,7 @@
{
mmc_power_off(host);
/* Wait at least 1 ms according to SD spec */
@@ -147550,9 +147014,9 @@ diff -Nur linux-4.1.6/drivers/mmc/core/core.c xbian-sources-kernel/drivers/mmc/c
mmc_power_up(host, ocr);
}
-diff -Nur linux-4.1.6/drivers/mmc/core/host.c xbian-sources-kernel/drivers/mmc/core/host.c
---- linux-4.1.6/drivers/mmc/core/host.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/mmc/core/host.c 2015-09-11 17:46:14.338635865 +0200
+diff -Nur linux-4.1.10.orig/drivers/mmc/core/host.c linux-4.1.10/drivers/mmc/core/host.c
+--- linux-4.1.10.orig/drivers/mmc/core/host.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/mmc/core/host.c 2015-10-10 16:41:42.645314847 +0200
@@ -12,14 +12,18 @@
* MMC host class device management
*/
@@ -147650,9 +147114,9 @@ diff -Nur linux-4.1.6/drivers/mmc/core/host.c xbian-sources-kernel/drivers/mmc/c
WARN_ON((host->caps & MMC_CAP_SDIO_IRQ) &&
!host->ops->enable_sdio_irq);
-diff -Nur linux-4.1.6/drivers/mmc/core/mmc_ops.c xbian-sources-kernel/drivers/mmc/core/mmc_ops.c
---- linux-4.1.6/drivers/mmc/core/mmc_ops.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/mmc/core/mmc_ops.c 2015-09-11 17:46:14.338635865 +0200
+diff -Nur linux-4.1.10.orig/drivers/mmc/core/mmc_ops.c linux-4.1.10/drivers/mmc/core/mmc_ops.c
+--- linux-4.1.10.orig/drivers/mmc/core/mmc_ops.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/mmc/core/mmc_ops.c 2015-10-10 16:41:42.645314847 +0200
@@ -513,6 +513,12 @@
return 0;
@@ -147666,9 +147130,9 @@ diff -Nur linux-4.1.6/drivers/mmc/core/mmc_ops.c xbian-sources-kernel/drivers/mm
* CRC errors shall only be ignored in cases were CMD13 is used to poll
* to detect busy completion.
*/
-diff -Nur linux-4.1.6/drivers/mmc/core/sd.c xbian-sources-kernel/drivers/mmc/core/sd.c
---- linux-4.1.6/drivers/mmc/core/sd.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/mmc/core/sd.c 2015-09-11 17:46:14.338635865 +0200
+diff -Nur linux-4.1.10.orig/drivers/mmc/core/sd.c linux-4.1.10/drivers/mmc/core/sd.c
+--- linux-4.1.10.orig/drivers/mmc/core/sd.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/mmc/core/sd.c 2015-10-10 16:41:42.645314847 +0200
@@ -521,6 +521,13 @@
else {
mmc_set_timing(card->host, timing);
@@ -147724,9 +147188,9 @@ diff -Nur linux-4.1.6/drivers/mmc/core/sd.c xbian-sources-kernel/drivers/mmc/cor
}
/*
-diff -Nur linux-4.1.6/drivers/mmc/host/sdhci-esdhc-imx.c xbian-sources-kernel/drivers/mmc/host/sdhci-esdhc-imx.c
---- linux-4.1.6/drivers/mmc/host/sdhci-esdhc-imx.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/mmc/host/sdhci-esdhc-imx.c 2015-09-11 17:46:14.354634794 +0200
+diff -Nur linux-4.1.10.orig/drivers/mmc/host/sdhci-esdhc-imx.c linux-4.1.10/drivers/mmc/host/sdhci-esdhc-imx.c
+--- linux-4.1.10.orig/drivers/mmc/host/sdhci-esdhc-imx.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/mmc/host/sdhci-esdhc-imx.c 2015-10-10 16:41:42.649314848 +0200
@@ -65,6 +65,8 @@
/* NOTE: the minimum valid tuning start tap for mx6sl is 1 */
#define ESDHC_TUNING_START_TAP 0x1
@@ -147899,9 +147363,9 @@ diff -Nur linux-4.1.6/drivers/mmc/host/sdhci-esdhc-imx.c xbian-sources-kernel/dr
boarddata = &imx_data->boarddata;
if (sdhci_esdhc_imx_probe_dt(pdev, host, boarddata) < 0) {
-diff -Nur linux-4.1.6/drivers/mxc/asrc/Kconfig xbian-sources-kernel/drivers/mxc/asrc/Kconfig
---- linux-4.1.6/drivers/mxc/asrc/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/asrc/Kconfig 2015-09-11 17:46:14.442628904 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/asrc/Kconfig linux-4.1.10/drivers/mxc/asrc/Kconfig
+--- linux-4.1.10.orig/drivers/mxc/asrc/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/asrc/Kconfig 2015-10-10 16:41:42.649314848 +0200
@@ -0,0 +1,14 @@
+#
+# ASRC configuration
@@ -147917,17 +147381,17 @@ diff -Nur linux-4.1.6/drivers/mxc/asrc/Kconfig xbian-sources-kernel/drivers/mxc/
+ Say Y to get the ASRC service.
+
+endmenu
-diff -Nur linux-4.1.6/drivers/mxc/asrc/Makefile xbian-sources-kernel/drivers/mxc/asrc/Makefile
---- linux-4.1.6/drivers/mxc/asrc/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/asrc/Makefile 2015-09-11 17:46:14.442628904 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/asrc/Makefile linux-4.1.10/drivers/mxc/asrc/Makefile
+--- linux-4.1.10.orig/drivers/mxc/asrc/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/asrc/Makefile 2015-10-10 16:41:42.649314848 +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.6/drivers/mxc/asrc/mxc_asrc.c xbian-sources-kernel/drivers/mxc/asrc/mxc_asrc.c
---- linux-4.1.6/drivers/mxc/asrc/mxc_asrc.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/asrc/mxc_asrc.c 2015-09-11 17:46:14.442628904 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/asrc/mxc_asrc.c linux-4.1.10/drivers/mxc/asrc/mxc_asrc.c
+--- linux-4.1.10.orig/drivers/mxc/asrc/mxc_asrc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/asrc/mxc_asrc.c 2015-10-10 16:41:42.653314849 +0200
@@ -0,0 +1,2045 @@
+/*
+ * Freescale Asynchronous Sample Rate Converter (ASRC) driver
@@ -149974,9 +149438,9 @@ diff -Nur linux-4.1.6/drivers/mxc/asrc/mxc_asrc.c xbian-sources-kernel/drivers/m
+MODULE_DESCRIPTION("Asynchronous Sample Rate Converter");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:mxc_asrc");
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c 2015-09-11 17:46:14.442628904 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c linux-4.1.10/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c 2015-10-10 16:41:42.653314849 +0200
@@ -0,0 +1,932 @@
+/****************************************************************************
+*
@@ -150910,9 +150374,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_ha
+
+#endif /* gcdENABLE_VG */
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h 2015-09-11 17:46:14.442628904 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h linux-4.1.10/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h 2015-10-10 16:41:42.653314849 +0200
@@ -0,0 +1,319 @@
+/****************************************************************************
+*
@@ -151233,9 +150697,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_ha
+
+#endif /* __gc_hal_kernel_hardware_command_h_ */
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c 2015-09-11 17:46:14.442628904 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c linux-4.1.10/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c 2015-10-10 16:41:42.653314849 +0200
@@ -0,0 +1,2114 @@
+/****************************************************************************
+*
@@ -153351,9 +152815,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_ha
+}
+#endif /* gcdENABLE_VG */
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h 2015-09-11 17:46:14.442628904 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h linux-4.1.10/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h 2015-10-10 16:41:42.653314849 +0200
@@ -0,0 +1,75 @@
+/****************************************************************************
+*
@@ -153430,9 +152894,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_ha
+
+#endif /* __gc_hal_kernel_hardware_h_ */
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c 2015-09-11 17:46:14.442628904 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c linux-4.1.10/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c 2015-10-10 16:41:42.653314849 +0200
@@ -0,0 +1,1735 @@
+/****************************************************************************
+*
@@ -155169,9 +154633,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_con
+#endif
+}
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h 2015-09-11 17:46:14.442628904 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h linux-4.1.10/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h 2015-10-10 16:41:42.657314848 +0200
@@ -0,0 +1,157 @@
+/****************************************************************************
+*
@@ -155330,9 +154794,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_con
+
+#endif /* __gc_hal_kernel_context_h_ */
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c 2015-09-11 17:46:14.446628636 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c linux-4.1.10/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c 2015-10-10 16:41:42.661314846 +0200
@@ -0,0 +1,7280 @@
+/****************************************************************************
+*
@@ -162614,9 +162078,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_har
+#endif
+
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h 2015-09-11 17:46:14.446628636 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h linux-4.1.10/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h 2015-10-10 16:41:42.661314846 +0200
@@ -0,0 +1,136 @@
+/****************************************************************************
+*
@@ -162754,9 +162218,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_har
+
+#endif /* __gc_hal_kernel_hardware_h_ */
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/config xbian-sources-kernel/drivers/mxc/gpu-viv/config
---- linux-4.1.6/drivers/mxc/gpu-viv/config 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/config 2015-09-11 17:46:14.446628636 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/config linux-4.1.10/drivers/mxc/gpu-viv/config
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/config 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/config 2015-10-10 16:41:42.661314846 +0200
@@ -0,0 +1,38 @@
+##############################################################################
+#
@@ -162796,9 +162260,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/config xbian-sources-kernel/drivers/mx
+BANK_CHANNEL_BIT ?= 12
+ENABLE_GPU_CLOCK_BY_DRIVER = 1
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.c 2015-09-11 17:46:14.446628636 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.c linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.c
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.c 2015-10-10 16:41:42.661314846 +0200
@@ -0,0 +1,2317 @@
+/****************************************************************************
+*
@@ -165117,9 +164581,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.
+ return status;
+}
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.h 2015-09-11 17:46:14.446628636 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.h linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.h
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.h 2015-10-10 16:41:42.661314846 +0200
@@ -0,0 +1,183 @@
+/****************************************************************************
+*
@@ -165304,9 +164768,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.
+
+#endif /* __gc_hal_kernel_context_h_ */
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.c 2015-09-11 17:46:14.446628636 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.c linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.c
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.c 2015-10-10 16:41:42.669314845 +0200
@@ -0,0 +1,8036 @@
+/****************************************************************************
+*
@@ -173344,9 +172808,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware
+}
+
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.h 2015-09-11 17:46:14.446628636 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.h linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.h
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.h 2015-10-10 16:41:42.669314845 +0200
@@ -0,0 +1,160 @@
+/****************************************************************************
+*
@@ -173508,9 +172972,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware
+
+#endif /* __gc_hal_kernel_hardware_h_ */
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_recorder.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_recorder.c 2015-09-11 17:46:14.446628636 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_recorder.c linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_recorder.c
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_recorder.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_recorder.c 2015-10-10 16:41:42.669314845 +0200
@@ -0,0 +1,679 @@
+/****************************************************************************
+*
@@ -174191,9 +173655,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_recorder
+}
+
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.c 2015-09-11 17:46:14.446628636 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.c linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.c
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.c 2015-10-10 16:41:42.669314845 +0200
@@ -0,0 +1,932 @@
+/****************************************************************************
+*
@@ -175127,9 +174591,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardwa
+
+#endif /* gcdENABLE_VG */
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.h 2015-09-11 17:46:14.446628636 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.h linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.h
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.h 2015-10-10 16:41:42.669314845 +0200
@@ -0,0 +1,319 @@
+/****************************************************************************
+*
@@ -175450,9 +174914,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardwa
+
+#endif /* __gc_hal_kernel_hardware_command_h_ */
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.c 2015-09-11 17:46:14.446628636 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.c linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.c
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.c 2015-10-10 16:41:42.669314845 +0200
@@ -0,0 +1,2119 @@
+/****************************************************************************
+*
@@ -177573,9 +177037,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardwa
+}
+#endif /* gcdENABLE_VG */
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.h 2015-09-11 17:46:14.446628636 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.h linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.h
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.h 2015-10-10 16:41:42.669314845 +0200
@@ -0,0 +1,74 @@
+/****************************************************************************
+*
@@ -177651,9 +177115,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardwa
+
+#endif /* __gc_hal_kernel_hardware_h_ */
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c
---- linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c 2015-09-11 17:46:14.446628636 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c 2015-10-10 16:41:42.673314849 +0200
@@ -0,0 +1,3967 @@
+/****************************************************************************
+*
@@ -181622,9 +181086,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c xbian-sourc
+***** Test Code ****************************************************************
+*******************************************************************************/
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c 2015-09-11 17:46:14.446628636 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c 2015-10-10 16:41:42.673314849 +0200
@@ -0,0 +1,3042 @@
+/****************************************************************************
+*
@@ -184668,9 +184132,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c xbi
+#endif
+}
+#endif
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c 2015-09-11 17:46:14.462627565 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c 2015-10-10 16:41:42.677314850 +0200
@@ -0,0 +1,3677 @@
+/****************************************************************************
+*
@@ -188349,9 +187813,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c
+}
+
+#endif /* gcdENABLE_VG */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c 2015-09-11 17:46:14.462627565 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c 2015-10-10 16:41:42.677314850 +0200
@@ -0,0 +1,1604 @@
+/****************************************************************************
+*
@@ -189957,9 +189421,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c xbian-so
+ gcmkFOOTER_NO();
+ return gcvSTATUS_OK;
+}
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c 2015-09-11 17:46:14.462627565 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c 2015-10-10 16:41:42.677314850 +0200
@@ -0,0 +1,2559 @@
+/****************************************************************************
+*
@@ -192520,9 +191984,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c xbian
+ return "nil";
+ }
+}
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c 2015-09-11 17:46:14.462627565 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c 2015-10-10 16:41:42.681314851 +0200
@@ -0,0 +1,2898 @@
+/****************************************************************************
+*
@@ -195422,9 +194886,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c xbian
+
+ return gcvSTATUS_OK;
+}
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h
---- linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h 2015-09-11 17:46:14.446628636 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h 2015-10-10 16:41:42.681314851 +0200
@@ -0,0 +1,1011 @@
+/****************************************************************************
+*
@@ -196437,9 +195901,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h xbian-sourc
+#endif
+
+#endif /* __gc_hal_kernel_h_ */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c 2015-09-11 17:46:14.462627565 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c 2015-10-10 16:41:42.681314851 +0200
@@ -0,0 +1,859 @@
+/****************************************************************************
+*
@@ -197300,9 +196764,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c xbian-
+***** Test Code ****************************************************************
+*******************************************************************************/
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c 2015-09-11 17:46:14.462627565 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c 2015-10-10 16:41:42.681314851 +0200
@@ -0,0 +1,877 @@
+/****************************************************************************
+*
@@ -198181,9 +197645,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.
+}
+
+#endif /* gcdENABLE_VG */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c 2015-09-11 17:46:14.462627565 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c 2015-10-10 16:41:42.681314851 +0200
@@ -0,0 +1,1982 @@
+/****************************************************************************
+*
@@ -200167,9 +199631,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c xbian-s
+****************************** T E S T C O D E ******************************
+******************************************************************************/
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c 2015-09-11 17:46:14.462627565 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c 2015-10-10 16:41:42.681314851 +0200
@@ -0,0 +1,522 @@
+/****************************************************************************
+*
@@ -200693,9 +200157,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c xbia
+}
+
+#endif /* gcdENABLE_VG */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c 2015-09-11 17:46:14.462627565 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c 2015-10-10 16:41:42.681314851 +0200
@@ -0,0 +1,347 @@
+/****************************************************************************
+*
@@ -201044,9 +200508,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c xbian
+ return gcvSTATUS_OK;
+}
+#endif
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h 2015-09-11 17:46:14.462627565 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h 2015-10-10 16:41:42.681314851 +0200
@@ -0,0 +1,29 @@
+/****************************************************************************
+*
@@ -201077,9 +200541,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h xbi
+#include "gc_hal_kernel.h"
+
+#endif /* __gc_hal_kernel_precomp_h_ */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_security.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_security.c 2015-09-11 17:46:14.462627565 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_security.c linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_security.c
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_security.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_security.c 2015-10-10 16:41:42.681314851 +0200
@@ -0,0 +1,239 @@
+/****************************************************************************
+*
@@ -201320,9 +200784,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_security.c xb
+}
+
+#endif
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c 2015-09-11 17:46:14.462627565 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c 2015-10-10 16:41:42.685314851 +0200
@@ -0,0 +1,895 @@
+/****************************************************************************
+*
@@ -202219,9 +201683,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c xbian-so
+}
+
+#endif /* gcdENABLE_VG */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h 2015-09-11 17:46:14.462627565 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h 2015-10-10 16:41:42.685314851 +0200
@@ -0,0 +1,85 @@
+/****************************************************************************
+*
@@ -202308,9 +201772,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h xbian-so
+};
+
+#endif /* __gc_hal_kernel_h_ */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c 2015-09-11 17:46:14.462627565 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c 2015-10-10 16:41:42.685314851 +0200
@@ -0,0 +1,2264 @@
+/****************************************************************************
+*
@@ -204576,9 +204040,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.
+ gcmkFOOTER();
+ return status;
+}
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h 2015-09-11 17:46:14.470627029 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h 2015-10-10 16:41:42.685314851 +0200
@@ -0,0 +1,3896 @@
+/****************************************************************************
+*
@@ -208476,9 +207940,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h xbian-sou
+#endif
+
+#endif /* __gc_hal_base_h_ */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h 2015-09-11 17:46:14.470627029 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h 2015-10-10 16:41:42.689314849 +0200
@@ -0,0 +1,4298 @@
+/****************************************************************************
+*
@@ -212778,9 +212242,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h xbian
+
+#endif /* VIVANTE_NO_3D */
+#endif /* __gc_hal_compiler_h_ */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h 2015-09-11 17:46:14.470627029 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h 2015-10-10 16:41:42.689314849 +0200
@@ -0,0 +1,1051 @@
+/****************************************************************************
+*
@@ -213833,9 +213297,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h xbian-s
+#endif
+
+#endif /* __gc_hal_driver_h_ */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h 2015-09-11 17:46:14.470627029 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h 2015-10-10 16:41:42.689314849 +0200
@@ -0,0 +1,270 @@
+/****************************************************************************
+*
@@ -214107,9 +213571,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h xbia
+#endif
+
+#endif /* __gc_hal_driver_h_ */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h 2015-09-11 17:46:14.470627029 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h 2015-10-10 16:41:42.689314849 +0200
@@ -0,0 +1,88 @@
+/****************************************************************************
+*
@@ -214199,9 +213663,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h xbian-sou
+
+#endif /* __gc_hal_dump_h_ */
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h 2015-09-11 17:46:14.470627029 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h 2015-10-10 16:41:42.689314849 +0200
@@ -0,0 +1,627 @@
+/****************************************************************************
+*
@@ -214830,9 +214294,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h xb
+#endif
+
+#endif /* __gc_hal_eglplatform_h_ */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h 2015-09-11 17:46:14.470627029 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h 2015-10-10 16:41:42.689314849 +0200
@@ -0,0 +1,286 @@
+/****************************************************************************
+*
@@ -215120,9 +214584,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type
+#endif
+
+#endif /* __gc_hal_eglplatform_type_h_ */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h 2015-09-11 17:46:14.470627029 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h 2015-10-10 16:41:42.689314849 +0200
@@ -0,0 +1,2053 @@
+/****************************************************************************
+*
@@ -217177,9 +216641,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h xbian-s
+
+#endif /* VIVANTE_NO_3D */
+#endif /* __gc_hal_engine_h_ */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h 2015-09-11 17:46:14.470627029 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h 2015-10-10 16:41:42.689314849 +0200
@@ -0,0 +1,904 @@
+/****************************************************************************
+*
@@ -218085,9 +217549,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h xbia
+#endif
+
+#endif /* __gc_hal_vg_h_ */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h 2015-09-11 17:46:14.470627029 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h 2015-10-10 16:41:42.689314849 +0200
@@ -0,0 +1,965 @@
+/****************************************************************************
+*
@@ -219054,9 +218518,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h xbian-sou
+#endif
+
+#endif /* __gc_hal_enum_h_ */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h
---- linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h 2015-09-11 17:46:14.470627029 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h 2015-10-10 16:41:42.693314847 +0200
@@ -0,0 +1,2661 @@
+/****************************************************************************
+*
@@ -221719,9 +221183,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h xbian-sources-
+#endif
+
+#endif /* __gc_hal_h_ */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h 2015-09-11 17:46:14.470627029 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h 2015-10-10 16:41:42.693314847 +0200
@@ -0,0 +1,185 @@
+/****************************************************************************
+*
@@ -221908,9 +221372,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h
+#endif
+
+#endif /* __gc_hal_kernel_buffer_h_ */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h 2015-09-11 17:46:14.470627029 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h 2015-10-10 16:41:42.693314847 +0200
@@ -0,0 +1,530 @@
+/****************************************************************************
+*
@@ -222442,9 +221906,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h xbian-sour
+
+#endif /* VIVANTE_NO_3D */
+#endif /* __gc_hal_mem_h_ */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h 2015-09-11 17:46:14.470627029 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h 2015-10-10 16:41:42.693314847 +0200
@@ -0,0 +1,947 @@
+/****************************************************************************
+*
@@ -223393,9 +222857,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h xbian-
+#endif
+
+#endif /* __gc_hal_options_h_ */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h 2015-09-11 17:46:14.470627029 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h 2015-10-10 16:41:42.753314849 +0200
@@ -0,0 +1,584 @@
+/****************************************************************************
+*
@@ -223981,9 +223445,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h xbian
+#endif
+
+#endif /* __gc_hal_profiler_h_ */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h 2015-09-11 17:46:14.470627029 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h 2015-10-10 16:41:42.753314849 +0200
@@ -0,0 +1,1010 @@
+/****************************************************************************
+*
@@ -224995,9 +224459,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h xbian-s
+#endif
+
+#endif /* __gc_hal_raster_h_ */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h 2015-09-11 17:46:14.470627029 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h 2015-10-10 16:41:42.753314849 +0200
@@ -0,0 +1,248 @@
+/****************************************************************************
+*
@@ -225247,9 +224711,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h xbian-s
+#endif
+
+#endif /* __gc_hal_rename_h_ */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_security_interface.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_security_interface.h 2015-09-11 17:46:14.470627029 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_security_interface.h linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_security_interface.h
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_security_interface.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_security_interface.h 2015-10-10 16:41:42.753314849 +0200
@@ -0,0 +1,137 @@
+/****************************************************************************
+*
@@ -225388,9 +224852,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_security_interfa
+};
+
+#endif
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h 2015-09-11 17:46:14.470627029 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h 2015-10-10 16:41:42.753314849 +0200
@@ -0,0 +1,115 @@
+/****************************************************************************
+*
@@ -225507,9 +224971,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h xbi
+
+#endif /*__gc_hal_statistics_h_ */
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h 2015-09-11 17:46:14.470627029 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h 2015-10-10 16:41:42.757314850 +0200
@@ -0,0 +1,1080 @@
+/****************************************************************************
+*
@@ -226591,9 +226055,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h xbian-so
+#endif
+
+#endif /* __gc_hal_types_h_ */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h 2015-09-11 17:46:14.470627029 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h 2015-10-10 16:41:42.757314850 +0200
@@ -0,0 +1,37 @@
+/****************************************************************************
+*
@@ -226632,9 +226096,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h xbian-
+#define gcvVERSION_TIME __TIME__
+
+#endif /* __gc_hal_version_h_ */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h 2015-09-11 17:46:14.474626762 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h 2015-10-10 16:41:42.761314850 +0200
@@ -0,0 +1,913 @@
+/****************************************************************************
+*
@@ -227549,9 +227013,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h xbian-sourc
+#endif
+
+#endif /* __gc_hal_h_ */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/default/gc_hal_kernel_allocator_array.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/default/gc_hal_kernel_allocator_array.h 2015-09-11 17:46:14.518623815 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/default/gc_hal_kernel_allocator_array.h linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/default/gc_hal_kernel_allocator_array.h
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/default/gc_hal_kernel_allocator_array.h 2015-10-10 16:41:42.761314850 +0200
@@ -0,0 +1,34 @@
+/****************************************************************************
+*
@@ -227587,9 +227051,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/default/
+};
+
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_array.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_array.h 2015-09-11 17:46:14.518623815 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_array.h linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_array.h
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_array.h 2015-10-10 16:41:42.761314850 +0200
@@ -0,0 +1,45 @@
+/****************************************************************************
+*
@@ -227636,9 +227100,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescal
+};
+
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_cma.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_cma.c 2015-09-11 17:46:14.518623815 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_cma.c linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_cma.c
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_cma.c 2015-10-10 16:41:42.761314850 +0200
@@ -0,0 +1,412 @@
+/****************************************************************************
+*
@@ -228052,9 +227516,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescal
+ return status;
+}
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.c 2015-09-11 17:46:14.518623815 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.c linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.c
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.c 2015-10-10 16:41:42.761314850 +0200
@@ -0,0 +1,938 @@
+/****************************************************************************
+*
@@ -228994,9 +228458,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allo
+ return gcvSTATUS_OK;
+}
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.h 2015-09-11 17:46:14.518623815 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.h linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.h
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.h 2015-10-10 16:41:42.761314850 +0200
@@ -0,0 +1,400 @@
+/****************************************************************************
+*
@@ -229398,9 +228862,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allo
+
+*/
+#endif
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c 2015-09-11 17:46:14.518623815 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c 2015-10-10 16:41:42.761314850 +0200
@@ -0,0 +1,795 @@
+/****************************************************************************
+*
@@ -230197,9 +229661,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debu
+{
+ gcmkDBGFSPRINT ( _GetArgumentSize ( Message ) , Message ) ;
+}
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h 2015-09-11 17:46:14.518623815 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h 2015-10-10 16:41:42.761314850 +0200
@@ -0,0 +1,84 @@
+/****************************************************************************
+*
@@ -230285,9 +229749,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debu
+#endif
+
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h 2015-09-11 17:46:14.518623815 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h 2015-10-10 16:41:42.761314850 +0200
@@ -0,0 +1,102 @@
+/****************************************************************************
+*
@@ -230391,9 +229855,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debu
+#endif
+
+#endif /* __gc_hal_kernel_debug_h_ */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c 2015-09-11 17:46:14.518623815 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c 2015-10-10 16:41:42.761314850 +0200
@@ -0,0 +1,1676 @@
+/****************************************************************************
+*
@@ -232071,9 +231535,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_devi
+ gcmkFOOTER();
+ return status;
+}
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h 2015-09-11 17:46:14.518623815 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h 2015-10-10 16:41:42.761314850 +0200
@@ -0,0 +1,192 @@
+/****************************************************************************
+*
@@ -232267,9 +231731,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_devi
+ );
+
+#endif /* __gc_hal_kernel_device_h_ */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c 2015-09-11 17:46:14.518623815 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c 2015-10-10 16:41:42.761314850 +0200
@@ -0,0 +1,1476 @@
+/****************************************************************************
+*
@@ -233747,9 +233211,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driv
+module_exit(gpu_exit);
+
+#endif
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_iommu.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_iommu.c 2015-09-11 17:46:14.518623815 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_iommu.c linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_iommu.c
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_iommu.c 2015-10-10 16:41:42.765314850 +0200
@@ -0,0 +1,216 @@
+/****************************************************************************
+*
@@ -233967,9 +233431,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_iomm
+ return gcvSTATUS_OK;
+}
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c 2015-09-11 17:46:14.518623815 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c 2015-10-10 16:41:42.765314850 +0200
@@ -0,0 +1,481 @@
+/****************************************************************************
+*
@@ -234452,9 +233916,9 @@ diff -Nur linux-4.1.6/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.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h 2015-09-11 17:46:14.518623815 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h 2015-10-10 16:41:42.765314850 +0200
@@ -0,0 +1,94 @@
+/****************************************************************************
+*
@@ -234550,9 +234014,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linu
+}
+
+#endif /* __gc_hal_kernel_linux_h_ */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c 2015-09-11 17:46:14.518623815 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c 2015-10-10 16:41:42.765314850 +0200
@@ -0,0 +1,32 @@
+/****************************************************************************
+*
@@ -234586,9 +234050,9 @@ diff -Nur linux-4.1.6/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.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c 2015-09-11 17:46:14.518623815 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c 2015-10-10 16:41:42.769314849 +0200
@@ -0,0 +1,9022 @@
+/****************************************************************************
+*
@@ -243612,9 +243076,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
+ return status;
+}
+#endif
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h 2015-09-11 17:46:14.518623815 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h 2015-10-10 16:41:42.769314849 +0200
@@ -0,0 +1,83 @@
+/****************************************************************************
+*
@@ -243699,9 +243163,9 @@ diff -Nur linux-4.1.6/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.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_platform.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_platform.h 2015-09-11 17:46:14.518623815 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_platform.h linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_platform.h
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_platform.h 2015-10-10 16:41:42.769314849 +0200
@@ -0,0 +1,279 @@
+/****************************************************************************
+*
@@ -243982,9 +243446,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_plat
+ );
+
+#endif
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_probe.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_probe.c 2015-09-11 17:46:14.518623815 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_probe.c linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_probe.c
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_probe.c 2015-10-10 16:41:42.769314849 +0200
@@ -0,0 +1,1347 @@
+/****************************************************************************
+*
@@ -245333,9 +244797,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_prob
+module_exit(gpu_exit);
+
+#endif
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_security_channel.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_security_channel.c 2015-09-11 17:46:14.522623548 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_security_channel.c linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_security_channel.c
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_security_channel.c 2015-10-10 16:41:42.769314849 +0200
@@ -0,0 +1,385 @@
+/****************************************************************************
+*
@@ -245722,9 +245186,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_secu
+ gcmkFOOTER();
+ return status;
+}
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c 2015-09-11 17:46:14.522623548 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c 2015-10-10 16:41:42.769314849 +0200
@@ -0,0 +1,174 @@
+/****************************************************************************
+*
@@ -245900,9 +245364,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync
+}
+
+#endif
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h 2015-09-11 17:46:14.522623548 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h 2015-10-10 16:41:42.769314849 +0200
@@ -0,0 +1,71 @@
+/****************************************************************************
+*
@@ -245975,9 +245439,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync
+ );
+
+#endif /* __gc_hal_kernel_sync_h_ */
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c 2015-09-11 17:46:14.522623548 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c 2015-10-10 16:41:42.769314849 +0200
@@ -0,0 +1,880 @@
+/****************************************************************************
+*
@@ -246859,9 +246323,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale
+ *Operations = &platformOperations;
+}
+
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.config xbian-sources-kernel/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 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.config 2015-09-11 17:46:14.522623548 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.config linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.config
+--- linux-4.1.10.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.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.config 2015-10-10 16:41:42.769314849 +0200
@@ -0,0 +1,15 @@
+EXTRA_CFLAGS += -DgcdDEFAULT_CONTIGUOUS_SIZE=134217728
+
@@ -246878,9 +246342,9 @@ diff -Nur linux-4.1.6/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.6/drivers/mxc/gpu-viv/Kbuild xbian-sources-kernel/drivers/mxc/gpu-viv/Kbuild
---- linux-4.1.6/drivers/mxc/gpu-viv/Kbuild 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/Kbuild 2015-09-11 17:46:14.442628904 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/Kbuild linux-4.1.10/drivers/mxc/gpu-viv/Kbuild
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/Kbuild 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/Kbuild 2015-10-10 16:41:42.769314849 +0200
@@ -0,0 +1,236 @@
+##############################################################################
+#
@@ -247118,9 +246582,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/Kbuild xbian-sources-kernel/drivers/mx
+galcore-objs := $(OBJS)
+
+endif
-diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/Kconfig xbian-sources-kernel/drivers/mxc/gpu-viv/Kconfig
---- linux-4.1.6/drivers/mxc/gpu-viv/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/gpu-viv/Kconfig 2015-09-11 17:46:14.442628904 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/gpu-viv/Kconfig linux-4.1.10/drivers/mxc/gpu-viv/Kconfig
+--- linux-4.1.10.orig/drivers/mxc/gpu-viv/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/gpu-viv/Kconfig 2015-10-10 16:41:42.769314849 +0200
@@ -0,0 +1,15 @@
+menu "Vivante GPU support"
+ depends on SOC_IMX6Q
@@ -247137,9 +246601,9 @@ diff -Nur linux-4.1.6/drivers/mxc/gpu-viv/Kconfig xbian-sources-kernel/drivers/m
+ Say Y to get the GPU driver support.
+
+endmenu
-diff -Nur linux-4.1.6/drivers/mxc/hdmi-cec/Kconfig xbian-sources-kernel/drivers/mxc/hdmi-cec/Kconfig
---- linux-4.1.6/drivers/mxc/hdmi-cec/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/hdmi-cec/Kconfig 2015-09-11 17:46:14.522623548 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/hdmi-cec/Kconfig linux-4.1.10/drivers/mxc/hdmi-cec/Kconfig
+--- linux-4.1.10.orig/drivers/mxc/hdmi-cec/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/hdmi-cec/Kconfig 2015-10-10 16:41:42.769314849 +0200
@@ -0,0 +1,11 @@
+
+menu "MXC HDMI CEC (Consumer Electronics Control) support"
@@ -247152,14 +246616,14 @@ diff -Nur linux-4.1.6/drivers/mxc/hdmi-cec/Kconfig xbian-sources-kernel/drivers/
+ The HDMI CEC device implement low level protocol on i.MX6x platforms.
+
+endmenu
-diff -Nur linux-4.1.6/drivers/mxc/hdmi-cec/Makefile xbian-sources-kernel/drivers/mxc/hdmi-cec/Makefile
---- linux-4.1.6/drivers/mxc/hdmi-cec/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/hdmi-cec/Makefile 2015-09-11 17:46:14.522623548 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/hdmi-cec/Makefile linux-4.1.10/drivers/mxc/hdmi-cec/Makefile
+--- linux-4.1.10.orig/drivers/mxc/hdmi-cec/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/hdmi-cec/Makefile 2015-10-10 16:41:42.769314849 +0200
@@ -0,0 +1 @@
+obj-$(CONFIG_MXC_HDMI_CEC) += mxc_hdmi-cec.o
-diff -Nur linux-4.1.6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c xbian-sources-kernel/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c
---- linux-4.1.6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c 2015-09-11 17:46:14.522623548 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c linux-4.1.10/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c
+--- linux-4.1.10.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c 2015-10-10 16:41:42.773314850 +0200
@@ -0,0 +1,795 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -247956,9 +247420,9 @@ diff -Nur linux-4.1.6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c xbian-sources-kernel/d
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:mxc_hdmi_cec");
+
-diff -Nur linux-4.1.6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.debug.c xbian-sources-kernel/drivers/mxc/hdmi-cec/mxc_hdmi-cec.debug.c
---- linux-4.1.6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.debug.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/hdmi-cec/mxc_hdmi-cec.debug.c 2015-09-11 17:46:14.538622477 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.debug.c linux-4.1.10/drivers/mxc/hdmi-cec/mxc_hdmi-cec.debug.c
+--- linux-4.1.10.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.debug.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/hdmi-cec/mxc_hdmi-cec.debug.c 2015-10-10 16:41:42.773314850 +0200
@@ -0,0 +1,765 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -248725,9 +248189,9 @@ diff -Nur linux-4.1.6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.debug.c xbian-sources-ke
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:mxc_hdmi_cec");
+
-diff -Nur linux-4.1.6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h xbian-sources-kernel/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h
---- linux-4.1.6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h 2015-09-11 17:46:14.538622477 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h linux-4.1.10/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h
+--- linux-4.1.10.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h 2015-10-10 16:41:42.773314850 +0200
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -248782,9 +248246,9 @@ diff -Nur linux-4.1.6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h xbian-sources-kernel/d
+
+#endif /* !_HDMICEC_H_ */
+
-diff -Nur linux-4.1.6/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c xbian-sources-kernel/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c
---- linux-4.1.6/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c 2015-09-11 17:46:14.538622477 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c linux-4.1.10/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c
+--- linux-4.1.10.orig/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c 2015-10-10 16:41:42.773314850 +0200
@@ -0,0 +1,495 @@
+/*
+ * Copyright 2009-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -249281,9 +248745,9 @@ diff -Nur linux-4.1.6/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c xbian-sources-ke
+ return status;
+}
+EXPORT_SYMBOL(ipu_calc_stripes_sizes);
-diff -Nur linux-4.1.6/drivers/mxc/ipu3/ipu_capture.c xbian-sources-kernel/drivers/mxc/ipu3/ipu_capture.c
---- linux-4.1.6/drivers/mxc/ipu3/ipu_capture.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/ipu3/ipu_capture.c 2015-09-11 17:46:14.538622477 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/ipu3/ipu_capture.c linux-4.1.10/drivers/mxc/ipu3/ipu_capture.c
+--- linux-4.1.10.orig/drivers/mxc/ipu3/ipu_capture.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/ipu3/ipu_capture.c 2015-10-10 16:41:42.773314850 +0200
@@ -0,0 +1,862 @@
+/*
+ * Copyright 2008-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -250147,9 +249611,9 @@ diff -Nur linux-4.1.6/drivers/mxc/ipu3/ipu_capture.c xbian-sources-kernel/driver
+ ipu_free_irq(ipu, irq, ipu);
+ dev_dbg(ipu->dev, "CSI stop timeout - %d * 10ms\n", 5 - ret);
+}
-diff -Nur linux-4.1.6/drivers/mxc/ipu3/ipu_common.c xbian-sources-kernel/drivers/mxc/ipu3/ipu_common.c
---- linux-4.1.6/drivers/mxc/ipu3/ipu_common.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/ipu3/ipu_common.c 2015-09-11 17:46:14.538622477 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/ipu3/ipu_common.c linux-4.1.10/drivers/mxc/ipu3/ipu_common.c
+--- linux-4.1.10.orig/drivers/mxc/ipu3/ipu_common.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/ipu3/ipu_common.c 2015-10-10 16:41:42.773314850 +0200
@@ -0,0 +1,3204 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -253355,9 +252819,9 @@ diff -Nur linux-4.1.6/drivers/mxc/ipu3/ipu_common.c xbian-sources-kernel/drivers
+
+MODULE_DESCRIPTION("i.MX IPU v3 driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-4.1.6/drivers/mxc/ipu3/ipu_device.c xbian-sources-kernel/drivers/mxc/ipu3/ipu_device.c
---- linux-4.1.6/drivers/mxc/ipu3/ipu_device.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/ipu3/ipu_device.c 2015-09-11 17:46:14.538622477 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/ipu3/ipu_device.c linux-4.1.10/drivers/mxc/ipu3/ipu_device.c
+--- linux-4.1.10.orig/drivers/mxc/ipu3/ipu_device.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/ipu3/ipu_device.c 2015-10-10 16:41:42.777314851 +0200
@@ -0,0 +1,3725 @@
+/*
+ * Copyright 2005-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -257084,9 +256548,9 @@ diff -Nur linux-4.1.6/drivers/mxc/ipu3/ipu_device.c xbian-sources-kernel/drivers
+ major = 0;
+ }
+}
-diff -Nur linux-4.1.6/drivers/mxc/ipu3/ipu_disp.c xbian-sources-kernel/drivers/mxc/ipu3/ipu_disp.c
---- linux-4.1.6/drivers/mxc/ipu3/ipu_disp.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/ipu3/ipu_disp.c 2015-09-11 17:46:14.538622477 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/ipu3/ipu_disp.c linux-4.1.10/drivers/mxc/ipu3/ipu_disp.c
+--- linux-4.1.10.orig/drivers/mxc/ipu3/ipu_disp.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/ipu3/ipu_disp.c 2015-10-10 16:41:42.777314851 +0200
@@ -0,0 +1,1956 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -259044,9 +258508,9 @@ diff -Nur linux-4.1.6/drivers/mxc/ipu3/ipu_disp.c xbian-sources-kernel/drivers/m
+ _ipu_init_dc_mappings(ipu);
+ _ipu_dmfc_init(ipu, DMFC_NORMAL, 1);
+}
-diff -Nur linux-4.1.6/drivers/mxc/ipu3/ipu_ic.c xbian-sources-kernel/drivers/mxc/ipu3/ipu_ic.c
---- linux-4.1.6/drivers/mxc/ipu3/ipu_ic.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/ipu3/ipu_ic.c 2015-09-11 17:46:14.542622210 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/ipu3/ipu_ic.c linux-4.1.10/drivers/mxc/ipu3/ipu_ic.c
+--- linux-4.1.10.orig/drivers/mxc/ipu3/ipu_ic.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/ipu3/ipu_ic.c 2015-10-10 16:41:42.777314851 +0200
@@ -0,0 +1,924 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -259972,9 +259436,9 @@ diff -Nur linux-4.1.6/drivers/mxc/ipu3/ipu_ic.c xbian-sources-kernel/drivers/mxc
+
+ ipu_vdi_write(ipu, reg, VDI_C);
+}
-diff -Nur linux-4.1.6/drivers/mxc/ipu3/ipu_param_mem.h xbian-sources-kernel/drivers/mxc/ipu3/ipu_param_mem.h
---- linux-4.1.6/drivers/mxc/ipu3/ipu_param_mem.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/ipu3/ipu_param_mem.h 2015-09-11 17:46:14.542622210 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/ipu3/ipu_param_mem.h linux-4.1.10/drivers/mxc/ipu3/ipu_param_mem.h
+--- linux-4.1.10.orig/drivers/mxc/ipu3/ipu_param_mem.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/ipu3/ipu_param_mem.h 2015-10-10 16:41:42.777314851 +0200
@@ -0,0 +1,921 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -260897,9 +260361,9 @@ diff -Nur linux-4.1.6/drivers/mxc/ipu3/ipu_param_mem.h xbian-sources-kernel/driv
+ return false;
+}
+#endif
-diff -Nur linux-4.1.6/drivers/mxc/ipu3/ipu_pixel_clk.c xbian-sources-kernel/drivers/mxc/ipu3/ipu_pixel_clk.c
---- linux-4.1.6/drivers/mxc/ipu3/ipu_pixel_clk.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/ipu3/ipu_pixel_clk.c 2015-09-11 17:46:14.542622210 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/ipu3/ipu_pixel_clk.c linux-4.1.10/drivers/mxc/ipu3/ipu_pixel_clk.c
+--- linux-4.1.10.orig/drivers/mxc/ipu3/ipu_pixel_clk.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/ipu3/ipu_pixel_clk.c 2015-10-10 16:41:42.777314851 +0200
@@ -0,0 +1,317 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -261218,9 +260682,9 @@ diff -Nur linux-4.1.6/drivers/mxc/ipu3/ipu_pixel_clk.c xbian-sources-kernel/driv
+
+ return clk;
+}
-diff -Nur linux-4.1.6/drivers/mxc/ipu3/ipu_prv.h xbian-sources-kernel/drivers/mxc/ipu3/ipu_prv.h
---- linux-4.1.6/drivers/mxc/ipu3/ipu_prv.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/ipu3/ipu_prv.h 2015-09-11 17:46:14.542622210 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/ipu3/ipu_prv.h linux-4.1.10/drivers/mxc/ipu3/ipu_prv.h
+--- linux-4.1.10.orig/drivers/mxc/ipu3/ipu_prv.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/ipu3/ipu_prv.h 2015-10-10 16:41:42.777314851 +0200
@@ -0,0 +1,371 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -261593,9 +261057,9 @@ diff -Nur linux-4.1.6/drivers/mxc/ipu3/ipu_prv.h xbian-sources-kernel/drivers/mx
+ 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.6/drivers/mxc/ipu3/ipu_regs.h xbian-sources-kernel/drivers/mxc/ipu3/ipu_regs.h
---- linux-4.1.6/drivers/mxc/ipu3/ipu_regs.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/ipu3/ipu_regs.h 2015-09-11 17:46:14.542622210 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/ipu3/ipu_regs.h linux-4.1.10/drivers/mxc/ipu3/ipu_regs.h
+--- linux-4.1.10.orig/drivers/mxc/ipu3/ipu_regs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/ipu3/ipu_regs.h 2015-10-10 16:41:42.777314851 +0200
@@ -0,0 +1,749 @@
+/*
+ * Copyright (C) 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -262346,23 +261810,23 @@ diff -Nur linux-4.1.6/drivers/mxc/ipu3/ipu_regs.h xbian-sources-kernel/drivers/m
+#define WRG (0x01)
+
+#endif
-diff -Nur linux-4.1.6/drivers/mxc/ipu3/Kconfig xbian-sources-kernel/drivers/mxc/ipu3/Kconfig
---- linux-4.1.6/drivers/mxc/ipu3/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/ipu3/Kconfig 2015-09-11 17:46:14.538622477 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/ipu3/Kconfig linux-4.1.10/drivers/mxc/ipu3/Kconfig
+--- linux-4.1.10.orig/drivers/mxc/ipu3/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/ipu3/Kconfig 2015-10-10 16:41:42.777314851 +0200
@@ -0,0 +1,2 @@
+config MXC_IPU_V3_FSL
+ bool
-diff -Nur linux-4.1.6/drivers/mxc/ipu3/Makefile xbian-sources-kernel/drivers/mxc/ipu3/Makefile
---- linux-4.1.6/drivers/mxc/ipu3/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/ipu3/Makefile 2015-09-11 17:46:14.538622477 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/ipu3/Makefile linux-4.1.10/drivers/mxc/ipu3/Makefile
+--- linux-4.1.10.orig/drivers/mxc/ipu3/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/ipu3/Makefile 2015-10-10 16:41:42.781314851 +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.6/drivers/mxc/ipu3/vdoa.c xbian-sources-kernel/drivers/mxc/ipu3/vdoa.c
---- linux-4.1.6/drivers/mxc/ipu3/vdoa.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/ipu3/vdoa.c 2015-09-11 17:46:14.542622210 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/ipu3/vdoa.c linux-4.1.10/drivers/mxc/ipu3/vdoa.c
+--- linux-4.1.10.orig/drivers/mxc/ipu3/vdoa.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/ipu3/vdoa.c 2015-10-10 16:41:42.781314851 +0200
@@ -0,0 +1,547 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -262911,9 +262375,9 @@ diff -Nur linux-4.1.6/drivers/mxc/ipu3/vdoa.c xbian-sources-kernel/drivers/mxc/i
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("i.MX Video Data Order Adapter(VDOA) driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-4.1.6/drivers/mxc/ipu3/vdoa.h xbian-sources-kernel/drivers/mxc/ipu3/vdoa.h
---- linux-4.1.6/drivers/mxc/ipu3/vdoa.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/ipu3/vdoa.h 2015-09-11 17:46:14.542622210 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/ipu3/vdoa.h linux-4.1.10/drivers/mxc/ipu3/vdoa.h
+--- linux-4.1.10.orig/drivers/mxc/ipu3/vdoa.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/ipu3/vdoa.h 2015-10-10 16:41:42.781314851 +0200
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -262984,9 +262448,9 @@ diff -Nur linux-4.1.6/drivers/mxc/ipu3/vdoa.h xbian-sources-kernel/drivers/mxc/i
+void vdoa_get_handle(vdoa_handle_t *handle);
+void vdoa_put_handle(vdoa_handle_t *handle);
+#endif
-diff -Nur linux-4.1.6/drivers/mxc/Kconfig xbian-sources-kernel/drivers/mxc/Kconfig
---- linux-4.1.6/drivers/mxc/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/Kconfig 2015-09-11 17:46:14.442628904 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/Kconfig linux-4.1.10/drivers/mxc/Kconfig
+--- linux-4.1.10.orig/drivers/mxc/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/Kconfig 2015-10-10 16:41:42.781314851 +0200
@@ -0,0 +1,25 @@
+# drivers/mxc/Kconfig
+
@@ -263013,9 +262477,9 @@ diff -Nur linux-4.1.6/drivers/mxc/Kconfig xbian-sources-kernel/drivers/mxc/Kconf
+endmenu
+
+endif
-diff -Nur linux-4.1.6/drivers/mxc/Makefile xbian-sources-kernel/drivers/mxc/Makefile
---- linux-4.1.6/drivers/mxc/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/Makefile 2015-09-11 17:46:14.442628904 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/Makefile linux-4.1.10/drivers/mxc/Makefile
+--- linux-4.1.10.orig/drivers/mxc/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/Makefile 2015-10-10 16:41:42.781314851 +0200
@@ -0,0 +1,8 @@
+obj-$(CONFIG_MXC_GPU_VIV) += gpu-viv/
+obj-$(CONFIG_MXC_GPU_VIV_V5) += ../gpu/galcore/
@@ -263025,9 +262489,9 @@ diff -Nur linux-4.1.6/drivers/mxc/Makefile xbian-sources-kernel/drivers/mxc/Make
+obj-$(CONFIG_MXC_HDMI_CEC) += hdmi-cec/
+obj-$(CONFIG_MXC_MIPI_CSI2) += mipi/
+obj-$(CONFIG_MXC_MLB) += mlb/
-diff -Nur linux-4.1.6/drivers/mxc/mipi/Kconfig xbian-sources-kernel/drivers/mxc/mipi/Kconfig
---- linux-4.1.6/drivers/mxc/mipi/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/mipi/Kconfig 2015-09-11 17:46:14.542622210 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/mipi/Kconfig linux-4.1.10/drivers/mxc/mipi/Kconfig
+--- linux-4.1.10.orig/drivers/mxc/mipi/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/mipi/Kconfig 2015-10-10 16:41:42.781314851 +0200
@@ -0,0 +1,14 @@
+#
+# MIPI configuration
@@ -263043,17 +262507,17 @@ diff -Nur linux-4.1.6/drivers/mxc/mipi/Kconfig xbian-sources-kernel/drivers/mxc/
+ Say Y to get the MIPI CSI2 support.
+
+endmenu
-diff -Nur linux-4.1.6/drivers/mxc/mipi/Makefile xbian-sources-kernel/drivers/mxc/mipi/Makefile
---- linux-4.1.6/drivers/mxc/mipi/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/mipi/Makefile 2015-09-11 17:46:14.542622210 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/mipi/Makefile linux-4.1.10/drivers/mxc/mipi/Makefile
+--- linux-4.1.10.orig/drivers/mxc/mipi/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/mipi/Makefile 2015-10-10 16:41:42.781314851 +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.6/drivers/mxc/mipi/mxc_mipi_csi2.c xbian-sources-kernel/drivers/mxc/mipi/mxc_mipi_csi2.c
---- linux-4.1.6/drivers/mxc/mipi/mxc_mipi_csi2.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/mipi/mxc_mipi_csi2.c 2015-09-11 17:46:14.542622210 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/mipi/mxc_mipi_csi2.c linux-4.1.10/drivers/mxc/mipi/mxc_mipi_csi2.c
+--- linux-4.1.10.orig/drivers/mxc/mipi/mxc_mipi_csi2.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/mipi/mxc_mipi_csi2.c 2015-10-10 16:41:42.781314851 +0200
@@ -0,0 +1,466 @@
+/*
+ * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -263521,9 +262985,9 @@ diff -Nur linux-4.1.6/drivers/mxc/mipi/mxc_mipi_csi2.c xbian-sources-kernel/driv
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("i.MX MIPI CSI2 driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-4.1.6/drivers/mxc/mipi/mxc_mipi_csi2.h xbian-sources-kernel/drivers/mxc/mipi/mxc_mipi_csi2.h
---- linux-4.1.6/drivers/mxc/mipi/mxc_mipi_csi2.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/mipi/mxc_mipi_csi2.h 2015-09-11 17:46:14.542622210 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/mipi/mxc_mipi_csi2.h linux-4.1.10/drivers/mxc/mipi/mxc_mipi_csi2.h
+--- linux-4.1.10.orig/drivers/mxc/mipi/mxc_mipi_csi2.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/mipi/mxc_mipi_csi2.h 2015-10-10 16:41:42.781314851 +0200
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -263567,9 +263031,9 @@ diff -Nur linux-4.1.6/drivers/mxc/mipi/mxc_mipi_csi2.h xbian-sources-kernel/driv
+};
+
+#endif
-diff -Nur linux-4.1.6/drivers/mxc/mlb/Kconfig xbian-sources-kernel/drivers/mxc/mlb/Kconfig
---- linux-4.1.6/drivers/mxc/mlb/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/mlb/Kconfig 2015-09-11 17:46:14.542622210 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/mlb/Kconfig linux-4.1.10/drivers/mxc/mlb/Kconfig
+--- linux-4.1.10.orig/drivers/mxc/mlb/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/mlb/Kconfig 2015-10-10 16:41:42.781314851 +0200
@@ -0,0 +1,17 @@
+#
+# MLB150 configuration
@@ -263588,18 +263052,18 @@ diff -Nur linux-4.1.6/drivers/mxc/mlb/Kconfig xbian-sources-kernel/drivers/mxc/m
+ Say Y to get the MLB150 support.
+
+endmenu
-diff -Nur linux-4.1.6/drivers/mxc/mlb/Makefile xbian-sources-kernel/drivers/mxc/mlb/Makefile
---- linux-4.1.6/drivers/mxc/mlb/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/mlb/Makefile 2015-09-11 17:46:14.542622210 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/mlb/Makefile linux-4.1.10/drivers/mxc/mlb/Makefile
+--- linux-4.1.10.orig/drivers/mxc/mlb/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/mlb/Makefile 2015-10-10 16:41:42.781314851 +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.6/drivers/mxc/mlb/mxc_mlb150.c xbian-sources-kernel/drivers/mxc/mlb/mxc_mlb150.c
---- linux-4.1.6/drivers/mxc/mlb/mxc_mlb150.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/mlb/mxc_mlb150.c 2015-09-11 17:46:14.542622210 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/mlb/mxc_mlb150.c linux-4.1.10/drivers/mxc/mlb/mxc_mlb150.c
+--- linux-4.1.10.orig/drivers/mxc/mlb/mxc_mlb150.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/mlb/mxc_mlb150.c 2015-10-10 16:41:42.781314851 +0200
@@ -0,0 +1,2778 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -266379,9 +265843,9 @@ diff -Nur linux-4.1.6/drivers/mxc/mlb/mxc_mlb150.c xbian-sources-kernel/drivers/
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("MLB150 low level driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-4.1.6/drivers/mxc/vpu/Kconfig xbian-sources-kernel/drivers/mxc/vpu/Kconfig
---- linux-4.1.6/drivers/mxc/vpu/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/vpu/Kconfig 2015-09-11 17:46:14.542622210 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/vpu/Kconfig linux-4.1.10/drivers/mxc/vpu/Kconfig
+--- linux-4.1.10.orig/drivers/mxc/vpu/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/vpu/Kconfig 2015-10-10 16:41:42.781314851 +0200
@@ -0,0 +1,31 @@
+#
+# Codec configuration
@@ -266414,9 +265878,9 @@ diff -Nur linux-4.1.6/drivers/mxc/vpu/Kconfig xbian-sources-kernel/drivers/mxc/v
+ This config is used for special VPU use case.
+
+endmenu
-diff -Nur linux-4.1.6/drivers/mxc/vpu/Makefile xbian-sources-kernel/drivers/mxc/vpu/Makefile
---- linux-4.1.6/drivers/mxc/vpu/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/vpu/Makefile 2015-09-11 17:46:14.542622210 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/vpu/Makefile linux-4.1.10/drivers/mxc/vpu/Makefile
+--- linux-4.1.10.orig/drivers/mxc/vpu/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/vpu/Makefile 2015-10-10 16:41:42.781314851 +0200
@@ -0,0 +1,9 @@
+#
+# Makefile for the VPU drivers.
@@ -266427,9 +265891,9 @@ diff -Nur linux-4.1.6/drivers/mxc/vpu/Makefile xbian-sources-kernel/drivers/mxc/
+ifeq ($(CONFIG_MXC_VPU_DEBUG),y)
+EXTRA_CFLAGS += -DDEBUG
+endif
-diff -Nur linux-4.1.6/drivers/mxc/vpu/mxc_vpu.c xbian-sources-kernel/drivers/mxc/vpu/mxc_vpu.c
---- linux-4.1.6/drivers/mxc/vpu/mxc_vpu.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/mxc/vpu/mxc_vpu.c 2015-09-11 17:46:14.542622210 +0200
+diff -Nur linux-4.1.10.orig/drivers/mxc/vpu/mxc_vpu.c linux-4.1.10/drivers/mxc/vpu/mxc_vpu.c
+--- linux-4.1.10.orig/drivers/mxc/vpu/mxc_vpu.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/mxc/vpu/mxc_vpu.c 2015-10-10 16:41:42.781314851 +0200
@@ -0,0 +1,1349 @@
+/*
+ * Copyright 2006-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -267780,9 +267244,9 @@ diff -Nur linux-4.1.6/drivers/mxc/vpu/mxc_vpu.c xbian-sources-kernel/drivers/mxc
+
+module_init(vpu_init);
+module_exit(vpu_exit);
-diff -Nur linux-4.1.6/drivers/net/ethernet/freescale/fec.h xbian-sources-kernel/drivers/net/ethernet/freescale/fec.h
---- linux-4.1.6/drivers/net/ethernet/freescale/fec.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/net/ethernet/freescale/fec.h 2015-09-11 17:46:14.710610964 +0200
+diff -Nur linux-4.1.10.orig/drivers/net/ethernet/freescale/fec.h linux-4.1.10/drivers/net/ethernet/freescale/fec.h
+--- linux-4.1.10.orig/drivers/net/ethernet/freescale/fec.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/net/ethernet/freescale/fec.h 2015-10-10 16:41:42.781314851 +0200
@@ -17,6 +17,7 @@
#include <linux/net_tstamp.h>
#include <linux/ptp_clock_kernel.h>
@@ -267856,9 +267320,9 @@ diff -Nur linux-4.1.6/drivers/net/ethernet/freescale/fec.h xbian-sources-kernel/
unsigned long last_overflow_check;
spinlock_t tmreg_lock;
struct cyclecounter cc;
-diff -Nur linux-4.1.6/drivers/net/ethernet/freescale/fec_main.c xbian-sources-kernel/drivers/net/ethernet/freescale/fec_main.c
---- linux-4.1.6/drivers/net/ethernet/freescale/fec_main.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/net/ethernet/freescale/fec_main.c 2015-09-11 17:46:14.710610964 +0200
+diff -Nur linux-4.1.10.orig/drivers/net/ethernet/freescale/fec_main.c linux-4.1.10/drivers/net/ethernet/freescale/fec_main.c
+--- linux-4.1.10.orig/drivers/net/ethernet/freescale/fec_main.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/net/ethernet/freescale/fec_main.c 2015-10-10 16:41:42.837314855 +0200
@@ -18,7 +18,7 @@
* Bug fixes and cleanup by Philippe De Muyter (phdm@macqel.be)
* Copyright (c) 2004-2006 Macq Electronique SA.
@@ -267896,57 +267360,7 @@ diff -Nur linux-4.1.6/drivers/net/ethernet/freescale/fec_main.c xbian-sources-ke
}, {
.name = "mvf600-fec",
.driver_data = FEC_QUIRK_ENET_MAC,
-@@ -1396,30 +1401,28 @@
- if ((status & BD_ENET_RX_LAST) == 0)
- netdev_err(ndev, "rcv is not +last\n");
-
--
- /* Check for errors. */
-- if (status & (BD_ENET_RX_LG | BD_ENET_RX_SH | BD_ENET_RX_NO |
-- BD_ENET_RX_CR | BD_ENET_RX_OV)) {
-+ if (status & BD_ENET_RX_ERROR) {
- ndev->stats.rx_errors++;
-- if (status & (BD_ENET_RX_LG | BD_ENET_RX_SH)) {
-- /* Frame too long or too short. */
-- ndev->stats.rx_length_errors++;
-- }
-- if (status & BD_ENET_RX_NO) /* Frame alignment */
-- ndev->stats.rx_frame_errors++;
-- if (status & BD_ENET_RX_CR) /* CRC Error */
-- ndev->stats.rx_crc_errors++;
-- if (status & BD_ENET_RX_OV) /* FIFO overrun */
-- ndev->stats.rx_fifo_errors++;
-- }
-
-- /* Report late collisions as a frame error.
-- * On this error, the BD is closed, but we don't know what we
-- * have in the buffer. So, just drop this frame on the floor.
-- */
-- if (status & BD_ENET_RX_CL) {
-- ndev->stats.rx_errors++;
-- ndev->stats.rx_frame_errors++;
-+ /* Report late collisions as a frame error.
-+ * On this error, the BD is closed, but we don't know what we
-+ * have in the buffer. So, just drop this frame on the floor.
-+ */
-+ if (status & BD_ENET_RX_CL) {
-+ ndev->stats.rx_frame_errors++;
-+ } else {
-+ if (status & (BD_ENET_RX_LG | BD_ENET_RX_SH)) {
-+ /* Frame too long or too short. */
-+ ndev->stats.rx_length_errors++;
-+ }
-+ if (status & BD_ENET_RX_NO) /* Frame alignment */
-+ ndev->stats.rx_frame_errors++;
-+ if (status & BD_ENET_RX_CR) /* CRC Error */
-+ ndev->stats.rx_crc_errors++;
-+ if (status & BD_ENET_RX_OV) /* FIFO overrun */
-+ ndev->stats.rx_fifo_errors++;
-+ }
- goto rx_processing_done;
- }
-
-@@ -2511,6 +2514,28 @@
+@@ -2512,6 +2517,28 @@
return 0;
}
@@ -267975,7 +267389,7 @@ diff -Nur linux-4.1.6/drivers/net/ethernet/freescale/fec_main.c xbian-sources-ke
static const struct ethtool_ops fec_enet_ethtool_ops = {
.get_settings = fec_enet_get_settings,
.set_settings = fec_enet_set_settings,
-@@ -2531,6 +2556,8 @@
+@@ -2532,6 +2559,8 @@
.set_tunable = fec_enet_set_tunable,
.get_wol = fec_enet_get_wol,
.set_wol = fec_enet_set_wol,
@@ -267984,7 +267398,7 @@ diff -Nur linux-4.1.6/drivers/net/ethernet/freescale/fec_main.c xbian-sources-ke
};
static int fec_enet_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)
-@@ -2759,10 +2786,29 @@
+@@ -2760,10 +2789,29 @@
return 0;
}
@@ -268014,7 +267428,7 @@ diff -Nur linux-4.1.6/drivers/net/ethernet/freescale/fec_main.c xbian-sources-ke
int ret;
pinctrl_pm_select_default_state(&fep->pdev->dev);
-@@ -2778,10 +2824,11 @@
+@@ -2779,10 +2827,11 @@
if (ret)
goto err_enet_alloc;
@@ -268030,7 +267444,7 @@ diff -Nur linux-4.1.6/drivers/net/ethernet/freescale/fec_main.c xbian-sources-ke
fec_restart(ndev);
napi_enable(&fep->napi);
-@@ -2791,10 +2838,19 @@
+@@ -2792,10 +2841,19 @@
device_set_wakeup_enable(&ndev->dev, fep->wol_flag &
FEC_WOL_FLAG_ENABLE);
@@ -268052,7 +267466,7 @@ diff -Nur linux-4.1.6/drivers/net/ethernet/freescale/fec_main.c xbian-sources-ke
err_enet_alloc:
fec_enet_clk_enable(ndev, false);
pinctrl_pm_select_sleep_state(&fep->pdev->dev);
-@@ -2818,7 +2874,9 @@
+@@ -2819,7 +2877,9 @@
fep->phy_dev = NULL;
fec_enet_clk_enable(ndev, false);
@@ -268062,7 +267476,7 @@ diff -Nur linux-4.1.6/drivers/net/ethernet/freescale/fec_main.c xbian-sources-ke
fec_enet_free_buffers(ndev);
return 0;
-@@ -2983,10 +3041,42 @@
+@@ -2984,10 +3044,42 @@
return 0;
}
@@ -268105,7 +267519,7 @@ diff -Nur linux-4.1.6/drivers/net/ethernet/freescale/fec_main.c xbian-sources-ke
.ndo_set_rx_mode = set_multicast_list,
.ndo_change_mtu = eth_change_mtu,
.ndo_validate_addr = eth_validate_addr,
-@@ -3300,6 +3390,7 @@
+@@ -3301,6 +3393,7 @@
fep->bufdesc_ex = false;
}
@@ -268113,7 +267527,7 @@ diff -Nur linux-4.1.6/drivers/net/ethernet/freescale/fec_main.c xbian-sources-ke
ret = fec_enet_clk_enable(ndev, true);
if (ret)
goto failed_clk;
-@@ -3348,13 +3439,17 @@
+@@ -3349,13 +3442,17 @@
/* Carrier starts down, phylib will bring it up */
netif_carrier_off(ndev);
@@ -268133,7 +267547,7 @@ diff -Nur linux-4.1.6/drivers/net/ethernet/freescale/fec_main.c xbian-sources-ke
device_init_wakeup(&ndev->dev, fep->wol_flag &
FEC_WOL_HAS_MAGIC_PACKET);
-@@ -3365,6 +3460,8 @@
+@@ -3366,6 +3463,8 @@
INIT_WORK(&fep->tx_timeout_work, fec_enet_timeout_work);
return 0;
@@ -268142,7 +267556,7 @@ diff -Nur linux-4.1.6/drivers/net/ethernet/freescale/fec_main.c xbian-sources-ke
failed_register:
fec_enet_mii_remove(fep);
failed_mii_init:
-@@ -3372,6 +3469,8 @@
+@@ -3373,6 +3472,8 @@
failed_init:
if (fep->reg_phy)
regulator_disable(fep->reg_phy);
@@ -268151,7 +267565,7 @@ diff -Nur linux-4.1.6/drivers/net/ethernet/freescale/fec_main.c xbian-sources-ke
failed_regulator:
fec_enet_clk_enable(ndev, false);
failed_clk:
-@@ -3398,6 +3497,7 @@
+@@ -3399,6 +3500,7 @@
if (fep->ptp_clock)
ptp_clock_unregister(fep->ptp_clock);
of_node_put(fep->phy_node);
@@ -268159,7 +267573,7 @@ diff -Nur linux-4.1.6/drivers/net/ethernet/freescale/fec_main.c xbian-sources-ke
free_netdev(ndev);
return 0;
-@@ -3423,6 +3523,8 @@
+@@ -3424,6 +3526,8 @@
pinctrl_pm_select_sleep_state(&fep->pdev->dev);
}
rtnl_unlock();
@@ -268168,7 +267582,7 @@ diff -Nur linux-4.1.6/drivers/net/ethernet/freescale/fec_main.c xbian-sources-ke
if (fep->reg_phy && !(fep->wol_flag & FEC_WOL_FLAG_ENABLE))
regulator_disable(fep->reg_phy);
-@@ -3451,6 +3553,7 @@
+@@ -3452,6 +3556,7 @@
}
rtnl_lock();
@@ -268176,7 +267590,7 @@ diff -Nur linux-4.1.6/drivers/net/ethernet/freescale/fec_main.c xbian-sources-ke
if (netif_running(ndev)) {
ret = fec_enet_clk_enable(ndev, true);
if (ret) {
-@@ -3484,7 +3587,22 @@
+@@ -3485,7 +3590,22 @@
return ret;
}
@@ -268200,9 +267614,9 @@ diff -Nur linux-4.1.6/drivers/net/ethernet/freescale/fec_main.c xbian-sources-ke
static struct platform_driver fec_driver = {
.driver = {
-diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
---- linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c 2015-09-11 17:46:15.290572138 +0200
+diff -Nur linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+--- linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c 2015-10-10 16:41:42.841314855 +0200
@@ -33,6 +33,7 @@
#include <linux/suspend.h>
#include <linux/errno.h>
@@ -268300,9 +267714,9 @@ diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c xbian-sou
return 0;
}
-diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
---- linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c 2015-09-11 17:46:15.290572138 +0200
+diff -Nur linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
+--- linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c 2015-10-10 16:41:42.845314853 +0200
@@ -52,8 +52,6 @@
#define BRCMF_PNO_SCAN_COMPLETE 1
#define BRCMF_PNO_SCAN_INCOMPLETE 0
@@ -268982,9 +268396,9 @@ diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c xbian-s
wl_deinit_priv(cfg);
brcmf_free_wiphy(cfg->wiphy);
}
-diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/chip.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/chip.c
---- linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/chip.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/chip.c 2015-09-11 17:46:15.290572138 +0200
+diff -Nur linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/chip.c linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/chip.c
+--- linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/chip.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/chip.c 2015-10-10 16:41:42.845314853 +0200
@@ -649,6 +649,7 @@
case BRCM_CC_43567_CHIP_ID:
case BRCM_CC_43569_CHIP_ID:
@@ -268993,9 +268407,9 @@ diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/chip.c xbian-sourc
case BRCM_CC_43602_CHIP_ID:
return 0x180000;
default:
-diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/commonring.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/commonring.c
---- linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/commonring.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/commonring.c 2015-09-11 17:46:15.290572138 +0200
+diff -Nur linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/commonring.c linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/commonring.c
+--- linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/commonring.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/commonring.c 2015-10-10 16:41:42.845314853 +0200
@@ -22,17 +22,6 @@
#include "core.h"
#include "commonring.h"
@@ -269068,9 +268482,9 @@ diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/commonring.c xbian
if (commonring->cr_write_rptr)
return commonring->cr_write_rptr(commonring->cr_ctx);
-diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/commonring.h xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/commonring.h
---- linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/commonring.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/commonring.h 2015-09-11 17:46:15.290572138 +0200
+diff -Nur linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/commonring.h linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/commonring.h
+--- linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/commonring.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/commonring.h 2015-10-10 16:41:42.845314853 +0200
@@ -62,7 +62,8 @@
u16 n_items);
void *brcmf_commonring_get_read_ptr(struct brcmf_commonring *commonring,
@@ -269081,9 +268495,9 @@ diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/commonring.h xbian
#define brcmf_commonring_n_items(commonring) (commonring->depth)
#define brcmf_commonring_len_item(commonring) (commonring->item_len)
-diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/core.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/core.c
---- linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/core.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/core.c 2015-09-11 17:46:15.290572138 +0200
+diff -Nur linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/core.c linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/core.c
+--- linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/core.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/core.c 2015-10-10 16:41:42.845314853 +0200
@@ -867,8 +867,6 @@
}
/* unregister will take care of freeing it */
@@ -269102,9 +268516,9 @@ diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/core.c xbian-sourc
brcmf_bus_change_state(bus_if, BRCMF_BUS_DOWN);
-diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/debug.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/debug.c
---- linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/debug.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/debug.c 2015-09-11 17:46:15.290572138 +0200
+diff -Nur linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/debug.c linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/debug.c
+--- linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/debug.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/debug.c 2015-10-10 16:41:42.845314853 +0200
@@ -41,15 +41,6 @@
root_folder = NULL;
}
@@ -269178,9 +268592,9 @@ diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/debug.c xbian-sour
+ drvr->dbgfs_dir, read_fn);
+ return PTR_ERR_OR_ZERO(e);
}
-diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/feature.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/feature.c
---- linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/feature.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/feature.c 2015-09-11 17:46:15.290572138 +0200
+diff -Nur linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/feature.c linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/feature.c
+--- linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/feature.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/feature.c 2015-10-10 16:41:42.845314853 +0200
@@ -124,10 +124,12 @@
struct brcmf_if *ifp = drvr->iflist[0];
@@ -269194,9 +268608,9 @@ diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/feature.c xbian-so
/* set chip related quirks */
switch (drvr->bus_if->chip) {
-diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/feature.h xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/feature.h
---- linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/feature.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/feature.h 2015-09-11 17:46:15.290572138 +0200
+diff -Nur linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/feature.h linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/feature.h
+--- linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/feature.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/feature.h 2015-10-10 16:41:42.845314853 +0200
@@ -19,12 +19,18 @@
/*
* Features:
@@ -269217,9 +268631,9 @@ diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/feature.h xbian-so
/*
* Quirks:
*
-diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/firmware.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/firmware.c
---- linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/firmware.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/firmware.c 2015-09-11 17:46:15.290572138 +0200
+diff -Nur linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/firmware.c linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/firmware.c
+--- linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/firmware.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/firmware.c 2015-10-10 16:41:42.845314853 +0200
@@ -23,6 +23,10 @@
#include "debug.h"
#include "firmware.h"
@@ -269612,9 +269026,9 @@ diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/firmware.c xbian-s
+ 0);
+}
+
-diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/firmware.h xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/firmware.h
---- linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/firmware.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/firmware.h 2015-09-11 17:46:15.290572138 +0200
+diff -Nur linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/firmware.h linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/firmware.h
+--- linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/firmware.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/firmware.h 2015-10-10 16:41:42.845314853 +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.
@@ -269628,9 +269042,9 @@ diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/firmware.h xbian-s
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.6/drivers/net/wireless/brcm80211/brcmfmac/flowring.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/flowring.c
---- linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/flowring.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/flowring.c 2015-09-11 17:46:15.290572138 +0200
+diff -Nur linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/flowring.c linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/flowring.c
+--- linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/flowring.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/flowring.c 2015-10-10 16:41:42.845314853 +0200
@@ -249,8 +249,8 @@
}
@@ -269650,9 +269064,9 @@ diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/flowring.c xbian-s
}
-diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/flowring.h xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/flowring.h
---- linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/flowring.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/flowring.h 2015-09-11 17:46:15.290572138 +0200
+diff -Nur linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/flowring.h linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/flowring.h
+--- linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/flowring.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/flowring.h 2015-10-10 16:41:42.845314853 +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);
@@ -269664,9 +269078,9 @@ diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/flowring.h xbian-s
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.6/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h
---- linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h 2015-09-11 17:46:15.294571871 +0200
+diff -Nur linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h
+--- linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h 2015-10-10 16:41:42.845314853 +0200
@@ -32,7 +32,11 @@
#define BRCMF_BSS_INFO_VERSION 109 /* curr ver of brcmf_bss_info_le struct */
#define BRCMF_BSS_RSSI_ON_CHANNEL 0x0002
@@ -269768,9 +269182,9 @@ diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h xbian
};
struct brcmf_chanspec_list {
-diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
---- linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c 2015-09-11 17:46:15.294571871 +0200
+diff -Nur linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
+--- linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c 2015-10-10 16:41:42.845314853 +0200
@@ -635,7 +635,7 @@
return 0;
}
@@ -269780,9 +269194,9 @@ diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c xbian-s
u32 slot_id, struct sk_buff **pktout,
bool remove_item)
{
-diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c
---- linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c 2015-09-11 17:46:15.294571871 +0200
+diff -Nur linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c
+--- linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c 2015-10-10 16:41:42.845314853 +0200
@@ -73,8 +73,10 @@
#define BRCMF_MSGBUF_TX_FLUSH_CNT1 32
#define BRCMF_MSGBUF_TX_FLUSH_CNT2 96
@@ -269870,9 +269284,9 @@ diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c xbian-sou
if (commonring->r_ptr == 0)
goto again;
-diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/of.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/of.c
---- linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/of.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/of.c 2015-09-11 17:46:15.294571871 +0200
+diff -Nur linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/of.c linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/of.c
+--- linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/of.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/of.c 2015-10-10 16:41:42.845314853 +0200
@@ -39,10 +39,16 @@
if (!sdiodev->pdata)
return;
@@ -269899,9 +269313,9 @@ diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/of.c xbian-sources
- if (of_property_read_u32(np, "brcm,drive-strength", &val) == 0)
- sdiodev->pdata->drive_strength = val;
}
-diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/p2p.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
---- linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/p2p.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/p2p.c 2015-09-11 17:46:15.294571871 +0200
+diff -Nur linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/p2p.c linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
+--- linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/p2p.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/p2p.c 2015-10-10 16:41:42.849314851 +0200
@@ -16,6 +16,7 @@
#include <linux/slab.h>
#include <linux/netdevice.h>
@@ -270137,9 +269551,9 @@ diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/p2p.c xbian-source
+ memset(p2p, 0, sizeof(*p2p));
+}
+
-diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/pcie.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
---- linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/pcie.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/pcie.c 2015-09-11 17:46:15.294571871 +0200
+diff -Nur linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/pcie.c linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
+--- linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/pcie.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/pcie.c 2015-10-10 16:41:42.849314851 +0200
@@ -51,6 +51,8 @@
#define BRCMF_PCIE_4356_NVRAM_NAME "brcm/brcmfmac4356-pcie.txt"
#define BRCMF_PCIE_43570_FW_NAME "brcm/brcmfmac43570-pcie.bin"
@@ -270542,9 +269956,9 @@ diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/pcie.c xbian-sourc
{ /* end: all zeroes */ }
};
-diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/sdio.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
---- linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/sdio.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/sdio.c 2015-09-11 17:46:15.294571871 +0200
+diff -Nur linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio.c linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
+--- linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/sdio.c 2015-10-10 16:41:42.849314851 +0200
@@ -601,6 +601,8 @@
#define BCM43241B0_NVRAM_NAME "brcm/brcmfmac43241b0-sdio.txt"
#define BCM43241B4_FIRMWARE_NAME "brcm/brcmfmac43241b4-sdio.bin"
@@ -270611,9 +270025,9 @@ diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/sdio.c xbian-sourc
/* Count the interrupt call */
bus->sdcnt.intrcount++;
if (in_interrupt())
-diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/usb.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/usb.c
---- linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2015-09-11 17:46:15.294571871 +0200
+diff -Nur linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/usb.c linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+--- linux-4.1.10.orig/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2015-10-10 16:41:42.849314851 +0200
@@ -1270,8 +1270,13 @@
bus->chiprev = bus_pub->chiprev;
@@ -270630,9 +270044,9 @@ diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/brcmfmac/usb.c xbian-source
return 0;
fail:
-diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h xbian-sources-kernel/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
---- linux-4.1.6/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h 2015-09-11 17:46:15.342568658 +0200
+diff -Nur linux-4.1.10.orig/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h linux-4.1.10/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
+--- linux-4.1.10.orig/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h 2015-10-10 16:41:42.849314851 +0200
@@ -45,6 +45,7 @@
#define BRCM_CC_43567_CHIP_ID 43567
#define BRCM_CC_43569_CHIP_ID 43569
@@ -270653,9 +270067,9 @@ diff -Nur linux-4.1.6/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h xbian
/* brcmsmac IDs */
#define BCM4313_D11N2G_ID 0x4727 /* 4313 802.11n 2.4G device */
-diff -Nur linux-4.1.6/drivers/power/reset/Kconfig xbian-sources-kernel/drivers/power/reset/Kconfig
---- linux-4.1.6/drivers/power/reset/Kconfig 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/power/reset/Kconfig 2015-09-11 17:46:15.862533850 +0200
+diff -Nur linux-4.1.10.orig/drivers/power/reset/Kconfig linux-4.1.10/drivers/power/reset/Kconfig
+--- linux-4.1.10.orig/drivers/power/reset/Kconfig 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/power/reset/Kconfig 2015-10-10 16:41:42.849314851 +0200
@@ -124,6 +124,14 @@
Power off and restart support for ARM Versatile family of
reference boards.
@@ -270671,9 +270085,9 @@ diff -Nur linux-4.1.6/drivers/power/reset/Kconfig xbian-sources-kernel/drivers/p
config POWER_RESET_VEXPRESS
bool "ARM Versatile Express power-off and reset driver"
depends on ARM || ARM64
-diff -Nur linux-4.1.6/drivers/power/reset/Makefile xbian-sources-kernel/drivers/power/reset/Makefile
---- linux-4.1.6/drivers/power/reset/Makefile 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/power/reset/Makefile 2015-09-11 17:46:15.862533850 +0200
+diff -Nur linux-4.1.10.orig/drivers/power/reset/Makefile linux-4.1.10/drivers/power/reset/Makefile
+--- linux-4.1.10.orig/drivers/power/reset/Makefile 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/power/reset/Makefile 2015-10-10 16:41:42.849314851 +0200
@@ -13,6 +13,7 @@
obj-$(CONFIG_POWER_RESET_RESTART) += restart-poweroff.o
obj-$(CONFIG_POWER_RESET_ST) += st-poweroff.o
@@ -270682,9 +270096,9 @@ diff -Nur linux-4.1.6/drivers/power/reset/Makefile xbian-sources-kernel/drivers/
obj-$(CONFIG_POWER_RESET_VEXPRESS) += vexpress-poweroff.o
obj-$(CONFIG_POWER_RESET_XGENE) += xgene-reboot.o
obj-$(CONFIG_POWER_RESET_KEYSTONE) += keystone-reset.o
-diff -Nur linux-4.1.6/drivers/power/reset/snvs-poweroff.c xbian-sources-kernel/drivers/power/reset/snvs-poweroff.c
---- linux-4.1.6/drivers/power/reset/snvs-poweroff.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/power/reset/snvs-poweroff.c 2015-09-11 17:46:15.862533850 +0200
+diff -Nur linux-4.1.10.orig/drivers/power/reset/snvs-poweroff.c linux-4.1.10/drivers/power/reset/snvs-poweroff.c
+--- linux-4.1.10.orig/drivers/power/reset/snvs-poweroff.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/power/reset/snvs-poweroff.c 2015-10-10 16:41:42.849314851 +0200
@@ -0,0 +1,59 @@
+/*
+ * Power off by restarting and let u-boot keep hold of the machine
@@ -270745,9 +270159,9 @@ diff -Nur linux-4.1.6/drivers/power/reset/snvs-poweroff.c xbian-sources-kernel/d
+ },
+};
+module_platform_driver(snvs_poweroff_driver);
-diff -Nur linux-4.1.6/drivers/rtc/rtc-snvs.c xbian-sources-kernel/drivers/rtc/rtc-snvs.c
---- linux-4.1.6/drivers/rtc/rtc-snvs.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/rtc/rtc-snvs.c 2015-09-11 17:46:15.966526887 +0200
+diff -Nur linux-4.1.10.orig/drivers/rtc/rtc-snvs.c linux-4.1.10/drivers/rtc/rtc-snvs.c
+--- linux-4.1.10.orig/drivers/rtc/rtc-snvs.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/rtc/rtc-snvs.c 2015-10-10 16:41:42.849314851 +0200
@@ -43,6 +43,10 @@
struct clk *clk;
};
@@ -270775,9 +270189,9 @@ diff -Nur linux-4.1.6/drivers/rtc/rtc-snvs.c xbian-sources-kernel/drivers/rtc/rt
static int snvs_rtc_probe(struct platform_device *pdev)
{
struct snvs_rtc_data *data;
-diff -Nur linux-4.1.6/drivers/spi/spi-imx.c xbian-sources-kernel/drivers/spi/spi-imx.c
---- linux-4.1.6/drivers/spi/spi-imx.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/spi/spi-imx.c 2015-09-11 17:46:16.518489938 +0200
+diff -Nur linux-4.1.10.orig/drivers/spi/spi-imx.c linux-4.1.10/drivers/spi/spi-imx.c
+--- linux-4.1.10.orig/drivers/spi/spi-imx.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/spi/spi-imx.c 2015-10-10 16:41:42.849314851 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -271127,9 +270541,9 @@ diff -Nur linux-4.1.6/drivers/spi/spi-imx.c xbian-sources-kernel/drivers/spi/spi
dev_info(&pdev->dev, "probed\n");
clk_disable(spi_imx->clk_ipg);
-diff -Nur linux-4.1.6/drivers/video/fbdev/core/fbmem.c xbian-sources-kernel/drivers/video/fbdev/core/fbmem.c
---- linux-4.1.6/drivers/video/fbdev/core/fbmem.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/video/fbdev/core/fbmem.c 2015-09-11 17:46:17.302437457 +0200
+diff -Nur linux-4.1.10.orig/drivers/video/fbdev/core/fbmem.c linux-4.1.10/drivers/video/fbdev/core/fbmem.c
+--- linux-4.1.10.orig/drivers/video/fbdev/core/fbmem.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/video/fbdev/core/fbmem.c 2015-10-10 16:41:42.849314851 +0200
@@ -1033,12 +1033,13 @@
!list_empty(&info->modelist))
ret = fb_add_videomode(&mode, &info->modelist);
@@ -271145,9 +270559,9 @@ diff -Nur linux-4.1.6/drivers/video/fbdev/core/fbmem.c xbian-sources-kernel/driv
info->flags &= ~FBINFO_MISC_USEREVENT;
event.info = info;
event.data = &mode;
-diff -Nur linux-4.1.6/drivers/video/fbdev/core/fbmon.c xbian-sources-kernel/drivers/video/fbdev/core/fbmon.c
---- linux-4.1.6/drivers/video/fbdev/core/fbmon.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/video/fbdev/core/fbmon.c 2015-09-11 17:46:17.302437457 +0200
+diff -Nur linux-4.1.10.orig/drivers/video/fbdev/core/fbmon.c linux-4.1.10/drivers/video/fbdev/core/fbmon.c
+--- linux-4.1.10.orig/drivers/video/fbdev/core/fbmon.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/video/fbdev/core/fbmon.c 2015-10-10 16:41:42.849314851 +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)
@@ -271190,9 +270604,9 @@ diff -Nur linux-4.1.6/drivers/video/fbdev/core/fbmon.c xbian-sources-kernel/driv
if (i < DMT_SIZE && dmt_modes[i].mode) {
/* DMT mode found */
*mode = *dmt_modes[i].mode;
-diff -Nur linux-4.1.6/drivers/video/fbdev/core/fbsysfs.c xbian-sources-kernel/drivers/video/fbdev/core/fbsysfs.c
---- linux-4.1.6/drivers/video/fbdev/core/fbsysfs.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/video/fbdev/core/fbsysfs.c 2015-09-11 17:46:17.302437457 +0200
+diff -Nur linux-4.1.10.orig/drivers/video/fbdev/core/fbsysfs.c linux-4.1.10/drivers/video/fbdev/core/fbsysfs.c
+--- linux-4.1.10.orig/drivers/video/fbdev/core/fbsysfs.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/video/fbdev/core/fbsysfs.c 2015-10-10 16:41:42.849314851 +0200
@@ -20,6 +20,7 @@
#include <linux/fb.h>
#include <linux/console.h>
@@ -271217,9 +270631,9 @@ diff -Nur linux-4.1.6/drivers/video/fbdev/core/fbsysfs.c xbian-sources-kernel/dr
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.6/drivers/video/fbdev/core/modedb.c xbian-sources-kernel/drivers/video/fbdev/core/modedb.c
---- linux-4.1.6/drivers/video/fbdev/core/modedb.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/video/fbdev/core/modedb.c 2015-09-11 17:46:17.302437457 +0200
+diff -Nur linux-4.1.10.orig/drivers/video/fbdev/core/modedb.c linux-4.1.10/drivers/video/fbdev/core/modedb.c
+--- linux-4.1.10.orig/drivers/video/fbdev/core/modedb.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/video/fbdev/core/modedb.c 2015-10-10 16:41:42.853314849 +0200
@@ -1111,7 +1111,7 @@
modelist->mode = *mode;
list_add(&modelist->list, head);
@@ -271238,9 +270652,9 @@ diff -Nur linux-4.1.6/drivers/video/fbdev/core/modedb.c xbian-sources-kernel/dri
return;
}
}
-diff -Nur linux-4.1.6/drivers/video/Kconfig xbian-sources-kernel/drivers/video/Kconfig
---- linux-4.1.6/drivers/video/Kconfig 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/video/Kconfig 2015-09-11 17:46:17.278439064 +0200
+diff -Nur linux-4.1.10.orig/drivers/video/Kconfig linux-4.1.10/drivers/video/Kconfig
+--- linux-4.1.10.orig/drivers/video/Kconfig 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/video/Kconfig 2015-10-10 16:41:42.853314849 +0200
@@ -30,6 +30,8 @@
source "drivers/video/fbdev/Kconfig"
endmenu
@@ -271250,9 +270664,9 @@ diff -Nur linux-4.1.6/drivers/video/Kconfig xbian-sources-kernel/drivers/video/K
source "drivers/video/backlight/Kconfig"
config VGASTATE
-diff -Nur linux-4.1.6/drivers/video/Makefile xbian-sources-kernel/drivers/video/Makefile
---- linux-4.1.6/drivers/video/Makefile 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/drivers/video/Makefile 2015-09-11 17:46:17.278439064 +0200
+diff -Nur linux-4.1.10.orig/drivers/video/Makefile linux-4.1.10/drivers/video/Makefile
+--- linux-4.1.10.orig/drivers/video/Makefile 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/drivers/video/Makefile 2015-10-10 16:41:42.853314849 +0200
@@ -6,6 +6,7 @@
obj-y += backlight/
@@ -271261,9 +270675,9 @@ diff -Nur linux-4.1.6/drivers/video/Makefile xbian-sources-kernel/drivers/video/
obj-$(CONFIG_VIDEOMODE_HELPERS) += display_timing.o videomode.o
ifeq ($(CONFIG_OF),y)
-diff -Nur linux-4.1.6/drivers/video/mxc/crtc.h xbian-sources-kernel/drivers/video/mxc/crtc.h
---- linux-4.1.6/drivers/video/mxc/crtc.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/video/mxc/crtc.h 2015-09-11 17:46:17.374432638 +0200
+diff -Nur linux-4.1.10.orig/drivers/video/mxc/crtc.h linux-4.1.10/drivers/video/mxc/crtc.h
+--- linux-4.1.10.orig/drivers/video/mxc/crtc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/video/mxc/crtc.h 2015-10-10 16:41:42.853314849 +0200
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -271322,9 +270736,9 @@ diff -Nur linux-4.1.6/drivers/video/mxc/crtc.h xbian-sources-kernel/drivers/vide
+}
+
+#endif
-diff -Nur linux-4.1.6/drivers/video/mxc/Kconfig xbian-sources-kernel/drivers/video/mxc/Kconfig
---- linux-4.1.6/drivers/video/mxc/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/video/mxc/Kconfig 2015-09-11 17:46:17.374432638 +0200
+diff -Nur linux-4.1.10.orig/drivers/video/mxc/Kconfig linux-4.1.10/drivers/video/mxc/Kconfig
+--- linux-4.1.10.orig/drivers/video/mxc/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/video/mxc/Kconfig 2015-10-10 16:41:42.853314849 +0200
@@ -0,0 +1,56 @@
+config FB_MXC
+ tristate "MXC Framebuffer support"
@@ -271382,9 +270796,9 @@ diff -Nur linux-4.1.6/drivers/video/mxc/Kconfig xbian-sources-kernel/drivers/vid
+ depends on FB_MXC && I2C
+ tristate "MXC EDID support"
+ default y
-diff -Nur linux-4.1.6/drivers/video/mxc/ldb.c xbian-sources-kernel/drivers/video/mxc/ldb.c
---- linux-4.1.6/drivers/video/mxc/ldb.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/video/mxc/ldb.c 2015-09-11 17:46:17.374432638 +0200
+diff -Nur linux-4.1.10.orig/drivers/video/mxc/ldb.c linux-4.1.10/drivers/video/mxc/ldb.c
+--- linux-4.1.10.orig/drivers/video/mxc/ldb.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/video/mxc/ldb.c 2015-10-10 16:41:42.853314849 +0200
@@ -0,0 +1,887 @@
+/*
+ * Copyright (C) 2012-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -272273,9 +271687,9 @@ diff -Nur linux-4.1.6/drivers/video/mxc/ldb.c xbian-sources-kernel/drivers/video
+MODULE_DESCRIPTION("LDB driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:" DRIVER_NAME);
-diff -Nur linux-4.1.6/drivers/video/mxc/Makefile xbian-sources-kernel/drivers/video/mxc/Makefile
---- linux-4.1.6/drivers/video/mxc/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/video/mxc/Makefile 2015-09-11 17:46:17.374432638 +0200
+diff -Nur linux-4.1.10.orig/drivers/video/mxc/Makefile linux-4.1.10/drivers/video/mxc/Makefile
+--- linux-4.1.10.orig/drivers/video/mxc/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/video/mxc/Makefile 2015-10-10 16:41:42.853314849 +0200
@@ -0,0 +1,7 @@
+obj-$(CONFIG_FB_MXC_LDB) += ldb.o
+obj-$(CONFIG_FB_MXC_MIPI_DSI) += mipi_dsi.o
@@ -272284,9 +271698,9 @@ diff -Nur linux-4.1.6/drivers/video/mxc/Makefile xbian-sources-kernel/drivers/vi
+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.6/drivers/video/mxc/mipi_dsi.c xbian-sources-kernel/drivers/video/mxc/mipi_dsi.c
---- linux-4.1.6/drivers/video/mxc/mipi_dsi.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/video/mxc/mipi_dsi.c 2015-09-11 17:46:17.374432638 +0200
+diff -Nur linux-4.1.10.orig/drivers/video/mxc/mipi_dsi.c linux-4.1.10/drivers/video/mxc/mipi_dsi.c
+--- linux-4.1.10.orig/drivers/video/mxc/mipi_dsi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/video/mxc/mipi_dsi.c 2015-10-10 16:41:42.853314849 +0200
@@ -0,0 +1,989 @@
+/*
+ * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -273277,9 +272691,9 @@ diff -Nur linux-4.1.6/drivers/video/mxc/mipi_dsi.c xbian-sources-kernel/drivers/
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("i.MX MIPI DSI driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-4.1.6/drivers/video/mxc/mipi_dsi.h xbian-sources-kernel/drivers/video/mxc/mipi_dsi.h
---- linux-4.1.6/drivers/video/mxc/mipi_dsi.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/video/mxc/mipi_dsi.h 2015-09-11 17:46:17.374432638 +0200
+diff -Nur linux-4.1.10.orig/drivers/video/mxc/mipi_dsi.h linux-4.1.10/drivers/video/mxc/mipi_dsi.h
+--- linux-4.1.10.orig/drivers/video/mxc/mipi_dsi.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/video/mxc/mipi_dsi.h 2015-10-10 16:41:42.853314849 +0200
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -273394,9 +272808,9 @@ diff -Nur linux-4.1.6/drivers/video/mxc/mipi_dsi.h xbian-sources-kernel/drivers/
+#endif
+
+#endif
-diff -Nur linux-4.1.6/drivers/video/mxc/mxc_dcic.c xbian-sources-kernel/drivers/video/mxc/mxc_dcic.c
---- linux-4.1.6/drivers/video/mxc/mxc_dcic.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/video/mxc/mxc_dcic.c 2015-09-11 17:46:17.374432638 +0200
+diff -Nur linux-4.1.10.orig/drivers/video/mxc/mxc_dcic.c linux-4.1.10/drivers/video/mxc/mxc_dcic.c
+--- linux-4.1.10.orig/drivers/video/mxc/mxc_dcic.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/video/mxc/mxc_dcic.c 2015-10-10 16:41:42.853314849 +0200
@@ -0,0 +1,663 @@
+/*
+ * Copyright (C) 2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -274061,9 +273475,9 @@ diff -Nur linux-4.1.6/drivers/video/mxc/mxc_dcic.c xbian-sources-kernel/drivers/
+MODULE_DESCRIPTION("MXC DCIC driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:" DRIVER_NAME);
-diff -Nur linux-4.1.6/drivers/video/mxc/mxc_dispdrv.c xbian-sources-kernel/drivers/video/mxc/mxc_dispdrv.c
---- linux-4.1.6/drivers/video/mxc/mxc_dispdrv.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/video/mxc/mxc_dispdrv.c 2015-09-11 17:46:17.374432638 +0200
+diff -Nur linux-4.1.10.orig/drivers/video/mxc/mxc_dispdrv.c linux-4.1.10/drivers/video/mxc/mxc_dispdrv.c
+--- linux-4.1.10.orig/drivers/video/mxc/mxc_dispdrv.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/video/mxc/mxc_dispdrv.c 2015-10-10 16:41:42.853314849 +0200
@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -274213,9 +273627,9 @@ diff -Nur linux-4.1.6/drivers/video/mxc/mxc_dispdrv.c xbian-sources-kernel/drive
+ return ERR_PTR(-EINVAL);
+}
+EXPORT_SYMBOL_GPL(mxc_dispdrv_getdata);
-diff -Nur linux-4.1.6/drivers/video/mxc/mxc_dispdrv.h xbian-sources-kernel/drivers/video/mxc/mxc_dispdrv.h
---- linux-4.1.6/drivers/video/mxc/mxc_dispdrv.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/video/mxc/mxc_dispdrv.h 2015-09-11 17:46:17.374432638 +0200
+diff -Nur linux-4.1.10.orig/drivers/video/mxc/mxc_dispdrv.h linux-4.1.10/drivers/video/mxc/mxc_dispdrv.h
+--- linux-4.1.10.orig/drivers/video/mxc/mxc_dispdrv.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/video/mxc/mxc_dispdrv.h 2015-10-10 16:41:42.853314849 +0200
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -274269,9 +273683,9 @@ diff -Nur linux-4.1.6/drivers/video/mxc/mxc_dispdrv.h xbian-sources-kernel/drive
+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.6/drivers/video/mxc/mxc_edid.c xbian-sources-kernel/drivers/video/mxc/mxc_edid.c
---- linux-4.1.6/drivers/video/mxc/mxc_edid.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/video/mxc/mxc_edid.c 2015-09-11 17:46:17.374432638 +0200
+diff -Nur linux-4.1.10.orig/drivers/video/mxc/mxc_edid.c linux-4.1.10/drivers/video/mxc/mxc_edid.c
+--- linux-4.1.10.orig/drivers/video/mxc/mxc_edid.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/video/mxc/mxc_edid.c 2015-10-10 16:41:42.853314849 +0200
@@ -0,0 +1,843 @@
+/*
+ * Copyright 2009-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -275116,9 +274530,9 @@ diff -Nur linux-4.1.6/drivers/video/mxc/mxc_edid.c xbian-sources-kernel/drivers/
+ return best;
+}
+EXPORT_SYMBOL(mxc_fb_find_nearest_mode);
-diff -Nur linux-4.1.6/drivers/video/mxc/mxcfb_hx8369_wvga.c xbian-sources-kernel/drivers/video/mxc/mxcfb_hx8369_wvga.c
---- linux-4.1.6/drivers/video/mxc/mxcfb_hx8369_wvga.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/video/mxc/mxcfb_hx8369_wvga.c 2015-09-11 17:46:17.374432638 +0200
+diff -Nur linux-4.1.10.orig/drivers/video/mxc/mxcfb_hx8369_wvga.c linux-4.1.10/drivers/video/mxc/mxcfb_hx8369_wvga.c
+--- linux-4.1.10.orig/drivers/video/mxc/mxcfb_hx8369_wvga.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/video/mxc/mxcfb_hx8369_wvga.c 2015-10-10 16:41:42.853314849 +0200
@@ -0,0 +1,449 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -275569,9 +274983,9 @@ diff -Nur linux-4.1.6/drivers/video/mxc/mxcfb_hx8369_wvga.c xbian-sources-kernel
+ mipid_bl_update_status(bl);
+ return 0;
+}
-diff -Nur linux-4.1.6/drivers/video/mxc/mxc_hdmi.c xbian-sources-kernel/drivers/video/mxc/mxc_hdmi.c
---- linux-4.1.6/drivers/video/mxc/mxc_hdmi.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/video/mxc/mxc_hdmi.c 2015-09-11 17:46:17.374432638 +0200
+diff -Nur linux-4.1.10.orig/drivers/video/mxc/mxc_hdmi.c linux-4.1.10/drivers/video/mxc/mxc_hdmi.c
+--- linux-4.1.10.orig/drivers/video/mxc/mxc_hdmi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/video/mxc/mxc_hdmi.c 2015-10-10 16:41:42.857314850 +0200
@@ -0,0 +1,3509 @@
+/*
+ * Copyright (C) 2011-2014 Freescale Semiconductor, Inc.
@@ -279082,9 +278496,9 @@ diff -Nur linux-4.1.6/drivers/video/mxc/mxc_hdmi.c xbian-sources-kernel/drivers/
+module_exit(mxc_hdmi_i2c_exit);
+
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
-diff -Nur linux-4.1.6/drivers/video/mxc/mxc_ipuv3_fb.c xbian-sources-kernel/drivers/video/mxc/mxc_ipuv3_fb.c
---- linux-4.1.6/drivers/video/mxc/mxc_ipuv3_fb.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/video/mxc/mxc_ipuv3_fb.c 2015-09-11 17:46:17.374432638 +0200
+diff -Nur linux-4.1.10.orig/drivers/video/mxc/mxc_ipuv3_fb.c linux-4.1.10/drivers/video/mxc/mxc_ipuv3_fb.c
+--- linux-4.1.10.orig/drivers/video/mxc/mxc_ipuv3_fb.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/video/mxc/mxc_ipuv3_fb.c 2015-10-10 16:41:42.857314850 +0200
@@ -0,0 +1,2587 @@
+/*
+ * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -281673,9 +281087,9 @@ diff -Nur linux-4.1.6/drivers/video/mxc/mxc_ipuv3_fb.c xbian-sources-kernel/driv
+MODULE_DESCRIPTION("MXC framebuffer driver");
+MODULE_LICENSE("GPL");
+MODULE_SUPPORTED_DEVICE("fb");
-diff -Nur linux-4.1.6/drivers/video/mxc/mxc_lcdif.c xbian-sources-kernel/drivers/video/mxc/mxc_lcdif.c
---- linux-4.1.6/drivers/video/mxc/mxc_lcdif.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/drivers/video/mxc/mxc_lcdif.c 2015-09-11 17:46:17.374432638 +0200
+diff -Nur linux-4.1.10.orig/drivers/video/mxc/mxc_lcdif.c linux-4.1.10/drivers/video/mxc/mxc_lcdif.c
+--- linux-4.1.10.orig/drivers/video/mxc/mxc_lcdif.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/drivers/video/mxc/mxc_lcdif.c 2015-10-10 16:41:42.857314850 +0200
@@ -0,0 +1,243 @@
+/*
+ * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -281920,9 +281334,9 @@ diff -Nur linux-4.1.6/drivers/video/mxc/mxc_lcdif.c xbian-sources-kernel/drivers
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("i.MX ipuv3 LCD extern port driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-4.1.6/firmware/imx/sdma/sdma-imx6q.bin.ihex xbian-sources-kernel/firmware/imx/sdma/sdma-imx6q.bin.ihex
---- linux-4.1.6/firmware/imx/sdma/sdma-imx6q.bin.ihex 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/firmware/imx/sdma/sdma-imx6q.bin.ihex 2015-09-11 17:46:17.482425407 +0200
+diff -Nur linux-4.1.10.orig/firmware/imx/sdma/sdma-imx6q.bin.ihex linux-4.1.10/firmware/imx/sdma/sdma-imx6q.bin.ihex
+--- linux-4.1.10.orig/firmware/imx/sdma/sdma-imx6q.bin.ihex 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/firmware/imx/sdma/sdma-imx6q.bin.ihex 2015-10-10 16:41:42.857314850 +0200
@@ -0,0 +1,116 @@
+:1000000053444D4101000000010000001C000000AD
+:1000100026000000B40000007A0600008202000002
@@ -282040,9 +281454,9 @@ diff -Nur linux-4.1.6/firmware/imx/sdma/sdma-imx6q.bin.ihex xbian-sources-kernel
+:10071000DD6F087FD169010FC86FDD6F037F0101B5
+:0E0720000004129B0700FF680C680002129B89
+:00000001FF
-diff -Nur linux-4.1.6/firmware/Makefile xbian-sources-kernel/firmware/Makefile
---- linux-4.1.6/firmware/Makefile 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/firmware/Makefile 2015-09-11 17:46:17.430428888 +0200
+diff -Nur linux-4.1.10.orig/firmware/Makefile linux-4.1.10/firmware/Makefile
+--- linux-4.1.10.orig/firmware/Makefile 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/firmware/Makefile 2015-10-10 16:41:42.857314850 +0200
@@ -62,6 +62,7 @@
radeon/RV730_pfp.bin radeon/RV730_me.bin \
radeon/RV710_pfp.bin radeon/RV710_me.bin
@@ -282051,9 +281465,9 @@ diff -Nur linux-4.1.6/firmware/Makefile xbian-sources-kernel/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.6/fs/btrfs/compression.c xbian-sources-kernel/fs/btrfs/compression.c
---- linux-4.1.6/fs/btrfs/compression.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/fs/btrfs/compression.c 2015-09-11 17:46:17.602417376 +0200
+diff -Nur linux-4.1.10.orig/fs/btrfs/compression.c linux-4.1.10/fs/btrfs/compression.c
+--- linux-4.1.10.orig/fs/btrfs/compression.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/fs/btrfs/compression.c 2015-10-10 16:41:42.933314855 +0200
@@ -753,6 +753,8 @@
static const struct btrfs_compress_op * const btrfs_compress_op[] = {
&btrfs_zlib_compress,
@@ -282063,9 +281477,9 @@ diff -Nur linux-4.1.6/fs/btrfs/compression.c xbian-sources-kernel/fs/btrfs/compr
};
void __init btrfs_init_compress(void)
-diff -Nur linux-4.1.6/fs/btrfs/compression.h xbian-sources-kernel/fs/btrfs/compression.h
---- linux-4.1.6/fs/btrfs/compression.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/fs/btrfs/compression.h 2015-09-11 17:46:17.602417376 +0200
+diff -Nur linux-4.1.10.orig/fs/btrfs/compression.h linux-4.1.10/fs/btrfs/compression.h
+--- linux-4.1.10.orig/fs/btrfs/compression.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/fs/btrfs/compression.h 2015-10-10 16:41:42.933314855 +0200
@@ -79,5 +79,7 @@
extern const struct btrfs_compress_op btrfs_zlib_compress;
@@ -282074,9 +281488,9 @@ diff -Nur linux-4.1.6/fs/btrfs/compression.h xbian-sources-kernel/fs/btrfs/compr
+extern const struct btrfs_compress_op btrfs_lz4hc_compress;
#endif
-diff -Nur linux-4.1.6/fs/btrfs/ctree.h xbian-sources-kernel/fs/btrfs/ctree.h
---- linux-4.1.6/fs/btrfs/ctree.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/fs/btrfs/ctree.h 2015-09-11 17:46:17.606417108 +0200
+diff -Nur linux-4.1.10.orig/fs/btrfs/ctree.h linux-4.1.10/fs/btrfs/ctree.h
+--- linux-4.1.10.orig/fs/btrfs/ctree.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/fs/btrfs/ctree.h 2015-10-10 16:41:42.933314855 +0200
@@ -504,13 +504,7 @@
#define BTRFS_FEATURE_INCOMPAT_DEFAULT_SUBVOL (1ULL << 1)
#define BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS (1ULL << 2)
@@ -282113,9 +281527,9 @@ diff -Nur linux-4.1.6/fs/btrfs/ctree.h xbian-sources-kernel/fs/btrfs/ctree.h
};
struct btrfs_inode_item {
-diff -Nur linux-4.1.6/fs/btrfs/disk-io.c xbian-sources-kernel/fs/btrfs/disk-io.c
---- linux-4.1.6/fs/btrfs/disk-io.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/fs/btrfs/disk-io.c 2015-09-11 17:46:17.606417108 +0200
+diff -Nur linux-4.1.10.orig/fs/btrfs/disk-io.c linux-4.1.10/fs/btrfs/disk-io.c
+--- linux-4.1.10.orig/fs/btrfs/disk-io.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/fs/btrfs/disk-io.c 2015-10-10 16:41:42.937314855 +0200
@@ -2703,6 +2703,10 @@
if (tree_root->fs_info->compress_type == BTRFS_COMPRESS_LZO)
features |= BTRFS_FEATURE_INCOMPAT_COMPRESS_LZO;
@@ -282127,9 +281541,9 @@ diff -Nur linux-4.1.6/fs/btrfs/disk-io.c xbian-sources-kernel/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.6/fs/btrfs/ioctl.c xbian-sources-kernel/fs/btrfs/ioctl.c
---- linux-4.1.6/fs/btrfs/ioctl.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/fs/btrfs/ioctl.c 2015-09-11 17:46:17.614416571 +0200
+diff -Nur linux-4.1.10.orig/fs/btrfs/ioctl.c linux-4.1.10/fs/btrfs/ioctl.c
+--- linux-4.1.10.orig/fs/btrfs/ioctl.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/fs/btrfs/ioctl.c 2015-10-10 16:41:42.941314855 +0200
@@ -1439,6 +1439,10 @@
if (range->compress_type == BTRFS_COMPRESS_LZO) {
btrfs_set_fs_incompat(root->fs_info, COMPRESS_LZO);
@@ -282141,9 +281555,9 @@ diff -Nur linux-4.1.6/fs/btrfs/ioctl.c xbian-sources-kernel/fs/btrfs/ioctl.c
ret = defrag_count;
-diff -Nur linux-4.1.6/fs/btrfs/lz4_wrapper.c xbian-sources-kernel/fs/btrfs/lz4_wrapper.c
---- linux-4.1.6/fs/btrfs/lz4_wrapper.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/fs/btrfs/lz4_wrapper.c 2015-09-11 17:46:17.614416571 +0200
+diff -Nur linux-4.1.10.orig/fs/btrfs/lz4_wrapper.c linux-4.1.10/fs/btrfs/lz4_wrapper.c
+--- linux-4.1.10.orig/fs/btrfs/lz4_wrapper.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/fs/btrfs/lz4_wrapper.c 2015-10-10 16:41:42.941314855 +0200
@@ -0,0 +1,487 @@
+/*
+ * Copyright (C) 2008 Oracle. All rights reserved.
@@ -282632,9 +282046,9 @@ diff -Nur linux-4.1.6/fs/btrfs/lz4_wrapper.c xbian-sources-kernel/fs/btrfs/lz4_w
+ .decompress_biovec = lz4_decompress_biovec,
+ .decompress = lz4_decompress_wrapper,
+};
-diff -Nur linux-4.1.6/fs/btrfs/Makefile xbian-sources-kernel/fs/btrfs/Makefile
---- linux-4.1.6/fs/btrfs/Makefile 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/fs/btrfs/Makefile 2015-09-11 17:46:17.602417376 +0200
+diff -Nur linux-4.1.10.orig/fs/btrfs/Makefile linux-4.1.10/fs/btrfs/Makefile
+--- linux-4.1.10.orig/fs/btrfs/Makefile 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/fs/btrfs/Makefile 2015-10-10 16:41:42.941314855 +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 \
@@ -282644,9 +282058,9 @@ diff -Nur linux-4.1.6/fs/btrfs/Makefile xbian-sources-kernel/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.6/fs/btrfs/super.c xbian-sources-kernel/fs/btrfs/super.c
---- linux-4.1.6/fs/btrfs/super.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/fs/btrfs/super.c 2015-09-11 17:46:17.630415500 +0200
+diff -Nur linux-4.1.10.orig/fs/btrfs/super.c linux-4.1.10/fs/btrfs/super.c
+--- linux-4.1.10.orig/fs/btrfs/super.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/fs/btrfs/super.c 2015-10-10 16:41:42.941314855 +0200
@@ -492,6 +492,20 @@
btrfs_clear_opt(info->mount_opt, COMPRESS);
btrfs_clear_opt(info->mount_opt, FORCE_COMPRESS);
@@ -282684,9 +282098,9 @@ diff -Nur linux-4.1.6/fs/btrfs/super.c xbian-sources-kernel/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.6/include/dt-bindings/clock/imx6qdl-clock.h xbian-sources-kernel/include/dt-bindings/clock/imx6qdl-clock.h
---- linux-4.1.6/include/dt-bindings/clock/imx6qdl-clock.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/include/dt-bindings/clock/imx6qdl-clock.h 2015-09-11 17:46:18.238374802 +0200
+diff -Nur linux-4.1.10.orig/include/dt-bindings/clock/imx6qdl-clock.h linux-4.1.10/include/dt-bindings/clock/imx6qdl-clock.h
+--- linux-4.1.10.orig/include/dt-bindings/clock/imx6qdl-clock.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/include/dt-bindings/clock/imx6qdl-clock.h 2015-10-10 16:41:42.941314855 +0200
@@ -86,8 +86,6 @@
#define IMX6QDL_CLK_GPU3D_SHADER 74
#define IMX6QDL_CLK_IPU1_PODF 75
@@ -282711,9 +282125,9 @@ diff -Nur linux-4.1.6/include/dt-bindings/clock/imx6qdl-clock.h xbian-sources-ke
+#define IMX6QDL_CLK_END 248
#endif /* __DT_BINDINGS_CLOCK_IMX6QDL_H */
-diff -Nur linux-4.1.6/include/linux/busfreq-imx6.h xbian-sources-kernel/include/linux/busfreq-imx6.h
---- linux-4.1.6/include/linux/busfreq-imx6.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/linux/busfreq-imx6.h 2015-09-11 17:46:18.250373999 +0200
+diff -Nur linux-4.1.10.orig/include/linux/busfreq-imx6.h linux-4.1.10/include/linux/busfreq-imx6.h
+--- linux-4.1.10.orig/include/linux/busfreq-imx6.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/linux/busfreq-imx6.h 2015-10-10 16:41:42.941314855 +0200
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -282738,9 +282152,9 @@ diff -Nur linux-4.1.6/include/linux/busfreq-imx6.h xbian-sources-kernel/include/
+void request_bus_freq(enum bus_freq_mode mode);
+void release_bus_freq(enum bus_freq_mode mode);
+#endif
-diff -Nur linux-4.1.6/include/linux/cgroup_subsys.h xbian-sources-kernel/include/linux/cgroup_subsys.h
---- linux-4.1.6/include/linux/cgroup_subsys.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/include/linux/cgroup_subsys.h 2015-09-11 17:46:18.254373731 +0200
+diff -Nur linux-4.1.10.orig/include/linux/cgroup_subsys.h linux-4.1.10/include/linux/cgroup_subsys.h
+--- linux-4.1.10.orig/include/linux/cgroup_subsys.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/include/linux/cgroup_subsys.h 2015-10-10 16:41:42.941314855 +0200
@@ -35,6 +35,10 @@
SUBSYS(net_cls)
#endif
@@ -282752,9 +282166,9 @@ diff -Nur linux-4.1.6/include/linux/cgroup_subsys.h xbian-sources-kernel/include
#if IS_ENABLED(CONFIG_CGROUP_PERF)
SUBSYS(perf_event)
#endif
-diff -Nur linux-4.1.6/include/linux/device_cooling.h xbian-sources-kernel/include/linux/device_cooling.h
---- linux-4.1.6/include/linux/device_cooling.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/linux/device_cooling.h 2015-09-11 17:46:18.274372393 +0200
+diff -Nur linux-4.1.10.orig/include/linux/device_cooling.h linux-4.1.10/include/linux/device_cooling.h
+--- linux-4.1.10.orig/include/linux/device_cooling.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/linux/device_cooling.h 2015-10-10 16:41:42.941314855 +0200
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -282801,9 +282215,9 @@ diff -Nur linux-4.1.6/include/linux/device_cooling.h xbian-sources-kernel/includ
+}
+#endif
+#endif /* __DEVICE_THERMAL_H__ */
-diff -Nur linux-4.1.6/include/linux/fb.h xbian-sources-kernel/include/linux/fb.h
---- linux-4.1.6/include/linux/fb.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/include/linux/fb.h 2015-09-11 17:46:18.278372125 +0200
+diff -Nur linux-4.1.10.orig/include/linux/fb.h linux-4.1.10/include/linux/fb.h
+--- linux-4.1.10.orig/include/linux/fb.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/include/linux/fb.h 2015-10-10 16:41:42.941314855 +0200
@@ -702,7 +702,8 @@
#define FB_MODE_IS_VESA 4
#define FB_MODE_IS_CALCULATED 8
@@ -282814,9 +282228,9 @@ diff -Nur linux-4.1.6/include/linux/fb.h xbian-sources-kernel/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.6/include/linux/ipu.h xbian-sources-kernel/include/linux/ipu.h
---- linux-4.1.6/include/linux/ipu.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/linux/ipu.h 2015-09-11 17:46:18.322369179 +0200
+diff -Nur linux-4.1.10.orig/include/linux/ipu.h linux-4.1.10/include/linux/ipu.h
+--- linux-4.1.10.orig/include/linux/ipu.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/linux/ipu.h 2015-10-10 16:41:42.941314855 +0200
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc.
@@ -282856,9 +282270,9 @@ diff -Nur linux-4.1.6/include/linux/ipu.h xbian-sources-kernel/include/linux/ipu
+int ipu_check_task(struct ipu_task *task);
+
+#endif
-diff -Nur linux-4.1.6/include/linux/ipu-v3.h xbian-sources-kernel/include/linux/ipu-v3.h
---- linux-4.1.6/include/linux/ipu-v3.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/linux/ipu-v3.h 2015-09-11 17:46:18.322369179 +0200
+diff -Nur linux-4.1.10.orig/include/linux/ipu-v3.h linux-4.1.10/include/linux/ipu-v3.h
+--- linux-4.1.10.orig/include/linux/ipu-v3.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/linux/ipu-v3.h 2015-10-10 16:41:42.941314855 +0200
@@ -0,0 +1,761 @@
+/*
+ * Copyright (c) 2010 Sascha Hauer <s.hauer@pengutronix.de>
@@ -283621,9 +283035,9 @@ diff -Nur linux-4.1.6/include/linux/ipu-v3.h xbian-sources-kernel/include/linux/
+};
+
+#endif /* __LINUX_IPU_V3_H_ */
-diff -Nur linux-4.1.6/include/linux/mfd/mxc-hdmi-core.h xbian-sources-kernel/include/linux/mfd/mxc-hdmi-core.h
---- linux-4.1.6/include/linux/mfd/mxc-hdmi-core.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/linux/mfd/mxc-hdmi-core.h 2015-09-11 17:46:18.378365431 +0200
+diff -Nur linux-4.1.10.orig/include/linux/mfd/mxc-hdmi-core.h linux-4.1.10/include/linux/mfd/mxc-hdmi-core.h
+--- linux-4.1.10.orig/include/linux/mfd/mxc-hdmi-core.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/linux/mfd/mxc-hdmi-core.h 2015-10-10 16:41:42.941314855 +0200
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -283693,9 +283107,9 @@ diff -Nur linux-4.1.6/include/linux/mfd/mxc-hdmi-core.h xbian-sources-kernel/inc
+void hdmi_cec_stop_device(void);
+
+#endif
-diff -Nur linux-4.1.6/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h xbian-sources-kernel/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
---- linux-4.1.6/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h 2015-09-11 17:46:18.382365163 +0200
+diff -Nur linux-4.1.10.orig/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h linux-4.1.10/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
+--- linux-4.1.10.orig/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h 2015-10-10 16:41:42.941314855 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 Freescale Semiconductor, Inc.
@@ -283789,9 +283203,9 @@ diff -Nur linux-4.1.6/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h xbian-sources-
+#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.6/include/linux/mipi_csi2.h xbian-sources-kernel/include/linux/mipi_csi2.h
---- linux-4.1.6/include/linux/mipi_csi2.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/linux/mipi_csi2.h 2015-09-11 17:46:18.402363824 +0200
+diff -Nur linux-4.1.10.orig/include/linux/mipi_csi2.h linux-4.1.10/include/linux/mipi_csi2.h
+--- linux-4.1.10.orig/include/linux/mipi_csi2.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/linux/mipi_csi2.h 2015-10-10 16:41:42.941314855 +0200
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -283880,9 +283294,9 @@ diff -Nur linux-4.1.6/include/linux/mipi_csi2.h xbian-sources-kernel/include/lin
+int mipi_csi2_reset(struct mipi_csi2_info *info);
+
+#endif
-diff -Nur linux-4.1.6/include/linux/mipi_dsi.h xbian-sources-kernel/include/linux/mipi_dsi.h
---- linux-4.1.6/include/linux/mipi_dsi.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/linux/mipi_dsi.h 2015-09-11 17:46:18.402363824 +0200
+diff -Nur linux-4.1.10.orig/include/linux/mipi_dsi.h linux-4.1.10/include/linux/mipi_dsi.h
+--- linux-4.1.10.orig/include/linux/mipi_dsi.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/linux/mipi_dsi.h 2015-10-10 16:41:42.941314855 +0200
@@ -0,0 +1,171 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -284055,9 +283469,9 @@ diff -Nur linux-4.1.6/include/linux/mipi_dsi.h xbian-sources-kernel/include/linu
+#define DSI_PHY_CLK_INIT_COMMAND (0x44)
+#define DSI_GEN_PLD_DATA_BUF_SIZE (0x4)
+#endif
-diff -Nur linux-4.1.6/include/linux/mmc/host.h xbian-sources-kernel/include/linux/mmc/host.h
---- linux-4.1.6/include/linux/mmc/host.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/include/linux/mmc/host.h 2015-09-11 17:46:18.406363557 +0200
+diff -Nur linux-4.1.10.orig/include/linux/mmc/host.h linux-4.1.10/include/linux/mmc/host.h
+--- linux-4.1.10.orig/include/linux/mmc/host.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/include/linux/mmc/host.h 2015-10-10 16:41:42.941314855 +0200
@@ -300,6 +300,11 @@
unsigned long clkgate_delay;
#endif
@@ -284070,9 +283484,9 @@ diff -Nur linux-4.1.6/include/linux/mmc/host.h xbian-sources-kernel/include/linu
/* 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.6/include/linux/mm_types.h xbian-sources-kernel/include/linux/mm_types.h
---- linux-4.1.6/include/linux/mm_types.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/include/linux/mm_types.h 2015-09-11 17:46:18.406363557 +0200
+diff -Nur linux-4.1.10.orig/include/linux/mm_types.h linux-4.1.10/include/linux/mm_types.h
+--- linux-4.1.10.orig/include/linux/mm_types.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/include/linux/mm_types.h 2015-10-10 16:41:42.941314855 +0200
@@ -23,7 +23,7 @@
struct address_space;
struct mem_cgroup;
@@ -284082,9 +283496,9 @@ diff -Nur linux-4.1.6/include/linux/mm_types.h xbian-sources-kernel/include/linu
#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.6/include/linux/mxc_asrc.h xbian-sources-kernel/include/linux/mxc_asrc.h
---- linux-4.1.6/include/linux/mxc_asrc.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/linux/mxc_asrc.h 2015-09-11 17:46:18.410363289 +0200
+diff -Nur linux-4.1.10.orig/include/linux/mxc_asrc.h linux-4.1.10/include/linux/mxc_asrc.h
+--- linux-4.1.10.orig/include/linux/mxc_asrc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/linux/mxc_asrc.h 2015-10-10 16:41:42.941314855 +0200
@@ -0,0 +1,389 @@
+/*
+ * Copyright 2008-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -284475,9 +283889,9 @@ diff -Nur linux-4.1.6/include/linux/mxc_asrc.h xbian-sources-kernel/include/linu
+ u32 in_wm, u32 out_wm);
+
+#endif/* __MXC_ASRC_H__ */
-diff -Nur linux-4.1.6/include/linux/mxc_dcic.h xbian-sources-kernel/include/linux/mxc_dcic.h
---- linux-4.1.6/include/linux/mxc_dcic.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/linux/mxc_dcic.h 2015-09-11 17:46:18.410363289 +0200
+diff -Nur linux-4.1.10.orig/include/linux/mxc_dcic.h linux-4.1.10/include/linux/mxc_dcic.h
+--- linux-4.1.10.orig/include/linux/mxc_dcic.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/linux/mxc_dcic.h 2015-10-10 16:41:42.941314855 +0200
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2014 Freescale Semiconductor, Inc. All Rights Reserved
@@ -284613,9 +284027,9 @@ diff -Nur linux-4.1.6/include/linux/mxc_dcic.h xbian-sources-kernel/include/linu
+ unsigned int result;
+};
+#endif
-diff -Nur linux-4.1.6/include/linux/mxc_v4l2.h xbian-sources-kernel/include/linux/mxc_v4l2.h
---- linux-4.1.6/include/linux/mxc_v4l2.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/linux/mxc_v4l2.h 2015-09-11 17:46:18.410363289 +0200
+diff -Nur linux-4.1.10.orig/include/linux/mxc_v4l2.h linux-4.1.10/include/linux/mxc_v4l2.h
+--- linux-4.1.10.orig/include/linux/mxc_v4l2.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/linux/mxc_v4l2.h 2015-10-10 16:41:42.941314855 +0200
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -284644,9 +284058,9 @@ diff -Nur linux-4.1.6/include/linux/mxc_v4l2.h xbian-sources-kernel/include/linu
+#include <uapi/linux/mxc_v4l2.h>
+
+#endif
-diff -Nur linux-4.1.6/include/linux/mxc_vpu.h xbian-sources-kernel/include/linux/mxc_vpu.h
---- linux-4.1.6/include/linux/mxc_vpu.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/linux/mxc_vpu.h 2015-09-11 17:46:18.410363289 +0200
+diff -Nur linux-4.1.10.orig/include/linux/mxc_vpu.h linux-4.1.10/include/linux/mxc_vpu.h
+--- linux-4.1.10.orig/include/linux/mxc_vpu.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/linux/mxc_vpu.h 2015-10-10 16:41:42.941314855 +0200
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -284766,9 +284180,9 @@ diff -Nur linux-4.1.6/include/linux/mxc_vpu.h xbian-sources-kernel/include/linux
+void vl2cc_cleanup(void);
+
+#endif
-diff -Nur linux-4.1.6/include/linux/platform_data/dma-imx.h xbian-sources-kernel/include/linux/platform_data/dma-imx.h
---- linux-4.1.6/include/linux/platform_data/dma-imx.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/include/linux/platform_data/dma-imx.h 2015-09-11 17:46:18.474359005 +0200
+diff -Nur linux-4.1.10.orig/include/linux/platform_data/dma-imx.h linux-4.1.10/include/linux/platform_data/dma-imx.h
+--- linux-4.1.10.orig/include/linux/platform_data/dma-imx.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/include/linux/platform_data/dma-imx.h 2015-10-10 16:41:42.945314855 +0200
@@ -17,31 +17,30 @@
* This enumerates peripheral types. Used for SDMA.
*/
@@ -284833,9 +284247,9 @@ diff -Nur linux-4.1.6/include/linux/platform_data/dma-imx.h xbian-sources-kernel
};
static inline int imx_dma_is_ipu(struct dma_chan *chan)
-diff -Nur linux-4.1.6/include/linux/pxp_device.h xbian-sources-kernel/include/linux/pxp_device.h
---- linux-4.1.6/include/linux/pxp_device.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/linux/pxp_device.h 2015-09-11 17:46:18.490357934 +0200
+diff -Nur linux-4.1.10.orig/include/linux/pxp_device.h linux-4.1.10/include/linux/pxp_device.h
+--- linux-4.1.10.orig/include/linux/pxp_device.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/linux/pxp_device.h 2015-10-10 16:41:42.945314855 +0200
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2013-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -284905,9 +284319,9 @@ diff -Nur linux-4.1.6/include/linux/pxp_device.h xbian-sources-kernel/include/li
+};
+
+#endif
-diff -Nur linux-4.1.6/include/linux/pxp_dma.h xbian-sources-kernel/include/linux/pxp_dma.h
---- linux-4.1.6/include/linux/pxp_dma.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/linux/pxp_dma.h 2015-09-11 17:46:18.490357934 +0200
+diff -Nur linux-4.1.10.orig/include/linux/pxp_dma.h linux-4.1.10/include/linux/pxp_dma.h
+--- linux-4.1.10.orig/include/linux/pxp_dma.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/linux/pxp_dma.h 2015-10-10 16:41:42.945314855 +0200
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -284981,9 +284395,9 @@ diff -Nur linux-4.1.6/include/linux/pxp_dma.h xbian-sources-kernel/include/linux
+#endif
+
+#endif
-diff -Nur linux-4.1.6/include/media/v4l2-chip-ident.h xbian-sources-kernel/include/media/v4l2-chip-ident.h
---- linux-4.1.6/include/media/v4l2-chip-ident.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/media/v4l2-chip-ident.h 2015-09-11 17:46:18.562353114 +0200
+diff -Nur linux-4.1.10.orig/include/media/v4l2-chip-ident.h linux-4.1.10/include/media/v4l2-chip-ident.h
+--- linux-4.1.10.orig/include/media/v4l2-chip-ident.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/media/v4l2-chip-ident.h 2015-10-10 16:41:42.945314855 +0200
@@ -0,0 +1,354 @@
+/*
+ v4l2 chip identifiers header
@@ -285339,9 +284753,9 @@ diff -Nur linux-4.1.6/include/media/v4l2-chip-ident.h xbian-sources-kernel/inclu
+};
+
+#endif
-diff -Nur linux-4.1.6/include/media/v4l2-int-device.h xbian-sources-kernel/include/media/v4l2-int-device.h
---- linux-4.1.6/include/media/v4l2-int-device.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/media/v4l2-int-device.h 2015-09-11 17:46:18.574352311 +0200
+diff -Nur linux-4.1.10.orig/include/media/v4l2-int-device.h linux-4.1.10/include/media/v4l2-int-device.h
+--- linux-4.1.10.orig/include/media/v4l2-int-device.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/media/v4l2-int-device.h 2015-10-10 16:41:42.945314855 +0200
@@ -0,0 +1,316 @@
+/*
+ * include/media/v4l2-int-device.h
@@ -285659,9 +285073,9 @@ diff -Nur linux-4.1.6/include/media/v4l2-int-device.h xbian-sources-kernel/inclu
+V4L2_INT_WRAPPER_1(g_chip_ident, int, *);
+
+#endif
-diff -Nur linux-4.1.6/include/media/v4l2-ioctl.h xbian-sources-kernel/include/media/v4l2-ioctl.h
---- linux-4.1.6/include/media/v4l2-ioctl.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/include/media/v4l2-ioctl.h 2015-09-11 17:46:18.574352311 +0200
+diff -Nur linux-4.1.10.orig/include/media/v4l2-ioctl.h linux-4.1.10/include/media/v4l2-ioctl.h
+--- linux-4.1.10.orig/include/media/v4l2-ioctl.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/include/media/v4l2-ioctl.h 2015-10-10 16:41:42.945314855 +0200
@@ -251,6 +251,8 @@
int (*vidioc_g_chip_info) (struct file *file, void *fh,
struct v4l2_dbg_chip_info *chip);
@@ -285671,9 +285085,9 @@ diff -Nur linux-4.1.6/include/media/v4l2-ioctl.h xbian-sources-kernel/include/me
int (*vidioc_enum_framesizes) (struct file *file, void *fh,
struct v4l2_frmsizeenum *fsize);
-diff -Nur linux-4.1.6/include/media/v4l2-subdev.h xbian-sources-kernel/include/media/v4l2-subdev.h
---- linux-4.1.6/include/media/v4l2-subdev.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/include/media/v4l2-subdev.h 2015-09-11 17:46:18.574352311 +0200
+diff -Nur linux-4.1.10.orig/include/media/v4l2-subdev.h linux-4.1.10/include/media/v4l2-subdev.h
+--- linux-4.1.10.orig/include/media/v4l2-subdev.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/include/media/v4l2-subdev.h 2015-10-10 16:41:42.945314855 +0200
@@ -89,6 +89,7 @@
/* Core ops: it is highly recommended to implement at least these ops:
@@ -285699,9 +285113,9 @@ diff -Nur linux-4.1.6/include/media/v4l2-subdev.h xbian-sources-kernel/include/m
*/
#define v4l2_subdev_call(sd, o, f, args...) \
(!(sd) ? -ENODEV : (((sd)->ops->o && (sd)->ops->o->f) ? \
-diff -Nur linux-4.1.6/include/mmc-mxcmmc.h xbian-sources-kernel/include/mmc-mxcmmc.h
---- linux-4.1.6/include/mmc-mxcmmc.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/mmc-mxcmmc.h 2015-09-11 17:46:18.574352311 +0200
+diff -Nur linux-4.1.10.orig/include/mmc-mxcmmc.h linux-4.1.10/include/mmc-mxcmmc.h
+--- linux-4.1.10.orig/include/mmc-mxcmmc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/mmc-mxcmmc.h 2015-10-10 16:41:42.945314855 +0200
@@ -0,0 +1,39 @@
+#ifndef ASMARM_ARCH_MMC_H
+#define ASMARM_ARCH_MMC_H
@@ -285742,9 +285156,9 @@ diff -Nur linux-4.1.6/include/mmc-mxcmmc.h xbian-sources-kernel/include/mmc-mxcm
+};
+
+#endif
-diff -Nur linux-4.1.6/include/mtd-mxc_nand.h xbian-sources-kernel/include/mtd-mxc_nand.h
---- linux-4.1.6/include/mtd-mxc_nand.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/mtd-mxc_nand.h 2015-09-11 17:46:18.578352043 +0200
+diff -Nur linux-4.1.10.orig/include/mtd-mxc_nand.h linux-4.1.10/include/mtd-mxc_nand.h
+--- linux-4.1.10.orig/include/mtd-mxc_nand.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/mtd-mxc_nand.h 2015-10-10 16:41:42.945314855 +0200
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -285778,9 +285192,9 @@ diff -Nur linux-4.1.6/include/mtd-mxc_nand.h xbian-sources-kernel/include/mtd-mx
+ int nr_parts; /* size of parts */
+};
+#endif /* __ASM_ARCH_NAND_H */
-diff -Nur linux-4.1.6/include/sound/soc.h xbian-sources-kernel/include/sound/soc.h
---- linux-4.1.6/include/sound/soc.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/include/sound/soc.h 2015-09-11 17:46:18.614349633 +0200
+diff -Nur linux-4.1.10.orig/include/sound/soc.h linux-4.1.10/include/sound/soc.h
+--- linux-4.1.10.orig/include/sound/soc.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/include/sound/soc.h 2015-10-10 16:41:42.945314855 +0200
@@ -28,6 +28,18 @@
#include <sound/control.h>
#include <sound/ac97_codec.h>
@@ -285825,9 +285239,9 @@ diff -Nur linux-4.1.6/include/sound/soc.h xbian-sources-kernel/include/sound/soc
/* component */
struct snd_soc_component component;
-diff -Nur linux-4.1.6/include/sync.h xbian-sources-kernel/include/sync.h
---- linux-4.1.6/include/sync.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/sync.h 2015-09-11 17:46:18.634348294 +0200
+diff -Nur linux-4.1.10.orig/include/sync.h linux-4.1.10/include/sync.h
+--- linux-4.1.10.orig/include/sync.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/sync.h 2015-10-10 16:41:42.945314855 +0200
@@ -0,0 +1,356 @@
+/*
+ * include/linux/sync.h
@@ -286185,9 +285599,9 @@ diff -Nur linux-4.1.6/include/sync.h xbian-sources-kernel/include/sync.h
+ int wake_flags, void *key);
+
+#endif /* _LINUX_SYNC_H */
-diff -Nur linux-4.1.6/include/uapi/linux/fb.h xbian-sources-kernel/include/uapi/linux/fb.h
---- linux-4.1.6/include/uapi/linux/fb.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/include/uapi/linux/fb.h 2015-09-11 17:46:18.658346688 +0200
+diff -Nur linux-4.1.10.orig/include/uapi/linux/fb.h linux-4.1.10/include/uapi/linux/fb.h
+--- linux-4.1.10.orig/include/uapi/linux/fb.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/include/uapi/linux/fb.h 2015-10-10 16:41:42.945314855 +0200
@@ -217,14 +217,45 @@
#define FB_SYNC_ON_GREEN 32 /* sync on green */
@@ -286242,9 +285656,9 @@ diff -Nur linux-4.1.6/include/uapi/linux/fb.h xbian-sources-kernel/include/uapi/
/*
* Display rotation support
-diff -Nur linux-4.1.6/include/uapi/linux/ipu.h xbian-sources-kernel/include/uapi/linux/ipu.h
---- linux-4.1.6/include/uapi/linux/ipu.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/uapi/linux/ipu.h 2015-09-11 17:46:18.666346152 +0200
+diff -Nur linux-4.1.10.orig/include/uapi/linux/ipu.h linux-4.1.10/include/uapi/linux/ipu.h
+--- linux-4.1.10.orig/include/uapi/linux/ipu.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/uapi/linux/ipu.h 2015-10-10 16:41:42.945314855 +0200
@@ -0,0 +1,282 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved
@@ -286528,9 +285942,9 @@ diff -Nur linux-4.1.6/include/uapi/linux/ipu.h xbian-sources-kernel/include/uapi
+#define IPU_FREE _IOW('I', 0x4, int)
+
+#endif
-diff -Nur linux-4.1.6/include/uapi/linux/Kbuild xbian-sources-kernel/include/uapi/linux/Kbuild
---- linux-4.1.6/include/uapi/linux/Kbuild 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/include/uapi/linux/Kbuild 2015-09-11 17:46:18.646347491 +0200
+diff -Nur linux-4.1.10.orig/include/uapi/linux/Kbuild linux-4.1.10/include/uapi/linux/Kbuild
+--- linux-4.1.10.orig/include/uapi/linux/Kbuild 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/include/uapi/linux/Kbuild 2015-10-10 16:41:42.945314855 +0200
@@ -266,6 +266,9 @@
header-y += msdos_fs.h
header-y += msg.h
@@ -286548,9 +285962,9 @@ diff -Nur linux-4.1.6/include/uapi/linux/Kbuild xbian-sources-kernel/include/uap
+
+header-y += pxp_device.h
+header-y += pxp_dma.h
-diff -Nur linux-4.1.6/include/uapi/linux/mxc_asrc.h xbian-sources-kernel/include/uapi/linux/mxc_asrc.h
---- linux-4.1.6/include/uapi/linux/mxc_asrc.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/uapi/linux/mxc_asrc.h 2015-09-11 17:46:18.670345885 +0200
+diff -Nur linux-4.1.10.orig/include/uapi/linux/mxc_asrc.h linux-4.1.10/include/uapi/linux/mxc_asrc.h
+--- linux-4.1.10.orig/include/uapi/linux/mxc_asrc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/uapi/linux/mxc_asrc.h 2015-10-10 16:41:42.945314855 +0200
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2008-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -286695,9 +286109,9 @@ diff -Nur linux-4.1.6/include/uapi/linux/mxc_asrc.h xbian-sources-kernel/include
+ ASRC_INPUT_BUFFER_UNDERRUN = 0x10,
+};
+#endif/* __MXC_ASRC_UAPI_H__ */
-diff -Nur linux-4.1.6/include/uapi/linux/mxc_dcic.h xbian-sources-kernel/include/uapi/linux/mxc_dcic.h
---- linux-4.1.6/include/uapi/linux/mxc_dcic.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/uapi/linux/mxc_dcic.h 2015-09-11 17:46:18.670345885 +0200
+diff -Nur linux-4.1.10.orig/include/uapi/linux/mxc_dcic.h linux-4.1.10/include/uapi/linux/mxc_dcic.h
+--- linux-4.1.10.orig/include/uapi/linux/mxc_dcic.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/uapi/linux/mxc_dcic.h 2015-10-10 16:41:42.945314855 +0200
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2014 Freescale Semiconductor, Inc. All Rights Reserved
@@ -286748,9 +286162,9 @@ diff -Nur linux-4.1.6/include/uapi/linux/mxc_dcic.h xbian-sources-kernel/include
+};
+
+#endif
-diff -Nur linux-4.1.6/include/uapi/linux/mxcfb.h xbian-sources-kernel/include/uapi/linux/mxcfb.h
---- linux-4.1.6/include/uapi/linux/mxcfb.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/uapi/linux/mxcfb.h 2015-09-11 17:46:18.670345885 +0200
+diff -Nur linux-4.1.10.orig/include/uapi/linux/mxcfb.h linux-4.1.10/include/uapi/linux/mxcfb.h
+--- linux-4.1.10.orig/include/uapi/linux/mxcfb.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/uapi/linux/mxcfb.h 2015-10-10 16:41:42.945314855 +0200
@@ -0,0 +1,176 @@
+/*
+ * Copyright (C) 2013-2014 Freescale Semiconductor, Inc. All Rights Reserved
@@ -286928,9 +286342,9 @@ diff -Nur linux-4.1.6/include/uapi/linux/mxcfb.h xbian-sources-kernel/include/ua
+#define MXCFB_DISABLE_EPDC_ACCESS _IO('F', 0x35)
+#define MXCFB_ENABLE_EPDC_ACCESS _IO('F', 0x36)
+#endif
-diff -Nur linux-4.1.6/include/uapi/linux/mxc_mlb.h xbian-sources-kernel/include/uapi/linux/mxc_mlb.h
---- linux-4.1.6/include/uapi/linux/mxc_mlb.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/uapi/linux/mxc_mlb.h 2015-09-11 17:46:18.670345885 +0200
+diff -Nur linux-4.1.10.orig/include/uapi/linux/mxc_mlb.h linux-4.1.10/include/uapi/linux/mxc_mlb.h
+--- linux-4.1.10.orig/include/uapi/linux/mxc_mlb.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/uapi/linux/mxc_mlb.h 2015-10-10 16:41:42.945314855 +0200
@@ -0,0 +1,55 @@
+/*
+ * mxc_mlb.h
@@ -286987,9 +286401,9 @@ diff -Nur linux-4.1.6/include/uapi/linux/mxc_mlb.h xbian-sources-kernel/include/
+
+
+#endif /* _MXC_MLB_H */
-diff -Nur linux-4.1.6/include/uapi/linux/mxc_v4l2.h xbian-sources-kernel/include/uapi/linux/mxc_v4l2.h
---- linux-4.1.6/include/uapi/linux/mxc_v4l2.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/uapi/linux/mxc_v4l2.h 2015-09-11 17:46:18.670345885 +0200
+diff -Nur linux-4.1.10.orig/include/uapi/linux/mxc_v4l2.h linux-4.1.10/include/uapi/linux/mxc_v4l2.h
+--- linux-4.1.10.orig/include/uapi/linux/mxc_v4l2.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/uapi/linux/mxc_v4l2.h 2015-10-10 16:41:42.945314855 +0200
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved
@@ -287052,9 +286466,9 @@ diff -Nur linux-4.1.6/include/uapi/linux/mxc_v4l2.h xbian-sources-kernel/include
+};
+
+#endif
-diff -Nur linux-4.1.6/include/uapi/linux/pxp_device.h xbian-sources-kernel/include/uapi/linux/pxp_device.h
---- linux-4.1.6/include/uapi/linux/pxp_device.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/uapi/linux/pxp_device.h 2015-09-11 17:46:18.694344278 +0200
+diff -Nur linux-4.1.10.orig/include/uapi/linux/pxp_device.h linux-4.1.10/include/uapi/linux/pxp_device.h
+--- linux-4.1.10.orig/include/uapi/linux/pxp_device.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/uapi/linux/pxp_device.h 2015-10-10 16:41:42.945314855 +0200
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2013-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -287119,9 +286533,9 @@ diff -Nur linux-4.1.6/include/uapi/linux/pxp_device.h xbian-sources-kernel/inclu
+#define CACHE_FLUSH 0x4
+
+#endif
-diff -Nur linux-4.1.6/include/uapi/linux/pxp_dma.h xbian-sources-kernel/include/uapi/linux/pxp_dma.h
---- linux-4.1.6/include/uapi/linux/pxp_dma.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/uapi/linux/pxp_dma.h 2015-09-11 17:46:18.694344278 +0200
+diff -Nur linux-4.1.10.orig/include/uapi/linux/pxp_dma.h linux-4.1.10/include/uapi/linux/pxp_dma.h
+--- linux-4.1.10.orig/include/uapi/linux/pxp_dma.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/uapi/linux/pxp_dma.h 2015-10-10 16:41:42.945314855 +0200
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2013-2015 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -287296,9 +286710,9 @@ diff -Nur linux-4.1.6/include/uapi/linux/pxp_dma.h xbian-sources-kernel/include/
+
+
+#endif
-diff -Nur linux-4.1.6/include/uapi/linux/videodev2.h xbian-sources-kernel/include/uapi/linux/videodev2.h
---- linux-4.1.6/include/uapi/linux/videodev2.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/include/uapi/linux/videodev2.h 2015-09-11 17:46:18.706343475 +0200
+diff -Nur linux-4.1.10.orig/include/uapi/linux/videodev2.h linux-4.1.10/include/uapi/linux/videodev2.h
+--- linux-4.1.10.orig/include/uapi/linux/videodev2.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/include/uapi/linux/videodev2.h 2015-10-10 16:41:42.945314855 +0200
@@ -147,6 +147,7 @@
V4L2_BUF_TYPE_SDR_CAPTURE = 11,
/* Deprecated, do not use */
@@ -287385,9 +286799,9 @@ diff -Nur linux-4.1.6/include/uapi/linux/videodev2.h xbian-sources-kernel/includ
#define VIDIOC_S_HW_FREQ_SEEK _IOW('V', 82, struct v4l2_hw_freq_seek)
#define VIDIOC_S_DV_TIMINGS _IOWR('V', 87, struct v4l2_dv_timings)
-diff -Nur linux-4.1.6/include/uapi/sync.h xbian-sources-kernel/include/uapi/sync.h
---- linux-4.1.6/include/uapi/sync.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/uapi/sync.h 2015-09-11 17:46:18.710343207 +0200
+diff -Nur linux-4.1.10.orig/include/uapi/sync.h linux-4.1.10/include/uapi/sync.h
+--- linux-4.1.10.orig/include/uapi/sync.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/uapi/sync.h 2015-10-10 16:41:42.949314855 +0200
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2012 Google, Inc.
@@ -287486,9 +286900,9 @@ diff -Nur linux-4.1.6/include/uapi/sync.h xbian-sources-kernel/include/uapi/sync
+ struct sync_fence_info_data)
+
+#endif /* _UAPI_LINUX_SYNC_H */
-diff -Nur linux-4.1.6/include/usb-ehci-mxc.h xbian-sources-kernel/include/usb-ehci-mxc.h
---- linux-4.1.6/include/usb-ehci-mxc.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/usb-ehci-mxc.h 2015-09-11 17:46:18.726342136 +0200
+diff -Nur linux-4.1.10.orig/include/usb-ehci-mxc.h linux-4.1.10/include/usb-ehci-mxc.h
+--- linux-4.1.10.orig/include/usb-ehci-mxc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/usb-ehci-mxc.h 2015-10-10 16:41:42.949314855 +0200
@@ -0,0 +1,13 @@
+#ifndef __INCLUDE_ASM_ARCH_MXC_EHCI_H
+#define __INCLUDE_ASM_ARCH_MXC_EHCI_H
@@ -287503,9 +286917,9 @@ diff -Nur linux-4.1.6/include/usb-ehci-mxc.h xbian-sources-kernel/include/usb-eh
+
+#endif /* __INCLUDE_ASM_ARCH_MXC_EHCI_H */
+
-diff -Nur linux-4.1.6/include/video/mxc_edid.h xbian-sources-kernel/include/video/mxc_edid.h
---- linux-4.1.6/include/video/mxc_edid.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/video/mxc_edid.h 2015-09-11 17:46:18.730341868 +0200
+diff -Nur linux-4.1.10.orig/include/video/mxc_edid.h linux-4.1.10/include/video/mxc_edid.h
+--- linux-4.1.10.orig/include/video/mxc_edid.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/video/mxc_edid.h 2015-10-10 16:41:42.949314855 +0200
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -287623,9 +287037,9 @@ diff -Nur linux-4.1.6/include/video/mxc_edid.h xbian-sources-kernel/include/vide
+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.6/include/video/mxc_hdmi.h xbian-sources-kernel/include/video/mxc_hdmi.h
---- linux-4.1.6/include/video/mxc_hdmi.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/include/video/mxc_hdmi.h 2015-09-11 17:46:18.730341868 +0200
+diff -Nur linux-4.1.10.orig/include/video/mxc_hdmi.h linux-4.1.10/include/video/mxc_hdmi.h
+--- linux-4.1.10.orig/include/video/mxc_hdmi.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/include/video/mxc_hdmi.h 2015-10-10 16:41:42.949314855 +0200
@@ -0,0 +1,1027 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc.
@@ -288654,9 +288068,9 @@ diff -Nur linux-4.1.6/include/video/mxc_hdmi.h xbian-sources-kernel/include/vide
+
+
+#endif /* __MXC_HDMI_H__ */
-diff -Nur linux-4.1.6/sound/soc/codecs/hdmi.c xbian-sources-kernel/sound/soc/codecs/hdmi.c
---- linux-4.1.6/sound/soc/codecs/hdmi.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/sound/soc/codecs/hdmi.c 2015-09-11 17:46:19.754273322 +0200
+diff -Nur linux-4.1.10.orig/sound/soc/codecs/hdmi.c linux-4.1.10/sound/soc/codecs/hdmi.c
+--- linux-4.1.10.orig/sound/soc/codecs/hdmi.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/sound/soc/codecs/hdmi.c 2015-10-10 16:41:42.949314855 +0200
@@ -47,7 +47,7 @@
SNDRV_PCM_RATE_176400 | SNDRV_PCM_RATE_192000,
.formats = SNDRV_PCM_FMTBIT_S16_LE |
@@ -288666,9 +288080,9 @@ diff -Nur linux-4.1.6/sound/soc/codecs/hdmi.c xbian-sources-kernel/sound/soc/cod
},
.capture = {
.stream_name = "Capture",
-diff -Nur linux-4.1.6/sound/soc/codecs/sgtl5000.c xbian-sources-kernel/sound/soc/codecs/sgtl5000.c
---- linux-4.1.6/sound/soc/codecs/sgtl5000.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/sound/soc/codecs/sgtl5000.c 2015-09-11 17:46:19.766272519 +0200
+diff -Nur linux-4.1.10.orig/sound/soc/codecs/sgtl5000.c linux-4.1.10/sound/soc/codecs/sgtl5000.c
+--- linux-4.1.10.orig/sound/soc/codecs/sgtl5000.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/sound/soc/codecs/sgtl5000.c 2015-10-10 16:41:42.985314855 +0200
@@ -16,7 +16,6 @@
#include <linux/pm.h>
#include <linux/i2c.h>
@@ -289126,9 +288540,9 @@ diff -Nur linux-4.1.6/sound/soc/codecs/sgtl5000.c xbian-sources-kernel/sound/soc
i2c_set_clientdata(client, sgtl5000);
/* Ensure sgtl5000 will start with sane register values */
-diff -Nur linux-4.1.6/sound/soc/fsl/fsl_asrc.h xbian-sources-kernel/sound/soc/fsl/fsl_asrc.h
---- linux-4.1.6/sound/soc/fsl/fsl_asrc.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/sound/soc/fsl/fsl_asrc.h 2015-09-11 17:46:19.838267700 +0200
+diff -Nur linux-4.1.10.orig/sound/soc/fsl/fsl_asrc.h linux-4.1.10/sound/soc/fsl/fsl_asrc.h
+--- linux-4.1.10.orig/sound/soc/fsl/fsl_asrc.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/sound/soc/fsl/fsl_asrc.h 2015-10-10 16:41:42.985314855 +0200
@@ -326,7 +326,7 @@
OUTCLK_ASRCK1_CLK = 0x0f,
};
@@ -289138,9 +288552,9 @@ diff -Nur linux-4.1.6/sound/soc/fsl/fsl_asrc.h xbian-sources-kernel/sound/soc/fs
enum asrc_word_width {
ASRC_WIDTH_24_BIT = 0,
-diff -Nur linux-4.1.6/sound/soc/fsl/fsl_esai.c xbian-sources-kernel/sound/soc/fsl/fsl_esai.c
---- linux-4.1.6/sound/soc/fsl/fsl_esai.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/sound/soc/fsl/fsl_esai.c 2015-09-11 17:46:19.842267432 +0200
+diff -Nur linux-4.1.10.orig/sound/soc/fsl/fsl_esai.c linux-4.1.10/sound/soc/fsl/fsl_esai.c
+--- linux-4.1.10.orig/sound/soc/fsl/fsl_esai.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/sound/soc/fsl/fsl_esai.c 2015-10-10 16:41:42.985314855 +0200
@@ -839,7 +839,7 @@
return ret;
}
@@ -289150,9 +288564,9 @@ diff -Nur linux-4.1.6/sound/soc/fsl/fsl_esai.c xbian-sources-kernel/sound/soc/fs
if (ret)
dev_err(&pdev->dev, "failed to init imx pcm dma: %d\n", ret);
-diff -Nur linux-4.1.6/sound/soc/fsl/fsl_hdmi.c xbian-sources-kernel/sound/soc/fsl/fsl_hdmi.c
---- linux-4.1.6/sound/soc/fsl/fsl_hdmi.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/sound/soc/fsl/fsl_hdmi.c 2015-09-11 17:46:19.842267432 +0200
+diff -Nur linux-4.1.10.orig/sound/soc/fsl/fsl_hdmi.c linux-4.1.10/sound/soc/fsl/fsl_hdmi.c
+--- linux-4.1.10.orig/sound/soc/fsl/fsl_hdmi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/sound/soc/fsl/fsl_hdmi.c 2015-10-10 16:41:42.985314855 +0200
@@ -0,0 +1,707 @@
+/*
+ * ALSA SoC HDMI Audio Layer for Freescale i.MX
@@ -289861,9 +289275,9 @@ diff -Nur linux-4.1.6/sound/soc/fsl/fsl_hdmi.c xbian-sources-kernel/sound/soc/fs
+MODULE_DESCRIPTION("IMX HDMI TX DAI");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:fsl-hdmi-dai");
-diff -Nur linux-4.1.6/sound/soc/fsl/fsl_sai.c xbian-sources-kernel/sound/soc/fsl/fsl_sai.c
---- linux-4.1.6/sound/soc/fsl/fsl_sai.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/sound/soc/fsl/fsl_sai.c 2015-09-11 17:46:19.842267432 +0200
+diff -Nur linux-4.1.10.orig/sound/soc/fsl/fsl_sai.c linux-4.1.10/sound/soc/fsl/fsl_sai.c
+--- linux-4.1.10.orig/sound/soc/fsl/fsl_sai.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/sound/soc/fsl/fsl_sai.c 2015-10-10 16:41:42.985314855 +0200
@@ -1,7 +1,7 @@
/*
* Freescale ALSA SoC Digital Audio Interface (SAI) driver.
@@ -289882,9 +289296,9 @@ diff -Nur linux-4.1.6/sound/soc/fsl/fsl_sai.c xbian-sources-kernel/sound/soc/fsl
else
return devm_snd_dmaengine_pcm_register(&pdev->dev, NULL,
SND_DMAENGINE_PCM_FLAG_NO_RESIDUE);
-diff -Nur linux-4.1.6/sound/soc/fsl/fsl_spdif.c xbian-sources-kernel/sound/soc/fsl/fsl_spdif.c
---- linux-4.1.6/sound/soc/fsl/fsl_spdif.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/sound/soc/fsl/fsl_spdif.c 2015-09-11 17:46:19.842267432 +0200
+diff -Nur linux-4.1.10.orig/sound/soc/fsl/fsl_spdif.c linux-4.1.10/sound/soc/fsl/fsl_spdif.c
+--- linux-4.1.10.orig/sound/soc/fsl/fsl_spdif.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/sound/soc/fsl/fsl_spdif.c 2015-10-10 16:41:42.985314855 +0200
@@ -1257,7 +1257,7 @@
return ret;
}
@@ -289894,9 +289308,9 @@ diff -Nur linux-4.1.6/sound/soc/fsl/fsl_spdif.c xbian-sources-kernel/sound/soc/f
if (ret)
dev_err(&pdev->dev, "imx_pcm_dma_init failed: %d\n", ret);
-diff -Nur linux-4.1.6/sound/soc/fsl/fsl_ssi.c xbian-sources-kernel/sound/soc/fsl/fsl_ssi.c
---- linux-4.1.6/sound/soc/fsl/fsl_ssi.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/sound/soc/fsl/fsl_ssi.c 2015-09-11 17:46:19.842267432 +0200
+diff -Nur linux-4.1.10.orig/sound/soc/fsl/fsl_ssi.c linux-4.1.10/sound/soc/fsl/fsl_ssi.c
+--- linux-4.1.10.orig/sound/soc/fsl/fsl_ssi.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/sound/soc/fsl/fsl_ssi.c 2015-10-10 16:41:42.985314855 +0200
@@ -3,7 +3,7 @@
*
* Author: Timur Tabi <timur@freescale.com>
@@ -291974,9 +291388,9 @@ diff -Nur linux-4.1.6/sound/soc/fsl/fsl_ssi.c xbian-sources-kernel/sound/soc/fsl
},
.probe = fsl_ssi_probe,
.remove = fsl_ssi_remove,
-diff -Nur linux-4.1.6/sound/soc/fsl/fsl_ssi.h xbian-sources-kernel/sound/soc/fsl/fsl_ssi.h
---- linux-4.1.6/sound/soc/fsl/fsl_ssi.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/sound/soc/fsl/fsl_ssi.h 2015-09-11 17:46:19.842267432 +0200
+diff -Nur linux-4.1.10.orig/sound/soc/fsl/fsl_ssi.h linux-4.1.10/sound/soc/fsl/fsl_ssi.h
+--- linux-4.1.10.orig/sound/soc/fsl/fsl_ssi.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/sound/soc/fsl/fsl_ssi.h 2015-10-10 16:41:42.985314855 +0200
@@ -12,32 +12,33 @@
#ifndef _MPC8610_I2S_H
#define _MPC8610_I2S_H
@@ -292102,9 +291516,9 @@ diff -Nur linux-4.1.6/sound/soc/fsl/fsl_ssi.h xbian-sources-kernel/sound/soc/fsl
-
#endif
+
-diff -Nur linux-4.1.6/sound/soc/fsl/hdmi_pcm.S xbian-sources-kernel/sound/soc/fsl/hdmi_pcm.S
---- linux-4.1.6/sound/soc/fsl/hdmi_pcm.S 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/sound/soc/fsl/hdmi_pcm.S 2015-09-11 17:46:19.842267432 +0200
+diff -Nur linux-4.1.10.orig/sound/soc/fsl/hdmi_pcm.S linux-4.1.10/sound/soc/fsl/hdmi_pcm.S
+--- linux-4.1.10.orig/sound/soc/fsl/hdmi_pcm.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/sound/soc/fsl/hdmi_pcm.S 2015-10-10 16:41:42.985314855 +0200
@@ -0,0 +1,246 @@
+/**
+ * Copyright (C) 2010-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -292352,9 +291766,9 @@ diff -Nur linux-4.1.6/sound/soc/fsl/hdmi_pcm.S xbian-sources-kernel/sound/soc/fs
+
+ vpop {d8}
+ mov pc, lr
-diff -Nur linux-4.1.6/sound/soc/fsl/imx-audmux.c xbian-sources-kernel/sound/soc/fsl/imx-audmux.c
---- linux-4.1.6/sound/soc/fsl/imx-audmux.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/sound/soc/fsl/imx-audmux.c 2015-09-11 17:46:19.842267432 +0200
+diff -Nur linux-4.1.10.orig/sound/soc/fsl/imx-audmux.c linux-4.1.10/sound/soc/fsl/imx-audmux.c
+--- linux-4.1.10.orig/sound/soc/fsl/imx-audmux.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/sound/soc/fsl/imx-audmux.c 2015-10-10 16:41:42.985314855 +0200
@@ -67,7 +67,7 @@
{
ssize_t ret;
@@ -292397,9 +291811,9 @@ diff -Nur linux-4.1.6/sound/soc/fsl/imx-audmux.c xbian-sources-kernel/sound/soc/
.of_match_table = imx_audmux_dt_ids,
}
};
-diff -Nur linux-4.1.6/sound/soc/fsl/imx-hdmi.c xbian-sources-kernel/sound/soc/fsl/imx-hdmi.c
---- linux-4.1.6/sound/soc/fsl/imx-hdmi.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/sound/soc/fsl/imx-hdmi.c 2015-09-11 17:46:19.842267432 +0200
+diff -Nur linux-4.1.10.orig/sound/soc/fsl/imx-hdmi.c linux-4.1.10/sound/soc/fsl/imx-hdmi.c
+--- linux-4.1.10.orig/sound/soc/fsl/imx-hdmi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/sound/soc/fsl/imx-hdmi.c 2015-10-10 16:41:42.985314855 +0200
@@ -0,0 +1,114 @@
+/*
+ * ASoC HDMI Transmitter driver for IMX development boards
@@ -292515,9 +291929,9 @@ diff -Nur linux-4.1.6/sound/soc/fsl/imx-hdmi.c xbian-sources-kernel/sound/soc/fs
+MODULE_DESCRIPTION("IMX HDMI TX ASoC driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:imx-audio-hdmi");
-diff -Nur linux-4.1.6/sound/soc/fsl/imx-hdmi-dma.c xbian-sources-kernel/sound/soc/fsl/imx-hdmi-dma.c
---- linux-4.1.6/sound/soc/fsl/imx-hdmi-dma.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/sound/soc/fsl/imx-hdmi-dma.c 2015-09-11 17:46:19.842267432 +0200
+diff -Nur linux-4.1.10.orig/sound/soc/fsl/imx-hdmi-dma.c linux-4.1.10/sound/soc/fsl/imx-hdmi-dma.c
+--- linux-4.1.10.orig/sound/soc/fsl/imx-hdmi-dma.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/sound/soc/fsl/imx-hdmi-dma.c 2015-10-10 16:41:42.985314855 +0200
@@ -0,0 +1,1256 @@
+/*
+ * imx-hdmi-dma.c -- HDMI DMA driver for ALSA Soc Audio Layer
@@ -293775,9 +293189,9 @@ diff -Nur linux-4.1.6/sound/soc/fsl/imx-hdmi-dma.c xbian-sources-kernel/sound/so
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("i.MX HDMI audio DMA");
+MODULE_LICENSE("GPL");
-diff -Nur linux-4.1.6/sound/soc/fsl/imx-hdmi.h xbian-sources-kernel/sound/soc/fsl/imx-hdmi.h
---- linux-4.1.6/sound/soc/fsl/imx-hdmi.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/sound/soc/fsl/imx-hdmi.h 2015-09-11 17:46:19.842267432 +0200
+diff -Nur linux-4.1.10.orig/sound/soc/fsl/imx-hdmi.h linux-4.1.10/sound/soc/fsl/imx-hdmi.h
+--- linux-4.1.10.orig/sound/soc/fsl/imx-hdmi.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/sound/soc/fsl/imx-hdmi.h 2015-10-10 16:41:42.985314855 +0200
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2011-2014 Freescale Semiconductor, Inc.
@@ -293885,9 +293299,9 @@ diff -Nur linux-4.1.6/sound/soc/fsl/imx-hdmi.h xbian-sources-kernel/sound/soc/fs
+ } while (0)
+
+#endif /* __IMX_HDMI_H */
-diff -Nur linux-4.1.6/sound/soc/fsl/imx-pcm-dma.c xbian-sources-kernel/sound/soc/fsl/imx-pcm-dma.c
---- linux-4.1.6/sound/soc/fsl/imx-pcm-dma.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/sound/soc/fsl/imx-pcm-dma.c 2015-09-11 17:46:19.842267432 +0200
+diff -Nur linux-4.1.10.orig/sound/soc/fsl/imx-pcm-dma.c linux-4.1.10/sound/soc/fsl/imx-pcm-dma.c
+--- linux-4.1.10.orig/sound/soc/fsl/imx-pcm-dma.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/sound/soc/fsl/imx-pcm-dma.c 2015-10-10 16:41:42.989314854 +0200
@@ -43,7 +43,7 @@
.buffer_bytes_max = IMX_SSI_DMABUF_SIZE,
.period_bytes_min = 128,
@@ -293927,9 +293341,9 @@ diff -Nur linux-4.1.6/sound/soc/fsl/imx-pcm-dma.c xbian-sources-kernel/sound/soc
SND_DMAENGINE_PCM_FLAG_COMPAT);
}
EXPORT_SYMBOL_GPL(imx_pcm_dma_init);
-diff -Nur linux-4.1.6/sound/soc/fsl/imx-pcm.h xbian-sources-kernel/sound/soc/fsl/imx-pcm.h
---- linux-4.1.6/sound/soc/fsl/imx-pcm.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/sound/soc/fsl/imx-pcm.h 2015-09-11 17:46:19.842267432 +0200
+diff -Nur linux-4.1.10.orig/sound/soc/fsl/imx-pcm.h linux-4.1.10/sound/soc/fsl/imx-pcm.h
+--- linux-4.1.10.orig/sound/soc/fsl/imx-pcm.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/sound/soc/fsl/imx-pcm.h 2015-10-10 16:41:42.989314854 +0200
@@ -19,6 +19,10 @@
* Do not change this as the FIQ handler depends on this size
*/
@@ -293953,9 +293367,9 @@ diff -Nur linux-4.1.6/sound/soc/fsl/imx-pcm.h xbian-sources-kernel/sound/soc/fsl
{
return -ENODEV;
}
-diff -Nur linux-4.1.6/sound/soc/fsl/imx-sgtl5000.c xbian-sources-kernel/sound/soc/fsl/imx-sgtl5000.c
---- linux-4.1.6/sound/soc/fsl/imx-sgtl5000.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/sound/soc/fsl/imx-sgtl5000.c 2015-09-11 17:46:19.842267432 +0200
+diff -Nur linux-4.1.10.orig/sound/soc/fsl/imx-sgtl5000.c linux-4.1.10/sound/soc/fsl/imx-sgtl5000.c
+--- linux-4.1.10.orig/sound/soc/fsl/imx-sgtl5000.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/sound/soc/fsl/imx-sgtl5000.c 2015-10-10 16:41:42.989314854 +0200
@@ -175,8 +175,10 @@
fail:
if (data && !IS_ERR(data->codec_clk))
@@ -293977,9 +293391,9 @@ diff -Nur linux-4.1.6/sound/soc/fsl/imx-sgtl5000.c xbian-sources-kernel/sound/so
.pm = &snd_soc_pm_ops,
.of_match_table = imx_sgtl5000_dt_ids,
},
-diff -Nur linux-4.1.6/sound/soc/fsl/imx-spdif.c xbian-sources-kernel/sound/soc/fsl/imx-spdif.c
---- linux-4.1.6/sound/soc/fsl/imx-spdif.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/sound/soc/fsl/imx-spdif.c 2015-09-11 17:46:19.842267432 +0200
+diff -Nur linux-4.1.10.orig/sound/soc/fsl/imx-spdif.c linux-4.1.10/sound/soc/fsl/imx-spdif.c
+--- linux-4.1.10.orig/sound/soc/fsl/imx-spdif.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/sound/soc/fsl/imx-spdif.c 2015-10-10 16:41:42.989314854 +0200
@@ -66,16 +66,18 @@
if (ret)
goto end;
@@ -294011,9 +293425,9 @@ diff -Nur linux-4.1.6/sound/soc/fsl/imx-spdif.c xbian-sources-kernel/sound/soc/f
.of_match_table = imx_spdif_dt_ids,
},
.probe = imx_spdif_audio_probe,
-diff -Nur linux-4.1.6/sound/soc/fsl/imx-ssi.c xbian-sources-kernel/sound/soc/fsl/imx-ssi.c
---- linux-4.1.6/sound/soc/fsl/imx-ssi.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/sound/soc/fsl/imx-ssi.c 2015-09-11 17:46:19.842267432 +0200
+diff -Nur linux-4.1.10.orig/sound/soc/fsl/imx-ssi.c linux-4.1.10/sound/soc/fsl/imx-ssi.c
+--- linux-4.1.10.orig/sound/soc/fsl/imx-ssi.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/sound/soc/fsl/imx-ssi.c 2015-10-10 16:41:42.989314854 +0200
@@ -603,7 +603,7 @@
ssi->fiq_params.dma_params_tx = &ssi->dma_params_tx;
@@ -294023,9 +293437,9 @@ diff -Nur linux-4.1.6/sound/soc/fsl/imx-ssi.c xbian-sources-kernel/sound/soc/fsl
if (ssi->fiq_init && ssi->dma_init) {
ret = ssi->fiq_init;
-diff -Nur linux-4.1.6/sound/soc/fsl/Kconfig xbian-sources-kernel/sound/soc/fsl/Kconfig
---- linux-4.1.6/sound/soc/fsl/Kconfig 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/sound/soc/fsl/Kconfig 2015-09-11 17:46:19.826268503 +0200
+diff -Nur linux-4.1.10.orig/sound/soc/fsl/Kconfig linux-4.1.10/sound/soc/fsl/Kconfig
+--- linux-4.1.10.orig/sound/soc/fsl/Kconfig 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/sound/soc/fsl/Kconfig 2015-10-10 16:41:42.989314854 +0200
@@ -55,6 +55,9 @@
This option is only useful for out-of-tree drivers since
in-tree drivers select it automatically.
@@ -294086,9 +293500,9 @@ diff -Nur linux-4.1.6/sound/soc/fsl/Kconfig xbian-sources-kernel/sound/soc/fsl/K
config SND_SOC_FSL_ASOC_CARD
tristate "Generic ASoC Sound Card with ASRC support"
depends on OF && I2C
-diff -Nur linux-4.1.6/sound/soc/fsl/Makefile xbian-sources-kernel/sound/soc/fsl/Makefile
---- linux-4.1.6/sound/soc/fsl/Makefile 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/sound/soc/fsl/Makefile 2015-09-11 17:46:19.826268503 +0200
+diff -Nur linux-4.1.10.orig/sound/soc/fsl/Makefile linux-4.1.10/sound/soc/fsl/Makefile
+--- linux-4.1.10.orig/sound/soc/fsl/Makefile 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/sound/soc/fsl/Makefile 2015-10-10 16:41:42.989314854 +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
@@ -294131,9 +293545,9 @@ diff -Nur linux-4.1.6/sound/soc/fsl/Makefile xbian-sources-kernel/sound/soc/fsl/
+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.6/sound/soc/soc-io.c xbian-sources-kernel/sound/soc/soc-io.c
---- linux-4.1.6/sound/soc/soc-io.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/sound/soc/soc-io.c 2015-09-11 17:46:19.890264219 +0200
+diff -Nur linux-4.1.10.orig/sound/soc/soc-io.c linux-4.1.10/sound/soc/soc-io.c
+--- linux-4.1.10.orig/sound/soc/soc-io.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/sound/soc/soc-io.c 2015-10-10 16:41:42.989314854 +0200
@@ -17,6 +17,8 @@
#include <linux/export.h>
#include <sound/soc.h>
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index 71c098167..6c096ddde 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -95,6 +95,8 @@ config ADK_KERNEL_MXC_MLB
config ADK_KERNEL_MXC_MLB150
bool
+ select ADK_KERNEL_SND
+ select ADK_KERNEL_SND_PCM
config ADK_KERNEL_MFD_SM501
bool
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-13 10:09:11 +0000