summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-10-11 18:12:51 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2015-10-11 18:15:39 +0200
commitefbbee334e940d9f9c7634c27ed5604d42c137b0 (patch)
tree53c0025ef37536b0514e7d0200a47873d1533a93
parent8c0b9f4e09abf2f748b6badcc9f3fc5e390b8caf (diff)
fix patch and compile error for 4.1.10 + solidrun
Diffstat
-rw-r--r--target/arm/solidrun-imx6/patches/4.1.10/0001-xbian.patch3508
-rw-r--r--target/linux/config/Config.in.graphics2
2 files changed, 1463 insertions, 2047 deletions
diff --git a/target/arm/solidrun-imx6/patches/4.1.10/0001-xbian.patch b/target/arm/solidrun-imx6/patches/4.1.10/0001-xbian.patch
index a8bf90ef0..d2ea38153 100644
--- a/target/arm/solidrun-imx6/patches/4.1.10/0001-xbian.patch
+++ b/target/arm/solidrun-imx6/patches/4.1.10/0001-xbian.patch
@@ -1,6 +1,6 @@
-diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6dl.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6dl.dtsi
---- linux-4.1.6/arch/arm/boot/dts/imx6dl.dtsi 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/boot/dts/imx6dl.dtsi 2015-09-11 17:46:08.539024112 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6dl.dtsi linux-4.1.10/arch/arm/boot/dts/imx6dl.dtsi
+--- linux-4.1.10.orig/arch/arm/boot/dts/imx6dl.dtsi 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/boot/dts/imx6dl.dtsi 2015-10-10 16:41:04.845313887 +0200
@@ -30,7 +30,7 @@
/* kHz uV */
996000 1250000
@@ -157,9 +157,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6dl.dtsi xbian-sources-kernel/arch/ar
-&vpu {
- compatible = "fsl,imx6dl-vpu", "cnm,coda960";
-};
-diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6dl-hummingboard2.dts xbian-sources-kernel/arch/arm/boot/dts/imx6dl-hummingboard2.dts
---- linux-4.1.6/arch/arm/boot/dts/imx6dl-hummingboard2.dts 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/arch/arm/boot/dts/imx6dl-hummingboard2.dts 2015-09-11 17:46:08.539024112 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6dl-hummingboard2.dts linux-4.1.10/arch/arm/boot/dts/imx6dl-hummingboard2.dts
+--- linux-4.1.10.orig/arch/arm/boot/dts/imx6dl-hummingboard2.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/arch/arm/boot/dts/imx6dl-hummingboard2.dts 2015-10-10 16:41:04.965313892 +0200
@@ -0,0 +1,52 @@
+/*
+ * Device Tree file for SolidRun HummingBoard2
@@ -213,9 +213,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6dl-hummingboard2.dts xbian-sources-k
+ model = "SolidRun HummingBoard2 Solo/DualLite";
+ compatible = "solidrun,hummingboard2/dl", "fsl,imx6dl";
+};
-diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
---- linux-4.1.6/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2015-09-11 17:46:08.555023041 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-4.1.10/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
+--- linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2015-10-10 16:41:04.965313892 +0200
@@ -45,11 +45,22 @@
#include <dt-bindings/gpio/gpio.h>
@@ -384,9 +384,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi xbian-sources-kerne
+ dcic_mux = "dcic-lvds1";
+ status = "okay";
};
-diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl.dtsi
---- linux-4.1.6/arch/arm/boot/dts/imx6qdl.dtsi 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl.dtsi 2015-09-11 17:46:08.571021970 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl.dtsi linux-4.1.10/arch/arm/boot/dts/imx6qdl.dtsi
+--- linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl.dtsi 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/boot/dts/imx6qdl.dtsi 2015-10-10 16:41:04.965313892 +0200
@@ -14,6 +14,7 @@
#include <dt-bindings/interrupt-controller/arm-gic.h>
@@ -956,9 +956,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl.dtsi xbian-sources-kernel/arch/a
};
};
};
-diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
---- linux-4.1.6/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi 2015-09-11 17:46:08.571021970 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
+--- linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi 2015-10-10 16:41:04.969313893 +0200
@@ -0,0 +1,686 @@
+/*
+ * Device Tree file for SolidRun HummingBoard2
@@ -1646,9 +1646,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi xbian-sources
+ pinctrl-0 = <&pinctrl_hummingboard2_uart3>;
+ status = "okay";
+};
-diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
---- linux-4.1.6/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi 2015-09-11 17:46:08.571021970 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
+--- linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi 2015-10-10 16:41:04.969313893 +0200
@@ -43,8 +43,11 @@
#include "imx6qdl-microsom-ar8035.dtsi"
@@ -2082,9 +2082,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi xbian-sources-
+ dcic_mux = "dcic-lvds1";
+ status = "okay";
+};
-diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-microsom.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-microsom.dtsi
---- linux-4.1.6/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2015-09-11 17:46:08.571021970 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-microsom.dtsi linux-4.1.10/arch/arm/boot/dts/imx6qdl-microsom.dtsi
+--- linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2015-10-10 16:41:04.969313893 +0200
@@ -39,15 +39,98 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
@@ -2208,9 +2208,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-microsom.dtsi xbian-sources-kern
+ vmmc-supply = <&reg_brcm>;
+ status = "okay";
+};
-diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-sabresd.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
---- linux-4.1.6/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2015-09-11 17:46:08.571021970 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-4.1.10/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+--- linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2015-10-10 16:41:04.969313893 +0200
@@ -57,6 +57,13 @@
enable-active-high;
};
@@ -2284,9 +2284,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-sabresd.dtsi xbian-sources-kerne
&pwm1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pwm1>;
-diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6q.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6q.dtsi
---- linux-4.1.6/arch/arm/boot/dts/imx6q.dtsi 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/boot/dts/imx6q.dtsi 2015-09-11 17:46:08.555023041 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6q.dtsi linux-4.1.10/arch/arm/boot/dts/imx6q.dtsi
+--- linux-4.1.10.orig/arch/arm/boot/dts/imx6q.dtsi 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/boot/dts/imx6q.dtsi 2015-10-10 16:41:04.969313893 +0200
@@ -14,6 +14,7 @@
/ {
@@ -2593,9 +2593,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6q.dtsi xbian-sources-kernel/arch/arm
+ "ldb_di0_div_7", "ldb_di1_div_7",
+ "ldb_di0_div_sel", "ldb_di1_div_sel";
};
-diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6q-hummingboard2.dts xbian-sources-kernel/arch/arm/boot/dts/imx6q-hummingboard2.dts
---- linux-4.1.6/arch/arm/boot/dts/imx6q-hummingboard2.dts 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/arch/arm/boot/dts/imx6q-hummingboard2.dts 2015-09-11 17:46:08.555023041 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6q-hummingboard2.dts linux-4.1.10/arch/arm/boot/dts/imx6q-hummingboard2.dts
+--- linux-4.1.10.orig/arch/arm/boot/dts/imx6q-hummingboard2.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/arch/arm/boot/dts/imx6q-hummingboard2.dts 2015-10-10 16:41:04.973313893 +0200
@@ -0,0 +1,60 @@
+/*
+ * Device Tree file for SolidRun HummingBoard2
@@ -2657,9 +2657,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6q-hummingboard2.dts xbian-sources-ke
+ fsl,transmit-atten-16ths = <9>;
+ fsl,no-spread-spectrum;
+};
-diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6q-hummingboard.dts xbian-sources-kernel/arch/arm/boot/dts/imx6q-hummingboard.dts
---- linux-4.1.6/arch/arm/boot/dts/imx6q-hummingboard.dts 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/boot/dts/imx6q-hummingboard.dts 2015-09-11 17:46:08.555023041 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6q-hummingboard.dts linux-4.1.10/arch/arm/boot/dts/imx6q-hummingboard.dts
+--- linux-4.1.10.orig/arch/arm/boot/dts/imx6q-hummingboard.dts 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/boot/dts/imx6q-hummingboard.dts 2015-10-10 16:41:04.973313893 +0200
@@ -48,6 +48,10 @@
/ {
model = "SolidRun HummingBoard Dual/Quad";
@@ -2679,9 +2679,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6q-hummingboard.dts xbian-sources-ker
+&sgtl5000 {
+ status = "okay";
+};
-diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6sl.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6sl.dtsi
---- linux-4.1.6/arch/arm/boot/dts/imx6sl.dtsi 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/boot/dts/imx6sl.dtsi 2015-09-11 17:46:08.571021970 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6sl.dtsi linux-4.1.10/arch/arm/boot/dts/imx6sl.dtsi
+--- linux-4.1.10.orig/arch/arm/boot/dts/imx6sl.dtsi 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/boot/dts/imx6sl.dtsi 2015-10-10 16:41:04.973313893 +0200
@@ -457,20 +457,21 @@
anatop-min-bit-val = <4>;
anatop-min-voltage = <800000>;
@@ -2732,9 +2732,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6sl.dtsi xbian-sources-kernel/arch/ar
fsl,anatop = <&anatop>;
};
-diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6sx.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6sx.dtsi
---- linux-4.1.6/arch/arm/boot/dts/imx6sx.dtsi 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/boot/dts/imx6sx.dtsi 2015-09-11 17:46:08.571021970 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6sx.dtsi linux-4.1.10/arch/arm/boot/dts/imx6sx.dtsi
+--- linux-4.1.10.orig/arch/arm/boot/dts/imx6sx.dtsi 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/boot/dts/imx6sx.dtsi 2015-10-10 16:41:04.973313893 +0200
@@ -556,20 +556,21 @@
anatop-min-bit-val = <4>;
anatop-min-voltage = <800000>;
@@ -2785,9 +2785,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6sx.dtsi xbian-sources-kernel/arch/ar
fsl,anatop = <&anatop>;
};
-diff -Nur linux-4.1.6/arch/arm/boot/dts/Makefile xbian-sources-kernel/arch/arm/boot/dts/Makefile
---- linux-4.1.6/arch/arm/boot/dts/Makefile 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/boot/dts/Makefile 2015-09-11 17:46:08.487027594 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/Makefile linux-4.1.10/arch/arm/boot/dts/Makefile
+--- linux-4.1.10.orig/arch/arm/boot/dts/Makefile 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/boot/dts/Makefile 2015-10-10 16:41:04.973313893 +0200
@@ -264,6 +264,7 @@
imx6dl-gw54xx.dtb \
imx6dl-gw552x.dtb \
@@ -2804,9 +2804,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/Makefile xbian-sources-kernel/arch/arm/b
imx6q-nitrogen6x.dtb \
imx6q-phytec-pbab01.dtb \
imx6q-rex-pro.dtb \
-diff -Nur linux-4.1.6/arch/arm/configs/imx_v7_cbi_hb_base_defconfig xbian-sources-kernel/arch/arm/configs/imx_v7_cbi_hb_base_defconfig
---- linux-4.1.6/arch/arm/configs/imx_v7_cbi_hb_base_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/arch/arm/configs/imx_v7_cbi_hb_base_defconfig 2015-09-11 17:46:08.655016347 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/configs/imx_v7_cbi_hb_base_defconfig linux-4.1.10/arch/arm/configs/imx_v7_cbi_hb_base_defconfig
+--- linux-4.1.10.orig/arch/arm/configs/imx_v7_cbi_hb_base_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/arch/arm/configs/imx_v7_cbi_hb_base_defconfig 2015-10-10 16:41:04.981313892 +0200
@@ -0,0 +1,367 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_KERNEL_LZO=y
@@ -3175,9 +3175,9 @@ diff -Nur linux-4.1.6/arch/arm/configs/imx_v7_cbi_hb_base_defconfig xbian-source
+CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_IR_GPIO_CIR=m
-diff -Nur linux-4.1.6/arch/arm/configs/imx_v7_cbi_hb_defconfig xbian-sources-kernel/arch/arm/configs/imx_v7_cbi_hb_defconfig
---- linux-4.1.6/arch/arm/configs/imx_v7_cbi_hb_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/arch/arm/configs/imx_v7_cbi_hb_defconfig 2015-09-11 17:46:08.655016347 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/configs/imx_v7_cbi_hb_defconfig linux-4.1.10/arch/arm/configs/imx_v7_cbi_hb_defconfig
+--- linux-4.1.10.orig/arch/arm/configs/imx_v7_cbi_hb_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/arch/arm/configs/imx_v7_cbi_hb_defconfig 2015-10-10 16:41:04.985313893 +0200
@@ -0,0 +1,5139 @@
+#
+# Automatically generated make config: don't edit
@@ -8318,9 +8318,9 @@ diff -Nur linux-4.1.6/arch/arm/configs/imx_v7_cbi_hb_defconfig xbian-sources-ker
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_PROC_DEVICETREE=y
+
-diff -Nur linux-4.1.6/arch/arm/configs/imx_v7_defconfig xbian-sources-kernel/arch/arm/configs/imx_v7_defconfig
---- linux-4.1.6/arch/arm/configs/imx_v7_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/arch/arm/configs/imx_v7_defconfig 2015-09-11 17:46:08.655016347 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/configs/imx_v7_defconfig linux-4.1.10/arch/arm/configs/imx_v7_defconfig
+--- linux-4.1.10.orig/arch/arm/configs/imx_v7_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/arch/arm/configs/imx_v7_defconfig 2015-10-10 16:41:04.985313893 +0200
@@ -0,0 +1,414 @@
+CONFIG_KERNEL_LZO=y
+CONFIG_SYSVIPC=y
@@ -8736,9 +8736,9 @@ diff -Nur linux-4.1.6/arch/arm/configs/imx_v7_defconfig xbian-sources-kernel/arc
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
-diff -Nur linux-4.1.6/arch/arm/configs/imx_v7_mfg_defconfig xbian-sources-kernel/arch/arm/configs/imx_v7_mfg_defconfig
---- linux-4.1.6/arch/arm/configs/imx_v7_mfg_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/arch/arm/configs/imx_v7_mfg_defconfig 2015-09-11 17:46:08.655016347 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/configs/imx_v7_mfg_defconfig linux-4.1.10/arch/arm/configs/imx_v7_mfg_defconfig
+--- linux-4.1.10.orig/arch/arm/configs/imx_v7_mfg_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/arch/arm/configs/imx_v7_mfg_defconfig 2015-10-10 16:41:04.985313893 +0200
@@ -0,0 +1,332 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_KERNEL_LZO=y
@@ -9072,9 +9072,9 @@ diff -Nur linux-4.1.6/arch/arm/configs/imx_v7_mfg_defconfig xbian-sources-kernel
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
-diff -Nur linux-4.1.6/arch/arm/include/asm/glue-cache.h xbian-sources-kernel/arch/arm/include/asm/glue-cache.h
---- linux-4.1.6/arch/arm/include/asm/glue-cache.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/include/asm/glue-cache.h 2015-09-11 17:46:08.695013671 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/include/asm/glue-cache.h linux-4.1.10/arch/arm/include/asm/glue-cache.h
+--- linux-4.1.10.orig/arch/arm/include/asm/glue-cache.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/include/asm/glue-cache.h 2015-10-10 16:41:04.985313893 +0200
@@ -102,19 +102,19 @@
#endif
@@ -9103,10 +9103,10 @@ diff -Nur linux-4.1.6/arch/arm/include/asm/glue-cache.h xbian-sources-kernel/arc
#endif
#if defined(CONFIG_CPU_V7M)
-diff -Nur linux-4.1.6/arch/arm/Kconfig xbian-sources-kernel/arch/arm/Kconfig
---- linux-4.1.6/arch/arm/Kconfig 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/Kconfig 2015-09-11 17:46:08.487027594 +0200
-@@ -1688,6 +1688,7 @@
+diff -Nur linux-4.1.10.orig/arch/arm/Kconfig linux-4.1.10/arch/arm/Kconfig
+--- linux-4.1.10.orig/arch/arm/Kconfig 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/Kconfig 2015-10-10 16:41:05.233313895 +0200
+@@ -1689,6 +1689,7 @@
range 11 64 if ARCH_SHMOBILE_LEGACY
default "12" if SOC_AM33XX
default "9" if SA1111 || ARCH_EFM32
@@ -9114,197 +9114,9 @@ diff -Nur linux-4.1.6/arch/arm/Kconfig xbian-sources-kernel/arch/arm/Kconfig
default "11"
help
The kernel memory allocator divides physically contiguous memory
-diff -Nur linux-4.1.6/arch/arm/mach-bcm/brcmstb.h xbian-sources-kernel/arch/arm/mach-bcm/brcmstb.h
---- linux-4.1.6/arch/arm/mach-bcm/brcmstb.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-bcm/brcmstb.h 1970-01-01 01:00:00.000000000 +0100
-@@ -1,19 +0,0 @@
--/*
-- * Copyright (C) 2013-2014 Broadcom Corporation
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License as
-- * published by the Free Software Foundation version 2.
-- *
-- * This program is distributed "as is" WITHOUT ANY WARRANTY of any
-- * kind, whether express or implied; without even the implied warranty
-- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- * GNU General Public License for more details.
-- */
--
--#ifndef __BRCMSTB_H__
--#define __BRCMSTB_H__
--
--void brcmstb_secondary_startup(void);
--
--#endif /* __BRCMSTB_H__ */
-diff -Nur linux-4.1.6/arch/arm/mach-bcm/headsmp-brcmstb.S xbian-sources-kernel/arch/arm/mach-bcm/headsmp-brcmstb.S
---- linux-4.1.6/arch/arm/mach-bcm/headsmp-brcmstb.S 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-bcm/headsmp-brcmstb.S 1970-01-01 01:00:00.000000000 +0100
-@@ -1,33 +0,0 @@
--/*
-- * SMP boot code for secondary CPUs
-- * Based on arch/arm/mach-tegra/headsmp.S
-- *
-- * Copyright (C) 2010 NVIDIA, Inc.
-- * Copyright (C) 2013-2014 Broadcom Corporation
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License as
-- * published by the Free Software Foundation version 2.
-- *
-- * This program is distributed "as is" WITHOUT ANY WARRANTY of any
-- * kind, whether express or implied; without even the implied warranty
-- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- * GNU General Public License for more details.
-- */
--
--#include <asm/assembler.h>
--#include <linux/linkage.h>
--#include <linux/init.h>
--
-- .section ".text.head", "ax"
--
--ENTRY(brcmstb_secondary_startup)
-- /*
-- * Ensure CPU is in a sane state by disabling all IRQs and switching
-- * into SVC mode.
-- */
-- setmode PSR_I_BIT | PSR_F_BIT | SVC_MODE, r0
--
-- bl v7_invalidate_l1
-- b secondary_startup
--ENDPROC(brcmstb_secondary_startup)
-diff -Nur linux-4.1.6/arch/arm/mach-bcm/Makefile xbian-sources-kernel/arch/arm/mach-bcm/Makefile
---- linux-4.1.6/arch/arm/mach-bcm/Makefile 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-bcm/Makefile 2015-09-11 17:46:08.747010190 +0200
-@@ -43,5 +43,5 @@
- ifeq ($(CONFIG_ARCH_BRCMSTB),y)
- CFLAGS_platsmp-brcmstb.o += -march=armv7-a
- obj-y += brcmstb.o
--obj-$(CONFIG_SMP) += headsmp-brcmstb.o platsmp-brcmstb.o
-+obj-$(CONFIG_SMP) += platsmp-brcmstb.o
- endif
-diff -Nur linux-4.1.6/arch/arm/mach-bcm/platsmp-brcmstb.c xbian-sources-kernel/arch/arm/mach-bcm/platsmp-brcmstb.c
---- linux-4.1.6/arch/arm/mach-bcm/platsmp-brcmstb.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-bcm/platsmp-brcmstb.c 2015-09-11 17:46:08.747010190 +0200
-@@ -30,8 +30,6 @@
- #include <asm/mach-types.h>
- #include <asm/smp_plat.h>
-
--#include "brcmstb.h"
--
- enum {
- ZONE_MAN_CLKEN_MASK = BIT(0),
- ZONE_MAN_RESET_CNTL_MASK = BIT(1),
-@@ -153,7 +151,7 @@
- * Set the reset vector to point to the secondary_startup
- * routine
- */
-- cpu_set_boot_addr(cpu, virt_to_phys(brcmstb_secondary_startup));
-+ cpu_set_boot_addr(cpu, virt_to_phys(secondary_startup));
-
- /* Unhalt the cpu */
- cpu_rst_cfg_set(cpu, 0);
-diff -Nur linux-4.1.6/arch/arm/mach-berlin/headsmp.S xbian-sources-kernel/arch/arm/mach-berlin/headsmp.S
---- linux-4.1.6/arch/arm/mach-berlin/headsmp.S 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-berlin/headsmp.S 2015-09-11 17:46:08.747010190 +0200
-@@ -12,12 +12,6 @@
- #include <linux/init.h>
- #include <asm/assembler.h>
-
--ENTRY(berlin_secondary_startup)
-- ARM_BE8(setend be)
-- bl v7_invalidate_l1
-- b secondary_startup
--ENDPROC(berlin_secondary_startup)
--
- /*
- * If the following instruction is set in the reset exception vector, CPUs
- * will fetch the value of the software reset address vector when being
-diff -Nur linux-4.1.6/arch/arm/mach-berlin/platsmp.c xbian-sources-kernel/arch/arm/mach-berlin/platsmp.c
---- linux-4.1.6/arch/arm/mach-berlin/platsmp.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-berlin/platsmp.c 2015-09-11 17:46:08.747010190 +0200
-@@ -22,7 +22,6 @@
- #define RESET_VECT 0x00
- #define SW_RESET_ADDR 0x94
-
--extern void berlin_secondary_startup(void);
- extern u32 boot_inst;
-
- static void __iomem *cpu_ctrl;
-@@ -85,7 +84,7 @@
- * Write the secondary startup address into the SW reset address
- * vector. This is used by boot_inst.
- */
-- writel(virt_to_phys(berlin_secondary_startup), vectors_base + SW_RESET_ADDR);
-+ writel(virt_to_phys(secondary_startup), vectors_base + SW_RESET_ADDR);
-
- iounmap(vectors_base);
- unmap_scu:
-diff -Nur linux-4.1.6/arch/arm/mach-hisi/core.h xbian-sources-kernel/arch/arm/mach-hisi/core.h
---- linux-4.1.6/arch/arm/mach-hisi/core.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-hisi/core.h 2015-09-11 17:46:08.795006977 +0200
-@@ -12,7 +12,6 @@
- extern int hi3xxx_cpu_kill(unsigned int cpu);
- extern void hi3xxx_set_cpu(int cpu, bool enable);
-
--extern void hisi_secondary_startup(void);
- extern struct smp_operations hix5hd2_smp_ops;
- extern void hix5hd2_set_cpu(int cpu, bool enable);
- extern void hix5hd2_cpu_die(unsigned int cpu);
-diff -Nur linux-4.1.6/arch/arm/mach-hisi/headsmp.S xbian-sources-kernel/arch/arm/mach-hisi/headsmp.S
---- linux-4.1.6/arch/arm/mach-hisi/headsmp.S 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-hisi/headsmp.S 1970-01-01 01:00:00.000000000 +0100
-@@ -1,16 +0,0 @@
--/*
-- * Copyright (c) 2014 Hisilicon Limited.
-- * Copyright (c) 2014 Linaro Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License version 2 as
-- * published by the Free Software Foundation.
-- */
--#include <linux/linkage.h>
--#include <linux/init.h>
--
-- __CPUINIT
--
--ENTRY(hisi_secondary_startup)
-- bl v7_invalidate_l1
-- b secondary_startup
-diff -Nur linux-4.1.6/arch/arm/mach-hisi/Makefile xbian-sources-kernel/arch/arm/mach-hisi/Makefile
---- linux-4.1.6/arch/arm/mach-hisi/Makefile 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-hisi/Makefile 2015-09-11 17:46:08.795006977 +0200
-@@ -6,4 +6,4 @@
-
- obj-y += hisilicon.o
- obj-$(CONFIG_MCPM) += platmcpm.o
--obj-$(CONFIG_SMP) += platsmp.o hotplug.o headsmp.o
-+obj-$(CONFIG_SMP) += platsmp.o hotplug.o
-diff -Nur linux-4.1.6/arch/arm/mach-hisi/platsmp.c xbian-sources-kernel/arch/arm/mach-hisi/platsmp.c
---- linux-4.1.6/arch/arm/mach-hisi/platsmp.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-hisi/platsmp.c 2015-09-11 17:46:08.795006977 +0200
-@@ -118,7 +118,7 @@
- {
- phys_addr_t jumpaddr;
-
-- jumpaddr = virt_to_phys(hisi_secondary_startup);
-+ jumpaddr = virt_to_phys(secondary_startup);
- hix5hd2_set_scu_boot_addr(HIX5HD2_BOOT_ADDRESS, jumpaddr);
- hix5hd2_set_cpu(cpu, true);
- arch_send_wakeup_ipi_mask(cpumask_of(cpu));
-@@ -156,7 +156,7 @@
- struct device_node *node;
-
-
-- jumpaddr = virt_to_phys(hisi_secondary_startup);
-+ jumpaddr = virt_to_phys(secondary_startup);
- hip01_set_boot_addr(HIP01_BOOT_ADDRESS, jumpaddr);
-
- node = of_find_compatible_node(NULL, NULL, "hisilicon,hip01-sysctrl");
-diff -Nur linux-4.1.6/arch/arm/mach-imx/busfreq_ddr3.c xbian-sources-kernel/arch/arm/mach-imx/busfreq_ddr3.c
---- linux-4.1.6/arch/arm/mach-imx/busfreq_ddr3.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/arch/arm/mach-imx/busfreq_ddr3.c 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/busfreq_ddr3.c linux-4.1.10/arch/arm/mach-imx/busfreq_ddr3.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/busfreq_ddr3.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/arch/arm/mach-imx/busfreq_ddr3.c 2015-10-10 16:41:25.125309040 +0200
@@ -0,0 +1,519 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -9825,9 +9637,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/busfreq_ddr3.c xbian-sources-kernel/arch
+
+ return 0;
+}
-diff -Nur linux-4.1.6/arch/arm/mach-imx/busfreq-imx6.c xbian-sources-kernel/arch/arm/mach-imx/busfreq-imx6.c
---- linux-4.1.6/arch/arm/mach-imx/busfreq-imx6.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/arch/arm/mach-imx/busfreq-imx6.c 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/busfreq-imx6.c linux-4.1.10/arch/arm/mach-imx/busfreq-imx6.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/busfreq-imx6.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/arch/arm/mach-imx/busfreq-imx6.c 2015-10-10 16:41:25.125309040 +0200
@@ -0,0 +1,994 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -10823,9 +10635,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/busfreq-imx6.c xbian-sources-kernel/arch
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("BusFreq driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-4.1.6/arch/arm/mach-imx/busfreq_lpddr2.c xbian-sources-kernel/arch/arm/mach-imx/busfreq_lpddr2.c
---- linux-4.1.6/arch/arm/mach-imx/busfreq_lpddr2.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/arch/arm/mach-imx/busfreq_lpddr2.c 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/busfreq_lpddr2.c linux-4.1.10/arch/arm/mach-imx/busfreq_lpddr2.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/busfreq_lpddr2.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/arch/arm/mach-imx/busfreq_lpddr2.c 2015-10-10 16:41:25.125309040 +0200
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2011-2015 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -11010,9 +10822,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/busfreq_lpddr2.c xbian-sources-kernel/ar
+
+ return 0;
+}
-diff -Nur linux-4.1.6/arch/arm/mach-imx/clk.h xbian-sources-kernel/arch/arm/mach-imx/clk.h
---- linux-4.1.6/arch/arm/mach-imx/clk.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/clk.h 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk.h linux-4.1.10/arch/arm/mach-imx/clk.h
+--- linux-4.1.10.orig/arch/arm/mach-imx/clk.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/clk.h 2015-10-10 16:41:25.129309291 +0200
@@ -55,6 +55,34 @@
shift, 0, &imx_ccm_lock, share_count);
}
@@ -11064,9 +10876,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk.h xbian-sources-kernel/arch/arm/mach
static inline struct clk *imx_clk_fixed_factor(const char *name,
const char *parent, unsigned int mult, unsigned int div)
{
-diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx1.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx1.c
---- linux-4.1.6/arch/arm/mach-imx/clk-imx1.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx1.c 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk-imx1.c linux-4.1.10/arch/arm/mach-imx/clk-imx1.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/clk-imx1.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/clk-imx1.c 2015-10-10 16:41:25.129309291 +0200
@@ -75,7 +75,8 @@
int __init mx1_clocks_init(unsigned long fref)
@@ -11086,9 +10898,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx1.c xbian-sources-kernel/arch/arm
return 0;
}
-diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx21.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx21.c
---- linux-4.1.6/arch/arm/mach-imx/clk-imx21.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx21.c 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk-imx21.c linux-4.1.10/arch/arm/mach-imx/clk-imx21.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/clk-imx21.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/clk-imx21.c 2015-10-10 16:41:25.129309291 +0200
@@ -153,7 +153,7 @@
clk_register_clkdev(clk[IMX21_CLK_I2C_GATE], NULL, "imx21-i2c.0");
clk_register_clkdev(clk[IMX21_CLK_OWIRE_GATE], NULL, "mxc_w1.0");
@@ -11098,9 +10910,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx21.c xbian-sources-kernel/arch/ar
return 0;
}
-diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx27.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx27.c
---- linux-4.1.6/arch/arm/mach-imx/clk-imx27.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx27.c 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk-imx27.c linux-4.1.10/arch/arm/mach-imx/clk-imx27.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/clk-imx27.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/clk-imx27.c 2015-10-10 16:41:25.129309291 +0200
@@ -229,7 +229,7 @@
clk_register_clkdev(clk[IMX27_CLK_EMMA_AHB_GATE], "ahb", "m2m-emmaprp.0");
clk_register_clkdev(clk[IMX27_CLK_EMMA_IPG_GATE], "ipg", "m2m-emmaprp.0");
@@ -11110,9 +10922,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx27.c xbian-sources-kernel/arch/ar
return 0;
}
-diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx31.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx31.c
---- linux-4.1.6/arch/arm/mach-imx/clk-imx31.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx31.c 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk-imx31.c linux-4.1.10/arch/arm/mach-imx/clk-imx31.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/clk-imx31.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/clk-imx31.c 2015-10-10 16:41:25.129309291 +0200
@@ -50,9 +50,12 @@
int __init mx31_clocks_init(unsigned long fref)
@@ -11136,9 +10948,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx31.c xbian-sources-kernel/arch/ar
return 0;
}
-diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx35.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx35.c
---- linux-4.1.6/arch/arm/mach-imx/clk-imx35.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx35.c 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk-imx35.c linux-4.1.10/arch/arm/mach-imx/clk-imx35.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/clk-imx35.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/clk-imx35.c 2015-10-10 16:41:25.129309291 +0200
@@ -71,11 +71,14 @@
int __init mx35_clocks_init(void)
@@ -11164,9 +10976,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx35.c xbian-sources-kernel/arch/ar
#endif
return 0;
-diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx6q.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx6q.c
---- linux-4.1.6/arch/arm/mach-imx/clk-imx6q.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx6q.c 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk-imx6q.c linux-4.1.10/arch/arm/mach-imx/clk-imx6q.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/clk-imx6q.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/clk-imx6q.c 2015-10-10 16:41:25.133309588 +0200
@@ -24,7 +24,6 @@
#include "clk.h"
#include "common.h"
@@ -11489,9 +11301,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx6q.c xbian-sources-kernel/arch/ar
+ }
}
CLK_OF_DECLARE(imx6q, "fsl,imx6q-ccm", imx6q_clocks_init);
-diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx6sl.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx6sl.c
---- linux-4.1.6/arch/arm/mach-imx/clk-imx6sl.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx6sl.c 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk-imx6sl.c linux-4.1.10/arch/arm/mach-imx/clk-imx6sl.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/clk-imx6sl.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/clk-imx6sl.c 2015-10-10 16:41:25.133309588 +0200
@@ -288,9 +288,6 @@
WARN_ON(!base);
ccm_base = base;
@@ -11511,9 +11323,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx6sl.c xbian-sources-kernel/arch/a
- imx6q_set_lpm(WAIT_CLOCKED);
}
CLK_OF_DECLARE(imx6sl, "fsl,imx6sl-ccm", imx6sl_clocks_init);
-diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx6sx.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx6sx.c
---- linux-4.1.6/arch/arm/mach-imx/clk-imx6sx.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx6sx.c 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk-imx6sx.c linux-4.1.10/arch/arm/mach-imx/clk-imx6sx.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/clk-imx6sx.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/clk-imx6sx.c 2015-10-10 16:41:25.133309588 +0200
@@ -268,8 +268,6 @@
base = of_iomap(np, 0);
WARN_ON(!base);
@@ -11532,9 +11344,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx6sx.c xbian-sources-kernel/arch/a
- imx6q_set_lpm(WAIT_CLOCKED);
}
CLK_OF_DECLARE(imx6sx, "fsl,imx6sx-ccm", imx6sx_clocks_init);
-diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-pllv3.c xbian-sources-kernel/arch/arm/mach-imx/clk-pllv3.c
---- linux-4.1.6/arch/arm/mach-imx/clk-pllv3.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/clk-pllv3.c 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk-pllv3.c linux-4.1.10/arch/arm/mach-imx/clk-pllv3.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/clk-pllv3.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/clk-pllv3.c 2015-10-10 16:41:25.133309588 +0200
@@ -23,6 +23,7 @@
#define PLL_DENOM_OFFSET 0x20
@@ -11587,9 +11399,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-pllv3.c xbian-sources-kernel/arch/ar
}
static const struct clk_ops clk_pllv3_av_ops = {
-diff -Nur linux-4.1.6/arch/arm/mach-imx/common.h xbian-sources-kernel/arch/arm/mach-imx/common.h
---- linux-4.1.6/arch/arm/mach-imx/common.h 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/common.h 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/common.h linux-4.1.10/arch/arm/mach-imx/common.h
+--- linux-4.1.10.orig/arch/arm/mach-imx/common.h 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/common.h 2015-10-10 16:41:25.133309588 +0200
@@ -44,7 +44,7 @@
void imx31_soc_init(void);
void imx35_soc_init(void);
@@ -11650,9 +11462,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/common.h xbian-sources-kernel/arch/arm/m
#ifdef CONFIG_PM
void imx51_pm_init(void);
-diff -Nur linux-4.1.6/arch/arm/mach-imx/common-imx6.c xbian-sources-kernel/arch/arm/mach-imx/common-imx6.c
---- linux-4.1.6/arch/arm/mach-imx/common-imx6.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/arch/arm/mach-imx/common-imx6.c 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/common-imx6.c linux-4.1.10/arch/arm/mach-imx/common-imx6.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/common-imx6.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/arch/arm/mach-imx/common-imx6.c 2015-10-10 16:41:25.137309900 +0200
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2011-2015 Freescale Semiconductor, Inc.
@@ -11750,9 +11562,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/common-imx6.c xbian-sources-kernel/arch/
+ }
+}
+
-diff -Nur linux-4.1.6/arch/arm/mach-imx/cpuidle-imx6q.c xbian-sources-kernel/arch/arm/mach-imx/cpuidle-imx6q.c
---- linux-4.1.6/arch/arm/mach-imx/cpuidle-imx6q.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/cpuidle-imx6q.c 2015-09-11 17:46:08.815005638 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/cpuidle-imx6q.c linux-4.1.10/arch/arm/mach-imx/cpuidle-imx6q.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/cpuidle-imx6q.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/cpuidle-imx6q.c 2015-10-10 16:41:25.137309900 +0200
@@ -27,9 +27,9 @@
*/
if (!spin_trylock(&master_lock))
@@ -11765,9 +11577,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/cpuidle-imx6q.c xbian-sources-kernel/arc
spin_unlock(&master_lock);
goto done;
}
-diff -Nur linux-4.1.6/arch/arm/mach-imx/cpuidle-imx6sl.c xbian-sources-kernel/arch/arm/mach-imx/cpuidle-imx6sl.c
---- linux-4.1.6/arch/arm/mach-imx/cpuidle-imx6sl.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/cpuidle-imx6sl.c 2015-09-11 17:46:08.815005638 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/cpuidle-imx6sl.c linux-4.1.10/arch/arm/mach-imx/cpuidle-imx6sl.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/cpuidle-imx6sl.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/cpuidle-imx6sl.c 2015-10-10 16:41:25.137309900 +0200
@@ -16,7 +16,7 @@
static int imx6sl_enter_wait(struct cpuidle_device *dev,
struct cpuidle_driver *drv, int index)
@@ -11786,9 +11598,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/cpuidle-imx6sl.c xbian-sources-kernel/ar
return index;
}
-diff -Nur linux-4.1.6/arch/arm/mach-imx/cpuidle-imx6sx.c xbian-sources-kernel/arch/arm/mach-imx/cpuidle-imx6sx.c
---- linux-4.1.6/arch/arm/mach-imx/cpuidle-imx6sx.c 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/cpuidle-imx6sx.c 2015-09-11 17:46:08.815005638 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/cpuidle-imx6sx.c linux-4.1.10/arch/arm/mach-imx/cpuidle-imx6sx.c
+--- linux-4.1.10.orig/arch/arm/mach-imx/cpuidle-imx6sx.c 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/cpuidle-imx6sx.c 2015-10-10 16:41:25.137309900 +0200
@@ -25,7 +25,7 @@
static int imx6sx_enter_wait(struct cpuidle_device *dev,
struct cpuidle_driver *drv, int index)
@@ -11807,9 +11619,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/cpuidle-imx6sx.c xbian-sources-kernel/ar
return index;
}
-diff -Nur linux-4.1.6/arch/arm/mach-imx/ddr3_freq_imx6.S xbian-sources-kernel/arch/arm/mach-imx/ddr3_freq_imx6.S
---- linux-4.1.6/arch/arm/mach-imx/ddr3_freq_imx6.S 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/arch/arm/mach-imx/ddr3_freq_imx6.S 2015-09-11 17:46:08.815005638 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/ddr3_freq_imx6.S linux-4.1.10/arch/arm/mach-imx/ddr3_freq_imx6.S
+--- linux-4.1.10.orig/arch/arm/mach-imx/ddr3_freq_imx6.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/arch/arm/mach-imx/ddr3_freq_imx6.S 2015-10-10 16:41:25.137309900 +0200
@@ -0,0 +1,893 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -12704,20 +12516,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/ddr3_freq_imx6.S xbian-sources-kernel/ar
+ENTRY(mx6_do_ddr_freq_change)
+ .word mx6_ddr3_freq_change
+ .size mx6_ddr3_freq_change, . - mx6_ddr3_freq_change
-diff -Nur linux-4.1.6/arch/arm/mach-imx/headsmp.S xbian-sources-kernel/arch/arm/mach-imx/headsmp.S
---- linux-4.1.6/arch/arm/mach-imx/headsmp.S 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/headsmp.S 2015-09-11 17:46:08.815005638 +0200
-@@ -25,7 +25,6 @@
- .endm
-
- ENTRY(v7_secondary_startup)
-- bl v7_invalidate_l1
- set_diag_reg
- b secondary_startup
- ENDPROC(v7_secondary_startup)
-diff -Nur linux-4.1.6/arch/arm/mach-imx/Kconfig xbian-sources-kernel/arch/arm/mach-imx/Kconfig
---- linux-4.1.6/arch/arm/mach-imx/Kconfig 2015-08-17 05:52:51.000000000 +0200
-+++ xbian-sources-kernel/arch/arm/mach-imx/Kconfig 2015-09-11 17:46:08.811005906 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/Kconfig linux-4.1.10/arch/arm/mach-imx/Kconfig
+--- linux-4.1.10.orig/arch/arm/mach-imx/Kconfig 2015-10-03 13:49:38.000000000 +0200
++++ linux-4.1.10/arch/arm/mach-imx/Kconfig 2015-10-10 16:41:28.701314199 +0200
@@ -1,5 +1,6 @@
menuconfig ARCH_MXC
bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7
@@ -12741,9 +12542,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/Kconfig xbian-sources-kernel/arch/arm/ma
config IMX_HAVE_IOMUX_V1
bool
-diff -Nur linux-4.1.6/arch/arm/mach-imx/lpddr2_freq_imx6.S xbian-sources-kernel/arch/arm/mach-imx/lpddr2_freq_imx6.S
---- linux-4.1.6/arch/arm/mach-imx/lpddr2_freq_imx6.S 1970-01-01 01:00:00.000000000 +0100
-+++ xbian-sources-kernel/arch/arm/mach-imx/lpddr2_freq_imx6.S 2015-09-11 17:46:08.819005369 +0200
+diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/lpddr2_freq_imx6.S linux-4.1.10/arch/arm/mach-imx/lpddr2_freq_imx6.S
+--- linux-4.1.10.orig/arch/arm/mach-imx/lpddr2_freq_imx6.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.10/arch/arm/mach-imx/lpddr2_freq_imx6.S 2015-10-10 16:41:28.701314199 +0200
@@ -0,0 +1,484 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13229,9 +13030,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/lpddr2_freq_imx6.S xbian-sources-kernel/
+ENTRY(mx6_lpddr2_do_iram)
+ .word mx6_lpddr2_freq_change
+ .size mx6_lpddr2_freq_change, . - mx6_lpddr2_freq_change
-diff -Nur linux-4.1.6/arch/arm/mach-imx/mach-imx6q.c xbian-sources-kernel/arch/arm/mach-imx/mach-imx6q.c
---- linux-4.1.6/a