summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
Diffstat (limited to 'target')
-rw-r--r--target/arm/solidrun-imx6/patches/4.1.13/0001-xbian.patch3245
1 files changed, 1580 insertions, 1665 deletions
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 <dt-bindings/gpio/gpio.h>
@@ -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 = <&reg_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 <dt-bindings/interrupt-controller/arm-gic.h>
@@ -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 <dt-bindings/gpio/gpio.h>
/ {
- 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 = <MX6QDL_PAD_DISP0_DAT8__PWM1_OUT 0x1b0b1>;
};
-@@ -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 = <&reg_3p3v>;
-+ pinctrl-1 = <
-+ &pinctrl_hummingboard_usdhc2_aux
-+ &pinctrl_hummingboard_usdhc2_100mhz
-+ >;
-+ pinctrl-2 = <
-+ &pinctrl_hummingboard_usdhc2_aux
-+ &pinctrl_hummingboard_usdhc2_200mhz
-+ >;
-+
-+ vmmc-supply = <&reg_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 = <&reg_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 = <&reg_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 = <&reg_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");
@