From 19d8137d61cf0d9a8d88df2f7a8205cb22977a13 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 6 Dec 2015 10:25:26 +0100 Subject: solidrun-imx6: refresh patch --- .../solidrun-imx6/patches/4.1.13/0001-xbian.patch | 3245 ++++++++++---------- 1 file changed, 1580 insertions(+), 1665 deletions(-) (limited to 'target/arm') diff --git a/target/arm/solidrun-imx6/patches/4.1.13/0001-xbian.patch b/target/arm/solidrun-imx6/patches/4.1.13/0001-xbian.patch index 68b82758b..d3ce4744b 100644 --- a/target/arm/solidrun-imx6/patches/4.1.13/0001-xbian.patch +++ b/target/arm/solidrun-imx6/patches/4.1.13/0001-xbian.patch @@ -1,6 +1,6 @@ -diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6dl-cm-fx6.dts xbian-sources-kernel/arch/arm/boot/dts/imx6dl-cm-fx6.dts ---- linux-4.1.10/arch/arm/boot/dts/imx6dl-cm-fx6.dts 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6dl-cm-fx6.dts 2015-10-11 19:49:25.503432136 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/boot/dts/imx6dl-cm-fx6.dts linux-4.1.13/arch/arm/boot/dts/imx6dl-cm-fx6.dts +--- linux-4.1.13.orig/arch/arm/boot/dts/imx6dl-cm-fx6.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/arch/arm/boot/dts/imx6dl-cm-fx6.dts 2015-11-30 17:56:13.480144383 +0100 @@ -0,0 +1,21 @@ +/* + * Copyright 2015 CompuLab Ltd. @@ -23,9 +23,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6dl-cm-fx6.dts xbian-sources-kernel/ + model = "CompuLab CM-FX6"; + compatible = "compulab,cm-fx6", "fsl,imx6dl"; +}; -diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6dl.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6dl.dtsi ---- linux-4.1.10/arch/arm/boot/dts/imx6dl.dtsi 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6dl.dtsi 2015-10-11 19:49:25.503432136 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/boot/dts/imx6dl.dtsi linux-4.1.13/arch/arm/boot/dts/imx6dl.dtsi +--- linux-4.1.13.orig/arch/arm/boot/dts/imx6dl.dtsi 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/boot/dts/imx6dl.dtsi 2015-11-30 17:56:13.480144383 +0100 @@ -30,7 +30,7 @@ /* kHz uV */ 996000 1250000 @@ -182,9 +182,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6dl.dtsi xbian-sources-kernel/arch/a -&vpu { - compatible = "fsl,imx6dl-vpu", "cnm,coda960"; -}; -diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6dl-hummingboard2.dts xbian-sources-kernel/arch/arm/boot/dts/imx6dl-hummingboard2.dts ---- linux-4.1.10/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-10-11 19:49:25.503432136 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/boot/dts/imx6dl-hummingboard2.dts linux-4.1.13/arch/arm/boot/dts/imx6dl-hummingboard2.dts +--- linux-4.1.13.orig/arch/arm/boot/dts/imx6dl-hummingboard2.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/arch/arm/boot/dts/imx6dl-hummingboard2.dts 2015-11-30 17:56:13.480144383 +0100 @@ -0,0 +1,52 @@ +/* + * Device Tree file for SolidRun HummingBoard2 @@ -238,9 +238,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6dl-hummingboard2.dts xbian-sources- + model = "SolidRun HummingBoard2 Solo/DualLite"; + compatible = "solidrun,hummingboard2/dl", "fsl,imx6dl"; +}; -diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6dl-sbc-fx6.dts xbian-sources-kernel/arch/arm/boot/dts/imx6dl-sbc-fx6.dts ---- linux-4.1.10/arch/arm/boot/dts/imx6dl-sbc-fx6.dts 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6dl-sbc-fx6.dts 2015-10-11 19:49:25.503432136 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/boot/dts/imx6dl-sbc-fx6.dts linux-4.1.13/arch/arm/boot/dts/imx6dl-sbc-fx6.dts +--- linux-4.1.13.orig/arch/arm/boot/dts/imx6dl-sbc-fx6.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/arch/arm/boot/dts/imx6dl-sbc-fx6.dts 2015-11-30 17:56:13.480144383 +0100 @@ -0,0 +1,23 @@ +/* +* Copyright 2015 CompuLab Ltd. @@ -265,9 +265,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6dl-sbc-fx6.dts xbian-sources-kernel + model = "CompuLab CM-FX6 on SBC-FX6"; + compatible = "compulab,cm-fx6", "compulab,sbc-fx6", "fsl,imx6dl"; +}; -diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6dl-sbc-fx6m.dts xbian-sources-kernel/arch/arm/boot/dts/imx6dl-sbc-fx6m.dts ---- linux-4.1.10/arch/arm/boot/dts/imx6dl-sbc-fx6m.dts 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6dl-sbc-fx6m.dts 2015-10-11 19:49:25.503432136 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/boot/dts/imx6dl-sbc-fx6m.dts linux-4.1.13/arch/arm/boot/dts/imx6dl-sbc-fx6m.dts +--- linux-4.1.13.orig/arch/arm/boot/dts/imx6dl-sbc-fx6m.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/arch/arm/boot/dts/imx6dl-sbc-fx6m.dts 2015-11-30 17:56:13.480144383 +0100 @@ -0,0 +1,23 @@ +/* +* Copyright 2015 CompuLab Ltd. @@ -292,9 +292,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6dl-sbc-fx6m.dts xbian-sources-kerne + model = "CompuLab CM-FX6 on SBC-FX6m"; + compatible = "compulab,cm-fx6", "compulab,sbc-fx6m", "fsl,imx6dl"; +}; -diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6dl-vero.dts xbian-sources-kernel/arch/arm/boot/dts/imx6dl-vero.dts ---- linux-4.1.10/arch/arm/boot/dts/imx6dl-vero.dts 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6dl-vero.dts 2015-10-11 19:49:25.503432136 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/boot/dts/imx6dl-vero.dts linux-4.1.13/arch/arm/boot/dts/imx6dl-vero.dts +--- linux-4.1.13.orig/arch/arm/boot/dts/imx6dl-vero.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/arch/arm/boot/dts/imx6dl-vero.dts 2015-11-30 17:56:13.480144383 +0100 @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2014 Russell King @@ -347,9 +347,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6dl-vero.dts xbian-sources-kernel/ar + model = "OSMC Vero Rev 1.0"; + compatible = "osmc,vero1", "fsl,imx6dl"; +}; -diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6q-cm-fx6.dts xbian-sources-kernel/arch/arm/boot/dts/imx6q-cm-fx6.dts ---- linux-4.1.10/arch/arm/boot/dts/imx6q-cm-fx6.dts 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6q-cm-fx6.dts 2015-10-11 19:49:25.507431871 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/boot/dts/imx6q-cm-fx6.dts linux-4.1.13/arch/arm/boot/dts/imx6q-cm-fx6.dts +--- linux-4.1.13.orig/arch/arm/boot/dts/imx6q-cm-fx6.dts 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/boot/dts/imx6q-cm-fx6.dts 2015-11-30 17:56:13.480144383 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2013 CompuLab Ltd. @@ -454,9 +454,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6q-cm-fx6.dts xbian-sources-kernel/a - pinctrl-0 = <&pinctrl_uart4>; - status = "okay"; }; -diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6q-cm-fx6.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6q-cm-fx6.dtsi ---- linux-4.1.10/arch/arm/boot/dts/imx6q-cm-fx6.dtsi 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6q-cm-fx6.dtsi 2015-10-11 19:49:25.507431871 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/boot/dts/imx6q-cm-fx6.dtsi linux-4.1.13/arch/arm/boot/dts/imx6q-cm-fx6.dtsi +--- linux-4.1.13.orig/arch/arm/boot/dts/imx6q-cm-fx6.dtsi 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/arch/arm/boot/dts/imx6q-cm-fx6.dtsi 2015-11-30 17:56:13.480144383 +0100 @@ -0,0 +1,95 @@ +/* + * Copyright 2014 CompuLab Ltd. @@ -553,9 +553,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6q-cm-fx6.dtsi xbian-sources-kernel/ +&sata { + status = "okay"; +}; -diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-cm-fx6.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-cm-fx6.dtsi ---- linux-4.1.10/arch/arm/boot/dts/imx6qdl-cm-fx6.dtsi 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-cm-fx6.dtsi 2015-10-11 19:49:25.507431871 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/boot/dts/imx6qdl-cm-fx6.dtsi linux-4.1.13/arch/arm/boot/dts/imx6qdl-cm-fx6.dtsi +--- linux-4.1.13.orig/arch/arm/boot/dts/imx6qdl-cm-fx6.dtsi 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/arch/arm/boot/dts/imx6qdl-cm-fx6.dtsi 2015-11-30 17:56:13.484144118 +0100 @@ -0,0 +1,643 @@ +/* + * Copyright 2014 CompuLab Ltd. @@ -1200,9 +1200,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-cm-fx6.dtsi xbian-sources-kerne + pinctrl-0 = <&pinctrl_audmux>; + status = "okay"; +}; -diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi ---- linux-4.1.10/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2015-10-11 19:49:25.507431871 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-4.1.13/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi +--- linux-4.1.13.orig/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2015-11-30 17:56:13.484144118 +0100 @@ -45,11 +45,22 @@ #include @@ -1354,35 +1354,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi xbian-sources-kern }; }; -@@ -256,9 +331,24 @@ - }; - - &usdhc2 { -- pinctrl-names = "default"; -+ pinctrl-names = "default", "state_100mhz", "state_200mhz"; - pinctrl-0 = <&pinctrl_cubox_i_usdhc2_aux &pinctrl_cubox_i_usdhc2>; -+ pinctrl-1 = <&pinctrl_cubox_i_usdhc2_aux &pinctrl_cubox_i_usdhc2_100mhz>; -+ pinctrl-2 = <&pinctrl_cubox_i_usdhc2_aux &pinctrl_cubox_i_usdhc2_200mhz>; - vmmc-supply = <®_3p3v>; - cd-gpios = <&gpio1 4 0>; - status = "okay"; -+ no-1-8-v; -+}; -+ -+&dcic1 { -+ dcic_id = <0>; -+ dcic_mux = "dcic-hdmi"; -+ status = "okay"; -+}; -+ -+&dcic2 { -+ dcic_id = <1>; -+ dcic_mux = "dcic-lvds1"; -+ status = "okay"; - }; -diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl.dtsi ---- linux-4.1.10/arch/arm/boot/dts/imx6qdl.dtsi 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl.dtsi 2015-10-11 19:49:25.511431606 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/boot/dts/imx6qdl.dtsi linux-4.1.13/arch/arm/boot/dts/imx6qdl.dtsi +--- linux-4.1.13.orig/arch/arm/boot/dts/imx6qdl.dtsi 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/boot/dts/imx6qdl.dtsi 2015-11-30 17:56:13.488143852 +0100 @@ -14,6 +14,7 @@ #include @@ -1971,9 +1945,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl.dtsi xbian-sources-kernel/arch/ }; }; }; -diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi ---- linux-4.1.10/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-10-11 19:49:25.507431871 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi linux-4.1.13/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi +--- linux-4.1.13.orig/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi 2015-11-30 17:56:13.488143852 +0100 @@ -0,0 +1,686 @@ +/* + * Device Tree file for SolidRun HummingBoard2 @@ -2661,11 +2635,11 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi xbian-source + pinctrl-0 = <&pinctrl_hummingboard2_uart3>; + status = "okay"; +}; -diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi ---- linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi 2015-10-11 19:49:25.507431871 +0200 -@@ -43,8 +43,11 @@ - #include "imx6qdl-microsom-ar8035.dtsi" +diff -Nur linux-4.1.13.orig/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi linux-4.1.13/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi +--- linux-4.1.13.orig/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi 2015-11-30 17:56:13.492143584 +0100 +@@ -44,8 +44,11 @@ + #include / { - chosen { @@ -2678,7 +2652,7 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi xbian-sources }; ir_recv: ir-receiver { -@@ -52,6 +55,17 @@ +@@ -53,6 +56,17 @@ gpios = <&gpio3 5 1>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_hummingboard_gpio3_5>; @@ -2696,7 +2670,7 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi xbian-sources }; regulators { -@@ -86,6 +100,16 @@ +@@ -87,6 +101,16 @@ regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; }; @@ -2713,7 +2687,7 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi xbian-sources }; sound-sgtl5000 { -@@ -98,16 +122,50 @@ +@@ -99,16 +123,50 @@ model = "On-board Codec"; mux-ext-port = <5>; mux-int-port = <1>; @@ -2765,7 +2739,7 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi xbian-sources }; &audmux { -@@ -117,13 +175,32 @@ +@@ -118,13 +176,32 @@ &can1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_hummingboard_flexcan1>; @@ -2775,9 +2749,10 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi xbian-sources +&hdmi_core { + ipu_id = <0>; + disp_id = <0>; -+ status = "okay"; -+}; -+ + status = "okay"; + }; + +-&hdmi { +&hdmi_video { + fsl,phy_reg_vlev = <0x0294>; + fsl,phy_reg_cksymtx = <0x800d>; @@ -2785,10 +2760,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi xbian-sources +}; + +&hdmi_audio { - status = "okay"; - }; - --&hdmi { ++ status = "okay"; ++}; ++ +&ocram { + status = "okay"; +}; @@ -2800,7 +2774,7 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi xbian-sources status = "okay"; }; -@@ -132,21 +209,45 @@ +@@ -133,21 +210,45 @@ pinctrl-0 = <&pinctrl_hummingboard_i2c1>; status = "okay"; @@ -2848,7 +2822,7 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi xbian-sources }; }; -@@ -155,10 +256,47 @@ +@@ -156,10 +257,47 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_hummingboard_i2c2>; status = "okay"; @@ -2896,7 +2870,7 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi xbian-sources pinctrl_hummingboard_flexcan1: hummingboard-flexcan1 { fsl,pins = < MX6QDL_PAD_SD3_CLK__FLEXCAN1_RX 0x80000000 -@@ -192,6 +330,19 @@ +@@ -193,6 +331,19 @@ >; }; @@ -2916,7 +2890,7 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi xbian-sources pinctrl_hummingboard_pwm1: pwm1grp { fsl,pins = ; }; -@@ -219,16 +370,21 @@ +@@ -220,16 +371,21 @@ * Similar to pinctrl_usbotg_2, but we want it * pulled down for a fixed host connection. */ @@ -2940,7 +2914,7 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi xbian-sources >; }; -@@ -242,9 +398,73 @@ +@@ -243,9 +399,73 @@ MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x13059 >; }; @@ -2966,9 +2940,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi xbian-sources + MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x130f9 + >; + }; -+ }; -+}; -+ + }; + }; + +&ldb { + status = "disabled"; + @@ -2992,9 +2966,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi xbian-sources + vsync-len = <10>; + }; + }; - }; - }; - ++ }; ++}; ++ +&mipi_csi { + ipu_id = <0>; + csi_id = <1>; @@ -3014,7 +2988,7 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi xbian-sources &pwm1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_hummingboard_pwm1>; -@@ -256,10 +476,28 @@ +@@ -257,10 +477,28 @@ status = "okay"; }; @@ -3043,68 +3017,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi xbian-sources }; &ssi1 { -@@ -282,12 +520,56 @@ - }; - - &usdhc2 { -- pinctrl-names = "default"; -+ pinctrl-names = "default", "state_100mhz", "state_200mhz"; - pinctrl-0 = < - &pinctrl_hummingboard_usdhc2_aux - &pinctrl_hummingboard_usdhc2 - >; -- vmmc-supply = <®_3p3v>; -+ pinctrl-1 = < -+ &pinctrl_hummingboard_usdhc2_aux -+ &pinctrl_hummingboard_usdhc2_100mhz -+ >; -+ pinctrl-2 = < -+ &pinctrl_hummingboard_usdhc2_aux -+ &pinctrl_hummingboard_usdhc2_200mhz -+ >; -+ -+ vmmc-supply = <®_usdhc2_vbus>; - cd-gpios = <&gpio1 4 0>; - status = "okay"; - }; -+ -+&gpc { -+ fsl,cpu_pupscr_sw2iso = <0xf>; -+ fsl,cpu_pupscr_sw = <0xf>; -+ fsl,cpu_pdnscr_iso2sw = <0x1>; -+ fsl,cpu_pdnscr_iso = <0x1>; -+ status = "okay"; -+}; -+ -+&ecspi1 { -+ status = "okay"; -+ fsl,spi-num-chipselects = <1>; -+}; -+ -+&ecspi2 { -+ status = "okay"; -+ fsl,spi-num-chipselects = <2>; -+}; -+ -+&ecspi3 { -+ status = "okay"; -+ fsl,spi-num-chipselects = <3>; -+}; -+ -+&dcic1 { -+ dcic_id = <0>; -+ dcic_mux = "dcic-hdmi"; -+ status = "okay"; -+}; -+ -+&dcic2 { -+ dcic_id = <1>; -+ dcic_mux = "dcic-lvds1"; -+ status = "okay"; -+}; -diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-microsom.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-microsom.dtsi ---- linux-4.1.10/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2015-10-11 19:49:25.507431871 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/boot/dts/imx6qdl-microsom.dtsi linux-4.1.13/arch/arm/boot/dts/imx6qdl-microsom.dtsi +--- linux-4.1.13.orig/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2015-11-30 17:56:13.512142253 +0100 @@ -39,15 +39,98 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. @@ -3228,9 +3143,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-microsom.dtsi xbian-sources-ker + vmmc-supply = <®_brcm>; + status = "okay"; +}; -diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-sabresd.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-sabresd.dtsi ---- linux-4.1.10/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2015-10-11 19:49:25.507431871 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-4.1.13/arch/arm/boot/dts/imx6qdl-sabresd.dtsi +--- linux-4.1.13.orig/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2015-11-30 17:56:13.512142253 +0100 @@ -57,6 +57,13 @@ enable-active-high; }; @@ -3304,9 +3219,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-sabresd.dtsi xbian-sources-kern &pwm1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_pwm1>; -diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-sb-fx6.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-sb-fx6.dtsi ---- linux-4.1.10/arch/arm/boot/dts/imx6qdl-sb-fx6.dtsi 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-sb-fx6.dtsi 2015-10-11 19:49:25.507431871 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/boot/dts/imx6qdl-sb-fx6.dtsi linux-4.1.13/arch/arm/boot/dts/imx6qdl-sb-fx6.dtsi +--- linux-4.1.13.orig/arch/arm/boot/dts/imx6qdl-sb-fx6.dtsi 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/arch/arm/boot/dts/imx6qdl-sb-fx6.dtsi 2015-11-30 17:56:13.512142253 +0100 @@ -0,0 +1,116 @@ +/* + * Copyright 2014 CompuLab Ltd. @@ -3424,9 +3339,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-sb-fx6.dtsi xbian-sources-kerne + pinctrl-0 = <&pinctrl_flexcan1_1>; + status = "okay"; +}; -diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-sb-fx6m.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-sb-fx6m.dtsi ---- linux-4.1.10/arch/arm/boot/dts/imx6qdl-sb-fx6m.dtsi 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-sb-fx6m.dtsi 2015-10-11 19:49:25.507431871 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/boot/dts/imx6qdl-sb-fx6m.dtsi linux-4.1.13/arch/arm/boot/dts/imx6qdl-sb-fx6m.dtsi +--- linux-4.1.13.orig/arch/arm/boot/dts/imx6qdl-sb-fx6m.dtsi 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/arch/arm/boot/dts/imx6qdl-sb-fx6m.dtsi 2015-11-30 17:56:13.512142253 +0100 @@ -0,0 +1,114 @@ +/* + * Copyright 2014 CompuLab Ltd. @@ -3542,9 +3457,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-sb-fx6m.dtsi xbian-sources-kern +&mxcfb2 { + status = "okay"; +}; -diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-sb-fx6x.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-sb-fx6x.dtsi ---- linux-4.1.10/arch/arm/boot/dts/imx6qdl-sb-fx6x.dtsi 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-sb-fx6x.dtsi 2015-10-11 19:49:25.507431871 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/boot/dts/imx6qdl-sb-fx6x.dtsi linux-4.1.13/arch/arm/boot/dts/imx6qdl-sb-fx6x.dtsi +--- linux-4.1.13.orig/arch/arm/boot/dts/imx6qdl-sb-fx6x.dtsi 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/arch/arm/boot/dts/imx6qdl-sb-fx6x.dtsi 2015-11-30 17:56:13.512142253 +0100 @@ -0,0 +1,110 @@ +/* + * Copyright 2014 CompuLab Ltd. @@ -3656,9 +3571,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-sb-fx6x.dtsi xbian-sources-kern + vmmc-supply = <®_3p3v>; + status = "disabled"; +}; -diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-vero.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-vero.dtsi ---- linux-4.1.10/arch/arm/boot/dts/imx6qdl-vero.dtsi 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-vero.dtsi 2015-10-11 19:49:25.511431606 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/boot/dts/imx6qdl-vero.dtsi linux-4.1.13/arch/arm/boot/dts/imx6qdl-vero.dtsi +--- linux-4.1.13.orig/arch/arm/boot/dts/imx6qdl-vero.dtsi 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/arch/arm/boot/dts/imx6qdl-vero.dtsi 2015-11-30 17:56:13.516141986 +0100 @@ -0,0 +1,355 @@ +/* + * Copyright (C) 2014 Russell King @@ -4015,9 +3930,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-vero.dtsi xbian-sources-kernel/ + dcic_mux = "dcic-lvds1"; + status = "disabled"; +}; -diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-verosom-ar8035.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-verosom-ar8035.dtsi ---- linux-4.1.10/arch/arm/boot/dts/imx6qdl-verosom-ar8035.dtsi 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-verosom-ar8035.dtsi 2015-10-11 19:49:25.511431606 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/boot/dts/imx6qdl-verosom-ar8035.dtsi linux-4.1.13/arch/arm/boot/dts/imx6qdl-verosom-ar8035.dtsi +--- linux-4.1.13.orig/arch/arm/boot/dts/imx6qdl-verosom-ar8035.dtsi 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/arch/arm/boot/dts/imx6qdl-verosom-ar8035.dtsi 2015-11-30 17:56:13.516141986 +0100 @@ -0,0 +1,101 @@ +/* + * Copyright (C) 2013,2014 Russell King @@ -4120,9 +4035,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-verosom-ar8035.dtsi xbian-sourc + }; + }; +}; -diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-verosom.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-verosom.dtsi ---- linux-4.1.10/arch/arm/boot/dts/imx6qdl-verosom.dtsi 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-verosom.dtsi 2015-10-11 19:49:25.511431606 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/boot/dts/imx6qdl-verosom.dtsi linux-4.1.13/arch/arm/boot/dts/imx6qdl-verosom.dtsi +--- linux-4.1.13.orig/arch/arm/boot/dts/imx6qdl-verosom.dtsi 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/arch/arm/boot/dts/imx6qdl-verosom.dtsi 2015-11-30 17:56:13.516141986 +0100 @@ -0,0 +1,162 @@ +/* + * Copyright (C) 2013,2014 Russell King @@ -4286,9 +4201,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6qdl-verosom.dtsi xbian-sources-kern + vmmc-supply = <®_brcm>; + status = "okay"; +}; -diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6q.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6q.dtsi ---- linux-4.1.10/arch/arm/boot/dts/imx6q.dtsi 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6q.dtsi 2015-10-11 19:49:25.507431871 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/boot/dts/imx6q.dtsi linux-4.1.13/arch/arm/boot/dts/imx6q.dtsi +--- linux-4.1.13.orig/arch/arm/boot/dts/imx6q.dtsi 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/boot/dts/imx6q.dtsi 2015-11-30 17:56:13.516141986 +0100 @@ -14,6 +14,7 @@ / { @@ -4595,9 +4510,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6q.dtsi xbian-sources-kernel/arch/ar + "ldb_di0_div_7", "ldb_di1_div_7", + "ldb_di0_div_sel", "ldb_di1_div_sel"; }; -diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6q-hummingboard2.dts xbian-sources-kernel/arch/arm/boot/dts/imx6q-hummingboard2.dts ---- linux-4.1.10/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-10-11 19:49:25.507431871 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/boot/dts/imx6q-hummingboard2.dts linux-4.1.13/arch/arm/boot/dts/imx6q-hummingboard2.dts +--- linux-4.1.13.orig/arch/arm/boot/dts/imx6q-hummingboard2.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/arch/arm/boot/dts/imx6q-hummingboard2.dts 2015-11-30 17:56:13.516141986 +0100 @@ -0,0 +1,60 @@ +/* + * Device Tree file for SolidRun HummingBoard2 @@ -4659,9 +4574,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6q-hummingboard2.dts xbian-sources-k + fsl,transmit-atten-16ths = <9>; + fsl,no-spread-spectrum; +}; -diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6q-hummingboard.dts xbian-sources-kernel/arch/arm/boot/dts/imx6q-hummingboard.dts ---- linux-4.1.10/arch/arm/boot/dts/imx6q-hummingboard.dts 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6q-hummingboard.dts 2015-10-11 19:49:25.507431871 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/boot/dts/imx6q-hummingboard.dts linux-4.1.13/arch/arm/boot/dts/imx6q-hummingboard.dts +--- linux-4.1.13.orig/arch/arm/boot/dts/imx6q-hummingboard.dts 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/boot/dts/imx6q-hummingboard.dts 2015-11-30 17:56:13.516141986 +0100 @@ -48,6 +48,10 @@ / { model = "SolidRun HummingBoard Dual/Quad"; @@ -4685,9 +4600,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6q-hummingboard.dts xbian-sources-ke +&rtc { + status = "okay"; +}; -diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6q-sbc-fx6.dts xbian-sources-kernel/arch/arm/boot/dts/imx6q-sbc-fx6.dts ---- linux-4.1.10/arch/arm/boot/dts/imx6q-sbc-fx6.dts 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6q-sbc-fx6.dts 2015-10-11 19:49:25.507431871 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/boot/dts/imx6q-sbc-fx6.dts linux-4.1.13/arch/arm/boot/dts/imx6q-sbc-fx6.dts +--- linux-4.1.13.orig/arch/arm/boot/dts/imx6q-sbc-fx6.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/arch/arm/boot/dts/imx6q-sbc-fx6.dts 2015-11-30 17:56:13.516141986 +0100 @@ -0,0 +1,23 @@ +/* +* Copyright 2014 CompuLab Ltd. @@ -4712,9 +4627,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6q-sbc-fx6.dts xbian-sources-kernel/ + model = "CompuLab CM-FX6 on SBC-FX6"; + compatible = "compulab,cm-fx6", "compulab,sbc-fx6", "fsl,imx6q"; +}; -diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6q-sbc-fx6m.dts xbian-sources-kernel/arch/arm/boot/dts/imx6q-sbc-fx6m.dts ---- linux-4.1.10/arch/arm/boot/dts/imx6q-sbc-fx6m.dts 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6q-sbc-fx6m.dts 2015-10-11 19:49:25.507431871 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/boot/dts/imx6q-sbc-fx6m.dts linux-4.1.13/arch/arm/boot/dts/imx6q-sbc-fx6m.dts +--- linux-4.1.13.orig/arch/arm/boot/dts/imx6q-sbc-fx6m.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/arch/arm/boot/dts/imx6q-sbc-fx6m.dts 2015-11-30 17:56:13.516141986 +0100 @@ -0,0 +1,33 @@ +/* +* Copyright 2014 CompuLab Ltd. @@ -4749,9 +4664,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6q-sbc-fx6m.dts xbian-sources-kernel + disp_id = <0>; + status = "okay"; +}; -diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6sl.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6sl.dtsi ---- linux-4.1.10/arch/arm/boot/dts/imx6sl.dtsi 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6sl.dtsi 2015-10-11 19:49:25.511431606 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/boot/dts/imx6sl.dtsi linux-4.1.13/arch/arm/boot/dts/imx6sl.dtsi +--- linux-4.1.13.orig/arch/arm/boot/dts/imx6sl.dtsi 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/boot/dts/imx6sl.dtsi 2015-11-30 17:56:13.520141720 +0100 @@ -457,20 +457,21 @@ anatop-min-bit-val = <4>; anatop-min-voltage = <800000>; @@ -4802,9 +4717,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6sl.dtsi xbian-sources-kernel/arch/a fsl,anatop = <&anatop>; }; -diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6sx.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6sx.dtsi ---- linux-4.1.10/arch/arm/boot/dts/imx6sx.dtsi 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6sx.dtsi 2015-10-11 19:49:25.511431606 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/boot/dts/imx6sx.dtsi linux-4.1.13/arch/arm/boot/dts/imx6sx.dtsi +--- linux-4.1.13.orig/arch/arm/boot/dts/imx6sx.dtsi 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/boot/dts/imx6sx.dtsi 2015-11-30 17:56:13.520141720 +0100 @@ -556,20 +556,21 @@ anatop-min-bit-val = <4>; anatop-min-voltage = <800000>; @@ -4855,9 +4770,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/imx6sx.dtsi xbian-sources-kernel/arch/a fsl,anatop = <&anatop>; }; -diff -Nur linux-4.1.10/arch/arm/boot/dts/Makefile xbian-sources-kernel/arch/arm/boot/dts/Makefile ---- linux-4.1.10/arch/arm/boot/dts/Makefile 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/boot/dts/Makefile 2015-10-11 19:49:25.479433727 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/boot/dts/Makefile linux-4.1.13/arch/arm/boot/dts/Makefile +--- linux-4.1.13.orig/arch/arm/boot/dts/Makefile 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/boot/dts/Makefile 2015-11-30 17:56:13.520141720 +0100 @@ -256,6 +256,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6dl-aristainetos_4.dtb \ @@ -4914,9 +4829,9 @@ diff -Nur linux-4.1.10/arch/arm/boot/dts/Makefile xbian-sources-kernel/arch/arm/ dtb-$(CONFIG_SOC_IMX6SL) += \ imx6sl-evk.dtb \ imx6sl-warp.dtb -diff -Nur linux-4.1.10/arch/arm/configs/cm_fx6_defconfig xbian-sources-kernel/arch/arm/configs/cm_fx6_defconfig ---- linux-4.1.10/arch/arm/configs/cm_fx6_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/configs/cm_fx6_defconfig 2015-10-11 19:49:25.575427364 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/configs/cm_fx6_defconfig linux-4.1.13/arch/arm/configs/cm_fx6_defconfig +--- linux-4.1.13.orig/arch/arm/configs/cm_fx6_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/arch/arm/configs/cm_fx6_defconfig 2015-11-30 17:56:13.520141720 +0100 @@ -0,0 +1,443 @@ +CONFIG_LOCALVERSION="-cm-fx6" +CONFIG_KERNEL_LZO=y @@ -5361,9 +5276,9 @@ diff -Nur linux-4.1.10/arch/arm/configs/cm_fx6_defconfig xbian-sources-kernel/ar +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y -diff -Nur linux-4.1.10/arch/arm/configs/imx_v7_cbi_hb_base_defconfig xbian-sources-kernel/arch/arm/configs/imx_v7_cbi_hb_base_defconfig ---- linux-4.1.10/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-10-11 19:49:25.579427099 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/configs/imx_v7_cbi_hb_base_defconfig linux-4.1.13/arch/arm/configs/imx_v7_cbi_hb_base_defconfig +--- linux-4.1.13.orig/arch/arm/configs/imx_v7_cbi_hb_base_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/arch/arm/configs/imx_v7_cbi_hb_base_defconfig 2015-11-30 17:56:13.524141455 +0100 @@ -0,0 +1,367 @@ +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_KERNEL_LZO=y @@ -5732,9 +5647,9 @@ diff -Nur linux-4.1.10/arch/arm/configs/imx_v7_cbi_hb_base_defconfig xbian-sourc +CONFIG_IR_IGUANA=m +CONFIG_IR_TTUSBIR=m +CONFIG_IR_GPIO_CIR=m -diff -Nur linux-4.1.10/arch/arm/configs/imx_v7_cbi_hb_defconfig xbian-sources-kernel/arch/arm/configs/imx_v7_cbi_hb_defconfig ---- linux-4.1.10/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-10-11 19:49:25.579427099 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/configs/imx_v7_cbi_hb_defconfig linux-4.1.13/arch/arm/configs/imx_v7_cbi_hb_defconfig +--- linux-4.1.13.orig/arch/arm/configs/imx_v7_cbi_hb_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/arch/arm/configs/imx_v7_cbi_hb_defconfig 2015-11-30 17:56:13.524141455 +0100 @@ -0,0 +1,5139 @@ +# +# Automatically generated make config: don't edit @@ -10875,9 +10790,9 @@ diff -Nur linux-4.1.10/arch/arm/configs/imx_v7_cbi_hb_defconfig xbian-sources-ke +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_PROC_DEVICETREE=y + -diff -Nur linux-4.1.10/arch/arm/configs/imx_v7_cbi_hb_xbian_defconfig xbian-sources-kernel/arch/arm/configs/imx_v7_cbi_hb_xbian_defconfig ---- linux-4.1.10/arch/arm/configs/imx_v7_cbi_hb_xbian_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/configs/imx_v7_cbi_hb_xbian_defconfig 2015-10-11 19:49:25.579427099 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/configs/imx_v7_cbi_hb_xbian_defconfig linux-4.1.13/arch/arm/configs/imx_v7_cbi_hb_xbian_defconfig +--- linux-4.1.13.orig/arch/arm/configs/imx_v7_cbi_hb_xbian_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/arch/arm/configs/imx_v7_cbi_hb_xbian_defconfig 2015-11-30 17:56:13.528141189 +0100 @@ -0,0 +1,6246 @@ +# +# Automatically generated file; DO NOT EDIT. @@ -17125,9 +17040,9 @@ diff -Nur linux-4.1.10/arch/arm/configs/imx_v7_cbi_hb_xbian_defconfig xbian-sour +CONFIG_FONT_8x16=y +CONFIG_ARCH_HAS_SG_CHAIN=y +# CONFIG_VIRTUALIZATION is not set -diff -Nur linux-4.1.10/arch/arm/configs/imx_v7_defconfig xbian-sources-kernel/arch/arm/configs/imx_v7_defconfig ---- linux-4.1.10/arch/arm/configs/imx_v7_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/configs/imx_v7_defconfig 2015-10-11 19:49:25.579427099 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/configs/imx_v7_defconfig linux-4.1.13/arch/arm/configs/imx_v7_defconfig +--- linux-4.1.13.orig/arch/arm/configs/imx_v7_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/arch/arm/configs/imx_v7_defconfig 2015-11-30 17:56:13.528141189 +0100 @@ -0,0 +1,414 @@ +CONFIG_KERNEL_LZO=y +CONFIG_SYSVIPC=y @@ -17543,9 +17458,9 @@ diff -Nur linux-4.1.10/arch/arm/configs/imx_v7_defconfig xbian-sources-kernel/ar +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y -diff -Nur linux-4.1.10/arch/arm/configs/imx_v7_mfg_defconfig xbian-sources-kernel/arch/arm/configs/imx_v7_mfg_defconfig ---- linux-4.1.10/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-10-11 19:49:25.579427099 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/configs/imx_v7_mfg_defconfig linux-4.1.13/arch/arm/configs/imx_v7_mfg_defconfig +--- linux-4.1.13.orig/arch/arm/configs/imx_v7_mfg_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/arch/arm/configs/imx_v7_mfg_defconfig 2015-11-30 17:56:13.528141189 +0100 @@ -0,0 +1,332 @@ +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_KERNEL_LZO=y @@ -17879,9 +17794,9 @@ diff -Nur linux-4.1.10/arch/arm/configs/imx_v7_mfg_defconfig xbian-sources-kerne +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y -diff -Nur linux-4.1.10/arch/arm/include/asm/glue-cache.h xbian-sources-kernel/arch/arm/include/asm/glue-cache.h ---- linux-4.1.10/arch/arm/include/asm/glue-cache.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/include/asm/glue-cache.h 2015-10-11 19:49:25.595426038 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/include/asm/glue-cache.h linux-4.1.13/arch/arm/include/asm/glue-cache.h +--- linux-4.1.13.orig/arch/arm/include/asm/glue-cache.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/include/asm/glue-cache.h 2015-11-30 17:56:13.528141189 +0100 @@ -102,19 +102,19 @@ #endif @@ -17910,9 +17825,9 @@ diff -Nur linux-4.1.10/arch/arm/include/asm/glue-cache.h xbian-sources-kernel/ar #endif #if defined(CONFIG_CPU_V7M) -diff -Nur linux-4.1.10/arch/arm/Kconfig xbian-sources-kernel/arch/arm/Kconfig ---- linux-4.1.10/arch/arm/Kconfig 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/Kconfig 2015-10-11 19:49:25.475433992 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/Kconfig linux-4.1.13/arch/arm/Kconfig +--- linux-4.1.13.orig/arch/arm/Kconfig 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/Kconfig 2015-11-30 17:56:13.528141189 +0100 @@ -1689,6 +1689,7 @@ range 11 64 if ARCH_SHMOBILE_LEGACY default "12" if SOC_AM33XX @@ -17921,9 +17836,9 @@ diff -Nur linux-4.1.10/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.10/arch/arm/mach-imx/busfreq_ddr3.c xbian-sources-kernel/arch/arm/mach-imx/busfreq_ddr3.c ---- linux-4.1.10/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-10-11 19:49:25.687419940 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mach-imx/busfreq_ddr3.c linux-4.1.13/arch/arm/mach-imx/busfreq_ddr3.c +--- linux-4.1.13.orig/arch/arm/mach-imx/busfreq_ddr3.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/arch/arm/mach-imx/busfreq_ddr3.c 2015-11-30 17:56:13.528141189 +0100 @@ -0,0 +1,519 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -18444,9 +18359,9 @@ diff -Nur linux-4.1.10/arch/arm/mach-imx/busfreq_ddr3.c xbian-sources-kernel/arc + + return 0; +} -diff -Nur linux-4.1.10/arch/arm/mach-imx/busfreq-imx6.c xbian-sources-kernel/arch/arm/mach-imx/busfreq-imx6.c ---- linux-4.1.10/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-10-11 19:49:25.687419940 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mach-imx/busfreq-imx6.c linux-4.1.13/arch/arm/mach-imx/busfreq-imx6.c +--- linux-4.1.13.orig/arch/arm/mach-imx/busfreq-imx6.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/arch/arm/mach-imx/busfreq-imx6.c 2015-11-30 17:56:13.528141189 +0100 @@ -0,0 +1,994 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -19442,9 +19357,9 @@ diff -Nur linux-4.1.10/arch/arm/mach-imx/busfreq-imx6.c xbian-sources-kernel/arc +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("BusFreq driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.10/arch/arm/mach-imx/busfreq_lpddr2.c xbian-sources-kernel/arch/arm/mach-imx/busfreq_lpddr2.c ---- linux-4.1.10/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-10-11 19:49:25.691419675 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mach-imx/busfreq_lpddr2.c linux-4.1.13/arch/arm/mach-imx/busfreq_lpddr2.c +--- linux-4.1.13.orig/arch/arm/mach-imx/busfreq_lpddr2.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/arch/arm/mach-imx/busfreq_lpddr2.c 2015-11-30 17:56:13.528141189 +0100 @@ -0,0 +1,183 @@ +/* + * Copyright (C) 2011-2015 Freescale Semiconductor, Inc. All Rights Reserved. @@ -19629,9 +19544,9 @@ diff -Nur linux-4.1.10/arch/arm/mach-imx/busfreq_lpddr2.c xbian-sources-kernel/a + + return 0; +} -diff -Nur linux-4.1.10/arch/arm/mach-imx/clk.h xbian-sources-kernel/arch/arm/mach-imx/clk.h ---- linux-4.1.10/arch/arm/mach-imx/clk.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/clk.h 2015-10-11 19:49:25.691419675 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mach-imx/clk.h linux-4.1.13/arch/arm/mach-imx/clk.h +--- linux-4.1.13.orig/arch/arm/mach-imx/clk.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/mach-imx/clk.h 2015-11-30 17:56:13.528141189 +0100 @@ -55,6 +55,34 @@ shift, 0, &imx_ccm_lock, share_count); } @@ -19683,9 +19598,9 @@ diff -Nur linux-4.1.10/arch/arm/mach-imx/clk.h xbian-sources-kernel/arch/arm/mac 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.10/arch/arm/mach-imx/clk-imx1.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx1.c ---- linux-4.1.10/arch/arm/mach-imx/clk-imx1.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx1.c 2015-10-11 19:49:25.691419675 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mach-imx/clk-imx1.c linux-4.1.13/arch/arm/mach-imx/clk-imx1.c +--- linux-4.1.13.orig/arch/arm/mach-imx/clk-imx1.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/mach-imx/clk-imx1.c 2015-11-30 17:56:13.528141189 +0100 @@ -75,7 +75,8 @@ int __init mx1_clocks_init(unsigned long fref) @@ -19705,9 +19620,9 @@ diff -Nur linux-4.1.10/arch/arm/mach-imx/clk-imx1.c xbian-sources-kernel/arch/ar return 0; } -diff -Nur linux-4.1.10/arch/arm/mach-imx/clk-imx21.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx21.c ---- linux-4.1.10/arch/arm/mach-imx/clk-imx21.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx21.c 2015-10-11 19:49:25.691419675 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mach-imx/clk-imx21.c linux-4.1.13/arch/arm/mach-imx/clk-imx21.c +--- linux-4.1.13.orig/arch/arm/mach-imx/clk-imx21.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/mach-imx/clk-imx21.c 2015-11-30 17:56:13.528141189 +0100 @@ -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"); @@ -19717,9 +19632,9 @@ diff -Nur linux-4.1.10/arch/arm/mach-imx/clk-imx21.c xbian-sources-kernel/arch/a return 0; } -diff -Nur linux-4.1.10/arch/arm/mach-imx/clk-imx27.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx27.c ---- linux-4.1.10/arch/arm/mach-imx/clk-imx27.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx27.c 2015-10-11 19:49:25.691419675 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mach-imx/clk-imx27.c linux-4.1.13/arch/arm/mach-imx/clk-imx27.c +--- linux-4.1.13.orig/arch/arm/mach-imx/clk-imx27.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/mach-imx/clk-imx27.c 2015-11-30 17:56:13.528141189 +0100 @@ -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"); @@ -19729,9 +19644,9 @@ diff -Nur linux-4.1.10/arch/arm/mach-imx/clk-imx27.c xbian-sources-kernel/arch/a return 0; } -diff -Nur linux-4.1.10/arch/arm/mach-imx/clk-imx31.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx31.c ---- linux-4.1.10/arch/arm/mach-imx/clk-imx31.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx31.c 2015-10-11 19:49:25.691419675 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mach-imx/clk-imx31.c linux-4.1.13/arch/arm/mach-imx/clk-imx31.c +--- linux-4.1.13.orig/arch/arm/mach-imx/clk-imx31.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/mach-imx/clk-imx31.c 2015-11-30 17:56:13.528141189 +0100 @@ -50,9 +50,12 @@ int __init mx31_clocks_init(unsigned long fref) @@ -19755,9 +19670,9 @@ diff -Nur linux-4.1.10/arch/arm/mach-imx/clk-imx31.c xbian-sources-kernel/arch/a return 0; } -diff -Nur linux-4.1.10/arch/arm/mach-imx/clk-imx35.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx35.c ---- linux-4.1.10/arch/arm/mach-imx/clk-imx35.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx35.c 2015-10-11 19:49:25.691419675 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mach-imx/clk-imx35.c linux-4.1.13/arch/arm/mach-imx/clk-imx35.c +--- linux-4.1.13.orig/arch/arm/mach-imx/clk-imx35.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/mach-imx/clk-imx35.c 2015-11-30 17:56:13.528141189 +0100 @@ -71,11 +71,14 @@ int __init mx35_clocks_init(void) @@ -19783,9 +19698,9 @@ diff -Nur linux-4.1.10/arch/arm/mach-imx/clk-imx35.c xbian-sources-kernel/arch/a #endif return 0; -diff -Nur linux-4.1.10/arch/arm/mach-imx/clk-imx6q.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx6q.c ---- linux-4.1.10/arch/arm/mach-imx/clk-imx6q.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx6q.c 2015-10-11 19:49:25.691419675 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mach-imx/clk-imx6q.c linux-4.1.13/arch/arm/mach-imx/clk-imx6q.c +--- linux-4.1.13.orig/arch/arm/mach-imx/clk-imx6q.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/mach-imx/clk-imx6q.c 2015-11-30 17:56:13.532140921 +0100 @@ -24,7 +24,6 @@ #include "clk.h" #include "common.h" @@ -20108,9 +20023,9 @@ diff -Nur linux-4.1.10/arch/arm/mach-imx/clk-imx6q.c xbian-sources-kernel/arch/a + } } CLK_OF_DECLARE(imx6q, "fsl,imx6q-ccm", imx6q_clocks_init); -diff -Nur linux-4.1.10/arch/arm/mach-imx/clk-imx6sl.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx6sl.c ---- linux-4.1.10/arch/arm/mach-imx/clk-imx6sl.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx6sl.c 2015-10-11 19:49:25.691419675 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mach-imx/clk-imx6sl.c linux-4.1.13/arch/arm/mach-imx/clk-imx6sl.c +--- linux-4.1.13.orig/arch/arm/mach-imx/clk-imx6sl.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/mach-imx/clk-imx6sl.c 2015-11-30 17:56:13.532140921 +0100 @@ -288,9 +288,6 @@ WARN_ON(!base); ccm_base = base; @@ -20130,9 +20045,9 @@ diff -Nur linux-4.1.10/arch/arm/mach-imx/clk-imx6sl.c xbian-sources-kernel/arch/ - imx6q_set_lpm(WAIT_CLOCKED); } CLK_OF_DECLARE(imx6sl, "fsl,imx6sl-ccm", imx6sl_clocks_init); -diff -Nur linux-4.1.10/arch/arm/mach-imx/clk-imx6sx.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx6sx.c ---- linux-4.1.10/arch/arm/mach-imx/clk-imx6sx.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx6sx.c 2015-10-11 19:49:25.691419675 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mach-imx/clk-imx6sx.c linux-4.1.13/arch/arm/mach-imx/clk-imx6sx.c +--- linux-4.1.13.orig/arch/arm/mach-imx/clk-imx6sx.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/mach-imx/clk-imx6sx.c 2015-11-30 17:56:13.532140921 +0100 @@ -268,8 +268,6 @@ base = of_iomap(np, 0); WARN_ON(!base); @@ -20151,9 +20066,9 @@ diff -Nur linux-4.1.10/arch/arm/mach-imx/clk-imx6sx.c xbian-sources-kernel/arch/ - imx6q_set_lpm(WAIT_CLOCKED); } CLK_OF_DECLARE(imx6sx, "fsl,imx6sx-ccm", imx6sx_clocks_init); -diff -Nur linux-4.1.10/arch/arm/mach-imx/clk-pllv3.c xbian-sources-kernel/arch/arm/mach-imx/clk-pllv3.c ---- linux-4.1.10/arch/arm/mach-imx/clk-pllv3.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/clk-pllv3.c 2015-10-11 19:49:25.691419675 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mach-imx/clk-pllv3.c linux-4.1.13/arch/arm/mach-imx/clk-pllv3.c +--- linux-4.1.13.orig/arch/arm/mach-imx/clk-pllv3.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/mach-imx/clk-pllv3.c 2015-11-30 17:56:13.532140921 +0100 @@ -23,6 +23,7 @@ #define PLL_DENOM_OFFSET 0x20 @@ -20206,9 +20121,9 @@ diff -Nur linux-4.1.10/arch/arm/mach-imx/clk-pllv3.c xbian-sources-kernel/arch/a } static const struct clk_ops clk_pllv3_av_ops = { -diff -Nur linux-4.1.10/arch/arm/mach-imx/common.h xbian-sources-kernel/arch/arm/mach-imx/common.h ---- linux-4.1.10/arch/arm/mach-imx/common.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/common.h 2015-10-11 19:49:25.691419675 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mach-imx/common.h linux-4.1.13/arch/arm/mach-imx/common.h +--- linux-4.1.13.orig/arch/arm/mach-imx/common.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/mach-imx/common.h 2015-11-30 17:56:13.532140921 +0100 @@ -44,7 +44,7 @@ void imx31_soc_init(void); void imx35_soc_init(void); @@ -20269,9 +20184,9 @@ diff -Nur linux-4.1.10/arch/arm/mach-imx/common.h xbian-sources-kernel/arch/arm/ #ifdef CONFIG_PM void imx51_pm_init(void); -diff -Nur linux-4.1.10/arch/arm/mach-imx/common-imx6.c xbian-sources-kernel/arch/arm/mach-imx/common-imx6.c ---- linux-4.1.10/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-10-11 19:49:25.691419675 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mach-imx/common-imx6.c linux-4.1.13/arch/arm/mach-imx/common-imx6.c +--- linux-4.1.13.orig/arch/arm/mach-imx/common-imx6.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/arch/arm/mach-imx/common-imx6.c 2015-11-30 17:56:13.532140921 +0100 @@ -0,0 +1,96 @@ +/* + * Copyright 2011-2015 Freescale Semiconductor, Inc. @@ -20369,9 +20284,9 @@ diff -Nur linux-4.1.10/arch/arm/mach-imx/common-imx6.c xbian-sources-kernel/arch + } +} + -diff -Nur linux-4.1.10/arch/arm/mach-imx/cpuidle-imx6q.c xbian-sources-kernel/arch/arm/mach-imx/cpuidle-imx6q.c ---- linux-4.1.10/arch/arm/mach-imx/cpuidle-imx6q.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/cpuidle-imx6q.c 2015-10-11 19:49:25.691419675 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mach-imx/cpuidle-imx6q.c linux-4.1.13/arch/arm/mach-imx/cpuidle-imx6q.c +--- linux-4.1.13.orig/arch/arm/mach-imx/cpuidle-imx6q.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/mach-imx/cpuidle-imx6q.c 2015-11-30 17:56:13.532140921 +0100 @@ -27,9 +27,9 @@ */ if (!spin_trylock(&master_lock)) @@ -20384,9 +20299,9 @@ diff -Nur linux-4.1.10/arch/arm/mach-imx/cpuidle-imx6q.c xbian-sources-kernel/ar spin_unlock(&master_lock); goto done; } -diff -Nur linux-4.1.10/arch/arm/mach-imx/cpuidle-imx6sl.c xbian-sources-kernel/arch/arm/mach-imx/cpuidle-imx6sl.c ---- linux-4.1.10/arch/arm/mach-imx/cpuidle-imx6sl.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/cpuidle-imx6sl.c 2015-10-11 19:49:25.691419675 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mach-imx/cpuidle-imx6sl.c linux-4.1.13/arch/arm/mach-imx/cpuidle-imx6sl.c +--- linux-4.1.13.orig/arch/arm/mach-imx/cpuidle-imx6sl.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/mach-imx/cpuidle-imx6sl.c 2015-11-30 17:56:13.532140921 +0100 @@ -16,7 +16,7 @@ static int imx6sl_enter_wait(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) @@ -20405,9 +20320,9 @@ diff -Nur linux-4.1.10/arch/arm/mach-imx/cpuidle-imx6sl.c xbian-sources-kernel/a return index; } -diff -Nur linux-4.1.10/arch/arm/mach-imx/cpuidle-imx6sx.c xbian-sources-kernel/arch/arm/mach-imx/cpuidle-imx6sx.c ---- linux-4.1.10/arch/arm/mach-imx/cpuidle-imx6sx.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/cpuidle-imx6sx.c 2015-10-11 19:49:25.691419675 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mach-imx/cpuidle-imx6sx.c linux-4.1.13/arch/arm/mach-imx/cpuidle-imx6sx.c +--- linux-4.1.13.orig/arch/arm/mach-imx/cpuidle-imx6sx.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/mach-imx/cpuidle-imx6sx.c 2015-11-30 17:56:13.532140921 +0100 @@ -25,7 +25,7 @@ static int imx6sx_enter_wait(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) @@ -20426,9 +20341,9 @@ diff -Nur linux-4.1.10/arch/arm/mach-imx/cpuidle-imx6sx.c xbian-sources-kernel/a return index; } -diff -Nur linux-4.1.10/arch/arm/mach-imx/ddr3_freq_imx6.S xbian-sources-kernel/arch/arm/mach-imx/ddr3_freq_imx6.S ---- linux-4.1.10/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-10-11 19:49:25.691419675 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mach-imx/ddr3_freq_imx6.S linux-4.1.13/arch/arm/mach-imx/ddr3_freq_imx6.S +--- linux-4.1.13.orig/arch/arm/mach-imx/ddr3_freq_imx6.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/arch/arm/mach-imx/ddr3_freq_imx6.S 2015-11-30 17:56:13.532140921 +0100 @@ -0,0 +1,893 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -21323,9 +21238,9 @@ diff -Nur linux-4.1.10/arch/arm/mach-imx/ddr3_freq_imx6.S xbian-sources-kernel/a +ENTRY(mx6_do_ddr_freq_change) + .word mx6_ddr3_freq_change + .size mx6_ddr3_freq_change, . - mx6_ddr3_freq_change -diff -Nur linux-4.1.10/arch/arm/mach-imx/Kconfig xbian-sources-kernel/arch/arm/mach-imx/Kconfig ---- linux-4.1.10/arch/arm/mach-imx/Kconfig 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/Kconfig 2015-10-11 19:49:25.687419940 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mach-imx/Kconfig linux-4.1.13/arch/arm/mach-imx/Kconfig +--- linux-4.1.13.orig/arch/arm/mach-imx/Kconfig 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/mach-imx/Kconfig 2015-11-30 17:56:13.532140921 +0100 @@ -8,6 +8,7 @@ select PM_OPP if PM select SOC_BUS @@ -21334,9 +21249,9 @@ diff -Nur linux-4.1.10/arch/arm/mach-imx/Kconfig xbian-sources-kernel/arch/arm/m help Support for Freescale MXC/iMX-based family of processors -diff -Nur linux-4.1.10/arch/arm/mach-imx/lpddr2_freq_imx6.S xbian-sources-kernel/arch/arm/mach-imx/lpddr2_freq_imx6.S ---- linux-4.1.10/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-10-11 19:49:25.695419410 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mach-imx/lpddr2_freq_imx6.S linux-4.1.13/arch/arm/mach-imx/lpddr2_freq_imx6.S +--- linux-4.1.13.orig/arch/arm/mach-imx/lpddr2_freq_imx6.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/arch/arm/mach-imx/lpddr2_freq_imx6.S 2015-11-30 17:56:13.532140921 +0100 @@ -0,0 +1,484 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -21822,9 +21737,9 @@ diff -Nur linux-4.1.10/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.10/arch/arm/mach-imx/mach-imx6q.c xbian-sources-kernel/arch/arm/mach-imx/mach-imx6q.c ---- linux-4.1.10/arch/arm/mach-imx/mach-imx6q.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/mach-imx6q.c 2015-10-11 19:49:25.695419410 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mach-imx/mach-imx6q.c linux-4.1.13/arch/arm/mach-imx/mach-imx6q.c +--- linux-4.1.13.orig/arch/arm/mach-imx/mach-imx6q.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/mach-imx/mach-imx6q.c 2015-11-30 17:56:13.532140921 +0100 @@ -31,6 +31,9 @@ #include #include @@ -22021,9 +21936,9 @@ diff -Nur linux-4.1.10/arch/arm/mach-imx/mach-imx6q.c xbian-sources-kernel/arch/ } static const char * const imx6q_dt_compat[] __initconst = { -diff -Nur linux-4.1.10/arch/arm/mach-imx/mach-imx6sl.c xbian-sources-kernel/arch/arm/mach-imx/mach-imx6sl.c ---- linux-4.1.10/arch/arm/mach-imx/mach-imx6sl.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/mach-imx6sl.c 2015-10-11 19:49:25.695419410 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mach-imx/mach-imx6sl.c linux-4.1.13/arch/arm/mach-imx/mach-imx6sl.c +--- linux-4.1.13.orig/arch/arm/mach-imx/mach-imx6sl.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/mach-imx/mach-imx6sl.c 2015-11-30 17:56:13.532140921 +0100 @@ -48,6 +48,8 @@ { struct device *parent; @@ -22047,9 +21962,9 @@ diff -Nur linux-4.1.10/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.10/arch/arm/mach-imx/mach-imx6sx.c xbian-sources-kernel/arch/arm/mach-imx/mach-imx6sx.c ---- linux-4.1.10/arch/arm/mach-imx/mach-imx6sx.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/mach-imx6sx.c 2015-10-11 19:49:25.695419410 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mach-imx/mach-imx6sx.c linux-4.1.13/arch/arm/mach-imx/mach-imx6sx.c +--- linux-4.1.13.orig/arch/arm/mach-imx/mach-imx6sx.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/mach-imx/mach-imx6sx.c 2015-11-30 17:56:13.532140921 +0100 @@ -12,12 +12,135 @@ #include #include @@ -22213,9 +22128,9 @@ diff -Nur linux-4.1.10/arch/arm/mach-imx/mach-imx6sx.c xbian-sources-kernel/arch } static void __init imx6sx_init_late(void) -diff -Nur linux-4.1.10/arch/arm/mach-imx/Makefile xbian-sources-kernel/arch/arm/mach-imx/Makefile ---- linux-4.1.10/arch/arm/mach-imx/Makefile 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/Makefile 2015-10-11 19:49:25.687419940 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mach-imx/Makefile linux-4.1.13/arch/arm/mach-imx/Makefile +--- linux-4.1.13.orig/arch/arm/mach-imx/Makefile 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/mach-imx/Makefile 2015-11-30 17:56:13.532140921 +0100 @@ -28,6 +28,14 @@ obj-$(CONFIG_MXC_USE_EPIT) += epit.o obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o @@ -22244,9 +22159,9 @@ diff -Nur linux-4.1.10/arch/arm/mach-imx/Makefile xbian-sources-kernel/arch/arm/ ifeq ($(CONFIG_SUSPEND),y) AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a -diff -Nur linux-4.1.10/arch/arm/mach-imx/pm-imx6.c xbian-sources-kernel/arch/arm/mach-imx/pm-imx6.c ---- linux-4.1.10/arch/arm/mach-imx/pm-imx6.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/pm-imx6.c 2015-10-11 19:49:25.699419145 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mach-imx/pm-imx6.c linux-4.1.13/arch/arm/mach-imx/pm-imx6.c +--- linux-4.1.13.orig/arch/arm/mach-imx/pm-imx6.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/mach-imx/pm-imx6.c 2015-11-30 17:56:13.532140921 +0100 @@ -89,6 +89,7 @@ struct imx6_pm_socdata { @@ -22400,9 +22315,9 @@ diff -Nur linux-4.1.10/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.10/arch/arm/mach-imx/src.c xbian-sources-kernel/arch/arm/mach-imx/src.c ---- linux-4.1.10/arch/arm/mach-imx/src.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/src.c 2015-10-11 19:49:25.699419145 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mach-imx/src.c linux-4.1.13/arch/arm/mach-imx/src.c +--- linux-4.1.13.orig/arch/arm/mach-imx/src.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/mach-imx/src.c 2015-11-30 17:56:13.532140921 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2011 Freescale Semiconductor, Inc. @@ -22453,9 +22368,9 @@ diff -Nur linux-4.1.10/arch/arm/mach-imx/src.c xbian-sources-kernel/arch/arm/mac val &= ~(1 << BP_SRC_SCR_WARM_RESET_ENABLE); writel_relaxed(val, src_base + SRC_SCR); spin_unlock(&scr_lock); -diff -Nur linux-4.1.10/arch/arm/mach-imx/system.c xbian-sources-kernel/arch/arm/mach-imx/system.c ---- linux-4.1.10/arch/arm/mach-imx/system.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/system.c 2015-10-11 19:49:25.699419145 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mach-imx/system.c linux-4.1.13/arch/arm/mach-imx/system.c +--- linux-4.1.13.orig/arch/arm/mach-imx/system.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/mach-imx/system.c 2015-11-30 17:56:13.532140921 +0100 @@ -34,6 +34,7 @@ static void __iomem *wdog_base; @@ -22524,9 +22439,9 @@ diff -Nur linux-4.1.10/arch/arm/mach-imx/system.c xbian-sources-kernel/arch/arm/ #ifdef CONFIG_CACHE_L2X0 void __init imx_init_l2cache(void) { -diff -Nur linux-4.1.10/arch/arm/mach-imx/time.c xbian-sources-kernel/arch/arm/mach-imx/time.c ---- linux-4.1.10/arch/arm/mach-imx/time.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/time.c 2015-10-11 19:49:25.699419145 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mach-imx/time.c linux-4.1.13/arch/arm/mach-imx/time.c +--- linux-4.1.13.orig/arch/arm/mach-imx/time.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/mach-imx/time.c 2015-11-30 17:56:13.532140921 +0100 @@ -28,6 +28,7 @@ #include #include @@ -22830,18 +22745,18 @@ diff -Nur linux-4.1.10/arch/arm/mach-imx/time.c xbian-sources-kernel/arch/arm/ma } 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.10/arch/arm/mm/cache-v7.S xbian-sources-kernel/arch/arm/mm/cache-v7.S ---- linux-4.1.10/arch/arm/mm/cache-v7.S 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mm/cache-v7.S 2015-10-11 19:49:25.915404828 +0200 +diff -Nur linux-4.1.13.orig/arch/arm/mm/cache-v7.S linux-4.1.13/arch/arm/mm/cache-v7.S +--- linux-4.1.13.orig/arch/arm/mm/cache-v7.S 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/arch/arm/mm/cache-v7.S 2015-11-30 17:56:13.532140921 +0100 @@ -446,3 +446,5 @@ @ define struct cpu_cache_fns (see and proc-macros.S) define_cache_functions v7 + + .long v7_dma_flush_range -diff -Nur linux-4.1.10/block/bfq-cgroup.c xbian-sources-kernel/block/bfq-cgroup.c ---- linux-4.1.10/block/bfq-cgroup.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/block/bfq-cgroup.c 2015-10-11 19:49:27.315312034 +0200 +diff -Nur linux-4.1.13.orig/block/bfq-cgroup.c linux-4.1.13/block/bfq-cgroup.c +--- linux-4.1.13.orig/block/bfq-cgroup.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/block/bfq-cgroup.c 2015-11-30 17:56:13.536140654 +0100 @@ -0,0 +1,936 @@ +/* + * BFQ: CGROUPS support. @@ -23779,9 +23694,9 @@ diff -Nur linux-4.1.10/block/bfq-cgroup.c xbian-sources-kernel/block/bfq-cgroup. + return bfqg; +} +#endif -diff -Nur linux-4.1.10/block/bfq.h xbian-sources-kernel/block/bfq.h ---- linux-4.1.10/block/bfq.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/block/bfq.h 2015-10-11 19:49:27.315312034 +0200 +diff -Nur linux-4.1.13.orig/block/bfq.h linux-4.1.13/block/bfq.h +--- linux-4.1.13.orig/block/bfq.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/block/bfq.h 2015-11-30 17:56:13.536140654 +0100 @@ -0,0 +1,811 @@ +/* + * BFQ-v7r7 for 4.0.0: data structures and common functions prototypes. @@ -24594,9 +24509,9 @@ diff -Nur linux-4.1.10/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.10/block/bfq-ioc.c xbian-sources-kernel/block/bfq-ioc.c ---- linux-4.1.10/block/bfq-ioc.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/block/bfq-ioc.c 2015-10-11 19:49:27.315312034 +0200 +diff -Nur linux-4.1.13.orig/block/bfq-ioc.c linux-4.1.13/block/bfq-ioc.c +--- linux-4.1.13.orig/block/bfq-ioc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/block/bfq-ioc.c 2015-11-30 17:56:13.536140654 +0100 @@ -0,0 +1,36 @@ +/* + * BFQ: I/O context handling. @@ -24634,9 +24549,9 @@ diff -Nur linux-4.1.10/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.10/block/bfq-iosched.c xbian-sources-kernel/block/bfq-iosched.c ---- linux-4.1.10/block/bfq-iosched.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/block/bfq-iosched.c 2015-10-11 19:49:27.315312034 +0200 +diff -Nur linux-4.1.13.orig/block/bfq-iosched.c linux-4.1.13/block/bfq-iosched.c +--- linux-4.1.13.orig/block/bfq-iosched.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/block/bfq-iosched.c 2015-11-30 17:56:13.536140654 +0100 @@ -0,0 +1,4223 @@ +/* + * Budget Fair Queueing (BFQ) disk scheduler. @@ -28861,9 +28776,9 @@ diff -Nur linux-4.1.10/block/bfq-iosched.c xbian-sources-kernel/block/bfq-iosche + +MODULE_AUTHOR("Fabio Checconi, Paolo Valente"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.10/block/bfq-sched.c xbian-sources-kernel/block/bfq-sched.c ---- linux-4.1.10/block/bfq-sched.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/block/bfq-sched.c 2015-10-11 19:49:27.315312034 +0200 +diff -Nur linux-4.1.13.orig/block/bfq-sched.c linux-4.1.13/block/bfq-sched.c +--- linux-4.1.13.orig/block/bfq-sched.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/block/bfq-sched.c 2015-11-30 17:56:13.536140654 +0100 @@ -0,0 +1,1186 @@ +/* + * BFQ: Hierarchical B-WF2Q+ scheduler. @@ -30051,9 +29966,9 @@ diff -Nur linux-4.1.10/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.10/block/Kconfig.iosched xbian-sources-kernel/block/Kconfig.iosched ---- linux-4.1.10/block/Kconfig.iosched 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/block/Kconfig.iosched 2015-10-11 19:49:27.315312034 +0200 +diff -Nur linux-4.1.13.orig/block/Kconfig.iosched linux-4.1.13/block/Kconfig.iosched +--- linux-4.1.13.orig/block/Kconfig.iosched 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/block/Kconfig.iosched 2015-11-30 17:56:13.536140654 +0100 @@ -39,6 +39,27 @@ ---help--- Enable group IO scheduling in CFQ. @@ -30107,9 +30022,9 @@ diff -Nur linux-4.1.10/block/Kconfig.iosched xbian-sources-kernel/block/Kconfig. default "noop" if DEFAULT_NOOP endmenu -diff -Nur linux-4.1.10/block/Makefile xbian-sources-kernel/block/Makefile ---- linux-4.1.10/block/Makefile 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/block/Makefile 2015-10-11 19:49:27.315312034 +0200 +diff -Nur linux-4.1.13.orig/block/Makefile linux-4.1.13/block/Makefile +--- linux-4.1.13.orig/block/Makefile 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/block/Makefile 2015-11-30 17:56:13.536140654 +0100 @@ -18,6 +18,7 @@ obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o @@ -30118,9 +30033,9 @@ diff -Nur linux-4.1.10/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.10/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt xbian-sources-kernel/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt ---- linux-4.1.10/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt 2015-10-11 19:49:25.087459709 +0200 +diff -Nur linux-4.1.13.orig/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt linux-4.1.13/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt +--- linux-4.1.13.orig/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt 2015-11-30 17:56:13.540140388 +0100 @@ -0,0 +1,118 @@ +* FSL IPUv3 Display/FB + @@ -30240,9 +30155,9 @@ diff -Nur linux-4.1.10/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt xbi + late_init = <0>; + status = "okay"; + }; -diff -Nur linux-4.1.10/Documentation/devicetree/bindings/regulator/ltc3676.txt xbian-sources-kernel/Documentation/devicetree/bindings/regulator/ltc3676.txt ---- linux-4.1.10/Documentation/devicetree/bindings/regulator/ltc3676.txt 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/Documentation/devicetree/bindings/regulator/ltc3676.txt 2015-10-11 19:49:25.151455467 +0200 +diff -Nur linux-4.1.13.orig/Documentation/devicetree/bindings/regulator/ltc3676.txt linux-4.1.13/Documentation/devicetree/bindings/regulator/ltc3676.txt +--- linux-4.1.13.orig/Documentation/devicetree/bindings/regulator/ltc3676.txt 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/Documentation/devicetree/bindings/regulator/ltc3676.txt 2015-11-30 17:56:13.540140388 +0100 @@ -0,0 +1,103 @@ +Linear Technology LTC3676 8-output regulators + @@ -30347,9 +30262,9 @@ diff -Nur linux-4.1.10/Documentation/devicetree/bindings/regulator/ltc3676.txt x + }; + }; + }; -diff -Nur linux-4.1.10/Documentation/devicetree/bindings/vendor-prefixes.txt xbian-sources-kernel/Documentation/devicetree/bindings/vendor-prefixes.txt ---- linux-4.1.10/Documentation/devicetree/bindings/vendor-prefixes.txt 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/Documentation/devicetree/bindings/vendor-prefixes.txt 2015-10-11 19:49:25.163454672 +0200 +diff -Nur linux-4.1.13.orig/Documentation/devicetree/bindings/vendor-prefixes.txt linux-4.1.13/Documentation/devicetree/bindings/vendor-prefixes.txt +--- linux-4.1.13.orig/Documentation/devicetree/bindings/vendor-prefixes.txt 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/Documentation/devicetree/bindings/vendor-prefixes.txt 2015-11-30 17:56:13.540140388 +0100 @@ -201,6 +201,7 @@ variscite Variscite Ltd. via VIA Technologies, Inc. @@ -30358,9 +30273,9 @@ diff -Nur linux-4.1.10/Documentation/devicetree/bindings/vendor-prefixes.txt xbi voipac Voipac Technologies s.r.o. winbond Winbond Electronics corp. wlf Wolfson Microelectronics -diff -Nur linux-4.1.10/Documentation/tda1997x xbian-sources-kernel/Documentation/tda1997x ---- linux-4.1.10/Documentation/tda1997x 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/Documentation/tda1997x 2015-10-11 19:49:25.303445392 +0200 +diff -Nur linux-4.1.13.orig/Documentation/tda1997x linux-4.1.13/Documentation/tda1997x +--- linux-4.1.13.orig/Documentation/tda1997x 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/Documentation/tda1997x 2015-11-30 17:56:13.540140388 +0100 @@ -0,0 +1,31 @@ +The NXP TDA19971/19972 are HDMI receiver devices that decode HDMI +input signals and present a configurable parallel video output bus and @@ -30393,9 +30308,9 @@ diff -Nur linux-4.1.10/Documentation/tda1997x xbian-sources-kernel/Documentation +separate platform specific ASoC SoC DAI driver can interact with the core +to obtain information about the audio data format which is dependent upon +the HDMI input signal. -diff -Nur linux-4.1.10/drivers/bluetooth/bt3c_cs.c xbian-sources-kernel/drivers/bluetooth/bt3c_cs.c ---- linux-4.1.10/drivers/bluetooth/bt3c_cs.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/bluetooth/bt3c_cs.c 2015-10-11 19:49:27.551296392 +0200 +diff -Nur linux-4.1.13.orig/drivers/bluetooth/bt3c_cs.c linux-4.1.13/drivers/bluetooth/bt3c_cs.c +--- linux-4.1.13.orig/drivers/bluetooth/bt3c_cs.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/bluetooth/bt3c_cs.c 2015-11-30 17:56:13.540140388 +0100 @@ -202,9 +202,8 @@ /* Send frame */ len = bt3c_write(iobase, 256, skb->data, skb->len); @@ -30407,9 +30322,9 @@ diff -Nur linux-4.1.10/drivers/bluetooth/bt3c_cs.c xbian-sources-kernel/drivers/ kfree_skb(skb); -diff -Nur linux-4.1.10/drivers/bluetooth/btbcm.c xbian-sources-kernel/drivers/bluetooth/btbcm.c ---- linux-4.1.10/drivers/bluetooth/btbcm.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/bluetooth/btbcm.c 2015-10-11 19:49:27.551296392 +0200 +diff -Nur linux-4.1.13.orig/drivers/bluetooth/btbcm.c linux-4.1.13/drivers/bluetooth/btbcm.c +--- linux-4.1.13.orig/drivers/bluetooth/btbcm.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/bluetooth/btbcm.c 2015-11-30 17:56:13.540140388 +0100 @@ -33,6 +33,7 @@ #define VERSION "0.1" @@ -30624,9 +30539,9 @@ diff -Nur linux-4.1.10/drivers/bluetooth/btbcm.c xbian-sources-kernel/drivers/bl /* Reset */ err = btbcm_reset(hdev); -diff -Nur linux-4.1.10/drivers/bluetooth/btbcm.h xbian-sources-kernel/drivers/bluetooth/btbcm.h ---- linux-4.1.10/drivers/bluetooth/btbcm.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/bluetooth/btbcm.h 2015-10-11 19:49:27.551296392 +0200 +diff -Nur linux-4.1.13.orig/drivers/bluetooth/btbcm.h linux-4.1.13/drivers/bluetooth/btbcm.h +--- linux-4.1.13.orig/drivers/bluetooth/btbcm.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/bluetooth/btbcm.h 2015-11-30 17:56:13.540140388 +0100 @@ -21,15 +21,61 @@ * */ @@ -30716,9 +30631,9 @@ diff -Nur linux-4.1.10/drivers/bluetooth/btbcm.h xbian-sources-kernel/drivers/bl +} #endif -diff -Nur linux-4.1.10/drivers/bluetooth/btintel.c xbian-sources-kernel/drivers/bluetooth/btintel.c ---- linux-4.1.10/drivers/bluetooth/btintel.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/bluetooth/btintel.c 2015-10-11 19:49:27.551296392 +0200 +diff -Nur linux-4.1.13.orig/drivers/bluetooth/btintel.c linux-4.1.13/drivers/bluetooth/btintel.c +--- linux-4.1.13.orig/drivers/bluetooth/btintel.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/bluetooth/btintel.c 2015-11-30 17:56:13.540140388 +0100 @@ -53,12 +53,6 @@ } @@ -30732,9 +30647,9 @@ diff -Nur linux-4.1.10/drivers/bluetooth/btintel.c xbian-sources-kernel/drivers/ /* 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.10/drivers/bluetooth/btmrvl_sdio.c xbian-sources-kernel/drivers/bluetooth/btmrvl_sdio.c ---- linux-4.1.10/drivers/bluetooth/btmrvl_sdio.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/bluetooth/btmrvl_sdio.c 2015-10-11 19:49:27.551296392 +0200 +diff -Nur linux-4.1.13.orig/drivers/bluetooth/btmrvl_sdio.c linux-4.1.13/drivers/bluetooth/btmrvl_sdio.c +--- linux-4.1.13.orig/drivers/bluetooth/btmrvl_sdio.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/bluetooth/btmrvl_sdio.c 2015-11-30 17:56:13.540140388 +0100 @@ -1217,7 +1217,7 @@ unsigned int reg, reg_start, reg_end; enum rdwr_status stat; @@ -30744,9 +30659,9 @@ diff -Nur linux-4.1.10/drivers/bluetooth/btmrvl_sdio.c xbian-sources-kernel/driv u32 memory_size, fw_dump_len = 0; /* dump sdio register first */ -diff -Nur linux-4.1.10/drivers/bluetooth/btrtl.c xbian-sources-kernel/drivers/bluetooth/btrtl.c ---- linux-4.1.10/drivers/bluetooth/btrtl.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/bluetooth/btrtl.c 2015-10-11 19:49:27.551296392 +0200 +diff -Nur linux-4.1.13.orig/drivers/bluetooth/btrtl.c linux-4.1.13/drivers/bluetooth/btrtl.c +--- linux-4.1.13.orig/drivers/bluetooth/btrtl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/bluetooth/btrtl.c 2015-11-30 17:56:13.540140388 +0100 @@ -0,0 +1,390 @@ +/* + * Bluetooth support for Realtek devices @@ -31138,9 +31053,9 @@ diff -Nur linux-4.1.10/drivers/bluetooth/btrtl.c xbian-sources-kernel/drivers/bl +MODULE_DESCRIPTION("Bluetooth support for Realtek devices ver " VERSION); +MODULE_VERSION(VERSION); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.10/drivers/bluetooth/btrtl.h xbian-sources-kernel/drivers/bluetooth/btrtl.h ---- linux-4.1.10/drivers/bluetooth/btrtl.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/bluetooth/btrtl.h 2015-10-11 19:49:27.551296392 +0200 +diff -Nur linux-4.1.13.orig/drivers/bluetooth/btrtl.h linux-4.1.13/drivers/bluetooth/btrtl.h +--- linux-4.1.13.orig/drivers/bluetooth/btrtl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/bluetooth/btrtl.h 2015-11-30 17:56:13.540140388 +0100 @@ -0,0 +1,52 @@ +/* + * Bluetooth support for Realtek devices @@ -31194,9 +31109,9 @@ diff -Nur linux-4.1.10/drivers/bluetooth/btrtl.h xbian-sources-kernel/drivers/bl +} + +#endif -diff -Nur linux-4.1.10/drivers/bluetooth/btusb.c xbian-sources-kernel/drivers/bluetooth/btusb.c ---- linux-4.1.10/drivers/bluetooth/btusb.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/bluetooth/btusb.c 2015-10-11 19:49:27.555296127 +0200 +diff -Nur linux-4.1.13.orig/drivers/bluetooth/btusb.c linux-4.1.13/drivers/bluetooth/btusb.c +--- linux-4.1.13.orig/drivers/bluetooth/btusb.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/bluetooth/btusb.c 2015-11-30 17:56:13.540140388 +0100 @@ -31,13 +31,14 @@ #include "btintel.h" @@ -31848,9 +31763,9 @@ diff -Nur linux-4.1.10/drivers/bluetooth/btusb.c xbian-sources-kernel/drivers/bl return 0; } -diff -Nur linux-4.1.10/drivers/bluetooth/btwilink.c xbian-sources-kernel/drivers/bluetooth/btwilink.c ---- linux-4.1.10/drivers/bluetooth/btwilink.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/bluetooth/btwilink.c 2015-10-11 19:49:27.555296127 +0200 +diff -Nur linux-4.1.13.orig/drivers/bluetooth/btwilink.c linux-4.1.13/drivers/bluetooth/btwilink.c +--- linux-4.1.13.orig/drivers/bluetooth/btwilink.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/bluetooth/btwilink.c 2015-11-30 17:56:13.540140388 +0100 @@ -22,7 +22,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * @@ -31860,9 +31775,9 @@ diff -Nur linux-4.1.10/drivers/bluetooth/btwilink.c xbian-sources-kernel/drivers #include #include #include -diff -Nur linux-4.1.10/drivers/bluetooth/hci_ath.c xbian-sources-kernel/drivers/bluetooth/hci_ath.c ---- linux-4.1.10/drivers/bluetooth/hci_ath.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/bluetooth/hci_ath.c 2015-10-11 19:49:27.555296127 +0200 +diff -Nur linux-4.1.13.orig/drivers/bluetooth/hci_ath.c linux-4.1.13/drivers/bluetooth/hci_ath.c +--- linux-4.1.13.orig/drivers/bluetooth/hci_ath.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/bluetooth/hci_ath.c 2015-11-30 17:56:13.540140388 +0100 @@ -192,6 +192,7 @@ if (IS_ERR(ath->rx_skb)) { int err = PTR_ERR(ath->rx_skb); @@ -31871,9 +31786,9 @@ diff -Nur linux-4.1.10/drivers/bluetooth/hci_ath.c xbian-sources-kernel/drivers/ return err; } -diff -Nur linux-4.1.10/drivers/bluetooth/hci_bcm.c xbian-sources-kernel/drivers/bluetooth/hci_bcm.c ---- linux-4.1.10/drivers/bluetooth/hci_bcm.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/bluetooth/hci_bcm.c 2015-10-11 19:49:27.555296127 +0200 +diff -Nur linux-4.1.13.orig/drivers/bluetooth/hci_bcm.c linux-4.1.13/drivers/bluetooth/hci_bcm.c +--- linux-4.1.13.orig/drivers/bluetooth/hci_bcm.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/bluetooth/hci_bcm.c 2015-11-30 17:56:13.540140388 +0100 @@ -24,6 +24,7 @@ #include #include @@ -32024,9 +31939,9 @@ diff -Nur linux-4.1.10/drivers/bluetooth/hci_bcm.c xbian-sources-kernel/drivers/ .recv = bcm_recv, .enqueue = bcm_enqueue, .dequeue = bcm_dequeue, -diff -Nur linux-4.1.10/drivers/bluetooth/hci_bcsp.c xbian-sources-kernel/drivers/bluetooth/hci_bcsp.c ---- linux-4.1.10/drivers/bluetooth/hci_bcsp.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/bluetooth/hci_bcsp.c 2015-10-11 19:49:27.555296127 +0200 +diff -Nur linux-4.1.13.orig/drivers/bluetooth/hci_bcsp.c linux-4.1.13/drivers/bluetooth/hci_bcsp.c +--- linux-4.1.13.orig/drivers/bluetooth/hci_bcsp.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/bluetooth/hci_bcsp.c 2015-11-30 17:56:13.540140388 +0100 @@ -47,8 +47,8 @@ #include "hci_uart.h" @@ -32095,9 +32010,9 @@ diff -Nur linux-4.1.10/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.10/drivers/bluetooth/hci_h4.c xbian-sources-kernel/drivers/bluetooth/hci_h4.c ---- linux-4.1.10/drivers/bluetooth/hci_h4.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/bluetooth/hci_h4.c 2015-10-11 19:49:27.555296127 +0200 +diff -Nur linux-4.1.13.orig/drivers/bluetooth/hci_h4.c linux-4.1.13/drivers/bluetooth/hci_h4.c +--- linux-4.1.13.orig/drivers/bluetooth/hci_h4.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/bluetooth/hci_h4.c 2015-11-30 17:56:13.540140388 +0100 @@ -133,6 +133,7 @@ if (IS_ERR(h4->rx_skb)) { int err = PTR_ERR(h4->rx_skb); @@ -32106,9 +32021,9 @@ diff -Nur linux-4.1.10/drivers/bluetooth/hci_h4.c xbian-sources-kernel/drivers/b return err; } -diff -Nur linux-4.1.10/drivers/bluetooth/hci_ldisc.c xbian-sources-kernel/drivers/bluetooth/hci_ldisc.c ---- linux-4.1.10/drivers/bluetooth/hci_ldisc.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/bluetooth/hci_ldisc.c 2015-10-11 19:49:27.555296127 +0200 +diff -Nur linux-4.1.13.orig/drivers/bluetooth/hci_ldisc.c linux-4.1.13/drivers/bluetooth/hci_ldisc.c +--- linux-4.1.13.orig/drivers/bluetooth/hci_ldisc.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/bluetooth/hci_ldisc.c 2015-11-30 17:56:13.540140388 +0100 @@ -40,6 +40,7 @@ #include #include @@ -32251,9 +32166,9 @@ diff -Nur linux-4.1.10/drivers/bluetooth/hci_ldisc.c xbian-sources-kernel/driver if (hu->proto->setup) return hu->proto->setup(hu); -diff -Nur linux-4.1.10/drivers/bluetooth/hci_uart.h xbian-sources-kernel/drivers/bluetooth/hci_uart.h ---- linux-4.1.10/drivers/bluetooth/hci_uart.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/bluetooth/hci_uart.h 2015-10-11 19:49:27.555296127 +0200 +diff -Nur linux-4.1.13.orig/drivers/bluetooth/hci_uart.h linux-4.1.13/drivers/bluetooth/hci_uart.h +--- linux-4.1.13.orig/drivers/bluetooth/hci_uart.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/bluetooth/hci_uart.h 2015-11-30 17:56:13.540140388 +0100 @@ -58,10 +58,13 @@ struct hci_uart_proto { unsigned int id; @@ -32290,9 +32205,9 @@ diff -Nur linux-4.1.10/drivers/bluetooth/hci_uart.h xbian-sources-kernel/drivers #ifdef CONFIG_BT_HCIUART_H4 int h4_init(void); -diff -Nur linux-4.1.10/drivers/bluetooth/hci_vhci.c xbian-sources-kernel/drivers/bluetooth/hci_vhci.c ---- linux-4.1.10/drivers/bluetooth/hci_vhci.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/bluetooth/hci_vhci.c 2015-10-11 19:49:27.555296127 +0200 +diff -Nur linux-4.1.13.orig/drivers/bluetooth/hci_vhci.c linux-4.1.13/drivers/bluetooth/hci_vhci.c +--- linux-4.1.13.orig/drivers/bluetooth/hci_vhci.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/bluetooth/hci_vhci.c 2015-11-30 17:56:13.540140388 +0100 @@ -366,7 +366,7 @@ .llseek = no_llseek, }; @@ -32302,9 +32217,9 @@ diff -Nur linux-4.1.10/drivers/bluetooth/hci_vhci.c xbian-sources-kernel/drivers .name = "vhci", .fops = &vhci_fops, .minor = VHCI_MINOR, -diff -Nur linux-4.1.10/drivers/bluetooth/Kconfig xbian-sources-kernel/drivers/bluetooth/Kconfig ---- linux-4.1.10/drivers/bluetooth/Kconfig 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/bluetooth/Kconfig 2015-10-11 19:49:27.551296392 +0200 +diff -Nur linux-4.1.13.orig/drivers/bluetooth/Kconfig linux-4.1.13/drivers/bluetooth/Kconfig +--- linux-4.1.13.orig/drivers/bluetooth/Kconfig 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/bluetooth/Kconfig 2015-11-30 17:56:13.544140122 +0100 @@ -9,6 +9,10 @@ tristate select FW_LOADER @@ -32334,9 +32249,9 @@ diff -Nur linux-4.1.10/drivers/bluetooth/Kconfig xbian-sources-kernel/drivers/bl config BT_HCIBTSDIO tristate "HCI SDIO driver" depends on MMC -diff -Nur linux-4.1.10/drivers/bluetooth/Makefile xbian-sources-kernel/drivers/bluetooth/Makefile ---- linux-4.1.10/drivers/bluetooth/Makefile 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/bluetooth/Makefile 2015-10-11 19:49:27.551296392 +0200 +diff -Nur linux-4.1.13.orig/drivers/bluetooth/Makefile linux-4.1.13/drivers/bluetooth/Makefile +--- linux-4.1.13.orig/drivers/bluetooth/Makefile 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/bluetooth/Makefile 2015-11-30 17:56:13.544140122 +0100 @@ -21,6 +21,7 @@ obj-$(CONFIG_BT_MRVL_SDIO) += btmrvl_sdio.o obj-$(CONFIG_BT_WILINK) += btwilink.o @@ -32345,9 +32260,9 @@ diff -Nur linux-4.1.10/drivers/bluetooth/Makefile xbian-sources-kernel/drivers/b btmrvl-y := btmrvl_main.o btmrvl-$(CONFIG_DEBUG_FS) += btmrvl_debugfs.o -diff -Nur linux-4.1.10/drivers/char/frandom.c xbian-sources-kernel/drivers/char/frandom.c ---- linux-4.1.10/drivers/char/frandom.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/char/frandom.c 2015-10-11 19:49:27.563295596 +0200 +diff -Nur linux-4.1.13.orig/drivers/char/frandom.c linux-4.1.13/drivers/char/frandom.c +--- linux-4.1.13.orig/drivers/char/frandom.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/char/frandom.c 2015-11-30 17:56:13.544140122 +0100 @@ -0,0 +1,415 @@ +/* +** frandom.c @@ -32764,9 +32679,9 @@ diff -Nur linux-4.1.10/drivers/char/frandom.c xbian-sources-kernel/drivers/char/ +module_exit(frandom_cleanup_module); + +EXPORT_SYMBOL(erandom_get_random_bytes); -diff -Nur linux-4.1.10/drivers/char/Makefile xbian-sources-kernel/drivers/char/Makefile ---- linux-4.1.10/drivers/char/Makefile 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/char/Makefile 2015-10-11 19:49:27.559295861 +0200 +diff -Nur linux-4.1.13.orig/drivers/char/Makefile linux-4.1.13/drivers/char/Makefile +--- linux-4.1.13.orig/drivers/char/Makefile 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/char/Makefile 2015-11-30 17:56:13.544140122 +0100 @@ -2,6 +2,7 @@ # Makefile for the kernel character device drivers. # @@ -32775,9 +32690,9 @@ diff -Nur linux-4.1.10/drivers/char/Makefile xbian-sources-kernel/drivers/char/M obj-y += mem.o random.o obj-$(CONFIG_TTY_PRINTK) += ttyprintk.o obj-y += misc.o -diff -Nur linux-4.1.10/drivers/cpufreq/imx6q-cpufreq.c xbian-sources-kernel/drivers/cpufreq/imx6q-cpufreq.c ---- linux-4.1.10/drivers/cpufreq/imx6q-cpufreq.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/cpufreq/imx6q-cpufreq.c 2015-10-11 19:49:27.647290029 +0200 +diff -Nur linux-4.1.13.orig/drivers/cpufreq/imx6q-cpufreq.c linux-4.1.13/drivers/cpufreq/imx6q-cpufreq.c +--- linux-4.1.13.orig/drivers/cpufreq/imx6q-cpufreq.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/cpufreq/imx6q-cpufreq.c 2015-11-30 17:56:13.544140122 +0100 @@ -20,6 +20,8 @@ #define PU_SOC_VOLTAGE_HIGH 1275000 #define FREQ_1P2_GHZ 1200000000 @@ -32867,9 +32782,9 @@ diff -Nur linux-4.1.10/drivers/cpufreq/imx6q-cpufreq.c xbian-sources-kernel/driv break; } } -diff -Nur linux-4.1.10/drivers/crypto/caam/caamalg.c xbian-sources-kernel/drivers/crypto/caam/caamalg.c ---- linux-4.1.10/drivers/crypto/caam/caamalg.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/crypto/caam/caamalg.c 2015-10-11 19:49:27.655289498 +0200 +diff -Nur linux-4.1.13.orig/drivers/crypto/caam/caamalg.c linux-4.1.13/drivers/crypto/caam/caamalg.c +--- linux-4.1.13.orig/drivers/crypto/caam/caamalg.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/crypto/caam/caamalg.c 2015-11-30 17:56:13.544140122 +0100 @@ -1,7 +1,7 @@ /* * caam - Freescale FSL CAAM support for crypto API @@ -36685,9 +36600,9 @@ diff -Nur linux-4.1.10/drivers/crypto/caam/caamalg.c xbian-sources-kernel/driver return err; } -diff -Nur linux-4.1.10/drivers/crypto/caam/caamhash.c xbian-sources-kernel/drivers/crypto/caam/caamhash.c ---- linux-4.1.10/drivers/crypto/caam/caamhash.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/crypto/caam/caamhash.c 2015-10-11 19:49:27.655289498 +0200 +diff -Nur linux-4.1.13.orig/drivers/crypto/caam/caamhash.c linux-4.1.13/drivers/crypto/caam/caamhash.c +--- linux-4.1.13.orig/drivers/crypto/caam/caamhash.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/crypto/caam/caamhash.c 2015-11-30 17:56:13.548139857 +0100 @@ -1,7 +1,7 @@ /* * caam - Freescale FSL CAAM support for ahash functions of crypto API @@ -38054,9 +37969,9 @@ diff -Nur linux-4.1.10/drivers/crypto/caam/caamhash.c xbian-sources-kernel/drive return err; } -diff -Nur linux-4.1.10/drivers/crypto/caam/caam_keyblob.c xbian-sources-kernel/drivers/crypto/caam/caam_keyblob.c ---- linux-4.1.10/drivers/crypto/caam/caam_keyblob.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/crypto/caam/caam_keyblob.c 2015-10-11 19:49:27.655289498 +0200 +diff -Nur linux-4.1.13.orig/drivers/crypto/caam/caam_keyblob.c linux-4.1.13/drivers/crypto/caam/caam_keyblob.c +--- linux-4.1.13.orig/drivers/crypto/caam/caam_keyblob.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/crypto/caam/caam_keyblob.c 2015-11-30 17:56:13.548139857 +0100 @@ -0,0 +1,687 @@ +/* + * Key blob driver based on CAAM hardware @@ -38745,9 +38660,9 @@ diff -Nur linux-4.1.10/drivers/crypto/caam/caam_keyblob.c xbian-sources-kernel/d +MODULE_LICENSE("Dual BSD/GPL"); +MODULE_DESCRIPTION("FSL CAAM Secure Memory / Keystore"); +MODULE_AUTHOR("Freescale Semiconductor - NMSG/MAD"); -diff -Nur linux-4.1.10/drivers/crypto/caam/caam_keyblob.h xbian-sources-kernel/drivers/crypto/caam/caam_keyblob.h ---- linux-4.1.10/drivers/crypto/caam/caam_keyblob.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/crypto/caam/caam_keyblob.h 2015-10-11 19:49:27.655289498 +0200 +diff -Nur linux-4.1.13.orig/drivers/crypto/caam/caam_keyblob.h linux-4.1.13/drivers/crypto/caam/caam_keyblob.h +--- linux-4.1.13.orig/drivers/crypto/caam/caam_keyblob.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/crypto/caam/caam_keyblob.h 2015-11-30 17:56:13.548139857 +0100 @@ -0,0 +1,45 @@ +/* + * CAAM public-level include definitions for the key blob @@ -38794,9 +38709,9 @@ diff -Nur linux-4.1.10/drivers/crypto/caam/caam_keyblob.h xbian-sources-kernel/d +#endif + +#endif /* CAAM_KEYBLOB_H */ -diff -Nur linux-4.1.10/drivers/crypto/caam/caamrng.c xbian-sources-kernel/drivers/crypto/caam/caamrng.c ---- linux-4.1.10/drivers/crypto/caam/caamrng.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/crypto/caam/caamrng.c 2015-10-11 19:49:27.655289498 +0200 +diff -Nur linux-4.1.13.orig/drivers/crypto/caam/caamrng.c linux-4.1.13/drivers/crypto/caam/caamrng.c +--- linux-4.1.13.orig/drivers/crypto/caam/caamrng.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/crypto/caam/caamrng.c 2015-11-30 17:56:13.548139857 +0100 @@ -1,7 +1,7 @@ /* * caam - Freescale FSL CAAM support for hw_random @@ -39053,9 +38968,9 @@ diff -Nur linux-4.1.10/drivers/crypto/caam/caamrng.c xbian-sources-kernel/driver return hwrng_register(&caam_rng); } -diff -Nur linux-4.1.10/drivers/crypto/caam/compat.h xbian-sources-kernel/drivers/crypto/caam/compat.h ---- linux-4.1.10/drivers/crypto/caam/compat.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/crypto/caam/compat.h 2015-10-11 19:49:27.655289498 +0200 +diff -Nur linux-4.1.13.orig/drivers/crypto/caam/compat.h linux-4.1.13/drivers/crypto/caam/compat.h +--- linux-4.1.13.orig/drivers/crypto/caam/compat.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/crypto/caam/compat.h 2015-11-30 17:56:13.548139857 +0100 @@ -14,6 +14,8 @@ #include #include @@ -39083,9 +38998,9 @@ diff -Nur linux-4.1.10/drivers/crypto/caam/compat.h xbian-sources-kernel/drivers #include #include #include -diff -Nur linux-4.1.10/drivers/crypto/caam/ctrl.c xbian-sources-kernel/drivers/crypto/caam/ctrl.c ---- linux-4.1.10/drivers/crypto/caam/ctrl.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/crypto/caam/ctrl.c 2015-10-11 19:49:27.655289498 +0200 +diff -Nur linux-4.1.13.orig/drivers/crypto/caam/ctrl.c linux-4.1.13/drivers/crypto/caam/ctrl.c +--- linux-4.1.13.orig/drivers/crypto/caam/ctrl.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/crypto/caam/ctrl.c 2015-11-30 17:56:13.548139857 +0100 @@ -1,405 +1,260 @@ -/* * CAAM control-plane driver backend +/* @@ -40063,9 +39978,9 @@ diff -Nur linux-4.1.10/drivers/crypto/caam/ctrl.c xbian-sources-kernel/drivers/c .of_match_table = caam_match, }, .probe = caam_probe, -diff -Nur linux-4.1.10/drivers/crypto/caam/ctrl.h xbian-sources-kernel/drivers/crypto/caam/ctrl.h ---- linux-4.1.10/drivers/crypto/caam/ctrl.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/crypto/caam/ctrl.h 2015-10-11 19:49:27.655289498 +0200 +diff -Nur linux-4.1.13.orig/drivers/crypto/caam/ctrl.h linux-4.1.13/drivers/crypto/caam/ctrl.h +--- linux-4.1.13.orig/drivers/crypto/caam/ctrl.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/crypto/caam/ctrl.h 2015-11-30 17:56:13.548139857 +0100 @@ -8,6 +8,6 @@ #define CTRL_H @@ -40074,9 +39989,9 @@ diff -Nur linux-4.1.10/drivers/crypto/caam/ctrl.h xbian-sources-kernel/drivers/c +int caam_get_era(u64 caam_id); #endif /* CTRL_H */ -diff -Nur linux-4.1.10/drivers/crypto/caam/desc_constr.h xbian-sources-kernel/drivers/crypto/caam/desc_constr.h ---- linux-4.1.10/drivers/crypto/caam/desc_constr.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/crypto/caam/desc_constr.h 2015-10-11 19:49:27.655289498 +0200 +diff -Nur linux-4.1.13.orig/drivers/crypto/caam/desc_constr.h linux-4.1.13/drivers/crypto/caam/desc_constr.h +--- linux-4.1.13.orig/drivers/crypto/caam/desc_constr.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/crypto/caam/desc_constr.h 2015-11-30 17:56:13.548139857 +0100 @@ -10,7 +10,6 @@ #define CAAM_CMD_SZ sizeof(u32) #define CAAM_PTR_SZ sizeof(dma_addr_t) @@ -40277,9 +40192,9 @@ diff -Nur linux-4.1.10/drivers/crypto/caam/desc_constr.h xbian-sources-kernel/dr - 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.10/drivers/crypto/caam/desc.h xbian-sources-kernel/drivers/crypto/caam/desc.h ---- linux-4.1.10/drivers/crypto/caam/desc.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/crypto/caam/desc.h 2015-10-11 19:49:27.655289498 +0200 +diff -Nur linux-4.1.13.orig/drivers/crypto/caam/desc.h linux-4.1.13/drivers/crypto/caam/desc.h +--- linux-4.1.13.orig/drivers/crypto/caam/desc.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/crypto/caam/desc.h 2015-11-30 17:56:13.548139857 +0100 @@ -2,19 +2,35 @@ * CAAM descriptor composition header * Definitions to support CAAM descriptor instruction generation @@ -40477,9 +40392,9 @@ diff -Nur linux-4.1.10/drivers/crypto/caam/desc.h xbian-sources-kernel/drivers/c -#define FD_CMD_REPLACE_JOB_DESC 0x20000000 #endif /* DESC_H */ -diff -Nur linux-4.1.10/drivers/crypto/caam/error.c xbian-sources-kernel/drivers/crypto/caam/error.c ---- linux-4.1.10/drivers/crypto/caam/error.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/crypto/caam/error.c 2015-10-11 19:49:27.655289498 +0200 +diff -Nur linux-4.1.13.orig/drivers/crypto/caam/error.c linux-4.1.13/drivers/crypto/caam/error.c +--- linux-4.1.13.orig/drivers/crypto/caam/error.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/crypto/caam/error.c 2015-11-30 17:56:13.548139857 +0100 @@ -11,243 +11,264 @@ #include "jr.h" #include "error.h" @@ -40937,9 +40852,9 @@ diff -Nur linux-4.1.10/drivers/crypto/caam/error.c xbian-sources-kernel/drivers/ + return outstr; } EXPORT_SYMBOL(caam_jr_strstatus); -diff -Nur linux-4.1.10/drivers/crypto/caam/error.h xbian-sources-kernel/drivers/crypto/caam/error.h ---- linux-4.1.10/drivers/crypto/caam/error.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/crypto/caam/error.h 2015-10-11 19:49:27.655289498 +0200 +diff -Nur linux-4.1.13.orig/drivers/crypto/caam/error.h linux-4.1.13/drivers/crypto/caam/error.h +--- linux-4.1.13.orig/drivers/crypto/caam/error.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/crypto/caam/error.h 2015-11-30 17:56:13.548139857 +0100 @@ -7,5 +7,5 @@ #ifndef CAAM_ERROR_H #define CAAM_ERROR_H @@ -40947,9 +40862,9 @@ diff -Nur linux-4.1.10/drivers/crypto/caam/error.h xbian-sources-kernel/drivers/ -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.10/drivers/crypto/caam/intern.h xbian-sources-kernel/drivers/crypto/caam/intern.h ---- linux-4.1.10/drivers/crypto/caam/intern.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/crypto/caam/intern.h 2015-10-11 19:49:27.655289498 +0200 +diff -Nur linux-4.1.13.orig/drivers/crypto/caam/intern.h linux-4.1.13/drivers/crypto/caam/intern.h +--- linux-4.1.13.orig/drivers/crypto/caam/intern.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/crypto/caam/intern.h 2015-11-30 17:56:13.548139857 +0100 @@ -2,13 +2,19 @@ * CAAM/SEC 4.x driver backend * Private/internal definitions between modules @@ -41047,9 +40962,9 @@ diff -Nur linux-4.1.10/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.10/drivers/crypto/caam/jr.c xbian-sources-kernel/drivers/crypto/caam/jr.c ---- linux-4.1.10/drivers/crypto/caam/jr.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/crypto/caam/jr.c 2015-10-11 19:49:27.655289498 +0200 +diff -Nur linux-4.1.13.orig/drivers/crypto/caam/jr.c linux-4.1.13/drivers/crypto/caam/jr.c +--- linux-4.1.13.orig/drivers/crypto/caam/jr.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/crypto/caam/jr.c 2015-11-30 17:56:13.548139857 +0100 @@ -2,125 +2,15 @@ * CAAM/SEC 4.x transport/backend driver * JobR backend functionality @@ -41671,9 +41586,9 @@ diff -Nur linux-4.1.10/drivers/crypto/caam/jr.c xbian-sources-kernel/drivers/cry -MODULE_LICENSE("GPL"); -MODULE_DESCRIPTION("FSL CAAM JR request backend"); -MODULE_AUTHOR("Freescale Semiconductor - NMG/STC"); -diff -Nur linux-4.1.10/drivers/crypto/caam/jr.h xbian-sources-kernel/drivers/crypto/caam/jr.h ---- linux-4.1.10/drivers/crypto/caam/jr.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/crypto/caam/jr.h 2015-10-11 19:49:27.655289498 +0200 +diff -Nur linux-4.1.13.orig/drivers/crypto/caam/jr.h linux-4.1.13/drivers/crypto/caam/jr.h +--- linux-4.1.13.orig/drivers/crypto/caam/jr.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/crypto/caam/jr.h 2015-11-30 17:56:13.548139857 +0100 @@ -1,18 +1,22 @@ /* * CAAM public-level include definitions for the JobR backend @@ -41700,9 +41615,9 @@ diff -Nur linux-4.1.10/drivers/crypto/caam/jr.h xbian-sources-kernel/drivers/cry +extern int caam_jr_shutdown(struct device *dev); +extern struct device *caam_get_jrdev(void); #endif /* JR_H */ -diff -Nur linux-4.1.10/drivers/crypto/caam/Kconfig xbian-sources-kernel/drivers/crypto/caam/Kconfig ---- linux-4.1.10/drivers/crypto/caam/Kconfig 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/crypto/caam/Kconfig 2015-10-11 19:49:27.655289498 +0200 +diff -Nur linux-4.1.13.orig/drivers/crypto/caam/Kconfig linux-4.1.13/drivers/crypto/caam/Kconfig +--- linux-4.1.13.orig/drivers/crypto/caam/Kconfig 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/crypto/caam/Kconfig 2015-11-30 17:56:13.548139857 +0100 @@ -1,32 +1,19 @@ config CRYPTO_DEV_FSL_CAAM tristate "Freescale CAAM-Multicore driver backend" @@ -41850,9 +41765,9 @@ diff -Nur linux-4.1.10/drivers/crypto/caam/Kconfig xbian-sources-kernel/drivers/ + will be called caam_keyblob. + + -diff -Nur linux-4.1.10/drivers/crypto/caam/key_gen.c xbian-sources-kernel/drivers/crypto/caam/key_gen.c ---- linux-4.1.10/drivers/crypto/caam/key_gen.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/crypto/caam/key_gen.c 2015-10-11 19:49:27.655289498 +0200 +diff -Nur linux-4.1.13.orig/drivers/crypto/caam/key_gen.c linux-4.1.13/drivers/crypto/caam/key_gen.c +--- linux-4.1.13.orig/drivers/crypto/caam/key_gen.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/crypto/caam/key_gen.c 2015-11-30 17:56:13.552139590 +0100 @@ -1,7 +1,7 @@ /* * CAAM/SEC 4.x functions for handling key-generation jobs @@ -41941,9 +41856,9 @@ diff -Nur linux-4.1.10/drivers/crypto/caam/key_gen.c xbian-sources-kernel/driver dma_unmap_single(jrdev, dma_addr_out, split_key_pad_len, DMA_FROM_DEVICE); out_unmap_in: -diff -Nur linux-4.1.10/drivers/crypto/caam/Makefile xbian-sources-kernel/drivers/crypto/caam/Makefile ---- linux-4.1.10/drivers/crypto/caam/Makefile 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/crypto/caam/Makefile 2015-10-11 19:49:27.655289498 +0200 +diff -Nur linux-4.1.13.orig/drivers/crypto/caam/Makefile linux-4.1.13/drivers/crypto/caam/Makefile +--- linux-4.1.13.orig/drivers/crypto/caam/Makefile 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/crypto/caam/Makefile 2015-11-30 17:56:13.552139590 +0100 @@ -1,15 +1,14 @@ # # Makefile for the CAAM backend and dependent components @@ -41965,9 +41880,9 @@ diff -Nur linux-4.1.10/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.10/drivers/crypto/caam/pdb.h xbian-sources-kernel/drivers/crypto/caam/pdb.h ---- linux-4.1.10/drivers/crypto/caam/pdb.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/crypto/caam/pdb.h 2015-10-11 19:49:27.659289233 +0200 +diff -Nur linux-4.1.13.orig/drivers/crypto/caam/pdb.h linux-4.1.13/drivers/crypto/caam/pdb.h +--- linux-4.1.13.orig/drivers/crypto/caam/pdb.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/crypto/caam/pdb.h 2015-11-30 17:56:13.552139590 +0100 @@ -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 */ @@ -41976,9 +41891,9 @@ diff -Nur linux-4.1.10/drivers/crypto/caam/pdb.h xbian-sources-kernel/drivers/cr #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.10/drivers/crypto/caam/regs.h xbian-sources-kernel/drivers/crypto/caam/regs.h ---- linux-4.1.10/drivers/crypto/caam/regs.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/crypto/caam/regs.h 2015-10-11 19:49:27.659289233 +0200 +diff -Nur linux-4.1.13.orig/drivers/crypto/caam/regs.h linux-4.1.13/drivers/crypto/caam/regs.h +--- linux-4.1.13.orig/drivers/crypto/caam/regs.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/crypto/caam/regs.h 2015-11-30 17:56:13.552139590 +0100 @@ -1,7 +1,7 @@ /* * CAAM hardware register-level view @@ -42542,9 +42457,9 @@ diff -Nur linux-4.1.10/drivers/crypto/caam/regs.h xbian-sources-kernel/drivers/c +}; + #endif /* REGS_H */ -diff -Nur linux-4.1.10/drivers/crypto/caam/secvio.c xbian-sources-kernel/drivers/crypto/caam/secvio.c ---- linux-4.1.10/drivers/crypto/caam/secvio.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/crypto/caam/secvio.c 2015-10-11 19:49:27.659289233 +0200 +diff -Nur linux-4.1.13.orig/drivers/crypto/caam/secvio.c linux-4.1.13/drivers/crypto/caam/secvio.c +--- linux-4.1.13.orig/drivers/crypto/caam/secvio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/crypto/caam/secvio.c 2015-11-30 17:56:13.552139590 +0100 @@ -0,0 +1,290 @@ + +/* @@ -42836,9 +42751,9 @@ diff -Nur linux-4.1.10/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.10/drivers/crypto/caam/secvio.h xbian-sources-kernel/drivers/crypto/caam/secvio.h ---- linux-4.1.10/drivers/crypto/caam/secvio.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/crypto/caam/secvio.h 2015-10-11 19:49:27.659289233 +0200 +diff -Nur linux-4.1.13.orig/drivers/crypto/caam/secvio.h linux-4.1.13/drivers/crypto/caam/secvio.h +--- linux-4.1.13.orig/drivers/crypto/caam/secvio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/crypto/caam/secvio.h 2015-11-30 17:56:13.552139590 +0100 @@ -0,0 +1,66 @@ + +/* @@ -42906,9 +42821,9 @@ diff -Nur linux-4.1.10/drivers/crypto/caam/secvio.h xbian-sources-kernel/drivers +}; + +#endif /* SECVIO_H */ -diff -Nur linux-4.1.10/drivers/crypto/caam/sg_sw_sec4.h xbian-sources-kernel/drivers/crypto/caam/sg_sw_sec4.h ---- linux-4.1.10/drivers/crypto/caam/sg_sw_sec4.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/crypto/caam/sg_sw_sec4.h 2015-10-11 19:49:27.659289233 +0200 +diff -Nur linux-4.1.13.orig/drivers/crypto/caam/sg_sw_sec4.h linux-4.1.13/drivers/crypto/caam/sg_sw_sec4.h +--- linux-4.1.13.orig/drivers/crypto/caam/sg_sw_sec4.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/crypto/caam/sg_sw_sec4.h 2015-11-30 17:56:13.552139590 +0100 @@ -1,7 +1,7 @@ /* * CAAM/SEC 4.x functions for using scatterlists in caam driver @@ -42995,9 +42910,9 @@ diff -Nur linux-4.1.10/drivers/crypto/caam/sg_sw_sec4.h xbian-sources-kernel/dri + if (end - sg_index) + sg_copy(dest + cpy_index, current_sg, end - sg_index); +} -diff -Nur linux-4.1.10/drivers/crypto/caam/sm.h xbian-sources-kernel/drivers/crypto/caam/sm.h ---- linux-4.1.10/drivers/crypto/caam/sm.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/crypto/caam/sm.h 2015-10-11 19:49:27.659289233 +0200 +diff -Nur linux-4.1.13.orig/drivers/crypto/caam/sm.h linux-4.1.13/drivers/crypto/caam/sm.h +--- linux-4.1.13.orig/drivers/crypto/caam/sm.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/crypto/caam/sm.h 2015-11-30 17:56:13.552139590 +0100 @@ -0,0 +1,88 @@ + +/* @@ -43087,9 +43002,9 @@ diff -Nur linux-4.1.10/drivers/crypto/caam/sm.h xbian-sources-kernel/drivers/cry +}; + +#endif /* SM_H */ -diff -Nur linux-4.1.10/drivers/crypto/caam/sm_store.c xbian-sources-kernel/drivers/crypto/caam/sm_store.c ---- linux-4.1.10/drivers/crypto/caam/sm_store.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/crypto/caam/sm_store.c 2015-10-11 19:49:27.659289233 +0200 +diff -Nur linux-4.1.13.orig/drivers/crypto/caam/sm_store.c linux-4.1.13/drivers/crypto/caam/sm_store.c +--- linux-4.1.13.orig/drivers/crypto/caam/sm_store.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/crypto/caam/sm_store.c 2015-11-30 17:56:13.552139590 +0100 @@ -0,0 +1,896 @@ + +/* @@ -43987,9 +43902,9 @@ diff -Nur linux-4.1.10/drivers/crypto/caam/sm_store.c xbian-sources-kernel/drive +MODULE_DESCRIPTION("FSL CAAM Secure Memory / Keystore"); +MODULE_AUTHOR("Freescale Semiconductor - NMSG/MAD"); +#endif -diff -Nur linux-4.1.10/drivers/crypto/caam/sm_test.c xbian-sources-kernel/drivers/crypto/caam/sm_test.c ---- linux-4.1.10/drivers/crypto/caam/sm_test.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/crypto/caam/sm_test.c 2015-10-11 19:49:27.659289233 +0200 +diff -Nur linux-4.1.13.orig/drivers/crypto/caam/sm_test.c linux-4.1.13/drivers/crypto/caam/sm_test.c +--- linux-4.1.13.orig/drivers/crypto/caam/sm_test.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/crypto/caam/sm_test.c 2015-11-30 17:56:13.552139590 +0100 @@ -0,0 +1,844 @@ +/* + * Secure Memory / Keystore Exemplification Module @@ -44835,9 +44750,9 @@ diff -Nur linux-4.1.10/drivers/crypto/caam/sm_test.c xbian-sources-kernel/driver +MODULE_DESCRIPTION("FSL CAAM Keystore Usage Example"); +MODULE_AUTHOR("Freescale Semiconductor - NMSG/MAD"); +#endif -diff -Nur linux-4.1.10/drivers/crypto/caam/snvsregs.h xbian-sources-kernel/drivers/crypto/caam/snvsregs.h ---- linux-4.1.10/drivers/crypto/caam/snvsregs.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/crypto/caam/snvsregs.h 2015-10-11 19:49:27.659289233 +0200 +diff -Nur linux-4.1.13.orig/drivers/crypto/caam/snvsregs.h linux-4.1.13/drivers/crypto/caam/snvsregs.h +--- linux-4.1.13.orig/drivers/crypto/caam/snvsregs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/crypto/caam/snvsregs.h 2015-11-30 17:56:13.552139590 +0100 @@ -0,0 +1,237 @@ +/* + * SNVS hardware register-level view @@ -45076,9 +44991,9 @@ diff -Nur linux-4.1.10/drivers/crypto/caam/snvsregs.h xbian-sources-kernel/drive +}; + +#endif /* SNVSREGS_H */ -diff -Nur linux-4.1.10/drivers/dma/imx-sdma.c xbian-sources-kernel/drivers/dma/imx-sdma.c ---- linux-4.1.10/drivers/dma/imx-sdma.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/dma/imx-sdma.c 2015-10-11 19:49:27.679287908 +0200 +diff -Nur linux-4.1.13.orig/drivers/dma/imx-sdma.c linux-4.1.13/drivers/dma/imx-sdma.c +--- linux-4.1.13.orig/drivers/dma/imx-sdma.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/dma/imx-sdma.c 2015-11-30 17:56:13.552139590 +0100 @@ -29,6 +29,7 @@ #include #include @@ -45720,18 +45635,18 @@ diff -Nur linux-4.1.10/drivers/dma/imx-sdma.c xbian-sources-kernel/drivers/dma/i MODULE_AUTHOR("Sascha Hauer, Pengutronix "); MODULE_DESCRIPTION("i.MX SDMA driver"); -diff -Nur linux-4.1.10/drivers/gpu/drm/Kconfig xbian-sources-kernel/drivers/gpu/drm/Kconfig ---- linux-4.1.10/drivers/gpu/drm/Kconfig 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/gpu/drm/Kconfig 2015-10-11 19:49:27.755282870 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/drm/Kconfig linux-4.1.13/drivers/gpu/drm/Kconfig +--- linux-4.1.13.orig/drivers/gpu/drm/Kconfig 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/drm/Kconfig 2015-11-30 17:56:13.552139590 +0100 @@ -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.10/drivers/gpu/drm/Makefile xbian-sources-kernel/drivers/gpu/drm/Makefile ---- linux-4.1.10/drivers/gpu/drm/Makefile 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/gpu/drm/Makefile 2015-10-11 19:49:27.755282870 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/drm/Makefile linux-4.1.13/drivers/gpu/drm/Makefile +--- linux-4.1.13.orig/drivers/gpu/drm/Makefile 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/drm/Makefile 2015-11-30 17:56:13.552139590 +0100 @@ -67,6 +67,7 @@ obj-$(CONFIG_DRM_TEGRA) += tegra/ obj-$(CONFIG_DRM_STI) += sti/ @@ -45740,9 +45655,9 @@ diff -Nur linux-4.1.10/drivers/gpu/drm/Makefile xbian-sources-kernel/drivers/gpu obj-y += i2c/ obj-y += panel/ obj-y += bridge/ -diff -Nur linux-4.1.10/drivers/gpu/drm/vivante/Kconfig xbian-sources-kernel/drivers/gpu/drm/vivante/Kconfig ---- linux-4.1.10/drivers/gpu/drm/vivante/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/gpu/drm/vivante/Kconfig 2015-10-11 19:49:27.959269349 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/drm/vivante/Kconfig linux-4.1.13/drivers/gpu/drm/vivante/Kconfig +--- linux-4.1.13.orig/drivers/gpu/drm/vivante/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/drm/vivante/Kconfig 2015-11-30 17:56:13.552139590 +0100 @@ -0,0 +1,6 @@ +config DRM_VIVANTE + tristate "Vivante GCCore" @@ -45750,9 +45665,9 @@ diff -Nur linux-4.1.10/drivers/gpu/drm/vivante/Kconfig xbian-sources-kernel/driv + 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.10/drivers/gpu/drm/vivante/Makefile xbian-sources-kernel/drivers/gpu/drm/vivante/Makefile ---- linux-4.1.10/drivers/gpu/drm/vivante/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/gpu/drm/vivante/Makefile 2015-10-11 19:49:27.959269349 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/drm/vivante/Makefile linux-4.1.13/drivers/gpu/drm/vivante/Makefile +--- linux-4.1.13.orig/drivers/gpu/drm/vivante/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/drm/vivante/Makefile 2015-11-30 17:56:13.552139590 +0100 @@ -0,0 +1,29 @@ +############################################################################## +# @@ -45783,9 +45698,9 @@ diff -Nur linux-4.1.10/drivers/gpu/drm/vivante/Makefile xbian-sources-kernel/dri +vivante-y := vivante_drv.o + +obj-$(CONFIG_DRM_VIVANTE) += vivante.o -diff -Nur linux-4.1.10/drivers/gpu/drm/vivante/vivante_drv.c xbian-sources-kernel/drivers/gpu/drm/vivante/vivante_drv.c ---- linux-4.1.10/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-10-11 19:49:27.959269349 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/drm/vivante/vivante_drv.c linux-4.1.13/drivers/gpu/drm/vivante/vivante_drv.c +--- linux-4.1.13.orig/drivers/gpu/drm/vivante/vivante_drv.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/drm/vivante/vivante_drv.c 2015-11-30 17:56:13.552139590 +0100 @@ -0,0 +1,112 @@ +/**************************************************************************** +* @@ -45899,9 +45814,9 @@ diff -Nur linux-4.1.10/drivers/gpu/drm/vivante/vivante_drv.c xbian-sources-kerne +MODULE_AUTHOR(DRIVER_AUTHOR); +MODULE_DESCRIPTION(DRIVER_DESC); +MODULE_LICENSE("GPL and additional rights"); -diff -Nur linux-4.1.10/drivers/gpu/drm/vivante/vivante_drv.h xbian-sources-kernel/drivers/gpu/drm/vivante/vivante_drv.h ---- linux-4.1.10/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-10-11 19:49:27.959269349 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/drm/vivante/vivante_drv.h linux-4.1.13/drivers/gpu/drm/vivante/vivante_drv.h +--- linux-4.1.13.orig/drivers/gpu/drm/vivante/vivante_drv.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/drm/vivante/vivante_drv.h 2015-11-30 17:56:13.552139590 +0100 @@ -0,0 +1,69 @@ +/**************************************************************************** +* @@ -45972,9 +45887,9 @@ diff -Nur linux-4.1.10/drivers/gpu/drm/vivante/vivante_drv.h xbian-sources-kerne +#define DRIVER_PATCHLEVEL 0 + +#endif -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:27.967268819 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/allocator/default/gc_hal_kernel_allocator_array.h linux-4.1.13/drivers/gpu/galcore/allocator/default/gc_hal_kernel_allocator_array.h +--- linux-4.1.13.orig/drivers/gpu/galcore/allocator/default/gc_hal_kernel_allocator_array.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/allocator/default/gc_hal_kernel_allocator_array.h 2015-11-30 17:56:13.556139323 +0100 @@ -0,0 +1,34 @@ +/**************************************************************************** +* @@ -46010,9 +45925,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/allocator/default/gc_hal_kernel_alloc +}; + + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:27.967268819 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/allocator/freescale/gc_hal_kernel_allocator_array.h linux-4.1.13/drivers/gpu/galcore/allocator/freescale/gc_hal_kernel_allocator_array.h +--- linux-4.1.13.orig/drivers/gpu/galcore/allocator/freescale/gc_hal_kernel_allocator_array.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/allocator/freescale/gc_hal_kernel_allocator_array.h 2015-11-30 17:56:13.556139323 +0100 @@ -0,0 +1,45 @@ +/**************************************************************************** +* @@ -46059,9 +45974,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/allocator/freescale/gc_hal_kernel_all +}; + + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:27.967268819 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/allocator/freescale/gc_hal_kernel_allocator_cma.c linux-4.1.13/drivers/gpu/galcore/allocator/freescale/gc_hal_kernel_allocator_cma.c +--- linux-4.1.13.orig/drivers/gpu/galcore/allocator/freescale/gc_hal_kernel_allocator_cma.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/allocator/freescale/gc_hal_kernel_allocator_cma.c 2015-11-30 17:56:13.556139323 +0100 @@ -0,0 +1,386 @@ +/**************************************************************************** +* @@ -46449,9 +46364,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/allocator/freescale/gc_hal_kernel_all + return status; +} + -diff -Nur linux-4.1.10/drivers/gpu/galcore/arch/gc_hal_kernel_context.c xbian-sources-kernel/drivers/gpu/galcore/arch/gc_hal_kernel_context.c ---- linux-4.1.10/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-10-11 19:49:27.967268819 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/arch/gc_hal_kernel_context.c linux-4.1.13/drivers/gpu/galcore/arch/gc_hal_kernel_context.c +--- linux-4.1.13.orig/drivers/gpu/galcore/arch/gc_hal_kernel_context.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/arch/gc_hal_kernel_context.c 2015-11-30 17:56:13.556139323 +0100 @@ -0,0 +1,2252 @@ +/**************************************************************************** +* @@ -48705,9 +48620,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/arch/gc_hal_kernel_context.c xbian-so + return status; +} + -diff -Nur linux-4.1.10/drivers/gpu/galcore/arch/gc_hal_kernel_context.h xbian-sources-kernel/drivers/gpu/galcore/arch/gc_hal_kernel_context.h ---- linux-4.1.10/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-10-11 19:49:27.967268819 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/arch/gc_hal_kernel_context.h linux-4.1.13/drivers/gpu/galcore/arch/gc_hal_kernel_context.h +--- linux-4.1.13.orig/drivers/gpu/galcore/arch/gc_hal_kernel_context.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/arch/gc_hal_kernel_context.h 2015-11-30 17:56:13.556139323 +0100 @@ -0,0 +1,178 @@ +/**************************************************************************** +* @@ -48887,9 +48802,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/arch/gc_hal_kernel_context.h xbian-so + +#endif /* __gc_hal_kernel_context_h_ */ + -diff -Nur linux-4.1.10/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.c xbian-sources-kernel/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.c ---- linux-4.1.10/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-10-11 19:49:27.967268819 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.c linux-4.1.13/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.c +--- linux-4.1.13.orig/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.c 2015-11-30 17:56:13.560139057 +0100 @@ -0,0 +1,7719 @@ +/**************************************************************************** +* @@ -56610,9 +56525,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.c xbian-s +} + + -diff -Nur linux-4.1.10/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.h xbian-sources-kernel/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.h ---- linux-4.1.10/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-10-11 19:49:27.967268819 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.h linux-4.1.13/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.h +--- linux-4.1.13.orig/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.h 2015-11-30 17:56:13.560139057 +0100 @@ -0,0 +1,160 @@ +/**************************************************************************** +* @@ -56774,9 +56689,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/arch/gc_hal_kernel_hardware.h xbian-s + +#endif /* __gc_hal_kernel_hardware_h_ */ + -diff -Nur linux-4.1.10/drivers/gpu/galcore/arch/gc_hal_kernel_recorder.c xbian-sources-kernel/drivers/gpu/galcore/arch/gc_hal_kernel_recorder.c ---- linux-4.1.10/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-10-11 19:49:27.967268819 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/arch/gc_hal_kernel_recorder.c linux-4.1.13/drivers/gpu/galcore/arch/gc_hal_kernel_recorder.c +--- linux-4.1.13.orig/drivers/gpu/galcore/arch/gc_hal_kernel_recorder.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/arch/gc_hal_kernel_recorder.c 2015-11-30 17:56:13.564138792 +0100 @@ -0,0 +1,679 @@ +/**************************************************************************** +* @@ -57457,9 +57372,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/arch/gc_hal_kernel_recorder.c xbian-s +} + + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:27.967268819 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_command_vg.c linux-4.1.13/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_command_vg.c +--- linux-4.1.13.orig/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_command_vg.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_command_vg.c 2015-11-30 17:56:13.564138792 +0100 @@ -0,0 +1,932 @@ +/**************************************************************************** +* @@ -58393,9 +58308,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_command + +#endif /* gcdENABLE_VG */ + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:27.967268819 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_command_vg.h linux-4.1.13/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_command_vg.h +--- linux-4.1.13.orig/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_command_vg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_command_vg.h 2015-11-30 17:56:13.564138792 +0100 @@ -0,0 +1,319 @@ +/**************************************************************************** +* @@ -58716,9 +58631,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_command + +#endif /* __gc_hal_kernel_hardware_command_h_ */ + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:27.967268819 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_vg.c linux-4.1.13/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_vg.c +--- linux-4.1.13.orig/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_vg.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_vg.c 2015-11-30 17:56:13.564138792 +0100 @@ -0,0 +1,2119 @@ +/**************************************************************************** +* @@ -60839,9 +60754,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_vg.c xb +} +#endif /* gcdENABLE_VG */ + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:27.967268819 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_vg.h linux-4.1.13/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_vg.h +--- linux-4.1.13.orig/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_vg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_vg.h 2015-11-30 17:56:13.564138792 +0100 @@ -0,0 +1,74 @@ +/**************************************************************************** +* @@ -60917,9 +60832,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/archvg/gc_hal_kernel_hardware_vg.h xb + +#endif /* __gc_hal_kernel_hardware_h_ */ + -diff -Nur linux-4.1.10/drivers/gpu/galcore/config xbian-sources-kernel/drivers/gpu/galcore/config ---- linux-4.1.10/drivers/gpu/galcore/config 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/gpu/galcore/config 2015-10-11 19:49:27.967268819 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/config linux-4.1.13/drivers/gpu/galcore/config +--- linux-4.1.13.orig/drivers/gpu/galcore/config 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/config 2015-11-30 17:56:13.564138792 +0100 @@ -0,0 +1,35 @@ +############################################################################## +# @@ -60956,9 +60871,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/config xbian-sources-kernel/drivers/g +BANK_CHANNEL_BIT ?= 12 +PLATFORM ?= freescale/gc_hal_kernel_platform_imx6q14 +DEBUG ?= 0 -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_allocator.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_allocator.c ---- linux-4.1.10/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-10-11 19:49:27.967268819 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_allocator.c linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_allocator.c +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_allocator.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_allocator.c 2015-11-30 17:56:13.564138792 +0100 @@ -0,0 +1,884 @@ +/**************************************************************************** +* @@ -61844,9 +61759,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_allocator.c xbian-sourc + return gcvSTATUS_OK; +} + -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_allocator.h xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_allocator.h ---- linux-4.1.10/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-10-11 19:49:27.971268553 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_allocator.h linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_allocator.h +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_allocator.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_allocator.h 2015-11-30 17:56:13.564138792 +0100 @@ -0,0 +1,400 @@ +/**************************************************************************** +* @@ -62248,9 +62163,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_allocator.h xbian-sourc + +*/ +#endif -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel.c ---- linux-4.1.10/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-10-11 19:49:27.967268819 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel.c linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel.c +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel.c 2015-11-30 17:56:13.568138526 +0100 @@ -0,0 +1,4244 @@ +/**************************************************************************** +* @@ -66496,9 +66411,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel.c xbian-sources-kernel/ +***** Test Code **************************************************************** +*******************************************************************************/ + -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_command.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_command.c ---- linux-4.1.10/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-10-11 19:49:27.971268553 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_command.c linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_command.c +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_command.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_command.c 2015-11-30 17:56:13.568138526 +0100 @@ -0,0 +1,3075 @@ +/**************************************************************************** +* @@ -69575,9 +69490,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_command.c xbian-sources + *In = in; + return gcvSTATUS_OK; +} -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_command_vg.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_command_vg.c ---- linux-4.1.10/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-10-11 19:49:27.971268553 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_command_vg.c linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_command_vg.c +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_command_vg.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_command_vg.c 2015-11-30 17:56:13.572138258 +0100 @@ -0,0 +1,3678 @@ +/**************************************************************************** +* @@ -73257,9 +73172,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_command_vg.c xbian-sour +} + +#endif /* gcdENABLE_VG */ -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_db.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_db.c ---- linux-4.1.10/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-10-11 19:49:27.971268553 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_db.c linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_db.c +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_db.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_db.c 2015-11-30 17:56:13.572138258 +0100 @@ -0,0 +1,1758 @@ +/**************************************************************************** +* @@ -75019,9 +74934,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_db.c xbian-sources-kern + gcmkFOOTER(); + return status; +} -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_debug.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_debug.c ---- linux-4.1.10/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-10-11 19:49:27.971268553 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_debug.c linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_debug.c +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_debug.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_debug.c 2015-11-30 17:56:13.572138258 +0100 @@ -0,0 +1,2766 @@ +/**************************************************************************** +* @@ -77789,9 +77704,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_debug.c xbian-sources-k + gckOS_WriteToRingBuffer(buffer, (gctUINT32)(payload - buffer)); +} + -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_debugfs.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_debugfs.c ---- linux-4.1.10/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-10-11 19:49:27.971268553 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_debugfs.c linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_debugfs.c +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_debugfs.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_debugfs.c 2015-11-30 17:56:13.572138258 +0100 @@ -0,0 +1,1137 @@ +/**************************************************************************** +* @@ -78930,9 +78845,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_debugfs.c xbian-sources + gcmkDEBUGFS_PRINT ( _GetArgumentSize ( Message ) , Message ) ; + return _debugfs_res; +} -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_debugfs.h xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_debugfs.h ---- linux-4.1.10/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-10-11 19:49:27.971268553 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_debugfs.h linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_debugfs.h +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_debugfs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_debugfs.h 2015-11-30 17:56:13.572138258 +0100 @@ -0,0 +1,135 @@ +/**************************************************************************** +* @@ -79069,9 +78984,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_debugfs.h xbian-sources +#endif + + -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_debug.h xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_debug.h ---- linux-4.1.10/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-10-11 19:49:27.971268553 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_debug.h linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_debug.h +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_debug.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_debug.h 2015-11-30 17:56:13.572138258 +0100 @@ -0,0 +1,103 @@ +/**************************************************************************** +* @@ -79176,9 +79091,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_debug.h xbian-sources-k +#endif + +#endif /* __gc_hal_kernel_debug_h_ */ -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_device.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_device.c ---- linux-4.1.10/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-10-11 19:49:27.971268553 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_device.c linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_device.c +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_device.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_device.c 2015-11-30 17:56:13.576137991 +0100 @@ -0,0 +1,1938 @@ +/**************************************************************************** +* @@ -81118,9 +81033,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_device.c xbian-sources- + gcmkFOOTER(); + return status; +} -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_device.h xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_device.h ---- linux-4.1.10/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-10-11 19:49:27.971268553 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_device.h linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_device.h +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_device.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_device.h 2015-11-30 17:56:13.576137991 +0100 @@ -0,0 +1,185 @@ +/**************************************************************************** +* @@ -81307,9 +81222,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_device.h xbian-sources- + ); + +#endif /* __gc_hal_kernel_device_h_ */ -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_event.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_event.c ---- linux-4.1.10/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-10-11 19:49:27.971268553 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_event.c linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_event.c +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_event.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_event.c 2015-11-30 17:56:13.576137991 +0100 @@ -0,0 +1,2859 @@ +/**************************************************************************** +* @@ -84170,9 +84085,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_event.c xbian-sources-k + return gcvSTATUS_OK; +} + -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel.h xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel.h ---- linux-4.1.10/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-10-11 19:49:27.967268819 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel.h linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel.h +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel.h 2015-11-30 17:56:13.576137991 +0100 @@ -0,0 +1,1353 @@ +/**************************************************************************** +* @@ -85527,9 +85442,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel.h xbian-sources-kernel/ +#endif + +#endif /* __gc_hal_kernel_h_ */ -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_interrupt_vg.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_interrupt_vg.c ---- linux-4.1.10/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-10-11 19:49:27.971268553 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_interrupt_vg.c linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_interrupt_vg.c +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_interrupt_vg.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_interrupt_vg.c 2015-11-30 17:56:13.576137991 +0100 @@ -0,0 +1,858 @@ +/**************************************************************************** +* @@ -86389,9 +86304,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_interrupt_vg.c xbian-so +} + +#endif /* gcdENABLE_VG */ -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_iommu.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_iommu.c ---- linux-4.1.10/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-10-11 19:49:27.971268553 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_iommu.c linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_iommu.c +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_iommu.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_iommu.c 2015-11-30 17:56:13.576137991 +0100 @@ -0,0 +1,202 @@ +/**************************************************************************** +* @@ -86595,9 +86510,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_iommu.c xbian-sources-k + return gcvSTATUS_OK; +} + -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_linux.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_linux.c ---- linux-4.1.10/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-10-11 19:49:27.971268553 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_linux.c linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_linux.c +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_linux.c 2015-11-30 17:56:13.576137991 +0100 @@ -0,0 +1,487 @@ +/**************************************************************************** +* @@ -87086,9 +87001,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_linux.c xbian-sources-k + gcmkFOOTER_ARG("Settings->signal=%d", Settings->signal); + return gcvSTATUS_OK; +} -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_linux.h xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_linux.h ---- linux-4.1.10/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-10-11 19:49:27.971268553 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_linux.h linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_linux.h +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_linux.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_linux.h 2015-11-30 17:56:13.576137991 +0100 @@ -0,0 +1,364 @@ +/**************************************************************************** +* @@ -87454,9 +87369,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_linux.h xbian-sources-k +#endif + +#endif /* __gc_hal_kernel_linux_h_ */ -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_math.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_math.c ---- linux-4.1.10/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-10-11 19:49:27.971268553 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_math.c linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_math.c +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_math.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_math.c 2015-11-30 17:56:13.576137991 +0100 @@ -0,0 +1,32 @@ +/**************************************************************************** +* @@ -87490,9 +87405,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_math.c xbian-sources-ke + if(Y ==0) {return 0;} + else {return X % Y;} +} -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_mmu.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_mmu.c ---- linux-4.1.10/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-10-11 19:49:27.971268553 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_mmu.c linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_mmu.c +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_mmu.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_mmu.c 2015-11-30 17:56:13.580137725 +0100 @@ -0,0 +1,2260 @@ +/**************************************************************************** +* @@ -89754,9 +89669,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_mmu.c xbian-sources-ker +****************************** T E S T C O D E ****************************** +******************************************************************************/ + -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_mmu_vg.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_mmu_vg.c ---- linux-4.1.10/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-10-11 19:49:27.971268553 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_mmu_vg.c linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_mmu_vg.c +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_mmu_vg.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_mmu_vg.c 2015-11-30 17:56:13.580137725 +0100 @@ -0,0 +1,522 @@ +/**************************************************************************** +* @@ -90280,9 +90195,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_mmu_vg.c xbian-sources- +} + +#endif /* gcdENABLE_VG */ -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_os.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_os.c ---- linux-4.1.10/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-10-11 19:49:27.975268288 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_os.c linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_os.c +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_os.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_os.c 2015-11-30 17:56:13.580137725 +0100 @@ -0,0 +1,8062 @@ +/**************************************************************************** +* @@ -98346,9 +98261,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_os.c xbian-sources-kern + + return gcvSTATUS_OK; +} -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_os.h xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_os.h ---- linux-4.1.10/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-10-11 19:49:27.975268288 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_os.h linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_os.h +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_os.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_os.h 2015-11-30 17:56:13.584137459 +0100 @@ -0,0 +1,88 @@ +/**************************************************************************** +* @@ -98438,9 +98353,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_os.h xbian-sources-kern +DRIVER_ARGS; + +#endif /* __gc_hal_kernel_os_h_ */ -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_platform.h xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_platform.h ---- linux-4.1.10/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-10-11 19:49:27.975268288 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_platform.h linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_platform.h +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_platform.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_platform.h 2015-11-30 17:56:13.584137459 +0100 @@ -0,0 +1,270 @@ +/**************************************************************************** +* @@ -98712,9 +98627,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_platform.h xbian-source + ); + +#endif -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_power.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_power.c ---- linux-4.1.10/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-10-11 19:49:27.975268288 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_power.c linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_power.c +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_power.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_power.c 2015-11-30 17:56:13.584137459 +0100 @@ -0,0 +1,347 @@ +/**************************************************************************** +* @@ -99063,9 +98978,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_power.c xbian-sources-k + return gcvSTATUS_OK; +} +#endif -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_precomp.h xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_precomp.h ---- linux-4.1.10/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-10-11 19:49:27.975268288 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_precomp.h linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_precomp.h +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_precomp.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_precomp.h 2015-11-30 17:56:13.584137459 +0100 @@ -0,0 +1,29 @@ +/**************************************************************************** +* @@ -99096,9 +99011,9 @@ diff -Nur linux-4.1.10/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.10/drivers/gpu/galcore/gc_hal_kernel_probe.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_probe.c ---- linux-4.1.10/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-10-11 19:49:27.975268288 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_probe.c linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_probe.c +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_probe.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_probe.c 2015-11-30 17:56:13.584137459 +0100 @@ -0,0 +1,1252 @@ +/**************************************************************************** +* @@ -100352,9 +100267,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_probe.c xbian-sources-k + +module_init(gpu_init); +module_exit(gpu_exit); -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_sync.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_sync.c ---- linux-4.1.10/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-10-11 19:49:27.975268288 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_sync.c linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_sync.c +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_sync.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_sync.c 2015-11-30 17:56:13.584137459 +0100 @@ -0,0 +1,177 @@ +/**************************************************************************** +* @@ -100533,9 +100448,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_sync.c xbian-sources-ke +} + +#endif -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_sync.h xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_sync.h ---- linux-4.1.10/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-10-11 19:49:27.975268288 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_sync.h linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_sync.h +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_sync.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_sync.h 2015-11-30 17:56:13.584137459 +0100 @@ -0,0 +1,72 @@ +/**************************************************************************** +* @@ -100609,9 +100524,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_sync.h xbian-sources-ke + ); + +#endif /* __gc_hal_kernel_sync_h_ */ -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_vg.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_vg.c ---- linux-4.1.10/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-10-11 19:49:27.975268288 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_vg.c linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_vg.c +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_vg.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_vg.c 2015-11-30 17:56:13.584137459 +0100 @@ -0,0 +1,831 @@ +/**************************************************************************** +* @@ -101444,9 +101359,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_vg.c xbian-sources-kern +} + +#endif /* gcdENABLE_VG */ -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_vg.h xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_vg.h ---- linux-4.1.10/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-10-11 19:49:27.975268288 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_vg.h linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_vg.h +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_vg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_vg.h 2015-11-30 17:56:13.584137459 +0100 @@ -0,0 +1,85 @@ +/**************************************************************************** +* @@ -101533,9 +101448,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_vg.h xbian-sources-kern +}; + +#endif /* __gc_hal_kernel_h_ */ -diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_video_memory.c xbian-sources-kernel/drivers/gpu/galcore/gc_hal_kernel_video_memory.c ---- linux-4.1.10/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-10-11 19:49:27.975268288 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_video_memory.c linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_video_memory.c +--- linux-4.1.13.orig/drivers/gpu/galcore/gc_hal_kernel_video_memory.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/gc_hal_kernel_video_memory.c 2015-11-30 17:56:13.584137459 +0100 @@ -0,0 +1,2734 @@ +/**************************************************************************** +* @@ -104271,14 +104186,14 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/gc_hal_kernel_video_memory.c xbian-so + return status; +} + -diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/aqHal.h xbian-sources-kernel/drivers/gpu/galcore/inc/aqHal.h ---- linux-4.1.10/drivers/gpu/galcore/inc/aqHal.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/gpu/galcore/inc/aqHal.h 2015-10-11 19:49:27.975268288 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/inc/aqHal.h linux-4.1.13/drivers/gpu/galcore/inc/aqHal.h +--- linux-4.1.13.orig/drivers/gpu/galcore/inc/aqHal.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/inc/aqHal.h 2015-11-30 17:56:13.584137459 +0100 @@ -0,0 +1 @@ +#include "HAL/gc_hal.h" -diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_base.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_base.h ---- linux-4.1.10/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-10-11 19:49:27.975268288 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_base.h linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_base.h +--- linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_base.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_base.h 2015-11-30 17:56:13.588137194 +0100 @@ -0,0 +1,5538 @@ +/**************************************************************************** +* @@ -109818,9 +109733,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_base.h xbian-sources-kerne +#endif + +#endif /* __gc_hal_base_h_ */ -diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_driver.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_driver.h ---- linux-4.1.10/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-10-11 19:49:27.975268288 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_driver.h linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_driver.h +--- linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_driver.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_driver.h 2015-11-30 17:56:13.588137194 +0100 @@ -0,0 +1,1064 @@ +/**************************************************************************** +* @@ -110886,9 +110801,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_driver.h xbian-sources-ker +#endif + +#endif /* __gc_hal_driver_h_ */ -diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_driver_vg.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_driver_vg.h ---- linux-4.1.10/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-10-11 19:49:27.975268288 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_driver_vg.h linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_driver_vg.h +--- linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_driver_vg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_driver_vg.h 2015-11-30 17:56:13.588137194 +0100 @@ -0,0 +1,265 @@ +/**************************************************************************** +* @@ -111155,9 +111070,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_driver_vg.h xbian-sources- +#endif + +#endif /* __gc_hal_driver_h_ */ -diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_dump.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_dump.h ---- linux-4.1.10/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-10-11 19:49:27.975268288 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_dump.h linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_dump.h +--- linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_dump.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_dump.h 2015-11-30 17:56:13.588137194 +0100 @@ -0,0 +1,89 @@ +/**************************************************************************** +* @@ -111248,9 +111163,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_dump.h xbian-sources-kerne + +#endif /* __gc_hal_dump_h_ */ + -diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_eglplatform.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_eglplatform.h ---- linux-4.1.10/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-10-11 19:49:27.975268288 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_eglplatform.h linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_eglplatform.h +--- linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_eglplatform.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_eglplatform.h 2015-11-30 17:56:13.588137194 +0100 @@ -0,0 +1,651 @@ +/**************************************************************************** +* @@ -111903,9 +111818,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_eglplatform.h xbian-source + +#endif /* __gc_hal_eglplatform_h_ */ + -diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_eglplatform_type.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_eglplatform_type.h ---- linux-4.1.10/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-10-11 19:49:27.975268288 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_eglplatform_type.h linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_eglplatform_type.h +--- linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_eglplatform_type.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_eglplatform_type.h 2015-11-30 17:56:13.588137194 +0100 @@ -0,0 +1,280 @@ +/**************************************************************************** +* @@ -112187,9 +112102,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_eglplatform_type.h xbian-s +#endif + +#endif /* __gc_hal_eglplatform_type_h_ */ -diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_engine.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_engine.h ---- linux-4.1.10/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-10-11 19:49:27.975268288 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_engine.h linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_engine.h +--- linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_engine.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_engine.h 2015-11-30 17:56:13.588137194 +0100 @@ -0,0 +1,2587 @@ +/**************************************************************************** +* @@ -114778,9 +114693,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_engine.h xbian-sources-ker + +#endif /* gcdENABLE_3D */ +#endif /* __gc_hal_engine_h_ */ -diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_engine_vg.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_engine_vg.h ---- linux-4.1.10/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-10-11 19:49:27.975268288 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_engine_vg.h linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_engine_vg.h +--- linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_engine_vg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_engine_vg.h 2015-11-30 17:56:13.592136927 +0100 @@ -0,0 +1,1215 @@ +/**************************************************************************** +* @@ -115997,9 +115912,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_engine_vg.h xbian-sources- +#endif + +#endif /* __gc_hal_vg_h_ */ -diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_enum.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_enum.h ---- linux-4.1.10/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-10-11 19:49:27.975268288 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_enum.h linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_enum.h +--- linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_enum.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_enum.h 2015-11-30 17:56:13.592136927 +0100 @@ -0,0 +1,1605 @@ +/**************************************************************************** +* @@ -117606,9 +117521,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_enum.h xbian-sources-kerne +#endif + +#endif /* __gc_hal_enum_h_ */ -diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal.h ---- linux-4.1.10/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-10-11 19:49:27.975268288 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal.h linux-4.1.13/drivers/gpu/galcore/inc/gc_hal.h +--- linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/inc/gc_hal.h 2015-11-30 17:56:13.592136927 +0100 @@ -0,0 +1,2677 @@ +/**************************************************************************** +* @@ -120287,9 +120202,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal.h xbian-sources-kernel/dri +#endif + +#endif /* __gc_hal_h_ */ -diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_kernel_buffer.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_kernel_buffer.h ---- linux-4.1.10/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-10-11 19:49:27.979268023 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_kernel_buffer.h linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_kernel_buffer.h +--- linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_kernel_buffer.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_kernel_buffer.h 2015-11-30 17:56:13.592136927 +0100 @@ -0,0 +1,218 @@ +/**************************************************************************** +* @@ -120509,9 +120424,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_kernel_buffer.h xbian-sour +#endif + +#endif /* __gc_hal_kernel_buffer_h_ */ -diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_mem.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_mem.h ---- linux-4.1.10/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-10-11 19:49:27.979268023 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_mem.h linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_mem.h +--- linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_mem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_mem.h 2015-11-30 17:56:13.592136927 +0100 @@ -0,0 +1,530 @@ +/**************************************************************************** +* @@ -121043,9 +120958,9 @@ diff -Nur linux-4.1.10/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.10/drivers/gpu/galcore/inc/gc_hal_options.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_options.h ---- linux-4.1.10/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-10-11 19:49:27.979268023 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_options.h linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_options.h +--- linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_options.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_options.h 2015-11-30 17:56:13.592136927 +0100 @@ -0,0 +1,1194 @@ +/**************************************************************************** +* @@ -122241,9 +122156,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_options.h xbian-sources-ke +#endif + +#endif /* __gc_hal_options_h_ */ -diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_profiler.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_profiler.h ---- linux-4.1.10/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-10-11 19:49:27.979268023 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_profiler.h linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_profiler.h +--- linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_profiler.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_profiler.h 2015-11-30 17:56:13.592136927 +0100 @@ -0,0 +1,585 @@ +/**************************************************************************** +* @@ -122830,9 +122745,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_profiler.h xbian-sources-k +#endif + +#endif /* __gc_hal_profiler_h_ */ -diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_raster.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_raster.h ---- linux-4.1.10/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-10-11 19:49:27.979268023 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_raster.h linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_raster.h +--- linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_raster.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_raster.h 2015-11-30 17:56:13.592136927 +0100 @@ -0,0 +1,1038 @@ +/**************************************************************************** +* @@ -123872,9 +123787,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_raster.h xbian-sources-ker +#endif + +#endif /* __gc_hal_raster_h_ */ -diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_rename.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_rename.h ---- linux-4.1.10/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-10-11 19:49:27.979268023 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_rename.h linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_rename.h +--- linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_rename.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_rename.h 2015-11-30 17:56:13.596136660 +0100 @@ -0,0 +1,243 @@ +/**************************************************************************** +* @@ -124119,9 +124034,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_rename.h xbian-sources-ker +#endif + +#endif /* __gc_hal_rename_h_ */ -diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_statistics.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_statistics.h ---- linux-4.1.10/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-10-11 19:49:27.979268023 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_statistics.h linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_statistics.h +--- linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_statistics.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_statistics.h 2015-11-30 17:56:13.596136660 +0100 @@ -0,0 +1,99 @@ +/**************************************************************************** +* @@ -124222,9 +124137,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_statistics.h xbian-sources + +#endif /*__gc_hal_statistics_h_ */ + -diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_types.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_types.h ---- linux-4.1.10/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-10-11 19:49:27.979268023 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_types.h linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_types.h +--- linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_types.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_types.h 2015-11-30 17:56:13.596136660 +0100 @@ -0,0 +1,911 @@ +/**************************************************************************** +* @@ -125137,9 +125052,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_types.h xbian-sources-kern +#endif + +#endif /* __gc_hal_types_h_ */ -diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_version.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_version.h ---- linux-4.1.10/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-10-11 19:49:27.979268023 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_version.h linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_version.h +--- linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_version.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_version.h 2015-11-30 17:56:13.596136660 +0100 @@ -0,0 +1,39 @@ +/**************************************************************************** +* @@ -125180,9 +125095,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_version.h xbian-sources-ke +#define gcvVERSION_TIME __TIME__ + +#endif /* __gc_hal_version_h_ */ -diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_vg.h xbian-sources-kernel/drivers/gpu/galcore/inc/gc_hal_vg.h ---- linux-4.1.10/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-10-11 19:49:27.979268023 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_vg.h linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_vg.h +--- linux-4.1.13.orig/drivers/gpu/galcore/inc/gc_hal_vg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/inc/gc_hal_vg.h 2015-11-30 17:56:13.596136660 +0100 @@ -0,0 +1,863 @@ +/**************************************************************************** +* @@ -126047,9 +125962,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/inc/gc_hal_vg.h xbian-sources-kernel/ +#endif + +#endif /* __gc_hal_h_ */ -diff -Nur linux-4.1.10/drivers/gpu/galcore/Kbuild xbian-sources-kernel/drivers/gpu/galcore/Kbuild ---- linux-4.1.10/drivers/gpu/galcore/Kbuild 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/gpu/galcore/Kbuild 2015-10-11 19:49:27.963269084 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/Kbuild linux-4.1.13/drivers/gpu/galcore/Kbuild +--- linux-4.1.13.orig/drivers/gpu/galcore/Kbuild 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/Kbuild 2015-11-30 17:56:13.596136660 +0100 @@ -0,0 +1,233 @@ +############################################################################## +# @@ -126284,9 +126199,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/Kbuild xbian-sources-kernel/drivers/g +galcore-objs := $(OBJS) + +endif -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:27.979268023 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/platform/freescale/gc_hal_kernel_platform_imx6q14.c linux-4.1.13/drivers/gpu/galcore/platform/freescale/gc_hal_kernel_platform_imx6q14.c +--- linux-4.1.13.orig/drivers/gpu/galcore/platform/freescale/gc_hal_kernel_platform_imx6q14.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/platform/freescale/gc_hal_kernel_platform_imx6q14.c 2015-11-30 17:56:13.596136660 +0100 @@ -0,0 +1,693 @@ +/**************************************************************************** +* @@ -126981,9 +126896,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/platform/freescale/gc_hal_kernel_plat + *Operations = &platformOperations; +} + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:27.979268023 +0200 +diff -Nur linux-4.1.13.orig/drivers/gpu/galcore/platform/freescale/gc_hal_kernel_platform_imx6q14.config linux-4.1.13/drivers/gpu/galcore/platform/freescale/gc_hal_kernel_platform_imx6q14.config +--- linux-4.1.13.orig/drivers/gpu/galcore/platform/freescale/gc_hal_kernel_platform_imx6q14.config 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/gpu/galcore/platform/freescale/gc_hal_kernel_platform_imx6q14.config 2015-11-30 17:56:13.596136660 +0100 @@ -0,0 +1,15 @@ +EXTRA_CFLAGS += -DgcdDEFAULT_CONTIGUOUS_SIZE=134217728 + @@ -127000,9 +126915,9 @@ diff -Nur linux-4.1.10/drivers/gpu/galcore/platform/freescale/gc_hal_kernel_plat +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.10/drivers/Kconfig xbian-sources-kernel/drivers/Kconfig ---- linux-4.1.10/drivers/Kconfig 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/Kconfig 2015-10-11 19:49:27.343310178 +0200 +diff -Nur linux-4.1.13.orig/drivers/Kconfig linux-4.1.13/drivers/Kconfig +--- linux-4.1.13.orig/drivers/Kconfig 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/Kconfig 2015-11-30 17:56:13.596136660 +0100 @@ -182,4 +182,6 @@ source "drivers/android/Kconfig" @@ -127010,17 +126925,17 @@ diff -Nur linux-4.1.10/drivers/Kconfig xbian-sources-kernel/drivers/Kconfig +source "drivers/mxc/Kconfig" + endmenu -diff -Nur linux-4.1.10/drivers/Makefile xbian-sources-kernel/drivers/Makefile ---- linux-4.1.10/drivers/Makefile 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/Makefile 2015-10-11 19:49:27.343310178 +0200 +diff -Nur linux-4.1.13.orig/drivers/Makefile linux-4.1.13/drivers/Makefile +--- linux-4.1.13.orig/drivers/Makefile 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/Makefile 2015-11-30 17:56:13.596136660 +0100 @@ -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.10/drivers/media/pci/Kconfig xbian-sources-kernel/drivers/media/pci/Kconfig ---- linux-4.1.10/drivers/media/pci/Kconfig 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/media/pci/Kconfig 2015-10-11 19:49:28.419238859 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/pci/Kconfig linux-4.1.13/drivers/media/pci/Kconfig +--- linux-4.1.13.orig/drivers/media/pci/Kconfig 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/media/pci/Kconfig 2015-11-30 17:56:13.596136660 +0100 @@ -12,6 +12,7 @@ comment "Media capture support" source "drivers/media/pci/meye/Kconfig" @@ -127029,17 +126944,17 @@ diff -Nur linux-4.1.10/drivers/media/pci/Kconfig xbian-sources-kernel/drivers/me endif if MEDIA_ANALOG_TV_SUPPORT -diff -Nur linux-4.1.10/drivers/media/pci/Makefile xbian-sources-kernel/drivers/media/pci/Makefile ---- linux-4.1.10/drivers/media/pci/Makefile 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/media/pci/Makefile 2015-10-11 19:49:28.419238859 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/pci/Makefile linux-4.1.13/drivers/media/pci/Makefile +--- linux-4.1.13.orig/drivers/media/pci/Makefile 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/media/pci/Makefile 2015-11-30 17:56:13.596136660 +0100 @@ -27,3 +27,4 @@ obj-$(CONFIG_VIDEO_MEYE) += meye/ obj-$(CONFIG_STA2X11_VIP) += sta2x11/ obj-$(CONFIG_VIDEO_SOLO6X10) += solo6x10/ +obj-$(CONFIG_VIDEO_TW6869) += tw6869/ -diff -Nur linux-4.1.10/drivers/media/pci/tw6869/Kconfig xbian-sources-kernel/drivers/media/pci/tw6869/Kconfig ---- linux-4.1.10/drivers/media/pci/tw6869/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/media/pci/tw6869/Kconfig 2015-10-11 19:49:28.467235678 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/pci/tw6869/Kconfig linux-4.1.13/drivers/media/pci/tw6869/Kconfig +--- linux-4.1.13.orig/drivers/media/pci/tw6869/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/pci/tw6869/Kconfig 2015-11-30 17:56:13.596136660 +0100 @@ -0,0 +1,9 @@ +config VIDEO_TW6869 + tristate "Techwell tw6869 Video For Linux" @@ -127050,14 +126965,14 @@ diff -Nur linux-4.1.10/drivers/media/pci/tw6869/Kconfig xbian-sources-kernel/dri + + To compile this driver as a module, choose M here: the + module will be called tw6869. -diff -Nur linux-4.1.10/drivers/media/pci/tw6869/Makefile xbian-sources-kernel/drivers/media/pci/tw6869/Makefile ---- linux-4.1.10/drivers/media/pci/tw6869/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/media/pci/tw6869/Makefile 2015-10-11 19:49:28.467235678 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/pci/tw6869/Makefile linux-4.1.13/drivers/media/pci/tw6869/Makefile +--- linux-4.1.13.orig/drivers/media/pci/tw6869/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/pci/tw6869/Makefile 2015-11-30 17:56:13.596136660 +0100 @@ -0,0 +1 @@ +obj-$(CONFIG_VIDEO_TW6869) += tw6869.o -diff -Nur linux-4.1.10/drivers/media/pci/tw6869/tw6869.c xbian-sources-kernel/drivers/media/pci/tw6869/tw6869.c ---- linux-4.1.10/drivers/media/pci/tw6869/tw6869.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/media/pci/tw6869/tw6869.c 2015-10-11 19:49:28.467235678 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/pci/tw6869/tw6869.c linux-4.1.13/drivers/media/pci/tw6869/tw6869.c +--- linux-4.1.13.orig/drivers/media/pci/tw6869/tw6869.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/pci/tw6869/tw6869.c 2015-11-30 17:56:13.596136660 +0100 @@ -0,0 +1,1439 @@ +/* + * Copyright 2015 www.starterkit.ru @@ -128498,9 +128413,9 @@ diff -Nur linux-4.1.10/drivers/media/pci/tw6869/tw6869.c xbian-sources-kernel/dr +}; + +module_pci_driver(tw6869_driver); -diff -Nur linux-4.1.10/drivers/media/pci/tw6869/tw6869.h xbian-sources-kernel/drivers/media/pci/tw6869/tw6869.h ---- linux-4.1.10/drivers/media/pci/tw6869/tw6869.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/media/pci/tw6869/tw6869.h 2015-10-11 19:49:28.467235678 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/pci/tw6869/tw6869.h linux-4.1.13/drivers/media/pci/tw6869/tw6869.h +--- linux-4.1.13.orig/drivers/media/pci/tw6869/tw6869.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/pci/tw6869/tw6869.h 2015-11-30 17:56:13.596136660 +0100 @@ -0,0 +1,119 @@ +/* + * Copyright 2015 www.starterkit.ru @@ -128621,9 +128536,9 @@ diff -Nur linux-4.1.10/drivers/media/pci/tw6869/tw6869.h xbian-sources-kernel/dr +#define R8_AIGAIN_CTRL(id) ((IS_CH03(id) ? 0x740 : 0xB40) + ID2SC(id) * 0x04) + +#endif /* __TW6869_H */ -diff -Nur linux-4.1.10/drivers/media/platform/Kconfig xbian-sources-kernel/drivers/media/platform/Kconfig ---- linux-4.1.10/drivers/media/platform/Kconfig 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/media/platform/Kconfig 2015-10-11 19:49:28.471235413 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/Kconfig linux-4.1.13/drivers/media/platform/Kconfig +--- linux-4.1.13.orig/drivers/media/platform/Kconfig 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/Kconfig 2015-11-30 17:56:13.596136660 +0100 @@ -114,6 +114,22 @@ To compile this driver as a module, choose M here: the module will be called s3c-camif. @@ -128647,9 +128562,9 @@ diff -Nur linux-4.1.10/drivers/media/platform/Kconfig xbian-sources-kernel/drive 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.10/drivers/media/platform/Makefile xbian-sources-kernel/drivers/media/platform/Makefile ---- linux-4.1.10/drivers/media/platform/Makefile 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/media/platform/Makefile 2015-10-11 19:49:28.471235413 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/Makefile linux-4.1.13/drivers/media/platform/Makefile +--- linux-4.1.13.orig/drivers/media/platform/Makefile 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/Makefile 2015-11-30 17:56:13.596136660 +0100 @@ -50,4 +50,7 @@ obj-$(CONFIG_VIDEO_XILINX) += xilinx/ @@ -128658,9 +128573,9 @@ diff -Nur linux-4.1.10/drivers/media/platform/Makefile xbian-sources-kernel/driv +obj-y += mxc/output/ + ccflags-y += -I$(srctree)/drivers/media/i2c -diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/adv7180.c xbian-sources-kernel/drivers/media/platform/mxc/capture/adv7180.c ---- linux-4.1.10/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-10-11 19:49:28.483234617 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/mxc/capture/adv7180.c linux-4.1.13/drivers/media/platform/mxc/capture/adv7180.c +--- linux-4.1.13.orig/drivers/media/platform/mxc/capture/adv7180.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/mxc/capture/adv7180.c 2015-11-30 17:56:13.600136395 +0100 @@ -0,0 +1,1344 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -130006,9 +129921,9 @@ diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/adv7180.c xbian-source +MODULE_AUTHOR("Freescale Semiconductor"); +MODULE_DESCRIPTION("Anolog Device ADV7180 video decoder driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/csi_v4l2_capture.c xbian-sources-kernel/drivers/media/platform/mxc/capture/csi_v4l2_capture.c ---- linux-4.1.10/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-10-11 19:49:28.483234617 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/mxc/capture/csi_v4l2_capture.c linux-4.1.13/drivers/media/platform/mxc/capture/csi_v4l2_capture.c +--- linux-4.1.13.orig/drivers/media/platform/mxc/capture/csi_v4l2_capture.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/mxc/capture/csi_v4l2_capture.c 2015-11-30 17:56:13.600136395 +0100 @@ -0,0 +1,2047 @@ +/* + * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -132057,9 +131972,9 @@ diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/csi_v4l2_capture.c xbi +MODULE_DESCRIPTION("V4L2 capture driver for Mx25 based cameras"); +MODULE_LICENSE("GPL"); +MODULE_SUPPORTED_DEVICE("video"); -diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/fsl_csi.c xbian-sources-kernel/drivers/media/platform/mxc/capture/fsl_csi.c ---- linux-4.1.10/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-10-11 19:49:28.483234617 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/mxc/capture/fsl_csi.c linux-4.1.13/drivers/media/platform/mxc/capture/fsl_csi.c +--- linux-4.1.13.orig/drivers/media/platform/mxc/capture/fsl_csi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/mxc/capture/fsl_csi.c 2015-11-30 17:56:13.600136395 +0100 @@ -0,0 +1,302 @@ +/* + * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -132363,9 +132278,9 @@ diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/fsl_csi.c xbian-source +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("fsl CSI driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/fsl_csi.h xbian-sources-kernel/drivers/media/platform/mxc/capture/fsl_csi.h ---- linux-4.1.10/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-10-11 19:49:28.483234617 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/mxc/capture/fsl_csi.h linux-4.1.13/drivers/media/platform/mxc/capture/fsl_csi.h +--- linux-4.1.13.orig/drivers/media/platform/mxc/capture/fsl_csi.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/mxc/capture/fsl_csi.h 2015-11-30 17:56:13.600136395 +0100 @@ -0,0 +1,198 @@ +/* + * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -132565,9 +132480,9 @@ diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/fsl_csi.h xbian-source +void csi_mclk_disable(void); +void csi_dmareq_rff_enable(void); +void csi_dmareq_rff_disable(void); -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.483234617 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c linux-4.1.13/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c +--- linux-4.1.13.orig/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c 2015-11-30 17:56:13.600136395 +0100 @@ -0,0 +1,493 @@ + +/* @@ -133062,9 +132977,9 @@ diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c x +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("IPU PRP VF SDC Backgroud Driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/ipu_csi_enc.c xbian-sources-kernel/drivers/media/platform/mxc/capture/ipu_csi_enc.c ---- linux-4.1.10/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-10-11 19:49:28.483234617 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/mxc/capture/ipu_csi_enc.c linux-4.1.13/drivers/media/platform/mxc/capture/ipu_csi_enc.c +--- linux-4.1.13.orig/drivers/media/platform/mxc/capture/ipu_csi_enc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/mxc/capture/ipu_csi_enc.c 2015-11-30 17:56:13.600136395 +0100 @@ -0,0 +1,384 @@ +/* + * Copyright 2009-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -133450,9 +133365,9 @@ diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/ipu_csi_enc.c xbian-so +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("CSI ENC Driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.483234617 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c linux-4.1.13/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c +--- linux-4.1.13.orig/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c 2015-11-30 17:56:13.600136395 +0100 @@ -0,0 +1,580 @@ +/* + * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -134034,9 +133949,9 @@ diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c x +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("IPU PRP VF SDC Driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/ipu_prp_enc.c xbian-sources-kernel/drivers/media/platform/mxc/capture/ipu_prp_enc.c ---- linux-4.1.10/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-10-11 19:49:28.483234617 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/mxc/capture/ipu_prp_enc.c linux-4.1.13/drivers/media/platform/mxc/capture/ipu_prp_enc.c +--- linux-4.1.13.orig/drivers/media/platform/mxc/capture/ipu_prp_enc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/mxc/capture/ipu_prp_enc.c 2015-11-30 17:56:13.600136395 +0100 @@ -0,0 +1,538 @@ +/* + * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -134576,9 +134491,9 @@ diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/ipu_prp_enc.c xbian-so +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("IPU PRP ENC Driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/ipu_prp_sw.h xbian-sources-kernel/drivers/media/platform/mxc/capture/ipu_prp_sw.h ---- linux-4.1.10/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-10-11 19:49:28.483234617 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/mxc/capture/ipu_prp_sw.h linux-4.1.13/drivers/media/platform/mxc/capture/ipu_prp_sw.h +--- linux-4.1.13.orig/drivers/media/platform/mxc/capture/ipu_prp_sw.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/mxc/capture/ipu_prp_sw.h 2015-11-30 17:56:13.600136395 +0100 @@ -0,0 +1,43 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -134623,9 +134538,9 @@ diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/ipu_prp_sw.h xbian-sou +int prp_still_deselect(void *private); + +#endif -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.483234617 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c linux-4.1.13/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c +--- linux-4.1.13.orig/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c 2015-11-30 17:56:13.600136395 +0100 @@ -0,0 +1,472 @@ +/* + * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -135099,9 +135014,9 @@ diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c xb +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("IPU PRP VF SDC Backgroud Driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.483234617 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c linux-4.1.13/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c +--- linux-4.1.13.orig/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c 2015-11-30 17:56:13.600136395 +0100 @@ -0,0 +1,528 @@ +/* + * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -135631,9 +135546,9 @@ diff -Nur linux-4.1.10/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.10/drivers/media/platform/mxc/capture/ipu_still.c xbian-sources-kernel/drivers/media/platform/mxc/capture/ipu_still.c ---- linux-4.1.10/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-10-11 19:49:28.483234617 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/mxc/capture/ipu_still.c linux-4.1.13/drivers/media/platform/mxc/capture/ipu_still.c +--- linux-4.1.13.orig/drivers/media/platform/mxc/capture/ipu_still.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/mxc/capture/ipu_still.c 2015-11-30 17:56:13.600136395 +0100 @@ -0,0 +1,269 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -135904,9 +135819,9 @@ diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/ipu_still.c xbian-sour +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("IPU PRP STILL IMAGE Driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/Kconfig xbian-sources-kernel/drivers/media/platform/mxc/capture/Kconfig ---- linux-4.1.10/drivers/media/platform/mxc/capture/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/media/platform/mxc/capture/Kconfig 2015-10-11 19:49:28.483234617 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/mxc/capture/Kconfig linux-4.1.13/drivers/media/platform/mxc/capture/Kconfig +--- linux-4.1.13.orig/drivers/media/platform/mxc/capture/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/mxc/capture/Kconfig 2015-11-30 17:56:13.600136395 +0100 @@ -0,0 +1,106 @@ +if VIDEO_MXC_CAPTURE + @@ -136014,9 +135929,9 @@ diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/Kconfig xbian-sources- +endmenu + +endif -diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/Makefile xbian-sources-kernel/drivers/media/platform/mxc/capture/Makefile ---- linux-4.1.10/drivers/media/platform/mxc/capture/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/media/platform/mxc/capture/Makefile 2015-10-11 19:49:28.483234617 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/mxc/capture/Makefile linux-4.1.13/drivers/media/platform/mxc/capture/Makefile +--- linux-4.1.13.orig/drivers/media/platform/mxc/capture/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/mxc/capture/Makefile 2015-11-30 17:56:13.600136395 +0100 @@ -0,0 +1,32 @@ +obj-$(CONFIG_VIDEO_MXC_CSI_CAMERA) += fsl_csi.o csi_v4l2_capture.o + @@ -136050,9 +135965,9 @@ diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/Makefile xbian-sources + +tda1997x-video-objs := tda1997x.o +obj-$(CONFIG_MXC_TVIN_TDA1997X) += tda1997x-video.o -diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c xbian-sources-kernel/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c ---- linux-4.1.10/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-10-11 19:49:28.483234617 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c linux-4.1.13/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c +--- linux-4.1.13.orig/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c 2015-11-30 17:56:13.604136128 +0100 @@ -0,0 +1,3384 @@ +/* + * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -139438,9 +139353,9 @@ diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c xbi +MODULE_DESCRIPTION("V4L2 capture driver for Mxc based cameras"); +MODULE_LICENSE("GPL"); +MODULE_SUPPORTED_DEVICE("video"); -diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h xbian-sources-kernel/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h ---- linux-4.1.10/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-10-11 19:49:28.483234617 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h linux-4.1.13/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h +--- linux-4.1.13.orig/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h 2015-11-30 17:56:13.604136128 +0100 @@ -0,0 +1,355 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -139797,9 +139712,9 @@ diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h xbi + return 0; +} +#endif /* __MXC_V4L2_CAPTURE_H__ */ -diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/ov5640.c xbian-sources-kernel/drivers/media/platform/mxc/capture/ov5640.c ---- linux-4.1.10/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-10-11 19:49:28.483234617 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/mxc/capture/ov5640.c linux-4.1.13/drivers/media/platform/mxc/capture/ov5640.c +--- linux-4.1.13.orig/drivers/media/platform/mxc/capture/ov5640.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/mxc/capture/ov5640.c 2015-11-30 17:56:13.604136128 +0100 @@ -0,0 +1,1959 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -141760,9 +141675,9 @@ diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/ov5640.c xbian-sources +MODULE_LICENSE("GPL"); +MODULE_VERSION("1.0"); +MODULE_ALIAS("CSI"); -diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/ov5640_mipi.c xbian-sources-kernel/drivers/media/platform/mxc/capture/ov5640_mipi.c ---- linux-4.1.10/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-10-11 19:49:28.483234617 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/mxc/capture/ov5640_mipi.c linux-4.1.13/drivers/media/platform/mxc/capture/ov5640_mipi.c +--- linux-4.1.13.orig/drivers/media/platform/mxc/capture/ov5640_mipi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/mxc/capture/ov5640_mipi.c 2015-11-30 17:56:13.604136128 +0100 @@ -0,0 +1,2193 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -143957,9 +143872,9 @@ diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/ov5640_mipi.c xbian-so +MODULE_LICENSE("GPL"); +MODULE_VERSION("1.0"); +MODULE_ALIAS("CSI"); -diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/ov5642.c xbian-sources-kernel/drivers/media/platform/mxc/capture/ov5642.c ---- linux-4.1.10/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-10-11 19:49:28.487234352 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/mxc/capture/ov5642.c linux-4.1.13/drivers/media/platform/mxc/capture/ov5642.c +--- linux-4.1.13.orig/drivers/media/platform/mxc/capture/ov5642.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/mxc/capture/ov5642.c 2015-11-30 17:56:13.612135595 +0100 @@ -0,0 +1,6294 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -150255,9 +150170,9 @@ diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/ov5642.c xbian-sources +MODULE_LICENSE("GPL"); +MODULE_VERSION("1.0"); +MODULE_ALIAS("CSI"); -diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/ov5647_mipi.c xbian-sources-kernel/drivers/media/platform/mxc/capture/ov5647_mipi.c ---- linux-4.1.10/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-10-11 19:49:28.487234352 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/mxc/capture/ov5647_mipi.c linux-4.1.13/drivers/media/platform/mxc/capture/ov5647_mipi.c +--- linux-4.1.13.orig/drivers/media/platform/mxc/capture/ov5647_mipi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/mxc/capture/ov5647_mipi.c 2015-11-30 17:56:13.612135595 +0100 @@ -0,0 +1,3780 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -154039,9 +153954,9 @@ diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/ov5647_mipi.c xbian-so +MODULE_LICENSE("GPL"); +MODULE_VERSION("1.0"); +MODULE_ALIAS("CSI"); -diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/tc358743_h2c.c xbian-sources-kernel/drivers/media/platform/mxc/capture/tc358743_h2c.c ---- linux-4.1.10/drivers/media/platform/mxc/capture/tc358743_h2c.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/media/platform/mxc/capture/tc358743_h2c.c 2015-10-11 19:49:28.487234352 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/mxc/capture/tc358743_h2c.c linux-4.1.13/drivers/media/platform/mxc/capture/tc358743_h2c.c +--- linux-4.1.13.orig/drivers/media/platform/mxc/capture/tc358743_h2c.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/mxc/capture/tc358743_h2c.c 2015-11-30 17:56:13.616135330 +0100 @@ -0,0 +1,3674 @@ +/* + * Copyright (C) 2011-2012 Freescale Semiconductor, Inc. All Rights Reserved. @@ -157717,9 +157632,9 @@ diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/tc358743_h2c.c xbian-s +MODULE_LICENSE("GPL"); +MODULE_VERSION("1.0"); +MODULE_ALIAS("CSI"); -diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/tda1997x.c xbian-sources-kernel/drivers/media/platform/mxc/capture/tda1997x.c ---- linux-4.1.10/drivers/media/platform/mxc/capture/tda1997x.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/media/platform/mxc/capture/tda1997x.c 2015-10-11 19:49:28.487234352 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/mxc/capture/tda1997x.c linux-4.1.13/drivers/media/platform/mxc/capture/tda1997x.c +--- linux-4.1.13.orig/drivers/media/platform/mxc/capture/tda1997x.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/mxc/capture/tda1997x.c 2015-11-30 17:56:13.616135330 +0100 @@ -0,0 +1,451 @@ +/* + * tda1997x.c -- MXC video capture driver for i.MX boards with @@ -158172,9 +158087,9 @@ diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/tda1997x.c xbian-sourc +MODULE_DESCRIPTION("TDA1997X hdmi receiver MXC video capture driver"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:imx-tda1997x-video"); -diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/v4l2-int-device.c xbian-sources-kernel/drivers/media/platform/mxc/capture/v4l2-int-device.c ---- linux-4.1.10/drivers/media/platform/mxc/capture/v4l2-int-device.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/media/platform/mxc/capture/v4l2-int-device.c 2015-10-11 19:49:28.487234352 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/mxc/capture/v4l2-int-device.c linux-4.1.13/drivers/media/platform/mxc/capture/v4l2-int-device.c +--- linux-4.1.13.orig/drivers/media/platform/mxc/capture/v4l2-int-device.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/mxc/capture/v4l2-int-device.c 2015-11-30 17:56:13.616135330 +0100 @@ -0,0 +1,165 @@ +/* + * drivers/media/video/v4l2-int-device.c @@ -158341,9 +158256,9 @@ diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/v4l2-int-device.c xbia +EXPORT_SYMBOL_GPL(v4l2_int_ioctl_1); + +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/v4l2-int-device.h xbian-sources-kernel/drivers/media/platform/mxc/capture/v4l2-int-device.h ---- linux-4.1.10/drivers/media/platform/mxc/capture/v4l2-int-device.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/media/platform/mxc/capture/v4l2-int-device.h 2015-10-11 19:49:28.487234352 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/mxc/capture/v4l2-int-device.h linux-4.1.13/drivers/media/platform/mxc/capture/v4l2-int-device.h +--- linux-4.1.13.orig/drivers/media/platform/mxc/capture/v4l2-int-device.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/mxc/capture/v4l2-int-device.h 2015-11-30 17:56:13.616135330 +0100 @@ -0,0 +1,317 @@ +/* + * include/media/v4l2-int-device.h @@ -158662,23 +158577,23 @@ diff -Nur linux-4.1.10/drivers/media/platform/mxc/capture/v4l2-int-device.h xbia +V4L2_INT_WRAPPER_1(g_chip_ident, int, *); + +#endif -diff -Nur linux-4.1.10/drivers/media/platform/mxc/output/Kconfig xbian-sources-kernel/drivers/media/platform/mxc/output/Kconfig ---- linux-4.1.10/drivers/media/platform/mxc/output/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/media/platform/mxc/output/Kconfig 2015-10-11 19:49:28.487234352 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/mxc/output/Kconfig linux-4.1.13/drivers/media/platform/mxc/output/Kconfig +--- linux-4.1.13.orig/drivers/media/platform/mxc/output/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/mxc/output/Kconfig 2015-11-30 17:56:13.616135330 +0100 @@ -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.10/drivers/media/platform/mxc/output/Makefile xbian-sources-kernel/drivers/media/platform/mxc/output/Makefile ---- linux-4.1.10/drivers/media/platform/mxc/output/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/media/platform/mxc/output/Makefile 2015-10-11 19:49:28.487234352 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/mxc/output/Makefile linux-4.1.13/drivers/media/platform/mxc/output/Makefile +--- linux-4.1.13.orig/drivers/media/platform/mxc/output/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/mxc/output/Makefile 2015-11-30 17:56:13.616135330 +0100 @@ -0,0 +1 @@ +obj-$(CONFIG_VIDEO_MXC_IPU_OUTPUT) += mxc_vout.o -diff -Nur linux-4.1.10/drivers/media/platform/mxc/output/mxc_vout.c xbian-sources-kernel/drivers/media/platform/mxc/output/mxc_vout.c ---- linux-4.1.10/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-10-11 19:49:28.487234352 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/mxc/output/mxc_vout.c linux-4.1.13/drivers/media/platform/mxc/output/mxc_vout.c +--- linux-4.1.13.orig/drivers/media/platform/mxc/output/mxc_vout.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/mxc/output/mxc_vout.c 2015-11-30 17:56:13.616135330 +0100 @@ -0,0 +1,2265 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -160945,9 +160860,9 @@ diff -Nur linux-4.1.10/drivers/media/platform/mxc/output/mxc_vout.c xbian-source +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("V4L2-driver for MXC video output"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.10/drivers/media/platform/mxc/v4l2-extra.h xbian-sources-kernel/drivers/media/platform/mxc/v4l2-extra.h ---- linux-4.1.10/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-10-11 19:49:28.487234352 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/platform/mxc/v4l2-extra.h linux-4.1.13/drivers/media/platform/mxc/v4l2-extra.h +--- linux-4.1.13.orig/drivers/media/platform/mxc/v4l2-extra.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/media/platform/mxc/v4l2-extra.h 2015-11-30 17:56:13.616135330 +0100 @@ -0,0 +1,11 @@ +/* +struct v4l2_send_command_control { @@ -160960,9 +160875,9 @@ diff -Nur linux-4.1.10/drivers/media/platform/mxc/v4l2-extra.h xbian-sources-ker + +#define VIDIOC_SEND_COMMAND _IOWR('V', 92, struct v4l2_send_command_control) + -diff -Nur linux-4.1.10/drivers/media/v4l2-core/Kconfig xbian-sources-kernel/drivers/media/v4l2-core/Kconfig ---- linux-4.1.10/drivers/media/v4l2-core/Kconfig 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/media/v4l2-core/Kconfig 2015-10-11 19:49:28.639224277 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/v4l2-core/Kconfig linux-4.1.13/drivers/media/v4l2-core/Kconfig +--- linux-4.1.13.orig/drivers/media/v4l2-core/Kconfig 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/media/v4l2-core/Kconfig 2015-11-30 17:56:13.616135330 +0100 @@ -44,6 +44,10 @@ tristate depends on VIDEOBUF2_CORE @@ -160974,9 +160889,9 @@ diff -Nur linux-4.1.10/drivers/media/v4l2-core/Kconfig xbian-sources-kernel/driv # Used by drivers that need Videobuf modules config VIDEOBUF_GEN tristate -diff -Nur linux-4.1.10/drivers/media/v4l2-core/Makefile xbian-sources-kernel/drivers/media/v4l2-core/Makefile ---- linux-4.1.10/drivers/media/v4l2-core/Makefile 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/media/v4l2-core/Makefile 2015-10-11 19:49:28.639224277 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/v4l2-core/Makefile linux-4.1.13/drivers/media/v4l2-core/Makefile +--- linux-4.1.13.orig/drivers/media/v4l2-core/Makefile 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/media/v4l2-core/Makefile 2015-11-30 17:56:13.616135330 +0100 @@ -21,6 +21,7 @@ obj-$(CONFIG_VIDEO_TUNER) += tuner.o @@ -160985,9 +160900,9 @@ diff -Nur linux-4.1.10/drivers/media/v4l2-core/Makefile xbian-sources-kernel/dri obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o -diff -Nur linux-4.1.10/drivers/media/v4l2-core/v4l2-compat-ioctl32.c xbian-sources-kernel/drivers/media/v4l2-core/v4l2-compat-ioctl32.c ---- linux-4.1.10/drivers/media/v4l2-core/v4l2-compat-ioctl32.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/media/v4l2-core/v4l2-compat-ioctl32.c 2015-10-11 19:49:28.639224277 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/v4l2-core/v4l2-compat-ioctl32.c linux-4.1.13/drivers/media/v4l2-core/v4l2-compat-ioctl32.c +--- linux-4.1.13.orig/drivers/media/v4l2-core/v4l2-compat-ioctl32.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/media/v4l2-core/v4l2-compat-ioctl32.c 2015-11-30 17:56:13.616135330 +0100 @@ -251,7 +251,8 @@ static int put_v4l2_format32(struct v4l2_format *kp, struct v4l2_format32 __user *up) @@ -161321,9 +161236,9 @@ diff -Nur linux-4.1.10/drivers/media/v4l2-core/v4l2-compat-ioctl32.c xbian-sourc return ret; } EXPORT_SYMBOL_GPL(v4l2_compat_ioctl32); -diff -Nur linux-4.1.10/drivers/media/v4l2-core/v4l2-dev.c xbian-sources-kernel/drivers/media/v4l2-core/v4l2-dev.c ---- linux-4.1.10/drivers/media/v4l2-core/v4l2-dev.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/media/v4l2-core/v4l2-dev.c 2015-10-11 19:49:28.639224277 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/v4l2-core/v4l2-dev.c linux-4.1.13/drivers/media/v4l2-core/v4l2-dev.c +--- linux-4.1.13.orig/drivers/media/v4l2-core/v4l2-dev.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/media/v4l2-core/v4l2-dev.c 2015-11-30 17:56:13.616135330 +0100 @@ -563,6 +563,7 @@ set_bit(_IOC_NR(VIDIOC_DBG_G_REGISTER), valid_ioctls); set_bit(_IOC_NR(VIDIOC_DBG_S_REGISTER), valid_ioctls); @@ -161332,9 +161247,9 @@ diff -Nur linux-4.1.10/drivers/media/v4l2-core/v4l2-dev.c xbian-sources-kernel/d /* 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.10/drivers/media/v4l2-core/v4l2-ioctl.c xbian-sources-kernel/drivers/media/v4l2-core/v4l2-ioctl.c ---- linux-4.1.10/drivers/media/v4l2-core/v4l2-ioctl.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/media/v4l2-core/v4l2-ioctl.c 2015-10-11 19:49:28.643224012 +0200 +diff -Nur linux-4.1.13.orig/drivers/media/v4l2-core/v4l2-ioctl.c linux-4.1.13/drivers/media/v4l2-core/v4l2-ioctl.c +--- linux-4.1.13.orig/drivers/media/v4l2-core/v4l2-ioctl.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/media/v4l2-core/v4l2-ioctl.c 2015-11-30 17:56:13.616135330 +0100 @@ -26,6 +26,7 @@ #include #include @@ -161391,9 +161306,9 @@ diff -Nur linux-4.1.10/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.10/drivers/mfd/Kconfig xbian-sources-kernel/drivers/mfd/Kconfig ---- linux-4.1.10/drivers/mfd/Kconfig 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/mfd/Kconfig 2015-10-11 19:49:28.659222952 +0200 +diff -Nur linux-4.1.13.orig/drivers/mfd/Kconfig linux-4.1.13/drivers/mfd/Kconfig +--- linux-4.1.13.orig/drivers/mfd/Kconfig 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/mfd/Kconfig 2015-11-30 17:56:13.616135330 +0100 @@ -207,6 +207,13 @@ Additional drivers must be enabled in order to use the specific features of the device. @@ -161422,18 +161337,18 @@ diff -Nur linux-4.1.10/drivers/mfd/Kconfig xbian-sources-kernel/drivers/mfd/Kcon + endmenu endif -diff -Nur linux-4.1.10/drivers/mfd/Makefile xbian-sources-kernel/drivers/mfd/Makefile ---- linux-4.1.10/drivers/mfd/Makefile 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/mfd/Makefile 2015-10-11 19:49:28.659222952 +0200 +diff -Nur linux-4.1.13.orig/drivers/mfd/Makefile linux-4.1.13/drivers/mfd/Makefile +--- linux-4.1.13.orig/drivers/mfd/Makefile 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/mfd/Makefile 2015-11-30 17:56:13.616135330 +0100 @@ -185,3 +185,5 @@ 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 +obj-$(CONFIG_MFD_TDA1997X) += tda1997x-core.o -diff -Nur linux-4.1.10/drivers/mfd/mxc-hdmi-core.c xbian-sources-kernel/drivers/mfd/mxc-hdmi-core.c ---- linux-4.1.10/drivers/mfd/mxc-hdmi-core.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mfd/mxc-hdmi-core.c 2015-10-11 19:49:28.667222422 +0200 +diff -Nur linux-4.1.13.orig/drivers/mfd/mxc-hdmi-core.c linux-4.1.13/drivers/mfd/mxc-hdmi-core.c +--- linux-4.1.13.orig/drivers/mfd/mxc-hdmi-core.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mfd/mxc-hdmi-core.c 2015-11-30 17:56:13.620135063 +0100 @@ -0,0 +1,795 @@ +/* + * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. @@ -162230,9 +162145,9 @@ diff -Nur linux-4.1.10/drivers/mfd/mxc-hdmi-core.c xbian-sources-kernel/drivers/ +MODULE_DESCRIPTION("Core driver for Freescale i.Mx on-chip HDMI"); +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.10/drivers/mfd/tda1997x-core.c xbian-sources-kernel/drivers/mfd/tda1997x-core.c ---- linux-4.1.10/drivers/mfd/tda1997x-core.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mfd/tda1997x-core.c 2015-10-11 19:49:28.671222156 +0200 +diff -Nur linux-4.1.13.orig/drivers/mfd/tda1997x-core.c linux-4.1.13/drivers/mfd/tda1997x-core.c +--- linux-4.1.13.orig/drivers/mfd/tda1997x-core.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mfd/tda1997x-core.c 2015-11-30 17:56:13.620135063 +0100 @@ -0,0 +1,4605 @@ +/* + * Copyright (C) 2013 Gateworks Corporation @@ -166839,9 +166754,9 @@ diff -Nur linux-4.1.10/drivers/mfd/tda1997x-core.c xbian-sources-kernel/drivers/ +MODULE_DESCRIPTION("Core driver for TDA1997X HDMI Receiver"); +MODULE_AUTHOR("Tim Harvey "); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.10/drivers/misc/sram.c xbian-sources-kernel/drivers/misc/sram.c ---- linux-4.1.10/drivers/misc/sram.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/misc/sram.c 2015-10-11 19:49:28.699220301 +0200 +diff -Nur linux-4.1.13.orig/drivers/misc/sram.c linux-4.1.13/drivers/misc/sram.c +--- linux-4.1.13.orig/drivers/misc/sram.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/misc/sram.c 2015-11-30 17:56:13.620135063 +0100 @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. @@ -166850,9 +166765,9 @@ diff -Nur linux-4.1.10/drivers/misc/sram.c xbian-sources-kernel/drivers/misc/sra #include #include -diff -Nur linux-4.1.10/drivers/mmc/card/block.c xbian-sources-kernel/drivers/mmc/card/block.c ---- linux-4.1.10/drivers/mmc/card/block.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/mmc/card/block.c 2015-10-11 19:49:28.703220035 +0200 +diff -Nur linux-4.1.13.orig/drivers/mmc/card/block.c linux-4.1.13/drivers/mmc/card/block.c +--- linux-4.1.13.orig/drivers/mmc/card/block.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/mmc/card/block.c 2015-11-30 17:56:13.620135063 +0100 @@ -2395,6 +2395,10 @@ * * N.B. This doesn't affect SD cards. @@ -166864,9 +166779,9 @@ diff -Nur linux-4.1.10/drivers/mmc/card/block.c xbian-sources-kernel/drivers/mmc MMC_FIXUP("MMC08G", CID_MANFID_TOSHIBA, CID_OEMID_ANY, add_quirk_mmc, MMC_QUIRK_BLK_NO_CMD23), MMC_FIXUP("MMC16G", CID_MANFID_TOSHIBA, CID_OEMID_ANY, add_quirk_mmc, -diff -Nur linux-4.1.10/drivers/mmc/core/core.c xbian-sources-kernel/drivers/mmc/core/core.c ---- linux-4.1.10/drivers/mmc/core/core.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/mmc/core/core.c 2015-10-11 19:49:28.703220035 +0200 +diff -Nur linux-4.1.13.orig/drivers/mmc/core/core.c linux-4.1.13/drivers/mmc/core/core.c +--- linux-4.1.13.orig/drivers/mmc/core/core.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/mmc/core/core.c 2015-11-30 17:56:13.620135063 +0100 @@ -1688,7 +1688,7 @@ { mmc_power_off(host); @@ -166941,9 +166856,9 @@ diff -Nur linux-4.1.10/drivers/mmc/core/core.c xbian-sources-kernel/drivers/mmc/ return max_discard; } -diff -Nur linux-4.1.10/drivers/mmc/core/host.c xbian-sources-kernel/drivers/mmc/core/host.c ---- linux-4.1.10/drivers/mmc/core/host.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/mmc/core/host.c 2015-10-11 19:49:28.707219770 +0200 +diff -Nur linux-4.1.13.orig/drivers/mmc/core/host.c linux-4.1.13/drivers/mmc/core/host.c +--- linux-4.1.13.orig/drivers/mmc/core/host.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/mmc/core/host.c 2015-11-30 17:56:13.624134796 +0100 @@ -451,7 +451,6 @@ return mmc_pwrseq_alloc(host); @@ -166952,9 +166867,9 @@ diff -Nur linux-4.1.10/drivers/mmc/core/host.c xbian-sources-kernel/drivers/mmc/ EXPORT_SYMBOL(mmc_of_parse); /** -diff -Nur linux-4.1.10/drivers/mmc/core/mmc_ops.c xbian-sources-kernel/drivers/mmc/core/mmc_ops.c ---- linux-4.1.10/drivers/mmc/core/mmc_ops.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/mmc/core/mmc_ops.c 2015-10-11 19:49:28.707219770 +0200 +diff -Nur linux-4.1.13.orig/drivers/mmc/core/mmc_ops.c linux-4.1.13/drivers/mmc/core/mmc_ops.c +--- linux-4.1.13.orig/drivers/mmc/core/mmc_ops.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/mmc/core/mmc_ops.c 2015-11-30 17:56:13.624134796 +0100 @@ -513,6 +513,12 @@ return 0; @@ -166968,9 +166883,9 @@ diff -Nur linux-4.1.10/drivers/mmc/core/mmc_ops.c xbian-sources-kernel/drivers/m * CRC errors shall only be ignored in cases were CMD13 is used to poll * to detect busy completion. */ -diff -Nur linux-4.1.10/drivers/mmc/core/sd.c xbian-sources-kernel/drivers/mmc/core/sd.c ---- linux-4.1.10/drivers/mmc/core/sd.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/mmc/core/sd.c 2015-10-11 19:49:28.707219770 +0200 +diff -Nur linux-4.1.13.orig/drivers/mmc/core/sd.c linux-4.1.13/drivers/mmc/core/sd.c +--- linux-4.1.13.orig/drivers/mmc/core/sd.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/mmc/core/sd.c 2015-11-30 17:56:13.624134796 +0100 @@ -521,6 +521,13 @@ else { mmc_set_timing(card->host, timing); @@ -167026,9 +166941,9 @@ diff -Nur linux-4.1.10/drivers/mmc/core/sd.c xbian-sources-kernel/drivers/mmc/co } /* -diff -Nur linux-4.1.10/drivers/mmc/host/sdhci-esdhc-imx.c xbian-sources-kernel/drivers/mmc/host/sdhci-esdhc-imx.c ---- linux-4.1.10/drivers/mmc/host/sdhci-esdhc-imx.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/mmc/host/sdhci-esdhc-imx.c 2015-10-11 19:49:28.715219240 +0200 +diff -Nur linux-4.1.13.orig/drivers/mmc/host/sdhci-esdhc-imx.c linux-4.1.13/drivers/mmc/host/sdhci-esdhc-imx.c +--- linux-4.1.13.orig/drivers/mmc/host/sdhci-esdhc-imx.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/mmc/host/sdhci-esdhc-imx.c 2015-11-30 17:56:13.624134796 +0100 @@ -112,6 +112,12 @@ #define ESDHC_FLAG_STD_TUNING BIT(5) /* The IP has SDHCI_CAPABILITIES_1 register */ @@ -167053,7 +166968,7 @@ diff -Nur linux-4.1.10/drivers/mmc/host/sdhci-esdhc-imx.c xbian-sources-kernel/d } else { v &= ~ESDHC_MIX_CTRL_EXE_TUNE; } -@@ -901,6 +911,9 @@ +@@ -902,6 +912,9 @@ if (of_property_read_u32(np, "fsl,delay-line", &boarddata->delay_line)) boarddata->delay_line = 0; @@ -167062,8 +166977,8 @@ diff -Nur linux-4.1.10/drivers/mmc/host/sdhci-esdhc-imx.c xbian-sources-kernel/d + mmc_of_parse_voltage(np, &host->ocr_mask); - return 0; -@@ -991,16 +1004,22 @@ + /* call to generic mmc_of_parse to support additional capabilities */ +@@ -1001,16 +1014,22 @@ writel(0x08100810, host->ioaddr + ESDHC_WTMK_LVL); host->quirks2 |= SDHCI_QUIRK2_PRESET_VALUE_BROKEN; host->mmc->caps |= MMC_CAP_1_8V_DDR; @@ -167090,9 +167005,9 @@ diff -Nur linux-4.1.10/drivers/mmc/host/sdhci-esdhc-imx.c xbian-sources-kernel/d boarddata = &imx_data->boarddata; if (sdhci_esdhc_imx_probe_dt(pdev, host, boarddata) < 0) { -diff -Nur linux-4.1.10/drivers/mxc/asrc/Kconfig xbian-sources-kernel/drivers/mxc/asrc/Kconfig ---- linux-4.1.10/drivers/mxc/asrc/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mxc/asrc/Kconfig 2015-10-11 19:49:28.755216589 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/asrc/Kconfig linux-4.1.13/drivers/mxc/asrc/Kconfig +--- linux-4.1.13.orig/drivers/mxc/asrc/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/asrc/Kconfig 2015-11-30 17:56:13.624134796 +0100 @@ -0,0 +1,14 @@ +# +# ASRC configuration @@ -167108,17 +167023,17 @@ diff -Nur linux-4.1.10/drivers/mxc/asrc/Kconfig xbian-sources-kernel/drivers/mxc + Say Y to get the ASRC service. + +endmenu -diff -Nur linux-4.1.10/drivers/mxc/asrc/Makefile xbian-sources-kernel/drivers/mxc/asrc/Makefile ---- linux-4.1.10/drivers/mxc/asrc/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mxc/asrc/Makefile 2015-10-11 19:49:28.755216589 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/asrc/Makefile linux-4.1.13/drivers/mxc/asrc/Makefile +--- linux-4.1.13.orig/drivers/mxc/asrc/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/asrc/Makefile 2015-11-30 17:56:13.624134796 +0100 @@ -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.10/drivers/mxc/asrc/mxc_asrc.c xbian-sources-kernel/drivers/mxc/asrc/mxc_asrc.c ---- linux-4.1.10/drivers/mxc/asrc/mxc_asrc.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mxc/asrc/mxc_asrc.c 2015-10-11 19:49:28.755216589 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/asrc/mxc_asrc.c linux-4.1.13/drivers/mxc/asrc/mxc_asrc.c +--- linux-4.1.13.orig/drivers/mxc/asrc/mxc_asrc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/asrc/mxc_asrc.c 2015-11-30 17:56:13.624134796 +0100 @@ -0,0 +1,2045 @@ +/* + * Freescale Asynchronous Sample Rate Converter (ASRC) driver @@ -169165,9 +169080,9 @@ diff -Nur linux-4.1.10/drivers/mxc/asrc/mxc_asrc.c xbian-sources-kernel/drivers/ +MODULE_DESCRIPTION("Asynchronous Sample Rate Converter"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:mxc_asrc"); -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.755216589 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c linux-4.1.13/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c 2015-11-30 17:56:13.624134796 +0100 @@ -0,0 +1,932 @@ +/**************************************************************************** +* @@ -170101,9 +170016,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_h + +#endif /* gcdENABLE_VG */ + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.755216589 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h linux-4.1.13/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h 2015-11-30 17:56:13.624134796 +0100 @@ -0,0 +1,319 @@ +/**************************************************************************** +* @@ -170424,9 +170339,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_h + +#endif /* __gc_hal_kernel_hardware_command_h_ */ + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.755216589 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c linux-4.1.13/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c 2015-11-30 17:56:13.628134529 +0100 @@ -0,0 +1,2114 @@ +/**************************************************************************** +* @@ -172542,9 +172457,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_h +} +#endif /* gcdENABLE_VG */ + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.755216589 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h linux-4.1.13/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h 2015-11-30 17:56:13.628134529 +0100 @@ -0,0 +1,75 @@ +/**************************************************************************** +* @@ -172621,9 +172536,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_h + +#endif /* __gc_hal_kernel_hardware_h_ */ + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.755216589 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c linux-4.1.13/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c 2015-11-30 17:56:13.628134529 +0100 @@ -0,0 +1,1735 @@ +/**************************************************************************** +* @@ -174360,9 +174275,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_co +#endif +} + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.755216589 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h linux-4.1.13/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h 2015-11-30 17:56:13.628134529 +0100 @@ -0,0 +1,157 @@ +/**************************************************************************** +* @@ -174521,9 +174436,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_co + +#endif /* __gc_hal_kernel_context_h_ */ + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.759216324 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c linux-4.1.13/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c 2015-11-30 17:56:13.632134263 +0100 @@ -0,0 +1,7280 @@ +/**************************************************************************** +* @@ -181805,9 +181720,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_ha +#endif + + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.759216324 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h linux-4.1.13/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h 2015-11-30 17:56:13.632134263 +0100 @@ -0,0 +1,136 @@ +/**************************************************************************** +* @@ -181945,9 +181860,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_ha + +#endif /* __gc_hal_kernel_hardware_h_ */ + -diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/config xbian-sources-kernel/drivers/mxc/gpu-viv/config ---- linux-4.1.10/drivers/mxc/gpu-viv/config 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mxc/gpu-viv/config 2015-10-11 19:49:28.759216324 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/config linux-4.1.13/drivers/mxc/gpu-viv/config +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/config 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/config 2015-11-30 17:56:13.632134263 +0100 @@ -0,0 +1,36 @@ +############################################################################## +# @@ -181985,9 +181900,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/config xbian-sources-kernel/drivers/m +BANK_CHANNEL_BIT ?= 12 +ENABLE_GPU_CLOCK_BY_DRIVER = 1 + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.759216324 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.c linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.c +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.c 2015-11-30 17:56:13.636133997 +0100 @@ -0,0 +1,2317 @@ +/**************************************************************************** +* @@ -184306,9 +184221,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context + return status; +} + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.759216324 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.h linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.h +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.h 2015-11-30 17:56:13.636133997 +0100 @@ -0,0 +1,183 @@ +/**************************************************************************** +* @@ -184493,9 +184408,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context + +#endif /* __gc_hal_kernel_context_h_ */ + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.759216324 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.c linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.c +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.c 2015-11-30 17:56:13.640133732 +0100 @@ -0,0 +1,8036 @@ +/**************************************************************************** +* @@ -192533,9 +192448,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardwar +} + + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.759216324 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.h linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.h +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.h 2015-11-30 17:56:13.640133732 +0100 @@ -0,0 +1,160 @@ +/**************************************************************************** +* @@ -192697,9 +192612,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardwar + +#endif /* __gc_hal_kernel_hardware_h_ */ + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.759216324 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_recorder.c linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_recorder.c +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_recorder.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_recorder.c 2015-11-30 17:56:13.640133732 +0100 @@ -0,0 +1,679 @@ +/**************************************************************************** +* @@ -193380,9 +193295,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_recorde +} + + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.759216324 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.c linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.c +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.c 2015-11-30 17:56:13.640133732 +0100 @@ -0,0 +1,932 @@ +/**************************************************************************** +* @@ -194316,9 +194231,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardw + +#endif /* gcdENABLE_VG */ + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.759216324 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.h linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.h +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.h 2015-11-30 17:56:13.640133732 +0100 @@ -0,0 +1,319 @@ +/**************************************************************************** +* @@ -194639,9 +194554,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardw + +#endif /* __gc_hal_kernel_hardware_command_h_ */ + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.759216324 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.c linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.c +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.c 2015-11-30 17:56:13.644133465 +0100 @@ -0,0 +1,2119 @@ +/**************************************************************************** +* @@ -196762,9 +196677,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardw +} +#endif /* gcdENABLE_VG */ + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.759216324 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.h linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.h +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.h 2015-11-30 17:56:13.644133465 +0100 @@ -0,0 +1,74 @@ +/**************************************************************************** +* @@ -196840,9 +196755,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardw + +#endif /* __gc_hal_kernel_hardware_h_ */ + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.759216324 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c 2015-11-30 17:56:13.644133465 +0100 @@ -0,0 +1,3967 @@ +/**************************************************************************** +* @@ -200811,9 +200726,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c xbian-sour +***** Test Code **************************************************************** +*******************************************************************************/ + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.763216059 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c 2015-11-30 17:56:13.648133198 +0100 @@ -0,0 +1,3042 @@ +/**************************************************************************** +* @@ -203857,9 +203772,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c xb +#endif +} +#endif -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.763216059 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c 2015-11-30 17:56:13.648133198 +0100 @@ -0,0 +1,3677 @@ +/**************************************************************************** +* @@ -207538,9 +207453,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c +} + +#endif /* gcdENABLE_VG */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.763216059 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c 2015-11-30 17:56:13.648133198 +0100 @@ -0,0 +1,1604 @@ +/**************************************************************************** +* @@ -209146,9 +209061,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c xbian-s + gcmkFOOTER_NO(); + return gcvSTATUS_OK; +} -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.763216059 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c 2015-11-30 17:56:13.648133198 +0100 @@ -0,0 +1,2559 @@ +/**************************************************************************** +* @@ -211709,9 +211624,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c xbia + return "nil"; + } +} -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.763216059 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c 2015-11-30 17:56:13.652132932 +0100 @@ -0,0 +1,2898 @@ +/**************************************************************************** +* @@ -214611,9 +214526,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c xbia + + return gcvSTATUS_OK; +} -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.759216324 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h 2015-11-30 17:56:13.652132932 +0100 @@ -0,0 +1,1011 @@ +/**************************************************************************** +* @@ -215626,9 +215541,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h xbian-sour +#endif + +#endif /* __gc_hal_kernel_h_ */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.763216059 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c 2015-11-30 17:56:13.652132932 +0100 @@ -0,0 +1,859 @@ +/**************************************************************************** +* @@ -216489,9 +216404,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c xbian +***** Test Code **************************************************************** +*******************************************************************************/ + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.763216059 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c 2015-11-30 17:56:13.652132932 +0100 @@ -0,0 +1,877 @@ +/**************************************************************************** +* @@ -217370,9 +217285,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg +} + +#endif /* gcdENABLE_VG */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.763216059 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c 2015-11-30 17:56:13.652132932 +0100 @@ -0,0 +1,1982 @@ +/**************************************************************************** +* @@ -219356,9 +219271,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c xbian- +****************************** T E S T C O D E ****************************** +******************************************************************************/ + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.763216059 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c 2015-11-30 17:56:13.652132932 +0100 @@ -0,0 +1,522 @@ +/**************************************************************************** +* @@ -219882,9 +219797,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c xbi +} + +#endif /* gcdENABLE_VG */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.763216059 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c 2015-11-30 17:56:13.652132932 +0100 @@ -0,0 +1,347 @@ +/**************************************************************************** +* @@ -220233,9 +220148,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c xbia + return gcvSTATUS_OK; +} +#endif -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.763216059 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h 2015-11-30 17:56:13.656132667 +0100 @@ -0,0 +1,29 @@ +/**************************************************************************** +* @@ -220266,9 +220181,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h xb +#include "gc_hal_kernel.h" + +#endif /* __gc_hal_kernel_precomp_h_ */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.763216059 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_security.c linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_security.c +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_security.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_security.c 2015-11-30 17:56:13.656132667 +0100 @@ -0,0 +1,239 @@ +/**************************************************************************** +* @@ -220509,9 +220424,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_security.c x +} + +#endif -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.763216059 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c 2015-11-30 17:56:13.656132667 +0100 @@ -0,0 +1,895 @@ +/**************************************************************************** +* @@ -221408,9 +221323,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c xbian-s +} + +#endif /* gcdENABLE_VG */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.763216059 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h 2015-11-30 17:56:13.656132667 +0100 @@ -0,0 +1,85 @@ +/**************************************************************************** +* @@ -221497,9 +221412,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h xbian-s +}; + +#endif /* __gc_hal_kernel_h_ */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.763216059 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c 2015-11-30 17:56:13.656132667 +0100 @@ -0,0 +1,2264 @@ +/**************************************************************************** +* @@ -223765,9 +223680,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory + gcmkFOOTER(); + return status; +} -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.763216059 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h 2015-11-30 17:56:13.656132667 +0100 @@ -0,0 +1,3896 @@ +/**************************************************************************** +* @@ -227665,9 +227580,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h xbian-so +#endif + +#endif /* __gc_hal_base_h_ */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h 2015-11-30 17:56:13.660132401 +0100 @@ -0,0 +1,4298 @@ +/**************************************************************************** +* @@ -231967,9 +231882,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h xbia + +#endif /* VIVANTE_NO_3D */ +#endif /* __gc_hal_compiler_h_ */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h 2015-11-30 17:56:13.660132401 +0100 @@ -0,0 +1,1051 @@ +/**************************************************************************** +* @@ -233022,9 +232937,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h xbian- +#endif + +#endif /* __gc_hal_driver_h_ */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h 2015-11-30 17:56:13.660132401 +0100 @@ -0,0 +1,270 @@ +/**************************************************************************** +* @@ -233296,9 +233211,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h xbi +#endif + +#endif /* __gc_hal_driver_h_ */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h 2015-11-30 17:56:13.660132401 +0100 @@ -0,0 +1,88 @@ +/**************************************************************************** +* @@ -233388,9 +233303,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h xbian-so + +#endif /* __gc_hal_dump_h_ */ + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h 2015-11-30 17:56:13.660132401 +0100 @@ -0,0 +1,627 @@ +/**************************************************************************** +* @@ -234019,9 +233934,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h x +#endif + +#endif /* __gc_hal_eglplatform_h_ */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h 2015-11-30 17:56:13.660132401 +0100 @@ -0,0 +1,286 @@ +/**************************************************************************** +* @@ -234309,9 +234224,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_typ +#endif + +#endif /* __gc_hal_eglplatform_type_h_ */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h 2015-11-30 17:56:13.660132401 +0100 @@ -0,0 +1,2053 @@ +/**************************************************************************** +* @@ -236366,9 +236281,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h xbian- + +#endif /* VIVANTE_NO_3D */ +#endif /* __gc_hal_engine_h_ */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h 2015-11-30 17:56:13.660132401 +0100 @@ -0,0 +1,904 @@ +/**************************************************************************** +* @@ -237274,9 +237189,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h xbi +#endif + +#endif /* __gc_hal_vg_h_ */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h 2015-11-30 17:56:13.664132133 +0100 @@ -0,0 +1,965 @@ +/**************************************************************************** +* @@ -238243,9 +238158,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h xbian-so +#endif + +#endif /* __gc_hal_enum_h_ */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.763216059 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h 2015-11-30 17:56:13.664132133 +0100 @@ -0,0 +1,2661 @@ +/**************************************************************************** +* @@ -240908,9 +240823,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h xbian-sources +#endif + +#endif /* __gc_hal_h_ */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h 2015-11-30 17:56:13.664132133 +0100 @@ -0,0 +1,185 @@ +/**************************************************************************** +* @@ -241097,9 +241012,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h +#endif + +#endif /* __gc_hal_kernel_buffer_h_ */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h 2015-11-30 17:56:13.664132133 +0100 @@ -0,0 +1,530 @@ +/**************************************************************************** +* @@ -241631,9 +241546,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h xbian-sou + +#endif /* VIVANTE_NO_3D */ +#endif /* __gc_hal_mem_h_ */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h 2015-11-30 17:56:13.664132133 +0100 @@ -0,0 +1,938 @@ +/**************************************************************************** +* @@ -242573,9 +242488,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h xbian +#endif + +#endif /* __gc_hal_options_h_ */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h 2015-11-30 17:56:13.664132133 +0100 @@ -0,0 +1,584 @@ +/**************************************************************************** +* @@ -243161,9 +243076,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h xbia +#endif + +#endif /* __gc_hal_profiler_h_ */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h 2015-11-30 17:56:13.664132133 +0100 @@ -0,0 +1,1010 @@ +/**************************************************************************** +* @@ -244175,9 +244090,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h xbian- +#endif + +#endif /* __gc_hal_raster_h_ */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h 2015-11-30 17:56:13.664132133 +0100 @@ -0,0 +1,248 @@ +/**************************************************************************** +* @@ -244427,9 +244342,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h xbian- +#endif + +#endif /* __gc_hal_rename_h_ */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_security_interface.h linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_security_interface.h +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_security_interface.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_security_interface.h 2015-11-30 17:56:13.664132133 +0100 @@ -0,0 +1,137 @@ +/**************************************************************************** +* @@ -244568,9 +244483,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_security_interf +}; + +#endif -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h 2015-11-30 17:56:13.664132133 +0100 @@ -0,0 +1,115 @@ +/**************************************************************************** +* @@ -244687,9 +244602,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h xb + +#endif /*__gc_hal_statistics_h_ */ + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h 2015-11-30 17:56:13.668131866 +0100 @@ -0,0 +1,1080 @@ +/**************************************************************************** +* @@ -245771,9 +245686,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h xbian-s +#endif + +#endif /* __gc_hal_types_h_ */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h 2015-11-30 17:56:13.668131866 +0100 @@ -0,0 +1,37 @@ +/**************************************************************************** +* @@ -245812,9 +245727,9 @@ diff -Nur linux-4.1.10/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.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h 2015-11-30 17:56:13.668131866 +0100 @@ -0,0 +1,913 @@ +/**************************************************************************** +* @@ -246729,9 +246644,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h xbian-sour +#endif + +#endif /* __gc_hal_h_ */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/default/gc_hal_kernel_allocator_array.h linux-4.1.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/default/gc_hal_kernel_allocator_array.h +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/default/gc_hal_kernel_allocator_array.h 2015-11-30 17:56:13.668131866 +0100 @@ -0,0 +1,34 @@ +/**************************************************************************** +* @@ -246767,9 +246682,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/default +}; + + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_array.h linux-4.1.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_array.h +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_array.h 2015-11-30 17:56:13.668131866 +0100 @@ -0,0 +1,45 @@ +/**************************************************************************** +* @@ -246816,9 +246731,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freesca +}; + + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_cma.c linux-4.1.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_cma.c +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_cma.c 2015-11-30 17:56:13.668131866 +0100 @@ -0,0 +1,412 @@ +/**************************************************************************** +* @@ -247232,9 +247147,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freesca + return status; +} + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.c linux-4.1.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.c +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.c 2015-11-30 17:56:13.668131866 +0100 @@ -0,0 +1,925 @@ +/**************************************************************************** +* @@ -248161,9 +248076,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_all + return gcvSTATUS_OK; +} + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.h linux-4.1.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.h +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.h 2015-11-30 17:56:13.668131866 +0100 @@ -0,0 +1,400 @@ +/**************************************************************************** +* @@ -248565,9 +248480,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_all + +*/ +#endif -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c linux-4.1.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c 2015-11-30 17:56:13.668131866 +0100 @@ -0,0 +1,795 @@ +/**************************************************************************** +* @@ -249364,9 +249279,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_deb +{ + gcmkDBGFSPRINT ( _GetArgumentSize ( Message ) , Message ) ; +} -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h linux-4.1.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h 2015-11-30 17:56:13.668131866 +0100 @@ -0,0 +1,84 @@ +/**************************************************************************** +* @@ -249452,9 +249367,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_deb +#endif + + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h linux-4.1.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h 2015-11-30 17:56:13.668131866 +0100 @@ -0,0 +1,102 @@ +/**************************************************************************** +* @@ -249558,9 +249473,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_deb +#endif + +#endif /* __gc_hal_kernel_debug_h_ */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c linux-4.1.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c 2015-11-30 17:56:13.668131866 +0100 @@ -0,0 +1,1676 @@ +/**************************************************************************** +* @@ -251238,9 +251153,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_dev + gcmkFOOTER(); + return status; +} -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h linux-4.1.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h 2015-11-30 17:56:13.668131866 +0100 @@ -0,0 +1,192 @@ +/**************************************************************************** +* @@ -251434,9 +251349,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_dev + ); + +#endif /* __gc_hal_kernel_device_h_ */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c linux-4.1.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c 2015-11-30 17:56:13.672131600 +0100 @@ -0,0 +1,1476 @@ +/**************************************************************************** +* @@ -252914,9 +252829,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_dri +module_exit(gpu_exit); + +#endif -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_iommu.c linux-4.1.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_iommu.c +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_iommu.c 2015-11-30 17:56:13.672131600 +0100 @@ -0,0 +1,216 @@ +/**************************************************************************** +* @@ -253134,9 +253049,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_iom + return gcvSTATUS_OK; +} + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.767215793 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c linux-4.1.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c 2015-11-30 17:56:13.672131600 +0100 @@ -0,0 +1,481 @@ +/**************************************************************************** +* @@ -253619,9 +253534,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_lin + gcmkFOOTER_ARG("Settings->signal=%d", Settings->signal); + return gcvSTATUS_OK; +} -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.771215528 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h linux-4.1.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h 2015-11-30 17:56:13.672131600 +0100 @@ -0,0 +1,94 @@ +/**************************************************************************** +* @@ -253717,9 +253632,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_lin +} + +#endif /* __gc_hal_kernel_linux_h_ */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.771215528 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c linux-4.1.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c 2015-11-30 17:56:13.672131600 +0100 @@ -0,0 +1,32 @@ +/**************************************************************************** +* @@ -253753,9 +253668,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_mat + if(Y ==0) {return 0;} + else {return X % Y;} +} -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.771215528 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c linux-4.1.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c 2015-11-30 17:56:13.676131334 +0100 @@ -0,0 +1,8825 @@ +/**************************************************************************** +* @@ -262582,9 +262497,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os. + return status; +} +#endif -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.771215528 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h linux-4.1.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h 2015-11-30 17:56:13.676131334 +0100 @@ -0,0 +1,83 @@ +/**************************************************************************** +* @@ -262669,9 +262584,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os. +DRIVER_ARGS; + +#endif /* __gc_hal_kernel_os_h_ */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.771215528 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_platform.h linux-4.1.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_platform.h +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_platform.h 2015-11-30 17:56:13.676131334 +0100 @@ -0,0 +1,279 @@ +/**************************************************************************** +* @@ -262952,9 +262867,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_pla + ); + +#endif -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.771215528 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_probe.c linux-4.1.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_probe.c +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_probe.c 2015-11-30 17:56:13.676131334 +0100 @@ -0,0 +1,1347 @@ +/**************************************************************************** +* @@ -264303,9 +264218,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_pro +module_exit(gpu_exit); + +#endif -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.771215528 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_security_channel.c linux-4.1.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_security_channel.c +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_security_channel.c 2015-11-30 17:56:13.676131334 +0100 @@ -0,0 +1,385 @@ +/**************************************************************************** +* @@ -264692,9 +264607,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sec + gcmkFOOTER(); + return status; +} -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.771215528 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c linux-4.1.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c 2015-11-30 17:56:13.676131334 +0100 @@ -0,0 +1,174 @@ +/**************************************************************************** +* @@ -264870,9 +264785,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_syn +} + +#endif -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.771215528 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h linux-4.1.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h 2015-11-30 17:56:13.676131334 +0100 @@ -0,0 +1,71 @@ +/**************************************************************************** +* @@ -264945,9 +264860,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_syn + ); + +#endif /* __gc_hal_kernel_sync_h_ */ -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.771215528 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c linux-4.1.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c 2015-11-30 17:56:13.676131334 +0100 @@ -0,0 +1,880 @@ +/**************************************************************************** +* @@ -265829,9 +265744,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescal + *Operations = &platformOperations; +} + -diff -Nur linux-4.1.10/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.10/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-10-11 19:49:28.771215528 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.config linux-4.1.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.config +--- linux-4.1.13.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.13/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.config 2015-11-30 17:56:13.676131334 +0100 @@ -0,0 +1,15 @@ +EXTRA_CFLAGS += -DgcdDEFAULT_CONTIGUOUS_SIZE=134217728 + @@ -265848,9 +265763,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescal +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.10/drivers/mxc/gpu-viv/Kbuild xbian-sources-kernel/drivers/mxc/gpu-viv/Kbuild ---- linux-4.1.10/drivers/mxc/gpu-viv/Kbuild 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mxc/gpu-viv/Kbuild 2015-10-11 19:49:28.755216589 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/Kbuild linux-4.1.13/drivers/mxc/gpu-viv/Kbuild +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/Kbuild 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/Kbuild 2015-11-30 17:56:13.676131334 +0100 @@ -0,0 +1,230 @@ +############################################################################## +# @@ -266082,9 +265997,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/Kbuild xbian-sources-kernel/drivers/m +galcore-objs := $(OBJS) + +endif -diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/Kconfig xbian-sources-kernel/drivers/mxc/gpu-viv/Kconfig ---- linux-4.1.10/drivers/mxc/gpu-viv/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mxc/gpu-viv/Kconfig 2015-10-11 19:49:28.755216589 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/gpu-viv/Kconfig linux-4.1.13/drivers/mxc/gpu-viv/Kconfig +--- linux-4.1.13.orig/drivers/mxc/gpu-viv/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/gpu-viv/Kconfig 2015-11-30 17:56:13.676131334 +0100 @@ -0,0 +1,15 @@ +menu "Vivante GPU support" + depends on SOC_IMX6Q @@ -266101,9 +266016,9 @@ diff -Nur linux-4.1.10/drivers/mxc/gpu-viv/Kconfig xbian-sources-kernel/drivers/ + Say Y to get the GPU driver support. + +endmenu -diff -Nur linux-4.1.10/drivers/mxc/hdmi-cec/Kconfig xbian-sources-kernel/drivers/mxc/hdmi-cec/Kconfig ---- linux-4.1.10/drivers/mxc/hdmi-cec/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mxc/hdmi-cec/Kconfig 2015-10-11 19:49:28.771215528 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/hdmi-cec/Kconfig linux-4.1.13/drivers/mxc/hdmi-cec/Kconfig +--- linux-4.1.13.orig/drivers/mxc/hdmi-cec/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/hdmi-cec/Kconfig 2015-11-30 17:56:13.676131334 +0100 @@ -0,0 +1,11 @@ + +menu "MXC HDMI CEC (Consumer Electronics Control) support" @@ -266116,14 +266031,14 @@ diff -Nur linux-4.1.10/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.10/drivers/mxc/hdmi-cec/Makefile xbian-sources-kernel/drivers/mxc/hdmi-cec/Makefile ---- linux-4.1.10/drivers/mxc/hdmi-cec/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mxc/hdmi-cec/Makefile 2015-10-11 19:49:28.771215528 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/hdmi-cec/Makefile linux-4.1.13/drivers/mxc/hdmi-cec/Makefile +--- linux-4.1.13.orig/drivers/mxc/hdmi-cec/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/hdmi-cec/Makefile 2015-11-30 17:56:13.676131334 +0100 @@ -0,0 +1 @@ +obj-$(CONFIG_MXC_HDMI_CEC) += mxc_hdmi-cec.o -diff -Nur linux-4.1.10/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c xbian-sources-kernel/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c ---- linux-4.1.10/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-10-11 19:49:28.771215528 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c linux-4.1.13/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c +--- linux-4.1.13.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c 2015-11-30 17:56:13.676131334 +0100 @@ -0,0 +1,795 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -266920,9 +266835,9 @@ diff -Nur linux-4.1.10/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c xbian-sources-kernel/ +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:mxc_hdmi_cec"); + -diff -Nur linux-4.1.10/drivers/mxc/hdmi-cec/mxc_hdmi-cec.debug.c xbian-sources-kernel/drivers/mxc/hdmi-cec/mxc_hdmi-cec.debug.c ---- linux-4.1.10/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-10-11 19:49:28.771215528 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.debug.c linux-4.1.13/drivers/mxc/hdmi-cec/mxc_hdmi-cec.debug.c +--- linux-4.1.13.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.debug.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/hdmi-cec/mxc_hdmi-cec.debug.c 2015-11-30 17:56:13.676131334 +0100 @@ -0,0 +1,765 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -267689,9 +267604,9 @@ diff -Nur linux-4.1.10/drivers/mxc/hdmi-cec/mxc_hdmi-cec.debug.c xbian-sources-k +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:mxc_hdmi_cec"); + -diff -Nur linux-4.1.10/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h xbian-sources-kernel/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h ---- linux-4.1.10/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-10-11 19:49:28.771215528 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h linux-4.1.13/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h +--- linux-4.1.13.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h 2015-11-30 17:56:13.676131334 +0100 @@ -0,0 +1,53 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -267746,9 +267661,9 @@ diff -Nur linux-4.1.10/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h xbian-sources-kernel/ + +#endif /* !_HDMICEC_H_ */ + -diff -Nur linux-4.1.10/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c xbian-sources-kernel/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c ---- linux-4.1.10/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-10-11 19:49:28.771215528 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c linux-4.1.13/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c +--- linux-4.1.13.orig/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c 2015-11-30 17:56:13.680131069 +0100 @@ -0,0 +1,495 @@ +/* + * Copyright 2009-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -268245,9 +268160,9 @@ diff -Nur linux-4.1.10/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c xbian-sources-k + return status; +} +EXPORT_SYMBOL(ipu_calc_stripes_sizes); -diff -Nur linux-4.1.10/drivers/mxc/ipu3/ipu_capture.c xbian-sources-kernel/drivers/mxc/ipu3/ipu_capture.c ---- linux-4.1.10/drivers/mxc/ipu3/ipu_capture.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mxc/ipu3/ipu_capture.c 2015-10-11 19:49:28.771215528 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/ipu3/ipu_capture.c linux-4.1.13/drivers/mxc/ipu3/ipu_capture.c +--- linux-4.1.13.orig/drivers/mxc/ipu3/ipu_capture.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/ipu3/ipu_capture.c 2015-11-30 17:56:13.696130004 +0100 @@ -0,0 +1,862 @@ +/* + * Copyright 2008-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -269111,9 +269026,9 @@ diff -Nur linux-4.1.10/drivers/mxc/ipu3/ipu_capture.c xbian-sources-kernel/drive + ipu_free_irq(ipu, irq, ipu); + dev_dbg(ipu->dev, "CSI stop timeout - %d * 10ms\n", 5 - ret); +} -diff -Nur linux-4.1.10/drivers/mxc/ipu3/ipu_common.c xbian-sources-kernel/drivers/mxc/ipu3/ipu_common.c ---- linux-4.1.10/drivers/mxc/ipu3/ipu_common.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mxc/ipu3/ipu_common.c 2015-10-11 19:49:28.771215528 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/ipu3/ipu_common.c linux-4.1.13/drivers/mxc/ipu3/ipu_common.c +--- linux-4.1.13.orig/drivers/mxc/ipu3/ipu_common.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/ipu3/ipu_common.c 2015-11-30 17:56:13.696130004 +0100 @@ -0,0 +1,3204 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -272319,9 +272234,9 @@ diff -Nur linux-4.1.10/drivers/mxc/ipu3/ipu_common.c xbian-sources-kernel/driver + +MODULE_DESCRIPTION("i.MX IPU v3 driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.10/drivers/mxc/ipu3/ipu_device.c xbian-sources-kernel/drivers/mxc/ipu3/ipu_device.c ---- linux-4.1.10/drivers/mxc/ipu3/ipu_device.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mxc/ipu3/ipu_device.c 2015-10-11 19:49:28.771215528 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/ipu3/ipu_device.c linux-4.1.13/drivers/mxc/ipu3/ipu_device.c +--- linux-4.1.13.orig/drivers/mxc/ipu3/ipu_device.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/ipu3/ipu_device.c 2015-11-30 17:56:13.700129738 +0100 @@ -0,0 +1,3726 @@ +/* + * Copyright 2005-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -276049,9 +275964,9 @@ diff -Nur linux-4.1.10/drivers/mxc/ipu3/ipu_device.c xbian-sources-kernel/driver + major = 0; + } +} -diff -Nur linux-4.1.10/drivers/mxc/ipu3/ipu_disp.c xbian-sources-kernel/drivers/mxc/ipu3/ipu_disp.c ---- linux-4.1.10/drivers/mxc/ipu3/ipu_disp.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mxc/ipu3/ipu_disp.c 2015-10-11 19:49:28.771215528 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/ipu3/ipu_disp.c linux-4.1.13/drivers/mxc/ipu3/ipu_disp.c +--- linux-4.1.13.orig/drivers/mxc/ipu3/ipu_disp.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/ipu3/ipu_disp.c 2015-11-30 17:56:13.700129738 +0100 @@ -0,0 +1,1956 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -278009,9 +277924,9 @@ diff -Nur linux-4.1.10/drivers/mxc/ipu3/ipu_disp.c xbian-sources-kernel/drivers/ + _ipu_init_dc_mappings(ipu); + _ipu_dmfc_init(ipu, DMFC_NORMAL, 1); +} -diff -Nur linux-4.1.10/drivers/mxc/ipu3/ipu_ic.c xbian-sources-kernel/drivers/mxc/ipu3/ipu_ic.c ---- linux-4.1.10/drivers/mxc/ipu3/ipu_ic.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mxc/ipu3/ipu_ic.c 2015-10-11 19:49:28.771215528 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/ipu3/ipu_ic.c linux-4.1.13/drivers/mxc/ipu3/ipu_ic.c +--- linux-4.1.13.orig/drivers/mxc/ipu3/ipu_ic.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/ipu3/ipu_ic.c 2015-11-30 17:56:13.700129738 +0100 @@ -0,0 +1,924 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -278937,9 +278852,9 @@ diff -Nur linux-4.1.10/drivers/mxc/ipu3/ipu_ic.c xbian-sources-kernel/drivers/mx + + ipu_vdi_write(ipu, reg, VDI_C); +} -diff -Nur linux-4.1.10/drivers/mxc/ipu3/ipu_param_mem.h xbian-sources-kernel/drivers/mxc/ipu3/ipu_param_mem.h ---- linux-4.1.10/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-10-11 19:49:28.771215528 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/ipu3/ipu_param_mem.h linux-4.1.13/drivers/mxc/ipu3/ipu_param_mem.h +--- linux-4.1.13.orig/drivers/mxc/ipu3/ipu_param_mem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/ipu3/ipu_param_mem.h 2015-11-30 17:56:13.704129470 +0100 @@ -0,0 +1,921 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -279862,9 +279777,9 @@ diff -Nur linux-4.1.10/drivers/mxc/ipu3/ipu_param_mem.h xbian-sources-kernel/dri + return false; +} +#endif -diff -Nur linux-4.1.10/drivers/mxc/ipu3/ipu_pixel_clk.c xbian-sources-kernel/drivers/mxc/ipu3/ipu_pixel_clk.c ---- linux-4.1.10/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-10-11 19:49:28.775215263 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/ipu3/ipu_pixel_clk.c linux-4.1.13/drivers/mxc/ipu3/ipu_pixel_clk.c +--- linux-4.1.13.orig/drivers/mxc/ipu3/ipu_pixel_clk.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/ipu3/ipu_pixel_clk.c 2015-11-30 17:56:13.704129470 +0100 @@ -0,0 +1,317 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -280183,9 +280098,9 @@ diff -Nur linux-4.1.10/drivers/mxc/ipu3/ipu_pixel_clk.c xbian-sources-kernel/dri + + return clk; +} -diff -Nur linux-4.1.10/drivers/mxc/ipu3/ipu_prv.h xbian-sources-kernel/drivers/mxc/ipu3/ipu_prv.h ---- linux-4.1.10/drivers/mxc/ipu3/ipu_prv.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mxc/ipu3/ipu_prv.h 2015-10-11 19:49:28.775215263 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/ipu3/ipu_prv.h linux-4.1.13/drivers/mxc/ipu3/ipu_prv.h +--- linux-4.1.13.orig/drivers/mxc/ipu3/ipu_prv.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/ipu3/ipu_prv.h 2015-11-30 17:56:13.704129470 +0100 @@ -0,0 +1,371 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -280558,9 +280473,9 @@ diff -Nur linux-4.1.10/drivers/mxc/ipu3/ipu_prv.h xbian-sources-kernel/drivers/m + 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.10/drivers/mxc/ipu3/ipu_regs.h xbian-sources-kernel/drivers/mxc/ipu3/ipu_regs.h ---- linux-4.1.10/drivers/mxc/ipu3/ipu_regs.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mxc/ipu3/ipu_regs.h 2015-10-11 19:49:28.775215263 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/ipu3/ipu_regs.h linux-4.1.13/drivers/mxc/ipu3/ipu_regs.h +--- linux-4.1.13.orig/drivers/mxc/ipu3/ipu_regs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/ipu3/ipu_regs.h 2015-11-30 17:56:13.704129470 +0100 @@ -0,0 +1,749 @@ +/* + * Copyright (C) 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -281311,23 +281226,23 @@ diff -Nur linux-4.1.10/drivers/mxc/ipu3/ipu_regs.h xbian-sources-kernel/drivers/ +#define WRG (0x01) + +#endif -diff -Nur linux-4.1.10/drivers/mxc/ipu3/Kconfig xbian-sources-kernel/drivers/mxc/ipu3/Kconfig ---- linux-4.1.10/drivers/mxc/ipu3/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mxc/ipu3/Kconfig 2015-10-11 19:49:28.771215528 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/ipu3/Kconfig linux-4.1.13/drivers/mxc/ipu3/Kconfig +--- linux-4.1.13.orig/drivers/mxc/ipu3/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/ipu3/Kconfig 2015-11-30 17:56:13.704129470 +0100 @@ -0,0 +1,2 @@ +config MXC_IPU_V3_FSL + bool -diff -Nur linux-4.1.10/drivers/mxc/ipu3/Makefile xbian-sources-kernel/drivers/mxc/ipu3/Makefile ---- linux-4.1.10/drivers/mxc/ipu3/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mxc/ipu3/Makefile 2015-10-11 19:49:28.771215528 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/ipu3/Makefile linux-4.1.13/drivers/mxc/ipu3/Makefile +--- linux-4.1.13.orig/drivers/mxc/ipu3/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/ipu3/Makefile 2015-11-30 17:56:13.704129470 +0100 @@ -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.10/drivers/mxc/ipu3/vdoa.c xbian-sources-kernel/drivers/mxc/ipu3/vdoa.c ---- linux-4.1.10/drivers/mxc/ipu3/vdoa.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mxc/ipu3/vdoa.c 2015-10-11 19:49:28.775215263 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/ipu3/vdoa.c linux-4.1.13/drivers/mxc/ipu3/vdoa.c +--- linux-4.1.13.orig/drivers/mxc/ipu3/vdoa.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/ipu3/vdoa.c 2015-11-30 17:56:13.704129470 +0100 @@ -0,0 +1,547 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -281876,9 +281791,9 @@ diff -Nur linux-4.1.10/drivers/mxc/ipu3/vdoa.c xbian-sources-kernel/drivers/mxc/ +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("i.MX Video Data Order Adapter(VDOA) driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.10/drivers/mxc/ipu3/vdoa.h xbian-sources-kernel/drivers/mxc/ipu3/vdoa.h ---- linux-4.1.10/drivers/mxc/ipu3/vdoa.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mxc/ipu3/vdoa.h 2015-10-11 19:49:28.775215263 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/ipu3/vdoa.h linux-4.1.13/drivers/mxc/ipu3/vdoa.h +--- linux-4.1.13.orig/drivers/mxc/ipu3/vdoa.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/ipu3/vdoa.h 2015-11-30 17:56:13.704129470 +0100 @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -281949,9 +281864,9 @@ diff -Nur linux-4.1.10/drivers/mxc/ipu3/vdoa.h xbian-sources-kernel/drivers/mxc/ +void vdoa_get_handle(vdoa_handle_t *handle); +void vdoa_put_handle(vdoa_handle_t *handle); +#endif -diff -Nur linux-4.1.10/drivers/mxc/Kconfig xbian-sources-kernel/drivers/mxc/Kconfig ---- linux-4.1.10/drivers/mxc/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mxc/Kconfig 2015-10-11 19:49:28.755216589 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/Kconfig linux-4.1.13/drivers/mxc/Kconfig +--- linux-4.1.13.orig/drivers/mxc/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/Kconfig 2015-11-30 17:56:13.704129470 +0100 @@ -0,0 +1,25 @@ +# drivers/mxc/Kconfig + @@ -281978,9 +281893,9 @@ diff -Nur linux-4.1.10/drivers/mxc/Kconfig xbian-sources-kernel/drivers/mxc/Kcon +endmenu + +endif -diff -Nur linux-4.1.10/drivers/mxc/Makefile xbian-sources-kernel/drivers/mxc/Makefile ---- linux-4.1.10/drivers/mxc/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mxc/Makefile 2015-10-11 19:49:28.755216589 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/Makefile linux-4.1.13/drivers/mxc/Makefile +--- linux-4.1.13.orig/drivers/mxc/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/Makefile 2015-11-30 17:56:13.704129470 +0100 @@ -0,0 +1,8 @@ +obj-$(CONFIG_MXC_GPU_VIV) += gpu-viv/ +obj-$(CONFIG_MXC_GPU_VIV_V5) += ../gpu/galcore/ @@ -281990,9 +281905,9 @@ diff -Nur linux-4.1.10/drivers/mxc/Makefile xbian-sources-kernel/drivers/mxc/Mak +obj-$(CONFIG_MXC_HDMI_CEC) += hdmi-cec/ +obj-$(CONFIG_MXC_MIPI_CSI2) += mipi/ +obj-$(CONFIG_MXC_MLB) += mlb/ -diff -Nur linux-4.1.10/drivers/mxc/mipi/Kconfig xbian-sources-kernel/drivers/mxc/mipi/Kconfig ---- linux-4.1.10/drivers/mxc/mipi/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mxc/mipi/Kconfig 2015-10-11 19:49:28.775215263 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/mipi/Kconfig linux-4.1.13/drivers/mxc/mipi/Kconfig +--- linux-4.1.13.orig/drivers/mxc/mipi/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/mipi/Kconfig 2015-11-30 17:56:13.704129470 +0100 @@ -0,0 +1,14 @@ +# +# MIPI configuration @@ -282008,17 +281923,17 @@ diff -Nur linux-4.1.10/drivers/mxc/mipi/Kconfig xbian-sources-kernel/drivers/mxc + Say Y to get the MIPI CSI2 support. + +endmenu -diff -Nur linux-4.1.10/drivers/mxc/mipi/Makefile xbian-sources-kernel/drivers/mxc/mipi/Makefile ---- linux-4.1.10/drivers/mxc/mipi/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mxc/mipi/Makefile 2015-10-11 19:49:28.775215263 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/mipi/Makefile linux-4.1.13/drivers/mxc/mipi/Makefile +--- linux-4.1.13.orig/drivers/mxc/mipi/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/mipi/Makefile 2015-11-30 17:56:13.704129470 +0100 @@ -0,0 +1,4 @@ +# +# Makefile for the mipi interface driver +# +obj-$(CONFIG_MXC_MIPI_CSI2) += mxc_mipi_csi2.o -diff -Nur linux-4.1.10/drivers/mxc/mipi/mxc_mipi_csi2.c xbian-sources-kernel/drivers/mxc/mipi/mxc_mipi_csi2.c ---- linux-4.1.10/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-10-11 19:49:28.775215263 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/mipi/mxc_mipi_csi2.c linux-4.1.13/drivers/mxc/mipi/mxc_mipi_csi2.c +--- linux-4.1.13.orig/drivers/mxc/mipi/mxc_mipi_csi2.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/mipi/mxc_mipi_csi2.c 2015-11-30 17:56:13.704129470 +0100 @@ -0,0 +1,466 @@ +/* + * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -282486,9 +282401,9 @@ diff -Nur linux-4.1.10/drivers/mxc/mipi/mxc_mipi_csi2.c xbian-sources-kernel/dri +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("i.MX MIPI CSI2 driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.10/drivers/mxc/mipi/mxc_mipi_csi2.h xbian-sources-kernel/drivers/mxc/mipi/mxc_mipi_csi2.h ---- linux-4.1.10/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-10-11 19:49:28.775215263 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/mipi/mxc_mipi_csi2.h linux-4.1.13/drivers/mxc/mipi/mxc_mipi_csi2.h +--- linux-4.1.13.orig/drivers/mxc/mipi/mxc_mipi_csi2.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/mipi/mxc_mipi_csi2.h 2015-11-30 17:56:13.704129470 +0100 @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -282532,9 +282447,9 @@ diff -Nur linux-4.1.10/drivers/mxc/mipi/mxc_mipi_csi2.h xbian-sources-kernel/dri +}; + +#endif -diff -Nur linux-4.1.10/drivers/mxc/mlb/Kconfig xbian-sources-kernel/drivers/mxc/mlb/Kconfig ---- linux-4.1.10/drivers/mxc/mlb/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mxc/mlb/Kconfig 2015-10-11 19:49:28.775215263 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/mlb/Kconfig linux-4.1.13/drivers/mxc/mlb/Kconfig +--- linux-4.1.13.orig/drivers/mxc/mlb/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/mlb/Kconfig 2015-11-30 17:56:13.704129470 +0100 @@ -0,0 +1,17 @@ +# +# MLB150 configuration @@ -282553,18 +282468,18 @@ diff -Nur linux-4.1.10/drivers/mxc/mlb/Kconfig xbian-sources-kernel/drivers/mxc/ + Say Y to get the MLB150 support. + +endmenu -diff -Nur linux-4.1.10/drivers/mxc/mlb/Makefile xbian-sources-kernel/drivers/mxc/mlb/Makefile ---- linux-4.1.10/drivers/mxc/mlb/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mxc/mlb/Makefile 2015-10-11 19:49:28.775215263 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/mlb/Makefile linux-4.1.13/drivers/mxc/mlb/Makefile +--- linux-4.1.13.orig/drivers/mxc/mlb/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/mlb/Makefile 2015-11-30 17:56:13.704129470 +0100 @@ -0,0 +1,5 @@ +# +# Makefile for the i.MX6Q/DL MLB150 driver +# + +obj-$(CONFIG_MXC_MLB150) += mxc_mlb150.o -diff -Nur linux-4.1.10/drivers/mxc/mlb/mxc_mlb150.c xbian-sources-kernel/drivers/mxc/mlb/mxc_mlb150.c ---- linux-4.1.10/drivers/mxc/mlb/mxc_mlb150.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mxc/mlb/mxc_mlb150.c 2015-10-11 19:49:28.775215263 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/mlb/mxc_mlb150.c linux-4.1.13/drivers/mxc/mlb/mxc_mlb150.c +--- linux-4.1.13.orig/drivers/mxc/mlb/mxc_mlb150.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/mlb/mxc_mlb150.c 2015-11-30 17:56:13.708129203 +0100 @@ -0,0 +1,2778 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -285344,9 +285259,9 @@ diff -Nur linux-4.1.10/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.10/drivers/mxc/vpu/Kconfig xbian-sources-kernel/drivers/mxc/vpu/Kconfig ---- linux-4.1.10/drivers/mxc/vpu/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mxc/vpu/Kconfig 2015-10-11 19:49:28.775215263 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/vpu/Kconfig linux-4.1.13/drivers/mxc/vpu/Kconfig +--- linux-4.1.13.orig/drivers/mxc/vpu/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/vpu/Kconfig 2015-11-30 17:56:13.708129203 +0100 @@ -0,0 +1,31 @@ +# +# Codec configuration @@ -285379,9 +285294,9 @@ diff -Nur linux-4.1.10/drivers/mxc/vpu/Kconfig xbian-sources-kernel/drivers/mxc/ + This config is used for special VPU use case. + +endmenu -diff -Nur linux-4.1.10/drivers/mxc/vpu/Makefile xbian-sources-kernel/drivers/mxc/vpu/Makefile ---- linux-4.1.10/drivers/mxc/vpu/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mxc/vpu/Makefile 2015-10-11 19:49:28.775215263 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/vpu/Makefile linux-4.1.13/drivers/mxc/vpu/Makefile +--- linux-4.1.13.orig/drivers/mxc/vpu/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/vpu/Makefile 2015-11-30 17:56:13.708129203 +0100 @@ -0,0 +1,9 @@ +# +# Makefile for the VPU drivers. @@ -285392,9 +285307,9 @@ diff -Nur linux-4.1.10/drivers/mxc/vpu/Makefile xbian-sources-kernel/drivers/mxc +ifeq ($(CONFIG_MXC_VPU_DEBUG),y) +EXTRA_CFLAGS += -DDEBUG +endif -diff -Nur linux-4.1.10/drivers/mxc/vpu/mxc_vpu.c xbian-sources-kernel/drivers/mxc/vpu/mxc_vpu.c ---- linux-4.1.10/drivers/mxc/vpu/mxc_vpu.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/mxc/vpu/mxc_vpu.c 2015-10-11 19:49:28.775215263 +0200 +diff -Nur linux-4.1.13.orig/drivers/mxc/vpu/mxc_vpu.c linux-4.1.13/drivers/mxc/vpu/mxc_vpu.c +--- linux-4.1.13.orig/drivers/mxc/vpu/mxc_vpu.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/mxc/vpu/mxc_vpu.c 2015-11-30 17:56:13.708129203 +0100 @@ -0,0 +1,1349 @@ +/* + * Copyright 2006-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -286745,9 +286660,9 @@ diff -Nur linux-4.1.10/drivers/mxc/vpu/mxc_vpu.c xbian-sources-kernel/drivers/mx + +module_init(vpu_init); +module_exit(vpu_exit); -diff -Nur linux-4.1.10/drivers/net/ethernet/freescale/fec.h xbian-sources-kernel/drivers/net/ethernet/freescale/fec.h ---- linux-4.1.10/drivers/net/ethernet/freescale/fec.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/ethernet/freescale/fec.h 2015-10-11 19:49:28.903206779 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/ethernet/freescale/fec.h linux-4.1.13/drivers/net/ethernet/freescale/fec.h +--- linux-4.1.13.orig/drivers/net/ethernet/freescale/fec.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/ethernet/freescale/fec.h 2015-11-30 17:56:13.708129203 +0100 @@ -17,6 +17,7 @@ #include #include @@ -286821,9 +286736,9 @@ diff -Nur linux-4.1.10/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.10/drivers/net/ethernet/freescale/fec_main.c xbian-sources-kernel/drivers/net/ethernet/freescale/fec_main.c ---- linux-4.1.10/drivers/net/ethernet/freescale/fec_main.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/ethernet/freescale/fec_main.c 2015-10-11 19:49:28.907206514 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/ethernet/freescale/fec_main.c linux-4.1.13/drivers/net/ethernet/freescale/fec_main.c +--- linux-4.1.13.orig/drivers/net/ethernet/freescale/fec_main.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/ethernet/freescale/fec_main.c 2015-11-30 17:56:13.708129203 +0100 @@ -18,7 +18,7 @@ * Bug fixes and cleanup by Philippe De Muyter (phdm@macqel.be) * Copyright (c) 2004-2006 Macq Electronique SA. @@ -287251,9 +287166,9 @@ diff -Nur linux-4.1.10/drivers/net/ethernet/freescale/fec_main.c xbian-sources-k static struct platform_driver fec_driver = { .driver = { -diff -Nur linux-4.1.10/drivers/net/ethernet/intel/igb/e1000_82575.c xbian-sources-kernel/drivers/net/ethernet/intel/igb/e1000_82575.c ---- linux-4.1.10/drivers/net/ethernet/intel/igb/e1000_82575.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/ethernet/intel/igb/e1000_82575.c 2015-10-11 19:49:28.971202272 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/ethernet/intel/igb/e1000_82575.c linux-4.1.13/drivers/net/ethernet/intel/igb/e1000_82575.c +--- linux-4.1.13.orig/drivers/net/ethernet/intel/igb/e1000_82575.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/ethernet/intel/igb/e1000_82575.c 2015-11-30 17:56:13.712128937 +0100 @@ -598,13 +598,25 @@ switch (link_mode) { case E1000_CTRL_EXT_LINK_MODE_1000BASE_KX: @@ -287310,9 +287225,9 @@ diff -Nur linux-4.1.10/drivers/net/ethernet/intel/igb/e1000_82575.c xbian-source hw->phy.ops.release(hw); -diff -Nur linux-4.1.10/drivers/net/ethernet/intel/igb/e1000_hw.h xbian-sources-kernel/drivers/net/ethernet/intel/igb/e1000_hw.h ---- linux-4.1.10/drivers/net/ethernet/intel/igb/e1000_hw.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/ethernet/intel/igb/e1000_hw.h 2015-10-11 19:49:28.971202272 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/ethernet/intel/igb/e1000_hw.h linux-4.1.13/drivers/net/ethernet/intel/igb/e1000_hw.h +--- linux-4.1.13.orig/drivers/net/ethernet/intel/igb/e1000_hw.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/ethernet/intel/igb/e1000_hw.h 2015-11-30 17:56:13.712128937 +0100 @@ -27,6 +27,7 @@ #include #include @@ -287334,9 +287249,9 @@ diff -Nur linux-4.1.10/drivers/net/ethernet/intel/igb/e1000_hw.h xbian-sources-k union { struct e1000_dev_spec_82575 _82575; } dev_spec; -diff -Nur linux-4.1.10/drivers/net/ethernet/intel/igb/e1000_phy.c xbian-sources-kernel/drivers/net/ethernet/intel/igb/e1000_phy.c ---- linux-4.1.10/drivers/net/ethernet/intel/igb/e1000_phy.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/ethernet/intel/igb/e1000_phy.c 2015-10-11 19:49:28.971202272 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/ethernet/intel/igb/e1000_phy.c linux-4.1.13/drivers/net/ethernet/intel/igb/e1000_phy.c +--- linux-4.1.13.orig/drivers/net/ethernet/intel/igb/e1000_phy.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/ethernet/intel/igb/e1000_phy.c 2015-11-30 17:56:13.712128937 +0100 @@ -132,10 +132,9 @@ * Reads the MDI control regsiter in the PHY at offset and stores the * information read to data. @@ -287605,9 +287520,9 @@ diff -Nur linux-4.1.10/drivers/net/ethernet/intel/igb/e1000_phy.c xbian-sources- * igb_set_master_slave_mode - Setup PHY for Master/slave mode * @hw: pointer to the HW structure * -diff -Nur linux-4.1.10/drivers/net/ethernet/intel/igb/e1000_phy.h xbian-sources-kernel/drivers/net/ethernet/intel/igb/e1000_phy.h ---- linux-4.1.10/drivers/net/ethernet/intel/igb/e1000_phy.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/ethernet/intel/igb/e1000_phy.h 2015-10-11 19:49:28.971202272 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/ethernet/intel/igb/e1000_phy.h linux-4.1.13/drivers/net/ethernet/intel/igb/e1000_phy.h +--- linux-4.1.13.orig/drivers/net/ethernet/intel/igb/e1000_phy.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/ethernet/intel/igb/e1000_phy.h 2015-11-30 17:56:13.712128937 +0100 @@ -61,8 +61,8 @@ void igb_power_up_phy_copper(struct e1000_hw *hw); void igb_power_down_phy_copper(struct e1000_hw *hw); @@ -287628,9 +287543,9 @@ diff -Nur linux-4.1.10/drivers/net/ethernet/intel/igb/e1000_phy.h xbian-sources- s32 igb_check_polarity_m88(struct e1000_hw *hw); /* IGP01E1000 Specific Registers */ -diff -Nur linux-4.1.10/drivers/net/ethernet/intel/igb/igb_main.c xbian-sources-kernel/drivers/net/ethernet/intel/igb/igb_main.c ---- linux-4.1.10/drivers/net/ethernet/intel/igb/igb_main.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/ethernet/intel/igb/igb_main.c 2015-10-11 19:49:28.975202007 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/ethernet/intel/igb/igb_main.c linux-4.1.13/drivers/net/ethernet/intel/igb/igb_main.c +--- linux-4.1.13.orig/drivers/net/ethernet/intel/igb/igb_main.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/ethernet/intel/igb/igb_main.c 2015-11-30 17:56:13.712128937 +0100 @@ -41,6 +41,7 @@ #include #include @@ -287888,9 +287803,9 @@ diff -Nur linux-4.1.10/drivers/net/ethernet/intel/igb/igb_main.c xbian-sources-k default: return -EOPNOTSUPP; } -diff -Nur linux-4.1.10/drivers/net/phy/phy.c xbian-sources-kernel/drivers/net/phy/phy.c ---- linux-4.1.10/drivers/net/phy/phy.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/phy/phy.c 2015-10-11 19:49:29.119192462 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/phy/phy.c linux-4.1.13/drivers/net/phy/phy.c +--- linux-4.1.13.orig/drivers/net/phy/phy.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/phy/phy.c 2015-11-30 17:56:13.716128671 +0100 @@ -58,6 +58,31 @@ } } @@ -287971,9 +287886,9 @@ diff -Nur linux-4.1.10/drivers/net/phy/phy.c xbian-sources-kernel/drivers/net/ph queue_delayed_work(system_power_efficient_wq, &phydev->state_queue, PHY_STATE_TIME * HZ); } -diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c ---- linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c 2015-10-11 19:49:29.383174964 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +--- linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c 2015-11-30 17:56:13.716128671 +0100 @@ -33,6 +33,7 @@ #include #include @@ -288071,9 +287986,9 @@ diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c xbian-so return 0; } -diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c ---- linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c 2015-10-11 19:49:29.387174699 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c +--- linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c 2015-11-30 17:56:13.716128671 +0100 @@ -52,8 +52,6 @@ #define BRCMF_PNO_SCAN_COMPLETE 1 #define BRCMF_PNO_SCAN_INCOMPLETE 0 @@ -288753,9 +288668,9 @@ diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c xbian- wl_deinit_priv(cfg); brcmf_free_wiphy(cfg->wiphy); } -diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/chip.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/chip.c ---- linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/chip.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/chip.c 2015-10-11 19:49:29.387174699 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/chip.c linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/chip.c +--- linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/chip.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/chip.c 2015-11-30 17:56:13.716128671 +0100 @@ -649,6 +649,7 @@ case BRCM_CC_43567_CHIP_ID: case BRCM_CC_43569_CHIP_ID: @@ -288764,9 +288679,9 @@ diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/chip.c xbian-sour case BRCM_CC_43602_CHIP_ID: return 0x180000; default: -diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/commonring.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/commonring.c ---- linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/commonring.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/commonring.c 2015-10-11 19:49:29.387174699 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/commonring.c linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/commonring.c +--- linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/commonring.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/commonring.c 2015-11-30 17:56:13.716128671 +0100 @@ -22,17 +22,6 @@ #include "core.h" #include "commonring.h" @@ -288839,9 +288754,9 @@ diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/commonring.c xbia if (commonring->cr_write_rptr) return commonring->cr_write_rptr(commonring->cr_ctx); -diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/commonring.h xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/commonring.h ---- linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/commonring.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/commonring.h 2015-10-11 19:49:29.387174699 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/commonring.h linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/commonring.h +--- linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/commonring.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/commonring.h 2015-11-30 17:56:13.716128671 +0100 @@ -62,7 +62,8 @@ u16 n_items); void *brcmf_commonring_get_read_ptr(struct brcmf_commonring *commonring, @@ -288852,9 +288767,9 @@ diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/commonring.h xbia #define brcmf_commonring_n_items(commonring) (commonring->depth) #define brcmf_commonring_len_item(commonring) (commonring->item_len) -diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/core.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/core.c ---- linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/core.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/core.c 2015-10-11 19:49:29.387174699 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/core.c linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/core.c +--- linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/core.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/core.c 2015-11-30 17:56:13.716128671 +0100 @@ -867,8 +867,6 @@ } /* unregister will take care of freeing it */ @@ -288873,9 +288788,9 @@ diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/core.c xbian-sour brcmf_bus_change_state(bus_if, BRCMF_BUS_DOWN); -diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/debug.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/debug.c ---- linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/debug.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/debug.c 2015-10-11 19:49:29.387174699 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/debug.c linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/debug.c +--- linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/debug.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/debug.c 2015-11-30 17:56:13.716128671 +0100 @@ -41,15 +41,6 @@ root_folder = NULL; } @@ -288949,9 +288864,9 @@ diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/debug.c xbian-sou + drvr->dbgfs_dir, read_fn); + return PTR_ERR_OR_ZERO(e); } -diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/feature.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/feature.c ---- linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/feature.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/feature.c 2015-10-11 19:49:29.387174699 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/feature.c linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/feature.c +--- linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/feature.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/feature.c 2015-11-30 17:56:13.716128671 +0100 @@ -124,10 +124,12 @@ struct brcmf_if *ifp = drvr->iflist[0]; @@ -288965,9 +288880,9 @@ diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/feature.c xbian-s /* set chip related quirks */ switch (drvr->bus_if->chip) { -diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/feature.h xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/feature.h ---- linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/feature.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/feature.h 2015-10-11 19:49:29.387174699 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/feature.h linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/feature.h +--- linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/feature.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/feature.h 2015-11-30 17:56:13.716128671 +0100 @@ -19,12 +19,18 @@ /* * Features: @@ -288988,9 +288903,9 @@ diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/feature.h xbian-s /* * Quirks: * -diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/firmware.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/firmware.c ---- linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/firmware.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/firmware.c 2015-10-11 19:49:29.387174699 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/firmware.c linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/firmware.c +--- linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/firmware.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/firmware.c 2015-11-30 17:56:13.716128671 +0100 @@ -23,6 +23,10 @@ #include "debug.h" #include "firmware.h" @@ -289383,9 +289298,9 @@ diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/firmware.c xbian- + 0); +} + -diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/firmware.h xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/firmware.h ---- linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/firmware.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/firmware.h 2015-10-11 19:49:29.387174699 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/firmware.h linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/firmware.h +--- linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/firmware.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/firmware.h 2015-11-30 17:56:13.716128671 +0100 @@ -32,6 +32,12 @@ * fails it will not use the callback, but call device_release_driver() * instead which will call the driver .remove() callback. @@ -289399,9 +289314,9 @@ diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/firmware.h xbian- 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.10/drivers/net/wireless/brcm80211/brcmfmac/flowring.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/flowring.c ---- linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/flowring.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/flowring.c 2015-10-11 19:49:29.387174699 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/flowring.c linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/flowring.c +--- linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/flowring.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/flowring.c 2015-11-30 17:56:13.716128671 +0100 @@ -249,8 +249,8 @@ } @@ -289421,9 +289336,9 @@ diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/flowring.c xbian- } -diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/flowring.h xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/flowring.h ---- linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/flowring.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/flowring.h 2015-10-11 19:49:29.387174699 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/flowring.h linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/flowring.h +--- linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/flowring.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/flowring.h 2015-11-30 17:56:13.720128406 +0100 @@ -64,8 +64,8 @@ void brcmf_flowring_delete(struct brcmf_flowring *flow, u8 flowid); void brcmf_flowring_open(struct brcmf_flowring *flow, u8 flowid); @@ -289435,9 +289350,9 @@ diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/flowring.h xbian- 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.10/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h ---- linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h 2015-10-11 19:49:29.387174699 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h +--- linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h 2015-11-30 17:56:13.720128406 +0100 @@ -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 @@ -289539,9 +289454,9 @@ diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h xbia }; struct brcmf_chanspec_list { -diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c ---- linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c 2015-10-11 19:49:29.387174699 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c +--- linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c 2015-11-30 17:56:13.720128406 +0100 @@ -635,7 +635,7 @@ return 0; } @@ -289551,9 +289466,9 @@ diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c xbian- u32 slot_id, struct sk_buff **pktout, bool remove_item) { -diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c ---- linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c 2015-10-11 19:49:29.387174699 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c +--- linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c 2015-11-30 17:56:13.720128406 +0100 @@ -73,8 +73,10 @@ #define BRCMF_MSGBUF_TX_FLUSH_CNT1 32 #define BRCMF_MSGBUF_TX_FLUSH_CNT2 96 @@ -289641,9 +289556,9 @@ diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c xbian-so if (commonring->r_ptr == 0) goto again; -diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/of.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/of.c ---- linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/of.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/of.c 2015-10-11 19:49:29.387174699 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/of.c linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/of.c +--- linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/of.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/of.c 2015-11-30 17:56:13.720128406 +0100 @@ -39,10 +39,16 @@ if (!sdiodev->pdata) return; @@ -289670,9 +289585,9 @@ diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/of.c xbian-source - if (of_property_read_u32(np, "brcm,drive-strength", &val) == 0) - sdiodev->pdata->drive_strength = val; } -diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/p2p.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/p2p.c ---- linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/p2p.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/p2p.c 2015-10-11 19:49:29.387174699 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/p2p.c linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/p2p.c +--- linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/p2p.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/p2p.c 2015-11-30 17:56:13.720128406 +0100 @@ -16,6 +16,7 @@ #include #include @@ -289908,9 +289823,9 @@ diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/p2p.c xbian-sourc + memset(p2p, 0, sizeof(*p2p)); +} + -diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/pcie.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/pcie.c ---- linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/pcie.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/pcie.c 2015-10-11 19:49:29.387174699 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/pcie.c linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/pcie.c +--- linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/pcie.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/pcie.c 2015-11-30 17:56:13.720128406 +0100 @@ -51,6 +51,8 @@ #define BRCMF_PCIE_4356_NVRAM_NAME "brcm/brcmfmac4356-pcie.txt" #define BRCMF_PCIE_43570_FW_NAME "brcm/brcmfmac43570-pcie.bin" @@ -290313,9 +290228,9 @@ diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/pcie.c xbian-sour { /* end: all zeroes */ } }; -diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/sdio.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/sdio.c ---- linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/sdio.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/sdio.c 2015-10-11 19:49:29.391174434 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio.c linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/sdio.c +--- linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/sdio.c 2015-11-30 17:56:13.720128406 +0100 @@ -601,6 +601,8 @@ #define BCM43241B0_NVRAM_NAME "brcm/brcmfmac43241b0-sdio.txt" #define BCM43241B4_FIRMWARE_NAME "brcm/brcmfmac43241b4-sdio.bin" @@ -290382,9 +290297,9 @@ diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/sdio.c xbian-sour /* Count the interrupt call */ bus->sdcnt.intrcount++; if (in_interrupt()) -diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/usb.c xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/usb.c ---- linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2015-10-11 19:49:29.391174434 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/usb.c linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/usb.c +--- linux-4.1.13.orig/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2015-11-30 17:56:13.720128406 +0100 @@ -1270,8 +1270,13 @@ bus->chiprev = bus_pub->chiprev; @@ -290401,9 +290316,9 @@ diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/brcmfmac/usb.c xbian-sourc return 0; fail: -diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h xbian-sources-kernel/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h ---- linux-4.1.10/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h 2015-10-11 19:49:29.407173373 +0200 +diff -Nur linux-4.1.13.orig/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h linux-4.1.13/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h +--- linux-4.1.13.orig/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h 2015-11-30 17:56:13.720128406 +0100 @@ -45,6 +45,7 @@ #define BRCM_CC_43567_CHIP_ID 43567 #define BRCM_CC_43569_CHIP_ID 43569 @@ -290424,9 +290339,9 @@ diff -Nur linux-4.1.10/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h xbia /* brcmsmac IDs */ #define BCM4313_D11N2G_ID 0x4727 /* 4313 802.11n 2.4G device */ -diff -Nur linux-4.1.10/drivers/pci/host/pci-imx6.c xbian-sources-kernel/drivers/pci/host/pci-imx6.c ---- linux-4.1.10/drivers/pci/host/pci-imx6.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/pci/host/pci-imx6.c 2015-10-11 19:49:29.567162768 +0200 +diff -Nur linux-4.1.13.orig/drivers/pci/host/pci-imx6.c linux-4.1.13/drivers/pci/host/pci-imx6.c +--- linux-4.1.13.orig/drivers/pci/host/pci-imx6.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/pci/host/pci-imx6.c 2015-11-30 17:56:13.720128406 +0100 @@ -240,6 +240,8 @@ val |= PCIE_PL_PFLR_FORCE_LINK; writel(val, pp->dbi_base + PCIE_PL_PFLR); @@ -290436,10 +290351,10 @@ diff -Nur linux-4.1.10/drivers/pci/host/pci-imx6.c xbian-sources-kernel/drivers/ regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, IMX6Q_GPR12_PCIE_CTL_2, 0 << 10); } -diff -Nur linux-4.1.10/drivers/pci/quirks.c xbian-sources-kernel/drivers/pci/quirks.c ---- linux-4.1.10/drivers/pci/quirks.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/pci/quirks.c 2015-10-11 19:49:29.579161973 +0200 -@@ -2869,6 +2869,14 @@ +diff -Nur linux-4.1.13.orig/drivers/pci/quirks.c linux-4.1.13/drivers/pci/quirks.c +--- linux-4.1.13.orig/drivers/pci/quirks.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/pci/quirks.c 2015-11-30 17:56:13.724128139 +0100 +@@ -2885,6 +2885,14 @@ DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_TI, 0xb800, PCI_CLASS_NOT_DEFINED, 0, fixup_ti816x_class); @@ -290454,9 +290369,9 @@ diff -Nur linux-4.1.10/drivers/pci/quirks.c xbian-sources-kernel/drivers/pci/qui /* Some PCIe devices do not work reliably with the claimed maximum * payload size supported. */ -diff -Nur linux-4.1.10/drivers/power/reset/Kconfig xbian-sources-kernel/drivers/power/reset/Kconfig ---- linux-4.1.10/drivers/power/reset/Kconfig 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/power/reset/Kconfig 2015-10-11 19:49:29.651157201 +0200 +diff -Nur linux-4.1.13.orig/drivers/power/reset/Kconfig linux-4.1.13/drivers/power/reset/Kconfig +--- linux-4.1.13.orig/drivers/power/reset/Kconfig 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/power/reset/Kconfig 2015-11-30 17:56:13.724128139 +0100 @@ -124,6 +124,14 @@ Power off and restart support for ARM Versatile family of reference boards. @@ -290472,9 +290387,9 @@ diff -Nur linux-4.1.10/drivers/power/reset/Kconfig xbian-sources-kernel/drivers/ config POWER_RESET_VEXPRESS bool "ARM Versatile Express power-off and reset driver" depends on ARM || ARM64 -diff -Nur linux-4.1.10/drivers/power/reset/Makefile xbian-sources-kernel/drivers/power/reset/Makefile ---- linux-4.1.10/drivers/power/reset/Makefile 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/power/reset/Makefile 2015-10-11 19:49:29.651157201 +0200 +diff -Nur linux-4.1.13.orig/drivers/power/reset/Makefile linux-4.1.13/drivers/power/reset/Makefile +--- linux-4.1.13.orig/drivers/power/reset/Makefile 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/power/reset/Makefile 2015-11-30 17:56:13.724128139 +0100 @@ -13,6 +13,7 @@ obj-$(CONFIG_POWER_RESET_RESTART) += restart-poweroff.o obj-$(CONFIG_POWER_RESET_ST) += st-poweroff.o @@ -290483,9 +290398,9 @@ diff -Nur linux-4.1.10/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.10/drivers/power/reset/snvs-poweroff.c xbian-sources-kernel/drivers/power/reset/snvs-poweroff.c ---- linux-4.1.10/drivers/power/reset/snvs-poweroff.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/power/reset/snvs-poweroff.c 2015-10-11 19:49:29.655156936 +0200 +diff -Nur linux-4.1.13.orig/drivers/power/reset/snvs-poweroff.c linux-4.1.13/drivers/power/reset/snvs-poweroff.c +--- linux-4.1.13.orig/drivers/power/reset/snvs-poweroff.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/power/reset/snvs-poweroff.c 2015-11-30 17:56:13.724128139 +0100 @@ -0,0 +1,59 @@ +/* + * Power off by restarting and let u-boot keep hold of the machine @@ -290546,9 +290461,9 @@ diff -Nur linux-4.1.10/drivers/power/reset/snvs-poweroff.c xbian-sources-kernel/ + }, +}; +module_platform_driver(snvs_poweroff_driver); -diff -Nur linux-4.1.10/drivers/regulator/Kconfig xbian-sources-kernel/drivers/regulator/Kconfig ---- linux-4.1.10/drivers/regulator/Kconfig 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/regulator/Kconfig 2015-10-11 19:49:29.695154284 +0200 +diff -Nur linux-4.1.13.orig/drivers/regulator/Kconfig linux-4.1.13/drivers/regulator/Kconfig +--- linux-4.1.13.orig/drivers/regulator/Kconfig 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/regulator/Kconfig 2015-11-30 17:56:13.724128139 +0100 @@ -316,6 +316,13 @@ The MAX14577 regulators include safeout LDO and charger current regulator. The MAX77836 has two additional LDOs. @@ -290563,9 +290478,9 @@ diff -Nur linux-4.1.10/drivers/regulator/Kconfig xbian-sources-kernel/drivers/re config REGULATOR_MAX1586 tristate "Maxim 1586/1587 voltage regulator" depends on I2C -diff -Nur linux-4.1.10/drivers/regulator/ltc3676.c xbian-sources-kernel/drivers/regulator/ltc3676.c ---- linux-4.1.10/drivers/regulator/ltc3676.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/regulator/ltc3676.c 2015-10-11 19:49:29.763149777 +0200 +diff -Nur linux-4.1.13.orig/drivers/regulator/ltc3676.c linux-4.1.13/drivers/regulator/ltc3676.c +--- linux-4.1.13.orig/drivers/regulator/ltc3676.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/regulator/ltc3676.c 2015-11-30 17:56:13.724128139 +0100 @@ -0,0 +1,497 @@ +/* + * Copyright (C) 2014 Gateworks Corporation, Inc. All Rights Reserved. @@ -291064,9 +290979,9 @@ diff -Nur linux-4.1.10/drivers/regulator/ltc3676.c xbian-sources-kernel/drivers/ +MODULE_DESCRIPTION("Regulator Driver for Linear Technology LTC1376"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("i2c:ltc3676"); -diff -Nur linux-4.1.10/drivers/regulator/Makefile xbian-sources-kernel/drivers/regulator/Makefile ---- linux-4.1.10/drivers/regulator/Makefile 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/regulator/Makefile 2015-10-11 19:49:29.695154284 +0200 +diff -Nur linux-4.1.13.orig/drivers/regulator/Makefile linux-4.1.13/drivers/regulator/Makefile +--- linux-4.1.13.orig/drivers/regulator/Makefile 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/regulator/Makefile 2015-11-30 17:56:13.724128139 +0100 @@ -43,6 +43,7 @@ obj-$(CONFIG_REGULATOR_LP8755) += lp8755.o obj-$(CONFIG_REGULATOR_LTC3589) += ltc3589.o @@ -291075,9 +290990,9 @@ diff -Nur linux-4.1.10/drivers/regulator/Makefile xbian-sources-kernel/drivers/r obj-$(CONFIG_REGULATOR_MAX1586) += max1586.o obj-$(CONFIG_REGULATOR_MAX8649) += max8649.o obj-$(CONFIG_REGULATOR_MAX8660) += max8660.o -diff -Nur linux-4.1.10/drivers/rtc/rtc-snvs.c xbian-sources-kernel/drivers/rtc/rtc-snvs.c ---- linux-4.1.10/drivers/rtc/rtc-snvs.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/rtc/rtc-snvs.c 2015-10-11 19:49:29.795147656 +0200 +diff -Nur linux-4.1.13.orig/drivers/rtc/rtc-snvs.c linux-4.1.13/drivers/rtc/rtc-snvs.c +--- linux-4.1.13.orig/drivers/rtc/rtc-snvs.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/rtc/rtc-snvs.c 2015-11-30 17:56:13.724128139 +0100 @@ -43,6 +43,10 @@ struct clk *clk; }; @@ -291105,9 +291020,9 @@ diff -Nur linux-4.1.10/drivers/rtc/rtc-snvs.c xbian-sources-kernel/drivers/rtc/r static int snvs_rtc_probe(struct platform_device *pdev) { struct snvs_rtc_data *data; -diff -Nur linux-4.1.10/drivers/spi/spi-imx.c xbian-sources-kernel/drivers/spi/spi-imx.c ---- linux-4.1.10/drivers/spi/spi-imx.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/spi/spi-imx.c 2015-10-11 19:49:30.107126976 +0200 +diff -Nur linux-4.1.13.orig/drivers/spi/spi-imx.c linux-4.1.13/drivers/spi/spi-imx.c +--- linux-4.1.13.orig/drivers/spi/spi-imx.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/spi/spi-imx.c 2015-11-30 17:56:13.724128139 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved. @@ -291457,9 +291372,9 @@ diff -Nur linux-4.1.10/drivers/spi/spi-imx.c xbian-sources-kernel/drivers/spi/sp dev_info(&pdev->dev, "probed\n"); clk_disable(spi_imx->clk_ipg); -diff -Nur linux-4.1.10/drivers/usb/phy/phy-mxs-usb.c xbian-sources-kernel/drivers/usb/phy/phy-mxs-usb.c ---- linux-4.1.10/drivers/usb/phy/phy-mxs-usb.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/usb/phy/phy-mxs-usb.c 2015-10-11 19:49:30.507100464 +0200 +diff -Nur linux-4.1.13.orig/drivers/usb/phy/phy-mxs-usb.c linux-4.1.13/drivers/usb/phy/phy-mxs-usb.c +--- linux-4.1.13.orig/drivers/usb/phy/phy-mxs-usb.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/usb/phy/phy-mxs-usb.c 2015-11-30 17:56:13.724128139 +0100 @@ -242,7 +242,7 @@ if (disconnect) @@ -291478,9 +291393,9 @@ diff -Nur linux-4.1.10/drivers/usb/phy/phy-mxs-usb.c xbian-sources-kernel/driver /* Delay some time, and let Linestate be SE0 for controller */ if (disconnect) -diff -Nur linux-4.1.10/drivers/video/fbdev/core/fbmem.c xbian-sources-kernel/drivers/video/fbdev/core/fbmem.c ---- linux-4.1.10/drivers/video/fbdev/core/fbmem.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/video/fbdev/core/fbmem.c 2015-10-11 19:49:30.563096752 +0200 +diff -Nur linux-4.1.13.orig/drivers/video/fbdev/core/fbmem.c linux-4.1.13/drivers/video/fbdev/core/fbmem.c +--- linux-4.1.13.orig/drivers/video/fbdev/core/fbmem.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/video/fbdev/core/fbmem.c 2015-11-30 17:56:13.724128139 +0100 @@ -1033,12 +1033,13 @@ !list_empty(&info->modelist)) ret = fb_add_videomode(&mode, &info->modelist); @@ -291496,9 +291411,9 @@ diff -Nur linux-4.1.10/drivers/video/fbdev/core/fbmem.c xbian-sources-kernel/dri info->flags &= ~FBINFO_MISC_USEREVENT; event.info = info; event.data = &mode; -diff -Nur linux-4.1.10/drivers/video/fbdev/core/fbmon.c xbian-sources-kernel/drivers/video/fbdev/core/fbmon.c ---- linux-4.1.10/drivers/video/fbdev/core/fbmon.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/video/fbdev/core/fbmon.c 2015-10-11 19:49:30.563096752 +0200 +diff -Nur linux-4.1.13.orig/drivers/video/fbdev/core/fbmon.c linux-4.1.13/drivers/video/fbdev/core/fbmon.c +--- linux-4.1.13.orig/drivers/video/fbdev/core/fbmon.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/video/fbdev/core/fbmon.c 2015-11-30 17:56:13.724128139 +0100 @@ -519,19 +519,25 @@ switch (ratio) { case 0: @@ -291527,9 +291442,9 @@ diff -Nur linux-4.1.10/drivers/video/fbdev/core/fbmon.c xbian-sources-kernel/dri break; } refresh = (block[1] & 0x3f) + 60; -diff -Nur linux-4.1.10/drivers/video/fbdev/core/fbsysfs.c xbian-sources-kernel/drivers/video/fbdev/core/fbsysfs.c ---- linux-4.1.10/drivers/video/fbdev/core/fbsysfs.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/video/fbdev/core/fbsysfs.c 2015-10-11 19:49:30.563096752 +0200 +diff -Nur linux-4.1.13.orig/drivers/video/fbdev/core/fbsysfs.c linux-4.1.13/drivers/video/fbdev/core/fbsysfs.c +--- linux-4.1.13.orig/drivers/video/fbdev/core/fbsysfs.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/video/fbdev/core/fbsysfs.c 2015-11-30 17:56:13.724128139 +0100 @@ -20,6 +20,7 @@ #include #include @@ -291554,9 +291469,9 @@ diff -Nur linux-4.1.10/drivers/video/fbdev/core/fbsysfs.c xbian-sources-kernel/d 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.10/drivers/video/fbdev/core/modedb.c xbian-sources-kernel/drivers/video/fbdev/core/modedb.c ---- linux-4.1.10/drivers/video/fbdev/core/modedb.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/video/fbdev/core/modedb.c 2015-10-11 19:49:30.563096752 +0200 +diff -Nur linux-4.1.13.orig/drivers/video/fbdev/core/modedb.c linux-4.1.13/drivers/video/fbdev/core/modedb.c +--- linux-4.1.13.orig/drivers/video/fbdev/core/modedb.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/video/fbdev/core/modedb.c 2015-11-30 17:56:13.724128139 +0100 @@ -1111,7 +1111,7 @@ modelist->mode = *mode; list_add(&modelist->list, head); @@ -291575,9 +291490,9 @@ diff -Nur linux-4.1.10/drivers/video/fbdev/core/modedb.c xbian-sources-kernel/dr return; } } -diff -Nur linux-4.1.10/drivers/video/Kconfig xbian-sources-kernel/drivers/video/Kconfig ---- linux-4.1.10/drivers/video/Kconfig 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/video/Kconfig 2015-10-11 19:49:30.543098078 +0200 +diff -Nur linux-4.1.13.orig/drivers/video/Kconfig linux-4.1.13/drivers/video/Kconfig +--- linux-4.1.13.orig/drivers/video/Kconfig 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/video/Kconfig 2015-11-30 17:56:13.724128139 +0100 @@ -30,6 +30,8 @@ source "drivers/video/fbdev/Kconfig" endmenu @@ -291587,9 +291502,9 @@ diff -Nur linux-4.1.10/drivers/video/Kconfig xbian-sources-kernel/drivers/video/ source "drivers/video/backlight/Kconfig" config VGASTATE -diff -Nur linux-4.1.10/drivers/video/Makefile xbian-sources-kernel/drivers/video/Makefile ---- linux-4.1.10/drivers/video/Makefile 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/drivers/video/Makefile 2015-10-11 19:49:30.543098078 +0200 +diff -Nur linux-4.1.13.orig/drivers/video/Makefile linux-4.1.13/drivers/video/Makefile +--- linux-4.1.13.orig/drivers/video/Makefile 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/drivers/video/Makefile 2015-11-30 17:56:13.724128139 +0100 @@ -6,6 +6,7 @@ obj-y += backlight/ @@ -291598,9 +291513,9 @@ diff -Nur linux-4.1.10/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.10/drivers/video/mxc/crtc.h xbian-sources-kernel/drivers/video/mxc/crtc.h ---- linux-4.1.10/drivers/video/mxc/crtc.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/video/mxc/crtc.h 2015-10-11 19:49:30.643091450 +0200 +diff -Nur linux-4.1.13.orig/drivers/video/mxc/crtc.h linux-4.1.13/drivers/video/mxc/crtc.h +--- linux-4.1.13.orig/drivers/video/mxc/crtc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/video/mxc/crtc.h 2015-11-30 17:56:13.724128139 +0100 @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -291659,9 +291574,9 @@ diff -Nur linux-4.1.10/drivers/video/mxc/crtc.h xbian-sources-kernel/drivers/vid +} + +#endif -diff -Nur linux-4.1.10/drivers/video/mxc/Kconfig xbian-sources-kernel/drivers/video/mxc/Kconfig ---- linux-4.1.10/drivers/video/mxc/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/video/mxc/Kconfig 2015-10-11 19:49:30.643091450 +0200 +diff -Nur linux-4.1.13.orig/drivers/video/mxc/Kconfig linux-4.1.13/drivers/video/mxc/Kconfig +--- linux-4.1.13.orig/drivers/video/mxc/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/video/mxc/Kconfig 2015-11-30 17:56:13.724128139 +0100 @@ -0,0 +1,61 @@ +config FB_MXC + tristate "MXC Framebuffer support" @@ -291724,9 +291639,9 @@ diff -Nur linux-4.1.10/drivers/video/mxc/Kconfig xbian-sources-kernel/drivers/vi + tristate "MXC EDID support" + default y + -diff -Nur linux-4.1.10/drivers/video/mxc/ldb.c xbian-sources-kernel/drivers/video/mxc/ldb.c ---- linux-4.1.10/drivers/video/mxc/ldb.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/video/mxc/ldb.c 2015-10-11 19:49:30.643091450 +0200 +diff -Nur linux-4.1.13.orig/drivers/video/mxc/ldb.c linux-4.1.13/drivers/video/mxc/ldb.c +--- linux-4.1.13.orig/drivers/video/mxc/ldb.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/video/mxc/ldb.c 2015-11-30 17:56:13.728127872 +0100 @@ -0,0 +1,888 @@ +/* + * Copyright (C) 2012-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -292616,9 +292531,9 @@ diff -Nur linux-4.1.10/drivers/video/mxc/ldb.c xbian-sources-kernel/drivers/vide +MODULE_DESCRIPTION("LDB driver"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:" DRIVER_NAME); -diff -Nur linux-4.1.10/drivers/video/mxc/Makefile xbian-sources-kernel/drivers/video/mxc/Makefile ---- linux-4.1.10/drivers/video/mxc/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/video/mxc/Makefile 2015-10-11 19:49:30.643091450 +0200 +diff -Nur linux-4.1.13.orig/drivers/video/mxc/Makefile linux-4.1.13/drivers/video/mxc/Makefile +--- linux-4.1.13.orig/drivers/video/mxc/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/video/mxc/Makefile 2015-11-30 17:56:13.728127872 +0100 @@ -0,0 +1,8 @@ +obj-$(CONFIG_FB_MXC_LDB) += ldb.o +obj-$(CONFIG_FB_MXC_MIPI_DSI) += mipi_dsi.o @@ -292628,9 +292543,9 @@ diff -Nur linux-4.1.10/drivers/video/mxc/Makefile xbian-sources-kernel/drivers/v +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.10/drivers/video/mxc/mipi_dsi.c xbian-sources-kernel/drivers/video/mxc/mipi_dsi.c ---- linux-4.1.10/drivers/video/mxc/mipi_dsi.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/video/mxc/mipi_dsi.c 2015-10-11 19:49:30.643091450 +0200 +diff -Nur linux-4.1.13.orig/drivers/video/mxc/mipi_dsi.c linux-4.1.13/drivers/video/mxc/mipi_dsi.c +--- linux-4.1.13.orig/drivers/video/mxc/mipi_dsi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/video/mxc/mipi_dsi.c 2015-11-30 17:56:13.728127872 +0100 @@ -0,0 +1,989 @@ +/* + * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -293621,9 +293536,9 @@ diff -Nur linux-4.1.10/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.10/drivers/video/mxc/mipi_dsi.h xbian-sources-kernel/drivers/video/mxc/mipi_dsi.h ---- linux-4.1.10/drivers/video/mxc/mipi_dsi.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/video/mxc/mipi_dsi.h 2015-10-11 19:49:30.643091450 +0200 +diff -Nur linux-4.1.13.orig/drivers/video/mxc/mipi_dsi.h linux-4.1.13/drivers/video/mxc/mipi_dsi.h +--- linux-4.1.13.orig/drivers/video/mxc/mipi_dsi.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/video/mxc/mipi_dsi.h 2015-11-30 17:56:13.728127872 +0100 @@ -0,0 +1,113 @@ +/* + * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -293738,9 +293653,9 @@ diff -Nur linux-4.1.10/drivers/video/mxc/mipi_dsi.h xbian-sources-kernel/drivers +#endif + +#endif -diff -Nur linux-4.1.10/drivers/video/mxc/mxc_dcic.c xbian-sources-kernel/drivers/video/mxc/mxc_dcic.c ---- linux-4.1.10/drivers/video/mxc/mxc_dcic.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/video/mxc/mxc_dcic.c 2015-10-11 19:49:30.643091450 +0200 +diff -Nur linux-4.1.13.orig/drivers/video/mxc/mxc_dcic.c linux-4.1.13/drivers/video/mxc/mxc_dcic.c +--- linux-4.1.13.orig/drivers/video/mxc/mxc_dcic.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/video/mxc/mxc_dcic.c 2015-11-30 17:56:13.728127872 +0100 @@ -0,0 +1,663 @@ +/* + * Copyright (C) 2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -294405,9 +294320,9 @@ diff -Nur linux-4.1.10/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.10/drivers/video/mxc/mxc_dispdrv.c xbian-sources-kernel/drivers/video/mxc/mxc_dispdrv.c ---- linux-4.1.10/drivers/video/mxc/mxc_dispdrv.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/video/mxc/mxc_dispdrv.c 2015-10-11 19:49:30.643091450 +0200 +diff -Nur linux-4.1.13.orig/drivers/video/mxc/mxc_dispdrv.c linux-4.1.13/drivers/video/mxc/mxc_dispdrv.c +--- linux-4.1.13.orig/drivers/video/mxc/mxc_dispdrv.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/video/mxc/mxc_dispdrv.c 2015-11-30 17:56:13.728127872 +0100 @@ -0,0 +1,148 @@ +/* + * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -294557,9 +294472,9 @@ diff -Nur linux-4.1.10/drivers/video/mxc/mxc_dispdrv.c xbian-sources-kernel/driv + return ERR_PTR(-EINVAL); +} +EXPORT_SYMBOL_GPL(mxc_dispdrv_getdata); -diff -Nur linux-4.1.10/drivers/video/mxc/mxc_dispdrv.h xbian-sources-kernel/drivers/video/mxc/mxc_dispdrv.h ---- linux-4.1.10/drivers/video/mxc/mxc_dispdrv.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/video/mxc/mxc_dispdrv.h 2015-10-11 19:49:30.643091450 +0200 +diff -Nur linux-4.1.13.orig/drivers/video/mxc/mxc_dispdrv.h linux-4.1.13/drivers/video/mxc/mxc_dispdrv.h +--- linux-4.1.13.orig/drivers/video/mxc/mxc_dispdrv.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/video/mxc/mxc_dispdrv.h 2015-11-30 17:56:13.728127872 +0100 @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -294613,9 +294528,9 @@ diff -Nur linux-4.1.10/drivers/video/mxc/mxc_dispdrv.h xbian-sources-kernel/driv +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.10/drivers/video/mxc/mxc_edid.c xbian-sources-kernel/drivers/video/mxc/mxc_edid.c ---- linux-4.1.10/drivers/video/mxc/mxc_edid.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/video/mxc/mxc_edid.c 2015-10-11 19:49:30.643091450 +0200 +diff -Nur linux-4.1.13.orig/drivers/video/mxc/mxc_edid.c linux-4.1.13/drivers/video/mxc/mxc_edid.c +--- linux-4.1.13.orig/drivers/video/mxc/mxc_edid.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/video/mxc/mxc_edid.c 2015-11-30 17:56:13.728127872 +0100 @@ -0,0 +1,882 @@ +/* + * Copyright 2009-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -295499,9 +295414,9 @@ diff -Nur linux-4.1.10/drivers/video/mxc/mxc_edid.c xbian-sources-kernel/drivers + return best; +} +EXPORT_SYMBOL(mxc_fb_find_nearest_mode); -diff -Nur linux-4.1.10/drivers/video/mxc/mxcfb_adv739x.c xbian-sources-kernel/drivers/video/mxc/mxcfb_adv739x.c ---- linux-4.1.10/drivers/video/mxc/mxcfb_adv739x.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/video/mxc/mxcfb_adv739x.c 2015-10-11 19:49:30.643091450 +0200 +diff -Nur linux-4.1.13.orig/drivers/video/mxc/mxcfb_adv739x.c linux-4.1.13/drivers/video/mxc/mxcfb_adv739x.c +--- linux-4.1.13.orig/drivers/video/mxc/mxcfb_adv739x.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/video/mxc/mxcfb_adv739x.c 2015-11-30 17:56:13.728127872 +0100 @@ -0,0 +1,397 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -295900,9 +295815,9 @@ diff -Nur linux-4.1.10/drivers/video/mxc/mxcfb_adv739x.c xbian-sources-kernel/dr +MODULE_DESCRIPTION("ADV739x TV encoder driver"); +MODULE_LICENSE("GPL"); + -diff -Nur linux-4.1.10/drivers/video/mxc/mxcfb_hx8369_wvga.c xbian-sources-kernel/drivers/video/mxc/mxcfb_hx8369_wvga.c ---- linux-4.1.10/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-10-11 19:49:30.643091450 +0200 +diff -Nur linux-4.1.13.orig/drivers/video/mxc/mxcfb_hx8369_wvga.c linux-4.1.13/drivers/video/mxc/mxcfb_hx8369_wvga.c +--- linux-4.1.13.orig/drivers/video/mxc/mxcfb_hx8369_wvga.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/video/mxc/mxcfb_hx8369_wvga.c 2015-11-30 17:56:13.728127872 +0100 @@ -0,0 +1,449 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -296353,9 +296268,9 @@ diff -Nur linux-4.1.10/drivers/video/mxc/mxcfb_hx8369_wvga.c xbian-sources-kerne + mipid_bl_update_status(bl); + return 0; +} -diff -Nur linux-4.1.10/drivers/video/mxc/mxc_hdmi.c xbian-sources-kernel/drivers/video/mxc/mxc_hdmi.c ---- linux-4.1.10/drivers/video/mxc/mxc_hdmi.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/video/mxc/mxc_hdmi.c 2015-10-11 19:49:30.643091450 +0200 +diff -Nur linux-4.1.13.orig/drivers/video/mxc/mxc_hdmi.c linux-4.1.13/drivers/video/mxc/mxc_hdmi.c +--- linux-4.1.13.orig/drivers/video/mxc/mxc_hdmi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/video/mxc/mxc_hdmi.c 2015-11-30 17:56:13.728127872 +0100 @@ -0,0 +1,3540 @@ +/* + * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. @@ -299897,9 +299812,9 @@ diff -Nur linux-4.1.10/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.10/drivers/video/mxc/mxc_ipuv3_fb.c xbian-sources-kernel/drivers/video/mxc/mxc_ipuv3_fb.c ---- linux-4.1.10/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-10-11 19:49:30.643091450 +0200 +diff -Nur linux-4.1.13.orig/drivers/video/mxc/mxc_ipuv3_fb.c linux-4.1.13/drivers/video/mxc/mxc_ipuv3_fb.c +--- linux-4.1.13.orig/drivers/video/mxc/mxc_ipuv3_fb.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/video/mxc/mxc_ipuv3_fb.c 2015-11-30 17:56:13.732127606 +0100 @@ -0,0 +1,2636 @@ +/* + * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -302537,9 +302452,9 @@ diff -Nur linux-4.1.10/drivers/video/mxc/mxc_ipuv3_fb.c xbian-sources-kernel/dri +MODULE_DESCRIPTION("MXC framebuffer driver"); +MODULE_LICENSE("GPL"); +MODULE_SUPPORTED_DEVICE("fb"); -diff -Nur linux-4.1.10/drivers/video/mxc/mxc_lcdif.c xbian-sources-kernel/drivers/video/mxc/mxc_lcdif.c ---- linux-4.1.10/drivers/video/mxc/mxc_lcdif.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/drivers/video/mxc/mxc_lcdif.c 2015-10-11 19:49:30.643091450 +0200 +diff -Nur linux-4.1.13.orig/drivers/video/mxc/mxc_lcdif.c linux-4.1.13/drivers/video/mxc/mxc_lcdif.c +--- linux-4.1.13.orig/drivers/video/mxc/mxc_lcdif.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/drivers/video/mxc/mxc_lcdif.c 2015-11-30 17:56:13.732127606 +0100 @@ -0,0 +1,249 @@ +/* + * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -302790,9 +302705,9 @@ diff -Nur linux-4.1.10/drivers/video/mxc/mxc_lcdif.c xbian-sources-kernel/driver +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("i.MX ipuv3 LCD extern port driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.10/firmware/imx/sdma/sdma-imx6q.bin.ihex xbian-sources-kernel/firmware/imx/sdma/sdma-imx6q.bin.ihex ---- linux-4.1.10/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-10-11 19:49:30.699087738 +0200 +diff -Nur linux-4.1.13.orig/firmware/imx/sdma/sdma-imx6q.bin.ihex linux-4.1.13/firmware/imx/sdma/sdma-imx6q.bin.ihex +--- linux-4.1.13.orig/firmware/imx/sdma/sdma-imx6q.bin.ihex 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/firmware/imx/sdma/sdma-imx6q.bin.ihex 2015-11-30 17:56:13.732127606 +0100 @@ -0,0 +1,116 @@ +:1000000053444D4101000000010000001C000000AD +:1000100026000000B40000007A0600008202000002 @@ -302910,9 +302825,9 @@ diff -Nur linux-4.1.10/firmware/imx/sdma/sdma-imx6q.bin.ihex xbian-sources-kerne +:10071000DD6F087FD169010FC86FDD6F037F0101B5 +:0E0720000004129B0700FF680C680002129B89 +:00000001FF -diff -Nur linux-4.1.10/firmware/Makefile xbian-sources-kernel/firmware/Makefile ---- linux-4.1.10/firmware/Makefile 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/firmware/Makefile 2015-10-11 19:49:30.671089594 +0200 +diff -Nur linux-4.1.13.orig/firmware/Makefile linux-4.1.13/firmware/Makefile +--- linux-4.1.13.orig/firmware/Makefile 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/firmware/Makefile 2015-11-30 17:56:13.732127606 +0100 @@ -62,6 +62,7 @@ radeon/RV730_pfp.bin radeon/RV730_me.bin \ radeon/RV710_pfp.bin radeon/RV710_me.bin @@ -302921,9 +302836,9 @@ diff -Nur linux-4.1.10/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.10/fs/btrfs/compression.c xbian-sources-kernel/fs/btrfs/compression.c ---- linux-4.1.10/fs/btrfs/compression.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/fs/btrfs/compression.c 2015-10-11 19:49:30.727085882 +0200 +diff -Nur linux-4.1.13.orig/fs/btrfs/compression.c linux-4.1.13/fs/btrfs/compression.c +--- linux-4.1.13.orig/fs/btrfs/compression.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/fs/btrfs/compression.c 2015-11-30 17:56:13.732127606 +0100 @@ -753,6 +753,8 @@ static const struct btrfs_compress_op * const btrfs_compress_op[] = { &btrfs_zlib_compress, @@ -302933,9 +302848,9 @@ diff -Nur linux-4.1.10/fs/btrfs/compression.c xbian-sources-kernel/fs/btrfs/comp }; void __init btrfs_init_compress(void) -diff -Nur linux-4.1.10/fs/btrfs/compression.h xbian-sources-kernel/fs/btrfs/compression.h ---- linux-4.1.10/fs/btrfs/compression.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/fs/btrfs/compression.h 2015-10-11 19:49:30.727085882 +0200 +diff -Nur linux-4.1.13.orig/fs/btrfs/compression.h linux-4.1.13/fs/btrfs/compression.h +--- linux-4.1.13.orig/fs/btrfs/compression.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/fs/btrfs/compression.h 2015-11-30 17:56:13.732127606 +0100 @@ -79,5 +79,7 @@ extern const struct btrfs_compress_op btrfs_zlib_compress; @@ -302944,9 +302859,9 @@ diff -Nur linux-4.1.10/fs/btrfs/compression.h xbian-sources-kernel/fs/btrfs/comp +extern const struct btrfs_compress_op btrfs_lz4hc_compress; #endif -diff -Nur linux-4.1.10/fs/btrfs/ctree.h xbian-sources-kernel/fs/btrfs/ctree.h ---- linux-4.1.10/fs/btrfs/ctree.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/fs/btrfs/ctree.h 2015-10-11 19:49:30.727085882 +0200 +diff -Nur linux-4.1.13.orig/fs/btrfs/ctree.h linux-4.1.13/fs/btrfs/ctree.h +--- linux-4.1.13.orig/fs/btrfs/ctree.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/fs/btrfs/ctree.h 2015-11-30 17:56:13.732127606 +0100 @@ -504,13 +504,7 @@ #define BTRFS_FEATURE_INCOMPAT_DEFAULT_SUBVOL (1ULL << 1) #define BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS (1ULL << 2) @@ -302983,9 +302898,9 @@ diff -Nur linux-4.1.10/fs/btrfs/ctree.h xbian-sources-kernel/fs/btrfs/ctree.h }; struct btrfs_inode_item { -diff -Nur linux-4.1.10/fs/btrfs/disk-io.c xbian-sources-kernel/fs/btrfs/disk-io.c ---- linux-4.1.10/fs/btrfs/disk-io.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/fs/btrfs/disk-io.c 2015-10-11 19:49:30.727085882 +0200 +diff -Nur linux-4.1.13.orig/fs/btrfs/disk-io.c linux-4.1.13/fs/btrfs/disk-io.c +--- linux-4.1.13.orig/fs/btrfs/disk-io.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/fs/btrfs/disk-io.c 2015-11-30 17:56:13.732127606 +0100 @@ -2703,6 +2703,10 @@ if (tree_root->fs_info->compress_type == BTRFS_COMPRESS_LZO) features |= BTRFS_FEATURE_INCOMPAT_COMPRESS_LZO; @@ -302997,9 +302912,9 @@ diff -Nur linux-4.1.10/fs/btrfs/disk-io.c xbian-sources-kernel/fs/btrfs/disk-io. if (features & BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA) printk(KERN_INFO "BTRFS: has skinny extents\n"); -diff -Nur linux-4.1.10/fs/btrfs/ioctl.c xbian-sources-kernel/fs/btrfs/ioctl.c ---- linux-4.1.10/fs/btrfs/ioctl.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/fs/btrfs/ioctl.c 2015-10-11 19:49:30.735085352 +0200 +diff -Nur linux-4.1.13.orig/fs/btrfs/ioctl.c linux-4.1.13/fs/btrfs/ioctl.c +--- linux-4.1.13.orig/fs/btrfs/ioctl.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/fs/btrfs/ioctl.c 2015-11-30 17:56:13.736127341 +0100 @@ -1439,6 +1439,10 @@ if (range->compress_type == BTRFS_COMPRESS_LZO) { btrfs_set_fs_incompat(root->fs_info, COMPRESS_LZO); @@ -303011,9 +302926,9 @@ diff -Nur linux-4.1.10/fs/btrfs/ioctl.c xbian-sources-kernel/fs/btrfs/ioctl.c ret = defrag_count; -diff -Nur linux-4.1.10/fs/btrfs/lz4_wrapper.c xbian-sources-kernel/fs/btrfs/lz4_wrapper.c ---- linux-4.1.10/fs/btrfs/lz4_wrapper.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/fs/btrfs/lz4_wrapper.c 2015-10-11 19:49:30.735085352 +0200 +diff -Nur linux-4.1.13.orig/fs/btrfs/lz4_wrapper.c linux-4.1.13/fs/btrfs/lz4_wrapper.c +--- linux-4.1.13.orig/fs/btrfs/lz4_wrapper.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/fs/btrfs/lz4_wrapper.c 2015-11-30 17:56:13.736127341 +0100 @@ -0,0 +1,487 @@ +/* + * Copyright (C) 2008 Oracle. All rights reserved. @@ -303502,9 +303417,9 @@ diff -Nur linux-4.1.10/fs/btrfs/lz4_wrapper.c xbian-sources-kernel/fs/btrfs/lz4_ + .decompress_biovec = lz4_decompress_biovec, + .decompress = lz4_decompress_wrapper, +}; -diff -Nur linux-4.1.10/fs/btrfs/Makefile xbian-sources-kernel/fs/btrfs/Makefile ---- linux-4.1.10/fs/btrfs/Makefile 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/fs/btrfs/Makefile 2015-10-11 19:49:30.723086147 +0200 +diff -Nur linux-4.1.13.orig/fs/btrfs/Makefile linux-4.1.13/fs/btrfs/Makefile +--- linux-4.1.13.orig/fs/btrfs/Makefile 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/fs/btrfs/Makefile 2015-11-30 17:56:13.736127341 +0100 @@ -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 \ @@ -303514,9 +303429,9 @@ diff -Nur linux-4.1.10/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.10/fs/btrfs/super.c xbian-sources-kernel/fs/btrfs/super.c ---- linux-4.1.10/fs/btrfs/super.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/fs/btrfs/super.c 2015-10-11 19:49:30.739085087 +0200 +diff -Nur linux-4.1.13.orig/fs/btrfs/super.c linux-4.1.13/fs/btrfs/super.c +--- linux-4.1.13.orig/fs/btrfs/super.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/fs/btrfs/super.c 2015-11-30 17:56:13.736127341 +0100 @@ -492,6 +492,20 @@ btrfs_clear_opt(info->mount_opt, COMPRESS); btrfs_clear_opt(info->mount_opt, FORCE_COMPRESS); @@ -303554,9 +303469,9 @@ diff -Nur linux-4.1.10/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.10/include/dt-bindings/clock/imx6qdl-clock.h xbian-sources-kernel/include/dt-bindings/clock/imx6qdl-clock.h ---- linux-4.1.10/include/dt-bindings/clock/imx6qdl-clock.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/include/dt-bindings/clock/imx6qdl-clock.h 2015-10-11 19:49:31.491035243 +0200 +diff -Nur linux-4.1.13.orig/include/dt-bindings/clock/imx6qdl-clock.h linux-4.1.13/include/dt-bindings/clock/imx6qdl-clock.h +--- linux-4.1.13.orig/include/dt-bindings/clock/imx6qdl-clock.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/include/dt-bindings/clock/imx6qdl-clock.h 2015-11-30 17:56:13.736127341 +0100 @@ -86,8 +86,6 @@ #define IMX6QDL_CLK_GPU3D_SHADER 74 #define IMX6QDL_CLK_IPU1_PODF 75 @@ -303581,9 +303496,9 @@ diff -Nur linux-4.1.10/include/dt-bindings/clock/imx6qdl-clock.h xbian-sources-k +#define IMX6QDL_CLK_END 248 #endif /* __DT_BINDINGS_CLOCK_IMX6QDL_H */ -diff -Nur linux-4.1.10/include/linux/busfreq-imx6.h xbian-sources-kernel/include/linux/busfreq-imx6.h ---- linux-4.1.10/include/linux/busfreq-imx6.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/include/linux/busfreq-imx6.h 2015-10-11 19:49:31.523033122 +0200 +diff -Nur linux-4.1.13.orig/include/linux/busfreq-imx6.h linux-4.1.13/include/linux/busfreq-imx6.h +--- linux-4.1.13.orig/include/linux/busfreq-imx6.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/linux/busfreq-imx6.h 2015-11-30 17:56:13.736127341 +0100 @@ -0,0 +1,23 @@ +/* + * Copyright 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -303608,9 +303523,9 @@ diff -Nur linux-4.1.10/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.10/include/linux/cgroup_subsys.h xbian-sources-kernel/include/linux/cgroup_subsys.h ---- linux-4.1.10/include/linux/cgroup_subsys.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/include/linux/cgroup_subsys.h 2015-10-11 19:49:31.535032327 +0200 +diff -Nur linux-4.1.13.orig/include/linux/cgroup_subsys.h linux-4.1.13/include/linux/cgroup_subsys.h +--- linux-4.1.13.orig/include/linux/cgroup_subsys.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/include/linux/cgroup_subsys.h 2015-11-30 17:56:13.736127341 +0100 @@ -35,6 +35,10 @@ SUBSYS(net_cls) #endif @@ -303622,9 +303537,9 @@ diff -Nur linux-4.1.10/include/linux/cgroup_subsys.h xbian-sources-kernel/includ #if IS_ENABLED(CONFIG_CGROUP_PERF) SUBSYS(perf_event) #endif -diff -Nur linux-4.1.10/include/linux/device_cooling.h xbian-sources-kernel/include/linux/device_cooling.h ---- linux-4.1.10/include/linux/device_cooling.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/include/linux/device_cooling.h 2015-10-11 19:49:31.547031531 +0200 +diff -Nur linux-4.1.13.orig/include/linux/device_cooling.h linux-4.1.13/include/linux/device_cooling.h +--- linux-4.1.13.orig/include/linux/device_cooling.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/linux/device_cooling.h 2015-11-30 17:56:13.736127341 +0100 @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -303671,9 +303586,9 @@ diff -Nur linux-4.1.10/include/linux/device_cooling.h xbian-sources-kernel/inclu +} +#endif +#endif /* __DEVICE_THERMAL_H__ */ -diff -Nur linux-4.1.10/include/linux/fb.h xbian-sources-kernel/include/linux/fb.h ---- linux-4.1.10/include/linux/fb.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/include/linux/fb.h 2015-10-11 19:49:31.551031266 +0200 +diff -Nur linux-4.1.13.orig/include/linux/fb.h linux-4.1.13/include/linux/fb.h +--- linux-4.1.13.orig/include/linux/fb.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/include/linux/fb.h 2015-11-30 17:56:13.736127341 +0100 @@ -702,7 +702,8 @@ #define FB_MODE_IS_VESA 4 #define FB_MODE_IS_CALCULATED 8 @@ -303684,9 +303599,9 @@ diff -Nur linux-4.1.10/include/linux/fb.h xbian-sources-kernel/include/linux/fb. 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.10/include/linux/ipu.h xbian-sources-kernel/include/linux/ipu.h ---- linux-4.1.10/include/linux/ipu.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/include/linux/ipu.h 2015-10-11 19:49:31.571029940 +0200 +diff -Nur linux-4.1.13.orig/include/linux/ipu.h linux-4.1.13/include/linux/ipu.h +--- linux-4.1.13.orig/include/linux/ipu.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/linux/ipu.h 2015-11-30 17:56:13.736127341 +0100 @@ -0,0 +1,38 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. @@ -303726,9 +303641,9 @@ diff -Nur linux-4.1.10/include/linux/ipu.h xbian-sources-kernel/include/linux/ip +int ipu_check_task(struct ipu_task *task); + +#endif -diff -Nur linux-4.1.10/include/linux/ipu-v3.h xbian-sources-kernel/include/linux/ipu-v3.h ---- linux-4.1.10/include/linux/ipu-v3.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/include/linux/ipu-v3.h 2015-10-11 19:49:31.571029940 +0200 +diff -Nur linux-4.1.13.orig/include/linux/ipu-v3.h linux-4.1.13/include/linux/ipu-v3.h +--- linux-4.1.13.orig/include/linux/ipu-v3.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/linux/ipu-v3.h 2015-11-30 17:56:13.736127341 +0100 @@ -0,0 +1,761 @@ +/* + * Copyright (c) 2010 Sascha Hauer @@ -304491,9 +304406,9 @@ diff -Nur linux-4.1.10/include/linux/ipu-v3.h xbian-sources-kernel/include/linux +}; + +#endif /* __LINUX_IPU_V3_H_ */ -diff -Nur linux-4.1.10/include/linux/mfd/mxc-hdmi-core.h xbian-sources-kernel/include/linux/mfd/mxc-hdmi-core.h ---- linux-4.1.10/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-10-11 19:49:31.591028615 +0200 +diff -Nur linux-4.1.13.orig/include/linux/mfd/mxc-hdmi-core.h linux-4.1.13/include/linux/mfd/mxc-hdmi-core.h +--- linux-4.1.13.orig/include/linux/mfd/mxc-hdmi-core.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/linux/mfd/mxc-hdmi-core.h 2015-11-30 17:56:13.736127341 +0100 @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -304563,9 +304478,9 @@ diff -Nur linux-4.1.10/include/linux/mfd/mxc-hdmi-core.h xbian-sources-kernel/in +void hdmi_cec_stop_device(void); + +#endif -diff -Nur linux-4.1.10/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h xbian-sources-kernel/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h ---- linux-4.1.10/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h 2015-10-11 19:49:31.595028350 +0200 +diff -Nur linux-4.1.13.orig/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h linux-4.1.13/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h +--- linux-4.1.13.orig/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h 2015-11-30 17:56:13.736127341 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Freescale Semiconductor, Inc. @@ -304659,9 +304574,9 @@ diff -Nur linux-4.1.10/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.10/include/linux/mfd/tda1997x-core.h xbian-sources-kernel/include/linux/mfd/tda1997x-core.h ---- linux-4.1.10/include/linux/mfd/tda1997x-core.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/include/linux/mfd/tda1997x-core.h 2015-10-11 19:49:31.595028350 +0200 +diff -Nur linux-4.1.13.orig/include/linux/mfd/tda1997x-core.h linux-4.1.13/include/linux/mfd/tda1997x-core.h +--- linux-4.1.13.orig/include/linux/mfd/tda1997x-core.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/linux/mfd/tda1997x-core.h 2015-11-30 17:56:13.736127341 +0100 @@ -0,0 +1,225 @@ +/* + * tda1997x.h - header for TDA1997X HDMI receiver device @@ -304888,9 +304803,9 @@ diff -Nur linux-4.1.10/include/linux/mfd/tda1997x-core.h xbian-sources-kernel/in +extern int tda1997x_select_input(tda1997x_input_t); + +#endif /* End of __TDA1997X_H */ -diff -Nur linux-4.1.10/include/linux/mipi_csi2.h xbian-sources-kernel/include/linux/mipi_csi2.h ---- linux-4.1.10/include/linux/mipi_csi2.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/include/linux/mipi_csi2.h 2015-10-11 19:49:31.603027819 +0200 +diff -Nur linux-4.1.13.orig/include/linux/mipi_csi2.h linux-4.1.13/include/linux/mipi_csi2.h +--- linux-4.1.13.orig/include/linux/mipi_csi2.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/linux/mipi_csi2.h 2015-11-30 17:56:13.736127341 +0100 @@ -0,0 +1,87 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -304979,9 +304894,9 @@ diff -Nur linux-4.1.10/include/linux/mipi_csi2.h xbian-sources-kernel/include/li +int mipi_csi2_reset(struct mipi_csi2_info *info); + +#endif -diff -Nur linux-4.1.10/include/linux/mipi_dsi.h xbian-sources-kernel/include/linux/mipi_dsi.h ---- linux-4.1.10/include/linux/mipi_dsi.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/include/linux/mipi_dsi.h 2015-10-11 19:49:31.603027819 +0200 +diff -Nur linux-4.1.13.orig/include/linux/mipi_dsi.h linux-4.1.13/include/linux/mipi_dsi.h +--- linux-4.1.13.orig/include/linux/mipi_dsi.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/linux/mipi_dsi.h 2015-11-30 17:56:13.736127341 +0100 @@ -0,0 +1,171 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -305154,9 +305069,9 @@ diff -Nur linux-4.1.10/include/linux/mipi_dsi.h xbian-sources-kernel/include/lin +#define DSI_PHY_CLK_INIT_COMMAND (0x44) +#define DSI_GEN_PLD_DATA_BUF_SIZE (0x4) +#endif -diff -Nur linux-4.1.10/include/linux/mmc/card.h xbian-sources-kernel/include/linux/mmc/card.h ---- linux-4.1.10/include/linux/mmc/card.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/include/linux/mmc/card.h 2015-10-11 19:49:31.603027819 +0200 +diff -Nur linux-4.1.13.orig/include/linux/mmc/card.h linux-4.1.13/include/linux/mmc/card.h +--- linux-4.1.13.orig/include/linux/mmc/card.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/include/linux/mmc/card.h 2015-11-30 17:56:13.736127341 +0100 @@ -282,6 +282,7 @@ unsigned int erase_size; /* erase size in sectors */ unsigned int erase_shift; /* if erase unit is power 2 */ @@ -305165,9 +305080,9 @@ diff -Nur linux-4.1.10/include/linux/mmc/card.h xbian-sources-kernel/include/lin u8 erased_byte; /* value of erased bytes */ u32 raw_cid[4]; /* raw card CID */ -diff -Nur linux-4.1.10/include/linux/mm_types.h xbian-sources-kernel/include/linux/mm_types.h ---- linux-4.1.10/include/linux/mm_types.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/include/linux/mm_types.h 2015-10-11 19:49:31.603027819 +0200 +diff -Nur linux-4.1.13.orig/include/linux/mm_types.h linux-4.1.13/include/linux/mm_types.h +--- linux-4.1.13.orig/include/linux/mm_types.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/include/linux/mm_types.h 2015-11-30 17:56:13.736127341 +0100 @@ -23,7 +23,7 @@ struct address_space; struct mem_cgroup; @@ -305177,9 +305092,9 @@ diff -Nur linux-4.1.10/include/linux/mm_types.h xbian-sources-kernel/include/lin #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.10/include/linux/mxc_asrc.h xbian-sources-kernel/include/linux/mxc_asrc.h ---- linux-4.1.10/include/linux/mxc_asrc.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/include/linux/mxc_asrc.h 2015-10-11 19:49:31.611027289 +0200 +diff -Nur linux-4.1.13.orig/include/linux/mxc_asrc.h linux-4.1.13/include/linux/mxc_asrc.h +--- linux-4.1.13.orig/include/linux/mxc_asrc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/linux/mxc_asrc.h 2015-11-30 17:56:13.736127341 +0100 @@ -0,0 +1,389 @@ +/* + * Copyright 2008-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -305570,9 +305485,9 @@ diff -Nur linux-4.1.10/include/linux/mxc_asrc.h xbian-sources-kernel/include/lin + u32 in_wm, u32 out_wm); + +#endif/* __MXC_ASRC_H__ */ -diff -Nur linux-4.1.10/include/linux/mxc_dcic.h xbian-sources-kernel/include/linux/mxc_dcic.h ---- linux-4.1.10/include/linux/mxc_dcic.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/include/linux/mxc_dcic.h 2015-10-11 19:49:31.611027289 +0200 +diff -Nur linux-4.1.13.orig/include/linux/mxc_dcic.h linux-4.1.13/include/linux/mxc_dcic.h +--- linux-4.1.13.orig/include/linux/mxc_dcic.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/linux/mxc_dcic.h 2015-11-30 17:56:13.736127341 +0100 @@ -0,0 +1,134 @@ +/* + * Copyright (C) 2014 Freescale Semiconductor, Inc. All Rights Reserved @@ -305708,9 +305623,9 @@ diff -Nur linux-4.1.10/include/linux/mxc_dcic.h xbian-sources-kernel/include/lin + unsigned int result; +}; +#endif -diff -Nur linux-4.1.10/include/linux/mxc_v4l2.h xbian-sources-kernel/include/linux/mxc_v4l2.h ---- linux-4.1.10/include/linux/mxc_v4l2.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/include/linux/mxc_v4l2.h 2015-10-11 19:49:31.611027289 +0200 +diff -Nur linux-4.1.13.orig/include/linux/mxc_v4l2.h linux-4.1.13/include/linux/mxc_v4l2.h +--- linux-4.1.13.orig/include/linux/mxc_v4l2.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/linux/mxc_v4l2.h 2015-11-30 17:56:13.740127075 +0100 @@ -0,0 +1,27 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -305739,9 +305654,9 @@ diff -Nur linux-4.1.10/include/linux/mxc_v4l2.h xbian-sources-kernel/include/lin +#include + +#endif -diff -Nur linux-4.1.10/include/linux/mxc_vpu.h xbian-sources-kernel/include/linux/mxc_vpu.h ---- linux-4.1.10/include/linux/mxc_vpu.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/include/linux/mxc_vpu.h 2015-10-11 19:49:31.611027289 +0200 +diff -Nur linux-4.1.13.orig/include/linux/mxc_vpu.h linux-4.1.13/include/linux/mxc_vpu.h +--- linux-4.1.13.orig/include/linux/mxc_vpu.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/linux/mxc_vpu.h 2015-11-30 17:56:13.740127075 +0100 @@ -0,0 +1,118 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -305861,9 +305776,9 @@ diff -Nur linux-4.1.10/include/linux/mxc_vpu.h xbian-sources-kernel/include/linu +void vl2cc_cleanup(void); + +#endif -diff -Nur linux-4.1.10/include/linux/platform_data/dma-imx.h xbian-sources-kernel/include/linux/platform_data/dma-imx.h ---- linux-4.1.10/include/linux/platform_data/dma-imx.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/include/linux/platform_data/dma-imx.h 2015-10-11 19:49:31.627026229 +0200 +diff -Nur linux-4.1.13.orig/include/linux/platform_data/dma-imx.h linux-4.1.13/include/linux/platform_data/dma-imx.h +--- linux-4.1.13.orig/include/linux/platform_data/dma-imx.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/include/linux/platform_data/dma-imx.h 2015-11-30 17:56:13.740127075 +0100 @@ -17,31 +17,30 @@ * This enumerates peripheral types. Used for SDMA. */ @@ -305928,9 +305843,9 @@ diff -Nur linux-4.1.10/include/linux/platform_data/dma-imx.h xbian-sources-kerne }; static inline int imx_dma_is_ipu(struct dma_chan *chan) -diff -Nur linux-4.1.10/include/linux/pxp_device.h xbian-sources-kernel/include/linux/pxp_device.h ---- linux-4.1.10/include/linux/pxp_device.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/include/linux/pxp_device.h 2015-10-11 19:49:31.635025698 +0200 +diff -Nur linux-4.1.13.orig/include/linux/pxp_device.h linux-4.1.13/include/linux/pxp_device.h +--- linux-4.1.13.orig/include/linux/pxp_device.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/linux/pxp_device.h 2015-11-30 17:56:13.740127075 +0100 @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2013-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -306000,9 +305915,9 @@ diff -Nur linux-4.1.10/include/linux/pxp_device.h xbian-sources-kernel/include/l +}; + +#endif -diff -Nur linux-4.1.10/include/linux/pxp_dma.h xbian-sources-kernel/include/linux/pxp_dma.h ---- linux-4.1.10/include/linux/pxp_dma.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/include/linux/pxp_dma.h 2015-10-11 19:49:31.635025698 +0200 +diff -Nur linux-4.1.13.orig/include/linux/pxp_dma.h linux-4.1.13/include/linux/pxp_dma.h +--- linux-4.1.13.orig/include/linux/pxp_dma.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/linux/pxp_dma.h 2015-11-30 17:56:13.740127075 +0100 @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -306076,9 +305991,9 @@ diff -Nur linux-4.1.10/include/linux/pxp_dma.h xbian-sources-kernel/include/linu +#endif + +#endif -diff -Nur linux-4.1.10/include/media/v4l2-chip-ident.h xbian-sources-kernel/include/media/v4l2-chip-ident.h ---- linux-4.1.10/include/media/v4l2-chip-ident.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/include/media/v4l2-chip-ident.h 2015-10-11 19:49:31.703021191 +0200 +diff -Nur linux-4.1.13.orig/include/media/v4l2-chip-ident.h linux-4.1.13/include/media/v4l2-chip-ident.h +--- linux-4.1.13.orig/include/media/v4l2-chip-ident.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/media/v4l2-chip-ident.h 2015-11-30 17:56:13.740127075 +0100 @@ -0,0 +1,358 @@ +/* + v4l2 chip identifiers header @@ -306438,9 +306353,9 @@ diff -Nur linux-4.1.10/include/media/v4l2-chip-ident.h xbian-sources-kernel/incl +}; + +#endif -diff -Nur linux-4.1.10/include/media/v4l2-ioctl.h xbian-sources-kernel/include/media/v4l2-ioctl.h ---- linux-4.1.10/include/media/v4l2-ioctl.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/include/media/v4l2-ioctl.h 2015-10-11 19:49:31.703021191 +0200 +diff -Nur linux-4.1.13.orig/include/media/v4l2-ioctl.h linux-4.1.13/include/media/v4l2-ioctl.h +--- linux-4.1.13.orig/include/media/v4l2-ioctl.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/include/media/v4l2-ioctl.h 2015-11-30 17:56:13.740127075 +0100 @@ -251,6 +251,8 @@ int (*vidioc_g_chip_info) (struct file *file, void *fh, struct v4l2_dbg_chip_info *chip); @@ -306450,9 +306365,9 @@ diff -Nur linux-4.1.10/include/media/v4l2-ioctl.h xbian-sources-kernel/include/m int (*vidioc_enum_framesizes) (struct file *file, void *fh, struct v4l2_frmsizeenum *fsize); -diff -Nur linux-4.1.10/include/media/v4l2-subdev.h xbian-sources-kernel/include/media/v4l2-subdev.h ---- linux-4.1.10/include/media/v4l2-subdev.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/include/media/v4l2-subdev.h 2015-10-11 19:49:31.707020926 +0200 +diff -Nur linux-4.1.13.orig/include/media/v4l2-subdev.h linux-4.1.13/include/media/v4l2-subdev.h +--- linux-4.1.13.orig/include/media/v4l2-subdev.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/include/media/v4l2-subdev.h 2015-11-30 17:56:13.740127075 +0100 @@ -89,6 +89,7 @@ /* Core ops: it is highly recommended to implement at least these ops: @@ -306478,9 +306393,9 @@ diff -Nur linux-4.1.10/include/media/v4l2-subdev.h xbian-sources-kernel/include/ */ #define v4l2_subdev_call(sd, o, f, args...) \ (!(sd) ? -ENODEV : (((sd)->ops->o && (sd)->ops->o->f) ? \ -diff -Nur linux-4.1.10/include/mmc-mxcmmc.h xbian-sources-kernel/include/mmc-mxcmmc.h ---- linux-4.1.10/include/mmc-mxcmmc.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/include/mmc-mxcmmc.h 2015-10-11 19:49:31.707020926 +0200 +diff -Nur linux-4.1.13.orig/include/mmc-mxcmmc.h linux-4.1.13/include/mmc-mxcmmc.h +--- linux-4.1.13.orig/include/mmc-mxcmmc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/mmc-mxcmmc.h 2015-11-30 17:56:13.740127075 +0100 @@ -0,0 +1,39 @@ +#ifndef ASMARM_ARCH_MMC_H +#define ASMARM_ARCH_MMC_H @@ -306521,9 +306436,9 @@ diff -Nur linux-4.1.10/include/mmc-mxcmmc.h xbian-sources-kernel/include/mmc-mxc +}; + +#endif -diff -Nur linux-4.1.10/include/mtd-mxc_nand.h xbian-sources-kernel/include/mtd-mxc_nand.h ---- linux-4.1.10/include/mtd-mxc_nand.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/include/mtd-mxc_nand.h 2015-10-11 19:49:31.707020926 +0200 +diff -Nur linux-4.1.13.orig/include/mtd-mxc_nand.h linux-4.1.13/include/mtd-mxc_nand.h +--- linux-4.1.13.orig/include/mtd-mxc_nand.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/mtd-mxc_nand.h 2015-11-30 17:56:13.740127075 +0100 @@ -0,0 +1,32 @@ +/* + * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved. @@ -306557,9 +306472,9 @@ diff -Nur linux-4.1.10/include/mtd-mxc_nand.h xbian-sources-kernel/include/mtd-m + int nr_parts; /* size of parts */ +}; +#endif /* __ASM_ARCH_NAND_H */ -diff -Nur linux-4.1.10/include/sound/dmaengine_pcm.h xbian-sources-kernel/include/sound/dmaengine_pcm.h ---- linux-4.1.10/include/sound/dmaengine_pcm.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/include/sound/dmaengine_pcm.h 2015-10-11 19:49:31.739018805 +0200 +diff -Nur linux-4.1.13.orig/include/sound/dmaengine_pcm.h linux-4.1.13/include/sound/dmaengine_pcm.h +--- linux-4.1.13.orig/include/sound/dmaengine_pcm.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/include/sound/dmaengine_pcm.h 2015-11-30 17:56:13.740127075 +0100 @@ -63,6 +63,8 @@ * requesting the DMA channel. * @chan_name: Custom channel name to use when requesting DMA channel. @@ -306586,9 +306501,9 @@ diff -Nur linux-4.1.10/include/sound/dmaengine_pcm.h xbian-sources-kernel/includ }; void snd_dmaengine_pcm_set_config_from_dai_data( -diff -Nur linux-4.1.10/include/sound/soc.h xbian-sources-kernel/include/sound/soc.h ---- linux-4.1.10/include/sound/soc.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/include/sound/soc.h 2015-10-11 19:49:31.743018540 +0200 +diff -Nur linux-4.1.13.orig/include/sound/soc.h linux-4.1.13/include/sound/soc.h +--- linux-4.1.13.orig/include/sound/soc.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/include/sound/soc.h 2015-11-30 17:56:13.740127075 +0100 @@ -28,6 +28,18 @@ #include #include @@ -306608,7 +306523,7 @@ diff -Nur linux-4.1.10/include/sound/soc.h xbian-sources-kernel/include/sound/so /* * Convenience kcontrol builders */ -@@ -805,16 +817,24 @@ +@@ -807,16 +819,24 @@ struct list_head list; struct list_head card_list; @@ -306633,9 +306548,9 @@ diff -Nur linux-4.1.10/include/sound/soc.h xbian-sources-kernel/include/sound/so /* component */ struct snd_soc_component component; -diff -Nur linux-4.1.10/include/sync.h xbian-sources-kernel/include/sync.h ---- linux-4.1.10/include/sync.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/include/sync.h 2015-10-11 19:49:31.747018275 +0200 +diff -Nur linux-4.1.13.orig/include/sync.h linux-4.1.13/include/sync.h +--- linux-4.1.13.orig/include/sync.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/sync.h 2015-11-30 17:56:13.740127075 +0100 @@ -0,0 +1,356 @@ +/* + * include/linux/sync.h @@ -306993,9 +306908,9 @@ diff -Nur linux-4.1.10/include/sync.h xbian-sources-kernel/include/sync.h + int wake_flags, void *key); + +#endif /* _LINUX_SYNC_H */ -diff -Nur linux-4.1.10/include/uapi/linux/fb.h xbian-sources-kernel/include/uapi/linux/fb.h ---- linux-4.1.10/include/uapi/linux/fb.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/include/uapi/linux/fb.h 2015-10-11 19:49:31.783015889 +0200 +diff -Nur linux-4.1.13.orig/include/uapi/linux/fb.h linux-4.1.13/include/uapi/linux/fb.h +--- linux-4.1.13.orig/include/uapi/linux/fb.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/include/uapi/linux/fb.h 2015-11-30 17:56:13.740127075 +0100 @@ -217,14 +217,45 @@ #define FB_SYNC_ON_GREEN 32 /* sync on green */ @@ -307050,9 +306965,9 @@ diff -Nur linux-4.1.10/include/uapi/linux/fb.h xbian-sources-kernel/include/uapi /* * Display rotation support -diff -Nur linux-4.1.10/include/uapi/linux/ipu.h xbian-sources-kernel/include/uapi/linux/ipu.h ---- linux-4.1.10/include/uapi/linux/ipu.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/include/uapi/linux/ipu.h 2015-10-11 19:49:31.791015358 +0200 +diff -Nur linux-4.1.13.orig/include/uapi/linux/ipu.h linux-4.1.13/include/uapi/linux/ipu.h +--- linux-4.1.13.orig/include/uapi/linux/ipu.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/uapi/linux/ipu.h 2015-11-30 17:56:13.740127075 +0100 @@ -0,0 +1,282 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved @@ -307336,9 +307251,9 @@ diff -Nur linux-4.1.10/include/uapi/linux/ipu.h xbian-sources-kernel/include/uap +#define IPU_FREE _IOW('I', 0x4, int) + +#endif -diff -Nur linux-4.1.10/include/uapi/linux/Kbuild xbian-sources-kernel/include/uapi/linux/Kbuild ---- linux-4.1.10/include/uapi/linux/Kbuild 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/include/uapi/linux/Kbuild 2015-10-11 19:49:31.755017745 +0200 +diff -Nur linux-4.1.13.orig/include/uapi/linux/Kbuild linux-4.1.13/include/uapi/linux/Kbuild +--- linux-4.1.13.orig/include/uapi/linux/Kbuild 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/include/uapi/linux/Kbuild 2015-11-30 17:56:13.740127075 +0100 @@ -266,6 +266,9 @@ header-y += msdos_fs.h header-y += msg.h @@ -307356,9 +307271,9 @@ diff -Nur linux-4.1.10/include/uapi/linux/Kbuild xbian-sources-kernel/include/ua + +header-y += pxp_device.h +header-y += pxp_dma.h -diff -Nur linux-4.1.10/include/uapi/linux/mxc_asrc.h xbian-sources-kernel/include/uapi/linux/mxc_asrc.h ---- linux-4.1.10/include/uapi/linux/mxc_asrc.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/include/uapi/linux/mxc_asrc.h 2015-10-11 19:49:31.795015093 +0200 +diff -Nur linux-4.1.13.orig/include/uapi/linux/mxc_asrc.h linux-4.1.13/include/uapi/linux/mxc_asrc.h +--- linux-4.1.13.orig/include/uapi/linux/mxc_asrc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/uapi/linux/mxc_asrc.h 2015-11-30 17:56:13.740127075 +0100 @@ -0,0 +1,143 @@ +/* + * Copyright 2008-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -307503,9 +307418,9 @@ diff -Nur linux-4.1.10/include/uapi/linux/mxc_asrc.h xbian-sources-kernel/includ + ASRC_INPUT_BUFFER_UNDERRUN = 0x10, +}; +#endif/* __MXC_ASRC_UAPI_H__ */ -diff -Nur linux-4.1.10/include/uapi/linux/mxc_dcic.h xbian-sources-kernel/include/uapi/linux/mxc_dcic.h ---- linux-4.1.10/include/uapi/linux/mxc_dcic.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/include/uapi/linux/mxc_dcic.h 2015-10-11 19:49:31.795015093 +0200 +diff -Nur linux-4.1.13.orig/include/uapi/linux/mxc_dcic.h linux-4.1.13/include/uapi/linux/mxc_dcic.h +--- linux-4.1.13.orig/include/uapi/linux/mxc_dcic.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/uapi/linux/mxc_dcic.h 2015-11-30 17:56:13.740127075 +0100 @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2014 Freescale Semiconductor, Inc. All Rights Reserved @@ -307556,9 +307471,9 @@ diff -Nur linux-4.1.10/include/uapi/linux/mxc_dcic.h xbian-sources-kernel/includ +}; + +#endif -diff -Nur linux-4.1.10/include/uapi/linux/mxcfb.h xbian-sources-kernel/include/uapi/linux/mxcfb.h ---- linux-4.1.10/include/uapi/linux/mxcfb.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/include/uapi/linux/mxcfb.h 2015-10-11 19:49:31.795015093 +0200 +diff -Nur linux-4.1.13.orig/include/uapi/linux/mxcfb.h linux-4.1.13/include/uapi/linux/mxcfb.h +--- linux-4.1.13.orig/include/uapi/linux/mxcfb.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/uapi/linux/mxcfb.h 2015-11-30 17:56:13.740127075 +0100 @@ -0,0 +1,180 @@ +/* + * Copyright (C) 2013-2014 Freescale Semiconductor, Inc. All Rights Reserved @@ -307740,9 +307655,9 @@ diff -Nur linux-4.1.10/include/uapi/linux/mxcfb.h xbian-sources-kernel/include/u +#define MXCFB_DISABLE_EPDC_ACCESS _IO('F', 0x35) +#define MXCFB_ENABLE_EPDC_ACCESS _IO('F', 0x36) +#endif -diff -Nur linux-4.1.10/include/uapi/linux/mxc_mlb.h xbian-sources-kernel/include/uapi/linux/mxc_mlb.h ---- linux-4.1.10/include/uapi/linux/mxc_mlb.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/include/uapi/linux/mxc_mlb.h 2015-10-11 19:49:31.795015093 +0200 +diff -Nur linux-4.1.13.orig/include/uapi/linux/mxc_mlb.h linux-4.1.13/include/uapi/linux/mxc_mlb.h +--- linux-4.1.13.orig/include/uapi/linux/mxc_mlb.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/uapi/linux/mxc_mlb.h 2015-11-30 17:56:13.740127075 +0100 @@ -0,0 +1,55 @@ +/* + * mxc_mlb.h @@ -307799,9 +307714,9 @@ diff -Nur linux-4.1.10/include/uapi/linux/mxc_mlb.h xbian-sources-kernel/include + + +#endif /* _MXC_MLB_H */ -diff -Nur linux-4.1.10/include/uapi/linux/mxc_v4l2.h xbian-sources-kernel/include/uapi/linux/mxc_v4l2.h ---- linux-4.1.10/include/uapi/linux/mxc_v4l2.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/include/uapi/linux/mxc_v4l2.h 2015-10-11 19:49:31.795015093 +0200 +diff -Nur linux-4.1.13.orig/include/uapi/linux/mxc_v4l2.h linux-4.1.13/include/uapi/linux/mxc_v4l2.h +--- linux-4.1.13.orig/include/uapi/linux/mxc_v4l2.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/uapi/linux/mxc_v4l2.h 2015-11-30 17:56:13.740127075 +0100 @@ -0,0 +1,61 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved @@ -307864,9 +307779,9 @@ diff -Nur linux-4.1.10/include/uapi/linux/mxc_v4l2.h xbian-sources-kernel/includ +}; + +#endif -diff -Nur linux-4.1.10/include/uapi/linux/pxp_device.h xbian-sources-kernel/include/uapi/linux/pxp_device.h ---- linux-4.1.10/include/uapi/linux/pxp_device.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/include/uapi/linux/pxp_device.h 2015-10-11 19:49:31.807014298 +0200 +diff -Nur linux-4.1.13.orig/include/uapi/linux/pxp_device.h linux-4.1.13/include/uapi/linux/pxp_device.h +--- linux-4.1.13.orig/include/uapi/linux/pxp_device.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/uapi/linux/pxp_device.h 2015-11-30 17:56:13.740127075 +0100 @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2013-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -307931,9 +307846,9 @@ diff -Nur linux-4.1.10/include/uapi/linux/pxp_device.h xbian-sources-kernel/incl +#define CACHE_FLUSH 0x4 + +#endif -diff -Nur linux-4.1.10/include/uapi/linux/pxp_dma.h xbian-sources-kernel/include/uapi/linux/pxp_dma.h ---- linux-4.1.10/include/uapi/linux/pxp_dma.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/include/uapi/linux/pxp_dma.h 2015-10-11 19:49:31.807014298 +0200 +diff -Nur linux-4.1.13.orig/include/uapi/linux/pxp_dma.h linux-4.1.13/include/uapi/linux/pxp_dma.h +--- linux-4.1.13.orig/include/uapi/linux/pxp_dma.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/uapi/linux/pxp_dma.h 2015-11-30 17:56:13.740127075 +0100 @@ -0,0 +1,173 @@ +/* + * Copyright (C) 2013-2015 Freescale Semiconductor, Inc. All Rights Reserved. @@ -308108,9 +308023,9 @@ diff -Nur linux-4.1.10/include/uapi/linux/pxp_dma.h xbian-sources-kernel/include + + +#endif -diff -Nur linux-4.1.10/include/uapi/linux/videodev2.h xbian-sources-kernel/include/uapi/linux/videodev2.h ---- linux-4.1.10/include/uapi/linux/videodev2.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/include/uapi/linux/videodev2.h 2015-10-11 19:49:31.815013768 +0200 +diff -Nur linux-4.1.13.orig/include/uapi/linux/videodev2.h linux-4.1.13/include/uapi/linux/videodev2.h +--- linux-4.1.13.orig/include/uapi/linux/videodev2.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/include/uapi/linux/videodev2.h 2015-11-30 17:56:13.740127075 +0100 @@ -147,6 +147,7 @@ V4L2_BUF_TYPE_SDR_CAPTURE = 11, /* Deprecated, do not use */ @@ -308197,9 +308112,9 @@ diff -Nur linux-4.1.10/include/uapi/linux/videodev2.h xbian-sources-kernel/inclu #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.10/include/uapi/sync.h xbian-sources-kernel/include/uapi/sync.h ---- linux-4.1.10/include/uapi/sync.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/include/uapi/sync.h 2015-10-11 19:49:31.823013237 +0200 +diff -Nur linux-4.1.13.orig/include/uapi/sync.h linux-4.1.13/include/uapi/sync.h +--- linux-4.1.13.orig/include/uapi/sync.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/uapi/sync.h 2015-11-30 17:56:13.744126807 +0100 @@ -0,0 +1,97 @@ +/* + * Copyright (C) 2012 Google, Inc. @@ -308298,9 +308213,9 @@ diff -Nur linux-4.1.10/include/uapi/sync.h xbian-sources-kernel/include/uapi/syn + struct sync_fence_info_data) + +#endif /* _UAPI_LINUX_SYNC_H */ -diff -Nur linux-4.1.10/include/usb-ehci-mxc.h xbian-sources-kernel/include/usb-ehci-mxc.h ---- linux-4.1.10/include/usb-ehci-mxc.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/include/usb-ehci-mxc.h 2015-10-11 19:49:31.823013237 +0200 +diff -Nur linux-4.1.13.orig/include/usb-ehci-mxc.h linux-4.1.13/include/usb-ehci-mxc.h +--- linux-4.1.13.orig/include/usb-ehci-mxc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/usb-ehci-mxc.h 2015-11-30 17:56:13.744126807 +0100 @@ -0,0 +1,13 @@ +#ifndef __INCLUDE_ASM_ARCH_MXC_EHCI_H +#define __INCLUDE_ASM_ARCH_MXC_EHCI_H @@ -308315,9 +308230,9 @@ diff -Nur linux-4.1.10/include/usb-ehci-mxc.h xbian-sources-kernel/include/usb-e + +#endif /* __INCLUDE_ASM_ARCH_MXC_EHCI_H */ + -diff -Nur linux-4.1.10/include/video/mxc_edid.h xbian-sources-kernel/include/video/mxc_edid.h ---- linux-4.1.10/include/video/mxc_edid.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/include/video/mxc_edid.h 2015-10-11 19:49:31.823013237 +0200 +diff -Nur linux-4.1.13.orig/include/video/mxc_edid.h linux-4.1.13/include/video/mxc_edid.h +--- linux-4.1.13.orig/include/video/mxc_edid.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/video/mxc_edid.h 2015-11-30 17:56:13.744126807 +0100 @@ -0,0 +1,123 @@ +/* + * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -308442,9 +308357,9 @@ diff -Nur linux-4.1.10/include/video/mxc_edid.h xbian-sources-kernel/include/vid +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.10/include/video/mxc_hdmi.h xbian-sources-kernel/include/video/mxc_hdmi.h ---- linux-4.1.10/include/video/mxc_hdmi.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/include/video/mxc_hdmi.h 2015-10-11 19:49:31.823013237 +0200 +diff -Nur linux-4.1.13.orig/include/video/mxc_hdmi.h linux-4.1.13/include/video/mxc_hdmi.h +--- linux-4.1.13.orig/include/video/mxc_hdmi.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/include/video/mxc_hdmi.h 2015-11-30 17:56:13.744126807 +0100 @@ -0,0 +1,1027 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. @@ -309473,9 +309388,9 @@ diff -Nur linux-4.1.10/include/video/mxc_hdmi.h xbian-sources-kernel/include/vid + + +#endif /* __MXC_HDMI_H__ */ -diff -Nur linux-4.1.10/sound/core/pcm_dmaengine.c xbian-sources-kernel/sound/core/pcm_dmaengine.c ---- linux-4.1.10/sound/core/pcm_dmaengine.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/sound/core/pcm_dmaengine.c 2015-10-11 19:49:32.242985399 +0200 +diff -Nur linux-4.1.13.orig/sound/core/pcm_dmaengine.c linux-4.1.13/sound/core/pcm_dmaengine.c +--- linux-4.1.13.orig/sound/core/pcm_dmaengine.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/sound/core/pcm_dmaengine.c 2015-11-30 17:56:13.744126807 +0100 @@ -5,6 +5,7 @@ * Based on: * imx-pcm-dma-mx2.c, Copyright 2009 Sascha Hauer @@ -309510,9 +309425,9 @@ diff -Nur linux-4.1.10/sound/core/pcm_dmaengine.c xbian-sources-kernel/sound/cor desc->callback_param = substream; prtd->cookie = dmaengine_submit(desc); -diff -Nur linux-4.1.10/sound/soc/codecs/hdmi.c xbian-sources-kernel/sound/soc/codecs/hdmi.c ---- linux-4.1.10/sound/soc/codecs/hdmi.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/sound/soc/codecs/hdmi.c 2015-10-11 19:49:32.358977711 +0200 +diff -Nur linux-4.1.13.orig/sound/soc/codecs/hdmi.c linux-4.1.13/sound/soc/codecs/hdmi.c +--- linux-4.1.13.orig/sound/soc/codecs/hdmi.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/sound/soc/codecs/hdmi.c 2015-11-30 17:56:13.744126807 +0100 @@ -47,7 +47,7 @@ SNDRV_PCM_RATE_176400 | SNDRV_PCM_RATE_192000, .formats = SNDRV_PCM_FMTBIT_S16_LE | @@ -309522,9 +309437,9 @@ diff -Nur linux-4.1.10/sound/soc/codecs/hdmi.c xbian-sources-kernel/sound/soc/co }, .capture = { .stream_name = "Capture", -diff -Nur linux-4.1.10/sound/soc/codecs/Kconfig xbian-sources-kernel/sound/soc/codecs/Kconfig ---- linux-4.1.10/sound/soc/codecs/Kconfig 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/sound/soc/codecs/Kconfig 2015-10-11 19:49:32.350978241 +0200 +diff -Nur linux-4.1.13.orig/sound/soc/codecs/Kconfig linux-4.1.13/sound/soc/codecs/Kconfig +--- linux-4.1.13.orig/sound/soc/codecs/Kconfig 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/sound/soc/codecs/Kconfig 2015-11-30 17:56:13.744126807 +0100 @@ -541,6 +541,10 @@ tristate "Freescale SGTL5000 CODEC" depends on I2C @@ -309536,9 +309451,9 @@ diff -Nur linux-4.1.10/sound/soc/codecs/Kconfig xbian-sources-kernel/sound/soc/c config SND_SOC_SI476X tristate -diff -Nur linux-4.1.10/sound/soc/codecs/Makefile xbian-sources-kernel/sound/soc/codecs/Makefile ---- linux-4.1.10/sound/soc/codecs/Makefile 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/sound/soc/codecs/Makefile 2015-10-11 19:49:32.350978241 +0200 +diff -Nur linux-4.1.13.orig/sound/soc/codecs/Makefile linux-4.1.13/sound/soc/codecs/Makefile +--- linux-4.1.13.orig/sound/soc/codecs/Makefile 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/sound/soc/codecs/Makefile 2015-11-30 17:56:13.744126807 +0100 @@ -86,6 +86,7 @@ snd-soc-rt5677-objs := rt5677.o snd-soc-rt5677-spi-objs := rt5677-spi.o @@ -309555,9 +309470,9 @@ diff -Nur linux-4.1.10/sound/soc/codecs/Makefile xbian-sources-kernel/sound/soc/ obj-$(CONFIG_SND_SOC_SIGMADSP) += snd-soc-sigmadsp.o obj-$(CONFIG_SND_SOC_SIGMADSP_I2C) += snd-soc-sigmadsp-i2c.o obj-$(CONFIG_SND_SOC_SIGMADSP_REGMAP) += snd-soc-sigmadsp-regmap.o -diff -Nur linux-4.1.10/sound/soc/codecs/sgtl5000.c xbian-sources-kernel/sound/soc/codecs/sgtl5000.c ---- linux-4.1.10/sound/soc/codecs/sgtl5000.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/sound/soc/codecs/sgtl5000.c 2015-10-11 19:49:32.370976915 +0200 +diff -Nur linux-4.1.13.orig/sound/soc/codecs/sgtl5000.c linux-4.1.13/sound/soc/codecs/sgtl5000.c +--- linux-4.1.13.orig/sound/soc/codecs/sgtl5000.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/sound/soc/codecs/sgtl5000.c 2015-11-30 17:57:54.597412011 +0100 @@ -16,7 +16,6 @@ #include #include @@ -309900,8 +309815,8 @@ diff -Nur linux-4.1.10/sound/soc/codecs/sgtl5000.c xbian-sources-kernel/sound/so + snd_soc_write(codec, SGTL5000_CHIP_MIC_CTRL, 2); - snd_soc_update_bits(codec, SGTL5000_CHIP_MIC_CTRL, -- SGTL5000_BIAS_R_MASK, -- sgtl5000->micbias_voltage << SGTL5000_BIAS_R_SHIFT); +- SGTL5000_BIAS_VOLT_MASK, +- sgtl5000->micbias_voltage << SGTL5000_BIAS_VOLT_SHIFT); /* * disable DAP * TODO: @@ -310015,9 +309930,9 @@ diff -Nur linux-4.1.10/sound/soc/codecs/sgtl5000.c xbian-sources-kernel/sound/so i2c_set_clientdata(client, sgtl5000); /* Ensure sgtl5000 will start with sane register values */ -diff -Nur linux-4.1.10/sound/soc/codecs/tda1997x.c xbian-sources-kernel/sound/soc/codecs/tda1997x.c ---- linux-4.1.10/sound/soc/codecs/tda1997x.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/sound/soc/codecs/tda1997x.c 2015-10-11 19:49:32.370976915 +0200 +diff -Nur linux-4.1.13.orig/sound/soc/codecs/tda1997x.c linux-4.1.13/sound/soc/codecs/tda1997x.c +--- linux-4.1.13.orig/sound/soc/codecs/tda1997x.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/sound/soc/codecs/tda1997x.c 2015-11-30 17:56:13.744126807 +0100 @@ -0,0 +1,155 @@ +/* + * tda1997x.c -- tda1997x ALSA SoC Audio driver @@ -310174,9 +310089,9 @@ diff -Nur linux-4.1.10/sound/soc/codecs/tda1997x.c xbian-sources-kernel/sound/so +MODULE_AUTHOR("Tim Harvey "); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:tda1997x-audio"); -diff -Nur linux-4.1.10/sound/soc/fsl/fsl_asrc.h xbian-sources-kernel/sound/soc/fsl/fsl_asrc.h ---- linux-4.1.10/sound/soc/fsl/fsl_asrc.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/sound/soc/fsl/fsl_asrc.h 2015-10-11 19:49:32.402974794 +0200 +diff -Nur linux-4.1.13.orig/sound/soc/fsl/fsl_asrc.h linux-4.1.13/sound/soc/fsl/fsl_asrc.h +--- linux-4.1.13.orig/sound/soc/fsl/fsl_asrc.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/sound/soc/fsl/fsl_asrc.h 2015-11-30 17:56:13.744126807 +0100 @@ -326,7 +326,7 @@ OUTCLK_ASRCK1_CLK = 0x0f, }; @@ -310186,9 +310101,9 @@ diff -Nur linux-4.1.10/sound/soc/fsl/fsl_asrc.h xbian-sources-kernel/sound/soc/f enum asrc_word_width { ASRC_WIDTH_24_BIT = 0, -diff -Nur linux-4.1.10/sound/soc/fsl/fsl_esai.c xbian-sources-kernel/sound/soc/fsl/fsl_esai.c ---- linux-4.1.10/sound/soc/fsl/fsl_esai.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/sound/soc/fsl/fsl_esai.c 2015-10-11 19:49:32.402974794 +0200 +diff -Nur linux-4.1.13.orig/sound/soc/fsl/fsl_esai.c linux-4.1.13/sound/soc/fsl/fsl_esai.c +--- linux-4.1.13.orig/sound/soc/fsl/fsl_esai.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/sound/soc/fsl/fsl_esai.c 2015-11-30 17:56:13.744126807 +0100 @@ -49,6 +49,7 @@ struct fsl_esai { struct snd_dmaengine_dai_dma_data dma_params_rx; @@ -310344,9 +310259,9 @@ diff -Nur linux-4.1.10/sound/soc/fsl/fsl_esai.c xbian-sources-kernel/sound/soc/f if (ret) dev_err(&pdev->dev, "failed to init imx pcm dma: %d\n", ret); -diff -Nur linux-4.1.10/sound/soc/fsl/fsl_hdmi.c xbian-sources-kernel/sound/soc/fsl/fsl_hdmi.c ---- linux-4.1.10/sound/soc/fsl/fsl_hdmi.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/sound/soc/fsl/fsl_hdmi.c 2015-10-11 19:49:32.402974794 +0200 +diff -Nur linux-4.1.13.orig/sound/soc/fsl/fsl_hdmi.c linux-4.1.13/sound/soc/fsl/fsl_hdmi.c +--- linux-4.1.13.orig/sound/soc/fsl/fsl_hdmi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/sound/soc/fsl/fsl_hdmi.c 2015-11-30 17:56:13.744126807 +0100 @@ -0,0 +1,734 @@ +/* + * ALSA SoC HDMI Audio Layer for Freescale i.MX @@ -311082,9 +310997,9 @@ diff -Nur linux-4.1.10/sound/soc/fsl/fsl_hdmi.c xbian-sources-kernel/sound/soc/f +MODULE_DESCRIPTION("IMX HDMI TX DAI"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:fsl-hdmi-dai"); -diff -Nur linux-4.1.10/sound/soc/fsl/fsl_sai.c xbian-sources-kernel/sound/soc/fsl/fsl_sai.c ---- linux-4.1.10/sound/soc/fsl/fsl_sai.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/sound/soc/fsl/fsl_sai.c 2015-10-11 19:49:32.402974794 +0200 +diff -Nur linux-4.1.13.orig/sound/soc/fsl/fsl_sai.c linux-4.1.13/sound/soc/fsl/fsl_sai.c +--- linux-4.1.13.orig/sound/soc/fsl/fsl_sai.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/sound/soc/fsl/fsl_sai.c 2015-11-30 17:56:13.744126807 +0100 @@ -1,7 +1,7 @@ /* * Freescale ALSA SoC Digital Audio Interface (SAI) driver. @@ -311103,9 +311018,9 @@ diff -Nur linux-4.1.10/sound/soc/fsl/fsl_sai.c xbian-sources-kernel/sound/soc/fs else return devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, SND_DMAENGINE_PCM_FLAG_NO_RESIDUE); -diff -Nur linux-4.1.10/sound/soc/fsl/fsl_spdif.c xbian-sources-kernel/sound/soc/fsl/fsl_spdif.c ---- linux-4.1.10/sound/soc/fsl/fsl_spdif.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/sound/soc/fsl/fsl_spdif.c 2015-10-11 19:49:32.402974794 +0200 +diff -Nur linux-4.1.13.orig/sound/soc/fsl/fsl_spdif.c linux-4.1.13/sound/soc/fsl/fsl_spdif.c +--- linux-4.1.13.orig/sound/soc/fsl/fsl_spdif.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/sound/soc/fsl/fsl_spdif.c 2015-11-30 17:56:13.744126807 +0100 @@ -1257,7 +1257,7 @@ return ret; } @@ -311115,9 +311030,9 @@ diff -Nur linux-4.1.10/sound/soc/fsl/fsl_spdif.c xbian-sources-kernel/sound/soc/ if (ret) dev_err(&pdev->dev, "imx_pcm_dma_init failed: %d\n", ret); -diff -Nur linux-4.1.10/sound/soc/fsl/fsl_ssi.c xbian-sources-kernel/sound/soc/fsl/fsl_ssi.c ---- linux-4.1.10/sound/soc/fsl/fsl_ssi.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/sound/soc/fsl/fsl_ssi.c 2015-10-11 19:49:32.402974794 +0200 +diff -Nur linux-4.1.13.orig/sound/soc/fsl/fsl_ssi.c linux-4.1.13/sound/soc/fsl/fsl_ssi.c +--- linux-4.1.13.orig/sound/soc/fsl/fsl_ssi.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/sound/soc/fsl/fsl_ssi.c 2015-11-30 17:56:13.748126540 +0100 @@ -3,7 +3,7 @@ * * Author: Timur Tabi @@ -311645,9 +311560,9 @@ diff -Nur linux-4.1.10/sound/soc/fsl/fsl_ssi.c xbian-sources-kernel/sound/soc/fs }, .probe = fsl_ssi_probe, .remove = fsl_ssi_remove, -diff -Nur linux-4.1.10/sound/soc/fsl/hdmi_pcm.S xbian-sources-kernel/sound/soc/fsl/hdmi_pcm.S ---- linux-4.1.10/sound/soc/fsl/hdmi_pcm.S 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/sound/soc/fsl/hdmi_pcm.S 2015-10-11 19:49:32.402974794 +0200 +diff -Nur linux-4.1.13.orig/sound/soc/fsl/hdmi_pcm.S linux-4.1.13/sound/soc/fsl/hdmi_pcm.S +--- linux-4.1.13.orig/sound/soc/fsl/hdmi_pcm.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/sound/soc/fsl/hdmi_pcm.S 2015-11-30 17:56:13.748126540 +0100 @@ -0,0 +1,246 @@ +/** + * Copyright (C) 2010-2014 Freescale Semiconductor, Inc. All Rights Reserved. @@ -311895,9 +311810,9 @@ diff -Nur linux-4.1.10/sound/soc/fsl/hdmi_pcm.S xbian-sources-kernel/sound/soc/f + + vpop {d8} + mov pc, lr -diff -Nur linux-4.1.10/sound/soc/fsl/imx-audmux.c xbian-sources-kernel/sound/soc/fsl/imx-audmux.c ---- linux-4.1.10/sound/soc/fsl/imx-audmux.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/sound/soc/fsl/imx-audmux.c 2015-10-11 19:49:32.402974794 +0200 +diff -Nur linux-4.1.13.orig/sound/soc/fsl/imx-audmux.c linux-4.1.13/sound/soc/fsl/imx-audmux.c +--- linux-4.1.13.orig/sound/soc/fsl/imx-audmux.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/sound/soc/fsl/imx-audmux.c 2015-11-30 17:56:13.748126540 +0100 @@ -67,7 +67,7 @@ { ssize_t ret; @@ -311940,9 +311855,9 @@ diff -Nur linux-4.1.10/sound/soc/fsl/imx-audmux.c xbian-sources-kernel/sound/soc .of_match_table = imx_audmux_dt_ids, } }; -diff -Nur linux-4.1.10/sound/soc/fsl/imx-hdmi.c xbian-sources-kernel/sound/soc/fsl/imx-hdmi.c ---- linux-4.1.10/sound/soc/fsl/imx-hdmi.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/sound/soc/fsl/imx-hdmi.c 2015-10-11 19:49:32.406974529 +0200 +diff -Nur linux-4.1.13.orig/sound/soc/fsl/imx-hdmi.c linux-4.1.13/sound/soc/fsl/imx-hdmi.c +--- linux-4.1.13.orig/sound/soc/fsl/imx-hdmi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/sound/soc/fsl/imx-hdmi.c 2015-11-30 17:56:13.748126540 +0100 @@ -0,0 +1,114 @@ +/* + * ASoC HDMI Transmitter driver for IMX development boards @@ -312058,9 +311973,9 @@ diff -Nur linux-4.1.10/sound/soc/fsl/imx-hdmi.c xbian-sources-kernel/sound/soc/f +MODULE_DESCRIPTION("IMX HDMI TX ASoC driver"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:imx-audio-hdmi"); -diff -Nur linux-4.1.10/sound/soc/fsl/imx-hdmi-dma.c xbian-sources-kernel/sound/soc/fsl/imx-hdmi-dma.c ---- linux-4.1.10/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-10-11 19:49:32.406974529 +0200 +diff -Nur linux-4.1.13.orig/sound/soc/fsl/imx-hdmi-dma.c linux-4.1.13/sound/soc/fsl/imx-hdmi-dma.c +--- linux-4.1.13.orig/sound/soc/fsl/imx-hdmi-dma.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/sound/soc/fsl/imx-hdmi-dma.c 2015-11-30 17:56:13.748126540 +0100 @@ -0,0 +1,1256 @@ +/* + * imx-hdmi-dma.c -- HDMI DMA driver for ALSA Soc Audio Layer @@ -313318,9 +313233,9 @@ diff -Nur linux-4.1.10/sound/soc/fsl/imx-hdmi-dma.c xbian-sources-kernel/sound/s +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("i.MX HDMI audio DMA"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.10/sound/soc/fsl/imx-hdmi.h xbian-sources-kernel/sound/soc/fsl/imx-hdmi.h ---- linux-4.1.10/sound/soc/fsl/imx-hdmi.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/sound/soc/fsl/imx-hdmi.h 2015-10-11 19:49:32.406974529 +0200 +diff -Nur linux-4.1.13.orig/sound/soc/fsl/imx-hdmi.h linux-4.1.13/sound/soc/fsl/imx-hdmi.h +--- linux-4.1.13.orig/sound/soc/fsl/imx-hdmi.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/sound/soc/fsl/imx-hdmi.h 2015-11-30 17:56:13.748126540 +0100 @@ -0,0 +1,106 @@ +/* + * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. @@ -313428,9 +313343,9 @@ diff -Nur linux-4.1.10/sound/soc/fsl/imx-hdmi.h xbian-sources-kernel/sound/soc/f + } while (0) + +#endif /* __IMX_HDMI_H */ -diff -Nur linux-4.1.10/sound/soc/fsl/imx-pcm-dma.c xbian-sources-kernel/sound/soc/fsl/imx-pcm-dma.c ---- linux-4.1.10/sound/soc/fsl/imx-pcm-dma.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/sound/soc/fsl/imx-pcm-dma.c 2015-10-11 19:49:32.406974529 +0200 +diff -Nur linux-4.1.13.orig/sound/soc/fsl/imx-pcm-dma.c linux-4.1.13/sound/soc/fsl/imx-pcm-dma.c +--- linux-4.1.13.orig/sound/soc/fsl/imx-pcm-dma.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/sound/soc/fsl/imx-pcm-dma.c 2015-11-30 17:56:13.748126540 +0100 @@ -43,22 +43,79 @@ .buffer_bytes_max = IMX_SSI_DMABUF_SIZE, .period_bytes_min = 128, @@ -313515,9 +313430,9 @@ diff -Nur linux-4.1.10/sound/soc/fsl/imx-pcm-dma.c xbian-sources-kernel/sound/so SND_DMAENGINE_PCM_FLAG_COMPAT); } EXPORT_SYMBOL_GPL(imx_pcm_dma_init); -diff -Nur linux-4.1.10/sound/soc/fsl/imx-pcm.h xbian-sources-kernel/sound/soc/fsl/imx-pcm.h ---- linux-4.1.10/sound/soc/fsl/imx-pcm.h 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/sound/soc/fsl/imx-pcm.h 2015-10-11 19:49:32.406974529 +0200 +diff -Nur linux-4.1.13.orig/sound/soc/fsl/imx-pcm.h linux-4.1.13/sound/soc/fsl/imx-pcm.h +--- linux-4.1.13.orig/sound/soc/fsl/imx-pcm.h 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/sound/soc/fsl/imx-pcm.h 2015-11-30 17:56:13.748126540 +0100 @@ -19,6 +19,10 @@ * Do not change this as the FIQ handler depends on this size */ @@ -313541,9 +313456,9 @@ diff -Nur linux-4.1.10/sound/soc/fsl/imx-pcm.h xbian-sources-kernel/sound/soc/fs { return -ENODEV; } -diff -Nur linux-4.1.10/sound/soc/fsl/imx-sgtl5000.c xbian-sources-kernel/sound/soc/fsl/imx-sgtl5000.c ---- linux-4.1.10/sound/soc/fsl/imx-sgtl5000.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/sound/soc/fsl/imx-sgtl5000.c 2015-10-11 19:49:32.406974529 +0200 +diff -Nur linux-4.1.13.orig/sound/soc/fsl/imx-sgtl5000.c linux-4.1.13/sound/soc/fsl/imx-sgtl5000.c +--- linux-4.1.13.orig/sound/soc/fsl/imx-sgtl5000.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/sound/soc/fsl/imx-sgtl5000.c 2015-11-30 17:56:13.748126540 +0100 @@ -175,8 +175,10 @@ fail: if (data && !IS_ERR(data->codec_clk)) @@ -313565,9 +313480,9 @@ diff -Nur linux-4.1.10/sound/soc/fsl/imx-sgtl5000.c xbian-sources-kernel/sound/s .pm = &snd_soc_pm_ops, .of_match_table = imx_sgtl5000_dt_ids, }, -diff -Nur linux-4.1.10/sound/soc/fsl/imx-spdif.c xbian-sources-kernel/sound/soc/fsl/imx-spdif.c ---- linux-4.1.10/sound/soc/fsl/imx-spdif.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/sound/soc/fsl/imx-spdif.c 2015-10-11 19:49:32.406974529 +0200 +diff -Nur linux-4.1.13.orig/sound/soc/fsl/imx-spdif.c linux-4.1.13/sound/soc/fsl/imx-spdif.c +--- linux-4.1.13.orig/sound/soc/fsl/imx-spdif.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/sound/soc/fsl/imx-spdif.c 2015-11-30 17:56:13.748126540 +0100 @@ -66,16 +66,18 @@ if (ret) goto end; @@ -313599,9 +313514,9 @@ diff -Nur linux-4.1.10/sound/soc/fsl/imx-spdif.c xbian-sources-kernel/sound/soc/ .of_match_table = imx_spdif_dt_ids, }, .probe = imx_spdif_audio_probe, -diff -Nur linux-4.1.10/sound/soc/fsl/imx-ssi.c xbian-sources-kernel/sound/soc/fsl/imx-ssi.c ---- linux-4.1.10/sound/soc/fsl/imx-ssi.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/sound/soc/fsl/imx-ssi.c 2015-10-11 19:49:32.406974529 +0200 +diff -Nur linux-4.1.13.orig/sound/soc/fsl/imx-ssi.c linux-4.1.13/sound/soc/fsl/imx-ssi.c +--- linux-4.1.13.orig/sound/soc/fsl/imx-ssi.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/sound/soc/fsl/imx-ssi.c 2015-11-30 17:56:13.748126540 +0100 @@ -603,7 +603,7 @@ ssi->fiq_params.dma_params_tx = &ssi->dma_params_tx; @@ -313611,9 +313526,9 @@ diff -Nur linux-4.1.10/sound/soc/fsl/imx-ssi.c xbian-sources-kernel/sound/soc/fs if (ssi->fiq_init && ssi->dma_init) { ret = ssi->fiq_init; -diff -Nur linux-4.1.10/sound/soc/fsl/imx-tda1997x.c xbian-sources-kernel/sound/soc/fsl/imx-tda1997x.c ---- linux-4.1.10/sound/soc/fsl/imx-tda1997x.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/sound/soc/fsl/imx-tda1997x.c 2015-10-11 19:49:32.406974529 +0200 +diff -Nur linux-4.1.13.orig/sound/soc/fsl/imx-tda1997x.c linux-4.1.13/sound/soc/fsl/imx-tda1997x.c +--- linux-4.1.13.orig/sound/soc/fsl/imx-tda1997x.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/sound/soc/fsl/imx-tda1997x.c 2015-11-30 17:56:13.748126540 +0100 @@ -0,0 +1,195 @@ +/* + * SoC audio for i.MX boards with tda1997x HDMI receiver @@ -313810,9 +313725,9 @@ diff -Nur linux-4.1.10/sound/soc/fsl/imx-tda1997x.c xbian-sources-kernel/sound/s +MODULE_DESCRIPTION("Freescale i.MX TDA1997X RX ASoC machine driver"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:imx-tda1997x-audio"); -diff -Nur linux-4.1.10/sound/soc/fsl/imx-wm8731.c xbian-sources-kernel/sound/soc/fsl/imx-wm8731.c ---- linux-4.1.10/sound/soc/fsl/imx-wm8731.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/sound/soc/fsl/imx-wm8731.c 2015-10-11 19:49:32.406974529 +0200 +diff -Nur linux-4.1.13.orig/sound/soc/fsl/imx-wm8731.c linux-4.1.13/sound/soc/fsl/imx-wm8731.c +--- linux-4.1.13.orig/sound/soc/fsl/imx-wm8731.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.13/sound/soc/fsl/imx-wm8731.c 2015-11-30 17:56:13.748126540 +0100 @@ -0,0 +1,682 @@ +/* + * Copyright (C) 2014 Freescale Semiconductor, Inc. @@ -314496,9 +314411,9 @@ diff -Nur linux-4.1.10/sound/soc/fsl/imx-wm8731.c xbian-sources-kernel/sound/soc +MODULE_DESCRIPTION("Freescale i.MX WM8731 ASoC machine driver"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:imx-wm8731"); -diff -Nur linux-4.1.10/sound/soc/fsl/Kconfig xbian-sources-kernel/sound/soc/fsl/Kconfig ---- linux-4.1.10/sound/soc/fsl/Kconfig 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/sound/soc/fsl/Kconfig 2015-10-11 19:49:32.402974794 +0200 +diff -Nur linux-4.1.13.orig/sound/soc/fsl/Kconfig linux-4.1.13/sound/soc/fsl/Kconfig +--- linux-4.1.13.orig/sound/soc/fsl/Kconfig 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/sound/soc/fsl/Kconfig 2015-11-30 17:56:13.748126540 +0100 @@ -55,6 +55,9 @@ This option is only useful for out-of-tree drivers since in-tree drivers select it automatically. @@ -314597,9 +314512,9 @@ diff -Nur linux-4.1.10/sound/soc/fsl/Kconfig xbian-sources-kernel/sound/soc/fsl/ endif # SND_IMX_SOC endmenu -diff -Nur linux-4.1.10/sound/soc/fsl/Makefile xbian-sources-kernel/sound/soc/fsl/Makefile ---- linux-4.1.10/sound/soc/fsl/Makefile 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/sound/soc/fsl/Makefile 2015-10-11 19:49:32.402974794 +0200 +diff -Nur linux-4.1.13.orig/sound/soc/fsl/Makefile linux-4.1.13/sound/soc/fsl/Makefile +--- linux-4.1.13.orig/sound/soc/fsl/Makefile 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/sound/soc/fsl/Makefile 2015-11-30 17:56:13.748126540 +0100 @@ -16,6 +16,7 @@ snd-soc-fsl-sai-objs := fsl_sai.o snd-soc-fsl-ssi-y := fsl_ssi.o @@ -314650,9 +314565,9 @@ diff -Nur linux-4.1.10/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.10/sound/soc/soc-io.c xbian-sources-kernel/sound/soc/soc-io.c ---- linux-4.1.10/sound/soc/soc-io.c 2015-10-03 13:49:38.000000000 +0200 -+++ xbian-sources-kernel/sound/soc/soc-io.c 2015-10-11 19:49:32.426973204 +0200 +diff -Nur linux-4.1.13.orig/sound/soc/soc-io.c linux-4.1.13/sound/soc/soc-io.c +--- linux-4.1.13.orig/sound/soc/soc-io.c 2015-11-09 23:34:10.000000000 +0100 ++++ linux-4.1.13/sound/soc/soc-io.c 2015-11-30 17:56:13.748126540 +0100 @@ -17,6 +17,8 @@ #include #include -- cgit v1.2.3