summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-09-09 18:44:49 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-09-09 18:44:49 +0200
commit3b9f9fc8e3468e0930fe1ab952cbae3894c256f0 (patch)
treead2a16638951c59702e3a2278f6da97bc3bfb282 /target
parent3ac37c8cfdbf621f223cbce7115ceb3306ad6f6a (diff)
parent86a2eb56549502f21ff753f6bce0ea32bb7a2cb7 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
-rw-r--r--target/arm/solidrun-imx6/patches/3.14.17/solidrun.patch10927
-rw-r--r--target/config/Config.in.libc.choice5
-rw-r--r--target/config/Config.in.libc.default2
-rw-r--r--target/linux/config/Config.in.kernel26
4 files changed, 7812 insertions, 3148 deletions
diff --git a/target/arm/solidrun-imx6/patches/3.14.17/solidrun.patch b/target/arm/solidrun-imx6/patches/3.14.17/solidrun.patch
index ac5ee0237..509e58943 100644
--- a/target/arm/solidrun-imx6/patches/3.14.17/solidrun.patch
+++ b/target/arm/solidrun-imx6/patches/3.14.17/solidrun.patch
@@ -1,6 +1,6 @@
-diff -Nur linux-3.14.15/arch/arm/boot/dts/clcd-panels.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/clcd-panels.dtsi
---- linux-3.14.15/arch/arm/boot/dts/clcd-panels.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/clcd-panels.dtsi 2014-08-20 19:23:45.534811583 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/clcd-panels.dtsi linux-imx6-3.14/arch/arm/boot/dts/clcd-panels.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/clcd-panels.dtsi 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/clcd-panels.dtsi 2014-09-09 10:13:47.196940658 +0200
@@ -0,0 +1,52 @@
+/*
+ * ARM Ltd. Versatile Express
@@ -54,9 +54,20 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/clcd-panels.dtsi linux-linaro-stable-m
+ };
+ };
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/efm32gg-dk3750.dts linux-linaro-stable-mx6/arch/arm/boot/dts/efm32gg-dk3750.dts
---- linux-3.14.15/arch/arm/boot/dts/efm32gg-dk3750.dts 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/efm32gg-dk3750.dts 2014-08-20 19:31:39.860842101 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/dra7-evm.dts linux-imx6-3.14/arch/arm/boot/dts/dra7-evm.dts
+--- linux-3.14.17/arch/arm/boot/dts/dra7-evm.dts 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/dra7-evm.dts 2014-09-09 10:13:47.196940658 +0200
+@@ -182,7 +182,6 @@
+ regulator-name = "ldo3";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+- regulator-always-on;
+ regulator-boot-on;
+ };
+
+diff -Nur linux-3.14.17/arch/arm/boot/dts/efm32gg-dk3750.dts linux-imx6-3.14/arch/arm/boot/dts/efm32gg-dk3750.dts
+--- linux-3.14.17/arch/arm/boot/dts/efm32gg-dk3750.dts 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/efm32gg-dk3750.dts 2014-09-09 10:13:47.208940757 +0200
@@ -26,7 +26,7 @@
};
@@ -66,9 +77,21 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/efm32gg-dk3750.dts linux-linaro-stable
status = "ok";
temp@48 {
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx23.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx23.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx23.dtsi 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx23.dtsi 2014-08-20 19:31:39.884842204 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/hi3620.dtsi linux-imx6-3.14/arch/arm/boot/dts/hi3620.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/hi3620.dtsi 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/hi3620.dtsi 2014-09-09 10:13:47.216940821 +0200
+@@ -73,7 +73,7 @@
+
+ L2: l2-cache {
+ compatible = "arm,pl310-cache";
+- reg = <0x100000 0x100000>;
++ reg = <0xfc10000 0x100000>;
+ interrupts = <0 15 4>;
+ cache-unified;
+ cache-level = <2>;
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx23.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx23.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx23.dtsi 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx23.dtsi 2014-09-09 10:13:47.216940821 +0200
@@ -363,7 +363,8 @@
compatible = "fsl,imx23-lcdif";
reg = <0x80030000 2000>;
@@ -79,9 +102,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx23.dtsi linux-linaro-stable-mx6/arc
status = "disabled";
};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx25.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx25.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx25.dtsi 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx25.dtsi 2014-08-20 19:31:39.888842222 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx25.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx25.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx25.dtsi 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx25.dtsi 2014-09-09 10:13:47.220940854 +0200
@@ -13,6 +13,7 @@
/ {
@@ -98,9 +121,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx25.dtsi linux-linaro-stable-mx6/arc
clock-frequency = <24000000>;
};
};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx25-karo-tx25.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx25-karo-tx25.dts
---- linux-3.14.15/arch/arm/boot/dts/imx25-karo-tx25.dts 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx25-karo-tx25.dts 2014-08-20 19:31:39.884842204 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx25-karo-tx25.dts linux-imx6-3.14/arch/arm/boot/dts/imx25-karo-tx25.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx25-karo-tx25.dts 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx25-karo-tx25.dts 2014-09-09 10:13:47.220940854 +0200
@@ -16,6 +16,10 @@
model = "Ka-Ro TX25";
compatible = "karo,imx25-tx25", "fsl,imx25";
@@ -112,9 +135,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx25-karo-tx25.dts linux-linaro-stabl
memory {
reg = <0x80000000 0x02000000 0x90000000 0x02000000>;
};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx27-apf27.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx27-apf27.dts
---- linux-3.14.15/arch/arm/boot/dts/imx27-apf27.dts 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx27-apf27.dts 2014-08-20 19:31:39.888842222 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx27-apf27.dts linux-imx6-3.14/arch/arm/boot/dts/imx27-apf27.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx27-apf27.dts 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx27-apf27.dts 2014-09-09 10:13:47.220940854 +0200
@@ -29,6 +29,7 @@
osc26m {
@@ -123,9 +146,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx27-apf27.dts linux-linaro-stable-mx
clock-frequency = <0>;
};
};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx27.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx27.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx27.dtsi 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx27.dtsi 2014-08-20 19:31:39.892842237 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx27.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx27.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx27.dtsi 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx27.dtsi 2014-09-09 10:13:47.220940854 +0200
@@ -13,6 +13,7 @@
/ {
@@ -142,9 +165,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx27.dtsi linux-linaro-stable-mx6/arc
clock-frequency = <26000000>;
};
};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts
---- linux-3.14.15/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts 2014-08-20 19:31:39.888842222 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts linux-imx6-3.14/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts 2014-09-09 10:13:47.220940854 +0200
@@ -15,6 +15,10 @@
model = "Phytec pca100 rapid development kit";
compatible = "phytec,imx27-pca100-rdk", "phytec,imx27-pca100", "fsl,imx27";
@@ -156,9 +179,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts linux-l
display: display {
model = "Primeview-PD050VL1";
native-mode = <&timing0>;
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx28.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx28.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx28.dtsi 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx28.dtsi 2014-08-20 19:31:39.892842237 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx28.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx28.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx28.dtsi 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx28.dtsi 2014-09-09 10:13:47.224940887 +0200
@@ -840,7 +840,8 @@
compatible = "fsl,imx28-lcdif";
reg = <0x80030000 0x2000>;
@@ -169,9 +192,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx28.dtsi linux-linaro-stable-mx6/arc
dmas = <&dma_apbh 13>;
dma-names = "rx";
status = "disabled";
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx51-babbage.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx51-babbage.dts
---- linux-3.14.15/arch/arm/boot/dts/imx51-babbage.dts 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx51-babbage.dts 2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx51-babbage.dts linux-imx6-3.14/arch/arm/boot/dts/imx51-babbage.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx51-babbage.dts 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx51-babbage.dts 2014-09-09 10:13:47.224940887 +0200
@@ -17,6 +17,10 @@
model = "Freescale i.MX51 Babbage Board";
compatible = "fsl,imx51-babbage", "fsl,imx51";
@@ -183,9 +206,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx51-babbage.dts linux-linaro-stable-
memory {
reg = <0x90000000 0x20000000>;
};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx51.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx51.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx51.dtsi 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx51.dtsi 2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx51.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx51.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx51.dtsi 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx51.dtsi 2014-09-09 10:13:47.224940887 +0200
@@ -15,6 +15,7 @@
/ {
@@ -220,9 +243,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx51.dtsi linux-linaro-stable-mx6/arc
clock-frequency = <24000000>;
};
};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx53.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx53.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx53.dtsi 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx53.dtsi 2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx53.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx53.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx53.dtsi 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx53.dtsi 2014-09-09 10:13:47.224940887 +0200
@@ -15,6 +15,7 @@
/ {
@@ -257,9 +280,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx53.dtsi linux-linaro-stable-mx6/arc
clock-frequency = <24000000>;
};
};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx53-mba53.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-mba53.dts
---- linux-3.14.15/arch/arm/boot/dts/imx53-mba53.dts 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx53-mba53.dts 2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx53-mba53.dts linux-imx6-3.14/arch/arm/boot/dts/imx53-mba53.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx53-mba53.dts 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx53-mba53.dts 2014-09-09 10:13:47.224940887 +0200
@@ -25,6 +25,10 @@
enable-active-low;
};
@@ -271,9 +294,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx53-mba53.dts linux-linaro-stable-mx
backlight {
compatible = "pwm-backlight";
pwms = <&pwm2 0 50000>;
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts 2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts 2014-09-09 10:13:47.224940887 +0200
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013 Sascha Hauer <s.hauer@pengutronix.de>
@@ -298,9 +321,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts linux-linaro-
+ model = "DFI FS700-M60-6DL i.MX6dl Q7 Board";
+ compatible = "dfi,fs700-m60-6dl", "dfi,fs700e-m60", "fsl,imx6dl";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6dl.dtsi 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl.dtsi 2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6dl.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl.dtsi 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl.dtsi 2014-09-09 10:13:47.228940921 +0200
@@ -8,6 +8,7 @@
*
*/
@@ -466,9 +489,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl.dtsi linux-linaro-stable-mx6/ar
status = "disabled";
};
};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-gw51xx.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-gw51xx.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6dl-gw51xx.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-gw51xx.dts 2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-gw51xx.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw51xx.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl-gw51xx.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw51xx.dts 2014-09-09 10:13:47.224940887 +0200
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -489,9 +512,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-gw51xx.dts linux-linaro-stable-
+ model = "Gateworks Ventana i.MX6 DualLite GW51XX";
+ compatible = "gw,imx6dl-gw51xx", "gw,ventana", "fsl,imx6dl";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-gw52xx.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-gw52xx.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6dl-gw52xx.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-gw52xx.dts 2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-gw52xx.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw52xx.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl-gw52xx.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw52xx.dts 2014-09-09 10:13:47.224940887 +0200
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -512,9 +535,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-gw52xx.dts linux-linaro-stable-
+ model = "Gateworks Ventana i.MX6 DualLite GW52XX";
+ compatible = "gw,imx6dl-gw52xx", "gw,ventana", "fsl,imx6dl";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-gw53xx.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-gw53xx.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6dl-gw53xx.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-gw53xx.dts 2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-gw53xx.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw53xx.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl-gw53xx.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw53xx.dts 2014-09-09 10:13:47.224940887 +0200
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -535,9 +558,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-gw53xx.dts linux-linaro-stable-
+ model = "Gateworks Ventana i.MX6 DualLite GW53XX";
+ compatible = "gw,imx6dl-gw53xx", "gw,ventana", "fsl,imx6dl";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-gw54xx.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-gw54xx.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6dl-gw54xx.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-gw54xx.dts 2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-gw54xx.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw54xx.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl-gw54xx.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw54xx.dts 2014-09-09 10:13:47.224940887 +0200
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -558,9 +581,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-gw54xx.dts linux-linaro-stable-
+ model = "Gateworks Ventana i.MX6 DualLite GW54XX";
+ compatible = "gw,imx6dl-gw54xx", "gw,ventana", "fsl,imx6dl";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-hummingboard.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-hummingboard.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6dl-hummingboard.dts 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-hummingboard.dts 2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-hummingboard.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-hummingboard.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl-hummingboard.dts 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-hummingboard.dts 2014-09-09 10:13:47.224940887 +0200
@@ -1,163 +1,13 @@
/*
- * Copyright (C) 2013,2014 Russell King
@@ -730,9 +753,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-hummingboard.dts linux-linaro-s
+ model = "SolidRun HummingBoard Solo/DualLite";
+ compatible = "solidrun,hummingboard/dl", "fsl,imx6dl";
};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-nitrogen6x.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-nitrogen6x.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6dl-nitrogen6x.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-nitrogen6x.dts 2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-nitrogen6x.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-nitrogen6x.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl-nitrogen6x.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-nitrogen6x.dts 2014-09-09 10:13:47.224940887 +0200
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2013 Boundary Devices, Inc.
@@ -755,9 +778,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-nitrogen6x.dts linux-linaro-sta
+ model = "Freescale i.MX6 DualLite Nitrogen6x Board";
+ compatible = "fsl,imx6dl-nitrogen6x", "fsl,imx6dl";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts 2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts 2014-09-09 10:13:47.224940887 +0200
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2013 Christian Hemp, Phytec Messtechnik GmbH
@@ -778,9 +801,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts linux-linaro-
+ model = "Phytec phyFLEX-i.MX6 DualLite/Solo Carrier-Board";
+ compatible = "phytec,imx6dl-pbab01", "phytec,imx6dl-pfla02", "fsl,imx6dl";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi 2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi 2014-09-09 10:13:47.224940887 +0200
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2013 Christian Hemp, Phytec Messtechnik GmbH
@@ -804,9 +827,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi linux-linaro
+ reg = <0x10000000 0x20000000>;
+ };
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-pinfunc.h linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-pinfunc.h
---- linux-3.14.15/arch/arm/boot/dts/imx6dl-pinfunc.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-pinfunc.h 2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-pinfunc.h linux-imx6-3.14/arch/arm/boot/dts/imx6dl-pinfunc.h
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl-pinfunc.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-pinfunc.h 2014-09-09 10:13:47.224940887 +0200
@@ -755,6 +755,7 @@
#define MX6QDL_PAD_GPIO_5__I2C3_SCL 0x230 0x600 0x878 0x6 0x2
#define MX6QDL_PAD_GPIO_5__ARM_EVENTI 0x230 0x600 0x000 0x7 0x0
@@ -823,9 +846,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-pinfunc.h linux-linaro-stable-m
#define MX6QDL_PAD_SD1_CLK__GPT_CLKIN 0x2dc 0x6c4 0x000 0x3 0x0
#define MX6QDL_PAD_SD1_CLK__GPIO1_IO20 0x2dc 0x6c4 0x000 0x5 0x0
#define MX6QDL_PAD_SD1_CMD__SD1_CMD 0x2e0 0x6c8 0x000 0x0 0x0
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-sabreauto.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabreauto.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6dl-sabreauto.dts 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabreauto.dts 2014-08-20 19:23:45.542811617 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-sabreauto.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-sabreauto.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl-sabreauto.dts 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-sabreauto.dts 2014-09-09 10:13:47.224940887 +0200
@@ -15,3 +15,16 @@
model = "Freescale i.MX6 DualLite/Solo SABRE Automotive Board";
compatible = "fsl,imx6dl-sabreauto", "fsl,imx6dl";
@@ -843,9 +866,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-sabreauto.dts linux-linaro-stab
+&mxcfb2 {
+ status = "okay";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-sabrelite.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabrelite.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6dl-sabrelite.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabrelite.dts 2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-sabrelite.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-sabrelite.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl-sabrelite.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-sabrelite.dts 2014-09-09 10:13:47.224940887 +0200
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2011 Freescale Semiconductor, Inc.
@@ -867,9 +890,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-sabrelite.dts linux-linaro-stab
+ model = "Freescale i.MX6 DualLite SABRE Lite Board";
+ compatible = "fsl,imx6dl-sabrelite", "fsl,imx6dl";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-sabresd.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabresd.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6dl-sabresd.dts 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabresd.dts 2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-sabresd.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-sabresd.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl-sabresd.dts 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-sabresd.dts 2014-09-09 10:13:47.224940887 +0200
@@ -15,3 +15,20 @@
model = "Freescale i.MX6 DualLite SABRE Smart Device Board";
compatible = "fsl,imx6dl-sabresd", "fsl,imx6dl";
@@ -891,9 +914,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-sabresd.dts linux-linaro-stable
+&mxcfb2 {
+ status = "okay";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts 2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts 2014-09-09 10:13:47.224940887 +0200
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -914,9 +937,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts linux-linaro-s
+&i2c2 {
+ status = "disable";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-arm2.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-arm2.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-arm2.dts 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-arm2.dts 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-arm2.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-arm2.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-arm2.dts 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-arm2.dts 2014-09-09 10:13:47.228940921 +0200
@@ -23,14 +23,27 @@
regulators {
@@ -1127,9 +1150,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-arm2.dts linux-linaro-stable-mx6
+ pinctrl-0 = <&pinctrl_uart4>;
status = "okay";
};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-arm2-hsic.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-arm2-hsic.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-arm2-hsic.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-arm2-hsic.dts 2014-08-20 19:31:39.896842254 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-arm2-hsic.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-arm2-hsic.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-arm2-hsic.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-arm2-hsic.dts 2014-09-09 10:13:47.228940921 +0200
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2013 Freescale Semiconductor, Inc.
@@ -1163,9 +1186,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-arm2-hsic.dts linux-linaro-stabl
+ osc-clkgate-delay = <0x3>;
+ status = "okay";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-cm-fx6.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-cm-fx6.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-cm-fx6.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-cm-fx6.dts 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-cm-fx6.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-cm-fx6.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-cm-fx6.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-cm-fx6.dts 2014-09-09 10:13:47.228940921 +0200
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2013 CompuLab Ltd.
@@ -1274,9 +1297,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-cm-fx6.dts linux-linaro-stable-m
+ pinctrl-0 = <&pinctrl_uart4>;
+ status = "okay";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-cubox-i.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-cubox-i.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-cubox-i.dts 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-cubox-i.dts 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-cubox-i.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-cubox-i.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-cubox-i.dts 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-cubox-i.dts 2014-09-09 10:13:47.228940921 +0200
@@ -13,4 +13,8 @@
&sata {
@@ -1286,9 +1309,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-cubox-i.dts linux-linaro-stable-
+ fsl,transmit-atten-16ths = <9>;
+ fsl,no-spread-spectrum;
};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts 2014-09-09 10:13:47.228940921 +0200
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013 Sascha Hauer <s.hauer@pengutronix.de>
@@ -1313,13 +1336,17 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts linux-linaro-s
+ model = "DFI FS700-M60-6QD i.MX6qd Q7 Board";
+ compatible = "dfi,fs700-m60-6qd", "dfi,fs700e-m60", "fsl,imx6q";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2014-08-20 19:31:39.900842271 +0200
-@@ -5,6 +5,10 @@
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2014-09-09 10:13:47.228940921 +0200
+@@ -5,11 +5,33 @@
#include "imx6qdl-microsom-ar8035.dtsi"
/ {
++ chosen {
++ bootargs = "quiet console=ttymxc0,115200 root=/dev/mmcblk0p2 rw";
++ };
++
+ aliases {
+ mxcfb0 = &mxcfb1;
+ };
@@ -1327,10 +1354,11 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-linaro-stab
ir_recv: ir-receiver {
compatible = "gpio-ir-receiver";
gpios = <&gpio3 9 1>;
-@@ -12,6 +16,19 @@
+ pinctrl-names = "default";
pinctrl-0 = <&pinctrl_cubox_i_ir>;
- };
-
++ linux,rc-map-name = "rc-rc6-mce";
++ };
++
+ pwmleds {
+ compatible = "pwm-leds";
+ pinctrl-names = "default";
@@ -1342,12 +1370,10 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-linaro-stab
+ max-brightness = <248>;
+ pwms = <&pwm1 0 50000>;
+ };
-+ };
-+
- regulators {
- compatible = "simple-bus";
+ };
-@@ -49,10 +66,62 @@
+ regulators {
+@@ -49,10 +71,62 @@
sound-spdif {
compatible = "fsl,imx-audio-spdif";
model = "imx-spdif";
@@ -1411,7 +1437,7 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-linaro-stab
};
&i2c3 {
-@@ -69,6 +138,19 @@
+@@ -69,6 +143,19 @@
&iomuxc {
cubox_i {
@@ -1431,7 +1457,7 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-linaro-stab
pinctrl_cubox_i_i2c3: cubox-i-i2c3 {
fsl,pins = <
MX6QDL_PAD_EIM_D17__I2C3_SCL 0x4001b8b1
-@@ -82,16 +164,35 @@
+@@ -82,16 +169,35 @@
>;
};
@@ -1469,7 +1495,7 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-linaro-stab
};
pinctrl_cubox_i_usdhc2_aux: cubox-i-usdhc2-aux {
-@@ -111,29 +212,76 @@
+@@ -111,29 +217,76 @@
MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x13059
>;
};
@@ -1547,9 +1573,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-linaro-stab
+ fsl,cpu_pdnscr_iso2sw = <0x1>;
+ fsl,cpu_pdnscr_iso = <0x1>;
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi 2014-09-09 10:13:47.228940921 +0200
@@ -0,0 +1,199 @@
+/ {
+ regulators {
@@ -1750,9 +1776,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi linux-linar
+ non-removable;
+ status = "okay";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl.dtsi 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl.dtsi 2014-08-20 19:31:39.904842290 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl.dtsi 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl.dtsi 2014-09-09 10:13:47.228940921 +0200
@@ -10,10 +10,16 @@
* http://www.gnu.org/copyleft/gpl.html
*/
@@ -1869,16 +1895,16 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl.dtsi linux-linaro-stable-mx6/a
- interrupts = <0 123 0x04>;
- clocks = <&clks 189>, <&clks 187>, <&clks 206>, <&clks 144>;
- clock-names = "pcie_ref_125m", "sata_ref_100m", "lvds_gate", "pcie_axi";
-+ interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
-+ interrupt-names = "msi";
++ interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>;
++ interrupt-names = "pme";
+ #interrupt-cells = <1>;
+ interrupt-map-mask = <0 0 0 0x7>;
+ interrupt-map = <0 0 0 1 &intc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
+ <0 0 0 2 &intc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
+ <0 0 0 3 &intc GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
+ <0 0 0 4 &intc GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
-+ clocks = <&clks 144>, <&clks 206>, <&clks 189>, <&clks 221>;
-+ clock-names = "pcie", "pcie_bus", "pcie_phy", "lvds_gate";
++ clocks = <&clks 144>, <&clks 221>, <&clks 189>, <&clks 187>;
++ clock-names = "pcie_axi", "lvds_gate", "pcie_ref_125m", "sata_ref_100m";
status = "disabled";
};
@@ -3444,9 +3470,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl.dtsi linux-linaro-stable-mx6/a
};
};
};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi 2014-09-09 10:13:47.228940921 +0200
@@ -0,0 +1,374 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -3822,9 +3848,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi linux-linaro-stabl
+&usbh1 {
+ status = "okay";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi 2014-09-09 10:13:47.228940921 +0200
@@ -0,0 +1,527 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -4353,9 +4379,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi linux-linaro-stabl
+ vmmc-supply = <&reg_3p3v>;
+ status = "okay";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi 2014-09-09 10:13:47.228940921 +0200
@@ -0,0 +1,572 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -4929,9 +4955,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi linux-linaro-stabl
+ vmmc-supply = <&reg_3p3v>;
+ status = "okay";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi 2014-09-09 10:13:47.228940921 +0200
@@ -0,0 +1,599 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -5532,10 +5558,10 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi linux-linaro-stabl
+ vmmc-supply = <&reg_3p3v>;
+ status = "okay";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi 2014-08-20 19:31:39.900842271 +0200
-@@ -0,0 +1,315 @@
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi 2014-09-09 10:13:47.228940921 +0200
+@@ -0,0 +1,339 @@
+/*
+ * Copyright (C) 2013,2014 Russell King
+ */
@@ -5543,15 +5569,20 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi linux-linaro
+#include "imx6qdl-microsom-ar8035.dtsi"
+
+/ {
++ chosen {
++ bootargs = "quiet console=ttymxc0,115200 root=/dev/mmcblk0p2 rw";
++ };
++
+ aliases {
+ mxcfb0 = &mxcfb1;
+ };
+
+ ir_recv: ir-receiver {
+ compatible = "gpio-ir-receiver";
-+ gpios = <&gpio1 2 1>;
++ gpios = <&gpio3 5 1>;
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hummingboard_gpio1_2>;
++ pinctrl-0 = <&pinctrl_hummingboard_gpio3_5>;
++ linux,rc-map-name = "rc-rc6-mce";
+ };
+
+ regulators {
@@ -5671,6 +5702,7 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi linux-linaro
+};
+
+&i2c1 {
++ clock-frequency = <100000>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_hummingboard_i2c1>;
+ status = "okay";
@@ -5704,29 +5736,32 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi linux-linaro
+ * numbering as following -
+ * GPIO number | GPIO (bank,num) | PIN number
+ * ------------+-----------------+------------
-+ * gpio1 | (1,1) | IO7
-+ * gpio73 | (3,9) | IO11
-+ * gpio72 | (3,8) | IO12
-+ * gpio71 | (3,7) | IO13
-+ * gpio70 | (3,6) | IO15
-+ * gpio194 | (7,2) | IO16
-+ * gpio195 | (7,3) | IO18
-+ * gpio67 | (3,3) | IO22
++ * gpio1 | (1,1) | IO7
++ * gpio73 | (3,9) | IO11
++ * gpio72 | (3,8) | IO12
++ * gpio71 | (3,7) | IO13
++ * gpio70 | (3,6) | IO15
++ * gpio194 | (7,2) | IO16
++ * gpio195 | (7,3) | IO18
++ * gpio67 | (3,3) | IO22
++ *
++ * Notice the gpioX and GPIO (Y,Z) mapping forumla :
++ * X = (Y-1) * 32 + Z
+ */
-+ MX6QDL_PAD_GPIO_1__GPIO1_IO01 0x8001b0b1
-+ MX6QDL_PAD_EIM_DA9__GPIO3_IO09 0x8001b0b1
-+ MX6QDL_PAD_EIM_DA8__GPIO3_IO08 0x8001b0b1
-+ MX6QDL_PAD_EIM_DA7__GPIO3_IO07 0x8001b0b1
-+ MX6QDL_PAD_EIM_DA6__GPIO3_IO06 0x8001b0b1
-+ MX6QDL_PAD_SD3_CMD__GPIO7_IO02 0x8001b0b1
-+ MX6QDL_PAD_SD3_CLK__GPIO7_IO03 0x8001b0b1
-+ MX6QDL_PAD_EIM_DA3__GPIO3_IO03 0x8001b0b1
++ MX6QDL_PAD_GPIO_1__GPIO1_IO01 0x400130b1
++ MX6QDL_PAD_EIM_DA9__GPIO3_IO09 0x400130b1
++ MX6QDL_PAD_EIM_DA8__GPIO3_IO08 0x400130b1
++ MX6QDL_PAD_EIM_DA7__GPIO3_IO07 0x400130b1
++ MX6QDL_PAD_EIM_DA6__GPIO3_IO06 0x400130b1
++ MX6QDL_PAD_SD3_CMD__GPIO7_IO02 0x400130b1
++ MX6QDL_PAD_SD3_CLK__GPIO7_IO03 0x400130b1
++ MX6QDL_PAD_EIM_DA3__GPIO3_IO03 0x400130b1
+ >;
+ };
+
-+ pinctrl_hummingboard_gpio1_2: hummingboard-gpio1_2 {
++ pinctrl_hummingboard_gpio3_5: hummingboard-gpio3_5 {
+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000
++ MX6QDL_PAD_EIM_DA5__GPIO3_IO05 0x80000000
+ >;
+ };
+
@@ -5796,6 +5831,12 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi linux-linaro
+ MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x13059
+ >;
+ };
++
++ pinctrl_hummingboard_pcie_reset: hummingboard-pcie-reset {
++ fsl,pins = <
++ MX6QDL_PAD_EIM_DA4__GPIO3_IO04 0x80000000
++ >;
++ };
+ };
+};
+
@@ -5851,9 +5892,18 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi linux-linaro
+ fsl,cpu_pdnscr_iso2sw = <0x1>;
+ fsl,cpu_pdnscr_iso = <0x1>;
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi 2014-08-20 19:31:39.900842271 +0200
++
++&pcie {
++ pinctrl-names = "default";
++ pinctrl-0 = <
++ &pinctrl_hummingboard_pcie_reset
++ >;
++ reset-gpio = <&gpio3 4 0>;
++ status = "okay";
++};
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi 2014-09-09 10:13:47.228940921 +0200
@@ -17,7 +17,7 @@
enet {
pinctrl_microsom_enet_ar8035: microsom-enet-ar8035 {
@@ -5900,9 +5950,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi linux-lin
/*
* As the RMII pins are also connected to RGMII
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-microsom.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-microsom.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-microsom.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-microsom.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2014-09-09 10:13:47.228940921 +0200
@@ -1,9 +1,69 @@
/*
* Copyright (C) 2013,2014 Russell King
@@ -6030,9 +6080,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-microsom.dtsi linux-linaro-sta
+ status = "okay";
};
+
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi 2014-09-09 10:13:47.228940921 +0200
@@ -0,0 +1,426 @@
+/*
+ * Copyright 2013 Boundary Devices, Inc.
@@ -6460,9 +6510,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi linux-linaro-s
+ vmmc-supply = <&reg_3p3v>;
+ status = "okay";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi 2014-09-09 10:13:47.228940921 +0200
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2013 Christian Hemp, Phytec Messtechnik GmbH
@@ -6562,9 +6612,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi linux-linar
+ >;
+ };
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi 2014-09-09 10:13:47.228940921 +0200
@@ -0,0 +1,356 @@
+/*
+ * Copyright 2013 Christian Hemp, Phytec Messtechnik GmbH
@@ -6922,9 +6972,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi linux-linar
+ wp-gpios = <&gpio1 29 0>;
+ status = "disabled";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi 2014-08-20 19:31:39.904842290 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi 2014-09-09 10:13:47.228940921 +0200
@@ -10,17 +10,146 @@
* http://www.gnu.org/copyleft/gpl.html
*/
@@ -7623,9 +7673,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi linux-linaro-st
+ fsl,cpu_pdnscr_iso2sw = <0x1>;
+ fsl,cpu_pdnscr_iso = <0x1>;
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi 2014-08-20 19:31:39.904842290 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi 2014-09-09 10:13:47.228940921 +0200
@@ -0,0 +1,427 @@
+/*
+ * Copyright 2011 Freescale Semiconductor, Inc.
@@ -8054,9 +8104,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi linux-linaro-st
+ vmmc-supply = <&reg_3p3v>;
+ status = "okay";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2014-08-20 19:31:39.904842290 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2014-09-09 10:13:47.228940921 +0200
@@ -10,16 +10,33 @@
* http://www.gnu.org/copyleft/gpl.html
*/
@@ -8749,9 +8799,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-linaro-stab
+ fsl,cpu_pdnscr_iso2sw = <0x1>;
+ fsl,cpu_pdnscr_iso = <0x1>;
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-wandboard.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6qdl-wandboard.dtsi 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-wandboard.dtsi 2014-08-20 19:31:39.904842290 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-wandboard.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6qdl-wandboard.dtsi 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-wandboard.dtsi 2014-09-09 10:13:47.228940921 +0200
@@ -12,17 +12,21 @@
/ {
regulators {
@@ -8976,9 +9026,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6qdl-wandboard.dtsi linux-linaro-st
cd-gpios = <&gpio3 9 0>;
status = "okay";
};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts 2014-09-09 10:13:47.228940921 +0200
@@ -0,0 +1,432 @@
+/*
+ * Copyright 2013 Data Modul AG
@@ -9412,9 +9462,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts linux-linaro-sta
+ bus-width = <8>;
+ status = "okay";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6q.dtsi 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q.dtsi 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6q.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6q.dtsi 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q.dtsi 2014-09-09 10:13:47.228940921 +0200
@@ -8,10 +8,16 @@
*
*/
@@ -9611,9 +9661,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q.dtsi linux-linaro-stable-mx6/arc
- crtcs = <&ipu1 0>, <&ipu1 1>, <&ipu2 0>, <&ipu2 1>;
- };
-};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-gk802.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gk802.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-gk802.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gk802.dts 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-gk802.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-gk802.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-gk802.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-gk802.dts 2014-09-09 10:13:47.228940921 +0200
@@ -0,0 +1,229 @@
+/*
+ * Copyright (C) 2013 Philipp Zabel
@@ -9844,9 +9894,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-gk802.dts linux-linaro-stable-mx
+ vmmc-supply = <&reg_3p3v>;
+ status = "okay";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-gw51xx.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw51xx.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-gw51xx.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw51xx.dts 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-gw51xx.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw51xx.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-gw51xx.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw51xx.dts 2014-09-09 10:13:47.228940921 +0200
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -9867,9 +9917,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-gw51xx.dts linux-linaro-stable-m
+ model = "Gateworks Ventana i.MX6 Quad GW51XX";
+ compatible = "gw,imx6q-gw51xx", "gw,ventana", "fsl,imx6q";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-gw52xx.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw52xx.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-gw52xx.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw52xx.dts 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-gw52xx.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw52xx.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-gw52xx.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw52xx.dts 2014-09-09 10:13:47.228940921 +0200
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -9894,9 +9944,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-gw52xx.dts linux-linaro-stable-m
+&sata {
+ status = "okay";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-gw53xx.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw53xx.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-gw53xx.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw53xx.dts 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-gw53xx.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw53xx.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-gw53xx.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw53xx.dts 2014-09-09 10:13:47.228940921 +0200
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -9921,9 +9971,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-gw53xx.dts linux-linaro-stable-m
+&sata {
+ status = "okay";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-gw5400-a.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw5400-a.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-gw5400-a.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw5400-a.dts 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-gw5400-a.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw5400-a.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-gw5400-a.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw5400-a.dts 2014-09-09 10:13:47.228940921 +0200
@@ -0,0 +1,543 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -10468,9 +10518,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-gw5400-a.dts linux-linaro-stable
+ vmmc-supply = <&reg_3p3v>;
+ status = "okay";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-gw54xx.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw54xx.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-gw54xx.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-gw54xx.dts 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-gw54xx.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw54xx.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-gw54xx.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw54xx.dts 2014-09-09 10:13:47.228940921 +0200
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -10495,9 +10545,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-gw54xx.dts linux-linaro-stable-m
+&sata {
+ status = "okay";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-hummingboard.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-hummingboard.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-hummingboard.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-hummingboard.dts 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-hummingboard.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-hummingboard.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-hummingboard.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-hummingboard.dts 2014-09-09 10:13:47.228940921 +0200
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2014 Rabeeh Khoury (rabeeh@solid-run.com)
@@ -10520,9 +10570,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-hummingboard.dts linux-linaro-st
+ fsl,transmit-atten-16ths = <9>;
+ fsl,no-spread-spectrum;
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-nitrogen6x.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-nitrogen6x.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-nitrogen6x.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-nitrogen6x.dts 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-nitrogen6x.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-nitrogen6x.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-nitrogen6x.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-nitrogen6x.dts 2014-09-09 10:13:47.228940921 +0200
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2013 Boundary Devices, Inc.
@@ -10549,9 +10599,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-nitrogen6x.dts linux-linaro-stab
+&sata {
+ status = "okay";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-phytec-pbab01.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-phytec-pbab01.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-phytec-pbab01.dts 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-phytec-pbab01.dts 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-phytec-pbab01.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-phytec-pbab01.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-phytec-pbab01.dts 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-phytec-pbab01.dts 2014-09-09 10:13:47.228940921 +0200
@@ -11,24 +11,17 @@
/dts-v1/;
@@ -10583,9 +10633,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-phytec-pbab01.dts linux-linaro-s
+&sata {
+ status = "okay";
};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi 2014-09-09 10:13:47.228940921 +0200
@@ -10,171 +10,13 @@
*/
@@ -10760,9 +10810,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi linux-linaro-
- wp-gpios = <&gpio1 29 0>;
- status = "disabled";
-};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-pinfunc.h linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-pinfunc.h
---- linux-3.14.15/arch/arm/boot/dts/imx6q-pinfunc.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-pinfunc.h 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-pinfunc.h linux-imx6-3.14/arch/arm/boot/dts/imx6q-pinfunc.h
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-pinfunc.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-pinfunc.h 2014-09-09 10:13:47.228940921 +0200
@@ -673,6 +673,7 @@
#define MX6QDL_PAD_GPIO_3__USB_H1_OC 0x22c 0x5fc 0x948 0x6 0x1
#define MX6QDL_PAD_GPIO_3__MLB_CLK 0x22c 0x5fc 0x900 0x7 0x1
@@ -10779,9 +10829,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-pinfunc.h linux-linaro-stable-mx
#define MX6QDL_PAD_SD1_CLK__GPT_CLKIN 0x350 0x738 0x000 0x3 0x0
#define MX6QDL_PAD_SD1_CLK__GPIO1_IO20 0x350 0x738 0x000 0x5 0x0
#define MX6QDL_PAD_SD2_CLK__SD2_CLK 0x354 0x73c 0x000 0x0 0x0
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-sabreauto.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabreauto.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-sabreauto.dts 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabreauto.dts 2014-08-20 19:23:45.542811617 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-sabreauto.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-sabreauto.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-sabreauto.dts 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-sabreauto.dts 2014-09-09 10:13:47.228940921 +0200
@@ -20,6 +20,22 @@
compatible = "fsl,imx6q-sabreauto", "fsl,imx6q";
};
@@ -10805,9 +10855,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-sabreauto.dts linux-linaro-stabl
&sata {
status = "okay";
};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-sabrelite.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabrelite.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-sabrelite.dts 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabrelite.dts 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-sabrelite.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-sabrelite.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-sabrelite.dts 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-sabrelite.dts 2014-09-09 10:13:47.228940921 +0200
@@ -12,189 +12,13 @@
/dts-v1/;
@@ -10999,9 +11049,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-sabrelite.dts linux-linaro-stabl
- vmmc-supply = <&reg_3p3v>;
- status = "okay";
-};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-sabresd.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabresd.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-sabresd.dts 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabresd.dts 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-sabresd.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-sabresd.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-sabresd.dts 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-sabresd.dts 2014-09-09 10:13:47.228940921 +0200
@@ -23,3 +23,19 @@
&sata {
status = "okay";
@@ -11022,9 +11072,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-sabresd.dts linux-linaro-stable-
+&mxcfb4 {
+ status = "okay";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts 2014-09-09 10:13:47.228940921 +0200
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2012-2013 Freescale Semiconductor, Inc.
@@ -11049,9 +11099,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts linux-linaro-st
+&i2c2 {
+ status = "disable";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-sbc6x.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sbc6x.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-sbc6x.dts 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sbc6x.dts 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-sbc6x.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-sbc6x.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-sbc6x.dts 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-sbc6x.dts 2014-09-09 10:13:47.228940921 +0200
@@ -17,28 +17,78 @@
};
};
@@ -11135,9 +11185,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-sbc6x.dts linux-linaro-stable-mx
+ pinctrl-0 = <&pinctrl_usdhc3>;
status = "okay";
};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-udoo.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-udoo.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6q-udoo.dts 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-udoo.dts 2014-08-20 19:31:39.900842271 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-udoo.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-udoo.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6q-udoo.dts 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-udoo.dts 2014-09-09 10:13:47.228940921 +0200
@@ -16,24 +16,78 @@
model = "Udoo i.MX6 Quad Board";
compatible = "udoo,imx6q-udoo", "fsl,imx6q";
@@ -11219,9 +11269,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6q-udoo.dts linux-linaro-stable-mx6
non-removable;
status = "okay";
};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6sl.dtsi
---- linux-3.14.15/arch/arm/boot/dts/imx6sl.dtsi 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6sl.dtsi 2014-08-20 19:31:39.904842290 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6sl.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6sl.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/imx6sl.dtsi 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6sl.dtsi 2014-09-09 10:13:47.232940953 +0200
@@ -7,12 +7,14 @@
*
*/
@@ -12258,9 +12308,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/ar
};
};
};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6sl-evk-csi.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6sl-evk-csi.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6sl-evk-csi.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6sl-evk-csi.dts 2014-08-20 19:23:45.546811635 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6sl-evk-csi.dts linux-imx6-3.14/arch/arm/boot/dts/imx6sl-evk-csi.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6sl-evk-csi.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6sl-evk-csi.dts 2014-09-09 10:13:47.228940921 +0200
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -12289,9 +12339,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6sl-evk-csi.dts linux-linaro-stable
+&epdc {
+ status = "disabled";
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6sl-evk.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6sl-evk.dts
---- linux-3.14.15/arch/arm/boot/dts/imx6sl-evk.dts 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6sl-evk.dts 2014-08-20 19:31:39.904842290 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6sl-evk.dts linux-imx6-3.14/arch/arm/boot/dts/imx6sl-evk.dts
+--- linux-3.14.17/arch/arm/boot/dts/imx6sl-evk.dts 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6sl-evk.dts 2014-09-09 10:13:47.228940921 +0200
@@ -8,6 +8,8 @@
/dts-v1/;
@@ -13053,9 +13103,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/imx6sl-evk.dts linux-linaro-stable-mx6
+&gpu {
+ pu-supply = <&pu_dummy>; /* ldo-bypass:use pu_dummy if VDDSOC share with VDDPU */
+};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/Makefile linux-linaro-stable-mx6/arch/arm/boot/dts/Makefile
---- linux-3.14.15/arch/arm/boot/dts/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/Makefile 2014-08-20 19:31:39.800841842 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/Makefile linux-imx6-3.14/arch/arm/boot/dts/Makefile
+--- linux-3.14.17/arch/arm/boot/dts/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/Makefile 2014-09-09 10:13:47.192940626 +0200
@@ -154,16 +154,37 @@
imx53-qsb.dtb \
imx53-smd.dtb \
@@ -13110,9 +13160,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/Makefile linux-linaro-stable-mx6/arch/
dtb-$(CONFIG_ARCH_VIRT) += xenvm-4.2.dtb
dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \
wm8505-ref.dtb \
-diff -Nur linux-3.14.15/arch/arm/boot/dts/marco.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/marco.dtsi
---- linux-3.14.15/arch/arm/boot/dts/marco.dtsi 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/marco.dtsi 2014-08-20 19:31:39.912842323 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/marco.dtsi linux-imx6-3.14/arch/arm/boot/dts/marco.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/marco.dtsi 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/marco.dtsi 2014-09-09 10:13:47.232940953 +0200
@@ -36,7 +36,7 @@
ranges = <0x40000000 0x40000000 0xa0000000>;
@@ -13122,9 +13172,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/marco.dtsi linux-linaro-stable-mx6/arc
reg = <0xc0030000 0x1000>;
interrupts = <0 59 0>;
arm,tag-latency = <1 1 1>;
-diff -Nur linux-3.14.15/arch/arm/boot/dts/prima2.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/prima2.dtsi
---- linux-3.14.15/arch/arm/boot/dts/prima2.dtsi 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/prima2.dtsi 2014-08-20 19:31:39.936842427 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/prima2.dtsi linux-imx6-3.14/arch/arm/boot/dts/prima2.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/prima2.dtsi 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/prima2.dtsi 2014-09-09 10:13:47.240941017 +0200
@@ -48,7 +48,7 @@
ranges = <0x40000000 0x40000000 0x80000000>;
@@ -13134,9 +13184,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/prima2.dtsi linux-linaro-stable-mx6/ar
reg = <0x80040000 0x1000>;
interrupts = <59>;
arm,tag-latency = <1 1 1>;
-diff -Nur linux-3.14.15/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts
---- linux-3.14.15/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts 2014-08-20 19:23:45.550811652 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts
+--- linux-3.14.17/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts 2014-09-09 10:13:47.244941050 +0200
@@ -0,0 +1,159 @@
+/*
+ * ARM Ltd. Fast Models
@@ -13297,9 +13347,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts linux-linaro-
+};
+
+/include/ "clcd-panels.dtsi"
-diff -Nur linux-3.14.15/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts
---- linux-3.14.15/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts 2014-08-20 19:23:45.550811652 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts
+--- linux-3.14.17/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts 2014-09-09 10:13:47.244941050 +0200
@@ -0,0 +1,165 @@
+/*
+ * ARM Ltd. Fast Models
@@ -13466,9 +13516,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts linux-linaro-
+};
+
+/include/ "clcd-panels.dtsi"
-diff -Nur linux-3.14.15/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts
---- linux-3.14.15/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts 2014-08-20 19:23:45.550811652 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts
+--- linux-3.14.17/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts 2014-09-09 10:13:47.244941050 +0200
@@ -0,0 +1,177 @@
+/*
+ * ARM Ltd. Fast Models
@@ -13647,9 +13697,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts linux-linaro-
+};
+
+/include/ "clcd-panels.dtsi"
-diff -Nur linux-3.14.15/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts
---- linux-3.14.15/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts 2014-08-20 19:23:45.550811652 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts
+--- linux-3.14.17/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts 2014-09-09 10:13:47.244941050 +0200
@@ -0,0 +1,171 @@
+/*
+ * ARM Ltd. Fast Models
@@ -13822,9 +13872,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts linux-linaro-s
+};
+
+/include/ "clcd-panels.dtsi"
-diff -Nur linux-3.14.15/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts
---- linux-3.14.15/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts 2014-08-20 19:23:45.550811652 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts
+--- linux-3.14.17/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts 2014-09-09 10:13:47.244941050 +0200
@@ -0,0 +1,183 @@
+/*
+ * ARM Ltd. Fast Models
@@ -14009,9 +14059,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts linux-linaro-s
+};
+
+/include/ "clcd-panels.dtsi"
-diff -Nur linux-3.14.15/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi
---- linux-3.14.15/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi 2014-08-20 19:23:45.550811652 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi 2014-09-09 10:13:47.244941050 +0200
@@ -0,0 +1,231 @@
+/*
+ * ARM Ltd. Fast Models
@@ -14244,9 +14294,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi linux-linaro-
+ };
+ };
+ };
-diff -Nur linux-3.14.15/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts
---- linux-3.14.15/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts 2014-08-20 19:31:39.940842444 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts
+--- linux-3.14.17/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts 2014-09-09 10:13:47.244941050 +0200
@@ -0,0 +1,233 @@
+/*
+ * ARM Ltd. Fast Models
@@ -14481,9 +14531,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts linux-lin
+};
+
+/include/ "clcd-panels.dtsi"
-diff -Nur linux-3.14.15/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts
---- linux-3.14.15/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts 2014-08-20 19:31:39.940842444 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts
+--- linux-3.14.17/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts 2014-09-09 10:13:47.244941050 +0200
@@ -0,0 +1,317 @@
+/*
+ * ARM Ltd. Fast Models
@@ -14802,9 +14852,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts linux-lin
+};
+
+/include/ "clcd-panels.dtsi"
-diff -Nur linux-3.14.15/arch/arm/boot/dts/vexpress-v2m.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2m.dtsi
---- linux-3.14.15/arch/arm/boot/dts/vexpress-v2m.dtsi 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2m.dtsi 2014-08-20 19:23:45.558811686 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/vexpress-v2m.dtsi linux-imx6-3.14/arch/arm/boot/dts/vexpress-v2m.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/vexpress-v2m.dtsi 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/vexpress-v2m.dtsi 2014-09-09 10:13:47.264941214 +0200
@@ -227,6 +227,7 @@
};
@@ -14813,9 +14863,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/vexpress-v2m.dtsi linux-linaro-stable-
compatible = "arm,pl111", "arm,primecell";
reg = <0x1f000 0x1000>;
interrupts = <14>;
-diff -Nur linux-3.14.15/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
---- linux-3.14.15/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi 2014-08-20 19:23:45.558811686 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi linux-imx6-3.14/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi 2014-09-09 10:13:47.264941214 +0200
@@ -228,6 +228,7 @@
};
@@ -14824,9 +14874,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi linux-linaro-sta
compatible = "arm,pl111", "arm,primecell";
reg = <0x1f0000 0x1000>;
interrupts = <14>;
-diff -Nur linux-3.14.15/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
---- linux-3.14.15/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts 2014-08-20 19:31:39.956842513 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts linux-imx6-3.14/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
+--- linux-3.14.17/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts 2014-09-09 10:13:47.268941247 +0200
@@ -9,6 +9,8 @@
/dts-v1/;
@@ -15022,9 +15072,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts linux-linaro-
dcc {
compatible = "arm,vexpress,config-bus";
arm,vexpress,config-bridge = <&v2m_sysreg>;
-diff -Nur linux-3.14.15/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
---- linux-3.14.15/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts 2014-08-20 19:31:39.956842513 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts linux-imx6-3.14/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
+--- linux-3.14.17/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts 2014-09-09 10:13:47.264941214 +0200
@@ -9,6 +9,8 @@
/dts-v1/;
@@ -15043,9 +15093,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts linux-linaro
};
memory-controller@2b0a0000 {
-diff -Nur linux-3.14.15/arch/arm/boot/dts/vexpress-v2p-ca5s.dts linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
---- linux-3.14.15/arch/arm/boot/dts/vexpress-v2p-ca5s.dts 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2p-ca5s.dts 2014-08-20 19:23:45.558811686 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/vexpress-v2p-ca5s.dts linux-imx6-3.14/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
+--- linux-3.14.17/arch/arm/boot/dts/vexpress-v2p-ca5s.dts 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/vexpress-v2p-ca5s.dts 2014-09-09 10:13:47.268941247 +0200
@@ -9,6 +9,8 @@
/dts-v1/;
@@ -15064,9 +15114,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/vexpress-v2p-ca5s.dts linux-linaro-sta
};
memory-controller@2a150000 {
-diff -Nur linux-3.14.15/arch/arm/boot/dts/vexpress-v2p-ca9.dts linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2p-ca9.dts
---- linux-3.14.15/arch/arm/boot/dts/vexpress-v2p-ca9.dts 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2p-ca9.dts 2014-08-20 19:23:45.558811686 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/vexpress-v2p-ca9.dts linux-imx6-3.14/arch/arm/boot/dts/vexpress-v2p-ca9.dts
+--- linux-3.14.17/arch/arm/boot/dts/vexpress-v2p-ca9.dts 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/vexpress-v2p-ca9.dts 2014-09-09 10:13:47.268941247 +0200
@@ -9,6 +9,8 @@
/dts-v1/;
@@ -15085,9 +15135,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/vexpress-v2p-ca9.dts linux-linaro-stab
};
memory-controller@100e0000 {
-diff -Nur linux-3.14.15/arch/arm/boot/dts/vf610.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/vf610.dtsi
---- linux-3.14.15/arch/arm/boot/dts/vf610.dtsi 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/vf610.dtsi 2014-08-20 19:31:39.956842513 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/vf610.dtsi linux-imx6-3.14/arch/arm/boot/dts/vf610.dtsi
+--- linux-3.14.17/arch/arm/boot/dts/vf610.dtsi 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/vf610.dtsi 2014-09-09 10:13:47.268941247 +0200
@@ -44,11 +44,13 @@
sxosc {
@@ -15102,9 +15152,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/vf610.dtsi linux-linaro-stable-mx6/arc
clock-frequency = <24000000>;
};
};
-diff -Nur linux-3.14.15/arch/arm/boot/dts/vf610-twr.dts linux-linaro-stable-mx6/arch/arm/boot/dts/vf610-twr.dts
---- linux-3.14.15/arch/arm/boot/dts/vf610-twr.dts 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/vf610-twr.dts 2014-08-20 19:31:39.956842513 +0200
+diff -Nur linux-3.14.17/arch/arm/boot/dts/vf610-twr.dts linux-imx6-3.14/arch/arm/boot/dts/vf610-twr.dts
+--- linux-3.14.17/arch/arm/boot/dts/vf610-twr.dts 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/boot/dts/vf610-twr.dts 2014-09-09 10:13:47.268941247 +0200
@@ -25,11 +25,13 @@
clocks {
audio_ext {
@@ -15119,9 +15169,9 @@ diff -Nur linux-3.14.15/arch/arm/boot/dts/vf610-twr.dts linux-linaro-stable-mx6/
clock-frequency = <50000000>;
};
};
-diff -Nur linux-3.14.15/arch/arm/common/Makefile linux-linaro-stable-mx6/arch/arm/common/Makefile
---- linux-3.14.15/arch/arm/common/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/common/Makefile 2014-08-20 19:31:39.960842530 +0200
+diff -Nur linux-3.14.17/arch/arm/common/Makefile linux-imx6-3.14/arch/arm/common/Makefile
+--- linux-3.14.17/arch/arm/common/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/common/Makefile 2014-09-09 10:13:47.268941247 +0200
@@ -13,6 +13,7 @@
obj-$(CONFIG_PCI_HOST_ITE8152) += it8152.o
obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp.o
@@ -15130,9 +15180,9 @@ diff -Nur linux-3.14.15/arch/arm/common/Makefile linux-linaro-stable-mx6/arch/ar
AFLAGS_mcpm_head.o := -march=armv7-a
AFLAGS_vlock.o := -march=armv7-a
obj-$(CONFIG_TI_PRIV_EDMA) += edma.o
-diff -Nur linux-3.14.15/arch/arm/configs/imx_v6_v7_defconfig linux-linaro-stable-mx6/arch/arm/configs/imx_v6_v7_defconfig
---- linux-3.14.15/arch/arm/configs/imx_v6_v7_defconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/configs/imx_v6_v7_defconfig 2014-08-20 19:31:39.968842564 +0200
+diff -Nur linux-3.14.17/arch/arm/configs/imx_v6_v7_defconfig linux-imx6-3.14/arch/arm/configs/imx_v6_v7_defconfig
+--- linux-3.14.17/arch/arm/configs/imx_v6_v7_defconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/configs/imx_v6_v7_defconfig 2014-09-09 10:13:47.280941344 +0200
@@ -45,6 +45,9 @@
CONFIG_AEABI=y
CONFIG_HIGHMEM=y
@@ -15247,9 +15297,9 @@ diff -Nur linux-3.14.15/arch/arm/configs/imx_v6_v7_defconfig linux-linaro-stable
CONFIG_COMMON_CLK_DEBUG=y
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_PWM=y
-diff -Nur linux-3.14.15/arch/arm/configs/imx_v7_cbi_hb_base_defconfig linux-linaro-stable-mx6/arch/arm/configs/imx_v7_cbi_hb_base_defconfig
---- linux-3.14.15/arch/arm/configs/imx_v7_cbi_hb_base_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/configs/imx_v7_cbi_hb_base_defconfig 2014-08-20 19:31:39.968842564 +0200
+diff -Nur linux-3.14.17/arch/arm/configs/imx_v7_cbi_hb_base_defconfig linux-imx6-3.14/arch/arm/configs/imx_v7_cbi_hb_base_defconfig
+--- linux-3.14.17/arch/arm/configs/imx_v7_cbi_hb_base_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/configs/imx_v7_cbi_hb_base_defconfig 2014-09-09 10:13:47.280941344 +0200
@@ -0,0 +1,367 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_KERNEL_LZO=y
@@ -15387,7 +15437,7 @@ diff -Nur linux-3.14.15/arch/arm/configs/imx_v7_cbi_hb_base_defconfig linux-lina
+CONFIG_AHCI_IMX=y
+CONFIG_NETDEVICES=y
+CONFIG_INPUT_EVDEV=y
-+CONFIG_INPUT_EVBUG=m
++# CONFIG_INPUT_EVBUG is not set
+CONFIG_KEYBOARD_GPIO=y
+CONFIG_KEYBOARD_IMX=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
@@ -15618,10 +15668,10 @@ diff -Nur linux-3.14.15/arch/arm/configs/imx_v7_cbi_hb_base_defconfig linux-lina
+CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_IR_GPIO_CIR=m
-diff -Nur linux-3.14.15/arch/arm/configs/imx_v7_cbi_hb_defconfig linux-linaro-stable-mx6/arch/arm/configs/imx_v7_cbi_hb_defconfig
---- linux-3.14.15/arch/arm/configs/imx_v7_cbi_hb_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/configs/imx_v7_cbi_hb_defconfig 2014-08-20 19:31:39.968842564 +0200
-@@ -0,0 +1,5139 @@
+diff -Nur linux-3.14.17/arch/arm/configs/imx_v7_cbi_hb_defconfig linux-imx6-3.14/arch/arm/configs/imx_v7_cbi_hb_defconfig
+--- linux-3.14.17/arch/arm/configs/imx_v7_cbi_hb_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/configs/imx_v7_cbi_hb_defconfig 2014-09-09 10:13:47.280941344 +0200
+@@ -0,0 +1,5138 @@
+#
+# Automatically generated make config: don't edit
+#
@@ -15819,7 +15869,7 @@ diff -Nur linux-3.14.15/arch/arm/configs/imx_v7_cbi_hb_defconfig linux-linaro-st
+CONFIG_AHCI_IMX=y
+CONFIG_NETDEVICES=y
+CONFIG_INPUT_EVDEV=y
-+CONFIG_INPUT_EVBUG=m
++# CONFIG_INPUT_EVBUG is not set
+CONFIG_KEYBOARD_GPIO=y
+CONFIG_KEYBOARD_IMX=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
@@ -17553,7 +17603,7 @@ diff -Nur linux-3.14.15/arch/arm/configs/imx_v7_cbi_hb_defconfig linux-linaro-st
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_BRCMSMAC=m
-+CONFIG_BRCMFMAC_SDIO_OOB=y
++# CONFIG_BRCMFMAC_SDIO_OOB is not set
+CONFIG_BRCMFMAC_USB=y
+# CONFIG_BRCM_TRACING is not set
+# CONFIG_BRCMISCAN is not set
@@ -20174,7 +20224,6 @@ diff -Nur linux-3.14.15/arch/arm/configs/imx_v7_cbi_hb_defconfig linux-linaro-st
+# CONFIG_THERMAL_GOV_USER_SPACE is not set
+CONFIG_THERMAL_GOV_STEP_WISE=y
+# CONFIG_THERMAL_EMULATION is not set
-+# CONFIG_THERMAL_OF is not set
+
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
@@ -20761,9 +20810,9 @@ diff -Nur linux-3.14.15/arch/arm/configs/imx_v7_cbi_hb_defconfig linux-linaro-st
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_PROC_DEVICETREE=y
+
-diff -Nur linux-3.14.15/arch/arm/configs/imx_v7_defconfig linux-linaro-stable-mx6/arch/arm/configs/imx_v7_defconfig
---- linux-3.14.15/arch/arm/configs/imx_v7_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/configs/imx_v7_defconfig 2014-08-20 19:31:39.968842564 +0200
+diff -Nur linux-3.14.17/arch/arm/configs/imx_v7_defconfig linux-imx6-3.14/arch/arm/configs/imx_v7_defconfig
+--- linux-3.14.17/arch/arm/configs/imx_v7_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/configs/imx_v7_defconfig 2014-09-09 10:13:47.280941344 +0200
@@ -0,0 +1,343 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_KERNEL_LZO=y
@@ -21108,9 +21157,9 @@ diff -Nur linux-3.14.15/arch/arm/configs/imx_v7_defconfig linux-linaro-stable-mx
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
-diff -Nur linux-3.14.15/arch/arm/configs/imx_v7_mfg_defconfig linux-linaro-stable-mx6/arch/arm/configs/imx_v7_mfg_defconfig
---- linux-3.14.15/arch/arm/configs/imx_v7_mfg_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/configs/imx_v7_mfg_defconfig 2014-08-20 19:31:39.968842564 +0200
+diff -Nur linux-3.14.17/arch/arm/configs/imx_v7_mfg_defconfig linux-imx6-3.14/arch/arm/configs/imx_v7_mfg_defconfig
+--- linux-3.14.17/arch/arm/configs/imx_v7_mfg_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/configs/imx_v7_mfg_defconfig 2014-09-09 10:13:47.280941344 +0200
@@ -0,0 +1,341 @@
+CONFIG_KERNEL_LZO=y
+CONFIG_SYSVIPC=y
@@ -21453,9 +21502,57 @@ diff -Nur linux-3.14.15/arch/arm/configs/imx_v7_mfg_defconfig linux-linaro-stabl
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
-diff -Nur linux-3.14.15/arch/arm/include/asm/arch_timer.h linux-linaro-stable-mx6/arch/arm/include/asm/arch_timer.h
---- linux-3.14.15/arch/arm/include/asm/arch_timer.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/include/asm/arch_timer.h 2014-08-20 19:31:39.980842616 +0200
+diff -Nur linux-3.14.17/arch/arm/crypto/aesbs-glue.c linux-imx6-3.14/arch/arm/crypto/aesbs-glue.c
+--- linux-3.14.17/arch/arm/crypto/aesbs-glue.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/crypto/aesbs-glue.c 2014-09-09 10:13:47.292941443 +0200
+@@ -137,7 +137,7 @@
+ dst += AES_BLOCK_SIZE;
+ } while (--blocks);
+ }
+- err = blkcipher_walk_done(desc, &walk, walk.nbytes % AES_BLOCK_SIZE);
++ err = blkcipher_walk_done(desc, &walk, 0);
+ }
+ return err;
+ }
+@@ -158,7 +158,7 @@
+ bsaes_cbc_encrypt(walk.src.virt.addr, walk.dst.virt.addr,
+ walk.nbytes, &ctx->dec, walk.iv);
+ kernel_neon_end();
+- err = blkcipher_walk_done(desc, &walk, walk.nbytes % AES_BLOCK_SIZE);
++ err = blkcipher_walk_done(desc, &walk, 0);
+ }
+ while (walk.nbytes) {
+ u32 blocks = walk.nbytes / AES_BLOCK_SIZE;
+@@ -182,7 +182,7 @@
+ dst += AES_BLOCK_SIZE;
+ src += AES_BLOCK_SIZE;
+ } while (--blocks);
+- err = blkcipher_walk_done(desc, &walk, walk.nbytes % AES_BLOCK_SIZE);
++ err = blkcipher_walk_done(desc, &walk, 0);
+ }
+ return err;
+ }
+@@ -268,7 +268,7 @@
+ bsaes_xts_encrypt(walk.src.virt.addr, walk.dst.virt.addr,
+ walk.nbytes, &ctx->enc, walk.iv);
+ kernel_neon_end();
+- err = blkcipher_walk_done(desc, &walk, walk.nbytes % AES_BLOCK_SIZE);
++ err = blkcipher_walk_done(desc, &walk, 0);
+ }
+ return err;
+ }
+@@ -292,7 +292,7 @@
+ bsaes_xts_decrypt(walk.src.virt.addr, walk.dst.virt.addr,
+ walk.nbytes, &ctx->dec, walk.iv);
+ kernel_neon_end();
+- err = blkcipher_walk_done(desc, &walk, walk.nbytes % AES_BLOCK_SIZE);
++ err = blkcipher_walk_done(desc, &walk, 0);
+ }
+ return err;
+ }
+diff -Nur linux-3.14.17/arch/arm/include/asm/arch_timer.h linux-imx6-3.14/arch/arm/include/asm/arch_timer.h
+--- linux-3.14.17/arch/arm/include/asm/arch_timer.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/include/asm/arch_timer.h 2014-09-09 10:13:47.292941443 +0200
@@ -107,7 +107,6 @@
/* Also disable virtual event stream */
cntkctl &= ~(ARCH_TIMER_USR_PT_ACCESS_EN
@@ -21464,9 +21561,9 @@ diff -Nur linux-3.14.15/arch/arm/include/asm/arch_timer.h linux-linaro-stable-mx
| ARCH_TIMER_USR_VCT_ACCESS_EN
| ARCH_TIMER_USR_PCT_ACCESS_EN);
arch_timer_set_cntkctl(cntkctl);
-diff -Nur linux-3.14.15/arch/arm/include/asm/atomic.h linux-linaro-stable-mx6/arch/arm/include/asm/atomic.h
---- linux-3.14.15/arch/arm/include/asm/atomic.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/include/asm/atomic.h 2014-08-20 19:31:39.980842616 +0200
+diff -Nur linux-3.14.17/arch/arm/include/asm/atomic.h linux-imx6-3.14/arch/arm/include/asm/atomic.h
+--- linux-3.14.17/arch/arm/include/asm/atomic.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/include/asm/atomic.h 2014-09-09 10:13:47.292941443 +0200
@@ -60,6 +60,7 @@
int result;
@@ -21595,9 +21692,9 @@ diff -Nur linux-3.14.15/arch/arm/include/asm/atomic.h linux-linaro-stable-mx6/ar
__asm__ __volatile__("@ atomic64_add_unless\n"
"1: ldrexd %0, %H0, [%4]\n"
-diff -Nur linux-3.14.15/arch/arm/include/asm/cmpxchg.h linux-linaro-stable-mx6/arch/arm/include/asm/cmpxchg.h
---- linux-3.14.15/arch/arm/include/asm/cmpxchg.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/include/asm/cmpxchg.h 2014-08-20 19:31:39.980842616 +0200
+diff -Nur linux-3.14.17/arch/arm/include/asm/cmpxchg.h linux-imx6-3.14/arch/arm/include/asm/cmpxchg.h
+--- linux-3.14.17/arch/arm/include/asm/cmpxchg.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/include/asm/cmpxchg.h 2014-09-09 10:13:47.292941443 +0200
@@ -2,6 +2,7 @@
#define __ASM_ARM_CMPXCHG_H
@@ -21632,9 +21729,9 @@ diff -Nur linux-3.14.15/arch/arm/include/asm/cmpxchg.h linux-linaro-stable-mx6/a
__asm__ __volatile__(
"1: ldrexd %1, %H1, [%3]\n"
" teq %1, %4\n"
-diff -Nur linux-3.14.15/arch/arm/include/asm/ftrace.h linux-linaro-stable-mx6/arch/arm/include/asm/ftrace.h
---- linux-3.14.15/arch/arm/include/asm/ftrace.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/include/asm/ftrace.h 2014-08-20 19:31:39.980842616 +0200
+diff -Nur linux-3.14.17/arch/arm/include/asm/ftrace.h linux-imx6-3.14/arch/arm/include/asm/ftrace.h
+--- linux-3.14.17/arch/arm/include/asm/ftrace.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/include/asm/ftrace.h 2014-09-09 10:13:47.296941475 +0200
@@ -52,15 +52,7 @@
#endif
@@ -21652,9 +21749,9 @@ diff -Nur linux-3.14.15/arch/arm/include/asm/ftrace.h linux-linaro-stable-mx6/ar
#endif /* ifndef __ASSEMBLY__ */
-diff -Nur linux-3.14.15/arch/arm/include/asm/futex.h linux-linaro-stable-mx6/arch/arm/include/asm/futex.h
---- linux-3.14.15/arch/arm/include/asm/futex.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/include/asm/futex.h 2014-08-20 19:31:39.980842616 +0200
+diff -Nur linux-3.14.17/arch/arm/include/asm/futex.h linux-imx6-3.14/arch/arm/include/asm/futex.h
+--- linux-3.14.17/arch/arm/include/asm/futex.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/include/asm/futex.h 2014-09-09 10:13:47.296941475 +0200
@@ -23,6 +23,7 @@
#define __futex_atomic_op(insn, ret, oldval, tmp, uaddr, oparg) \
@@ -21672,9 +21769,9 @@ diff -Nur linux-3.14.15/arch/arm/include/asm/futex.h linux-linaro-stable-mx6/arc
__asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
"1: ldrex %1, [%4]\n"
" teq %1, %2\n"
-diff -Nur linux-3.14.15/arch/arm/include/asm/glue-cache.h linux-linaro-stable-mx6/arch/arm/include/asm/glue-cache.h
---- linux-3.14.15/arch/arm/include/asm/glue-cache.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/include/asm/glue-cache.h 2014-08-20 19:31:39.980842616 +0200
+diff -Nur linux-3.14.17/arch/arm/include/asm/glue-cache.h linux-imx6-3.14/arch/arm/include/asm/glue-cache.h
+--- linux-3.14.17/arch/arm/include/asm/glue-cache.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/include/asm/glue-cache.h 2014-09-09 10:13:47.296941475 +0200
@@ -102,19 +102,19 @@
#endif
@@ -21703,9 +21800,9 @@ diff -Nur linux-3.14.15/arch/arm/include/asm/glue-cache.h linux-linaro-stable-mx
#endif
#if defined(CONFIG_CPU_V7M)
-diff -Nur linux-3.14.15/arch/arm/include/asm/hardware/cache-l2x0.h linux-linaro-stable-mx6/arch/arm/include/asm/hardware/cache-l2x0.h
---- linux-3.14.15/arch/arm/include/asm/hardware/cache-l2x0.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/include/asm/hardware/cache-l2x0.h 2014-08-20 19:31:39.980842616 +0200
+diff -Nur linux-3.14.17/arch/arm/include/asm/hardware/cache-l2x0.h linux-imx6-3.14/arch/arm/include/asm/hardware/cache-l2x0.h
+--- linux-3.14.17/arch/arm/include/asm/hardware/cache-l2x0.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/include/asm/hardware/cache-l2x0.h 2014-09-09 10:13:47.296941475 +0200
@@ -26,8 +26,8 @@
#define L2X0_CACHE_TYPE 0x004
#define L2X0_CTRL 0x100
@@ -21844,9 +21941,9 @@ diff -Nur linux-3.14.15/arch/arm/include/asm/hardware/cache-l2x0.h linux-linaro-
#define L2X0_CTRL_EN 1
-diff -Nur linux-3.14.15/arch/arm/include/asm/outercache.h linux-linaro-stable-mx6/arch/arm/include/asm/outercache.h
---- linux-3.14.15/arch/arm/include/asm/outercache.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/include/asm/outercache.h 2014-08-20 19:31:39.996842683 +0200
+diff -Nur linux-3.14.17/arch/arm/include/asm/outercache.h linux-imx6-3.14/arch/arm/include/asm/outercache.h
+--- linux-3.14.17/arch/arm/include/asm/outercache.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/include/asm/outercache.h 2014-09-09 10:13:47.300941507 +0200
@@ -21,6 +21,7 @@
#ifndef __ASM_OUTERCACHE_H
#define __ASM_OUTERCACHE_H
@@ -21975,9 +22072,9 @@ diff -Nur linux-3.14.15/arch/arm/include/asm/outercache.h linux-linaro-stable-mx
static inline void outer_sync(void)
{
if (outer_cache.sync)
-diff -Nur linux-3.14.15/arch/arm/include/asm/pmu.h linux-linaro-stable-mx6/arch/arm/include/asm/pmu.h
---- linux-3.14.15/arch/arm/include/asm/pmu.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/include/asm/pmu.h 2014-08-20 19:23:45.610811908 +0200
+diff -Nur linux-3.14.17/arch/arm/include/asm/pmu.h linux-imx6-3.14/arch/arm/include/asm/pmu.h
+--- linux-3.14.17/arch/arm/include/asm/pmu.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/include/asm/pmu.h 2014-09-09 10:13:47.300941507 +0200
@@ -62,9 +62,19 @@
raw_spinlock_t pmu_lock;
};
@@ -22007,9 +22104,9 @@ diff -Nur linux-3.14.15/arch/arm/include/asm/pmu.h linux-linaro-stable-mx6/arch/
int num_events;
atomic_t active_events;
struct mutex reserve_mutex;
-diff -Nur linux-3.14.15/arch/arm/include/asm/psci.h linux-linaro-stable-mx6/arch/arm/include/asm/psci.h
---- linux-3.14.15/arch/arm/include/asm/psci.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/include/asm/psci.h 2014-08-20 19:31:40.000842701 +0200
+diff -Nur linux-3.14.17/arch/arm/include/asm/psci.h linux-imx6-3.14/arch/arm/include/asm/psci.h
+--- linux-3.14.17/arch/arm/include/asm/psci.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/include/asm/psci.h 2014-09-09 10:13:47.300941507 +0200
@@ -16,6 +16,10 @@
#define PSCI_POWER_STATE_TYPE_STANDBY 0
@@ -22034,9 +22131,9 @@ diff -Nur linux-3.14.15/arch/arm/include/asm/psci.h linux-linaro-stable-mx6/arch
+}
+#endif
#endif /* __ASM_ARM_PSCI_H */
-diff -Nur linux-3.14.15/arch/arm/include/asm/topology.h linux-linaro-stable-mx6/arch/arm/include/asm/topology.h
---- linux-3.14.15/arch/arm/include/asm/topology.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/include/asm/topology.h 2014-08-20 19:31:40.004842719 +0200
+diff -Nur linux-3.14.17/arch/arm/include/asm/topology.h linux-imx6-3.14/arch/arm/include/asm/topology.h
+--- linux-3.14.17/arch/arm/include/asm/topology.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/include/asm/topology.h 2014-09-09 10:13:47.304941540 +0200
@@ -26,11 +26,14 @@
void init_cpu_topology(void);
void store_cpu_topology(unsigned int cpuid);
@@ -22052,9 +22149,9 @@ diff -Nur linux-3.14.15/arch/arm/include/asm/topology.h linux-linaro-stable-mx6/
#endif
-diff -Nur linux-3.14.15/arch/arm/Kconfig linux-linaro-stable-mx6/arch/arm/Kconfig
---- linux-3.14.15/arch/arm/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/Kconfig 2014-08-20 19:31:39.796841825 +0200
+diff -Nur linux-3.14.17/arch/arm/Kconfig linux-imx6-3.14/arch/arm/Kconfig
+--- linux-3.14.17/arch/arm/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/Kconfig 2014-09-09 10:13:47.188940594 +0200
@@ -1216,19 +1216,6 @@
register of the Cortex-A9 which reduces the linefill issuing
capabilities of the processor.
@@ -22172,9 +22269,9 @@ diff -Nur linux-3.14.15/arch/arm/Kconfig linux-linaro-stable-mx6/arch/arm/Kconfi
default "11"
help
The kernel memory allocator divides physically contiguous memory
-diff -Nur linux-3.14.15/arch/arm/kernel/perf_event.c linux-linaro-stable-mx6/arch/arm/kernel/perf_event.c
---- linux-3.14.15/arch/arm/kernel/perf_event.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/kernel/perf_event.c 2014-08-20 19:31:40.024842805 +0200
+diff -Nur linux-3.14.17/arch/arm/kernel/perf_event.c linux-imx6-3.14/arch/arm/kernel/perf_event.c
+--- linux-3.14.17/arch/arm/kernel/perf_event.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/kernel/perf_event.c 2014-09-09 10:13:47.312941606 +0200
@@ -12,6 +12,7 @@
*/
#define pr_fmt(fmt) "hw perfevents: " fmt
@@ -22243,9 +22340,9 @@ diff -Nur linux-3.14.15/arch/arm/kernel/perf_event.c linux-linaro-stable-mx6/arc
/* does not support taken branch sampling */
if (has_branch_stack(event))
return -EOPNOTSUPP;
-diff -Nur linux-3.14.15/arch/arm/kernel/perf_event_cpu.c linux-linaro-stable-mx6/arch/arm/kernel/perf_event_cpu.c
---- linux-3.14.15/arch/arm/kernel/perf_event_cpu.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/kernel/perf_event_cpu.c 2014-08-20 19:31:40.024842805 +0200
+diff -Nur linux-3.14.17/arch/arm/kernel/perf_event_cpu.c linux-imx6-3.14/arch/arm/kernel/perf_event_cpu.c
+--- linux-3.14.17/arch/arm/kernel/perf_event_cpu.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/kernel/perf_event_cpu.c 2014-09-09 10:13:47.312941606 +0200
@@ -19,6 +19,7 @@
#define pr_fmt(fmt) "CPU PMU: " fmt
@@ -22509,9 +22606,9 @@ diff -Nur linux-3.14.15/arch/arm/kernel/perf_event_cpu.c linux-linaro-stable-mx6
return err;
}
-diff -Nur linux-3.14.15/arch/arm/kernel/perf_event_v7.c linux-linaro-stable-mx6/arch/arm/kernel/perf_event_v7.c
---- linux-3.14.15/arch/arm/kernel/perf_event_v7.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/kernel/perf_event_v7.c 2014-08-20 19:23:45.650812079 +0200
+diff -Nur linux-3.14.17/arch/arm/kernel/perf_event_v7.c linux-imx6-3.14/arch/arm/kernel/perf_event_v7.c
+--- linux-3.14.17/arch/arm/kernel/perf_event_v7.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/kernel/perf_event_v7.c 2014-09-09 10:13:47.312941606 +0200
@@ -950,6 +950,51 @@
}
#endif
@@ -22618,9 +22715,9 @@ diff -Nur linux-3.14.15/arch/arm/kernel/perf_event_v7.c linux-linaro-stable-mx6/
cpu_pmu->map_event = armv7_a7_map_event;
cpu_pmu->num_events = armv7_read_num_pmnc_events();
cpu_pmu->set_event_filter = armv7pmu_set_event_filter;
-diff -Nur linux-3.14.15/arch/arm/kernel/process.c linux-linaro-stable-mx6/arch/arm/kernel/process.c
---- linux-3.14.15/arch/arm/kernel/process.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/kernel/process.c 2014-08-20 19:31:40.024842805 +0200
+diff -Nur linux-3.14.17/arch/arm/kernel/process.c linux-imx6-3.14/arch/arm/kernel/process.c
+--- linux-3.14.17/arch/arm/kernel/process.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/kernel/process.c 2014-09-09 10:13:47.312941606 +0200
@@ -172,8 +172,10 @@
*/
void arch_cpu_idle(void)
@@ -22632,9 +22729,9 @@ diff -Nur linux-3.14.15/arch/arm/kernel/process.c linux-linaro-stable-mx6/arch/a
}
/*
-diff -Nur linux-3.14.15/arch/arm/kernel/psci.c linux-linaro-stable-mx6/arch/arm/kernel/psci.c
---- linux-3.14.15/arch/arm/kernel/psci.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/kernel/psci.c 2014-08-20 19:31:40.028842822 +0200
+diff -Nur linux-3.14.17/arch/arm/kernel/psci.c linux-imx6-3.14/arch/arm/kernel/psci.c
+--- linux-3.14.17/arch/arm/kernel/psci.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/kernel/psci.c 2014-09-09 10:13:47.312941606 +0200
@@ -42,6 +42,7 @@
#define PSCI_RET_EOPNOTSUPP -1
#define PSCI_RET_EINVAL -2
@@ -22678,9 +22775,9 @@ diff -Nur linux-3.14.15/arch/arm/kernel/psci.c linux-linaro-stable-mx6/arch/arm/
+ of_node_put(np);
+ return ret;
+}
-diff -Nur linux-3.14.15/arch/arm/kernel/setup.c linux-linaro-stable-mx6/arch/arm/kernel/setup.c
---- linux-3.14.15/arch/arm/kernel/setup.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/kernel/setup.c 2014-08-20 19:31:40.032842839 +0200
+diff -Nur linux-3.14.17/arch/arm/kernel/setup.c linux-imx6-3.14/arch/arm/kernel/setup.c
+--- linux-3.14.17/arch/arm/kernel/setup.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/kernel/setup.c 2014-09-09 10:13:47.316941638 +0200
@@ -273,6 +273,19 @@
int aliasing_icache;
unsigned int id_reg, num_sets, line_size;
@@ -22701,9 +22798,9 @@ diff -Nur linux-3.14.15/arch/arm/kernel/setup.c linux-linaro-stable-mx6/arch/arm
/* PIPT caches never alias. */
if (icache_is_pipt())
return 0;
-diff -Nur linux-3.14.15/arch/arm/kernel/topology.c linux-linaro-stable-mx6/arch/arm/kernel/topology.c
---- linux-3.14.15/arch/arm/kernel/topology.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/kernel/topology.c 2014-08-20 19:31:40.032842839 +0200
+diff -Nur linux-3.14.17/arch/arm/kernel/topology.c linux-imx6-3.14/arch/arm/kernel/topology.c
+--- linux-3.14.17/arch/arm/kernel/topology.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/kernel/topology.c 2014-09-09 10:13:47.316941638 +0200
@@ -267,6 +267,33 @@
}
@@ -22738,9 +22835,9 @@ diff -Nur linux-3.14.15/arch/arm/kernel/topology.c linux-linaro-stable-mx6/arch/
* init_cpu_topology is called at boot when only one cpu is running
* which prevent simultaneous write access to cpu_topology array
*/
-diff -Nur linux-3.14.15/arch/arm/lib/bitops.h linux-linaro-stable-mx6/arch/arm/lib/bitops.h
---- linux-3.14.15/arch/arm/lib/bitops.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/lib/bitops.h 2014-08-20 19:31:40.036842855 +0200
+diff -Nur linux-3.14.17/arch/arm/lib/bitops.h linux-imx6-3.14/arch/arm/lib/bitops.h
+--- linux-3.14.17/arch/arm/lib/bitops.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/lib/bitops.h 2014-09-09 10:13:47.320941670 +0200
@@ -37,6 +37,11 @@
add r1, r1, r0, lsl #2 @ Get word offset
mov r3, r2, lsl r3 @ create mask
@@ -22753,9 +22850,9 @@ diff -Nur linux-3.14.15/arch/arm/lib/bitops.h linux-linaro-stable-mx6/arch/arm/l
1: ldrex r2, [r1]
ands r0, r2, r3 @ save old value of bit
\instr r2, r2, r3 @ toggle bit
-diff -Nur linux-3.14.15/arch/arm/mach-berlin/berlin.c linux-linaro-stable-mx6/arch/arm/mach-berlin/berlin.c
---- linux-3.14.15/arch/arm/mach-berlin/berlin.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-berlin/berlin.c 2014-08-20 19:31:40.044842889 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-berlin/berlin.c linux-imx6-3.14/arch/arm/mach-berlin/berlin.c
+--- linux-3.14.17/arch/arm/mach-berlin/berlin.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-berlin/berlin.c 2014-09-09 10:13:47.332941769 +0200
@@ -24,7 +24,7 @@
* with DT probing for L2CCs, berlin_init_machine can be removed.
* Note: 88DE3005 (Armada 1500-mini) uses pl310 l2cc
@@ -22765,9 +22862,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-berlin/berlin.c linux-linaro-stable-mx6/ar
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
-diff -Nur linux-3.14.15/arch/arm/mach-cns3xxx/core.c linux-linaro-stable-mx6/arch/arm/mach-cns3xxx/core.c
---- linux-3.14.15/arch/arm/mach-cns3xxx/core.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-cns3xxx/core.c 2014-08-20 19:31:40.048842908 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-cns3xxx/core.c linux-imx6-3.14/arch/arm/mach-cns3xxx/core.c
+--- linux-3.14.17/arch/arm/mach-cns3xxx/core.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-cns3xxx/core.c 2014-09-09 10:13:47.336941802 +0200
@@ -240,9 +240,9 @@
*
* 1 cycle of latency for setup, read and write accesses
@@ -22796,9 +22893,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-cns3xxx/core.c linux-linaro-stable-mx6/arc
}
#endif /* CONFIG_CACHE_L2X0 */
-diff -Nur linux-3.14.15/arch/arm/mach-exynos/common.c linux-linaro-stable-mx6/arch/arm/mach-exynos/common.c
---- linux-3.14.15/arch/arm/mach-exynos/common.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-exynos/common.c 2014-08-20 19:31:40.072843010 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-exynos/common.c linux-imx6-3.14/arch/arm/mach-exynos/common.c
+--- linux-3.14.17/arch/arm/mach-exynos/common.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-exynos/common.c 2014-09-09 10:13:47.344941866 +0200
@@ -45,9 +45,6 @@
#include "common.h"
#include "regs-pmu.h"
@@ -22818,9 +22915,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-exynos/common.c linux-linaro-stable-mx6/ar
if (ret)
return ret;
-diff -Nur linux-3.14.15/arch/arm/mach-highbank/highbank.c linux-linaro-stable-mx6/arch/arm/mach-highbank/highbank.c
---- linux-3.14.15/arch/arm/mach-highbank/highbank.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-highbank/highbank.c 2014-08-20 19:31:40.076843028 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-highbank/highbank.c linux-imx6-3.14/arch/arm/mach-highbank/highbank.c
+--- linux-3.14.17/arch/arm/mach-highbank/highbank.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-highbank/highbank.c 2014-09-09 10:13:47.352941932 +0200
@@ -20,7 +20,7 @@
#include <linux/input.h>
#include <linux/io.h>
@@ -22863,9 +22960,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-highbank/highbank.c linux-linaro-stable-mx
}
}
-diff -Nur linux-3.14.15/arch/arm/mach-imx/anatop.c linux-linaro-stable-mx6/arch/arm/mach-imx/anatop.c
---- linux-3.14.15/arch/arm/mach-imx/anatop.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/anatop.c 2014-08-20 19:31:40.080843045 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/anatop.c linux-imx6-3.14/arch/arm/mach-imx/anatop.c
+--- linux-3.14.17/arch/arm/mach-imx/anatop.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-imx/anatop.c 2014-09-09 10:13:47.352941932 +0200
@@ -9,6 +9,7 @@
* http://www.gnu.org/copyleft/gpl.html
*/
@@ -22930,9 +23027,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/anatop.c linux-linaro-stable-mx6/arch/
default:
revision = IMX_CHIP_REVISION_UNKNOWN;
}
-diff -Nur linux-3.14.15/arch/arm/mach-imx/busfreq_ddr3.c linux-linaro-stable-mx6/arch/arm/mach-imx/busfreq_ddr3.c
---- linux-3.14.15/arch/arm/mach-imx/busfreq_ddr3.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/busfreq_ddr3.c 2014-08-20 19:31:40.080843045 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/busfreq_ddr3.c linux-imx6-3.14/arch/arm/mach-imx/busfreq_ddr3.c
+--- linux-3.14.17/arch/arm/mach-imx/busfreq_ddr3.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/mach-imx/busfreq_ddr3.c 2014-09-09 10:13:47.352941932 +0200
@@ -0,0 +1,471 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -23405,9 +23502,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/busfreq_ddr3.c linux-linaro-stable-mx6
+
+ return 0;
+}
-diff -Nur linux-3.14.15/arch/arm/mach-imx/busfreq-imx6.c linux-linaro-stable-mx6/arch/arm/mach-imx/busfreq-imx6.c
---- linux-3.14.15/arch/arm/mach-imx/busfreq-imx6.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/busfreq-imx6.c 2014-08-20 19:31:40.080843045 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/busfreq-imx6.c linux-imx6-3.14/arch/arm/mach-imx/busfreq-imx6.c
+--- linux-3.14.17/arch/arm/mach-imx/busfreq-imx6.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/mach-imx/busfreq-imx6.c 2014-09-09 10:13:47.352941932 +0200
@@ -0,0 +1,952 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -24361,9 +24458,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/busfreq-imx6.c linux-linaro-stable-mx6
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("BusFreq driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/arch/arm/mach-imx/busfreq_lpddr2.c linux-linaro-stable-mx6/arch/arm/mach-imx/busfreq_lpddr2.c
---- linux-3.14.15/arch/arm/mach-imx/busfreq_lpddr2.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/busfreq_lpddr2.c 2014-08-20 19:31:40.080843045 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/busfreq_lpddr2.c linux-imx6-3.14/arch/arm/mach-imx/busfreq_lpddr2.c
+--- linux-3.14.17/arch/arm/mach-imx/busfreq_lpddr2.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/mach-imx/busfreq_lpddr2.c 2014-09-09 10:13:47.352941932 +0200
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -24548,9 +24645,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/busfreq_lpddr2.c linux-linaro-stable-m
+
+ return 0;
+}
-diff -Nur linux-3.14.15/arch/arm/mach-imx/clk.h linux-linaro-stable-mx6/arch/arm/mach-imx/clk.h
---- linux-3.14.15/arch/arm/mach-imx/clk.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk.h 2014-08-20 19:31:40.084843062 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/clk.h linux-imx6-3.14/arch/arm/mach-imx/clk.h
+--- linux-3.14.17/arch/arm/mach-imx/clk.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-imx/clk.h 2014-09-09 10:13:47.356941965 +0200
@@ -23,7 +23,8 @@
};
@@ -24561,9 +24658,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/clk.h linux-linaro-stable-mx6/arch/arm
struct clk *clk_register_gate2(struct device *dev, const char *name,
const char *parent_name, unsigned long flags,
-diff -Nur linux-3.14.15/arch/arm/mach-imx/clk-imx6q.c linux-linaro-stable-mx6/arch/arm/mach-imx/clk-imx6q.c
---- linux-3.14.15/arch/arm/mach-imx/clk-imx6q.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-imx6q.c 2014-08-20 19:31:40.084843062 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/clk-imx6q.c linux-imx6-3.14/arch/arm/mach-imx/clk-imx6q.c
+--- linux-3.14.17/arch/arm/mach-imx/clk-imx6q.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-imx/clk-imx6q.c 2014-09-09 10:13:47.352941932 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2011-2013 Freescale Semiconductor, Inc.
@@ -25073,9 +25170,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/clk-imx6q.c linux-linaro-stable-mx6/ar
/* Set initial power mode */
imx6q_set_lpm(WAIT_CLOCKED);
-diff -Nur linux-3.14.15/arch/arm/mach-imx/clk-imx6sl.c linux-linaro-stable-mx6/arch/arm/mach-imx/clk-imx6sl.c
---- linux-3.14.15/arch/arm/mach-imx/clk-imx6sl.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-imx6sl.c 2014-08-20 19:31:40.084843062 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/clk-imx6sl.c linux-imx6-3.14/arch/arm/mach-imx/clk-imx6sl.c
+--- linux-3.14.17/arch/arm/mach-imx/clk-imx6sl.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-imx/clk-imx6sl.c 2014-09-09 10:13:47.352941932 +0200
@@ -7,9 +7,29 @@
*
*/
@@ -25397,9 +25494,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/clk-imx6sl.c linux-linaro-stable-mx6/a
np = of_find_compatible_node(NULL, NULL, "fsl,imx6sl-gpt");
base = of_iomap(np, 0);
WARN_ON(!base);
-diff -Nur linux-3.14.15/arch/arm/mach-imx/clk-pfd.c linux-linaro-stable-mx6/arch/arm/mach-imx/clk-pfd.c
---- linux-3.14.15/arch/arm/mach-imx/clk-pfd.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-pfd.c 2014-08-20 19:31:40.084843062 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/clk-pfd.c linux-imx6-3.14/arch/arm/mach-imx/clk-pfd.c
+--- linux-3.14.17/arch/arm/mach-imx/clk-pfd.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-imx/clk-pfd.c 2014-09-09 10:13:47.352941932 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 Freescale Semiconductor, Inc.
@@ -25478,9 +25575,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/clk-pfd.c linux-linaro-stable-mx6/arch
tmp = tmp * 18 + rate / 2;
do_div(tmp, rate);
frac = tmp;
-diff -Nur linux-3.14.15/arch/arm/mach-imx/clk-pllv3.c linux-linaro-stable-mx6/arch/arm/mach-imx/clk-pllv3.c
---- linux-3.14.15/arch/arm/mach-imx/clk-pllv3.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-pllv3.c 2014-08-20 19:31:40.084843062 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/clk-pllv3.c linux-imx6-3.14/arch/arm/mach-imx/clk-pllv3.c
+--- linux-3.14.17/arch/arm/mach-imx/clk-pllv3.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-imx/clk-pllv3.c 2014-09-09 10:13:47.356941965 +0200
@@ -26,12 +26,15 @@
#define BM_PLL_ENABLE (0x1 << 13)
#define BM_PLL_BYPASS (0x1 << 16)
@@ -25849,9 +25946,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/clk-pllv3.c linux-linaro-stable-mx6/ar
init.name = name;
init.ops = ops;
-diff -Nur linux-3.14.15/arch/arm/mach-imx/common.h linux-linaro-stable-mx6/arch/arm/mach-imx/common.h
---- linux-3.14.15/arch/arm/mach-imx/common.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/common.h 2014-08-20 19:31:40.084843062 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/common.h linux-imx6-3.14/arch/arm/mach-imx/common.h
+--- linux-3.14.17/arch/arm/mach-imx/common.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-imx/common.h 2014-09-09 10:13:47.356941965 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -25906,9 +26003,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/common.h linux-linaro-stable-mx6/arch/
#ifdef CONFIG_PM
void imx5_pm_init(void);
#else
-diff -Nur linux-3.14.15/arch/arm/mach-imx/cpuidle.h linux-linaro-stable-mx6/arch/arm/mach-imx/cpuidle.h
---- linux-3.14.15/arch/arm/mach-imx/cpuidle.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/cpuidle.h 2014-08-20 19:23:45.798812710 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/cpuidle.h linux-imx6-3.14/arch/arm/mach-imx/cpuidle.h
+--- linux-3.14.17/arch/arm/mach-imx/cpuidle.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-imx/cpuidle.h 2014-09-09 10:13:47.356941965 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 Freescale Semiconductor, Inc.
@@ -25933,9 +26030,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/cpuidle.h linux-linaro-stable-mx6/arch
+ return 0;
+}
#endif
-diff -Nur linux-3.14.15/arch/arm/mach-imx/cpuidle-imx6q.c linux-linaro-stable-mx6/arch/arm/mach-imx/cpuidle-imx6q.c
---- linux-3.14.15/arch/arm/mach-imx/cpuidle-imx6q.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/cpuidle-imx6q.c 2014-08-20 19:31:40.084843062 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/cpuidle-imx6q.c linux-imx6-3.14/arch/arm/mach-imx/cpuidle-imx6q.c
+--- linux-3.14.17/arch/arm/mach-imx/cpuidle-imx6q.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-imx/cpuidle-imx6q.c 2014-09-09 10:13:47.356941965 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 Freescale Semiconductor, Inc.
@@ -25954,9 +26051,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/cpuidle-imx6q.c linux-linaro-stable-mx
return cpuidle_register(&imx6q_cpuidle_driver, NULL);
}
-diff -Nur linux-3.14.15/arch/arm/mach-imx/cpuidle-imx6sl.c linux-linaro-stable-mx6/arch/arm/mach-imx/cpuidle-imx6sl.c
---- linux-3.14.15/arch/arm/mach-imx/cpuidle-imx6sl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/cpuidle-imx6sl.c 2014-08-20 19:31:40.084843062 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/cpuidle-imx6sl.c linux-imx6-3.14/arch/arm/mach-imx/cpuidle-imx6sl.c
+--- linux-3.14.17/arch/arm/mach-imx/cpuidle-imx6sl.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/mach-imx/cpuidle-imx6sl.c 2014-09-09 10:13:47.356941965 +0200
@@ -0,0 +1,149 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc.
@@ -26107,9 +26204,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/cpuidle-imx6sl.c linux-linaro-stable-m
+
+ return cpuidle_register(&imx6sl_cpuidle_driver, NULL);
+}
-diff -Nur linux-3.14.15/arch/arm/mach-imx/ddr3_freq_imx6.S linux-linaro-stable-mx6/arch/arm/mach-imx/ddr3_freq_imx6.S
---- linux-3.14.15/arch/arm/mach-imx/ddr3_freq_imx6.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/ddr3_freq_imx6.S 2014-08-20 19:23:45.798812710 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/ddr3_freq_imx6.S linux-imx6-3.14/arch/arm/mach-imx/ddr3_freq_imx6.S
+--- linux-3.14.17/arch/arm/mach-imx/ddr3_freq_imx6.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/mach-imx/ddr3_freq_imx6.S 2014-09-09 10:13:47.356941965 +0200
@@ -0,0 +1,893 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -27004,9 +27101,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/ddr3_freq_imx6.S linux-linaro-stable-m
+ENTRY(mx6_do_ddr_freq_change)
+ .word mx6_ddr3_freq_change
+ .size mx6_ddr3_freq_change, . - mx6_ddr3_freq_change
-diff -Nur linux-3.14.15/arch/arm/mach-imx/gpc.c linux-linaro-stable-mx6/arch/arm/mach-imx/gpc.c
---- linux-3.14.15/arch/arm/mach-imx/gpc.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/gpc.c 2014-08-20 19:31:40.084843062 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/gpc.c linux-imx6-3.14/arch/arm/mach-imx/gpc.c
+--- linux-3.14.17/arch/arm/mach-imx/gpc.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-imx/gpc.c 2014-09-09 10:13:47.360941996 +0200
@@ -10,30 +10,69 @@
* http://www.gnu.org/copyleft/gpl.html
*/
@@ -27391,9 +27488,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/gpc.c linux-linaro-stable-mx6/arch/arm
+MODULE_AUTHOR("Anson Huang <b20788@freescale.com>");
+MODULE_DESCRIPTION("Freescale i.MX GPC driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/arch/arm/mach-imx/hardware.h linux-linaro-stable-mx6/arch/arm/mach-imx/hardware.h
---- linux-3.14.15/arch/arm/mach-imx/hardware.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/hardware.h 2014-08-20 19:31:40.084843062 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/hardware.h linux-imx6-3.14/arch/arm/mach-imx/hardware.h
+--- linux-3.14.17/arch/arm/mach-imx/hardware.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-imx/hardware.h 2014-09-09 10:13:47.360941996 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -27411,9 +27508,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/hardware.h linux-linaro-stable-mx6/arc
#include <asm/sizes.h>
#define addr_in_module(addr, mod) \
-diff -Nur linux-3.14.15/arch/arm/mach-imx/headsmp.S linux-linaro-stable-mx6/arch/arm/mach-imx/headsmp.S
---- linux-3.14.15/arch/arm/mach-imx/headsmp.S 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/headsmp.S 2014-08-20 19:31:40.084843062 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/headsmp.S linux-imx6-3.14/arch/arm/mach-imx/headsmp.S
+--- linux-3.14.17/arch/arm/mach-imx/headsmp.S 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-imx/headsmp.S 2014-09-09 10:13:47.360941996 +0200
@@ -12,8 +12,6 @@
#include <linux/linkage.h>
@@ -27461,9 +27558,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/headsmp.S linux-linaro-stable-mx6/arch
- b cpu_resume
-ENDPROC(v7_cpu_resume)
-#endif
-diff -Nur linux-3.14.15/arch/arm/mach-imx/imx6sl_wfi.S linux-linaro-stable-mx6/arch/arm/mach-imx/imx6sl_wfi.S
---- linux-3.14.15/arch/arm/mach-imx/imx6sl_wfi.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/imx6sl_wfi.S 2014-08-20 19:23:45.806812745 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/imx6sl_wfi.S linux-imx6-3.14/arch/arm/mach-imx/imx6sl_wfi.S
+--- linux-3.14.17/arch/arm/mach-imx/imx6sl_wfi.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/mach-imx/imx6sl_wfi.S 2014-09-09 10:13:47.360941996 +0200
@@ -0,0 +1,639 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -28104,9 +28201,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/imx6sl_wfi.S linux-linaro-stable-mx6/a
+
+ /* Restore registers */
+ mov pc, lr
-diff -Nur linux-3.14.15/arch/arm/mach-imx/Kconfig linux-linaro-stable-mx6/arch/arm/mach-imx/Kconfig
---- linux-3.14.15/arch/arm/mach-imx/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/Kconfig 2014-08-20 19:31:40.080843045 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/Kconfig linux-imx6-3.14/arch/arm/mach-imx/Kconfig
+--- linux-3.14.17/arch/arm/mach-imx/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-imx/Kconfig 2014-09-09 10:13:47.352941932 +0200
@@ -1,5 +1,6 @@
config ARCH_MXC
bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7
@@ -28153,9 +28250,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/Kconfig linux-linaro-stable-mx6/arch/a
help
This enables support for Freescale i.MX6 Quad processor.
-diff -Nur linux-3.14.15/arch/arm/mach-imx/lpddr2_freq_imx6.S linux-linaro-stable-mx6/arch/arm/mach-imx/lpddr2_freq_imx6.S
---- linux-3.14.15/arch/arm/mach-imx/lpddr2_freq_imx6.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/lpddr2_freq_imx6.S 2014-08-20 19:23:45.806812745 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/lpddr2_freq_imx6.S linux-imx6-3.14/arch/arm/mach-imx/lpddr2_freq_imx6.S
+--- linux-3.14.17/arch/arm/mach-imx/lpddr2_freq_imx6.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/mach-imx/lpddr2_freq_imx6.S 2014-09-09 10:13:47.360941996 +0200
@@ -0,0 +1,484 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -28641,9 +28738,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/lpddr2_freq_imx6.S linux-linaro-stable
+ENTRY(mx6_lpddr2_do_iram)
+ .word mx6_lpddr2_freq_change
+ .size mx6_lpddr2_freq_change, . - mx6_lpddr2_freq_change
-diff -Nur linux-3.14.15/arch/arm/mach-imx/mach-imx6q.c linux-linaro-stable-mx6/arch/arm/mach-imx/mach-imx6q.c
---- linux-3.14.15/arch/arm/mach-imx/mach-imx6q.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/mach-imx6q.c 2014-08-20 19:31:40.088843079 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/mach-imx6q.c linux-imx6-3.14/arch/arm/mach-imx/mach-imx6q.c
+--- linux-3.14.17/arch/arm/mach-imx/mach-imx6q.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-imx/mach-imx6q.c 2014-09-09 10:13:47.364942029 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2011-2013 Freescale Semiconductor, Inc.
@@ -28931,9 +29028,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/mach-imx6q.c linux-linaro-stable-mx6/a
.smp = smp_ops(imx_smp_ops),
.map_io = imx6q_map_io,
.init_irq = imx6q_init_irq,
-diff -Nur linux-3.14.15/arch/arm/mach-imx/mach-imx6sl.c linux-linaro-stable-mx6/arch/arm/mach-imx/mach-imx6sl.c
---- linux-3.14.15/arch/arm/mach-imx/mach-imx6sl.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/mach-imx6sl.c 2014-08-20 19:31:40.088843079 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/mach-imx6sl.c linux-imx6-3.14/arch/arm/mach-imx/mach-imx6sl.c
+--- linux-3.14.17/arch/arm/mach-imx/mach-imx6sl.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-imx/mach-imx6sl.c 2014-09-09 10:13:47.364942029 +0200
@@ -17,8 +17,9 @@
#include <asm/mach/map.h>
@@ -28973,9 +29070,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/mach-imx6sl.c linux-linaro-stable-mx6/
}
static void __init imx6sl_init_irq(void)
-diff -Nur linux-3.14.15/arch/arm/mach-imx/mach-vf610.c linux-linaro-stable-mx6/arch/arm/mach-imx/mach-vf610.c
---- linux-3.14.15/arch/arm/mach-imx/mach-vf610.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/mach-vf610.c 2014-08-20 19:31:40.088843079 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/mach-vf610.c linux-imx6-3.14/arch/arm/mach-imx/mach-vf610.c
+--- linux-3.14.17/arch/arm/mach-imx/mach-vf610.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-imx/mach-vf610.c 2014-09-09 10:13:47.408942389 +0200
@@ -22,7 +22,7 @@
static void __init vf610_init_irq(void)
@@ -28985,9 +29082,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/mach-vf610.c linux-linaro-stable-mx6/a
irqchip_init();
}
-diff -Nur linux-3.14.15/arch/arm/mach-imx/Makefile linux-linaro-stable-mx6/arch/arm/mach-imx/Makefile
---- linux-3.14.15/arch/arm/mach-imx/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/Makefile 2014-08-20 19:31:40.080843045 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/Makefile linux-imx6-3.14/arch/arm/mach-imx/Makefile
+--- linux-3.14.17/arch/arm/mach-imx/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-imx/Makefile 2014-09-09 10:13:47.352941932 +0200
@@ -30,6 +30,7 @@
ifeq ($(CONFIG_CPU_IDLE),y)
obj-$(CONFIG_SOC_IMX5) += cpuidle-imx5.o
@@ -29018,9 +29115,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/Makefile linux-linaro-stable-mx6/arch/
# i.MX5 based machines
obj-$(CONFIG_MACH_MX51_BABBAGE) += mach-mx51_babbage.o
-diff -Nur linux-3.14.15/arch/arm/mach-imx/mx6.h linux-linaro-stable-mx6/arch/arm/mach-imx/mx6.h
---- linux-3.14.15/arch/arm/mach-imx/mx6.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/mx6.h 2014-08-20 19:23:45.814812779 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/mx6.h linux-imx6-3.14/arch/arm/mach-imx/mx6.h
+--- linux-3.14.17/arch/arm/mach-imx/mx6.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/mach-imx/mx6.h 2014-09-09 10:13:47.412942422 +0200
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -29057,9 +29154,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/mx6.h linux-linaro-stable-mx6/arch/arm
+
+#define MX6_SUSPEND_IRAM_SIZE 0x1000
+#endif
-diff -Nur linux-3.14.15/arch/arm/mach-imx/mxc.h linux-linaro-stable-mx6/arch/arm/mach-imx/mxc.h
---- linux-3.14.15/arch/arm/mach-imx/mxc.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/mxc.h 2014-08-20 19:31:40.092843095 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/mxc.h linux-imx6-3.14/arch/arm/mach-imx/mxc.h
+--- linux-3.14.17/arch/arm/mach-imx/mxc.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-imx/mxc.h 2014-09-09 10:13:47.412942422 +0200
@@ -42,6 +42,8 @@
#define IMX_CHIP_REVISION_1_1 0x11
#define IMX_CHIP_REVISION_1_2 0x12
@@ -29077,9 +29174,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/mxc.h linux-linaro-stable-mx6/arch/arm
#define cpu_is_mx3() (cpu_is_mx31() || cpu_is_mx35())
#define cpu_is_mx2() (cpu_is_mx21() || cpu_is_mx27())
-diff -Nur linux-3.14.15/arch/arm/mach-imx/pm-imx6.c linux-linaro-stable-mx6/arch/arm/mach-imx/pm-imx6.c
---- linux-3.14.15/arch/arm/mach-imx/pm-imx6.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/pm-imx6.c 2014-08-20 19:31:40.092843095 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/pm-imx6.c linux-imx6-3.14/arch/arm/mach-imx/pm-imx6.c
+--- linux-3.14.17/arch/arm/mach-imx/pm-imx6.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/mach-imx/pm-imx6.c 2014-09-09 10:13:47.416942453 +0200
@@ -0,0 +1,580 @@
+/*
+ * Copyright 2011-2014 Freescale Semiconductor, Inc.
@@ -29661,9 +29758,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/pm-imx6.c linux-linaro-stable-mx6/arch
+{
+ imx6_pm_common_init(NULL);
+}
-diff -Nur linux-3.14.15/arch/arm/mach-imx/pm-imx6q.c linux-linaro-stable-mx6/arch/arm/mach-imx/pm-imx6q.c
---- linux-3.14.15/arch/arm/mach-imx/pm-imx6q.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/pm-imx6q.c 1970-01-01 01:00:00.000000000 +0100
+diff -Nur linux-3.14.17/arch/arm/mach-imx/pm-imx6q.c linux-imx6-3.14/arch/arm/mach-imx/pm-imx6q.c
+--- linux-3.14.17/arch/arm/mach-imx/pm-imx6q.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-imx/pm-imx6q.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,241 +0,0 @@
-/*
- * Copyright 2011-2013 Freescale Semiconductor, Inc.
@@ -29906,9 +30003,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/pm-imx6q.c linux-linaro-stable-mx6/arc
-
- suspend_set_ops(&imx6q_pm_ops);
-}
-diff -Nur linux-3.14.15/arch/arm/mach-imx/suspend-imx6.S linux-linaro-stable-mx6/arch/arm/mach-imx/suspend-imx6.S
---- linux-3.14.15/arch/arm/mach-imx/suspend-imx6.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/suspend-imx6.S 2014-08-20 19:31:40.092843095 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/suspend-imx6.S linux-imx6-3.14/arch/arm/mach-imx/suspend-imx6.S
+--- linux-3.14.17/arch/arm/mach-imx/suspend-imx6.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/mach-imx/suspend-imx6.S 2014-09-09 10:13:47.416942453 +0200
@@ -0,0 +1,306 @@
+/*
+ * Copyright 2014 Freescale Semiconductor, Inc.
@@ -30216,9 +30313,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/suspend-imx6.S linux-linaro-stable-mx6
+#endif
+ b cpu_resume
+ENDPROC(v7_cpu_resume)
-diff -Nur linux-3.14.15/arch/arm/mach-imx/system.c linux-linaro-stable-mx6/arch/arm/mach-imx/system.c
---- linux-3.14.15/arch/arm/mach-imx/system.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/system.c 2014-08-20 19:31:40.092843095 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/system.c linux-imx6-3.14/arch/arm/mach-imx/system.c
+--- linux-3.14.17/arch/arm/mach-imx/system.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-imx/system.c 2014-09-09 10:13:47.416942453 +0200
@@ -34,6 +34,7 @@
static void __iomem *wdog_base;
@@ -30300,9 +30397,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/system.c linux-linaro-stable-mx6/arch/
+ l2x0_of_init(0, ~0);
}
#endif
-diff -Nur linux-3.14.15/arch/arm/mach-imx/time.c linux-linaro-stable-mx6/arch/arm/mach-imx/time.c
---- linux-3.14.15/arch/arm/mach-imx/time.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-imx/time.c 2014-08-20 19:31:40.092843095 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-imx/time.c linux-imx6-3.14/arch/arm/mach-imx/time.c
+--- linux-3.14.17/arch/arm/mach-imx/time.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-imx/time.c 2014-09-09 10:13:47.416942453 +0200
@@ -60,7 +60,11 @@
#define V2_TCTL_WAITEN (1 << 3) /* Wait enable mode */
#define V2_TCTL_CLK_IPG (1 << 6)
@@ -30366,9 +30463,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-imx/time.c linux-linaro-stable-mx6/arch/ar
__raw_writel(tctl_val, timer_base + MXC_TCTL);
-diff -Nur linux-3.14.15/arch/arm/mach-nomadik/cpu-8815.c linux-linaro-stable-mx6/arch/arm/mach-nomadik/cpu-8815.c
---- linux-3.14.15/arch/arm/mach-nomadik/cpu-8815.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-nomadik/cpu-8815.c 2014-08-20 19:31:40.228843679 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-nomadik/cpu-8815.c linux-imx6-3.14/arch/arm/mach-nomadik/cpu-8815.c
+--- linux-3.14.17/arch/arm/mach-nomadik/cpu-8815.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-nomadik/cpu-8815.c 2014-09-09 10:13:47.444942683 +0200
@@ -147,7 +147,7 @@
{
#ifdef CONFIG_CACHE_L2X0
@@ -30378,9 +30475,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-nomadik/cpu-8815.c linux-linaro-stable-mx6
#endif
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
-diff -Nur linux-3.14.15/arch/arm/mach-omap2/common.h linux-linaro-stable-mx6/arch/arm/mach-omap2/common.h
---- linux-3.14.15/arch/arm/mach-omap2/common.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-omap2/common.h 2014-08-20 19:31:40.268843852 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-omap2/common.h linux-imx6-3.14/arch/arm/mach-omap2/common.h
+--- linux-3.14.17/arch/arm/mach-omap2/common.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-omap2/common.h 2014-09-09 10:13:47.464942847 +0200
@@ -91,6 +91,7 @@
extern void omap3_secure_sync32k_timer_init(void);
extern void omap3_gptimer_timer_init(void);
@@ -30389,9 +30486,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-omap2/common.h linux-linaro-stable-mx6/arc
extern void omap5_realtime_timer_init(void);
void omap2420_init_early(void);
-diff -Nur linux-3.14.15/arch/arm/mach-omap2/io.c linux-linaro-stable-mx6/arch/arm/mach-omap2/io.c
---- linux-3.14.15/arch/arm/mach-omap2/io.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-omap2/io.c 2014-08-20 19:31:40.280843902 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-omap2/io.c linux-imx6-3.14/arch/arm/mach-omap2/io.c
+--- linux-3.14.17/arch/arm/mach-omap2/io.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-omap2/io.c 2014-09-09 10:13:47.468942879 +0200
@@ -608,6 +608,7 @@
am43xx_clockdomains_init();
am43xx_hwmod_init();
@@ -30408,9 +30505,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-omap2/io.c linux-linaro-stable-mx6/arch/ar
omap_clk_soc_init = omap4xxx_dt_clk_init;
}
-diff -Nur linux-3.14.15/arch/arm/mach-omap2/Kconfig linux-linaro-stable-mx6/arch/arm/mach-omap2/Kconfig
---- linux-3.14.15/arch/arm/mach-omap2/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-omap2/Kconfig 2014-08-20 19:31:40.232843696 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-omap2/Kconfig linux-imx6-3.14/arch/arm/mach-omap2/Kconfig
+--- linux-3.14.17/arch/arm/mach-omap2/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-omap2/Kconfig 2014-09-09 10:13:47.452942747 +0200
@@ -78,6 +78,7 @@
select MULTI_IRQ_HANDLER
select ARM_GIC
@@ -30419,9 +30516,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-omap2/Kconfig linux-linaro-stable-mx6/arch
config SOC_DRA7XX
bool "TI DRA7XX"
-diff -Nur linux-3.14.15/arch/arm/mach-omap2/omap4-common.c linux-linaro-stable-mx6/arch/arm/mach-omap2/omap4-common.c
---- linux-3.14.15/arch/arm/mach-omap2/omap4-common.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-omap2/omap4-common.c 2014-08-20 19:31:40.280843902 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-omap2/omap4-common.c linux-imx6-3.14/arch/arm/mach-omap2/omap4-common.c
+--- linux-3.14.17/arch/arm/mach-omap2/omap4-common.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-omap2/omap4-common.c 2014-09-09 10:13:47.468942879 +0200
@@ -166,75 +166,57 @@
return l2cache_base;
}
@@ -30532,9 +30629,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-omap2/omap4-common.c linux-linaro-stable-m
#endif
void __iomem *omap4_get_sar_ram_base(void)
-diff -Nur linux-3.14.15/arch/arm/mach-omap2/omap-mpuss-lowpower.c linux-linaro-stable-mx6/arch/arm/mach-omap2/omap-mpuss-lowpower.c
---- linux-3.14.15/arch/arm/mach-omap2/omap-mpuss-lowpower.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-omap2/omap-mpuss-lowpower.c 2014-08-20 19:31:40.280843902 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-omap2/omap-mpuss-lowpower.c linux-imx6-3.14/arch/arm/mach-omap2/omap-mpuss-lowpower.c
+--- linux-3.14.17/arch/arm/mach-omap2/omap-mpuss-lowpower.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-omap2/omap-mpuss-lowpower.c 2014-09-09 10:13:47.468942879 +0200
@@ -187,19 +187,15 @@
* in every restore MPUSS OFF path.
*/
@@ -30561,9 +30658,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-omap2/omap-mpuss-lowpower.c linux-linaro-s
{}
#endif
-diff -Nur linux-3.14.15/arch/arm/mach-prima2/l2x0.c linux-linaro-stable-mx6/arch/arm/mach-prima2/l2x0.c
---- linux-3.14.15/arch/arm/mach-prima2/l2x0.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-prima2/l2x0.c 2014-08-20 19:31:40.304844006 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-prima2/l2x0.c linux-imx6-3.14/arch/arm/mach-prima2/l2x0.c
+--- linux-3.14.17/arch/arm/mach-prima2/l2x0.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-prima2/l2x0.c 2014-09-09 10:13:47.488943042 +0200
@@ -8,43 +8,10 @@
#include <linux/init.h>
@@ -30609,9 +30706,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-prima2/l2x0.c linux-linaro-stable-mx6/arch
+ return l2x0_of_init(0, ~0);
}
early_initcall(sirfsoc_l2x0_init);
-diff -Nur linux-3.14.15/arch/arm/mach-prima2/pm.c linux-linaro-stable-mx6/arch/arm/mach-prima2/pm.c
---- linux-3.14.15/arch/arm/mach-prima2/pm.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-prima2/pm.c 2014-08-20 19:31:40.304844006 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-prima2/pm.c linux-imx6-3.14/arch/arm/mach-prima2/pm.c
+--- linux-3.14.17/arch/arm/mach-prima2/pm.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-prima2/pm.c 2014-09-09 10:13:47.488943042 +0200
@@ -71,7 +71,6 @@
case PM_SUSPEND_MEM:
sirfsoc_pre_suspend_power_off();
@@ -30620,9 +30717,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-prima2/pm.c linux-linaro-stable-mx6/arch/a
outer_disable();
/* go zzz */
cpu_suspend(0, sirfsoc_finish_suspend);
-diff -Nur linux-3.14.15/arch/arm/mach-realview/realview_eb.c linux-linaro-stable-mx6/arch/arm/mach-realview/realview_eb.c
---- linux-3.14.15/arch/arm/mach-realview/realview_eb.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-realview/realview_eb.c 2014-08-20 19:31:40.320844075 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-realview/realview_eb.c linux-imx6-3.14/arch/arm/mach-realview/realview_eb.c
+--- linux-3.14.17/arch/arm/mach-realview/realview_eb.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-realview/realview_eb.c 2014-09-09 10:13:47.508943205 +0200
@@ -442,8 +442,13 @@
realview_eb11mp_fixup();
@@ -30639,9 +30736,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-realview/realview_eb.c linux-linaro-stable
l2x0_init(__io_address(REALVIEW_EB11MP_L220_BASE), 0x00790000, 0xfe000fff);
#endif
platform_device_register(&pmu_device);
-diff -Nur linux-3.14.15/arch/arm/mach-realview/realview_pb1176.c linux-linaro-stable-mx6/arch/arm/mach-realview/realview_pb1176.c
---- linux-3.14.15/arch/arm/mach-realview/realview_pb1176.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-realview/realview_pb1176.c 2014-08-20 19:31:40.320844075 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-realview/realview_pb1176.c linux-imx6-3.14/arch/arm/mach-realview/realview_pb1176.c
+--- linux-3.14.17/arch/arm/mach-realview/realview_pb1176.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-realview/realview_pb1176.c 2014-09-09 10:13:47.508943205 +0200
@@ -355,7 +355,13 @@
int i;
@@ -30657,9 +30754,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-realview/realview_pb1176.c linux-linaro-st
l2x0_init(__io_address(REALVIEW_PB1176_L220_BASE), 0x00730000, 0xfe000fff);
#endif
-diff -Nur linux-3.14.15/arch/arm/mach-realview/realview_pb11mp.c linux-linaro-stable-mx6/arch/arm/mach-realview/realview_pb11mp.c
---- linux-3.14.15/arch/arm/mach-realview/realview_pb11mp.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-realview/realview_pb11mp.c 2014-08-20 19:31:40.320844075 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-realview/realview_pb11mp.c linux-imx6-3.14/arch/arm/mach-realview/realview_pb11mp.c
+--- linux-3.14.17/arch/arm/mach-realview/realview_pb11mp.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-realview/realview_pb11mp.c 2014-09-09 10:13:47.508943205 +0200
@@ -337,8 +337,13 @@
int i;
@@ -30676,9 +30773,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-realview/realview_pb11mp.c linux-linaro-st
l2x0_init(__io_address(REALVIEW_TC11MP_L220_BASE), 0x00790000, 0xfe000fff);
#endif
-diff -Nur linux-3.14.15/arch/arm/mach-realview/realview_pbx.c linux-linaro-stable-mx6/arch/arm/mach-realview/realview_pbx.c
---- linux-3.14.15/arch/arm/mach-realview/realview_pbx.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-realview/realview_pbx.c 2014-08-20 19:31:40.320844075 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-realview/realview_pbx.c linux-imx6-3.14/arch/arm/mach-realview/realview_pbx.c
+--- linux-3.14.17/arch/arm/mach-realview/realview_pbx.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-realview/realview_pbx.c 2014-09-09 10:13:47.508943205 +0200
@@ -370,8 +370,8 @@
__io_address(REALVIEW_PBX_TILE_L220_BASE);
@@ -30690,9 +30787,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-realview/realview_pbx.c linux-linaro-stabl
/* 16KB way size, 8-way associativity, parity disabled
* Bits: .. 0 0 0 0 1 00 1 0 1 001 0 000 0 .... .... .... */
-diff -Nur linux-3.14.15/arch/arm/mach-rockchip/rockchip.c linux-linaro-stable-mx6/arch/arm/mach-rockchip/rockchip.c
---- linux-3.14.15/arch/arm/mach-rockchip/rockchip.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-rockchip/rockchip.c 2014-08-20 19:31:40.320844075 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-rockchip/rockchip.c linux-imx6-3.14/arch/arm/mach-rockchip/rockchip.c
+--- linux-3.14.17/arch/arm/mach-rockchip/rockchip.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-rockchip/rockchip.c 2014-09-09 10:13:47.508943205 +0200
@@ -25,7 +25,7 @@
static void __init rockchip_dt_init(void)
@@ -30702,9 +30799,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-rockchip/rockchip.c linux-linaro-stable-mx
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
-diff -Nur linux-3.14.15/arch/arm/mach-shmobile/board-armadillo800eva.c linux-linaro-stable-mx6/arch/arm/mach-shmobile/board-armadillo800eva.c
---- linux-3.14.15/arch/arm/mach-shmobile/board-armadillo800eva.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-shmobile/board-armadillo800eva.c 2014-08-20 19:31:40.356844228 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-shmobile/board-armadillo800eva.c linux-imx6-3.14/arch/arm/mach-shmobile/board-armadillo800eva.c
+--- linux-3.14.17/arch/arm/mach-shmobile/board-armadillo800eva.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-shmobile/board-armadillo800eva.c 2014-09-09 10:13:47.532943401 +0200
@@ -1270,8 +1270,8 @@
@@ -30716,9 +30813,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-shmobile/board-armadillo800eva.c linux-lin
#endif
i2c_register_board_info(0, i2c0_devices, ARRAY_SIZE(i2c0_devices));
-diff -Nur linux-3.14.15/arch/arm/mach-shmobile/board-armadillo800eva-reference.c linux-linaro-stable-mx6/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
---- linux-3.14.15/arch/arm/mach-shmobile/board-armadillo800eva-reference.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-shmobile/board-armadillo800eva-reference.c 2014-08-20 19:31:40.356844228 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-shmobile/board-armadillo800eva-reference.c linux-imx6-3.14/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
+--- linux-3.14.17/arch/arm/mach-shmobile/board-armadillo800eva-reference.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-shmobile/board-armadillo800eva-reference.c 2014-09-09 10:13:47.532943401 +0200
@@ -164,8 +164,8 @@
r8a7740_meram_workaround();
@@ -30730,9 +30827,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
#endif
r8a7740_add_standard_devices_dt();
-diff -Nur linux-3.14.15/arch/arm/mach-shmobile/board-kzm9g.c linux-linaro-stable-mx6/arch/arm/mach-shmobile/board-kzm9g.c
---- linux-3.14.15/arch/arm/mach-shmobile/board-kzm9g.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-shmobile/board-kzm9g.c 2014-08-20 19:31:40.364844264 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-shmobile/board-kzm9g.c linux-imx6-3.14/arch/arm/mach-shmobile/board-kzm9g.c
+--- linux-3.14.17/arch/arm/mach-shmobile/board-kzm9g.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-shmobile/board-kzm9g.c 2014-09-09 10:13:47.532943401 +0200
@@ -878,8 +878,8 @@
gpio_request_one(223, GPIOF_IN, NULL); /* IRQ8 */
@@ -30744,9 +30841,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-shmobile/board-kzm9g.c linux-linaro-stable
#endif
i2c_register_board_info(0, i2c0_devices, ARRAY_SIZE(i2c0_devices));
-diff -Nur linux-3.14.15/arch/arm/mach-shmobile/board-kzm9g-reference.c linux-linaro-stable-mx6/arch/arm/mach-shmobile/board-kzm9g-reference.c
---- linux-3.14.15/arch/arm/mach-shmobile/board-kzm9g-reference.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-shmobile/board-kzm9g-reference.c 2014-08-20 19:31:40.360844246 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-shmobile/board-kzm9g-reference.c linux-imx6-3.14/arch/arm/mach-shmobile/board-kzm9g-reference.c
+--- linux-3.14.17/arch/arm/mach-shmobile/board-kzm9g-reference.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-shmobile/board-kzm9g-reference.c 2014-09-09 10:13:47.532943401 +0200
@@ -36,8 +36,8 @@
sh73a0_add_standard_devices_dt();
@@ -30758,9 +30855,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-shmobile/board-kzm9g-reference.c linux-lin
#endif
}
-diff -Nur linux-3.14.15/arch/arm/mach-shmobile/setup-r8a7778.c linux-linaro-stable-mx6/arch/arm/mach-shmobile/setup-r8a7778.c
---- linux-3.14.15/arch/arm/mach-shmobile/setup-r8a7778.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-shmobile/setup-r8a7778.c 2014-08-20 19:31:40.392844384 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-shmobile/setup-r8a7778.c linux-imx6-3.14/arch/arm/mach-shmobile/setup-r8a7778.c
+--- linux-3.14.17/arch/arm/mach-shmobile/setup-r8a7778.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-shmobile/setup-r8a7778.c 2014-09-09 10:13:47.540943466 +0200
@@ -298,10 +298,10 @@
void __iomem *base = ioremap_nocache(0xf0100000, 0x1000);
if (base) {
@@ -30774,9 +30871,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-shmobile/setup-r8a7778.c linux-linaro-stab
}
#endif
-diff -Nur linux-3.14.15/arch/arm/mach-shmobile/setup-r8a7779.c linux-linaro-stable-mx6/arch/arm/mach-shmobile/setup-r8a7779.c
---- linux-3.14.15/arch/arm/mach-shmobile/setup-r8a7779.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-shmobile/setup-r8a7779.c 2014-08-20 19:31:40.392844384 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-shmobile/setup-r8a7779.c linux-imx6-3.14/arch/arm/mach-shmobile/setup-r8a7779.c
+--- linux-3.14.17/arch/arm/mach-shmobile/setup-r8a7779.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-shmobile/setup-r8a7779.c 2014-09-09 10:13:47.540943466 +0200
@@ -700,8 +700,8 @@
void __init r8a7779_add_standard_devices(void)
{
@@ -30788,9 +30885,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-shmobile/setup-r8a7779.c linux-linaro-stab
#endif
r8a7779_pm_init();
-diff -Nur linux-3.14.15/arch/arm/mach-socfpga/socfpga.c linux-linaro-stable-mx6/arch/arm/mach-socfpga/socfpga.c
---- linux-3.14.15/arch/arm/mach-socfpga/socfpga.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-socfpga/socfpga.c 2014-08-20 19:31:40.404844435 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-socfpga/socfpga.c linux-imx6-3.14/arch/arm/mach-socfpga/socfpga.c
+--- linux-3.14.17/arch/arm/mach-socfpga/socfpga.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-socfpga/socfpga.c 2014-09-09 10:13:47.540943466 +0200
@@ -104,7 +104,7 @@
static void __init socfpga_cyclone5_init(void)
@@ -30800,9 +30897,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-socfpga/socfpga.c linux-linaro-stable-mx6/
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
socfpga_init_clocks();
}
-diff -Nur linux-3.14.15/arch/arm/mach-spear/platsmp.c linux-linaro-stable-mx6/arch/arm/mach-spear/platsmp.c
---- linux-3.14.15/arch/arm/mach-spear/platsmp.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-spear/platsmp.c 2014-08-20 19:31:40.404844435 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-spear/platsmp.c linux-imx6-3.14/arch/arm/mach-spear/platsmp.c
+--- linux-3.14.17/arch/arm/mach-spear/platsmp.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-spear/platsmp.c 2014-09-09 10:13:47.540943466 +0200
@@ -20,6 +20,18 @@
#include <mach/spear.h>
#include "generic.h"
@@ -30843,9 +30940,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-spear/platsmp.c linux-linaro-stable-mx6/ar
timeout = jiffies + (1 * HZ);
while (time_before(jiffies, timeout)) {
-diff -Nur linux-3.14.15/arch/arm/mach-spear/spear13xx.c linux-linaro-stable-mx6/arch/arm/mach-spear/spear13xx.c
---- linux-3.14.15/arch/arm/mach-spear/spear13xx.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-spear/spear13xx.c 2014-08-20 19:31:40.404844435 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-spear/spear13xx.c linux-imx6-3.14/arch/arm/mach-spear/spear13xx.c
+--- linux-3.14.17/arch/arm/mach-spear/spear13xx.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-spear/spear13xx.c 2014-09-09 10:13:47.540943466 +0200
@@ -38,15 +38,15 @@
if (!IS_ENABLED(CONFIG_CACHE_L2X0))
return;
@@ -30866,9 +30963,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-spear/spear13xx.c linux-linaro-stable-mx6/
}
/*
-diff -Nur linux-3.14.15/arch/arm/mach-sti/board-dt.c linux-linaro-stable-mx6/arch/arm/mach-sti/board-dt.c
---- linux-3.14.15/arch/arm/mach-sti/board-dt.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-sti/board-dt.c 2014-08-20 19:31:40.404844435 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-sti/board-dt.c linux-imx6-3.14/arch/arm/mach-sti/board-dt.c
+--- linux-3.14.17/arch/arm/mach-sti/board-dt.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-sti/board-dt.c 2014-09-09 10:13:47.544943499 +0200
@@ -16,15 +16,9 @@
void __init stih41x_l2x0_init(void)
@@ -30888,9 +30985,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-sti/board-dt.c linux-linaro-stable-mx6/arc
}
static void __init stih41x_machine_init(void)
-diff -Nur linux-3.14.15/arch/arm/mach-tegra/pm.h linux-linaro-stable-mx6/arch/arm/mach-tegra/pm.h
---- linux-3.14.15/arch/arm/mach-tegra/pm.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-tegra/pm.h 2014-08-20 19:31:40.408844453 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-tegra/pm.h linux-imx6-3.14/arch/arm/mach-tegra/pm.h
+--- linux-3.14.17/arch/arm/mach-tegra/pm.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-tegra/pm.h 2014-09-09 10:13:47.544943499 +0200
@@ -35,8 +35,6 @@
void tegra30_lp1_iram_hook(void);
void tegra30_sleep_core_init(void);
@@ -30900,9 +30997,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-tegra/pm.h linux-linaro-stable-mx6/arch/ar
void tegra_clear_cpu_in_lp2(void);
bool tegra_set_cpu_in_lp2(void);
-diff -Nur linux-3.14.15/arch/arm/mach-tegra/reset-handler.S linux-linaro-stable-mx6/arch/arm/mach-tegra/reset-handler.S
---- linux-3.14.15/arch/arm/mach-tegra/reset-handler.S 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-tegra/reset-handler.S 2014-08-20 19:31:40.412844470 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-tegra/reset-handler.S linux-imx6-3.14/arch/arm/mach-tegra/reset-handler.S
+--- linux-3.14.17/arch/arm/mach-tegra/reset-handler.S 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-tegra/reset-handler.S 2014-09-09 10:13:47.544943499 +0200
@@ -19,7 +19,6 @@
#include <asm/cache.h>
@@ -30936,9 +31033,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-tegra/reset-handler.S linux-linaro-stable-
.align L1_CACHE_SHIFT
ENTRY(__tegra_cpu_reset_handler_start)
-diff -Nur linux-3.14.15/arch/arm/mach-tegra/sleep.h linux-linaro-stable-mx6/arch/arm/mach-tegra/sleep.h
---- linux-3.14.15/arch/arm/mach-tegra/sleep.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-tegra/sleep.h 2014-08-20 19:31:40.412844470 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-tegra/sleep.h linux-imx6-3.14/arch/arm/mach-tegra/sleep.h
+--- linux-3.14.17/arch/arm/mach-tegra/sleep.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-tegra/sleep.h 2014-09-09 10:13:47.548943532 +0200
@@ -120,37 +120,6 @@
mov \tmp1, \tmp1, lsr #8
.endm
@@ -30977,9 +31074,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-tegra/sleep.h linux-linaro-stable-mx6/arch
#else
void tegra_pen_lock(void);
void tegra_pen_unlock(void);
-diff -Nur linux-3.14.15/arch/arm/mach-tegra/tegra.c linux-linaro-stable-mx6/arch/arm/mach-tegra/tegra.c
---- linux-3.14.15/arch/arm/mach-tegra/tegra.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-tegra/tegra.c 2014-08-20 19:31:40.412844470 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-tegra/tegra.c linux-imx6-3.14/arch/arm/mach-tegra/tegra.c
+--- linux-3.14.17/arch/arm/mach-tegra/tegra.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-tegra/tegra.c 2014-09-09 10:13:47.548943532 +0200
@@ -73,27 +73,7 @@
static void __init tegra_init_cache(void)
{
@@ -31009,9 +31106,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-tegra/tegra.c linux-linaro-stable-mx6/arch
#endif
}
-diff -Nur linux-3.14.15/arch/arm/mach-ux500/board-mop500-audio.c linux-linaro-stable-mx6/arch/arm/mach-ux500/board-mop500-audio.c
---- linux-3.14.15/arch/arm/mach-ux500/board-mop500-audio.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-ux500/board-mop500-audio.c 2014-08-20 19:31:40.412844470 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-ux500/board-mop500-audio.c linux-imx6-3.14/arch/arm/mach-ux500/board-mop500-audio.c
+--- linux-3.14.17/arch/arm/mach-ux500/board-mop500-audio.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-ux500/board-mop500-audio.c 2014-09-09 10:13:47.548943532 +0200
@@ -9,7 +9,6 @@
#include <linux/gpio.h>
#include <linux/platform_data/dma-ste-dma40.h>
@@ -31020,9 +31117,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-ux500/board-mop500-audio.c linux-linaro-st
#include <linux/platform_data/asoc-ux500-msp.h>
#include "ste-dma40-db8500.h"
-diff -Nur linux-3.14.15/arch/arm/mach-ux500/cache-l2x0.c linux-linaro-stable-mx6/arch/arm/mach-ux500/cache-l2x0.c
---- linux-3.14.15/arch/arm/mach-ux500/cache-l2x0.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-ux500/cache-l2x0.c 2014-08-20 19:31:40.416844487 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-ux500/cache-l2x0.c linux-imx6-3.14/arch/arm/mach-ux500/cache-l2x0.c
+--- linux-3.14.17/arch/arm/mach-ux500/cache-l2x0.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-ux500/cache-l2x0.c 2014-09-09 10:13:47.548943532 +0200
@@ -35,10 +35,16 @@
return 0;
}
@@ -31074,9 +31171,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-ux500/cache-l2x0.c linux-linaro-stable-mx6
return 0;
}
-diff -Nur linux-3.14.15/arch/arm/mach-ux500/cpu-db8500.c linux-linaro-stable-mx6/arch/arm/mach-ux500/cpu-db8500.c
---- linux-3.14.15/arch/arm/mach-ux500/cpu-db8500.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-ux500/cpu-db8500.c 2014-08-20 19:31:40.416844487 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-ux500/cpu-db8500.c linux-imx6-3.14/arch/arm/mach-ux500/cpu-db8500.c
+--- linux-3.14.17/arch/arm/mach-ux500/cpu-db8500.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-ux500/cpu-db8500.c 2014-09-09 10:13:47.548943532 +0200
@@ -27,7 +27,6 @@
#include <asm/mach/map.h>
@@ -31100,9 +31197,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-ux500/cpu-db8500.c linux-linaro-stable-mx6
.version_offset = DB8500_PRCMU_FW_VERSION_OFFSET,
.legacy_offset = DB8500_PRCMU_LEGACY_OFFSET,
};
-diff -Nur linux-3.14.15/arch/arm/mach-ux500/irqs-board-mop500.h linux-linaro-stable-mx6/arch/arm/mach-ux500/irqs-board-mop500.h
---- linux-3.14.15/arch/arm/mach-ux500/irqs-board-mop500.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-ux500/irqs-board-mop500.h 1970-01-01 01:00:00.000000000 +0100
+diff -Nur linux-3.14.17/arch/arm/mach-ux500/irqs-board-mop500.h linux-imx6-3.14/arch/arm/mach-ux500/irqs-board-mop500.h
+--- linux-3.14.17/arch/arm/mach-ux500/irqs-board-mop500.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-ux500/irqs-board-mop500.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
@@ -31159,9 +31256,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-ux500/irqs-board-mop500.h linux-linaro-sta
-#endif
-
-#endif
-diff -Nur linux-3.14.15/arch/arm/mach-ux500/irqs-db8500.h linux-linaro-stable-mx6/arch/arm/mach-ux500/irqs-db8500.h
---- linux-3.14.15/arch/arm/mach-ux500/irqs-db8500.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-ux500/irqs-db8500.h 1970-01-01 01:00:00.000000000 +0100
+diff -Nur linux-3.14.17/arch/arm/mach-ux500/irqs-db8500.h linux-imx6-3.14/arch/arm/mach-ux500/irqs-db8500.h
+--- linux-3.14.17/arch/arm/mach-ux500/irqs-db8500.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-ux500/irqs-db8500.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
@@ -31288,9 +31385,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-ux500/irqs-db8500.h linux-linaro-stable-mx
-
-#endif /* CONFIG_UX500_SOC_DB8500 */
-#endif
-diff -Nur linux-3.14.15/arch/arm/mach-ux500/irqs.h linux-linaro-stable-mx6/arch/arm/mach-ux500/irqs.h
---- linux-3.14.15/arch/arm/mach-ux500/irqs.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-ux500/irqs.h 1970-01-01 01:00:00.000000000 +0100
+diff -Nur linux-3.14.17/arch/arm/mach-ux500/irqs.h linux-imx6-3.14/arch/arm/mach-ux500/irqs.h
+--- linux-3.14.17/arch/arm/mach-ux500/irqs.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-ux500/irqs.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2008 STMicroelectronics
@@ -31341,9 +31438,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-ux500/irqs.h linux-linaro-stable-mx6/arch/
-#define UX500_NR_IRQS IRQ_BOARD_END
-
-#endif /* ASM_ARCH_IRQS_H */
-diff -Nur linux-3.14.15/arch/arm/mach-vexpress/ct-ca9x4.c linux-linaro-stable-mx6/arch/arm/mach-vexpress/ct-ca9x4.c
---- linux-3.14.15/arch/arm/mach-vexpress/ct-ca9x4.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/ct-ca9x4.c 2014-08-20 19:31:40.416844487 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-vexpress/ct-ca9x4.c linux-imx6-3.14/arch/arm/mach-vexpress/ct-ca9x4.c
+--- linux-3.14.17/arch/arm/mach-vexpress/ct-ca9x4.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-vexpress/ct-ca9x4.c 2014-09-09 10:13:47.552943564 +0200
@@ -45,6 +45,23 @@
iotable_init(ct_ca9x4_io_desc, ARRAY_SIZE(ct_ca9x4_io_desc));
}
@@ -31393,9 +31490,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-vexpress/ct-ca9x4.c linux-linaro-stable-mx
for (i = 0; i < ARRAY_SIZE(ct_ca9x4_amba_devs); i++)
amba_device_register(ct_ca9x4_amba_devs[i], &iomem_resource);
-diff -Nur linux-3.14.15/arch/arm/mach-vexpress/dcscb.c linux-linaro-stable-mx6/arch/arm/mach-vexpress/dcscb.c
---- linux-3.14.15/arch/arm/mach-vexpress/dcscb.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/dcscb.c 2014-08-20 19:23:46.262814691 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-vexpress/dcscb.c linux-imx6-3.14/arch/arm/mach-vexpress/dcscb.c
+--- linux-3.14.17/arch/arm/mach-vexpress/dcscb.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-vexpress/dcscb.c 2014-09-09 10:13:47.552943564 +0200
@@ -23,6 +23,7 @@
#include <asm/cacheflush.h>
#include <asm/cputype.h>
@@ -31417,9 +31514,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-vexpress/dcscb.c linux-linaro-stable-mx6/a
if (!cci_probed())
return -ENODEV;
-diff -Nur linux-3.14.15/arch/arm/mach-vexpress/Kconfig linux-linaro-stable-mx6/arch/arm/mach-vexpress/Kconfig
---- linux-3.14.15/arch/arm/mach-vexpress/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/Kconfig 2014-08-20 19:31:40.416844487 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-vexpress/Kconfig linux-imx6-3.14/arch/arm/mach-vexpress/Kconfig
+--- linux-3.14.17/arch/arm/mach-vexpress/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-vexpress/Kconfig 2014-09-09 10:13:47.552943564 +0200
@@ -55,6 +55,7 @@
config ARCH_VEXPRESS_CA9X4
@@ -31428,9 +31525,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-vexpress/Kconfig linux-linaro-stable-mx6/a
config ARCH_VEXPRESS_DCSCB
bool "Dual Cluster System Control Block (DCSCB) support"
-diff -Nur linux-3.14.15/arch/arm/mach-vexpress/Makefile linux-linaro-stable-mx6/arch/arm/mach-vexpress/Makefile
---- linux-3.14.15/arch/arm/mach-vexpress/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/Makefile 2014-08-20 19:31:40.416844487 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-vexpress/Makefile linux-imx6-3.14/arch/arm/mach-vexpress/Makefile
+--- linux-3.14.17/arch/arm/mach-vexpress/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-vexpress/Makefile 2014-09-09 10:13:47.552943564 +0200
@@ -8,8 +8,15 @@
obj-$(CONFIG_ARCH_VEXPRESS_CA9X4) += ct-ca9x4.o
obj-$(CONFIG_ARCH_VEXPRESS_DCSCB) += dcscb.o dcscb_setup.o
@@ -31447,9 +31544,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-vexpress/Makefile linux-linaro-stable-mx6/
+endif
obj-$(CONFIG_SMP) += platsmp.o
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
-diff -Nur linux-3.14.15/arch/arm/mach-vexpress/spc.c linux-linaro-stable-mx6/arch/arm/mach-vexpress/spc.c
---- linux-3.14.15/arch/arm/mach-vexpress/spc.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/spc.c 2014-08-20 19:31:40.416844487 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-vexpress/spc.c linux-imx6-3.14/arch/arm/mach-vexpress/spc.c
+--- linux-3.14.17/arch/arm/mach-vexpress/spc.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-vexpress/spc.c 2014-09-09 10:13:47.552943564 +0200
@@ -392,7 +392,7 @@
* +--------------------------+
* | 31 20 | 19 0 |
@@ -31468,9 +31565,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-vexpress/spc.c linux-linaro-stable-mx6/arc
} else {
break;
}
-diff -Nur linux-3.14.15/arch/arm/mach-vexpress/tc2_pm.c linux-linaro-stable-mx6/arch/arm/mach-vexpress/tc2_pm.c
---- linux-3.14.15/arch/arm/mach-vexpress/tc2_pm.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/tc2_pm.c 2014-08-20 19:31:40.416844487 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-vexpress/tc2_pm.c linux-imx6-3.14/arch/arm/mach-vexpress/tc2_pm.c
+--- linux-3.14.17/arch/arm/mach-vexpress/tc2_pm.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-vexpress/tc2_pm.c 2014-09-09 10:13:47.552943564 +0200
@@ -27,6 +27,7 @@
#include <asm/cacheflush.h>
#include <asm/cputype.h>
@@ -31492,9 +31589,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-vexpress/tc2_pm.c linux-linaro-stable-mx6/
/*
* The power management-related features are hidden behind
* SCC registers. We need to extract runtime information like
-diff -Nur linux-3.14.15/arch/arm/mach-vexpress/tc2_pm_psci.c linux-linaro-stable-mx6/arch/arm/mach-vexpress/tc2_pm_psci.c
---- linux-3.14.15/arch/arm/mach-vexpress/tc2_pm_psci.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/tc2_pm_psci.c 2014-08-20 19:31:40.416844487 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-vexpress/tc2_pm_psci.c linux-imx6-3.14/arch/arm/mach-vexpress/tc2_pm_psci.c
+--- linux-3.14.17/arch/arm/mach-vexpress/tc2_pm_psci.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/mach-vexpress/tc2_pm_psci.c 2014-09-09 10:13:47.552943564 +0200
@@ -0,0 +1,173 @@
+/*
+ * arch/arm/mach-vexpress/tc2_pm_psci.c - TC2 PSCI support
@@ -31669,9 +31766,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-vexpress/tc2_pm_psci.c linux-linaro-stable
+}
+
+early_initcall(tc2_pm_psci_init);
-diff -Nur linux-3.14.15/arch/arm/mach-vexpress/v2m.c linux-linaro-stable-mx6/arch/arm/mach-vexpress/v2m.c
---- linux-3.14.15/arch/arm/mach-vexpress/v2m.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/v2m.c 2014-08-20 19:31:40.416844487 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-vexpress/v2m.c linux-imx6-3.14/arch/arm/mach-vexpress/v2m.c
+--- linux-3.14.17/arch/arm/mach-vexpress/v2m.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-vexpress/v2m.c 2014-09-09 10:13:47.552943564 +0200
@@ -7,6 +7,7 @@
#include <linux/io.h>
#include <linux/smp.h>
@@ -31721,9 +31818,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-vexpress/v2m.c linux-linaro-stable-mx6/arc
}
static const struct of_device_id v2m_dt_bus_match[] __initconst = {
-diff -Nur linux-3.14.15/arch/arm/mach-zynq/common.c linux-linaro-stable-mx6/arch/arm/mach-zynq/common.c
---- linux-3.14.15/arch/arm/mach-zynq/common.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mach-zynq/common.c 2014-08-20 19:31:40.420844504 +0200
+diff -Nur linux-3.14.17/arch/arm/mach-zynq/common.c linux-imx6-3.14/arch/arm/mach-zynq/common.c
+--- linux-3.14.17/arch/arm/mach-zynq/common.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mach-zynq/common.c 2014-09-09 10:13:47.556943596 +0200
@@ -67,7 +67,7 @@
/*
* 64KB way size, 8-way associativity, parity disabled
@@ -31733,9 +31830,9 @@ diff -Nur linux-3.14.15/arch/arm/mach-zynq/common.c linux-linaro-stable-mx6/arch
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
-diff -Nur linux-3.14.15/arch/arm/mm/cache-feroceon-l2.c linux-linaro-stable-mx6/arch/arm/mm/cache-feroceon-l2.c
---- linux-3.14.15/arch/arm/mm/cache-feroceon-l2.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mm/cache-feroceon-l2.c 2014-08-20 19:31:40.420844504 +0200
+diff -Nur linux-3.14.17/arch/arm/mm/cache-feroceon-l2.c linux-imx6-3.14/arch/arm/mm/cache-feroceon-l2.c
+--- linux-3.14.17/arch/arm/mm/cache-feroceon-l2.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mm/cache-feroceon-l2.c 2014-09-09 10:13:47.580943792 +0200
@@ -343,7 +343,6 @@
outer_cache.inv_range = feroceon_l2_inv_range;
outer_cache.clean_range = feroceon_l2_clean_range;
@@ -31744,9 +31841,9 @@ diff -Nur linux-3.14.15/arch/arm/mm/cache-feroceon-l2.c linux-linaro-stable-mx6/
enable_l2();
-diff -Nur linux-3.14.15/arch/arm/mm/cache-l2x0.c linux-linaro-stable-mx6/arch/arm/mm/cache-l2x0.c
---- linux-3.14.15/arch/arm/mm/cache-l2x0.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mm/cache-l2x0.c 2014-08-20 19:31:40.420844504 +0200
+diff -Nur linux-3.14.17/arch/arm/mm/cache-l2x0.c linux-imx6-3.14/arch/arm/mm/cache-l2x0.c
+--- linux-3.14.17/arch/arm/mm/cache-l2x0.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mm/cache-l2x0.c 2014-09-09 10:13:47.580943792 +0200
@@ -16,18 +16,33 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@@ -33563,9 +33660,20 @@ diff -Nur linux-3.14.15/arch/arm/mm/cache-l2x0.c linux-linaro-stable-mx6/arch/ar
return 0;
}
-diff -Nur linux-3.14.15/arch/arm/mm/fault.c linux-linaro-stable-mx6/arch/arm/mm/fault.c
---- linux-3.14.15/arch/arm/mm/fault.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mm/fault.c 2014-08-20 19:31:40.428844537 +0200
+diff -Nur linux-3.14.17/arch/arm/mm/dma-mapping.c linux-imx6-3.14/arch/arm/mm/dma-mapping.c
+--- linux-3.14.17/arch/arm/mm/dma-mapping.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mm/dma-mapping.c 2014-09-09 10:13:47.580943792 +0200
+@@ -26,6 +26,7 @@
+ #include <linux/io.h>
+ #include <linux/vmalloc.h>
+ #include <linux/sizes.h>
++#include <linux/cma.h>
+
+ #include <asm/memory.h>
+ #include <asm/highmem.h>
+diff -Nur linux-3.14.17/arch/arm/mm/fault.c linux-imx6-3.14/arch/arm/mm/fault.c
+--- linux-3.14.17/arch/arm/mm/fault.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mm/fault.c 2014-09-09 10:13:47.584943825 +0200
@@ -449,8 +449,16 @@
if (pud_none(*pud_k))
@@ -33595,9 +33703,38 @@ diff -Nur linux-3.14.15/arch/arm/mm/fault.c linux-linaro-stable-mx6/arch/arm/mm/
return 0;
bad_area:
-diff -Nur linux-3.14.15/arch/arm/mm/Kconfig linux-linaro-stable-mx6/arch/arm/mm/Kconfig
---- linux-3.14.15/arch/arm/mm/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mm/Kconfig 2014-08-20 19:31:40.420844504 +0200
+diff -Nur linux-3.14.17/arch/arm/mm/idmap.c linux-imx6-3.14/arch/arm/mm/idmap.c
+--- linux-3.14.17/arch/arm/mm/idmap.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mm/idmap.c 2014-09-09 10:13:47.584943825 +0200
+@@ -25,13 +25,6 @@
+ pr_warning("Failed to allocate identity pmd.\n");
+ return;
+ }
+- /*
+- * Copy the original PMD to ensure that the PMD entries for
+- * the kernel image are preserved.
+- */
+- if (!pud_none(*pud))
+- memcpy(pmd, pmd_offset(pud, 0),
+- PTRS_PER_PMD * sizeof(pmd_t));
+ pud_populate(&init_mm, pud, pmd);
+ pmd += pmd_index(addr);
+ } else
+diff -Nur linux-3.14.17/arch/arm/mm/init.c linux-imx6-3.14/arch/arm/mm/init.c
+--- linux-3.14.17/arch/arm/mm/init.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mm/init.c 2014-09-09 10:13:47.584943825 +0200
+@@ -327,7 +327,7 @@
+ * reserve memory for DMA contigouos allocations,
+ * must come from DMA area inside low memory
+ */
+- dma_contiguous_reserve(min(arm_dma_limit, arm_lowmem_limit));
++ dma_contiguous_reserve(arm_dma_limit);
+
+ arm_memblock_steal_permitted = false;
+ memblock_dump_all();
+diff -Nur linux-3.14.17/arch/arm/mm/Kconfig linux-imx6-3.14/arch/arm/mm/Kconfig
+--- linux-3.14.17/arch/arm/mm/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mm/Kconfig 2014-09-09 10:13:47.556943596 +0200
@@ -897,6 +897,57 @@
This option enables optimisations for the PL310 cache
controller.
@@ -33656,9 +33793,9 @@ diff -Nur linux-3.14.15/arch/arm/mm/Kconfig linux-linaro-stable-mx6/arch/arm/mm/
config CACHE_TAUROS2
bool "Enable the Tauros2 L2 cache controller"
depends on (ARCH_DOVE || ARCH_MMP || CPU_PJ4)
-diff -Nur linux-3.14.15/arch/arm/mm/l2c-common.c linux-linaro-stable-mx6/arch/arm/mm/l2c-common.c
---- linux-3.14.15/arch/arm/mm/l2c-common.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mm/l2c-common.c 2014-08-20 19:31:40.436844573 +0200
+diff -Nur linux-3.14.17/arch/arm/mm/l2c-common.c linux-imx6-3.14/arch/arm/mm/l2c-common.c
+--- linux-3.14.17/arch/arm/mm/l2c-common.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/mm/l2c-common.c 2014-09-09 10:13:47.584943825 +0200
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2010 ARM Ltd.
@@ -33680,9 +33817,9 @@ diff -Nur linux-3.14.15/arch/arm/mm/l2c-common.c linux-linaro-stable-mx6/arch/ar
+ if (outer_cache.disable)
+ outer_cache.disable();
+}
-diff -Nur linux-3.14.15/arch/arm/mm/l2c-l2x0-resume.S linux-linaro-stable-mx6/arch/arm/mm/l2c-l2x0-resume.S
---- linux-3.14.15/arch/arm/mm/l2c-l2x0-resume.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/mm/l2c-l2x0-resume.S 2014-08-20 19:31:40.436844573 +0200
+diff -Nur linux-3.14.17/arch/arm/mm/l2c-l2x0-resume.S linux-imx6-3.14/arch/arm/mm/l2c-l2x0-resume.S
+--- linux-3.14.17/arch/arm/mm/l2c-l2x0-resume.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm/mm/l2c-l2x0-resume.S 2014-09-09 10:13:47.584943825 +0200
@@ -0,0 +1,58 @@
+/*
+ * L2C-310 early resume code. This can be used by platforms to restore
@@ -33742,9 +33879,9 @@ diff -Nur linux-3.14.15/arch/arm/mm/l2c-l2x0-resume.S linux-linaro-stable-mx6/ar
+
+ .align
+1: .long l2x0_saved_regs - .
-diff -Nur linux-3.14.15/arch/arm/mm/Makefile linux-linaro-stable-mx6/arch/arm/mm/Makefile
---- linux-3.14.15/arch/arm/mm/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mm/Makefile 2014-08-20 19:31:40.420844504 +0200
+diff -Nur linux-3.14.17/arch/arm/mm/Makefile linux-imx6-3.14/arch/arm/mm/Makefile
+--- linux-3.14.17/arch/arm/mm/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mm/Makefile 2014-09-09 10:13:47.556943596 +0200
@@ -95,7 +95,8 @@
AFLAGS_proc-v6.o :=-Wa,-march=armv6
AFLAGS_proc-v7.o :=-Wa,-march=armv7-a
@@ -33755,9 +33892,32 @@ diff -Nur linux-3.14.15/arch/arm/mm/Makefile linux-linaro-stable-mx6/arch/arm/mm
+obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o l2c-l2x0-resume.o
obj-$(CONFIG_CACHE_XSC3L2) += cache-xsc3l2.o
obj-$(CONFIG_CACHE_TAUROS2) += cache-tauros2.o
-diff -Nur linux-3.14.15/arch/arm/mm/proc-v7.S linux-linaro-stable-mx6/arch/arm/mm/proc-v7.S
---- linux-3.14.15/arch/arm/mm/proc-v7.S 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm/mm/proc-v7.S 2014-08-20 19:31:40.460844676 +0200
+diff -Nur linux-3.14.17/arch/arm/mm/mmu.c linux-imx6-3.14/arch/arm/mm/mmu.c
+--- linux-3.14.17/arch/arm/mm/mmu.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mm/mmu.c 2014-09-09 10:13:47.584943825 +0200
+@@ -1436,8 +1436,8 @@
+ return;
+
+ /* remap kernel code and data */
+- map_start = init_mm.start_code & PMD_MASK;
+- map_end = ALIGN(init_mm.brk, PMD_SIZE);
++ map_start = init_mm.start_code;
++ map_end = init_mm.brk;
+
+ /* get a handle on things... */
+ pgd0 = pgd_offset_k(0);
+@@ -1472,7 +1472,7 @@
+ }
+
+ /* remap pmds for kernel mapping */
+- phys = __pa(map_start);
++ phys = __pa(map_start) & PMD_MASK;
+ do {
+ *pmdk++ = __pmd(phys | pmdprot);
+ phys += PMD_SIZE;
+diff -Nur linux-3.14.17/arch/arm/mm/proc-v7.S linux-imx6-3.14/arch/arm/mm/proc-v7.S
+--- linux-3.14.17/arch/arm/mm/proc-v7.S 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm/mm/proc-v7.S 2014-09-09 10:13:47.588943859 +0200
@@ -336,6 +336,17 @@
mcrlt p15, 0, r10, c15, c0, 1 @ write diagnostic register
1:
@@ -33776,9 +33936,9 @@ diff -Nur linux-3.14.15/arch/arm/mm/proc-v7.S linux-linaro-stable-mx6/arch/arm/m
/* Cortex-A15 Errata */
3: ldr r10, =0x00000c0f @ Cortex-A15 primary part number
-diff -Nur linux-3.14.15/arch/arm64/boot/dts/apm-mustang.dts linux-linaro-stable-mx6/arch/arm64/boot/dts/apm-mustang.dts
---- linux-3.14.15/arch/arm64/boot/dts/apm-mustang.dts 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/boot/dts/apm-mustang.dts 2014-08-20 19:31:40.540845019 +0200
+diff -Nur linux-3.14.17/arch/arm64/boot/dts/apm-mustang.dts linux-imx6-3.14/arch/arm64/boot/dts/apm-mustang.dts
+--- linux-3.14.17/arch/arm64/boot/dts/apm-mustang.dts 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/boot/dts/apm-mustang.dts 2014-09-09 10:13:47.604943988 +0200
@@ -24,3 +24,7 @@
reg = < 0x1 0x00000000 0x0 0x80000000 >; /* Updated by bootloader */
};
@@ -33787,9 +33947,9 @@ diff -Nur linux-3.14.15/arch/arm64/boot/dts/apm-mustang.dts linux-linaro-stable-
+&serial0 {
+ status = "ok";
+};
-diff -Nur linux-3.14.15/arch/arm64/boot/dts/apm-storm.dtsi linux-linaro-stable-mx6/arch/arm64/boot/dts/apm-storm.dtsi
---- linux-3.14.15/arch/arm64/boot/dts/apm-storm.dtsi 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/boot/dts/apm-storm.dtsi 2014-08-20 19:31:40.540845019 +0200
+diff -Nur linux-3.14.17/arch/arm64/boot/dts/apm-storm.dtsi linux-imx6-3.14/arch/arm64/boot/dts/apm-storm.dtsi
+--- linux-3.14.17/arch/arm64/boot/dts/apm-storm.dtsi 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/boot/dts/apm-storm.dtsi 2014-09-09 10:13:47.604943988 +0200
@@ -176,16 +176,226 @@
reg-names = "csr-reg";
clock-output-names = "eth8clk";
@@ -34018,9 +34178,9 @@ diff -Nur linux-3.14.15/arch/arm64/boot/dts/apm-storm.dtsi linux-linaro-stable-m
+ };
};
};
-diff -Nur linux-3.14.15/arch/arm64/boot/dts/clcd-panels.dtsi linux-linaro-stable-mx6/arch/arm64/boot/dts/clcd-panels.dtsi
---- linux-3.14.15/arch/arm64/boot/dts/clcd-panels.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/boot/dts/clcd-panels.dtsi 2014-08-20 19:31:40.540845019 +0200
+diff -Nur linux-3.14.17/arch/arm64/boot/dts/clcd-panels.dtsi linux-imx6-3.14/arch/arm64/boot/dts/clcd-panels.dtsi
+--- linux-3.14.17/arch/arm64/boot/dts/clcd-panels.dtsi 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/boot/dts/clcd-panels.dtsi 2014-09-09 10:13:47.604943988 +0200
@@ -0,0 +1,52 @@
+/*
+ * ARM Ltd. Versatile Express
@@ -34074,9 +34234,9 @@ diff -Nur linux-3.14.15/arch/arm64/boot/dts/clcd-panels.dtsi linux-linaro-stable
+ };
+ };
+};
-diff -Nur linux-3.14.15/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts linux-linaro-stable-mx6/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts
---- linux-3.14.15/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts 2014-08-20 19:31:40.540845019 +0200
+diff -Nur linux-3.14.17/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts linux-imx6-3.14/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts
+--- linux-3.14.17/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts 2014-09-09 10:13:47.604943988 +0200
@@ -0,0 +1,266 @@
+/*
+ * Copyright (c) 2013, ARM Limited. All rights reserved.
@@ -34344,9 +34504,9 @@ diff -Nur linux-3.14.15/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts linux-linaro
+};
+
+/include/ "clcd-panels.dtsi"
-diff -Nur linux-3.14.15/arch/arm64/boot/dts/juno.dts linux-linaro-stable-mx6/arch/arm64/boot/dts/juno.dts
---- linux-3.14.15/arch/arm64/boot/dts/juno.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/boot/dts/juno.dts 2014-08-20 19:31:40.540845019 +0200
+diff -Nur linux-3.14.17/arch/arm64/boot/dts/juno.dts linux-imx6-3.14/arch/arm64/boot/dts/juno.dts
+--- linux-3.14.17/arch/arm64/boot/dts/juno.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/boot/dts/juno.dts 2014-09-09 10:13:47.604943988 +0200
@@ -0,0 +1,498 @@
+/*
+ * ARM Ltd. Juno Plaform
@@ -34846,9 +35006,9 @@ diff -Nur linux-3.14.15/arch/arm64/boot/dts/juno.dts linux-linaro-stable-mx6/arc
+ };
+ };
+};
-diff -Nur linux-3.14.15/arch/arm64/boot/dts/Makefile linux-linaro-stable-mx6/arch/arm64/boot/dts/Makefile
---- linux-3.14.15/arch/arm64/boot/dts/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/boot/dts/Makefile 2014-08-20 19:31:40.540845019 +0200
+diff -Nur linux-3.14.17/arch/arm64/boot/dts/Makefile linux-imx6-3.14/arch/arm64/boot/dts/Makefile
+--- linux-3.14.17/arch/arm64/boot/dts/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/boot/dts/Makefile 2014-09-09 10:13:47.604943988 +0200
@@ -1,5 +1,7 @@
-dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb foundation-v8.dtb
+dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb foundation-v8.dtb \
@@ -34858,18 +35018,18 @@ diff -Nur linux-3.14.15/arch/arm64/boot/dts/Makefile linux-linaro-stable-mx6/arc
targets += dtbs
targets += $(dtb-y)
-diff -Nur linux-3.14.15/arch/arm64/boot/dts/rtsm_ve-aemv8a.dts linux-linaro-stable-mx6/arch/arm64/boot/dts/rtsm_ve-aemv8a.dts
---- linux-3.14.15/arch/arm64/boot/dts/rtsm_ve-aemv8a.dts 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/boot/dts/rtsm_ve-aemv8a.dts 2014-08-20 19:31:40.540845019 +0200
+diff -Nur linux-3.14.17/arch/arm64/boot/dts/rtsm_ve-aemv8a.dts linux-imx6-3.14/arch/arm64/boot/dts/rtsm_ve-aemv8a.dts
+--- linux-3.14.17/arch/arm64/boot/dts/rtsm_ve-aemv8a.dts 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/boot/dts/rtsm_ve-aemv8a.dts 2014-09-09 10:13:47.604943988 +0200
@@ -157,3 +157,5 @@
/include/ "rtsm_ve-motherboard.dtsi"
};
};
+
+/include/ "clcd-panels.dtsi"
-diff -Nur linux-3.14.15/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi linux-linaro-stable-mx6/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi
---- linux-3.14.15/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi 2014-08-20 19:23:46.326814964 +0200
+diff -Nur linux-3.14.17/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi linux-imx6-3.14/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi
+--- linux-3.14.17/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi 2014-09-09 10:13:47.604943988 +0200
@@ -182,6 +182,9 @@
interrupts = <14>;
clocks = <&v2m_oscclk1>, <&v2m_clk24mhz>;
@@ -34880,9 +35040,9 @@ diff -Nur linux-3.14.15/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi linux-linar
};
virtio_block@0130000 {
-diff -Nur linux-3.14.15/arch/arm64/crypto/aes-ce-ccm-core.S linux-linaro-stable-mx6/arch/arm64/crypto/aes-ce-ccm-core.S
---- linux-3.14.15/arch/arm64/crypto/aes-ce-ccm-core.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/crypto/aes-ce-ccm-core.S 2014-08-20 19:31:40.540845019 +0200
+diff -Nur linux-3.14.17/arch/arm64/crypto/aes-ce-ccm-core.S linux-imx6-3.14/arch/arm64/crypto/aes-ce-ccm-core.S
+--- linux-3.14.17/arch/arm64/crypto/aes-ce-ccm-core.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/crypto/aes-ce-ccm-core.S 2014-09-09 10:13:47.604943988 +0200
@@ -0,0 +1,222 @@
+/*
+ * aesce-ccm-core.S - AES-CCM transform for ARMv8 with Crypto Extensions
@@ -35106,9 +35266,9 @@ diff -Nur linux-3.14.15/arch/arm64/crypto/aes-ce-ccm-core.S linux-linaro-stable-
+ENTRY(ce_aes_ccm_decrypt)
+ aes_ccm_do_crypt 0
+ENDPROC(ce_aes_ccm_decrypt)
-diff -Nur linux-3.14.15/arch/arm64/crypto/aes-ce-ccm-glue.c linux-linaro-stable-mx6/arch/arm64/crypto/aes-ce-ccm-glue.c
---- linux-3.14.15/arch/arm64/crypto/aes-ce-ccm-glue.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/crypto/aes-ce-ccm-glue.c 2014-08-20 19:31:40.540845019 +0200
+diff -Nur linux-3.14.17/arch/arm64/crypto/aes-ce-ccm-glue.c linux-imx6-3.14/arch/arm64/crypto/aes-ce-ccm-glue.c
+--- linux-3.14.17/arch/arm64/crypto/aes-ce-ccm-glue.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/crypto/aes-ce-ccm-glue.c 2014-09-09 10:13:47.604943988 +0200
@@ -0,0 +1,297 @@
+/*
+ * aes-ccm-glue.c - AES-CCM transform for ARMv8 with Crypto Extensions
@@ -35407,9 +35567,9 @@ diff -Nur linux-3.14.15/arch/arm64/crypto/aes-ce-ccm-glue.c linux-linaro-stable-
+MODULE_AUTHOR("Ard Biesheuvel <ard.biesheuvel@linaro.org>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("ccm(aes)");
-diff -Nur linux-3.14.15/arch/arm64/crypto/aes-ce-cipher.c linux-linaro-stable-mx6/arch/arm64/crypto/aes-ce-cipher.c
---- linux-3.14.15/arch/arm64/crypto/aes-ce-cipher.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/crypto/aes-ce-cipher.c 2014-08-20 19:31:40.540845019 +0200
+diff -Nur linux-3.14.17/arch/arm64/crypto/aes-ce-cipher.c linux-imx6-3.14/arch/arm64/crypto/aes-ce-cipher.c
+--- linux-3.14.17/arch/arm64/crypto/aes-ce-cipher.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/crypto/aes-ce-cipher.c 2014-09-09 10:13:47.604943988 +0200
@@ -0,0 +1,155 @@
+/*
+ * aes-ce-cipher.c - core AES cipher using ARMv8 Crypto Extensions
@@ -35566,9 +35726,9 @@ diff -Nur linux-3.14.15/arch/arm64/crypto/aes-ce-cipher.c linux-linaro-stable-mx
+
+module_cpu_feature_match(AES, aes_mod_init);
+module_exit(aes_mod_exit);
-diff -Nur linux-3.14.15/arch/arm64/crypto/aes-ce.S linux-linaro-stable-mx6/arch/arm64/crypto/aes-ce.S
---- linux-3.14.15/arch/arm64/crypto/aes-ce.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/crypto/aes-ce.S 2014-08-20 19:31:40.540845019 +0200
+diff -Nur linux-3.14.17/arch/arm64/crypto/aes-ce.S linux-imx6-3.14/arch/arm64/crypto/aes-ce.S
+--- linux-3.14.17/arch/arm64/crypto/aes-ce.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/crypto/aes-ce.S 2014-09-09 10:13:47.604943988 +0200
@@ -0,0 +1,133 @@
+/*
+ * linux/arch/arm64/crypto/aes-ce.S - AES cipher for ARMv8 with
@@ -35703,9 +35863,9 @@ diff -Nur linux-3.14.15/arch/arm64/crypto/aes-ce.S linux-linaro-stable-mx6/arch/
+ .endm
+
+#include "aes-modes.S"
-diff -Nur linux-3.14.15/arch/arm64/crypto/aes-glue.c linux-linaro-stable-mx6/arch/arm64/crypto/aes-glue.c
---- linux-3.14.15/arch/arm64/crypto/aes-glue.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/crypto/aes-glue.c 2014-08-20 19:31:40.540845019 +0200
+diff -Nur linux-3.14.17/arch/arm64/crypto/aes-glue.c linux-imx6-3.14/arch/arm64/crypto/aes-glue.c
+--- linux-3.14.17/arch/arm64/crypto/aes-glue.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/crypto/aes-glue.c 2014-09-09 10:13:47.604943988 +0200
@@ -0,0 +1,446 @@
+/*
+ * linux/arch/arm64/crypto/aes-glue.c - wrapper code for ARMv8 AES
@@ -36153,9 +36313,9 @@ diff -Nur linux-3.14.15/arch/arm64/crypto/aes-glue.c linux-linaro-stable-mx6/arc
+module_init(aes_init);
+#endif
+module_exit(aes_exit);
-diff -Nur linux-3.14.15/arch/arm64/crypto/aes-modes.S linux-linaro-stable-mx6/arch/arm64/crypto/aes-modes.S
---- linux-3.14.15/arch/arm64/crypto/aes-modes.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/crypto/aes-modes.S 2014-08-20 19:31:40.540845019 +0200
+diff -Nur linux-3.14.17/arch/arm64/crypto/aes-modes.S linux-imx6-3.14/arch/arm64/crypto/aes-modes.S
+--- linux-3.14.17/arch/arm64/crypto/aes-modes.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/crypto/aes-modes.S 2014-09-09 10:13:47.604943988 +0200
@@ -0,0 +1,532 @@
+/*
+ * linux/arch/arm64/crypto/aes-modes.S - chaining mode wrappers for AES
@@ -36689,9 +36849,9 @@ diff -Nur linux-3.14.15/arch/arm64/crypto/aes-modes.S linux-linaro-stable-mx6/ar
+ FRAME_POP
+ ret
+AES_ENDPROC(aes_xts_decrypt)
-diff -Nur linux-3.14.15/arch/arm64/crypto/aes-neon.S linux-linaro-stable-mx6/arch/arm64/crypto/aes-neon.S
---- linux-3.14.15/arch/arm64/crypto/aes-neon.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/crypto/aes-neon.S 2014-08-20 19:31:40.544845035 +0200
+diff -Nur linux-3.14.17/arch/arm64/crypto/aes-neon.S linux-imx6-3.14/arch/arm64/crypto/aes-neon.S
+--- linux-3.14.17/arch/arm64/crypto/aes-neon.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/crypto/aes-neon.S 2014-09-09 10:13:47.604943988 +0200
@@ -0,0 +1,382 @@
+/*
+ * linux/arch/arm64/crypto/aes-neon.S - AES cipher for ARMv8 NEON
@@ -37075,9 +37235,9 @@ diff -Nur linux-3.14.15/arch/arm64/crypto/aes-neon.S linux-linaro-stable-mx6/arc
+ .byte 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61
+ .byte 0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26
+ .byte 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d
-diff -Nur linux-3.14.15/arch/arm64/crypto/ghash-ce-core.S linux-linaro-stable-mx6/arch/arm64/crypto/ghash-ce-core.S
---- linux-3.14.15/arch/arm64/crypto/ghash-ce-core.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/crypto/ghash-ce-core.S 2014-08-20 19:31:40.544845035 +0200
+diff -Nur linux-3.14.17/arch/arm64/crypto/ghash-ce-core.S linux-imx6-3.14/arch/arm64/crypto/ghash-ce-core.S
+--- linux-3.14.17/arch/arm64/crypto/ghash-ce-core.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/crypto/ghash-ce-core.S 2014-09-09 10:13:47.604943988 +0200
@@ -0,0 +1,79 @@
+/*
+ * Accelerated GHASH implementation with ARMv8 PMULL instructions.
@@ -37158,9 +37318,9 @@ diff -Nur linux-3.14.15/arch/arm64/crypto/ghash-ce-core.S linux-linaro-stable-mx
+ st1 {XL.16b}, [x1]
+ ret
+ENDPROC(pmull_ghash_update)
-diff -Nur linux-3.14.15/arch/arm64/crypto/ghash-ce-glue.c linux-linaro-stable-mx6/arch/arm64/crypto/ghash-ce-glue.c
---- linux-3.14.15/arch/arm64/crypto/ghash-ce-glue.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/crypto/ghash-ce-glue.c 2014-08-20 19:31:40.544845035 +0200
+diff -Nur linux-3.14.17/arch/arm64/crypto/ghash-ce-glue.c linux-imx6-3.14/arch/arm64/crypto/ghash-ce-glue.c
+--- linux-3.14.17/arch/arm64/crypto/ghash-ce-glue.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/crypto/ghash-ce-glue.c 2014-09-09 10:13:47.604943988 +0200
@@ -0,0 +1,156 @@
+/*
+ * Accelerated GHASH implementation with ARMv8 PMULL instructions.
@@ -37318,9 +37478,9 @@ diff -Nur linux-3.14.15/arch/arm64/crypto/ghash-ce-glue.c linux-linaro-stable-mx
+
+module_cpu_feature_match(PMULL, ghash_ce_mod_init);
+module_exit(ghash_ce_mod_exit);
-diff -Nur linux-3.14.15/arch/arm64/crypto/Kconfig linux-linaro-stable-mx6/arch/arm64/crypto/Kconfig
---- linux-3.14.15/arch/arm64/crypto/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/crypto/Kconfig 2014-08-20 19:31:40.540845019 +0200
+diff -Nur linux-3.14.17/arch/arm64/crypto/Kconfig linux-imx6-3.14/arch/arm64/crypto/Kconfig
+--- linux-3.14.17/arch/arm64/crypto/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/crypto/Kconfig 2014-09-09 10:13:47.604943988 +0200
@@ -0,0 +1,53 @@
+
+menuconfig ARM64_CRYPTO
@@ -37375,9 +37535,9 @@ diff -Nur linux-3.14.15/arch/arm64/crypto/Kconfig linux-linaro-stable-mx6/arch/a
+ select CRYPTO_ABLK_HELPER
+
+endif
-diff -Nur linux-3.14.15/arch/arm64/crypto/Makefile linux-linaro-stable-mx6/arch/arm64/crypto/Makefile
---- linux-3.14.15/arch/arm64/crypto/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/crypto/Makefile 2014-08-20 19:31:40.540845019 +0200
+diff -Nur linux-3.14.17/arch/arm64/crypto/Makefile linux-imx6-3.14/arch/arm64/crypto/Makefile
+--- linux-3.14.17/arch/arm64/crypto/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/crypto/Makefile 2014-09-09 10:13:47.604943988 +0200
@@ -0,0 +1,38 @@
+#
+# linux/arch/arm64/crypto/Makefile
@@ -37417,9 +37577,9 @@ diff -Nur linux-3.14.15/arch/arm64/crypto/Makefile linux-linaro-stable-mx6/arch/
+
+$(obj)/aes-glue-%.o: $(src)/aes-glue.c FORCE
+ $(call if_changed_dep,cc_o_c)
-diff -Nur linux-3.14.15/arch/arm64/crypto/sha1-ce-core.S linux-linaro-stable-mx6/arch/arm64/crypto/sha1-ce-core.S
---- linux-3.14.15/arch/arm64/crypto/sha1-ce-core.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/crypto/sha1-ce-core.S 2014-08-20 19:31:40.544845035 +0200
+diff -Nur linux-3.14.17/arch/arm64/crypto/sha1-ce-core.S linux-imx6-3.14/arch/arm64/crypto/sha1-ce-core.S
+--- linux-3.14.17/arch/arm64/crypto/sha1-ce-core.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/crypto/sha1-ce-core.S 2014-09-09 10:13:47.604943988 +0200
@@ -0,0 +1,153 @@
+/*
+ * sha1-ce-core.S - SHA-1 secure hash using ARMv8 Crypto Extensions
@@ -37574,9 +37734,9 @@ diff -Nur linux-3.14.15/arch/arm64/crypto/sha1-ce-core.S linux-linaro-stable-mx6
+ str dgb, [x2, #16]
+ ret
+ENDPROC(sha1_ce_transform)
-diff -Nur linux-3.14.15/arch/arm64/crypto/sha1-ce-glue.c linux-linaro-stable-mx6/arch/arm64/crypto/sha1-ce-glue.c
---- linux-3.14.15/arch/arm64/crypto/sha1-ce-glue.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/crypto/sha1-ce-glue.c 2014-08-20 19:31:40.544845035 +0200
+diff -Nur linux-3.14.17/arch/arm64/crypto/sha1-ce-glue.c linux-imx6-3.14/arch/arm64/crypto/sha1-ce-glue.c
+--- linux-3.14.17/arch/arm64/crypto/sha1-ce-glue.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/crypto/sha1-ce-glue.c 2014-09-09 10:13:47.604943988 +0200
@@ -0,0 +1,174 @@
+/*
+ * sha1-ce-glue.c - SHA-1 secure hash using ARMv8 Crypto Extensions
@@ -37752,9 +37912,9 @@ diff -Nur linux-3.14.15/arch/arm64/crypto/sha1-ce-glue.c linux-linaro-stable-mx6
+
+module_cpu_feature_match(SHA1, sha1_ce_mod_init);
+module_exit(sha1_ce_mod_fini);
-diff -Nur linux-3.14.15/arch/arm64/crypto/sha2-ce-core.S linux-linaro-stable-mx6/arch/arm64/crypto/sha2-ce-core.S
---- linux-3.14.15/arch/arm64/crypto/sha2-ce-core.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/crypto/sha2-ce-core.S 2014-08-20 19:31:40.544845035 +0200
+diff -Nur linux-3.14.17/arch/arm64/crypto/sha2-ce-core.S linux-imx6-3.14/arch/arm64/crypto/sha2-ce-core.S
+--- linux-3.14.17/arch/arm64/crypto/sha2-ce-core.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/crypto/sha2-ce-core.S 2014-09-09 10:13:47.604943988 +0200
@@ -0,0 +1,156 @@
+/*
+ * sha2-ce-core.S - core SHA-224/SHA-256 transform using v8 Crypto Extensions
@@ -37912,9 +38072,9 @@ diff -Nur linux-3.14.15/arch/arm64/crypto/sha2-ce-core.S linux-linaro-stable-mx6
+3: stp dga, dgb, [x2]
+ ret
+ENDPROC(sha2_ce_transform)
-diff -Nur linux-3.14.15/arch/arm64/crypto/sha2-ce-glue.c linux-linaro-stable-mx6/arch/arm64/crypto/sha2-ce-glue.c
---- linux-3.14.15/arch/arm64/crypto/sha2-ce-glue.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/crypto/sha2-ce-glue.c 2014-08-20 19:31:40.544845035 +0200
+diff -Nur linux-3.14.17/arch/arm64/crypto/sha2-ce-glue.c linux-imx6-3.14/arch/arm64/crypto/sha2-ce-glue.c
+--- linux-3.14.17/arch/arm64/crypto/sha2-ce-glue.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/crypto/sha2-ce-glue.c 2014-09-09 10:13:47.604943988 +0200
@@ -0,0 +1,255 @@
+/*
+ * sha2-ce-glue.c - SHA-224/SHA-256 using ARMv8 Crypto Extensions
@@ -38171,9 +38331,9 @@ diff -Nur linux-3.14.15/arch/arm64/crypto/sha2-ce-glue.c linux-linaro-stable-mx6
+
+module_cpu_feature_match(SHA2, sha2_ce_mod_init);
+module_exit(sha2_ce_mod_fini);
-diff -Nur linux-3.14.15/arch/arm64/include/asm/bL_switcher.h linux-linaro-stable-mx6/arch/arm64/include/asm/bL_switcher.h
---- linux-3.14.15/arch/arm64/include/asm/bL_switcher.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/include/asm/bL_switcher.h 2014-08-20 19:31:40.544845035 +0200
+diff -Nur linux-3.14.17/arch/arm64/include/asm/bL_switcher.h linux-imx6-3.14/arch/arm64/include/asm/bL_switcher.h
+--- linux-3.14.17/arch/arm64/include/asm/bL_switcher.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/include/asm/bL_switcher.h 2014-09-09 10:13:47.604943988 +0200
@@ -0,0 +1,54 @@
+/*
+ * Based on the stubs for the ARM implementation which is:
@@ -38229,9 +38389,9 @@ diff -Nur linux-3.14.15/arch/arm64/include/asm/bL_switcher.h linux-linaro-stable
+static inline int bL_switcher_get_logical_index(u32 mpidr) { return -EUNATCH; }
+
+#endif
-diff -Nur linux-3.14.15/arch/arm64/include/asm/cacheflush.h linux-linaro-stable-mx6/arch/arm64/include/asm/cacheflush.h
---- linux-3.14.15/arch/arm64/include/asm/cacheflush.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/include/asm/cacheflush.h 2014-08-20 19:31:40.544845035 +0200
+diff -Nur linux-3.14.17/arch/arm64/include/asm/cacheflush.h linux-imx6-3.14/arch/arm64/include/asm/cacheflush.h
+--- linux-3.14.17/arch/arm64/include/asm/cacheflush.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/include/asm/cacheflush.h 2014-09-09 10:13:47.604943988 +0200
@@ -85,6 +85,13 @@
}
@@ -38246,9 +38406,9 @@ diff -Nur linux-3.14.15/arch/arm64/include/asm/cacheflush.h linux-linaro-stable-
* Copy user data from/to a page which is mapped into a different
* processes address space. Really, we want to allow our "user
* space" model to handle this.
-diff -Nur linux-3.14.15/arch/arm64/include/asm/compat.h linux-linaro-stable-mx6/arch/arm64/include/asm/compat.h
---- linux-3.14.15/arch/arm64/include/asm/compat.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/include/asm/compat.h 2014-08-20 19:31:40.548845053 +0200
+diff -Nur linux-3.14.17/arch/arm64/include/asm/compat.h linux-imx6-3.14/arch/arm64/include/asm/compat.h
+--- linux-3.14.17/arch/arm64/include/asm/compat.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/include/asm/compat.h 2014-09-09 10:13:47.604943988 +0200
@@ -228,7 +228,7 @@
return (u32)(unsigned long)uptr;
}
@@ -38270,9 +38430,9 @@ diff -Nur linux-3.14.15/arch/arm64/include/asm/compat.h linux-linaro-stable-mx6/
static inline int is_compat_thread(struct thread_info *thread)
{
return 0;
-diff -Nur linux-3.14.15/arch/arm64/include/asm/cpufeature.h linux-linaro-stable-mx6/arch/arm64/include/asm/cpufeature.h
---- linux-3.14.15/arch/arm64/include/asm/cpufeature.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/include/asm/cpufeature.h 2014-08-20 19:31:40.548845053 +0200
+diff -Nur linux-3.14.17/arch/arm64/include/asm/cpufeature.h linux-imx6-3.14/arch/arm64/include/asm/cpufeature.h
+--- linux-3.14.17/arch/arm64/include/asm/cpufeature.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/include/asm/cpufeature.h 2014-09-09 10:13:47.604943988 +0200
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2014 Linaro Ltd. <ard.biesheuvel@linaro.org>
@@ -38303,9 +38463,9 @@ diff -Nur linux-3.14.15/arch/arm64/include/asm/cpufeature.h linux-linaro-stable-
+}
+
+#endif
-diff -Nur linux-3.14.15/arch/arm64/include/asm/debug-monitors.h linux-linaro-stable-mx6/arch/arm64/include/asm/debug-monitors.h
---- linux-3.14.15/arch/arm64/include/asm/debug-monitors.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/include/asm/debug-monitors.h 2014-08-20 19:31:40.548845053 +0200
+diff -Nur linux-3.14.17/arch/arm64/include/asm/debug-monitors.h linux-imx6-3.14/arch/arm64/include/asm/debug-monitors.h
+--- linux-3.14.17/arch/arm64/include/asm/debug-monitors.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/include/asm/debug-monitors.h 2014-09-09 10:13:47.604943988 +0200
@@ -26,6 +26,53 @@
#define DBG_ESR_EVT_HWWP 0x2
#define DBG_ESR_EVT_BRK 0x6
@@ -38384,9 +38544,9 @@ diff -Nur linux-3.14.15/arch/arm64/include/asm/debug-monitors.h linux-linaro-sta
#define DBG_ARCH_ID_RESERVED 0 /* In case of ptrace ABI updates. */
#define DBG_HOOK_HANDLED 0
-diff -Nur linux-3.14.15/arch/arm64/include/asm/dma-mapping.h linux-linaro-stable-mx6/arch/arm64/include/asm/dma-mapping.h
---- linux-3.14.15/arch/arm64/include/asm/dma-mapping.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/include/asm/dma-mapping.h 2014-08-20 19:31:40.552845071 +0200
+diff -Nur linux-3.14.17/arch/arm64/include/asm/dma-mapping.h linux-imx6-3.14/arch/arm64/include/asm/dma-mapping.h
+--- linux-3.14.17/arch/arm64/include/asm/dma-mapping.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/include/asm/dma-mapping.h 2014-09-09 10:13:47.604943988 +0200
@@ -28,6 +28,8 @@
#define DMA_ERROR_CODE (~(dma_addr_t)0)
@@ -38408,9 +38568,9 @@ diff -Nur linux-3.14.15/arch/arm64/include/asm/dma-mapping.h linux-linaro-stable
#include <asm-generic/dma-mapping-common.h>
static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)
-diff -Nur linux-3.14.15/arch/arm64/include/asm/ftrace.h linux-linaro-stable-mx6/arch/arm64/include/asm/ftrace.h
---- linux-3.14.15/arch/arm64/include/asm/ftrace.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/include/asm/ftrace.h 2014-08-20 19:31:40.556845089 +0200
+diff -Nur linux-3.14.17/arch/arm64/include/asm/ftrace.h linux-imx6-3.14/arch/arm64/include/asm/ftrace.h
+--- linux-3.14.17/arch/arm64/include/asm/ftrace.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/include/asm/ftrace.h 2014-09-09 10:13:47.608944022 +0200
@@ -0,0 +1,59 @@
+/*
+ * arch/arm64/include/asm/ftrace.h
@@ -38471,9 +38631,9 @@ diff -Nur linux-3.14.15/arch/arm64/include/asm/ftrace.h linux-linaro-stable-mx6/
+#endif /* ifndef __ASSEMBLY__ */
+
+#endif /* __ASM_FTRACE_H */
-diff -Nur linux-3.14.15/arch/arm64/include/asm/hwcap.h linux-linaro-stable-mx6/arch/arm64/include/asm/hwcap.h
---- linux-3.14.15/arch/arm64/include/asm/hwcap.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/include/asm/hwcap.h 2014-08-20 19:31:40.560845104 +0200
+diff -Nur linux-3.14.17/arch/arm64/include/asm/hwcap.h linux-imx6-3.14/arch/arm64/include/asm/hwcap.h
+--- linux-3.14.17/arch/arm64/include/asm/hwcap.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/include/asm/hwcap.h 2014-09-09 10:13:47.608944022 +0200
@@ -32,6 +32,12 @@
#define COMPAT_HWCAP_IDIV (COMPAT_HWCAP_IDIVA|COMPAT_HWCAP_IDIVT)
#define COMPAT_HWCAP_EVTSTRM (1 << 21)
@@ -38497,9 +38657,9 @@ diff -Nur linux-3.14.15/arch/arm64/include/asm/hwcap.h linux-linaro-stable-mx6/a
#endif
extern unsigned long elf_hwcap;
-diff -Nur linux-3.14.15/arch/arm64/include/asm/insn.h linux-linaro-stable-mx6/arch/arm64/include/asm/insn.h
---- linux-3.14.15/arch/arm64/include/asm/insn.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/include/asm/insn.h 2014-08-20 19:31:40.560845104 +0200
+diff -Nur linux-3.14.17/arch/arm64/include/asm/insn.h linux-imx6-3.14/arch/arm64/include/asm/insn.h
+--- linux-3.14.17/arch/arm64/include/asm/insn.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/include/asm/insn.h 2014-09-09 10:13:47.608944022 +0200
@@ -16,11 +16,14 @@
*/
#ifndef __ASM_INSN_H
@@ -38522,9 +38682,9 @@ diff -Nur linux-3.14.15/arch/arm64/include/asm/insn.h linux-linaro-stable-mx6/ar
+#endif /* __ASSEMBLY__ */
+
#endif /* __ASM_INSN_H */
-diff -Nur linux-3.14.15/arch/arm64/include/asm/irqflags.h linux-linaro-stable-mx6/arch/arm64/include/asm/irqflags.h
---- linux-3.14.15/arch/arm64/include/asm/irqflags.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/include/asm/irqflags.h 2014-08-20 19:31:40.560845104 +0200
+diff -Nur linux-3.14.17/arch/arm64/include/asm/irqflags.h linux-imx6-3.14/arch/arm64/include/asm/irqflags.h
+--- linux-3.14.17/arch/arm64/include/asm/irqflags.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/include/asm/irqflags.h 2014-09-09 10:13:47.608944022 +0200
@@ -90,5 +90,28 @@
return flags & PSR_I_BIT;
}
@@ -38554,9 +38714,9 @@ diff -Nur linux-3.14.15/arch/arm64/include/asm/irqflags.h linux-linaro-stable-mx
+
#endif
#endif
-diff -Nur linux-3.14.15/arch/arm64/include/asm/Kbuild linux-linaro-stable-mx6/arch/arm64/include/asm/Kbuild
---- linux-3.14.15/arch/arm64/include/asm/Kbuild 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/include/asm/Kbuild 2014-08-20 19:31:40.544845035 +0200
+diff -Nur linux-3.14.17/arch/arm64/include/asm/Kbuild linux-imx6-3.14/arch/arm64/include/asm/Kbuild
+--- linux-3.14.17/arch/arm64/include/asm/Kbuild 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/include/asm/Kbuild 2014-09-09 10:13:47.604943988 +0200
@@ -35,6 +35,7 @@
generic-y += sembuf.h
generic-y += serial.h
@@ -38565,9 +38725,9 @@ diff -Nur linux-3.14.15/arch/arm64/include/asm/Kbuild linux-linaro-stable-mx6/ar
generic-y += sizes.h
generic-y += socket.h
generic-y += sockios.h
-diff -Nur linux-3.14.15/arch/arm64/include/asm/kgdb.h linux-linaro-stable-mx6/arch/arm64/include/asm/kgdb.h
---- linux-3.14.15/arch/arm64/include/asm/kgdb.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/include/asm/kgdb.h 2014-08-20 19:31:40.564845121 +0200
+diff -Nur linux-3.14.17/arch/arm64/include/asm/kgdb.h linux-imx6-3.14/arch/arm64/include/asm/kgdb.h
+--- linux-3.14.17/arch/arm64/include/asm/kgdb.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/include/asm/kgdb.h 2014-09-09 10:13:47.608944022 +0200
@@ -0,0 +1,84 @@
+/*
+ * AArch64 KGDB support
@@ -38653,9 +38813,9 @@ diff -Nur linux-3.14.15/arch/arm64/include/asm/kgdb.h linux-linaro-stable-mx6/ar
+ (_EXTRA_REGS * 4))
+
+#endif /* __ASM_KGDB_H */
-diff -Nur linux-3.14.15/arch/arm64/include/asm/page.h linux-linaro-stable-mx6/arch/arm64/include/asm/page.h
---- linux-3.14.15/arch/arm64/include/asm/page.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/include/asm/page.h 2014-08-20 19:31:40.572845156 +0200
+diff -Nur linux-3.14.17/arch/arm64/include/asm/page.h linux-imx6-3.14/arch/arm64/include/asm/page.h
+--- linux-3.14.17/arch/arm64/include/asm/page.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/include/asm/page.h 2014-09-09 10:13:47.608944022 +0200
@@ -31,6 +31,15 @@
/* We do define AT_SYSINFO_EHDR but don't use the gate mechanism */
#define __HAVE_ARCH_GATE_AREA 1
@@ -38672,9 +38832,9 @@ diff -Nur linux-3.14.15/arch/arm64/include/asm/page.h linux-linaro-stable-mx6/ar
#ifndef __ASSEMBLY__
#ifdef CONFIG_ARM64_64K_PAGES
-diff -Nur linux-3.14.15/arch/arm64/include/asm/pgtable.h linux-linaro-stable-mx6/arch/arm64/include/asm/pgtable.h
---- linux-3.14.15/arch/arm64/include/asm/pgtable.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/include/asm/pgtable.h 2014-08-20 19:31:40.580845192 +0200
+diff -Nur linux-3.14.17/arch/arm64/include/asm/pgtable.h linux-imx6-3.14/arch/arm64/include/asm/pgtable.h
+--- linux-3.14.17/arch/arm64/include/asm/pgtable.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/include/asm/pgtable.h 2014-09-09 10:13:47.608944022 +0200
@@ -227,36 +227,36 @@
#define __HAVE_ARCH_PTE_SPECIAL
@@ -38767,9 +38927,9 @@ diff -Nur linux-3.14.15/arch/arm64/include/asm/pgtable.h linux-linaro-stable-mx6
/*
* Encode and decode a swap entry:
* bits 0-1: present (must be zero)
-diff -Nur linux-3.14.15/arch/arm64/include/asm/ptrace.h linux-linaro-stable-mx6/arch/arm64/include/asm/ptrace.h
---- linux-3.14.15/arch/arm64/include/asm/ptrace.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/include/asm/ptrace.h 2014-08-20 19:31:40.580845192 +0200
+diff -Nur linux-3.14.17/arch/arm64/include/asm/ptrace.h linux-imx6-3.14/arch/arm64/include/asm/ptrace.h
+--- linux-3.14.17/arch/arm64/include/asm/ptrace.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/include/asm/ptrace.h 2014-09-09 10:13:47.608944022 +0200
@@ -68,6 +68,7 @@
/* Architecturally defined mapping between AArch32 and AArch64 registers */
@@ -38801,9 +38961,9 @@ diff -Nur linux-3.14.15/arch/arm64/include/asm/ptrace.h linux-linaro-stable-mx6/
#ifdef CONFIG_SMP
extern unsigned long profile_pc(struct pt_regs *regs);
-diff -Nur linux-3.14.15/arch/arm64/include/asm/syscall.h linux-linaro-stable-mx6/arch/arm64/include/asm/syscall.h
---- linux-3.14.15/arch/arm64/include/asm/syscall.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/include/asm/syscall.h 2014-08-20 19:31:40.588845224 +0200
+diff -Nur linux-3.14.17/arch/arm64/include/asm/syscall.h linux-imx6-3.14/arch/arm64/include/asm/syscall.h
+--- linux-3.14.17/arch/arm64/include/asm/syscall.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/include/asm/syscall.h 2014-09-09 10:13:47.612944054 +0200
@@ -18,6 +18,7 @@
#include <linux/err.h>
@@ -38812,9 +38972,9 @@ diff -Nur linux-3.14.15/arch/arm64/include/asm/syscall.h linux-linaro-stable-mx6
static inline int syscall_get_nr(struct task_struct *task,
struct pt_regs *regs)
-diff -Nur linux-3.14.15/arch/arm64/include/asm/thread_info.h linux-linaro-stable-mx6/arch/arm64/include/asm/thread_info.h
---- linux-3.14.15/arch/arm64/include/asm/thread_info.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/include/asm/thread_info.h 2014-08-20 19:31:40.588845224 +0200
+diff -Nur linux-3.14.17/arch/arm64/include/asm/thread_info.h linux-imx6-3.14/arch/arm64/include/asm/thread_info.h
+--- linux-3.14.17/arch/arm64/include/asm/thread_info.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/include/asm/thread_info.h 2014-09-09 10:13:47.612944054 +0200
@@ -91,6 +91,9 @@
/*
* thread information flags:
@@ -38853,9 +39013,9 @@ diff -Nur linux-3.14.15/arch/arm64/include/asm/thread_info.h linux-linaro-stable
+
#endif /* __KERNEL__ */
#endif /* __ASM_THREAD_INFO_H */
-diff -Nur linux-3.14.15/arch/arm64/include/asm/topology.h linux-linaro-stable-mx6/arch/arm64/include/asm/topology.h
---- linux-3.14.15/arch/arm64/include/asm/topology.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/include/asm/topology.h 2014-08-20 19:31:40.592845242 +0200
+diff -Nur linux-3.14.17/arch/arm64/include/asm/topology.h linux-imx6-3.14/arch/arm64/include/asm/topology.h
+--- linux-3.14.17/arch/arm64/include/asm/topology.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/include/asm/topology.h 2014-09-09 10:13:47.612944054 +0200
@@ -0,0 +1,70 @@
+#ifndef __ASM_TOPOLOGY_H
+#define __ASM_TOPOLOGY_H
@@ -38927,18 +39087,18 @@ diff -Nur linux-3.14.15/arch/arm64/include/asm/topology.h linux-linaro-stable-mx
+#include <asm-generic/topology.h>
+
+#endif /* _ASM_ARM_TOPOLOGY_H */
-diff -Nur linux-3.14.15/arch/arm64/include/asm/unistd.h linux-linaro-stable-mx6/arch/arm64/include/asm/unistd.h
---- linux-3.14.15/arch/arm64/include/asm/unistd.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/include/asm/unistd.h 2014-08-20 19:31:40.592845242 +0200
+diff -Nur linux-3.14.17/arch/arm64/include/asm/unistd.h linux-imx6-3.14/arch/arm64/include/asm/unistd.h
+--- linux-3.14.17/arch/arm64/include/asm/unistd.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/include/asm/unistd.h 2014-09-09 10:13:47.612944054 +0200
@@ -28,3 +28,5 @@
#endif
#define __ARCH_WANT_SYS_CLONE
#include <uapi/asm/unistd.h>
+
+#define NR_syscalls (__NR_syscalls)
-diff -Nur linux-3.14.15/arch/arm64/include/uapi/asm/Kbuild linux-linaro-stable-mx6/arch/arm64/include/uapi/asm/Kbuild
---- linux-3.14.15/arch/arm64/include/uapi/asm/Kbuild 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/include/uapi/asm/Kbuild 2014-08-20 19:31:40.596845260 +0200
+diff -Nur linux-3.14.17/arch/arm64/include/uapi/asm/Kbuild linux-imx6-3.14/arch/arm64/include/uapi/asm/Kbuild
+--- linux-3.14.17/arch/arm64/include/uapi/asm/Kbuild 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/include/uapi/asm/Kbuild 2014-09-09 10:13:47.612944054 +0200
@@ -9,6 +9,7 @@
header-y += fcntl.h
header-y += hwcap.h
@@ -38947,9 +39107,9 @@ diff -Nur linux-3.14.15/arch/arm64/include/uapi/asm/Kbuild linux-linaro-stable-m
header-y += param.h
header-y += ptrace.h
header-y += setup.h
-diff -Nur linux-3.14.15/arch/arm64/include/uapi/asm/perf_regs.h linux-linaro-stable-mx6/arch/arm64/include/uapi/asm/perf_regs.h
---- linux-3.14.15/arch/arm64/include/uapi/asm/perf_regs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/include/uapi/asm/perf_regs.h 2014-08-20 19:31:40.600845277 +0200
+diff -Nur linux-3.14.17/arch/arm64/include/uapi/asm/perf_regs.h linux-imx6-3.14/arch/arm64/include/uapi/asm/perf_regs.h
+--- linux-3.14.17/arch/arm64/include/uapi/asm/perf_regs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/include/uapi/asm/perf_regs.h 2014-09-09 10:13:47.612944054 +0200
@@ -0,0 +1,40 @@
+#ifndef _ASM_ARM64_PERF_REGS_H
+#define _ASM_ARM64_PERF_REGS_H
@@ -38991,9 +39151,9 @@ diff -Nur linux-3.14.15/arch/arm64/include/uapi/asm/perf_regs.h linux-linaro-sta
+ PERF_REG_ARM64_MAX,
+};
+#endif /* _ASM_ARM64_PERF_REGS_H */
-diff -Nur linux-3.14.15/arch/arm64/Kconfig linux-linaro-stable-mx6/arch/arm64/Kconfig
---- linux-3.14.15/arch/arm64/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/Kconfig 2014-08-20 19:31:40.480844761 +0200
+diff -Nur linux-3.14.17/arch/arm64/Kconfig linux-imx6-3.14/arch/arm64/Kconfig
+--- linux-3.14.17/arch/arm64/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/Kconfig 2014-09-09 10:13:47.604943988 +0200
@@ -4,6 +4,7 @@
select ARCH_USE_CMPXCHG_LOCKREF
select ARCH_SUPPORTS_ATOMIC_RMW
@@ -39191,9 +39351,9 @@ diff -Nur linux-3.14.15/arch/arm64/Kconfig linux-linaro-stable-mx6/arch/arm64/Kc
+endif
source "lib/Kconfig"
-diff -Nur linux-3.14.15/arch/arm64/kernel/arm64ksyms.c linux-linaro-stable-mx6/arch/arm64/kernel/arm64ksyms.c
---- linux-3.14.15/arch/arm64/kernel/arm64ksyms.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/arm64ksyms.c 2014-08-20 19:31:40.600845277 +0200
+diff -Nur linux-3.14.17/arch/arm64/kernel/arm64ksyms.c linux-imx6-3.14/arch/arm64/kernel/arm64ksyms.c
+--- linux-3.14.17/arch/arm64/kernel/arm64ksyms.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/kernel/arm64ksyms.c 2014-09-09 10:13:47.612944054 +0200
@@ -56,3 +56,7 @@
EXPORT_SYMBOL(test_and_clear_bit);
EXPORT_SYMBOL(change_bit);
@@ -39202,9 +39362,9 @@ diff -Nur linux-3.14.15/arch/arm64/kernel/arm64ksyms.c linux-linaro-stable-mx6/a
+#ifdef CONFIG_FUNCTION_TRACER
+EXPORT_SYMBOL(_mcount);
+#endif
-diff -Nur linux-3.14.15/arch/arm64/kernel/debug-monitors.c linux-linaro-stable-mx6/arch/arm64/kernel/debug-monitors.c
---- linux-3.14.15/arch/arm64/kernel/debug-monitors.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/debug-monitors.c 2014-08-20 19:31:40.600845277 +0200
+diff -Nur linux-3.14.17/arch/arm64/kernel/debug-monitors.c linux-imx6-3.14/arch/arm64/kernel/debug-monitors.c
+--- linux-3.14.17/arch/arm64/kernel/debug-monitors.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/kernel/debug-monitors.c 2014-09-09 10:13:47.612944054 +0200
@@ -138,6 +138,7 @@
{
asm volatile("msr oslar_el1, %0" : : "r" (0));
@@ -39223,9 +39383,9 @@ diff -Nur linux-3.14.15/arch/arm64/kernel/debug-monitors.c linux-linaro-stable-m
if (!user_mode(regs))
return -EFAULT;
-diff -Nur linux-3.14.15/arch/arm64/kernel/entry-ftrace.S linux-linaro-stable-mx6/arch/arm64/kernel/entry-ftrace.S
---- linux-3.14.15/arch/arm64/kernel/entry-ftrace.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/entry-ftrace.S 2014-08-20 19:31:40.600845277 +0200
+diff -Nur linux-3.14.17/arch/arm64/kernel/entry-ftrace.S linux-imx6-3.14/arch/arm64/kernel/entry-ftrace.S
+--- linux-3.14.17/arch/arm64/kernel/entry-ftrace.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/kernel/entry-ftrace.S 2014-09-09 10:13:47.612944054 +0200
@@ -0,0 +1,218 @@
+/*
+ * arch/arm64/kernel/entry-ftrace.S
@@ -39445,9 +39605,9 @@ diff -Nur linux-3.14.15/arch/arm64/kernel/entry-ftrace.S linux-linaro-stable-mx6
+ ret
+END(return_to_handler)
+#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
-diff -Nur linux-3.14.15/arch/arm64/kernel/entry.S linux-linaro-stable-mx6/arch/arm64/kernel/entry.S
---- linux-3.14.15/arch/arm64/kernel/entry.S 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/entry.S 2014-08-20 19:31:40.600845277 +0200
+diff -Nur linux-3.14.17/arch/arm64/kernel/entry.S linux-imx6-3.14/arch/arm64/kernel/entry.S
+--- linux-3.14.17/arch/arm64/kernel/entry.S 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/kernel/entry.S 2014-09-09 10:13:47.612944054 +0200
@@ -630,8 +630,9 @@
enable_irq
@@ -39484,9 +39644,9 @@ diff -Nur linux-3.14.15/arch/arm64/kernel/entry.S linux-linaro-stable-mx6/arch/a
b ret_to_user
/*
-diff -Nur linux-3.14.15/arch/arm64/kernel/ftrace.c linux-linaro-stable-mx6/arch/arm64/kernel/ftrace.c
---- linux-3.14.15/arch/arm64/kernel/ftrace.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/ftrace.c 2014-08-20 19:31:40.600845277 +0200
+diff -Nur linux-3.14.17/arch/arm64/kernel/ftrace.c linux-imx6-3.14/arch/arm64/kernel/ftrace.c
+--- linux-3.14.17/arch/arm64/kernel/ftrace.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/kernel/ftrace.c 2014-09-09 10:13:47.612944054 +0200
@@ -0,0 +1,177 @@
+/*
+ * arch/arm64/kernel/ftrace.c
@@ -39665,9 +39825,9 @@ diff -Nur linux-3.14.15/arch/arm64/kernel/ftrace.c linux-linaro-stable-mx6/arch/
+}
+#endif /* CONFIG_DYNAMIC_FTRACE */
+#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
-diff -Nur linux-3.14.15/arch/arm64/kernel/head.S linux-linaro-stable-mx6/arch/arm64/kernel/head.S
---- linux-3.14.15/arch/arm64/kernel/head.S 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/head.S 2014-08-20 19:31:40.600845277 +0200
+diff -Nur linux-3.14.17/arch/arm64/kernel/head.S linux-imx6-3.14/arch/arm64/kernel/head.S
+--- linux-3.14.17/arch/arm64/kernel/head.S 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/kernel/head.S 2014-09-09 10:13:47.612944054 +0200
@@ -26,6 +26,7 @@
#include <asm/assembler.h>
#include <asm/ptrace.h>
@@ -39857,9 +40017,9 @@ diff -Nur linux-3.14.15/arch/arm64/kernel/head.S linux-linaro-stable-mx6/arch/ar
.quad processor_id // x4
.quad __fdt_pointer // x5
.quad memstart_addr // x6
-diff -Nur linux-3.14.15/arch/arm64/kernel/hw_breakpoint.c linux-linaro-stable-mx6/arch/arm64/kernel/hw_breakpoint.c
---- linux-3.14.15/arch/arm64/kernel/hw_breakpoint.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/hw_breakpoint.c 2014-08-20 19:31:40.600845277 +0200
+diff -Nur linux-3.14.17/arch/arm64/kernel/hw_breakpoint.c linux-imx6-3.14/arch/arm64/kernel/hw_breakpoint.c
+--- linux-3.14.17/arch/arm64/kernel/hw_breakpoint.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/kernel/hw_breakpoint.c 2014-09-09 10:13:47.612944054 +0200
@@ -20,6 +20,7 @@
#define pr_fmt(fmt) "hw-breakpoint: " fmt
@@ -39876,9 +40036,9 @@ diff -Nur linux-3.14.15/arch/arm64/kernel/hw_breakpoint.c linux-linaro-stable-mx
#include <asm/current.h>
#include <asm/debug-monitors.h>
#include <asm/hw_breakpoint.h>
-diff -Nur linux-3.14.15/arch/arm64/kernel/kgdb.c linux-linaro-stable-mx6/arch/arm64/kernel/kgdb.c
---- linux-3.14.15/arch/arm64/kernel/kgdb.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/kgdb.c 2014-08-20 19:31:40.600845277 +0200
+diff -Nur linux-3.14.17/arch/arm64/kernel/kgdb.c linux-imx6-3.14/arch/arm64/kernel/kgdb.c
+--- linux-3.14.17/arch/arm64/kernel/kgdb.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/kernel/kgdb.c 2014-09-09 10:13:47.616944086 +0200
@@ -0,0 +1,336 @@
+/*
+ * AArch64 KGDB support
@@ -40216,9 +40376,9 @@ diff -Nur linux-3.14.15/arch/arm64/kernel/kgdb.c linux-linaro-stable-mx6/arch/ar
+ KGDB_DYN_BRK_INS_BYTE3,
+ }
+};
-diff -Nur linux-3.14.15/arch/arm64/kernel/Makefile linux-linaro-stable-mx6/arch/arm64/kernel/Makefile
---- linux-3.14.15/arch/arm64/kernel/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/Makefile 2014-08-20 19:31:40.600845277 +0200
+diff -Nur linux-3.14.17/arch/arm64/kernel/Makefile linux-imx6-3.14/arch/arm64/kernel/Makefile
+--- linux-3.14.17/arch/arm64/kernel/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/kernel/Makefile 2014-09-09 10:13:47.612944054 +0200
@@ -5,21 +5,29 @@
CPPFLAGS_vmlinux.lds := -DTEXT_OFFSET=$(TEXT_OFFSET)
AFLAGS_head.o := -DTEXT_OFFSET=$(TEXT_OFFSET)
@@ -40251,9 +40411,9 @@ diff -Nur linux-3.14.15/arch/arm64/kernel/Makefile linux-linaro-stable-mx6/arch/
obj-y += $(arm64-obj-y) vdso/
obj-m += $(arm64-obj-m)
-diff -Nur linux-3.14.15/arch/arm64/kernel/perf_event.c linux-linaro-stable-mx6/arch/arm64/kernel/perf_event.c
---- linux-3.14.15/arch/arm64/kernel/perf_event.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/perf_event.c 2014-08-20 19:31:40.600845277 +0200
+diff -Nur linux-3.14.17/arch/arm64/kernel/perf_event.c linux-imx6-3.14/arch/arm64/kernel/perf_event.c
+--- linux-3.14.17/arch/arm64/kernel/perf_event.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/kernel/perf_event.c 2014-09-09 10:13:47.616944086 +0200
@@ -1348,8 +1348,8 @@
* Callchain handling code.
*/
@@ -40364,9 +40524,9 @@ diff -Nur linux-3.14.15/arch/arm64/kernel/perf_event.c linux-linaro-stable-mx6/a
walk_stackframe(&frame, callchain_trace, entry);
}
-diff -Nur linux-3.14.15/arch/arm64/kernel/perf_regs.c linux-linaro-stable-mx6/arch/arm64/kernel/perf_regs.c
---- linux-3.14.15/arch/arm64/kernel/perf_regs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/perf_regs.c 2014-08-20 19:31:40.600845277 +0200
+diff -Nur linux-3.14.17/arch/arm64/kernel/perf_regs.c linux-imx6-3.14/arch/arm64/kernel/perf_regs.c
+--- linux-3.14.17/arch/arm64/kernel/perf_regs.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/kernel/perf_regs.c 2014-09-09 10:13:47.616944086 +0200
@@ -0,0 +1,46 @@
+#include <linux/errno.h>
+#include <linux/kernel.h>
@@ -40414,9 +40574,9 @@ diff -Nur linux-3.14.15/arch/arm64/kernel/perf_regs.c linux-linaro-stable-mx6/ar
+ else
+ return PERF_SAMPLE_REGS_ABI_64;
+}
-diff -Nur linux-3.14.15/arch/arm64/kernel/process.c linux-linaro-stable-mx6/arch/arm64/kernel/process.c
---- linux-3.14.15/arch/arm64/kernel/process.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/process.c 2014-08-20 19:31:40.600845277 +0200
+diff -Nur linux-3.14.17/arch/arm64/kernel/process.c linux-imx6-3.14/arch/arm64/kernel/process.c
+--- linux-3.14.17/arch/arm64/kernel/process.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/kernel/process.c 2014-09-09 10:13:47.616944086 +0200
@@ -20,6 +20,7 @@
#include <stdarg.h>
@@ -40425,9 +40585,9 @@ diff -Nur linux-3.14.15/arch/arm64/kernel/process.c linux-linaro-stable-mx6/arch
#include <linux/export.h>
#include <linux/sched.h>
#include <linux/kernel.h>
-diff -Nur linux-3.14.15/arch/arm64/kernel/ptrace.c linux-linaro-stable-mx6/arch/arm64/kernel/ptrace.c
---- linux-3.14.15/arch/arm64/kernel/ptrace.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/ptrace.c 2014-08-20 19:31:40.604845294 +0200
+diff -Nur linux-3.14.17/arch/arm64/kernel/ptrace.c linux-imx6-3.14/arch/arm64/kernel/ptrace.c
+--- linux-3.14.17/arch/arm64/kernel/ptrace.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/kernel/ptrace.c 2014-09-09 10:13:47.616944086 +0200
@@ -19,6 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -40517,9 +40677,9 @@ diff -Nur linux-3.14.15/arch/arm64/kernel/ptrace.c linux-linaro-stable-mx6/arch/
+ if (test_thread_flag(TIF_SYSCALL_TRACE))
+ tracehook_report_syscall(regs, PTRACE_SYSCALL_EXIT);
+}
-diff -Nur linux-3.14.15/arch/arm64/kernel/return_address.c linux-linaro-stable-mx6/arch/arm64/kernel/return_address.c
---- linux-3.14.15/arch/arm64/kernel/return_address.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/return_address.c 2014-08-20 19:31:40.604845294 +0200
+diff -Nur linux-3.14.17/arch/arm64/kernel/return_address.c linux-imx6-3.14/arch/arm64/kernel/return_address.c
+--- linux-3.14.17/arch/arm64/kernel/return_address.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/kernel/return_address.c 2014-09-09 10:13:47.616944086 +0200
@@ -0,0 +1,55 @@
+/*
+ * arch/arm64/kernel/return_address.c
@@ -40576,9 +40736,9 @@ diff -Nur linux-3.14.15/arch/arm64/kernel/return_address.c linux-linaro-stable-m
+ return NULL;
+}
+EXPORT_SYMBOL_GPL(return_address);
-diff -Nur linux-3.14.15/arch/arm64/kernel/setup.c linux-linaro-stable-mx6/arch/arm64/kernel/setup.c
---- linux-3.14.15/arch/arm64/kernel/setup.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/setup.c 2014-08-20 19:31:40.604845294 +0200
+diff -Nur linux-3.14.17/arch/arm64/kernel/setup.c linux-imx6-3.14/arch/arm64/kernel/setup.c
+--- linux-3.14.17/arch/arm64/kernel/setup.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/kernel/setup.c 2014-09-09 10:13:47.616944086 +0200
@@ -69,6 +69,7 @@
COMPAT_HWCAP_VFPv3|COMPAT_HWCAP_VFPv4|\
COMPAT_HWCAP_NEON|COMPAT_HWCAP_IDIV)
@@ -40635,9 +40795,9 @@ diff -Nur linux-3.14.15/arch/arm64/kernel/setup.c linux-linaro-stable-mx6/arch/a
static DEFINE_PER_CPU(struct cpu, cpu_data);
-diff -Nur linux-3.14.15/arch/arm64/kernel/signal.c linux-linaro-stable-mx6/arch/arm64/kernel/signal.c
---- linux-3.14.15/arch/arm64/kernel/signal.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/signal.c 2014-08-20 19:31:40.604845294 +0200
+diff -Nur linux-3.14.17/arch/arm64/kernel/signal.c linux-imx6-3.14/arch/arm64/kernel/signal.c
+--- linux-3.14.17/arch/arm64/kernel/signal.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/kernel/signal.c 2014-09-09 10:13:47.616944086 +0200
@@ -17,6 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -40654,9 +40814,9 @@ diff -Nur linux-3.14.15/arch/arm64/kernel/signal.c linux-linaro-stable-mx6/arch/
#include <asm/debug-monitors.h>
#include <asm/elf.h>
#include <asm/cacheflush.h>
-diff -Nur linux-3.14.15/arch/arm64/kernel/smp.c linux-linaro-stable-mx6/arch/arm64/kernel/smp.c
---- linux-3.14.15/arch/arm64/kernel/smp.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/smp.c 2014-08-20 19:31:40.604845294 +0200
+diff -Nur linux-3.14.17/arch/arm64/kernel/smp.c linux-imx6-3.14/arch/arm64/kernel/smp.c
+--- linux-3.14.17/arch/arm64/kernel/smp.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/kernel/smp.c 2014-09-09 10:13:47.616944086 +0200
@@ -114,6 +114,11 @@
return ret;
}
@@ -40689,9 +40849,9 @@ diff -Nur linux-3.14.15/arch/arm64/kernel/smp.c linux-linaro-stable-mx6/arch/arm
/*
* are we trying to boot more cores than exist?
*/
-diff -Nur linux-3.14.15/arch/arm64/kernel/stacktrace.c linux-linaro-stable-mx6/arch/arm64/kernel/stacktrace.c
---- linux-3.14.15/arch/arm64/kernel/stacktrace.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/stacktrace.c 2014-08-20 19:31:40.604845294 +0200
+diff -Nur linux-3.14.17/arch/arm64/kernel/stacktrace.c linux-imx6-3.14/arch/arm64/kernel/stacktrace.c
+--- linux-3.14.17/arch/arm64/kernel/stacktrace.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/kernel/stacktrace.c 2014-09-09 10:13:47.616944086 +0200
@@ -35,7 +35,7 @@
* ldp x29, x30, [sp]
* add sp, sp, #0x10
@@ -40701,9 +40861,9 @@ diff -Nur linux-3.14.15/arch/arm64/kernel/stacktrace.c linux-linaro-stable-mx6/a
{
unsigned long high, low;
unsigned long fp = frame->fp;
-diff -Nur linux-3.14.15/arch/arm64/kernel/topology.c linux-linaro-stable-mx6/arch/arm64/kernel/topology.c
---- linux-3.14.15/arch/arm64/kernel/topology.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/topology.c 2014-08-20 19:31:40.608845311 +0200
+diff -Nur linux-3.14.17/arch/arm64/kernel/topology.c linux-imx6-3.14/arch/arm64/kernel/topology.c
+--- linux-3.14.17/arch/arm64/kernel/topology.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/arch/arm64/kernel/topology.c 2014-09-09 10:13:47.616944086 +0200
@@ -0,0 +1,558 @@
+/*
+ * arch/arm64/kernel/topology.c
@@ -41263,9 +41423,9 @@ diff -Nur linux-3.14.15/arch/arm64/kernel/topology.c linux-linaro-stable-mx6/arc
+ reset_cpu_power();
+ parse_dt_cpu_power();
+}
-diff -Nur linux-3.14.15/arch/arm64/kernel/vdso/Makefile linux-linaro-stable-mx6/arch/arm64/kernel/vdso/Makefile
---- linux-3.14.15/arch/arm64/kernel/vdso/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/vdso/Makefile 2014-08-20 19:31:40.608845311 +0200
+diff -Nur linux-3.14.17/arch/arm64/kernel/vdso/Makefile linux-imx6-3.14/arch/arm64/kernel/vdso/Makefile
+--- linux-3.14.17/arch/arm64/kernel/vdso/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/kernel/vdso/Makefile 2014-09-09 10:13:47.616944086 +0200
@@ -47,9 +47,9 @@
$(call if_changed_dep,vdsoas)
@@ -41278,9 +41438,9 @@ diff -Nur linux-3.14.15/arch/arm64/kernel/vdso/Makefile linux-linaro-stable-mx6/
cmd_vdsoas = $(CC) $(a_flags) -c -o $@ $<
# Install commands for the unstripped file
-diff -Nur linux-3.14.15/arch/arm64/kernel/vdso.c linux-linaro-stable-mx6/arch/arm64/kernel/vdso.c
---- linux-3.14.15/arch/arm64/kernel/vdso.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/vdso.c 2014-08-20 19:31:40.608845311 +0200
+diff -Nur linux-3.14.17/arch/arm64/kernel/vdso.c linux-imx6-3.14/arch/arm64/kernel/vdso.c
+--- linux-3.14.17/arch/arm64/kernel/vdso.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/kernel/vdso.c 2014-09-09 10:13:47.616944086 +0200
@@ -156,11 +156,12 @@
int uses_interp)
{
@@ -41355,9 +41515,9 @@ diff -Nur linux-3.14.15/arch/arm64/kernel/vdso.c linux-linaro-stable-mx6/arch/ar
}
return NULL;
-diff -Nur linux-3.14.15/arch/arm64/kernel/vmlinux.lds.S linux-linaro-stable-mx6/arch/arm64/kernel/vmlinux.lds.S
---- linux-3.14.15/arch/arm64/kernel/vmlinux.lds.S 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/kernel/vmlinux.lds.S 2014-08-20 19:31:40.608845311 +0200
+diff -Nur linux-3.14.17/arch/arm64/kernel/vmlinux.lds.S linux-imx6-3.14/arch/arm64/kernel/vmlinux.lds.S
+--- linux-3.14.17/arch/arm64/kernel/vmlinux.lds.S 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/kernel/vmlinux.lds.S 2014-09-09 10:13:47.616944086 +0200
@@ -104,6 +104,13 @@
_edata = .;
@@ -41372,9 +41532,9 @@ diff -Nur linux-3.14.15/arch/arm64/kernel/vmlinux.lds.S linux-linaro-stable-mx6/
_end = .;
STABS_DEBUG
-diff -Nur linux-3.14.15/arch/arm64/Makefile linux-linaro-stable-mx6/arch/arm64/Makefile
---- linux-3.14.15/arch/arm64/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/Makefile 2014-08-20 19:31:40.480844761 +0200
+diff -Nur linux-3.14.17/arch/arm64/Makefile linux-imx6-3.14/arch/arm64/Makefile
+--- linux-3.14.17/arch/arm64/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/Makefile 2014-09-09 10:13:47.604943988 +0200
@@ -45,6 +45,7 @@
core-y += arch/arm64/kernel/ arch/arm64/mm/
core-$(CONFIG_KVM) += arch/arm64/kvm/
@@ -41383,9 +41543,9 @@ diff -Nur linux-3.14.15/arch/arm64/Makefile linux-linaro-stable-mx6/arch/arm64/M
libs-y := arch/arm64/lib/ $(libs-y)
libs-y += $(LIBGCC)
-diff -Nur linux-3.14.15/arch/arm64/mm/cache.S linux-linaro-stable-mx6/arch/arm64/mm/cache.S
---- linux-3.14.15/arch/arm64/mm/cache.S 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/mm/cache.S 2014-08-20 19:31:40.612845327 +0200
+diff -Nur linux-3.14.17/arch/arm64/mm/cache.S linux-imx6-3.14/arch/arm64/mm/cache.S
+--- linux-3.14.17/arch/arm64/mm/cache.S 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/mm/cache.S 2014-09-09 10:13:47.620944119 +0200
@@ -30,7 +30,7 @@
*
* Corrupted registers: x0-x7, x9-x11
@@ -41493,9 +41653,9 @@ diff -Nur linux-3.14.15/arch/arm64/mm/cache.S linux-linaro-stable-mx6/arch/arm64
+ b.ne __dma_inv_range
+ ret
+ENDPROC(__dma_unmap_area)
-diff -Nur linux-3.14.15/arch/arm64/mm/copypage.c linux-linaro-stable-mx6/arch/arm64/mm/copypage.c
---- linux-3.14.15/arch/arm64/mm/copypage.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/mm/copypage.c 2014-08-20 19:31:40.612845327 +0200
+diff -Nur linux-3.14.17/arch/arm64/mm/copypage.c linux-imx6-3.14/arch/arm64/mm/copypage.c
+--- linux-3.14.17/arch/arm64/mm/copypage.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/mm/copypage.c 2014-09-09 10:13:47.620944119 +0200
@@ -27,8 +27,10 @@
copy_page(kto, kfrom);
__flush_dcache_area(kto, PAGE_SIZE);
@@ -41507,9 +41667,9 @@ diff -Nur linux-3.14.15/arch/arm64/mm/copypage.c linux-linaro-stable-mx6/arch/ar
clear_page(kaddr);
}
+EXPORT_SYMBOL_GPL(__cpu_clear_user_page);
-diff -Nur linux-3.14.15/arch/arm64/mm/dma-mapping.c linux-linaro-stable-mx6/arch/arm64/mm/dma-mapping.c
---- linux-3.14.15/arch/arm64/mm/dma-mapping.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/mm/dma-mapping.c 2014-08-20 19:31:40.612845327 +0200
+diff -Nur linux-3.14.17/arch/arm64/mm/dma-mapping.c linux-imx6-3.14/arch/arm64/mm/dma-mapping.c
+--- linux-3.14.17/arch/arm64/mm/dma-mapping.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/mm/dma-mapping.c 2014-09-09 10:13:47.620944119 +0200
@@ -22,26 +22,39 @@
#include <linux/slab.h>
#include <linux/dma-mapping.h>
@@ -41835,9 +41995,9 @@ diff -Nur linux-3.14.15/arch/arm64/mm/dma-mapping.c linux-linaro-stable-mx6/arch
#define PREALLOC_DMA_DEBUG_ENTRIES 4096
-diff -Nur linux-3.14.15/arch/arm64/mm/init.c linux-linaro-stable-mx6/arch/arm64/mm/init.c
---- linux-3.14.15/arch/arm64/mm/init.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/mm/init.c 2014-08-20 19:31:40.616845345 +0200
+diff -Nur linux-3.14.17/arch/arm64/mm/init.c linux-imx6-3.14/arch/arm64/mm/init.c
+--- linux-3.14.17/arch/arm64/mm/init.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/mm/init.c 2014-09-09 10:13:47.620944119 +0200
@@ -30,6 +30,7 @@
#include <linux/memblock.h>
#include <linux/sort.h>
@@ -41934,9 +42094,9 @@ diff -Nur linux-3.14.15/arch/arm64/mm/init.c linux-linaro-stable-mx6/arch/arm64/
max_mapnr = pfn_to_page(max_pfn + PHYS_PFN_OFFSET) - mem_map;
#ifndef CONFIG_SPARSEMEM_VMEMMAP
-diff -Nur linux-3.14.15/arch/arm64/mm/proc.S linux-linaro-stable-mx6/arch/arm64/mm/proc.S
---- linux-3.14.15/arch/arm64/mm/proc.S 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/arm64/mm/proc.S 2014-08-20 19:31:40.616845345 +0200
+diff -Nur linux-3.14.17/arch/arm64/mm/proc.S linux-imx6-3.14/arch/arm64/mm/proc.S
+--- linux-3.14.17/arch/arm64/mm/proc.S 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/arm64/mm/proc.S 2014-09-09 10:13:47.620944119 +0200
@@ -173,12 +173,6 @@
* value of the SCTLR_EL1 register.
*/
@@ -41950,9 +42110,9 @@ diff -Nur linux-3.14.15/arch/arm64/mm/proc.S linux-linaro-stable-mx6/arch/arm64/
ic iallu // I+BTB cache invalidate
tlbi vmalle1is // invalidate I + D TLBs
dsb sy
-diff -Nur linux-3.14.15/arch/avr32/kernel/cpu.c linux-linaro-stable-mx6/arch/avr32/kernel/cpu.c
---- linux-3.14.15/arch/avr32/kernel/cpu.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/avr32/kernel/cpu.c 2014-08-20 19:31:40.624845380 +0200
+diff -Nur linux-3.14.17/arch/avr32/kernel/cpu.c linux-imx6-3.14/arch/avr32/kernel/cpu.c
+--- linux-3.14.17/arch/avr32/kernel/cpu.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/avr32/kernel/cpu.c 2014-09-09 10:13:47.628944185 +0200
@@ -39,10 +39,12 @@
size_t count)
{
@@ -42049,9 +42209,9 @@ diff -Nur linux-3.14.15/arch/avr32/kernel/cpu.c linux-linaro-stable-mx6/arch/avr
if (val)
val = 1;
-diff -Nur linux-3.14.15/arch/blackfin/include/asm/ftrace.h linux-linaro-stable-mx6/arch/blackfin/include/asm/ftrace.h
---- linux-3.14.15/arch/blackfin/include/asm/ftrace.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/blackfin/include/asm/ftrace.h 2014-08-20 19:31:40.632845414 +0200
+diff -Nur linux-3.14.17/arch/blackfin/include/asm/ftrace.h linux-imx6-3.14/arch/blackfin/include/asm/ftrace.h
+--- linux-3.14.17/arch/blackfin/include/asm/ftrace.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/blackfin/include/asm/ftrace.h 2014-09-09 10:13:47.640944282 +0200
@@ -66,16 +66,7 @@
#endif /* CONFIG_FRAME_POINTER */
@@ -42070,9 +42230,9 @@ diff -Nur linux-3.14.15/arch/blackfin/include/asm/ftrace.h linux-linaro-stable-m
#endif /* __ASSEMBLY__ */
-diff -Nur linux-3.14.15/arch/hexagon/include/asm/elf.h linux-linaro-stable-mx6/arch/hexagon/include/asm/elf.h
---- linux-3.14.15/arch/hexagon/include/asm/elf.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/hexagon/include/asm/elf.h 2014-08-20 19:31:40.728845826 +0200
+diff -Nur linux-3.14.17/arch/hexagon/include/asm/elf.h linux-imx6-3.14/arch/hexagon/include/asm/elf.h
+--- linux-3.14.17/arch/hexagon/include/asm/elf.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/hexagon/include/asm/elf.h 2014-09-09 10:13:47.748945163 +0200
@@ -1,7 +1,7 @@
/*
* ELF definitions for the Hexagon architecture
@@ -42082,9 +42242,9 @@ diff -Nur linux-3.14.15/arch/hexagon/include/asm/elf.h linux-linaro-stable-mx6/a
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
-diff -Nur linux-3.14.15/arch/parisc/include/asm/ftrace.h linux-linaro-stable-mx6/arch/parisc/include/asm/ftrace.h
---- linux-3.14.15/arch/parisc/include/asm/ftrace.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/parisc/include/asm/ftrace.h 2014-08-20 19:31:41.312848333 +0200
+diff -Nur linux-3.14.17/arch/parisc/include/asm/ftrace.h linux-imx6-3.14/arch/parisc/include/asm/ftrace.h
+--- linux-3.14.17/arch/parisc/include/asm/ftrace.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/parisc/include/asm/ftrace.h 2014-09-09 10:13:48.088947937 +0200
@@ -24,15 +24,7 @@
extern unsigned long return_address(unsigned int);
@@ -42102,9 +42262,9 @@ diff -Nur linux-3.14.15/arch/parisc/include/asm/ftrace.h linux-linaro-stable-mx6
#endif /* __ASSEMBLY__ */
-diff -Nur linux-3.14.15/arch/parisc/include/uapi/asm/signal.h linux-linaro-stable-mx6/arch/parisc/include/uapi/asm/signal.h
---- linux-3.14.15/arch/parisc/include/uapi/asm/signal.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/parisc/include/uapi/asm/signal.h 2014-08-20 19:23:48.390823776 +0200
+diff -Nur linux-3.14.17/arch/parisc/include/uapi/asm/signal.h linux-imx6-3.14/arch/parisc/include/uapi/asm/signal.h
+--- linux-3.14.17/arch/parisc/include/uapi/asm/signal.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/parisc/include/uapi/asm/signal.h 2014-09-09 10:13:48.092947970 +0200
@@ -69,6 +69,8 @@
#define SA_NOMASK SA_NODEFER
#define SA_ONESHOT SA_RESETHAND
@@ -42114,9 +42274,9 @@ diff -Nur linux-3.14.15/arch/parisc/include/uapi/asm/signal.h linux-linaro-stabl
#define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192
-diff -Nur linux-3.14.15/arch/s390/include/asm/cio.h linux-linaro-stable-mx6/arch/s390/include/asm/cio.h
---- linux-3.14.15/arch/s390/include/asm/cio.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/s390/include/asm/cio.h 2014-08-20 19:31:41.684849930 +0200
+diff -Nur linux-3.14.17/arch/s390/include/asm/cio.h linux-imx6-3.14/arch/s390/include/asm/cio.h
+--- linux-3.14.17/arch/s390/include/asm/cio.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/s390/include/asm/cio.h 2014-09-09 10:13:48.264949374 +0200
@@ -199,7 +199,7 @@
/**
* struct irb - interruption response block
@@ -42126,9 +42286,9 @@ diff -Nur linux-3.14.15/arch/s390/include/asm/cio.h linux-linaro-stable-mx6/arch
* @ecw: extended control word
*
* The irb that is handed to the device driver when an interrupt occurs. For
-diff -Nur linux-3.14.15/arch/s390/kernel/ptrace.c linux-linaro-stable-mx6/arch/s390/kernel/ptrace.c
---- linux-3.14.15/arch/s390/kernel/ptrace.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/s390/kernel/ptrace.c 2014-08-20 19:31:41.708850033 +0200
+diff -Nur linux-3.14.17/arch/s390/kernel/ptrace.c linux-imx6-3.14/arch/s390/kernel/ptrace.c
+--- linux-3.14.17/arch/s390/kernel/ptrace.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/s390/kernel/ptrace.c 2014-09-09 10:13:48.280949504 +0200
@@ -323,14 +323,9 @@
unsigned long mask = PSW_MASK_USER;
@@ -42159,9 +42319,9 @@ diff -Nur linux-3.14.15/arch/s390/kernel/ptrace.c linux-linaro-stable-mx6/arch/s
regs->psw.mask = (regs->psw.mask & ~PSW_MASK_USER) |
(regs->psw.mask & PSW_MASK_BA) |
(__u64)(tmp & mask) << 32;
-diff -Nur linux-3.14.15/arch/sh/include/asm/ftrace.h linux-linaro-stable-mx6/arch/sh/include/asm/ftrace.h
---- linux-3.14.15/arch/sh/include/asm/ftrace.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/sh/include/asm/ftrace.h 2014-08-20 19:31:41.796850411 +0200
+diff -Nur linux-3.14.17/arch/sh/include/asm/ftrace.h linux-imx6-3.14/arch/sh/include/asm/ftrace.h
+--- linux-3.14.17/arch/sh/include/asm/ftrace.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/sh/include/asm/ftrace.h 2014-09-09 10:13:48.320949831 +0200
@@ -40,15 +40,7 @@
/* arch/sh/kernel/return_address.c */
extern void *return_address(unsigned int);
@@ -42179,9 +42339,733 @@ diff -Nur linux-3.14.15/arch/sh/include/asm/ftrace.h linux-linaro-stable-mx6/arc
#endif /* __ASSEMBLY__ */
-diff -Nur linux-3.14.15/arch/x86/boot/header.S linux-linaro-stable-mx6/arch/x86/boot/header.S
---- linux-3.14.15/arch/x86/boot/header.S 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/x86/boot/header.S 2014-08-20 19:31:41.936851012 +0200
+diff -Nur linux-3.14.17/arch/sparc/include/asm/pgtable_64.h linux-imx6-3.14/arch/sparc/include/asm/pgtable_64.h
+--- linux-3.14.17/arch/sparc/include/asm/pgtable_64.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/sparc/include/asm/pgtable_64.h 2014-09-09 10:13:48.372950255 +0200
+@@ -24,8 +24,7 @@
+
+ /* The kernel image occupies 0x4000000 to 0x6000000 (4MB --> 96MB).
+ * The page copy blockops can use 0x6000000 to 0x8000000.
+- * The 8K TSB is mapped in the 0x8000000 to 0x8400000 range.
+- * The 4M TSB is mapped in the 0x8400000 to 0x8800000 range.
++ * The TSB is mapped in the 0x8000000 to 0xa000000 range.
+ * The PROM resides in an area spanning 0xf0000000 to 0x100000000.
+ * The vmalloc area spans 0x100000000 to 0x200000000.
+ * Since modules need to be in the lowest 32-bits of the address space,
+@@ -34,8 +33,7 @@
+ * 0x400000000.
+ */
+ #define TLBTEMP_BASE _AC(0x0000000006000000,UL)
+-#define TSBMAP_8K_BASE _AC(0x0000000008000000,UL)
+-#define TSBMAP_4M_BASE _AC(0x0000000008400000,UL)
++#define TSBMAP_BASE _AC(0x0000000008000000,UL)
+ #define MODULES_VADDR _AC(0x0000000010000000,UL)
+ #define MODULES_LEN _AC(0x00000000e0000000,UL)
+ #define MODULES_END _AC(0x00000000f0000000,UL)
+@@ -73,23 +71,6 @@
+
+ #include <linux/sched.h>
+
+-extern unsigned long sparc64_valid_addr_bitmap[];
+-
+-/* Needs to be defined here and not in linux/mm.h, as it is arch dependent */
+-static inline bool __kern_addr_valid(unsigned long paddr)
+-{
+- if ((paddr >> MAX_PHYS_ADDRESS_BITS) != 0UL)
+- return false;
+- return test_bit(paddr >> ILOG2_4MB, sparc64_valid_addr_bitmap);
+-}
+-
+-static inline bool kern_addr_valid(unsigned long addr)
+-{
+- unsigned long paddr = __pa(addr);
+-
+- return __kern_addr_valid(paddr);
+-}
+-
+ /* Entries per page directory level. */
+ #define PTRS_PER_PTE (1UL << (PAGE_SHIFT-3))
+ #define PTRS_PER_PMD (1UL << PMD_BITS)
+@@ -98,12 +79,9 @@
+ /* Kernel has a separate 44bit address space. */
+ #define FIRST_USER_ADDRESS 0
+
+-#define pmd_ERROR(e) \
+- pr_err("%s:%d: bad pmd %p(%016lx) seen at (%pS)\n", \
+- __FILE__, __LINE__, &(e), pmd_val(e), __builtin_return_address(0))
+-#define pgd_ERROR(e) \
+- pr_err("%s:%d: bad pgd %p(%016lx) seen at (%pS)\n", \
+- __FILE__, __LINE__, &(e), pgd_val(e), __builtin_return_address(0))
++#define pte_ERROR(e) __builtin_trap()
++#define pmd_ERROR(e) __builtin_trap()
++#define pgd_ERROR(e) __builtin_trap()
+
+ #endif /* !(__ASSEMBLY__) */
+
+@@ -280,8 +258,8 @@
+ {
+ unsigned long mask, tmp;
+
+- /* SUN4U: 0x630107ffffffec38 (negated == 0x9cfef800000013c7)
+- * SUN4V: 0x33ffffffffffee07 (negated == 0xcc000000000011f8)
++ /* SUN4U: 0x600307ffffffecb8 (negated == 0x9ffcf80000001347)
++ * SUN4V: 0x30ffffffffffee17 (negated == 0xcf000000000011e8)
+ *
+ * Even if we use negation tricks the result is still a 6
+ * instruction sequence, so don't try to play fancy and just
+@@ -311,10 +289,10 @@
+ " .previous\n"
+ : "=r" (mask), "=r" (tmp)
+ : "i" (_PAGE_PADDR_4U | _PAGE_MODIFIED_4U | _PAGE_ACCESSED_4U |
+- _PAGE_CP_4U | _PAGE_CV_4U | _PAGE_E_4U |
++ _PAGE_CP_4U | _PAGE_CV_4U | _PAGE_E_4U | _PAGE_PRESENT_4U |
+ _PAGE_SPECIAL | _PAGE_PMD_HUGE | _PAGE_SZALL_4U),
+ "i" (_PAGE_PADDR_4V | _PAGE_MODIFIED_4V | _PAGE_ACCESSED_4V |
+- _PAGE_CP_4V | _PAGE_CV_4V | _PAGE_E_4V |
++ _PAGE_CP_4V | _PAGE_CV_4V | _PAGE_E_4V | _PAGE_PRESENT_4V |
+ _PAGE_SPECIAL | _PAGE_PMD_HUGE | _PAGE_SZALL_4V));
+
+ return __pte((pte_val(pte) & mask) | (pgprot_val(prot) & ~mask));
+@@ -655,7 +633,7 @@
+ {
+ pte_t pte = __pte(pmd_val(pmd));
+
+- return pte_val(pte) & _PAGE_PMD_HUGE;
++ return (pte_val(pte) & _PAGE_PMD_HUGE) && pte_present(pte);
+ }
+
+ #ifdef CONFIG_TRANSPARENT_HUGEPAGE
+@@ -741,6 +719,20 @@
+ return __pmd(pte_val(pte));
+ }
+
++static inline pmd_t pmd_mknotpresent(pmd_t pmd)
++{
++ unsigned long mask;
++
++ if (tlb_type == hypervisor)
++ mask = _PAGE_PRESENT_4V;
++ else
++ mask = _PAGE_PRESENT_4U;
++
++ pmd_val(pmd) &= ~mask;
++
++ return pmd;
++}
++
+ static inline pmd_t pmd_mksplitting(pmd_t pmd)
+ {
+ pte_t pte = __pte(pmd_val(pmd));
+@@ -765,20 +757,6 @@
+
+ #define pmd_none(pmd) (!pmd_val(pmd))
+
+-/* pmd_bad() is only called on non-trans-huge PMDs. Our encoding is
+- * very simple, it's just the physical address. PTE tables are of
+- * size PAGE_SIZE so make sure the sub-PAGE_SIZE bits are clear and
+- * the top bits outside of the range of any physical address size we
+- * support are clear as well. We also validate the physical itself.
+- */
+-#define pmd_bad(pmd) ((pmd_val(pmd) & ~PAGE_MASK) || \
+- !__kern_addr_valid(pmd_val(pmd)))
+-
+-#define pud_none(pud) (!pud_val(pud))
+-
+-#define pud_bad(pud) ((pud_val(pud) & ~PAGE_MASK) || \
+- !__kern_addr_valid(pud_val(pud)))
+-
+ #ifdef CONFIG_TRANSPARENT_HUGEPAGE
+ extern void set_pmd_at(struct mm_struct *mm, unsigned long addr,
+ pmd_t *pmdp, pmd_t pmd);
+@@ -812,7 +790,10 @@
+ #define pud_page_vaddr(pud) \
+ ((unsigned long) __va(pud_val(pud)))
+ #define pud_page(pud) virt_to_page((void *)pud_page_vaddr(pud))
++#define pmd_bad(pmd) (0)
+ #define pmd_clear(pmdp) (pmd_val(*(pmdp)) = 0UL)
++#define pud_none(pud) (!pud_val(pud))
++#define pud_bad(pud) (0)
+ #define pud_present(pud) (pud_val(pud) != 0U)
+ #define pud_clear(pudp) (pud_val(*(pudp)) = 0UL)
+
+@@ -912,10 +893,6 @@
+ extern void update_mmu_cache_pmd(struct vm_area_struct *vma, unsigned long addr,
+ pmd_t *pmd);
+
+-#define __HAVE_ARCH_PMDP_INVALIDATE
+-extern void pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,
+- pmd_t *pmdp);
+-
+ #define __HAVE_ARCH_PGTABLE_DEPOSIT
+ extern void pgtable_trans_huge_deposit(struct mm_struct *mm, pmd_t *pmdp,
+ pgtable_t pgtable);
+@@ -942,6 +919,18 @@
+ extern pte_t pgoff_to_pte(unsigned long);
+ #define PTE_FILE_MAX_BITS (64UL - PAGE_SHIFT - 1UL)
+
++extern unsigned long sparc64_valid_addr_bitmap[];
++
++/* Needs to be defined here and not in linux/mm.h, as it is arch dependent */
++static inline bool kern_addr_valid(unsigned long addr)
++{
++ unsigned long paddr = __pa(addr);
++
++ if ((paddr >> 41UL) != 0UL)
++ return false;
++ return test_bit(paddr >> 22, sparc64_valid_addr_bitmap);
++}
++
+ extern int page_in_phys_avail(unsigned long paddr);
+
+ /*
+diff -Nur linux-3.14.17/arch/sparc/include/asm/tlbflush_64.h linux-imx6-3.14/arch/sparc/include/asm/tlbflush_64.h
+--- linux-3.14.17/arch/sparc/include/asm/tlbflush_64.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/sparc/include/asm/tlbflush_64.h 2014-09-09 10:13:48.376950288 +0200
+@@ -34,8 +34,6 @@
+ {
+ }
+
+-void flush_tlb_kernel_range(unsigned long start, unsigned long end);
+-
+ #define __HAVE_ARCH_ENTER_LAZY_MMU_MODE
+
+ extern void flush_tlb_pending(void);
+@@ -50,6 +48,11 @@
+
+ #ifndef CONFIG_SMP
+
++#define flush_tlb_kernel_range(start,end) \
++do { flush_tsb_kernel_range(start,end); \
++ __flush_tlb_kernel_range(start,end); \
++} while (0)
++
+ static inline void global_flush_tlb_page(struct mm_struct *mm, unsigned long vaddr)
+ {
+ __flush_tlb_page(CTX_HWBITS(mm->context), vaddr);
+@@ -60,6 +63,11 @@
+ extern void smp_flush_tlb_kernel_range(unsigned long start, unsigned long end);
+ extern void smp_flush_tlb_page(struct mm_struct *mm, unsigned long vaddr);
+
++#define flush_tlb_kernel_range(start, end) \
++do { flush_tsb_kernel_range(start,end); \
++ smp_flush_tlb_kernel_range(start, end); \
++} while (0)
++
+ #define global_flush_tlb_page(mm, vaddr) \
+ smp_flush_tlb_page(mm, vaddr)
+
+diff -Nur linux-3.14.17/arch/sparc/include/asm/tsb.h linux-imx6-3.14/arch/sparc/include/asm/tsb.h
+--- linux-3.14.17/arch/sparc/include/asm/tsb.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/sparc/include/asm/tsb.h 2014-09-09 10:13:48.376950288 +0200
+@@ -171,8 +171,7 @@
+ andcc REG1, REG2, %g0; \
+ be,pt %xcc, 700f; \
+ sethi %hi(4 * 1024 * 1024), REG2; \
+- brgez,pn REG1, FAIL_LABEL; \
+- andn REG1, REG2, REG1; \
++ andn REG1, REG2, REG1; \
+ and VADDR, REG2, REG2; \
+ brlz,pt REG1, PTE_LABEL; \
+ or REG1, REG2, REG1; \
+diff -Nur linux-3.14.17/arch/sparc/kernel/head_64.S linux-imx6-3.14/arch/sparc/kernel/head_64.S
+--- linux-3.14.17/arch/sparc/kernel/head_64.S 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/sparc/kernel/head_64.S 2014-09-09 10:13:48.380950320 +0200
+@@ -282,8 +282,8 @@
+ stx %l2, [%l4 + 0x0]
+ ldx [%sp + 2047 + 128 + 0x50], %l3 ! physaddr low
+ /* 4MB align */
+- srlx %l3, ILOG2_4MB, %l3
+- sllx %l3, ILOG2_4MB, %l3
++ srlx %l3, 22, %l3
++ sllx %l3, 22, %l3
+ stx %l3, [%l4 + 0x8]
+
+ /* Leave service as-is, "call-method" */
+diff -Nur linux-3.14.17/arch/sparc/kernel/ktlb.S linux-imx6-3.14/arch/sparc/kernel/ktlb.S
+--- linux-3.14.17/arch/sparc/kernel/ktlb.S 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/sparc/kernel/ktlb.S 2014-09-09 10:13:48.384950352 +0200
+@@ -277,7 +277,7 @@
+ #ifdef CONFIG_SPARSEMEM_VMEMMAP
+ kvmap_vmemmap:
+ sub %g4, %g5, %g5
+- srlx %g5, ILOG2_4MB, %g5
++ srlx %g5, 22, %g5
+ sethi %hi(vmemmap_table), %g1
+ sllx %g5, 3, %g5
+ or %g1, %lo(vmemmap_table), %g1
+diff -Nur linux-3.14.17/arch/sparc/kernel/ldc.c linux-imx6-3.14/arch/sparc/kernel/ldc.c
+--- linux-3.14.17/arch/sparc/kernel/ldc.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/sparc/kernel/ldc.c 2014-09-09 10:13:48.384950352 +0200
+@@ -1336,7 +1336,7 @@
+ if (!(lp->flags & LDC_FLAG_ALLOCED_QUEUES) ||
+ !(lp->flags & LDC_FLAG_REGISTERED_QUEUES) ||
+ lp->hs_state != LDC_HS_OPEN)
+- err = ((lp->hs_state > LDC_HS_OPEN) ? 0 : -EINVAL);
++ err = -EINVAL;
+ else
+ err = start_handshake(lp);
+
+diff -Nur linux-3.14.17/arch/sparc/kernel/smp_64.c linux-imx6-3.14/arch/sparc/kernel/smp_64.c
+--- linux-3.14.17/arch/sparc/kernel/smp_64.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/sparc/kernel/smp_64.c 2014-09-09 10:13:48.392950418 +0200
+@@ -151,7 +151,7 @@
+ #define NUM_ROUNDS 64 /* magic value */
+ #define NUM_ITERS 5 /* likewise */
+
+-static DEFINE_RAW_SPINLOCK(itc_sync_lock);
++static DEFINE_SPINLOCK(itc_sync_lock);
+ static unsigned long go[SLAVE + 1];
+
+ #define DEBUG_TICK_SYNC 0
+@@ -259,7 +259,7 @@
+ go[MASTER] = 0;
+ membar_safe("#StoreLoad");
+
+- raw_spin_lock_irqsave(&itc_sync_lock, flags);
++ spin_lock_irqsave(&itc_sync_lock, flags);
+ {
+ for (i = 0; i < NUM_ROUNDS*NUM_ITERS; i++) {
+ while (!go[MASTER])
+@@ -270,7 +270,7 @@
+ membar_safe("#StoreLoad");
+ }
+ }
+- raw_spin_unlock_irqrestore(&itc_sync_lock, flags);
++ spin_unlock_irqrestore(&itc_sync_lock, flags);
+ }
+
+ #if defined(CONFIG_SUN_LDOMS) && defined(CONFIG_HOTPLUG_CPU)
+diff -Nur linux-3.14.17/arch/sparc/kernel/sys32.S linux-imx6-3.14/arch/sparc/kernel/sys32.S
+--- linux-3.14.17/arch/sparc/kernel/sys32.S 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/sparc/kernel/sys32.S 2014-09-09 10:13:48.392950418 +0200
+@@ -44,7 +44,7 @@
+ SIGN1(sys32_io_submit, compat_sys_io_submit, %o1)
+ SIGN1(sys32_mq_open, compat_sys_mq_open, %o1)
+ SIGN1(sys32_select, compat_sys_select, %o0)
+-SIGN1(sys32_futex, compat_sys_futex, %o1)
++SIGN3(sys32_futex, compat_sys_futex, %o1, %o2, %o5)
+ SIGN1(sys32_recvfrom, compat_sys_recvfrom, %o0)
+ SIGN1(sys32_recvmsg, compat_sys_recvmsg, %o0)
+ SIGN1(sys32_sendmsg, compat_sys_sendmsg, %o0)
+diff -Nur linux-3.14.17/arch/sparc/kernel/unaligned_64.c linux-imx6-3.14/arch/sparc/kernel/unaligned_64.c
+--- linux-3.14.17/arch/sparc/kernel/unaligned_64.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/sparc/kernel/unaligned_64.c 2014-09-09 10:13:48.416950614 +0200
+@@ -166,23 +166,17 @@
+ unsigned long compute_effective_address(struct pt_regs *regs,
+ unsigned int insn, unsigned int rd)
+ {
+- int from_kernel = (regs->tstate & TSTATE_PRIV) != 0;
+ unsigned int rs1 = (insn >> 14) & 0x1f;
+ unsigned int rs2 = insn & 0x1f;
+- unsigned long addr;
++ int from_kernel = (regs->tstate & TSTATE_PRIV) != 0;
+
+ if (insn & 0x2000) {
+ maybe_flush_windows(rs1, 0, rd, from_kernel);
+- addr = (fetch_reg(rs1, regs) + sign_extend_imm13(insn));
++ return (fetch_reg(rs1, regs) + sign_extend_imm13(insn));
+ } else {
+ maybe_flush_windows(rs1, rs2, rd, from_kernel);
+- addr = (fetch_reg(rs1, regs) + fetch_reg(rs2, regs));
++ return (fetch_reg(rs1, regs) + fetch_reg(rs2, regs));
+ }
+-
+- if (!from_kernel && test_thread_flag(TIF_32BIT))
+- addr &= 0xffffffff;
+-
+- return addr;
+ }
+
+ /* This is just to make gcc think die_if_kernel does return... */
+diff -Nur linux-3.14.17/arch/sparc/lib/NG2memcpy.S linux-imx6-3.14/arch/sparc/lib/NG2memcpy.S
+--- linux-3.14.17/arch/sparc/lib/NG2memcpy.S 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/sparc/lib/NG2memcpy.S 2014-09-09 10:13:48.420950646 +0200
+@@ -236,7 +236,6 @@
+ */
+ VISEntryHalf
+
+- membar #Sync
+ alignaddr %o1, %g0, %g0
+
+ add %o1, (64 - 1), %o4
+diff -Nur linux-3.14.17/arch/sparc/math-emu/math_32.c linux-imx6-3.14/arch/sparc/math-emu/math_32.c
+--- linux-3.14.17/arch/sparc/math-emu/math_32.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/sparc/math-emu/math_32.c 2014-09-09 10:13:48.424950678 +0200
+@@ -499,7 +499,7 @@
+ case 0: fsr = *pfsr;
+ if (IR == -1) IR = 2;
+ /* fcc is always fcc0 */
+- fsr &= ~0xc00; fsr |= (IR << 10);
++ fsr &= ~0xc00; fsr |= (IR << 10); break;
+ *pfsr = fsr;
+ break;
+ case 1: rd->s = IR; break;
+diff -Nur linux-3.14.17/arch/sparc/mm/fault_64.c linux-imx6-3.14/arch/sparc/mm/fault_64.c
+--- linux-3.14.17/arch/sparc/mm/fault_64.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/sparc/mm/fault_64.c 2014-09-09 10:13:48.428950711 +0200
+@@ -96,51 +96,38 @@
+ pte_t *ptep, pte;
+ unsigned long pa;
+ u32 insn = 0;
++ unsigned long pstate;
+
+- if (pgd_none(*pgdp) || unlikely(pgd_bad(*pgdp)))
+- goto out;
++ if (pgd_none(*pgdp))
++ goto outret;
+ pudp = pud_offset(pgdp, tpc);
+- if (pud_none(*pudp) || unlikely(pud_bad(*pudp)))
+- goto out;
++ if (pud_none(*pudp))
++ goto outret;
++ pmdp = pmd_offset(pudp, tpc);
++ if (pmd_none(*pmdp))
++ goto outret;
+
+ /* This disables preemption for us as well. */
+- local_irq_disable();
++ __asm__ __volatile__("rdpr %%pstate, %0" : "=r" (pstate));
++ __asm__ __volatile__("wrpr %0, %1, %%pstate"
++ : : "r" (pstate), "i" (PSTATE_IE));
++ ptep = pte_offset_map(pmdp, tpc);
++ pte = *ptep;
++ if (!pte_present(pte))
++ goto out;
+
+- pmdp = pmd_offset(pudp, tpc);
+- if (pmd_none(*pmdp) || unlikely(pmd_bad(*pmdp)))
+- goto out_irq_enable;
++ pa = (pte_pfn(pte) << PAGE_SHIFT);
++ pa += (tpc & ~PAGE_MASK);
++
++ /* Use phys bypass so we don't pollute dtlb/dcache. */
++ __asm__ __volatile__("lduwa [%1] %2, %0"
++ : "=r" (insn)
++ : "r" (pa), "i" (ASI_PHYS_USE_EC));
+
+-#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+- if (pmd_trans_huge(*pmdp)) {
+- if (pmd_trans_splitting(*pmdp))
+- goto out_irq_enable;
+-
+- pa = pmd_pfn(*pmdp) << PAGE_SHIFT;
+- pa += tpc & ~HPAGE_MASK;
+-
+- /* Use phys bypass so we don't pollute dtlb/dcache. */
+- __asm__ __volatile__("lduwa [%1] %2, %0"
+- : "=r" (insn)
+- : "r" (pa), "i" (ASI_PHYS_USE_EC));
+- } else
+-#endif
+- {
+- ptep = pte_offset_map(pmdp, tpc);
+- pte = *ptep;
+- if (pte_present(pte)) {
+- pa = (pte_pfn(pte) << PAGE_SHIFT);
+- pa += (tpc & ~PAGE_MASK);
+-
+- /* Use phys bypass so we don't pollute dtlb/dcache. */
+- __asm__ __volatile__("lduwa [%1] %2, %0"
+- : "=r" (insn)
+- : "r" (pa), "i" (ASI_PHYS_USE_EC));
+- }
+- pte_unmap(ptep);
+- }
+-out_irq_enable:
+- local_irq_enable();
+ out:
++ pte_unmap(ptep);
++ __asm__ __volatile__("wrpr %0, 0x0, %%pstate" : : "r" (pstate));
++outret:
+ return insn;
+ }
+
+@@ -166,8 +153,7 @@
+ }
+
+ static void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
+- unsigned long fault_addr, unsigned int insn,
+- int fault_code)
++ unsigned int insn, int fault_code)
+ {
+ unsigned long addr;
+ siginfo_t info;
+@@ -175,18 +161,10 @@
+ info.si_code = code;
+ info.si_signo = sig;
+ info.si_errno = 0;
+- if (fault_code & FAULT_CODE_ITLB) {
++ if (fault_code & FAULT_CODE_ITLB)
+ addr = regs->tpc;
+- } else {
+- /* If we were able to probe the faulting instruction, use it
+- * to compute a precise fault address. Otherwise use the fault
+- * time provided address which may only have page granularity.
+- */
+- if (insn)
+- addr = compute_effective_address(regs, insn, 0);
+- else
+- addr = fault_addr;
+- }
++ else
++ addr = compute_effective_address(regs, insn, 0);
+ info.si_addr = (void __user *) addr;
+ info.si_trapno = 0;
+
+@@ -261,7 +239,7 @@
+ /* The si_code was set to make clear whether
+ * this was a SEGV_MAPERR or SEGV_ACCERR fault.
+ */
+- do_fault_siginfo(si_code, SIGSEGV, regs, address, insn, fault_code);
++ do_fault_siginfo(si_code, SIGSEGV, regs, insn, fault_code);
+ return;
+ }
+
+@@ -281,6 +259,18 @@
+ show_regs(regs);
+ }
+
++static void noinline __kprobes bogus_32bit_fault_address(struct pt_regs *regs,
++ unsigned long addr)
++{
++ static int times;
++
++ if (times++ < 10)
++ printk(KERN_ERR "FAULT[%s:%d]: 32-bit process "
++ "reports 64-bit fault address [%lx]\n",
++ current->comm, current->pid, addr);
++ show_regs(regs);
++}
++
+ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
+ {
+ enum ctx_state prev_state = exception_enter();
+@@ -310,8 +300,10 @@
+ goto intr_or_no_mm;
+ }
+ }
+- if (unlikely((address >> 32) != 0))
++ if (unlikely((address >> 32) != 0)) {
++ bogus_32bit_fault_address(regs, address);
+ goto intr_or_no_mm;
++ }
+ }
+
+ if (regs->tstate & TSTATE_PRIV) {
+@@ -533,7 +525,7 @@
+ * Send a sigbus, regardless of whether we were in kernel
+ * or user mode.
+ */
+- do_fault_siginfo(BUS_ADRERR, SIGBUS, regs, address, insn, fault_code);
++ do_fault_siginfo(BUS_ADRERR, SIGBUS, regs, insn, fault_code);
+
+ /* Kernel mode? Handle exceptions or die */
+ if (regs->tstate & TSTATE_PRIV)
+diff -Nur linux-3.14.17/arch/sparc/mm/gup.c linux-imx6-3.14/arch/sparc/mm/gup.c
+--- linux-3.14.17/arch/sparc/mm/gup.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/sparc/mm/gup.c 2014-09-09 10:13:48.428950711 +0200
+@@ -73,7 +73,7 @@
+ struct page *head, *page, *tail;
+ int refs;
+
+- if (!(pmd_val(pmd) & _PAGE_VALID))
++ if (!pmd_large(pmd))
+ return 0;
+
+ if (write && !pmd_write(pmd))
+diff -Nur linux-3.14.17/arch/sparc/mm/init_64.c linux-imx6-3.14/arch/sparc/mm/init_64.c
+--- linux-3.14.17/arch/sparc/mm/init_64.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/sparc/mm/init_64.c 2014-09-09 10:13:48.428950711 +0200
+@@ -350,10 +350,6 @@
+
+ mm = vma->vm_mm;
+
+- /* Don't insert a non-valid PTE into the TSB, we'll deadlock. */
+- if (!pte_accessible(mm, pte))
+- return;
+-
+ spin_lock_irqsave(&mm->context.lock, flags);
+
+ #if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_TRANSPARENT_HUGEPAGE)
+@@ -592,7 +588,7 @@
+ int i, tlb_ent = sparc64_highest_locked_tlbent();
+
+ tte_vaddr = (unsigned long) KERNBASE;
+- phys_page = (prom_boot_mapping_phys_low >> ILOG2_4MB) << ILOG2_4MB;
++ phys_page = (prom_boot_mapping_phys_low >> 22UL) << 22UL;
+ tte_data = kern_large_tte(phys_page);
+
+ kern_locked_tte_data = tte_data;
+@@ -1885,7 +1881,7 @@
+
+ BUILD_BUG_ON(NR_CPUS > 4096);
+
+- kern_base = (prom_boot_mapping_phys_low >> ILOG2_4MB) << ILOG2_4MB;
++ kern_base = (prom_boot_mapping_phys_low >> 22UL) << 22UL;
+ kern_size = (unsigned long)&_end - (unsigned long)KERNBASE;
+
+ /* Invalidate both kernel TSBs. */
+@@ -1941,7 +1937,7 @@
+ shift = kern_base + PAGE_OFFSET - ((unsigned long)KERNBASE);
+
+ real_end = (unsigned long)_end;
+- num_kernel_image_mappings = DIV_ROUND_UP(real_end - KERNBASE, 1 << ILOG2_4MB);
++ num_kernel_image_mappings = DIV_ROUND_UP(real_end - KERNBASE, 1 << 22);
+ printk("Kernel: Using %d locked TLB entries for main kernel image.\n",
+ num_kernel_image_mappings);
+
+@@ -2098,7 +2094,7 @@
+
+ if (new_start <= old_start &&
+ new_end >= (old_start + PAGE_SIZE)) {
+- set_bit(old_start >> ILOG2_4MB, bitmap);
++ set_bit(old_start >> 22, bitmap);
+ goto do_next_page;
+ }
+ }
+@@ -2147,7 +2143,7 @@
+ addr = PAGE_OFFSET + kern_base;
+ last = PAGE_ALIGN(kern_size) + addr;
+ while (addr < last) {
+- set_bit(__pa(addr) >> ILOG2_4MB, sparc64_valid_addr_bitmap);
++ set_bit(__pa(addr) >> 22, sparc64_valid_addr_bitmap);
+ addr += PAGE_SIZE;
+ }
+
+@@ -2271,7 +2267,7 @@
+ void *block;
+
+ if (!(*vmem_pp & _PAGE_VALID)) {
+- block = vmemmap_alloc_block(1UL << ILOG2_4MB, node);
++ block = vmemmap_alloc_block(1UL << 22, node);
+ if (!block)
+ return -ENOMEM;
+
+@@ -2618,10 +2614,6 @@
+
+ pte = pmd_val(entry);
+
+- /* Don't insert a non-valid PMD into the TSB, we'll deadlock. */
+- if (!(pte & _PAGE_VALID))
+- return;
+-
+ /* We are fabricating 8MB pages using 4MB real hw pages. */
+ pte |= (addr & (1UL << REAL_HPAGE_SHIFT));
+
+@@ -2702,26 +2694,3 @@
+ }
+ }
+ #endif
+-
+-#ifdef CONFIG_SMP
+-#define do_flush_tlb_kernel_range smp_flush_tlb_kernel_range
+-#else
+-#define do_flush_tlb_kernel_range __flush_tlb_kernel_range
+-#endif
+-
+-void flush_tlb_kernel_range(unsigned long start, unsigned long end)
+-{
+- if (start < HI_OBP_ADDRESS && end > LOW_OBP_ADDRESS) {
+- if (start < LOW_OBP_ADDRESS) {
+- flush_tsb_kernel_range(start, LOW_OBP_ADDRESS);
+- do_flush_tlb_kernel_range(start, LOW_OBP_ADDRESS);
+- }
+- if (end > HI_OBP_ADDRESS) {
+- flush_tsb_kernel_range(end, HI_OBP_ADDRESS);
+- do_flush_tlb_kernel_range(end, HI_OBP_ADDRESS);
+- }
+- } else {
+- flush_tsb_kernel_range(start, end);
+- do_flush_tlb_kernel_range(start, end);
+- }
+-}
+diff -Nur linux-3.14.17/arch/sparc/mm/tlb.c linux-imx6-3.14/arch/sparc/mm/tlb.c
+--- linux-3.14.17/arch/sparc/mm/tlb.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/sparc/mm/tlb.c 2014-09-09 10:13:48.428950711 +0200
+@@ -134,7 +134,7 @@
+
+ #ifdef CONFIG_TRANSPARENT_HUGEPAGE
+ static void tlb_batch_pmd_scan(struct mm_struct *mm, unsigned long vaddr,
+- pmd_t pmd)
++ pmd_t pmd, bool exec)
+ {
+ unsigned long end;
+ pte_t *pte;
+@@ -142,11 +142,8 @@
+ pte = pte_offset_map(&pmd, vaddr);
+ end = vaddr + HPAGE_SIZE;
+ while (vaddr < end) {
+- if (pte_val(*pte) & _PAGE_VALID) {
+- bool exec = pte_exec(*pte);
+-
++ if (pte_val(*pte) & _PAGE_VALID)
+ tlb_batch_add_one(mm, vaddr, exec);
+- }
+ pte++;
+ vaddr += PAGE_SIZE;
+ }
+@@ -180,30 +177,19 @@
+ }
+
+ if (!pmd_none(orig)) {
++ pte_t orig_pte = __pte(pmd_val(orig));
++ bool exec = pte_exec(orig_pte);
++
+ addr &= HPAGE_MASK;
+ if (pmd_trans_huge(orig)) {
+- pte_t orig_pte = __pte(pmd_val(orig));
+- bool exec = pte_exec(orig_pte);
+-
+ tlb_batch_add_one(mm, addr, exec);
+ tlb_batch_add_one(mm, addr + REAL_HPAGE_SIZE, exec);
+ } else {
+- tlb_batch_pmd_scan(mm, addr, orig);
++ tlb_batch_pmd_scan(mm, addr, orig, exec);
+ }
+ }
+ }
+
+-void pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,
+- pmd_t *pmdp)
+-{
+- pmd_t entry = *pmdp;
+-
+- pmd_val(entry) &= ~_PAGE_VALID;
+-
+- set_pmd_at(vma->vm_mm, address, pmdp, entry);
+- flush_tlb_range(vma, address, address + HPAGE_PMD_SIZE);
+-}
+-
+ void pgtable_trans_huge_deposit(struct mm_struct *mm, pmd_t *pmdp,
+ pgtable_t pgtable)
+ {
+diff -Nur linux-3.14.17/arch/sparc/mm/tsb.c linux-imx6-3.14/arch/sparc/mm/tsb.c
+--- linux-3.14.17/arch/sparc/mm/tsb.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/sparc/mm/tsb.c 2014-09-09 10:13:48.428950711 +0200
+@@ -133,19 +133,7 @@
+ mm->context.tsb_block[tsb_idx].tsb_nentries =
+ tsb_bytes / sizeof(struct tsb);
+
+- switch (tsb_idx) {
+- case MM_TSB_BASE:
+- base = TSBMAP_8K_BASE;
+- break;
+-#if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_TRANSPARENT_HUGEPAGE)
+- case MM_TSB_HUGE:
+- base = TSBMAP_4M_BASE;
+- break;
+-#endif
+- default:
+- BUG();
+- }
+-
++ base = TSBMAP_BASE;
+ tte = pgprot_val(PAGE_KERNEL_LOCKED);
+ tsb_paddr = __pa(mm->context.tsb_block[tsb_idx].tsb);
+ BUG_ON(tsb_paddr & (tsb_bytes - 1UL));
+diff -Nur linux-3.14.17/arch/x86/boot/header.S linux-imx6-3.14/arch/x86/boot/header.S
+--- linux-3.14.17/arch/x86/boot/header.S 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/x86/boot/header.S 2014-09-09 10:13:48.484951168 +0200
@@ -91,9 +91,10 @@
.section ".bsdata", "a"
@@ -42230,9 +43114,9 @@ diff -Nur linux-3.14.15/arch/x86/boot/header.S linux-linaro-stable-mx6/arch/x86/
#endif /* CONFIG_EFI_STUB */
# Kernel attributes; used by setup. This is part 1 of the
-diff -Nur linux-3.14.15/arch/x86/boot/tools/build.c linux-linaro-stable-mx6/arch/x86/boot/tools/build.c
---- linux-3.14.15/arch/x86/boot/tools/build.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/x86/boot/tools/build.c 2014-08-20 19:31:41.936851012 +0200
+diff -Nur linux-3.14.17/arch/x86/boot/tools/build.c linux-imx6-3.14/arch/x86/boot/tools/build.c
+--- linux-3.14.17/arch/x86/boot/tools/build.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/x86/boot/tools/build.c 2014-09-09 10:13:48.484951168 +0200
@@ -142,7 +142,7 @@
#ifdef CONFIG_EFI_STUB
@@ -42321,9 +43205,100 @@ diff -Nur linux-3.14.15/arch/x86/boot/tools/build.c linux-linaro-stable-mx6/arch
#ifdef CONFIG_X86_64 /* Yes, this is really how we defined it :( */
efi_stub_entry -= 0x200;
-diff -Nur linux-3.14.15/arch/x86/kernel/entry_32.S linux-linaro-stable-mx6/arch/x86/kernel/entry_32.S
---- linux-3.14.15/arch/x86/kernel/entry_32.S 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/arch/x86/kernel/entry_32.S 2014-08-20 19:31:42.004851304 +0200
+diff -Nur linux-3.14.17/arch/x86/include/asm/espfix.h linux-imx6-3.14/arch/x86/include/asm/espfix.h
+--- linux-3.14.17/arch/x86/include/asm/espfix.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/x86/include/asm/espfix.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,16 +0,0 @@
+-#ifndef _ASM_X86_ESPFIX_H
+-#define _ASM_X86_ESPFIX_H
+-
+-#ifdef CONFIG_X86_64
+-
+-#include <asm/percpu.h>
+-
+-DECLARE_PER_CPU_READ_MOSTLY(unsigned long, espfix_stack);
+-DECLARE_PER_CPU_READ_MOSTLY(unsigned long, espfix_waddr);
+-
+-extern void init_espfix_bsp(void);
+-extern void init_espfix_ap(void);
+-
+-#endif /* CONFIG_X86_64 */
+-
+-#endif /* _ASM_X86_ESPFIX_H */
+diff -Nur linux-3.14.17/arch/x86/include/asm/irqflags.h linux-imx6-3.14/arch/x86/include/asm/irqflags.h
+--- linux-3.14.17/arch/x86/include/asm/irqflags.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/x86/include/asm/irqflags.h 2014-09-09 10:13:48.504951332 +0200
+@@ -129,7 +129,7 @@
+
+ #define PARAVIRT_ADJUST_EXCEPTION_FRAME /* */
+
+-#define INTERRUPT_RETURN jmp native_iret
++#define INTERRUPT_RETURN iretq
+ #define USERGS_SYSRET64 \
+ swapgs; \
+ sysretq;
+diff -Nur linux-3.14.17/arch/x86/include/asm/pgtable_64_types.h linux-imx6-3.14/arch/x86/include/asm/pgtable_64_types.h
+--- linux-3.14.17/arch/x86/include/asm/pgtable_64_types.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/x86/include/asm/pgtable_64_types.h 2014-09-09 10:13:48.508951364 +0200
+@@ -61,8 +61,6 @@
+ #define MODULES_VADDR (__START_KERNEL_map + KERNEL_IMAGE_SIZE)
+ #define MODULES_END _AC(0xffffffffff000000, UL)
+ #define MODULES_LEN (MODULES_END - MODULES_VADDR)
+-#define ESPFIX_PGD_ENTRY _AC(-2, UL)
+-#define ESPFIX_BASE_ADDR (ESPFIX_PGD_ENTRY << PGDIR_SHIFT)
+
+ #define EARLY_DYNAMIC_PAGE_TABLES 64
+
+diff -Nur linux-3.14.17/arch/x86/include/asm/setup.h linux-imx6-3.14/arch/x86/include/asm/setup.h
+--- linux-3.14.17/arch/x86/include/asm/setup.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/x86/include/asm/setup.h 2014-09-09 10:13:48.512951397 +0200
+@@ -65,8 +65,6 @@
+
+ #ifndef _SETUP
+
+-#include <asm/espfix.h>
+-
+ /*
+ * This is set up by the setup-routine at boot-time
+ */
+diff -Nur linux-3.14.17/arch/x86/Kconfig linux-imx6-3.14/arch/x86/Kconfig
+--- linux-3.14.17/arch/x86/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/x86/Kconfig 2014-09-09 10:13:48.480951135 +0200
+@@ -966,27 +966,10 @@
+ default y
+ depends on X86_32
+ ---help---
+- This option is required by programs like DOSEMU to run
+- 16-bit real mode legacy code on x86 processors. It also may
+- be needed by software like XFree86 to initialize some video
+- cards via BIOS. Disabling this option saves about 6K.
+-
+-config X86_16BIT
+- bool "Enable support for 16-bit segments" if EXPERT
+- default y
+- ---help---
+- This option is required by programs like Wine to run 16-bit
+- protected mode legacy code on x86 processors. Disabling
+- this option saves about 300 bytes on i386, or around 6K text
+- plus 16K runtime memory on x86-64,
+-
+-config X86_ESPFIX32
+- def_bool y
+- depends on X86_16BIT && X86_32
+-
+-config X86_ESPFIX64
+- def_bool y
+- depends on X86_16BIT && X86_64
++ This option is required by programs like DOSEMU to run 16-bit legacy
++ code on X86 processors. It also may be needed by software like
++ XFree86 to initialize some video cards via BIOS. Disabling this
++ option saves about 6k.
+
+ config TOSHIBA
+ tristate "Toshiba Laptop support"
+diff -Nur linux-3.14.17/arch/x86/kernel/entry_32.S linux-imx6-3.14/arch/x86/kernel/entry_32.S
+--- linux-3.14.17/arch/x86/kernel/entry_32.S 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/x86/kernel/entry_32.S 2014-09-09 10:13:48.536951592 +0200
@@ -433,8 +433,8 @@
cmpl $(NR_syscalls), %eax
jae sysenter_badsys
@@ -42342,7 +43317,39 @@ diff -Nur linux-3.14.15/arch/x86/kernel/entry_32.S linux-linaro-stable-mx6/arch/
movl %eax,PT_EAX(%esp) # store the return value
syscall_exit:
LOCKDEP_SYS_EXIT
-@@ -684,12 +683,12 @@
+@@ -529,7 +528,6 @@
+ restore_all:
+ TRACE_IRQS_IRET
+ restore_all_notrace:
+-#ifdef CONFIG_X86_ESPFIX32
+ movl PT_EFLAGS(%esp), %eax # mix EFLAGS, SS and CS
+ # Warning: PT_OLDSS(%esp) contains the wrong/random values if we
+ # are returning to the kernel.
+@@ -540,7 +538,6 @@
+ cmpl $((SEGMENT_LDT << 8) | USER_RPL), %eax
+ CFI_REMEMBER_STATE
+ je ldt_ss # returning to user-space with LDT SS
+-#endif
+ restore_nocheck:
+ RESTORE_REGS 4 # skip orig_eax/error_code
+ irq_return:
+@@ -553,7 +550,6 @@
+ .previous
+ _ASM_EXTABLE(irq_return,iret_exc)
+
+-#ifdef CONFIG_X86_ESPFIX32
+ CFI_RESTORE_STATE
+ ldt_ss:
+ #ifdef CONFIG_PARAVIRT
+@@ -597,7 +593,6 @@
+ lss (%esp), %esp /* switch to espfix segment */
+ CFI_ADJUST_CFA_OFFSET -8
+ jmp restore_nocheck
+-#endif
+ CFI_ENDPROC
+ ENDPROC(system_call)
+
+@@ -688,12 +683,12 @@
END(syscall_fault)
syscall_badsys:
@@ -42358,9 +43365,836 @@ diff -Nur linux-3.14.15/arch/x86/kernel/entry_32.S linux-linaro-stable-mx6/arch/
jmp sysenter_after_call
END(syscall_badsys)
CFI_ENDPROC
-diff -Nur linux-3.14.15/block/bfq-cgroup.c linux-linaro-stable-mx6/block/bfq-cgroup.c
---- linux-3.14.15/block/bfq-cgroup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/block/bfq-cgroup.c 2014-08-20 19:31:42.192852109 +0200
+@@ -710,7 +705,6 @@
+ * the high word of the segment base from the GDT and swiches to the
+ * normal stack and adjusts ESP with the matching offset.
+ */
+-#ifdef CONFIG_X86_ESPFIX32
+ /* fixup the stack */
+ mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
+ mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
+@@ -720,10 +714,8 @@
+ pushl_cfi %eax
+ lss (%esp), %esp /* switch to the normal stack segment */
+ CFI_ADJUST_CFA_OFFSET -8
+-#endif
+ .endm
+ .macro UNWIND_ESPFIX_STACK
+-#ifdef CONFIG_X86_ESPFIX32
+ movl %ss, %eax
+ /* see if on espfix stack */
+ cmpw $__ESPFIX_SS, %ax
+@@ -734,7 +726,6 @@
+ /* switch to normal stack */
+ FIXUP_ESPFIX_STACK
+ 27:
+-#endif
+ .endm
+
+ /*
+@@ -1365,13 +1356,11 @@
+ ENTRY(nmi)
+ RING0_INT_FRAME
+ ASM_CLAC
+-#ifdef CONFIG_X86_ESPFIX32
+ pushl_cfi %eax
+ movl %ss, %eax
+ cmpw $__ESPFIX_SS, %ax
+ popl_cfi %eax
+ je nmi_espfix_stack
+-#endif
+ cmpl $ia32_sysenter_target,(%esp)
+ je nmi_stack_fixup
+ pushl_cfi %eax
+@@ -1411,7 +1400,6 @@
+ FIX_STACK 24, nmi_stack_correct, 1
+ jmp nmi_stack_correct
+
+-#ifdef CONFIG_X86_ESPFIX32
+ nmi_espfix_stack:
+ /* We have a RING0_INT_FRAME here.
+ *
+@@ -1433,7 +1421,6 @@
+ lss 12+4(%esp), %esp # back to espfix stack
+ CFI_ADJUST_CFA_OFFSET -24
+ jmp irq_return
+-#endif
+ CFI_ENDPROC
+ END(nmi)
+
+diff -Nur linux-3.14.17/arch/x86/kernel/entry_64.S linux-imx6-3.14/arch/x86/kernel/entry_64.S
+--- linux-3.14.17/arch/x86/kernel/entry_64.S 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/x86/kernel/entry_64.S 2014-09-09 10:13:48.536951592 +0200
+@@ -58,7 +58,6 @@
+ #include <asm/asm.h>
+ #include <asm/context_tracking.h>
+ #include <asm/smap.h>
+-#include <asm/pgtable_types.h>
+ #include <linux/err.h>
+
+ /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
+@@ -1042,45 +1041,12 @@
+
+ irq_return:
+ INTERRUPT_RETURN
++ _ASM_EXTABLE(irq_return, bad_iret)
+
++#ifdef CONFIG_PARAVIRT
+ ENTRY(native_iret)
+- /*
+- * Are we returning to a stack segment from the LDT? Note: in
+- * 64-bit mode SS:RSP on the exception stack is always valid.
+- */
+-#ifdef CONFIG_X86_ESPFIX64
+- testb $4,(SS-RIP)(%rsp)
+- jnz native_irq_return_ldt
+-#endif
+-
+-native_irq_return_iret:
+ iretq
+- _ASM_EXTABLE(native_irq_return_iret, bad_iret)
+-
+-#ifdef CONFIG_X86_ESPFIX64
+-native_irq_return_ldt:
+- pushq_cfi %rax
+- pushq_cfi %rdi
+- SWAPGS
+- movq PER_CPU_VAR(espfix_waddr),%rdi
+- movq %rax,(0*8)(%rdi) /* RAX */
+- movq (2*8)(%rsp),%rax /* RIP */
+- movq %rax,(1*8)(%rdi)
+- movq (3*8)(%rsp),%rax /* CS */
+- movq %rax,(2*8)(%rdi)
+- movq (4*8)(%rsp),%rax /* RFLAGS */
+- movq %rax,(3*8)(%rdi)
+- movq (6*8)(%rsp),%rax /* SS */
+- movq %rax,(5*8)(%rdi)
+- movq (5*8)(%rsp),%rax /* RSP */
+- movq %rax,(4*8)(%rdi)
+- andl $0xffff0000,%eax
+- popq_cfi %rdi
+- orq PER_CPU_VAR(espfix_stack),%rax
+- SWAPGS
+- movq %rax,%rsp
+- popq_cfi %rax
+- jmp native_irq_return_iret
++ _ASM_EXTABLE(native_iret, bad_iret)
+ #endif
+
+ .section .fixup,"ax"
+@@ -1144,40 +1110,9 @@
+ call preempt_schedule_irq
+ jmp exit_intr
+ #endif
+- CFI_ENDPROC
+-END(common_interrupt)
+
+- /*
+- * If IRET takes a fault on the espfix stack, then we
+- * end up promoting it to a doublefault. In that case,
+- * modify the stack to make it look like we just entered
+- * the #GP handler from user space, similar to bad_iret.
+- */
+-#ifdef CONFIG_X86_ESPFIX64
+- ALIGN
+-__do_double_fault:
+- XCPT_FRAME 1 RDI+8
+- movq RSP(%rdi),%rax /* Trap on the espfix stack? */
+- sarq $PGDIR_SHIFT,%rax
+- cmpl $ESPFIX_PGD_ENTRY,%eax
+- jne do_double_fault /* No, just deliver the fault */
+- cmpl $__KERNEL_CS,CS(%rdi)
+- jne do_double_fault
+- movq RIP(%rdi),%rax
+- cmpq $native_irq_return_iret,%rax
+- jne do_double_fault /* This shouldn't happen... */
+- movq PER_CPU_VAR(kernel_stack),%rax
+- subq $(6*8-KERNEL_STACK_OFFSET),%rax /* Reset to original stack */
+- movq %rax,RSP(%rdi)
+- movq $0,(%rax) /* Missing (lost) #GP error code */
+- movq $general_protection,RIP(%rdi)
+- retq
+ CFI_ENDPROC
+-END(__do_double_fault)
+-#else
+-# define __do_double_fault do_double_fault
+-#endif
+-
++END(common_interrupt)
+ /*
+ * End of kprobes section
+ */
+@@ -1379,7 +1314,7 @@
+ zeroentry bounds do_bounds
+ zeroentry invalid_op do_invalid_op
+ zeroentry device_not_available do_device_not_available
+-paranoiderrorentry double_fault __do_double_fault
++paranoiderrorentry double_fault do_double_fault
+ zeroentry coprocessor_segment_overrun do_coprocessor_segment_overrun
+ errorentry invalid_TSS do_invalid_TSS
+ errorentry segment_not_present do_segment_not_present
+@@ -1666,7 +1601,7 @@
+ */
+ error_kernelspace:
+ incl %ebx
+- leaq native_irq_return_iret(%rip),%rcx
++ leaq irq_return(%rip),%rcx
+ cmpq %rcx,RIP+8(%rsp)
+ je error_swapgs
+ movl %ecx,%eax /* zero extend */
+diff -Nur linux-3.14.17/arch/x86/kernel/espfix_64.c linux-imx6-3.14/arch/x86/kernel/espfix_64.c
+--- linux-3.14.17/arch/x86/kernel/espfix_64.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/x86/kernel/espfix_64.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,208 +0,0 @@
+-/* ----------------------------------------------------------------------- *
+- *
+- * Copyright 2014 Intel Corporation; author: H. Peter Anvin
+- *
+- * This program is free software; you can redistribute it and/or modify it
+- * under the terms and conditions of the GNU General Public License,
+- * version 2, as published by the Free Software Foundation.
+- *
+- * This program is distributed in the hope it will be useful, but WITHOUT
+- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+- * more details.
+- *
+- * ----------------------------------------------------------------------- */
+-
+-/*
+- * The IRET instruction, when returning to a 16-bit segment, only
+- * restores the bottom 16 bits of the user space stack pointer. This
+- * causes some 16-bit software to break, but it also leaks kernel state
+- * to user space.
+- *
+- * This works around this by creating percpu "ministacks", each of which
+- * is mapped 2^16 times 64K apart. When we detect that the return SS is
+- * on the LDT, we copy the IRET frame to the ministack and use the
+- * relevant alias to return to userspace. The ministacks are mapped
+- * readonly, so if the IRET fault we promote #GP to #DF which is an IST
+- * vector and thus has its own stack; we then do the fixup in the #DF
+- * handler.
+- *
+- * This file sets up the ministacks and the related page tables. The
+- * actual ministack invocation is in entry_64.S.
+- */
+-
+-#include <linux/init.h>
+-#include <linux/init_task.h>
+-#include <linux/kernel.h>
+-#include <linux/percpu.h>
+-#include <linux/gfp.h>
+-#include <linux/random.h>
+-#include <asm/pgtable.h>
+-#include <asm/pgalloc.h>
+-#include <asm/setup.h>
+-#include <asm/espfix.h>
+-
+-/*
+- * Note: we only need 6*8 = 48 bytes for the espfix stack, but round
+- * it up to a cache line to avoid unnecessary sharing.
+- */
+-#define ESPFIX_STACK_SIZE (8*8UL)
+-#define ESPFIX_STACKS_PER_PAGE (PAGE_SIZE/ESPFIX_STACK_SIZE)
+-
+-/* There is address space for how many espfix pages? */
+-#define ESPFIX_PAGE_SPACE (1UL << (PGDIR_SHIFT-PAGE_SHIFT-16))
+-
+-#define ESPFIX_MAX_CPUS (ESPFIX_STACKS_PER_PAGE * ESPFIX_PAGE_SPACE)
+-#if CONFIG_NR_CPUS > ESPFIX_MAX_CPUS
+-# error "Need more than one PGD for the ESPFIX hack"
+-#endif
+-
+-#define PGALLOC_GFP (GFP_KERNEL | __GFP_NOTRACK | __GFP_REPEAT | __GFP_ZERO)
+-
+-/* This contains the *bottom* address of the espfix stack */
+-DEFINE_PER_CPU_READ_MOSTLY(unsigned long, espfix_stack);
+-DEFINE_PER_CPU_READ_MOSTLY(unsigned long, espfix_waddr);
+-
+-/* Initialization mutex - should this be a spinlock? */
+-static DEFINE_MUTEX(espfix_init_mutex);
+-
+-/* Page allocation bitmap - each page serves ESPFIX_STACKS_PER_PAGE CPUs */
+-#define ESPFIX_MAX_PAGES DIV_ROUND_UP(CONFIG_NR_CPUS, ESPFIX_STACKS_PER_PAGE)
+-static void *espfix_pages[ESPFIX_MAX_PAGES];
+-
+-static __page_aligned_bss pud_t espfix_pud_page[PTRS_PER_PUD]
+- __aligned(PAGE_SIZE);
+-
+-static unsigned int page_random, slot_random;
+-
+-/*
+- * This returns the bottom address of the espfix stack for a specific CPU.
+- * The math allows for a non-power-of-two ESPFIX_STACK_SIZE, in which case
+- * we have to account for some amount of padding at the end of each page.
+- */
+-static inline unsigned long espfix_base_addr(unsigned int cpu)
+-{
+- unsigned long page, slot;
+- unsigned long addr;
+-
+- page = (cpu / ESPFIX_STACKS_PER_PAGE) ^ page_random;
+- slot = (cpu + slot_random) % ESPFIX_STACKS_PER_PAGE;
+- addr = (page << PAGE_SHIFT) + (slot * ESPFIX_STACK_SIZE);
+- addr = (addr & 0xffffUL) | ((addr & ~0xffffUL) << 16);
+- addr += ESPFIX_BASE_ADDR;
+- return addr;
+-}
+-
+-#define PTE_STRIDE (65536/PAGE_SIZE)
+-#define ESPFIX_PTE_CLONES (PTRS_PER_PTE/PTE_STRIDE)
+-#define ESPFIX_PMD_CLONES PTRS_PER_PMD
+-#define ESPFIX_PUD_CLONES (65536/(ESPFIX_PTE_CLONES*ESPFIX_PMD_CLONES))
+-
+-#define PGTABLE_PROT ((_KERNPG_TABLE & ~_PAGE_RW) | _PAGE_NX)
+-
+-static void init_espfix_random(void)
+-{
+- unsigned long rand;
+-
+- /*
+- * This is run before the entropy pools are initialized,
+- * but this is hopefully better than nothing.
+- */
+- if (!arch_get_random_long(&rand)) {
+- /* The constant is an arbitrary large prime */
+- rdtscll(rand);
+- rand *= 0xc345c6b72fd16123UL;
+- }
+-
+- slot_random = rand % ESPFIX_STACKS_PER_PAGE;
+- page_random = (rand / ESPFIX_STACKS_PER_PAGE)
+- & (ESPFIX_PAGE_SPACE - 1);
+-}
+-
+-void __init init_espfix_bsp(void)
+-{
+- pgd_t *pgd_p;
+- pteval_t ptemask;
+-
+- ptemask = __supported_pte_mask;
+-
+- /* Install the espfix pud into the kernel page directory */
+- pgd_p = &init_level4_pgt[pgd_index(ESPFIX_BASE_ADDR)];
+- pgd_populate(&init_mm, pgd_p, (pud_t *)espfix_pud_page);
+-
+- /* Randomize the locations */
+- init_espfix_random();
+-
+- /* The rest is the same as for any other processor */
+- init_espfix_ap();
+-}
+-
+-void init_espfix_ap(void)
+-{
+- unsigned int cpu, page;
+- unsigned long addr;
+- pud_t pud, *pud_p;
+- pmd_t pmd, *pmd_p;
+- pte_t pte, *pte_p;
+- int n;
+- void *stack_page;
+- pteval_t ptemask;
+-
+- /* We only have to do this once... */
+- if (likely(this_cpu_read(espfix_stack)))
+- return; /* Already initialized */
+-
+- cpu = smp_processor_id();
+- addr = espfix_base_addr(cpu);
+- page = cpu/ESPFIX_STACKS_PER_PAGE;
+-
+- /* Did another CPU already set this up? */
+- stack_page = ACCESS_ONCE(espfix_pages[page]);
+- if (likely(stack_page))
+- goto done;
+-
+- mutex_lock(&espfix_init_mutex);
+-
+- /* Did we race on the lock? */
+- stack_page = ACCESS_ONCE(espfix_pages[page]);
+- if (stack_page)
+- goto unlock_done;
+-
+- ptemask = __supported_pte_mask;
+-
+- pud_p = &espfix_pud_page[pud_index(addr)];
+- pud = *pud_p;
+- if (!pud_present(pud)) {
+- pmd_p = (pmd_t *)__get_free_page(PGALLOC_GFP);
+- pud = __pud(__pa(pmd_p) | (PGTABLE_PROT & ptemask));
+- paravirt_alloc_pmd(&init_mm, __pa(pmd_p) >> PAGE_SHIFT);
+- for (n = 0; n < ESPFIX_PUD_CLONES; n++)
+- set_pud(&pud_p[n], pud);
+- }
+-
+- pmd_p = pmd_offset(&pud, addr);
+- pmd = *pmd_p;
+- if (!pmd_present(pmd)) {
+- pte_p = (pte_t *)__get_free_page(PGALLOC_GFP);
+- pmd = __pmd(__pa(pte_p) | (PGTABLE_PROT & ptemask));
+- paravirt_alloc_pte(&init_mm, __pa(pte_p) >> PAGE_SHIFT);
+- for (n = 0; n < ESPFIX_PMD_CLONES; n++)
+- set_pmd(&pmd_p[n], pmd);
+- }
+-
+- pte_p = pte_offset_kernel(&pmd, addr);
+- stack_page = (void *)__get_free_page(GFP_KERNEL);
+- pte = __pte(__pa(stack_page) | (__PAGE_KERNEL_RO & ptemask));
+- for (n = 0; n < ESPFIX_PTE_CLONES; n++)
+- set_pte(&pte_p[n*PTE_STRIDE], pte);
+-
+- /* Job is done for this CPU and any CPU which shares this page */
+- ACCESS_ONCE(espfix_pages[page]) = stack_page;
+-
+-unlock_done:
+- mutex_unlock(&espfix_init_mutex);
+-done:
+- this_cpu_write(espfix_stack, addr);
+- this_cpu_write(espfix_waddr, (unsigned long)stack_page
+- + (addr & ~PAGE_MASK));
+-}
+diff -Nur linux-3.14.17/arch/x86/kernel/ldt.c linux-imx6-3.14/arch/x86/kernel/ldt.c
+--- linux-3.14.17/arch/x86/kernel/ldt.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/x86/kernel/ldt.c 2014-09-09 10:13:48.540951626 +0200
+@@ -20,6 +20,8 @@
+ #include <asm/mmu_context.h>
+ #include <asm/syscalls.h>
+
++int sysctl_ldt16 = 0;
++
+ #ifdef CONFIG_SMP
+ static void flush_ldt(void *current_mm)
+ {
+@@ -229,10 +231,16 @@
+ }
+ }
+
+- if (!IS_ENABLED(CONFIG_X86_16BIT) && !ldt_info.seg_32bit) {
++ /*
++ * On x86-64 we do not support 16-bit segments due to
++ * IRET leaking the high bits of the kernel stack address.
++ */
++#ifdef CONFIG_X86_64
++ if (!ldt_info.seg_32bit && !sysctl_ldt16) {
+ error = -EINVAL;
+ goto out_unlock;
+ }
++#endif
+
+ fill_ldt(&ldt, &ldt_info);
+ if (oldmode)
+diff -Nur linux-3.14.17/arch/x86/kernel/Makefile linux-imx6-3.14/arch/x86/kernel/Makefile
+--- linux-3.14.17/arch/x86/kernel/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/x86/kernel/Makefile 2014-09-09 10:13:48.520951462 +0200
+@@ -29,7 +29,6 @@
+ obj-y += syscall_$(BITS).o
+ obj-$(CONFIG_X86_64) += vsyscall_64.o
+ obj-$(CONFIG_X86_64) += vsyscall_emu_64.o
+-obj-$(CONFIG_X86_ESPFIX64) += espfix_64.o
+ obj-$(CONFIG_SYSFS) += ksysfs.o
+ obj-y += bootflag.o e820.o
+ obj-y += pci-dma.o quirks.o topology.o kdebugfs.o
+diff -Nur linux-3.14.17/arch/x86/kernel/paravirt_patch_64.c linux-imx6-3.14/arch/x86/kernel/paravirt_patch_64.c
+--- linux-3.14.17/arch/x86/kernel/paravirt_patch_64.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/x86/kernel/paravirt_patch_64.c 2014-09-09 10:13:48.540951626 +0200
+@@ -6,6 +6,7 @@
+ DEF_NATIVE(pv_irq_ops, irq_enable, "sti");
+ DEF_NATIVE(pv_irq_ops, restore_fl, "pushq %rdi; popfq");
+ DEF_NATIVE(pv_irq_ops, save_fl, "pushfq; popq %rax");
++DEF_NATIVE(pv_cpu_ops, iret, "iretq");
+ DEF_NATIVE(pv_mmu_ops, read_cr2, "movq %cr2, %rax");
+ DEF_NATIVE(pv_mmu_ops, read_cr3, "movq %cr3, %rax");
+ DEF_NATIVE(pv_mmu_ops, write_cr3, "movq %rdi, %cr3");
+@@ -49,6 +50,7 @@
+ PATCH_SITE(pv_irq_ops, save_fl);
+ PATCH_SITE(pv_irq_ops, irq_enable);
+ PATCH_SITE(pv_irq_ops, irq_disable);
++ PATCH_SITE(pv_cpu_ops, iret);
+ PATCH_SITE(pv_cpu_ops, irq_enable_sysexit);
+ PATCH_SITE(pv_cpu_ops, usergs_sysret32);
+ PATCH_SITE(pv_cpu_ops, usergs_sysret64);
+diff -Nur linux-3.14.17/arch/x86/kernel/setup.c linux-imx6-3.14/arch/x86/kernel/setup.c
+--- linux-3.14.17/arch/x86/kernel/setup.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/x86/kernel/setup.c 2014-09-09 10:13:48.544951658 +0200
+@@ -1120,7 +1120,7 @@
+ setup_real_mode();
+
+ memblock_set_current_limit(get_max_mapped());
+- dma_contiguous_reserve(0);
++ dma_contiguous_reserve(max_pfn_mapped << PAGE_SHIFT);
+
+ /*
+ * NOTE: On x86-32, only from this point on, fixmaps are ready for use.
+diff -Nur linux-3.14.17/arch/x86/kernel/smpboot.c linux-imx6-3.14/arch/x86/kernel/smpboot.c
+--- linux-3.14.17/arch/x86/kernel/smpboot.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/x86/kernel/smpboot.c 2014-09-09 10:13:48.544951658 +0200
+@@ -243,13 +243,6 @@
+ check_tsc_sync_target();
+
+ /*
+- * Enable the espfix hack for this CPU
+- */
+-#ifdef CONFIG_X86_ESPFIX64
+- init_espfix_ap();
+-#endif
+-
+- /*
+ * We need to hold vector_lock so there the set of online cpus
+ * does not change while we are assigning vectors to cpus. Holding
+ * this lock ensures we don't half assign or remove an irq from a cpu.
+diff -Nur linux-3.14.17/arch/x86/mm/dump_pagetables.c linux-imx6-3.14/arch/x86/mm/dump_pagetables.c
+--- linux-3.14.17/arch/x86/mm/dump_pagetables.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/x86/mm/dump_pagetables.c 2014-09-09 10:13:48.564951821 +0200
+@@ -30,13 +30,11 @@
+ unsigned long start_address;
+ unsigned long current_address;
+ const struct addr_marker *marker;
+- unsigned long lines;
+ };
+
+ struct addr_marker {
+ unsigned long start_address;
+ const char *name;
+- unsigned long max_lines;
+ };
+
+ /* indices for address_markers; keep sync'd w/ address_markers below */
+@@ -47,7 +45,6 @@
+ LOW_KERNEL_NR,
+ VMALLOC_START_NR,
+ VMEMMAP_START_NR,
+- ESPFIX_START_NR,
+ HIGH_KERNEL_NR,
+ MODULES_VADDR_NR,
+ MODULES_END_NR,
+@@ -70,7 +67,6 @@
+ { PAGE_OFFSET, "Low Kernel Mapping" },
+ { VMALLOC_START, "vmalloc() Area" },
+ { VMEMMAP_START, "Vmemmap" },
+- { ESPFIX_BASE_ADDR, "ESPfix Area", 16 },
+ { __START_KERNEL_map, "High Kernel Mapping" },
+ { MODULES_VADDR, "Modules" },
+ { MODULES_END, "End Modules" },
+@@ -167,7 +163,7 @@
+ pgprot_t new_prot, int level)
+ {
+ pgprotval_t prot, cur;
+- static const char units[] = "BKMGTPE";
++ static const char units[] = "KMGTPE";
+
+ /*
+ * If we have a "break" in the series, we need to flush the state that
+@@ -182,7 +178,6 @@
+ st->current_prot = new_prot;
+ st->level = level;
+ st->marker = address_markers;
+- st->lines = 0;
+ seq_printf(m, "---[ %s ]---\n", st->marker->name);
+ } else if (prot != cur || level != st->level ||
+ st->current_address >= st->marker[1].start_address) {
+@@ -193,21 +188,17 @@
+ /*
+ * Now print the actual finished series
+ */
+- if (!st->marker->max_lines ||
+- st->lines < st->marker->max_lines) {
+- seq_printf(m, "0x%0*lx-0x%0*lx ",
+- width, st->start_address,
+- width, st->current_address);
+-
+- delta = (st->current_address - st->start_address) >> 10;
+- while (!(delta & 1023) && unit[1]) {
+- delta >>= 10;
+- unit++;
+- }
+- seq_printf(m, "%9lu%c ", delta, *unit);
+- printk_prot(m, st->current_prot, st->level);
++ seq_printf(m, "0x%0*lx-0x%0*lx ",
++ width, st->start_address,
++ width, st->current_address);
++
++ delta = (st->current_address - st->start_address) >> 10;
++ while (!(delta & 1023) && unit[1]) {
++ delta >>= 10;
++ unit++;
+ }
+- st->lines++;
++ seq_printf(m, "%9lu%c ", delta, *unit);
++ printk_prot(m, st->current_prot, st->level);
+
+ /*
+ * We print markers for special areas of address space,
+diff -Nur linux-3.14.17/arch/x86/vdso/vdso32-setup.c linux-imx6-3.14/arch/x86/vdso/vdso32-setup.c
+--- linux-3.14.17/arch/x86/vdso/vdso32-setup.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/x86/vdso/vdso32-setup.c 2014-09-09 10:13:48.584951984 +0200
+@@ -41,6 +41,7 @@
+ #ifdef CONFIG_X86_64
+ #define vdso_enabled sysctl_vsyscall32
+ #define arch_setup_additional_pages syscall32_setup_pages
++extern int sysctl_ldt16;
+ #endif
+
+ /*
+@@ -379,6 +380,13 @@
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = proc_dointvec
++ },
++ {
++ .procname = "ldt16",
++ .data = &sysctl_ldt16,
++ .maxlen = sizeof(int),
++ .mode = 0644,
++ .proc_handler = proc_dointvec
+ },
+ {}
+ };
+diff -Nur linux-3.14.17/arch/x86/xen/setup.c linux-imx6-3.14/arch/x86/xen/setup.c
+--- linux-3.14.17/arch/x86/xen/setup.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/x86/xen/setup.c 2014-09-09 10:13:48.588952016 +0200
+@@ -574,7 +574,13 @@
+ }
+ #endif /* CONFIG_X86_64 */
+ }
+-
++void xen_enable_nmi(void)
++{
++#ifdef CONFIG_X86_64
++ if (register_callback(CALLBACKTYPE_nmi, (char *)nmi))
++ BUG();
++#endif
++}
+ void __init xen_pvmmu_arch_setup(void)
+ {
+ HYPERVISOR_vm_assist(VMASST_CMD_enable, VMASST_TYPE_4gb_segments);
+@@ -589,6 +595,7 @@
+
+ xen_enable_sysenter();
+ xen_enable_syscall();
++ xen_enable_nmi();
+ }
+
+ /* This function is not called for HVM domains */
+diff -Nur linux-3.14.17/arch/xtensa/kernel/vectors.S linux-imx6-3.14/arch/xtensa/kernel/vectors.S
+--- linux-3.14.17/arch/xtensa/kernel/vectors.S 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/xtensa/kernel/vectors.S 2014-09-09 10:13:48.600952115 +0200
+@@ -376,42 +376,38 @@
+ beqz a2, 1f # if at start of vector, don't restore
+
+ addi a0, a0, -128
+- bbsi.l a0, 8, 1f # don't restore except for overflow 8 and 12
+-
+- /*
+- * This fixup handler is for the extremely unlikely case where the
+- * overflow handler's reference thru a0 gets a hardware TLB refill
+- * that bumps out the (distinct, aliasing) TLB entry that mapped its
+- * prior references thru a9/a13, and where our reference now thru
+- * a9/a13 gets a 2nd-level miss exception (not hardware TLB refill).
+- */
+- movi a2, window_overflow_restore_a0_fixup
+- s32i a2, a3, EXC_TABLE_FIXUP
+- l32i a2, a3, EXC_TABLE_DOUBLE_SAVE
+- xsr a3, excsave1
+-
+- bbsi.l a0, 7, 2f
++ bbsi a0, 8, 1f # don't restore except for overflow 8 and 12
++ bbsi a0, 7, 2f
+
+ /*
+ * Restore a0 as saved by _WindowOverflow8().
++ *
++ * FIXME: we really need a fixup handler for this L32E,
++ * for the extremely unlikely case where the overflow handler's
++ * reference thru a0 gets a hardware TLB refill that bumps out
++ * the (distinct, aliasing) TLB entry that mapped its prior
++ * references thru a9, and where our reference now thru a9
++ * gets a 2nd-level miss exception (not hardware TLB refill).
+ */
+
+- l32e a0, a9, -16
+- wsr a0, depc # replace the saved a0
+- j 3f
++ l32e a2, a9, -16
++ wsr a2, depc # replace the saved a0
++ j 1f
+
+ 2:
+ /*
+ * Restore a0 as saved by _WindowOverflow12().
++ *
++ * FIXME: we really need a fixup handler for this L32E,
++ * for the extremely unlikely case where the overflow handler's
++ * reference thru a0 gets a hardware TLB refill that bumps out
++ * the (distinct, aliasing) TLB entry that mapped its prior
++ * references thru a13, and where our reference now thru a13
++ * gets a 2nd-level miss exception (not hardware TLB refill).
+ */
+
+- l32e a0, a13, -16
+- wsr a0, depc # replace the saved a0
+-3:
+- xsr a3, excsave1
+- movi a0, 0
+- s32i a0, a3, EXC_TABLE_FIXUP
+- s32i a2, a3, EXC_TABLE_DOUBLE_SAVE
++ l32e a2, a13, -16
++ wsr a2, depc # replace the saved a0
+ 1:
+ /*
+ * Restore WindowBase while leaving all address registers restored.
+@@ -453,7 +449,6 @@
+
+ s32i a0, a2, PT_DEPC
+
+-_DoubleExceptionVector_handle_exception:
+ addx4 a0, a0, a3
+ l32i a0, a0, EXC_TABLE_FAST_USER
+ xsr a3, excsave1
+@@ -469,120 +464,11 @@
+ rotw -3
+ j 1b
+
++ .end literal_prefix
+
+ ENDPROC(_DoubleExceptionVector)
+
+ /*
+- * Fixup handler for TLB miss in double exception handler for window owerflow.
+- * We get here with windowbase set to the window that was being spilled and
+- * a0 trashed. a0 bit 7 determines if this is a call8 (bit clear) or call12
+- * (bit set) window.
+- *
+- * We do the following here:
+- * - go to the original window retaining a0 value;
+- * - set up exception stack to return back to appropriate a0 restore code
+- * (we'll need to rotate window back and there's no place to save this
+- * information, use different return address for that);
+- * - handle the exception;
+- * - go to the window that was being spilled;
+- * - set up window_overflow_restore_a0_fixup as a fixup routine;
+- * - reload a0;
+- * - restore the original window;
+- * - reset the default fixup routine;
+- * - return to user. By the time we get to this fixup handler all information
+- * about the conditions of the original double exception that happened in
+- * the window overflow handler is lost, so we just return to userspace to
+- * retry overflow from start.
+- *
+- * a0: value of depc, original value in depc
+- * a2: trashed, original value in EXC_TABLE_DOUBLE_SAVE
+- * a3: exctable, original value in excsave1
+- */
+-
+-ENTRY(window_overflow_restore_a0_fixup)
+-
+- rsr a0, ps
+- extui a0, a0, PS_OWB_SHIFT, PS_OWB_WIDTH
+- rsr a2, windowbase
+- sub a0, a2, a0
+- extui a0, a0, 0, 3
+- l32i a2, a3, EXC_TABLE_DOUBLE_SAVE
+- xsr a3, excsave1
+-
+- _beqi a0, 1, .Lhandle_1
+- _beqi a0, 3, .Lhandle_3
+-
+- .macro overflow_fixup_handle_exception_pane n
+-
+- rsr a0, depc
+- rotw -\n
+-
+- xsr a3, excsave1
+- wsr a2, depc
+- l32i a2, a3, EXC_TABLE_KSTK
+- s32i a0, a2, PT_AREG0
+-
+- movi a0, .Lrestore_\n
+- s32i a0, a2, PT_DEPC
+- rsr a0, exccause
+- j _DoubleExceptionVector_handle_exception
+-
+- .endm
+-
+- overflow_fixup_handle_exception_pane 2
+-.Lhandle_1:
+- overflow_fixup_handle_exception_pane 1
+-.Lhandle_3:
+- overflow_fixup_handle_exception_pane 3
+-
+- .macro overflow_fixup_restore_a0_pane n
+-
+- rotw \n
+- /* Need to preserve a0 value here to be able to handle exception
+- * that may occur on a0 reload from stack. It may occur because
+- * TLB miss handler may not be atomic and pointer to page table
+- * may be lost before we get here. There are no free registers,
+- * so we need to use EXC_TABLE_DOUBLE_SAVE area.
+- */
+- xsr a3, excsave1
+- s32i a2, a3, EXC_TABLE_DOUBLE_SAVE
+- movi a2, window_overflow_restore_a0_fixup
+- s32i a2, a3, EXC_TABLE_FIXUP
+- l32i a2, a3, EXC_TABLE_DOUBLE_SAVE
+- xsr a3, excsave1
+- bbsi.l a0, 7, 1f
+- l32e a0, a9, -16
+- j 2f
+-1:
+- l32e a0, a13, -16
+-2:
+- rotw -\n
+-
+- .endm
+-
+-.Lrestore_2:
+- overflow_fixup_restore_a0_pane 2
+-
+-.Lset_default_fixup:
+- xsr a3, excsave1
+- s32i a2, a3, EXC_TABLE_DOUBLE_SAVE
+- movi a2, 0
+- s32i a2, a3, EXC_TABLE_FIXUP
+- l32i a2, a3, EXC_TABLE_DOUBLE_SAVE
+- xsr a3, excsave1
+- rfe
+-
+-.Lrestore_1:
+- overflow_fixup_restore_a0_pane 1
+- j .Lset_default_fixup
+-.Lrestore_3:
+- overflow_fixup_restore_a0_pane 3
+- j .Lset_default_fixup
+-
+-ENDPROC(window_overflow_restore_a0_fixup)
+-
+- .end literal_prefix
+-/*
+ * Debug interrupt vector
+ *
+ * There is not much space here, so simply jump to another handler.
+diff -Nur linux-3.14.17/arch/xtensa/kernel/vmlinux.lds.S linux-imx6-3.14/arch/xtensa/kernel/vmlinux.lds.S
+--- linux-3.14.17/arch/xtensa/kernel/vmlinux.lds.S 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/arch/xtensa/kernel/vmlinux.lds.S 2014-09-09 10:13:48.600952115 +0200
+@@ -269,13 +269,13 @@
+ .UserExceptionVector.literal)
+ SECTION_VECTOR (_DoubleExceptionVector_literal,
+ .DoubleExceptionVector.literal,
+- DOUBLEEXC_VECTOR_VADDR - 40,
++ DOUBLEEXC_VECTOR_VADDR - 16,
+ SIZEOF(.UserExceptionVector.text),
+ .UserExceptionVector.text)
+ SECTION_VECTOR (_DoubleExceptionVector_text,
+ .DoubleExceptionVector.text,
+ DOUBLEEXC_VECTOR_VADDR,
+- 40,
++ 32,
+ .DoubleExceptionVector.literal)
+
+ . = (LOADADDR( .DoubleExceptionVector.text ) + SIZEOF( .DoubleExceptionVector.text ) + 3) & ~ 3;
+diff -Nur linux-3.14.17/block/bfq-cgroup.c linux-imx6-3.14/block/bfq-cgroup.c
+--- linux-3.14.17/block/bfq-cgroup.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/block/bfq-cgroup.c 2014-09-09 10:13:48.604952147 +0200
@@ -0,0 +1,932 @@
+/*
+ * BFQ: CGROUPS support.
@@ -43294,9 +45128,9 @@ diff -Nur linux-3.14.15/block/bfq-cgroup.c linux-linaro-stable-mx6/block/bfq-cgr
+ return bfqg;
+}
+#endif
-diff -Nur linux-3.14.15/block/bfq.h linux-linaro-stable-mx6/block/bfq.h
---- linux-3.14.15/block/bfq.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/block/bfq.h 2014-08-20 19:31:42.192852109 +0200
+diff -Nur linux-3.14.17/block/bfq.h linux-imx6-3.14/block/bfq.h
+--- linux-3.14.17/block/bfq.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/block/bfq.h 2014-09-09 10:13:48.604952147 +0200
@@ -0,0 +1,770 @@
+/*
+ * BFQ-v7r5 for 3.14.0: data structures and common functions prototypes.
@@ -44068,9 +45902,9 @@ diff -Nur linux-3.14.15/block/bfq.h linux-linaro-stable-mx6/block/bfq.h
+static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq);
+
+#endif /* _BFQ_H */
-diff -Nur linux-3.14.15/block/bfq-ioc.c linux-linaro-stable-mx6/block/bfq-ioc.c
---- linux-3.14.15/block/bfq-ioc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/block/bfq-ioc.c 2014-08-20 19:31:42.192852109 +0200
+diff -Nur linux-3.14.17/block/bfq-ioc.c linux-imx6-3.14/block/bfq-ioc.c
+--- linux-3.14.17/block/bfq-ioc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/block/bfq-ioc.c 2014-09-09 10:13:48.604952147 +0200
@@ -0,0 +1,36 @@
+/*
+ * BFQ: I/O context handling.
@@ -44108,9 +45942,9 @@ diff -Nur linux-3.14.15/block/bfq-ioc.c linux-linaro-stable-mx6/block/bfq-ioc.c
+ return icq_to_bic(ioc_lookup_icq(ioc, bfqd->queue));
+ return NULL;
+}
-diff -Nur linux-3.14.15/block/bfq-iosched.c linux-linaro-stable-mx6/block/bfq-iosched.c
---- linux-3.14.15/block/bfq-iosched.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/block/bfq-iosched.c 2014-08-20 19:31:42.192852109 +0200
+diff -Nur linux-3.14.17/block/bfq-iosched.c linux-imx6-3.14/block/bfq-iosched.c
+--- linux-3.14.17/block/bfq-iosched.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/block/bfq-iosched.c 2014-09-09 10:13:48.604952147 +0200
@@ -0,0 +1,3919 @@
+/*
+ * Budget Fair Queueing (BFQ) disk scheduler.
@@ -48031,9 +49865,9 @@ diff -Nur linux-3.14.15/block/bfq-iosched.c linux-linaro-stable-mx6/block/bfq-io
+
+MODULE_AUTHOR("Fabio Checconi, Paolo Valente");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/block/bfq-sched.c linux-linaro-stable-mx6/block/bfq-sched.c
---- linux-3.14.15/block/bfq-sched.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/block/bfq-sched.c 2014-08-20 19:31:42.192852109 +0200
+diff -Nur linux-3.14.17/block/bfq-sched.c linux-imx6-3.14/block/bfq-sched.c
+--- linux-3.14.17/block/bfq-sched.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/block/bfq-sched.c 2014-09-09 10:13:48.604952147 +0200
@@ -0,0 +1,1179 @@
+/*
+ * BFQ: Hierarchical B-WF2Q+ scheduler.
@@ -49214,9 +51048,9 @@ diff -Nur linux-3.14.15/block/bfq-sched.c linux-linaro-stable-mx6/block/bfq-sche
+ if (bfqq->wr_coeff > 1)
+ bfqd->wr_busy_queues++;
+}
-diff -Nur linux-3.14.15/block/blk-cgroup.c linux-linaro-stable-mx6/block/blk-cgroup.c
---- linux-3.14.15/block/blk-cgroup.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/block/blk-cgroup.c 2014-08-20 19:31:42.192852109 +0200
+diff -Nur linux-3.14.17/block/blk-cgroup.c linux-imx6-3.14/block/blk-cgroup.c
+--- linux-3.14.17/block/blk-cgroup.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/block/blk-cgroup.c 2014-09-09 10:13:48.604952147 +0200
@@ -859,13 +859,6 @@
{
lockdep_assert_held(q->queue_lock);
@@ -49231,9 +51065,9 @@ diff -Nur linux-3.14.15/block/blk-cgroup.c linux-linaro-stable-mx6/block/blk-cgr
blk_throtl_drain(q);
}
-diff -Nur linux-3.14.15/block/blk-core.c linux-linaro-stable-mx6/block/blk-core.c
---- linux-3.14.15/block/blk-core.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/block/blk-core.c 2014-08-20 19:31:42.192852109 +0200
+diff -Nur linux-3.14.17/block/blk-core.c linux-imx6-3.14/block/blk-core.c
+--- linux-3.14.17/block/blk-core.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/block/blk-core.c 2014-09-09 10:13:48.608952180 +0200
@@ -1928,7 +1928,7 @@
* in some cases below, so export this function.
* Request stacking drivers like request-based dm may change the queue
@@ -49243,9 +51077,9 @@ diff -Nur linux-3.14.15/block/blk-core.c linux-linaro-stable-mx6/block/blk-core.
* the new queue limits again when they dispatch those requests,
* although such checkings are also done against the old queue limits
* when submitting requests.
-diff -Nur linux-3.14.15/block/blk-map.c linux-linaro-stable-mx6/block/blk-map.c
---- linux-3.14.15/block/blk-map.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/block/blk-map.c 2014-08-20 19:31:42.196852127 +0200
+diff -Nur linux-3.14.17/block/blk-map.c linux-imx6-3.14/block/blk-map.c
+--- linux-3.14.17/block/blk-map.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/block/blk-map.c 2014-09-09 10:13:48.608952180 +0200
@@ -285,7 +285,7 @@
*
* Description:
@@ -49255,9 +51089,9 @@ diff -Nur linux-3.14.15/block/blk-map.c linux-linaro-stable-mx6/block/blk-map.c
* buffers.
*/
int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
-diff -Nur linux-3.14.15/block/blk-tag.c linux-linaro-stable-mx6/block/blk-tag.c
---- linux-3.14.15/block/blk-tag.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/block/blk-tag.c 2014-08-20 19:31:42.200852145 +0200
+diff -Nur linux-3.14.17/block/blk-tag.c linux-imx6-3.14/block/blk-tag.c
+--- linux-3.14.17/block/blk-tag.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/block/blk-tag.c 2014-09-09 10:13:48.608952180 +0200
@@ -27,15 +27,18 @@
EXPORT_SYMBOL(blk_queue_find_tag);
@@ -49323,9 +51157,9 @@ diff -Nur linux-3.14.15/block/blk-tag.c linux-linaro-stable-mx6/block/blk-tag.c
* blk_queue_free_tags - release tag maintenance info
* @q: the request queue for the device
*
-diff -Nur linux-3.14.15/block/compat_ioctl.c linux-linaro-stable-mx6/block/compat_ioctl.c
---- linux-3.14.15/block/compat_ioctl.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/block/compat_ioctl.c 2014-08-20 19:31:42.204852163 +0200
+diff -Nur linux-3.14.17/block/compat_ioctl.c linux-imx6-3.14/block/compat_ioctl.c
+--- linux-3.14.17/block/compat_ioctl.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/block/compat_ioctl.c 2014-09-09 10:13:48.612952213 +0200
@@ -690,7 +690,6 @@
case BLKROSET:
case BLKDISCARD:
@@ -49334,9 +51168,9 @@ diff -Nur linux-3.14.15/block/compat_ioctl.c linux-linaro-stable-mx6/block/compa
/*
* the ones below are implemented in blkdev_locked_ioctl,
* but we call blkdev_ioctl, which gets the lock for us
-diff -Nur linux-3.14.15/block/Kconfig.iosched linux-linaro-stable-mx6/block/Kconfig.iosched
---- linux-3.14.15/block/Kconfig.iosched 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/block/Kconfig.iosched 2014-08-20 19:31:42.188852092 +0200
+diff -Nur linux-3.14.17/block/Kconfig.iosched linux-imx6-3.14/block/Kconfig.iosched
+--- linux-3.14.17/block/Kconfig.iosched 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/block/Kconfig.iosched 2014-09-09 10:13:48.604952147 +0200
@@ -39,6 +39,27 @@
---help---
Enable group IO scheduling in CFQ.
@@ -49390,9 +51224,9 @@ diff -Nur linux-3.14.15/block/Kconfig.iosched linux-linaro-stable-mx6/block/Kcon
default "noop" if DEFAULT_NOOP
endmenu
-diff -Nur linux-3.14.15/block/Makefile linux-linaro-stable-mx6/block/Makefile
---- linux-3.14.15/block/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/block/Makefile 2014-08-20 19:31:42.188852092 +0200
+diff -Nur linux-3.14.17/block/Makefile linux-imx6-3.14/block/Makefile
+--- linux-3.14.17/block/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/block/Makefile 2014-09-09 10:13:48.604952147 +0200
@@ -16,6 +16,7 @@
obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o
obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o
@@ -49401,9 +51235,28 @@ diff -Nur linux-3.14.15/block/Makefile linux-linaro-stable-mx6/block/Makefile
obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o
obj-$(CONFIG_BLK_DEV_INTEGRITY) += blk-integrity.o
-diff -Nur linux-3.14.15/crypto/blkcipher.c linux-linaro-stable-mx6/crypto/blkcipher.c
---- linux-3.14.15/crypto/blkcipher.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/crypto/blkcipher.c 2014-08-20 19:31:42.212852195 +0200
+diff -Nur linux-3.14.17/crypto/af_alg.c linux-imx6-3.14/crypto/af_alg.c
+--- linux-3.14.17/crypto/af_alg.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/crypto/af_alg.c 2014-09-09 10:13:48.616952245 +0200
+@@ -21,7 +21,6 @@
+ #include <linux/module.h>
+ #include <linux/net.h>
+ #include <linux/rwsem.h>
+-#include <linux/security.h>
+
+ struct alg_type_list {
+ const struct af_alg_type *type;
+@@ -244,7 +243,6 @@
+
+ sock_init_data(newsock, sk2);
+ sock_graft(sk2, newsock);
+- security_sk_clone(sk, sk2);
+
+ err = type->accept(ask->private, sk2);
+ if (err) {
+diff -Nur linux-3.14.17/crypto/blkcipher.c linux-imx6-3.14/crypto/blkcipher.c
+--- linux-3.14.17/crypto/blkcipher.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/crypto/blkcipher.c 2014-09-09 10:13:48.620952278 +0200
@@ -70,14 +70,12 @@
return max(start, end_page);
}
@@ -49603,9 +51456,9 @@ diff -Nur linux-3.14.15/crypto/blkcipher.c linux-linaro-stable-mx6/crypto/blkcip
static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
unsigned int keylen)
{
-diff -Nur linux-3.14.15/crypto/tcrypt.c linux-linaro-stable-mx6/crypto/tcrypt.c
---- linux-3.14.15/crypto/tcrypt.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/crypto/tcrypt.c 2014-08-20 19:31:42.216852212 +0200
+diff -Nur linux-3.14.17/crypto/tcrypt.c linux-imx6-3.14/crypto/tcrypt.c
+--- linux-3.14.17/crypto/tcrypt.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/crypto/tcrypt.c 2014-09-09 10:13:48.624952310 +0200
@@ -33,6 +33,7 @@
#include <linux/jiffies.h>
#include <linux/timex.h>
@@ -49654,9 +51507,9 @@ diff -Nur linux-3.14.15/crypto/tcrypt.c linux-linaro-stable-mx6/crypto/tcrypt.c
name++;
}
}
-diff -Nur linux-3.14.15/Documentation/ABI/testing/sysfs-class-net-statistics linux-linaro-stable-mx6/Documentation/ABI/testing/sysfs-class-net-statistics
---- linux-3.14.15/Documentation/ABI/testing/sysfs-class-net-statistics 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/ABI/testing/sysfs-class-net-statistics 2014-08-20 19:31:39.048838615 +0200
+diff -Nur linux-3.14.17/Documentation/ABI/testing/sysfs-class-net-statistics linux-imx6-3.14/Documentation/ABI/testing/sysfs-class-net-statistics
+--- linux-3.14.17/Documentation/ABI/testing/sysfs-class-net-statistics 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/Documentation/ABI/testing/sysfs-class-net-statistics 2014-09-09 10:13:46.792937360 +0200
@@ -0,0 +1,201 @@
+What: /sys/class/<iface>/statistics/collisions
+Date: April 2005
@@ -49859,9 +51712,9 @@ diff -Nur linux-3.14.15/Documentation/ABI/testing/sysfs-class-net-statistics lin
+ due to a window collision. The specific meaning depends on the
+ MAC layer used. On Ethernet this is usually used to report
+ late collisions errors.
-diff -Nur linux-3.14.15/Documentation/arm64/booting.txt linux-linaro-stable-mx6/Documentation/arm64/booting.txt
---- linux-3.14.15/Documentation/arm64/booting.txt 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/arm64/booting.txt 2014-08-20 19:31:39.096838821 +0200
+diff -Nur linux-3.14.17/Documentation/arm64/booting.txt linux-imx6-3.14/Documentation/arm64/booting.txt
+--- linux-3.14.17/Documentation/arm64/booting.txt 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/Documentation/arm64/booting.txt 2014-09-09 10:13:46.868937981 +0200
@@ -111,8 +111,14 @@
- Caches, MMUs
The MMU must be off.
@@ -49879,9 +51732,9 @@ diff -Nur linux-3.14.15/Documentation/arm64/booting.txt linux-linaro-stable-mx6/
- Architected timers
CNTFRQ must be programmed with the timer frequency and CNTVOFF must
-diff -Nur linux-3.14.15/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt
---- linux-3.14.15/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt 2014-08-20 19:23:45.070809603 +0200
+diff -Nur linux-3.14.17/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt linux-imx6-3.14/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt
+--- linux-3.14.17/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt 2014-09-09 10:13:46.908938309 +0200
@@ -0,0 +1,64 @@
+Freescale Busfreq driver
+
@@ -49947,9 +51800,9 @@ diff -Nur linux-3.14.15/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.t
+ SET_RUNTIME_PM_OPS(ipu_runtime_suspend, ipu_runtime_resume, NULL)
+ SET_SYSTEM_SLEEP_PM_OPS(ipu_suspend, ipu_resume)
+};
-diff -Nur linux-3.14.15/Documentation/devicetree/bindings/arm/imx/gpc.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/imx/gpc.txt
---- linux-3.14.15/Documentation/devicetree/bindings/arm/imx/gpc.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/imx/gpc.txt 2014-08-20 19:23:45.070809603 +0200
+diff -Nur linux-3.14.17/Documentation/devicetree/bindings/arm/imx/gpc.txt linux-imx6-3.14/Documentation/devicetree/bindings/arm/imx/gpc.txt
+--- linux-3.14.17/Documentation/devicetree/bindings/arm/imx/gpc.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/Documentation/devicetree/bindings/arm/imx/gpc.txt 2014-09-09 10:13:46.908938309 +0200
@@ -0,0 +1,20 @@
+Freescale imx GPC bindings
+
@@ -49971,9 +51824,9 @@ diff -Nur linux-3.14.15/Documentation/devicetree/bindings/arm/imx/gpc.txt linux-
+ fsl,cpu_pdnscr_iso2sw = <0x1>;
+ fsl,cpu_pdnscr_iso = <0x1>;
+ };
-diff -Nur linux-3.14.15/Documentation/devicetree/bindings/arm/pmu.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/pmu.txt
---- linux-3.14.15/Documentation/devicetree/bindings/arm/pmu.txt 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/pmu.txt 2014-08-20 19:31:39.232839404 +0200
+diff -Nur linux-3.14.17/Documentation/devicetree/bindings/arm/pmu.txt linux-imx6-3.14/Documentation/devicetree/bindings/arm/pmu.txt
+--- linux-3.14.17/Documentation/devicetree/bindings/arm/pmu.txt 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/Documentation/devicetree/bindings/arm/pmu.txt 2014-09-09 10:13:46.912938342 +0200
@@ -17,6 +17,9 @@
"arm,arm1176-pmu"
"arm,arm1136-pmu"
@@ -49984,9 +51837,9 @@ diff -Nur linux-3.14.15/Documentation/devicetree/bindings/arm/pmu.txt linux-lina
Example:
-diff -Nur linux-3.14.15/Documentation/devicetree/bindings/ata/ahci-platform.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/ata/ahci-platform.txt
---- linux-3.14.15/Documentation/devicetree/bindings/ata/ahci-platform.txt 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/ata/ahci-platform.txt 2014-08-20 19:31:39.232839404 +0200
+diff -Nur linux-3.14.17/Documentation/devicetree/bindings/ata/ahci-platform.txt linux-imx6-3.14/Documentation/devicetree/bindings/ata/ahci-platform.txt
+--- linux-3.14.17/Documentation/devicetree/bindings/ata/ahci-platform.txt 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/Documentation/devicetree/bindings/ata/ahci-platform.txt 2014-09-09 10:13:46.912938342 +0200
@@ -4,12 +4,19 @@
Each SATA controller should have its own node.
@@ -50008,9 +51861,9 @@ diff -Nur linux-3.14.15/Documentation/devicetree/bindings/ata/ahci-platform.txt
Example:
sata@ffe08000 {
-diff -Nur linux-3.14.15/Documentation/devicetree/bindings/clock/imx6q-clock.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/clock/imx6q-clock.txt
---- linux-3.14.15/Documentation/devicetree/bindings/clock/imx6q-clock.txt 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/clock/imx6q-clock.txt 2014-08-20 19:31:39.240839439 +0200
+diff -Nur linux-3.14.17/Documentation/devicetree/bindings/clock/imx6q-clock.txt linux-imx6-3.14/Documentation/devicetree/bindings/clock/imx6q-clock.txt
+--- linux-3.14.17/Documentation/devicetree/bindings/clock/imx6q-clock.txt 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/Documentation/devicetree/bindings/clock/imx6q-clock.txt 2014-09-09 10:13:46.916938373 +0200
@@ -89,8 +89,6 @@
gpu3d_shader 74
ipu1_podf 75
@@ -50041,9 +51894,9 @@ diff -Nur linux-3.14.15/Documentation/devicetree/bindings/clock/imx6q-clock.txt
Examples:
-diff -Nur linux-3.14.15/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
---- linux-3.14.15/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt 2014-08-20 19:31:39.244839456 +0200
+diff -Nur linux-3.14.17/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt linux-imx6-3.14/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
+--- linux-3.14.17/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt 2014-09-09 10:13:46.920938405 +0200
@@ -47,6 +47,7 @@
20 ASRC
21 ESAI
@@ -50052,9 +51905,9 @@ diff -Nur linux-3.14.15/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt l
The third cell specifies the transfer priority as below.
-diff -Nur linux-3.14.15/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt
---- linux-3.14.15/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt 2014-08-20 19:23:45.106809757 +0200
+diff -Nur linux-3.14.17/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt linux-imx6-3.14/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt
+--- linux-3.14.17/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt 2014-09-09 10:13:46.920938405 +0200
@@ -0,0 +1,146 @@
+* FSL IPUv3 Display/FB
+
@@ -50202,9 +52055,9 @@ diff -Nur linux-3.14.15/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt li
+ resets = <&mipi_dsi_reset>;
+ status = "okay";
+ };
-diff -Nur linux-3.14.15/Documentation/devicetree/bindings/leds/leds-pwm.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/leds/leds-pwm.txt
---- linux-3.14.15/Documentation/devicetree/bindings/leds/leds-pwm.txt 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/leds/leds-pwm.txt 2014-08-20 19:31:39.284839627 +0200
+diff -Nur linux-3.14.17/Documentation/devicetree/bindings/leds/leds-pwm.txt linux-imx6-3.14/Documentation/devicetree/bindings/leds/leds-pwm.txt
+--- linux-3.14.17/Documentation/devicetree/bindings/leds/leds-pwm.txt 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/Documentation/devicetree/bindings/leds/leds-pwm.txt 2014-09-09 10:13:46.928938471 +0200
@@ -13,6 +13,8 @@
For the pwms and pwm-names property please refer to:
Documentation/devicetree/bindings/pwm/pwm.txt
@@ -50214,9 +52067,9 @@ diff -Nur linux-3.14.15/Documentation/devicetree/bindings/leds/leds-pwm.txt linu
- label : (optional)
see Documentation/devicetree/bindings/leds/common.txt
- linux,default-trigger : (optional)
-diff -Nur linux-3.14.15/Documentation/devicetree/bindings/mailbox/mailbox.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/mailbox/mailbox.txt
---- linux-3.14.15/Documentation/devicetree/bindings/mailbox/mailbox.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/mailbox/mailbox.txt 2014-08-20 19:31:39.284839627 +0200
+diff -Nur linux-3.14.17/Documentation/devicetree/bindings/mailbox/mailbox.txt linux-imx6-3.14/Documentation/devicetree/bindings/mailbox/mailbox.txt
+--- linux-3.14.17/Documentation/devicetree/bindings/mailbox/mailbox.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/Documentation/devicetree/bindings/mailbox/mailbox.txt 2014-09-09 10:13:46.928938471 +0200
@@ -0,0 +1,33 @@
+* Generic Mailbox Controller and client driver bindings
+
@@ -50251,9 +52104,9 @@ diff -Nur linux-3.14.15/Documentation/devicetree/bindings/mailbox/mailbox.txt li
+ mbox = <&mailbox 0
+ &mailbox 1>;
+ };
-diff -Nur linux-3.14.15/Documentation/devicetree/bindings/mlb/mlb150.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/mlb/mlb150.txt
---- linux-3.14.15/Documentation/devicetree/bindings/mlb/mlb150.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/mlb/mlb150.txt 2014-08-20 19:23:45.146809927 +0200
+diff -Nur linux-3.14.17/Documentation/devicetree/bindings/mlb/mlb150.txt linux-imx6-3.14/Documentation/devicetree/bindings/mlb/mlb150.txt
+--- linux-3.14.17/Documentation/devicetree/bindings/mlb/mlb150.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/Documentation/devicetree/bindings/mlb/mlb150.txt 2014-09-09 10:13:46.932938505 +0200
@@ -0,0 +1,22 @@
+* Freescale Media Local Bus Host Controller (MLB) for i.MX6Q/DL
+
@@ -50277,9 +52130,9 @@ diff -Nur linux-3.14.15/Documentation/devicetree/bindings/mlb/mlb150.txt linux-l
+ clock-names = "mlb", "pll8_mlb";
+ iram = <&ocram>;
+};
-diff -Nur linux-3.14.15/Documentation/devicetree/bindings/mmc/mmc.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/mmc/mmc.txt
---- linux-3.14.15/Documentation/devicetree/bindings/mmc/mmc.txt 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/mmc/mmc.txt 2014-08-20 19:31:39.304839713 +0200
+diff -Nur linux-3.14.17/Documentation/devicetree/bindings/mmc/mmc.txt linux-imx6-3.14/Documentation/devicetree/bindings/mmc/mmc.txt
+--- linux-3.14.17/Documentation/devicetree/bindings/mmc/mmc.txt 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/Documentation/devicetree/bindings/mmc/mmc.txt 2014-09-09 10:13:46.932938505 +0200
@@ -5,6 +5,8 @@
Interpreted by the OF core:
- reg: Registers location and length.
@@ -50305,9 +52158,9 @@ diff -Nur linux-3.14.15/Documentation/devicetree/bindings/mmc/mmc.txt linux-lina
*NOTE* on CD and WP polarity. To use common for all SD/MMC host controllers line
polarity properties, we have to fix the meaning of the "normal" and "inverted"
line levels. We choose to follow the SDHCI standard, which specifies both those
-diff -Nur linux-3.14.15/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
---- linux-3.14.15/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt 2014-08-20 19:31:39.344839885 +0200
+diff -Nur linux-3.14.17/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt linux-imx6-3.14/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
+--- linux-3.14.17/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt 2014-09-09 10:13:46.940938569 +0200
@@ -71,6 +71,13 @@
name for integer state ID 0, list entry 1 for state ID 1, and
so on.
@@ -50322,9 +52175,9 @@ diff -Nur linux-3.14.15/Documentation/devicetree/bindings/pinctrl/pinctrl-bindin
For example:
/* For a client device requiring named states */
-diff -Nur linux-3.14.15/Documentation/devicetree/bindings/reset/gpio-reset.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/reset/gpio-reset.txt
---- linux-3.14.15/Documentation/devicetree/bindings/reset/gpio-reset.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/reset/gpio-reset.txt 2014-08-20 19:23:45.166810012 +0200
+diff -Nur linux-3.14.17/Documentation/devicetree/bindings/reset/gpio-reset.txt linux-imx6-3.14/Documentation/devicetree/bindings/reset/gpio-reset.txt
+--- linux-3.14.17/Documentation/devicetree/bindings/reset/gpio-reset.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/Documentation/devicetree/bindings/reset/gpio-reset.txt 2014-09-09 10:13:46.948938635 +0200
@@ -0,0 +1,35 @@
+GPIO reset controller
+=====================
@@ -50361,9 +52214,9 @@ diff -Nur linux-3.14.15/Documentation/devicetree/bindings/reset/gpio-reset.txt l
+ /* ... */
+ resets = <&sii902x_reset>; /* active-low GPIO5_0, 10 ms delay */
+};
-diff -Nur linux-3.14.15/Documentation/devicetree/bindings/sound/cs42888.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/cs42888.txt
---- linux-3.14.15/Documentation/devicetree/bindings/sound/cs42888.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/cs42888.txt 2014-08-20 19:23:45.170810029 +0200
+diff -Nur linux-3.14.17/Documentation/devicetree/bindings/sound/cs42888.txt linux-imx6-3.14/Documentation/devicetree/bindings/sound/cs42888.txt
+--- linux-3.14.17/Documentation/devicetree/bindings/sound/cs42888.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/Documentation/devicetree/bindings/sound/cs42888.txt 2014-09-09 10:13:46.952938668 +0200
@@ -0,0 +1,29 @@
+CS42888 audio CODEC
+
@@ -50394,9 +52247,9 @@ diff -Nur linux-3.14.15/Documentation/devicetree/bindings/sound/cs42888.txt linu
+ VLS-supply = <&reg_audio>;
+ VLC-supply = <&reg_audio>;
+};
-diff -Nur linux-3.14.15/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt
---- linux-3.14.15/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt 2014-08-20 19:23:45.170810029 +0200
+diff -Nur linux-3.14.17/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt linux-imx6-3.14/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt
+--- linux-3.14.17/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt 2014-09-09 10:13:46.952938668 +0200
@@ -0,0 +1,23 @@
+* Freescale Asynchronous Sample Rate Converter (ASRC)
+
@@ -50421,9 +52274,9 @@ diff -Nur linux-3.14.15/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt
+ fsl,asrc-dma-tx-events = <20 21 22>;
+ status = "okay";
+};
-diff -Nur linux-3.14.15/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt
---- linux-3.14.15/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt 2014-08-20 19:23:45.170810029 +0200
+diff -Nur linux-3.14.17/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt linux-imx6-3.14/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt
+--- linux-3.14.17/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt 2014-09-09 10:13:46.952938668 +0200
@@ -0,0 +1,25 @@
+Freescale i.MX audio complex with CS42888 codec
+
@@ -50450,9 +52303,9 @@ diff -Nur linux-3.14.15/Documentation/devicetree/bindings/sound/imx-audio-cs4288
+ asrc-controller = <&asrc_p2p>;
+ audio-codec = <&codec>;
+};
-diff -Nur linux-3.14.15/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt
---- linux-3.14.15/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt 2014-08-20 19:23:45.170810029 +0200
+diff -Nur linux-3.14.17/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt linux-imx6-3.14/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt
+--- linux-3.14.17/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt 2014-09-09 10:13:46.952938668 +0200
@@ -24,6 +24,12 @@
Note: The AUDMUX port numbering should start at 1, which is consistent with
hardware manual.
@@ -50473,9 +52326,9 @@ diff -Nur linux-3.14.15/Documentation/devicetree/bindings/sound/imx-audio-wm8962
+ hp-det-gpios = <&gpio7 8 1>;
+ mic-det-gpios = <&gpio1 9 1>;
};
-diff -Nur linux-3.14.15/Documentation/devicetree/bindings/sound/wm8962.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/wm8962.txt
---- linux-3.14.15/Documentation/devicetree/bindings/sound/wm8962.txt 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/wm8962.txt 2014-08-20 19:23:45.170810029 +0200
+diff -Nur linux-3.14.17/Documentation/devicetree/bindings/sound/wm8962.txt linux-imx6-3.14/Documentation/devicetree/bindings/sound/wm8962.txt
+--- linux-3.14.17/Documentation/devicetree/bindings/sound/wm8962.txt 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/Documentation/devicetree/bindings/sound/wm8962.txt 2014-09-09 10:13:46.952938668 +0200
@@ -13,6 +13,14 @@
of R51 (Class D Control 2) gets set, indicating that the speaker is
in mono mode.
@@ -50491,9 +52344,9 @@ diff -Nur linux-3.14.15/Documentation/devicetree/bindings/sound/wm8962.txt linux
- mic-cfg : Default register value for R48 (Additional Control 4).
If absent, the default should be the register default.
-diff -Nur linux-3.14.15/Documentation/devicetree/bindings/usb/mxs-phy.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/usb/mxs-phy.txt
---- linux-3.14.15/Documentation/devicetree/bindings/usb/mxs-phy.txt 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/usb/mxs-phy.txt 2014-08-20 19:23:45.178810064 +0200
+diff -Nur linux-3.14.17/Documentation/devicetree/bindings/usb/mxs-phy.txt linux-imx6-3.14/Documentation/devicetree/bindings/usb/mxs-phy.txt
+--- linux-3.14.17/Documentation/devicetree/bindings/usb/mxs-phy.txt 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/Documentation/devicetree/bindings/usb/mxs-phy.txt 2014-09-09 10:13:46.956938700 +0200
@@ -1,13 +1,16 @@
* Freescale MXS USB Phy Device
@@ -50512,9 +52365,9 @@ diff -Nur linux-3.14.15/Documentation/devicetree/bindings/usb/mxs-phy.txt linux-
interrupts = <0 44 0x04>;
+ fsl,anatop = <&anatop>;
};
-diff -Nur linux-3.14.15/Documentation/devicetree/bindings/video/fsl,csi-v4l2-capture.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/fsl,csi-v4l2-capture.txt
---- linux-3.14.15/Documentation/devicetree/bindings/video/fsl,csi-v4l2-capture.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/fsl,csi-v4l2-capture.txt 2014-08-20 19:23:45.190810115 +0200
+diff -Nur linux-3.14.17/Documentation/devicetree/bindings/video/fsl,csi-v4l2-capture.txt linux-imx6-3.14/Documentation/devicetree/bindings/video/fsl,csi-v4l2-capture.txt
+--- linux-3.14.17/Documentation/devicetree/bindings/video/fsl,csi-v4l2-capture.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/Documentation/devicetree/bindings/video/fsl,csi-v4l2-capture.txt 2014-09-09 10:13:46.960938732 +0200
@@ -0,0 +1,61 @@
+* Freescale CMOS Sensor Interface (CSI) V4L2 Capture
+
@@ -50577,9 +52430,9 @@ diff -Nur linux-3.14.15/Documentation/devicetree/bindings/video/fsl,csi-v4l2-cap
+ mclk = <24000000>;
+ mclk_source = <0>;
+ };
-diff -Nur linux-3.14.15/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt
---- linux-3.14.15/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt 2014-08-20 19:31:39.440840296 +0200
+diff -Nur linux-3.14.17/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt linux-imx6-3.14/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt
+--- linux-3.14.17/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt 2014-09-09 10:13:46.960938732 +0200
@@ -0,0 +1,42 @@
+* Freescale MIPI CSI2 Controller for i.MX6DQ/i.MX6SDL
+
@@ -50623,9 +52476,9 @@ diff -Nur linux-3.14.15/Documentation/devicetree/bindings/video/fsl,mipi-csi2.tx
+ v_channel = <0>;
+ lanes = <2>;
+ };
-diff -Nur linux-3.14.15/Documentation/devicetree/bindings/video/fsl,pxp.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/fsl,pxp.txt
---- linux-3.14.15/Documentation/devicetree/bindings/video/fsl,pxp.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/fsl,pxp.txt 2014-08-20 19:23:45.190810115 +0200
+diff -Nur linux-3.14.17/Documentation/devicetree/bindings/video/fsl,pxp.txt linux-imx6-3.14/Documentation/devicetree/bindings/video/fsl,pxp.txt
+--- linux-3.14.17/Documentation/devicetree/bindings/video/fsl,pxp.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/Documentation/devicetree/bindings/video/fsl,pxp.txt 2014-09-09 10:13:46.960938732 +0200
@@ -0,0 +1,30 @@
+* Freescale PxP Controller for i.MX6DL, i.MX6SL
+
@@ -50657,9 +52510,9 @@ diff -Nur linux-3.14.15/Documentation/devicetree/bindings/video/fsl,pxp.txt linu
+ &pxp {
+ status = "okay";
+ };
-diff -Nur linux-3.14.15/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt
---- linux-3.14.15/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt 2014-08-20 19:23:45.190810115 +0200
+diff -Nur linux-3.14.17/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt linux-imx6-3.14/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt
+--- linux-3.14.17/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt 2014-09-09 10:13:46.960938732 +0200
@@ -0,0 +1,102 @@
+* Freescale V4L2 Capture for i.MX6DQ/i.MX6SDL
+
@@ -50763,9 +52616,9 @@ diff -Nur linux-3.14.15/Documentation/devicetree/bindings/video/fsl,v4l2-capture
+ mclk_source = <0>;
+ cvbs = <1>;
+ };
-diff -Nur linux-3.14.15/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt
---- linux-3.14.15/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt 2014-08-20 19:23:45.190810115 +0200
+diff -Nur linux-3.14.17/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt linux-imx6-3.14/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt
+--- linux-3.14.17/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt 2014-09-09 10:13:46.960938732 +0200
@@ -0,0 +1,20 @@
+Device-Tree bindings for hdmi video driver
+
@@ -50787,18 +52640,35 @@ diff -Nur linux-3.14.15/Documentation/devicetree/bindings/video/mxc_hdmi_video.t
+ fsl,phy_reg_cksymtx = <0x800d>;
+ };
+
-diff -Nur linux-3.14.15/Documentation/filesystems/hfsplus.txt linux-linaro-stable-mx6/Documentation/filesystems/hfsplus.txt
---- linux-3.14.15/Documentation/filesystems/hfsplus.txt 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/filesystems/hfsplus.txt 2014-08-20 19:31:39.464840400 +0200
+diff -Nur linux-3.14.17/Documentation/filesystems/hfsplus.txt linux-imx6-3.14/Documentation/filesystems/hfsplus.txt
+--- linux-3.14.17/Documentation/filesystems/hfsplus.txt 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/Documentation/filesystems/hfsplus.txt 2014-09-09 10:13:46.976938864 +0200
@@ -56,4 +56,4 @@
kernel source: <file:fs/hfsplus>
-Apple Technote 1150 http://developer.apple.com/technotes/tn/tn1150.html
+Apple Technote 1150 https://developer.apple.com/legacy/library/technotes/tn/tn1150.html
-diff -Nur linux-3.14.15/Documentation/networking/gianfar.txt linux-linaro-stable-mx6/Documentation/networking/gianfar.txt
---- linux-3.14.15/Documentation/networking/gianfar.txt 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/Documentation/networking/gianfar.txt 2014-08-20 19:31:39.528840676 +0200
+diff -Nur linux-3.14.17/Documentation/kernel-parameters.txt linux-imx6-3.14/Documentation/kernel-parameters.txt
+--- linux-3.14.17/Documentation/kernel-parameters.txt 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/Documentation/kernel-parameters.txt 2014-09-09 10:13:47.028939289 +0200
+@@ -603,8 +603,11 @@
+ Also note the kernel might malfunction if you disable
+ some critical bits.
+
+- cma=nn[MG] [ARM,KNL]
+- Sets the size of kernel global memory area for contiguous
++ cma=nn[MG]@[start[MG][-end[MG]]]
++ [ARM,X86,KNL]
++ Sets the size of kernel global memory area for
++ contiguous memory allocations and optionally the
++ placement constraint by the physical address range of
+ memory allocations. For more information, see
+ include/linux/dma-contiguous.h
+
+diff -Nur linux-3.14.17/Documentation/networking/gianfar.txt linux-imx6-3.14/Documentation/networking/gianfar.txt
+--- linux-3.14.17/Documentation/networking/gianfar.txt 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/Documentation/networking/gianfar.txt 2014-09-09 10:13:47.052939484 +0200
@@ -1,38 +1,8 @@
The Gianfar Ethernet Driver
-Sysfs File description
@@ -50838,9 +52708,21 @@ diff -Nur linux-3.14.15/Documentation/networking/gianfar.txt linux-linaro-stable
CHECKSUM OFFLOADING
-diff -Nur linux-3.14.15/drivers/ata/acard-ahci.c linux-linaro-stable-mx6/drivers/ata/acard-ahci.c
---- linux-3.14.15/drivers/ata/acard-ahci.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/acard-ahci.c 2014-08-20 19:31:42.312852626 +0200
+diff -Nur linux-3.14.17/Documentation/x86/x86_64/mm.txt linux-imx6-3.14/Documentation/x86/x86_64/mm.txt
+--- linux-3.14.17/Documentation/x86/x86_64/mm.txt 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/Documentation/x86/x86_64/mm.txt 2014-09-09 10:13:47.120940038 +0200
+@@ -12,8 +12,6 @@
+ ffffe90000000000 - ffffe9ffffffffff (=40 bits) hole
+ ffffea0000000000 - ffffeaffffffffff (=40 bits) virtual memory map (1TB)
+ ... unused hole ...
+-ffffff0000000000 - ffffff7fffffffff (=39 bits) %esp fixup stacks
+-... unused hole ...
+ ffffffff80000000 - ffffffffa0000000 (=512 MB) kernel text mapping, from phys 0
+ ffffffffa0000000 - ffffffffff5fffff (=1525 MB) module mapping space
+ ffffffffff600000 - ffffffffffdfffff (=8 MB) vsyscalls
+diff -Nur linux-3.14.17/drivers/ata/acard-ahci.c linux-imx6-3.14/drivers/ata/acard-ahci.c
+--- linux-3.14.17/drivers/ata/acard-ahci.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/acard-ahci.c 2014-09-09 10:13:48.668952670 +0200
@@ -36,7 +36,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -50849,9 +52731,9 @@ diff -Nur linux-3.14.15/drivers/ata/acard-ahci.c linux-linaro-stable-mx6/drivers
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
-diff -Nur linux-3.14.15/drivers/ata/ahci.c linux-linaro-stable-mx6/drivers/ata/ahci.c
---- linux-3.14.15/drivers/ata/ahci.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/ahci.c 2014-08-20 19:31:42.312852626 +0200
+diff -Nur linux-3.14.17/drivers/ata/ahci.c linux-imx6-3.14/drivers/ata/ahci.c
+--- linux-3.14.17/drivers/ata/ahci.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/ahci.c 2014-09-09 10:13:48.668952670 +0200
@@ -35,7 +35,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -50931,9 +52813,9 @@ diff -Nur linux-3.14.15/drivers/ata/ahci.c linux-linaro-stable-mx6/drivers/ata/a
/* save initial config */
ahci_pci_save_initial_config(pdev, hpriv);
-diff -Nur linux-3.14.15/drivers/ata/ahci.h linux-linaro-stable-mx6/drivers/ata/ahci.h
---- linux-3.14.15/drivers/ata/ahci.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/ahci.h 2014-08-20 19:31:42.312852626 +0200
+diff -Nur linux-3.14.17/drivers/ata/ahci.h linux-imx6-3.14/drivers/ata/ahci.h
+--- linux-3.14.17/drivers/ata/ahci.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/ahci.h 2014-09-09 10:13:48.668952670 +0200
@@ -37,6 +37,8 @@
#include <linux/clk.h>
@@ -50979,9 +52861,9 @@ diff -Nur linux-3.14.15/drivers/ata/ahci.h linux-linaro-stable-mx6/drivers/ata/a
};
extern int ahci_ignore_sss;
-diff -Nur linux-3.14.15/drivers/ata/ahci_imx.c linux-linaro-stable-mx6/drivers/ata/ahci_imx.c
---- linux-3.14.15/drivers/ata/ahci_imx.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/ahci_imx.c 2014-08-20 19:31:42.312852626 +0200
+diff -Nur linux-3.14.17/drivers/ata/ahci_imx.c linux-imx6-3.14/drivers/ata/ahci_imx.c
+--- linux-3.14.17/drivers/ata/ahci_imx.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/ahci_imx.c 2014-09-09 10:13:48.668952670 +0200
@@ -26,12 +26,29 @@
#include <linux/mfd/syscon.h>
#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
@@ -51802,9 +53684,9 @@ diff -Nur linux-3.14.15/drivers/ata/ahci_imx.c linux-linaro-stable-mx6/drivers/a
},
};
module_platform_driver(imx_ahci_driver);
-diff -Nur linux-3.14.15/drivers/ata/ahci_platform.c linux-linaro-stable-mx6/drivers/ata/ahci_platform.c
---- linux-3.14.15/drivers/ata/ahci_platform.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/ahci_platform.c 2014-08-20 19:31:42.312852626 +0200
+diff -Nur linux-3.14.17/drivers/ata/ahci_platform.c linux-imx6-3.14/drivers/ata/ahci_platform.c
+--- linux-3.14.17/drivers/ata/ahci_platform.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/ahci_platform.c 2014-09-09 10:13:48.672952702 +0200
@@ -12,135 +12,36 @@
* any later version.
*/
@@ -52153,9 +54035,9 @@ diff -Nur linux-3.14.15/drivers/ata/ahci_platform.c linux-linaro-stable-mx6/driv
};
module_platform_driver(ahci_driver);
-diff -Nur linux-3.14.15/drivers/ata/ata_generic.c linux-linaro-stable-mx6/drivers/ata/ata_generic.c
---- linux-3.14.15/drivers/ata/ata_generic.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/ata_generic.c 2014-08-20 19:31:42.312852626 +0200
+diff -Nur linux-3.14.17/drivers/ata/ata_generic.c linux-imx6-3.14/drivers/ata/ata_generic.c
+--- linux-3.14.17/drivers/ata/ata_generic.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/ata_generic.c 2014-09-09 10:13:48.672952702 +0200
@@ -19,7 +19,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52164,9 +54046,9 @@ diff -Nur linux-3.14.15/drivers/ata/ata_generic.c linux-linaro-stable-mx6/driver
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.15/drivers/ata/Kconfig linux-linaro-stable-mx6/drivers/ata/Kconfig
---- linux-3.14.15/drivers/ata/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/Kconfig 2014-08-20 19:31:42.312852626 +0200
+diff -Nur linux-3.14.17/drivers/ata/Kconfig linux-imx6-3.14/drivers/ata/Kconfig
+--- linux-3.14.17/drivers/ata/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/Kconfig 2014-09-09 10:13:48.668952670 +0200
@@ -99,7 +99,7 @@
config AHCI_IMX
@@ -52176,9 +54058,9 @@ diff -Nur linux-3.14.15/drivers/ata/Kconfig linux-linaro-stable-mx6/drivers/ata/
help
This option enables support for the Freescale i.MX SoC's
onboard AHCI SATA.
-diff -Nur linux-3.14.15/drivers/ata/libahci.c linux-linaro-stable-mx6/drivers/ata/libahci.c
---- linux-3.14.15/drivers/ata/libahci.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/libahci.c 2014-08-20 19:31:42.316852643 +0200
+diff -Nur linux-3.14.17/drivers/ata/libahci.c linux-imx6-3.14/drivers/ata/libahci.c
+--- linux-3.14.17/drivers/ata/libahci.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/libahci.c 2014-09-09 10:13:48.672952702 +0200
@@ -35,7 +35,6 @@
#include <linux/kernel.h>
#include <linux/gfp.h>
@@ -52328,9 +54210,9 @@ diff -Nur linux-3.14.15/drivers/ata/libahci.c linux-linaro-stable-mx6/drivers/at
}
static void ahci_pmp_attach(struct ata_port *ap)
-diff -Nur linux-3.14.15/drivers/ata/libahci_platform.c linux-linaro-stable-mx6/drivers/ata/libahci_platform.c
---- linux-3.14.15/drivers/ata/libahci_platform.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/ata/libahci_platform.c 2014-08-20 19:31:42.316852643 +0200
+diff -Nur linux-3.14.17/drivers/ata/libahci_platform.c linux-imx6-3.14/drivers/ata/libahci_platform.c
+--- linux-3.14.17/drivers/ata/libahci_platform.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/ata/libahci_platform.c 2014-09-09 10:13:48.672952702 +0200
@@ -0,0 +1,544 @@
+/*
+ * AHCI SATA platform library
@@ -52876,9 +54758,9 @@ diff -Nur linux-3.14.15/drivers/ata/libahci_platform.c linux-linaro-stable-mx6/d
+MODULE_DESCRIPTION("AHCI SATA platform library");
+MODULE_AUTHOR("Anton Vorontsov <avorontsov@ru.mvista.com>");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/drivers/ata/libata-core.c linux-linaro-stable-mx6/drivers/ata/libata-core.c
---- linux-3.14.15/drivers/ata/libata-core.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/libata-core.c 2014-08-20 19:31:42.316852643 +0200
+diff -Nur linux-3.14.17/drivers/ata/libata-core.c linux-imx6-3.14/drivers/ata/libata-core.c
+--- linux-3.14.17/drivers/ata/libata-core.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/libata-core.c 2014-09-09 10:13:48.672952702 +0200
@@ -1524,7 +1524,7 @@
* @dev: Device to which the command is sent
* @tf: Taskfile registers for the command and the result
@@ -52943,9 +54825,9 @@ diff -Nur linux-3.14.15/drivers/ata/libata-core.c linux-linaro-stable-mx6/driver
/* host must have been started */
if (!(host->flags & ATA_HOST_STARTED)) {
dev_err(host->dev, "BUG: trying to register unstarted host\n");
-diff -Nur linux-3.14.15/drivers/ata/Makefile linux-linaro-stable-mx6/drivers/ata/Makefile
---- linux-3.14.15/drivers/ata/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/Makefile 2014-08-20 19:31:42.312852626 +0200
+diff -Nur linux-3.14.17/drivers/ata/Makefile linux-imx6-3.14/drivers/ata/Makefile
+--- linux-3.14.17/drivers/ata/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/Makefile 2014-09-09 10:13:48.668952670 +0200
@@ -4,13 +4,13 @@
# non-SFF interface
obj-$(CONFIG_SATA_AHCI) += ahci.o libahci.o
@@ -52962,9 +54844,9 @@ diff -Nur linux-3.14.15/drivers/ata/Makefile linux-linaro-stable-mx6/drivers/ata
# SFF w/ custom DMA
obj-$(CONFIG_PDC_ADMA) += pdc_adma.o
-diff -Nur linux-3.14.15/drivers/ata/pata_acpi.c linux-linaro-stable-mx6/drivers/ata/pata_acpi.c
---- linux-3.14.15/drivers/ata/pata_acpi.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_acpi.c 2014-08-20 19:31:42.320852660 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_acpi.c linux-imx6-3.14/drivers/ata/pata_acpi.c
+--- linux-3.14.17/drivers/ata/pata_acpi.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_acpi.c 2014-09-09 10:13:48.676952734 +0200
@@ -7,7 +7,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52973,9 +54855,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_acpi.c linux-linaro-stable-mx6/drivers/
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_amd.c linux-linaro-stable-mx6/drivers/ata/pata_amd.c
---- linux-3.14.15/drivers/ata/pata_amd.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_amd.c 2014-08-20 19:31:42.320852660 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_amd.c linux-imx6-3.14/drivers/ata/pata_amd.c
+--- linux-3.14.17/drivers/ata/pata_amd.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_amd.c 2014-09-09 10:13:48.676952734 +0200
@@ -17,7 +17,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52984,9 +54866,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_amd.c linux-linaro-stable-mx6/drivers/a
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_artop.c linux-linaro-stable-mx6/drivers/ata/pata_artop.c
---- linux-3.14.15/drivers/ata/pata_artop.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_artop.c 2014-08-20 19:31:42.320852660 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_artop.c linux-imx6-3.14/drivers/ata/pata_artop.c
+--- linux-3.14.17/drivers/ata/pata_artop.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_artop.c 2014-09-09 10:13:48.676952734 +0200
@@ -19,7 +19,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52995,9 +54877,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_artop.c linux-linaro-stable-mx6/drivers
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_at91.c linux-linaro-stable-mx6/drivers/ata/pata_at91.c
---- linux-3.14.15/drivers/ata/pata_at91.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_at91.c 2014-08-20 19:31:42.320852660 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_at91.c linux-imx6-3.14/drivers/ata/pata_at91.c
+--- linux-3.14.17/drivers/ata/pata_at91.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_at91.c 2014-09-09 10:13:48.676952734 +0200
@@ -18,7 +18,6 @@
#include <linux/kernel.h>
@@ -53006,9 +54888,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_at91.c linux-linaro-stable-mx6/drivers/
#include <linux/blkdev.h>
#include <linux/gfp.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_atiixp.c linux-linaro-stable-mx6/drivers/ata/pata_atiixp.c
---- linux-3.14.15/drivers/ata/pata_atiixp.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_atiixp.c 2014-08-20 19:31:42.320852660 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_atiixp.c linux-imx6-3.14/drivers/ata/pata_atiixp.c
+--- linux-3.14.17/drivers/ata/pata_atiixp.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_atiixp.c 2014-09-09 10:13:48.676952734 +0200
@@ -15,7 +15,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53017,9 +54899,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_atiixp.c linux-linaro-stable-mx6/driver
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_atp867x.c linux-linaro-stable-mx6/drivers/ata/pata_atp867x.c
---- linux-3.14.15/drivers/ata/pata_atp867x.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_atp867x.c 2014-08-20 19:31:42.320852660 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_atp867x.c linux-imx6-3.14/drivers/ata/pata_atp867x.c
+--- linux-3.14.17/drivers/ata/pata_atp867x.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_atp867x.c 2014-09-09 10:13:48.676952734 +0200
@@ -29,7 +29,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53028,9 +54910,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_atp867x.c linux-linaro-stable-mx6/drive
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_cmd640.c linux-linaro-stable-mx6/drivers/ata/pata_cmd640.c
---- linux-3.14.15/drivers/ata/pata_cmd640.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_cmd640.c 2014-08-20 19:31:42.324852677 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_cmd640.c linux-imx6-3.14/drivers/ata/pata_cmd640.c
+--- linux-3.14.17/drivers/ata/pata_cmd640.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_cmd640.c 2014-09-09 10:13:48.676952734 +0200
@@ -15,7 +15,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53039,9 +54921,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_cmd640.c linux-linaro-stable-mx6/driver
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/gfp.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_cmd64x.c linux-linaro-stable-mx6/drivers/ata/pata_cmd64x.c
---- linux-3.14.15/drivers/ata/pata_cmd64x.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_cmd64x.c 2014-08-20 19:31:42.324852677 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_cmd64x.c linux-imx6-3.14/drivers/ata/pata_cmd64x.c
+--- linux-3.14.17/drivers/ata/pata_cmd64x.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_cmd64x.c 2014-09-09 10:13:48.676952734 +0200
@@ -26,7 +26,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53050,9 +54932,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_cmd64x.c linux-linaro-stable-mx6/driver
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_cs5520.c linux-linaro-stable-mx6/drivers/ata/pata_cs5520.c
---- linux-3.14.15/drivers/ata/pata_cs5520.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_cs5520.c 2014-08-20 19:31:42.324852677 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_cs5520.c linux-imx6-3.14/drivers/ata/pata_cs5520.c
+--- linux-3.14.17/drivers/ata/pata_cs5520.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_cs5520.c 2014-09-09 10:13:48.676952734 +0200
@@ -34,7 +34,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53061,9 +54943,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_cs5520.c linux-linaro-stable-mx6/driver
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_cs5530.c linux-linaro-stable-mx6/drivers/ata/pata_cs5530.c
---- linux-3.14.15/drivers/ata/pata_cs5530.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_cs5530.c 2014-08-20 19:31:42.324852677 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_cs5530.c linux-imx6-3.14/drivers/ata/pata_cs5530.c
+--- linux-3.14.17/drivers/ata/pata_cs5530.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_cs5530.c 2014-09-09 10:13:48.676952734 +0200
@@ -26,7 +26,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53072,9 +54954,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_cs5530.c linux-linaro-stable-mx6/driver
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_cs5535.c linux-linaro-stable-mx6/drivers/ata/pata_cs5535.c
---- linux-3.14.15/drivers/ata/pata_cs5535.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_cs5535.c 2014-08-20 19:31:42.324852677 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_cs5535.c linux-imx6-3.14/drivers/ata/pata_cs5535.c
+--- linux-3.14.17/drivers/ata/pata_cs5535.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_cs5535.c 2014-09-09 10:13:48.676952734 +0200
@@ -31,7 +31,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53083,9 +54965,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_cs5535.c linux-linaro-stable-mx6/driver
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_cs5536.c linux-linaro-stable-mx6/drivers/ata/pata_cs5536.c
---- linux-3.14.15/drivers/ata/pata_cs5536.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_cs5536.c 2014-08-20 19:31:42.324852677 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_cs5536.c linux-imx6-3.14/drivers/ata/pata_cs5536.c
+--- linux-3.14.17/drivers/ata/pata_cs5536.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_cs5536.c 2014-09-09 10:13:48.676952734 +0200
@@ -33,7 +33,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53094,9 +54976,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_cs5536.c linux-linaro-stable-mx6/driver
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/libata.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_cypress.c linux-linaro-stable-mx6/drivers/ata/pata_cypress.c
---- linux-3.14.15/drivers/ata/pata_cypress.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_cypress.c 2014-08-20 19:31:42.324852677 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_cypress.c linux-imx6-3.14/drivers/ata/pata_cypress.c
+--- linux-3.14.17/drivers/ata/pata_cypress.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_cypress.c 2014-09-09 10:13:48.676952734 +0200
@@ -11,7 +11,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53105,9 +54987,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_cypress.c linux-linaro-stable-mx6/drive
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_efar.c linux-linaro-stable-mx6/drivers/ata/pata_efar.c
---- linux-3.14.15/drivers/ata/pata_efar.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_efar.c 2014-08-20 19:31:42.324852677 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_efar.c linux-imx6-3.14/drivers/ata/pata_efar.c
+--- linux-3.14.17/drivers/ata/pata_efar.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_efar.c 2014-09-09 10:13:48.676952734 +0200
@@ -14,7 +14,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53116,9 +54998,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_efar.c linux-linaro-stable-mx6/drivers/
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_ep93xx.c linux-linaro-stable-mx6/drivers/ata/pata_ep93xx.c
---- linux-3.14.15/drivers/ata/pata_ep93xx.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_ep93xx.c 2014-08-20 19:31:42.324852677 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_ep93xx.c linux-imx6-3.14/drivers/ata/pata_ep93xx.c
+--- linux-3.14.17/drivers/ata/pata_ep93xx.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_ep93xx.c 2014-09-09 10:13:48.680952767 +0200
@@ -34,7 +34,6 @@
#include <linux/err.h>
#include <linux/kernel.h>
@@ -53127,9 +55009,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_ep93xx.c linux-linaro-stable-mx6/driver
#include <linux/blkdev.h>
#include <scsi/scsi_host.h>
#include <linux/ata.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_hpt366.c linux-linaro-stable-mx6/drivers/ata/pata_hpt366.c
---- linux-3.14.15/drivers/ata/pata_hpt366.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_hpt366.c 2014-08-20 19:31:42.324852677 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_hpt366.c linux-imx6-3.14/drivers/ata/pata_hpt366.c
+--- linux-3.14.17/drivers/ata/pata_hpt366.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_hpt366.c 2014-09-09 10:13:48.680952767 +0200
@@ -19,7 +19,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53138,9 +55020,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_hpt366.c linux-linaro-stable-mx6/driver
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_hpt37x.c linux-linaro-stable-mx6/drivers/ata/pata_hpt37x.c
---- linux-3.14.15/drivers/ata/pata_hpt37x.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_hpt37x.c 2014-08-20 19:31:42.324852677 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_hpt37x.c linux-imx6-3.14/drivers/ata/pata_hpt37x.c
+--- linux-3.14.17/drivers/ata/pata_hpt37x.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_hpt37x.c 2014-09-09 10:13:48.680952767 +0200
@@ -19,7 +19,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53149,9 +55031,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_hpt37x.c linux-linaro-stable-mx6/driver
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_hpt3x2n.c linux-linaro-stable-mx6/drivers/ata/pata_hpt3x2n.c
---- linux-3.14.15/drivers/ata/pata_hpt3x2n.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_hpt3x2n.c 2014-08-20 19:31:42.324852677 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_hpt3x2n.c linux-imx6-3.14/drivers/ata/pata_hpt3x2n.c
+--- linux-3.14.17/drivers/ata/pata_hpt3x2n.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_hpt3x2n.c 2014-09-09 10:13:48.680952767 +0200
@@ -20,7 +20,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53160,9 +55042,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_hpt3x2n.c linux-linaro-stable-mx6/drive
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_hpt3x3.c linux-linaro-stable-mx6/drivers/ata/pata_hpt3x3.c
---- linux-3.14.15/drivers/ata/pata_hpt3x3.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_hpt3x3.c 2014-08-20 19:31:42.324852677 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_hpt3x3.c linux-imx6-3.14/drivers/ata/pata_hpt3x3.c
+--- linux-3.14.17/drivers/ata/pata_hpt3x3.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_hpt3x3.c 2014-09-09 10:13:48.680952767 +0200
@@ -16,7 +16,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53171,9 +55053,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_hpt3x3.c linux-linaro-stable-mx6/driver
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_imx.c linux-linaro-stable-mx6/drivers/ata/pata_imx.c
---- linux-3.14.15/drivers/ata/pata_imx.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_imx.c 2014-08-20 19:31:42.324852677 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_imx.c linux-imx6-3.14/drivers/ata/pata_imx.c
+--- linux-3.14.17/drivers/ata/pata_imx.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_imx.c 2014-09-09 10:13:48.680952767 +0200
@@ -15,7 +15,6 @@
*/
#include <linux/kernel.h>
@@ -53182,9 +55064,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_imx.c linux-linaro-stable-mx6/drivers/a
#include <linux/blkdev.h>
#include <scsi/scsi_host.h>
#include <linux/ata.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_it8213.c linux-linaro-stable-mx6/drivers/ata/pata_it8213.c
---- linux-3.14.15/drivers/ata/pata_it8213.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_it8213.c 2014-08-20 19:31:42.328852693 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_it8213.c linux-imx6-3.14/drivers/ata/pata_it8213.c
+--- linux-3.14.17/drivers/ata/pata_it8213.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_it8213.c 2014-09-09 10:13:48.680952767 +0200
@@ -10,7 +10,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53193,9 +55075,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_it8213.c linux-linaro-stable-mx6/driver
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_it821x.c linux-linaro-stable-mx6/drivers/ata/pata_it821x.c
---- linux-3.14.15/drivers/ata/pata_it821x.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_it821x.c 2014-08-20 19:31:42.328852693 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_it821x.c linux-imx6-3.14/drivers/ata/pata_it821x.c
+--- linux-3.14.17/drivers/ata/pata_it821x.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_it821x.c 2014-09-09 10:13:48.680952767 +0200
@@ -72,7 +72,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53204,9 +55086,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_it821x.c linux-linaro-stable-mx6/driver
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/slab.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_jmicron.c linux-linaro-stable-mx6/drivers/ata/pata_jmicron.c
---- linux-3.14.15/drivers/ata/pata_jmicron.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_jmicron.c 2014-08-20 19:31:42.328852693 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_jmicron.c linux-imx6-3.14/drivers/ata/pata_jmicron.c
+--- linux-3.14.17/drivers/ata/pata_jmicron.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_jmicron.c 2014-09-09 10:13:48.680952767 +0200
@@ -10,7 +10,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53215,9 +55097,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_jmicron.c linux-linaro-stable-mx6/drive
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_marvell.c linux-linaro-stable-mx6/drivers/ata/pata_marvell.c
---- linux-3.14.15/drivers/ata/pata_marvell.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_marvell.c 2014-08-20 19:31:42.328852693 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_marvell.c linux-imx6-3.14/drivers/ata/pata_marvell.c
+--- linux-3.14.17/drivers/ata/pata_marvell.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_marvell.c 2014-09-09 10:13:48.680952767 +0200
@@ -11,7 +11,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53226,9 +55108,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_marvell.c linux-linaro-stable-mx6/drive
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_mpiix.c linux-linaro-stable-mx6/drivers/ata/pata_mpiix.c
---- linux-3.14.15/drivers/ata/pata_mpiix.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_mpiix.c 2014-08-20 19:31:42.328852693 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_mpiix.c linux-imx6-3.14/drivers/ata/pata_mpiix.c
+--- linux-3.14.17/drivers/ata/pata_mpiix.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_mpiix.c 2014-09-09 10:13:48.680952767 +0200
@@ -28,7 +28,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53237,9 +55119,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_mpiix.c linux-linaro-stable-mx6/drivers
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_netcell.c linux-linaro-stable-mx6/drivers/ata/pata_netcell.c
---- linux-3.14.15/drivers/ata/pata_netcell.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_netcell.c 2014-08-20 19:31:42.328852693 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_netcell.c linux-imx6-3.14/drivers/ata/pata_netcell.c
+--- linux-3.14.17/drivers/ata/pata_netcell.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_netcell.c 2014-09-09 10:13:48.680952767 +0200
@@ -7,7 +7,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53248,9 +55130,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_netcell.c linux-linaro-stable-mx6/drive
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_ninja32.c linux-linaro-stable-mx6/drivers/ata/pata_ninja32.c
---- linux-3.14.15/drivers/ata/pata_ninja32.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_ninja32.c 2014-08-20 19:31:42.328852693 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_ninja32.c linux-imx6-3.14/drivers/ata/pata_ninja32.c
+--- linux-3.14.17/drivers/ata/pata_ninja32.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_ninja32.c 2014-09-09 10:13:48.680952767 +0200
@@ -37,7 +37,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53259,9 +55141,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_ninja32.c linux-linaro-stable-mx6/drive
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_ns87410.c linux-linaro-stable-mx6/drivers/ata/pata_ns87410.c
---- linux-3.14.15/drivers/ata/pata_ns87410.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_ns87410.c 2014-08-20 19:31:42.328852693 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_ns87410.c linux-imx6-3.14/drivers/ata/pata_ns87410.c
+--- linux-3.14.17/drivers/ata/pata_ns87410.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_ns87410.c 2014-09-09 10:13:48.680952767 +0200
@@ -20,7 +20,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53270,9 +55152,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_ns87410.c linux-linaro-stable-mx6/drive
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_ns87415.c linux-linaro-stable-mx6/drivers/ata/pata_ns87415.c
---- linux-3.14.15/drivers/ata/pata_ns87415.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_ns87415.c 2014-08-20 19:31:42.328852693 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_ns87415.c linux-imx6-3.14/drivers/ata/pata_ns87415.c
+--- linux-3.14.17/drivers/ata/pata_ns87415.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_ns87415.c 2014-09-09 10:13:48.680952767 +0200
@@ -25,7 +25,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53281,9 +55163,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_ns87415.c linux-linaro-stable-mx6/drive
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_oldpiix.c linux-linaro-stable-mx6/drivers/ata/pata_oldpiix.c
---- linux-3.14.15/drivers/ata/pata_oldpiix.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_oldpiix.c 2014-08-20 19:31:42.328852693 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_oldpiix.c linux-imx6-3.14/drivers/ata/pata_oldpiix.c
+--- linux-3.14.17/drivers/ata/pata_oldpiix.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_oldpiix.c 2014-09-09 10:13:48.680952767 +0200
@@ -16,7 +16,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53292,9 +55174,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_oldpiix.c linux-linaro-stable-mx6/drive
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_opti.c linux-linaro-stable-mx6/drivers/ata/pata_opti.c
---- linux-3.14.15/drivers/ata/pata_opti.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_opti.c 2014-08-20 19:31:42.328852693 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_opti.c linux-imx6-3.14/drivers/ata/pata_opti.c
+--- linux-3.14.17/drivers/ata/pata_opti.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_opti.c 2014-09-09 10:13:48.680952767 +0200
@@ -26,7 +26,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53303,9 +55185,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_opti.c linux-linaro-stable-mx6/drivers/
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_optidma.c linux-linaro-stable-mx6/drivers/ata/pata_optidma.c
---- linux-3.14.15/drivers/ata/pata_optidma.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_optidma.c 2014-08-20 19:31:42.328852693 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_optidma.c linux-imx6-3.14/drivers/ata/pata_optidma.c
+--- linux-3.14.17/drivers/ata/pata_optidma.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_optidma.c 2014-09-09 10:13:48.680952767 +0200
@@ -25,7 +25,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53314,9 +55196,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_optidma.c linux-linaro-stable-mx6/drive
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_pcmcia.c linux-linaro-stable-mx6/drivers/ata/pata_pcmcia.c
---- linux-3.14.15/drivers/ata/pata_pcmcia.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_pcmcia.c 2014-08-20 19:31:42.328852693 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_pcmcia.c linux-imx6-3.14/drivers/ata/pata_pcmcia.c
+--- linux-3.14.17/drivers/ata/pata_pcmcia.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_pcmcia.c 2014-09-09 10:13:48.680952767 +0200
@@ -26,7 +26,6 @@
#include <linux/kernel.h>
@@ -53325,9 +55207,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_pcmcia.c linux-linaro-stable-mx6/driver
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/slab.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_pdc2027x.c linux-linaro-stable-mx6/drivers/ata/pata_pdc2027x.c
---- linux-3.14.15/drivers/ata/pata_pdc2027x.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_pdc2027x.c 2014-08-20 19:31:42.332852711 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_pdc2027x.c linux-imx6-3.14/drivers/ata/pata_pdc2027x.c
+--- linux-3.14.17/drivers/ata/pata_pdc2027x.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_pdc2027x.c 2014-09-09 10:13:48.684952800 +0200
@@ -25,7 +25,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53336,9 +55218,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_pdc2027x.c linux-linaro-stable-mx6/driv
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_pdc202xx_old.c linux-linaro-stable-mx6/drivers/ata/pata_pdc202xx_old.c
---- linux-3.14.15/drivers/ata/pata_pdc202xx_old.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_pdc202xx_old.c 2014-08-20 19:31:42.332852711 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_pdc202xx_old.c linux-imx6-3.14/drivers/ata/pata_pdc202xx_old.c
+--- linux-3.14.17/drivers/ata/pata_pdc202xx_old.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_pdc202xx_old.c 2014-09-09 10:13:48.684952800 +0200
@@ -15,7 +15,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53347,9 +55229,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_pdc202xx_old.c linux-linaro-stable-mx6/
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_piccolo.c linux-linaro-stable-mx6/drivers/ata/pata_piccolo.c
---- linux-3.14.15/drivers/ata/pata_piccolo.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_piccolo.c 2014-08-20 19:31:42.332852711 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_piccolo.c linux-imx6-3.14/drivers/ata/pata_piccolo.c
+--- linux-3.14.17/drivers/ata/pata_piccolo.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_piccolo.c 2014-09-09 10:13:48.684952800 +0200
@@ -18,7 +18,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53358,9 +55240,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_piccolo.c linux-linaro-stable-mx6/drive
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_platform.c linux-linaro-stable-mx6/drivers/ata/pata_platform.c
---- linux-3.14.15/drivers/ata/pata_platform.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_platform.c 2014-08-20 19:31:42.332852711 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_platform.c linux-imx6-3.14/drivers/ata/pata_platform.c
+--- linux-3.14.17/drivers/ata/pata_platform.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_platform.c 2014-09-09 10:13:48.684952800 +0200
@@ -13,7 +13,6 @@
*/
#include <linux/kernel.h>
@@ -53369,9 +55251,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_platform.c linux-linaro-stable-mx6/driv
#include <linux/blkdev.h>
#include <scsi/scsi_host.h>
#include <linux/ata.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_pxa.c linux-linaro-stable-mx6/drivers/ata/pata_pxa.c
---- linux-3.14.15/drivers/ata/pata_pxa.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_pxa.c 2014-08-20 19:31:42.332852711 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_pxa.c linux-imx6-3.14/drivers/ata/pata_pxa.c
+--- linux-3.14.17/drivers/ata/pata_pxa.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_pxa.c 2014-09-09 10:13:48.684952800 +0200
@@ -20,7 +20,6 @@
#include <linux/kernel.h>
@@ -53380,9 +55262,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_pxa.c linux-linaro-stable-mx6/drivers/a
#include <linux/blkdev.h>
#include <linux/ata.h>
#include <linux/libata.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_radisys.c linux-linaro-stable-mx6/drivers/ata/pata_radisys.c
---- linux-3.14.15/drivers/ata/pata_radisys.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_radisys.c 2014-08-20 19:31:42.332852711 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_radisys.c linux-imx6-3.14/drivers/ata/pata_radisys.c
+--- linux-3.14.17/drivers/ata/pata_radisys.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_radisys.c 2014-09-09 10:13:48.684952800 +0200
@@ -15,7 +15,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53391,9 +55273,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_radisys.c linux-linaro-stable-mx6/drive
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_rdc.c linux-linaro-stable-mx6/drivers/ata/pata_rdc.c
---- linux-3.14.15/drivers/ata/pata_rdc.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_rdc.c 2014-08-20 19:31:42.332852711 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_rdc.c linux-imx6-3.14/drivers/ata/pata_rdc.c
+--- linux-3.14.17/drivers/ata/pata_rdc.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_rdc.c 2014-09-09 10:13:48.684952800 +0200
@@ -24,7 +24,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53402,9 +55284,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_rdc.c linux-linaro-stable-mx6/drivers/a
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_rz1000.c linux-linaro-stable-mx6/drivers/ata/pata_rz1000.c
---- linux-3.14.15/drivers/ata/pata_rz1000.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_rz1000.c 2014-08-20 19:31:42.332852711 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_rz1000.c linux-imx6-3.14/drivers/ata/pata_rz1000.c
+--- linux-3.14.17/drivers/ata/pata_rz1000.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_rz1000.c 2014-09-09 10:13:48.684952800 +0200
@@ -14,7 +14,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53413,9 +55295,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_rz1000.c linux-linaro-stable-mx6/driver
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_sc1200.c linux-linaro-stable-mx6/drivers/ata/pata_sc1200.c
---- linux-3.14.15/drivers/ata/pata_sc1200.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_sc1200.c 2014-08-20 19:31:42.336852729 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_sc1200.c linux-imx6-3.14/drivers/ata/pata_sc1200.c
+--- linux-3.14.17/drivers/ata/pata_sc1200.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_sc1200.c 2014-09-09 10:13:48.684952800 +0200
@@ -32,7 +32,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53424,9 +55306,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_sc1200.c linux-linaro-stable-mx6/driver
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_scc.c linux-linaro-stable-mx6/drivers/ata/pata_scc.c
---- linux-3.14.15/drivers/ata/pata_scc.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_scc.c 2014-08-20 19:31:42.336852729 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_scc.c linux-imx6-3.14/drivers/ata/pata_scc.c
+--- linux-3.14.17/drivers/ata/pata_scc.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_scc.c 2014-09-09 10:13:48.684952800 +0200
@@ -35,7 +35,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53435,9 +55317,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_scc.c linux-linaro-stable-mx6/drivers/a
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_sch.c linux-linaro-stable-mx6/drivers/ata/pata_sch.c
---- linux-3.14.15/drivers/ata/pata_sch.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_sch.c 2014-08-20 19:31:42.336852729 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_sch.c linux-imx6-3.14/drivers/ata/pata_sch.c
+--- linux-3.14.17/drivers/ata/pata_sch.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_sch.c 2014-09-09 10:13:48.684952800 +0200
@@ -27,7 +27,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53446,9 +55328,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_sch.c linux-linaro-stable-mx6/drivers/a
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_serverworks.c linux-linaro-stable-mx6/drivers/ata/pata_serverworks.c
---- linux-3.14.15/drivers/ata/pata_serverworks.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_serverworks.c 2014-08-20 19:31:42.336852729 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_serverworks.c linux-imx6-3.14/drivers/ata/pata_serverworks.c
+--- linux-3.14.17/drivers/ata/pata_serverworks.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_serverworks.c 2014-09-09 10:13:48.684952800 +0200
@@ -34,7 +34,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53457,9 +55339,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_serverworks.c linux-linaro-stable-mx6/d
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_sil680.c linux-linaro-stable-mx6/drivers/ata/pata_sil680.c
---- linux-3.14.15/drivers/ata/pata_sil680.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_sil680.c 2014-08-20 19:31:42.340852746 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_sil680.c linux-imx6-3.14/drivers/ata/pata_sil680.c
+--- linux-3.14.17/drivers/ata/pata_sil680.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_sil680.c 2014-09-09 10:13:48.684952800 +0200
@@ -25,7 +25,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53468,9 +55350,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_sil680.c linux-linaro-stable-mx6/driver
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_sis.c linux-linaro-stable-mx6/drivers/ata/pata_sis.c
---- linux-3.14.15/drivers/ata/pata_sis.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_sis.c 2014-08-20 19:31:42.340852746 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_sis.c linux-imx6-3.14/drivers/ata/pata_sis.c
+--- linux-3.14.17/drivers/ata/pata_sis.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_sis.c 2014-09-09 10:13:48.684952800 +0200
@@ -26,7 +26,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53479,9 +55361,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_sis.c linux-linaro-stable-mx6/drivers/a
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_sl82c105.c linux-linaro-stable-mx6/drivers/ata/pata_sl82c105.c
---- linux-3.14.15/drivers/ata/pata_sl82c105.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_sl82c105.c 2014-08-20 19:31:42.340852746 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_sl82c105.c linux-imx6-3.14/drivers/ata/pata_sl82c105.c
+--- linux-3.14.17/drivers/ata/pata_sl82c105.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_sl82c105.c 2014-09-09 10:13:48.684952800 +0200
@@ -19,7 +19,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53490,9 +55372,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_sl82c105.c linux-linaro-stable-mx6/driv
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_triflex.c linux-linaro-stable-mx6/drivers/ata/pata_triflex.c
---- linux-3.14.15/drivers/ata/pata_triflex.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_triflex.c 2014-08-20 19:31:42.340852746 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_triflex.c linux-imx6-3.14/drivers/ata/pata_triflex.c
+--- linux-3.14.17/drivers/ata/pata_triflex.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_triflex.c 2014-09-09 10:13:48.684952800 +0200
@@ -36,7 +36,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53501,9 +55383,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_triflex.c linux-linaro-stable-mx6/drive
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.15/drivers/ata/pata_via.c linux-linaro-stable-mx6/drivers/ata/pata_via.c
---- linux-3.14.15/drivers/ata/pata_via.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pata_via.c 2014-08-20 19:31:42.344852763 +0200
+diff -Nur linux-3.14.17/drivers/ata/pata_via.c linux-imx6-3.14/drivers/ata/pata_via.c
+--- linux-3.14.17/drivers/ata/pata_via.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pata_via.c 2014-09-09 10:13:48.684952800 +0200
@@ -55,7 +55,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53512,9 +55394,9 @@ diff -Nur linux-3.14.15/drivers/ata/pata_via.c linux-linaro-stable-mx6/drivers/a
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/gfp.h>
-diff -Nur linux-3.14.15/drivers/ata/pdc_adma.c linux-linaro-stable-mx6/drivers/ata/pdc_adma.c
---- linux-3.14.15/drivers/ata/pdc_adma.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/pdc_adma.c 2014-08-20 19:31:42.344852763 +0200
+diff -Nur linux-3.14.17/drivers/ata/pdc_adma.c linux-imx6-3.14/drivers/ata/pdc_adma.c
+--- linux-3.14.17/drivers/ata/pdc_adma.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/pdc_adma.c 2014-09-09 10:13:48.684952800 +0200
@@ -36,7 +36,6 @@
#include <linux/module.h>
#include <linux/gfp.h>
@@ -53523,9 +55405,9 @@ diff -Nur linux-3.14.15/drivers/ata/pdc_adma.c linux-linaro-stable-mx6/drivers/a
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
-diff -Nur linux-3.14.15/drivers/ata/sata_dwc_460ex.c linux-linaro-stable-mx6/drivers/ata/sata_dwc_460ex.c
---- linux-3.14.15/drivers/ata/sata_dwc_460ex.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/sata_dwc_460ex.c 2014-08-20 19:31:42.344852763 +0200
+diff -Nur linux-3.14.17/drivers/ata/sata_dwc_460ex.c linux-imx6-3.14/drivers/ata/sata_dwc_460ex.c
+--- linux-3.14.17/drivers/ata/sata_dwc_460ex.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/sata_dwc_460ex.c 2014-09-09 10:13:48.684952800 +0200
@@ -29,7 +29,6 @@
#include <linux/kernel.h>
@@ -53534,9 +55416,9 @@ diff -Nur linux-3.14.15/drivers/ata/sata_dwc_460ex.c linux-linaro-stable-mx6/dri
#include <linux/device.h>
#include <linux/of_address.h>
#include <linux/of_irq.h>
-diff -Nur linux-3.14.15/drivers/ata/sata_highbank.c linux-linaro-stable-mx6/drivers/ata/sata_highbank.c
---- linux-3.14.15/drivers/ata/sata_highbank.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/sata_highbank.c 2014-08-20 19:31:42.348852780 +0200
+diff -Nur linux-3.14.17/drivers/ata/sata_highbank.c linux-imx6-3.14/drivers/ata/sata_highbank.c
+--- linux-3.14.17/drivers/ata/sata_highbank.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/sata_highbank.c 2014-09-09 10:13:48.684952800 +0200
@@ -19,7 +19,6 @@
#include <linux/kernel.h>
#include <linux/gfp.h>
@@ -53562,9 +55444,9 @@ diff -Nur linux-3.14.15/drivers/ata/sata_highbank.c linux-linaro-stable-mx6/driv
if (online)
*class = ahci_dev_classify(ap);
-diff -Nur linux-3.14.15/drivers/ata/sata_nv.c linux-linaro-stable-mx6/drivers/ata/sata_nv.c
---- linux-3.14.15/drivers/ata/sata_nv.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/sata_nv.c 2014-08-20 19:31:42.352852797 +0200
+diff -Nur linux-3.14.17/drivers/ata/sata_nv.c linux-imx6-3.14/drivers/ata/sata_nv.c
+--- linux-3.14.17/drivers/ata/sata_nv.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/sata_nv.c 2014-09-09 10:13:48.688952833 +0200
@@ -40,7 +40,6 @@
#include <linux/module.h>
#include <linux/gfp.h>
@@ -53573,9 +55455,9 @@ diff -Nur linux-3.14.15/drivers/ata/sata_nv.c linux-linaro-stable-mx6/drivers/at
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
-diff -Nur linux-3.14.15/drivers/ata/sata_promise.c linux-linaro-stable-mx6/drivers/ata/sata_promise.c
---- linux-3.14.15/drivers/ata/sata_promise.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/sata_promise.c 2014-08-20 19:31:42.352852797 +0200
+diff -Nur linux-3.14.17/drivers/ata/sata_promise.c linux-imx6-3.14/drivers/ata/sata_promise.c
+--- linux-3.14.17/drivers/ata/sata_promise.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/sata_promise.c 2014-09-09 10:13:48.688952833 +0200
@@ -35,7 +35,6 @@
#include <linux/module.h>
#include <linux/gfp.h>
@@ -53584,9 +55466,9 @@ diff -Nur linux-3.14.15/drivers/ata/sata_promise.c linux-linaro-stable-mx6/drive
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
-diff -Nur linux-3.14.15/drivers/ata/sata_qstor.c linux-linaro-stable-mx6/drivers/ata/sata_qstor.c
---- linux-3.14.15/drivers/ata/sata_qstor.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/sata_qstor.c 2014-08-20 19:31:42.352852797 +0200
+diff -Nur linux-3.14.17/drivers/ata/sata_qstor.c linux-imx6-3.14/drivers/ata/sata_qstor.c
+--- linux-3.14.17/drivers/ata/sata_qstor.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/sata_qstor.c 2014-09-09 10:13:48.688952833 +0200
@@ -31,7 +31,6 @@
#include <linux/module.h>
#include <linux/gfp.h>
@@ -53595,9 +55477,9 @@ diff -Nur linux-3.14.15/drivers/ata/sata_qstor.c linux-linaro-stable-mx6/drivers
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
-diff -Nur linux-3.14.15/drivers/ata/sata_sil.c linux-linaro-stable-mx6/drivers/ata/sata_sil.c
---- linux-3.14.15/drivers/ata/sata_sil.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/sata_sil.c 2014-08-20 19:31:42.356852813 +0200
+diff -Nur linux-3.14.17/drivers/ata/sata_sil.c linux-imx6-3.14/drivers/ata/sata_sil.c
+--- linux-3.14.17/drivers/ata/sata_sil.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/sata_sil.c 2014-09-09 10:13:48.688952833 +0200
@@ -37,7 +37,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53606,9 +55488,9 @@ diff -Nur linux-3.14.15/drivers/ata/sata_sil.c linux-linaro-stable-mx6/drivers/a
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
-diff -Nur linux-3.14.15/drivers/ata/sata_sis.c linux-linaro-stable-mx6/drivers/ata/sata_sis.c
---- linux-3.14.15/drivers/ata/sata_sis.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/sata_sis.c 2014-08-20 19:31:42.360852831 +0200
+diff -Nur linux-3.14.17/drivers/ata/sata_sis.c linux-imx6-3.14/drivers/ata/sata_sis.c
+--- linux-3.14.17/drivers/ata/sata_sis.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/sata_sis.c 2014-09-09 10:13:48.688952833 +0200
@@ -33,7 +33,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53617,9 +55499,9 @@ diff -Nur linux-3.14.15/drivers/ata/sata_sis.c linux-linaro-stable-mx6/drivers/a
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
-diff -Nur linux-3.14.15/drivers/ata/sata_svw.c linux-linaro-stable-mx6/drivers/ata/sata_svw.c
---- linux-3.14.15/drivers/ata/sata_svw.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/sata_svw.c 2014-08-20 19:31:42.360852831 +0200
+diff -Nur linux-3.14.17/drivers/ata/sata_svw.c linux-imx6-3.14/drivers/ata/sata_svw.c
+--- linux-3.14.17/drivers/ata/sata_svw.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/sata_svw.c 2014-09-09 10:13:48.688952833 +0200
@@ -39,7 +39,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53628,9 +55510,9 @@ diff -Nur linux-3.14.15/drivers/ata/sata_svw.c linux-linaro-stable-mx6/drivers/a
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
-diff -Nur linux-3.14.15/drivers/ata/sata_sx4.c linux-linaro-stable-mx6/drivers/ata/sata_sx4.c
---- linux-3.14.15/drivers/ata/sata_sx4.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/sata_sx4.c 2014-08-20 19:31:42.360852831 +0200
+diff -Nur linux-3.14.17/drivers/ata/sata_sx4.c linux-imx6-3.14/drivers/ata/sata_sx4.c
+--- linux-3.14.17/drivers/ata/sata_sx4.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/sata_sx4.c 2014-09-09 10:13:48.688952833 +0200
@@ -82,7 +82,6 @@
#include <linux/module.h>
#include <linux/pci.h>
@@ -53639,9 +55521,9 @@ diff -Nur linux-3.14.15/drivers/ata/sata_sx4.c linux-linaro-stable-mx6/drivers/a
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
-diff -Nur linux-3.14.15/drivers/ata/sata_uli.c linux-linaro-stable-mx6/drivers/ata/sata_uli.c
---- linux-3.14.15/drivers/ata/sata_uli.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/sata_uli.c 2014-08-20 19:31:42.360852831 +0200
+diff -Nur linux-3.14.17/drivers/ata/sata_uli.c linux-imx6-3.14/drivers/ata/sata_uli.c
+--- linux-3.14.17/drivers/ata/sata_uli.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/sata_uli.c 2014-09-09 10:13:48.688952833 +0200
@@ -28,7 +28,6 @@
#include <linux/module.h>
#include <linux/gfp.h>
@@ -53650,9 +55532,9 @@ diff -Nur linux-3.14.15/drivers/ata/sata_uli.c linux-linaro-stable-mx6/drivers/a
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
-diff -Nur linux-3.14.15/drivers/ata/sata_via.c linux-linaro-stable-mx6/drivers/ata/sata_via.c
---- linux-3.14.15/drivers/ata/sata_via.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/sata_via.c 2014-08-20 19:31:42.364852849 +0200
+diff -Nur linux-3.14.17/drivers/ata/sata_via.c linux-imx6-3.14/drivers/ata/sata_via.c
+--- linux-3.14.17/drivers/ata/sata_via.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/sata_via.c 2014-09-09 10:13:48.688952833 +0200
@@ -36,7 +36,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53661,9 +55543,9 @@ diff -Nur linux-3.14.15/drivers/ata/sata_via.c linux-linaro-stable-mx6/drivers/a
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.15/drivers/ata/sata_vsc.c linux-linaro-stable-mx6/drivers/ata/sata_vsc.c
---- linux-3.14.15/drivers/ata/sata_vsc.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ata/sata_vsc.c 2014-08-20 19:31:42.364852849 +0200
+diff -Nur linux-3.14.17/drivers/ata/sata_vsc.c linux-imx6-3.14/drivers/ata/sata_vsc.c
+--- linux-3.14.17/drivers/ata/sata_vsc.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ata/sata_vsc.c 2014-09-09 10:13:48.688952833 +0200
@@ -37,7 +37,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53672,9 +55554,9 @@ diff -Nur linux-3.14.15/drivers/ata/sata_vsc.c linux-linaro-stable-mx6/drivers/a
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
-diff -Nur linux-3.14.15/drivers/base/bus.c linux-linaro-stable-mx6/drivers/base/bus.c
---- linux-3.14.15/drivers/base/bus.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/base/bus.c 2014-08-20 19:31:42.368852866 +0200
+diff -Nur linux-3.14.17/drivers/base/bus.c linux-imx6-3.14/drivers/base/bus.c
+--- linux-3.14.17/drivers/base/bus.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/base/bus.c 2014-09-09 10:13:48.700952930 +0200
@@ -1218,7 +1218,7 @@
* with the name of the subsystem. The root device can carry subsystem-
* wide attributes. All registered devices are below this single root
@@ -53684,9 +55566,9 @@ diff -Nur linux-3.14.15/drivers/base/bus.c linux-linaro-stable-mx6/drivers/base/
* only 'id' in the device needs to be set.
*
* Do not use this interface for anything new, it exists for compatibility
-diff -Nur linux-3.14.15/drivers/base/cpu.c linux-linaro-stable-mx6/drivers/base/cpu.c
---- linux-3.14.15/drivers/base/cpu.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/base/cpu.c 2014-08-20 19:31:42.368852866 +0200
+diff -Nur linux-3.14.17/drivers/base/cpu.c linux-imx6-3.14/drivers/base/cpu.c
+--- linux-3.14.17/drivers/base/cpu.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/base/cpu.c 2014-09-09 10:13:48.700952930 +0200
@@ -15,6 +15,7 @@
#include <linux/percpu.h>
#include <linux/acpi.h>
@@ -53772,9 +55654,9 @@ diff -Nur linux-3.14.15/drivers/base/cpu.c linux-linaro-stable-mx6/drivers/base/
&dev_attr_modalias.attr,
#endif
NULL
-diff -Nur linux-3.14.15/drivers/base/dma-buf.c linux-linaro-stable-mx6/drivers/base/dma-buf.c
---- linux-3.14.15/drivers/base/dma-buf.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/base/dma-buf.c 2014-08-20 19:31:42.372852883 +0200
+diff -Nur linux-3.14.17/drivers/base/dma-buf.c linux-imx6-3.14/drivers/base/dma-buf.c
+--- linux-3.14.17/drivers/base/dma-buf.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/base/dma-buf.c 2014-09-09 10:13:48.700952930 +0200
@@ -251,9 +251,8 @@
* @dmabuf: [in] buffer to attach device to.
* @dev: [in] device to be attached.
@@ -53828,9 +55710,339 @@ diff -Nur linux-3.14.15/drivers/base/dma-buf.c linux-linaro-stable-mx6/drivers/b
goto out_unlock;
dmabuf->vmap_ptr = ptr;
-diff -Nur linux-3.14.15/drivers/base/Kconfig linux-linaro-stable-mx6/drivers/base/Kconfig
---- linux-3.14.15/drivers/base/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/base/Kconfig 2014-08-20 19:31:42.368852866 +0200
+diff -Nur linux-3.14.17/drivers/base/dma-contiguous.c linux-imx6-3.14/drivers/base/dma-contiguous.c
+--- linux-3.14.17/drivers/base/dma-contiguous.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/base/dma-contiguous.c 2014-09-09 10:13:48.700952930 +0200
+@@ -24,22 +24,9 @@
+
+ #include <linux/memblock.h>
+ #include <linux/err.h>
+-#include <linux/mm.h>
+-#include <linux/mutex.h>
+-#include <linux/page-isolation.h>
+ #include <linux/sizes.h>
+-#include <linux/slab.h>
+-#include <linux/swap.h>
+-#include <linux/mm_types.h>
+ #include <linux/dma-contiguous.h>
+-
+-struct cma {
+- unsigned long base_pfn;
+- unsigned long count;
+- unsigned long *bitmap;
+-};
+-
+-struct cma *dma_contiguous_default_area;
++#include <linux/cma.h>
+
+ #ifdef CONFIG_CMA_SIZE_MBYTES
+ #define CMA_SIZE_MBYTES CONFIG_CMA_SIZE_MBYTES
+@@ -47,6 +34,8 @@
+ #define CMA_SIZE_MBYTES 0
+ #endif
+
++struct cma *dma_contiguous_default_area;
++
+ /*
+ * Default global CMA area size can be defined in kernel's .config.
+ * This is useful mainly for distro maintainers to create a kernel
+@@ -59,11 +48,22 @@
+ */
+ static const phys_addr_t size_bytes = CMA_SIZE_MBYTES * SZ_1M;
+ static phys_addr_t size_cmdline = -1;
++static phys_addr_t base_cmdline;
++static phys_addr_t limit_cmdline;
+
+ static int __init early_cma(char *p)
+ {
+ pr_debug("%s(%s)\n", __func__, p);
+ size_cmdline = memparse(p, &p);
++ if (*p != '@')
++ return 0;
++ base_cmdline = memparse(p + 1, &p);
++ if (*p != '-') {
++ limit_cmdline = base_cmdline + size_cmdline;
++ return 0;
++ }
++ limit_cmdline = memparse(p + 1, &p);
++
+ return 0;
+ }
+ early_param("cma", early_cma);
+@@ -107,11 +107,18 @@
+ void __init dma_contiguous_reserve(phys_addr_t limit)
+ {
+ phys_addr_t selected_size = 0;
++ phys_addr_t selected_base = 0;
++ phys_addr_t selected_limit = limit;
++ bool fixed = false;
+
+ pr_debug("%s(limit %08lx)\n", __func__, (unsigned long)limit);
+
+ if (size_cmdline != -1) {
+ selected_size = size_cmdline;
++ selected_base = base_cmdline;
++ selected_limit = min_not_zero(limit_cmdline, limit);
++ if (base_cmdline + size_cmdline == limit_cmdline)
++ fixed = true;
+ } else {
+ #ifdef CONFIG_CMA_SIZE_SEL_MBYTES
+ selected_size = size_bytes;
+@@ -128,68 +135,12 @@
+ pr_debug("%s: reserving %ld MiB for global area\n", __func__,
+ (unsigned long)selected_size / SZ_1M);
+
+- dma_contiguous_reserve_area(selected_size, 0, limit,
+- &dma_contiguous_default_area);
+- }
+-};
+-
+-static DEFINE_MUTEX(cma_mutex);
+-
+-static int __init cma_activate_area(struct cma *cma)
+-{
+- int bitmap_size = BITS_TO_LONGS(cma->count) * sizeof(long);
+- unsigned long base_pfn = cma->base_pfn, pfn = base_pfn;
+- unsigned i = cma->count >> pageblock_order;
+- struct zone *zone;
+-
+- cma->bitmap = kzalloc(bitmap_size, GFP_KERNEL);
+-
+- if (!cma->bitmap)
+- return -ENOMEM;
+-
+- WARN_ON_ONCE(!pfn_valid(pfn));
+- zone = page_zone(pfn_to_page(pfn));
+-
+- do {
+- unsigned j;
+- base_pfn = pfn;
+- for (j = pageblock_nr_pages; j; --j, pfn++) {
+- WARN_ON_ONCE(!pfn_valid(pfn));
+- /*
+- * alloc_contig_range requires the pfn range
+- * specified to be in the same zone. Make this
+- * simple by forcing the entire CMA resv range
+- * to be in the same zone.
+- */
+- if (page_zone(pfn_to_page(pfn)) != zone)
+- goto err;
+- }
+- init_cma_reserved_pageblock(pfn_to_page(base_pfn));
+- } while (--i);
+-
+- return 0;
+-
+-err:
+- kfree(cma->bitmap);
+- return -EINVAL;
+-}
+-
+-static struct cma cma_areas[MAX_CMA_AREAS];
+-static unsigned cma_area_count;
+-
+-static int __init cma_init_reserved_areas(void)
+-{
+- int i;
+-
+- for (i = 0; i < cma_area_count; i++) {
+- int ret = cma_activate_area(&cma_areas[i]);
+- if (ret)
+- return ret;
++ dma_contiguous_reserve_area(selected_size, selected_base,
++ selected_limit,
++ &dma_contiguous_default_area,
++ fixed);
+ }
+-
+- return 0;
+ }
+-core_initcall(cma_init_reserved_areas);
+
+ /**
+ * dma_contiguous_reserve_area() - reserve custom contiguous area
+@@ -197,78 +148,32 @@
+ * @base: Base address of the reserved area optional, use 0 for any
+ * @limit: End address of the reserved memory (optional, 0 for any).
+ * @res_cma: Pointer to store the created cma region.
++ * @fixed: hint about where to place the reserved area
+ *
+ * This function reserves memory from early allocator. It should be
+ * called by arch specific code once the early allocator (memblock or bootmem)
+ * has been activated and all other subsystems have already allocated/reserved
+ * memory. This function allows to create custom reserved areas for specific
+ * devices.
++ *
++ * If @fixed is true, reserve contiguous area at exactly @base. If false,
++ * reserve in range from @base to @limit.
+ */
+ int __init dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base,
+- phys_addr_t limit, struct cma **res_cma)
++ phys_addr_t limit, struct cma **res_cma,
++ bool fixed)
+ {
+- struct cma *cma = &cma_areas[cma_area_count];
+- phys_addr_t alignment;
+- int ret = 0;
+-
+- pr_debug("%s(size %lx, base %08lx, limit %08lx)\n", __func__,
+- (unsigned long)size, (unsigned long)base,
+- (unsigned long)limit);
+-
+- /* Sanity checks */
+- if (cma_area_count == ARRAY_SIZE(cma_areas)) {
+- pr_err("Not enough slots for CMA reserved regions!\n");
+- return -ENOSPC;
+- }
+-
+- if (!size)
+- return -EINVAL;
+-
+- /* Sanitise input arguments */
+- alignment = PAGE_SIZE << max(MAX_ORDER - 1, pageblock_order);
+- base = ALIGN(base, alignment);
+- size = ALIGN(size, alignment);
+- limit &= ~(alignment - 1);
+-
+- /* Reserve memory */
+- if (base) {
+- if (memblock_is_region_reserved(base, size) ||
+- memblock_reserve(base, size) < 0) {
+- ret = -EBUSY;
+- goto err;
+- }
+- } else {
+- /*
+- * Use __memblock_alloc_base() since
+- * memblock_alloc_base() panic()s.
+- */
+- phys_addr_t addr = __memblock_alloc_base(size, alignment, limit);
+- if (!addr) {
+- ret = -ENOMEM;
+- goto err;
+- } else {
+- base = addr;
+- }
+- }
+-
+- /*
+- * Each reserved area must be initialised later, when more kernel
+- * subsystems (like slab allocator) are available.
+- */
+- cma->base_pfn = PFN_DOWN(base);
+- cma->count = size >> PAGE_SHIFT;
+- *res_cma = cma;
+- cma_area_count++;
++ int ret;
+
+- pr_info("CMA: reserved %ld MiB at %08lx\n", (unsigned long)size / SZ_1M,
+- (unsigned long)base);
++ ret = cma_declare_contiguous(base, size, limit, 0, 0, fixed, res_cma);
++ if (ret)
++ return ret;
+
+ /* Architecture specific contiguous memory fixup. */
+- dma_contiguous_early_fixup(base, size);
++ dma_contiguous_early_fixup(cma_get_base(*res_cma),
++ cma_get_size(*res_cma));
++
+ return 0;
+-err:
+- pr_err("CMA: failed to reserve %ld MiB\n", (unsigned long)size / SZ_1M);
+- return ret;
+ }
+
+ /**
+@@ -279,57 +184,16 @@
+ *
+ * This function allocates memory buffer for specified device. It uses
+ * device specific contiguous memory area if available or the default
+- * global one. Requires architecture specific get_dev_cma_area() helper
++ * global one. Requires architecture specific dev_get_cma_area() helper
+ * function.
+ */
+ struct page *dma_alloc_from_contiguous(struct device *dev, int count,
+ unsigned int align)
+ {
+- unsigned long mask, pfn, pageno, start = 0;
+- struct cma *cma = dev_get_cma_area(dev);
+- struct page *page = NULL;
+- int ret;
+-
+- if (!cma || !cma->count)
+- return NULL;
+-
+ if (align > CONFIG_CMA_ALIGNMENT)
+ align = CONFIG_CMA_ALIGNMENT;
+
+- pr_debug("%s(cma %p, count %d, align %d)\n", __func__, (void *)cma,
+- count, align);
+-
+- if (!count)
+- return NULL;
+-
+- mask = (1 << align) - 1;
+-
+- mutex_lock(&cma_mutex);
+-
+- for (;;) {
+- pageno = bitmap_find_next_zero_area(cma->bitmap, cma->count,
+- start, count, mask);
+- if (pageno >= cma->count)
+- break;
+-
+- pfn = cma->base_pfn + pageno;
+- ret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA);
+- if (ret == 0) {
+- bitmap_set(cma->bitmap, pageno, count);
+- page = pfn_to_page(pfn);
+- break;
+- } else if (ret != -EBUSY) {
+- break;
+- }
+- pr_debug("%s(): memory range at %p is busy, retrying\n",
+- __func__, pfn_to_page(pfn));
+- /* try again with a bit different memory target */
+- start = pageno + mask + 1;
+- }
+-
+- mutex_unlock(&cma_mutex);
+- pr_debug("%s(): returned %p\n", __func__, page);
+- return page;
++ return cma_alloc(dev_get_cma_area(dev), count, align);
+ }
+
+ /**
+@@ -345,25 +209,5 @@
+ bool dma_release_from_contiguous(struct device *dev, struct page *pages,
+ int count)
+ {
+- struct cma *cma = dev_get_cma_area(dev);
+- unsigned long pfn;
+-
+- if (!cma || !pages)
+- return false;
+-
+- pr_debug("%s(page %p)\n", __func__, (void *)pages);
+-
+- pfn = page_to_pfn(pages);
+-
+- if (pfn < cma->base_pfn || pfn >= cma->base_pfn + cma->count)
+- return false;
+-
+- VM_BUG_ON(pfn + count > cma->base_pfn + cma->count);
+-
+- mutex_lock(&cma_mutex);
+- bitmap_clear(cma->bitmap, pfn - cma->base_pfn, count);
+- free_contig_range(pfn, count);
+- mutex_unlock(&cma_mutex);
+-
+- return true;
++ return cma_release(dev_get_cma_area(dev), pages, count);
+ }
+diff -Nur linux-3.14.17/drivers/base/Kconfig linux-imx6-3.14/drivers/base/Kconfig
+--- linux-3.14.17/drivers/base/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/base/Kconfig 2014-09-09 10:13:48.700952930 +0200
@@ -185,6 +185,14 @@
bool
default n
@@ -53846,9 +56058,26 @@ diff -Nur linux-3.14.15/drivers/base/Kconfig linux-linaro-stable-mx6/drivers/bas
config SOC_BUS
bool
-diff -Nur linux-3.14.15/drivers/base/platform.c linux-linaro-stable-mx6/drivers/base/platform.c
---- linux-3.14.15/drivers/base/platform.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/base/platform.c 2014-08-20 19:31:42.372852883 +0200
+@@ -266,16 +274,6 @@
+
+ If unsure, leave the default value "8".
+
+-config CMA_AREAS
+- int "Maximum count of the CMA device-private areas"
+- default 7
+- help
+- CMA allows to create CMA areas for particular devices. This parameter
+- sets the maximum number of such device private CMA areas in the
+- system.
+-
+- If unsure, leave the default value "7".
+-
+ endif
+
+ endmenu
+diff -Nur linux-3.14.17/drivers/base/platform.c linux-imx6-3.14/drivers/base/platform.c
+--- linux-3.14.17/drivers/base/platform.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/base/platform.c 2014-09-09 10:13:48.704952963 +0200
@@ -89,13 +89,8 @@
return dev->archdata.irqs[num];
#else
@@ -53865,9 +56094,9 @@ diff -Nur linux-3.14.15/drivers/base/platform.c linux-linaro-stable-mx6/drivers/
r = platform_get_resource(dev, IORESOURCE_IRQ, num);
-diff -Nur linux-3.14.15/drivers/bus/arm-cci.c linux-linaro-stable-mx6/drivers/bus/arm-cci.c
---- linux-3.14.15/drivers/bus/arm-cci.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/bus/arm-cci.c 2014-08-20 19:31:42.416853073 +0200
+diff -Nur linux-3.14.17/drivers/bus/arm-cci.c linux-imx6-3.14/drivers/bus/arm-cci.c
+--- linux-3.14.17/drivers/bus/arm-cci.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/bus/arm-cci.c 2014-09-09 10:13:48.740953257 +0200
@@ -26,6 +26,7 @@
#include <asm/cacheflush.h>
@@ -53896,9 +56125,9 @@ diff -Nur linux-3.14.15/drivers/bus/arm-cci.c linux-linaro-stable-mx6/drivers/bu
np = of_find_matching_node(NULL, arm_cci_matches);
if (!np)
return -ENODEV;
-diff -Nur linux-3.14.15/drivers/char/fsl_otp.c linux-linaro-stable-mx6/drivers/char/fsl_otp.c
---- linux-3.14.15/drivers/char/fsl_otp.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/char/fsl_otp.c 2014-08-20 19:23:50.574833100 +0200
+diff -Nur linux-3.14.17/drivers/char/fsl_otp.c linux-imx6-3.14/drivers/char/fsl_otp.c
+--- linux-3.14.17/drivers/char/fsl_otp.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/char/fsl_otp.c 2014-09-09 10:13:48.748953321 +0200
@@ -0,0 +1,299 @@
+/*
+ * Freescale On-Chip OTP driver
@@ -54199,9 +56428,9 @@ diff -Nur linux-3.14.15/drivers/char/fsl_otp.c linux-linaro-stable-mx6/drivers/c
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Huang Shijie <b32955@freescale.com>");
+MODULE_DESCRIPTION("Freescale i.MX OCOTP driver");
-diff -Nur linux-3.14.15/drivers/char/Kconfig linux-linaro-stable-mx6/drivers/char/Kconfig
---- linux-3.14.15/drivers/char/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/char/Kconfig 2014-08-20 19:31:42.416853073 +0200
+diff -Nur linux-3.14.17/drivers/char/Kconfig linux-imx6-3.14/drivers/char/Kconfig
+--- linux-3.14.17/drivers/char/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/char/Kconfig 2014-09-09 10:13:48.744953289 +0200
@@ -82,6 +82,21 @@
If unsure, say N.
@@ -54224,9 +56453,9 @@ diff -Nur linux-3.14.15/drivers/char/Kconfig linux-linaro-stable-mx6/drivers/cha
config PRINTER
tristate "Parallel printer support"
depends on PARPORT
-diff -Nur linux-3.14.15/drivers/char/Makefile linux-linaro-stable-mx6/drivers/char/Makefile
---- linux-3.14.15/drivers/char/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/char/Makefile 2014-08-20 19:31:42.416853073 +0200
+diff -Nur linux-3.14.17/drivers/char/Makefile linux-imx6-3.14/drivers/char/Makefile
+--- linux-3.14.17/drivers/char/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/char/Makefile 2014-09-09 10:13:48.744953289 +0200
@@ -16,6 +16,7 @@
obj-$(CONFIG_IBM_BSR) += bsr.o
obj-$(CONFIG_SGI_MBCS) += mbcs.o
@@ -54235,9 +56464,69 @@ diff -Nur linux-3.14.15/drivers/char/Makefile linux-linaro-stable-mx6/drivers/ch
obj-$(CONFIG_PRINTER) += lp.o
-diff -Nur linux-3.14.15/drivers/cpufreq/cpufreq_interactive.c linux-linaro-stable-mx6/drivers/cpufreq/cpufreq_interactive.c
---- linux-3.14.15/drivers/cpufreq/cpufreq_interactive.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/cpufreq/cpufreq_interactive.c 2014-08-20 19:31:42.688854238 +0200
+diff -Nur linux-3.14.17/drivers/clk/clk.c linux-imx6-3.14/drivers/clk/clk.c
+--- linux-3.14.17/drivers/clk/clk.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/clk/clk.c 2014-09-09 10:13:48.768953484 +0200
+@@ -1702,6 +1702,7 @@
+ */
+ int clk_set_parent(struct clk *clk, struct clk *parent)
+ {
++ struct clk *child;
+ int ret = 0;
+ int p_index = 0;
+ unsigned long p_rate = 0;
+@@ -1728,6 +1729,18 @@
+ goto out;
+ }
+
++ /* check two consecutive basic mux clocks */
++ if (clk->flags & CLK_IS_BASIC_MUX) {
++ hlist_for_each_entry(child, &clk->children, child_node) {
++ if (child->flags & CLK_IS_BASIC_MUX) {
++ pr_err("%s: failed to switch parent of %s due to child mux %s\n",
++ __func__, clk->name, child->name);
++ ret = -EBUSY;
++ goto out;
++ }
++ }
++ }
++
+ /* try finding the new parent index */
+ if (parent) {
+ p_index = clk_fetch_parent_index(clk, parent);
+diff -Nur linux-3.14.17/drivers/clk/clk-mux.c linux-imx6-3.14/drivers/clk/clk-mux.c
+--- linux-3.14.17/drivers/clk/clk-mux.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/clk/clk-mux.c 2014-09-09 10:13:48.764953452 +0200
+@@ -143,7 +143,7 @@
+ init.ops = &clk_mux_ro_ops;
+ else
+ init.ops = &clk_mux_ops;
+- init.flags = flags | CLK_IS_BASIC;
++ init.flags = flags | CLK_IS_BASIC | CLK_IS_BASIC_MUX;
+ init.parent_names = parent_names;
+ init.num_parents = num_parents;
+
+diff -Nur linux-3.14.17/drivers/cpufreq/cpufreq.c linux-imx6-3.14/drivers/cpufreq/cpufreq.c
+--- linux-3.14.17/drivers/cpufreq/cpufreq.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/cpufreq/cpufreq.c 2014-09-09 10:13:48.788953648 +0200
+@@ -1089,12 +1089,10 @@
+ * the creation of a brand new one. So we need to perform this update
+ * by invoking update_policy_cpu().
+ */
+- if (frozen && cpu != policy->cpu) {
++ if (frozen && cpu != policy->cpu)
+ update_policy_cpu(policy, cpu);
+- WARN_ON(kobject_move(&policy->kobj, &dev->kobj));
+- } else {
++ else
+ policy->cpu = cpu;
+- }
+
+ policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
+ cpumask_copy(policy->cpus, cpumask_of(cpu));
+diff -Nur linux-3.14.17/drivers/cpufreq/cpufreq_interactive.c linux-imx6-3.14/drivers/cpufreq/cpufreq_interactive.c
+--- linux-3.14.17/drivers/cpufreq/cpufreq_interactive.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/cpufreq/cpufreq_interactive.c 2014-09-09 10:13:48.788953648 +0200
@@ -0,0 +1,1349 @@
+/*
+ * drivers/cpufreq/cpufreq_interactive.c
@@ -55588,9 +57877,9 @@ diff -Nur linux-3.14.15/drivers/cpufreq/cpufreq_interactive.c linux-linaro-stabl
+MODULE_DESCRIPTION("'cpufreq_interactive' - A cpufreq governor for "
+ "Latency sensitive workloads");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/drivers/cpufreq/highbank-cpufreq.c linux-linaro-stable-mx6/drivers/cpufreq/highbank-cpufreq.c
---- linux-3.14.15/drivers/cpufreq/highbank-cpufreq.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/cpufreq/highbank-cpufreq.c 2014-08-20 19:31:42.692854256 +0200
+diff -Nur linux-3.14.17/drivers/cpufreq/highbank-cpufreq.c linux-imx6-3.14/drivers/cpufreq/highbank-cpufreq.c
+--- linux-3.14.17/drivers/cpufreq/highbank-cpufreq.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/cpufreq/highbank-cpufreq.c 2014-09-09 10:13:48.792953680 +0200
@@ -19,7 +19,7 @@
#include <linux/cpu.h>
#include <linux/err.h>
@@ -55600,9 +57889,9 @@ diff -Nur linux-3.14.15/drivers/cpufreq/highbank-cpufreq.c linux-linaro-stable-m
#include <linux/platform_device.h>
#define HB_CPUFREQ_CHANGE_NOTE 0x80000001
-diff -Nur linux-3.14.15/drivers/cpufreq/imx6-cpufreq.c linux-linaro-stable-mx6/drivers/cpufreq/imx6-cpufreq.c
---- linux-3.14.15/drivers/cpufreq/imx6-cpufreq.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/cpufreq/imx6-cpufreq.c 2014-08-20 19:31:42.696854274 +0200
+diff -Nur linux-3.14.17/drivers/cpufreq/imx6-cpufreq.c linux-imx6-3.14/drivers/cpufreq/imx6-cpufreq.c
+--- linux-3.14.17/drivers/cpufreq/imx6-cpufreq.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/cpufreq/imx6-cpufreq.c 2014-09-09 10:13:48.792953680 +0200
@@ -0,0 +1,393 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -55997,9 +58286,9 @@ diff -Nur linux-3.14.15/drivers/cpufreq/imx6-cpufreq.c linux-linaro-stable-mx6/d
+MODULE_AUTHOR("Shawn Guo <shawn.guo@linaro.org>");
+MODULE_DESCRIPTION("Freescale i.MX6Q cpufreq driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/drivers/cpufreq/imx6q-cpufreq.c linux-linaro-stable-mx6/drivers/cpufreq/imx6q-cpufreq.c
---- linux-3.14.15/drivers/cpufreq/imx6q-cpufreq.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/cpufreq/imx6q-cpufreq.c 1970-01-01 01:00:00.000000000 +0100
+diff -Nur linux-3.14.17/drivers/cpufreq/imx6q-cpufreq.c linux-imx6-3.14/drivers/cpufreq/imx6q-cpufreq.c
+--- linux-3.14.17/drivers/cpufreq/imx6q-cpufreq.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/cpufreq/imx6q-cpufreq.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,330 +0,0 @@
-/*
- * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -56331,9 +58620,9 @@ diff -Nur linux-3.14.15/drivers/cpufreq/imx6q-cpufreq.c linux-linaro-stable-mx6/
-MODULE_AUTHOR("Shawn Guo <shawn.guo@linaro.org>");
-MODULE_DESCRIPTION("Freescale i.MX6Q cpufreq driver");
-MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/drivers/cpufreq/Kconfig linux-linaro-stable-mx6/drivers/cpufreq/Kconfig
---- linux-3.14.15/drivers/cpufreq/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/cpufreq/Kconfig 2014-08-20 19:31:42.684854222 +0200
+diff -Nur linux-3.14.17/drivers/cpufreq/Kconfig linux-imx6-3.14/drivers/cpufreq/Kconfig
+--- linux-3.14.17/drivers/cpufreq/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/cpufreq/Kconfig 2014-09-09 10:13:48.788953648 +0200
@@ -91,6 +91,15 @@
governor. If unsure have a look at the help section of the
driver. Fallback governor will be the performance governor.
@@ -56375,9 +58664,9 @@ diff -Nur linux-3.14.15/drivers/cpufreq/Kconfig linux-linaro-stable-mx6/drivers/
If in doubt, say N.
config CPU_FREQ_GOV_CONSERVATIVE
-diff -Nur linux-3.14.15/drivers/cpufreq/Kconfig.arm linux-linaro-stable-mx6/drivers/cpufreq/Kconfig.arm
---- linux-3.14.15/drivers/cpufreq/Kconfig.arm 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/cpufreq/Kconfig.arm 2014-08-20 19:31:42.684854222 +0200
+diff -Nur linux-3.14.17/drivers/cpufreq/Kconfig.arm linux-imx6-3.14/drivers/cpufreq/Kconfig.arm
+--- linux-3.14.17/drivers/cpufreq/Kconfig.arm 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/cpufreq/Kconfig.arm 2014-09-09 10:13:48.788953648 +0200
@@ -4,7 +4,8 @@
config ARM_BIG_LITTLE_CPUFREQ
@@ -56397,9 +58686,9 @@ diff -Nur linux-3.14.15/drivers/cpufreq/Kconfig.arm linux-linaro-stable-mx6/driv
tristate "Freescale i.MX6 cpufreq support"
depends on ARCH_MXC
depends on REGULATOR_ANATOP
-diff -Nur linux-3.14.15/drivers/cpufreq/Makefile linux-linaro-stable-mx6/drivers/cpufreq/Makefile
---- linux-3.14.15/drivers/cpufreq/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/cpufreq/Makefile 2014-08-20 19:31:42.684854222 +0200
+diff -Nur linux-3.14.17/drivers/cpufreq/Makefile linux-imx6-3.14/drivers/cpufreq/Makefile
+--- linux-3.14.17/drivers/cpufreq/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/cpufreq/Makefile 2014-09-09 10:13:48.788953648 +0200
@@ -8,6 +8,7 @@
obj-$(CONFIG_CPU_FREQ_GOV_POWERSAVE) += cpufreq_powersave.o
obj-$(CONFIG_CPU_FREQ_GOV_USERSPACE) += cpufreq_userspace.o
@@ -56417,9 +58706,9 @@ diff -Nur linux-3.14.15/drivers/cpufreq/Makefile linux-linaro-stable-mx6/drivers
obj-$(CONFIG_ARM_INTEGRATOR) += integrator-cpufreq.o
obj-$(CONFIG_ARM_KIRKWOOD_CPUFREQ) += kirkwood-cpufreq.o
obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ) += omap-cpufreq.o
-diff -Nur linux-3.14.15/drivers/crypto/caam/secvio.c linux-linaro-stable-mx6/drivers/crypto/caam/secvio.c
---- linux-3.14.15/drivers/crypto/caam/secvio.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/crypto/caam/secvio.c 2014-08-20 19:31:42.792854686 +0200
+diff -Nur linux-3.14.17/drivers/crypto/caam/secvio.c linux-imx6-3.14/drivers/crypto/caam/secvio.c
+--- linux-3.14.17/drivers/crypto/caam/secvio.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/crypto/caam/secvio.c 2014-09-09 10:13:48.804953779 +0200
@@ -0,0 +1,335 @@
+
+/*
@@ -56756,9 +59045,9 @@ diff -Nur linux-3.14.15/drivers/crypto/caam/secvio.c linux-linaro-stable-mx6/dri
+MODULE_DESCRIPTION("FSL CAAM/SNVS Security Violation Handler");
+MODULE_AUTHOR("Freescale Semiconductor - NMSG/MAD");
+#endif
-diff -Nur linux-3.14.15/drivers/crypto/caam/secvio.h linux-linaro-stable-mx6/drivers/crypto/caam/secvio.h
---- linux-3.14.15/drivers/crypto/caam/secvio.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/crypto/caam/secvio.h 2014-08-20 19:23:50.790834021 +0200
+diff -Nur linux-3.14.17/drivers/crypto/caam/secvio.h linux-imx6-3.14/drivers/crypto/caam/secvio.h
+--- linux-3.14.17/drivers/crypto/caam/secvio.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/crypto/caam/secvio.h 2014-09-09 10:13:48.804953779 +0200
@@ -0,0 +1,64 @@
+
+/*
@@ -56824,9 +59113,9 @@ diff -Nur linux-3.14.15/drivers/crypto/caam/secvio.h linux-linaro-stable-mx6/dri
+};
+
+#endif /* SECVIO_H */
-diff -Nur linux-3.14.15/drivers/crypto/caam/sm.h linux-linaro-stable-mx6/drivers/crypto/caam/sm.h
---- linux-3.14.15/drivers/crypto/caam/sm.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/crypto/caam/sm.h 2014-08-20 19:23:50.790834021 +0200
+diff -Nur linux-3.14.17/drivers/crypto/caam/sm.h linux-imx6-3.14/drivers/crypto/caam/sm.h
+--- linux-3.14.17/drivers/crypto/caam/sm.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/crypto/caam/sm.h 2014-09-09 10:13:48.804953779 +0200
@@ -0,0 +1,88 @@
+
+/*
@@ -56916,9 +59205,9 @@ diff -Nur linux-3.14.15/drivers/crypto/caam/sm.h linux-linaro-stable-mx6/drivers
+};
+
+#endif /* SM_H */
-diff -Nur linux-3.14.15/drivers/crypto/caam/sm_store.c linux-linaro-stable-mx6/drivers/crypto/caam/sm_store.c
---- linux-3.14.15/drivers/crypto/caam/sm_store.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/crypto/caam/sm_store.c 2014-08-20 19:23:50.790834021 +0200
+diff -Nur linux-3.14.17/drivers/crypto/caam/sm_store.c linux-imx6-3.14/drivers/crypto/caam/sm_store.c
+--- linux-3.14.17/drivers/crypto/caam/sm_store.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/crypto/caam/sm_store.c 2014-09-09 10:13:48.804953779 +0200
@@ -0,0 +1,896 @@
+
+/*
@@ -57816,9 +60105,9 @@ diff -Nur linux-3.14.15/drivers/crypto/caam/sm_store.c linux-linaro-stable-mx6/d
+MODULE_DESCRIPTION("FSL CAAM Secure Memory / Keystore");
+MODULE_AUTHOR("Freescale Semiconductor - NMSG/MAD");
+#endif
-diff -Nur linux-3.14.15/drivers/crypto/caam/sm_test.c linux-linaro-stable-mx6/drivers/crypto/caam/sm_test.c
---- linux-3.14.15/drivers/crypto/caam/sm_test.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/crypto/caam/sm_test.c 2014-08-20 19:23:50.790834021 +0200
+diff -Nur linux-3.14.17/drivers/crypto/caam/sm_test.c linux-imx6-3.14/drivers/crypto/caam/sm_test.c
+--- linux-3.14.17/drivers/crypto/caam/sm_test.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/crypto/caam/sm_test.c 2014-09-09 10:13:48.804953779 +0200
@@ -0,0 +1,844 @@
+/*
+ * Secure Memory / Keystore Exemplification Module
@@ -58664,9 +60953,9 @@ diff -Nur linux-3.14.15/drivers/crypto/caam/sm_test.c linux-linaro-stable-mx6/dr
+MODULE_DESCRIPTION("FSL CAAM Keystore Usage Example");
+MODULE_AUTHOR("Freescale Semiconductor - NMSG/MAD");
+#endif
-diff -Nur linux-3.14.15/drivers/crypto/caam/snvsregs.h linux-linaro-stable-mx6/drivers/crypto/caam/snvsregs.h
---- linux-3.14.15/drivers/crypto/caam/snvsregs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/crypto/caam/snvsregs.h 2014-08-20 19:23:50.790834021 +0200
+diff -Nur linux-3.14.17/drivers/crypto/caam/snvsregs.h linux-imx6-3.14/drivers/crypto/caam/snvsregs.h
+--- linux-3.14.17/drivers/crypto/caam/snvsregs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/crypto/caam/snvsregs.h 2014-09-09 10:13:48.804953779 +0200
@@ -0,0 +1,237 @@
+/*
+ * SNVS hardware register-level view
@@ -58905,9 +61194,9 @@ diff -Nur linux-3.14.15/drivers/crypto/caam/snvsregs.h linux-linaro-stable-mx6/d
+};
+
+#endif /* SNVSREGS_H */
-diff -Nur linux-3.14.15/drivers/dma/imx-sdma.c linux-linaro-stable-mx6/drivers/dma/imx-sdma.c
---- linux-3.14.15/drivers/dma/imx-sdma.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/dma/imx-sdma.c 2014-08-20 19:31:42.816854789 +0200
+diff -Nur linux-3.14.17/drivers/dma/imx-sdma.c linux-imx6-3.14/drivers/dma/imx-sdma.c
+--- linux-3.14.17/drivers/dma/imx-sdma.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/dma/imx-sdma.c 2014-09-09 10:13:48.820953910 +0200
@@ -29,6 +29,7 @@
#include <linux/semaphore.h>
#include <linux/spinlock.h>
@@ -59504,9 +61793,9 @@ diff -Nur linux-3.14.15/drivers/dma/imx-sdma.c linux-linaro-stable-mx6/drivers/d
ret = sdma_init(sdma);
if (ret)
goto err_init;
-diff -Nur linux-3.14.15/drivers/dma/Kconfig linux-linaro-stable-mx6/drivers/dma/Kconfig
---- linux-3.14.15/drivers/dma/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/dma/Kconfig 2014-08-20 19:31:42.808854753 +0200
+diff -Nur linux-3.14.17/drivers/dma/Kconfig linux-imx6-3.14/drivers/dma/Kconfig
+--- linux-3.14.17/drivers/dma/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/dma/Kconfig 2014-09-09 10:13:48.816953876 +0200
@@ -137,6 +137,19 @@
To avoid bloating the irq_desc[] array we allocate a sufficient
number of IRQ slots and map them dynamically to specific sources.
@@ -59527,9 +61816,9 @@ diff -Nur linux-3.14.15/drivers/dma/Kconfig linux-linaro-stable-mx6/drivers/dma/
config TXX9_DMAC
tristate "Toshiba TXx9 SoC DMA support"
depends on MACH_TX49XX || MACH_TX39XX
-diff -Nur linux-3.14.15/drivers/dma/Makefile linux-linaro-stable-mx6/drivers/dma/Makefile
---- linux-3.14.15/drivers/dma/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/dma/Makefile 2014-08-20 19:31:42.808854753 +0200
+diff -Nur linux-3.14.17/drivers/dma/Makefile linux-imx6-3.14/drivers/dma/Makefile
+--- linux-3.14.17/drivers/dma/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/dma/Makefile 2014-09-09 10:13:48.816953876 +0200
@@ -18,6 +18,7 @@
obj-$(CONFIG_DW_DMAC_CORE) += dw/
obj-$(CONFIG_AT_HDMAC) += at_hdmac.o
@@ -59538,15 +61827,15 @@ diff -Nur linux-3.14.15/drivers/dma/Makefile linux-linaro-stable-mx6/drivers/dma
obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o
obj-$(CONFIG_SH_DMAE_BASE) += sh/
obj-$(CONFIG_COH901318) += coh901318.o coh901318_lli.o
-diff -Nur linux-3.14.15/drivers/dma/pxp/Makefile linux-linaro-stable-mx6/drivers/dma/pxp/Makefile
---- linux-3.14.15/drivers/dma/pxp/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/dma/pxp/Makefile 2014-08-20 19:23:50.894834465 +0200
+diff -Nur linux-3.14.17/drivers/dma/pxp/Makefile linux-imx6-3.14/drivers/dma/pxp/Makefile
+--- linux-3.14.17/drivers/dma/pxp/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/dma/pxp/Makefile 2014-09-09 10:13:48.828953974 +0200
@@ -0,0 +1,2 @@
+obj-$(CONFIG_MXC_PXP_V2) += pxp_dma_v2.o
+obj-$(CONFIG_MXC_PXP_CLIENT_DEVICE) += pxp_device.o
-diff -Nur linux-3.14.15/drivers/dma/pxp/pxp_device.c linux-linaro-stable-mx6/drivers/dma/pxp/pxp_device.c
---- linux-3.14.15/drivers/dma/pxp/pxp_device.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/dma/pxp/pxp_device.c 2014-08-20 19:31:42.824854823 +0200
+diff -Nur linux-3.14.17/drivers/dma/pxp/pxp_device.c linux-imx6-3.14/drivers/dma/pxp/pxp_device.c
+--- linux-3.14.17/drivers/dma/pxp/pxp_device.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/dma/pxp/pxp_device.c 2014-09-09 10:13:48.828953974 +0200
@@ -0,0 +1,765 @@
+/*
+ * Copyright (C) 2010-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -60313,9 +62602,9 @@ diff -Nur linux-3.14.15/drivers/dma/pxp/pxp_device.c linux-linaro-stable-mx6/dri
+ pxp_ht_destroy(&bufhash);
+ misc_deregister(&pxp_device_miscdev);
+}
-diff -Nur linux-3.14.15/drivers/dma/pxp/pxp_dma_v2.c linux-linaro-stable-mx6/drivers/dma/pxp/pxp_dma_v2.c
---- linux-3.14.15/drivers/dma/pxp/pxp_dma_v2.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/dma/pxp/pxp_dma_v2.c 2014-08-20 19:31:42.824854823 +0200
+diff -Nur linux-3.14.17/drivers/dma/pxp/pxp_dma_v2.c linux-imx6-3.14/drivers/dma/pxp/pxp_dma_v2.c
+--- linux-3.14.17/drivers/dma/pxp/pxp_dma_v2.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/dma/pxp/pxp_dma_v2.c 2014-09-09 10:13:48.828953974 +0200
@@ -0,0 +1,1854 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc.
@@ -62171,9 +64460,9 @@ diff -Nur linux-3.14.15/drivers/dma/pxp/pxp_dma_v2.c linux-linaro-stable-mx6/dri
+MODULE_DESCRIPTION("i.MX PxP driver");
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/drivers/dma/pxp/regs-pxp_v2.h linux-linaro-stable-mx6/drivers/dma/pxp/regs-pxp_v2.h
---- linux-3.14.15/drivers/dma/pxp/regs-pxp_v2.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/dma/pxp/regs-pxp_v2.h 2014-08-20 19:23:50.894834465 +0200
+diff -Nur linux-3.14.17/drivers/dma/pxp/regs-pxp_v2.h linux-imx6-3.14/drivers/dma/pxp/regs-pxp_v2.h
+--- linux-3.14.17/drivers/dma/pxp/regs-pxp_v2.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/dma/pxp/regs-pxp_v2.h 2014-09-09 10:13:48.828953974 +0200
@@ -0,0 +1,1152 @@
+/*
+ * Freescale PXP Register Definitions
@@ -63327,9 +65616,9 @@ diff -Nur linux-3.14.15/drivers/dma/pxp/regs-pxp_v2.h linux-linaro-stable-mx6/dr
+#define BF_PXP_VERSION_STEP(v) \
+ (((v) << 0) & BM_PXP_VERSION_STEP)
+#endif /* __ARCH_ARM___PXP_H */
-diff -Nur linux-3.14.15/drivers/gpio/gpio-pca953x.c linux-linaro-stable-mx6/drivers/gpio/gpio-pca953x.c
---- linux-3.14.15/drivers/gpio/gpio-pca953x.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/gpio/gpio-pca953x.c 2014-08-20 19:31:42.948855355 +0200
+diff -Nur linux-3.14.17/drivers/gpio/gpio-pca953x.c linux-imx6-3.14/drivers/gpio/gpio-pca953x.c
+--- linux-3.14.17/drivers/gpio/gpio-pca953x.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/gpio/gpio-pca953x.c 2014-09-09 10:13:48.852954170 +0200
@@ -19,6 +19,7 @@
#include <linux/irqdomain.h>
#include <linux/i2c.h>
@@ -63349,9 +65638,9 @@ diff -Nur linux-3.14.15/drivers/gpio/gpio-pca953x.c linux-linaro-stable-mx6/driv
/* initialize cached registers from their original values.
* we can't share this chip with another i2c master.
*/
-diff -Nur linux-3.14.15/drivers/gpu/drm/drm_crtc_helper.c linux-linaro-stable-mx6/drivers/gpu/drm/drm_crtc_helper.c
---- linux-3.14.15/drivers/gpu/drm/drm_crtc_helper.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/gpu/drm/drm_crtc_helper.c 2014-08-20 19:31:43.004855596 +0200
+diff -Nur linux-3.14.17/drivers/gpu/drm/drm_crtc_helper.c linux-imx6-3.14/drivers/gpu/drm/drm_crtc_helper.c
+--- linux-3.14.17/drivers/gpu/drm/drm_crtc_helper.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/gpu/drm/drm_crtc_helper.c 2014-09-09 10:13:48.864954268 +0200
@@ -564,7 +564,7 @@
* Caller must hold mode config lock.
*
@@ -63361,9 +65650,9 @@ diff -Nur linux-3.14.15/drivers/gpu/drm/drm_crtc_helper.c linux-linaro-stable-mx
* enable it. This is the main helper functions for drivers that implement
* kernel mode setting with the crtc helper functions and the assorted
* ->prepare(), ->modeset() and ->commit() helper callbacks.
-diff -Nur linux-3.14.15/drivers/gpu/drm/drm_prime.c linux-linaro-stable-mx6/drivers/gpu/drm/drm_prime.c
---- linux-3.14.15/drivers/gpu/drm/drm_prime.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/gpu/drm/drm_prime.c 2014-08-20 19:31:43.024855681 +0200
+diff -Nur linux-3.14.17/drivers/gpu/drm/drm_prime.c linux-imx6-3.14/drivers/gpu/drm/drm_prime.c
+--- linux-3.14.17/drivers/gpu/drm/drm_prime.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/gpu/drm/drm_prime.c 2014-09-09 10:13:48.868954301 +0200
@@ -471,7 +471,7 @@
get_dma_buf(dma_buf);
@@ -63373,9 +65662,9 @@ diff -Nur linux-3.14.15/drivers/gpu/drm/drm_prime.c linux-linaro-stable-mx6/driv
ret = PTR_ERR(sgt);
goto fail_detach;
}
-diff -Nur linux-3.14.15/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c linux-linaro-stable-mx6/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c
---- linux-3.14.15/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c 2014-08-20 19:31:43.032855716 +0200
+diff -Nur linux-3.14.17/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c linux-imx6-3.14/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c
+--- linux-3.14.17/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c 2014-09-09 10:13:48.872954334 +0200
@@ -224,7 +224,7 @@
get_dma_buf(dma_buf);
@@ -63385,9 +65674,9 @@ diff -Nur linux-3.14.15/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c linux-linaro-
ret = PTR_ERR(sgt);
goto err_buf_detach;
}
-diff -Nur linux-3.14.15/drivers/gpu/drm/Kconfig linux-linaro-stable-mx6/drivers/gpu/drm/Kconfig
---- linux-3.14.15/drivers/gpu/drm/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/gpu/drm/Kconfig 2014-08-20 19:31:42.988855528 +0200
+diff -Nur linux-3.14.17/drivers/gpu/drm/Kconfig linux-imx6-3.14/drivers/gpu/drm/Kconfig
+--- linux-3.14.17/drivers/gpu/drm/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/gpu/drm/Kconfig 2014-09-09 10:13:48.860954236 +0200
@@ -166,6 +166,13 @@
Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister
chipset. If M is selected the module will be called savage.
@@ -63402,9 +65691,9 @@ diff -Nur linux-3.14.15/drivers/gpu/drm/Kconfig linux-linaro-stable-mx6/drivers/
source "drivers/gpu/drm/exynos/Kconfig"
source "drivers/gpu/drm/vmwgfx/Kconfig"
-diff -Nur linux-3.14.15/drivers/gpu/drm/Makefile linux-linaro-stable-mx6/drivers/gpu/drm/Makefile
---- linux-3.14.15/drivers/gpu/drm/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/gpu/drm/Makefile 2014-08-20 19:31:42.988855528 +0200
+diff -Nur linux-3.14.17/drivers/gpu/drm/Makefile linux-imx6-3.14/drivers/gpu/drm/Makefile
+--- linux-3.14.17/drivers/gpu/drm/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/gpu/drm/Makefile 2014-09-09 10:13:48.860954236 +0200
@@ -1,3 +1,24 @@
+##############################################################################
+#
@@ -63438,9 +65727,9 @@ diff -Nur linux-3.14.15/drivers/gpu/drm/Makefile linux-linaro-stable-mx6/drivers
obj-$(CONFIG_DRM_TDFX) += tdfx/
obj-$(CONFIG_DRM_R128) += r128/
obj-$(CONFIG_DRM_RADEON)+= radeon/
-diff -Nur linux-3.14.15/drivers/gpu/drm/radeon/cik.c linux-linaro-stable-mx6/drivers/gpu/drm/radeon/cik.c
---- linux-3.14.15/drivers/gpu/drm/radeon/cik.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/gpu/drm/radeon/cik.c 2014-08-20 19:31:43.456857536 +0200
+diff -Nur linux-3.14.17/drivers/gpu/drm/radeon/cik.c linux-imx6-3.14/drivers/gpu/drm/radeon/cik.c
+--- linux-3.14.17/drivers/gpu/drm/radeon/cik.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/gpu/drm/radeon/cik.c 2014-09-09 10:13:48.972955149 +0200
@@ -2219,7 +2219,6 @@
gb_tile_moden = 0;
break;
@@ -63457,9 +65746,9 @@ diff -Nur linux-3.14.15/drivers/gpu/drm/radeon/cik.c linux-linaro-stable-mx6/dri
}
return (wptr & rdev->ih.ptr_mask);
}
-diff -Nur linux-3.14.15/drivers/gpu/drm/radeon/evergreen.c linux-linaro-stable-mx6/drivers/gpu/drm/radeon/evergreen.c
---- linux-3.14.15/drivers/gpu/drm/radeon/evergreen.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/gpu/drm/radeon/evergreen.c 2014-08-20 19:31:43.472857603 +0200
+diff -Nur linux-3.14.17/drivers/gpu/drm/radeon/evergreen.c linux-imx6-3.14/drivers/gpu/drm/radeon/evergreen.c
+--- linux-3.14.17/drivers/gpu/drm/radeon/evergreen.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/gpu/drm/radeon/evergreen.c 2014-09-09 10:13:48.972955149 +0200
@@ -4763,7 +4763,6 @@
tmp = RREG32(IH_RB_CNTL);
tmp |= IH_WPTR_OVERFLOW_CLEAR;
@@ -63468,9 +65757,9 @@ diff -Nur linux-3.14.15/drivers/gpu/drm/radeon/evergreen.c linux-linaro-stable-m
}
return (wptr & rdev->ih.ptr_mask);
}
-diff -Nur linux-3.14.15/drivers/gpu/drm/radeon/r600.c linux-linaro-stable-mx6/drivers/gpu/drm/radeon/r600.c
---- linux-3.14.15/drivers/gpu/drm/radeon/r600.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/gpu/drm/radeon/r600.c 2014-08-20 19:31:43.496857707 +0200
+diff -Nur linux-3.14.17/drivers/gpu/drm/radeon/r600.c linux-imx6-3.14/drivers/gpu/drm/radeon/r600.c
+--- linux-3.14.17/drivers/gpu/drm/radeon/r600.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/gpu/drm/radeon/r600.c 2014-09-09 10:13:48.980955215 +0200
@@ -3795,7 +3795,6 @@
tmp = RREG32(IH_RB_CNTL);
tmp |= IH_WPTR_OVERFLOW_CLEAR;
@@ -63479,9 +65768,9 @@ diff -Nur linux-3.14.15/drivers/gpu/drm/radeon/r600.c linux-linaro-stable-mx6/dr
}
return (wptr & rdev->ih.ptr_mask);
}
-diff -Nur linux-3.14.15/drivers/gpu/drm/radeon/si.c linux-linaro-stable-mx6/drivers/gpu/drm/radeon/si.c
---- linux-3.14.15/drivers/gpu/drm/radeon/si.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/gpu/drm/radeon/si.c 2014-08-20 19:31:43.540857895 +0200
+diff -Nur linux-3.14.17/drivers/gpu/drm/radeon/si.c linux-imx6-3.14/drivers/gpu/drm/radeon/si.c
+--- linux-3.14.17/drivers/gpu/drm/radeon/si.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/gpu/drm/radeon/si.c 2014-09-09 10:13:49.004955410 +0200
@@ -6098,7 +6098,6 @@
tmp = RREG32(IH_RB_CNTL);
tmp |= IH_WPTR_OVERFLOW_CLEAR;
@@ -63490,9 +65779,9 @@ diff -Nur linux-3.14.15/drivers/gpu/drm/radeon/si.c linux-linaro-stable-mx6/driv
}
return (wptr & rdev->ih.ptr_mask);
}
-diff -Nur linux-3.14.15/drivers/gpu/drm/vivante/Makefile linux-linaro-stable-mx6/drivers/gpu/drm/vivante/Makefile
---- linux-3.14.15/drivers/gpu/drm/vivante/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gpu/drm/vivante/Makefile 2014-08-20 19:23:51.450836839 +0200
+diff -Nur linux-3.14.17/drivers/gpu/drm/vivante/Makefile linux-imx6-3.14/drivers/gpu/drm/vivante/Makefile
+--- linux-3.14.17/drivers/gpu/drm/vivante/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/gpu/drm/vivante/Makefile 2014-09-09 10:13:49.020955541 +0200
@@ -0,0 +1,29 @@
+##############################################################################
+#
@@ -63523,9 +65812,9 @@ diff -Nur linux-3.14.15/drivers/gpu/drm/vivante/Makefile linux-linaro-stable-mx6
+vivante-y := vivante_drv.o
+
+obj-$(CONFIG_DRM_VIVANTE) += vivante.o
-diff -Nur linux-3.14.15/drivers/gpu/drm/vivante/vivante_drv.c linux-linaro-stable-mx6/drivers/gpu/drm/vivante/vivante_drv.c
---- linux-3.14.15/drivers/gpu/drm/vivante/vivante_drv.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gpu/drm/vivante/vivante_drv.c 2014-08-20 19:31:43.580858068 +0200
+diff -Nur linux-3.14.17/drivers/gpu/drm/vivante/vivante_drv.c linux-imx6-3.14/drivers/gpu/drm/vivante/vivante_drv.c
+--- linux-3.14.17/drivers/gpu/drm/vivante/vivante_drv.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/gpu/drm/vivante/vivante_drv.c 2014-09-09 10:13:49.020955541 +0200
@@ -0,0 +1,108 @@
+/****************************************************************************
+*
@@ -63635,9 +65924,9 @@ diff -Nur linux-3.14.15/drivers/gpu/drm/vivante/vivante_drv.c linux-linaro-stabl
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL and additional rights");
-diff -Nur linux-3.14.15/drivers/gpu/drm/vivante/vivante_drv.h linux-linaro-stable-mx6/drivers/gpu/drm/vivante/vivante_drv.h
---- linux-3.14.15/drivers/gpu/drm/vivante/vivante_drv.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/gpu/drm/vivante/vivante_drv.h 2014-08-20 19:23:51.450836839 +0200
+diff -Nur linux-3.14.17/drivers/gpu/drm/vivante/vivante_drv.h linux-imx6-3.14/drivers/gpu/drm/vivante/vivante_drv.h
+--- linux-3.14.17/drivers/gpu/drm/vivante/vivante_drv.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/gpu/drm/vivante/vivante_drv.h 2014-09-09 10:13:49.020955541 +0200
@@ -0,0 +1,66 @@
+/****************************************************************************
+*
@@ -63705,9 +65994,9 @@ diff -Nur linux-3.14.15/drivers/gpu/drm/vivante/vivante_drv.h linux-linaro-stabl
+#define DRIVER_PATCHLEVEL 0
+
+#endif
-diff -Nur linux-3.14.15/drivers/hwmon/Kconfig linux-linaro-stable-mx6/drivers/hwmon/Kconfig
---- linux-3.14.15/drivers/hwmon/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/hwmon/Kconfig 2014-08-20 19:31:43.636858307 +0200
+diff -Nur linux-3.14.17/drivers/hwmon/Kconfig linux-imx6-3.14/drivers/hwmon/Kconfig
+--- linux-3.14.17/drivers/hwmon/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/hwmon/Kconfig 2014-09-09 10:13:49.044955736 +0200
@@ -1584,4 +1584,19 @@
endif # ACPI
@@ -63728,9 +66017,9 @@ diff -Nur linux-3.14.15/drivers/hwmon/Kconfig linux-linaro-stable-mx6/drivers/hw
+ default y
+
endif # HWMON
-diff -Nur linux-3.14.15/drivers/hwmon/mag3110.c linux-linaro-stable-mx6/drivers/hwmon/mag3110.c
---- linux-3.14.15/drivers/hwmon/mag3110.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/hwmon/mag3110.c 2014-08-20 19:23:51.638837642 +0200
+diff -Nur linux-3.14.17/drivers/hwmon/mag3110.c linux-imx6-3.14/drivers/hwmon/mag3110.c
+--- linux-3.14.17/drivers/hwmon/mag3110.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/hwmon/mag3110.c 2014-09-09 10:13:49.060955867 +0200
@@ -0,0 +1,611 @@
+/*
+ *
@@ -64343,9 +66632,9 @@ diff -Nur linux-3.14.15/drivers/hwmon/mag3110.c linux-linaro-stable-mx6/drivers/
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("Freescale mag3110 3-axis magnetometer driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/drivers/hwmon/Makefile linux-linaro-stable-mx6/drivers/hwmon/Makefile
---- linux-3.14.15/drivers/hwmon/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/hwmon/Makefile 2014-08-20 19:31:43.636858307 +0200
+diff -Nur linux-3.14.17/drivers/hwmon/Makefile linux-imx6-3.14/drivers/hwmon/Makefile
+--- linux-3.14.17/drivers/hwmon/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/hwmon/Makefile 2014-09-09 10:13:49.044955736 +0200
@@ -142,6 +142,8 @@
obj-$(CONFIG_SENSORS_W83L786NG) += w83l786ng.o
obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o
@@ -64355,9 +66644,9 @@ diff -Nur linux-3.14.15/drivers/hwmon/Makefile linux-linaro-stable-mx6/drivers/h
obj-$(CONFIG_PMBUS) += pmbus/
-diff -Nur linux-3.14.15/drivers/hwmon/mxc_mma8451.c linux-linaro-stable-mx6/drivers/hwmon/mxc_mma8451.c
---- linux-3.14.15/drivers/hwmon/mxc_mma8451.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/hwmon/mxc_mma8451.c 2014-08-20 19:31:43.672858463 +0200
+diff -Nur linux-3.14.17/drivers/hwmon/mxc_mma8451.c linux-imx6-3.14/drivers/hwmon/mxc_mma8451.c
+--- linux-3.14.17/drivers/hwmon/mxc_mma8451.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/hwmon/mxc_mma8451.c 2014-09-09 10:13:49.060955867 +0200
@@ -0,0 +1,598 @@
+/*
+ * mma8451.c - Linux kernel modules for 3-Axis Orientation/Motion
@@ -64957,9 +67246,9 @@ diff -Nur linux-3.14.15/drivers/hwmon/mxc_mma8451.c linux-linaro-stable-mx6/driv
+
+module_init(mma8451_init);
+module_exit(mma8451_exit);
-diff -Nur linux-3.14.15/drivers/hwmon/smsc47m192.c linux-linaro-stable-mx6/drivers/hwmon/smsc47m192.c
---- linux-3.14.15/drivers/hwmon/smsc47m192.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/hwmon/smsc47m192.c 2014-08-20 19:23:51.682837830 +0200
+diff -Nur linux-3.14.17/drivers/hwmon/smsc47m192.c linux-imx6-3.14/drivers/hwmon/smsc47m192.c
+--- linux-3.14.17/drivers/hwmon/smsc47m192.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/hwmon/smsc47m192.c 2014-09-09 10:13:49.064955899 +0200
@@ -86,7 +86,7 @@
*/
static inline s8 TEMP_TO_REG(int val)
@@ -64978,9 +67267,9 @@ diff -Nur linux-3.14.15/drivers/hwmon/smsc47m192.c linux-linaro-stable-mx6/drive
data->vrm = val;
return count;
-diff -Nur linux-3.14.15/drivers/i2c/busses/i2c-imx.c linux-linaro-stable-mx6/drivers/i2c/busses/i2c-imx.c
---- linux-3.14.15/drivers/i2c/busses/i2c-imx.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/i2c/busses/i2c-imx.c 2014-08-20 19:31:43.692858550 +0200
+diff -Nur linux-3.14.17/drivers/i2c/busses/i2c-imx.c linux-imx6-3.14/drivers/i2c/busses/i2c-imx.c
+--- linux-3.14.17/drivers/i2c/busses/i2c-imx.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/i2c/busses/i2c-imx.c 2014-09-09 10:13:49.076955998 +0200
@@ -184,6 +184,9 @@
int stopped;
unsigned int ifdr; /* IMX_I2C_IFDR */
@@ -65122,9 +67411,58 @@ diff -Nur linux-3.14.15/drivers/i2c/busses/i2c-imx.c linux-linaro-stable-mx6/dri
/* Set up chip registers to defaults */
imx_i2c_write_reg(i2c_imx->hwdata->i2cr_ien_opcode ^ I2CR_IEN,
-diff -Nur linux-3.14.15/drivers/input/input.c linux-linaro-stable-mx6/drivers/input/input.c
---- linux-3.14.15/drivers/input/input.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/input/input.c 2014-08-20 19:31:43.972859750 +0200
+diff -Nur linux-3.14.17/drivers/iio/accel/bma180.c linux-imx6-3.14/drivers/iio/accel/bma180.c
+--- linux-3.14.17/drivers/iio/accel/bma180.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/iio/accel/bma180.c 2014-09-09 10:13:49.100956193 +0200
+@@ -68,13 +68,13 @@
+ /* Defaults values */
+ #define BMA180_DEF_PMODE 0
+ #define BMA180_DEF_BW 20
+-#define BMA180_DEF_SCALE 2452
++#define BMA180_DEF_SCALE 250
+
+ /* Available values for sysfs */
+ #define BMA180_FLP_FREQ_AVAILABLE \
+ "10 20 40 75 150 300"
+ #define BMA180_SCALE_AVAILABLE \
+- "0.001275 0.001863 0.002452 0.003727 0.004903 0.009709 0.019417"
++ "0.000130 0.000190 0.000250 0.000380 0.000500 0.000990 0.001980"
+
+ struct bma180_data {
+ struct i2c_client *client;
+@@ -94,7 +94,7 @@
+ };
+
+ static int bw_table[] = { 10, 20, 40, 75, 150, 300 }; /* Hz */
+-static int scale_table[] = { 1275, 1863, 2452, 3727, 4903, 9709, 19417 };
++static int scale_table[] = { 130, 190, 250, 380, 500, 990, 1980 };
+
+ static int bma180_get_acc_reg(struct bma180_data *data, enum bma180_axis axis)
+ {
+@@ -376,8 +376,6 @@
+ mutex_unlock(&data->mutex);
+ return ret;
+ case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY:
+- if (val2)
+- return -EINVAL;
+ mutex_lock(&data->mutex);
+ ret = bma180_set_bw(data, val);
+ mutex_unlock(&data->mutex);
+diff -Nur linux-3.14.17/drivers/iio/industrialio-buffer.c linux-imx6-3.14/drivers/iio/industrialio-buffer.c
+--- linux-3.14.17/drivers/iio/industrialio-buffer.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/iio/industrialio-buffer.c 2014-09-09 10:13:49.112956291 +0200
+@@ -953,7 +953,7 @@
+
+ /* Now we have the two masks, work from least sig and build up sizes */
+ for_each_set_bit(out_ind,
+- buffer->scan_mask,
++ indio_dev->active_scan_mask,
+ indio_dev->masklength) {
+ in_ind = find_next_bit(indio_dev->active_scan_mask,
+ indio_dev->masklength,
+diff -Nur linux-3.14.17/drivers/input/input.c linux-imx6-3.14/drivers/input/input.c
+--- linux-3.14.17/drivers/input/input.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/input/input.c 2014-09-09 10:13:49.172956780 +0200
@@ -257,10 +257,9 @@
}
@@ -65154,9 +67492,9 @@ diff -Nur linux-3.14.15/drivers/input/input.c linux-linaro-stable-mx6/drivers/in
if ((disposition & INPUT_PASS_TO_DEVICE) && dev->event)
dev->event(dev, type, code, value);
-diff -Nur linux-3.14.15/drivers/input/keyboard/gpio_keys.c linux-linaro-stable-mx6/drivers/input/keyboard/gpio_keys.c
---- linux-3.14.15/drivers/input/keyboard/gpio_keys.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/input/keyboard/gpio_keys.c 2014-08-20 19:31:43.980859786 +0200
+diff -Nur linux-3.14.17/drivers/input/keyboard/gpio_keys.c linux-imx6-3.14/drivers/input/keyboard/gpio_keys.c
+--- linux-3.14.17/drivers/input/keyboard/gpio_keys.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/input/keyboard/gpio_keys.c 2014-09-09 10:13:49.180956845 +0200
@@ -3,6 +3,7 @@
*
* Copyright 2005 Phil Blundell
@@ -65174,9 +67512,9 @@ diff -Nur linux-3.14.15/drivers/input/keyboard/gpio_keys.c linux-linaro-stable-m
} else {
if (!button->irq) {
-diff -Nur linux-3.14.15/drivers/input/keyboard/imx_keypad.c linux-linaro-stable-mx6/drivers/input/keyboard/imx_keypad.c
---- linux-3.14.15/drivers/input/keyboard/imx_keypad.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/input/keyboard/imx_keypad.c 2014-08-20 19:31:43.980859786 +0200
+diff -Nur linux-3.14.17/drivers/input/keyboard/imx_keypad.c linux-imx6-3.14/drivers/input/keyboard/imx_keypad.c
+--- linux-3.14.17/drivers/input/keyboard/imx_keypad.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/input/keyboard/imx_keypad.c 2014-09-09 10:13:49.180956845 +0200
@@ -1,6 +1,7 @@
/*
* Driver for the IMX keypad port.
@@ -65203,9 +67541,9 @@ diff -Nur linux-3.14.15/drivers/input/keyboard/imx_keypad.c linux-linaro-stable-
mutex_lock(&input_dev->mutex);
-diff -Nur linux-3.14.15/drivers/input/misc/mma8450.c linux-linaro-stable-mx6/drivers/input/misc/mma8450.c
---- linux-3.14.15/drivers/input/misc/mma8450.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/input/misc/mma8450.c 2014-08-20 19:31:44.000859871 +0200
+diff -Nur linux-3.14.17/drivers/input/misc/mma8450.c linux-imx6-3.14/drivers/input/misc/mma8450.c
+--- linux-3.14.17/drivers/input/misc/mma8450.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/input/misc/mma8450.c 2014-09-09 10:13:49.188956911 +0200
@@ -1,7 +1,7 @@
/*
* Driver for Freescale's 3-Axis Accelerometer MMA8450
@@ -65476,9 +67814,9 @@ diff -Nur linux-3.14.15/drivers/input/misc/mma8450.c linux-linaro-stable-mx6/dri
input_unregister_polled_device(idev);
input_free_polled_device(idev);
kfree(m);
-diff -Nur linux-3.14.15/drivers/input/mouse/synaptics.c linux-linaro-stable-mx6/drivers/input/mouse/synaptics.c
---- linux-3.14.15/drivers/input/mouse/synaptics.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/input/mouse/synaptics.c 2014-08-20 19:31:44.020859956 +0200
+diff -Nur linux-3.14.17/drivers/input/mouse/synaptics.c linux-imx6-3.14/drivers/input/mouse/synaptics.c
+--- linux-3.14.17/drivers/input/mouse/synaptics.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/input/mouse/synaptics.c 2014-09-09 10:13:49.196956975 +0200
@@ -132,8 +132,7 @@
1232, 5710, 1156, 4696
},
@@ -65498,9 +67836,9 @@ diff -Nur linux-3.14.15/drivers/input/mouse/synaptics.c linux-linaro-stable-mx6/
"LEN2003",
"LEN2004", /* L440 */
"LEN2005",
-diff -Nur linux-3.14.15/drivers/input/sparse-keymap.c linux-linaro-stable-mx6/drivers/input/sparse-keymap.c
---- linux-3.14.15/drivers/input/sparse-keymap.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/input/sparse-keymap.c 2014-08-20 19:31:44.024859975 +0200
+diff -Nur linux-3.14.17/drivers/input/sparse-keymap.c linux-imx6-3.14/drivers/input/sparse-keymap.c
+--- linux-3.14.17/drivers/input/sparse-keymap.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/input/sparse-keymap.c 2014-09-09 10:13:49.200957008 +0200
@@ -236,7 +236,7 @@
* in an input device that was set up by sparse_keymap_setup().
* NOTE: It is safe to cal this function while input device is
@@ -65510,9 +67848,9 @@ diff -Nur linux-3.14.15/drivers/input/sparse-keymap.c linux-linaro-stable-mx6/dr
* before freeing the keymap).
*/
void sparse_keymap_free(struct input_dev *dev)
-diff -Nur linux-3.14.15/drivers/Kconfig linux-linaro-stable-mx6/drivers/Kconfig
---- linux-3.14.15/drivers/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/Kconfig 2014-08-20 19:31:42.224852248 +0200
+diff -Nur linux-3.14.17/drivers/Kconfig linux-imx6-3.14/drivers/Kconfig
+--- linux-3.14.17/drivers/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/Kconfig 2014-09-09 10:13:48.632952376 +0200
@@ -96,6 +96,8 @@
source "drivers/memstick/Kconfig"
@@ -65522,9 +67860,9 @@ diff -Nur linux-3.14.15/drivers/Kconfig linux-linaro-stable-mx6/drivers/Kconfig
source "drivers/leds/Kconfig"
source "drivers/accessibility/Kconfig"
-diff -Nur linux-3.14.15/drivers/leds/leds-gpio.c linux-linaro-stable-mx6/drivers/leds/leds-gpio.c
---- linux-3.14.15/drivers/leds/leds-gpio.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/leds/leds-gpio.c 2014-08-20 19:31:44.600862447 +0200
+diff -Nur linux-3.14.17/drivers/leds/leds-gpio.c linux-imx6-3.14/drivers/leds/leds-gpio.c
+--- linux-3.14.17/drivers/leds/leds-gpio.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/leds/leds-gpio.c 2014-09-09 10:13:49.272957595 +0200
@@ -3,7 +3,7 @@
*
* Copyright (C) 2007 8D Technologies inc.
@@ -65543,9 +67881,9 @@ diff -Nur linux-3.14.15/drivers/leds/leds-gpio.c linux-linaro-stable-mx6/drivers
ret = create_gpio_led(&led, &priv->leds[priv->num_leds++],
&pdev->dev, NULL);
-diff -Nur linux-3.14.15/drivers/leds/leds-pwm.c linux-linaro-stable-mx6/drivers/leds/leds-pwm.c
---- linux-3.14.15/drivers/leds/leds-pwm.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/leds/leds-pwm.c 2014-08-20 19:31:44.604862464 +0200
+diff -Nur linux-3.14.17/drivers/leds/leds-pwm.c linux-imx6-3.14/drivers/leds/leds-pwm.c
+--- linux-3.14.17/drivers/leds/leds-pwm.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/leds/leds-pwm.c 2014-09-09 10:13:49.276957628 +0200
@@ -70,6 +70,10 @@
duty *= brightness;
@@ -65731,9 +68069,9 @@ diff -Nur linux-3.14.15/drivers/leds/leds-pwm.c linux-linaro-stable-mx6/drivers/
}
static int led_pwm_remove(struct platform_device *pdev)
-diff -Nur linux-3.14.15/drivers/mailbox/mailbox.c linux-linaro-stable-mx6/drivers/mailbox/mailbox.c
---- linux-3.14.15/drivers/mailbox/mailbox.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mailbox/mailbox.c 2014-08-20 19:31:44.616862515 +0200
+diff -Nur linux-3.14.17/drivers/mailbox/mailbox.c linux-imx6-3.14/drivers/mailbox/mailbox.c
+--- linux-3.14.17/drivers/mailbox/mailbox.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mailbox/mailbox.c 2014-09-09 10:13:49.288957725 +0200
@@ -0,0 +1,488 @@
+/*
+ * Mailbox: Common code for Mailbox controllers and users
@@ -66223,9 +68561,9 @@ diff -Nur linux-3.14.15/drivers/mailbox/mailbox.c linux-linaro-stable-mx6/driver
+ mutex_unlock(&con_mutex);
+}
+EXPORT_SYMBOL_GPL(mbox_controller_unregister);
-diff -Nur linux-3.14.15/drivers/mailbox/Makefile linux-linaro-stable-mx6/drivers/mailbox/Makefile
---- linux-3.14.15/drivers/mailbox/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mailbox/Makefile 2014-08-20 19:31:44.612862497 +0200
+diff -Nur linux-3.14.17/drivers/mailbox/Makefile linux-imx6-3.14/drivers/mailbox/Makefile
+--- linux-3.14.17/drivers/mailbox/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mailbox/Makefile 2014-09-09 10:13:49.288957725 +0200
@@ -1,3 +1,7 @@
+# Generic MAILBOX API
+
@@ -66234,9 +68572,9 @@ diff -Nur linux-3.14.15/drivers/mailbox/Makefile linux-linaro-stable-mx6/drivers
obj-$(CONFIG_PL320_MBOX) += pl320-ipc.o
obj-$(CONFIG_OMAP_MBOX) += omap-mailbox.o
-diff -Nur linux-3.14.15/drivers/mailbox/pl320-ipc.c linux-linaro-stable-mx6/drivers/mailbox/pl320-ipc.c
---- linux-3.14.15/drivers/mailbox/pl320-ipc.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mailbox/pl320-ipc.c 2014-08-20 19:31:44.620862533 +0200
+diff -Nur linux-3.14.17/drivers/mailbox/pl320-ipc.c linux-imx6-3.14/drivers/mailbox/pl320-ipc.c
+--- linux-3.14.17/drivers/mailbox/pl320-ipc.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mailbox/pl320-ipc.c 2014-09-09 10:13:49.288957725 +0200
@@ -26,7 +26,7 @@
#include <linux/device.h>
#include <linux/amba/bus.h>
@@ -66246,9 +68584,9 @@ diff -Nur linux-3.14.15/drivers/mailbox/pl320-ipc.c linux-linaro-stable-mx6/driv
#define IPCMxSOURCE(m) ((m) * 0x40)
#define IPCMxDSET(m) (((m) * 0x40) + 0x004)
-diff -Nur linux-3.14.15/drivers/Makefile linux-linaro-stable-mx6/drivers/Makefile
---- linux-3.14.15/drivers/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/Makefile 2014-08-20 19:31:42.224852248 +0200
+diff -Nur linux-3.14.17/drivers/Makefile linux-imx6-3.14/drivers/Makefile
+--- linux-3.14.17/drivers/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/Makefile 2014-09-09 10:13:48.632952376 +0200
@@ -111,6 +111,7 @@
obj-$(CONFIG_CPU_FREQ) += cpufreq/
obj-$(CONFIG_CPU_IDLE) += cpuidle/
@@ -66257,9 +68595,79 @@ diff -Nur linux-3.14.15/drivers/Makefile linux-linaro-stable-mx6/drivers/Makefil
obj-$(CONFIG_MEMSTICK) += memstick/
obj-y += leds/
obj-$(CONFIG_INFINIBAND) += infiniband/
-diff -Nur linux-3.14.15/drivers/media/dvb-frontends/tda10071.c linux-linaro-stable-mx6/drivers/media/dvb-frontends/tda10071.c
---- linux-3.14.15/drivers/media/dvb-frontends/tda10071.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/media/dvb-frontends/tda10071.c 2014-08-20 19:31:45.104864610 +0200
+diff -Nur linux-3.14.17/drivers/md/dm-bufio.c linux-imx6-3.14/drivers/md/dm-bufio.c
+--- linux-3.14.17/drivers/md/dm-bufio.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/md/dm-bufio.c 2014-09-09 10:13:49.292957759 +0200
+@@ -1541,7 +1541,7 @@
+ BUG_ON(block_size < 1 << SECTOR_SHIFT ||
+ (block_size & (block_size - 1)));
+
+- c = kzalloc(sizeof(*c), GFP_KERNEL);
++ c = kmalloc(sizeof(*c), GFP_KERNEL);
+ if (!c) {
+ r = -ENOMEM;
+ goto bad_client;
+diff -Nur linux-3.14.17/drivers/md/dm-cache-target.c linux-imx6-3.14/drivers/md/dm-cache-target.c
+--- linux-3.14.17/drivers/md/dm-cache-target.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/md/dm-cache-target.c 2014-09-09 10:13:49.296957792 +0200
+@@ -231,7 +231,7 @@
+ /*
+ * cache_size entries, dirty if set
+ */
+- atomic_t nr_dirty;
++ dm_cblock_t nr_dirty;
+ unsigned long *dirty_bitset;
+
+ /*
+@@ -493,7 +493,7 @@
+ static void set_dirty(struct cache *cache, dm_oblock_t oblock, dm_cblock_t cblock)
+ {
+ if (!test_and_set_bit(from_cblock(cblock), cache->dirty_bitset)) {
+- atomic_inc(&cache->nr_dirty);
++ cache->nr_dirty = to_cblock(from_cblock(cache->nr_dirty) + 1);
+ policy_set_dirty(cache->policy, oblock);
+ }
+ }
+@@ -502,7 +502,8 @@
+ {
+ if (test_and_clear_bit(from_cblock(cblock), cache->dirty_bitset)) {
+ policy_clear_dirty(cache->policy, oblock);
+- if (atomic_dec_return(&cache->nr_dirty) == 0)
++ cache->nr_dirty = to_cblock(from_cblock(cache->nr_dirty) - 1);
++ if (!from_cblock(cache->nr_dirty))
+ dm_table_event(cache->ti->table);
+ }
+ }
+@@ -2285,7 +2286,7 @@
+ atomic_set(&cache->quiescing_ack, 0);
+
+ r = -ENOMEM;
+- atomic_set(&cache->nr_dirty, 0);
++ cache->nr_dirty = 0;
+ cache->dirty_bitset = alloc_bitset(from_cblock(cache->cache_size));
+ if (!cache->dirty_bitset) {
+ *error = "could not allocate dirty bitset";
+@@ -2827,7 +2828,7 @@
+
+ residency = policy_residency(cache->policy);
+
+- DMEMIT("%u %llu/%llu %u %llu/%llu %u %u %u %u %u %u %lu ",
++ DMEMIT("%u %llu/%llu %u %llu/%llu %u %u %u %u %u %u %llu ",
+ (unsigned)(DM_CACHE_METADATA_BLOCK_SIZE >> SECTOR_SHIFT),
+ (unsigned long long)(nr_blocks_metadata - nr_free_blocks_metadata),
+ (unsigned long long)nr_blocks_metadata,
+@@ -2840,7 +2841,7 @@
+ (unsigned) atomic_read(&cache->stats.write_miss),
+ (unsigned) atomic_read(&cache->stats.demotion),
+ (unsigned) atomic_read(&cache->stats.promotion),
+- (unsigned long) atomic_read(&cache->nr_dirty));
++ (unsigned long long) from_cblock(cache->nr_dirty));
+
+ if (writethrough_mode(&cache->features))
+ DMEMIT("1 writethrough ");
+diff -Nur linux-3.14.17/drivers/media/dvb-frontends/tda10071.c linux-imx6-3.14/drivers/media/dvb-frontends/tda10071.c
+--- linux-3.14.17/drivers/media/dvb-frontends/tda10071.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/media/dvb-frontends/tda10071.c 2014-09-09 10:13:49.352958249 +0200
@@ -667,7 +667,6 @@
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
int ret, i;
@@ -66291,9 +68699,9 @@ diff -Nur linux-3.14.15/drivers/media/dvb-frontends/tda10071.c linux-linaro-stab
c->fec_inner == TDA10071_MODCOD[i].fec) {
mode = TDA10071_MODCOD[i].val;
dev_dbg(&priv->i2c->dev, "%s: mode found=%02x\n",
-diff -Nur linux-3.14.15/drivers/media/platform/Kconfig linux-linaro-stable-mx6/drivers/media/platform/Kconfig
---- linux-3.14.15/drivers/media/platform/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/media/platform/Kconfig 2014-08-20 19:31:45.424865984 +0200
+diff -Nur linux-3.14.17/drivers/media/platform/Kconfig linux-imx6-3.14/drivers/media/platform/Kconfig
+--- linux-3.14.17/drivers/media/platform/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/media/platform/Kconfig 2014-09-09 10:13:49.424958835 +0200
@@ -115,6 +115,21 @@
To compile this driver as a module, choose M here: the module
will be called s3c-camif.
@@ -66316,9 +68724,9 @@ diff -Nur linux-3.14.15/drivers/media/platform/Kconfig linux-linaro-stable-mx6/d
source "drivers/media/platform/soc_camera/Kconfig"
source "drivers/media/platform/exynos4-is/Kconfig"
source "drivers/media/platform/s5p-tv/Kconfig"
-diff -Nur linux-3.14.15/drivers/media/platform/Makefile linux-linaro-stable-mx6/drivers/media/platform/Makefile
---- linux-3.14.15/drivers/media/platform/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/media/platform/Makefile 2014-08-20 19:31:45.424865984 +0200
+diff -Nur linux-3.14.17/drivers/media/platform/Makefile linux-imx6-3.14/drivers/media/platform/Makefile
+--- linux-3.14.17/drivers/media/platform/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/media/platform/Makefile 2014-09-09 10:13:49.424958835 +0200
@@ -51,4 +51,7 @@
obj-$(CONFIG_ARCH_OMAP) += omap/
@@ -66327,9 +68735,9 @@ diff -Nur linux-3.14.15/drivers/media/platform/Makefile linux-linaro-stable-mx6/
+obj-$(CONFIG_VIDEO_MXC_OUTPUT) += mxc/output/
+
ccflags-y += -I$(srctree)/drivers/media/i2c
-diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/adv7180.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/adv7180.c
---- linux-3.14.15/drivers/media/platform/mxc/capture/adv7180.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/adv7180.c 2014-08-20 19:23:52.814842662 +0200
+diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/adv7180.c linux-imx6-3.14/drivers/media/platform/mxc/capture/adv7180.c
+--- linux-3.14.17/drivers/media/platform/mxc/capture/adv7180.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/adv7180.c 2014-09-09 10:13:49.436958933 +0200
@@ -0,0 +1,1344 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -67675,9 +70083,9 @@ diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/adv7180.c linux-linar
+MODULE_AUTHOR("Freescale Semiconductor");
+MODULE_DESCRIPTION("Anolog Device ADV7180 video decoder driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/csi_v4l2_capture.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/csi_v4l2_capture.c
---- linux-3.14.15/drivers/media/platform/mxc/capture/csi_v4l2_capture.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/csi_v4l2_capture.c 2014-08-20 19:23:52.814842662 +0200
+diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/csi_v4l2_capture.c linux-imx6-3.14/drivers/media/platform/mxc/capture/csi_v4l2_capture.c
+--- linux-3.14.17/drivers/media/platform/mxc/capture/csi_v4l2_capture.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/csi_v4l2_capture.c 2014-09-09 10:13:49.440958965 +0200
@@ -0,0 +1,2047 @@
+/*
+ * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -69726,9 +72134,9 @@ diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/csi_v4l2_capture.c li
+MODULE_DESCRIPTION("V4L2 capture driver for Mx25 based cameras");
+MODULE_LICENSE("GPL");
+MODULE_SUPPORTED_DEVICE("video");
-diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/fsl_csi.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/fsl_csi.c
---- linux-3.14.15/drivers/media/platform/mxc/capture/fsl_csi.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/fsl_csi.c 2014-08-20 19:23:52.814842662 +0200
+diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/fsl_csi.c linux-imx6-3.14/drivers/media/platform/mxc/capture/fsl_csi.c
+--- linux-3.14.17/drivers/media/platform/mxc/capture/fsl_csi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/fsl_csi.c 2014-09-09 10:13:49.440958965 +0200
@@ -0,0 +1,302 @@
+/*
+ * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -70032,9 +72440,9 @@ diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/fsl_csi.c linux-linar
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("fsl CSI driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/fsl_csi.h linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/fsl_csi.h
---- linux-3.14.15/drivers/media/platform/mxc/capture/fsl_csi.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/fsl_csi.h 2014-08-20 19:23:52.814842662 +0200
+diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/fsl_csi.h linux-imx6-3.14/drivers/media/platform/mxc/capture/fsl_csi.h
+--- linux-3.14.17/drivers/media/platform/mxc/capture/fsl_csi.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/fsl_csi.h 2014-09-09 10:13:49.440958965 +0200
@@ -0,0 +1,198 @@
+/*
+ * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -70234,9 +72642,9 @@ diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/fsl_csi.h linux-linar
+void csi_mclk_disable(void);
+void csi_dmareq_rff_enable(void);
+void csi_dmareq_rff_disable(void);
-diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c
---- linux-3.14.15/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c 2014-08-20 19:31:45.440866052 +0200
+diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c
+--- linux-3.14.17/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c 2014-09-09 10:13:49.440958965 +0200
@@ -0,0 +1,546 @@
+
+/*
@@ -70784,9 +73192,9 @@ diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("IPU PRP VF SDC Backgroud Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/ipu_csi_enc.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_csi_enc.c
---- linux-3.14.15/drivers/media/platform/mxc/capture/ipu_csi_enc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_csi_enc.c 2014-08-20 19:31:45.440866052 +0200
+diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/ipu_csi_enc.c linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_csi_enc.c
+--- linux-3.14.17/drivers/media/platform/mxc/capture/ipu_csi_enc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_csi_enc.c 2014-09-09 10:13:49.440958965 +0200
@@ -0,0 +1,418 @@
+/*
+ * Copyright 2009-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -71206,9 +73614,9 @@ diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/ipu_csi_enc.c linux-l
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("CSI ENC Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c
---- linux-3.14.15/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c 2014-08-20 19:31:45.440866052 +0200
+diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c
+--- linux-3.14.17/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c 2014-09-09 10:13:49.440958965 +0200
@@ -0,0 +1,634 @@
+/*
+ * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -71844,9 +74252,9 @@ diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("IPU PRP VF SDC Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/ipu_prp_enc.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_prp_enc.c
---- linux-3.14.15/drivers/media/platform/mxc/capture/ipu_prp_enc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_prp_enc.c 2014-08-20 19:31:45.440866052 +0200
+diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/ipu_prp_enc.c linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_prp_enc.c
+--- linux-3.14.17/drivers/media/platform/mxc/capture/ipu_prp_enc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_prp_enc.c 2014-09-09 10:13:49.440958965 +0200
@@ -0,0 +1,595 @@
+/*
+ * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -72443,9 +74851,9 @@ diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/ipu_prp_enc.c linux-l
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("IPU PRP ENC Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/ipu_prp_sw.h linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_prp_sw.h
---- linux-3.14.15/drivers/media/platform/mxc/capture/ipu_prp_sw.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_prp_sw.h 2014-08-20 19:23:52.818842679 +0200
+diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/ipu_prp_sw.h linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_prp_sw.h
+--- linux-3.14.17/drivers/media/platform/mxc/capture/ipu_prp_sw.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_prp_sw.h 2014-09-09 10:13:49.440958965 +0200
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -72490,9 +74898,9 @@ diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/ipu_prp_sw.h linux-li
+int prp_still_deselect(void *private);
+
+#endif
-diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c
---- linux-3.14.15/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c 2014-08-20 19:31:45.440866052 +0200
+diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c
+--- linux-3.14.17/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c 2014-09-09 10:13:49.440958965 +0200
@@ -0,0 +1,521 @@
+/*
+ * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -73015,9 +75423,9 @@ diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c l
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("IPU PRP VF SDC Backgroud Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c
---- linux-3.14.15/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c 2014-08-20 19:31:45.440866052 +0200
+diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c
+--- linux-3.14.17/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c 2014-09-09 10:13:49.440958965 +0200
@@ -0,0 +1,582 @@
+/*
+ * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -73601,9 +76009,9 @@ diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c linu
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("IPU PRP VF SDC Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/ipu_still.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_still.c
---- linux-3.14.15/drivers/media/platform/mxc/capture/ipu_still.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_still.c 2014-08-20 19:23:52.818842679 +0200
+diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/ipu_still.c linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_still.c
+--- linux-3.14.17/drivers/media/platform/mxc/capture/ipu_still.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_still.c 2014-09-09 10:13:49.440958965 +0200
@@ -0,0 +1,268 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -73873,9 +76281,9 @@ diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/ipu_still.c linux-lin
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("IPU PRP STILL IMAGE Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/Kconfig linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/Kconfig
---- linux-3.14.15/drivers/media/platform/mxc/capture/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/Kconfig 2014-08-20 19:23:52.798842594 +0200
+diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/Kconfig linux-imx6-3.14/drivers/media/platform/mxc/capture/Kconfig
+--- linux-3.14.17/drivers/media/platform/mxc/capture/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/Kconfig 2014-09-09 10:13:49.436958933 +0200
@@ -0,0 +1,86 @@
+if VIDEO_MXC_CAPTURE
+
@@ -73963,9 +76371,9 @@ diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/Kconfig linux-linaro-
+endmenu
+
+endif
-diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/Makefile linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/Makefile
---- linux-3.14.15/drivers/media/platform/mxc/capture/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/Makefile 2014-08-20 19:23:52.798842594 +0200
+diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/Makefile linux-imx6-3.14/drivers/media/platform/mxc/capture/Makefile
+--- linux-3.14.17/drivers/media/platform/mxc/capture/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/Makefile 2014-09-09 10:13:49.436958933 +0200
@@ -0,0 +1,21 @@
+obj-$(CONFIG_VIDEO_MXC_CSI_CAMERA) += fsl_csi.o csi_v4l2_capture.o
+
@@ -73988,9 +76396,9 @@ diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/Makefile linux-linaro
+
+adv7180_tvin-objs := adv7180.o
+obj-$(CONFIG_MXC_TVIN_ADV7180) += adv7180_tvin.o
-diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c
---- linux-3.14.15/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c 2014-08-20 19:31:45.440866052 +0200
+diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c linux-imx6-3.14/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c
+--- linux-3.14.17/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c 2014-09-09 10:13:49.440958965 +0200
@@ -0,0 +1,3102 @@
+/*
+ * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -77094,9 +79502,9 @@ diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c li
+MODULE_DESCRIPTION("V4L2 capture driver for Mxc based cameras");
+MODULE_LICENSE("GPL");
+MODULE_SUPPORTED_DEVICE("video");
-diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h
---- linux-3.14.15/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h 2014-08-20 19:23:52.818842679 +0200
+diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h linux-imx6-3.14/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h
+--- linux-3.14.17/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h 2014-09-09 10:13:49.440958965 +0200
@@ -0,0 +1,260 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -77358,9 +79766,9 @@ diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h li
+
+void set_mclk_rate(uint32_t *p_mclk_freq, uint32_t csi);
+#endif /* __MXC_V4L2_CAPTURE_H__ */
-diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/ov5640.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ov5640.c
---- linux-3.14.15/drivers/media/platform/mxc/capture/ov5640.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ov5640.c 2014-08-20 19:23:52.818842679 +0200
+diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/ov5640.c linux-imx6-3.14/drivers/media/platform/mxc/capture/ov5640.c
+--- linux-3.14.17/drivers/media/platform/mxc/capture/ov5640.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ov5640.c 2014-09-09 10:13:49.440958965 +0200
@@ -0,0 +1,1951 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -79313,9 +81721,9 @@ diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/ov5640.c linux-linaro
+MODULE_LICENSE("GPL");
+MODULE_VERSION("1.0");
+MODULE_ALIAS("CSI");
-diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/ov5640_mipi.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ov5640_mipi.c
---- linux-3.14.15/drivers/media/platform/mxc/capture/ov5640_mipi.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ov5640_mipi.c 2014-08-20 19:23:52.818842679 +0200
+diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/ov5640_mipi.c linux-imx6-3.14/drivers/media/platform/mxc/capture/ov5640_mipi.c
+--- linux-3.14.17/drivers/media/platform/mxc/capture/ov5640_mipi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ov5640_mipi.c 2014-09-09 10:13:49.440958965 +0200
@@ -0,0 +1,2104 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -81421,9 +83829,9 @@ diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/ov5640_mipi.c linux-l
+MODULE_LICENSE("GPL");
+MODULE_VERSION("1.0");
+MODULE_ALIAS("CSI");
-diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/ov5642.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ov5642.c
---- linux-3.14.15/drivers/media/platform/mxc/capture/ov5642.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ov5642.c 2014-08-20 19:23:52.818842679 +0200
+diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/ov5642.c linux-imx6-3.14/drivers/media/platform/mxc/capture/ov5642.c
+--- linux-3.14.17/drivers/media/platform/mxc/capture/ov5642.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ov5642.c 2014-09-09 10:13:49.440958965 +0200
@@ -0,0 +1,4252 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -85677,23 +88085,23 @@ diff -Nur linux-3.14.15/drivers/media/platform/mxc/capture/ov5642.c linux-linaro
+MODULE_LICENSE("GPL");
+MODULE_VERSION("1.0");
+MODULE_ALIAS("CSI");
-diff -Nur linux-3.14.15/drivers/media/platform/mxc/output/Kconfig linux-linaro-stable-mx6/drivers/media/platform/mxc/output/Kconfig
---- linux-3.14.15/drivers/media/platform/mxc/output/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/output/Kconfig 2014-08-20 19:31:45.440866052 +0200
+diff -Nur linux-3.14.17/drivers/media/platform/mxc/output/Kconfig linux-imx6-3.14/drivers/media/platform/mxc/output/Kconfig
+--- linux-3.14.17/drivers/media/platform/mxc/output/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/media/platform/mxc/output/Kconfig 2014-09-09 10:13:49.440958965 +0200
@@ -0,0 +1,5 @@
+config VIDEO_MXC_IPU_OUTPUT
+ tristate "IPU v4l2 output support"
+ depends on VIDEO_MXC_OUTPUT && MXC_IPU
+ ---help---
+ This is the video4linux2 driver for IPU post processing video output.
-diff -Nur linux-3.14.15/drivers/media/platform/mxc/output/Makefile linux-linaro-stable-mx6/drivers/media/platform/mxc/output/Makefile
---- linux-3.14.15/drivers/media/platform/mxc/output/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/output/Makefile 2014-08-20 19:31:45.440866052 +0200
+diff -Nur linux-3.14.17/drivers/media/platform/mxc/output/Makefile linux-imx6-3.14/drivers/media/platform/mxc/output/Makefile
+--- linux-3.14.17/drivers/media/platform/mxc/output/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/media/platform/mxc/output/Makefile 2014-09-09 10:13:49.440958965 +0200
@@ -0,0 +1 @@
+obj-$(CONFIG_VIDEO_MXC_IPU_OUTPUT) += mxc_vout.o
-diff -Nur linux-3.14.15/drivers/media/platform/mxc/output/mxc_vout.c linux-linaro-stable-mx6/drivers/media/platform/mxc/output/mxc_vout.c
---- linux-3.14.15/drivers/media/platform/mxc/output/mxc_vout.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/output/mxc_vout.c 2014-08-20 19:23:52.818842679 +0200
+diff -Nur linux-3.14.17/drivers/media/platform/mxc/output/mxc_vout.c linux-imx6-3.14/drivers/media/platform/mxc/output/mxc_vout.c
+--- linux-3.14.17/drivers/media/platform/mxc/output/mxc_vout.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/media/platform/mxc/output/mxc_vout.c 2014-09-09 10:13:49.440958965 +0200
@@ -0,0 +1,2265 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -87960,9 +90368,9 @@ diff -Nur linux-3.14.15/drivers/media/platform/mxc/output/mxc_vout.c linux-linar
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("V4L2-driver for MXC video output");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/drivers/media/usb/hdpvr/hdpvr-video.c linux-linaro-stable-mx6/drivers/media/usb/hdpvr/hdpvr-video.c
---- linux-3.14.15/drivers/media/usb/hdpvr/hdpvr-video.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/media/usb/hdpvr/hdpvr-video.c 2014-08-20 19:31:45.624866842 +0200
+diff -Nur linux-3.14.17/drivers/media/usb/hdpvr/hdpvr-video.c linux-imx6-3.14/drivers/media/usb/hdpvr/hdpvr-video.c
+--- linux-3.14.17/drivers/media/usb/hdpvr/hdpvr-video.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/media/usb/hdpvr/hdpvr-video.c 2014-09-09 10:13:49.532959715 +0200
@@ -82,7 +82,7 @@
}
@@ -87990,9 +90398,9 @@ diff -Nur linux-3.14.15/drivers/media/usb/hdpvr/hdpvr-video.c linux-linaro-stabl
v4l2_ctrl_new_std_menu(hdl, &hdpvr_ctrl_ops,
V4L2_CID_MPEG_VIDEO_ENCODING,
V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC, 0x3,
-diff -Nur linux-3.14.15/drivers/media/v4l2-core/v4l2-dv-timings.c linux-linaro-stable-mx6/drivers/media/v4l2-core/v4l2-dv-timings.c
---- linux-3.14.15/drivers/media/v4l2-core/v4l2-dv-timings.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/media/v4l2-core/v4l2-dv-timings.c 2014-08-20 19:31:45.708867204 +0200
+diff -Nur linux-3.14.17/drivers/media/v4l2-core/v4l2-dv-timings.c linux-imx6-3.14/drivers/media/v4l2-core/v4l2-dv-timings.c
+--- linux-3.14.17/drivers/media/v4l2-core/v4l2-dv-timings.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/media/v4l2-core/v4l2-dv-timings.c 2014-09-09 10:13:49.552959878 +0200
@@ -595,10 +595,10 @@
aspect.denominator = 9;
} else if (ratio == 34) {
@@ -88006,9 +90414,9 @@ diff -Nur linux-3.14.15/drivers/media/v4l2-core/v4l2-dv-timings.c linux-linaro-s
} else {
aspect.numerator = hor_landscape + 99;
aspect.denominator = 100;
-diff -Nur linux-3.14.15/drivers/media/v4l2-core/videobuf2-dma-contig.c linux-linaro-stable-mx6/drivers/media/v4l2-core/videobuf2-dma-contig.c
---- linux-3.14.15/drivers/media/v4l2-core/videobuf2-dma-contig.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/media/v4l2-core/videobuf2-dma-contig.c 2014-08-20 19:31:45.708867204 +0200
+diff -Nur linux-3.14.17/drivers/media/v4l2-core/videobuf2-dma-contig.c linux-imx6-3.14/drivers/media/v4l2-core/videobuf2-dma-contig.c
+--- linux-3.14.17/drivers/media/v4l2-core/videobuf2-dma-contig.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/media/v4l2-core/videobuf2-dma-contig.c 2014-09-09 10:13:49.552959878 +0200
@@ -719,7 +719,7 @@
/* get the associated scatterlist for this buffer */
@@ -88018,9 +90426,9 @@ diff -Nur linux-3.14.15/drivers/media/v4l2-core/videobuf2-dma-contig.c linux-lin
pr_err("Error getting dmabuf scatterlist\n");
return -EINVAL;
}
-diff -Nur linux-3.14.15/drivers/media/v4l2-core/videobuf-dma-contig.c linux-linaro-stable-mx6/drivers/media/v4l2-core/videobuf-dma-contig.c
---- linux-3.14.15/drivers/media/v4l2-core/videobuf-dma-contig.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/media/v4l2-core/videobuf-dma-contig.c 2014-08-20 19:31:45.708867204 +0200
+diff -Nur linux-3.14.17/drivers/media/v4l2-core/videobuf-dma-contig.c linux-imx6-3.14/drivers/media/v4l2-core/videobuf-dma-contig.c
+--- linux-3.14.17/drivers/media/v4l2-core/videobuf-dma-contig.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/media/v4l2-core/videobuf-dma-contig.c 2014-09-09 10:13:49.552959878 +0200
@@ -304,7 +304,7 @@
/* Try to remap memory */
@@ -88030,9 +90438,9 @@ diff -Nur linux-3.14.15/drivers/media/v4l2-core/videobuf-dma-contig.c linux-lina
retval = vm_iomap_memory(vma, vma->vm_start, size);
if (retval) {
dev_err(q->dev, "mmap: remap failed with error %d. ",
-diff -Nur linux-3.14.15/drivers/mfd/ab8500-core.c linux-linaro-stable-mx6/drivers/mfd/ab8500-core.c
---- linux-3.14.15/drivers/mfd/ab8500-core.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mfd/ab8500-core.c 2014-08-20 19:31:45.720867254 +0200
+diff -Nur linux-3.14.17/drivers/mfd/ab8500-core.c linux-imx6-3.14/drivers/mfd/ab8500-core.c
+--- linux-3.14.17/drivers/mfd/ab8500-core.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mfd/ab8500-core.c 2014-09-09 10:13:49.568960009 +0200
@@ -592,7 +592,7 @@
/* If ->irq_base is zero this will give a linear mapping */
@@ -88118,9 +90526,9 @@ diff -Nur linux-3.14.15/drivers/mfd/ab8500-core.c linux-linaro-stable-mx6/driver
if (ret)
dev_err(ab8500->dev, "error adding bm devices\n");
}
-diff -Nur linux-3.14.15/drivers/mfd/db8500-prcmu.c linux-linaro-stable-mx6/drivers/mfd/db8500-prcmu.c
---- linux-3.14.15/drivers/mfd/db8500-prcmu.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mfd/db8500-prcmu.c 2014-08-20 19:31:45.728867289 +0200
+diff -Nur linux-3.14.17/drivers/mfd/db8500-prcmu.c linux-imx6-3.14/drivers/mfd/db8500-prcmu.c
+--- linux-3.14.17/drivers/mfd/db8500-prcmu.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mfd/db8500-prcmu.c 2014-09-09 10:13:49.572960042 +0200
@@ -25,6 +25,7 @@
#include <linux/bitops.h>
#include <linux/fs.h>
@@ -88202,9 +90610,9 @@ diff -Nur linux-3.14.15/drivers/mfd/db8500-prcmu.c linux-linaro-stable-mx6/drive
if (err) {
mfd_remove_devices(&pdev->dev);
pr_err("prcmu: Failed to add ab8500 subdevice\n");
-diff -Nur linux-3.14.15/drivers/mfd/Kconfig linux-linaro-stable-mx6/drivers/mfd/Kconfig
---- linux-3.14.15/drivers/mfd/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mfd/Kconfig 2014-08-20 19:31:45.720867254 +0200
+diff -Nur linux-3.14.17/drivers/mfd/Kconfig linux-imx6-3.14/drivers/mfd/Kconfig
+--- linux-3.14.17/drivers/mfd/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mfd/Kconfig 2014-09-09 10:13:49.568960009 +0200
@@ -163,6 +163,14 @@
Additional drivers must be enabled in order to use the functionality
of the device.
@@ -88225,18 +90633,18 @@ diff -Nur linux-3.14.15/drivers/mfd/Kconfig linux-linaro-stable-mx6/drivers/mfd/
Platform configuration infrastructure for the ARM Ltd.
Versatile Express.
+
-diff -Nur linux-3.14.15/drivers/mfd/Makefile linux-linaro-stable-mx6/drivers/mfd/Makefile
---- linux-3.14.15/drivers/mfd/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mfd/Makefile 2014-08-20 19:31:45.720867254 +0200
+diff -Nur linux-3.14.17/drivers/mfd/Makefile linux-imx6-3.14/drivers/mfd/Makefile
+--- linux-3.14.17/drivers/mfd/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mfd/Makefile 2014-09-09 10:13:49.568960009 +0200
@@ -166,3 +166,4 @@
obj-$(CONFIG_MFD_AS3711) += as3711.o
obj-$(CONFIG_MFD_AS3722) += as3722.o
obj-$(CONFIG_MFD_STW481X) += stw481x.o
+obj-$(CONFIG_MFD_MXC_HDMI) += mxc-hdmi-core.o
-diff -Nur linux-3.14.15/drivers/mfd/mxc-hdmi-core.c linux-linaro-stable-mx6/drivers/mfd/mxc-hdmi-core.c
---- linux-3.14.15/drivers/mfd/mxc-hdmi-core.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mfd/mxc-hdmi-core.c 2014-08-20 19:31:45.760867426 +0200
-@@ -0,0 +1,784 @@
+diff -Nur linux-3.14.17/drivers/mfd/mxc-hdmi-core.c linux-imx6-3.14/drivers/mfd/mxc-hdmi-core.c
+--- linux-3.14.17/drivers/mfd/mxc-hdmi-core.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mfd/mxc-hdmi-core.c 2014-09-09 10:13:49.576960075 +0200
+@@ -0,0 +1,798 @@
+/*
+ * Copyright (C) 2011-2014 Freescale Semiconductor, Inc.
+ *
@@ -88278,7 +90686,6 @@ diff -Nur linux-3.14.15/drivers/mfd/mxc-hdmi-core.c linux-linaro-stable-mx6/driv
+#include <linux/mfd/mxc-hdmi-core.h>
+#include <linux/of_device.h>
+#include <linux/mod_devicetable.h>
-+#include <linux/mfd/mxc-hdmi-core.h>
+
+struct mxc_hdmi_data {
+ struct platform_device *pdev;
@@ -88298,6 +90705,7 @@ diff -Nur linux-3.14.15/drivers/mfd/mxc-hdmi-core.c linux-linaro-stable-mx6/driv
+static int hdmi_ratio;
+int mxc_hdmi_ipu_id;
+int mxc_hdmi_disp_id;
++static int hdmi_core_edid_status;
+static struct mxc_edid_cfg hdmi_core_edid_cfg;
+static int hdmi_core_init;
+static unsigned int hdmi_dma_running;
@@ -88307,6 +90715,17 @@ diff -Nur linux-3.14.15/drivers/mfd/mxc-hdmi-core.c linux-linaro-stable-mx6/driv
+static unsigned int hdmi_abort_state;
+static spinlock_t hdmi_audio_lock, hdmi_blank_state_lock, hdmi_cable_state_lock;
+
++void hdmi_set_dvi_mode(unsigned int state)
++{
++ if (state) {
++ mxc_hdmi_abort_stream();
++ hdmi_cec_stop_device();
++ } else {
++ hdmi_cec_start_device();
++ }
++}
++EXPORT_SYMBOL(hdmi_set_dvi_mode);
++
+unsigned int hdmi_set_cable_state(unsigned int state)
+{
+ unsigned long flags;
@@ -88813,23 +91232,26 @@ diff -Nur linux-3.14.15/drivers/mfd/mxc-hdmi-core.c linux-linaro-stable-mx6/driv
+}
+EXPORT_SYMBOL(hdmi_set_sample_rate);
+
-+void hdmi_set_edid_cfg(struct mxc_edid_cfg *cfg)
++void hdmi_set_edid_cfg(int edid_status, struct mxc_edid_cfg *cfg)
+{
+ unsigned long flags;
+
+ spin_lock_irqsave(&edid_spinlock, flags);
++ hdmi_core_edid_status = edid_status;
+ memcpy(&hdmi_core_edid_cfg, cfg, sizeof(struct mxc_edid_cfg));
+ spin_unlock_irqrestore(&edid_spinlock, flags);
+}
+EXPORT_SYMBOL(hdmi_set_edid_cfg);
+
-+void hdmi_get_edid_cfg(struct mxc_edid_cfg *cfg)
++int hdmi_get_edid_cfg(struct mxc_edid_cfg *cfg)
+{
+ unsigned long flags;
+
+ spin_lock_irqsave(&edid_spinlock, flags);
+ memcpy(cfg, &hdmi_core_edid_cfg, sizeof(struct mxc_edid_cfg));
+ spin_unlock_irqrestore(&edid_spinlock, flags);
++
++ return hdmi_core_edid_status;
+}
+EXPORT_SYMBOL(hdmi_get_edid_cfg);
+
@@ -89021,9 +91443,9 @@ diff -Nur linux-3.14.15/drivers/mfd/mxc-hdmi-core.c linux-linaro-stable-mx6/driv
+MODULE_DESCRIPTION("Core driver for Freescale i.Mx on-chip HDMI");
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/drivers/mfd/si476x-cmd.c linux-linaro-stable-mx6/drivers/mfd/si476x-cmd.c
---- linux-3.14.15/drivers/mfd/si476x-cmd.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mfd/si476x-cmd.c 2014-08-20 19:23:53.302844746 +0200
+diff -Nur linux-3.14.17/drivers/mfd/si476x-cmd.c linux-imx6-3.14/drivers/mfd/si476x-cmd.c
+--- linux-3.14.17/drivers/mfd/si476x-cmd.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mfd/si476x-cmd.c 2014-09-09 10:13:49.580960108 +0200
@@ -303,13 +303,13 @@
* possible racing conditions when working in polling mode */
atomic_set(&core->cts, 0);
@@ -89045,9 +91467,9 @@ diff -Nur linux-3.14.15/drivers/mfd/si476x-cmd.c linux-linaro-stable-mx6/drivers
/*
When working in polling mode, for some reason the tuner will
-diff -Nur linux-3.14.15/drivers/mfd/si476x-i2c.c linux-linaro-stable-mx6/drivers/mfd/si476x-i2c.c
---- linux-3.14.15/drivers/mfd/si476x-i2c.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mfd/si476x-i2c.c 2014-08-20 19:31:45.776867496 +0200
+diff -Nur linux-3.14.17/drivers/mfd/si476x-i2c.c linux-imx6-3.14/drivers/mfd/si476x-i2c.c
+--- linux-3.14.17/drivers/mfd/si476x-i2c.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mfd/si476x-i2c.c 2014-09-09 10:13:49.580960108 +0200
@@ -303,7 +303,7 @@
*/
udelay(100);
@@ -89095,9 +91517,9 @@ diff -Nur linux-3.14.15/drivers/mfd/si476x-i2c.c linux-linaro-stable-mx6/drivers
rval = si476x_core_get_revision_info(core);
if (rval < 0) {
rval = -ENODEV;
-diff -Nur linux-3.14.15/drivers/mfd/si476x-prop.c linux-linaro-stable-mx6/drivers/mfd/si476x-prop.c
---- linux-3.14.15/drivers/mfd/si476x-prop.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mfd/si476x-prop.c 2014-08-20 19:23:53.302844746 +0200
+diff -Nur linux-3.14.17/drivers/mfd/si476x-prop.c linux-imx6-3.14/drivers/mfd/si476x-prop.c
+--- linux-3.14.17/drivers/mfd/si476x-prop.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mfd/si476x-prop.c 2014-09-09 10:13:49.580960108 +0200
@@ -217,15 +217,36 @@
return 0;
}
@@ -89135,9 +91557,9 @@ diff -Nur linux-3.14.15/drivers/mfd/si476x-prop.c linux-linaro-stable-mx6/driver
.reg_read = si476x_core_regmap_read,
.reg_write = si476x_core_regmap_write,
-diff -Nur linux-3.14.15/drivers/misc/sram.c linux-linaro-stable-mx6/drivers/misc/sram.c
---- linux-3.14.15/drivers/misc/sram.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/misc/sram.c 2014-08-20 19:31:45.936868182 +0200
+diff -Nur linux-3.14.17/drivers/misc/sram.c linux-imx6-3.14/drivers/misc/sram.c
+--- linux-3.14.17/drivers/misc/sram.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/misc/sram.c 2014-09-09 10:13:49.640960596 +0200
@@ -29,7 +29,7 @@
#include <linux/spinlock.h>
#include <linux/genalloc.h>
@@ -89147,9 +91569,9 @@ diff -Nur linux-3.14.15/drivers/misc/sram.c linux-linaro-stable-mx6/drivers/misc
struct sram_dev {
struct gen_pool *pool;
-diff -Nur linux-3.14.15/drivers/mmc/core/core.c linux-linaro-stable-mx6/drivers/mmc/core/core.c
---- linux-3.14.15/drivers/mmc/core/core.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/core/core.c 2014-08-20 19:31:45.948868233 +0200
+diff -Nur linux-3.14.17/drivers/mmc/core/core.c linux-imx6-3.14/drivers/mmc/core/core.c
+--- linux-3.14.17/drivers/mmc/core/core.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mmc/core/core.c 2014-09-09 10:13:49.648960662 +0200
@@ -13,11 +13,13 @@
#include <linux/module.h>
#include <linux/init.h>
@@ -89218,9 +91640,9 @@ diff -Nur linux-3.14.15/drivers/mmc/core/core.c linux-linaro-stable-mx6/drivers/
mmc_host_clk_hold(host);
host->ios.vdd = fls(ocr) - 1;
-diff -Nur linux-3.14.15/drivers/mmc/core/host.c linux-linaro-stable-mx6/drivers/mmc/core/host.c
---- linux-3.14.15/drivers/mmc/core/host.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/core/host.c 2014-08-20 19:31:45.948868233 +0200
+diff -Nur linux-3.14.17/drivers/mmc/core/host.c linux-imx6-3.14/drivers/mmc/core/host.c
+--- linux-3.14.17/drivers/mmc/core/host.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mmc/core/host.c 2014-09-09 10:13:49.648960662 +0200
@@ -12,14 +12,18 @@
* MMC host class device management
*/
@@ -89318,9 +91740,9 @@ diff -Nur linux-3.14.15/drivers/mmc/core/host.c linux-linaro-stable-mx6/drivers/
WARN_ON((host->caps & MMC_CAP_SDIO_IRQ) &&
!host->ops->enable_sdio_irq);
-diff -Nur linux-3.14.15/drivers/mmc/core/mmc.c linux-linaro-stable-mx6/drivers/mmc/core/mmc.c
---- linux-3.14.15/drivers/mmc/core/mmc.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/core/mmc.c 2014-08-20 19:31:45.948868233 +0200
+diff -Nur linux-3.14.17/drivers/mmc/core/mmc.c linux-imx6-3.14/drivers/mmc/core/mmc.c
+--- linux-3.14.17/drivers/mmc/core/mmc.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mmc/core/mmc.c 2014-09-09 10:13:49.648960662 +0200
@@ -317,6 +317,11 @@
mmc_card_set_blockaddr(card);
}
@@ -89726,9 +92148,9 @@ diff -Nur linux-3.14.15/drivers/mmc/core/mmc.c linux-linaro-stable-mx6/drivers/m
NULL,
};
-diff -Nur linux-3.14.15/drivers/mmc/core/sdio_irq.c linux-linaro-stable-mx6/drivers/mmc/core/sdio_irq.c
---- linux-3.14.15/drivers/mmc/core/sdio_irq.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/core/sdio_irq.c 2014-08-20 19:31:45.948868233 +0200
+diff -Nur linux-3.14.17/drivers/mmc/core/sdio_irq.c linux-imx6-3.14/drivers/mmc/core/sdio_irq.c
+--- linux-3.14.17/drivers/mmc/core/sdio_irq.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mmc/core/sdio_irq.c 2014-09-09 10:13:49.648960662 +0200
@@ -90,6 +90,15 @@
return ret;
}
@@ -89791,9 +92213,9 @@ diff -Nur linux-3.14.15/drivers/mmc/core/sdio_irq.c linux-linaro-stable-mx6/driv
}
return 0;
-diff -Nur linux-3.14.15/drivers/mmc/host/dw_mmc.c linux-linaro-stable-mx6/drivers/mmc/host/dw_mmc.c
---- linux-3.14.15/drivers/mmc/host/dw_mmc.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/dw_mmc.c 2014-08-20 19:31:45.956868267 +0200
+diff -Nur linux-3.14.17/drivers/mmc/host/dw_mmc.c linux-imx6-3.14/drivers/mmc/host/dw_mmc.c
+--- linux-3.14.17/drivers/mmc/host/dw_mmc.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mmc/host/dw_mmc.c 2014-09-09 10:13:49.652960695 +0200
@@ -2140,6 +2140,8 @@
if (!mmc)
return -ENOMEM;
@@ -89803,9 +92225,9 @@ diff -Nur linux-3.14.15/drivers/mmc/host/dw_mmc.c linux-linaro-stable-mx6/driver
slot = mmc_priv(mmc);
slot->id = id;
slot->mmc = mmc;
-diff -Nur linux-3.14.15/drivers/mmc/host/Kconfig linux-linaro-stable-mx6/drivers/mmc/host/Kconfig
---- linux-3.14.15/drivers/mmc/host/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/Kconfig 2014-08-20 19:31:45.948868233 +0200
+diff -Nur linux-3.14.17/drivers/mmc/host/Kconfig linux-imx6-3.14/drivers/mmc/host/Kconfig
+--- linux-3.14.17/drivers/mmc/host/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mmc/host/Kconfig 2014-09-09 10:13:49.648960662 +0200
@@ -25,8 +25,7 @@
If unsure, say N.
@@ -90001,9 +92423,9 @@ diff -Nur linux-3.14.15/drivers/mmc/host/Kconfig linux-linaro-stable-mx6/drivers
help
This selects the BCM2835 SD/MMC controller. If you have a BCM2835
platform with SD or MMC devices, say Y or M here.
-diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-acpi.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-acpi.c
---- linux-3.14.15/drivers/mmc/host/sdhci-acpi.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-acpi.c 2014-08-20 19:31:45.976868352 +0200
+diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-acpi.c linux-imx6-3.14/drivers/mmc/host/sdhci-acpi.c
+--- linux-3.14.17/drivers/mmc/host/sdhci-acpi.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-acpi.c 2014-09-09 10:13:49.656960727 +0200
@@ -101,11 +101,19 @@
}
@@ -90024,9 +92446,9 @@ diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-acpi.c linux-linaro-stable-mx6/dr
.hw_reset = sdhci_acpi_int_hw_reset,
};
-diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-bcm2835.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-bcm2835.c
---- linux-3.14.15/drivers/mmc/host/sdhci-bcm2835.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-bcm2835.c 2014-08-20 19:31:45.976868352 +0200
+diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-bcm2835.c linux-imx6-3.14/drivers/mmc/host/sdhci-bcm2835.c
+--- linux-3.14.17/drivers/mmc/host/sdhci-bcm2835.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-bcm2835.c 2014-09-09 10:13:49.656960727 +0200
@@ -131,8 +131,12 @@
.read_l = bcm2835_sdhci_readl,
.read_w = bcm2835_sdhci_readw,
@@ -90040,9 +92462,9 @@ diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-bcm2835.c linux-linaro-stable-mx6
};
static const struct sdhci_pltfm_data bcm2835_sdhci_pdata = {
-diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-bcm-kona.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-bcm-kona.c
---- linux-3.14.15/drivers/mmc/host/sdhci-bcm-kona.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-bcm-kona.c 2014-08-20 19:31:45.976868352 +0200
+diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-bcm-kona.c linux-imx6-3.14/drivers/mmc/host/sdhci-bcm-kona.c
+--- linux-3.14.17/drivers/mmc/host/sdhci-bcm-kona.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-bcm-kona.c 2014-09-09 10:13:49.656960727 +0200
@@ -205,9 +205,13 @@
}
@@ -90057,9 +92479,9 @@ diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-bcm-kona.c linux-linaro-stable-mx
.card_event = sdhci_bcm_kona_card_event,
};
-diff -Nur linux-3.14.15/drivers/mmc/host/sdhci.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci.c
---- linux-3.14.15/drivers/mmc/host/sdhci.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci.c 2014-08-20 19:31:45.996868438 +0200
+diff -Nur linux-3.14.17/drivers/mmc/host/sdhci.c linux-imx6-3.14/drivers/mmc/host/sdhci.c
+--- linux-3.14.17/drivers/mmc/host/sdhci.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mmc/host/sdhci.c 2014-09-09 10:13:49.660960759 +0200
@@ -44,6 +44,8 @@
#define MAX_TUNING_LOOP 40
@@ -91313,9 +93735,9 @@ diff -Nur linux-3.14.15/drivers/mmc/host/sdhci.c linux-linaro-stable-mx6/drivers
kfree(host->align_buffer);
host->adma_desc = NULL;
-diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-cns3xxx.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-cns3xxx.c
---- linux-3.14.15/drivers/mmc/host/sdhci-cns3xxx.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-cns3xxx.c 2014-08-20 19:31:45.980868370 +0200
+diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-cns3xxx.c linux-imx6-3.14/drivers/mmc/host/sdhci-cns3xxx.c
+--- linux-3.14.17/drivers/mmc/host/sdhci-cns3xxx.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-cns3xxx.c 2014-09-09 10:13:49.656960727 +0200
@@ -30,13 +30,12 @@
u16 clk;
unsigned long timeout;
@@ -91359,9 +93781,9 @@ diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-cns3xxx.c linux-linaro-stable-mx6
};
static int sdhci_cns3xxx_probe(struct platform_device *pdev)
-diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-dove.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-dove.c
---- linux-3.14.15/drivers/mmc/host/sdhci-dove.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-dove.c 2014-08-20 19:31:45.980868370 +0200
+diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-dove.c linux-imx6-3.14/drivers/mmc/host/sdhci-dove.c
+--- linux-3.14.17/drivers/mmc/host/sdhci-dove.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-dove.c 2014-09-09 10:13:49.656960727 +0200
@@ -86,6 +86,10 @@
static const struct sdhci_ops sdhci_dove_ops = {
.read_w = sdhci_dove_readw,
@@ -91373,9 +93795,9 @@ diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-dove.c linux-linaro-stable-mx6/dr
};
static const struct sdhci_pltfm_data sdhci_dove_pdata = {
-diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-esdhc.h linux-linaro-stable-mx6/drivers/mmc/host/sdhci-esdhc.h
---- linux-3.14.15/drivers/mmc/host/sdhci-esdhc.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-esdhc.h 2014-08-20 19:31:45.980868370 +0200
+diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-esdhc.h linux-imx6-3.14/drivers/mmc/host/sdhci-esdhc.h
+--- linux-3.14.17/drivers/mmc/host/sdhci-esdhc.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-esdhc.h 2014-09-09 10:13:49.656960727 +0200
@@ -20,12 +20,11 @@
#define ESDHC_DEFAULT_QUIRKS (SDHCI_QUIRK_FORCE_BLK_SZ_2048 | \
@@ -91391,9 +93813,9 @@ diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-esdhc.h linux-linaro-stable-mx6/d
#define ESDHC_CLOCK_MASK 0x0000fff0
#define ESDHC_PREDIV_SHIFT 8
#define ESDHC_DIVIDER_SHIFT 4
-diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-esdhc-imx.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-esdhc-imx.c
---- linux-3.14.15/drivers/mmc/host/sdhci-esdhc-imx.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-esdhc-imx.c 2014-08-20 19:31:45.980868370 +0200
+diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-esdhc-imx.c linux-imx6-3.14/drivers/mmc/host/sdhci-esdhc-imx.c
+--- linux-3.14.17/drivers/mmc/host/sdhci-esdhc-imx.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-esdhc-imx.c 2014-09-09 10:13:49.656960727 +0200
@@ -11,6 +11,7 @@
* the Free Software Foundation; either version 2 of the License.
*/
@@ -91807,9 +94229,9 @@ diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-esdhc-imx.c linux-linaro-stable-m
clk_prepare_enable(imx_data->clk_ahb);
return sdhci_runtime_resume_host(host);
-diff -Nur linux-3.14.15/drivers/mmc/host/sdhci.h linux-linaro-stable-mx6/drivers/mmc/host/sdhci.h
---- linux-3.14.15/drivers/mmc/host/sdhci.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci.h 2014-08-20 19:31:45.996868438 +0200
+diff -Nur linux-3.14.17/drivers/mmc/host/sdhci.h linux-imx6-3.14/drivers/mmc/host/sdhci.h
+--- linux-3.14.17/drivers/mmc/host/sdhci.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mmc/host/sdhci.h 2014-09-09 10:13:49.660960759 +0200
@@ -281,18 +281,15 @@
unsigned int (*get_max_clock)(struct sdhci_host *host);
unsigned int (*get_min_clock)(struct sdhci_host *host);
@@ -91850,9 +94272,9 @@ diff -Nur linux-3.14.15/drivers/mmc/host/sdhci.h linux-linaro-stable-mx6/drivers
#ifdef CONFIG_PM
extern int sdhci_suspend_host(struct sdhci_host *host);
extern int sdhci_resume_host(struct sdhci_host *host);
-diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-of-arasan.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-of-arasan.c
---- linux-3.14.15/drivers/mmc/host/sdhci-of-arasan.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-of-arasan.c 2014-08-20 19:31:45.984868388 +0200
+diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-of-arasan.c linux-imx6-3.14/drivers/mmc/host/sdhci-of-arasan.c
+--- linux-3.14.17/drivers/mmc/host/sdhci-of-arasan.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-of-arasan.c 2014-09-09 10:13:49.656960727 +0200
@@ -52,8 +52,12 @@
}
@@ -91866,9 +94288,9 @@ diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-of-arasan.c linux-linaro-stable-m
};
static struct sdhci_pltfm_data sdhci_arasan_pdata = {
-diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-of-esdhc.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-of-esdhc.c
---- linux-3.14.15/drivers/mmc/host/sdhci-of-esdhc.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-of-esdhc.c 2014-08-20 19:31:45.984868388 +0200
+diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-of-esdhc.c linux-imx6-3.14/drivers/mmc/host/sdhci-of-esdhc.c
+--- linux-3.14.17/drivers/mmc/host/sdhci-of-esdhc.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-of-esdhc.c 2014-09-09 10:13:49.656960727 +0200
@@ -199,13 +199,14 @@
static void esdhc_of_set_clock(struct sdhci_host *host, unsigned int clock)
@@ -91990,9 +94412,9 @@ diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-of-esdhc.c linux-linaro-stable-mx
},
.probe = sdhci_esdhc_probe,
.remove = sdhci_esdhc_remove,
-diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-of-hlwd.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-of-hlwd.c
---- linux-3.14.15/drivers/mmc/host/sdhci-of-hlwd.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-of-hlwd.c 2014-08-20 19:31:45.984868388 +0200
+diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-of-hlwd.c linux-imx6-3.14/drivers/mmc/host/sdhci-of-hlwd.c
+--- linux-3.14.17/drivers/mmc/host/sdhci-of-hlwd.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-of-hlwd.c 2014-09-09 10:13:49.656960727 +0200
@@ -58,6 +58,10 @@
.write_l = sdhci_hlwd_writel,
.write_w = sdhci_hlwd_writew,
@@ -92004,9 +94426,9 @@ diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-of-hlwd.c linux-linaro-stable-mx6
};
static const struct sdhci_pltfm_data sdhci_hlwd_pdata = {
-diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-pci.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pci.c
---- linux-3.14.15/drivers/mmc/host/sdhci-pci.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pci.c 2014-08-20 19:31:45.988868406 +0200
+diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-pci.c linux-imx6-3.14/drivers/mmc/host/sdhci-pci.c
+--- linux-3.14.17/drivers/mmc/host/sdhci-pci.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-pci.c 2014-09-09 10:13:49.656960727 +0200
@@ -1011,7 +1011,7 @@
return 0;
}
@@ -92038,9 +94460,9 @@ diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-pci.c linux-linaro-stable-mx6/dri
.hw_reset = sdhci_pci_hw_reset,
};
-diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-pltfm.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pltfm.c
---- linux-3.14.15/drivers/mmc/host/sdhci-pltfm.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pltfm.c 2014-08-20 19:31:45.988868406 +0200
+diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-pltfm.c linux-imx6-3.14/drivers/mmc/host/sdhci-pltfm.c
+--- linux-3.14.17/drivers/mmc/host/sdhci-pltfm.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-pltfm.c 2014-09-09 10:13:49.656960727 +0200
@@ -45,6 +45,10 @@
EXPORT_SYMBOL_GPL(sdhci_pltfm_clk_get_max_clock);
@@ -92052,9 +94474,9 @@ diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-pltfm.c linux-linaro-stable-mx6/d
};
#ifdef CONFIG_OF
-diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-pxav2.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pxav2.c
---- linux-3.14.15/drivers/mmc/host/sdhci-pxav2.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pxav2.c 2014-08-20 19:31:45.992868421 +0200
+diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-pxav2.c linux-imx6-3.14/drivers/mmc/host/sdhci-pxav2.c
+--- linux-3.14.17/drivers/mmc/host/sdhci-pxav2.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-pxav2.c 2014-09-09 10:13:49.656960727 +0200
@@ -51,11 +51,13 @@
#define MMC_CARD 0x1000
#define MMC_WIDTH 0x0100
@@ -92098,9 +94520,9 @@ diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-pxav2.c linux-linaro-stable-mx6/d
};
#ifdef CONFIG_OF
-diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-pxav3.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pxav3.c
---- linux-3.14.15/drivers/mmc/host/sdhci-pxav3.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pxav3.c 2014-08-20 19:31:45.992868421 +0200
+diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-pxav3.c linux-imx6-3.14/drivers/mmc/host/sdhci-pxav3.c
+--- linux-3.14.17/drivers/mmc/host/sdhci-pxav3.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-pxav3.c 2014-09-09 10:13:49.656960727 +0200
@@ -57,11 +57,13 @@
#define SDCE_MISC_INT (1<<2)
#define SDCE_MISC_INT_EN (1<<1)
@@ -92145,9 +94567,9 @@ diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-pxav3.c linux-linaro-stable-mx6/d
};
static struct sdhci_pltfm_data sdhci_pxav3_pdata = {
-diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-s3c.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-s3c.c
---- linux-3.14.15/drivers/mmc/host/sdhci-s3c.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-s3c.c 2014-08-20 19:31:45.992868421 +0200
+diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-s3c.c linux-imx6-3.14/drivers/mmc/host/sdhci-s3c.c
+--- linux-3.14.17/drivers/mmc/host/sdhci-s3c.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-s3c.c 2014-09-09 10:13:49.656960727 +0200
@@ -57,6 +57,8 @@
struct clk *clk_io;
@@ -92286,9 +94708,9 @@ diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-s3c.c linux-linaro-stable-mx6/dri
};
#define EXYNOS4_SDHCI_DRV_DATA ((kernel_ulong_t)&exynos4_sdhci_drv_data)
#else
-diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-sirf.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-sirf.c
---- linux-3.14.15/drivers/mmc/host/sdhci-sirf.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-sirf.c 2014-08-20 19:31:45.996868438 +0200
+diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-sirf.c linux-imx6-3.14/drivers/mmc/host/sdhci-sirf.c
+--- linux-3.14.17/drivers/mmc/host/sdhci-sirf.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-sirf.c 2014-09-09 10:13:49.656960727 +0200
@@ -28,7 +28,11 @@
}
@@ -92301,9 +94723,9 @@ diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-sirf.c linux-linaro-stable-mx6/dr
};
static struct sdhci_pltfm_data sdhci_sirf_pdata = {
-diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-spear.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-spear.c
---- linux-3.14.15/drivers/mmc/host/sdhci-spear.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-spear.c 2014-08-20 19:31:45.996868438 +0200
+diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-spear.c linux-imx6-3.14/drivers/mmc/host/sdhci-spear.c
+--- linux-3.14.17/drivers/mmc/host/sdhci-spear.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-spear.c 2014-09-09 10:13:49.656960727 +0200
@@ -37,7 +37,10 @@
/* sdhci ops */
@@ -92316,9 +94738,9 @@ diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-spear.c linux-linaro-stable-mx6/d
};
/* gpio card detection interrupt handler */
-diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-tegra.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-tegra.c
---- linux-3.14.15/drivers/mmc/host/sdhci-tegra.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-tegra.c 2014-08-20 19:31:45.996868438 +0200
+diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-tegra.c linux-imx6-3.14/drivers/mmc/host/sdhci-tegra.c
+--- linux-3.14.17/drivers/mmc/host/sdhci-tegra.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-tegra.c 2014-09-09 10:13:49.656960727 +0200
@@ -48,19 +48,6 @@
int power_gpio;
};
@@ -92385,9 +94807,9 @@ diff -Nur linux-3.14.15/drivers/mmc/host/sdhci-tegra.c linux-linaro-stable-mx6/d
};
static const struct sdhci_pltfm_data sdhci_tegra20_pdata = {
-diff -Nur linux-3.14.15/drivers/mtd/chips/cfi_cmdset_0002.c linux-linaro-stable-mx6/drivers/mtd/chips/cfi_cmdset_0002.c
---- linux-3.14.15/drivers/mtd/chips/cfi_cmdset_0002.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/chips/cfi_cmdset_0002.c 2014-08-20 19:31:46.024868559 +0200
+diff -Nur linux-3.14.17/drivers/mtd/chips/cfi_cmdset_0002.c linux-imx6-3.14/drivers/mtd/chips/cfi_cmdset_0002.c
+--- linux-3.14.17/drivers/mtd/chips/cfi_cmdset_0002.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mtd/chips/cfi_cmdset_0002.c 2014-09-09 10:13:49.664960792 +0200
@@ -1058,17 +1058,13 @@
#define UDELAY(map, chip, adr, usec) \
@@ -92406,9 +94828,9 @@ diff -Nur linux-3.14.15/drivers/mtd/chips/cfi_cmdset_0002.c linux-linaro-stable-
} while (0)
#endif
-diff -Nur linux-3.14.15/drivers/mtd/ubi/build.c linux-linaro-stable-mx6/drivers/mtd/ubi/build.c
---- linux-3.14.15/drivers/mtd/ubi/build.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/mtd/ubi/build.c 2014-08-20 19:31:46.068868748 +0200
+diff -Nur linux-3.14.17/drivers/mtd/ubi/build.c linux-imx6-3.14/drivers/mtd/ubi/build.c
+--- linux-3.14.17/drivers/mtd/ubi/build.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/mtd/ubi/build.c 2014-09-09 10:13:49.688960988 +0200
@@ -640,7 +640,7 @@
dbg_gen("sizeof(struct ubi_ainf_peb) %zu", sizeof(struct ubi_ainf_peb));
dbg_gen("sizeof(struct ubi_wl_entry) %zu", sizeof(struct ubi_wl_entry));
@@ -92418,9 +94840,9 @@ diff -Nur linux-3.14.15/drivers/mtd/ubi/build.c linux-linaro-stable-mx6/drivers/
/*
* Some flashes have several erase regions. Different regions
* may have different eraseblock size and other
-diff -Nur linux-3.14.15/drivers/mxc/asrc/Kconfig linux-linaro-stable-mx6/drivers/mxc/asrc/Kconfig
---- linux-3.14.15/drivers/mxc/asrc/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/asrc/Kconfig 2014-08-20 19:23:53.554845822 +0200
+diff -Nur linux-3.14.17/drivers/mxc/asrc/Kconfig linux-imx6-3.14/drivers/mxc/asrc/Kconfig
+--- linux-3.14.17/drivers/mxc/asrc/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/asrc/Kconfig 2014-09-09 10:13:49.692961021 +0200
@@ -0,0 +1,14 @@
+#
+# ASRC configuration
@@ -92436,17 +94858,17 @@ diff -Nur linux-3.14.15/drivers/mxc/asrc/Kconfig linux-linaro-stable-mx6/drivers
+ Say Y to get the ASRC service.
+
+endmenu
-diff -Nur linux-3.14.15/drivers/mxc/asrc/Makefile linux-linaro-stable-mx6/drivers/mxc/asrc/Makefile
---- linux-3.14.15/drivers/mxc/asrc/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/asrc/Makefile 2014-08-20 19:23:53.554845822 +0200
+diff -Nur linux-3.14.17/drivers/mxc/asrc/Makefile linux-imx6-3.14/drivers/mxc/asrc/Makefile
+--- linux-3.14.17/drivers/mxc/asrc/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/asrc/Makefile 2014-09-09 10:13:49.692961021 +0200
@@ -0,0 +1,4 @@
+#
+# Makefile for the kernel Asynchronous Sample Rate Converter driver
+#
+obj-$(CONFIG_MXC_ASRC) += mxc_asrc.o
-diff -Nur linux-3.14.15/drivers/mxc/asrc/mxc_asrc.c linux-linaro-stable-mx6/drivers/mxc/asrc/mxc_asrc.c
---- linux-3.14.15/drivers/mxc/asrc/mxc_asrc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/asrc/mxc_asrc.c 2014-08-20 19:23:53.554845822 +0200
+diff -Nur linux-3.14.17/drivers/mxc/asrc/mxc_asrc.c linux-imx6-3.14/drivers/mxc/asrc/mxc_asrc.c
+--- linux-3.14.17/drivers/mxc/asrc/mxc_asrc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/asrc/mxc_asrc.c 2014-09-09 10:13:49.692961021 +0200
@@ -0,0 +1,1957 @@
+/*
+ * Freescale Asynchronous Sample Rate Converter (ASRC) driver
@@ -94405,9 +96827,9 @@ diff -Nur linux-3.14.15/drivers/mxc/asrc/mxc_asrc.c linux-linaro-stable-mx6/driv
+MODULE_DESCRIPTION("Asynchronous Sample Rate Converter");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:mxc_asrc");
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c
---- linux-3.14.15/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c 2014-08-20 19:23:53.558845839 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c linux-imx6-3.14/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c
+--- linux-3.14.17/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c 2014-09-09 10:13:49.692961021 +0200
@@ -0,0 +1,932 @@
+/****************************************************************************
+*
@@ -95341,9 +97763,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_
+
+#endif /* gcdENABLE_VG */
+
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h
---- linux-3.14.15/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h 2014-08-20 19:23:53.558845839 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h linux-imx6-3.14/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h 2014-09-09 10:13:49.692961021 +0200
@@ -0,0 +1,319 @@
+/****************************************************************************
+*
@@ -95664,9 +98086,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_
+
+#endif /* __gc_hal_kernel_hardware_command_h_ */
+
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c
---- linux-3.14.15/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c 2014-08-20 19:31:46.124868988 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c linux-imx6-3.14/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c
+--- linux-3.14.17/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c 2014-09-09 10:13:49.692961021 +0200
@@ -0,0 +1,2114 @@
+/****************************************************************************
+*
@@ -97782,9 +100204,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_
+}
+#endif /* gcdENABLE_VG */
+
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h
---- linux-3.14.15/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h 2014-08-20 19:23:53.558845839 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h linux-imx6-3.14/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h 2014-09-09 10:13:49.692961021 +0200
@@ -0,0 +1,75 @@
+/****************************************************************************
+*
@@ -97861,9 +100283,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_
+
+#endif /* __gc_hal_kernel_hardware_h_ */
+
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c
---- linux-3.14.15/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c 2014-08-20 19:23:53.558845839 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c linux-imx6-3.14/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c
+--- linux-3.14.17/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c 2014-09-09 10:13:49.692961021 +0200
@@ -0,0 +1,1735 @@
+/****************************************************************************
+*
@@ -99600,9 +102022,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_c
+#endif
+}
+
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h
---- linux-3.14.15/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h 2014-08-20 19:23:53.558845839 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h linux-imx6-3.14/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h 2014-09-09 10:13:49.692961021 +0200
@@ -0,0 +1,157 @@
+/****************************************************************************
+*
@@ -99761,9 +102183,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_c
+
+#endif /* __gc_hal_kernel_context_h_ */
+
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c
---- linux-3.14.15/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c 2014-08-20 19:31:46.128869007 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c linux-imx6-3.14/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c
+--- linux-3.14.17/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c 2014-09-09 10:13:49.696961052 +0200
@@ -0,0 +1,7280 @@
+/****************************************************************************
+*
@@ -107045,9 +109467,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_h
+#endif
+
+
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h
---- linux-3.14.15/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h 2014-08-20 19:23:53.562845855 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h linux-imx6-3.14/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h 2014-09-09 10:13:49.696961052 +0200
@@ -0,0 +1,136 @@
+/****************************************************************************
+*
@@ -107185,9 +109607,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_h
+
+#endif /* __gc_hal_kernel_hardware_h_ */
+
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/config linux-linaro-stable-mx6/drivers/mxc/gpu-viv/config
---- linux-3.14.15/drivers/mxc/gpu-viv/config 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/config 2014-08-20 19:31:46.128869007 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/config linux-imx6-3.14/drivers/mxc/gpu-viv/config
+--- linux-3.14.17/drivers/mxc/gpu-viv/config 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/config 2014-09-09 10:13:49.696961052 +0200
@@ -0,0 +1,38 @@
+##############################################################################
+#
@@ -107227,9 +109649,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/config linux-linaro-stable-mx6/drive
+BANK_CHANNEL_BIT ?= 12
+ENABLE_GPU_CLOCK_BY_DRIVER = 1
+
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c 2014-08-20 19:31:46.128869007 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c 2014-09-09 10:13:49.696961052 +0200
@@ -0,0 +1,3967 @@
+/****************************************************************************
+*
@@ -111198,9 +113620,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c linux-lin
+***** Test Code ****************************************************************
+*******************************************************************************/
+
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c 2014-08-20 19:23:53.562845855 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c 2014-09-09 10:13:49.696961052 +0200
@@ -0,0 +1,3042 @@
+/****************************************************************************
+*
@@ -114244,9 +116666,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c l
+#endif
+}
+#endif
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c 2014-08-20 19:31:46.128869007 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c 2014-09-09 10:13:49.696961052 +0200
@@ -0,0 +1,3677 @@
+/****************************************************************************
+*
@@ -117925,9 +120347,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.
+}
+
+#endif /* gcdENABLE_VG */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c 2014-08-20 19:31:46.128869007 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c 2014-09-09 10:13:49.696961052 +0200
@@ -0,0 +1,1604 @@
+/****************************************************************************
+*
@@ -119533,9 +121955,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c linux-
+ gcmkFOOTER_NO();
+ return gcvSTATUS_OK;
+}
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c 2014-08-20 19:31:46.128869007 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c 2014-09-09 10:13:49.696961052 +0200
@@ -0,0 +1,2559 @@
+/****************************************************************************
+*
@@ -122096,9 +124518,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c lin
+ return "nil";
+ }
+}
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c 2014-08-20 19:31:46.132869024 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c 2014-09-09 10:13:49.696961052 +0200
@@ -0,0 +1,2898 @@
+/****************************************************************************
+*
@@ -124998,9 +127420,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c lin
+
+ return gcvSTATUS_OK;
+}
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h 2014-08-20 19:31:46.128869007 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h 2014-09-09 10:13:49.696961052 +0200
@@ -0,0 +1,1011 @@
+/****************************************************************************
+*
@@ -126013,9 +128435,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h linux-lin
+#endif
+
+#endif /* __gc_hal_kernel_h_ */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c 2014-08-20 19:23:53.562845855 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c 2014-09-09 10:13:49.696961052 +0200
@@ -0,0 +1,859 @@
+/****************************************************************************
+*
@@ -126876,9 +129298,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c linu
+***** Test Code ****************************************************************
+*******************************************************************************/
+
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c 2014-08-20 19:23:53.562845855 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c 2014-09-09 10:13:49.696961052 +0200
@@ -0,0 +1,877 @@
+/****************************************************************************
+*
@@ -127757,9 +130179,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_v
+}
+
+#endif /* gcdENABLE_VG */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c 2014-08-20 19:31:46.132869024 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c 2014-09-09 10:13:49.696961052 +0200
@@ -0,0 +1,1982 @@
+/****************************************************************************
+*
@@ -129743,9 +132165,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c linux
+****************************** T E S T C O D E ******************************
+******************************************************************************/
+
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c 2014-08-20 19:23:53.562845855 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c 2014-09-09 10:13:49.696961052 +0200
@@ -0,0 +1,522 @@
+/****************************************************************************
+*
@@ -130269,9 +132691,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c li
+}
+
+#endif /* gcdENABLE_VG */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c 2014-08-20 19:23:53.562845855 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c 2014-09-09 10:13:49.696961052 +0200
@@ -0,0 +1,347 @@
+/****************************************************************************
+*
@@ -130620,9 +133042,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c lin
+ return gcvSTATUS_OK;
+}
+#endif
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h 2014-08-20 19:23:53.562845855 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h 2014-09-09 10:13:49.696961052 +0200
@@ -0,0 +1,29 @@
+/****************************************************************************
+*
@@ -130653,9 +133075,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h l
+#include "gc_hal_kernel.h"
+
+#endif /* __gc_hal_kernel_precomp_h_ */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c 2014-08-20 19:31:46.132869024 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c 2014-09-09 10:13:49.696961052 +0200
@@ -0,0 +1,895 @@
+/****************************************************************************
+*
@@ -131552,9 +133974,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c linux-
+}
+
+#endif /* gcdENABLE_VG */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h 2014-08-20 19:23:53.566845873 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h 2014-09-09 10:13:49.700961086 +0200
@@ -0,0 +1,85 @@
+/****************************************************************************
+*
@@ -131641,9 +134063,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h linux-
+};
+
+#endif /* __gc_hal_kernel_h_ */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c 2014-08-20 19:31:46.132869024 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c 2014-09-09 10:13:49.700961086 +0200
@@ -0,0 +1,2264 @@
+/****************************************************************************
+*
@@ -133909,9 +136331,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memor
+ gcmkFOOTER();
+ return status;
+}
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h 2014-08-20 19:31:46.132869024 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h 2014-09-09 10:13:49.700961086 +0200
@@ -0,0 +1,3896 @@
+/****************************************************************************
+*
@@ -137809,9 +140231,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h linux-l
+#endif
+
+#endif /* __gc_hal_base_h_ */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h 2014-08-20 19:31:46.132869024 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h 2014-09-09 10:13:49.700961086 +0200
@@ -0,0 +1,4298 @@
+/****************************************************************************
+*
@@ -142111,9 +144533,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h lin
+
+#endif /* VIVANTE_NO_3D */
+#endif /* __gc_hal_compiler_h_ */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h 2014-08-20 19:31:46.132869024 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h 2014-09-09 10:13:49.700961086 +0200
@@ -0,0 +1,1051 @@
+/****************************************************************************
+*
@@ -143166,9 +145588,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h linux
+#endif
+
+#endif /* __gc_hal_driver_h_ */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h 2014-08-20 19:23:53.566845873 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h 2014-09-09 10:13:49.700961086 +0200
@@ -0,0 +1,270 @@
+/****************************************************************************
+*
@@ -143440,9 +145862,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h li
+#endif
+
+#endif /* __gc_hal_driver_h_ */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h 2014-08-20 19:23:53.566845873 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h 2014-09-09 10:13:49.700961086 +0200
@@ -0,0 +1,88 @@
+/****************************************************************************
+*
@@ -143532,9 +145954,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h linux-l
+
+#endif /* __gc_hal_dump_h_ */
+
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h 2014-08-20 19:31:46.132869024 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h 2014-09-09 10:13:49.700961086 +0200
@@ -0,0 +1,627 @@
+/****************************************************************************
+*
@@ -144163,9 +146585,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h
+#endif
+
+#endif /* __gc_hal_eglplatform_h_ */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h 2014-08-20 19:23:53.566845873 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h 2014-09-09 10:13:49.700961086 +0200
@@ -0,0 +1,286 @@
+/****************************************************************************
+*
@@ -144453,9 +146875,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_ty
+#endif
+
+#endif /* __gc_hal_eglplatform_type_h_ */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h 2014-08-20 19:23:53.566845873 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h 2014-09-09 10:13:49.700961086 +0200
@@ -0,0 +1,2053 @@
+/****************************************************************************
+*
@@ -146510,9 +148932,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h linux
+
+#endif /* VIVANTE_NO_3D */
+#endif /* __gc_hal_engine_h_ */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h 2014-08-20 19:23:53.566845873 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h 2014-09-09 10:13:49.700961086 +0200
@@ -0,0 +1,904 @@
+/****************************************************************************
+*
@@ -147418,9 +149840,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h li
+#endif
+
+#endif /* __gc_hal_vg_h_ */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h 2014-08-20 19:31:46.136869040 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h 2014-09-09 10:13:49.700961086 +0200
@@ -0,0 +1,965 @@
+/****************************************************************************
+*
@@ -148387,9 +150809,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h linux-l
+#endif
+
+#endif /* __gc_hal_enum_h_ */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h 2014-08-20 19:31:46.132869024 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h 2014-09-09 10:13:49.700961086 +0200
@@ -0,0 +1,2661 @@
+/****************************************************************************
+*
@@ -151052,9 +153474,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h linux-linaro
+#endif
+
+#endif /* __gc_hal_h_ */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h 2014-08-20 19:23:53.566845873 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h 2014-09-09 10:13:49.700961086 +0200
@@ -0,0 +1,185 @@
+/****************************************************************************
+*
@@ -151241,9 +153663,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.
+#endif
+
+#endif /* __gc_hal_kernel_buffer_h_ */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h 2014-08-20 19:23:53.566845873 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h 2014-09-09 10:13:49.700961086 +0200
@@ -0,0 +1,530 @@
+/****************************************************************************
+*
@@ -151775,9 +154197,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h linux-li
+
+#endif /* VIVANTE_NO_3D */
+#endif /* __gc_hal_mem_h_ */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h 2014-08-20 19:31:46.136869040 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h 2014-09-09 10:13:49.700961086 +0200
@@ -0,0 +1,947 @@
+/****************************************************************************
+*
@@ -152726,9 +155148,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h linu
+#endif
+
+#endif /* __gc_hal_options_h_ */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h 2014-08-20 19:23:53.566845873 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h 2014-09-09 10:13:49.700961086 +0200
@@ -0,0 +1,584 @@
+/****************************************************************************
+*
@@ -153314,9 +155736,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h lin
+#endif
+
+#endif /* __gc_hal_profiler_h_ */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h 2014-08-20 19:23:53.570845890 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h 2014-09-09 10:13:49.700961086 +0200
@@ -0,0 +1,1010 @@
+/****************************************************************************
+*
@@ -154328,9 +156750,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h linux
+#endif
+
+#endif /* __gc_hal_raster_h_ */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h 2014-08-20 19:23:53.570845890 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h 2014-09-09 10:13:49.700961086 +0200
@@ -0,0 +1,248 @@
+/****************************************************************************
+*
@@ -154580,9 +157002,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h linux
+#endif
+
+#endif /* __gc_hal_rename_h_ */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h 2014-08-20 19:23:53.570845890 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h 2014-09-09 10:13:49.700961086 +0200
@@ -0,0 +1,115 @@
+/****************************************************************************
+*
@@ -154699,9 +157121,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h l
+
+#endif /*__gc_hal_statistics_h_ */
+
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h 2014-08-20 19:31:46.136869040 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h 2014-09-09 10:13:49.700961086 +0200
@@ -0,0 +1,1080 @@
+/****************************************************************************
+*
@@ -155783,9 +158205,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h linux-
+#endif
+
+#endif /* __gc_hal_types_h_ */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h 2014-08-20 19:23:53.570845890 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h 2014-09-09 10:13:49.700961086 +0200
@@ -0,0 +1,37 @@
+/****************************************************************************
+*
@@ -155824,9 +158246,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h linu
+#define gcvVERSION_TIME __TIME__
+
+#endif /* __gc_hal_version_h_ */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h 2014-08-20 19:23:53.570845890 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h 2014-09-09 10:13:49.704961119 +0200
@@ -0,0 +1,913 @@
+/****************************************************************************
+*
@@ -156741,9 +159163,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h linux-lin
+#endif
+
+#endif /* __gc_hal_h_ */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c 2014-08-20 19:23:53.570845890 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c 2014-09-09 10:13:49.704961119 +0200
@@ -0,0 +1,795 @@
+/****************************************************************************
+*
@@ -157540,9 +159962,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_de
+{
+ gcmkDBGFSPRINT ( _GetArgumentSize ( Message ) , Message ) ;
+}
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h 2014-08-20 19:23:53.570845890 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h 2014-09-09 10:13:49.704961119 +0200
@@ -0,0 +1,84 @@
+/****************************************************************************
+*
@@ -157628,9 +160050,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_de
+#endif
+
+
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h 2014-08-20 19:23:53.570845890 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h 2014-09-09 10:13:49.704961119 +0200
@@ -0,0 +1,102 @@
+/****************************************************************************
+*
@@ -157734,9 +160156,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_de
+#endif
+
+#endif /* __gc_hal_kernel_debug_h_ */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c 2014-08-20 19:31:46.136869040 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c 2014-09-09 10:13:49.704961119 +0200
@@ -0,0 +1,1676 @@
+/****************************************************************************
+*
@@ -159414,9 +161836,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_de
+ gcmkFOOTER();
+ return status;
+}
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h 2014-08-20 19:31:46.136869040 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h 2014-09-09 10:13:49.704961119 +0200
@@ -0,0 +1,192 @@
+/****************************************************************************
+*
@@ -159610,9 +162032,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_de
+ );
+
+#endif /* __gc_hal_kernel_device_h_ */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c 2014-08-20 19:31:46.136869040 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c 2014-09-09 10:13:49.704961119 +0200
@@ -0,0 +1,1471 @@
+/****************************************************************************
+*
@@ -161085,9 +163507,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_dr
+module_exit(gpu_exit);
+
+#endif
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c 2014-08-20 19:23:53.570845890 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c 2014-09-09 10:13:49.704961119 +0200
@@ -0,0 +1,481 @@
+/****************************************************************************
+*
@@ -161570,9 +163992,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_li
+ gcmkFOOTER_ARG("Settings->signal=%d", Settings->signal);
+ return gcvSTATUS_OK;
+}
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h 2014-08-20 19:23:53.570845890 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h 2014-09-09 10:13:49.704961119 +0200
@@ -0,0 +1,94 @@
+/****************************************************************************
+*
@@ -161668,9 +164090,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_li
+}
+
+#endif /* __gc_hal_kernel_linux_h_ */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c 2014-08-20 19:23:53.570845890 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c 2014-09-09 10:13:49.704961119 +0200
@@ -0,0 +1,32 @@
+/****************************************************************************
+*
@@ -161704,9 +164126,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_ma
+ if(Y ==0) {return 0;}
+ else {return X % Y;}
+}
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c 2014-08-20 19:31:46.136869040 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c 2014-09-09 10:13:49.704961119 +0200
@@ -0,0 +1,9019 @@
+/****************************************************************************
+*
@@ -170727,9 +173149,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os
+ return status;
+}
+#endif
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h 2014-08-20 19:31:46.136869040 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h 2014-09-09 10:13:49.704961119 +0200
@@ -0,0 +1,83 @@
+/****************************************************************************
+*
@@ -170814,9 +173236,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os
+DRIVER_ARGS;
+
+#endif /* __gc_hal_kernel_os_h_ */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c 2014-08-20 19:23:53.574845907 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c 2014-09-09 10:13:49.704961119 +0200
@@ -0,0 +1,174 @@
+/****************************************************************************
+*
@@ -170992,9 +173414,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sy
+}
+
+#endif
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h
---- linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h 2014-08-20 19:23:53.574845907 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h
+--- linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h 2014-09-09 10:13:49.704961119 +0200
@@ -0,0 +1,71 @@
+/****************************************************************************
+*
@@ -171067,9 +173489,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sy
+ );
+
+#endif /* __gc_hal_kernel_sync_h_ */
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/Kbuild linux-linaro-stable-mx6/drivers/mxc/gpu-viv/Kbuild
---- linux-3.14.15/drivers/mxc/gpu-viv/Kbuild 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/Kbuild 2014-08-20 19:31:46.068868748 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/Kbuild linux-imx6-3.14/drivers/mxc/gpu-viv/Kbuild
+--- linux-3.14.17/drivers/mxc/gpu-viv/Kbuild 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/Kbuild 2014-09-09 10:13:49.692961021 +0200
@@ -0,0 +1,236 @@
+##############################################################################
+#
@@ -171307,9 +173729,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/Kbuild linux-linaro-stable-mx6/drive
+galcore-objs := $(OBJS)
+
+endif
-diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/Kconfig linux-linaro-stable-mx6/drivers/mxc/gpu-viv/Kconfig
---- linux-3.14.15/drivers/mxc/gpu-viv/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/Kconfig 2014-08-20 19:23:53.554845822 +0200
+diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/Kconfig linux-imx6-3.14/drivers/mxc/gpu-viv/Kconfig
+--- linux-3.14.17/drivers/mxc/gpu-viv/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/Kconfig 2014-09-09 10:13:49.692961021 +0200
@@ -0,0 +1,9 @@
+menu "MXC Vivante GPU support"
+ depends on SOC_IMX6Q
@@ -171320,9 +173742,9 @@ diff -Nur linux-3.14.15/drivers/mxc/gpu-viv/Kconfig linux-linaro-stable-mx6/driv
+ Say Y to get the GPU driver support.
+
+endmenu
-diff -Nur linux-3.14.15/drivers/mxc/hdmi-cec/Kconfig linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/Kconfig
---- linux-3.14.15/drivers/mxc/hdmi-cec/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/Kconfig 2014-08-20 19:23:53.574845907 +0200
+diff -Nur linux-3.14.17/drivers/mxc/hdmi-cec/Kconfig linux-imx6-3.14/drivers/mxc/hdmi-cec/Kconfig
+--- linux-3.14.17/drivers/mxc/hdmi-cec/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/hdmi-cec/Kconfig 2014-09-09 10:13:49.704961119 +0200
@@ -0,0 +1,11 @@
+
+menu "MXC HDMI CEC (Consumer Electronics Control) support"
@@ -171335,15 +173757,15 @@ diff -Nur linux-3.14.15/drivers/mxc/hdmi-cec/Kconfig linux-linaro-stable-mx6/dri
+ The HDMI CEC device implement low level protocol on i.MX6x platforms.
+
+endmenu
-diff -Nur linux-3.14.15/drivers/mxc/hdmi-cec/Makefile linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/Makefile
---- linux-3.14.15/drivers/mxc/hdmi-cec/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/Makefile 2014-08-20 19:23:53.574845907 +0200
+diff -Nur linux-3.14.17/drivers/mxc/hdmi-cec/Makefile linux-imx6-3.14/drivers/mxc/hdmi-cec/Makefile
+--- linux-3.14.17/drivers/mxc/hdmi-cec/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/hdmi-cec/Makefile 2014-09-09 10:13:49.704961119 +0200
@@ -0,0 +1 @@
+obj-$(CONFIG_MXC_HDMI_CEC) += mxc_hdmi-cec.o
-diff -Nur linux-3.14.15/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c
---- linux-3.14.15/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c 2014-08-20 19:23:53.574845907 +0200
-@@ -0,0 +1,608 @@
+diff -Nur linux-3.14.17/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c linux-imx6-3.14/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c
+--- linux-3.14.17/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c 2014-09-09 10:13:49.704961119 +0200
+@@ -0,0 +1,629 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
@@ -171429,6 +173851,8 @@ diff -Nur linux-3.14.15/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c linux-linaro-stable-
+
+static LIST_HEAD(head);
+
++static int hdmi_cec_ready = 0;
++static int hdmi_cec_started;
+static int hdmi_cec_major;
+static struct class *hdmi_cec_class;
+static struct hdmi_cec_priv hdmi_cec_data;
@@ -171703,11 +174127,40 @@ diff -Nur linux-3.14.15/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c linux-linaro-stable-
+ return ret;
+}
+
++void hdmi_cec_start_device(void)
++{
++ u8 val;
++
++ if (!hdmi_cec_ready || hdmi_cec_started)
++ return;
++
++ val = hdmi_readb(HDMI_MC_CLKDIS);
++ val &= ~HDMI_MC_CLKDIS_CECCLK_DISABLE;
++ hdmi_writeb(val, HDMI_MC_CLKDIS);
++ hdmi_writeb(0x02, HDMI_CEC_CTRL);
++ /* Force read unlock */
++ hdmi_writeb(0x0, HDMI_CEC_LOCK);
++ val = HDMI_IH_CEC_STAT0_ERROR_INIT | HDMI_IH_CEC_STAT0_NACK | HDMI_IH_CEC_STAT0_EOM | HDMI_IH_CEC_STAT0_DONE;
++ hdmi_writeb(val, HDMI_CEC_POLARITY);
++ val = HDMI_IH_CEC_STAT0_WAKEUP | HDMI_IH_CEC_STAT0_ERROR_FOLL | HDMI_IH_CEC_STAT0_ARB_LOST;
++ hdmi_writeb(val, HDMI_CEC_MASK);
++ hdmi_writeb(val, HDMI_IH_MUTE_CEC_STAT0);
++ hdmi_cec_data.link_status = hdmi_readb(HDMI_PHY_STAT0) & 0x02;
++ mutex_lock(&hdmi_cec_data.lock);
++ hdmi_cec_data.cec_state = true;
++ mutex_unlock(&hdmi_cec_data.lock);
++
++ hdmi_cec_started = 1;
++}
++EXPORT_SYMBOL(hdmi_cec_start_device);
+
-+static void hdmi_stop_device(void)
++void hdmi_cec_stop_device(void)
+{
+ u8 val;
+
++ if (!hdmi_cec_ready || !hdmi_cec_started)
++ return;
++
+ hdmi_writeb(0x10, HDMI_CEC_CTRL);
+ val = HDMI_IH_CEC_STAT0_WAKEUP | HDMI_IH_CEC_STAT0_ERROR_FOLL | HDMI_IH_CEC_STAT0_ERROR_INIT | HDMI_IH_CEC_STAT0_ARB_LOST | \
+ HDMI_IH_CEC_STAT0_NACK | HDMI_IH_CEC_STAT0_EOM | HDMI_IH_CEC_STAT0_DONE;
@@ -171720,7 +174173,10 @@ diff -Nur linux-3.14.15/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c linux-linaro-stable-
+ mutex_lock(&hdmi_cec_data.lock);
+ hdmi_cec_data.cec_state = false;
+ mutex_unlock(&hdmi_cec_data.lock);
++
++ hdmi_cec_started = 0;
+}
++EXPORT_SYMBOL(hdmi_cec_stop_device);
+
+/*!
+ * @brief IO ctrl function for vpu file operation
@@ -171767,24 +174223,10 @@ diff -Nur linux-3.14.15/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c linux-linaro-stable-
+ mutex_unlock(&hdmi_cec_data.lock);
+ break;
+ case HDMICEC_IOC_STARTDEVICE:
-+ val = hdmi_readb(HDMI_MC_CLKDIS);
-+ val &= ~HDMI_MC_CLKDIS_CECCLK_DISABLE;
-+ hdmi_writeb(val, HDMI_MC_CLKDIS);
-+ hdmi_writeb(0x02, HDMI_CEC_CTRL);
-+ /* Force read unlock */
-+ hdmi_writeb(0x0, HDMI_CEC_LOCK);
-+ val = HDMI_IH_CEC_STAT0_ERROR_INIT | HDMI_IH_CEC_STAT0_NACK | HDMI_IH_CEC_STAT0_EOM | HDMI_IH_CEC_STAT0_DONE;
-+ hdmi_writeb(val, HDMI_CEC_POLARITY);
-+ val = HDMI_IH_CEC_STAT0_WAKEUP | HDMI_IH_CEC_STAT0_ERROR_FOLL | HDMI_IH_CEC_STAT0_ARB_LOST;
-+ hdmi_writeb(val, HDMI_CEC_MASK);
-+ hdmi_writeb(val, HDMI_IH_MUTE_CEC_STAT0);
-+ hdmi_cec_data.link_status = hdmi_readb(HDMI_PHY_STAT0) & 0x02;
-+ mutex_lock(&hdmi_cec_data.lock);
-+ hdmi_cec_data.cec_state = true;
-+ mutex_unlock(&hdmi_cec_data.lock);
++ hdmi_cec_start_device();
+ break;
+ case HDMICEC_IOC_STOPDEVICE:
-+ hdmi_stop_device();
++ hdmi_cec_stop_device();
+ break;
+ case HDMICEC_IOC_GETPHYADDRESS:
+ hdmi_get_edid_cfg(&hdmi_edid_cfg);
@@ -171906,6 +174348,7 @@ diff -Nur linux-3.14.15/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c linux-linaro-stable-
+ INIT_DELAYED_WORK(&hdmi_cec_data.hdmi_cec_work, mxc_hdmi_cec_worker);
+
+ dev_info(&pdev->dev, "HDMI CEC initialized\n");
++ hdmi_cec_ready = 1;
+ goto out;
+
+err_out_class:
@@ -171920,7 +174363,7 @@ diff -Nur linux-3.14.15/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c linux-linaro-stable-
+static int hdmi_cec_dev_remove(struct platform_device *pdev)
+{
+ if (hdmi_cec_data.cec_state)
-+ hdmi_stop_device();
++ hdmi_cec_stop_device();
+ if (hdmi_cec_major > 0) {
+ device_destroy(hdmi_cec_class, MKDEV(hdmi_cec_major, 0));
+ class_destroy(hdmi_cec_class);
@@ -171952,9 +174395,9 @@ diff -Nur linux-3.14.15/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c linux-linaro-stable-
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:mxc_hdmi_cec");
+
-diff -Nur linux-3.14.15/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h
---- linux-3.14.15/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h 2014-08-20 19:23:53.574845907 +0200
+diff -Nur linux-3.14.17/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h linux-imx6-3.14/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h
+--- linux-3.14.17/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h 2014-09-09 10:13:49.704961119 +0200
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -171994,9 +174437,9 @@ diff -Nur linux-3.14.15/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h linux-linaro-stable-
+ _IOR(HDMICEC_IOC_MAGIC, 4, unsigned char[4])
+
+#endif /* !_HDMICEC_H_ */
-diff -Nur linux-3.14.15/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c
---- linux-3.14.15/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c 2014-08-20 19:31:46.136869040 +0200
+diff -Nur linux-3.14.17/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c linux-imx6-3.14/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c
+--- linux-3.14.17/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c 2014-09-09 10:13:49.704961119 +0200
@@ -0,0 +1,495 @@
+/*
+ * Copyright 2009-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -172493,9 +174936,9 @@ diff -Nur linux-3.14.15/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c linux-linaro-s
+ return status;
+}
+EXPORT_SYMBOL(ipu_calc_stripes_sizes);
-diff -Nur linux-3.14.15/drivers/mxc/ipu3/ipu_capture.c linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_capture.c
---- linux-3.14.15/drivers/mxc/ipu3/ipu_capture.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_capture.c 2014-08-20 19:31:46.136869040 +0200
+diff -Nur linux-3.14.17/drivers/mxc/ipu3/ipu_capture.c linux-imx6-3.14/drivers/mxc/ipu3/ipu_capture.c
+--- linux-3.14.17/drivers/mxc/ipu3/ipu_capture.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_capture.c 2014-09-09 10:13:49.704961119 +0200
@@ -0,0 +1,816 @@
+/*
+ * Copyright 2008-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -173313,9 +175756,9 @@ diff -Nur linux-3.14.15/drivers/mxc/ipu3/ipu_capture.c linux-linaro-stable-mx6/d
+ ipu_free_irq(ipu, irq, ipu);
+ dev_dbg(ipu->dev, "CSI stop timeout - %d * 10ms\n", 5 - ret);
+}
-diff -Nur linux-3.14.15/drivers/mxc/ipu3/ipu_common.c linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_common.c
---- linux-3.14.15/drivers/mxc/ipu3/ipu_common.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_common.c 2014-08-20 19:31:46.140869056 +0200
+diff -Nur linux-3.14.17/drivers/mxc/ipu3/ipu_common.c linux-imx6-3.14/drivers/mxc/ipu3/ipu_common.c
+--- linux-3.14.17/drivers/mxc/ipu3/ipu_common.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_common.c 2014-09-09 10:13:49.704961119 +0200
@@ -0,0 +1,3134 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -176451,9 +178894,9 @@ diff -Nur linux-3.14.15/drivers/mxc/ipu3/ipu_common.c linux-linaro-stable-mx6/dr
+}
+
+module_exit(ipu_gen_uninit);
-diff -Nur linux-3.14.15/drivers/mxc/ipu3/ipu_device.c linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_device.c
---- linux-3.14.15/drivers/mxc/ipu3/ipu_device.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_device.c 2014-08-20 19:31:46.140869056 +0200
+diff -Nur linux-3.14.17/drivers/mxc/ipu3/ipu_device.c linux-imx6-3.14/drivers/mxc/ipu3/ipu_device.c
+--- linux-3.14.17/drivers/mxc/ipu3/ipu_device.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_device.c 2014-09-09 10:13:49.704961119 +0200
@@ -0,0 +1,3717 @@
+/*
+ * Copyright 2005-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -180172,9 +182615,9 @@ diff -Nur linux-3.14.15/drivers/mxc/ipu3/ipu_device.c linux-linaro-stable-mx6/dr
+ major = 0;
+ }
+}
-diff -Nur linux-3.14.15/drivers/mxc/ipu3/ipu_disp.c linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_disp.c
---- linux-3.14.15/drivers/mxc/ipu3/ipu_disp.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_disp.c 2014-08-20 19:31:46.140869056 +0200
+diff -Nur linux-3.14.17/drivers/mxc/ipu3/ipu_disp.c linux-imx6-3.14/drivers/mxc/ipu3/ipu_disp.c
+--- linux-3.14.17/drivers/mxc/ipu3/ipu_disp.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_disp.c 2014-09-09 10:13:49.708961151 +0200
@@ -0,0 +1,1962 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -182138,9 +184581,9 @@ diff -Nur linux-3.14.15/drivers/mxc/ipu3/ipu_disp.c linux-linaro-stable-mx6/driv
+ _ipu_init_dc_mappings(ipu);
+ _ipu_dmfc_init(ipu, DMFC_NORMAL, 1);
+}
-diff -Nur linux-3.14.15/drivers/mxc/ipu3/ipu_ic.c linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_ic.c
---- linux-3.14.15/drivers/mxc/ipu3/ipu_ic.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_ic.c 2014-08-20 19:31:46.140869056 +0200
+diff -Nur linux-3.14.17/drivers/mxc/ipu3/ipu_ic.c linux-imx6-3.14/drivers/mxc/ipu3/ipu_ic.c
+--- linux-3.14.17/drivers/mxc/ipu3/ipu_ic.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_ic.c 2014-09-09 10:13:49.708961151 +0200
@@ -0,0 +1,924 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -183066,9 +185509,9 @@ diff -Nur linux-3.14.15/drivers/mxc/ipu3/ipu_ic.c linux-linaro-stable-mx6/driver
+
+ ipu_vdi_write(ipu, reg, VDI_C);
+}
-diff -Nur linux-3.14.15/drivers/mxc/ipu3/ipu_param_mem.h linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_param_mem.h
---- linux-3.14.15/drivers/mxc/ipu3/ipu_param_mem.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_param_mem.h 2014-08-20 19:23:53.574845907 +0200
+diff -Nur linux-3.14.17/drivers/mxc/ipu3/ipu_param_mem.h linux-imx6-3.14/drivers/mxc/ipu3/ipu_param_mem.h
+--- linux-3.14.17/drivers/mxc/ipu3/ipu_param_mem.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_param_mem.h 2014-09-09 10:13:49.708961151 +0200
@@ -0,0 +1,921 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -183991,9 +186434,9 @@ diff -Nur linux-3.14.15/drivers/mxc/ipu3/ipu_param_mem.h linux-linaro-stable-mx6
+ return false;
+}
+#endif
-diff -Nur linux-3.14.15/drivers/mxc/ipu3/ipu_pixel_clk.c linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_pixel_clk.c
---- linux-3.14.15/drivers/mxc/ipu3/ipu_pixel_clk.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_pixel_clk.c 2014-08-20 19:23:53.574845907 +0200
+diff -Nur linux-3.14.17/drivers/mxc/ipu3/ipu_pixel_clk.c linux-imx6-3.14/drivers/mxc/ipu3/ipu_pixel_clk.c
+--- linux-3.14.17/drivers/mxc/ipu3/ipu_pixel_clk.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_pixel_clk.c 2014-09-09 10:13:49.708961151 +0200
@@ -0,0 +1,317 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -184312,9 +186755,9 @@ diff -Nur linux-3.14.15/drivers/mxc/ipu3/ipu_pixel_clk.c linux-linaro-stable-mx6
+
+ return clk;
+}
-diff -Nur linux-3.14.15/drivers/mxc/ipu3/ipu_prv.h linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_prv.h
---- linux-3.14.15/drivers/mxc/ipu3/ipu_prv.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_prv.h 2014-08-20 19:31:46.140869056 +0200
+diff -Nur linux-3.14.17/drivers/mxc/ipu3/ipu_prv.h linux-imx6-3.14/drivers/mxc/ipu3/ipu_prv.h
+--- linux-3.14.17/drivers/mxc/ipu3/ipu_prv.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_prv.h 2014-09-09 10:13:49.708961151 +0200
@@ -0,0 +1,356 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -184672,9 +187115,9 @@ diff -Nur linux-3.14.15/drivers/mxc/ipu3/ipu_prv.h linux-linaro-stable-mx6/drive
+ 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-3.14.15/drivers/mxc/ipu3/ipu_regs.h linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_regs.h
---- linux-3.14.15/drivers/mxc/ipu3/ipu_regs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_regs.h 2014-08-20 19:31:46.140869056 +0200
+diff -Nur linux-3.14.17/drivers/mxc/ipu3/ipu_regs.h linux-imx6-3.14/drivers/mxc/ipu3/ipu_regs.h
+--- linux-3.14.17/drivers/mxc/ipu3/ipu_regs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_regs.h 2014-09-09 10:13:49.708961151 +0200
@@ -0,0 +1,743 @@
+/*
+ * Copyright (C) 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -185419,23 +187862,23 @@ diff -Nur linux-3.14.15/drivers/mxc/ipu3/ipu_regs.h linux-linaro-stable-mx6/driv
+#define WRG (0x01)
+
+#endif
-diff -Nur linux-3.14.15/drivers/mxc/ipu3/Kconfig linux-linaro-stable-mx6/drivers/mxc/ipu3/Kconfig
---- linux-3.14.15/drivers/mxc/ipu3/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/Kconfig 2014-08-20 19:23:53.574845907 +0200
+diff -Nur linux-3.14.17/drivers/mxc/ipu3/Kconfig linux-imx6-3.14/drivers/mxc/ipu3/Kconfig
+--- linux-3.14.17/drivers/mxc/ipu3/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/ipu3/Kconfig 2014-09-09 10:13:49.704961119 +0200
@@ -0,0 +1,2 @@
+config MXC_IPU_V3
+ bool
-diff -Nur linux-3.14.15/drivers/mxc/ipu3/Makefile linux-linaro-stable-mx6/drivers/mxc/ipu3/Makefile
---- linux-3.14.15/drivers/mxc/ipu3/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/Makefile 2014-08-20 19:23:53.574845907 +0200
+diff -Nur linux-3.14.17/drivers/mxc/ipu3/Makefile linux-imx6-3.14/drivers/mxc/ipu3/Makefile
+--- linux-3.14.17/drivers/mxc/ipu3/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/ipu3/Makefile 2014-09-09 10:13:49.704961119 +0200
@@ -0,0 +1,4 @@
+obj-$(CONFIG_MXC_IPU_V3) = 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-3.14.15/drivers/mxc/ipu3/vdoa.c linux-linaro-stable-mx6/drivers/mxc/ipu3/vdoa.c
---- linux-3.14.15/drivers/mxc/ipu3/vdoa.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/vdoa.c 2014-08-20 19:23:53.578845924 +0200
+diff -Nur linux-3.14.17/drivers/mxc/ipu3/vdoa.c linux-imx6-3.14/drivers/mxc/ipu3/vdoa.c
+--- linux-3.14.17/drivers/mxc/ipu3/vdoa.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/ipu3/vdoa.c 2014-09-09 10:13:49.708961151 +0200
@@ -0,0 +1,543 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -185980,9 +188423,9 @@ diff -Nur linux-3.14.15/drivers/mxc/ipu3/vdoa.c linux-linaro-stable-mx6/drivers/
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("i.MX Video Data Order Adapter(VDOA) driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/drivers/mxc/ipu3/vdoa.h linux-linaro-stable-mx6/drivers/mxc/ipu3/vdoa.h
---- linux-3.14.15/drivers/mxc/ipu3/vdoa.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/vdoa.h 2014-08-20 19:23:53.578845924 +0200
+diff -Nur linux-3.14.17/drivers/mxc/ipu3/vdoa.h linux-imx6-3.14/drivers/mxc/ipu3/vdoa.h
+--- linux-3.14.17/drivers/mxc/ipu3/vdoa.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/ipu3/vdoa.h 2014-09-09 10:13:49.708961151 +0200
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -186053,9 +188496,9 @@ diff -Nur linux-3.14.15/drivers/mxc/ipu3/vdoa.h linux-linaro-stable-mx6/drivers/
+void vdoa_get_handle(vdoa_handle_t *handle);
+void vdoa_put_handle(vdoa_handle_t *handle);
+#endif
-diff -Nur linux-3.14.15/drivers/mxc/Kconfig linux-linaro-stable-mx6/drivers/mxc/Kconfig
---- linux-3.14.15/drivers/mxc/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/Kconfig 2014-08-20 19:23:53.554845822 +0200
+diff -Nur linux-3.14.17/drivers/mxc/Kconfig linux-imx6-3.14/drivers/mxc/Kconfig
+--- linux-3.14.17/drivers/mxc/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/Kconfig 2014-09-09 10:13:49.692961021 +0200
@@ -0,0 +1,24 @@
+# drivers/mxc/Kconfig
+
@@ -186081,9 +188524,9 @@ diff -Nur linux-3.14.15/drivers/mxc/Kconfig linux-linaro-stable-mx6/drivers/mxc/
+endmenu
+
+endif
-diff -Nur linux-3.14.15/drivers/mxc/Makefile linux-linaro-stable-mx6/drivers/mxc/Makefile
---- linux-3.14.15/drivers/mxc/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/Makefile 2014-08-20 19:23:53.554845822 +0200
+diff -Nur linux-3.14.17/drivers/mxc/Makefile linux-imx6-3.14/drivers/mxc/Makefile
+--- linux-3.14.17/drivers/mxc/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/Makefile 2014-09-09 10:13:49.692961021 +0200
@@ -0,0 +1,7 @@
+obj-$(CONFIG_MXC_GPU_VIV) += gpu-viv/
+obj-$(CONFIG_MXC_IPU_V3) += ipu3/
@@ -186092,9 +188535,9 @@ diff -Nur linux-3.14.15/drivers/mxc/Makefile linux-linaro-stable-mx6/drivers/mxc
+obj-$(CONFIG_MXC_HDMI_CEC) += hdmi-cec/
+obj-$(CONFIG_MXC_MIPI_CSI2) += mipi/
+obj-$(CONFIG_MXC_MLB) += mlb/
-diff -Nur linux-3.14.15/drivers/mxc/mipi/Kconfig linux-linaro-stable-mx6/drivers/mxc/mipi/Kconfig
---- linux-3.14.15/drivers/mxc/mipi/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/mipi/Kconfig 2014-08-20 19:23:53.578845924 +0200
+diff -Nur linux-3.14.17/drivers/mxc/mipi/Kconfig linux-imx6-3.14/drivers/mxc/mipi/Kconfig
+--- linux-3.14.17/drivers/mxc/mipi/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/mipi/Kconfig 2014-09-09 10:13:49.708961151 +0200
@@ -0,0 +1,14 @@
+#
+# MIPI configuration
@@ -186110,17 +188553,17 @@ diff -Nur linux-3.14.15/drivers/mxc/mipi/Kconfig linux-linaro-stable-mx6/drivers
+ Say Y to get the MIPI CSI2 support.
+
+endmenu
-diff -Nur linux-3.14.15/drivers/mxc/mipi/Makefile linux-linaro-stable-mx6/drivers/mxc/mipi/Makefile
---- linux-3.14.15/drivers/mxc/mipi/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/mipi/Makefile 2014-08-20 19:23:53.578845924 +0200
+diff -Nur linux-3.14.17/drivers/mxc/mipi/Makefile linux-imx6-3.14/drivers/mxc/mipi/Makefile
+--- linux-3.14.17/drivers/mxc/mipi/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/mipi/Makefile 2014-09-09 10:13:49.708961151 +0200
@@ -0,0 +1,4 @@
+#
+# Makefile for the mipi interface driver
+#
+obj-$(CONFIG_MXC_MIPI_CSI2) += mxc_mipi_csi2.o
-diff -Nur linux-3.14.15/drivers/mxc/mipi/mxc_mipi_csi2.c linux-linaro-stable-mx6/drivers/mxc/mipi/mxc_mipi_csi2.c
---- linux-3.14.15/drivers/mxc/mipi/mxc_mipi_csi2.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/mipi/mxc_mipi_csi2.c 2014-08-20 19:31:46.140869056 +0200
+diff -Nur linux-3.14.17/drivers/mxc/mipi/mxc_mipi_csi2.c linux-imx6-3.14/drivers/mxc/mipi/mxc_mipi_csi2.c
+--- linux-3.14.17/drivers/mxc/mipi/mxc_mipi_csi2.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/mipi/mxc_mipi_csi2.c 2014-09-09 10:13:49.708961151 +0200
@@ -0,0 +1,540 @@
+/*
+ * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -186662,9 +189105,9 @@ diff -Nur linux-3.14.15/drivers/mxc/mipi/mxc_mipi_csi2.c linux-linaro-stable-mx6
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("i.MX MIPI CSI2 driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/drivers/mxc/mipi/mxc_mipi_csi2.h linux-linaro-stable-mx6/drivers/mxc/mipi/mxc_mipi_csi2.h
---- linux-3.14.15/drivers/mxc/mipi/mxc_mipi_csi2.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/mipi/mxc_mipi_csi2.h 2014-08-20 19:31:46.140869056 +0200
+diff -Nur linux-3.14.17/drivers/mxc/mipi/mxc_mipi_csi2.h linux-imx6-3.14/drivers/mxc/mipi/mxc_mipi_csi2.h
+--- linux-3.14.17/drivers/mxc/mipi/mxc_mipi_csi2.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/mipi/mxc_mipi_csi2.h 2014-09-09 10:13:49.708961151 +0200
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -186712,9 +189155,9 @@ diff -Nur linux-3.14.15/drivers/mxc/mipi/mxc_mipi_csi2.h linux-linaro-stable-mx6
+};
+
+#endif
-diff -Nur linux-3.14.15/drivers/mxc/mlb/Kconfig linux-linaro-stable-mx6/drivers/mxc/mlb/Kconfig
---- linux-3.14.15/drivers/mxc/mlb/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/mlb/Kconfig 2014-08-20 19:23:53.578845924 +0200
+diff -Nur linux-3.14.17/drivers/mxc/mlb/Kconfig linux-imx6-3.14/drivers/mxc/mlb/Kconfig
+--- linux-3.14.17/drivers/mxc/mlb/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/mlb/Kconfig 2014-09-09 10:13:49.708961151 +0200
@@ -0,0 +1,17 @@
+#
+# MLB150 configuration
@@ -186733,18 +189176,18 @@ diff -Nur linux-3.14.15/drivers/mxc/mlb/Kconfig linux-linaro-stable-mx6/drivers/
+ Say Y to get the MLB150 support.
+
+endmenu
-diff -Nur linux-3.14.15/drivers/mxc/mlb/Makefile linux-linaro-stable-mx6/drivers/mxc/mlb/Makefile
---- linux-3.14.15/drivers/mxc/mlb/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/mlb/Makefile 2014-08-20 19:23:53.578845924 +0200
+diff -Nur linux-3.14.17/drivers/mxc/mlb/Makefile linux-imx6-3.14/drivers/mxc/mlb/Makefile
+--- linux-3.14.17/drivers/mxc/mlb/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/mlb/Makefile 2014-09-09 10:13:49.708961151 +0200
@@ -0,0 +1,5 @@
+#
+# Makefile for the i.MX6Q/DL MLB150 driver
+#
+
+obj-$(CONFIG_MXC_MLB150) += mxc_mlb150.o
-diff -Nur linux-3.14.15/drivers/mxc/mlb/mxc_mlb150.c linux-linaro-stable-mx6/drivers/mxc/mlb/mxc_mlb150.c
---- linux-3.14.15/drivers/mxc/mlb/mxc_mlb150.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/mlb/mxc_mlb150.c 2014-08-20 19:23:53.578845924 +0200
+diff -Nur linux-3.14.17/drivers/mxc/mlb/mxc_mlb150.c linux-imx6-3.14/drivers/mxc/mlb/mxc_mlb150.c
+--- linux-3.14.17/drivers/mxc/mlb/mxc_mlb150.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/mlb/mxc_mlb150.c 2014-09-09 10:13:49.708961151 +0200
@@ -0,0 +1,2778 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -189524,9 +191967,9 @@ diff -Nur linux-3.14.15/drivers/mxc/mlb/mxc_mlb150.c linux-linaro-stable-mx6/dri
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("MLB150 low level driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/drivers/mxc/vpu/Kconfig linux-linaro-stable-mx6/drivers/mxc/vpu/Kconfig
---- linux-3.14.15/drivers/mxc/vpu/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/vpu/Kconfig 2014-08-20 19:23:53.578845924 +0200
+diff -Nur linux-3.14.17/drivers/mxc/vpu/Kconfig linux-imx6-3.14/drivers/mxc/vpu/Kconfig
+--- linux-3.14.17/drivers/mxc/vpu/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/vpu/Kconfig 2014-09-09 10:13:49.708961151 +0200
@@ -0,0 +1,31 @@
+#
+# Codec configuration
@@ -189559,9 +192002,9 @@ diff -Nur linux-3.14.15/drivers/mxc/vpu/Kconfig linux-linaro-stable-mx6/drivers/
+ This config is used for special VPU use case.
+
+endmenu
-diff -Nur linux-3.14.15/drivers/mxc/vpu/Makefile linux-linaro-stable-mx6/drivers/mxc/vpu/Makefile
---- linux-3.14.15/drivers/mxc/vpu/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/vpu/Makefile 2014-08-20 19:23:53.578845924 +0200
+diff -Nur linux-3.14.17/drivers/mxc/vpu/Makefile linux-imx6-3.14/drivers/mxc/vpu/Makefile
+--- linux-3.14.17/drivers/mxc/vpu/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/vpu/Makefile 2014-09-09 10:13:49.708961151 +0200
@@ -0,0 +1,9 @@
+#
+# Makefile for the VPU drivers.
@@ -189572,9 +192015,9 @@ diff -Nur linux-3.14.15/drivers/mxc/vpu/Makefile linux-linaro-stable-mx6/drivers
+ifeq ($(CONFIG_MXC_VPU_DEBUG),y)
+EXTRA_CFLAGS += -DDEBUG
+endif
-diff -Nur linux-3.14.15/drivers/mxc/vpu/mxc_vpu.c linux-linaro-stable-mx6/drivers/mxc/vpu/mxc_vpu.c
---- linux-3.14.15/drivers/mxc/vpu/mxc_vpu.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/mxc/vpu/mxc_vpu.c 2014-08-20 19:23:53.578845924 +0200
+diff -Nur linux-3.14.17/drivers/mxc/vpu/mxc_vpu.c linux-imx6-3.14/drivers/mxc/vpu/mxc_vpu.c
+--- linux-3.14.17/drivers/mxc/vpu/mxc_vpu.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/mxc/vpu/mxc_vpu.c 2014-09-09 10:13:49.708961151 +0200
@@ -0,0 +1,1342 @@
+/*
+ * Copyright 2006-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -190918,9 +193361,9 @@ diff -Nur linux-3.14.15/drivers/mxc/vpu/mxc_vpu.c linux-linaro-stable-mx6/driver
+
+module_init(vpu_init);
+module_exit(vpu_exit);
-diff -Nur linux-3.14.15/drivers/net/bonding/bonding.h linux-linaro-stable-mx6/drivers/net/bonding/bonding.h
---- linux-3.14.15/drivers/net/bonding/bonding.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/bonding/bonding.h 2014-08-20 19:31:46.148869092 +0200
+diff -Nur linux-3.14.17/drivers/net/bonding/bonding.h linux-imx6-3.14/drivers/net/bonding/bonding.h
+--- linux-3.14.17/drivers/net/bonding/bonding.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/bonding/bonding.h 2014-09-09 10:13:49.716961215 +0200
@@ -188,7 +188,8 @@
struct net_device *dev; /* first - useful for panic debug */
struct bonding *bond; /* our master */
@@ -190931,9 +193374,9 @@ diff -Nur linux-3.14.15/drivers/net/bonding/bonding.h linux-linaro-stable-mx6/dr
unsigned long last_arp_rx;
unsigned long target_last_arp_rx[BOND_MAX_ARP_TARGETS];
s8 link; /* one of BOND_LINK_XXXX */
-diff -Nur linux-3.14.15/drivers/net/bonding/bond_main.c linux-linaro-stable-mx6/drivers/net/bonding/bond_main.c
---- linux-3.14.15/drivers/net/bonding/bond_main.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/bonding/bond_main.c 2014-08-20 19:31:46.148869092 +0200
+diff -Nur linux-3.14.17/drivers/net/bonding/bond_main.c linux-imx6-3.14/drivers/net/bonding/bond_main.c
+--- linux-3.14.17/drivers/net/bonding/bond_main.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/bonding/bond_main.c 2014-09-09 10:13:49.712961184 +0200
@@ -798,7 +798,7 @@
return;
@@ -191034,9 +193477,9 @@ diff -Nur linux-3.14.15/drivers/net/bonding/bond_main.c linux-linaro-stable-mx6/
rcu_assign_pointer(bond->current_arp_slave, new_slave);
check_state:
-diff -Nur linux-3.14.15/drivers/net/can/flexcan.c linux-linaro-stable-mx6/drivers/net/can/flexcan.c
---- linux-3.14.15/drivers/net/can/flexcan.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/can/flexcan.c 2014-08-20 19:31:46.152869109 +0200
+diff -Nur linux-3.14.17/drivers/net/can/flexcan.c linux-imx6-3.14/drivers/net/can/flexcan.c
+--- linux-3.14.17/drivers/net/can/flexcan.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/can/flexcan.c 2014-09-09 10:13:49.720961249 +0200
@@ -125,7 +125,8 @@
FLEXCAN_ESR_BOFF_INT | FLEXCAN_ESR_ERR_INT)
@@ -191076,9 +193519,9 @@ diff -Nur linux-3.14.15/drivers/net/can/flexcan.c linux-linaro-stable-mx6/driver
return NETDEV_TX_OK;
}
-diff -Nur linux-3.14.15/drivers/net/ethernet/adi/bfin_mac.c linux-linaro-stable-mx6/drivers/net/ethernet/adi/bfin_mac.c
---- linux-3.14.15/drivers/net/ethernet/adi/bfin_mac.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/adi/bfin_mac.c 2014-08-20 19:31:46.168869177 +0200
+diff -Nur linux-3.14.17/drivers/net/ethernet/adi/bfin_mac.c linux-imx6-3.14/drivers/net/ethernet/adi/bfin_mac.c
+--- linux-3.14.17/drivers/net/ethernet/adi/bfin_mac.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/ethernet/adi/bfin_mac.c 2014-09-09 10:13:49.732961347 +0200
@@ -1040,6 +1040,7 @@
.n_alarm = 0,
.n_ext_ts = 0,
@@ -191087,9 +193530,46 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/adi/bfin_mac.c linux-linaro-stable-
.pps = 0,
.adjfreq = bfin_ptp_adjfreq,
.adjtime = bfin_ptp_adjtime,
-diff -Nur linux-3.14.15/drivers/net/ethernet/broadcom/tg3.c linux-linaro-stable-mx6/drivers/net/ethernet/broadcom/tg3.c
---- linux-3.14.15/drivers/net/ethernet/broadcom/tg3.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/broadcom/tg3.c 2014-08-20 19:31:46.220869402 +0200
+diff -Nur linux-3.14.17/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c linux-imx6-3.14/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+--- linux-3.14.17/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c 2014-09-09 10:13:49.752961509 +0200
+@@ -223,12 +223,6 @@
+ --nbd;
+ bd_idx = TX_BD(NEXT_TX_IDX(bd_idx));
+
+- if (tx_buf->flags & BNX2X_HAS_SECOND_PBD) {
+- /* Skip second parse bd... */
+- --nbd;
+- bd_idx = TX_BD(NEXT_TX_IDX(bd_idx));
+- }
+-
+ /* TSO headers+data bds share a common mapping. See bnx2x_tx_split() */
+ if (tx_buf->flags & BNX2X_TSO_SPLIT_BD) {
+ tx_data_bd = &txdata->tx_desc_ring[bd_idx].reg_bd;
+@@ -3874,9 +3868,6 @@
+ /* set encapsulation flag in start BD */
+ SET_FLAG(tx_start_bd->general_data,
+ ETH_TX_START_BD_TUNNEL_EXIST, 1);
+-
+- tx_buf->flags |= BNX2X_HAS_SECOND_PBD;
+-
+ nbd++;
+ } else if (xmit_type & XMIT_CSUM) {
+ /* Set PBD in checksum offload case w/o encapsulation */
+diff -Nur linux-3.14.17/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h linux-imx6-3.14/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+--- linux-3.14.17/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h 2014-09-09 10:13:49.752961509 +0200
+@@ -337,7 +337,6 @@
+ u8 flags;
+ /* Set on the first BD descriptor when there is a split BD */
+ #define BNX2X_TSO_SPLIT_BD (1<<0)
+-#define BNX2X_HAS_SECOND_PBD (1<<1)
+ };
+
+ struct sw_rx_page {
+diff -Nur linux-3.14.17/drivers/net/ethernet/broadcom/tg3.c linux-imx6-3.14/drivers/net/ethernet/broadcom/tg3.c
+--- linux-3.14.17/drivers/net/ethernet/broadcom/tg3.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/ethernet/broadcom/tg3.c 2014-09-09 10:13:49.772961672 +0200
@@ -6322,6 +6322,7 @@
.n_alarm = 0,
.n_ext_ts = 0,
@@ -191098,9 +193578,23 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/broadcom/tg3.c linux-linaro-stable-
.pps = 0,
.adjfreq = tg3_ptp_adjfreq,
.adjtime = tg3_ptp_adjtime,
-diff -Nur linux-3.14.15/drivers/net/ethernet/cadence/macb.c linux-linaro-stable-mx6/drivers/net/ethernet/cadence/macb.c
---- linux-3.14.15/drivers/net/ethernet/cadence/macb.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/cadence/macb.c 2014-08-20 19:31:46.224869419 +0200
+diff -Nur linux-3.14.17/drivers/net/ethernet/brocade/bna/bnad.c linux-imx6-3.14/drivers/net/ethernet/brocade/bna/bnad.c
+--- linux-3.14.17/drivers/net/ethernet/brocade/bna/bnad.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/ethernet/brocade/bna/bnad.c 2014-09-09 10:13:49.776961705 +0200
+@@ -600,9 +600,9 @@
+ prefetch(bnad->netdev);
+
+ cq = ccb->sw_q;
++ cmpl = &cq[ccb->producer_index];
+
+ while (packets < budget) {
+- cmpl = &cq[ccb->producer_index];
+ if (!cmpl->valid)
+ break;
+ /* The 'valid' field is set by the adapter, only after writing
+diff -Nur linux-3.14.17/drivers/net/ethernet/cadence/macb.c linux-imx6-3.14/drivers/net/ethernet/cadence/macb.c
+--- linux-3.14.17/drivers/net/ethernet/cadence/macb.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/ethernet/cadence/macb.c 2014-09-09 10:13:49.776961705 +0200
@@ -605,25 +605,16 @@
{
unsigned int entry;
@@ -191135,9 +193629,9 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/cadence/macb.c linux-linaro-stable-
bp->rx_tail++;
count++;
-diff -Nur linux-3.14.15/drivers/net/ethernet/chelsio/cxgb4vf/sge.c linux-linaro-stable-mx6/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
---- linux-3.14.15/drivers/net/ethernet/chelsio/cxgb4vf/sge.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/chelsio/cxgb4vf/sge.c 2014-08-20 19:31:46.240869487 +0200
+diff -Nur linux-3.14.17/drivers/net/ethernet/chelsio/cxgb4vf/sge.c linux-imx6-3.14/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
+--- linux-3.14.17/drivers/net/ethernet/chelsio/cxgb4vf/sge.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/ethernet/chelsio/cxgb4vf/sge.c 2014-09-09 10:13:49.792961835 +0200
@@ -1510,7 +1510,8 @@
{
struct sk_buff *skb;
@@ -191159,9 +193653,9 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/chelsio/cxgb4vf/sge.c linux-linaro-
if (!pkt->ip_frag)
skb->ip_summed = CHECKSUM_UNNECESSARY;
else {
-diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec.h linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec.h
---- linux-3.14.15/drivers/net/ethernet/freescale/fec.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec.h 2014-08-20 19:31:46.364870019 +0200
+diff -Nur linux-3.14.17/drivers/net/ethernet/freescale/fec.h linux-imx6-3.14/drivers/net/ethernet/freescale/fec.h
+--- linux-3.14.17/drivers/net/ethernet/freescale/fec.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/fec.h 2014-09-09 10:13:49.804961934 +0200
@@ -221,7 +221,7 @@
#define BD_ENET_TX_RCMASK ((ushort)0x003c)
#define BD_ENET_TX_UN ((ushort)0x0002)
@@ -191232,9 +193726,9 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec.h linux-linaro-stable
struct regulator *reg_phy;
};
-diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec_main.c
---- linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec_main.c 2014-08-20 19:31:46.364870019 +0200
+diff -Nur linux-3.14.17/drivers/net/ethernet/freescale/fec_main.c linux-imx6-3.14/drivers/net/ethernet/freescale/fec_main.c
+--- linux-3.14.17/drivers/net/ethernet/freescale/fec_main.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/fec_main.c 2014-09-09 10:13:49.808961966 +0200
@@ -36,6 +36,7 @@
#include <linux/in.h>
#include <linux/ip.h>
@@ -192109,7 +194603,20 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
/* During a receive, the cur_rx points to the current incoming buffer.
* When we update through the ring, if the next incoming buffer has
-@@ -886,8 +1227,7 @@
+@@ -876,8 +1217,11 @@
+
+ while (!((status = bdp->cbd_sc) & BD_ENET_RX_EMPTY)) {
+
+- if (pkt_received >= budget)
++ if (pkt_received >= budget) {
++ /* overwhelmed take a breath */
++ udelay(210);
+ break;
++ }
+ pkt_received++;
+
+ /* Since we have allocated space to hold a complete frame,
+@@ -886,8 +1230,7 @@
if ((status & BD_ENET_RX_LAST) == 0)
netdev_err(ndev, "rcv is not +last\n");
@@ -192119,7 +194626,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
/* Check for errors. */
if (status & (BD_ENET_RX_LG | BD_ENET_RX_SH | BD_ENET_RX_NO |
-@@ -920,11 +1260,7 @@
+@@ -920,11 +1263,7 @@
pkt_len = bdp->cbd_datlen;
ndev->stats.rx_bytes += pkt_len;
@@ -192132,7 +194639,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
data = fep->rx_skbuff[index]->data;
dma_sync_single_for_cpu(&fep->pdev->dev, bdp->cbd_bufaddr,
FEC_ENET_RX_FRSIZE, DMA_FROM_DEVICE);
-@@ -975,18 +1311,9 @@
+@@ -975,18 +1314,9 @@
skb->protocol = eth_type_trans(skb, ndev);
/* Get receive timestamp from the skb */
@@ -192154,7 +194661,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
if (fep->bufdesc_ex &&
(fep->csum_flags & FLAG_RX_CSUM_ENABLED)) {
-@@ -1044,29 +1371,25 @@
+@@ -1044,29 +1374,25 @@
{
struct net_device *ndev = dev_id;
struct fec_enet_private *fep = netdev_priv(ndev);
@@ -192197,7 +194704,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
return ret;
}
-@@ -1074,8 +1397,16 @@
+@@ -1074,8 +1400,16 @@
static int fec_enet_rx_napi(struct napi_struct *napi, int budget)
{
struct net_device *ndev = napi->dev;
@@ -192215,7 +194722,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
fec_enet_tx(ndev);
-@@ -1173,14 +1504,23 @@
+@@ -1173,14 +1507,23 @@
return;
}
@@ -192241,7 +194748,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
if (phy_dev->speed != fep->speed) {
fep->speed = phy_dev->speed;
-@@ -1188,11 +1528,21 @@
+@@ -1188,11 +1531,21 @@
}
/* if any of the above changed restart the FEC */
@@ -192265,7 +194772,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
fep->link = phy_dev->link;
status_change = 1;
}
-@@ -1255,9 +1605,51 @@
+@@ -1255,9 +1608,51 @@
return 0;
}
@@ -192318,7 +194825,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
}
static int fec_enet_mii_probe(struct net_device *ndev)
-@@ -1304,6 +1696,7 @@
+@@ -1304,6 +1699,7 @@
/* mask with MAC supported features */
if (id_entry->driver_data & FEC_QUIRK_HAS_GBIT) {
phy_dev->supported &= PHY_GBIT_FEATURES;
@@ -192326,7 +194833,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
#if !defined(CONFIG_M5272)
phy_dev->supported |= SUPPORTED_Pause;
#endif
-@@ -1369,7 +1762,7 @@
+@@ -1369,7 +1765,7 @@
* Reference Manual has an error on this, and gets fixed on i.MX6Q
* document.
*/
@@ -192335,7 +194842,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
if (id_entry->driver_data & FEC_QUIRK_ENET_MAC)
fep->phy_speed--;
fep->phy_speed <<= 1;
-@@ -1384,7 +1777,6 @@
+@@ -1384,7 +1780,6 @@
fep->mii_bus->name = "fec_enet_mii_bus";
fep->mii_bus->read = fec_enet_mdio_read;
fep->mii_bus->write = fec_enet_mdio_write;
@@ -192343,7 +194850,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
snprintf(fep->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
pdev->name, fep->dev_id + 1);
fep->mii_bus->priv = fep;
-@@ -1508,6 +1900,9 @@
+@@ -1508,6 +1903,9 @@
{
struct fec_enet_private *fep = netdev_priv(ndev);
@@ -192353,7 +194860,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
if (pause->tx_pause != pause->rx_pause) {
netdev_info(ndev,
"hardware only support enable/disable both tx and rx");
-@@ -1533,8 +1928,14 @@
+@@ -1533,8 +1931,14 @@
fec_stop(ndev);
phy_start_aneg(fep->phy_dev);
}
@@ -192370,7 +194877,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
return 0;
}
-@@ -1651,21 +2052,19 @@
+@@ -1651,21 +2055,19 @@
}
static const struct ethtool_ops fec_enet_ethtool_ops = {
@@ -192397,7 +194904,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
};
static int fec_enet_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)
-@@ -1699,18 +2098,23 @@
+@@ -1699,18 +2101,23 @@
bdp = fep->rx_bd_base;
for (i = 0; i < fep->rx_ring_size; i++) {
skb = fep->rx_skbuff[i];
@@ -192425,7 +194932,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
}
static int fec_enet_alloc_buffers(struct net_device *ndev)
-@@ -1722,21 +2126,23 @@
+@@ -1722,21 +2129,23 @@
bdp = fep->rx_bd_base;
for (i = 0; i < fep->rx_ring_size; i++) {
@@ -192458,7 +194965,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
bdp->cbd_sc = BD_ENET_RX_EMPTY;
if (fep->bufdesc_ex) {
-@@ -1754,6 +2160,8 @@
+@@ -1754,6 +2163,8 @@
bdp = fep->tx_bd_base;
for (i = 0; i < fep->tx_ring_size; i++) {
fep->tx_bounce[i] = kmalloc(FEC_ENET_TX_FRSIZE, GFP_KERNEL);
@@ -192467,7 +194974,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
bdp->cbd_sc = 0;
bdp->cbd_bufaddr = 0;
-@@ -1771,14 +2179,35 @@
+@@ -1771,14 +2182,35 @@
bdp->cbd_sc |= BD_SC_WRAP;
return 0;
@@ -192503,7 +195010,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
/* I should reset the ring buffers here, but I don't yet know
* a simple way to do that.
*/
-@@ -1794,10 +2223,12 @@
+@@ -1794,10 +2226,12 @@
return ret;
}
@@ -192517,7 +195024,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
return 0;
}
-@@ -1806,17 +2237,22 @@
+@@ -1806,17 +2240,22 @@
{
struct fec_enet_private *fep = netdev_priv(ndev);
@@ -192548,7 +195055,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
fec_enet_free_buffers(ndev);
return 0;
-@@ -1904,10 +2340,11 @@
+@@ -1904,10 +2343,11 @@
struct fec_enet_private *fep = netdev_priv(ndev);
struct sockaddr *addr = p;
@@ -192564,7 +195071,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
writel(ndev->dev_addr[3] | (ndev->dev_addr[2] << 8) |
(ndev->dev_addr[1] << 16) | (ndev->dev_addr[0] << 24),
-@@ -1940,12 +2377,21 @@
+@@ -1940,12 +2380,21 @@
}
#endif
@@ -192586,7 +195093,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
netdev->features = features;
/* Receive checksum has been changed */
-@@ -1954,14 +2400,14 @@
+@@ -1954,14 +2403,14 @@
fep->csum_flags |= FLAG_RX_CSUM_ENABLED;
else
fep->csum_flags &= ~FLAG_RX_CSUM_ENABLED;
@@ -192608,7 +195115,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
}
return 0;
-@@ -1993,23 +2439,43 @@
+@@ -1993,23 +2442,43 @@
const struct platform_device_id *id_entry =
platform_get_device_id(fep->pdev);
struct bufdesc *cbd_base;
@@ -192657,7 +195164,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
/* Set receive and transmit descriptor base. */
fep->rx_bd_base = cbd_base;
-@@ -2027,22 +2493,22 @@
+@@ -2027,22 +2496,22 @@
writel(FEC_RX_DISABLED_IMASK, fep->hwp + FEC_IMASK);
netif_napi_add(ndev, &fep->napi, fec_enet_rx_napi, NAPI_POLL_WEIGHT);
@@ -192687,7 +195194,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
return 0;
}
-@@ -2117,6 +2583,9 @@
+@@ -2117,6 +2586,9 @@
fep->pause_flag |= FEC_PAUSE_FLAG_AUTONEG;
#endif
@@ -192697,7 +195204,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
fep->hwp = devm_ioremap_resource(&pdev->dev, r);
if (IS_ERR(fep->hwp)) {
-@@ -2167,26 +2636,10 @@
+@@ -2167,26 +2639,10 @@
fep->bufdesc_ex = 0;
}
@@ -192725,7 +195232,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
fep->reg_phy = devm_regulator_get(&pdev->dev, "phy");
if (!IS_ERR(fep->reg_phy)) {
ret = regulator_enable(fep->reg_phy);
-@@ -2228,6 +2681,8 @@
+@@ -2228,6 +2684,8 @@
/* Carrier starts down, phylib will bring it up */
netif_carrier_off(ndev);
@@ -192734,7 +195241,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
ret = register_netdev(ndev);
if (ret)
-@@ -2236,7 +2691,7 @@
+@@ -2236,7 +2694,7 @@
if (fep->bufdesc_ex && fep->ptp_clock)
netdev_info(ndev, "registered PHC device %d\n", fep->dev_id);
@@ -192743,7 +195250,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
return 0;
failed_register:
-@@ -2247,15 +2702,7 @@
+@@ -2247,15 +2705,7 @@
if (fep->reg_phy)
regulator_disable(fep->reg_phy);
failed_regulator:
@@ -192760,7 +195267,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
failed_clk:
failed_ioremap:
free_netdev(ndev);
-@@ -2269,42 +2716,40 @@
+@@ -2269,42 +2719,40 @@
struct net_device *ndev = platform_get_drvdata(pdev);
struct fec_enet_private *fep = netdev_priv(ndev);
@@ -192816,7 +195323,7 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
if (fep->reg_phy)
regulator_disable(fep->reg_phy);
-@@ -2325,48 +2770,49 @@
+@@ -2325,48 +2773,49 @@
return ret;
}
@@ -192894,9 +195401,9 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_main.c linux-linaro-s
static struct platform_driver fec_driver = {
.driver = {
-diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_ptp.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec_ptp.c
---- linux-3.14.15/drivers/net/ethernet/freescale/fec_ptp.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec_ptp.c 2014-08-20 19:31:46.368870036 +0200
+diff -Nur linux-3.14.17/drivers/net/ethernet/freescale/fec_ptp.c linux-imx6-3.14/drivers/net/ethernet/freescale/fec_ptp.c
+--- linux-3.14.17/drivers/net/ethernet/freescale/fec_ptp.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/fec_ptp.c 2014-09-09 10:13:49.808961966 +0200
@@ -372,6 +372,7 @@
fep->ptp_caps.n_alarm = 0;
fep->ptp_caps.n_ext_ts = 0;
@@ -192905,9 +195412,9 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fec_ptp.c linux-linaro-st
fep->ptp_caps.pps = 0;
fep->ptp_caps.adjfreq = fec_ptp_adjfreq;
fep->ptp_caps.adjtime = fec_ptp_adjtime;
-diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
---- linux-3.14.15/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c 2014-08-20 19:31:46.384870105 +0200
+diff -Nur linux-3.14.17/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c linux-imx6-3.14/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
+--- linux-3.14.17/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c 2014-09-09 10:13:49.808961966 +0200
@@ -91,6 +91,9 @@
u16 pkt_len, sc;
int curidx;
@@ -192949,9 +195456,9 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c li
if (of_device_is_compatible(ofdev->dev.of_node, "fsl,mpc5125-fec")) {
phy_connection_type = of_get_property(ofdev->dev.of_node,
-diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fs_enet/mii-fec.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
---- linux-3.14.15/drivers/net/ethernet/freescale/fs_enet/mii-fec.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/mii-fec.c 2014-08-20 19:31:46.424870276 +0200
+diff -Nur linux-3.14.17/drivers/net/ethernet/freescale/fs_enet/mii-fec.c linux-imx6-3.14/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
+--- linux-3.14.17/drivers/net/ethernet/freescale/fs_enet/mii-fec.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/fs_enet/mii-fec.c 2014-09-09 10:13:49.808961966 +0200
@@ -95,12 +95,6 @@
}
@@ -192973,9 +195480,9 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/fs_enet/mii-fec.c linux-l
ret = of_address_to_resource(ofdev->dev.of_node, 0, &res);
if (ret)
-diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/gianfar.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar.c
---- linux-3.14.15/drivers/net/ethernet/freescale/gianfar.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar.c 2014-08-20 19:31:46.424870276 +0200
+diff -Nur linux-3.14.17/drivers/net/ethernet/freescale/gianfar.c linux-imx6-3.14/drivers/net/ethernet/freescale/gianfar.c
+--- linux-3.14.17/drivers/net/ethernet/freescale/gianfar.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/gianfar.c 2014-09-09 10:13:49.808961966 +0200
@@ -9,7 +9,7 @@
* Maintainer: Kumar Gala
* Modifier: Sandeep Gopalpet <sandeep.kumar@freescale.com>
@@ -195178,9 +197685,9 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/gianfar.c linux-linaro-st
static struct of_device_id gfar_match[] =
{
{
-diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/gianfar_ethtool.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar_ethtool.c
---- linux-3.14.15/drivers/net/ethernet/freescale/gianfar_ethtool.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar_ethtool.c 2014-08-20 19:31:46.428870293 +0200
+diff -Nur linux-3.14.17/drivers/net/ethernet/freescale/gianfar_ethtool.c linux-imx6-3.14/drivers/net/ethernet/freescale/gianfar_ethtool.c
+--- linux-3.14.17/drivers/net/ethernet/freescale/gianfar_ethtool.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/gianfar_ethtool.c 2014-09-09 10:13:49.808961966 +0200
@@ -44,10 +44,6 @@
#include "gianfar.h"
@@ -195460,9 +197967,9 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/gianfar_ethtool.c linux-l
mutex_lock(&priv->rx_queue_access);
switch (cmd->cmd) {
-diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/gianfar.h linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar.h
---- linux-3.14.15/drivers/net/ethernet/freescale/gianfar.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar.h 2014-08-20 19:31:46.424870276 +0200
+diff -Nur linux-3.14.17/drivers/net/ethernet/freescale/gianfar.h linux-imx6-3.14/drivers/net/ethernet/freescale/gianfar.h
+--- linux-3.14.17/drivers/net/ethernet/freescale/gianfar.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/gianfar.h 2014-09-09 10:13:49.808961966 +0200
@@ -9,7 +9,7 @@
* Maintainer: Kumar Gala
* Modifier: Sandeep Gopalpet <sandeep.kumar@freescale.com>
@@ -195702,9 +198209,9 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/gianfar.h linux-linaro-st
extern const struct ethtool_ops gfar_ethtool_ops;
-diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/gianfar_ptp.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar_ptp.c
---- linux-3.14.15/drivers/net/ethernet/freescale/gianfar_ptp.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar_ptp.c 2014-08-20 19:31:46.428870293 +0200
+diff -Nur linux-3.14.17/drivers/net/ethernet/freescale/gianfar_ptp.c linux-imx6-3.14/drivers/net/ethernet/freescale/gianfar_ptp.c
+--- linux-3.14.17/drivers/net/ethernet/freescale/gianfar_ptp.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/gianfar_ptp.c 2014-09-09 10:13:49.808961966 +0200
@@ -414,6 +414,7 @@
.n_alarm = 0,
.n_ext_ts = N_EXT_TS,
@@ -195713,9 +198220,9 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/gianfar_ptp.c linux-linar
.pps = 1,
.adjfreq = ptp_gianfar_adjfreq,
.adjtime = ptp_gianfar_adjtime,
-diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/gianfar_sysfs.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar_sysfs.c
---- linux-3.14.15/drivers/net/ethernet/freescale/gianfar_sysfs.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar_sysfs.c 1970-01-01 01:00:00.000000000 +0100
+diff -Nur linux-3.14.17/drivers/net/ethernet/freescale/gianfar_sysfs.c linux-imx6-3.14/drivers/net/ethernet/freescale/gianfar_sysfs.c
+--- linux-3.14.17/drivers/net/ethernet/freescale/gianfar_sysfs.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/gianfar_sysfs.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,340 +0,0 @@
-/*
- * drivers/net/ethernet/freescale/gianfar_sysfs.c
@@ -196057,9 +198564,9 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/gianfar_sysfs.c linux-lin
- if (rc)
- dev_err(&dev->dev, "Error creating gianfar sysfs files\n");
-}
-diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/Kconfig linux-linaro-stable-mx6/drivers/net/ethernet/freescale/Kconfig
---- linux-3.14.15/drivers/net/ethernet/freescale/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/Kconfig 2014-08-20 19:31:46.364870019 +0200
+diff -Nur linux-3.14.17/drivers/net/ethernet/freescale/Kconfig linux-imx6-3.14/drivers/net/ethernet/freescale/Kconfig
+--- linux-3.14.17/drivers/net/ethernet/freescale/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/Kconfig 2014-09-09 10:13:49.804961934 +0200
@@ -67,6 +67,7 @@
tristate "Freescale XGMAC MDIO"
depends on FSL_SOC
@@ -196068,9 +198575,9 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/Kconfig linux-linaro-stab
---help---
This driver supports the MDIO bus on the Fman 10G Ethernet MACs.
-diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/Makefile linux-linaro-stable-mx6/drivers/net/ethernet/freescale/Makefile
---- linux-3.14.15/drivers/net/ethernet/freescale/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/Makefile 2014-08-20 19:31:46.364870019 +0200
+diff -Nur linux-3.14.17/drivers/net/ethernet/freescale/Makefile linux-imx6-3.14/drivers/net/ethernet/freescale/Makefile
+--- linux-3.14.17/drivers/net/ethernet/freescale/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/Makefile 2014-09-09 10:13:49.804961934 +0200
@@ -14,7 +14,6 @@
obj-$(CONFIG_GIANFAR) += gianfar_driver.o
obj-$(CONFIG_PTP_1588_CLOCK_GIANFAR) += gianfar_ptp.o
@@ -196080,9 +198587,9 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/Makefile linux-linaro-sta
+ gianfar_ethtool.o
obj-$(CONFIG_UCC_GETH) += ucc_geth_driver.o
ucc_geth_driver-objs := ucc_geth.o ucc_geth_ethtool.o
-diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/ucc_geth.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/ucc_geth.c
---- linux-3.14.15/drivers/net/ethernet/freescale/ucc_geth.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/ucc_geth.c 2014-08-20 19:31:46.428870293 +0200
+diff -Nur linux-3.14.17/drivers/net/ethernet/freescale/ucc_geth.c linux-imx6-3.14/drivers/net/ethernet/freescale/ucc_geth.c
+--- linux-3.14.17/drivers/net/ethernet/freescale/ucc_geth.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/ucc_geth.c 2014-09-09 10:13:49.812961999 +0200
@@ -1728,9 +1728,6 @@
phydev = of_phy_connect(dev, ug_info->phy_node, &adjust_link, 0,
@@ -196120,9 +198627,9 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/ucc_geth.c linux-linaro-s
/* Find the TBI PHY node. If it's not there, we don't support SGMII */
ug_info->tbi_node = of_parse_phandle(np, "tbi-handle", 0);
-diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/xgmac_mdio.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/xgmac_mdio.c
---- linux-3.14.15/drivers/net/ethernet/freescale/xgmac_mdio.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/xgmac_mdio.c 2014-08-20 19:31:46.428870293 +0200
+diff -Nur linux-3.14.17/drivers/net/ethernet/freescale/xgmac_mdio.c linux-imx6-3.14/drivers/net/ethernet/freescale/xgmac_mdio.c
+--- linux-3.14.17/drivers/net/ethernet/freescale/xgmac_mdio.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/xgmac_mdio.c 2014-09-09 10:13:49.812961999 +0200
@@ -162,7 +162,9 @@
/* Return all Fs if nothing was there */
@@ -196134,9 +198641,9 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/freescale/xgmac_mdio.c linux-linaro
return 0xffff;
}
-diff -Nur linux-3.14.15/drivers/net/ethernet/intel/e1000e/ptp.c linux-linaro-stable-mx6/drivers/net/ethernet/intel/e1000e/ptp.c
---- linux-3.14.15/drivers/net/ethernet/intel/e1000e/ptp.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/intel/e1000e/ptp.c 2014-08-20 19:31:46.508870637 +0200
+diff -Nur linux-3.14.17/drivers/net/ethernet/intel/e1000e/ptp.c linux-imx6-3.14/drivers/net/ethernet/intel/e1000e/ptp.c
+--- linux-3.14.17/drivers/net/ethernet/intel/e1000e/ptp.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/ethernet/intel/e1000e/ptp.c 2014-09-09 10:13:49.828962129 +0200
@@ -191,6 +191,7 @@
.n_alarm = 0,
.n_ext_ts = 0,
@@ -196145,9 +198652,9 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/intel/e1000e/ptp.c linux-linaro-sta
.pps = 0,
.adjfreq = e1000e_phc_adjfreq,
.adjtime = e1000e_phc_adjtime,
-diff -Nur linux-3.14.15/drivers/net/ethernet/mellanox/mlx4/en_clock.c linux-linaro-stable-mx6/drivers/net/ethernet/mellanox/mlx4/en_clock.c
---- linux-3.14.15/drivers/net/ethernet/mellanox/mlx4/en_clock.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/mellanox/mlx4/en_clock.c 2014-08-20 19:31:46.560870860 +0200
+diff -Nur linux-3.14.17/drivers/net/ethernet/mellanox/mlx4/en_clock.c linux-imx6-3.14/drivers/net/ethernet/mellanox/mlx4/en_clock.c
+--- linux-3.14.17/drivers/net/ethernet/mellanox/mlx4/en_clock.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/ethernet/mellanox/mlx4/en_clock.c 2014-09-09 10:13:49.904962750 +0200
@@ -276,6 +276,7 @@
.n_alarm = 0,
.n_ext_ts = 0,
@@ -196156,9 +198663,9 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/mellanox/mlx4/en_clock.c linux-lina
.pps = 0,
.adjfreq = mlx4_en_phc_adjfreq,
.adjtime = mlx4_en_phc_adjtime,
-diff -Nur linux-3.14.15/drivers/net/ethernet/sfc/ptp.c linux-linaro-stable-mx6/drivers/net/ethernet/sfc/ptp.c
---- linux-3.14.15/drivers/net/ethernet/sfc/ptp.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/sfc/ptp.c 2014-08-20 19:31:46.628871152 +0200
+diff -Nur linux-3.14.17/drivers/net/ethernet/sfc/ptp.c linux-imx6-3.14/drivers/net/ethernet/sfc/ptp.c
+--- linux-3.14.17/drivers/net/ethernet/sfc/ptp.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/ethernet/sfc/ptp.c 2014-09-09 10:13:49.952963141 +0200
@@ -1208,6 +1208,7 @@
.n_alarm = 0,
.n_ext_ts = 0,
@@ -196167,9 +198674,9 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/sfc/ptp.c linux-linaro-stable-mx6/d
.pps = 1,
.adjfreq = efx_phc_adjfreq,
.adjtime = efx_phc_adjtime,
-diff -Nur linux-3.14.15/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c linux-linaro-stable-mx6/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
---- linux-3.14.15/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c 2014-08-20 19:31:46.644871222 +0200
+diff -Nur linux-3.14.17/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c linux-imx6-3.14/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
+--- linux-3.14.17/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c 2014-09-09 10:13:49.964963238 +0200
@@ -164,6 +164,7 @@
.n_alarm = 0,
.n_ext_ts = 0,
@@ -196178,9 +198685,9 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c linux-l
.pps = 0,
.adjfreq = stmmac_adjust_freq,
.adjtime = stmmac_adjust_time,
-diff -Nur linux-3.14.15/drivers/net/ethernet/ti/cpts.c linux-linaro-stable-mx6/drivers/net/ethernet/ti/cpts.c
---- linux-3.14.15/drivers/net/ethernet/ti/cpts.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/ti/cpts.c 2014-08-20 19:31:46.656871271 +0200
+diff -Nur linux-3.14.17/drivers/net/ethernet/ti/cpts.c linux-imx6-3.14/drivers/net/ethernet/ti/cpts.c
+--- linux-3.14.17/drivers/net/ethernet/ti/cpts.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/ethernet/ti/cpts.c 2014-09-09 10:13:49.972963304 +0200
@@ -217,6 +217,7 @@
.name = "CTPS timer",
.max_adj = 1000000,
@@ -196189,9 +198696,9 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/ti/cpts.c linux-linaro-stable-mx6/d
.pps = 0,
.adjfreq = cpts_ptp_adjfreq,
.adjtime = cpts_ptp_adjtime,
-diff -Nur linux-3.14.15/drivers/net/ethernet/tile/tilegx.c linux-linaro-stable-mx6/drivers/net/ethernet/tile/tilegx.c
---- linux-3.14.15/drivers/net/ethernet/tile/tilegx.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ethernet/tile/tilegx.c 2014-08-20 19:31:46.660871289 +0200
+diff -Nur linux-3.14.17/drivers/net/ethernet/tile/tilegx.c linux-imx6-3.14/drivers/net/ethernet/tile/tilegx.c
+--- linux-3.14.17/drivers/net/ethernet/tile/tilegx.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/ethernet/tile/tilegx.c 2014-09-09 10:13:49.976963337 +0200
@@ -870,6 +870,7 @@
.name = "mPIPE clock",
.max_adj = 999999999,
@@ -196200,9 +198707,9 @@ diff -Nur linux-3.14.15/drivers/net/ethernet/tile/tilegx.c linux-linaro-stable-m
.pps = 0,
.adjfreq = ptp_mpipe_adjfreq,
.adjtime = ptp_mpipe_adjtime,
-diff -Nur linux-3.14.15/drivers/net/ieee802154/Kconfig linux-linaro-stable-mx6/drivers/net/ieee802154/Kconfig
---- linux-3.14.15/drivers/net/ieee802154/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/ieee802154/Kconfig 2014-08-20 19:31:46.676871358 +0200
+diff -Nur linux-3.14.17/drivers/net/ieee802154/Kconfig linux-imx6-3.14/drivers/net/ieee802154/Kconfig
+--- linux-3.14.17/drivers/net/ieee802154/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/ieee802154/Kconfig 2014-09-09 10:13:49.992963467 +0200
@@ -15,9 +15,9 @@
depends on IEEE802154_DRIVERS
---help---
@@ -196244,9 +198751,20 @@ diff -Nur linux-3.14.15/drivers/net/ieee802154/Kconfig linux-linaro-stable-mx6/d
- the module will be called 'mrf24j40'.
+ This driver can also be built as a module. To do so, say M here.
+ the module will be called 'mrf24j40'.
-diff -Nur linux-3.14.15/drivers/net/phy/at803x.c linux-linaro-stable-mx6/drivers/net/phy/at803x.c
---- linux-3.14.15/drivers/net/phy/at803x.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/phy/at803x.c 2014-08-20 19:31:46.688871410 +0200
+diff -Nur linux-3.14.17/drivers/net/macvlan.c linux-imx6-3.14/drivers/net/macvlan.c
+--- linux-3.14.17/drivers/net/macvlan.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/macvlan.c 2014-09-09 10:13:50.004963565 +0200
+@@ -548,7 +548,6 @@
+ (lowerdev->state & MACVLAN_STATE_MASK);
+ dev->features = lowerdev->features & MACVLAN_FEATURES;
+ dev->features |= ALWAYS_ON_FEATURES;
+- dev->vlan_features = lowerdev->vlan_features & MACVLAN_FEATURES;
+ dev->gso_max_size = lowerdev->gso_max_size;
+ dev->iflink = lowerdev->ifindex;
+ dev->hard_header_len = lowerdev->hard_header_len;
+diff -Nur linux-3.14.17/drivers/net/phy/at803x.c linux-imx6-3.14/drivers/net/phy/at803x.c
+--- linux-3.14.17/drivers/net/phy/at803x.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/phy/at803x.c 2014-09-09 10:13:50.004963565 +0200
@@ -27,6 +27,9 @@
#define AT803X_MMD_ACCESS_CONTROL 0x0D
#define AT803X_MMD_ACCESS_CONTROL_DATA 0x0E
@@ -196353,9 +198871,18 @@ diff -Nur linux-3.14.15/drivers/net/phy/at803x.c linux-linaro-stable-mx6/drivers
}
module_init(atheros_init);
-diff -Nur linux-3.14.15/drivers/net/phy/phy_device.c linux-linaro-stable-mx6/drivers/net/phy/phy_device.c
---- linux-3.14.15/drivers/net/phy/phy_device.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/phy/phy_device.c 2014-08-20 19:31:46.700871461 +0200
+diff -Nur linux-3.14.17/drivers/net/phy/phy_device.c linux-imx6-3.14/drivers/net/phy/phy_device.c
+--- linux-3.14.17/drivers/net/phy/phy_device.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/phy/phy_device.c 2014-09-09 10:13:50.008963597 +0200
+@@ -353,7 +353,7 @@
+ phydev->bus->phy_map[phydev->addr] = phydev;
+
+ /* Run all of the fixups for this PHY */
+- err = phy_scan_fixups(phydev);
++ err = phy_init_hw(phydev);
+ if (err) {
+ pr_err("PHY %d failed to initialize\n", phydev->addr);
+ goto out;
@@ -1029,7 +1029,7 @@
return 0;
}
@@ -196374,9 +198901,9 @@ diff -Nur linux-3.14.15/drivers/net/phy/phy_device.c linux-linaro-stable-mx6/dri
static int gen10g_config_init(struct phy_device *phydev)
{
/* Temporarily just say we support everything */
-diff -Nur linux-3.14.15/drivers/net/phy/smsc.c linux-linaro-stable-mx6/drivers/net/phy/smsc.c
---- linux-3.14.15/drivers/net/phy/smsc.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/phy/smsc.c 2014-08-20 19:31:46.700871461 +0200
+diff -Nur linux-3.14.17/drivers/net/phy/smsc.c linux-imx6-3.14/drivers/net/phy/smsc.c
+--- linux-3.14.17/drivers/net/phy/smsc.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/phy/smsc.c 2014-09-09 10:13:50.008963597 +0200
@@ -249,8 +249,7 @@
static void __exit smsc_exit(void)
@@ -196387,9 +198914,9 @@ diff -Nur linux-3.14.15/drivers/net/phy/smsc.c linux-linaro-stable-mx6/drivers/n
}
MODULE_DESCRIPTION("SMSC PHY driver");
-diff -Nur linux-3.14.15/drivers/net/phy/vitesse.c linux-linaro-stable-mx6/drivers/net/phy/vitesse.c
---- linux-3.14.15/drivers/net/phy/vitesse.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/phy/vitesse.c 2014-08-20 19:31:46.704871478 +0200
+diff -Nur linux-3.14.17/drivers/net/phy/vitesse.c linux-imx6-3.14/drivers/net/phy/vitesse.c
+--- linux-3.14.17/drivers/net/phy/vitesse.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/phy/vitesse.c 2014-09-09 10:13:50.008963597 +0200
@@ -319,8 +319,7 @@
static void __exit vsc82xx_exit(void)
@@ -196400,9 +198927,21 @@ diff -Nur linux-3.14.15/drivers/net/phy/vitesse.c linux-linaro-stable-mx6/driver
}
module_init(vsc82xx_init);
-diff -Nur linux-3.14.15/drivers/net/veth.c linux-linaro-stable-mx6/drivers/net/veth.c
---- linux-3.14.15/drivers/net/veth.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/veth.c 2014-08-20 19:31:46.736871615 +0200
+diff -Nur linux-3.14.17/drivers/net/ppp/pptp.c linux-imx6-3.14/drivers/net/ppp/pptp.c
+--- linux-3.14.17/drivers/net/ppp/pptp.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/ppp/pptp.c 2014-09-09 10:13:50.012963629 +0200
+@@ -281,7 +281,7 @@
+ nf_reset(skb);
+
+ skb->ip_summed = CHECKSUM_NONE;
+- ip_select_ident(skb, NULL);
++ ip_select_ident(skb, &rt->dst, NULL);
+ ip_send_check(iph);
+
+ ip_local_out(skb);
+diff -Nur linux-3.14.17/drivers/net/veth.c linux-imx6-3.14/drivers/net/veth.c
+--- linux-3.14.17/drivers/net/veth.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/veth.c 2014-09-09 10:13:50.020963696 +0200
@@ -14,6 +14,7 @@
#include <linux/etherdevice.h>
#include <linux/u64_stats_sync.h>
@@ -196425,9 +198964,9 @@ diff -Nur linux-3.14.15/drivers/net/veth.c linux-linaro-stable-mx6/drivers/net/v
if (err < 0)
return err;
-diff -Nur linux-3.14.15/drivers/net/wireless/ath/ar5523/ar5523.c linux-linaro-stable-mx6/drivers/net/wireless/ath/ar5523/ar5523.c
---- linux-3.14.15/drivers/net/wireless/ath/ar5523/ar5523.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/ath/ar5523/ar5523.c 2014-08-20 19:31:46.748871667 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/ath/ar5523/ar5523.c linux-imx6-3.14/drivers/net/wireless/ath/ar5523/ar5523.c
+--- linux-3.14.17/drivers/net/wireless/ath/ar5523/ar5523.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/ath/ar5523/ar5523.c 2014-09-09 10:13:50.036963825 +0200
@@ -1090,7 +1090,8 @@
return ret;
}
@@ -196438,9 +198977,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/ath/ar5523/ar5523.c linux-linaro-st
{
struct ar5523 *ar = hw->priv;
-diff -Nur linux-3.14.15/drivers/net/wireless/ath/ath10k/mac.c linux-linaro-stable-mx6/drivers/net/wireless/ath/ath10k/mac.c
---- linux-3.14.15/drivers/net/wireless/ath/ath10k/mac.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/ath/ath10k/mac.c 2014-08-20 19:31:46.764871737 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/ath/ath10k/mac.c linux-imx6-3.14/drivers/net/wireless/ath/ath10k/mac.c
+--- linux-3.14.17/drivers/net/wireless/ath/ath10k/mac.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/ath/ath10k/mac.c 2014-09-09 10:13:50.040963859 +0200
@@ -3183,7 +3183,8 @@
return ret;
}
@@ -196451,9 +198990,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/ath/ath10k/mac.c linux-linaro-stabl
{
struct ath10k *ar = hw->priv;
bool skip;
-diff -Nur linux-3.14.15/drivers/net/wireless/ath/ath6kl/cfg80211.c linux-linaro-stable-mx6/drivers/net/wireless/ath/ath6kl/cfg80211.c
---- linux-3.14.15/drivers/net/wireless/ath/ath6kl/cfg80211.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/ath/ath6kl/cfg80211.c 2014-08-20 19:31:46.772871770 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/ath/ath6kl/cfg80211.c linux-imx6-3.14/drivers/net/wireless/ath/ath6kl/cfg80211.c
+--- linux-3.14.17/drivers/net/wireless/ath/ath6kl/cfg80211.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/ath/ath6kl/cfg80211.c 2014-09-09 10:13:50.048963923 +0200
@@ -790,7 +790,7 @@
if (nw_type & ADHOC_NETWORK) {
ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "ad-hoc %s selected\n",
@@ -196478,9 +199017,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/ath/ath6kl/cfg80211.c linux-linaro-
return;
}
-diff -Nur linux-3.14.15/drivers/net/wireless/ath/ath6kl/hif.h linux-linaro-stable-mx6/drivers/net/wireless/ath/ath6kl/hif.h
---- linux-3.14.15/drivers/net/wireless/ath/ath6kl/hif.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/ath/ath6kl/hif.h 2014-08-20 19:23:54.246848776 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/ath/ath6kl/hif.h linux-imx6-3.14/drivers/net/wireless/ath/ath6kl/hif.h
+--- linux-3.14.17/drivers/net/wireless/ath/ath6kl/hif.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/ath/ath6kl/hif.h 2014-09-09 10:13:50.052963956 +0200
@@ -197,9 +197,9 @@
/* bounce buffer for upper layers to copy to/from */
u8 *virt_dma_buf;
@@ -196493,9 +199032,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/ath/ath6kl/hif.h linux-linaro-stabl
};
struct ath6kl_irq_proc_registers {
-diff -Nur linux-3.14.15/drivers/net/wireless/ath/ath6kl/sdio.c linux-linaro-stable-mx6/drivers/net/wireless/ath/ath6kl/sdio.c
---- linux-3.14.15/drivers/net/wireless/ath/ath6kl/sdio.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/ath/ath6kl/sdio.c 2014-08-20 19:31:46.776871786 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/ath/ath6kl/sdio.c linux-imx6-3.14/drivers/net/wireless/ath/ath6kl/sdio.c
+--- linux-3.14.17/drivers/net/wireless/ath/ath6kl/sdio.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/ath/ath6kl/sdio.c 2014-09-09 10:13:50.052963956 +0200
@@ -222,6 +222,7 @@
struct mmc_data *data)
{
@@ -196533,9 +199072,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/ath/ath6kl/sdio.c linux-linaro-stab
scat_req_sz = sizeof(*s_req) + scat_list_sz;
if (!virt_scat)
-diff -Nur linux-3.14.15/drivers/net/wireless/ath/ath9k/main.c linux-linaro-stable-mx6/drivers/net/wireless/ath/ath9k/main.c
---- linux-3.14.15/drivers/net/wireless/ath/ath9k/main.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/ath/ath9k/main.c 2014-08-20 19:31:46.832872028 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/ath/ath9k/main.c linux-imx6-3.14/drivers/net/wireless/ath/ath9k/main.c
+--- linux-3.14.17/drivers/net/wireless/ath/ath9k/main.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/ath/ath9k/main.c 2014-09-09 10:13:50.072964119 +0200
@@ -1883,7 +1883,8 @@
return !!npend;
}
@@ -196546,9 +199085,28 @@ diff -Nur linux-3.14.15/drivers/net/wireless/ath/ath9k/main.c linux-linaro-stabl
{
struct ath_softc *sc = hw->priv;
struct ath_hw *ah = sc->sc_ah;
-diff -Nur linux-3.14.15/drivers/net/wireless/ath/carl9170/main.c linux-linaro-stable-mx6/drivers/net/wireless/ath/carl9170/main.c
---- linux-3.14.15/drivers/net/wireless/ath/carl9170/main.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/ath/carl9170/main.c 2014-08-20 19:31:46.836872046 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/ath/ath9k/xmit.c linux-imx6-3.14/drivers/net/wireless/ath/ath9k/xmit.c
+--- linux-3.14.17/drivers/net/wireless/ath/ath9k/xmit.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/ath/ath9k/xmit.c 2014-09-09 10:13:50.072964119 +0200
+@@ -890,15 +890,6 @@
+
+ tx_info = IEEE80211_SKB_CB(skb);
+ tx_info->flags &= ~IEEE80211_TX_CTL_CLEAR_PS_FILT;
+-
+- /*
+- * No aggregation session is running, but there may be frames
+- * from a previous session or a failed attempt in the queue.
+- * Send them out as normal data frames
+- */
+- if (!tid->active)
+- tx_info->flags &= ~IEEE80211_TX_CTL_AMPDU;
+-
+ if (!(tx_info->flags & IEEE80211_TX_CTL_AMPDU)) {
+ bf->bf_state.bf_type = 0;
+ return bf;
+diff -Nur linux-3.14.17/drivers/net/wireless/ath/carl9170/main.c linux-imx6-3.14/drivers/net/wireless/ath/carl9170/main.c
+--- linux-3.14.17/drivers/net/wireless/ath/carl9170/main.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/ath/carl9170/main.c 2014-09-09 10:13:50.076964152 +0200
@@ -1707,7 +1707,9 @@
return 0;
}
@@ -196560,9 +199118,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/ath/carl9170/main.c linux-linaro-st
{
struct ar9170 *ar = hw->priv;
unsigned int vid;
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
---- linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c 2014-08-20 19:31:46.868872181 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+--- linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c 2014-09-09 10:13:50.100964348 +0200
@@ -43,7 +43,6 @@
#include "dhd_bus.h"
#include "dhd_dbg.h"
@@ -196821,9 +199379,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c linux-l
{
brcmf_dbg(SDIO, "Enter\n");
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/chip.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/chip.c
---- linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/chip.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/chip.c 2014-08-20 19:31:46.884872251 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/chip.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/chip.c
+--- linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/chip.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/chip.c 2014-09-09 10:13:50.100964348 +0200
@@ -0,0 +1,1035 @@
+/*
+ * Copyright (c) 2014 Broadcom Corporation
@@ -197860,9 +200418,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/chip.c linux-lin
+ PMU_RCTL_LOGIC_DISABLE_MASK)) == 0;
+ }
+}
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/chip.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/chip.h
---- linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/chip.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/chip.h 2014-08-20 19:31:46.884872251 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/chip.h linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/chip.h
+--- linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/chip.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/chip.h 2014-09-09 10:13:50.100964348 +0200
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2014 Broadcom Corporation
@@ -197955,9 +200513,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/chip.h linux-lin
+bool brcmf_chip_sr_capable(struct brcmf_chip *pub);
+
+#endif /* BRCMF_AXIDMP_H */
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
---- linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h 2014-08-20 19:31:46.884872251 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
+--- linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h 2014-09-09 10:13:50.100964348 +0200
@@ -63,7 +63,6 @@
*/
struct brcmf_bus_ops {
@@ -197986,9 +200544,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h linux-
static inline void brcmf_bus_stop(struct brcmf_bus *bus)
{
bus->ops->stop(bus->dev);
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
---- linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c 2014-08-20 19:31:46.884872251 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
+--- linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c 2014-09-09 10:13:50.100964348 +0200
@@ -32,6 +32,9 @@
#define BRCMF_DEFAULT_SCAN_UNASSOC_TIME 40
#define BRCMF_DEFAULT_PACKET_FILTER "100 0 0 0 0x01 0x00"
@@ -198028,9 +200586,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c lin
/* Setup event_msgs, enable E_IF */
err = brcmf_fil_iovar_data_get(ifp, "event_msgs", eventmask,
BRCMF_EVENTING_MASK_LEN);
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/dhd.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
---- linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/dhd.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd.h 2014-08-20 19:31:46.884872251 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/dhd.h linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
+--- linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/dhd.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/dhd.h 2014-09-09 10:13:50.100964348 +0200
@@ -186,7 +186,7 @@
void brcmf_txflowblock_if(struct brcmf_if *ifp,
enum brcmf_netif_stop_reason reason, bool state);
@@ -198040,9 +200598,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/dhd.h linux-lina
bool success);
/* Sets dongle media info (drv_version, mac address). */
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
---- linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c 2014-08-20 19:31:46.884872251 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+--- linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c 2014-09-09 10:13:50.100964348 +0200
@@ -190,7 +190,7 @@
int ret;
struct brcmf_if *ifp = netdev_priv(ndev);
@@ -198151,9 +200709,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c linu
brcmf_debugfs_detach(drvr);
bus_if->drvr = NULL;
kfree(drvr);
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
---- linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c 2014-08-20 19:31:46.888872268 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+--- linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c 2014-09-09 10:13:50.100964348 +0200
@@ -23,6 +23,7 @@
#include <linux/interrupt.h>
#include <linux/sched.h>
@@ -200028,9 +202586,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c linux
}
kfree(bus->rxbuf);
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/firmware.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/firmware.c
---- linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/firmware.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/firmware.c 2014-08-20 19:31:46.888872268 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/firmware.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/firmware.c
+--- linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/firmware.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/firmware.c 2014-09-09 10:13:50.100964348 +0200
@@ -0,0 +1,332 @@
+/*
+ * Copyright (c) 2013 Broadcom Corporation
@@ -200364,9 +202922,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/firmware.c linux
+ GFP_KERNEL, fwctx,
+ brcmf_fw_request_code_done);
+}
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/firmware.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/firmware.h
---- linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/firmware.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/firmware.h 2014-08-20 19:31:46.888872268 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/firmware.h linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/firmware.h
+--- linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/firmware.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/firmware.h 2014-09-09 10:13:50.100964348 +0200
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2013 Broadcom Corporation
@@ -200404,9 +202962,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/firmware.h linux
+ void *nvram_image, u32 nvram_len));
+
+#endif /* BRCMFMAC_FIRMWARE_H */
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/fwil.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwil.c
---- linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/fwil.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwil.c 2014-08-20 19:31:46.888872268 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/fwil.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/fwil.c
+--- linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/fwil.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/fwil.c 2014-09-09 10:13:50.100964348 +0200
@@ -124,7 +124,8 @@
}
@@ -200426,9 +202984,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/fwil.c linux-lin
u32 len)
{
struct brcmf_pub *drvr = ifp->drvr;
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/fwil.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwil.h
---- linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/fwil.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwil.h 2014-08-20 19:31:46.888872268 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/fwil.h linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/fwil.h
+--- linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/fwil.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/fwil.h 2014-09-09 10:13:50.100964348 +0200
@@ -83,7 +83,7 @@
s32 brcmf_fil_cmd_int_set(struct brcmf_if *ifp, u32 cmd, u32 data);
s32 brcmf_fil_cmd_int_get(struct brcmf_if *ifp, u32 cmd, u32 *data);
@@ -200438,9 +202996,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/fwil.h linux-lin
u32 len);
s32 brcmf_fil_iovar_data_get(struct brcmf_if *ifp, char *name, void *data,
u32 len);
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h
---- linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h 2014-08-20 19:31:46.888872268 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h
+--- linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h 2014-09-09 10:13:50.100964348 +0200
@@ -48,6 +48,19 @@
#define BRCMF_MAXRATES_IN_SET 16 /* max # of rates in rateset */
@@ -200496,9 +203054,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h lin
/* used for join with or without a specific bssid and channel list */
struct brcmf_join_params {
struct brcmf_ssid_le ssid_le;
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
---- linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c 2014-08-20 19:31:46.892872284 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
+--- linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c 2014-09-09 10:13:50.104964380 +0200
@@ -476,6 +476,7 @@
bool bus_flow_blocked;
bool creditmap_received;
@@ -200661,9 +203219,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c linux
fws->fws_wq = create_singlethread_workqueue("brcmf_fws_wq");
if (fws->fws_wq == NULL) {
brcmf_err("workqueue creation failed\n");
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/Makefile linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/Makefile
---- linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/Makefile 2014-08-20 19:31:46.868872181 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/Makefile linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/Makefile
+--- linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/Makefile 2014-09-09 10:13:50.100964348 +0200
@@ -24,6 +24,7 @@
obj-$(CONFIG_BRCMFMAC) += brcmfmac.o
brcmfmac-objs += \
@@ -200687,9 +203245,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/Makefile linux-l
brcmfmac-$(CONFIG_BRCMFMAC_USB) += \
usb.o
brcmfmac-$(CONFIG_BRCMDBG) += \
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/nvram.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/nvram.c
---- linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/nvram.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/nvram.c 1970-01-01 01:00:00.000000000 +0100
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/nvram.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/nvram.c
+--- linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/nvram.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/nvram.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2013 Broadcom Corporation
@@ -200785,9 +203343,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/nvram.c linux-li
-}
-
-
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/nvram.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/nvram.h
---- linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/nvram.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/nvram.h 1970-01-01 01:00:00.000000000 +0100
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/nvram.h linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/nvram.h
+--- linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/nvram.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/nvram.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2013 Broadcom Corporation
@@ -200813,9 +203371,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/nvram.h linux-li
-
-
-#endif /* BRCMFMAC_NVRAM_H */
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/p2p.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
---- linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/p2p.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/p2p.c 2014-08-20 19:31:46.892872284 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/p2p.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
+--- linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/p2p.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/p2p.c 2014-09-09 10:13:50.104964380 +0200
@@ -797,7 +797,8 @@
/* SOCIAL CHANNELS 1, 6, 11 */
search_state = WL_P2P_DISC_ST_SEARCH;
@@ -200846,9 +203404,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/p2p.c linux-lina
break;
case NL80211_IFTYPE_P2P_DEVICE:
return brcmf_p2p_create_p2pdev(&cfg->p2p, wiphy,
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
---- linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c 1970-01-01 01:00:00.000000000 +0100
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
+--- linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,973 +0,0 @@
-/*
- * Copyright (c) 2011 Broadcom Corporation
@@ -201823,9 +204381,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c linu
-
- return brcmf_sdio_chip_cr4_exitdl(sdiodev, ci, rstvec);
-}
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h
---- linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h 1970-01-01 01:00:00.000000000 +0100
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h
+--- linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,231 +0,0 @@
-/*
- * Copyright (c) 2011 Broadcom Corporation
@@ -202058,9 +204616,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h linu
- struct brcmf_chip *ci, u32 rstvec);
-
-#endif /* _BRCMFMAC_SDIO_CHIP_H_ */
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
---- linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h 2014-08-20 19:31:46.892872284 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
+--- linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h 2014-09-09 10:13:50.104964380 +0200
@@ -180,6 +180,97 @@
uint max_request_size;
ushort max_segment_count;
@@ -202159,9 +204717,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h linu
};
/* Register/deregister interrupt handler. */
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/usb.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/usb.c
---- linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2014-08-20 19:31:46.896872302 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/usb.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+--- linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2014-09-09 10:13:50.104964380 +0200
@@ -25,6 +25,7 @@
#include <dhd_bus.h>
#include <dhd_dbg.h>
@@ -202613,9 +205171,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/usb.c linux-lina
- INIT_LIST_HEAD(&fw_image_list);
usb_register(&brcmf_usbdrvr);
}
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
---- linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c 2014-08-20 19:31:46.896872302 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+--- linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c 2014-09-09 10:13:50.104964380 +0200
@@ -18,6 +18,7 @@
#include <linux/kernel.h>
@@ -203527,9 +206085,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c li
if (err)
goto default_conf_out;
err = brcmf_cfg80211_change_iface(wdev->wiphy, ndev, wdev->iftype,
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
---- linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h 2014-08-20 19:31:46.896872302 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
+--- linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h 2014-09-09 10:13:50.104964380 +0200
@@ -89,21 +89,6 @@
BRCMF_SCAN_STATUS_SUPPRESS,
};
@@ -203586,9 +206144,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h li
u16 channel_to_chanspec(struct brcmu_d11inf *d11inf,
struct ieee80211_channel *ch);
u32 wl_get_vif_state_all(struct brcmf_cfg80211_info *cfg, unsigned long state);
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
---- linux-3.14.15/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c 2014-08-20 19:31:46.896872302 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+--- linux-3.14.17/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c 2014-09-09 10:13:50.108964412 +0200
@@ -897,7 +897,8 @@
return result;
}
@@ -203612,9 +206170,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c li
* is called in brcms_bcma_probe() context, therefore no locking required.
*/
static struct brcms_info *brcms_attach(struct bcma_device *pdev)
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmsmac/main.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/main.c
---- linux-3.14.15/drivers/net/wireless/brcm80211/brcmsmac/main.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/main.c 2014-08-20 19:31:46.900872320 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmsmac/main.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmsmac/main.c
+--- linux-3.14.17/drivers/net/wireless/brcm80211/brcmsmac/main.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmsmac/main.c 2014-09-09 10:13:50.108964412 +0200
@@ -4870,14 +4870,11 @@
/*
* low level detach
@@ -203659,9 +206217,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmsmac/main.c linux-lin
if (!brcms_c_radio_monitor_stop(wlc))
callbacks++;
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmutil/d11.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmutil/d11.c
---- linux-3.14.15/drivers/net/wireless/brcm80211/brcmutil/d11.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmutil/d11.c 2014-08-20 19:31:46.900872320 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmutil/d11.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmutil/d11.c
+--- linux-3.14.17/drivers/net/wireless/brcm80211/brcmutil/d11.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmutil/d11.c 2014-09-09 10:13:50.120964511 +0200
@@ -21,19 +21,46 @@
#include <brcmu_wifi.h>
#include <brcmu_d11.h>
@@ -203803,9 +206361,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/brcmutil/d11.c linux-lina
break;
case BRCMU_CHSPEC_D11AC_BW_8080:
case BRCMU_CHSPEC_D11AC_BW_160:
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
---- linux-3.14.15/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h 2014-08-20 19:31:46.900872320 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h linux-imx6-3.14/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
+--- linux-3.14.17/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h 2014-09-09 10:13:50.120964511 +0200
@@ -43,5 +43,6 @@
#define BCM4335_CHIP_ID 0x4335
#define BCM43362_CHIP_ID 43362
@@ -203813,9 +206371,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h lin
+#define BCM4354_CHIP_ID 0x4354
#endif /* _BRCM_HW_IDS_H_ */
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/include/brcmu_d11.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/include/brcmu_d11.h
---- linux-3.14.15/drivers/net/wireless/brcm80211/include/brcmu_d11.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/include/brcmu_d11.h 2014-08-20 19:31:46.900872320 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/include/brcmu_d11.h linux-imx6-3.14/drivers/net/wireless/brcm80211/include/brcmu_d11.h
+--- linux-3.14.17/drivers/net/wireless/brcm80211/include/brcmu_d11.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/include/brcmu_d11.h 2014-09-09 10:13:50.120964511 +0200
@@ -108,13 +108,7 @@
};
@@ -203844,9 +206402,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/include/brcmu_d11.h linux
};
struct brcmu_chan {
-diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/include/brcmu_wifi.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/include/brcmu_wifi.h
---- linux-3.14.15/drivers/net/wireless/brcm80211/include/brcmu_wifi.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/include/brcmu_wifi.h 2014-08-20 19:31:46.900872320 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/include/brcmu_wifi.h linux-imx6-3.14/drivers/net/wireless/brcm80211/include/brcmu_wifi.h
+--- linux-3.14.17/drivers/net/wireless/brcm80211/include/brcmu_wifi.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/include/brcmu_wifi.h 2014-09-09 10:13:50.120964511 +0200
@@ -29,6 +29,7 @@
#define CH_UPPER_SB 0x01
#define CH_LOWER_SB 0x02
@@ -203865,9 +206423,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/brcm80211/include/brcmu_wifi.h linu
/* WPA authentication mode bitvec */
#define WPA_AUTH_DISABLED 0x0000 /* Legacy (i.e., non-WPA) */
-diff -Nur linux-3.14.15/drivers/net/wireless/cw1200/sta.c linux-linaro-stable-mx6/drivers/net/wireless/cw1200/sta.c
---- linux-3.14.15/drivers/net/wireless/cw1200/sta.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/cw1200/sta.c 2014-08-20 19:31:46.904872337 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/cw1200/sta.c linux-imx6-3.14/drivers/net/wireless/cw1200/sta.c
+--- linux-3.14.17/drivers/net/wireless/cw1200/sta.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/cw1200/sta.c 2014-09-09 10:13:50.120964511 +0200
@@ -936,7 +936,8 @@
return ret;
}
@@ -203878,9 +206436,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/cw1200/sta.c linux-linaro-stable-mx
{
struct cw1200_common *priv = hw->priv;
-diff -Nur linux-3.14.15/drivers/net/wireless/cw1200/sta.h linux-linaro-stable-mx6/drivers/net/wireless/cw1200/sta.h
---- linux-3.14.15/drivers/net/wireless/cw1200/sta.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/cw1200/sta.h 2014-08-20 19:31:46.904872337 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/cw1200/sta.h linux-imx6-3.14/drivers/net/wireless/cw1200/sta.h
+--- linux-3.14.17/drivers/net/wireless/cw1200/sta.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/cw1200/sta.h 2014-09-09 10:13:50.120964511 +0200
@@ -40,7 +40,8 @@
int cw1200_set_rts_threshold(struct ieee80211_hw *hw, u32 value);
@@ -203891,9 +206449,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/cw1200/sta.h linux-linaro-stable-mx
u64 cw1200_prepare_multicast(struct ieee80211_hw *hw,
struct netdev_hw_addr_list *mc_list);
-diff -Nur linux-3.14.15/drivers/net/wireless/iwlegacy/common.c linux-linaro-stable-mx6/drivers/net/wireless/iwlegacy/common.c
---- linux-3.14.15/drivers/net/wireless/iwlegacy/common.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/iwlegacy/common.c 2014-08-20 19:31:46.924872422 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/iwlegacy/common.c linux-imx6-3.14/drivers/net/wireless/iwlegacy/common.c
+--- linux-3.14.17/drivers/net/wireless/iwlegacy/common.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/iwlegacy/common.c 2014-09-09 10:13:50.140964674 +0200
@@ -4701,7 +4701,8 @@
}
EXPORT_SYMBOL(il_mac_change_interface);
@@ -203904,9 +206462,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/iwlegacy/common.c linux-linaro-stab
{
struct il_priv *il = hw->priv;
unsigned long timeout = jiffies + msecs_to_jiffies(500);
-diff -Nur linux-3.14.15/drivers/net/wireless/iwlegacy/common.h linux-linaro-stable-mx6/drivers/net/wireless/iwlegacy/common.h
---- linux-3.14.15/drivers/net/wireless/iwlegacy/common.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/iwlegacy/common.h 2014-08-20 19:31:46.924872422 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/iwlegacy/common.h linux-imx6-3.14/drivers/net/wireless/iwlegacy/common.h
+--- linux-3.14.17/drivers/net/wireless/iwlegacy/common.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/iwlegacy/common.h 2014-09-09 10:13:50.140964674 +0200
@@ -1722,7 +1722,8 @@
struct ieee80211_vif *vif);
int il_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
@@ -203917,9 +206475,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/iwlegacy/common.h linux-linaro-stab
int il_alloc_txq_mem(struct il_priv *il);
void il_free_txq_mem(struct il_priv *il);
-diff -Nur linux-3.14.15/drivers/net/wireless/iwlwifi/dvm/mac80211.c linux-linaro-stable-mx6/drivers/net/wireless/iwlwifi/dvm/mac80211.c
---- linux-3.14.15/drivers/net/wireless/iwlwifi/dvm/mac80211.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/iwlwifi/dvm/mac80211.c 2014-08-20 19:31:46.928872440 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/iwlwifi/dvm/mac80211.c linux-imx6-3.14/drivers/net/wireless/iwlwifi/dvm/mac80211.c
+--- linux-3.14.17/drivers/net/wireless/iwlwifi/dvm/mac80211.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/iwlwifi/dvm/mac80211.c 2014-09-09 10:13:50.144964706 +0200
@@ -1091,7 +1091,8 @@
FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL;
}
@@ -203930,9 +206488,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/iwlwifi/dvm/mac80211.c linux-linaro
{
struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
-diff -Nur linux-3.14.15/drivers/net/wireless/libertas/cfg.c linux-linaro-stable-mx6/drivers/net/wireless/libertas/cfg.c
---- linux-3.14.15/drivers/net/wireless/libertas/cfg.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/libertas/cfg.c 2014-08-20 19:31:46.968872611 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/libertas/cfg.c linux-imx6-3.14/drivers/net/wireless/libertas/cfg.c
+--- linux-3.14.17/drivers/net/wireless/libertas/cfg.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/libertas/cfg.c 2014-09-09 10:13:50.160964836 +0200
@@ -1766,7 +1766,8 @@
memcpy(priv->wdev->ssid, params->ssid, params->ssid_len);
priv->wdev->ssid_len = params->ssid_len;
@@ -203943,9 +206501,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/libertas/cfg.c linux-linaro-stable-
/* TODO: consider doing this at MACREG_INT_CODE_LINK_SENSED time */
priv->connect_status = LBS_CONNECTED;
-diff -Nur linux-3.14.15/drivers/net/wireless/mac80211_hwsim.c linux-linaro-stable-mx6/drivers/net/wireless/mac80211_hwsim.c
---- linux-3.14.15/drivers/net/wireless/mac80211_hwsim.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/mac80211_hwsim.c 2014-08-20 19:31:46.972872628 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/mac80211_hwsim.c linux-imx6-3.14/drivers/net/wireless/mac80211_hwsim.c
+--- linux-3.14.17/drivers/net/wireless/mac80211_hwsim.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/mac80211_hwsim.c 2014-09-09 10:13:50.164964869 +0200
@@ -1671,7 +1671,9 @@
return 0;
}
@@ -203957,9 +206515,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/mac80211_hwsim.c linux-linaro-stabl
{
/* Not implemented, queues only on kernel side */
}
-diff -Nur linux-3.14.15/drivers/net/wireless/mwifiex/cfg80211.c linux-linaro-stable-mx6/drivers/net/wireless/mwifiex/cfg80211.c
---- linux-3.14.15/drivers/net/wireless/mwifiex/cfg80211.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/mwifiex/cfg80211.c 2014-08-20 19:31:46.976872647 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/mwifiex/cfg80211.c linux-imx6-3.14/drivers/net/wireless/mwifiex/cfg80211.c
+--- linux-3.14.17/drivers/net/wireless/mwifiex/cfg80211.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/mwifiex/cfg80211.c 2014-09-09 10:13:50.164964869 +0200
@@ -1881,7 +1881,8 @@
params->privacy);
done:
@@ -203970,9 +206528,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/mwifiex/cfg80211.c linux-linaro-sta
dev_dbg(priv->adapter->dev,
"info: joined/created adhoc network with bssid"
" %pM successfully\n", priv->cfg_bssid);
-diff -Nur linux-3.14.15/drivers/net/wireless/mwifiex/main.h linux-linaro-stable-mx6/drivers/net/wireless/mwifiex/main.h
---- linux-3.14.15/drivers/net/wireless/mwifiex/main.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/mwifiex/main.h 2014-08-20 19:31:46.984872680 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/mwifiex/main.h linux-imx6-3.14/drivers/net/wireless/mwifiex/main.h
+--- linux-3.14.17/drivers/net/wireless/mwifiex/main.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/mwifiex/main.h 2014-09-09 10:13:50.168964901 +0200
@@ -1078,7 +1078,7 @@
const u8 *key, int key_len, u8 key_index,
const u8 *mac_addr, int disable);
@@ -203982,9 +206540,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/mwifiex/main.h linux-linaro-stable-
int mwifiex_get_ver_ext(struct mwifiex_private *priv);
-diff -Nur linux-3.14.15/drivers/net/wireless/mwifiex/sta_ioctl.c linux-linaro-stable-mx6/drivers/net/wireless/mwifiex/sta_ioctl.c
---- linux-3.14.15/drivers/net/wireless/mwifiex/sta_ioctl.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/mwifiex/sta_ioctl.c 2014-08-20 19:31:46.992872714 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/mwifiex/sta_ioctl.c linux-imx6-3.14/drivers/net/wireless/mwifiex/sta_ioctl.c
+--- linux-3.14.17/drivers/net/wireless/mwifiex/sta_ioctl.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/mwifiex/sta_ioctl.c 2014-09-09 10:13:50.172964934 +0200
@@ -1391,7 +1391,7 @@
* with requisite parameters and calls the IOCTL handler.
*/
@@ -203994,9 +206552,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/mwifiex/sta_ioctl.c linux-linaro-st
{
struct mwifiex_ds_misc_gen_ie gen_ie;
-diff -Nur linux-3.14.15/drivers/net/wireless/p54/main.c linux-linaro-stable-mx6/drivers/net/wireless/p54/main.c
---- linux-3.14.15/drivers/net/wireless/p54/main.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/p54/main.c 2014-08-20 19:31:47.008872783 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/p54/main.c linux-imx6-3.14/drivers/net/wireless/p54/main.c
+--- linux-3.14.17/drivers/net/wireless/p54/main.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/p54/main.c 2014-09-09 10:13:50.180964999 +0200
@@ -669,7 +669,8 @@
return total;
}
@@ -204007,9 +206565,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/p54/main.c linux-linaro-stable-mx6/
{
struct p54_common *priv = dev->priv;
unsigned int total, i;
-diff -Nur linux-3.14.15/drivers/net/wireless/rndis_wlan.c linux-linaro-stable-mx6/drivers/net/wireless/rndis_wlan.c
---- linux-3.14.15/drivers/net/wireless/rndis_wlan.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/rndis_wlan.c 2014-08-20 19:31:47.016872817 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/rndis_wlan.c linux-imx6-3.14/drivers/net/wireless/rndis_wlan.c
+--- linux-3.14.17/drivers/net/wireless/rndis_wlan.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/rndis_wlan.c 2014-09-09 10:13:50.184965032 +0200
@@ -2835,7 +2835,9 @@
bssid, req_ie, req_ie_len,
resp_ie, resp_ie_len, GFP_KERNEL);
@@ -204021,9 +206579,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/rndis_wlan.c linux-linaro-stable-mx
kfree(info);
-diff -Nur linux-3.14.15/drivers/net/wireless/rt2x00/rt2x00.h linux-linaro-stable-mx6/drivers/net/wireless/rt2x00/rt2x00.h
---- linux-3.14.15/drivers/net/wireless/rt2x00/rt2x00.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/rt2x00/rt2x00.h 2014-08-20 19:31:47.028872869 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/rt2x00/rt2x00.h linux-imx6-3.14/drivers/net/wireless/rt2x00/rt2x00.h
+--- linux-3.14.17/drivers/net/wireless/rt2x00/rt2x00.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/rt2x00/rt2x00.h 2014-09-09 10:13:50.188965064 +0200
@@ -1449,7 +1449,8 @@
struct ieee80211_vif *vif, u16 queue,
const struct ieee80211_tx_queue_params *params);
@@ -204034,9 +206592,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/rt2x00/rt2x00.h linux-linaro-stable
int rt2x00mac_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant);
int rt2x00mac_get_antenna(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant);
void rt2x00mac_get_ringparam(struct ieee80211_hw *hw,
-diff -Nur linux-3.14.15/drivers/net/wireless/rt2x00/rt2x00mac.c linux-linaro-stable-mx6/drivers/net/wireless/rt2x00/rt2x00mac.c
---- linux-3.14.15/drivers/net/wireless/rt2x00/rt2x00mac.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/rt2x00/rt2x00mac.c 2014-08-20 19:31:47.040872920 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/rt2x00/rt2x00mac.c linux-imx6-3.14/drivers/net/wireless/rt2x00/rt2x00mac.c
+--- linux-3.14.17/drivers/net/wireless/rt2x00/rt2x00mac.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/rt2x00/rt2x00mac.c 2014-09-09 10:13:50.192965097 +0200
@@ -751,7 +751,8 @@
}
EXPORT_SYMBOL_GPL(rt2x00mac_rfkill_poll);
@@ -204047,9 +206605,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/rt2x00/rt2x00mac.c linux-linaro-sta
{
struct rt2x00_dev *rt2x00dev = hw->priv;
struct data_queue *queue;
-diff -Nur linux-3.14.15/drivers/net/wireless/rtl818x/rtl8187/dev.c linux-linaro-stable-mx6/drivers/net/wireless/rtl818x/rtl8187/dev.c
---- linux-3.14.15/drivers/net/wireless/rtl818x/rtl8187/dev.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/rtl818x/rtl8187/dev.c 2014-08-20 19:31:47.060873006 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/rtl818x/rtl8187/dev.c linux-imx6-3.14/drivers/net/wireless/rtl818x/rtl8187/dev.c
+--- linux-3.14.17/drivers/net/wireless/rtl818x/rtl8187/dev.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/rtl818x/rtl8187/dev.c 2014-09-09 10:13:50.196965130 +0200
@@ -1636,10 +1636,10 @@
err_free_dmabuf:
@@ -204063,9 +206621,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/rtl818x/rtl8187/dev.c linux-linaro-
return err;
}
-diff -Nur linux-3.14.15/drivers/net/wireless/rtlwifi/core.c linux-linaro-stable-mx6/drivers/net/wireless/rtlwifi/core.c
---- linux-3.14.15/drivers/net/wireless/rtlwifi/core.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/rtlwifi/core.c 2014-08-20 19:31:47.060873006 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/rtlwifi/core.c linux-imx6-3.14/drivers/net/wireless/rtlwifi/core.c
+--- linux-3.14.17/drivers/net/wireless/rtlwifi/core.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/rtlwifi/core.c 2014-09-09 10:13:50.196965130 +0200
@@ -1309,7 +1309,8 @@
* before switch channel or power save, or tx buffer packet
* maybe send after offchannel or rf sleep, this may cause
@@ -204076,9 +206634,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/rtlwifi/core.c linux-linaro-stable-
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
-diff -Nur linux-3.14.15/drivers/net/wireless/ti/wlcore/main.c linux-linaro-stable-mx6/drivers/net/wireless/ti/wlcore/main.c
---- linux-3.14.15/drivers/net/wireless/ti/wlcore/main.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/net/wireless/ti/wlcore/main.c 2014-08-20 19:31:47.084873109 +0200
+diff -Nur linux-3.14.17/drivers/net/wireless/ti/wlcore/main.c linux-imx6-3.14/drivers/net/wireless/ti/wlcore/main.c
+--- linux-3.14.17/drivers/net/wireless/ti/wlcore/main.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/net/wireless/ti/wlcore/main.c 2014-09-09 10:13:50.228965390 +0200
@@ -5156,7 +5156,8 @@
mutex_unlock(&wl->mutex);
}
@@ -204089,9 +206647,9 @@ diff -Nur linux-3.14.15/drivers/net/wireless/ti/wlcore/main.c linux-linaro-stabl
{
struct wl1271 *wl = hw->priv;
-diff -Nur linux-3.14.15/drivers/parport/Kconfig linux-linaro-stable-mx6/drivers/parport/Kconfig
---- linux-3.14.15/drivers/parport/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/parport/Kconfig 2014-08-20 19:31:47.128873298 +0200
+diff -Nur linux-3.14.17/drivers/parport/Kconfig linux-imx6-3.14/drivers/parport/Kconfig
+--- linux-3.14.17/drivers/parport/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/parport/Kconfig 2014-09-09 10:13:50.244965520 +0200
@@ -5,12 +5,6 @@
# Parport configuration.
#
@@ -204118,9 +206676,9 @@ diff -Nur linux-3.14.15/drivers/parport/Kconfig linux-linaro-stable-mx6/drivers/
if PARPORT
config PARPORT_PC
-diff -Nur linux-3.14.15/drivers/pci/host/Kconfig linux-linaro-stable-mx6/drivers/pci/host/Kconfig
---- linux-3.14.15/drivers/pci/host/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/pci/host/Kconfig 2014-08-20 19:31:47.132873314 +0200
+diff -Nur linux-3.14.17/drivers/pci/host/Kconfig linux-imx6-3.14/drivers/pci/host/Kconfig
+--- linux-3.14.17/drivers/pci/host/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/pci/host/Kconfig 2014-09-09 10:13:50.248965553 +0200
@@ -21,6 +21,23 @@
select PCIEPORTBUS
select PCIE_DW
@@ -204145,9 +206703,9 @@ diff -Nur linux-3.14.15/drivers/pci/host/Kconfig linux-linaro-stable-mx6/drivers
config PCI_TEGRA
bool "NVIDIA Tegra PCIe controller"
depends on ARCH_TEGRA
-diff -Nur linux-3.14.15/drivers/pci/host/Makefile linux-linaro-stable-mx6/drivers/pci/host/Makefile
---- linux-3.14.15/drivers/pci/host/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/pci/host/Makefile 2014-08-20 19:31:47.132873314 +0200
+diff -Nur linux-3.14.17/drivers/pci/host/Makefile linux-imx6-3.14/drivers/pci/host/Makefile
+--- linux-3.14.17/drivers/pci/host/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/pci/host/Makefile 2014-09-09 10:13:50.248965553 +0200
@@ -1,6 +1,7 @@
obj-$(CONFIG_PCIE_DW) += pcie-designware.o
obj-$(CONFIG_PCI_EXYNOS) += pci-exynos.o
@@ -204156,9 +206714,9 @@ diff -Nur linux-3.14.15/drivers/pci/host/Makefile linux-linaro-stable-mx6/driver
obj-$(CONFIG_PCI_MVEBU) += pci-mvebu.o
obj-$(CONFIG_PCI_TEGRA) += pci-tegra.o
obj-$(CONFIG_PCI_RCAR_GEN2) += pci-rcar-gen2.o
-diff -Nur linux-3.14.15/drivers/pci/host/pcie-designware.c linux-linaro-stable-mx6/drivers/pci/host/pcie-designware.c
---- linux-3.14.15/drivers/pci/host/pcie-designware.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/pci/host/pcie-designware.c 2014-08-20 19:31:47.236873762 +0200
+diff -Nur linux-3.14.17/drivers/pci/host/pcie-designware.c linux-imx6-3.14/drivers/pci/host/pcie-designware.c
+--- linux-3.14.17/drivers/pci/host/pcie-designware.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/pci/host/pcie-designware.c 2014-09-09 10:13:50.252965587 +0200
@@ -23,48 +23,6 @@
#include "pcie-designware.h"
@@ -204365,9 +206923,9 @@ diff -Nur linux-3.14.15/drivers/pci/host/pcie-designware.c linux-linaro-stable-m
}
static void dw_pcie_add_bus(struct pci_bus *bus)
-diff -Nur linux-3.14.15/drivers/pci/host/pcie-designware.h linux-linaro-stable-mx6/drivers/pci/host/pcie-designware.h
---- linux-3.14.15/drivers/pci/host/pcie-designware.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/pci/host/pcie-designware.h 2014-08-20 19:31:47.236873762 +0200
+diff -Nur linux-3.14.17/drivers/pci/host/pcie-designware.h linux-imx6-3.14/drivers/pci/host/pcie-designware.h
+--- linux-3.14.17/drivers/pci/host/pcie-designware.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/pci/host/pcie-designware.h 2014-09-09 10:13:50.252965587 +0200
@@ -14,6 +14,48 @@
#ifndef _PCIE_DESIGNWARE_H
#define _PCIE_DESIGNWARE_H
@@ -204429,9 +206987,9 @@ diff -Nur linux-3.14.15/drivers/pci/host/pcie-designware.h linux-linaro-stable-m
int msi_irq;
struct irq_domain *irq_domain;
unsigned long msi_data;
-diff -Nur linux-3.14.15/drivers/pci/host/pci-imx6.c linux-linaro-stable-mx6/drivers/pci/host/pci-imx6.c
---- linux-3.14.15/drivers/pci/host/pci-imx6.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/pci/host/pci-imx6.c 2014-08-20 19:31:47.228873726 +0200
+diff -Nur linux-3.14.17/drivers/pci/host/pci-imx6.c linux-imx6-3.14/drivers/pci/host/pci-imx6.c
+--- linux-3.14.17/drivers/pci/host/pci-imx6.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/pci/host/pci-imx6.c 2014-09-09 10:13:50.248965553 +0200
@@ -1,6 +1,7 @@
/*
* PCIe host controller driver for Freescale i.MX6 SoCs
@@ -204470,34 +207028,50 @@ diff -Nur linux-3.14.15/drivers/pci/host/pci-imx6.c linux-linaro-stable-mx6/driv
struct imx6_pcie {
int reset_gpio;
int power_on_gpio;
-@@ -214,18 +226,6 @@
- return 0;
- }
-
--static int imx6_pcie_assert_core_reset(struct pcie_port *pp)
--{
+@@ -52,6 +64,9 @@
+
+ /* PCIe Port Logic registers (memory-mapped) */
+ #define PL_OFFSET 0x700
++#define PCIE_PL_PFLR (PL_OFFSET + 0x08)
++#define PCIE_PL_PFLR_LINK_STATE_MASK (0x3f << 16)
++#define PCIE_PL_PFLR_FORCE_LINK (1 << 15)
+ #define PCIE_PHY_DEBUG_R0 (PL_OFFSET + 0x28)
+ #define PCIE_PHY_DEBUG_R1 (PL_OFFSET + 0x2c)
+ #define PCIE_PHY_DEBUG_R1_XMLH_LINK_IN_TRAINING (1 << 29)
+@@ -216,14 +231,14 @@
+
+ static int imx6_pcie_assert_core_reset(struct pcie_port *pp)
+ {
- struct imx6_pcie *imx6_pcie = to_imx6_pcie(pp);
--
++ struct imx6_pcie *imx6_pcie = to_imx6_pcie(pp);
+
- regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1,
- IMX6Q_GPR1_PCIE_TEST_PD, 1 << 18);
- regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1,
- IMX6Q_GPR1_PCIE_REF_CLK_EN, 0 << 16);
--
++ regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1,
++ IMX6Q_GPR1_PCIE_TEST_PD, 1 << 18);
++ regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1,
++ IMX6Q_GPR1_PCIE_REF_CLK_EN, 0 << 16);
+
- return 0;
--}
--
++ return 0;
+ }
+
static int imx6_pcie_deassert_core_reset(struct pcie_port *pp)
- {
- struct imx6_pcie *imx6_pcie = to_imx6_pcie(pp);
-@@ -238,6 +238,7 @@
- IMX6Q_GPR1_PCIE_TEST_PD, 0 << 18);
- regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1,
- IMX6Q_GPR1_PCIE_REF_CLK_EN, 1 << 16);
+@@ -234,10 +249,7 @@
+ if (gpio_is_valid(imx6_pcie->power_on_gpio))
+ gpio_set_value(imx6_pcie->power_on_gpio, 1);
+
+- regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1,
+- IMX6Q_GPR1_PCIE_TEST_PD, 0 << 18);
+- regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1,
+- IMX6Q_GPR1_PCIE_REF_CLK_EN, 1 << 16);
+ request_bus_freq(BUS_FREQ_HIGH);
ret = clk_prepare_enable(imx6_pcie->sata_ref_100m);
if (ret) {
-@@ -251,10 +252,13 @@
+@@ -251,10 +263,13 @@
goto err_pcie_ref;
}
@@ -204515,7 +207089,20 @@ diff -Nur linux-3.14.15/drivers/pci/host/pci-imx6.c linux-linaro-stable-mx6/driv
}
ret = clk_prepare_enable(imx6_pcie->pcie_axi);
-@@ -281,6 +285,7 @@
+@@ -266,6 +281,12 @@
+ /* allow the clocks to stabilize */
+ usleep_range(200, 500);
+
++ /* power up core phy and enable ref clock */
++ regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1,
++ IMX6Q_GPR1_PCIE_TEST_PD, 0 << 18);
++ regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1,
++ IMX6Q_GPR1_PCIE_REF_CLK_EN, 1 << 16);
++
+ /* Some boards don't have PCIe reset GPIO. */
+ if (gpio_is_valid(imx6_pcie->reset_gpio)) {
+ gpio_set_value(imx6_pcie->reset_gpio, 0);
+@@ -281,6 +302,7 @@
err_pcie_ref:
clk_disable_unprepare(imx6_pcie->sata_ref_100m);
err_sata_ref:
@@ -204523,7 +207110,37 @@ diff -Nur linux-3.14.15/drivers/pci/host/pci-imx6.c linux-linaro-stable-mx6/driv
return ret;
}
-@@ -293,8 +298,14 @@
+@@ -288,13 +310,44 @@
+ static void imx6_pcie_init_phy(struct pcie_port *pp)
+ {
+ struct imx6_pcie *imx6_pcie = to_imx6_pcie(pp);
++ u32 val, gpr1, gpr12;
++
++ /*
++ * If the bootloader already enabled the link we need some special
++ * handling to get the core back into a state where it is safe to
++ * touch it for configuration. As there is no dedicated reset signal
++ * wired up for MX6QDL, we need to manually force LTSSM into "detect"
++ * state before completely disabling LTSSM, which is a prerequisite
++ * for core configuration.
++ * If both LTSSM_ENABLE and REF_SSP_ENABLE are active we have a strong
++ * indication that the bootloader activated the link.
++ */
++ regmap_read(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1, &gpr1);
++ regmap_read(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, &gpr12);
++
++ if ((gpr1 & IMX6Q_GPR1_PCIE_REF_CLK_EN) &&
++ (gpr12 & IMX6Q_GPR12_PCIE_CTL_2)) {
++ val = readl(pp->dbi_base + PCIE_PL_PFLR);
++ val &= ~PCIE_PL_PFLR_LINK_STATE_MASK;
++ val |= PCIE_PL_PFLR_FORCE_LINK;
++ writel(val, pp->dbi_base + PCIE_PL_PFLR);
++
++ regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12,
++ IMX6Q_GPR12_PCIE_CTL_2, 0 << 10);
++ }
+
+ regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12,
IMX6Q_GPR12_PCIE_CTL_2, 0 << 10);
/* configure constant input signal to the pcie ctrl and phy */
@@ -204540,15 +207157,7 @@ diff -Nur linux-3.14.15/drivers/pci/host/pci-imx6.c linux-linaro-stable-mx6/driv
regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12,
IMX6Q_GPR12_LOS_LEVEL, 9 << 4);
-@@ -312,6 +323,7 @@
-
- static int imx6_pcie_wait_for_link(struct pcie_port *pp)
- {
-+ struct imx6_pcie *imx6_pcie = to_imx6_pcie(pp);
- int count = 200;
-
- while (!dw_pcie_link_up(pp)) {
-@@ -326,6 +338,18 @@
+@@ -326,6 +379,12 @@
return -EINVAL;
}
@@ -204558,36 +207167,26 @@ diff -Nur linux-3.14.15/drivers/pci/host/pci-imx6.c linux-linaro-stable-mx6/driv
+ dw_pcie_msi_init(pp);
+ }
+
-+ if (gpio_is_valid(imx6_pcie->reset_gpio)) {
-+ gpio_set_value(imx6_pcie->reset_gpio, 0);
-+ msleep(100);
-+ gpio_set_value(imx6_pcie->reset_gpio, 1);
-+ }
-+
return 0;
}
-@@ -392,10 +416,17 @@
+@@ -392,6 +451,15 @@
return ret;
}
--static void imx6_pcie_host_init(struct pcie_port *pp)
+static irqreturn_t imx_pcie_msi_irq_handler(int irq, void *arg)
- {
-- imx6_pcie_assert_core_reset(pp);
++{
+ struct pcie_port *pp = arg;
+
+ dw_handle_msi_irq(pp);
-
++
+ return IRQ_HANDLED;
+}
+
-+static void imx6_pcie_host_init(struct pcie_port *pp)
-+{
- imx6_pcie_init_phy(pp);
-
- imx6_pcie_deassert_core_reset(pp);
-@@ -498,6 +529,22 @@
+ static void imx6_pcie_host_init(struct pcie_port *pp)
+ {
+ imx6_pcie_assert_core_reset(pp);
+@@ -498,6 +566,22 @@
return -ENODEV;
}
@@ -204610,7 +207209,7 @@ diff -Nur linux-3.14.15/drivers/pci/host/pci-imx6.c linux-linaro-stable-mx6/driv
pp->root_bus_nr = -1;
pp->ops = &imx6_pcie_host_ops;
-@@ -511,29 +558,188 @@
+@@ -511,29 +595,188 @@
return 0;
}
@@ -204804,7 +207403,7 @@ diff -Nur linux-3.14.15/drivers/pci/host/pci-imx6.c linux-linaro-stable-mx6/driv
/* Fetch GPIOs */
imx6_pcie->reset_gpio = of_get_named_gpio(np, "reset-gpio", 0);
-@@ -542,7 +748,7 @@
+@@ -542,7 +785,7 @@
GPIOF_OUT_INIT_LOW, "PCIe reset");
if (ret) {
dev_err(&pdev->dev, "unable to get reset gpio\n");
@@ -204813,7 +207412,7 @@ diff -Nur linux-3.14.15/drivers/pci/host/pci-imx6.c linux-linaro-stable-mx6/driv
}
}
-@@ -554,7 +760,7 @@
+@@ -554,7 +797,7 @@
"PCIe power enable");
if (ret) {
dev_err(&pdev->dev, "unable to get power-on gpio\n");
@@ -204822,7 +207421,7 @@ diff -Nur linux-3.14.15/drivers/pci/host/pci-imx6.c linux-linaro-stable-mx6/driv
}
}
-@@ -566,7 +772,7 @@
+@@ -566,7 +809,7 @@
"PCIe wake up");
if (ret) {
dev_err(&pdev->dev, "unable to get wake-up gpio\n");
@@ -204831,7 +207430,7 @@ diff -Nur linux-3.14.15/drivers/pci/host/pci-imx6.c linux-linaro-stable-mx6/driv
}
}
-@@ -578,7 +784,7 @@
+@@ -578,7 +821,7 @@
"PCIe disable endpoint");
if (ret) {
dev_err(&pdev->dev, "unable to get disable-ep gpio\n");
@@ -204840,7 +207439,7 @@ diff -Nur linux-3.14.15/drivers/pci/host/pci-imx6.c linux-linaro-stable-mx6/driv
}
}
-@@ -587,28 +793,32 @@
+@@ -587,28 +830,32 @@
if (IS_ERR(imx6_pcie->lvds_gate)) {
dev_err(&pdev->dev,
"lvds_gate clock select missing or invalid\n");
@@ -204877,7 +207476,7 @@ diff -Nur linux-3.14.15/drivers/pci/host/pci-imx6.c linux-linaro-stable-mx6/driv
}
/* Grab GPR config register range */
-@@ -616,15 +826,167 @@
+@@ -616,15 +863,175 @@
syscon_regmap_lookup_by_compatible("fsl,imx6q-iomuxc-gpr");
if (IS_ERR(imx6_pcie->iomuxc_gpr)) {
dev_err(&pdev->dev, "unable to find iomuxc registers\n");
@@ -205048,12 +207647,28 @@ diff -Nur linux-3.14.15/drivers/pci/host/pci-imx6.c linux-linaro-stable-mx6/driv
+
+err:
+ return ret;
++}
++
++static void imx6_pcie_shutdown(struct platform_device *pdev)
++{
++ struct imx6_pcie *imx6_pcie = platform_get_drvdata(pdev);
++
++ /* bring down link, so bootloader gets clean state in case of reboot */
++ imx6_pcie_assert_core_reset(&imx6_pcie->pp);
}
static const struct of_device_id imx6_pcie_of_match[] = {
-diff -Nur linux-3.14.15/drivers/pci/host/pci-imx6-ep-driver.c linux-linaro-stable-mx6/drivers/pci/host/pci-imx6-ep-driver.c
---- linux-3.14.15/drivers/pci/host/pci-imx6-ep-driver.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/pci/host/pci-imx6-ep-driver.c 2014-08-20 19:31:47.132873314 +0200
+@@ -639,6 +1046,7 @@
+ .owner = THIS_MODULE,
+ .of_match_table = imx6_pcie_of_match,
+ },
++ .shutdown = imx6_pcie_shutdown,
+ };
+
+ /* Freescale PCIe driver does not allow module unload */
+diff -Nur linux-3.14.17/drivers/pci/host/pci-imx6-ep-driver.c linux-imx6-3.14/drivers/pci/host/pci-imx6-ep-driver.c
+--- linux-3.14.17/drivers/pci/host/pci-imx6-ep-driver.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/pci/host/pci-imx6-ep-driver.c 2014-09-09 10:13:50.248965553 +0200
@@ -0,0 +1,159 @@
+/*
+ * PCIe endpoint skeleton driver for IMX6 SOCs
@@ -205214,9 +207829,9 @@ diff -Nur linux-3.14.15/drivers/pci/host/pci-imx6-ep-driver.c linux-linaro-stabl
+MODULE_VERSION(DRV_VERSION);
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("imx_pcie_ep");
-diff -Nur linux-3.14.15/drivers/pinctrl/devicetree.c linux-linaro-stable-mx6/drivers/pinctrl/devicetree.c
---- linux-3.14.15/drivers/pinctrl/devicetree.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/pinctrl/devicetree.c 2014-08-20 19:23:54.870851440 +0200
+diff -Nur linux-3.14.17/drivers/pinctrl/devicetree.c linux-imx6-3.14/drivers/pinctrl/devicetree.c
+--- linux-3.14.17/drivers/pinctrl/devicetree.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/pinctrl/devicetree.c 2014-09-09 10:13:50.276965782 +0200
@@ -18,6 +18,7 @@
#include <linux/device.h>
@@ -205282,9 +207897,9 @@ diff -Nur linux-3.14.15/drivers/pinctrl/devicetree.c linux-linaro-stable-mx6/dri
/* We may store pointers to property names within the node */
of_node_get(np);
-diff -Nur linux-3.14.15/drivers/pinctrl/pinctrl-imx6sl.c linux-linaro-stable-mx6/drivers/pinctrl/pinctrl-imx6sl.c
---- linux-3.14.15/drivers/pinctrl/pinctrl-imx6sl.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/pinctrl/pinctrl-imx6sl.c 2014-08-20 19:31:47.424874568 +0200
+diff -Nur linux-3.14.17/drivers/pinctrl/pinctrl-imx6sl.c linux-imx6-3.14/drivers/pinctrl/pinctrl-imx6sl.c
+--- linux-3.14.17/drivers/pinctrl/pinctrl-imx6sl.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/pinctrl/pinctrl-imx6sl.c 2014-09-09 10:13:50.280965814 +0200
@@ -384,6 +384,10 @@
},
.probe = imx6sl_pinctrl_probe,
@@ -205296,9 +207911,9 @@ diff -Nur linux-3.14.15/drivers/pinctrl/pinctrl-imx6sl.c linux-linaro-stable-mx6
};
static int __init imx6sl_pinctrl_init(void)
-diff -Nur linux-3.14.15/drivers/pinctrl/pinctrl-imx.c linux-linaro-stable-mx6/drivers/pinctrl/pinctrl-imx.c
---- linux-3.14.15/drivers/pinctrl/pinctrl-imx.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/pinctrl/pinctrl-imx.c 2014-08-20 19:31:47.420874552 +0200
+diff -Nur linux-3.14.17/drivers/pinctrl/pinctrl-imx.c linux-imx6-3.14/drivers/pinctrl/pinctrl-imx.c
+--- linux-3.14.17/drivers/pinctrl/pinctrl-imx.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/pinctrl/pinctrl-imx.c 2014-09-09 10:13:50.280965814 +0200
@@ -1,7 +1,7 @@
/*
* Core driver for the imx pin controller
@@ -205334,9 +207949,9 @@ diff -Nur linux-3.14.15/drivers/pinctrl/pinctrl-imx.c linux-linaro-stable-mx6/dr
+ return pinctrl_force_default(ipctl->pctl);
+}
+#endif
-diff -Nur linux-3.14.15/drivers/pinctrl/pinctrl-imx.h linux-linaro-stable-mx6/drivers/pinctrl/pinctrl-imx.h
---- linux-3.14.15/drivers/pinctrl/pinctrl-imx.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/pinctrl/pinctrl-imx.h 2014-08-20 19:31:47.424874568 +0200
+diff -Nur linux-3.14.17/drivers/pinctrl/pinctrl-imx.h linux-imx6-3.14/drivers/pinctrl/pinctrl-imx.h
+--- linux-3.14.17/drivers/pinctrl/pinctrl-imx.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/pinctrl/pinctrl-imx.h 2014-09-09 10:13:50.280965814 +0200
@@ -1,7 +1,7 @@
/*
* IMX pinmux core definitions
@@ -205355,9 +207970,22 @@ diff -Nur linux-3.14.15/drivers/pinctrl/pinctrl-imx.h linux-linaro-stable-mx6/dr
+int imx_pinctrl_resume(struct platform_device *pdev);
+#endif
#endif /* __DRIVERS_PINCTRL_IMX_H */
-diff -Nur linux-3.14.15/drivers/power/imx6_usb_charger.c linux-linaro-stable-mx6/drivers/power/imx6_usb_charger.c
---- linux-3.14.15/drivers/power/imx6_usb_charger.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/power/imx6_usb_charger.c 2014-08-20 19:23:54.934851713 +0200
+diff -Nur linux-3.14.17/drivers/pnp/pnpacpi/core.c linux-imx6-3.14/drivers/pnp/pnpacpi/core.c
+--- linux-3.14.17/drivers/pnp/pnpacpi/core.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/pnp/pnpacpi/core.c 2014-09-09 10:13:50.316966108 +0200
+@@ -339,7 +339,8 @@
+ struct pnp_dev *pnp = _pnp;
+
+ /* true means it matched */
+- return pnp->data == acpi;
++ return !acpi->physical_node_count
++ && compare_pnp_id(pnp->id, acpi_device_hid(acpi));
+ }
+
+ static struct acpi_device * __init acpi_pnp_find_companion(struct device *dev)
+diff -Nur linux-3.14.17/drivers/power/imx6_usb_charger.c linux-imx6-3.14/drivers/power/imx6_usb_charger.c
+--- linux-3.14.17/drivers/power/imx6_usb_charger.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/power/imx6_usb_charger.c 2014-09-09 10:13:50.320966140 +0200
@@ -0,0 +1,294 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -205653,9 +208281,9 @@ diff -Nur linux-3.14.15/drivers/power/imx6_usb_charger.c linux-linaro-stable-mx6
+ power_supply_unregister(&charger->psy);
+}
+EXPORT_SYMBOL(imx6_usb_remove_charger);
-diff -Nur linux-3.14.15/drivers/power/Kconfig linux-linaro-stable-mx6/drivers/power/Kconfig
---- linux-3.14.15/drivers/power/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/power/Kconfig 2014-08-20 19:31:47.464874741 +0200
+diff -Nur linux-3.14.17/drivers/power/Kconfig linux-imx6-3.14/drivers/power/Kconfig
+--- linux-3.14.17/drivers/power/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/power/Kconfig 2014-09-09 10:13:50.316966108 +0200
@@ -389,6 +389,12 @@
Say Y to enable support for the battery and AC power in the
Goldfish emulator.
@@ -205669,17 +208297,17 @@ diff -Nur linux-3.14.15/drivers/power/Kconfig linux-linaro-stable-mx6/drivers/po
source "drivers/power/reset/Kconfig"
endif # POWER_SUPPLY
-diff -Nur linux-3.14.15/drivers/power/Makefile linux-linaro-stable-mx6/drivers/power/Makefile
---- linux-3.14.15/drivers/power/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/power/Makefile 2014-08-20 19:31:47.464874741 +0200
+diff -Nur linux-3.14.17/drivers/power/Makefile linux-imx6-3.14/drivers/power/Makefile
+--- linux-3.14.17/drivers/power/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/power/Makefile 2014-09-09 10:13:50.316966108 +0200
@@ -58,3 +58,4 @@
obj-$(CONFIG_CHARGER_SMB347) += smb347-charger.o
obj-$(CONFIG_CHARGER_TPS65090) += tps65090-charger.o
obj-$(CONFIG_POWER_RESET) += reset/
+obj-$(CONFIG_IMX6_USB_CHARGER) += imx6_usb_charger.o
-diff -Nur linux-3.14.15/drivers/ptp/ptp_chardev.c linux-linaro-stable-mx6/drivers/ptp/ptp_chardev.c
---- linux-3.14.15/drivers/ptp/ptp_chardev.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ptp/ptp_chardev.c 2014-08-20 19:31:47.536875050 +0200
+diff -Nur linux-3.14.17/drivers/ptp/ptp_chardev.c linux-imx6-3.14/drivers/ptp/ptp_chardev.c
+--- linux-3.14.17/drivers/ptp/ptp_chardev.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ptp/ptp_chardev.c 2014-09-09 10:13:50.328966205 +0200
@@ -25,6 +25,96 @@
#include "ptp_private.h"
@@ -205841,9 +208469,9 @@ diff -Nur linux-3.14.15/drivers/ptp/ptp_chardev.c linux-linaro-stable-mx6/driver
default:
err = -ENOTTY;
break;
-diff -Nur linux-3.14.15/drivers/ptp/ptp_clock.c linux-linaro-stable-mx6/drivers/ptp/ptp_clock.c
---- linux-3.14.15/drivers/ptp/ptp_clock.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ptp/ptp_clock.c 2014-08-20 19:31:47.536875050 +0200
+diff -Nur linux-3.14.17/drivers/ptp/ptp_clock.c linux-imx6-3.14/drivers/ptp/ptp_clock.c
+--- linux-3.14.17/drivers/ptp/ptp_clock.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ptp/ptp_clock.c 2014-09-09 10:13:50.328966205 +0200
@@ -169,6 +169,7 @@
struct ptp_clock *ptp = container_of(pc, struct ptp_clock, clock);
@@ -205895,9 +208523,9 @@ diff -Nur linux-3.14.15/drivers/ptp/ptp_clock.c linux-linaro-stable-mx6/drivers/
/* module operations */
static void __exit ptp_exit(void)
-diff -Nur linux-3.14.15/drivers/ptp/ptp_ixp46x.c linux-linaro-stable-mx6/drivers/ptp/ptp_ixp46x.c
---- linux-3.14.15/drivers/ptp/ptp_ixp46x.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ptp/ptp_ixp46x.c 2014-08-20 19:31:47.536875050 +0200
+diff -Nur linux-3.14.17/drivers/ptp/ptp_ixp46x.c linux-imx6-3.14/drivers/ptp/ptp_ixp46x.c
+--- linux-3.14.17/drivers/ptp/ptp_ixp46x.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ptp/ptp_ixp46x.c 2014-09-09 10:13:50.328966205 +0200
@@ -244,6 +244,7 @@
.name = "IXP46X timer",
.max_adj = 66666655,
@@ -205906,9 +208534,9 @@ diff -Nur linux-3.14.15/drivers/ptp/ptp_ixp46x.c linux-linaro-stable-mx6/drivers
.pps = 0,
.adjfreq = ptp_ixp_adjfreq,
.adjtime = ptp_ixp_adjtime,
-diff -Nur linux-3.14.15/drivers/ptp/ptp_pch.c linux-linaro-stable-mx6/drivers/ptp/ptp_pch.c
---- linux-3.14.15/drivers/ptp/ptp_pch.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ptp/ptp_pch.c 2014-08-20 19:31:47.536875050 +0200
+diff -Nur linux-3.14.17/drivers/ptp/ptp_pch.c linux-imx6-3.14/drivers/ptp/ptp_pch.c
+--- linux-3.14.17/drivers/ptp/ptp_pch.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ptp/ptp_pch.c 2014-09-09 10:13:50.328966205 +0200
@@ -514,6 +514,7 @@
.name = "PCH timer",
.max_adj = 50000000,
@@ -205917,9 +208545,9 @@ diff -Nur linux-3.14.15/drivers/ptp/ptp_pch.c linux-linaro-stable-mx6/drivers/pt
.pps = 0,
.adjfreq = ptp_pch_adjfreq,
.adjtime = ptp_pch_adjtime,
-diff -Nur linux-3.14.15/drivers/ptp/ptp_private.h linux-linaro-stable-mx6/drivers/ptp/ptp_private.h
---- linux-3.14.15/drivers/ptp/ptp_private.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/ptp/ptp_private.h 2014-08-20 19:31:47.536875050 +0200
+diff -Nur linux-3.14.17/drivers/ptp/ptp_private.h linux-imx6-3.14/drivers/ptp/ptp_private.h
+--- linux-3.14.17/drivers/ptp/ptp_private.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/ptp/ptp_private.h 2014-09-09 10:13:50.332966239 +0200
@@ -48,6 +48,7 @@
long dialed_frequency; /* remembers the frequency adjustment */
struct timestamp_event_queue tsevq; /* simple fifo for time stamps */
@@ -205939,9 +208567,9 @@ diff -Nur linux-3.14.15/drivers/ptp/ptp_private.h linux-linaro-stable-mx6/driver
long ptp_ioctl(struct posix_clock *pc,
unsigned int cmd, unsigned long arg);
-diff -Nur linux-3.14.15/drivers/pwm/pwm-imx.c linux-linaro-stable-mx6/drivers/pwm/pwm-imx.c
---- linux-3.14.15/drivers/pwm/pwm-imx.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/pwm/pwm-imx.c 2014-08-20 19:31:47.540875067 +0200
+diff -Nur linux-3.14.17/drivers/pwm/pwm-imx.c linux-imx6-3.14/drivers/pwm/pwm-imx.c
+--- linux-3.14.17/drivers/pwm/pwm-imx.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/pwm/pwm-imx.c 2014-09-09 10:13:50.332966239 +0200
@@ -1,4 +1,5 @@
/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -205983,9 +208611,34 @@ diff -Nur linux-3.14.15/drivers/pwm/pwm-imx.c linux-linaro-stable-mx6/drivers/pw
},
.probe = imx_pwm_probe,
.remove = imx_pwm_remove,
-diff -Nur linux-3.14.15/drivers/regulator/anatop-regulator.c linux-linaro-stable-mx6/drivers/regulator/anatop-regulator.c
---- linux-3.14.15/drivers/regulator/anatop-regulator.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/regulator/anatop-regulator.c 2014-08-20 19:31:47.624875427 +0200
+diff -Nur linux-3.14.17/drivers/rapidio/devices/tsi721_dma.c linux-imx6-3.14/drivers/rapidio/devices/tsi721_dma.c
+--- linux-3.14.17/drivers/rapidio/devices/tsi721_dma.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/rapidio/devices/tsi721_dma.c 2014-09-09 10:13:50.332966239 +0200
+@@ -287,12 +287,6 @@
+ "desc %p not ACKed\n", tx_desc);
+ }
+
+- if (ret == NULL) {
+- dev_dbg(bdma_chan->dchan.device->dev,
+- "%s: unable to obtain tx descriptor\n", __func__);
+- goto err_out;
+- }
+-
+ i = bdma_chan->wr_count_next % bdma_chan->bd_num;
+ if (i == bdma_chan->bd_num - 1) {
+ i = 0;
+@@ -303,7 +297,7 @@
+ tx_desc->txd.phys = bdma_chan->bd_phys +
+ i * sizeof(struct tsi721_dma_desc);
+ tx_desc->hw_desc = &((struct tsi721_dma_desc *)bdma_chan->bd_base)[i];
+-err_out:
++
+ spin_unlock_bh(&bdma_chan->lock);
+
+ return ret;
+diff -Nur linux-3.14.17/drivers/regulator/anatop-regulator.c linux-imx6-3.14/drivers/regulator/anatop-regulator.c
+--- linux-3.14.17/drivers/regulator/anatop-regulator.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/regulator/anatop-regulator.c 2014-09-09 10:13:50.336966271 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -206111,9 +208764,9 @@ diff -Nur linux-3.14.15/drivers/regulator/anatop-regulator.c linux-linaro-stable
/* register regulator */
rdev = devm_regulator_register(dev, rdesc, &config);
-diff -Nur linux-3.14.15/drivers/regulator/core.c linux-linaro-stable-mx6/drivers/regulator/core.c
---- linux-3.14.15/drivers/regulator/core.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/regulator/core.c 2014-08-20 19:31:47.632875462 +0200
+diff -Nur linux-3.14.17/drivers/regulator/core.c linux-imx6-3.14/drivers/regulator/core.c
+--- linux-3.14.17/drivers/regulator/core.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/regulator/core.c 2014-09-09 10:13:50.336966271 +0200
@@ -3,6 +3,7 @@
*
* Copyright 2007, 2008 Wolfson Microelectronics PLC.
@@ -206232,9 +208885,9 @@ diff -Nur linux-3.14.15/drivers/regulator/core.c linux-linaro-stable-mx6/drivers
ret = regulator_ena_gpio_request(rdev, config);
if (ret != 0) {
rdev_err(rdev, "Failed to request enable GPIO%d: %d\n",
-diff -Nur linux-3.14.15/drivers/regulator/dummy.c linux-linaro-stable-mx6/drivers/regulator/dummy.c
---- linux-3.14.15/drivers/regulator/dummy.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/regulator/dummy.c 2014-08-20 19:23:55.014852055 +0200
+diff -Nur linux-3.14.17/drivers/regulator/dummy.c linux-imx6-3.14/drivers/regulator/dummy.c
+--- linux-3.14.17/drivers/regulator/dummy.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/regulator/dummy.c 2014-09-09 10:13:50.340966303 +0200
@@ -44,6 +44,7 @@
config.dev = &pdev->dev;
@@ -206243,9 +208896,9 @@ diff -Nur linux-3.14.15/drivers/regulator/dummy.c linux-linaro-stable-mx6/driver
dummy_regulator_rdev = regulator_register(&dummy_desc, &config);
if (IS_ERR(dummy_regulator_rdev)) {
-diff -Nur linux-3.14.15/drivers/regulator/fixed.c linux-linaro-stable-mx6/drivers/regulator/fixed.c
---- linux-3.14.15/drivers/regulator/fixed.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/regulator/fixed.c 2014-08-20 19:31:47.640875496 +0200
+diff -Nur linux-3.14.17/drivers/regulator/fixed.c linux-imx6-3.14/drivers/regulator/fixed.c
+--- linux-3.14.17/drivers/regulator/fixed.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/regulator/fixed.c 2014-09-09 10:13:50.340966303 +0200
@@ -163,9 +163,7 @@
drvdata->desc.n_voltages = 1;
@@ -206257,9 +208910,9 @@ diff -Nur linux-3.14.15/drivers/regulator/fixed.c linux-linaro-stable-mx6/driver
cfg.ena_gpio_invert = !config->enable_high;
if (config->enabled_at_boot) {
if (config->enable_high)
-diff -Nur linux-3.14.15/drivers/reset/gpio-reset.c linux-linaro-stable-mx6/drivers/reset/gpio-reset.c
---- linux-3.14.15/drivers/reset/gpio-reset.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/reset/gpio-reset.c 2014-08-20 19:23:55.034852141 +0200
+diff -Nur linux-3.14.17/drivers/reset/gpio-reset.c linux-imx6-3.14/drivers/reset/gpio-reset.c
+--- linux-3.14.17/drivers/reset/gpio-reset.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/reset/gpio-reset.c 2014-09-09 10:13:50.348966368 +0200
@@ -0,0 +1,187 @@
+/*
+ * GPIO Reset Controller driver
@@ -206448,9 +209101,9 @@ diff -Nur linux-3.14.15/drivers/reset/gpio-reset.c linux-linaro-stable-mx6/drive
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:gpio-reset");
+MODULE_DEVICE_TABLE(of, gpio_reset_dt_ids);
-diff -Nur linux-3.14.15/drivers/reset/Kconfig linux-linaro-stable-mx6/drivers/reset/Kconfig
---- linux-3.14.15/drivers/reset/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/reset/Kconfig 2014-08-20 19:23:55.034852141 +0200
+diff -Nur linux-3.14.17/drivers/reset/Kconfig linux-imx6-3.14/drivers/reset/Kconfig
+--- linux-3.14.17/drivers/reset/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/reset/Kconfig 2014-09-09 10:13:50.348966368 +0200
@@ -11,3 +11,15 @@
via GPIOs or SoC-internal reset controller modules.
@@ -206467,16 +209120,16 @@ diff -Nur linux-3.14.15/drivers/reset/Kconfig linux-linaro-stable-mx6/drivers/re
+ directly by GPIOs.
+
+endif
-diff -Nur linux-3.14.15/drivers/reset/Makefile linux-linaro-stable-mx6/drivers/reset/Makefile
---- linux-3.14.15/drivers/reset/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/reset/Makefile 2014-08-20 19:31:47.672875633 +0200
+diff -Nur linux-3.14.17/drivers/reset/Makefile linux-imx6-3.14/drivers/reset/Makefile
+--- linux-3.14.17/drivers/reset/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/reset/Makefile 2014-09-09 10:13:50.348966368 +0200
@@ -1,2 +1,3 @@
obj-$(CONFIG_RESET_CONTROLLER) += core.o
+obj-$(CONFIG_RESET_GPIO) += gpio-reset.o
obj-$(CONFIG_ARCH_SUNXI) += reset-sunxi.o
-diff -Nur linux-3.14.15/drivers/rtc/rtc-pcf8523.c linux-linaro-stable-mx6/drivers/rtc/rtc-pcf8523.c
---- linux-3.14.15/drivers/rtc/rtc-pcf8523.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/rtc/rtc-pcf8523.c 2014-08-20 19:23:55.050852208 +0200
+diff -Nur linux-3.14.17/drivers/rtc/rtc-pcf8523.c linux-imx6-3.14/drivers/rtc/rtc-pcf8523.c
+--- linux-3.14.17/drivers/rtc/rtc-pcf8523.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/rtc/rtc-pcf8523.c 2014-09-09 10:13:50.356966434 +0200
@@ -7,6 +7,7 @@
*/
@@ -206608,9 +209261,9 @@ diff -Nur linux-3.14.15/drivers/rtc/rtc-pcf8523.c linux-linaro-stable-mx6/driver
err = pcf8523_set_pm(client, 0);
if (err < 0)
return err;
-diff -Nur linux-3.14.15/drivers/rtc/rtc-snvs.c linux-linaro-stable-mx6/drivers/rtc/rtc-snvs.c
---- linux-3.14.15/drivers/rtc/rtc-snvs.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/rtc/rtc-snvs.c 2014-08-20 19:31:47.696875736 +0200
+diff -Nur linux-3.14.17/drivers/rtc/rtc-snvs.c linux-imx6-3.14/drivers/rtc/rtc-snvs.c
+--- linux-3.14.17/drivers/rtc/rtc-snvs.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/rtc/rtc-snvs.c 2014-09-09 10:13:50.360966466 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2012 Freescale Semiconductor, Inc.
@@ -206673,9 +209326,75 @@ diff -Nur linux-3.14.15/drivers/rtc/rtc-snvs.c linux-linaro-stable-mx6/drivers/r
return 0;
}
-diff -Nur linux-3.14.15/drivers/scsi/scsi_transport_iscsi.c linux-linaro-stable-mx6/drivers/scsi/scsi_transport_iscsi.c
---- linux-3.14.15/drivers/scsi/scsi_transport_iscsi.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/scsi/scsi_transport_iscsi.c 2014-08-20 19:31:47.940876783 +0200
+diff -Nur linux-3.14.17/drivers/sbus/char/bbc_envctrl.c linux-imx6-3.14/drivers/sbus/char/bbc_envctrl.c
+--- linux-3.14.17/drivers/sbus/char/bbc_envctrl.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/sbus/char/bbc_envctrl.c 2014-09-09 10:13:50.416966923 +0200
+@@ -452,9 +452,6 @@
+ if (!tp)
+ return;
+
+- INIT_LIST_HEAD(&tp->bp_list);
+- INIT_LIST_HEAD(&tp->glob_list);
+-
+ tp->client = bbc_i2c_attach(bp, op);
+ if (!tp->client) {
+ kfree(tp);
+@@ -500,9 +497,6 @@
+ if (!fp)
+ return;
+
+- INIT_LIST_HEAD(&fp->bp_list);
+- INIT_LIST_HEAD(&fp->glob_list);
+-
+ fp->client = bbc_i2c_attach(bp, op);
+ if (!fp->client) {
+ kfree(fp);
+diff -Nur linux-3.14.17/drivers/sbus/char/bbc_i2c.c linux-imx6-3.14/drivers/sbus/char/bbc_i2c.c
+--- linux-3.14.17/drivers/sbus/char/bbc_i2c.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/sbus/char/bbc_i2c.c 2014-09-09 10:13:50.416966923 +0200
+@@ -300,18 +300,13 @@
+ if (!bp)
+ return NULL;
+
+- INIT_LIST_HEAD(&bp->temps);
+- INIT_LIST_HEAD(&bp->fans);
+-
+ bp->i2c_control_regs = of_ioremap(&op->resource[0], 0, 0x2, "bbc_i2c_regs");
+ if (!bp->i2c_control_regs)
+ goto fail;
+
+- if (op->num_resources == 2) {
+- bp->i2c_bussel_reg = of_ioremap(&op->resource[1], 0, 0x1, "bbc_i2c_bussel");
+- if (!bp->i2c_bussel_reg)
+- goto fail;
+- }
++ bp->i2c_bussel_reg = of_ioremap(&op->resource[1], 0, 0x1, "bbc_i2c_bussel");
++ if (!bp->i2c_bussel_reg)
++ goto fail;
+
+ bp->waiting = 0;
+ init_waitqueue_head(&bp->wq);
+diff -Nur linux-3.14.17/drivers/scsi/scsi_lib.c linux-imx6-3.14/drivers/scsi/scsi_lib.c
+--- linux-3.14.17/drivers/scsi/scsi_lib.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/scsi/scsi_lib.c 2014-09-09 10:13:50.584968292 +0200
+@@ -831,14 +831,6 @@
+ scsi_next_command(cmd);
+ return;
+ }
+- } else if (blk_rq_bytes(req) == 0 && result && !sense_deferred) {
+- /*
+- * Certain non BLOCK_PC requests are commands that don't
+- * actually transfer anything (FLUSH), so cannot use
+- * good_bytes != blk_rq_bytes(req) as the signal for an error.
+- * This sets the error explicitly for the problem case.
+- */
+- error = __scsi_error_from_host_byte(cmd, result);
+ }
+
+ /* no bidi support for !REQ_TYPE_BLOCK_PC yet */
+diff -Nur linux-3.14.17/drivers/scsi/scsi_transport_iscsi.c linux-imx6-3.14/drivers/scsi/scsi_transport_iscsi.c
+--- linux-3.14.17/drivers/scsi/scsi_transport_iscsi.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/scsi/scsi_transport_iscsi.c 2014-09-09 10:13:50.628968651 +0200
@@ -1225,7 +1225,7 @@
* Adds a sysfs entry for the flashnode session attributes
*
@@ -206703,9 +209422,9 @@ diff -Nur linux-3.14.15/drivers/scsi/scsi_transport_iscsi.c linux-linaro-stable-
* @shost: pointer to host data
*
* Destroys all the flashnode session entries and all corresponding children
-diff -Nur linux-3.14.15/drivers/staging/bcm/Typedefs.h linux-linaro-stable-mx6/drivers/staging/bcm/Typedefs.h
---- linux-3.14.15/drivers/staging/bcm/Typedefs.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/staging/bcm/Typedefs.h 2014-08-20 19:31:48.016877109 +0200
+diff -Nur linux-3.14.17/drivers/staging/bcm/Typedefs.h linux-imx6-3.14/drivers/staging/bcm/Typedefs.h
+--- linux-3.14.17/drivers/staging/bcm/Typedefs.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/staging/bcm/Typedefs.h 2014-09-09 10:13:50.924971058 +0200
@@ -25,16 +25,16 @@
typedef unsigned long ULONG;
typedef unsigned long DWORD;
@@ -206732,9 +209451,9 @@ diff -Nur linux-3.14.15/drivers/staging/bcm/Typedefs.h linux-linaro-stable-mx6/d
typedef unsigned long long ULONG64;
typedef unsigned long long LARGE_INTEGER;
typedef unsigned int UINT32;
-diff -Nur linux-3.14.15/drivers/staging/media/omap4iss/Kconfig linux-linaro-stable-mx6/drivers/staging/media/omap4iss/Kconfig
---- linux-3.14.15/drivers/staging/media/omap4iss/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/staging/media/omap4iss/Kconfig 2014-08-20 19:31:48.564879463 +0200
+diff -Nur linux-3.14.17/drivers/staging/media/omap4iss/Kconfig linux-imx6-3.14/drivers/staging/media/omap4iss/Kconfig
+--- linux-3.14.17/drivers/staging/media/omap4iss/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/staging/media/omap4iss/Kconfig 2014-09-09 10:13:51.084972368 +0200
@@ -1,6 +1,6 @@
config VIDEO_OMAP4
bool "OMAP 4 Camera support"
@@ -206743,9 +209462,9 @@ diff -Nur linux-3.14.15/drivers/staging/media/omap4iss/Kconfig linux-linaro-stab
select VIDEOBUF2_DMA_CONTIG
---help---
Driver for an OMAP 4 ISS controller.
-diff -Nur linux-3.14.15/drivers/staging/octeon/ethernet-rgmii.c linux-linaro-stable-mx6/drivers/staging/octeon/ethernet-rgmii.c
---- linux-3.14.15/drivers/staging/octeon/ethernet-rgmii.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/staging/octeon/ethernet-rgmii.c 2014-08-20 19:31:48.596879600 +0200
+diff -Nur linux-3.14.17/drivers/staging/octeon/ethernet-rgmii.c linux-imx6-3.14/drivers/staging/octeon/ethernet-rgmii.c
+--- linux-3.14.17/drivers/staging/octeon/ethernet-rgmii.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/staging/octeon/ethernet-rgmii.c 2014-09-09 10:13:51.096972466 +0200
@@ -166,9 +166,8 @@
if (use_global_register_lock)
@@ -206757,9 +209476,9 @@ diff -Nur linux-3.14.15/drivers/staging/octeon/ethernet-rgmii.c linux-linaro-sta
if (priv->phydev == NULL) {
/* Tell core. */
-diff -Nur linux-3.14.15/drivers/staging/rtl8821ae/core.c linux-linaro-stable-mx6/drivers/staging/rtl8821ae/core.c
---- linux-3.14.15/drivers/staging/rtl8821ae/core.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/staging/rtl8821ae/core.c 2014-08-20 19:31:48.776880373 +0200
+diff -Nur linux-3.14.17/drivers/staging/rtl8821ae/core.c linux-imx6-3.14/drivers/staging/rtl8821ae/core.c
+--- linux-3.14.17/drivers/staging/rtl8821ae/core.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/staging/rtl8821ae/core.c 2014-09-09 10:13:51.168973052 +0200
@@ -1414,23 +1414,15 @@
* before switch channle or power save, or tx buffer packet
* maybe send after offchannel or rf sleep, this may cause
@@ -206787,9 +209506,52 @@ diff -Nur linux-3.14.15/drivers/staging/rtl8821ae/core.c linux-linaro-stable-mx6
const struct ieee80211_ops rtl_ops = {
.start = rtl_op_start,
-diff -Nur linux-3.14.15/drivers/thermal/device_cooling.c linux-linaro-stable-mx6/drivers/thermal/device_cooling.c
---- linux-3.14.15/drivers/thermal/device_cooling.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/thermal/device_cooling.c 2014-08-20 19:23:57.174861277 +0200
+diff -Nur linux-3.14.17/drivers/staging/vt6655/bssdb.c linux-imx6-3.14/drivers/staging/vt6655/bssdb.c
+--- linux-3.14.17/drivers/staging/vt6655/bssdb.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/staging/vt6655/bssdb.c 2014-09-09 10:13:51.224973509 +0200
+@@ -983,7 +983,7 @@
+ pDevice->byERPFlag &= ~(WLAN_SET_ERP_USE_PROTECTION(1));
+ }
+
+- if (pDevice->eCommandState == WLAN_ASSOCIATE_WAIT) {
++ {
+ pDevice->byReAssocCount++;
+ /* 10 sec timeout */
+ if ((pDevice->byReAssocCount > 10) && (!pDevice->bLinkPass)) {
+diff -Nur linux-3.14.17/drivers/staging/vt6655/device_main.c linux-imx6-3.14/drivers/staging/vt6655/device_main.c
+--- linux-3.14.17/drivers/staging/vt6655/device_main.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/staging/vt6655/device_main.c 2014-09-09 10:13:51.224973509 +0200
+@@ -2430,7 +2430,6 @@
+ int handled = 0;
+ unsigned char byData = 0;
+ int ii = 0;
+- unsigned long flags;
+ // unsigned char byRSSI;
+
+ MACvReadISR(pDevice->PortOffset, &pDevice->dwIsr);
+@@ -2456,8 +2455,7 @@
+
+ handled = 1;
+ MACvIntDisable(pDevice->PortOffset);
+-
+- spin_lock_irqsave(&pDevice->lock, flags);
++ spin_lock_irq(&pDevice->lock);
+
+ //Make sure current page is 0
+ VNSvInPortB(pDevice->PortOffset + MAC_REG_PAGE1SEL, &byOrgPageSel);
+@@ -2698,8 +2696,7 @@
+ MACvSelectPage1(pDevice->PortOffset);
+ }
+
+- spin_unlock_irqrestore(&pDevice->lock, flags);
+-
++ spin_unlock_irq(&pDevice->lock);
+ MACvIntEnable(pDevice->PortOffset, IMR_MASK_VALUE);
+
+ return IRQ_RETVAL(handled);
+diff -Nur linux-3.14.17/drivers/thermal/device_cooling.c linux-imx6-3.14/drivers/thermal/device_cooling.c
+--- linux-3.14.17/drivers/thermal/device_cooling.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/thermal/device_cooling.c 2014-09-09 10:13:51.292974062 +0200
@@ -0,0 +1,151 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -206942,9 +209704,9 @@ diff -Nur linux-3.14.15/drivers/thermal/device_cooling.c linux-linaro-stable-mx6
+ kfree(devfreq_dev);
+}
+EXPORT_SYMBOL_GPL(devfreq_cooling_unregister);
-diff -Nur linux-3.14.15/drivers/thermal/imx_thermal.c linux-linaro-stable-mx6/drivers/thermal/imx_thermal.c
---- linux-3.14.15/drivers/thermal/imx_thermal.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/thermal/imx_thermal.c 2014-08-20 19:31:49.116881832 +0200
+diff -Nur linux-3.14.17/drivers/thermal/imx_thermal.c linux-imx6-3.14/drivers/thermal/imx_thermal.c
+--- linux-3.14.17/drivers/thermal/imx_thermal.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/thermal/imx_thermal.c 2014-09-09 10:13:51.292974062 +0200
@@ -12,6 +12,7 @@
#include <linux/cpufreq.h>
#include <linux/delay.h>
@@ -207043,9 +209805,9 @@ diff -Nur linux-3.14.15/drivers/thermal/imx_thermal.c linux-linaro-stable-mx6/dr
return 0;
}
-diff -Nur linux-3.14.15/drivers/thermal/Kconfig linux-linaro-stable-mx6/drivers/thermal/Kconfig
---- linux-3.14.15/drivers/thermal/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/thermal/Kconfig 2014-08-20 19:31:49.116881832 +0200
+diff -Nur linux-3.14.17/drivers/thermal/Kconfig linux-imx6-3.14/drivers/thermal/Kconfig
+--- linux-3.14.17/drivers/thermal/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/thermal/Kconfig 2014-09-09 10:13:51.292974062 +0200
@@ -125,6 +125,13 @@
cpufreq is used as the cooling device to throttle CPUs when the
passive trip is crossed.
@@ -207060,9 +209822,9 @@ diff -Nur linux-3.14.15/drivers/thermal/Kconfig linux-linaro-stable-mx6/drivers/
config SPEAR_THERMAL
bool "SPEAr thermal sensor driver"
depends on PLAT_SPEAR
-diff -Nur linux-3.14.15/drivers/thermal/Makefile linux-linaro-stable-mx6/drivers/thermal/Makefile
---- linux-3.14.15/drivers/thermal/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/thermal/Makefile 2014-08-20 19:31:49.116881832 +0200
+diff -Nur linux-3.14.17/drivers/thermal/Makefile linux-imx6-3.14/drivers/thermal/Makefile
+--- linux-3.14.17/drivers/thermal/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/thermal/Makefile 2014-09-09 10:13:51.292974062 +0200
@@ -26,6 +26,7 @@
obj-$(CONFIG_DB8500_THERMAL) += db8500_thermal.o
obj-$(CONFIG_ARMADA_THERMAL) += armada_thermal.o
@@ -207071,9 +209833,9 @@ diff -Nur linux-3.14.15/drivers/thermal/Makefile linux-linaro-stable-mx6/drivers
obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o
obj-$(CONFIG_INTEL_POWERCLAMP) += intel_powerclamp.o
obj-$(CONFIG_X86_PKG_TEMP_THERMAL) += x86_pkg_temp_thermal.o
-diff -Nur linux-3.14.15/drivers/tty/serial/earlycon.c linux-linaro-stable-mx6/drivers/tty/serial/earlycon.c
---- linux-3.14.15/drivers/tty/serial/earlycon.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/tty/serial/earlycon.c 2014-08-20 19:31:49.196882175 +0200
+diff -Nur linux-3.14.17/drivers/tty/serial/earlycon.c linux-imx6-3.14/drivers/tty/serial/earlycon.c
+--- linux-3.14.17/drivers/tty/serial/earlycon.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/tty/serial/earlycon.c 2014-09-09 10:13:51.312974225 +0200
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2014 Linaro Ltd.
@@ -207227,9 +209989,9 @@ diff -Nur linux-3.14.15/drivers/tty/serial/earlycon.c linux-linaro-stable-mx6/dr
+ register_console(early_console_dev.con);
+ return 0;
+}
-diff -Nur linux-3.14.15/drivers/tty/serial/Kconfig linux-linaro-stable-mx6/drivers/tty/serial/Kconfig
---- linux-3.14.15/drivers/tty/serial/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/tty/serial/Kconfig 2014-08-20 19:31:49.188882141 +0200
+diff -Nur linux-3.14.17/drivers/tty/serial/Kconfig linux-imx6-3.14/drivers/tty/serial/Kconfig
+--- linux-3.14.17/drivers/tty/serial/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/tty/serial/Kconfig 2014-09-09 10:13:51.308974193 +0200
@@ -7,6 +7,13 @@
menu "Serial drivers"
depends on HAS_IOMEM
@@ -207244,9 +210006,9 @@ diff -Nur linux-3.14.15/drivers/tty/serial/Kconfig linux-linaro-stable-mx6/drive
source "drivers/tty/serial/8250/Kconfig"
comment "Non-8250 serial port support"
-diff -Nur linux-3.14.15/drivers/tty/serial/Makefile linux-linaro-stable-mx6/drivers/tty/serial/Makefile
---- linux-3.14.15/drivers/tty/serial/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/tty/serial/Makefile 2014-08-20 19:31:49.188882141 +0200
+diff -Nur linux-3.14.17/drivers/tty/serial/Makefile linux-imx6-3.14/drivers/tty/serial/Makefile
+--- linux-3.14.17/drivers/tty/serial/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/tty/serial/Makefile 2014-09-09 10:13:51.308974193 +0200
@@ -5,6 +5,8 @@
obj-$(CONFIG_SERIAL_CORE) += serial_core.o
obj-$(CONFIG_SERIAL_21285) += 21285.o
@@ -207256,9 +210018,28 @@ diff -Nur linux-3.14.15/drivers/tty/serial/Makefile linux-linaro-stable-mx6/driv
# These Sparc drivers have to appear before others such as 8250
# which share ttySx minor node space. Otherwise console device
# names change and other unplesantries.
-diff -Nur linux-3.14.15/drivers/usb/chipidea/ci.h linux-linaro-stable-mx6/drivers/usb/chipidea/ci.h
---- linux-3.14.15/drivers/usb/chipidea/ci.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/ci.h 2014-08-20 19:31:49.240882364 +0200
+diff -Nur linux-3.14.17/drivers/tty/serial/sunsab.c linux-imx6-3.14/drivers/tty/serial/sunsab.c
+--- linux-3.14.17/drivers/tty/serial/sunsab.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/tty/serial/sunsab.c 2014-09-09 10:13:51.328974356 +0200
+@@ -157,15 +157,6 @@
+ (up->port.line == up->port.cons->index))
+ saw_console_brk = 1;
+
+- if (count == 0) {
+- if (unlikely(stat->sreg.isr1 & SAB82532_ISR1_BRK)) {
+- stat->sreg.isr0 &= ~(SAB82532_ISR0_PERR |
+- SAB82532_ISR0_FERR);
+- up->port.icount.brk++;
+- uart_handle_break(&up->port);
+- }
+- }
+-
+ for (i = 0; i < count; i++) {
+ unsigned char ch = buf[i], flag;
+
+diff -Nur linux-3.14.17/drivers/usb/chipidea/ci.h linux-imx6-3.14/drivers/usb/chipidea/ci.h
+--- linux-3.14.17/drivers/usb/chipidea/ci.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/usb/chipidea/ci.h 2014-09-09 10:13:51.340974454 +0200
@@ -139,8 +139,8 @@
* @roles: array of supported roles for this controller
* @role: current role
@@ -207303,9 +210084,9 @@ diff -Nur linux-3.14.15/drivers/usb/chipidea/ci.h linux-linaro-stable-mx6/driver
};
static inline struct ci_role_driver *ci_role(struct ci_hdrc *ci)
-diff -Nur linux-3.14.15/drivers/usb/chipidea/ci_hdrc_imx.c linux-linaro-stable-mx6/drivers/usb/chipidea/ci_hdrc_imx.c
---- linux-3.14.15/drivers/usb/chipidea/ci_hdrc_imx.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/ci_hdrc_imx.c 2014-08-20 19:31:49.240882364 +0200
+diff -Nur linux-3.14.17/drivers/usb/chipidea/ci_hdrc_imx.c linux-imx6-3.14/drivers/usb/chipidea/ci_hdrc_imx.c
+--- linux-3.14.17/drivers/usb/chipidea/ci_hdrc_imx.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/usb/chipidea/ci_hdrc_imx.c 2014-09-09 10:13:51.340974454 +0200
@@ -19,11 +19,14 @@
#include <linux/dma-mapping.h>
#include <linux/usb/chipidea.h>
@@ -207563,9 +210344,9 @@ diff -Nur linux-3.14.15/drivers/usb/chipidea/ci_hdrc_imx.c linux-linaro-stable-m
},
};
-diff -Nur linux-3.14.15/drivers/usb/chipidea/ci_hdrc_imx.h linux-linaro-stable-mx6/drivers/usb/chipidea/ci_hdrc_imx.h
---- linux-3.14.15/drivers/usb/chipidea/ci_hdrc_imx.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/ci_hdrc_imx.h 2014-08-20 19:31:49.240882364 +0200
+diff -Nur linux-3.14.17/drivers/usb/chipidea/ci_hdrc_imx.h linux-imx6-3.14/drivers/usb/chipidea/ci_hdrc_imx.h
+--- linux-3.14.17/drivers/usb/chipidea/ci_hdrc_imx.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/usb/chipidea/ci_hdrc_imx.h 2014-09-09 10:13:51.340974454 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 Freescale Semiconductor, Inc.
@@ -207592,9 +210373,9 @@ diff -Nur linux-3.14.15/drivers/usb/chipidea/ci_hdrc_imx.h linux-linaro-stable-m
+int imx_usbmisc_set_wakeup(struct imx_usbmisc_data *, bool);
#endif /* __DRIVER_USB_CHIPIDEA_CI_HDRC_IMX_H */
-diff -Nur linux-3.14.15/drivers/usb/chipidea/ci_hdrc_msm.c linux-linaro-stable-mx6/drivers/usb/chipidea/ci_hdrc_msm.c
---- linux-3.14.15/drivers/usb/chipidea/ci_hdrc_msm.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/ci_hdrc_msm.c 2014-08-20 19:23:57.250861602 +0200
+diff -Nur linux-3.14.17/drivers/usb/chipidea/ci_hdrc_msm.c linux-imx6-3.14/drivers/usb/chipidea/ci_hdrc_msm.c
+--- linux-3.14.17/drivers/usb/chipidea/ci_hdrc_msm.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/usb/chipidea/ci_hdrc_msm.c 2014-09-09 10:13:51.340974454 +0200
@@ -17,7 +17,7 @@
#define MSM_USB_BASE (ci->hw_bank.abs)
@@ -207613,9 +210394,9 @@ diff -Nur linux-3.14.15/drivers/usb/chipidea/ci_hdrc_msm.c linux-linaro-stable-m
}
static struct ci_hdrc_platform_data ci_hdrc_msm_platdata = {
-diff -Nur linux-3.14.15/drivers/usb/chipidea/core.c linux-linaro-stable-mx6/drivers/usb/chipidea/core.c
---- linux-3.14.15/drivers/usb/chipidea/core.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/core.c 2014-08-20 19:31:49.240882364 +0200
+diff -Nur linux-3.14.17/drivers/usb/chipidea/core.c linux-imx6-3.14/drivers/usb/chipidea/core.c
+--- linux-3.14.17/drivers/usb/chipidea/core.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/usb/chipidea/core.c 2014-09-09 10:13:51.340974454 +0200
@@ -165,25 +165,30 @@
return hw_read(ci, OP_PORTSC, PORTSC_PTC) >> __ffs(PORTSC_PTC);
}
@@ -207924,9 +210705,9 @@ diff -Nur linux-3.14.15/drivers/usb/chipidea/core.c linux-linaro-stable-mx6/driv
},
};
-diff -Nur linux-3.14.15/drivers/usb/chipidea/host.c linux-linaro-stable-mx6/drivers/usb/chipidea/host.c
---- linux-3.14.15/drivers/usb/chipidea/host.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/host.c 2014-08-20 19:31:49.240882364 +0200
+diff -Nur linux-3.14.17/drivers/usb/chipidea/host.c linux-imx6-3.14/drivers/usb/chipidea/host.c
+--- linux-3.14.17/drivers/usb/chipidea/host.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/usb/chipidea/host.c 2014-09-09 10:13:51.340974454 +0200
@@ -33,6 +33,176 @@
#include "host.h"
@@ -208128,9 +210909,9 @@ diff -Nur linux-3.14.15/drivers/usb/chipidea/host.c linux-linaro-stable-mx6/driv
+
return 0;
}
-diff -Nur linux-3.14.15/drivers/usb/chipidea/otg.c linux-linaro-stable-mx6/drivers/usb/chipidea/otg.c
---- linux-3.14.15/drivers/usb/chipidea/otg.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/otg.c 2014-08-20 19:31:49.240882364 +0200
+diff -Nur linux-3.14.17/drivers/usb/chipidea/otg.c linux-imx6-3.14/drivers/usb/chipidea/otg.c
+--- linux-3.14.17/drivers/usb/chipidea/otg.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/usb/chipidea/otg.c 2014-09-09 10:13:51.340974454 +0200
@@ -18,6 +18,8 @@
#include <linux/usb/otg.h>
#include <linux/usb/gadget.h>
@@ -208229,9 +211010,9 @@ diff -Nur linux-3.14.15/drivers/usb/chipidea/otg.c linux-linaro-stable-mx6/drive
ci_disable_otg_interrupt(ci, OTGSC_INT_EN_BITS);
ci_clear_otg_interrupt(ci, OTGSC_INT_STATUS_BITS);
}
-diff -Nur linux-3.14.15/drivers/usb/chipidea/udc.c linux-linaro-stable-mx6/drivers/usb/chipidea/udc.c
---- linux-3.14.15/drivers/usb/chipidea/udc.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/udc.c 2014-08-20 19:31:49.244882382 +0200
+diff -Nur linux-3.14.17/drivers/usb/chipidea/udc.c linux-imx6-3.14/drivers/usb/chipidea/udc.c
+--- linux-3.14.17/drivers/usb/chipidea/udc.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/usb/chipidea/udc.c 2014-09-09 10:13:51.340974454 +0200
@@ -681,12 +681,6 @@
struct ci_hdrc *ci = container_of(gadget, struct ci_hdrc, gadget);
unsigned long flags;
@@ -208324,9 +211105,9 @@ diff -Nur linux-3.14.15/drivers/usb/chipidea/udc.c linux-linaro-stable-mx6/drive
if (!ci->remote_wakeup) {
ret = -EOPNOTSUPP;
goto out;
-diff -Nur linux-3.14.15/drivers/usb/chipidea/usbmisc_imx.c linux-linaro-stable-mx6/drivers/usb/chipidea/usbmisc_imx.c
---- linux-3.14.15/drivers/usb/chipidea/usbmisc_imx.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/chipidea/usbmisc_imx.c 2014-08-20 19:31:49.244882382 +0200
+diff -Nur linux-3.14.17/drivers/usb/chipidea/usbmisc_imx.c linux-imx6-3.14/drivers/usb/chipidea/usbmisc_imx.c
+--- linux-3.14.17/drivers/usb/chipidea/usbmisc_imx.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/usb/chipidea/usbmisc_imx.c 2014-09-09 10:13:51.340974454 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 Freescale Semiconductor, Inc.
@@ -208501,9 +211282,9 @@ diff -Nur linux-3.14.15/drivers/usb/chipidea/usbmisc_imx.c linux-linaro-stable-m
usbmisc = NULL;
return 0;
}
-diff -Nur linux-3.14.15/drivers/usb/core/hub.c linux-linaro-stable-mx6/drivers/usb/core/hub.c
---- linux-3.14.15/drivers/usb/core/hub.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/core/hub.c 2014-08-20 19:31:49.248882399 +0200
+diff -Nur linux-3.14.17/drivers/usb/core/hub.c linux-imx6-3.14/drivers/usb/core/hub.c
+--- linux-3.14.17/drivers/usb/core/hub.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/usb/core/hub.c 2014-09-09 10:13:51.344974487 +0200
@@ -3867,6 +3867,12 @@
void usb_enable_ltm(struct usb_device *udev) { }
EXPORT_SYMBOL_GPL(usb_enable_ltm);
@@ -208527,9 +211308,9 @@ diff -Nur linux-3.14.15/drivers/usb/core/hub.c linux-linaro-stable-mx6/drivers/u
usb_phy_notify_disconnect(hcd->phy, udev->speed);
usb_disconnect(&hub->ports[port1 - 1]->child);
}
-diff -Nur linux-3.14.15/drivers/usb/core/message.c linux-linaro-stable-mx6/drivers/usb/core/message.c
---- linux-3.14.15/drivers/usb/core/message.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/core/message.c 2014-08-20 19:31:49.248882399 +0200
+diff -Nur linux-3.14.17/drivers/usb/core/message.c linux-imx6-3.14/drivers/usb/core/message.c
+--- linux-3.14.17/drivers/usb/core/message.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/usb/core/message.c 2014-09-09 10:13:51.344974487 +0200
@@ -178,7 +178,7 @@
*
* Return:
@@ -208539,9 +211320,9 @@ diff -Nur linux-3.14.15/drivers/usb/core/message.c linux-linaro-stable-mx6/drive
*/
int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
void *data, int len, int *actual_length, int timeout)
-diff -Nur linux-3.14.15/drivers/usb/core/urb.c linux-linaro-stable-mx6/drivers/usb/core/urb.c
---- linux-3.14.15/drivers/usb/core/urb.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/core/urb.c 2014-08-20 19:31:49.252882416 +0200
+diff -Nur linux-3.14.17/drivers/usb/core/urb.c linux-imx6-3.14/drivers/usb/core/urb.c
+--- linux-3.14.17/drivers/usb/core/urb.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/usb/core/urb.c 2014-09-09 10:13:51.348974519 +0200
@@ -831,7 +831,7 @@
*
* this allows all outstanding URBs to be unlinked starting
@@ -208551,9 +211332,9 @@ diff -Nur linux-3.14.15/drivers/usb/core/urb.c linux-linaro-stable-mx6/drivers/u
* function has returned.
*
* This routine should not be called by a driver after its disconnect
-diff -Nur linux-3.14.15/drivers/usb/gadget/f_mass_storage.c linux-linaro-stable-mx6/drivers/usb/gadget/f_mass_storage.c
---- linux-3.14.15/drivers/usb/gadget/f_mass_storage.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/gadget/f_mass_storage.c 2014-08-20 19:31:49.296882606 +0200
+diff -Nur linux-3.14.17/drivers/usb/gadget/f_mass_storage.c linux-imx6-3.14/drivers/usb/gadget/f_mass_storage.c
+--- linux-3.14.17/drivers/usb/gadget/f_mass_storage.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/usb/gadget/f_mass_storage.c 2014-09-09 10:13:51.360974617 +0200
@@ -336,8 +336,15 @@
struct usb_ep *bulk_in;
@@ -208675,9 +211456,9 @@ diff -Nur linux-3.14.15/drivers/usb/gadget/f_mass_storage.c linux-linaro-stable-
}
static inline struct fsg_lun_opts *to_fsg_lun_opts(struct config_item *item)
-diff -Nur linux-3.14.15/drivers/usb/gadget/fsl_updater.c linux-linaro-stable-mx6/drivers/usb/gadget/fsl_updater.c
---- linux-3.14.15/drivers/usb/gadget/fsl_updater.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/usb/gadget/fsl_updater.c 2014-08-20 19:23:57.318861891 +0200
+diff -Nur linux-3.14.17/drivers/usb/gadget/fsl_updater.c linux-imx6-3.14/drivers/usb/gadget/fsl_updater.c
+--- linux-3.14.17/drivers/usb/gadget/fsl_updater.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/usb/gadget/fsl_updater.c 2014-09-09 10:13:51.364974650 +0200
@@ -0,0 +1,594 @@
+/*
+ * Freescale UUT driver
@@ -209273,9 +212054,9 @@ diff -Nur linux-3.14.15/drivers/usb/gadget/fsl_updater.c linux-linaro-stable-mx6
+ utp_send_status(fsg);
+ return -1;
+}
-diff -Nur linux-3.14.15/drivers/usb/gadget/fsl_updater.h linux-linaro-stable-mx6/drivers/usb/gadget/fsl_updater.h
---- linux-3.14.15/drivers/usb/gadget/fsl_updater.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/usb/gadget/fsl_updater.h 2014-08-20 19:23:57.318861891 +0200
+diff -Nur linux-3.14.17/drivers/usb/gadget/fsl_updater.h linux-imx6-3.14/drivers/usb/gadget/fsl_updater.h
+--- linux-3.14.17/drivers/usb/gadget/fsl_updater.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/usb/gadget/fsl_updater.h 2014-09-09 10:13:51.364974650 +0200
@@ -0,0 +1,150 @@
+/*
+ * Freescale UUT driver
@@ -209427,9 +212208,9 @@ diff -Nur linux-3.14.15/drivers/usb/gadget/fsl_updater.h linux-linaro-stable-mx6
+
+#endif /* __FSL_UPDATER_H */
+
-diff -Nur linux-3.14.15/drivers/usb/gadget/Kconfig linux-linaro-stable-mx6/drivers/usb/gadget/Kconfig
---- linux-3.14.15/drivers/usb/gadget/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/gadget/Kconfig 2014-08-20 19:31:49.280882536 +0200
+diff -Nur linux-3.14.17/drivers/usb/gadget/Kconfig linux-imx6-3.14/drivers/usb/gadget/Kconfig
+--- linux-3.14.17/drivers/usb/gadget/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/usb/gadget/Kconfig 2014-09-09 10:13:51.352974551 +0200
@@ -952,6 +952,12 @@
Say "y" to link the driver statically, or "m" to build
a dynamically linked module called "g_mass_storage".
@@ -209443,9 +212224,9 @@ diff -Nur linux-3.14.15/drivers/usb/gadget/Kconfig linux-linaro-stable-mx6/drive
config USB_GADGET_TARGET
tristate "USB Gadget Target Fabric Module"
depends on TARGET_CORE
-diff -Nur linux-3.14.15/drivers/usb/gadget/mass_storage.c linux-linaro-stable-mx6/drivers/usb/gadget/mass_storage.c
---- linux-3.14.15/drivers/usb/gadget/mass_storage.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/gadget/mass_storage.c 2014-08-20 19:31:49.324882725 +0200
+diff -Nur linux-3.14.17/drivers/usb/gadget/mass_storage.c linux-imx6-3.14/drivers/usb/gadget/mass_storage.c
+--- linux-3.14.17/drivers/usb/gadget/mass_storage.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/usb/gadget/mass_storage.c 2014-09-09 10:13:51.368974682 +0200
@@ -266,7 +266,7 @@
{
return usb_composite_probe(&msg_driver);
@@ -209455,9 +212236,9 @@ diff -Nur linux-3.14.15/drivers/usb/gadget/mass_storage.c linux-linaro-stable-mx
static void msg_cleanup(void)
{
-diff -Nur linux-3.14.15/drivers/usb/host/ehci-h20ahb.c linux-linaro-stable-mx6/drivers/usb/host/ehci-h20ahb.c
---- linux-3.14.15/drivers/usb/host/ehci-h20ahb.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/usb/host/ehci-h20ahb.c 2014-08-20 19:31:49.344882811 +0200
+diff -Nur linux-3.14.17/drivers/usb/host/ehci-h20ahb.c linux-imx6-3.14/drivers/usb/host/ehci-h20ahb.c
+--- linux-3.14.17/drivers/usb/host/ehci-h20ahb.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/usb/host/ehci-h20ahb.c 2014-09-09 10:13:51.380974780 +0200
@@ -0,0 +1,341 @@
+/*
+ * Copyright (C) 2007-2013 Texas Instruments, Inc.
@@ -209800,9 +212581,9 @@ diff -Nur linux-3.14.15/drivers/usb/host/ehci-h20ahb.c linux-linaro-stable-mx6/d
+
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/drivers/usb/host/ehci-hcd.c linux-linaro-stable-mx6/drivers/usb/host/ehci-hcd.c
---- linux-3.14.15/drivers/usb/host/ehci-hcd.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/host/ehci-hcd.c 2014-08-20 19:31:49.344882811 +0200
+diff -Nur linux-3.14.17/drivers/usb/host/ehci-hcd.c linux-imx6-3.14/drivers/usb/host/ehci-hcd.c
+--- linux-3.14.17/drivers/usb/host/ehci-hcd.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/usb/host/ehci-hcd.c 2014-09-09 10:13:51.380974780 +0200
@@ -590,11 +590,16 @@
*/
hcc_params = ehci_readl(ehci, &ehci->caps->hcc_params);
@@ -209823,9 +212604,9 @@ diff -Nur linux-3.14.15/drivers/usb/host/ehci-hcd.c linux-linaro-stable-mx6/driv
#endif
}
-diff -Nur linux-3.14.15/drivers/usb/host/ehci-hub.c linux-linaro-stable-mx6/drivers/usb/host/ehci-hub.c
---- linux-3.14.15/drivers/usb/host/ehci-hub.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/host/ehci-hub.c 2014-08-20 19:31:49.344882811 +0200
+diff -Nur linux-3.14.17/drivers/usb/host/ehci-hub.c linux-imx6-3.14/drivers/usb/host/ehci-hub.c
+--- linux-3.14.17/drivers/usb/host/ehci-hub.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/usb/host/ehci-hub.c 2014-09-09 10:13:51.380974780 +0200
@@ -313,6 +313,15 @@
USB_PORT_STAT_HIGH_SPEED)
fs_idle_delay = true;
@@ -209842,9 +212623,9 @@ diff -Nur linux-3.14.15/drivers/usb/host/ehci-hub.c linux-linaro-stable-mx6/driv
changed = 1;
}
}
-diff -Nur linux-3.14.15/drivers/usb/host/Kconfig linux-linaro-stable-mx6/drivers/usb/host/Kconfig
---- linux-3.14.15/drivers/usb/host/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/host/Kconfig 2014-08-20 19:31:49.340882794 +0200
+diff -Nur linux-3.14.17/drivers/usb/host/Kconfig linux-imx6-3.14/drivers/usb/host/Kconfig
+--- linux-3.14.17/drivers/usb/host/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/usb/host/Kconfig 2014-09-09 10:13:51.376974747 +0200
@@ -158,6 +158,13 @@
Enables support for the on-chip EHCI controller on
ST SPEAr chips.
@@ -209859,9 +212640,9 @@ diff -Nur linux-3.14.15/drivers/usb/host/Kconfig linux-linaro-stable-mx6/drivers
config USB_EHCI_HCD_AT91
tristate "Support for Atmel on-chip EHCI USB controller"
depends on USB_EHCI_HCD && ARCH_AT91
-diff -Nur linux-3.14.15/drivers/usb/host/Makefile linux-linaro-stable-mx6/drivers/usb/host/Makefile
---- linux-3.14.15/drivers/usb/host/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/host/Makefile 2014-08-20 19:31:49.340882794 +0200
+diff -Nur linux-3.14.17/drivers/usb/host/Makefile linux-imx6-3.14/drivers/usb/host/Makefile
+--- linux-3.14.17/drivers/usb/host/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/usb/host/Makefile 2014-09-09 10:13:51.376974747 +0200
@@ -33,6 +33,8 @@
obj-$(CONFIG_USB_EHCI_HCD_ORION) += ehci-orion.o
obj-$(CONFIG_USB_EHCI_HCD_SPEAR) += ehci-spear.o
@@ -209871,9 +212652,9 @@ diff -Nur linux-3.14.15/drivers/usb/host/Makefile linux-linaro-stable-mx6/driver
obj-$(CONFIG_USB_EHCI_HCD_AT91) += ehci-atmel.o
obj-$(CONFIG_USB_EHCI_MSM) += ehci-msm.o
obj-$(CONFIG_USB_EHCI_TEGRA) += ehci-tegra.o
-diff -Nur linux-3.14.15/drivers/usb/phy/Kconfig linux-linaro-stable-mx6/drivers/usb/phy/Kconfig
---- linux-3.14.15/drivers/usb/phy/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/phy/Kconfig 2014-08-20 19:31:49.532883619 +0200
+diff -Nur linux-3.14.17/drivers/usb/phy/Kconfig linux-imx6-3.14/drivers/usb/phy/Kconfig
+--- linux-3.14.17/drivers/usb/phy/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/usb/phy/Kconfig 2014-09-09 10:13:51.412975040 +0200
@@ -253,7 +253,7 @@
config USB_ULPI
@@ -209883,9 +212664,9 @@ diff -Nur linux-3.14.15/drivers/usb/phy/Kconfig linux-linaro-stable-mx6/drivers/
help
Enable this to support ULPI connected USB OTG transceivers which
are likely found on embedded boards.
-diff -Nur linux-3.14.15/drivers/usb/phy/phy-mxs-usb.c linux-linaro-stable-mx6/drivers/usb/phy/phy-mxs-usb.c
---- linux-3.14.15/drivers/usb/phy/phy-mxs-usb.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/phy/phy-mxs-usb.c 2014-08-20 19:31:49.536883636 +0200
+diff -Nur linux-3.14.17/drivers/usb/phy/phy-mxs-usb.c linux-imx6-3.14/drivers/usb/phy/phy-mxs-usb.c
+--- linux-3.14.17/drivers/usb/phy/phy-mxs-usb.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/usb/phy/phy-mxs-usb.c 2014-09-09 10:13:51.416975072 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 Freescale Semiconductor, Inc.
@@ -210418,9 +213199,9 @@ diff -Nur linux-3.14.15/drivers/usb/phy/phy-mxs-usb.c linux-linaro-stable-mx6/dr
},
};
-diff -Nur linux-3.14.15/drivers/usb/phy/phy-ulpi.c linux-linaro-stable-mx6/drivers/usb/phy/phy-ulpi.c
---- linux-3.14.15/drivers/usb/phy/phy-ulpi.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/usb/phy/phy-ulpi.c 2014-08-20 19:31:49.536883636 +0200
+diff -Nur linux-3.14.17/drivers/usb/phy/phy-ulpi.c linux-imx6-3.14/drivers/usb/phy/phy-ulpi.c
+--- linux-3.14.17/drivers/usb/phy/phy-ulpi.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/usb/phy/phy-ulpi.c 2014-09-09 10:13:51.416975072 +0200
@@ -48,6 +48,7 @@
ULPI_INFO(ULPI_ID(0x04cc, 0x1504), "NXP ISP1504"),
ULPI_INFO(ULPI_ID(0x0424, 0x0006), "SMSC USB331x"),
@@ -210429,9 +213210,21 @@ diff -Nur linux-3.14.15/drivers/usb/phy/phy-ulpi.c linux-linaro-stable-mx6/drive
ULPI_INFO(ULPI_ID(0x0451, 0x1507), "TI TUSB1210"),
};
-diff -Nur linux-3.14.15/drivers/video/amba-clcd.c linux-linaro-stable-mx6/drivers/video/amba-clcd.c
---- linux-3.14.15/drivers/video/amba-clcd.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/video/amba-clcd.c 2014-08-20 19:31:49.580883825 +0200
+diff -Nur linux-3.14.17/drivers/usb/serial/option.c linux-imx6-3.14/drivers/usb/serial/option.c
+--- linux-3.14.17/drivers/usb/serial/option.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/usb/serial/option.c 2014-09-09 10:13:51.432975203 +0200
+@@ -1917,6 +1917,8 @@
+ dev_dbg(dev, "%s: type %x req %x\n", __func__,
+ req_pkt->bRequestType, req_pkt->bRequest);
+ }
++ } else if (status == -ENOENT || status == -ESHUTDOWN) {
++ dev_dbg(dev, "%s: urb stopped: %d\n", __func__, status);
+ } else
+ dev_err(dev, "%s: error %d\n", __func__, status);
+
+diff -Nur linux-3.14.17/drivers/video/amba-clcd.c linux-imx6-3.14/drivers/video/amba-clcd.c
+--- linux-3.14.17/drivers/video/amba-clcd.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/video/amba-clcd.c 2014-09-09 10:13:51.452975366 +0200
@@ -17,7 +17,10 @@
#include <linux/string.h>
#include <linux/slab.h>
@@ -210777,9 +213570,9 @@ diff -Nur linux-3.14.15/drivers/video/amba-clcd.c linux-linaro-stable-mx6/driver
ret = dma_set_mask_and_coherent(&dev->dev, DMA_BIT_MASK(32));
if (ret)
-diff -Nur linux-3.14.15/drivers/video/arm-hdlcd.c linux-linaro-stable-mx6/drivers/video/arm-hdlcd.c
---- linux-3.14.15/drivers/video/arm-hdlcd.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/arm-hdlcd.c 2014-08-20 19:23:57.474862558 +0200
+diff -Nur linux-3.14.17/drivers/video/arm-hdlcd.c linux-imx6-3.14/drivers/video/arm-hdlcd.c
+--- linux-3.14.17/drivers/video/arm-hdlcd.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/video/arm-hdlcd.c 2014-09-09 10:13:51.452975366 +0200
@@ -0,0 +1,844 @@
+/*
+ * drivers/video/arm-hdlcd.c
@@ -211625,9 +214418,9 @@ diff -Nur linux-3.14.15/drivers/video/arm-hdlcd.c linux-linaro-stable-mx6/driver
+MODULE_AUTHOR("Liviu Dudau");
+MODULE_DESCRIPTION("ARM HDLCD core driver");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-3.14.15/drivers/video/backlight/backlight.c linux-linaro-stable-mx6/drivers/video/backlight/backlight.c
---- linux-3.14.15/drivers/video/backlight/backlight.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/video/backlight/backlight.c 2014-08-20 19:31:49.592883875 +0200
+diff -Nur linux-3.14.17/drivers/video/backlight/backlight.c linux-imx6-3.14/drivers/video/backlight/backlight.c
+--- linux-3.14.17/drivers/video/backlight/backlight.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/video/backlight/backlight.c 2014-09-09 10:13:51.460975431 +0200
@@ -41,6 +41,8 @@
{
struct backlight_device *bd;
@@ -211668,9 +214461,9 @@ diff -Nur linux-3.14.15/drivers/video/backlight/backlight.c linux-linaro-stable-
}
mutex_unlock(&bd->ops_lock);
return 0;
-diff -Nur linux-3.14.15/drivers/video/Kconfig linux-linaro-stable-mx6/drivers/video/Kconfig
---- linux-3.14.15/drivers/video/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/video/Kconfig 2014-08-20 19:31:49.580883825 +0200
+diff -Nur linux-3.14.17/drivers/video/Kconfig linux-imx6-3.14/drivers/video/Kconfig
+--- linux-3.14.17/drivers/video/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/video/Kconfig 2014-09-09 10:13:51.452975366 +0200
@@ -39,6 +39,11 @@
config HDMI
bool
@@ -211716,9 +214509,9 @@ diff -Nur linux-3.14.15/drivers/video/Kconfig linux-linaro-stable-mx6/drivers/vi
if VT
source "drivers/video/console/Kconfig"
endif
-diff -Nur linux-3.14.15/drivers/video/Makefile linux-linaro-stable-mx6/drivers/video/Makefile
---- linux-3.14.15/drivers/video/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/video/Makefile 2014-08-20 19:31:49.580883825 +0200
+diff -Nur linux-3.14.17/drivers/video/Makefile linux-imx6-3.14/drivers/video/Makefile
+--- linux-3.14.17/drivers/video/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/video/Makefile 2014-09-09 10:13:51.452975366 +0200
@@ -53,6 +53,7 @@
obj-$(CONFIG_FB_SAVAGE) += savage/
obj-$(CONFIG_FB_GEODE) += geode/
@@ -211742,9 +214535,9 @@ diff -Nur linux-3.14.15/drivers/video/Makefile linux-linaro-stable-mx6/drivers/v
+
+# platform specific output drivers
+obj-$(CONFIG_VEXPRESS_DVI_CONTROL) += vexpress-dvi.o
-diff -Nur linux-3.14.15/drivers/video/mxc/Kconfig linux-linaro-stable-mx6/drivers/video/mxc/Kconfig
---- linux-3.14.15/drivers/video/mxc/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/mxc/Kconfig 2014-08-20 19:31:50.020885713 +0200
+diff -Nur linux-3.14.17/drivers/video/mxc/Kconfig linux-imx6-3.14/drivers/video/mxc/Kconfig
+--- linux-3.14.17/drivers/video/mxc/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/video/mxc/Kconfig 2014-09-09 10:13:51.496975724 +0200
@@ -0,0 +1,48 @@
+config FB_MXC
+ tristate "MXC Framebuffer support"
@@ -211794,9 +214587,9 @@ diff -Nur linux-3.14.15/drivers/video/mxc/Kconfig linux-linaro-stable-mx6/driver
+ depends on FB_MXC && I2C
+ tristate "MXC EDID support"
+ default y
-diff -Nur linux-3.14.15/drivers/video/mxc/ldb.c linux-linaro-stable-mx6/drivers/video/mxc/ldb.c
---- linux-3.14.15/drivers/video/mxc/ldb.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/mxc/ldb.c 2014-08-20 19:23:58.566867220 +0200
+diff -Nur linux-3.14.17/drivers/video/mxc/ldb.c linux-imx6-3.14/drivers/video/mxc/ldb.c
+--- linux-3.14.17/drivers/video/mxc/ldb.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/video/mxc/ldb.c 2014-09-09 10:13:51.496975724 +0200
@@ -0,0 +1,1036 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -212834,9 +215627,9 @@ diff -Nur linux-3.14.15/drivers/video/mxc/ldb.c linux-linaro-stable-mx6/drivers/
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("MXC LDB driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/drivers/video/mxc/Makefile linux-linaro-stable-mx6/drivers/video/mxc/Makefile
---- linux-3.14.15/drivers/video/mxc/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/mxc/Makefile 2014-08-20 19:31:50.020885713 +0200
+diff -Nur linux-3.14.17/drivers/video/mxc/Makefile linux-imx6-3.14/drivers/video/mxc/Makefile
+--- linux-3.14.17/drivers/video/mxc/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/video/mxc/Makefile 2014-09-09 10:13:51.496975724 +0200
@@ -0,0 +1,6 @@
+obj-$(CONFIG_FB_MXC_LDB) += ldb.o
+obj-$(CONFIG_FB_MXC_MIPI_DSI) += mipi_dsi.o
@@ -212844,9 +215637,9 @@ diff -Nur linux-3.14.15/drivers/video/mxc/Makefile linux-linaro-stable-mx6/drive
+obj-$(CONFIG_FB_MXC_HDMI) += mxc_hdmi.o
+obj-$(CONFIG_FB_MXC_EDID) += mxc_edid.o
+obj-$(CONFIG_FB_MXC_SYNC_PANEL) += mxc_dispdrv.o mxc_lcdif.o mxc_ipuv3_fb.o
-diff -Nur linux-3.14.15/drivers/video/mxc/mipi_dsi.c linux-linaro-stable-mx6/drivers/video/mxc/mipi_dsi.c
---- linux-3.14.15/drivers/video/mxc/mipi_dsi.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/mxc/mipi_dsi.c 2014-08-20 19:23:58.566867220 +0200
+diff -Nur linux-3.14.17/drivers/video/mxc/mipi_dsi.c linux-imx6-3.14/drivers/video/mxc/mipi_dsi.c
+--- linux-3.14.17/drivers/video/mxc/mipi_dsi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/video/mxc/mipi_dsi.c 2014-09-09 10:13:51.496975724 +0200
@@ -0,0 +1,953 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -213801,9 +216594,9 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mipi_dsi.c linux-linaro-stable-mx6/dri
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("i.MX MIPI DSI driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/drivers/video/mxc/mipi_dsi.h linux-linaro-stable-mx6/drivers/video/mxc/mipi_dsi.h
---- linux-3.14.15/drivers/video/mxc/mipi_dsi.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/mxc/mipi_dsi.h 2014-08-20 19:23:58.566867220 +0200
+diff -Nur linux-3.14.17/drivers/video/mxc/mipi_dsi.h linux-imx6-3.14/drivers/video/mxc/mipi_dsi.h
+--- linux-3.14.17/drivers/video/mxc/mipi_dsi.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/video/mxc/mipi_dsi.h 2014-09-09 10:13:51.496975724 +0200
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -213917,9 +216710,9 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mipi_dsi.h linux-linaro-stable-mx6/dri
+#endif
+
+#endif
-diff -Nur linux-3.14.15/drivers/video/mxc/mxc_dispdrv.c linux-linaro-stable-mx6/drivers/video/mxc/mxc_dispdrv.c
---- linux-3.14.15/drivers/video/mxc/mxc_dispdrv.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/mxc/mxc_dispdrv.c 2014-08-20 19:23:58.566867220 +0200
+diff -Nur linux-3.14.17/drivers/video/mxc/mxc_dispdrv.c linux-imx6-3.14/drivers/video/mxc/mxc_dispdrv.c
+--- linux-3.14.17/drivers/video/mxc/mxc_dispdrv.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/video/mxc/mxc_dispdrv.c 2014-09-09 10:13:51.496975724 +0200
@@ -0,0 +1,150 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -214071,9 +216864,9 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxc_dispdrv.c linux-linaro-stable-mx6/
+ return ERR_PTR(-EINVAL);
+}
+EXPORT_SYMBOL_GPL(mxc_dispdrv_getdata);
-diff -Nur linux-3.14.15/drivers/video/mxc/mxc_dispdrv.h linux-linaro-stable-mx6/drivers/video/mxc/mxc_dispdrv.h
---- linux-3.14.15/drivers/video/mxc/mxc_dispdrv.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/mxc/mxc_dispdrv.h 2014-08-20 19:23:58.566867220 +0200
+diff -Nur linux-3.14.17/drivers/video/mxc/mxc_dispdrv.h linux-imx6-3.14/drivers/video/mxc/mxc_dispdrv.h
+--- linux-3.14.17/drivers/video/mxc/mxc_dispdrv.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/video/mxc/mxc_dispdrv.h 2014-09-09 10:13:51.496975724 +0200
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -214129,9 +216922,9 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxc_dispdrv.h linux-linaro-stable-mx6/
+int mxc_dispdrv_setdata(struct mxc_dispdrv_handle *handle, void *data);
+void *mxc_dispdrv_getdata(struct mxc_dispdrv_handle *handle);
+#endif
-diff -Nur linux-3.14.15/drivers/video/mxc/mxc_edid.c linux-linaro-stable-mx6/drivers/video/mxc/mxc_edid.c
---- linux-3.14.15/drivers/video/mxc/mxc_edid.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/mxc/mxc_edid.c 2014-08-20 19:23:58.566867220 +0200
+diff -Nur linux-3.14.17/drivers/video/mxc/mxc_edid.c linux-imx6-3.14/drivers/video/mxc/mxc_edid.c
+--- linux-3.14.17/drivers/video/mxc/mxc_edid.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/video/mxc/mxc_edid.c 2014-09-09 10:13:51.496975724 +0200
@@ -0,0 +1,762 @@
+/*
+ * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -214895,9 +217688,9 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxc_edid.c linux-linaro-stable-mx6/dri
+}
+EXPORT_SYMBOL(mxc_edid_read);
+
-diff -Nur linux-3.14.15/drivers/video/mxc/mxcfb_hx8369_wvga.c linux-linaro-stable-mx6/drivers/video/mxc/mxcfb_hx8369_wvga.c
---- linux-3.14.15/drivers/video/mxc/mxcfb_hx8369_wvga.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/mxc/mxcfb_hx8369_wvga.c 2014-08-20 19:23:58.566867220 +0200
+diff -Nur linux-3.14.17/drivers/video/mxc/mxcfb_hx8369_wvga.c linux-imx6-3.14/drivers/video/mxc/mxcfb_hx8369_wvga.c
+--- linux-3.14.17/drivers/video/mxc/mxcfb_hx8369_wvga.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/video/mxc/mxcfb_hx8369_wvga.c 2014-09-09 10:13:51.496975724 +0200
@@ -0,0 +1,449 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -215348,10 +218141,10 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxcfb_hx8369_wvga.c linux-linaro-stabl
+ mipid_bl_update_status(bl);
+ return 0;
+}
-diff -Nur linux-3.14.15/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/drivers/video/mxc/mxc_hdmi.c
---- linux-3.14.15/drivers/video/mxc/mxc_hdmi.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/mxc/mxc_hdmi.c 2014-08-20 19:31:50.020885713 +0200
-@@ -0,0 +1,2920 @@
+diff -Nur linux-3.14.17/drivers/video/mxc/mxc_hdmi.c linux-imx6-3.14/drivers/video/mxc/mxc_hdmi.c
+--- linux-3.14.17/drivers/video/mxc/mxc_hdmi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/video/mxc/mxc_hdmi.c 2014-09-09 10:13:51.496975724 +0200
+@@ -0,0 +1,3022 @@
+/*
+ * Copyright (C) 2011-2014 Freescale Semiconductor, Inc.
+ *
@@ -215380,6 +218173,7 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/dri
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
++
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/device.h>
@@ -215492,6 +218286,7 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/dri
+ unsigned int pix_repet_factor;
+ unsigned int hdcp_enable;
+ unsigned int rgb_out_enable;
++ unsigned int rgb_quant_range;
+ struct hdmi_vmode video_mode;
+};
+
@@ -215508,13 +218303,15 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/dri
+ struct fb_info *fbi;
+ struct clk *hdmi_isfr_clk;
+ struct clk *hdmi_iahb_clk;
-+ struct delayed_work hotplug_work;
++ struct timer_list jitter_timer;
++ struct work_struct hotplug_work;
+ struct delayed_work hdcp_hdp_work;
+
+ struct notifier_block nb;
+
+ struct hdmi_data_info hdmi_data;
+ int vic;
++ int edid_status;
+ struct mxc_edid_cfg edid_cfg;
+ u8 edid[HDMI_EDID_LEN];
+ bool fb_reg;
@@ -215524,6 +218321,8 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/dri
+ char *dft_mode_str;
+ int default_bpp;
+ u8 latest_intr_stat;
++ u8 plug_event;
++ u8 plug_mask;
+ bool irq_enabled;
+ spinlock_t irq_lock;
+ bool phy_enabled;
@@ -215557,6 +218356,10 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/dri
+static void hdmi_enable_overflow_interrupts(void);
+static void hdmi_disable_overflow_interrupts(void);
+
++static char *rgb_quant_range = "default";
++module_param(rgb_quant_range, charp, S_IRUGO);
++MODULE_PARM_DESC(rgb_quant_range, "RGB Quant Range (default, limited, full)");
++
+static struct platform_device_id imx_hdmi_devtype[] = {
+ {
+ .name = "hdmi-imx6DL",
@@ -215676,6 +218479,55 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/dri
+ mxc_hdmi_show_rgb_out_enable,
+ mxc_hdmi_store_rgb_out_enable);
+
++static ssize_t mxc_hdmi_show_rgb_quant_range(struct device *dev,
++ struct device_attribute *attr, char *buf)
++{
++ struct mxc_hdmi *hdmi = dev_get_drvdata(dev);
++
++ switch (hdmi->hdmi_data.rgb_quant_range) {
++ case HDMI_FC_AVICONF2_RGB_QUANT_LIMITED_RANGE:
++ strcpy(buf, "limited\n");
++ break;
++ case HDMI_FC_AVICONF2_RGB_QUANT_FULL_RANGE:
++ strcpy(buf, "full\n");
++ break;
++ case HDMI_FC_AVICONF2_RGB_QUANT_DEFAULT:
++ default:
++ strcpy(buf, "default\n");
++ break;
++ };
++
++ return strlen(buf);
++}
++
++static ssize_t mxc_hdmi_store_rgb_quant_range(struct device *dev,
++ struct device_attribute *attr, const char *buf, size_t count)
++{
++ struct mxc_hdmi *hdmi = dev_get_drvdata(dev);
++ int ret = count;
++
++ if (sysfs_streq("limited", buf)) {
++ hdmi->hdmi_data.rgb_quant_range = HDMI_FC_AVICONF2_RGB_QUANT_LIMITED_RANGE;
++ } else if (sysfs_streq("full", buf)) {
++ hdmi->hdmi_data.rgb_quant_range = HDMI_FC_AVICONF2_RGB_QUANT_FULL_RANGE;
++ } else if (sysfs_streq("default", buf)) {
++ hdmi->hdmi_data.rgb_quant_range = HDMI_FC_AVICONF2_RGB_QUANT_DEFAULT;
++ } else {
++ ret = -EINVAL;
++ goto out;
++ }
++
++ /* Reconfig HDMI for output RGB Quant Range change if using RGB out */
++ if(hdmi->hdmi_data.rgb_out_enable)
++ mxc_hdmi_setup(hdmi, 0);
++out:
++ return ret;
++}
++
++static DEVICE_ATTR(rgb_quant_range, S_IRUGO | S_IWUSR,
++ mxc_hdmi_show_rgb_quant_range,
++ mxc_hdmi_store_rgb_quant_range);
++
+static ssize_t mxc_hdmi_show_hdcp_enable(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
@@ -216730,7 +219582,7 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/dri
+ ********************************************/
+
+ val = HDMI_FC_AVICONF2_IT_CONTENT_NO_DATA | ext_colorimetry |
-+ HDMI_FC_AVICONF2_RGB_QUANT_DEFAULT |
++ hdmi->hdmi_data.rgb_quant_range |
+ HDMI_FC_AVICONF2_SCALING_NONE;
+ hdmi_writeb(val, HDMI_FC_AVICONF2);
+
@@ -216932,8 +219784,13 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/dri
+
+ ret = mxc_edid_parse_ext_blk(edid + EDID_LENGTH,
+ cfg, &fbi->monspecs);
-+ if (ret < 0)
-+ return -ENOENT;
++ if (ret < 0) {
++ fb_edid_add_monspecs(edid + EDID_LENGTH, &fbi->monspecs);
++ if (fbi->monspecs.modedb_len > 0)
++ hdmi->edid_cfg.hdmi_cap = false;
++ else
++ return -ENOENT;
++ }
+
+ /* need read segment block? */
+ if (extblknum > 1) {
@@ -216987,11 +219844,13 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/dri
+ }
+
+ }
++
+ if (ret < 0)
+ return HDMI_EDID_FAIL;
+
-+ /* Save edid cfg for audio driver */
-+ hdmi_set_edid_cfg(&hdmi->edid_cfg);
++ dev_info(&hdmi->pdev->dev, "%s HDMI in %s mode\n", __func__, hdmi->edid_cfg.hdmi_cap?"HDMI":"DVI");
++ hdmi->plug_event = hdmi->edid_cfg.hdmi_cap?HDMI_IH_PHY_STAT0_HPD:HDMI_DVI_IH_STAT;
++ hdmi->plug_mask = hdmi->edid_cfg.hdmi_cap?HDMI_PHY_HPD:HDMI_DVI_STAT;
+
+ if (!memcmp(edid_old, hdmi->edid, HDMI_EDID_LEN)) {
+ dev_info(&hdmi->pdev->dev, "same edid\n");
@@ -217156,20 +220015,21 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/dri
+ */
+ mode = &hdmi->fbi->monspecs.modedb[i];
+
-+ if (!(mode->vmode & FB_VMODE_INTERLACED) &&
-+ (mxc_edid_mode_to_vic(mode) != 0)) {
++ if ((mode->vmode & FB_VMODE_INTERLACED) ||
++ (hdmi->edid_cfg.hdmi_cap &&
++ (mxc_edid_mode_to_vic(mode) == 0)))
++ continue;
+
-+ dev_dbg(&hdmi->pdev->dev, "Added mode %d:", i);
-+ dev_dbg(&hdmi->pdev->dev,
-+ "xres = %d, yres = %d, freq = %d, vmode = %d, flag = %d\n",
-+ hdmi->fbi->monspecs.modedb[i].xres,
-+ hdmi->fbi->monspecs.modedb[i].yres,
-+ hdmi->fbi->monspecs.modedb[i].refresh,
-+ hdmi->fbi->monspecs.modedb[i].vmode,
-+ hdmi->fbi->monspecs.modedb[i].flag);
++ dev_dbg(&hdmi->pdev->dev, "Added mode %d:", i);
++ dev_dbg(&hdmi->pdev->dev,
++ "xres = %d, yres = %d, freq = %d, vmode = %d, flag = %d\n",
++ hdmi->fbi->monspecs.modedb[i].xres,
++ hdmi->fbi->monspecs.modedb[i].yres,
++ hdmi->fbi->monspecs.modedb[i].refresh,
++ hdmi->fbi->monspecs.modedb[i].vmode,
++ hdmi->fbi->monspecs.modedb[i].flag);
+
-+ fb_add_videomode(mode, &hdmi->fbi->modelist);
-+ }
++ fb_add_videomode(mode, &hdmi->fbi->modelist);
+ }
+
+ console_unlock();
@@ -217263,24 +220123,22 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/dri
+
+static void mxc_hdmi_cable_connected(struct mxc_hdmi *hdmi)
+{
-+ int edid_status;
-+
+ dev_dbg(&hdmi->pdev->dev, "%s\n", __func__);
+
+ hdmi->cable_plugin = true;
+
+ /* HDMI Initialization Step C */
-+ edid_status = mxc_hdmi_read_edid(hdmi);
++ hdmi->edid_status = mxc_hdmi_read_edid(hdmi);
+
+ /* Read EDID again if first EDID read failed */
-+ if (edid_status == HDMI_EDID_NO_MODES ||
-+ edid_status == HDMI_EDID_FAIL) {
++ if (hdmi->edid_status == HDMI_EDID_NO_MODES ||
++ hdmi->edid_status == HDMI_EDID_FAIL) {
+ dev_info(&hdmi->pdev->dev, "Read EDID again\n");
-+ edid_status = mxc_hdmi_read_edid(hdmi);
++ hdmi->edid_status = mxc_hdmi_read_edid(hdmi);
+ }
+
+ /* HDMI Initialization Steps D, E, F */
-+ switch (edid_status) {
++ switch (hdmi->edid_status) {
+ case HDMI_EDID_SUCCESS:
+ mxc_hdmi_edid_rebuild_modelist(hdmi);
+ break;
@@ -217298,6 +220156,9 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/dri
+ break;
+ }
+
++ /* Save edid cfg for audio driver */
++ hdmi_set_edid_cfg(hdmi->edid_status, &hdmi->edid_cfg);
++
+ /* Setting video mode */
+ mxc_hdmi_set_mode(hdmi);
+
@@ -217339,61 +220200,46 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/dri
+
+static void hotplug_worker(struct work_struct *work)
+{
-+ struct delayed_work *delay_work = to_delayed_work(work);
+ struct mxc_hdmi *hdmi =
-+ container_of(delay_work, struct mxc_hdmi, hotplug_work);
-+ u32 phy_int_stat, phy_int_pol, phy_int_mask;
-+ u8 val;
++ container_of(work, struct mxc_hdmi, hotplug_work);
++ u32 hdmi_phy_stat0, hdmi_phy_pol0, hdmi_phy_mask0;
+ unsigned long flags;
+ char event_string[32];
+ char *envp[] = { event_string, NULL };
+
-+ phy_int_stat = hdmi->latest_intr_stat;
-+ phy_int_pol = hdmi_readb(HDMI_PHY_POL0);
++ hdmi_phy_stat0 = hdmi_readb(HDMI_PHY_STAT0);
++ hdmi_phy_pol0 = hdmi_readb(HDMI_PHY_POL0);
+
-+ dev_dbg(&hdmi->pdev->dev, "phy_int_stat=0x%x, phy_int_pol=0x%x\n",
-+ phy_int_stat, phy_int_pol);
++ if (hdmi->latest_intr_stat & hdmi->plug_event) {
++ /* Make HPD intr active low to capture unplug event or
++ * active high to capture plugin event */
++ hdmi_writeb((hdmi->plug_mask & ~hdmi_phy_pol0), HDMI_PHY_POL0);
+
-+ /* check cable status */
-+ if (phy_int_stat & HDMI_IH_PHY_STAT0_HPD) {
-+ /* cable connection changes */
-+ if (phy_int_pol & HDMI_PHY_HPD) {
++ /* check cable status */
++ if (hdmi_phy_stat0 & hdmi->plug_mask) {
+ /* Plugin event */
+ dev_dbg(&hdmi->pdev->dev, "EVENT=plugin\n");
+ mxc_hdmi_cable_connected(hdmi);
+
-+ /* Make HPD intr active low to capture unplug event */
-+ val = hdmi_readb(HDMI_PHY_POL0);
-+ val &= ~HDMI_PHY_HPD;
-+ hdmi_writeb(val, HDMI_PHY_POL0);
-+
-+ hdmi_set_cable_state(1);
-+
+ sprintf(event_string, "EVENT=plugin");
+ kobject_uevent_env(&hdmi->pdev->dev.kobj, KOBJ_CHANGE, envp);
+#ifdef CONFIG_MXC_HDMI_CEC
+ mxc_hdmi_cec_handle(0x80);
+#endif
-+ } else if (!(phy_int_pol & HDMI_PHY_HPD)) {
++ hdmi_set_cable_state(1);
++ } else {
+ /* Plugout event */
+ dev_dbg(&hdmi->pdev->dev, "EVENT=plugout\n");
+ hdmi_set_cable_state(0);
+ mxc_hdmi_abort_stream();
+ mxc_hdmi_cable_disconnected(hdmi);
+
-+ /* Make HPD intr active high to capture plugin event */
-+ val = hdmi_readb(HDMI_PHY_POL0);
-+ val |= HDMI_PHY_HPD;
-+ hdmi_writeb(val, HDMI_PHY_POL0);
-+
+ sprintf(event_string, "EVENT=plugout");
+ kobject_uevent_env(&hdmi->pdev->dev.kobj, KOBJ_CHANGE, envp);
+#ifdef CONFIG_MXC_HDMI_CEC
+ mxc_hdmi_cec_handle(0x100);
+#endif
-+
-+ } else
-+ dev_dbg(&hdmi->pdev->dev, "EVENT=none?\n");
++ }
+ }
+
+ /* Lock here to ensure full powerdown sequence
@@ -217401,12 +220247,12 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/dri
+ spin_lock_irqsave(&hdmi->irq_lock, flags);
+
+ /* Re-enable HPD interrupts */
-+ phy_int_mask = hdmi_readb(HDMI_PHY_MASK0);
-+ phy_int_mask &= ~HDMI_PHY_HPD;
-+ hdmi_writeb(phy_int_mask, HDMI_PHY_MASK0);
++ hdmi_phy_mask0 = hdmi_readb(HDMI_PHY_MASK0);
++ hdmi_phy_mask0 &= ~hdmi->plug_mask;
++ hdmi_writeb(hdmi_phy_mask0, HDMI_PHY_MASK0);
+
+ /* Unmute interrupts */
-+ hdmi_writeb(~HDMI_IH_MUTE_PHY_STAT0_HPD, HDMI_IH_MUTE_PHY_STAT0);
++ hdmi_writeb(~hdmi->plug_event, HDMI_IH_MUTE_PHY_STAT0);
+
+ if (hdmi_readb(HDMI_IH_FC_STAT2) & HDMI_IH_FC_STAT2_OVERFLOW_MASK)
+ mxc_hdmi_clear_overflow(hdmi);
@@ -217414,6 +220260,13 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/dri
+ spin_unlock_irqrestore(&hdmi->irq_lock, flags);
+}
+
++static void hotplug_work_launch(unsigned long data)
++{
++ struct mxc_hdmi *hdmi = (struct mxc_hdmi *)data;
++ pr_debug("%s\n", __func__);
++ schedule_work(&hdmi->hotplug_work);
++}
++
+static void hdcp_hdp_worker(struct work_struct *work)
+{
+ struct delayed_work *delay_work = to_delayed_work(work);
@@ -217455,26 +220308,28 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/dri
+ */
+ /* Capture status - used in hotplug_worker ISR */
+ intr_stat = hdmi_readb(HDMI_IH_PHY_STAT0);
-+
-+ if (intr_stat & HDMI_IH_PHY_STAT0_HPD) {
++ if (intr_stat & hdmi->plug_event) {
+
+ dev_dbg(&hdmi->pdev->dev, "Hotplug interrupt received\n");
++ dev_dbg(&hdmi->pdev->dev, "intr_stat %u plug_event %u\n", intr_stat, hdmi->plug_event);
+ hdmi->latest_intr_stat = intr_stat;
+
+ /* Mute interrupts until handled */
+
+ val = hdmi_readb(HDMI_IH_MUTE_PHY_STAT0);
-+ val |= HDMI_IH_MUTE_PHY_STAT0_HPD;
++ val |= hdmi->plug_event;
+ hdmi_writeb(val, HDMI_IH_MUTE_PHY_STAT0);
+
+ val = hdmi_readb(HDMI_PHY_MASK0);
-+ val |= HDMI_PHY_HPD;
++ val |= hdmi->plug_mask;
+ hdmi_writeb(val, HDMI_PHY_MASK0);
+
+ /* Clear Hotplug interrupts */
-+ hdmi_writeb(HDMI_IH_PHY_STAT0_HPD, HDMI_IH_PHY_STAT0);
++ hdmi_writeb(hdmi->plug_event, HDMI_IH_PHY_STAT0);
+
-+ schedule_delayed_work(&(hdmi->hotplug_work), msecs_to_jiffies(20));
++ if(hdmi_inited) {
++ mod_timer(&hdmi->jitter_timer, jiffies + HZ);
++ }
+ }
+
+ /* Check HDCP interrupt state */
@@ -217523,9 +220378,11 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/dri
+ hdmi_disable_overflow_interrupts();
+
+ dev_dbg(&hdmi->pdev->dev, "CEA mode used vic=%d\n", hdmi->vic);
-+ if (hdmi->edid_cfg.hdmi_cap)
++ if (hdmi->edid_cfg.hdmi_cap || !hdmi->edid_status) {
++ hdmi_set_dvi_mode(0);
+ hdmi->hdmi_data.video_mode.mDVI = false;
-+ else {
++ } else {
++ hdmi_set_dvi_mode(1);
+ dev_dbg(&hdmi->pdev->dev, "CEA mode vic=%d work in DVI\n", hdmi->vic);
+ hdmi->hdmi_data.video_mode.mDVI = true;
+ }
@@ -217624,13 +220481,13 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/dri
+ HDMI_PHY_I2CM_CTLINT_ADDR);
+
+ /* enable cable hot plug irq */
-+ hdmi_writeb((u8)~HDMI_PHY_HPD, HDMI_PHY_MASK0);
++ hdmi_writeb(~hdmi->plug_mask, HDMI_PHY_MASK0);
+
+ /* Clear Hotplug interrupts */
-+ hdmi_writeb(HDMI_IH_PHY_STAT0_HPD, HDMI_IH_PHY_STAT0);
++ hdmi_writeb(hdmi->plug_event, HDMI_IH_PHY_STAT0);
+
+ /* Unmute interrupts */
-+ hdmi_writeb(~HDMI_IH_MUTE_PHY_STAT0_HPD, HDMI_IH_MUTE_PHY_STAT0);
++ hdmi_writeb(~hdmi->plug_event, HDMI_IH_MUTE_PHY_STAT0);
+
+ hdmi->fb_reg = true;
+
@@ -217674,10 +220531,17 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/dri
+
+ hdmi->blank = *((int *)event->data);
+
++ /* Re-enable HPD interrupts */
++ val = hdmi_readb(HDMI_PHY_MASK0);
++ val &= ~hdmi->plug_mask;
++ hdmi_writeb(val, HDMI_PHY_MASK0);
++
++ /* Unmute interrupts */
++ hdmi_writeb(~hdmi->plug_event, HDMI_IH_MUTE_PHY_STAT0);
++
+ if (hdmi->fb_reg && hdmi->cable_plugin)
+ mxc_hdmi_setup(hdmi, val);
+ hdmi_set_blank_state(1);
-+
+ } else if (*((int *)event->data) != hdmi->blank) {
+ dev_dbg(&hdmi->pdev->dev,
+ "event=FB_EVENT_BLANK - BLANK\n");
@@ -217686,6 +220550,20 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/dri
+
+ mxc_hdmi_phy_disable(hdmi);
+
++ if(hdmi->plug_mask == HDMI_DVI_STAT) {
++ u8 val;
++ pr_info("In DVI Mode disable interrupts\n");
++ val = hdmi_readb(HDMI_IH_MUTE_PHY_STAT0);
++ val |= hdmi->plug_event;
++ hdmi_writeb(val, HDMI_IH_MUTE_PHY_STAT0);
++
++ val = hdmi_readb(HDMI_PHY_MASK0);
++ val |= hdmi->plug_mask;
++ hdmi_writeb(val, HDMI_PHY_MASK0);
++
++ hdmi_set_dvi_mode(1);
++ }
++
+ hdmi->blank = *((int *)event->data);
+ } else
+ dev_dbg(&hdmi->pdev->dev,
@@ -217937,15 +220815,19 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/dri
+ /* Default setting HDMI working in HDMI mode*/
+ hdmi->edid_cfg.hdmi_cap = true;
+
-+ INIT_DELAYED_WORK(&hdmi->hotplug_work, hotplug_worker);
++ hdmi->plug_event = HDMI_DVI_IH_STAT;
++ hdmi->plug_mask = HDMI_DVI_STAT;
++
++ setup_timer(&hdmi->jitter_timer, hotplug_work_launch, (unsigned long)hdmi);
++ INIT_WORK(&hdmi->hotplug_work, hotplug_worker);
+ INIT_DELAYED_WORK(&hdmi->hdcp_hdp_work, hdcp_hdp_worker);
+
+ /* Configure registers related to HDMI interrupt
+ * generation before registering IRQ. */
-+ hdmi_writeb(HDMI_PHY_HPD, HDMI_PHY_POL0);
++ hdmi_writeb(hdmi->plug_mask, HDMI_PHY_POL0);
+
+ /* Clear Hotplug interrupts */
-+ hdmi_writeb(HDMI_IH_PHY_STAT0_HPD, HDMI_IH_PHY_STAT0);
++ hdmi_writeb(hdmi->plug_event, HDMI_IH_PHY_STAT0);
+
+ hdmi->nb.notifier_call = mxc_hdmi_fb_event;
+ ret = fb_register_client(&hdmi->nb);
@@ -217957,6 +220839,14 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/dri
+ /* Default HDMI working in RGB mode */
+ hdmi->hdmi_data.rgb_out_enable = true;
+
++ if (!strcasecmp(rgb_quant_range, "limited")) {
++ hdmi->hdmi_data.rgb_quant_range = HDMI_FC_AVICONF2_RGB_QUANT_LIMITED_RANGE;
++ } else if (!strcasecmp(rgb_quant_range, "full")) {
++ hdmi->hdmi_data.rgb_quant_range = HDMI_FC_AVICONF2_RGB_QUANT_FULL_RANGE;
++ } else {
++ hdmi->hdmi_data.rgb_quant_range = HDMI_FC_AVICONF2_RGB_QUANT_DEFAULT;
++ }
++
+ ret = devm_request_irq(&hdmi->pdev->dev, irq, mxc_hdmi_hotplug, IRQF_SHARED,
+ dev_name(&hdmi->pdev->dev), hdmi);
+ if (ret < 0) {
@@ -217983,6 +220873,11 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/dri
+ dev_warn(&hdmi->pdev->dev,
+ "cound not create sys node for rgb out enable\n");
+
++ ret = device_create_file(&hdmi->pdev->dev, &dev_attr_rgb_quant_range);
++ if (ret < 0)
++ dev_warn(&hdmi->pdev->dev,
++ "cound not create sys node for rgb quant range\n");
++
+ ret = device_create_file(&hdmi->pdev->dev, &dev_attr_hdcp_enable);
+ if (ret < 0)
+ dev_warn(&hdmi->pdev->dev,
@@ -218272,9 +221167,9 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/dri
+module_exit(mxc_hdmi_i2c_exit);
+
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
-diff -Nur linux-3.14.15/drivers/video/mxc/mxc_ipuv3_fb.c linux-linaro-stable-mx6/drivers/video/mxc/mxc_ipuv3_fb.c
---- linux-3.14.15/drivers/video/mxc/mxc_ipuv3_fb.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/mxc/mxc_ipuv3_fb.c 2014-08-20 19:31:50.020885713 +0200
+diff -Nur linux-3.14.17/drivers/video/mxc/mxc_ipuv3_fb.c linux-imx6-3.14/drivers/video/mxc/mxc_ipuv3_fb.c
+--- linux-3.14.17/drivers/video/mxc/mxc_ipuv3_fb.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/video/mxc/mxc_ipuv3_fb.c 2014-09-09 10:13:51.496975724 +0200
@@ -0,0 +1,2578 @@
+/*
+ * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -220854,9 +223749,9 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxc_ipuv3_fb.c linux-linaro-stable-mx6
+MODULE_DESCRIPTION("MXC framebuffer driver");
+MODULE_LICENSE("GPL");
+MODULE_SUPPORTED_DEVICE("fb");
-diff -Nur linux-3.14.15/drivers/video/mxc/mxc_lcdif.c linux-linaro-stable-mx6/drivers/video/mxc/mxc_lcdif.c
---- linux-3.14.15/drivers/video/mxc/mxc_lcdif.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/mxc/mxc_lcdif.c 2014-08-20 19:23:58.566867220 +0200
+diff -Nur linux-3.14.17/drivers/video/mxc/mxc_lcdif.c linux-imx6-3.14/drivers/video/mxc/mxc_lcdif.c
+--- linux-3.14.17/drivers/video/mxc/mxc_lcdif.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/video/mxc/mxc_lcdif.c 2014-09-09 10:13:51.496975724 +0200
@@ -0,0 +1,235 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -221093,9 +223988,9 @@ diff -Nur linux-3.14.15/drivers/video/mxc/mxc_lcdif.c linux-linaro-stable-mx6/dr
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("i.MX ipuv3 LCD extern port driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/drivers/video/mxsfb.c linux-linaro-stable-mx6/drivers/video/mxsfb.c
---- linux-3.14.15/drivers/video/mxsfb.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/drivers/video/mxsfb.c 2014-08-20 19:31:50.020885713 +0200
+diff -Nur linux-3.14.17/drivers/video/mxsfb.c linux-imx6-3.14/drivers/video/mxsfb.c
+--- linux-3.14.17/drivers/video/mxsfb.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/drivers/video/mxsfb.c 2014-09-09 10:13:51.496975724 +0200
@@ -96,9 +96,10 @@
#define CTRL_DF24 (1 << 1)
#define CTRL_RUN (1 << 0)
@@ -221311,9 +224206,9 @@ diff -Nur linux-3.14.15/drivers/video/mxsfb.c linux-linaro-stable-mx6/drivers/vi
}
static struct platform_device_id mxsfb_devtype[] = {
-diff -Nur linux-3.14.15/drivers/video/vexpress-dvi.c linux-linaro-stable-mx6/drivers/video/vexpress-dvi.c
---- linux-3.14.15/drivers/video/vexpress-dvi.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/drivers/video/vexpress-dvi.c 2014-08-20 19:24:03.438888022 +0200
+diff -Nur linux-3.14.17/drivers/video/vexpress-dvi.c linux-imx6-3.14/drivers/video/vexpress-dvi.c
+--- linux-3.14.17/drivers/video/vexpress-dvi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/drivers/video/vexpress-dvi.c 2014-09-09 10:13:51.532976018 +0200
@@ -0,0 +1,220 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -221535,9 +224430,9 @@ diff -Nur linux-3.14.15/drivers/video/vexpress-dvi.c linux-linaro-stable-mx6/dri
+ return platform_driver_register(&vexpress_dvi_driver);
+}
+device_initcall(vexpress_dvi_init);
-diff -Nur linux-3.14.15/firmware/imx/sdma/sdma-imx6q.bin.ihex linux-linaro-stable-mx6/firmware/imx/sdma/sdma-imx6q.bin.ihex
---- linux-3.14.15/firmware/imx/sdma/sdma-imx6q.bin.ihex 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/firmware/imx/sdma/sdma-imx6q.bin.ihex 2014-08-20 19:24:03.654888945 +0200
+diff -Nur linux-3.14.17/firmware/imx/sdma/sdma-imx6q.bin.ihex linux-imx6-3.14/firmware/imx/sdma/sdma-imx6q.bin.ihex
+--- linux-3.14.17/firmware/imx/sdma/sdma-imx6q.bin.ihex 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/firmware/imx/sdma/sdma-imx6q.bin.ihex 2014-09-09 10:13:51.592976507 +0200
@@ -0,0 +1,116 @@
+:1000000053444D4101000000010000001C000000AD
+:1000100026000000B40000007A0600008202000002
@@ -221655,9 +224550,9 @@ diff -Nur linux-3.14.15/firmware/imx/sdma/sdma-imx6q.bin.ihex linux-linaro-stabl
+:10071000DD6F087FD169010FC86FDD6F037F0101B5
+:0E0720000004129B0700FF680C680002129B89
+:00000001FF
-diff -Nur linux-3.14.15/firmware/Makefile linux-linaro-stable-mx6/firmware/Makefile
---- linux-3.14.15/firmware/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/firmware/Makefile 2014-08-20 19:31:50.432887482 +0200
+diff -Nur linux-3.14.17/firmware/Makefile linux-imx6-3.14/firmware/Makefile
+--- linux-3.14.17/firmware/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/firmware/Makefile 2014-09-09 10:13:51.568976312 +0200
@@ -61,6 +61,7 @@
radeon/RV770_pfp.bin radeon/RV770_me.bin \
radeon/RV730_pfp.bin radeon/RV730_me.bin \
@@ -221675,9 +224570,9 @@ diff -Nur linux-3.14.15/firmware/Makefile linux-linaro-stable-mx6/firmware/Makef
# Don't depend on ihex2fw if we're installing and it already exists.
# Putting it after | in the dependencies doesn't seem sufficient when
# we're installing after a cross-compile, because ihex2fw has dependencies
-diff -Nur linux-3.14.15/fs/btrfs/Kconfig linux-linaro-stable-mx6/fs/btrfs/Kconfig
---- linux-3.14.15/fs/btrfs/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/btrfs/Kconfig 2014-08-20 19:31:50.448887549 +0200
+diff -Nur linux-3.14.17/fs/btrfs/Kconfig linux-imx6-3.14/fs/btrfs/Kconfig
+--- linux-3.14.17/fs/btrfs/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/fs/btrfs/Kconfig 2014-09-09 10:13:51.624976767 +0200
@@ -1,5 +1,6 @@
config BTRFS_FS
tristate "Btrfs filesystem support"
@@ -221685,9 +224580,9 @@ diff -Nur linux-3.14.15/fs/btrfs/Kconfig linux-linaro-stable-mx6/fs/btrfs/Kconfi
select CRYPTO
select CRYPTO_CRC32C
select ZLIB_INFLATE
-diff -Nur linux-3.14.15/fs/buffer.c linux-linaro-stable-mx6/fs/buffer.c
---- linux-3.14.15/fs/buffer.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/buffer.c 2014-08-20 19:31:50.500887773 +0200
+diff -Nur linux-3.14.17/fs/buffer.c linux-imx6-3.14/fs/buffer.c
+--- linux-3.14.17/fs/buffer.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/fs/buffer.c 2014-09-09 10:13:51.644976930 +0200
@@ -3088,7 +3088,7 @@
* until the buffer gets unlocked).
*
@@ -221697,9 +224592,9 @@ diff -Nur linux-3.14.15/fs/buffer.c linux-linaro-stable-mx6/fs/buffer.c
* any waiters.
*
* All of the buffers must be for the same device, and must also be a
-diff -Nur linux-3.14.15/fs/compat_binfmt_elf.c linux-linaro-stable-mx6/fs/compat_binfmt_elf.c
---- linux-3.14.15/fs/compat_binfmt_elf.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/compat_binfmt_elf.c 2014-08-20 19:31:50.528887893 +0200
+diff -Nur linux-3.14.17/fs/compat_binfmt_elf.c linux-imx6-3.14/fs/compat_binfmt_elf.c
+--- linux-3.14.17/fs/compat_binfmt_elf.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/fs/compat_binfmt_elf.c 2014-09-09 10:13:51.664977093 +0200
@@ -88,6 +88,11 @@
#define ELF_HWCAP COMPAT_ELF_HWCAP
#endif
@@ -221712,9 +224607,9 @@ diff -Nur linux-3.14.15/fs/compat_binfmt_elf.c linux-linaro-stable-mx6/fs/compat
#ifdef COMPAT_ARCH_DLINFO
#undef ARCH_DLINFO
#define ARCH_DLINFO COMPAT_ARCH_DLINFO
-diff -Nur linux-3.14.15/fs/coredump.c linux-linaro-stable-mx6/fs/coredump.c
---- linux-3.14.15/fs/coredump.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/coredump.c 2014-08-20 19:31:50.528887893 +0200
+diff -Nur linux-3.14.17/fs/coredump.c linux-imx6-3.14/fs/coredump.c
+--- linux-3.14.17/fs/coredump.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/fs/coredump.c 2014-09-09 10:13:51.664977093 +0200
@@ -306,7 +306,7 @@
if (unlikely(nr < 0))
return nr;
@@ -221724,9 +224619,9 @@ diff -Nur linux-3.14.15/fs/coredump.c linux-linaro-stable-mx6/fs/coredump.c
if (atomic_read(&mm->mm_users) == nr + 1)
goto done;
/*
-diff -Nur linux-3.14.15/fs/debugfs/inode.c linux-linaro-stable-mx6/fs/debugfs/inode.c
---- linux-3.14.15/fs/debugfs/inode.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/debugfs/inode.c 2014-08-20 19:31:50.532887910 +0200
+diff -Nur linux-3.14.17/fs/debugfs/inode.c linux-imx6-3.14/fs/debugfs/inode.c
+--- linux-3.14.17/fs/debugfs/inode.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/fs/debugfs/inode.c 2014-09-09 10:13:51.668977127 +0200
@@ -358,7 +358,7 @@
* @name: a pointer to a string containing the name of the file to create.
* @mode: the permission that the file should have.
@@ -221754,9 +224649,9 @@ diff -Nur linux-3.14.15/fs/debugfs/inode.c linux-linaro-stable-mx6/fs/debugfs/in
* then the symbolic link will be created in the root of the debugfs
* filesystem.
* @target: a pointer to a string containing the path to the target of the
-diff -Nur linux-3.14.15/fs/namei.c linux-linaro-stable-mx6/fs/namei.c
---- linux-3.14.15/fs/namei.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/namei.c 2014-08-20 19:31:50.640888375 +0200
+diff -Nur linux-3.14.17/fs/namei.c linux-imx6-3.14/fs/namei.c
+--- linux-3.14.17/fs/namei.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/fs/namei.c 2014-09-09 10:13:51.748977779 +0200
@@ -2247,10 +2247,9 @@
goto out;
}
@@ -221769,9 +224664,9 @@ diff -Nur linux-3.14.15/fs/namei.c linux-linaro-stable-mx6/fs/namei.c
follow_mount(path);
error = 0;
out:
-diff -Nur linux-3.14.15/fs/nfs/nfs3acl.c linux-linaro-stable-mx6/fs/nfs/nfs3acl.c
---- linux-3.14.15/fs/nfs/nfs3acl.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/nfs/nfs3acl.c 2014-08-20 19:31:50.652888427 +0200
+diff -Nur linux-3.14.17/fs/nfs/nfs3acl.c linux-imx6-3.14/fs/nfs/nfs3acl.c
+--- linux-3.14.17/fs/nfs/nfs3acl.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/fs/nfs/nfs3acl.c 2014-09-09 10:13:51.756977843 +0200
@@ -247,46 +247,3 @@
&posix_acl_default_xattr_handler,
NULL,
@@ -221819,9 +224714,9 @@ diff -Nur linux-3.14.15/fs/nfs/nfs3acl.c linux-linaro-stable-mx6/fs/nfs/nfs3acl.
- return error;
- return result;
-}
-diff -Nur linux-3.14.15/fs/nfs/nfs3proc.c linux-linaro-stable-mx6/fs/nfs/nfs3proc.c
---- linux-3.14.15/fs/nfs/nfs3proc.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/fs/nfs/nfs3proc.c 2014-08-20 19:31:50.652888427 +0200
+diff -Nur linux-3.14.17/fs/nfs/nfs3proc.c linux-imx6-3.14/fs/nfs/nfs3proc.c
+--- linux-3.14.17/fs/nfs/nfs3proc.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/fs/nfs/nfs3proc.c 2014-09-09 10:13:51.756977843 +0200
@@ -926,7 +926,7 @@
.getattr = nfs_getattr,
.setattr = nfs_setattr,
@@ -221840,9 +224735,87 @@ diff -Nur linux-3.14.15/fs/nfs/nfs3proc.c linux-linaro-stable-mx6/fs/nfs/nfs3pro
.getxattr = generic_getxattr,
.setxattr = generic_setxattr,
.removexattr = generic_removexattr,
-diff -Nur linux-3.14.15/include/asm-generic/word-at-a-time.h linux-linaro-stable-mx6/include/asm-generic/word-at-a-time.h
---- linux-3.14.15/include/asm-generic/word-at-a-time.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/asm-generic/word-at-a-time.h 2014-08-20 19:31:51.020890006 +0200
+diff -Nur linux-3.14.17/fs/xfs/xfs_log_cil.c linux-imx6-3.14/fs/xfs/xfs_log_cil.c
+--- linux-3.14.17/fs/xfs/xfs_log_cil.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/fs/xfs/xfs_log_cil.c 2014-09-09 10:13:51.880978853 +0200
+@@ -97,7 +97,7 @@
+ {
+ /* Account for the new LV being passed in */
+ if (lv->lv_buf_len != XFS_LOG_VEC_ORDERED) {
+- *diff_len += lv->lv_bytes;
++ *diff_len += lv->lv_buf_len;
+ *diff_iovecs += lv->lv_niovecs;
+ }
+
+@@ -111,7 +111,7 @@
+ else if (old_lv != lv) {
+ ASSERT(lv->lv_buf_len != XFS_LOG_VEC_ORDERED);
+
+- *diff_len -= old_lv->lv_bytes;
++ *diff_len -= old_lv->lv_buf_len;
+ *diff_iovecs -= old_lv->lv_niovecs;
+ kmem_free(old_lv);
+ }
+@@ -239,7 +239,7 @@
+ * that the space reservation accounting is correct.
+ */
+ *diff_iovecs -= lv->lv_niovecs;
+- *diff_len -= lv->lv_bytes;
++ *diff_len -= lv->lv_buf_len;
+ } else {
+ /* allocate new data chunk */
+ lv = kmem_zalloc(buf_size, KM_SLEEP|KM_NOFS);
+@@ -259,7 +259,6 @@
+
+ /* The allocated data region lies beyond the iovec region */
+ lv->lv_buf_len = 0;
+- lv->lv_bytes = 0;
+ lv->lv_buf = (char *)lv + buf_size - nbytes;
+ ASSERT(IS_ALIGNED((unsigned long)lv->lv_buf, sizeof(uint64_t)));
+
+diff -Nur linux-3.14.17/fs/xfs/xfs_log.h linux-imx6-3.14/fs/xfs/xfs_log.h
+--- linux-3.14.17/fs/xfs/xfs_log.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/fs/xfs/xfs_log.h 2014-09-09 10:13:51.880978853 +0200
+@@ -24,8 +24,7 @@
+ struct xfs_log_iovec *lv_iovecp; /* iovec array */
+ struct xfs_log_item *lv_item; /* owner */
+ char *lv_buf; /* formatted buffer */
+- int lv_bytes; /* accounted space in buffer */
+- int lv_buf_len; /* aligned size of buffer */
++ int lv_buf_len; /* size of formatted buffer */
+ int lv_size; /* size of allocated lv */
+ };
+
+@@ -53,21 +52,15 @@
+ return vec->i_addr;
+ }
+
+-/*
+- * We need to make sure the next buffer is naturally aligned for the biggest
+- * basic data type we put into it. We already accounted for this padding when
+- * sizing the buffer.
+- *
+- * However, this padding does not get written into the log, and hence we have to
+- * track the space used by the log vectors separately to prevent log space hangs
+- * due to inaccurate accounting (i.e. a leak) of the used log space through the
+- * CIL context ticket.
+- */
+ static inline void
+ xlog_finish_iovec(struct xfs_log_vec *lv, struct xfs_log_iovec *vec, int len)
+ {
++ /*
++ * We need to make sure the next buffer is naturally aligned for the
++ * biggest basic data type we put into it. We already accounted for
++ * this when sizing the buffer.
++ */
+ lv->lv_buf_len += round_up(len, sizeof(uint64_t));
+- lv->lv_bytes += len;
+ vec->i_len = len;
+ }
+
+diff -Nur linux-3.14.17/include/asm-generic/word-at-a-time.h linux-imx6-3.14/include/asm-generic/word-at-a-time.h
+--- linux-3.14.17/include/asm-generic/word-at-a-time.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/asm-generic/word-at-a-time.h 2014-09-09 10:13:51.900979016 +0200
@@ -50,7 +50,7 @@
}
@@ -221852,9 +224825,9 @@ diff -Nur linux-3.14.15/include/asm-generic/word-at-a-time.h linux-linaro-stable
#endif
#endif /* _ASM_WORD_AT_A_TIME_H */
-diff -Nur linux-3.14.15/include/crypto/algapi.h linux-linaro-stable-mx6/include/crypto/algapi.h
---- linux-3.14.15/include/crypto/algapi.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/crypto/algapi.h 2014-08-20 19:31:51.020890006 +0200
+diff -Nur linux-3.14.17/include/crypto/algapi.h linux-imx6-3.14/include/crypto/algapi.h
+--- linux-3.14.17/include/crypto/algapi.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/crypto/algapi.h 2014-09-09 10:13:51.900979016 +0200
@@ -100,9 +100,12 @@
void *page;
u8 *buffer;
@@ -221880,9 +224853,9 @@ diff -Nur linux-3.14.15/include/crypto/algapi.h linux-linaro-stable-mx6/include/
int ablkcipher_walk_done(struct ablkcipher_request *req,
struct ablkcipher_walk *walk, int err);
-diff -Nur linux-3.14.15/include/drm/drm_fb_helper.h linux-linaro-stable-mx6/include/drm/drm_fb_helper.h
---- linux-3.14.15/include/drm/drm_fb_helper.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/drm/drm_fb_helper.h 2014-08-20 19:31:51.024890023 +0200
+diff -Nur linux-3.14.17/include/drm/drm_fb_helper.h linux-imx6-3.14/include/drm/drm_fb_helper.h
+--- linux-3.14.17/include/drm/drm_fb_helper.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/drm/drm_fb_helper.h 2014-09-09 10:13:51.904979048 +0200
@@ -55,7 +55,7 @@
* save the current lut when force-restoring the fbdev for e.g.
* kdbg.
@@ -221892,9 +224865,9 @@ diff -Nur linux-3.14.15/include/drm/drm_fb_helper.h linux-linaro-stable-mx6/incl
* framebuffer used to back the fbdev.
* @initial_config: Setup an initial fbdev display configuration
*
-diff -Nur linux-3.14.15/include/dt-bindings/clock/imx6sl-clock.h linux-linaro-stable-mx6/include/dt-bindings/clock/imx6sl-clock.h
---- linux-3.14.15/include/dt-bindings/clock/imx6sl-clock.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/dt-bindings/clock/imx6sl-clock.h 2014-08-20 19:31:51.116890419 +0200
+diff -Nur linux-3.14.17/include/dt-bindings/clock/imx6sl-clock.h linux-imx6-3.14/include/dt-bindings/clock/imx6sl-clock.h
+--- linux-3.14.17/include/dt-bindings/clock/imx6sl-clock.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/dt-bindings/clock/imx6sl-clock.h 2014-09-09 10:13:51.908979081 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2013 Freescale Semiconductor, Inc.
@@ -221922,9 +224895,35 @@ diff -Nur linux-3.14.15/include/dt-bindings/clock/imx6sl-clock.h linux-linaro-st
+#define IMX6SL_CLK_END 136
#endif /* __DT_BINDINGS_CLOCK_IMX6SL_H */
-diff -Nur linux-3.14.15/include/linux/ahci_platform.h linux-linaro-stable-mx6/include/linux/ahci_platform.h
---- linux-3.14.15/include/linux/ahci_platform.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/ahci_platform.h 2014-08-20 19:31:51.184890711 +0200
+diff -Nur linux-3.14.17/include/dt-bindings/pinctrl/dra.h linux-imx6-3.14/include/dt-bindings/pinctrl/dra.h
+--- linux-3.14.17/include/dt-bindings/pinctrl/dra.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/dt-bindings/pinctrl/dra.h 2014-09-09 10:13:51.912979115 +0200
+@@ -30,8 +30,7 @@
+ #define MUX_MODE14 0xe
+ #define MUX_MODE15 0xf
+
+-#define PULL_ENA (0 << 16)
+-#define PULL_DIS (1 << 16)
++#define PULL_ENA (1 << 16)
+ #define PULL_UP (1 << 17)
+ #define INPUT_EN (1 << 18)
+ #define SLEWCONTROL (1 << 19)
+@@ -39,10 +38,10 @@
+ #define WAKEUP_EVENT (1 << 25)
+
+ /* Active pin states */
+-#define PIN_OUTPUT (0 | PULL_DIS)
++#define PIN_OUTPUT 0
+ #define PIN_OUTPUT_PULLUP (PIN_OUTPUT | PULL_ENA | PULL_UP)
+ #define PIN_OUTPUT_PULLDOWN (PIN_OUTPUT | PULL_ENA)
+-#define PIN_INPUT (INPUT_EN | PULL_DIS)
++#define PIN_INPUT INPUT_EN
+ #define PIN_INPUT_SLEW (INPUT_EN | SLEWCONTROL)
+ #define PIN_INPUT_PULLUP (PULL_ENA | INPUT_EN | PULL_UP)
+ #define PIN_INPUT_PULLDOWN (PULL_ENA | INPUT_EN)
+diff -Nur linux-3.14.17/include/linux/ahci_platform.h linux-imx6-3.14/include/linux/ahci_platform.h
+--- linux-3.14.17/include/linux/ahci_platform.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/ahci_platform.h 2014-09-09 10:13:51.912979115 +0200
@@ -19,15 +19,38 @@
struct device;
@@ -221967,9 +224966,9 @@ diff -Nur linux-3.14.15/include/linux/ahci_platform.h linux-linaro-stable-mx6/in
+int ahci_platform_resume(struct device *dev);
+
#endif /* _AHCI_PLATFORM_H */
-diff -Nur linux-3.14.15/include/linux/amba/clcd.h linux-linaro-stable-mx6/include/linux/amba/clcd.h
---- linux-3.14.15/include/linux/amba/clcd.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/amba/clcd.h 2014-08-20 19:31:51.780893269 +0200
+diff -Nur linux-3.14.17/include/linux/amba/clcd.h linux-imx6-3.14/include/linux/amba/clcd.h
+--- linux-3.14.17/include/linux/amba/clcd.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/amba/clcd.h 2014-09-09 10:13:51.912979115 +0200
@@ -243,6 +243,9 @@
val |= CNTL_BGR;
}
@@ -221999,9 +224998,9 @@ diff -Nur linux-3.14.15/include/linux/amba/clcd.h linux-linaro-stable-mx6/includ
break;
}
-diff -Nur linux-3.14.15/include/linux/arm-hdlcd.h linux-linaro-stable-mx6/include/linux/arm-hdlcd.h
---- linux-3.14.15/include/linux/arm-hdlcd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/arm-hdlcd.h 2014-08-20 19:24:04.598892975 +0200
+diff -Nur linux-3.14.17/include/linux/arm-hdlcd.h linux-imx6-3.14/include/linux/arm-hdlcd.h
+--- linux-3.14.17/include/linux/arm-hdlcd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/linux/arm-hdlcd.h 2014-09-09 10:13:51.916979147 +0200
@@ -0,0 +1,122 @@
+/*
+ * include/linux/arm-hdlcd.h
@@ -222125,9 +225124,9 @@ diff -Nur linux-3.14.15/include/linux/arm-hdlcd.h linux-linaro-stable-mx6/includ
+ struct completion vsync_completion;
+ unsigned char *edid;
+};
-diff -Nur linux-3.14.15/include/linux/backlight.h linux-linaro-stable-mx6/include/linux/backlight.h
---- linux-3.14.15/include/linux/backlight.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/backlight.h 2014-08-20 19:31:51.980894126 +0200
+diff -Nur linux-3.14.17/include/linux/backlight.h linux-imx6-3.14/include/linux/backlight.h
+--- linux-3.14.17/include/linux/backlight.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/backlight.h 2014-09-09 10:13:51.916979147 +0200
@@ -9,6 +9,7 @@
#define _LINUX_BACKLIGHT_H
@@ -222148,9 +225147,9 @@ diff -Nur linux-3.14.15/include/linux/backlight.h linux-linaro-stable-mx6/includ
};
static inline void backlight_update_status(struct backlight_device *bd)
-diff -Nur linux-3.14.15/include/linux/busfreq-imx6.h linux-linaro-stable-mx6/include/linux/busfreq-imx6.h
---- linux-3.14.15/include/linux/busfreq-imx6.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/busfreq-imx6.h 2014-08-20 19:24:04.606893010 +0200
+diff -Nur linux-3.14.17/include/linux/busfreq-imx6.h linux-imx6-3.14/include/linux/busfreq-imx6.h
+--- linux-3.14.17/include/linux/busfreq-imx6.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/linux/busfreq-imx6.h 2014-09-09 10:13:51.920979179 +0200
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -222175,9 +225174,9 @@ diff -Nur linux-3.14.15/include/linux/busfreq-imx6.h linux-linaro-stable-mx6/inc
+void request_bus_freq(enum bus_freq_mode mode);
+void release_bus_freq(enum bus_freq_mode mode);
+#endif
-diff -Nur linux-3.14.15/include/linux/cgroup_subsys.h linux-linaro-stable-mx6/include/linux/cgroup_subsys.h
---- linux-3.14.15/include/linux/cgroup_subsys.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/cgroup_subsys.h 2014-08-20 19:31:52.216895139 +0200
+diff -Nur linux-3.14.17/include/linux/cgroup_subsys.h linux-imx6-3.14/include/linux/cgroup_subsys.h
+--- linux-3.14.17/include/linux/cgroup_subsys.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/cgroup_subsys.h 2014-09-09 10:13:51.924979211 +0200
@@ -39,6 +39,10 @@
SUBSYS(blkio)
#endif
@@ -222189,9 +225188,57 @@ diff -Nur linux-3.14.15/include/linux/cgroup_subsys.h linux-linaro-stable-mx6/in
#if IS_SUBSYS_ENABLED(CONFIG_CGROUP_PERF)
SUBSYS(perf)
#endif
-diff -Nur linux-3.14.15/include/linux/cpufeature.h linux-linaro-stable-mx6/include/linux/cpufeature.h
---- linux-3.14.15/include/linux/cpufeature.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/cpufeature.h 2014-08-20 19:31:52.252895296 +0200
+diff -Nur linux-3.14.17/include/linux/clk-provider.h linux-imx6-3.14/include/linux/clk-provider.h
+--- linux-3.14.17/include/linux/clk-provider.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/clk-provider.h 2014-09-09 10:13:51.924979211 +0200
+@@ -30,6 +30,13 @@
+ #define CLK_GET_RATE_NOCACHE BIT(6) /* do not use the cached clk rate */
+ #define CLK_SET_RATE_NO_REPARENT BIT(7) /* don't re-parent on rate change */
+ #define CLK_GET_ACCURACY_NOCACHE BIT(8) /* do not use the cached clk accuracy */
++/*
++ * Basic mux clk, can't switch parent while there is another basic mux clk
++ * being its child. Otherwise, a glitch might be propagated to downstream
++ * clocks through this child mux.
++ */
++#define CLK_IS_BASIC_MUX BIT(9)
++
+
+ struct clk_hw;
+
+diff -Nur linux-3.14.17/include/linux/cma.h linux-imx6-3.14/include/linux/cma.h
+--- linux-3.14.17/include/linux/cma.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/linux/cma.h 2014-09-09 10:13:51.924979211 +0200
+@@ -0,0 +1,27 @@
++#ifndef __CMA_H__
++#define __CMA_H__
++
++/*
++ * There is always at least global CMA area and a few optional
++ * areas configured in kernel .config.
++ */
++#ifdef CONFIG_CMA_AREAS
++#define MAX_CMA_AREAS (1 + CONFIG_CMA_AREAS)
++
++#else
++#define MAX_CMA_AREAS (0)
++
++#endif
++
++struct cma;
++
++extern phys_addr_t cma_get_base(struct cma *cma);
++extern unsigned long cma_get_size(struct cma *cma);
++
++extern int __init cma_declare_contiguous(phys_addr_t size,
++ phys_addr_t base, phys_addr_t limit,
++ phys_addr_t alignment, unsigned int order_per_bit,
++ bool fixed, struct cma **res_cma);
++extern struct page *cma_alloc(struct cma *cma, int count, unsigned int align);
++extern bool cma_release(struct cma *cma, struct page *pages, int count);
++#endif
+diff -Nur linux-3.14.17/include/linux/cpufeature.h linux-imx6-3.14/include/linux/cpufeature.h
+--- linux-3.14.17/include/linux/cpufeature.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/linux/cpufeature.h 2014-09-09 10:13:51.988979735 +0200
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2014 Linaro Ltd. <ard.biesheuvel@linaro.org>
@@ -222253,9 +225300,9 @@ diff -Nur linux-3.14.15/include/linux/cpufeature.h linux-linaro-stable-mx6/inclu
+
+#endif
+#endif
-diff -Nur linux-3.14.15/include/linux/cpufreq.h linux-linaro-stable-mx6/include/linux/cpufreq.h
---- linux-3.14.15/include/linux/cpufreq.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/cpufreq.h 2014-08-20 19:31:52.252895296 +0200
+diff -Nur linux-3.14.17/include/linux/cpufreq.h linux-imx6-3.14/include/linux/cpufreq.h
+--- linux-3.14.17/include/linux/cpufreq.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/cpufreq.h 2014-09-09 10:13:51.988979735 +0200
@@ -429,6 +429,9 @@
#elif defined(CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND)
extern struct cpufreq_governor cpufreq_gov_ondemand;
@@ -222266,9 +225313,9 @@ diff -Nur linux-3.14.15/include/linux/cpufreq.h linux-linaro-stable-mx6/include/
#elif defined(CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE)
extern struct cpufreq_governor cpufreq_gov_conservative;
#define CPUFREQ_DEFAULT_GOVERNOR (&cpufreq_gov_conservative)
-diff -Nur linux-3.14.15/include/linux/cpu.h linux-linaro-stable-mx6/include/linux/cpu.h
---- linux-3.14.15/include/linux/cpu.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/cpu.h 2014-08-20 19:31:52.248895278 +0200
+diff -Nur linux-3.14.17/include/linux/cpu.h linux-imx6-3.14/include/linux/cpu.h
+--- linux-3.14.17/include/linux/cpu.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/cpu.h 2014-09-09 10:13:51.988979735 +0200
@@ -226,4 +226,11 @@
void arch_cpu_idle_exit(void);
void arch_cpu_idle_dead(void);
@@ -222281,9 +225328,9 @@ diff -Nur linux-3.14.15/include/linux/cpu.h linux-linaro-stable-mx6/include/linu
+void idle_notifier_call_chain(unsigned long val);
+
#endif /* _LINUX_CPU_H_ */
-diff -Nur linux-3.14.15/include/linux/device_cooling.h linux-linaro-stable-mx6/include/linux/device_cooling.h
---- linux-3.14.15/include/linux/device_cooling.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/device_cooling.h 2014-08-20 19:24:04.638893146 +0200
+diff -Nur linux-3.14.17/include/linux/device_cooling.h linux-imx6-3.14/include/linux/device_cooling.h
+--- linux-3.14.17/include/linux/device_cooling.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/linux/device_cooling.h 2014-09-09 10:13:51.996979800 +0200
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -222330,9 +225377,72 @@ diff -Nur linux-3.14.15/include/linux/device_cooling.h linux-linaro-stable-mx6/i
+}
+#endif
+#endif /* __DEVICE_THERMAL_H__ */
-diff -Nur linux-3.14.15/include/linux/dmaengine.h linux-linaro-stable-mx6/include/linux/dmaengine.h
---- linux-3.14.15/include/linux/dmaengine.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/dmaengine.h 2014-08-20 19:31:52.268895363 +0200
+diff -Nur linux-3.14.17/include/linux/dma-contiguous.h linux-imx6-3.14/include/linux/dma-contiguous.h
+--- linux-3.14.17/include/linux/dma-contiguous.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/dma-contiguous.h 2014-09-09 10:13:52.000979831 +0200
+@@ -53,18 +53,13 @@
+
+ #ifdef __KERNEL__
+
++#include <linux/device.h>
++
+ struct cma;
+ struct page;
+-struct device;
+
+ #ifdef CONFIG_DMA_CMA
+
+-/*
+- * There is always at least global CMA area and a few optional device
+- * private areas configured in kernel .config.
+- */
+-#define MAX_CMA_AREAS (1 + CONFIG_CMA_AREAS)
+-
+ extern struct cma *dma_contiguous_default_area;
+
+ static inline struct cma *dev_get_cma_area(struct device *dev)
+@@ -88,7 +83,8 @@
+ void dma_contiguous_reserve(phys_addr_t addr_limit);
+
+ int __init dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base,
+- phys_addr_t limit, struct cma **res_cma);
++ phys_addr_t limit, struct cma **res_cma,
++ bool fixed);
+
+ /**
+ * dma_declare_contiguous() - reserve area for contiguous memory handling
+@@ -108,7 +104,7 @@
+ {
+ struct cma *cma;
+ int ret;
+- ret = dma_contiguous_reserve_area(size, base, limit, &cma);
++ ret = dma_contiguous_reserve_area(size, base, limit, &cma, true);
+ if (ret == 0)
+ dev_set_cma_area(dev, cma);
+
+@@ -122,8 +118,6 @@
+
+ #else
+
+-#define MAX_CMA_AREAS (0)
+-
+ static inline struct cma *dev_get_cma_area(struct device *dev)
+ {
+ return NULL;
+@@ -136,7 +130,9 @@
+ static inline void dma_contiguous_reserve(phys_addr_t limit) { }
+
+ static inline int dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base,
+- phys_addr_t limit, struct cma **res_cma) {
++ phys_addr_t limit, struct cma **res_cma,
++ bool fixed)
++{
+ return -ENOSYS;
+ }
+
+diff -Nur linux-3.14.17/include/linux/dmaengine.h linux-imx6-3.14/include/linux/dmaengine.h
+--- linux-3.14.17/include/linux/dmaengine.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/dmaengine.h 2014-09-09 10:13:52.000979831 +0200
@@ -333,6 +333,8 @@
* @slave_id: Slave requester id. Only valid for slave channels. The dma
* slave peripheral will have unique id as dma requester which need to be
@@ -222351,9 +225461,9 @@ diff -Nur linux-3.14.15/include/linux/dmaengine.h linux-linaro-stable-mx6/includ
};
/**
-diff -Nur linux-3.14.15/include/linux/ftrace.h linux-linaro-stable-mx6/include/linux/ftrace.h
---- linux-3.14.15/include/linux/ftrace.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/ftrace.h 2014-08-20 19:31:52.304895518 +0200
+diff -Nur linux-3.14.17/include/linux/ftrace.h linux-imx6-3.14/include/linux/ftrace.h
+--- linux-3.14.17/include/linux/ftrace.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/ftrace.h 2014-09-09 10:13:52.012979929 +0200
@@ -605,25 +605,27 @@
#endif
}
@@ -222398,9 +225508,9 @@ diff -Nur linux-3.14.15/include/linux/ftrace.h linux-linaro-stable-mx6/include/l
#ifdef CONFIG_IRQSOFF_TRACER
extern void time_hardirqs_on(unsigned long a0, unsigned long a1);
-diff -Nur linux-3.14.15/include/linux/hardirq.h linux-linaro-stable-mx6/include/linux/hardirq.h
---- linux-3.14.15/include/linux/hardirq.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/hardirq.h 2014-08-20 19:31:52.308895534 +0200
+diff -Nur linux-3.14.17/include/linux/hardirq.h linux-imx6-3.14/include/linux/hardirq.h
+--- linux-3.14.17/include/linux/hardirq.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/hardirq.h 2014-09-09 10:13:52.012979929 +0200
@@ -9,6 +9,7 @@
@@ -222409,9 +225519,9 @@ diff -Nur linux-3.14.15/include/linux/hardirq.h linux-linaro-stable-mx6/include/
#if defined(CONFIG_TINY_RCU)
-diff -Nur linux-3.14.15/include/linux/hsi/hsi.h linux-linaro-stable-mx6/include/linux/hsi/hsi.h
---- linux-3.14.15/include/linux/hsi/hsi.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/hsi/hsi.h 2014-08-20 19:31:52.316895570 +0200
+diff -Nur linux-3.14.17/include/linux/hsi/hsi.h linux-imx6-3.14/include/linux/hsi/hsi.h
+--- linux-3.14.17/include/linux/hsi/hsi.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/hsi/hsi.h 2014-09-09 10:13:52.016979963 +0200
@@ -178,7 +178,7 @@
* @complete: Transfer completion callback
* @destructor: Destructor to free resources when flushing
@@ -222421,9 +225531,9 @@ diff -Nur linux-3.14.15/include/linux/hsi/hsi.h linux-linaro-stable-mx6/include/
* @channel: Channel were to TX/RX the message
* @ttype: Transfer type (TX if set, RX otherwise)
* @break_frame: if true HSI will send/receive a break frame. Data buffers are
-diff -Nur linux-3.14.15/include/linux/ipu.h linux-linaro-stable-mx6/include/linux/ipu.h
---- linux-3.14.15/include/linux/ipu.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/ipu.h 2014-08-20 19:24:04.734893555 +0200
+diff -Nur linux-3.14.17/include/linux/ipu.h linux-imx6-3.14/include/linux/ipu.h
+--- linux-3.14.17/include/linux/ipu.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/linux/ipu.h 2014-09-09 10:13:52.028980058 +0200
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc.
@@ -222463,9 +225573,9 @@ diff -Nur linux-3.14.15/include/linux/ipu.h linux-linaro-stable-mx6/include/linu
+int ipu_check_task(struct ipu_task *task);
+
+#endif
-diff -Nur linux-3.14.15/include/linux/ipu-v3.h linux-linaro-stable-mx6/include/linux/ipu-v3.h
---- linux-3.14.15/include/linux/ipu-v3.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/ipu-v3.h 2014-08-20 19:24:04.734893555 +0200
+diff -Nur linux-3.14.17/include/linux/ipu-v3.h linux-imx6-3.14/include/linux/ipu-v3.h
+--- linux-3.14.17/include/linux/ipu-v3.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/linux/ipu-v3.h 2014-09-09 10:13:52.028980058 +0200
@@ -0,0 +1,752 @@
+/*
+ * Copyright (c) 2010 Sascha Hauer <s.hauer@pengutronix.de>
@@ -223219,9 +226329,9 @@ diff -Nur linux-3.14.15/include/linux/ipu-v3.h linux-linaro-stable-mx6/include/l
+};
+
+#endif /* __LINUX_IPU_V3_H_ */
-diff -Nur linux-3.14.15/include/linux/isl29023.h linux-linaro-stable-mx6/include/linux/isl29023.h
---- linux-3.14.15/include/linux/isl29023.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/isl29023.h 2014-08-20 19:24:04.746893607 +0200
+diff -Nur linux-3.14.17/include/linux/isl29023.h linux-imx6-3.14/include/linux/isl29023.h
+--- linux-3.14.17/include/linux/isl29023.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/linux/isl29023.h 2014-09-09 10:13:52.032980091 +0200
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -223270,9 +226380,9 @@ diff -Nur linux-3.14.15/include/linux/isl29023.h linux-linaro-stable-mx6/include
+#define ISL29023_RANGE_64K 0x3
+
+#endif
-diff -Nur linux-3.14.15/include/linux/kfifo.h linux-linaro-stable-mx6/include/linux/kfifo.h
---- linux-3.14.15/include/linux/kfifo.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/kfifo.h 2014-08-20 19:31:52.356895741 +0200
+diff -Nur linux-3.14.17/include/linux/kfifo.h linux-imx6-3.14/include/linux/kfifo.h
+--- linux-3.14.17/include/linux/kfifo.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/kfifo.h 2014-09-09 10:13:52.032980091 +0200
@@ -722,7 +722,7 @@
/**
* kfifo_dma_out_finish - finish a DMA OUT operation
@@ -223282,9 +226392,9 @@ diff -Nur linux-3.14.15/include/linux/kfifo.h linux-linaro-stable-mx6/include/li
*
* This macro finish a DMA OUT operation. The out counter will be updated by
* the len parameter. No error checking will be done.
-diff -Nur linux-3.14.15/include/linux/libata.h linux-linaro-stable-mx6/include/linux/libata.h
---- linux-3.14.15/include/linux/libata.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/libata.h 2014-08-20 19:31:52.368895793 +0200
+diff -Nur linux-3.14.17/include/linux/libata.h linux-imx6-3.14/include/linux/libata.h
+--- linux-3.14.17/include/linux/libata.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/libata.h 2014-09-09 10:13:52.036980125 +0200
@@ -593,7 +593,6 @@
struct device *dev;
void __iomem * const *iomap;
@@ -223293,9 +226403,9 @@ diff -Nur linux-3.14.15/include/linux/libata.h linux-linaro-stable-mx6/include/l
void *private_data;
struct ata_port_operations *ops;
unsigned long flags;
-diff -Nur linux-3.14.15/include/linux/mailbox_client.h linux-linaro-stable-mx6/include/linux/mailbox_client.h
---- linux-3.14.15/include/linux/mailbox_client.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/mailbox_client.h 2014-08-20 19:31:52.380895844 +0200
+diff -Nur linux-3.14.17/include/linux/mailbox_client.h linux-imx6-3.14/include/linux/mailbox_client.h
+--- linux-3.14.17/include/linux/mailbox_client.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/linux/mailbox_client.h 2014-09-09 10:13:52.040980157 +0200
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2014 Linaro Ltd.
@@ -223343,9 +226453,9 @@ diff -Nur linux-3.14.15/include/linux/mailbox_client.h linux-linaro-stable-mx6/i
+void mbox_free_channel(struct mbox_chan *chan);
+
+#endif /* __MAILBOX_CLIENT_H */
-diff -Nur linux-3.14.15/include/linux/mailbox_controller.h linux-linaro-stable-mx6/include/linux/mailbox_controller.h
---- linux-3.14.15/include/linux/mailbox_controller.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/mailbox_controller.h 2014-08-20 19:31:52.380895844 +0200
+diff -Nur linux-3.14.17/include/linux/mailbox_controller.h linux-imx6-3.14/include/linux/mailbox_controller.h
+--- linux-3.14.17/include/linux/mailbox_controller.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/linux/mailbox_controller.h 2014-09-09 10:13:52.040980157 +0200
@@ -0,0 +1,121 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -223468,9 +226578,9 @@ diff -Nur linux-3.14.15/include/linux/mailbox_controller.h linux-linaro-stable-m
+void mbox_controller_unregister(struct mbox_controller *mbox);
+
+#endif /* __MAILBOX_CONTROLLER_H */
-diff -Nur linux-3.14.15/include/linux/mailbox.h linux-linaro-stable-mx6/include/linux/mailbox.h
---- linux-3.14.15/include/linux/mailbox.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/mailbox.h 1970-01-01 01:00:00.000000000 +0100
+diff -Nur linux-3.14.17/include/linux/mailbox.h linux-imx6-3.14/include/linux/mailbox.h
+--- linux-3.14.17/include/linux/mailbox.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/mailbox.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or modify it
@@ -223489,9 +226599,21 @@ diff -Nur linux-3.14.15/include/linux/mailbox.h linux-linaro-stable-mx6/include/
-int pl320_ipc_transmit(u32 *data);
-int pl320_ipc_register_notifier(struct notifier_block *nb);
-int pl320_ipc_unregister_notifier(struct notifier_block *nb);
-diff -Nur linux-3.14.15/include/linux/mfd/abx500/ab8500.h linux-linaro-stable-mx6/include/linux/mfd/abx500/ab8500.h
---- linux-3.14.15/include/linux/mfd/abx500/ab8500.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/mfd/abx500/ab8500.h 2014-08-20 19:31:52.388895878 +0200
+diff -Nur linux-3.14.17/include/linux/memblock.h linux-imx6-3.14/include/linux/memblock.h
+--- linux-3.14.17/include/linux/memblock.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/memblock.h 2014-09-09 10:13:52.040980157 +0200
+@@ -221,6 +221,8 @@
+ #define MEMBLOCK_ALLOC_ANYWHERE (~(phys_addr_t)0)
+ #define MEMBLOCK_ALLOC_ACCESSIBLE 0
+
++phys_addr_t __init memblock_alloc_range(phys_addr_t size, phys_addr_t align,
++ phys_addr_t start, phys_addr_t end);
+ phys_addr_t memblock_alloc_base(phys_addr_t size, phys_addr_t align,
+ phys_addr_t max_addr);
+ phys_addr_t __memblock_alloc_base(phys_addr_t size, phys_addr_t align,
+diff -Nur linux-3.14.17/include/linux/mfd/abx500/ab8500.h linux-imx6-3.14/include/linux/mfd/abx500/ab8500.h
+--- linux-3.14.17/include/linux/mfd/abx500/ab8500.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/mfd/abx500/ab8500.h 2014-09-09 10:13:52.044980190 +0200
@@ -347,7 +347,6 @@
struct mutex lock;
struct mutex irq_lock;
@@ -223508,9 +226630,9 @@ diff -Nur linux-3.14.15/include/linux/mfd/abx500/ab8500.h linux-linaro-stable-mx
void (*init) (struct ab8500 *);
struct ab8500_regulator_platform_data *regulator;
struct ab8500_codec_platform_data *codec;
-diff -Nur linux-3.14.15/include/linux/mfd/dbx500-prcmu.h linux-linaro-stable-mx6/include/linux/mfd/dbx500-prcmu.h
---- linux-3.14.15/include/linux/mfd/dbx500-prcmu.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/mfd/dbx500-prcmu.h 2014-08-20 19:31:52.440896102 +0200
+diff -Nur linux-3.14.17/include/linux/mfd/dbx500-prcmu.h linux-imx6-3.14/include/linux/mfd/dbx500-prcmu.h
+--- linux-3.14.17/include/linux/mfd/dbx500-prcmu.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/mfd/dbx500-prcmu.h 2014-09-09 10:13:52.048980221 +0200
@@ -183,8 +183,6 @@
bool enable_set_ddr_opp;
bool enable_ape_opp_100_voltage;
@@ -223520,10 +226642,10 @@ diff -Nur linux-3.14.15/include/linux/mfd/dbx500-prcmu.h linux-linaro-stable-mx6
u32 version_offset;
u32 legacy_offset;
u32 adt_offset;
-diff -Nur linux-3.14.15/include/linux/mfd/mxc-hdmi-core.h linux-linaro-stable-mx6/include/linux/mfd/mxc-hdmi-core.h
---- linux-3.14.15/include/linux/mfd/mxc-hdmi-core.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/mfd/mxc-hdmi-core.h 2014-08-20 19:24:05.602897262 +0200
-@@ -0,0 +1,64 @@
+diff -Nur linux-3.14.17/include/linux/mfd/mxc-hdmi-core.h linux-imx6-3.14/include/linux/mfd/mxc-hdmi-core.h
+--- linux-3.14.17/include/linux/mfd/mxc-hdmi-core.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/linux/mfd/mxc-hdmi-core.h 2014-09-09 10:13:52.048980221 +0200
+@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
@@ -223572,8 +226694,8 @@ diff -Nur linux-3.14.15/include/linux/mfd/mxc-hdmi-core.h linux-linaro-stable-mx
+void hdmi_init_clk_regenerator(void);
+void hdmi_clk_regenerator_update_pixel_clock(u32 pixclock);
+
-+void hdmi_set_edid_cfg(struct mxc_edid_cfg *cfg);
-+void hdmi_get_edid_cfg(struct mxc_edid_cfg *cfg);
++void hdmi_set_edid_cfg(int edid_status, struct mxc_edid_cfg *cfg);
++int hdmi_get_edid_cfg(struct mxc_edid_cfg *cfg);
+
+extern int mxc_hdmi_ipu_id;
+extern int mxc_hdmi_disp_id;
@@ -223583,14 +226705,18 @@ diff -Nur linux-3.14.15/include/linux/mfd/mxc-hdmi-core.h linux-linaro-stable-mx
+int mxc_hdmi_abort_stream(void);
+int mxc_hdmi_register_audio(struct snd_pcm_substream *substream);
+void mxc_hdmi_unregister_audio(struct snd_pcm_substream *substream);
++void hdmi_set_dvi_mode(unsigned int state);
+unsigned int hdmi_set_cable_state(unsigned int state);
+unsigned int hdmi_set_blank_state(unsigned int state);
+int check_hdmi_state(void);
+
++void hdmi_cec_start_device(void);
++void hdmi_cec_stop_device(void);
++
+#endif
-diff -Nur linux-3.14.15/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h linux-linaro-stable-mx6/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
---- linux-3.14.15/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h 2014-08-20 19:24:05.630897382 +0200
+diff -Nur linux-3.14.17/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h linux-imx6-3.14/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
+--- linux-3.14.17/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h 2014-09-09 10:13:52.052980254 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 Freescale Semiconductor, Inc.
@@ -223609,9 +226735,9 @@ diff -Nur linux-3.14.15/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h linux-linaro
#define IMX6Q_GPR1_ADDRS3_MASK (0x3 << 10)
#define IMX6Q_GPR1_ADDRS3_32MB (0x0 << 10)
#define IMX6Q_GPR1_ADDRS3_64MB (0x1 << 10)
-diff -Nur linux-3.14.15/include/linux/mipi_csi2.h linux-linaro-stable-mx6/include/linux/mipi_csi2.h
---- linux-3.14.15/include/linux/mipi_csi2.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/mipi_csi2.h 2014-08-20 19:31:52.548896564 +0200
+diff -Nur linux-3.14.17/include/linux/mipi_csi2.h linux-imx6-3.14/include/linux/mipi_csi2.h
+--- linux-3.14.17/include/linux/mipi_csi2.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/linux/mipi_csi2.h 2014-09-09 10:13:52.056980288 +0200
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -223706,9 +226832,9 @@ diff -Nur linux-3.14.15/include/linux/mipi_csi2.h linux-linaro-stable-mx6/includ
+int mipi_csi2_reset(struct mipi_csi2_info *info);
+
+#endif
-diff -Nur linux-3.14.15/include/linux/mipi_dsi.h linux-linaro-stable-mx6/include/linux/mipi_dsi.h
---- linux-3.14.15/include/linux/mipi_dsi.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/mipi_dsi.h 2014-08-20 19:24:05.694897655 +0200
+diff -Nur linux-3.14.17/include/linux/mipi_dsi.h linux-imx6-3.14/include/linux/mipi_dsi.h
+--- linux-3.14.17/include/linux/mipi_dsi.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/linux/mipi_dsi.h 2014-09-09 10:13:52.056980288 +0200
@@ -0,0 +1,171 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -223881,9 +227007,9 @@ diff -Nur linux-3.14.15/include/linux/mipi_dsi.h linux-linaro-stable-mx6/include
+#define DSI_PHY_CLK_INIT_COMMAND (0x44)
+#define DSI_GEN_PLD_DATA_BUF_SIZE (0x4)
+#endif
-diff -Nur linux-3.14.15/include/linux/mmc/card.h linux-linaro-stable-mx6/include/linux/mmc/card.h
---- linux-3.14.15/include/linux/mmc/card.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/mmc/card.h 2014-08-20 19:31:52.556896600 +0200
+diff -Nur linux-3.14.17/include/linux/mmc/card.h linux-imx6-3.14/include/linux/mmc/card.h
+--- linux-3.14.17/include/linux/mmc/card.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/mmc/card.h 2014-09-09 10:13:52.060980320 +0200
@@ -86,10 +86,13 @@
unsigned int data_sector_size; /* 512 bytes or 4KB */
unsigned int data_tag_unit_size; /* DATA TAG UNIT size */
@@ -223906,9 +227032,9 @@ diff -Nur linux-3.14.15/include/linux/mmc/card.h linux-linaro-stable-mx6/include
u8 raw_sec_trim_mult; /* 229 */
u8 raw_sec_erase_mult; /* 230 */
u8 raw_sec_feature_support;/* 231 */
-diff -Nur linux-3.14.15/include/linux/mmc/host.h linux-linaro-stable-mx6/include/linux/mmc/host.h
---- linux-3.14.15/include/linux/mmc/host.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/mmc/host.h 2014-08-20 19:31:52.560896617 +0200
+diff -Nur linux-3.14.17/include/linux/mmc/host.h linux-imx6-3.14/include/linux/mmc/host.h
+--- linux-3.14.17/include/linux/mmc/host.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/mmc/host.h 2014-09-09 10:13:52.060980320 +0200
@@ -282,6 +282,7 @@
MMC_CAP2_PACKED_WR)
#define MMC_CAP2_NO_PRESCAN_POWERUP (1 << 14) /* Don't power up before scan */
@@ -223938,9 +227064,9 @@ diff -Nur linux-3.14.15/include/linux/mmc/host.h linux-linaro-stable-mx6/include
#ifdef CONFIG_REGULATOR
int mmc_regulator_get_ocrmask(struct regulator *supply);
int mmc_regulator_set_ocr(struct mmc_host *mmc,
-diff -Nur linux-3.14.15/include/linux/mmc/mmc.h linux-linaro-stable-mx6/include/linux/mmc/mmc.h
---- linux-3.14.15/include/linux/mmc/mmc.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/mmc/mmc.h 2014-08-20 19:24:05.722897774 +0200
+diff -Nur linux-3.14.17/include/linux/mmc/mmc.h linux-imx6-3.14/include/linux/mmc/mmc.h
+--- linux-3.14.17/include/linux/mmc/mmc.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/mmc/mmc.h 2014-09-09 10:13:52.060980320 +0200
@@ -292,6 +292,7 @@
#define EXT_CSD_RPMB_MULT 168 /* RO */
#define EXT_CSD_BOOT_WP 173 /* R/W */
@@ -223987,9 +227113,9 @@ diff -Nur linux-3.14.15/include/linux/mmc/mmc.h linux-linaro-stable-mx6/include/
#define EXT_CSD_RST_N_EN_MASK 0x3
#define EXT_CSD_RST_N_ENABLED 1 /* RST_n is enabled on card */
-diff -Nur linux-3.14.15/include/linux/mmc/sdhci.h linux-linaro-stable-mx6/include/linux/mmc/sdhci.h
---- linux-3.14.15/include/linux/mmc/sdhci.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/mmc/sdhci.h 2014-08-20 19:31:52.560896617 +0200
+diff -Nur linux-3.14.17/include/linux/mmc/sdhci.h linux-imx6-3.14/include/linux/mmc/sdhci.h
+--- linux-3.14.17/include/linux/mmc/sdhci.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/mmc/sdhci.h 2014-09-09 10:13:52.060980320 +0200
@@ -57,12 +57,8 @@
#define SDHCI_QUIRK_BROKEN_CARD_DETECTION (1<<15)
/* Controller reports inverted write-protect state */
@@ -224043,9 +227169,9 @@ diff -Nur linux-3.14.15/include/linux/mmc/sdhci.h linux-linaro-stable-mx6/includ
wait_queue_head_t buf_ready_int; /* Waitqueue for Buffer Read Ready interrupt */
unsigned int tuning_done; /* Condition flag set when CMD19 succeeds */
-diff -Nur linux-3.14.15/include/linux/mmc/sdio_ids.h linux-linaro-stable-mx6/include/linux/mmc/sdio_ids.h
---- linux-3.14.15/include/linux/mmc/sdio_ids.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/mmc/sdio_ids.h 2014-08-20 19:31:52.560896617 +0200
+diff -Nur linux-3.14.17/include/linux/mmc/sdio_ids.h linux-imx6-3.14/include/linux/mmc/sdio_ids.h
+--- linux-3.14.17/include/linux/mmc/sdio_ids.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/mmc/sdio_ids.h 2014-09-09 10:13:52.060980320 +0200
@@ -31,6 +31,7 @@
#define SDIO_DEVICE_ID_BROADCOM_4334 0x4334
#define SDIO_DEVICE_ID_BROADCOM_4335_4339 0x4335
@@ -224054,9 +227180,9 @@ diff -Nur linux-3.14.15/include/linux/mmc/sdio_ids.h linux-linaro-stable-mx6/inc
#define SDIO_VENDOR_ID_INTEL 0x0089
#define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX 0x1402
-diff -Nur linux-3.14.15/include/linux/mod_devicetable.h linux-linaro-stable-mx6/include/linux/mod_devicetable.h
---- linux-3.14.15/include/linux/mod_devicetable.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/mod_devicetable.h 2014-08-20 19:31:52.560896617 +0200
+diff -Nur linux-3.14.17/include/linux/mod_devicetable.h linux-imx6-3.14/include/linux/mod_devicetable.h
+--- linux-3.14.17/include/linux/mod_devicetable.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/mod_devicetable.h 2014-09-09 10:13:52.060980320 +0200
@@ -564,6 +564,15 @@
#define X86_MODEL_ANY 0
#define X86_FEATURE_ANY 0 /* Same as FPU, you can't test for that */
@@ -224073,9 +227199,9 @@ diff -Nur linux-3.14.15/include/linux/mod_devicetable.h linux-linaro-stable-mx6/
#define IPACK_ANY_FORMAT 0xff
#define IPACK_ANY_ID (~0)
struct ipack_device_id {
-diff -Nur linux-3.14.15/include/linux/mtd/map.h linux-linaro-stable-mx6/include/linux/mtd/map.h
---- linux-3.14.15/include/linux/mtd/map.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/mtd/map.h 2014-08-20 19:24:05.734897826 +0200
+diff -Nur linux-3.14.17/include/linux/mtd/map.h linux-imx6-3.14/include/linux/mtd/map.h
+--- linux-3.14.17/include/linux/mtd/map.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/mtd/map.h 2014-09-09 10:13:52.064980353 +0200
@@ -438,7 +438,7 @@
if (map->cached)
memcpy(to, (char *)map->cached + from, len);
@@ -224085,9 +227211,9 @@ diff -Nur linux-3.14.15/include/linux/mtd/map.h linux-linaro-stable-mx6/include/
}
static inline void inline_map_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len)
-diff -Nur linux-3.14.15/include/linux/mxc_asrc.h linux-linaro-stable-mx6/include/linux/mxc_asrc.h
---- linux-3.14.15/include/linux/mxc_asrc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/mxc_asrc.h 2014-08-20 19:24:05.738897843 +0200
+diff -Nur linux-3.14.17/include/linux/mxc_asrc.h linux-imx6-3.14/include/linux/mxc_asrc.h
+--- linux-3.14.17/include/linux/mxc_asrc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/linux/mxc_asrc.h 2014-09-09 10:13:52.068980385 +0200
@@ -0,0 +1,386 @@
+/*
+ * Copyright 2008-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -224475,9 +227601,9 @@ diff -Nur linux-3.14.15/include/linux/mxc_asrc.h linux-linaro-stable-mx6/include
+ u32 in_wm, u32 out_wm);
+
+#endif/* __MXC_ASRC_H__ */
-diff -Nur linux-3.14.15/include/linux/mxcfb.h linux-linaro-stable-mx6/include/linux/mxcfb.h
---- linux-3.14.15/include/linux/mxcfb.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/mxcfb.h 2014-08-20 19:24:05.738897843 +0200
+diff -Nur linux-3.14.17/include/linux/mxcfb.h linux-imx6-3.14/include/linux/mxcfb.h
+--- linux-3.14.17/include/linux/mxcfb.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/linux/mxcfb.h 2014-09-09 10:13:52.068980385 +0200
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -224525,9 +227651,9 @@ diff -Nur linux-3.14.15/include/linux/mxcfb.h linux-linaro-stable-mx6/include/li
+ int num_modes, int dev_mode);
+
+#endif
-diff -Nur linux-3.14.15/include/linux/mxc_mlb.h linux-linaro-stable-mx6/include/linux/mxc_mlb.h
---- linux-3.14.15/include/linux/mxc_mlb.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/mxc_mlb.h 2014-08-20 19:24:05.738897843 +0200
+diff -Nur linux-3.14.17/include/linux/mxc_mlb.h linux-imx6-3.14/include/linux/mxc_mlb.h
+--- linux-3.14.17/include/linux/mxc_mlb.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/linux/mxc_mlb.h 2014-09-09 10:13:52.068980385 +0200
@@ -0,0 +1,55 @@
+/*
+ * mxc_mlb.h
@@ -224584,9 +227710,9 @@ diff -Nur linux-3.14.15/include/linux/mxc_mlb.h linux-linaro-stable-mx6/include/
+
+
+#endif /* _MXC_MLB_H */
-diff -Nur linux-3.14.15/include/linux/mxc_v4l2.h linux-linaro-stable-mx6/include/linux/mxc_v4l2.h
---- linux-3.14.15/include/linux/mxc_v4l2.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/mxc_v4l2.h 2014-08-20 19:24:05.738897843 +0200
+diff -Nur linux-3.14.17/include/linux/mxc_v4l2.h linux-imx6-3.14/include/linux/mxc_v4l2.h
+--- linux-3.14.17/include/linux/mxc_v4l2.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/linux/mxc_v4l2.h 2014-09-09 10:13:52.068980385 +0200
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -224615,9 +227741,9 @@ diff -Nur linux-3.14.15/include/linux/mxc_v4l2.h linux-linaro-stable-mx6/include
+#include <uapi/linux/mxc_v4l2.h>
+
+#endif
-diff -Nur linux-3.14.15/include/linux/mxc_vpu.h linux-linaro-stable-mx6/include/linux/mxc_vpu.h
---- linux-3.14.15/include/linux/mxc_vpu.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/mxc_vpu.h 2014-08-20 19:24:05.738897843 +0200
+diff -Nur linux-3.14.17/include/linux/mxc_vpu.h linux-imx6-3.14/include/linux/mxc_vpu.h
+--- linux-3.14.17/include/linux/mxc_vpu.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/linux/mxc_vpu.h 2014-09-09 10:13:52.068980385 +0200
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -224737,9 +227863,9 @@ diff -Nur linux-3.14.15/include/linux/mxc_vpu.h linux-linaro-stable-mx6/include/
+void vl2cc_cleanup(void);
+
+#endif
-diff -Nur linux-3.14.15/include/linux/phy.h linux-linaro-stable-mx6/include/linux/phy.h
---- linux-3.14.15/include/linux/phy.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/phy.h 2014-08-20 19:31:53.076898833 +0200
+diff -Nur linux-3.14.17/include/linux/phy.h linux-imx6-3.14/include/linux/phy.h
+--- linux-3.14.17/include/linux/phy.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/phy.h 2014-09-09 10:13:52.080980483 +0200
@@ -609,6 +609,7 @@
return phydev->drv->read_status(phydev);
}
@@ -224748,9 +227874,9 @@ diff -Nur linux-3.14.15/include/linux/phy.h linux-linaro-stable-mx6/include/linu
int genphy_setup_forced(struct phy_device *phydev);
int genphy_restart_aneg(struct phy_device *phydev);
int genphy_config_aneg(struct phy_device *phydev);
-diff -Nur linux-3.14.15/include/linux/pipe_fs_i.h linux-linaro-stable-mx6/include/linux/pipe_fs_i.h
---- linux-3.14.15/include/linux/pipe_fs_i.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/pipe_fs_i.h 2014-08-20 19:31:53.080898851 +0200
+diff -Nur linux-3.14.17/include/linux/pipe_fs_i.h linux-imx6-3.14/include/linux/pipe_fs_i.h
+--- linux-3.14.17/include/linux/pipe_fs_i.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/pipe_fs_i.h 2014-09-09 10:13:52.080980483 +0200
@@ -35,7 +35,7 @@
* @tmp_page: cached released page
* @readers: number of current readers of this pipe
@@ -224760,9 +227886,9 @@ diff -Nur linux-3.14.15/include/linux/pipe_fs_i.h linux-linaro-stable-mx6/includ
* @waiting_writers: number of writers blocked waiting for room
* @r_counter: reader counter
* @w_counter: writer counter
-diff -Nur linux-3.14.15/include/linux/pl320-ipc.h linux-linaro-stable-mx6/include/linux/pl320-ipc.h
---- linux-3.14.15/include/linux/pl320-ipc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/pl320-ipc.h 2014-08-20 19:31:53.080898851 +0200
+diff -Nur linux-3.14.17/include/linux/pl320-ipc.h linux-imx6-3.14/include/linux/pl320-ipc.h
+--- linux-3.14.17/include/linux/pl320-ipc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/linux/pl320-ipc.h 2014-09-09 10:13:52.080980483 +0200
@@ -0,0 +1,17 @@
+/*
+ * This program is free software; you can redistribute it and/or modify it
@@ -224781,9 +227907,9 @@ diff -Nur linux-3.14.15/include/linux/pl320-ipc.h linux-linaro-stable-mx6/includ
+int pl320_ipc_transmit(u32 *data);
+int pl320_ipc_register_notifier(struct notifier_block *nb);
+int pl320_ipc_unregister_notifier(struct notifier_block *nb);
-diff -Nur linux-3.14.15/include/linux/platform_data/dma-imx.h linux-linaro-stable-mx6/include/linux/platform_data/dma-imx.h
---- linux-3.14.15/include/linux/platform_data/dma-imx.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/platform_data/dma-imx.h 2014-08-20 19:31:53.100898936 +0200
+diff -Nur linux-3.14.17/include/linux/platform_data/dma-imx.h linux-imx6-3.14/include/linux/platform_data/dma-imx.h
+--- linux-3.14.17/include/linux/platform_data/dma-imx.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/platform_data/dma-imx.h 2014-09-09 10:13:52.084980516 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2009 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -224824,9 +227950,9 @@ diff -Nur linux-3.14.15/include/linux/platform_data/dma-imx.h linux-linaro-stabl
static inline int imx_dma_is_general_purpose(struct dma_chan *chan)
{
return !strcmp(chan->device->dev->driver->name, "imx-sdma") ||
-diff -Nur linux-3.14.15/include/linux/power/imx6_usb_charger.h linux-linaro-stable-mx6/include/linux/power/imx6_usb_charger.h
---- linux-3.14.15/include/linux/power/imx6_usb_charger.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/power/imx6_usb_charger.h 2014-08-20 19:24:05.934898680 +0200
+diff -Nur linux-3.14.17/include/linux/power/imx6_usb_charger.h linux-imx6-3.14/include/linux/power/imx6_usb_charger.h
+--- linux-3.14.17/include/linux/power/imx6_usb_charger.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/linux/power/imx6_usb_charger.h 2014-09-09 10:13:52.096980613 +0200
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -224908,9 +228034,33 @@ diff -Nur linux-3.14.15/include/linux/power/imx6_usb_charger.h linux-linaro-stab
+#endif
+
+#endif /* __IMXUSB6_CHARGER_H */
-diff -Nur linux-3.14.15/include/linux/ptp_clock_kernel.h linux-linaro-stable-mx6/include/linux/ptp_clock_kernel.h
---- linux-3.14.15/include/linux/ptp_clock_kernel.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/ptp_clock_kernel.h 2014-08-20 19:31:53.204899381 +0200
+diff -Nur linux-3.14.17/include/linux/printk.h linux-imx6-3.14/include/linux/printk.h
+--- linux-3.14.17/include/linux/printk.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/printk.h 2014-09-09 10:13:52.096980613 +0200
+@@ -132,9 +132,9 @@
+ int printk(const char *fmt, ...);
+
+ /*
+- * Special printk facility for scheduler/timekeeping use only, _DO_NOT_USE_ !
++ * Special printk facility for scheduler use only, _DO_NOT_USE_ !
+ */
+-__printf(1, 2) __cold int printk_deferred(const char *fmt, ...);
++__printf(1, 2) __cold int printk_sched(const char *fmt, ...);
+
+ /*
+ * Please don't use printk_ratelimit(), because it shares ratelimiting state
+@@ -169,7 +169,7 @@
+ return 0;
+ }
+ static inline __printf(1, 2) __cold
+-int printk_deferred(const char *s, ...)
++int printk_sched(const char *s, ...)
+ {
+ return 0;
+ }
+diff -Nur linux-3.14.17/include/linux/ptp_clock_kernel.h linux-imx6-3.14/include/linux/ptp_clock_kernel.h
+--- linux-3.14.17/include/linux/ptp_clock_kernel.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/ptp_clock_kernel.h 2014-09-09 10:13:52.096980613 +0200
@@ -49,7 +49,11 @@
* @n_alarm: The number of programmable alarms.
* @n_ext_ts: The number of external time stamp channels.
@@ -224978,9 +228128,9 @@ diff -Nur linux-3.14.15/include/linux/ptp_clock_kernel.h linux-linaro-stable-mx6
+ enum ptp_pin_function func, unsigned int chan);
+
#endif
-diff -Nur linux-3.14.15/include/linux/pxp_device.h linux-linaro-stable-mx6/include/linux/pxp_device.h
---- linux-3.14.15/include/linux/pxp_device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/pxp_device.h 2014-08-20 19:31:53.204899381 +0200
+diff -Nur linux-3.14.17/include/linux/pxp_device.h linux-imx6-3.14/include/linux/pxp_device.h
+--- linux-3.14.17/include/linux/pxp_device.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/linux/pxp_device.h 2014-09-09 10:13:52.096980613 +0200
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2013-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -225050,9 +228200,9 @@ diff -Nur linux-3.14.15/include/linux/pxp_device.h linux-linaro-stable-mx6/inclu
+};
+
+#endif
-diff -Nur linux-3.14.15/include/linux/pxp_dma.h linux-linaro-stable-mx6/include/linux/pxp_dma.h
---- linux-3.14.15/include/linux/pxp_dma.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/linux/pxp_dma.h 2014-08-20 19:31:53.204899381 +0200
+diff -Nur linux-3.14.17/include/linux/pxp_dma.h linux-imx6-3.14/include/linux/pxp_dma.h
+--- linux-3.14.17/include/linux/pxp_dma.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/linux/pxp_dma.h 2014-09-09 10:13:52.096980613 +0200
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -225126,9 +228276,9 @@ diff -Nur linux-3.14.15/include/linux/pxp_dma.h linux-linaro-stable-mx6/include/
+#endif
+
+#endif
-diff -Nur linux-3.14.15/include/linux/regulator/consumer.h linux-linaro-stable-mx6/include/linux/regulator/consumer.h
---- linux-3.14.15/include/linux/regulator/consumer.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/regulator/consumer.h 2014-08-20 19:31:53.216899434 +0200
+diff -Nur linux-3.14.17/include/linux/regulator/consumer.h linux-imx6-3.14/include/linux/regulator/consumer.h
+--- linux-3.14.17/include/linux/regulator/consumer.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/regulator/consumer.h 2014-09-09 10:13:52.100980646 +0200
@@ -2,6 +2,7 @@
* consumer.h -- SoC Regulator consumer support.
*
@@ -225146,9 +228296,9 @@ diff -Nur linux-3.14.15/include/linux/regulator/consumer.h linux-linaro-stable-m
struct regulator;
-diff -Nur linux-3.14.15/include/linux/reset.h linux-linaro-stable-mx6/include/linux/reset.h
---- linux-3.14.15/include/linux/reset.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/reset.h 2014-08-20 19:24:05.950898748 +0200
+diff -Nur linux-3.14.17/include/linux/reset.h linux-imx6-3.14/include/linux/reset.h
+--- linux-3.14.17/include/linux/reset.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/reset.h 2014-09-09 10:13:52.100980646 +0200
@@ -12,6 +12,13 @@
void reset_control_put(struct reset_control *rstc);
struct reset_control *devm_reset_control_get(struct device *dev, const char *id);
@@ -225163,9 +228313,9 @@ diff -Nur linux-3.14.15/include/linux/reset.h linux-linaro-stable-mx6/include/li
+#endif /* CONFIG_RESET_CONTROLLER */
#endif
-diff -Nur linux-3.14.15/include/linux/serial_core.h linux-linaro-stable-mx6/include/linux/serial_core.h
---- linux-3.14.15/include/linux/serial_core.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/serial_core.h 2014-08-20 19:31:53.236899518 +0200
+diff -Nur linux-3.14.17/include/linux/serial_core.h linux-imx6-3.14/include/linux/serial_core.h
+--- linux-3.14.17/include/linux/serial_core.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/serial_core.h 2014-09-09 10:13:52.108980711 +0200
@@ -285,6 +285,22 @@
/*
* Console helpers.
@@ -225189,9 +228339,9 @@ diff -Nur linux-3.14.15/include/linux/serial_core.h linux-linaro-stable-mx6/incl
struct uart_port *uart_get_console(struct uart_port *ports, int nr,
struct console *c);
void uart_parse_options(char *options, int *baud, int *parity, int *bits,
-diff -Nur linux-3.14.15/include/linux/skbuff.h linux-linaro-stable-mx6/include/linux/skbuff.h
---- linux-3.14.15/include/linux/skbuff.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/skbuff.h 2014-08-20 19:31:53.240899537 +0200
+diff -Nur linux-3.14.17/include/linux/skbuff.h linux-imx6-3.14/include/linux/skbuff.h
+--- linux-3.14.17/include/linux/skbuff.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/skbuff.h 2014-09-09 10:13:52.112980743 +0200
@@ -2038,7 +2038,7 @@
}
@@ -225201,9 +228351,9 @@ diff -Nur linux-3.14.15/include/linux/skbuff.h linux-linaro-stable-mx6/include/l
* @frag: the paged fragment
*
* Returns the &struct page associated with @frag.
-diff -Nur linux-3.14.15/include/linux/spi/spi.h linux-linaro-stable-mx6/include/linux/spi/spi.h
---- linux-3.14.15/include/linux/spi/spi.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/spi/spi.h 2014-08-20 19:31:53.240899537 +0200
+diff -Nur linux-3.14.17/include/linux/spi/spi.h linux-imx6-3.14/include/linux/spi/spi.h
+--- linux-3.14.17/include/linux/spi/spi.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/spi/spi.h 2014-09-09 10:13:52.116980776 +0200
@@ -234,7 +234,7 @@
* @mode_bits: flags understood by this controller driver
* @bits_per_word_mask: A mask indicating which values of bits_per_word are
@@ -225240,9 +228390,9 @@ diff -Nur linux-3.14.15/include/linux/spi/spi.h linux-linaro-stable-mx6/include/
* from device through @tx_nbits and @rx_nbits. In Bi-direction, these
* two should both be set. User can set transfer mode with SPI_NBITS_SINGLE(1x)
* SPI_NBITS_DUAL(2x) and SPI_NBITS_QUAD(4x) to support these three transfer.
-diff -Nur linux-3.14.15/include/linux/syscalls.h linux-linaro-stable-mx6/include/linux/syscalls.h
---- linux-3.14.15/include/linux/syscalls.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/syscalls.h 2014-08-20 19:31:53.248899571 +0200
+diff -Nur linux-3.14.17/include/linux/syscalls.h linux-imx6-3.14/include/linux/syscalls.h
+--- linux-3.14.17/include/linux/syscalls.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/syscalls.h 2014-09-09 10:13:52.120980809 +0200
@@ -744,6 +744,9 @@
int newdfd, const char __user *newname, int flags);
asmlinkage long sys_renameat(int olddfd, const char __user * oldname,
@@ -225253,9 +228403,9 @@ diff -Nur linux-3.14.15/include/linux/syscalls.h linux-linaro-stable-mx6/include
asmlinkage long sys_futimesat(int dfd, const char __user *filename,
struct timeval __user *utimes);
asmlinkage long sys_faccessat(int dfd, const char __user *filename, int mode);
-diff -Nur linux-3.14.15/include/linux/usb/chipidea.h linux-linaro-stable-mx6/include/linux/usb/chipidea.h
---- linux-3.14.15/include/linux/usb/chipidea.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/usb/chipidea.h 2014-08-20 19:31:53.264899640 +0200
+diff -Nur linux-3.14.17/include/linux/usb/chipidea.h linux-imx6-3.14/include/linux/usb/chipidea.h
+--- linux-3.14.17/include/linux/usb/chipidea.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/usb/chipidea.h 2014-09-09 10:13:52.128980874 +0200
@@ -18,6 +18,7 @@
unsigned long flags;
#define CI_HDRC_REGS_SHARED BIT(0)
@@ -225279,9 +228429,9 @@ diff -Nur linux-3.14.15/include/linux/usb/chipidea.h linux-linaro-stable-mx6/inc
+/* Get current available role */
+enum usb_dr_mode ci_hdrc_query_available_role(struct platform_device *pdev);
#endif
-diff -Nur linux-3.14.15/include/linux/usb/composite.h linux-linaro-stable-mx6/include/linux/usb/composite.h
---- linux-3.14.15/include/linux/usb/composite.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/usb/composite.h 2014-08-20 19:31:53.264899640 +0200
+diff -Nur linux-3.14.17/include/linux/usb/composite.h linux-imx6-3.14/include/linux/usb/composite.h
+--- linux-3.14.17/include/linux/usb/composite.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/usb/composite.h 2014-09-09 10:13:52.128980874 +0200
@@ -92,7 +92,7 @@
* @suspend: Notifies functions when the host stops sending USB traffic.
* @resume: Notifies functions when the host restarts USB traffic.
@@ -225291,9 +228441,9 @@ diff -Nur linux-3.14.15/include/linux/usb/composite.h linux-linaro-stable-mx6/in
* @func_suspend: callback to be called when
* SetFeature(FUNCTION_SUSPEND) is reseived
*
-diff -Nur linux-3.14.15/include/linux/usb/phy.h linux-linaro-stable-mx6/include/linux/usb/phy.h
---- linux-3.14.15/include/linux/usb/phy.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/linux/usb/phy.h 2014-08-20 19:31:53.268899657 +0200
+diff -Nur linux-3.14.17/include/linux/usb/phy.h linux-imx6-3.14/include/linux/usb/phy.h
+--- linux-3.14.17/include/linux/usb/phy.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/linux/usb/phy.h 2014-09-09 10:13:52.132980906 +0200
@@ -111,11 +111,23 @@
int (*set_suspend)(struct usb_phy *x,
int suspend);
@@ -225359,9 +228509,9 @@ diff -Nur linux-3.14.15/include/linux/usb/phy.h linux-linaro-stable-mx6/include/
/* notifiers */
static inline int
-diff -Nur linux-3.14.15/include/net/cfg80211.h linux-linaro-stable-mx6/include/net/cfg80211.h
---- linux-3.14.15/include/net/cfg80211.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/net/cfg80211.h 2014-08-20 19:31:53.404900240 +0200
+diff -Nur linux-3.14.17/include/net/cfg80211.h linux-imx6-3.14/include/net/cfg80211.h
+--- linux-3.14.17/include/net/cfg80211.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/net/cfg80211.h 2014-09-09 10:13:52.152981069 +0200
@@ -1729,7 +1729,7 @@
u8 *ssid;
size_t ssid_len;
@@ -225389,9 +228539,127 @@ diff -Nur linux-3.14.15/include/net/cfg80211.h linux-linaro-stable-mx6/include/n
/**
* cfg80211_notify_new_candidate - notify cfg80211 of a new mesh peer candidate
-diff -Nur linux-3.14.15/include/net/mac80211.h linux-linaro-stable-mx6/include/net/mac80211.h
---- linux-3.14.15/include/net/mac80211.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/net/mac80211.h 2014-08-20 19:31:53.420900308 +0200
+diff -Nur linux-3.14.17/include/net/inetpeer.h linux-imx6-3.14/include/net/inetpeer.h
+--- linux-3.14.17/include/net/inetpeer.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/net/inetpeer.h 2014-09-09 10:13:52.156981101 +0200
+@@ -41,13 +41,14 @@
+ struct rcu_head gc_rcu;
+ };
+ /*
+- * Once inet_peer is queued for deletion (refcnt == -1), following field
+- * is not available: rid
++ * Once inet_peer is queued for deletion (refcnt == -1), following fields
++ * are not available: rid, ip_id_count
+ * We can share memory with rcu_head to help keep inet_peer small.
+ */
+ union {
+ struct {
+ atomic_t rid; /* Frag reception counter */
++ atomic_t ip_id_count; /* IP ID for the next packet */
+ };
+ struct rcu_head rcu;
+ struct inet_peer *gc_next;
+@@ -164,7 +165,7 @@
+ void inetpeer_invalidate_tree(struct inet_peer_base *);
+
+ /*
+- * temporary check to make sure we dont access rid, tcp_ts,
++ * temporary check to make sure we dont access rid, ip_id_count, tcp_ts,
+ * tcp_ts_stamp if no refcount is taken on inet_peer
+ */
+ static inline void inet_peer_refcheck(const struct inet_peer *p)
+@@ -172,4 +173,13 @@
+ WARN_ON_ONCE(atomic_read(&p->refcnt) <= 0);
+ }
+
++
++/* can be called with or without local BH being disabled */
++static inline int inet_getid(struct inet_peer *p, int more)
++{
++ more++;
++ inet_peer_refcheck(p);
++ return atomic_add_return(more, &p->ip_id_count) - more;
++}
++
+ #endif /* _NET_INETPEER_H */
+diff -Nur linux-3.14.17/include/net/ip.h linux-imx6-3.14/include/net/ip.h
+--- linux-3.14.17/include/net/ip.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/net/ip.h 2014-09-09 10:13:52.156981101 +0200
+@@ -297,10 +297,9 @@
+ }
+ }
+
+-u32 ip_idents_reserve(u32 hash, int segs);
+-void __ip_select_ident(struct iphdr *iph, int segs);
++void __ip_select_ident(struct iphdr *iph, struct dst_entry *dst, int more);
+
+-static inline void ip_select_ident_segs(struct sk_buff *skb, struct sock *sk, int segs)
++static inline void ip_select_ident(struct sk_buff *skb, struct dst_entry *dst, struct sock *sk)
+ {
+ struct iphdr *iph = ip_hdr(skb);
+
+@@ -310,20 +309,24 @@
+ * does not change, they drop every other packet in
+ * a TCP stream using header compression.
+ */
+- if (sk && inet_sk(sk)->inet_daddr) {
+- iph->id = htons(inet_sk(sk)->inet_id);
+- inet_sk(sk)->inet_id += segs;
+- } else {
+- iph->id = 0;
+- }
+- } else {
+- __ip_select_ident(iph, segs);
+- }
++ iph->id = (sk && inet_sk(sk)->inet_daddr) ?
++ htons(inet_sk(sk)->inet_id++) : 0;
++ } else
++ __ip_select_ident(iph, dst, 0);
+ }
+
+-static inline void ip_select_ident(struct sk_buff *skb, struct sock *sk)
++static inline void ip_select_ident_more(struct sk_buff *skb, struct dst_entry *dst, struct sock *sk, int more)
+ {
+- ip_select_ident_segs(skb, sk, 1);
++ struct iphdr *iph = ip_hdr(skb);
++
++ if ((iph->frag_off & htons(IP_DF)) && !skb->local_df) {
++ if (sk && inet_sk(sk)->inet_daddr) {
++ iph->id = htons(inet_sk(sk)->inet_id);
++ inet_sk(sk)->inet_id += 1 + more;
++ } else
++ iph->id = 0;
++ } else
++ __ip_select_ident(iph, dst, more);
+ }
+
+ /*
+diff -Nur linux-3.14.17/include/net/ip_tunnels.h linux-imx6-3.14/include/net/ip_tunnels.h
+--- linux-3.14.17/include/net/ip_tunnels.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/net/ip_tunnels.h 2014-09-09 10:13:52.156981101 +0200
+@@ -40,7 +40,6 @@
+
+ struct ip_tunnel_dst {
+ struct dst_entry __rcu *dst;
+- __be32 saddr;
+ };
+
+ struct ip_tunnel {
+diff -Nur linux-3.14.17/include/net/ipv6.h linux-imx6-3.14/include/net/ipv6.h
+--- linux-3.14.17/include/net/ipv6.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/net/ipv6.h 2014-09-09 10:13:52.160981134 +0200
+@@ -660,6 +660,8 @@
+ return __ipv6_addr_diff(a1, a2, sizeof(struct in6_addr));
+ }
+
++void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt);
++
+ int ip6_dst_hoplimit(struct dst_entry *dst);
+
+ /*
+diff -Nur linux-3.14.17/include/net/mac80211.h linux-imx6-3.14/include/net/mac80211.h
+--- linux-3.14.17/include/net/mac80211.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/net/mac80211.h 2014-09-09 10:13:52.164981167 +0200
@@ -1895,7 +1895,7 @@
*
* Driver informs U-APSD client support by enabling
@@ -225437,9 +228705,9 @@ diff -Nur linux-3.14.15/include/net/mac80211.h linux-linaro-stable-mx6/include/n
void (*channel_switch)(struct ieee80211_hw *hw,
struct ieee80211_channel_switch *ch_switch);
int (*napi_poll)(struct ieee80211_hw *hw, int budget);
-diff -Nur linux-3.14.15/include/net/rtnetlink.h linux-linaro-stable-mx6/include/net/rtnetlink.h
---- linux-3.14.15/include/net/rtnetlink.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/net/rtnetlink.h 2014-08-20 19:31:53.456900464 +0200
+diff -Nur linux-3.14.17/include/net/rtnetlink.h linux-imx6-3.14/include/net/rtnetlink.h
+--- linux-3.14.17/include/net/rtnetlink.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/net/rtnetlink.h 2014-09-09 10:13:52.168981200 +0200
@@ -140,7 +140,7 @@
struct nlattr *tb[]);
int rtnl_configure_link(struct net_device *dev, const struct ifinfomsg *ifm);
@@ -225449,9 +228717,21 @@ diff -Nur linux-3.14.15/include/net/rtnetlink.h linux-linaro-stable-mx6/include/
#define MODULE_ALIAS_RTNL_LINK(kind) MODULE_ALIAS("rtnl-link-" kind)
-diff -Nur linux-3.14.15/include/net/tso.h linux-linaro-stable-mx6/include/net/tso.h
---- linux-3.14.15/include/net/tso.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/net/tso.h 2014-08-20 19:31:54.492904910 +0200
+diff -Nur linux-3.14.17/include/net/secure_seq.h linux-imx6-3.14/include/net/secure_seq.h
+--- linux-3.14.17/include/net/secure_seq.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/net/secure_seq.h 2014-09-09 10:13:52.172981232 +0200
+@@ -3,6 +3,8 @@
+
+ #include <linux/types.h>
+
++__u32 secure_ip_id(__be32 daddr);
++__u32 secure_ipv6_id(const __be32 daddr[4]);
+ u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport);
+ u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
+ __be16 dport);
+diff -Nur linux-3.14.17/include/net/tso.h linux-imx6-3.14/include/net/tso.h
+--- linux-3.14.17/include/net/tso.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/net/tso.h 2014-09-09 10:13:52.172981232 +0200
@@ -0,0 +1,20 @@
+#ifndef _TSO_H
+#define _TSO_H
@@ -225473,9 +228753,9 @@ diff -Nur linux-3.14.15/include/net/tso.h linux-linaro-stable-mx6/include/net/ts
+void tso_start(struct sk_buff *skb, struct tso_t *tso);
+
+#endif /* _TSO_H */
-diff -Nur linux-3.14.15/include/sound/wm8962.h linux-linaro-stable-mx6/include/sound/wm8962.h
---- linux-3.14.15/include/sound/wm8962.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/sound/wm8962.h 2014-08-20 19:24:06.398900661 +0200
+diff -Nur linux-3.14.17/include/sound/wm8962.h linux-imx6-3.14/include/sound/wm8962.h
+--- linux-3.14.17/include/sound/wm8962.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/sound/wm8962.h 2014-09-09 10:13:52.192981395 +0200
@@ -55,6 +55,9 @@
* in a DC measurement configuration.
*/
@@ -225486,9 +228766,9 @@ diff -Nur linux-3.14.15/include/sound/wm8962.h linux-linaro-stable-mx6/include/s
};
#endif
-diff -Nur linux-3.14.15/include/trace/events/cpufreq_interactive.h linux-linaro-stable-mx6/include/trace/events/cpufreq_interactive.h
---- linux-3.14.15/include/trace/events/cpufreq_interactive.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/trace/events/cpufreq_interactive.h 2014-08-20 19:31:54.724905906 +0200
+diff -Nur linux-3.14.17/include/trace/events/cpufreq_interactive.h linux-imx6-3.14/include/trace/events/cpufreq_interactive.h
+--- linux-3.14.17/include/trace/events/cpufreq_interactive.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/trace/events/cpufreq_interactive.h 2014-09-09 10:13:52.192981395 +0200
@@ -0,0 +1,112 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM cpufreq_interactive
@@ -225602,9 +228882,9 @@ diff -Nur linux-3.14.15/include/trace/events/cpufreq_interactive.h linux-linaro-
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
-diff -Nur linux-3.14.15/include/uapi/linux/ipu.h linux-linaro-stable-mx6/include/uapi/linux/ipu.h
---- linux-3.14.15/include/uapi/linux/ipu.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/uapi/linux/ipu.h 2014-08-20 19:24:06.526901208 +0200
+diff -Nur linux-3.14.17/include/uapi/linux/ipu.h linux-imx6-3.14/include/uapi/linux/ipu.h
+--- linux-3.14.17/include/uapi/linux/ipu.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/uapi/linux/ipu.h 2014-09-09 10:13:52.220981622 +0200
@@ -0,0 +1,282 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved
@@ -225888,9 +229168,9 @@ diff -Nur linux-3.14.15/include/uapi/linux/ipu.h linux-linaro-stable-mx6/include
+#define IPU_FREE _IOW('I', 0x4, int)
+
+#endif
-diff -Nur linux-3.14.15/include/uapi/linux/isl29023.h linux-linaro-stable-mx6/include/uapi/linux/isl29023.h
---- linux-3.14.15/include/uapi/linux/isl29023.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/uapi/linux/isl29023.h 2014-08-20 19:24:06.526901208 +0200
+diff -Nur linux-3.14.17/include/uapi/linux/isl29023.h linux-imx6-3.14/include/uapi/linux/isl29023.h
+--- linux-3.14.17/include/uapi/linux/isl29023.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/uapi/linux/isl29023.h 2014-09-09 10:13:52.220981622 +0200
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -225939,9 +229219,9 @@ diff -Nur linux-3.14.15/include/uapi/linux/isl29023.h linux-linaro-stable-mx6/in
+#define ISL29023_RANGE_64K 0x3
+
+#endif
-diff -Nur linux-3.14.15/include/uapi/linux/Kbuild linux-linaro-stable-mx6/include/uapi/linux/Kbuild
---- linux-3.14.15/include/uapi/linux/Kbuild 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/uapi/linux/Kbuild 2014-08-20 19:31:54.740905976 +0200
+diff -Nur linux-3.14.17/include/uapi/linux/Kbuild linux-imx6-3.14/include/uapi/linux/Kbuild
+--- linux-3.14.17/include/uapi/linux/Kbuild 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/uapi/linux/Kbuild 2014-09-09 10:13:52.204981492 +0200
@@ -226,6 +226,7 @@
header-y += kvm_para.h
endif
@@ -225969,9 +229249,9 @@ diff -Nur linux-3.14.15/include/uapi/linux/Kbuild linux-linaro-stable-mx6/includ
header-y += qnx4_fs.h
header-y += qnxtypes.h
header-y += quota.h
-diff -Nur linux-3.14.15/include/uapi/linux/mxc_asrc.h linux-linaro-stable-mx6/include/uapi/linux/mxc_asrc.h
---- linux-3.14.15/include/uapi/linux/mxc_asrc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/uapi/linux/mxc_asrc.h 2014-08-20 19:24:06.550901310 +0200
+diff -Nur linux-3.14.17/include/uapi/linux/mxc_asrc.h linux-imx6-3.14/include/uapi/linux/mxc_asrc.h
+--- linux-3.14.17/include/uapi/linux/mxc_asrc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/uapi/linux/mxc_asrc.h 2014-09-09 10:13:52.224981655 +0200
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2008-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -226116,9 +229396,9 @@ diff -Nur linux-3.14.15/include/uapi/linux/mxc_asrc.h linux-linaro-stable-mx6/in
+ ASRC_INPUT_BUFFER_UNDERRUN = 0x10,
+};
+#endif/* __MXC_ASRC_UAPI_H__ */
-diff -Nur linux-3.14.15/include/uapi/linux/mxcfb.h linux-linaro-stable-mx6/include/uapi/linux/mxcfb.h
---- linux-3.14.15/include/uapi/linux/mxcfb.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/uapi/linux/mxcfb.h 2014-08-20 19:24:06.550901310 +0200
+diff -Nur linux-3.14.17/include/uapi/linux/mxcfb.h linux-imx6-3.14/include/uapi/linux/mxcfb.h
+--- linux-3.14.17/include/uapi/linux/mxcfb.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/uapi/linux/mxcfb.h 2014-09-09 10:13:52.224981655 +0200
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved
@@ -226294,9 +229574,9 @@ diff -Nur linux-3.14.15/include/uapi/linux/mxcfb.h linux-linaro-stable-mx6/inclu
+#define MXCFB_SET_UPDATE_SCHEME _IOW('F', 0x32, __u32)
+#define MXCFB_GET_WORK_BUFFER _IOWR('F', 0x34, unsigned long)
+#endif
-diff -Nur linux-3.14.15/include/uapi/linux/mxc_mlb.h linux-linaro-stable-mx6/include/uapi/linux/mxc_mlb.h
---- linux-3.14.15/include/uapi/linux/mxc_mlb.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/uapi/linux/mxc_mlb.h 2014-08-20 19:24:06.550901310 +0200
+diff -Nur linux-3.14.17/include/uapi/linux/mxc_mlb.h linux-imx6-3.14/include/uapi/linux/mxc_mlb.h
+--- linux-3.14.17/include/uapi/linux/mxc_mlb.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/uapi/linux/mxc_mlb.h 2014-09-09 10:13:52.224981655 +0200
@@ -0,0 +1,55 @@
+/*
+ * mxc_mlb.h
@@ -226353,9 +229633,9 @@ diff -Nur linux-3.14.15/include/uapi/linux/mxc_mlb.h linux-linaro-stable-mx6/inc
+
+
+#endif /* _MXC_MLB_H */
-diff -Nur linux-3.14.15/include/uapi/linux/mxc_v4l2.h linux-linaro-stable-mx6/include/uapi/linux/mxc_v4l2.h
---- linux-3.14.15/include/uapi/linux/mxc_v4l2.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/uapi/linux/mxc_v4l2.h 2014-08-20 19:24:06.550901310 +0200
+diff -Nur linux-3.14.17/include/uapi/linux/mxc_v4l2.h linux-imx6-3.14/include/uapi/linux/mxc_v4l2.h
+--- linux-3.14.17/include/uapi/linux/mxc_v4l2.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/uapi/linux/mxc_v4l2.h 2014-09-09 10:13:52.224981655 +0200
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved
@@ -226413,9 +229693,9 @@ diff -Nur linux-3.14.15/include/uapi/linux/mxc_v4l2.h linux-linaro-stable-mx6/in
+};
+
+#endif
-diff -Nur linux-3.14.15/include/uapi/linux/ptp_clock.h linux-linaro-stable-mx6/include/uapi/linux/ptp_clock.h
---- linux-3.14.15/include/uapi/linux/ptp_clock.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/include/uapi/linux/ptp_clock.h 2014-08-20 19:31:54.808906267 +0200
+diff -Nur linux-3.14.17/include/uapi/linux/ptp_clock.h linux-imx6-3.14/include/uapi/linux/ptp_clock.h
+--- linux-3.14.17/include/uapi/linux/ptp_clock.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/include/uapi/linux/ptp_clock.h 2014-09-09 10:13:52.236981753 +0200
@@ -50,7 +50,8 @@
int n_ext_ts; /* Number of external time stamp channels. */
int n_per_out; /* Number of programmable periodic signals. */
@@ -226476,9 +229756,9 @@ diff -Nur linux-3.14.15/include/uapi/linux/ptp_clock.h linux-linaro-stable-mx6/i
struct ptp_extts_event {
struct ptp_clock_time t; /* Time event occured. */
-diff -Nur linux-3.14.15/include/uapi/linux/pxp_device.h linux-linaro-stable-mx6/include/uapi/linux/pxp_device.h
---- linux-3.14.15/include/uapi/linux/pxp_device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/uapi/linux/pxp_device.h 2014-08-20 19:31:54.812906284 +0200
+diff -Nur linux-3.14.17/include/uapi/linux/pxp_device.h linux-imx6-3.14/include/uapi/linux/pxp_device.h
+--- linux-3.14.17/include/uapi/linux/pxp_device.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/uapi/linux/pxp_device.h 2014-09-09 10:13:52.236981753 +0200
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2013-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -226543,9 +229823,9 @@ diff -Nur linux-3.14.15/include/uapi/linux/pxp_device.h linux-linaro-stable-mx6/
+#define CACHE_FLUSH 0x4
+
+#endif
-diff -Nur linux-3.14.15/include/uapi/linux/pxp_dma.h linux-linaro-stable-mx6/include/uapi/linux/pxp_dma.h
---- linux-3.14.15/include/uapi/linux/pxp_dma.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/uapi/linux/pxp_dma.h 2014-08-20 19:31:54.812906284 +0200
+diff -Nur linux-3.14.17/include/uapi/linux/pxp_dma.h linux-imx6-3.14/include/uapi/linux/pxp_dma.h
+--- linux-3.14.17/include/uapi/linux/pxp_dma.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/uapi/linux/pxp_dma.h 2014-09-09 10:13:52.236981753 +0200
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2013-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -226720,9 +230000,9 @@ diff -Nur linux-3.14.15/include/uapi/linux/pxp_dma.h linux-linaro-stable-mx6/inc
+
+
+#endif
-diff -Nur linux-3.14.15/include/video/mxc_edid.h linux-linaro-stable-mx6/include/video/mxc_edid.h
---- linux-3.14.15/include/video/mxc_edid.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/video/mxc_edid.h 2014-08-20 19:24:06.682901874 +0200
+diff -Nur linux-3.14.17/include/video/mxc_edid.h linux-imx6-3.14/include/video/mxc_edid.h
+--- linux-3.14.17/include/video/mxc_edid.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/video/mxc_edid.h 2014-09-09 10:13:52.256981916 +0200
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -226829,10 +230109,10 @@ diff -Nur linux-3.14.15/include/video/mxc_edid.h linux-linaro-stable-mx6/include
+int mxc_edid_parse_ext_blk(unsigned char *edid, struct mxc_edid_cfg *cfg,
+ struct fb_monspecs *specs);
+#endif
-diff -Nur linux-3.14.15/include/video/mxc_hdmi.h linux-linaro-stable-mx6/include/video/mxc_hdmi.h
---- linux-3.14.15/include/video/mxc_hdmi.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/include/video/mxc_hdmi.h 2014-08-20 19:31:54.848906440 +0200
-@@ -0,0 +1,1020 @@
+diff -Nur linux-3.14.17/include/video/mxc_hdmi.h linux-imx6-3.14/include/video/mxc_hdmi.h
+--- linux-3.14.17/include/video/mxc_hdmi.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/include/video/mxc_hdmi.h 2014-09-09 10:13:52.256981916 +0200
+@@ -0,0 +1,1027 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc.
+ */
@@ -227415,6 +230695,10 @@ diff -Nur linux-3.14.15/include/video/mxc_hdmi.h linux-linaro-stable-mx6/include
+ HDMI_IH_MUTE_PHY_STAT0_TX_PHY_LOCK = 0x2,
+ HDMI_IH_MUTE_PHY_STAT0_HPD = 0x1,
+
++/* IH and IH_MUTE convenience macro RX_SENSE | HPD*/
++ HDMI_DVI_IH_STAT = 0x3D,
++
++
+/* IH_AHBDMAAUD_STAT0 field values */
+ HDMI_IH_AHBDMAAUD_STAT0_ERROR = 0x20,
+ HDMI_IH_AHBDMAAUD_STAT0_LOST = 0x10,
@@ -227710,6 +230994,9 @@ diff -Nur linux-3.14.15/include/video/mxc_hdmi.h linux-linaro-stable-mx6/include
+ HDMI_PHY_HPD = 0x02,
+ HDMI_PHY_TX_PHY_LOCK = 0x01,
+
++/* HDMI STAT convenience RX_SENSE | HPD */
++ HDMI_DVI_STAT = 0xF2,
++
+/* PHY_I2CM_SLAVE_ADDR field values */
+ HDMI_PHY_I2CM_SLAVE_ADDR_PHY_GEN2 = 0x69,
+ HDMI_PHY_I2CM_SLAVE_ADDR_HEAC_PHY = 0x49,
@@ -227853,9 +231140,23 @@ diff -Nur linux-3.14.15/include/video/mxc_hdmi.h linux-linaro-stable-mx6/include
+
+
+#endif /* __MXC_HDMI_H__ */
-diff -Nur linux-3.14.15/kernel/cpu.c linux-linaro-stable-mx6/kernel/cpu.c
---- linux-3.14.15/kernel/cpu.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/kernel/cpu.c 2014-08-20 19:31:54.868906526 +0200
+diff -Nur linux-3.14.17/init/main.c linux-imx6-3.14/init/main.c
+--- linux-3.14.17/init/main.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/init/main.c 2014-09-09 10:13:52.264981980 +0200
+@@ -617,10 +617,6 @@
+ if (efi_enabled(EFI_RUNTIME_SERVICES))
+ efi_enter_virtual_mode();
+ #endif
+-#ifdef CONFIG_X86_ESPFIX64
+- /* Should be run before the first non-init thread is created */
+- init_espfix_bsp();
+-#endif
+ thread_info_cache_init();
+ cred_init();
+ fork_init(totalram_pages);
+diff -Nur linux-3.14.17/kernel/cpu.c linux-imx6-3.14/kernel/cpu.c
+--- linux-3.14.17/kernel/cpu.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/kernel/cpu.c 2014-09-09 10:13:52.272982047 +0200
@@ -722,3 +722,22 @@
{
cpumask_copy(to_cpumask(cpu_online_bits), src);
@@ -227879,9 +231180,9 @@ diff -Nur linux-3.14.15/kernel/cpu.c linux-linaro-stable-mx6/kernel/cpu.c
+ atomic_notifier_call_chain(&idle_notifier, val, NULL);
+}
+EXPORT_SYMBOL_GPL(idle_notifier_call_chain);
-diff -Nur linux-3.14.15/kernel/irq/manage.c linux-linaro-stable-mx6/kernel/irq/manage.c
---- linux-3.14.15/kernel/irq/manage.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/kernel/irq/manage.c 2014-08-20 19:31:54.880906576 +0200
+diff -Nur linux-3.14.17/kernel/irq/manage.c linux-imx6-3.14/kernel/irq/manage.c
+--- linux-3.14.17/kernel/irq/manage.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/kernel/irq/manage.c 2014-09-09 10:13:52.284982143 +0200
@@ -32,24 +32,10 @@
early_param("threadirqs", setup_forced_irqthreads);
#endif
@@ -227970,9 +231271,21 @@ diff -Nur linux-3.14.15/kernel/irq/manage.c linux-linaro-stable-mx6/kernel/irq/m
}
EXPORT_SYMBOL(synchronize_irq);
-diff -Nur linux-3.14.15/kernel/relay.c linux-linaro-stable-mx6/kernel/relay.c
---- linux-3.14.15/kernel/relay.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/kernel/relay.c 2014-08-20 19:31:54.992907058 +0200
+diff -Nur linux-3.14.17/kernel/printk/printk.c linux-imx6-3.14/kernel/printk/printk.c
+--- linux-3.14.17/kernel/printk/printk.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/kernel/printk/printk.c 2014-09-09 10:13:52.296982242 +0200
+@@ -2468,7 +2468,7 @@
+ preempt_enable();
+ }
+
+-int printk_deferred(const char *fmt, ...)
++int printk_sched(const char *fmt, ...)
+ {
+ unsigned long flags;
+ va_list args;
+diff -Nur linux-3.14.17/kernel/relay.c linux-imx6-3.14/kernel/relay.c
+--- linux-3.14.17/kernel/relay.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/kernel/relay.c 2014-09-09 10:13:52.300982275 +0200
@@ -227,7 +227,7 @@
* relay_remove_buf - remove a channel buffer
* @kref: target kernel reference that contains the relay buffer
@@ -227982,9 +231295,45 @@ diff -Nur linux-3.14.15/kernel/relay.c linux-linaro-stable-mx6/kernel/relay.c
* rchan_buf_struct and the channel buffer. Should only be called from
* kref_put().
*/
-diff -Nur linux-3.14.15/kernel/signal.c linux-linaro-stable-mx6/kernel/signal.c
---- linux-3.14.15/kernel/signal.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/kernel/signal.c 2014-08-20 19:31:55.012907143 +0200
+diff -Nur linux-3.14.17/kernel/sched/core.c linux-imx6-3.14/kernel/sched/core.c
+--- linux-3.14.17/kernel/sched/core.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/kernel/sched/core.c 2014-09-09 10:13:52.300982275 +0200
+@@ -1322,7 +1322,7 @@
+ * leave kernel.
+ */
+ if (p->mm && printk_ratelimit()) {
+- printk_deferred("process %d (%s) no longer affine to cpu%d\n",
++ printk_sched("process %d (%s) no longer affine to cpu%d\n",
+ task_pid_nr(p), p->comm, cpu);
+ }
+ }
+diff -Nur linux-3.14.17/kernel/sched/deadline.c linux-imx6-3.14/kernel/sched/deadline.c
+--- linux-3.14.17/kernel/sched/deadline.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/kernel/sched/deadline.c 2014-09-09 10:13:52.300982275 +0200
+@@ -329,7 +329,7 @@
+
+ if (!lag_once) {
+ lag_once = true;
+- printk_deferred("sched: DL replenish lagged to much\n");
++ printk_sched("sched: DL replenish lagged to much\n");
+ }
+ dl_se->deadline = rq_clock(rq) + pi_se->dl_deadline;
+ dl_se->runtime = pi_se->dl_runtime;
+diff -Nur linux-3.14.17/kernel/sched/rt.c linux-imx6-3.14/kernel/sched/rt.c
+--- linux-3.14.17/kernel/sched/rt.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/kernel/sched/rt.c 2014-09-09 10:13:52.304982306 +0200
+@@ -837,7 +837,7 @@
+
+ if (!once) {
+ once = true;
+- printk_deferred("sched: RT throttling activated\n");
++ printk_sched("sched: RT throttling activated\n");
+ }
+ } else {
+ /*
+diff -Nur linux-3.14.17/kernel/signal.c linux-imx6-3.14/kernel/signal.c
+--- linux-3.14.17/kernel/signal.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/kernel/signal.c 2014-09-09 10:13:52.304982306 +0200
@@ -2382,7 +2382,7 @@
* @regs: user register state
* @stepping: nonzero if debugger single-step or block-step in use
@@ -227994,9 +231343,57 @@ diff -Nur linux-3.14.15/kernel/signal.c linux-linaro-stable-mx6/kernel/signal.c
* delivered. It updates the blocked signals accordingly (@ka->sa.sa_mask
* is always blocked, and the signal itself is blocked unless %SA_NODEFER
* is set in @ka->sa.sa_flags. Tracing is notified.
-diff -Nur linux-3.14.15/kernel/trace/trace.c linux-linaro-stable-mx6/kernel/trace/trace.c
---- linux-3.14.15/kernel/trace/trace.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/kernel/trace/trace.c 2014-08-20 19:31:55.032907228 +0200
+diff -Nur linux-3.14.17/kernel/time/clockevents.c linux-imx6-3.14/kernel/time/clockevents.c
+--- linux-3.14.17/kernel/time/clockevents.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/kernel/time/clockevents.c 2014-09-09 10:13:52.308982339 +0200
+@@ -146,8 +146,7 @@
+ {
+ /* Nothing to do if we already reached the limit */
+ if (dev->min_delta_ns >= MIN_DELTA_LIMIT) {
+- printk_deferred(KERN_WARNING
+- "CE: Reprogramming failure. Giving up\n");
++ printk(KERN_WARNING "CE: Reprogramming failure. Giving up\n");
+ dev->next_event.tv64 = KTIME_MAX;
+ return -ETIME;
+ }
+@@ -160,10 +159,9 @@
+ if (dev->min_delta_ns > MIN_DELTA_LIMIT)
+ dev->min_delta_ns = MIN_DELTA_LIMIT;
+
+- printk_deferred(KERN_WARNING
+- "CE: %s increased min_delta_ns to %llu nsec\n",
+- dev->name ? dev->name : "?",
+- (unsigned long long) dev->min_delta_ns);
++ printk(KERN_WARNING "CE: %s increased min_delta_ns to %llu nsec\n",
++ dev->name ? dev->name : "?",
++ (unsigned long long) dev->min_delta_ns);
+ return 0;
+ }
+
+diff -Nur linux-3.14.17/kernel/time/sched_clock.c linux-imx6-3.14/kernel/time/sched_clock.c
+--- linux-3.14.17/kernel/time/sched_clock.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/kernel/time/sched_clock.c 2014-09-09 10:13:52.308982339 +0200
+@@ -204,8 +204,7 @@
+
+ static int sched_clock_suspend(void)
+ {
+- update_sched_clock();
+- hrtimer_cancel(&sched_clock_timer);
++ sched_clock_poll(&sched_clock_timer);
+ cd.suspended = true;
+ return 0;
+ }
+@@ -213,7 +212,6 @@
+ static void sched_clock_resume(void)
+ {
+ cd.epoch_cyc = read_sched_clock();
+- hrtimer_start(&sched_clock_timer, cd.wrap_kt, HRTIMER_MODE_REL);
+ cd.suspended = false;
+ }
+
+diff -Nur linux-3.14.17/kernel/trace/trace.c linux-imx6-3.14/kernel/trace/trace.c
+--- linux-3.14.17/kernel/trace/trace.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/kernel/trace/trace.c 2014-09-09 10:13:52.316982405 +0200
@@ -811,7 +811,7 @@
{ trace_clock_local, "local", 1 },
{ trace_clock_global, "global", 1 },
@@ -228006,9 +231403,9 @@ diff -Nur linux-3.14.15/kernel/trace/trace.c linux-linaro-stable-mx6/kernel/trac
{ trace_clock, "perf", 1 },
ARCH_TRACE_CLOCKS
};
-diff -Nur linux-3.14.15/kernel/trace/trace_clock.c linux-linaro-stable-mx6/kernel/trace/trace_clock.c
---- linux-3.14.15/kernel/trace/trace_clock.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/kernel/trace/trace_clock.c 2014-08-20 19:24:07.766906502 +0200
+diff -Nur linux-3.14.17/kernel/trace/trace_clock.c linux-imx6-3.14/kernel/trace/trace_clock.c
+--- linux-3.14.17/kernel/trace/trace_clock.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/kernel/trace/trace_clock.c 2014-09-09 10:13:52.316982405 +0200
@@ -59,14 +59,13 @@
/*
@@ -228028,9 +231425,20 @@ diff -Nur linux-3.14.15/kernel/trace/trace_clock.c linux-linaro-stable-mx6/kerne
}
/*
-diff -Nur linux-3.14.15/linaro/configs/android.conf linux-linaro-stable-mx6/linaro/configs/android.conf
---- linux-3.14.15/linaro/configs/android.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/android.conf 2014-08-20 19:31:55.176907848 +0200
+diff -Nur linux-3.14.17/lib/btree.c linux-imx6-3.14/lib/btree.c
+--- linux-3.14.17/lib/btree.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/lib/btree.c 2014-09-09 10:13:52.324982470 +0200
+@@ -198,7 +198,6 @@
+
+ void btree_destroy(struct btree_head *head)
+ {
+- mempool_free(head->node, head->mempool);
+ mempool_destroy(head->mempool);
+ head->mempool = NULL;
+ }
+diff -Nur linux-3.14.17/linaro/configs/android.conf linux-imx6-3.14/linaro/configs/android.conf
+--- linux-3.14.17/linaro/configs/android.conf 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/linaro/configs/android.conf 2014-09-09 10:13:52.344982633 +0200
@@ -0,0 +1,42 @@
+CONFIG_IPV6=y
+# CONFIG_IPV6_SIT is not set
@@ -228074,9 +231482,9 @@ diff -Nur linux-3.14.15/linaro/configs/android.conf linux-linaro-stable-mx6/lina
+CONFIG_ADF_MEMBLOCK=y
+CONFIG_DMA_SHARED_BUFFER=y
+CONFIG_TUN=y
-diff -Nur linux-3.14.15/linaro/configs/arndale.conf linux-linaro-stable-mx6/linaro/configs/arndale.conf
---- linux-3.14.15/linaro/configs/arndale.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/arndale.conf 2014-08-20 19:24:07.902907083 +0200
+diff -Nur linux-3.14.17/linaro/configs/arndale.conf linux-imx6-3.14/linaro/configs/arndale.conf
+--- linux-3.14.17/linaro/configs/arndale.conf 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/linaro/configs/arndale.conf 2014-09-09 10:13:52.344982633 +0200
@@ -0,0 +1,66 @@
+CONFIG_KALLSYMS_ALL=y
+CONFIG_PARTITION_ADVANCED=y
@@ -228144,31 +231552,31 @@ diff -Nur linux-3.14.15/linaro/configs/arndale.conf linux-linaro-stable-mx6/lina
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+CONFIG_DEBUG_USER=y
+CONFIG_TUN=y
-diff -Nur linux-3.14.15/linaro/configs/bigendian.conf linux-linaro-stable-mx6/linaro/configs/bigendian.conf
---- linux-3.14.15/linaro/configs/bigendian.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/bigendian.conf 2014-08-20 19:31:55.180907865 +0200
+diff -Nur linux-3.14.17/linaro/configs/bigendian.conf linux-imx6-3.14/linaro/configs/bigendian.conf
+--- linux-3.14.17/linaro/configs/bigendian.conf 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/linaro/configs/bigendian.conf 2014-09-09 10:13:52.344982633 +0200
@@ -0,0 +1,4 @@
+CONFIG_CPU_BIG_ENDIAN=y
+CONFIG_CPU_ENDIAN_BE8=y
+# CONFIG_VIRTUALIZATION is not set
+# CONFIG_MMC_DW_IDMAC is not set
-diff -Nur linux-3.14.15/linaro/configs/big-LITTLE-IKS.conf linux-linaro-stable-mx6/linaro/configs/big-LITTLE-IKS.conf
---- linux-3.14.15/linaro/configs/big-LITTLE-IKS.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/big-LITTLE-IKS.conf 2014-08-20 19:24:07.902907083 +0200
+diff -Nur linux-3.14.17/linaro/configs/big-LITTLE-IKS.conf linux-imx6-3.14/linaro/configs/big-LITTLE-IKS.conf
+--- linux-3.14.17/linaro/configs/big-LITTLE-IKS.conf 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/linaro/configs/big-LITTLE-IKS.conf 2014-09-09 10:13:52.344982633 +0200
@@ -0,0 +1,5 @@
+CONFIG_BIG_LITTLE=y
+CONFIG_BL_SWITCHER=y
+CONFIG_ARM_DT_BL_CPUFREQ=y
+CONFIG_ARM_VEXPRESS_BL_CPUFREQ=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
-diff -Nur linux-3.14.15/linaro/configs/debug.conf linux-linaro-stable-mx6/linaro/configs/debug.conf
---- linux-3.14.15/linaro/configs/debug.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/debug.conf 2014-08-20 19:24:07.902907083 +0200
+diff -Nur linux-3.14.17/linaro/configs/debug.conf linux-imx6-3.14/linaro/configs/debug.conf
+--- linux-3.14.17/linaro/configs/debug.conf 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/linaro/configs/debug.conf 2014-09-09 10:13:52.344982633 +0200
@@ -0,0 +1 @@
+CONFIG_PROVE_LOCKING=y
-diff -Nur linux-3.14.15/linaro/configs/distribution.conf linux-linaro-stable-mx6/linaro/configs/distribution.conf
---- linux-3.14.15/linaro/configs/distribution.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/distribution.conf 2014-08-20 19:31:55.180907865 +0200
+diff -Nur linux-3.14.17/linaro/configs/distribution.conf linux-imx6-3.14/linaro/configs/distribution.conf
+--- linux-3.14.17/linaro/configs/distribution.conf 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/linaro/configs/distribution.conf 2014-09-09 10:13:52.344982633 +0200
@@ -0,0 +1,49 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_CGROUPS=y
@@ -228219,9 +231627,9 @@ diff -Nur linux-3.14.15/linaro/configs/distribution.conf linux-linaro-stable-mx6
+CONFIG_HUGETLB_PAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
-diff -Nur linux-3.14.15/linaro/configs/highbank.conf linux-linaro-stable-mx6/linaro/configs/highbank.conf
---- linux-3.14.15/linaro/configs/highbank.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/highbank.conf 2014-08-20 19:24:07.902907083 +0200
+diff -Nur linux-3.14.17/linaro/configs/highbank.conf linux-imx6-3.14/linaro/configs/highbank.conf
+--- linux-3.14.17/linaro/configs/highbank.conf 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/linaro/configs/highbank.conf 2014-09-09 10:13:52.344982633 +0200
@@ -0,0 +1,40 @@
+CONFIG_EXPERIMENTAL=y
+CONFIG_NO_HZ=y
@@ -228263,9 +231671,9 @@ diff -Nur linux-3.14.15/linaro/configs/highbank.conf linux-linaro-stable-mx6/lin
+CONFIG_RTC_DRV_PL031=y
+CONFIG_DMADEVICES=y
+CONFIG_PL330_DMA=y
-diff -Nur linux-3.14.15/linaro/configs/kvm-guest.conf linux-linaro-stable-mx6/linaro/configs/kvm-guest.conf
---- linux-3.14.15/linaro/configs/kvm-guest.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/kvm-guest.conf 2014-08-20 19:24:07.906907101 +0200
+diff -Nur linux-3.14.17/linaro/configs/kvm-guest.conf linux-imx6-3.14/linaro/configs/kvm-guest.conf
+--- linux-3.14.17/linaro/configs/kvm-guest.conf 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/linaro/configs/kvm-guest.conf 2014-09-09 10:13:52.344982633 +0200
@@ -0,0 +1,11 @@
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_VIRTIO_BLK=y
@@ -228278,9 +231686,9 @@ diff -Nur linux-3.14.15/linaro/configs/kvm-guest.conf linux-linaro-stable-mx6/li
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+CONFIG_VIRTUALIZATION=y
+# CONFIG_THUMB2_KERNEL is not set
-diff -Nur linux-3.14.15/linaro/configs/kvm-host.conf linux-linaro-stable-mx6/linaro/configs/kvm-host.conf
---- linux-3.14.15/linaro/configs/kvm-host.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/kvm-host.conf 2014-08-20 19:24:07.906907101 +0200
+diff -Nur linux-3.14.17/linaro/configs/kvm-host.conf linux-imx6-3.14/linaro/configs/kvm-host.conf
+--- linux-3.14.17/linaro/configs/kvm-host.conf 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/linaro/configs/kvm-host.conf 2014-09-09 10:13:52.344982633 +0200
@@ -0,0 +1,11 @@
+CONFIG_VIRTUALIZATION=y
+CONFIG_ARM_LPAE=y
@@ -228293,9 +231701,9 @@ diff -Nur linux-3.14.15/linaro/configs/kvm-host.conf linux-linaro-stable-mx6/lin
+CONFIG_KVM_MMIO=y
+CONFIG_KVM=y
+CONFIG_BLK_DEV_NBD=m
-diff -Nur linux-3.14.15/linaro/configs/linaro-base.conf linux-linaro-stable-mx6/linaro/configs/linaro-base.conf
---- linux-3.14.15/linaro/configs/linaro-base.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/linaro-base.conf 2014-08-20 19:31:55.180907865 +0200
+diff -Nur linux-3.14.17/linaro/configs/linaro-base.conf linux-imx6-3.14/linaro/configs/linaro-base.conf
+--- linux-3.14.17/linaro/configs/linaro-base.conf 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/linaro/configs/linaro-base.conf 2014-09-09 10:13:52.344982633 +0200
@@ -0,0 +1,115 @@
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
@@ -228412,9 +231820,9 @@ diff -Nur linux-3.14.15/linaro/configs/linaro-base.conf linux-linaro-stable-mx6/
+CONFIG_LSM_MMAP_MIN_ADDR=4096
+CONFIG_SECURITY_SELINUX=y
+CONFIG_EXT4_FS_SECURITY=y
-diff -Nur linux-3.14.15/linaro/configs/omap4.conf linux-linaro-stable-mx6/linaro/configs/omap4.conf
---- linux-3.14.15/linaro/configs/omap4.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/omap4.conf 2014-08-20 19:31:55.180907865 +0200
+diff -Nur linux-3.14.17/linaro/configs/omap4.conf linux-imx6-3.14/linaro/configs/omap4.conf
+--- linux-3.14.17/linaro/configs/omap4.conf 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/linaro/configs/omap4.conf 2014-09-09 10:13:52.344982633 +0200
@@ -0,0 +1,196 @@
+CONFIG_EXPERT=y
+CONFIG_KPROBES=y
@@ -228612,17 +232020,17 @@ diff -Nur linux-3.14.15/linaro/configs/omap4.conf linux-linaro-stable-mx6/linaro
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_LIBCRC32C=y
+# CONFIG_CPU_FREQ is not set
-diff -Nur linux-3.14.15/linaro/configs/preempt-rt.conf linux-linaro-stable-mx6/linaro/configs/preempt-rt.conf
---- linux-3.14.15/linaro/configs/preempt-rt.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/preempt-rt.conf 2014-08-20 19:31:55.180907865 +0200
+diff -Nur linux-3.14.17/linaro/configs/preempt-rt.conf linux-imx6-3.14/linaro/configs/preempt-rt.conf
+--- linux-3.14.17/linaro/configs/preempt-rt.conf 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/linaro/configs/preempt-rt.conf 2014-09-09 10:13:52.344982633 +0200
@@ -0,0 +1,4 @@
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_RT_FULL=y
+CONFIG_SLUB=y
+# CONFIG_CPU_FREQ is not set
-diff -Nur linux-3.14.15/linaro/configs/vexpress64.conf linux-linaro-stable-mx6/linaro/configs/vexpress64.conf
---- linux-3.14.15/linaro/configs/vexpress64.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/vexpress64.conf 2014-08-20 19:31:55.184907882 +0200
+diff -Nur linux-3.14.17/linaro/configs/vexpress64.conf linux-imx6-3.14/linaro/configs/vexpress64.conf
+--- linux-3.14.17/linaro/configs/vexpress64.conf 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/linaro/configs/vexpress64.conf 2014-09-09 10:13:52.344982633 +0200
@@ -0,0 +1,56 @@
+CONFIG_ARCH_VEXPRESS=y
+CONFIG_SMP=y
@@ -228680,9 +232088,9 @@ diff -Nur linux-3.14.15/linaro/configs/vexpress64.conf linux-linaro-stable-mx6/l
+CONFIG_ARM_DT_BL_CPUFREQ=y
+CONFIG_ARM64_CPUIDLE=y
+CONFIG_ARM64_CRYPTO=y
-diff -Nur linux-3.14.15/linaro/configs/vexpress.conf linux-linaro-stable-mx6/linaro/configs/vexpress.conf
---- linux-3.14.15/linaro/configs/vexpress.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/vexpress.conf 2014-08-20 19:31:55.184907882 +0200
+diff -Nur linux-3.14.17/linaro/configs/vexpress.conf linux-imx6-3.14/linaro/configs/vexpress.conf
+--- linux-3.14.17/linaro/configs/vexpress.conf 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/linaro/configs/vexpress.conf 2014-09-09 10:13:52.344982633 +0200
@@ -0,0 +1,64 @@
+CONFIG_ARCH_VEXPRESS=y
+CONFIG_ARCH_VEXPRESS_CA9X4=y
@@ -228748,14 +232156,14 @@ diff -Nur linux-3.14.15/linaro/configs/vexpress.conf linux-linaro-stable-mx6/lin
+CONFIG_VIRTIO_BLK=y
+CONFIG_VIRTIO_MMIO=y
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
-diff -Nur linux-3.14.15/linaro/configs/vexpress-tuning.conf linux-linaro-stable-mx6/linaro/configs/vexpress-tuning.conf
---- linux-3.14.15/linaro/configs/vexpress-tuning.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/vexpress-tuning.conf 2014-08-20 19:24:07.906907101 +0200
+diff -Nur linux-3.14.17/linaro/configs/vexpress-tuning.conf linux-imx6-3.14/linaro/configs/vexpress-tuning.conf
+--- linux-3.14.17/linaro/configs/vexpress-tuning.conf 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/linaro/configs/vexpress-tuning.conf 2014-09-09 10:13:52.344982633 +0200
@@ -0,0 +1 @@
+# CONFIG_PROVE_LOCKING is not set
-diff -Nur linux-3.14.15/linaro/configs/xen.conf linux-linaro-stable-mx6/linaro/configs/xen.conf
---- linux-3.14.15/linaro/configs/xen.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/linaro/configs/xen.conf 2014-08-20 19:24:07.906907101 +0200
+diff -Nur linux-3.14.17/linaro/configs/xen.conf linux-imx6-3.14/linaro/configs/xen.conf
+--- linux-3.14.17/linaro/configs/xen.conf 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/linaro/configs/xen.conf 2014-09-09 10:13:52.344982633 +0200
@@ -0,0 +1,7 @@
+CONFIG_XEN=y
+CONFIG_XEN_NETDEV_FRONTEND=y
@@ -228764,9 +232172,9 @@ diff -Nur linux-3.14.15/linaro/configs/xen.conf linux-linaro-stable-mx6/linaro/c
+CONFIG_XEN_BLKDEV_BACKEND=y
+CONFIG_XENFS=y
+CONFIG_XEN_COMPAT_XENFS=y
-diff -Nur linux-3.14.15/MAINTAINERS linux-linaro-stable-mx6/MAINTAINERS
---- linux-3.14.15/MAINTAINERS 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/MAINTAINERS 2014-08-20 19:31:39.704841430 +0200
+diff -Nur linux-3.14.17/MAINTAINERS linux-imx6-3.14/MAINTAINERS
+--- linux-3.14.17/MAINTAINERS 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/MAINTAINERS 2014-09-09 10:13:47.124940070 +0200
@@ -5511,6 +5511,14 @@
F: drivers/net/macvlan.c
F: include/linux/if_macvlan.h
@@ -228782,9 +232190,9 @@ diff -Nur linux-3.14.15/MAINTAINERS linux-linaro-stable-mx6/MAINTAINERS
MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7
M: Michael Kerrisk <mtk.manpages@gmail.com>
W: http://www.kernel.org/doc/man-pages
-diff -Nur linux-3.14.15/Makefile linux-linaro-stable-mx6/Makefile
---- linux-3.14.15/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/Makefile 2014-08-20 22:02:59.718382139 +0200
+diff -Nur linux-3.14.17/Makefile linux-imx6-3.14/Makefile
+--- linux-3.14.17/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/Makefile 2014-09-09 10:20:45.272103604 +0200
@@ -639,8 +639,6 @@
endif
endif
@@ -228794,9 +232202,369 @@ diff -Nur linux-3.14.15/Makefile linux-linaro-stable-mx6/Makefile
ifdef CONFIG_DEBUG_INFO
KBUILD_CFLAGS += -g
KBUILD_AFLAGS += -Wa,--gdwarf-2
-diff -Nur linux-3.14.15/mm/hugetlb.c linux-linaro-stable-mx6/mm/hugetlb.c
---- linux-3.14.15/mm/hugetlb.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/mm/hugetlb.c 2014-08-20 19:31:55.188907899 +0200
+diff -Nur linux-3.14.17/mm/cma.c linux-imx6-3.14/mm/cma.c
+--- linux-3.14.17/mm/cma.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/mm/cma.c 2014-09-09 10:13:52.348982665 +0200
+@@ -0,0 +1,356 @@
++/*
++ * Contiguous Memory Allocator
++ *
++ * Copyright (c) 2010-2011 by Samsung Electronics.
++ * Copyright IBM Corporation, 2013
++ * Copyright LG Electronics Inc., 2014
++ * Written by:
++ * Marek Szyprowski <m.szyprowski@samsung.com>
++ * Michal Nazarewicz <mina86@mina86.com>
++ * Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
++ * Joonsoo Kim <iamjoonsoo.kim@lge.com>
++ *
++ * 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; either version 2 of the
++ * License or (at your optional) any later version of the license.
++ */
++
++#define pr_fmt(fmt) "cma: " fmt
++
++#ifdef CONFIG_CMA_DEBUG
++#ifndef DEBUG
++# define DEBUG
++#endif
++#endif
++
++#include <linux/memblock.h>
++#include <linux/err.h>
++#include <linux/mm.h>
++#include <linux/mutex.h>
++#include <linux/sizes.h>
++#include <linux/slab.h>
++#include <linux/log2.h>
++#include <linux/cma.h>
++#include <linux/highmem.h>
++
++struct cma {
++ unsigned long base_pfn;
++ unsigned long count;
++ unsigned long *bitmap;
++ unsigned int order_per_bit; /* Order of pages represented by one bit */
++ struct mutex lock;
++};
++
++static struct cma cma_areas[MAX_CMA_AREAS];
++static unsigned cma_area_count;
++static DEFINE_MUTEX(cma_mutex);
++
++phys_addr_t cma_get_base(struct cma *cma)
++{
++ return PFN_PHYS(cma->base_pfn);
++}
++
++unsigned long cma_get_size(struct cma *cma)
++{
++ return cma->count << PAGE_SHIFT;
++}
++
++static unsigned long cma_bitmap_aligned_mask(struct cma *cma, int align_order)
++{
++ return (1UL << (align_order >> cma->order_per_bit)) - 1;
++}
++
++static unsigned long cma_bitmap_maxno(struct cma *cma)
++{
++ return cma->count >> cma->order_per_bit;
++}
++
++static unsigned long cma_bitmap_pages_to_bits(struct cma *cma,
++ unsigned long pages)
++{
++ return ALIGN(pages, 1UL << cma->order_per_bit) >> cma->order_per_bit;
++}
++
++static void cma_clear_bitmap(struct cma *cma, unsigned long pfn, int count)
++{
++ unsigned long bitmap_no, bitmap_count;
++
++ bitmap_no = (pfn - cma->base_pfn) >> cma->order_per_bit;
++ bitmap_count = cma_bitmap_pages_to_bits(cma, count);
++
++ mutex_lock(&cma->lock);
++ bitmap_clear(cma->bitmap, bitmap_no, bitmap_count);
++ mutex_unlock(&cma->lock);
++}
++
++static int __init cma_activate_area(struct cma *cma)
++{
++ int bitmap_size = BITS_TO_LONGS(cma_bitmap_maxno(cma)) * sizeof(long);
++ unsigned long base_pfn = cma->base_pfn, pfn = base_pfn;
++ unsigned i = cma->count >> pageblock_order;
++ struct zone *zone;
++
++ cma->bitmap = kzalloc(bitmap_size, GFP_KERNEL);
++
++ if (!cma->bitmap)
++ return -ENOMEM;
++
++ WARN_ON_ONCE(!pfn_valid(pfn));
++ zone = page_zone(pfn_to_page(pfn));
++
++ do {
++ unsigned j;
++
++ base_pfn = pfn;
++ for (j = pageblock_nr_pages; j; --j, pfn++) {
++ WARN_ON_ONCE(!pfn_valid(pfn));
++ /*
++ * alloc_contig_range requires the pfn range
++ * specified to be in the same zone. Make this
++ * simple by forcing the entire CMA resv range
++ * to be in the same zone.
++ */
++ if (page_zone(pfn_to_page(pfn)) != zone)
++ goto err;
++ }
++ init_cma_reserved_pageblock(pfn_to_page(base_pfn));
++ } while (--i);
++
++ mutex_init(&cma->lock);
++ return 0;
++
++err:
++ kfree(cma->bitmap);
++ return -EINVAL;
++}
++
++static int __init cma_init_reserved_areas(void)
++{
++ int i;
++
++ for (i = 0; i < cma_area_count; i++) {
++ int ret = cma_activate_area(&cma_areas[i]);
++
++ if (ret)
++ return ret;
++ }
++
++ return 0;
++}
++core_initcall(cma_init_reserved_areas);
++
++/**
++ * cma_declare_contiguous() - reserve custom contiguous area
++ * @base: Base address of the reserved area optional, use 0 for any
++ * @size: Size of the reserved area (in bytes),
++ * @limit: End address of the reserved memory (optional, 0 for any).
++ * @alignment: Alignment for the CMA area, should be power of 2 or zero
++ * @order_per_bit: Order of pages represented by one bit on bitmap.
++ * @fixed: hint about where to place the reserved area
++ * @res_cma: Pointer to store the created cma region.
++ *
++ * This function reserves memory from early allocator. It should be
++ * called by arch specific code once the early allocator (memblock or bootmem)
++ * has been activated and all other subsystems have already allocated/reserved
++ * memory. This function allows to create custom reserved areas.
++ *
++ * If @fixed is true, reserve contiguous area at exactly @base. If false,
++ * reserve in range from @base to @limit.
++ */
++int __init cma_declare_contiguous(phys_addr_t base,
++ phys_addr_t size, phys_addr_t limit,
++ phys_addr_t alignment, unsigned int order_per_bit,
++ bool fixed, struct cma **res_cma)
++{
++ struct cma *cma;
++ phys_addr_t memblock_end = memblock_end_of_DRAM();
++ phys_addr_t highmem_start = __pa(high_memory);
++ int ret = 0;
++
++ pr_debug("%s(size %lx, base %08lx, limit %08lx alignment %08lx)\n",
++ __func__, (unsigned long)size, (unsigned long)base,
++ (unsigned long)limit, (unsigned long)alignment);
++
++ if (cma_area_count == ARRAY_SIZE(cma_areas)) {
++ pr_err("Not enough slots for CMA reserved regions!\n");
++ return -ENOSPC;
++ }
++
++ if (!size)
++ return -EINVAL;
++
++ if (alignment && !is_power_of_2(alignment))
++ return -EINVAL;
++
++ /*
++ * Sanitise input arguments.
++ * Pages both ends in CMA area could be merged into adjacent unmovable
++ * migratetype page by page allocator's buddy algorithm. In the case,
++ * you couldn't get a contiguous memory, which is not what we want.
++ */
++ alignment = max(alignment,
++ (phys_addr_t)PAGE_SIZE << max(MAX_ORDER - 1, pageblock_order));
++ base = ALIGN(base, alignment);
++ size = ALIGN(size, alignment);
++ limit &= ~(alignment - 1);
++
++ /* size should be aligned with order_per_bit */
++ if (!IS_ALIGNED(size >> PAGE_SHIFT, 1 << order_per_bit))
++ return -EINVAL;
++
++ /*
++ * adjust limit to avoid crossing low/high memory boundary for
++ * automatically allocated regions
++ */
++ if (((limit == 0 || limit > memblock_end) &&
++ (memblock_end - size < highmem_start &&
++ memblock_end > highmem_start)) ||
++ (!fixed && limit > highmem_start && limit - size < highmem_start)) {
++ limit = highmem_start;
++ }
++
++ if (fixed && base < highmem_start && base+size > highmem_start) {
++ ret = -EINVAL;
++ pr_err("Region at %08lx defined on low/high memory boundary (%08lx)\n",
++ (unsigned long)base, (unsigned long)highmem_start);
++ goto err;
++ }
++
++ /* Reserve memory */
++ if (base && fixed) {
++ if (memblock_is_region_reserved(base, size) ||
++ memblock_reserve(base, size) < 0) {
++ ret = -EBUSY;
++ goto err;
++ }
++ } else {
++ phys_addr_t addr = memblock_alloc_range(size, alignment, base,
++ limit);
++ if (!addr) {
++ ret = -ENOMEM;
++ goto err;
++ } else {
++ base = addr;
++ }
++ }
++
++ /*
++ * Each reserved area must be initialised later, when more kernel
++ * subsystems (like slab allocator) are available.
++ */
++ cma = &cma_areas[cma_area_count];
++ cma->base_pfn = PFN_DOWN(base);
++ cma->count = size >> PAGE_SHIFT;
++ cma->order_per_bit = order_per_bit;
++ *res_cma = cma;
++ cma_area_count++;
++
++ pr_info("CMA: reserved %ld MiB at %08lx\n", (unsigned long)size / SZ_1M,
++ (unsigned long)base);
++ return 0;
++
++err:
++ pr_err("CMA: failed to reserve %ld MiB\n", (unsigned long)size / SZ_1M);
++ return ret;
++}
++
++/**
++ * cma_alloc() - allocate pages from contiguous area
++ * @cma: Contiguous memory region for which the allocation is performed.
++ * @count: Requested number of pages.
++ * @align: Requested alignment of pages (in PAGE_SIZE order).
++ *
++ * This function allocates part of contiguous memory on specific
++ * contiguous memory area.
++ */
++struct page *cma_alloc(struct cma *cma, int count, unsigned int align)
++{
++ unsigned long mask, pfn, start = 0;
++ unsigned long bitmap_maxno, bitmap_no, bitmap_count;
++ struct page *page = NULL;
++ int ret;
++
++ if (!cma || !cma->count)
++ return NULL;
++
++ pr_debug("%s(cma %p, count %d, align %d)\n", __func__, (void *)cma,
++ count, align);
++
++ if (!count)
++ return NULL;
++
++ mask = cma_bitmap_aligned_mask(cma, align);
++ bitmap_maxno = cma_bitmap_maxno(cma);
++ bitmap_count = cma_bitmap_pages_to_bits(cma, count);
++
++ for (;;) {
++ mutex_lock(&cma->lock);
++ bitmap_no = bitmap_find_next_zero_area(cma->bitmap,
++ bitmap_maxno, start, bitmap_count, mask);
++ if (bitmap_no >= bitmap_maxno) {
++ mutex_unlock(&cma->lock);
++ break;
++ }
++ bitmap_set(cma->bitmap, bitmap_no, bitmap_count);
++ /*
++ * It's safe to drop the lock here. We've marked this region for
++ * our exclusive use. If the migration fails we will take the
++ * lock again and unmark it.
++ */
++ mutex_unlock(&cma->lock);
++
++ pfn = cma->base_pfn + (bitmap_no << cma->order_per_bit);
++ mutex_lock(&cma_mutex);
++ ret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA);
++ mutex_unlock(&cma_mutex);
++ if (ret == 0) {
++ page = pfn_to_page(pfn);
++ break;
++ }
++
++ cma_clear_bitmap(cma, pfn, count);
++ if (ret != -EBUSY)
++ break;
++
++ pr_debug("%s(): memory range at %p is busy, retrying\n",
++ __func__, pfn_to_page(pfn));
++ /* try again with a bit different memory target */
++ start = bitmap_no + mask + 1;
++ }
++
++ pr_debug("%s(): returned %p\n", __func__, page);
++ return page;
++}
++
++/**
++ * cma_release() - release allocated pages
++ * @cma: Contiguous memory region for which the allocation is performed.
++ * @pages: Allocated pages.
++ * @count: Number of allocated pages.
++ *
++ * This function releases memory allocated by alloc_cma().
++ * It returns false when provided pages do not belong to contiguous area and
++ * true otherwise.
++ */
++bool cma_release(struct cma *cma, struct page *pages, int count)
++{
++ unsigned long pfn;
++
++ if (!cma || !pages)
++ return false;
++
++ pr_debug("%s(page %p)\n", __func__, (void *)pages);
++
++ pfn = page_to_pfn(pages);
++
++ if (pfn < cma->base_pfn || pfn >= cma->base_pfn + cma->count)
++ return false;
++
++ VM_BUG_ON(pfn + count > cma->base_pfn + cma->count);
++
++ free_contig_range(pfn, count);
++ cma_clear_bitmap(cma, pfn, count);
++
++ return true;
++}
+diff -Nur linux-3.14.17/mm/hugetlb.c linux-imx6-3.14/mm/hugetlb.c
+--- linux-3.14.17/mm/hugetlb.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/mm/hugetlb.c 2014-09-09 10:13:52.348982665 +0200
@@ -2422,7 +2422,6 @@
} else {
if (cow)
@@ -228805,9 +232573,153 @@ diff -Nur linux-3.14.15/mm/hugetlb.c linux-linaro-stable-mx6/mm/hugetlb.c
ptepage = pte_page(entry);
get_page(ptepage);
page_dup_rmap(ptepage);
-diff -Nur linux-3.14.15/mm/slab_common.c linux-linaro-stable-mx6/mm/slab_common.c
---- linux-3.14.15/mm/slab_common.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/mm/slab_common.c 2014-08-20 19:31:55.220908036 +0200
+diff -Nur linux-3.14.17/mm/Kconfig linux-imx6-3.14/mm/Kconfig
+--- linux-3.14.17/mm/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/mm/Kconfig 2014-09-09 10:13:52.344982633 +0200
+@@ -514,6 +514,17 @@
+ processing calls such as dma_alloc_from_contiguous().
+ This option does not affect warning and error messages.
+
++config CMA_AREAS
++ int "Maximum count of the CMA areas"
++ depends on CMA
++ default 7
++ help
++ CMA allows to create CMA areas for particular purpose, mainly,
++ used as device private area. This parameter sets the maximum
++ number of CMA area in the system.
++
++ If unsure, leave the default value "7".
++
+ config ZBUD
+ tristate
+ default n
+diff -Nur linux-3.14.17/mm/Makefile linux-imx6-3.14/mm/Makefile
+--- linux-3.14.17/mm/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/mm/Makefile 2014-09-09 10:13:52.344982633 +0200
+@@ -61,3 +61,4 @@
+ obj-$(CONFIG_MEMORY_ISOLATION) += page_isolation.o
+ obj-$(CONFIG_ZBUD) += zbud.o
+ obj-$(CONFIG_ZSMALLOC) += zsmalloc.o
++obj-$(CONFIG_CMA) += cma.o
+diff -Nur linux-3.14.17/mm/memblock.c linux-imx6-3.14/mm/memblock.c
+--- linux-3.14.17/mm/memblock.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/mm/memblock.c 2014-09-09 10:13:52.352982698 +0200
+@@ -975,22 +975,35 @@
+ }
+ #endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */
+
+-static phys_addr_t __init memblock_alloc_base_nid(phys_addr_t size,
+- phys_addr_t align, phys_addr_t max_addr,
+- int nid)
++static phys_addr_t __init memblock_alloc_range_nid(phys_addr_t size,
++ phys_addr_t align, phys_addr_t start,
++ phys_addr_t end, int nid)
+ {
+ phys_addr_t found;
+
+ if (!align)
+ align = SMP_CACHE_BYTES;
+
+- found = memblock_find_in_range_node(size, align, 0, max_addr, nid);
++ found = memblock_find_in_range_node(size, align, start, end, nid);
+ if (found && !memblock_reserve(found, size))
+ return found;
+
+ return 0;
+ }
+
++phys_addr_t __init memblock_alloc_range(phys_addr_t size, phys_addr_t align,
++ phys_addr_t start, phys_addr_t end)
++{
++ return memblock_alloc_range_nid(size, align, start, end, NUMA_NO_NODE);
++}
++
++static phys_addr_t __init memblock_alloc_base_nid(phys_addr_t size,
++ phys_addr_t align, phys_addr_t max_addr,
++ int nid)
++{
++ return memblock_alloc_range_nid(size, align, 0, max_addr, nid);
++}
++
+ phys_addr_t __init memblock_alloc_nid(phys_addr_t size, phys_addr_t align, int nid)
+ {
+ return memblock_alloc_base_nid(size, align, MEMBLOCK_ALLOC_ACCESSIBLE, nid);
+diff -Nur linux-3.14.17/mm/memcontrol.c linux-imx6-3.14/mm/memcontrol.c
+--- linux-3.14.17/mm/memcontrol.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/mm/memcontrol.c 2014-09-09 10:13:52.352982698 +0200
+@@ -5670,12 +5670,8 @@
+ {
+ struct mem_cgroup_eventfd_list *ev;
+
+- spin_lock(&memcg_oom_lock);
+-
+ list_for_each_entry(ev, &memcg->oom_notify, list)
+ eventfd_signal(ev->eventfd, 1);
+-
+- spin_unlock(&memcg_oom_lock);
+ return 0;
+ }
+
+diff -Nur linux-3.14.17/mm/page_alloc.c linux-imx6-3.14/mm/page_alloc.c
+--- linux-3.14.17/mm/page_alloc.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/mm/page_alloc.c 2014-09-09 10:13:52.360982764 +0200
+@@ -2434,7 +2434,7 @@
+ gfp_to_alloc_flags(gfp_t gfp_mask)
+ {
+ int alloc_flags = ALLOC_WMARK_MIN | ALLOC_CPUSET;
+- const bool atomic = !(gfp_mask & (__GFP_WAIT | __GFP_NO_KSWAPD));
++ const gfp_t wait = gfp_mask & __GFP_WAIT;
+
+ /* __GFP_HIGH is assumed to be the same as ALLOC_HIGH to save a branch. */
+ BUILD_BUG_ON(__GFP_HIGH != (__force gfp_t) ALLOC_HIGH);
+@@ -2443,20 +2443,20 @@
+ * The caller may dip into page reserves a bit more if the caller
+ * cannot run direct reclaim, or if the caller has realtime scheduling
+ * policy or is asking for __GFP_HIGH memory. GFP_ATOMIC requests will
+- * set both ALLOC_HARDER (atomic == true) and ALLOC_HIGH (__GFP_HIGH).
++ * set both ALLOC_HARDER (!wait) and ALLOC_HIGH (__GFP_HIGH).
+ */
+ alloc_flags |= (__force int) (gfp_mask & __GFP_HIGH);
+
+- if (atomic) {
++ if (!wait) {
+ /*
+- * Not worth trying to allocate harder for __GFP_NOMEMALLOC even
+- * if it can't schedule.
++ * Not worth trying to allocate harder for
++ * __GFP_NOMEMALLOC even if it can't schedule.
+ */
+- if (!(gfp_mask & __GFP_NOMEMALLOC))
++ if (!(gfp_mask & __GFP_NOMEMALLOC))
+ alloc_flags |= ALLOC_HARDER;
+ /*
+- * Ignore cpuset mems for GFP_ATOMIC rather than fail, see the
+- * comment for __cpuset_node_allowed_softwall().
++ * Ignore cpuset if GFP_ATOMIC (!wait) rather than fail alloc.
++ * See also cpuset_zone_allowed() comment in kernel/cpuset.c.
+ */
+ alloc_flags &= ~ALLOC_CPUSET;
+ } else if (unlikely(rt_task(current)) && !in_interrupt())
+diff -Nur linux-3.14.17/mm/page-writeback.c linux-imx6-3.14/mm/page-writeback.c
+--- linux-3.14.17/mm/page-writeback.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/mm/page-writeback.c 2014-09-09 10:13:52.356982731 +0200
+@@ -1324,9 +1324,9 @@
+ *bdi_thresh = bdi_dirty_limit(bdi, dirty_thresh);
+
+ if (bdi_bg_thresh)
+- *bdi_bg_thresh = dirty_thresh ? div_u64((u64)*bdi_thresh *
+- background_thresh,
+- dirty_thresh) : 0;
++ *bdi_bg_thresh = div_u64((u64)*bdi_thresh *
++ background_thresh,
++ dirty_thresh);
+
+ /*
+ * In order to avoid the stacked BDI deadlock we need
+diff -Nur linux-3.14.17/mm/slab_common.c linux-imx6-3.14/mm/slab_common.c
+--- linux-3.14.17/mm/slab_common.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/mm/slab_common.c 2014-09-09 10:13:52.364982796 +0200
@@ -56,7 +56,7 @@
continue;
}
@@ -228817,9 +232729,9 @@ diff -Nur linux-3.14.15/mm/slab_common.c linux-linaro-stable-mx6/mm/slab_common.
/*
* For simplicity, we won't check this in the list of memcg
* caches. We have control over memcg naming, and if there
-diff -Nur linux-3.14.15/net/atm/svc.c linux-linaro-stable-mx6/net/atm/svc.c
---- linux-3.14.15/net/atm/svc.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/net/atm/svc.c 2014-08-20 19:31:55.276908277 +0200
+diff -Nur linux-3.14.17/net/atm/svc.c linux-imx6-3.14/net/atm/svc.c
+--- linux-3.14.17/net/atm/svc.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/atm/svc.c 2014-09-09 10:13:52.376982894 +0200
@@ -263,17 +263,11 @@
goto out;
}
@@ -228840,9 +232752,65 @@ diff -Nur linux-3.14.15/net/atm/svc.c linux-linaro-stable-mx6/net/atm/svc.c
error = vcc_connect(sock, vcc->itf, vcc->vpi, vcc->vci);
if (!error)
sock->state = SS_CONNECTED;
-diff -Nur linux-3.14.15/net/core/dev.c linux-linaro-stable-mx6/net/core/dev.c
---- linux-3.14.15/net/core/dev.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/net/core/dev.c 2014-08-20 19:31:55.316908449 +0200
+diff -Nur linux-3.14.17/net/batman-adv/fragmentation.c linux-imx6-3.14/net/batman-adv/fragmentation.c
+--- linux-3.14.17/net/batman-adv/fragmentation.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/batman-adv/fragmentation.c 2014-09-09 10:13:52.380982927 +0200
+@@ -128,7 +128,6 @@
+ {
+ struct batadv_frag_table_entry *chain;
+ struct batadv_frag_list_entry *frag_entry_new = NULL, *frag_entry_curr;
+- struct batadv_frag_list_entry *frag_entry_last = NULL;
+ struct batadv_frag_packet *frag_packet;
+ uint8_t bucket;
+ uint16_t seqno, hdr_size = sizeof(struct batadv_frag_packet);
+@@ -181,14 +180,11 @@
+ ret = true;
+ goto out;
+ }
+-
+- /* store current entry because it could be the last in list */
+- frag_entry_last = frag_entry_curr;
+ }
+
+- /* Reached the end of the list, so insert after 'frag_entry_last'. */
+- if (likely(frag_entry_last)) {
+- hlist_add_after(&frag_entry_last->list, &frag_entry_new->list);
++ /* Reached the end of the list, so insert after 'frag_entry_curr'. */
++ if (likely(frag_entry_curr)) {
++ hlist_add_after(&frag_entry_curr->list, &frag_entry_new->list);
+ chain->size += skb->len - hdr_size;
+ chain->timestamp = jiffies;
+ ret = true;
+diff -Nur linux-3.14.17/net/compat.c linux-imx6-3.14/net/compat.c
+--- linux-3.14.17/net/compat.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/compat.c 2014-09-09 10:13:52.404983122 +0200
+@@ -85,7 +85,7 @@
+ {
+ int tot_len;
+
+- if (kern_msg->msg_name && kern_msg->msg_namelen) {
++ if (kern_msg->msg_namelen) {
+ if (mode == VERIFY_READ) {
+ int err = move_addr_to_kernel(kern_msg->msg_name,
+ kern_msg->msg_namelen,
+@@ -93,11 +93,10 @@
+ if (err < 0)
+ return err;
+ }
+- kern_msg->msg_name = kern_address;
+- } else {
++ if (kern_msg->msg_name)
++ kern_msg->msg_name = kern_address;
++ } else
+ kern_msg->msg_name = NULL;
+- kern_msg->msg_namelen = 0;
+- }
+
+ tot_len = iov_from_user_compat_to_kern(kern_iov,
+ (struct compat_iovec __user *)kern_msg->msg_iov,
+diff -Nur linux-3.14.17/net/core/dev.c linux-imx6-3.14/net/core/dev.c
+--- linux-3.14.17/net/core/dev.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/core/dev.c 2014-09-09 10:13:52.404983122 +0200
@@ -3453,7 +3453,7 @@
* @rx_handler: receive handler to register
* @rx_handler_data: data pointer that is used by rx handler
@@ -228852,9 +232820,45 @@ diff -Nur linux-3.14.15/net/core/dev.c linux-linaro-stable-mx6/net/core/dev.c
* called from __netif_receive_skb. A negative errno code is returned
* on a failure.
*
-diff -Nur linux-3.14.15/net/core/Makefile linux-linaro-stable-mx6/net/core/Makefile
---- linux-3.14.15/net/core/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/net/core/Makefile 2014-08-20 19:31:55.316908449 +0200
+diff -Nur linux-3.14.17/net/core/iovec.c linux-imx6-3.14/net/core/iovec.c
+--- linux-3.14.17/net/core/iovec.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/core/iovec.c 2014-09-09 10:13:52.404983122 +0200
+@@ -39,7 +39,7 @@
+ {
+ int size, ct, err;
+
+- if (m->msg_name && m->msg_namelen) {
++ if (m->msg_namelen) {
+ if (mode == VERIFY_READ) {
+ void __user *namep;
+ namep = (void __user __force *) m->msg_name;
+@@ -48,10 +48,10 @@
+ if (err < 0)
+ return err;
+ }
+- m->msg_name = address;
++ if (m->msg_name)
++ m->msg_name = address;
+ } else {
+ m->msg_name = NULL;
+- m->msg_namelen = 0;
+ }
+
+ size = m->msg_iovlen * sizeof(struct iovec);
+@@ -107,10 +107,6 @@
+ int memcpy_fromiovecend(unsigned char *kdata, const struct iovec *iov,
+ int offset, int len)
+ {
+- /* No data? Done! */
+- if (len == 0)
+- return 0;
+-
+ /* Skip over the finished iovecs */
+ while (offset >= iov->iov_len) {
+ offset -= iov->iov_len;
+diff -Nur linux-3.14.17/net/core/Makefile linux-imx6-3.14/net/core/Makefile
+--- linux-3.14.17/net/core/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/core/Makefile 2014-09-09 10:13:52.404983122 +0200
@@ -9,7 +9,7 @@
obj-y += dev.o ethtool.o dev_addr_lists.o dst.o netevent.o \
@@ -228864,9 +232868,9 @@ diff -Nur linux-3.14.15/net/core/Makefile linux-linaro-stable-mx6/net/core/Makef
obj-$(CONFIG_XFRM) += flow.o
obj-y += net-sysfs.o
-diff -Nur linux-3.14.15/net/core/rtnetlink.c linux-linaro-stable-mx6/net/core/rtnetlink.c
---- linux-3.14.15/net/core/rtnetlink.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/net/core/rtnetlink.c 2014-08-20 19:31:55.324908483 +0200
+diff -Nur linux-3.14.17/net/core/rtnetlink.c linux-imx6-3.14/net/core/rtnetlink.c
+--- linux-3.14.17/net/core/rtnetlink.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/core/rtnetlink.c 2014-09-09 10:13:52.408983154 +0200
@@ -1156,73 +1156,7 @@
return -EMSGSIZE;
}
@@ -229012,9 +233016,58 @@ diff -Nur linux-3.14.15/net/core/rtnetlink.c linux-linaro-stable-mx6/net/core/rt
struct net *rtnl_link_get_net(struct net *src_net, struct nlattr *tb[])
{
struct net *net;
-diff -Nur linux-3.14.15/net/core/tso.c linux-linaro-stable-mx6/net/core/tso.c
---- linux-3.14.15/net/core/tso.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/net/core/tso.c 2014-08-20 19:31:55.332908517 +0200
+diff -Nur linux-3.14.17/net/core/secure_seq.c linux-imx6-3.14/net/core/secure_seq.c
+--- linux-3.14.17/net/core/secure_seq.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/core/secure_seq.c 2014-09-09 10:13:52.408983154 +0200
+@@ -85,6 +85,31 @@
+ #endif
+
+ #ifdef CONFIG_INET
++__u32 secure_ip_id(__be32 daddr)
++{
++ u32 hash[MD5_DIGEST_WORDS];
++
++ net_secret_init();
++ hash[0] = (__force __u32) daddr;
++ hash[1] = net_secret[13];
++ hash[2] = net_secret[14];
++ hash[3] = net_secret[15];
++
++ md5_transform(hash, net_secret);
++
++ return hash[0];
++}
++
++__u32 secure_ipv6_id(const __be32 daddr[4])
++{
++ __u32 hash[4];
++
++ net_secret_init();
++ memcpy(hash, daddr, 16);
++ md5_transform(hash, net_secret);
++
++ return hash[0];
++}
+
+ __u32 secure_tcp_sequence_number(__be32 saddr, __be32 daddr,
+ __be16 sport, __be16 dport)
+diff -Nur linux-3.14.17/net/core/skbuff.c linux-imx6-3.14/net/core/skbuff.c
+--- linux-3.14.17/net/core/skbuff.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/core/skbuff.c 2014-09-09 10:13:52.408983154 +0200
+@@ -2968,9 +2968,9 @@
+ tail = nskb;
+
+ __copy_skb_header(nskb, head_skb);
++ nskb->mac_len = head_skb->mac_len;
+
+ skb_headers_offset_update(nskb, skb_headroom(nskb) - headroom);
+- skb_reset_mac_len(nskb);
+
+ skb_copy_from_linear_data_offset(head_skb, -tnl_hlen,
+ nskb->data - tnl_hlen,
+diff -Nur linux-3.14.17/net/core/tso.c linux-imx6-3.14/net/core/tso.c
+--- linux-3.14.17/net/core/tso.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/net/core/tso.c 2014-09-09 10:13:52.412983186 +0200
@@ -0,0 +1,72 @@
+#include <net/ip.h>
+#include <net/tso.h>
@@ -229088,9 +233141,9 @@ diff -Nur linux-3.14.15/net/core/tso.c linux-linaro-stable-mx6/net/core/tso.c
+ tso->next_frag_idx++;
+ }
+}
-diff -Nur linux-3.14.15/net/ieee802154/Kconfig linux-linaro-stable-mx6/net/ieee802154/Kconfig
---- linux-3.14.15/net/ieee802154/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/net/ieee802154/Kconfig 2014-08-20 19:31:55.344908570 +0200
+diff -Nur linux-3.14.17/net/ieee802154/Kconfig linux-imx6-3.14/net/ieee802154/Kconfig
+--- linux-3.14.17/net/ieee802154/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/ieee802154/Kconfig 2014-09-09 10:13:52.420983253 +0200
@@ -15,7 +15,7 @@
depends on IEEE802154 && IPV6
select 6LOWPAN_IPHC
@@ -229100,9 +233153,445 @@ diff -Nur linux-3.14.15/net/ieee802154/Kconfig linux-linaro-stable-mx6/net/ieee8
config 6LOWPAN_IPHC
tristate
-diff -Nur linux-3.14.15/net/mac80211/driver-ops.h linux-linaro-stable-mx6/net/mac80211/driver-ops.h
---- linux-3.14.15/net/mac80211/driver-ops.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/net/mac80211/driver-ops.h 2014-08-20 19:31:55.496909221 +0200
+diff -Nur linux-3.14.17/net/ipv4/igmp.c linux-imx6-3.14/net/ipv4/igmp.c
+--- linux-3.14.17/net/ipv4/igmp.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/ipv4/igmp.c 2014-09-09 10:13:52.428983317 +0200
+@@ -369,7 +369,7 @@
+ pip->saddr = fl4.saddr;
+ pip->protocol = IPPROTO_IGMP;
+ pip->tot_len = 0; /* filled in later */
+- ip_select_ident(skb, NULL);
++ ip_select_ident(skb, &rt->dst, NULL);
+ ((u8 *)&pip[1])[0] = IPOPT_RA;
+ ((u8 *)&pip[1])[1] = 4;
+ ((u8 *)&pip[1])[2] = 0;
+@@ -714,7 +714,7 @@
+ iph->daddr = dst;
+ iph->saddr = fl4.saddr;
+ iph->protocol = IPPROTO_IGMP;
+- ip_select_ident(skb, NULL);
++ ip_select_ident(skb, &rt->dst, NULL);
+ ((u8 *)&iph[1])[0] = IPOPT_RA;
+ ((u8 *)&iph[1])[1] = 4;
+ ((u8 *)&iph[1])[2] = 0;
+diff -Nur linux-3.14.17/net/ipv4/inetpeer.c linux-imx6-3.14/net/ipv4/inetpeer.c
+--- linux-3.14.17/net/ipv4/inetpeer.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/ipv4/inetpeer.c 2014-09-09 10:13:52.428983317 +0200
+@@ -26,7 +26,20 @@
+ * Theory of operations.
+ * We keep one entry for each peer IP address. The nodes contains long-living
+ * information about the peer which doesn't depend on routes.
++ * At this moment this information consists only of ID field for the next
++ * outgoing IP packet. This field is incremented with each packet as encoded
++ * in inet_getid() function (include/net/inetpeer.h).
++ * At the moment of writing this notes identifier of IP packets is generated
++ * to be unpredictable using this code only for packets subjected
++ * (actually or potentially) to defragmentation. I.e. DF packets less than
++ * PMTU in size when local fragmentation is disabled use a constant ID and do
++ * not use this code (see ip_select_ident() in include/net/ip.h).
+ *
++ * Route cache entries hold references to our nodes.
++ * New cache entries get references via lookup by destination IP address in
++ * the avl tree. The reference is grabbed only when it's needed i.e. only
++ * when we try to output IP packet which needs an unpredictable ID (see
++ * __ip_select_ident() in net/ipv4/route.c).
+ * Nodes are removed only when reference counter goes to 0.
+ * When it's happened the node may be removed when a sufficient amount of
+ * time has been passed since its last use. The less-recently-used entry can
+@@ -49,6 +62,7 @@
+ * refcnt: atomically against modifications on other CPU;
+ * usually under some other lock to prevent node disappearing
+ * daddr: unchangeable
++ * ip_id_count: atomic value (no lock needed)
+ */
+
+ static struct kmem_cache *peer_cachep __read_mostly;
+@@ -483,6 +497,10 @@
+ p->daddr = *daddr;
+ atomic_set(&p->refcnt, 1);
+ atomic_set(&p->rid, 0);
++ atomic_set(&p->ip_id_count,
++ (daddr->family == AF_INET) ?
++ secure_ip_id(daddr->addr.a4) :
++ secure_ipv6_id(daddr->addr.a6));
+ p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
+ p->rate_tokens = 0;
+ /* 60*HZ is arbitrary, but chosen enough high so that the first
+diff -Nur linux-3.14.17/net/ipv4/ipmr.c linux-imx6-3.14/net/ipv4/ipmr.c
+--- linux-3.14.17/net/ipv4/ipmr.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/ipv4/ipmr.c 2014-09-09 10:13:52.432983349 +0200
+@@ -1663,7 +1663,7 @@
+ iph->protocol = IPPROTO_IPIP;
+ iph->ihl = 5;
+ iph->tot_len = htons(skb->len);
+- ip_select_ident(skb, NULL);
++ ip_select_ident(skb, skb_dst(skb), NULL);
+ ip_send_check(iph);
+
+ memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
+diff -Nur linux-3.14.17/net/ipv4/ip_output.c linux-imx6-3.14/net/ipv4/ip_output.c
+--- linux-3.14.17/net/ipv4/ip_output.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/ipv4/ip_output.c 2014-09-09 10:13:52.428983317 +0200
+@@ -148,7 +148,7 @@
+ iph->daddr = (opt && opt->opt.srr ? opt->opt.faddr : daddr);
+ iph->saddr = saddr;
+ iph->protocol = sk->sk_protocol;
+- ip_select_ident(skb, sk);
++ ip_select_ident(skb, &rt->dst, sk);
+
+ if (opt && opt->opt.optlen) {
+ iph->ihl += opt->opt.optlen>>2;
+@@ -386,7 +386,8 @@
+ ip_options_build(skb, &inet_opt->opt, inet->inet_daddr, rt, 0);
+ }
+
+- ip_select_ident_segs(skb, sk, skb_shinfo(skb)->gso_segs ?: 1);
++ ip_select_ident_more(skb, &rt->dst, sk,
++ (skb_shinfo(skb)->gso_segs ?: 1) - 1);
+
+ skb->priority = sk->sk_priority;
+ skb->mark = sk->sk_mark;
+@@ -1337,7 +1338,7 @@
+ iph->ttl = ttl;
+ iph->protocol = sk->sk_protocol;
+ ip_copy_addrs(iph, fl4);
+- ip_select_ident(skb, sk);
++ ip_select_ident(skb, &rt->dst, sk);
+
+ if (opt) {
+ iph->ihl += opt->optlen>>2;
+diff -Nur linux-3.14.17/net/ipv4/ip_tunnel.c linux-imx6-3.14/net/ipv4/ip_tunnel.c
+--- linux-3.14.17/net/ipv4/ip_tunnel.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/ipv4/ip_tunnel.c 2014-09-09 10:13:52.428983317 +0200
+@@ -69,25 +69,23 @@
+ }
+
+ static void __tunnel_dst_set(struct ip_tunnel_dst *idst,
+- struct dst_entry *dst, __be32 saddr)
++ struct dst_entry *dst)
+ {
+ struct dst_entry *old_dst;
+
+ dst_clone(dst);
+ old_dst = xchg((__force struct dst_entry **)&idst->dst, dst);
+ dst_release(old_dst);
+- idst->saddr = saddr;
+ }
+
+-static void tunnel_dst_set(struct ip_tunnel *t,
+- struct dst_entry *dst, __be32 saddr)
++static void tunnel_dst_set(struct ip_tunnel *t, struct dst_entry *dst)
+ {
+- __tunnel_dst_set(this_cpu_ptr(t->dst_cache), dst, saddr);
++ __tunnel_dst_set(this_cpu_ptr(t->dst_cache), dst);
+ }
+
+ static void tunnel_dst_reset(struct ip_tunnel *t)
+ {
+- tunnel_dst_set(t, NULL, 0);
++ tunnel_dst_set(t, NULL);
+ }
+
+ void ip_tunnel_dst_reset_all(struct ip_tunnel *t)
+@@ -95,25 +93,20 @@
+ int i;
+
+ for_each_possible_cpu(i)
+- __tunnel_dst_set(per_cpu_ptr(t->dst_cache, i), NULL, 0);
++ __tunnel_dst_set(per_cpu_ptr(t->dst_cache, i), NULL);
+ }
+ EXPORT_SYMBOL(ip_tunnel_dst_reset_all);
+
+-static struct rtable *tunnel_rtable_get(struct ip_tunnel *t,
+- u32 cookie, __be32 *saddr)
++static struct rtable *tunnel_rtable_get(struct ip_tunnel *t, u32 cookie)
+ {
+- struct ip_tunnel_dst *idst;
+ struct dst_entry *dst;
+
+ rcu_read_lock();
+- idst = this_cpu_ptr(t->dst_cache);
+- dst = rcu_dereference(idst->dst);
++ dst = rcu_dereference(this_cpu_ptr(t->dst_cache)->dst);
+ if (dst && !atomic_inc_not_zero(&dst->__refcnt))
+ dst = NULL;
+ if (dst) {
+- if (!dst->obsolete || dst->ops->check(dst, cookie)) {
+- *saddr = idst->saddr;
+- } else {
++ if (dst->obsolete && dst->ops->check(dst, cookie) == NULL) {
+ tunnel_dst_reset(t);
+ dst_release(dst);
+ dst = NULL;
+@@ -369,7 +362,7 @@
+
+ if (!IS_ERR(rt)) {
+ tdev = rt->dst.dev;
+- tunnel_dst_set(tunnel, &rt->dst, fl4.saddr);
++ tunnel_dst_set(tunnel, &rt->dst);
+ ip_rt_put(rt);
+ }
+ if (dev->type != ARPHRD_ETHER)
+@@ -613,7 +606,7 @@
+ init_tunnel_flow(&fl4, protocol, dst, tnl_params->saddr,
+ tunnel->parms.o_key, RT_TOS(tos), tunnel->parms.link);
+
+- rt = connected ? tunnel_rtable_get(tunnel, 0, &fl4.saddr) : NULL;
++ rt = connected ? tunnel_rtable_get(tunnel, 0) : NULL;
+
+ if (!rt) {
+ rt = ip_route_output_key(tunnel->net, &fl4);
+@@ -623,7 +616,7 @@
+ goto tx_error;
+ }
+ if (connected)
+- tunnel_dst_set(tunnel, &rt->dst, fl4.saddr);
++ tunnel_dst_set(tunnel, &rt->dst);
+ }
+
+ if (rt->dst.dev == dev) {
+diff -Nur linux-3.14.17/net/ipv4/ip_tunnel_core.c linux-imx6-3.14/net/ipv4/ip_tunnel_core.c
+--- linux-3.14.17/net/ipv4/ip_tunnel_core.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/ipv4/ip_tunnel_core.c 2014-09-09 10:13:52.428983317 +0200
+@@ -74,7 +74,7 @@
+ iph->daddr = dst;
+ iph->saddr = src;
+ iph->ttl = ttl;
+- __ip_select_ident(iph, skb_shinfo(skb)->gso_segs ?: 1);
++ __ip_select_ident(iph, &rt->dst, (skb_shinfo(skb)->gso_segs ?: 1) - 1);
+
+ err = ip_local_out(skb);
+ if (unlikely(net_xmit_eval(err)))
+diff -Nur linux-3.14.17/net/ipv4/raw.c linux-imx6-3.14/net/ipv4/raw.c
+--- linux-3.14.17/net/ipv4/raw.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/ipv4/raw.c 2014-09-09 10:13:52.436983382 +0200
+@@ -389,7 +389,7 @@
+ iph->check = 0;
+ iph->tot_len = htons(length);
+ if (!iph->id)
+- ip_select_ident(skb, NULL);
++ ip_select_ident(skb, &rt->dst, NULL);
+
+ iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);
+ }
+diff -Nur linux-3.14.17/net/ipv4/route.c linux-imx6-3.14/net/ipv4/route.c
+--- linux-3.14.17/net/ipv4/route.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/ipv4/route.c 2014-09-09 10:13:52.436983382 +0200
+@@ -89,7 +89,6 @@
+ #include <linux/rcupdate.h>
+ #include <linux/times.h>
+ #include <linux/slab.h>
+-#include <linux/jhash.h>
+ #include <net/dst.h>
+ #include <net/net_namespace.h>
+ #include <net/protocol.h>
+@@ -463,45 +462,39 @@
+ return neigh_create(&arp_tbl, pkey, dev);
+ }
+
+-#define IP_IDENTS_SZ 2048u
+-struct ip_ident_bucket {
+- atomic_t id;
+- u32 stamp32;
+-};
+-
+-static struct ip_ident_bucket *ip_idents __read_mostly;
+-
+-/* In order to protect privacy, we add a perturbation to identifiers
+- * if one generator is seldom used. This makes hard for an attacker
+- * to infer how many packets were sent between two points in time.
++/*
++ * Peer allocation may fail only in serious out-of-memory conditions. However
++ * we still can generate some output.
++ * Random ID selection looks a bit dangerous because we have no chances to
++ * select ID being unique in a reasonable period of time.
++ * But broken packet identifier may be better than no packet at all.
+ */
+-u32 ip_idents_reserve(u32 hash, int segs)
++static void ip_select_fb_ident(struct iphdr *iph)
+ {
+- struct ip_ident_bucket *bucket = ip_idents + hash % IP_IDENTS_SZ;
+- u32 old = ACCESS_ONCE(bucket->stamp32);
+- u32 now = (u32)jiffies;
+- u32 delta = 0;
+-
+- if (old != now && cmpxchg(&bucket->stamp32, old, now) == old)
+- delta = prandom_u32_max(now - old);
++ static DEFINE_SPINLOCK(ip_fb_id_lock);
++ static u32 ip_fallback_id;
++ u32 salt;
+
+- return atomic_add_return(segs + delta, &bucket->id) - segs;
++ spin_lock_bh(&ip_fb_id_lock);
++ salt = secure_ip_id((__force __be32)ip_fallback_id ^ iph->daddr);
++ iph->id = htons(salt & 0xFFFF);
++ ip_fallback_id = salt;
++ spin_unlock_bh(&ip_fb_id_lock);
+ }
+-EXPORT_SYMBOL(ip_idents_reserve);
+
+-void __ip_select_ident(struct iphdr *iph, int segs)
++void __ip_select_ident(struct iphdr *iph, struct dst_entry *dst, int more)
+ {
+- static u32 ip_idents_hashrnd __read_mostly;
+- u32 hash, id;
++ struct net *net = dev_net(dst->dev);
++ struct inet_peer *peer;
+
+- net_get_random_once(&ip_idents_hashrnd, sizeof(ip_idents_hashrnd));
++ peer = inet_getpeer_v4(net->ipv4.peers, iph->daddr, 1);
++ if (peer) {
++ iph->id = htons(inet_getid(peer, more));
++ inet_putpeer(peer);
++ return;
++ }
+
+- hash = jhash_3words((__force u32)iph->daddr,
+- (__force u32)iph->saddr,
+- iph->protocol,
+- ip_idents_hashrnd);
+- id = ip_idents_reserve(hash, segs);
+- iph->id = htons(id);
++ ip_select_fb_ident(iph);
+ }
+ EXPORT_SYMBOL(__ip_select_ident);
+
+@@ -2725,12 +2718,6 @@
+ {
+ int rc = 0;
+
+- ip_idents = kmalloc(IP_IDENTS_SZ * sizeof(*ip_idents), GFP_KERNEL);
+- if (!ip_idents)
+- panic("IP: failed to allocate ip_idents\n");
+-
+- prandom_bytes(ip_idents, IP_IDENTS_SZ * sizeof(*ip_idents));
+-
+ #ifdef CONFIG_IP_ROUTE_CLASSID
+ ip_rt_acct = __alloc_percpu(256 * sizeof(struct ip_rt_acct), __alignof__(struct ip_rt_acct));
+ if (!ip_rt_acct)
+diff -Nur linux-3.14.17/net/ipv4/tcp_vegas.c linux-imx6-3.14/net/ipv4/tcp_vegas.c
+--- linux-3.14.17/net/ipv4/tcp_vegas.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/ipv4/tcp_vegas.c 2014-09-09 10:13:52.440983416 +0200
+@@ -219,8 +219,7 @@
+ * This is:
+ * (actual rate in segments) * baseRTT
+ */
+- target_cwnd = (u64)tp->snd_cwnd * vegas->baseRTT;
+- do_div(target_cwnd, rtt);
++ target_cwnd = tp->snd_cwnd * vegas->baseRTT / rtt;
+
+ /* Calculate the difference between the window we had,
+ * and the window we would like to have. This quantity
+diff -Nur linux-3.14.17/net/ipv4/tcp_veno.c linux-imx6-3.14/net/ipv4/tcp_veno.c
+--- linux-3.14.17/net/ipv4/tcp_veno.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/ipv4/tcp_veno.c 2014-09-09 10:13:52.440983416 +0200
+@@ -145,7 +145,7 @@
+
+ rtt = veno->minrtt;
+
+- target_cwnd = (u64)tp->snd_cwnd * veno->basertt;
++ target_cwnd = (tp->snd_cwnd * veno->basertt);
+ target_cwnd <<= V_PARAM_SHIFT;
+ do_div(target_cwnd, rtt);
+
+diff -Nur linux-3.14.17/net/ipv4/xfrm4_mode_tunnel.c linux-imx6-3.14/net/ipv4/xfrm4_mode_tunnel.c
+--- linux-3.14.17/net/ipv4/xfrm4_mode_tunnel.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/ipv4/xfrm4_mode_tunnel.c 2014-09-09 10:13:52.444983448 +0200
+@@ -117,12 +117,12 @@
+
+ top_iph->frag_off = (flags & XFRM_STATE_NOPMTUDISC) ?
+ 0 : (XFRM_MODE_SKB_CB(skb)->frag_off & htons(IP_DF));
++ ip_select_ident(skb, dst->child, NULL);
+
+ top_iph->ttl = ip4_dst_hoplimit(dst->child);
+
+ top_iph->saddr = x->props.saddr.a4;
+ top_iph->daddr = x->id.daddr.a4;
+- ip_select_ident(skb, NULL);
+
+ return 0;
+ }
+diff -Nur linux-3.14.17/net/ipv6/ip6_output.c linux-imx6-3.14/net/ipv6/ip6_output.c
+--- linux-3.14.17/net/ipv6/ip6_output.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/ipv6/ip6_output.c 2014-09-09 10:13:52.448983480 +0200
+@@ -537,20 +537,6 @@
+ skb_copy_secmark(to, from);
+ }
+
+-static void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt)
+-{
+- static u32 ip6_idents_hashrnd __read_mostly;
+- u32 hash, id;
+-
+- net_get_random_once(&ip6_idents_hashrnd, sizeof(ip6_idents_hashrnd));
+-
+- hash = __ipv6_addr_jhash(&rt->rt6i_dst.addr, ip6_idents_hashrnd);
+- hash = __ipv6_addr_jhash(&rt->rt6i_src.addr, hash);
+-
+- id = ip_idents_reserve(hash, 1);
+- fhdr->identification = htonl(id);
+-}
+-
+ int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
+ {
+ struct sk_buff *frag;
+diff -Nur linux-3.14.17/net/ipv6/output_core.c linux-imx6-3.14/net/ipv6/output_core.c
+--- linux-3.14.17/net/ipv6/output_core.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/ipv6/output_core.c 2014-09-09 10:13:52.452983512 +0200
+@@ -7,6 +7,29 @@
+ #include <net/ip6_fib.h>
+ #include <net/addrconf.h>
+
++void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt)
++{
++ static atomic_t ipv6_fragmentation_id;
++ int ident;
++
++#if IS_ENABLED(CONFIG_IPV6)
++ if (rt && !(rt->dst.flags & DST_NOPEER)) {
++ struct inet_peer *peer;
++ struct net *net;
++
++ net = dev_net(rt->dst.dev);
++ peer = inet_getpeer_v6(net->ipv6.peers, &rt->rt6i_dst.addr, 1);
++ if (peer) {
++ fhdr->identification = htonl(inet_getid(peer, 0));
++ inet_putpeer(peer);
++ return;
++ }
++ }
++#endif
++ ident = atomic_inc_return(&ipv6_fragmentation_id);
++ fhdr->identification = htonl(ident);
++}
++EXPORT_SYMBOL(ipv6_select_ident);
+
+ int ip6_find_1stfragopt(struct sk_buff *skb, u8 **nexthdr)
+ {
+diff -Nur linux-3.14.17/net/l2tp/l2tp_ppp.c linux-imx6-3.14/net/l2tp/l2tp_ppp.c
+--- linux-3.14.17/net/l2tp/l2tp_ppp.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/l2tp/l2tp_ppp.c 2014-09-09 10:13:52.468983643 +0200
+@@ -1368,7 +1368,7 @@
+ int err;
+
+ if (level != SOL_PPPOL2TP)
+- return -EINVAL;
++ return udp_prot.setsockopt(sk, level, optname, optval, optlen);
+
+ if (optlen < sizeof(int))
+ return -EINVAL;
+@@ -1494,7 +1494,7 @@
+ struct pppol2tp_session *ps;
+
+ if (level != SOL_PPPOL2TP)
+- return -EINVAL;
++ return udp_prot.getsockopt(sk, level, optname, optval, optlen);
+
+ if (get_user(len, optlen))
+ return -EFAULT;
+diff -Nur linux-3.14.17/net/mac80211/driver-ops.h linux-imx6-3.14/net/mac80211/driver-ops.h
+--- linux-3.14.17/net/mac80211/driver-ops.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/mac80211/driver-ops.h 2014-09-09 10:13:52.472983675 +0200
@@ -722,13 +722,19 @@
}
@@ -229124,9 +233613,9 @@ diff -Nur linux-3.14.15/net/mac80211/driver-ops.h linux-linaro-stable-mx6/net/ma
trace_drv_return_void(local);
}
-diff -Nur linux-3.14.15/net/mac80211/ibss.c linux-linaro-stable-mx6/net/mac80211/ibss.c
---- linux-3.14.15/net/mac80211/ibss.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/net/mac80211/ibss.c 2014-08-20 19:31:55.496909221 +0200
+diff -Nur linux-3.14.17/net/mac80211/ibss.c linux-imx6-3.14/net/mac80211/ibss.c
+--- linux-3.14.17/net/mac80211/ibss.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/mac80211/ibss.c 2014-09-09 10:13:52.472983675 +0200
@@ -386,7 +386,7 @@
presp->head_len, 0, GFP_KERNEL);
cfg80211_put_bss(local->hw.wiphy, bss);
@@ -229136,9 +233625,69 @@ diff -Nur linux-3.14.15/net/mac80211/ibss.c linux-linaro-stable-mx6/net/mac80211
}
static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
-diff -Nur linux-3.14.15/net/mac80211/util.c linux-linaro-stable-mx6/net/mac80211/util.c
---- linux-3.14.15/net/mac80211/util.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/net/mac80211/util.c 2014-08-20 19:31:55.524909342 +0200
+diff -Nur linux-3.14.17/net/mac80211/tx.c linux-imx6-3.14/net/mac80211/tx.c
+--- linux-3.14.17/net/mac80211/tx.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/mac80211/tx.c 2014-09-09 10:13:52.480983740 +0200
+@@ -414,9 +414,6 @@
+ if (ieee80211_has_order(hdr->frame_control))
+ return TX_CONTINUE;
+
+- if (ieee80211_is_probe_req(hdr->frame_control))
+- return TX_CONTINUE;
+-
+ if (tx->local->hw.flags & IEEE80211_HW_QUEUE_CONTROL)
+ info->hw_queue = tx->sdata->vif.cab_queue;
+
+@@ -467,7 +464,6 @@
+ {
+ struct sta_info *sta = tx->sta;
+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx->skb);
+- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx->skb->data;
+ struct ieee80211_local *local = tx->local;
+
+ if (unlikely(!sta))
+@@ -478,15 +474,6 @@
+ !(info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER))) {
+ int ac = skb_get_queue_mapping(tx->skb);
+
+- /* only deauth, disassoc and action are bufferable MMPDUs */
+- if (ieee80211_is_mgmt(hdr->frame_control) &&
+- !ieee80211_is_deauth(hdr->frame_control) &&
+- !ieee80211_is_disassoc(hdr->frame_control) &&
+- !ieee80211_is_action(hdr->frame_control)) {
+- info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER;
+- return TX_CONTINUE;
+- }
+-
+ ps_dbg(sta->sdata, "STA %pM aid %d: PS buffer for AC %d\n",
+ sta->sta.addr, sta->sta.aid, ac);
+ if (tx->local->total_ps_buffered >= TOTAL_MAX_TX_BUFFER)
+@@ -545,8 +532,22 @@
+ static ieee80211_tx_result debug_noinline
+ ieee80211_tx_h_ps_buf(struct ieee80211_tx_data *tx)
+ {
++ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx->skb);
++ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx->skb->data;
++
+ if (unlikely(tx->flags & IEEE80211_TX_PS_BUFFERED))
+ return TX_CONTINUE;
++
++ /* only deauth, disassoc and action are bufferable MMPDUs */
++ if (ieee80211_is_mgmt(hdr->frame_control) &&
++ !ieee80211_is_deauth(hdr->frame_control) &&
++ !ieee80211_is_disassoc(hdr->frame_control) &&
++ !ieee80211_is_action(hdr->frame_control)) {
++ if (tx->flags & IEEE80211_TX_UNICAST)
++ info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER;
++ return TX_CONTINUE;
++ }
++
+ if (tx->flags & IEEE80211_TX_UNICAST)
+ return ieee80211_tx_h_unicast_ps_buf(tx);
+ else
+diff -Nur linux-3.14.17/net/mac80211/util.c linux-imx6-3.14/net/mac80211/util.c
+--- linux-3.14.17/net/mac80211/util.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/mac80211/util.c 2014-09-09 10:13:52.480983740 +0200
@@ -554,7 +554,7 @@
ieee80211_stop_queues_by_reason(&local->hw, IEEE80211_MAX_QUEUE_MAP,
IEEE80211_QUEUE_STOP_REASON_FLUSH);
@@ -229148,9 +233697,44 @@ diff -Nur linux-3.14.15/net/mac80211/util.c linux-linaro-stable-mx6/net/mac80211
ieee80211_wake_queues_by_reason(&local->hw, IEEE80211_MAX_QUEUE_MAP,
IEEE80211_QUEUE_STOP_REASON_FLUSH);
-diff -Nur linux-3.14.15/net/wireless/core.h linux-linaro-stable-mx6/net/wireless/core.h
---- linux-3.14.15/net/wireless/core.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/net/wireless/core.h 2014-08-20 19:31:56.540913704 +0200
+diff -Nur linux-3.14.17/net/netfilter/ipvs/ip_vs_xmit.c linux-imx6-3.14/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-3.14.17/net/netfilter/ipvs/ip_vs_xmit.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/netfilter/ipvs/ip_vs_xmit.c 2014-09-09 10:13:52.492983838 +0200
+@@ -883,7 +883,7 @@
+ iph->daddr = cp->daddr.ip;
+ iph->saddr = saddr;
+ iph->ttl = old_iph->ttl;
+- ip_select_ident(skb, NULL);
++ ip_select_ident(skb, &rt->dst, NULL);
+
+ /* Another hack: avoid icmp_send in ip_fragment */
+ skb->local_df = 1;
+diff -Nur linux-3.14.17/net/sctp/associola.c linux-imx6-3.14/net/sctp/associola.c
+--- linux-3.14.17/net/sctp/associola.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/sctp/associola.c 2014-09-09 10:13:52.540984228 +0200
+@@ -1151,7 +1151,6 @@
+ asoc->c = new->c;
+ asoc->peer.rwnd = new->peer.rwnd;
+ asoc->peer.sack_needed = new->peer.sack_needed;
+- asoc->peer.auth_capable = new->peer.auth_capable;
+ asoc->peer.i = new->peer.i;
+ sctp_tsnmap_init(&asoc->peer.tsn_map, SCTP_TSN_MAP_INITIAL,
+ asoc->peer.i.initial_tsn, GFP_ATOMIC);
+diff -Nur linux-3.14.17/net/sctp/output.c linux-imx6-3.14/net/sctp/output.c
+--- linux-3.14.17/net/sctp/output.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/sctp/output.c 2014-09-09 10:13:52.544984261 +0200
+@@ -599,7 +599,7 @@
+ return err;
+ no_route:
+ kfree_skb(nskb);
+- IP_INC_STATS(sock_net(asoc->base.sk), IPSTATS_MIB_OUTNOROUTES);
++ IP_INC_STATS_BH(sock_net(asoc->base.sk), IPSTATS_MIB_OUTNOROUTES);
+
+ /* FIXME: Returning the 'err' will effect all the associations
+ * associated with a socket, although only one of the paths of the
+diff -Nur linux-3.14.17/net/wireless/core.h linux-imx6-3.14/net/wireless/core.h
+--- linux-3.14.17/net/wireless/core.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/wireless/core.h 2014-09-09 10:13:52.568984458 +0200
@@ -211,6 +211,7 @@
} dc;
struct {
@@ -229169,9 +233753,9 @@ diff -Nur linux-3.14.15/net/wireless/core.h linux-linaro-stable-mx6/net/wireless
int cfg80211_ibss_wext_join(struct cfg80211_registered_device *rdev,
struct wireless_dev *wdev);
-diff -Nur linux-3.14.15/net/wireless/ibss.c linux-linaro-stable-mx6/net/wireless/ibss.c
---- linux-3.14.15/net/wireless/ibss.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/net/wireless/ibss.c 2014-08-20 19:31:56.540913704 +0200
+diff -Nur linux-3.14.17/net/wireless/ibss.c linux-imx6-3.14/net/wireless/ibss.c
+--- linux-3.14.17/net/wireless/ibss.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/wireless/ibss.c 2014-09-09 10:13:52.568984458 +0200
@@ -14,7 +14,8 @@
#include "rdev-ops.h"
@@ -229222,9 +233806,9 @@ diff -Nur linux-3.14.15/net/wireless/ibss.c linux-linaro-stable-mx6/net/wireless
spin_lock_irqsave(&wdev->event_lock, flags);
list_add_tail(&ev->list, &wdev->event_list);
-diff -Nur linux-3.14.15/net/wireless/nl80211.c linux-linaro-stable-mx6/net/wireless/nl80211.c
---- linux-3.14.15/net/wireless/nl80211.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/net/wireless/nl80211.c 2014-08-20 19:31:56.540913704 +0200
+diff -Nur linux-3.14.17/net/wireless/nl80211.c linux-imx6-3.14/net/wireless/nl80211.c
+--- linux-3.14.17/net/wireless/nl80211.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/wireless/nl80211.c 2014-09-09 10:13:52.572984490 +0200
@@ -1450,17 +1450,18 @@
}
CMD(start_p2p_device, START_P2P_DEVICE);
@@ -229249,10 +233833,20 @@ diff -Nur linux-3.14.15/net/wireless/nl80211.c linux-linaro-stable-mx6/net/wirel
#undef CMD
if (dev->ops->connect || dev->ops->auth) {
-diff -Nur linux-3.14.15/net/wireless/trace.h linux-linaro-stable-mx6/net/wireless/trace.h
---- linux-3.14.15/net/wireless/trace.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/net/wireless/trace.h 2014-08-20 19:31:56.544913721 +0200
-@@ -2278,11 +2278,6 @@
+diff -Nur linux-3.14.17/net/wireless/trace.h linux-imx6-3.14/net/wireless/trace.h
+--- linux-3.14.17/net/wireless/trace.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/wireless/trace.h 2014-09-09 10:13:52.572984490 +0200
+@@ -2068,8 +2068,7 @@
+ MAC_ASSIGN(addr, addr);
+ __entry->key_type = key_type;
+ __entry->key_id = key_id;
+- if (tsc)
+- memcpy(__entry->tsc, tsc, 6);
++ memcpy(__entry->tsc, tsc, 6);
+ ),
+ TP_printk(NETDEV_PR_FMT ", " MAC_PR_FMT ", key type: %d, key id: %d, tsc: %pm",
+ NETDEV_PR_ARG, MAC_PR_ARG(addr), __entry->key_type,
+@@ -2279,11 +2278,6 @@
TP_printk(NETDEV_PR_FMT ", " MAC_PR_FMT, NETDEV_PR_ARG, MAC_PR_ARG(addr))
);
@@ -229264,7 +233858,7 @@ diff -Nur linux-3.14.15/net/wireless/trace.h linux-linaro-stable-mx6/net/wireles
DEFINE_EVENT(cfg80211_rx_evt, cfg80211_rx_spurious_frame,
TP_PROTO(struct net_device *netdev, const u8 *addr),
TP_ARGS(netdev, addr)
-@@ -2293,6 +2288,24 @@
+@@ -2294,6 +2288,24 @@
TP_ARGS(netdev, addr)
);
@@ -229289,9 +233883,9 @@ diff -Nur linux-3.14.15/net/wireless/trace.h linux-linaro-stable-mx6/net/wireles
TRACE_EVENT(cfg80211_probe_status,
TP_PROTO(struct net_device *netdev, const u8 *addr, u64 cookie,
bool acked),
-diff -Nur linux-3.14.15/net/wireless/util.c linux-linaro-stable-mx6/net/wireless/util.c
---- linux-3.14.15/net/wireless/util.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/net/wireless/util.c 2014-08-20 19:31:56.544913721 +0200
+diff -Nur linux-3.14.17/net/wireless/util.c linux-imx6-3.14/net/wireless/util.c
+--- linux-3.14.17/net/wireless/util.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/wireless/util.c 2014-09-09 10:13:52.572984490 +0200
@@ -820,7 +820,8 @@
ev->dc.reason, true);
break;
@@ -229302,9 +233896,33 @@ diff -Nur linux-3.14.15/net/wireless/util.c linux-linaro-stable-mx6/net/wireless
break;
}
wdev_unlock(wdev);
-diff -Nur linux-3.14.15/scripts/Makefile.lib linux-linaro-stable-mx6/scripts/Makefile.lib
---- linux-3.14.15/scripts/Makefile.lib 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/scripts/Makefile.lib 2014-08-20 19:31:56.552913755 +0200
+diff -Nur linux-3.14.17/net/xfrm/xfrm_user.c linux-imx6-3.14/net/xfrm/xfrm_user.c
+--- linux-3.14.17/net/xfrm/xfrm_user.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/net/xfrm/xfrm_user.c 2014-09-09 10:13:52.576984523 +0200
+@@ -176,7 +176,9 @@
+ attrs[XFRMA_ALG_AEAD] ||
+ attrs[XFRMA_ALG_CRYPT] ||
+ attrs[XFRMA_ALG_COMP] ||
+- attrs[XFRMA_TFCPAD])
++ attrs[XFRMA_TFCPAD] ||
++ (ntohl(p->id.spi) >= 0x10000))
++
+ goto out;
+ break;
+
+@@ -204,8 +206,7 @@
+ attrs[XFRMA_ALG_AUTH] ||
+ attrs[XFRMA_ALG_AUTH_TRUNC] ||
+ attrs[XFRMA_ALG_CRYPT] ||
+- attrs[XFRMA_TFCPAD] ||
+- (ntohl(p->id.spi) >= 0x10000))
++ attrs[XFRMA_TFCPAD])
+ goto out;
+ break;
+
+diff -Nur linux-3.14.17/scripts/Makefile.lib linux-imx6-3.14/scripts/Makefile.lib
+--- linux-3.14.17/scripts/Makefile.lib 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/scripts/Makefile.lib 2014-09-09 10:13:52.580984555 +0200
@@ -153,6 +153,7 @@
-I$(srctree)/arch/$(SRCARCH)/boot/dts \
-I$(srctree)/arch/$(SRCARCH)/boot/dts/include \
@@ -229313,9 +233931,9 @@ diff -Nur linux-3.14.15/scripts/Makefile.lib linux-linaro-stable-mx6/scripts/Mak
-undef -D__DTS__
# Finds the multi-part object the current object will be linked into
-diff -Nur linux-3.14.15/scripts/mod/devicetable-offsets.c linux-linaro-stable-mx6/scripts/mod/devicetable-offsets.c
---- linux-3.14.15/scripts/mod/devicetable-offsets.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/scripts/mod/devicetable-offsets.c 2014-08-20 19:31:57.120916194 +0200
+diff -Nur linux-3.14.17/scripts/mod/devicetable-offsets.c linux-imx6-3.14/scripts/mod/devicetable-offsets.c
+--- linux-3.14.17/scripts/mod/devicetable-offsets.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/scripts/mod/devicetable-offsets.c 2014-09-09 10:13:52.600984718 +0200
@@ -174,6 +174,9 @@
DEVID_FIELD(x86_cpu_id, model);
DEVID_FIELD(x86_cpu_id, vendor);
@@ -229326,9 +233944,9 @@ diff -Nur linux-3.14.15/scripts/mod/devicetable-offsets.c linux-linaro-stable-mx
DEVID(mei_cl_device_id);
DEVID_FIELD(mei_cl_device_id, name);
-diff -Nur linux-3.14.15/scripts/mod/file2alias.c linux-linaro-stable-mx6/scripts/mod/file2alias.c
---- linux-3.14.15/scripts/mod/file2alias.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/scripts/mod/file2alias.c 2014-08-20 19:31:57.148916314 +0200
+diff -Nur linux-3.14.17/scripts/mod/file2alias.c linux-imx6-3.14/scripts/mod/file2alias.c
+--- linux-3.14.17/scripts/mod/file2alias.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/scripts/mod/file2alias.c 2014-09-09 10:13:52.600984718 +0200
@@ -1135,6 +1135,16 @@
}
ADD_TO_DEVTABLE("x86cpu", x86_cpu_id, do_x86cpu_entry);
@@ -229346,9 +233964,9 @@ diff -Nur linux-3.14.15/scripts/mod/file2alias.c linux-linaro-stable-mx6/scripts
/* Looks like: mei:S */
static int do_mei_entry(const char *filename, void *symval,
char *alias)
-diff -Nur linux-3.14.15/scripts/recordmcount.c linux-linaro-stable-mx6/scripts/recordmcount.c
---- linux-3.14.15/scripts/recordmcount.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/scripts/recordmcount.c 2014-08-20 19:31:57.256916777 +0200
+diff -Nur linux-3.14.17/scripts/recordmcount.c linux-imx6-3.14/scripts/recordmcount.c
+--- linux-3.14.17/scripts/recordmcount.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/scripts/recordmcount.c 2014-09-09 10:13:52.600984718 +0200
@@ -40,6 +40,11 @@
#define R_METAG_NONE 3
#endif
@@ -229370,9 +233988,9 @@ diff -Nur linux-3.14.15/scripts/recordmcount.c linux-linaro-stable-mx6/scripts/r
case EM_IA_64: reltype = R_IA64_IMM64; gpfx = '_'; break;
case EM_METAG: reltype = R_METAG_ADDR32;
altmcount = "_mcount_wrapper";
-diff -Nur linux-3.14.15/scripts/recordmcount.pl linux-linaro-stable-mx6/scripts/recordmcount.pl
---- linux-3.14.15/scripts/recordmcount.pl 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/scripts/recordmcount.pl 2014-08-20 19:31:57.256916777 +0200
+diff -Nur linux-3.14.17/scripts/recordmcount.pl linux-imx6-3.14/scripts/recordmcount.pl
+--- linux-3.14.17/scripts/recordmcount.pl 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/scripts/recordmcount.pl 2014-09-09 10:13:52.600984718 +0200
@@ -279,6 +279,11 @@
$mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*R_ARM_(CALL|PC24|THM_CALL)" .
"\\s+(__gnu_mcount_nc|mcount)\$";
@@ -229385,9 +234003,9 @@ diff -Nur linux-3.14.15/scripts/recordmcount.pl linux-linaro-stable-mx6/scripts/
} elsif ($arch eq "ia64") {
$mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s_mcount\$";
$type = "data8";
-diff -Nur linux-3.14.15/sound/soc/codecs/cs42888.c linux-linaro-stable-mx6/sound/soc/codecs/cs42888.c
---- linux-3.14.15/sound/soc/codecs/cs42888.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/sound/soc/codecs/cs42888.c 2014-08-20 19:24:09.490913864 +0200
+diff -Nur linux-3.14.17/sound/soc/codecs/cs42888.c linux-imx6-3.14/sound/soc/codecs/cs42888.c
+--- linux-3.14.17/sound/soc/codecs/cs42888.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/sound/soc/codecs/cs42888.c 2014-09-09 10:13:52.744985891 +0200
@@ -0,0 +1,934 @@
+/*
+ * cs42888.c -- CS42888 ALSA SoC Audio Driver
@@ -230323,9 +234941,9 @@ diff -Nur linux-3.14.15/sound/soc/codecs/cs42888.c linux-linaro-stable-mx6/sound
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("Cirrus Logic CS42888 ALSA SoC Codec Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/sound/soc/codecs/cs42888.h linux-linaro-stable-mx6/sound/soc/codecs/cs42888.h
---- linux-3.14.15/sound/soc/codecs/cs42888.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/sound/soc/codecs/cs42888.h 2014-08-20 19:24:09.490913864 +0200
+diff -Nur linux-3.14.17/sound/soc/codecs/cs42888.h linux-imx6-3.14/sound/soc/codecs/cs42888.h
+--- linux-3.14.17/sound/soc/codecs/cs42888.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/sound/soc/codecs/cs42888.h 2014-09-09 10:13:52.744985891 +0200
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -230450,9 +235068,9 @@ diff -Nur linux-3.14.15/sound/soc/codecs/cs42888.h linux-linaro-stable-mx6/sound
+
+
+#endif
-diff -Nur linux-3.14.15/sound/soc/codecs/Kconfig linux-linaro-stable-mx6/sound/soc/codecs/Kconfig
---- linux-3.14.15/sound/soc/codecs/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/codecs/Kconfig 2014-08-20 19:31:58.628922667 +0200
+diff -Nur linux-3.14.17/sound/soc/codecs/Kconfig linux-imx6-3.14/sound/soc/codecs/Kconfig
+--- linux-3.14.17/sound/soc/codecs/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/sound/soc/codecs/Kconfig 2014-09-09 10:13:52.740985859 +0200
@@ -37,6 +37,7 @@
select SND_SOC_CS42L73 if I2C
select SND_SOC_CS4270 if I2C
@@ -230471,9 +235089,9 @@ diff -Nur linux-3.14.15/sound/soc/codecs/Kconfig linux-linaro-stable-mx6/sound/s
config SND_SOC_CX20442
tristate
depends on TTY
-diff -Nur linux-3.14.15/sound/soc/codecs/Makefile linux-linaro-stable-mx6/sound/soc/codecs/Makefile
---- linux-3.14.15/sound/soc/codecs/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/codecs/Makefile 2014-08-20 19:31:58.628922667 +0200
+diff -Nur linux-3.14.17/sound/soc/codecs/Makefile linux-imx6-3.14/sound/soc/codecs/Makefile
+--- linux-3.14.17/sound/soc/codecs/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/sound/soc/codecs/Makefile 2014-09-09 10:13:52.740985859 +0200
@@ -23,6 +23,7 @@
snd-soc-cs42l73-objs := cs42l73.o
snd-soc-cs4270-objs := cs4270.o
@@ -230490,9 +235108,9 @@ diff -Nur linux-3.14.15/sound/soc/codecs/Makefile linux-linaro-stable-mx6/sound/
obj-$(CONFIG_SND_SOC_CX20442) += snd-soc-cx20442.o
obj-$(CONFIG_SND_SOC_DA7210) += snd-soc-da7210.o
obj-$(CONFIG_SND_SOC_DA7213) += snd-soc-da7213.o
-diff -Nur linux-3.14.15/sound/soc/codecs/sgtl5000.c linux-linaro-stable-mx6/sound/soc/codecs/sgtl5000.c
---- linux-3.14.15/sound/soc/codecs/sgtl5000.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/codecs/sgtl5000.c 2014-08-20 19:31:58.688922925 +0200
+diff -Nur linux-3.14.17/sound/soc/codecs/sgtl5000.c linux-imx6-3.14/sound/soc/codecs/sgtl5000.c
+--- linux-3.14.17/sound/soc/codecs/sgtl5000.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/sound/soc/codecs/sgtl5000.c 2014-09-09 10:13:52.752985955 +0200
@@ -756,7 +756,7 @@
struct ldo_regulator *ldo = rdev_get_drvdata(dev);
struct snd_soc_codec *codec = (struct snd_soc_codec *)ldo->codec_data;
@@ -230602,9 +235220,9 @@ diff -Nur linux-3.14.15/sound/soc/codecs/sgtl5000.c linux-linaro-stable-mx6/soun
ldo_regulator_remove(codec);
return 0;
-diff -Nur linux-3.14.15/sound/soc/codecs/spdif_transmitter.c linux-linaro-stable-mx6/sound/soc/codecs/spdif_transmitter.c
---- linux-3.14.15/sound/soc/codecs/spdif_transmitter.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/codecs/spdif_transmitter.c 2014-08-20 19:31:58.692922943 +0200
+diff -Nur linux-3.14.17/sound/soc/codecs/spdif_transmitter.c linux-imx6-3.14/sound/soc/codecs/spdif_transmitter.c
+--- linux-3.14.17/sound/soc/codecs/spdif_transmitter.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/sound/soc/codecs/spdif_transmitter.c 2014-09-09 10:13:52.752985955 +0200
@@ -24,7 +24,7 @@
#define DRV_NAME "spdif-dit"
@@ -230614,9 +235232,9 @@ diff -Nur linux-3.14.15/sound/soc/codecs/spdif_transmitter.c linux-linaro-stable
#define STUB_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \
SNDRV_PCM_FMTBIT_S20_3LE | \
SNDRV_PCM_FMTBIT_S24_LE)
-diff -Nur linux-3.14.15/sound/soc/codecs/wm8962.c linux-linaro-stable-mx6/sound/soc/codecs/wm8962.c
---- linux-3.14.15/sound/soc/codecs/wm8962.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/codecs/wm8962.c 2014-08-20 19:31:58.720923064 +0200
+diff -Nur linux-3.14.17/sound/soc/codecs/wm8962.c linux-imx6-3.14/sound/soc/codecs/wm8962.c
+--- linux-3.14.17/sound/soc/codecs/wm8962.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/sound/soc/codecs/wm8962.c 2014-09-09 10:13:52.772986119 +0200
@@ -16,6 +16,7 @@
#include <linux/init.h>
#include <linux/delay.h>
@@ -230740,9 +235358,9 @@ diff -Nur linux-3.14.15/sound/soc/codecs/wm8962.c linux-linaro-stable-mx6/sound/
return 0;
}
#endif
-diff -Nur linux-3.14.15/sound/soc/fsl/fsl_asrc.c linux-linaro-stable-mx6/sound/soc/fsl/fsl_asrc.c
---- linux-3.14.15/sound/soc/fsl/fsl_asrc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_asrc.c 2014-08-20 19:31:58.740923149 +0200
+diff -Nur linux-3.14.17/sound/soc/fsl/fsl_asrc.c linux-imx6-3.14/sound/soc/fsl/fsl_asrc.c
+--- linux-3.14.17/sound/soc/fsl/fsl_asrc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/sound/soc/fsl/fsl_asrc.c 2014-09-09 10:13:52.784986217 +0200
@@ -0,0 +1,498 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -231242,9 +235860,9 @@ diff -Nur linux-3.14.15/sound/soc/fsl/fsl_asrc.c linux-linaro-stable-mx6/sound/s
+MODULE_DESCRIPTION("i.MX ASoC ASRC P2P driver");
+MODULE_ALIAS("platform:fsl-asrc-p2p");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/sound/soc/fsl/fsl_asrc.h linux-linaro-stable-mx6/sound/soc/fsl/fsl_asrc.h
---- linux-3.14.15/sound/soc/fsl/fsl_asrc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_asrc.h 2014-08-20 19:24:09.534914052 +0200
+diff -Nur linux-3.14.17/sound/soc/fsl/fsl_asrc.h linux-imx6-3.14/sound/soc/fsl/fsl_asrc.h
+--- linux-3.14.17/sound/soc/fsl/fsl_asrc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/sound/soc/fsl/fsl_asrc.h 2014-09-09 10:13:52.784986217 +0200
@@ -0,0 +1,48 @@
+/*
+ * fsl_asrc.h - ALSA ASRC interface
@@ -231294,9 +235912,9 @@ diff -Nur linux-3.14.15/sound/soc/fsl/fsl_asrc.h linux-linaro-stable-mx6/sound/s
+};
+
+#endif
-diff -Nur linux-3.14.15/sound/soc/fsl/fsl_asrc_pcm.c linux-linaro-stable-mx6/sound/soc/fsl/fsl_asrc_pcm.c
---- linux-3.14.15/sound/soc/fsl/fsl_asrc_pcm.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_asrc_pcm.c 2014-08-20 19:24:09.534914052 +0200
+diff -Nur linux-3.14.17/sound/soc/fsl/fsl_asrc_pcm.c linux-imx6-3.14/sound/soc/fsl/fsl_asrc_pcm.c
+--- linux-3.14.17/sound/soc/fsl/fsl_asrc_pcm.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/sound/soc/fsl/fsl_asrc_pcm.c 2014-09-09 10:13:52.784986217 +0200
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -231339,9 +235957,9 @@ diff -Nur linux-3.14.15/sound/soc/fsl/fsl_asrc_pcm.c linux-linaro-stable-mx6/sou
+MODULE_DESCRIPTION("i.MX ASoC PCM driver");
+MODULE_ALIAS("platform:imx-pcm-asrc");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/sound/soc/fsl/fsl_esai.c linux-linaro-stable-mx6/sound/soc/fsl/fsl_esai.c
---- linux-3.14.15/sound/soc/fsl/fsl_esai.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_esai.c 2014-08-20 19:31:58.740923149 +0200
+diff -Nur linux-3.14.17/sound/soc/fsl/fsl_esai.c linux-imx6-3.14/sound/soc/fsl/fsl_esai.c
+--- linux-3.14.17/sound/soc/fsl/fsl_esai.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/sound/soc/fsl/fsl_esai.c 2014-09-09 10:13:52.788986249 +0200
@@ -785,7 +785,7 @@
return ret;
}
@@ -231351,10 +235969,10 @@ diff -Nur linux-3.14.15/sound/soc/fsl/fsl_esai.c linux-linaro-stable-mx6/sound/s
if (ret)
dev_err(&pdev->dev, "failed to init imx pcm dma: %d\n", ret);
-diff -Nur linux-3.14.15/sound/soc/fsl/fsl_hdmi.c linux-linaro-stable-mx6/sound/soc/fsl/fsl_hdmi.c
---- linux-3.14.15/sound/soc/fsl/fsl_hdmi.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_hdmi.c 2014-08-20 19:31:58.740923149 +0200
-@@ -0,0 +1,611 @@
+diff -Nur linux-3.14.17/sound/soc/fsl/fsl_hdmi.c linux-imx6-3.14/sound/soc/fsl/fsl_hdmi.c
+--- linux-3.14.17/sound/soc/fsl/fsl_hdmi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/sound/soc/fsl/fsl_hdmi.c 2014-09-09 10:13:52.788986249 +0200
+@@ -0,0 +1,614 @@
+/*
+ * ALSA SoC HDMI Audio Layer for Freescale i.MX
+ *
@@ -231691,9 +236309,12 @@ diff -Nur linux-3.14.15/sound/soc/fsl/fsl_hdmi.c linux-linaro-stable-mx6/sound/s
+static int fsl_hdmi_update_constraints(struct snd_pcm_substream *substream)
+{
+ struct snd_pcm_runtime *runtime = substream->runtime;
-+ int ret;
++ int edid_status, ret;
+
-+ hdmi_get_edid_cfg(&edid_cfg);
++ edid_status = hdmi_get_edid_cfg(&edid_cfg);
++
++ if (edid_status && !edid_cfg.hdmi_cap)
++ return -1;
+
+ fsl_hdmi_get_playback_rates();
+ ret = snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
@@ -231726,6 +236347,10 @@ diff -Nur linux-3.14.15/sound/soc/fsl/fsl_hdmi.c linux-linaro-stable-mx6/sound/s
+ struct imx_hdmi *hdmi_data = snd_soc_dai_get_drvdata(dai);
+ int ret;
+
++ ret = fsl_hdmi_update_constraints(substream);
++ if (ret < 0)
++ return ret;
++
+ clk_prepare_enable(hdmi_data->isfr_clk);
+ clk_prepare_enable(hdmi_data->iahb_clk);
+
@@ -231733,10 +236358,6 @@ diff -Nur linux-3.14.15/sound/soc/fsl/fsl_hdmi.c linux-linaro-stable-mx6/sound/s
+ (int)clk_get_rate(hdmi_data->isfr_clk),
+ (int)clk_get_rate(hdmi_data->iahb_clk));
+
-+ ret = fsl_hdmi_update_constraints(substream);
-+ if (ret < 0)
-+ return ret;
-+
+ /* Indicates the subpacket represents a flatline sample */
+ hdmi_audio_writeb(FC_AUDSCONF, AUD_PACKET_SAMPFIT, 0x0);
+
@@ -231788,7 +236409,7 @@ diff -Nur linux-3.14.15/sound/soc/fsl/fsl_hdmi.c linux-linaro-stable-mx6/sound/s
+{
+ int i;
+
-+ for (i = 0 ; i < 4 ; i++)
++ for (i = 0 ; i < 6 ; i++)
+ uvalue->value.iec958.status[i] = iec_header.status[i];
+
+ return 0;
@@ -231803,7 +236424,7 @@ diff -Nur linux-3.14.15/sound/soc/fsl/fsl_hdmi.c linux-linaro-stable-mx6/sound/s
+ if (uvalue->value.iec958.status[0] & IEC958_AES0_PROFESSIONAL)
+ return -EPERM;
+
-+ for (i = 0 ; i < 4 ; i++) {
++ for (i = 0 ; i < 6 ; i++) {
+ iec_header.status[i] = uvalue->value.iec958.status[i];
+ pr_debug("%s status[%d]=0x%02x\n", __func__, i, iec_header.status[i]);
+ }
@@ -231966,9 +236587,9 @@ diff -Nur linux-3.14.15/sound/soc/fsl/fsl_hdmi.c linux-linaro-stable-mx6/sound/s
+MODULE_DESCRIPTION("IMX HDMI TX DAI");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:fsl-hdmi-dai");
-diff -Nur linux-3.14.15/sound/soc/fsl/fsl_spdif.c linux-linaro-stable-mx6/sound/soc/fsl/fsl_spdif.c
---- linux-3.14.15/sound/soc/fsl/fsl_spdif.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_spdif.c 2014-08-20 19:31:58.744923167 +0200
+diff -Nur linux-3.14.17/sound/soc/fsl/fsl_spdif.c linux-imx6-3.14/sound/soc/fsl/fsl_spdif.c
+--- linux-3.14.17/sound/soc/fsl/fsl_spdif.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/sound/soc/fsl/fsl_spdif.c 2014-09-09 10:13:52.788986249 +0200
@@ -21,6 +21,8 @@
#include <linux/of_address.h>
#include <linux/of_device.h>
@@ -232294,9 +236915,9 @@ diff -Nur linux-3.14.15/sound/soc/fsl/fsl_spdif.c linux-linaro-stable-mx6/sound/
},
.probe = fsl_spdif_probe,
};
-diff -Nur linux-3.14.15/sound/soc/fsl/fsl_spdif.h linux-linaro-stable-mx6/sound/soc/fsl/fsl_spdif.h
---- linux-3.14.15/sound/soc/fsl/fsl_spdif.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_spdif.h 2014-08-20 19:31:58.744923167 +0200
+diff -Nur linux-3.14.17/sound/soc/fsl/fsl_spdif.h linux-imx6-3.14/sound/soc/fsl/fsl_spdif.h
+--- linux-3.14.17/sound/soc/fsl/fsl_spdif.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/sound/soc/fsl/fsl_spdif.h 2014-09-09 10:13:52.788986249 +0200
@@ -157,13 +157,19 @@
#define STC_TXCLK_DIV(x) ((((x) - 1) << STC_TXCLK_DIV_OFFSET) & STC_TXCLK_DIV_MASK)
#define STC_TXCLK_SRC_MAX 8
@@ -232331,9 +236952,9 @@ diff -Nur linux-3.14.15/sound/soc/fsl/fsl_spdif.h linux-linaro-stable-mx6/sound/
#define FSL_SPDIF_RATES_CAPTURE (SNDRV_PCM_RATE_16000 | \
SNDRV_PCM_RATE_32000 | \
-diff -Nur linux-3.14.15/sound/soc/fsl/fsl_ssi.c linux-linaro-stable-mx6/sound/soc/fsl/fsl_ssi.c
---- linux-3.14.15/sound/soc/fsl/fsl_ssi.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_ssi.c 2014-08-20 19:31:58.744923167 +0200
+diff -Nur linux-3.14.17/sound/soc/fsl/fsl_ssi.c linux-imx6-3.14/sound/soc/fsl/fsl_ssi.c
+--- linux-3.14.17/sound/soc/fsl/fsl_ssi.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/sound/soc/fsl/fsl_ssi.c 2014-09-09 10:13:52.788986249 +0200
@@ -3,7 +3,7 @@
*
* Author: Timur Tabi <timur@freescale.com>
@@ -232645,9 +237266,9 @@ diff -Nur linux-3.14.15/sound/soc/fsl/fsl_ssi.c linux-linaro-stable-mx6/sound/so
},
.probe = fsl_ssi_probe,
.remove = fsl_ssi_remove,
-diff -Nur linux-3.14.15/sound/soc/fsl/imx-cs42888.c linux-linaro-stable-mx6/sound/soc/fsl/imx-cs42888.c
---- linux-3.14.15/sound/soc/fsl/imx-cs42888.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-cs42888.c 2014-08-20 19:31:58.744923167 +0200
+diff -Nur linux-3.14.17/sound/soc/fsl/imx-cs42888.c linux-imx6-3.14/sound/soc/fsl/imx-cs42888.c
+--- linux-3.14.17/sound/soc/fsl/imx-cs42888.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/sound/soc/fsl/imx-cs42888.c 2014-09-09 10:13:52.788986249 +0200
@@ -0,0 +1,369 @@
+/*
+ * Copyright (C) 2010-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -233018,9 +237639,9 @@ diff -Nur linux-3.14.15/sound/soc/fsl/imx-cs42888.c linux-linaro-stable-mx6/soun
+MODULE_DESCRIPTION("ALSA SoC cs42888 Machine Layer Driver");
+MODULE_ALIAS("platform:imx-cs42888");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/sound/soc/fsl/imx-hdmi.c linux-linaro-stable-mx6/sound/soc/fsl/imx-hdmi.c
---- linux-3.14.15/sound/soc/fsl/imx-hdmi.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-hdmi.c 2014-08-20 19:24:09.562914171 +0200
+diff -Nur linux-3.14.17/sound/soc/fsl/imx-hdmi.c linux-imx6-3.14/sound/soc/fsl/imx-hdmi.c
+--- linux-3.14.17/sound/soc/fsl/imx-hdmi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/sound/soc/fsl/imx-hdmi.c 2014-09-09 10:13:52.788986249 +0200
@@ -0,0 +1,113 @@
+/*
+ * ASoC HDMI Transmitter driver for IMX development boards
@@ -233135,10 +237756,10 @@ diff -Nur linux-3.14.15/sound/soc/fsl/imx-hdmi.c linux-linaro-stable-mx6/sound/s
+MODULE_DESCRIPTION("IMX HDMI TX ASoC driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:imx-audio-hdmi");
-diff -Nur linux-3.14.15/sound/soc/fsl/imx-hdmi-dma.c linux-linaro-stable-mx6/sound/soc/fsl/imx-hdmi-dma.c
---- linux-3.14.15/sound/soc/fsl/imx-hdmi-dma.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-hdmi-dma.c 2014-08-20 19:31:58.744923167 +0200
-@@ -0,0 +1,1214 @@
+diff -Nur linux-3.14.17/sound/soc/fsl/imx-hdmi-dma.c linux-imx6-3.14/sound/soc/fsl/imx-hdmi-dma.c
+--- linux-3.14.17/sound/soc/fsl/imx-hdmi-dma.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/sound/soc/fsl/imx-hdmi-dma.c 2014-09-09 10:13:52.788986249 +0200
+@@ -0,0 +1,1240 @@
+/*
+ * imx-hdmi-dma.c -- HDMI DMA driver for ALSA Soc Audio Layer
+ *
@@ -233224,7 +237845,7 @@ diff -Nur linux-3.14.15/sound/soc/fsl/imx-hdmi-dma.c linux-linaro-stable-mx6/sou
+static u8 g_channel_remap_table[24];
+
+/* default mapping tables */
-+static const u8 channel_maps_alsa_cea[5][8] = {
++static const u8 channel_maps_alsa_cea[5][8] = {
+ { 0, 1, 2, 3, 4, 5, 6, 7 }, /* 0CH: no remapping */
+ { 0, 1, 2, 3, 4, 5, 6, 7 }, /* 2CH: no remapping */
+ { 0, 1, 2, 3, 4, 5, 6, 7 }, /* 4CH: no remapping */
@@ -233232,7 +237853,7 @@ diff -Nur linux-3.14.15/sound/soc/fsl/imx-hdmi-dma.c linux-linaro-stable-mx6/sou
+ { 0, 1, 6, 7, 3, 2, 4, 5 } /* 8CH: ALSA7.1 to CEA */
+};
+
-+static const u8 channel_maps_cea_alsa[5][8] = {
++static const u8 channel_maps_cea_alsa[5][8] = {
+ { 0, 1, 2, 3, 4, 5, 6, 7 }, /* 0CH: no remapping */
+ { 0, 1, 2, 3, 4, 5, 6, 7 }, /* 2CH: no remapping */
+ { 0, 1, 2, 3, 4, 5, 6, 7 }, /* 4CH: no remapping */
@@ -233283,8 +237904,8 @@ diff -Nur linux-3.14.15/sound/soc/fsl/imx-hdmi-dma.c linux-linaro-stable-mx6/sou
+ * is necessary for 6 ch.
+ */
+#define HDMI_DMA_PERIOD_BYTES (12288)
-+#define HDMI_DMA_BUF_SIZE (128 * 1024)
-+#define HDMI_PCM_BUF_SIZE (128 * 1024)
++#define HDMI_DMA_BUF_SIZE (1280 * 1024)
++#define HDMI_PCM_BUF_SIZE (1280 * 1024)
+
+#define hdmi_audio_debug(dev, reg) \
+ dev_dbg(dev, #reg ": 0x%02x\n", hdmi_readb(reg))
@@ -233388,24 +238009,29 @@ diff -Nur linux-3.14.15/sound/soc/fsl/imx-hdmi-dma.c linux-linaro-stable-mx6/sou
+ u32 pcm_data, int subframe_idx)
+{
+ union hdmi_audio_dma_data_t subframe;
++ union hdmi_audio_header_t tmp_header;
+
+ subframe.U = 0;
+
-+ /* fill c (channel status) */
+ if (priv->frame_idx < 42) {
-+ iec_header.B.channel =
-+ (iec_header.B.linear_pcm == 0) ? subframe_idx : 0;
-+ subframe.B.c = iec_header.U >> priv->frame_idx;
++ tmp_header = iec_header;
++
++ /* fill v (validity) */
++ subframe.B.v = tmp_header.B.linear_pcm;
++
++ /* fill c (channel status) */
++ if (tmp_header.B.linear_pcm == 0)
++ tmp_header.B.channel = subframe_idx + 1;
++ subframe.B.c = tmp_header.U >> priv->frame_idx;
++ } else {
++ /* fill v (validity), c is always zero */
++ subframe.B.v = iec_header.B.linear_pcm;
+ }
-+
-+ /* fill v (validity) */
-+ subframe.B.v = iec_header.B.linear_pcm;
+
+ /* fill data */
+ if (priv->sample_bits == 16)
-+ subframe.B.data = pcm_data << 8;
-+ else
-+ subframe.B.data = pcm_data;
++ pcm_data <<= 8;
++ subframe.B.data = pcm_data;
+
+ /* fill p (parity) Note: Do not include b ! */
+ subframe.B.p = odd_ones(subframe.U);
@@ -233419,8 +238045,9 @@ diff -Nur linux-3.14.15/sound/soc/fsl/imx-hdmi-dma.c linux-linaro-stable-mx6/sou
+
+static void init_table(int channels)
+{
++ int i, map_sel, ch;
+ unsigned char *p = g_packet_head_table;
-+ int i, map_sel, ch = 0;
++ union hdmi_audio_header_t tmp_header = iec_header;
+
+ for (i = 0; i < 48; i++) {
+ int b = 0;
@@ -233430,8 +238057,8 @@ diff -Nur linux-3.14.15/sound/soc/fsl/imx-hdmi-dma.c linux-linaro-stable-mx6/sou
+ for (ch = 0; ch < channels; ch++) {
+ int c = 0;
+ if (i < 42) {
-+ iec_header.B.channel = ch+1;
-+ c = (iec_header.U >> i) & 0x1;
++ tmp_header.B.channel = ch + 1;
++ c = (tmp_header.U >> i) & 0x1;
+ }
+ /* preset bit p as c */
+ *p++ = (b << 4) | (c << 2) | (c << 3);
@@ -233440,7 +238067,7 @@ diff -Nur linux-3.14.15/sound/soc/fsl/imx-hdmi-dma.c linux-linaro-stable-mx6/sou
+
+ map_sel = channels / 2;
+ for (i = 0; i < 24; i++) {
-+ g_channel_remap_table[i] = (i / channels) * channels +
++ g_channel_remap_table[i] = (i / channels) * channels +
+ channel_maps_cea_alsa[map_sel][i % channels];
+ }
+}
@@ -233825,15 +238452,22 @@ diff -Nur linux-3.14.15/sound/soc/fsl/imx-hdmi-dma.c linux-linaro-stable-mx6/sou
+ struct hdmi_dma_priv *priv = runtime->private_data;
+ unsigned int count = frames_to_bytes(runtime, frames);
+ unsigned int pos_bytes = frames_to_bytes(runtime, pos);
-+ int channel_no, pcm_idx, subframe_no, bits_left, sample_bits, map_sel;
-+ u32 pcm_data[8], pcm_temp, *hw_buf, sample_block;
-+
++ int channel_no, pcm_idx, subframe_idx, bits_left, sample_bits, map_sel;
++ u32 pcm_data[8], pcm_temp, *hw_buf, sample_block, inc_mask;
++
+ /* Adding frame info to pcm data from userspace and copy to hw_buffer */
+ hw_buf = (u32 *)(priv->hw_buffer.area + (pos_bytes * priv->buffer_ratio));
+
+ sample_bits = priv->sample_align * 8;
+ sample_block = priv->sample_align * priv->channels;
-+ map_sel = (iec_header.B.linear_pcm == 0) ? (priv->channels / 2) : 0;
++
++ if (iec_header.B.linear_pcm == 0) {
++ map_sel = priv->channels / 2;
++ inc_mask = 1 << (priv->channels - 1);
++ } else {
++ map_sel = 0;
++ inc_mask = 0xaa;
++ }
+
+ while (count > 0) {
+ if (copy_from_user(pcm_data, buf, sample_block))
@@ -233848,11 +238482,17 @@ diff -Nur linux-3.14.15/sound/soc/fsl/imx-hdmi-dma.c linux-linaro-stable-mx6/sou
+ bits_left = 32;
+ for (;;) {
+ /* re-map channels */
-+ subframe_no = channel_maps_alsa_cea[map_sel][channel_no];
++ subframe_idx = channel_maps_alsa_cea[map_sel][channel_no];
+
+ /* Save the header info to the audio dma buffer */
-+ hw_buf[subframe_no] = hdmi_dma_add_frame_info(
-+ priv, pcm_temp, subframe_no + 1);
++ hw_buf[subframe_idx] = hdmi_dma_add_frame_info(
++ priv, pcm_temp, subframe_idx);
++
++ if (inc_mask & (1 << channel_no)) {
++ if (++priv->frame_idx == 192)
++ priv->frame_idx = 0;
++ }
++
+ channel_no++;
+
+ if (bits_left <= sample_bits)
@@ -233864,10 +238504,6 @@ diff -Nur linux-3.14.15/sound/soc/fsl/imx-hdmi-dma.c linux-linaro-stable-mx6/sou
+ } while (channel_no < priv->channels);
+
+ hw_buf += priv->channels;
-+
-+ priv->frame_idx++;
-+ if (priv->frame_idx == 192)
-+ priv->frame_idx = 0;
+ }
+
+ return 0;
@@ -234009,6 +238645,7 @@ diff -Nur linux-3.14.15/sound/soc/fsl/imx-hdmi-dma.c linux-linaro-stable-mx6/sou
+ init_table(priv->channels);
+
+ priv->appl_bytes = 0;
++ priv->frame_idx = 0;
+
+ return 0;
+}
@@ -234027,8 +238664,17 @@ diff -Nur linux-3.14.15/sound/soc/fsl/imx-hdmi-dma.c linux-linaro-stable-mx6/sou
+ hbr = (iec_header.B.linear_pcm != 0 && priv->channels == 8);
+ hdmi_audio_writeb(AHB_DMA_CONF0, HBR, !!hbr);
+
++ /*
++ * Override AES3 - parameter: This is a temporary hack for
++ * callers that provide incorrect information when opening
++ * the device. 0x09 (i.e. 768K) is the only acceptable value.
++ */
++ if (hbr) {
++ iec_header.B.sample_freq = 0x09;
++ iec_header.B.org_sample_freq = 0x00;
++ }
++
+ priv->offset = 0;
-+ priv->frame_idx = 0;
+
+ /* Copy data by buffer_bytes */
+ hdmi_dma_data_copy(substream, priv, 'b');
@@ -234073,13 +238719,13 @@ diff -Nur linux-3.14.15/sound/soc/fsl/imx-hdmi-dma.c linux-linaro-stable-mx6/sou
+ switch (cmd) {
+ case SNDRV_PCM_TRIGGER_START:
+ case SNDRV_PCM_TRIGGER_RESUME:
-+ case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+ if (!check_hdmi_state())
+ return 0;
+ hdmi_dma_trigger_init(substream, priv);
+
+ dumpregs(dev);
+
++ case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+ priv->tx_active = true;
+ hdmi_audio_writeb(AHB_DMA_START, START, 0x1);
+ hdmi_dma_irq_set(false);
@@ -234128,7 +238774,7 @@ diff -Nur linux-3.14.15/sound/soc/fsl/imx-hdmi-dma.c linux-linaro-stable-mx6/sou
+ .period_bytes_min = HDMI_DMA_PERIOD_BYTES / 2,
+ .period_bytes_max = HDMI_DMA_PERIOD_BYTES / 2,
+ .periods_min = 8,
-+ .periods_max = 8,
++ .periods_max = HDMI_DMA_BUF_SIZE / HDMI_DMA_PERIOD_BYTES,
+ .fifo_size = 0,
+};
+
@@ -234309,6 +238955,7 @@ diff -Nur linux-3.14.15/sound/soc/fsl/imx-hdmi-dma.c linux-linaro-stable-mx6/sou
+ case 0x0a:
+ snd_imx_hardware.period_bytes_max = HDMI_DMA_PERIOD_BYTES / 4;
+ snd_imx_hardware.period_bytes_min = HDMI_DMA_PERIOD_BYTES / 4;
++ snd_imx_hardware.periods_max = HDMI_DMA_BUF_SIZE / (HDMI_DMA_PERIOD_BYTES / 2);
+ break;
+ default:
+ break;
@@ -234353,9 +239000,9 @@ diff -Nur linux-3.14.15/sound/soc/fsl/imx-hdmi-dma.c linux-linaro-stable-mx6/sou
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("i.MX HDMI audio DMA");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.15/sound/soc/fsl/imx-hdmi.h linux-linaro-stable-mx6/sound/soc/fsl/imx-hdmi.h
---- linux-3.14.15/sound/soc/fsl/imx-hdmi.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-hdmi.h 2014-08-20 19:24:09.562914171 +0200
+diff -Nur linux-3.14.17/sound/soc/fsl/imx-hdmi.h linux-imx6-3.14/sound/soc/fsl/imx-hdmi.h
+--- linux-3.14.17/sound/soc/fsl/imx-hdmi.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-imx6-3.14/sound/soc/fsl/imx-hdmi.h 2014-09-09 10:13:52.788986249 +0200
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc.
@@ -234462,9 +239109,9 @@ diff -Nur linux-3.14.15/sound/soc/fsl/imx-hdmi.h linux-linaro-stable-mx6/sound/s
+ } while (0)
+
+#endif /* __IMX_HDMI_H */
-diff -Nur linux-3.14.15/sound/soc/fsl/imx-pcm-dma.c linux-linaro-stable-mx6/sound/soc/fsl/imx-pcm-dma.c
---- linux-3.14.15/sound/soc/fsl/imx-pcm-dma.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-pcm-dma.c 2014-08-20 19:31:58.748923182 +0200
+diff -Nur linux-3.14.17/sound/soc/fsl/imx-pcm-dma.c linux-imx6-3.14/sound/soc/fsl/imx-pcm-dma.c
+--- linux-3.14.17/sound/soc/fsl/imx-pcm-dma.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/sound/soc/fsl/imx-pcm-dma.c 2014-09-09 10:13:52.788986249 +0200
@@ -11,6 +11,10 @@
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
@@ -234592,9 +239239,9 @@ diff -Nur linux-3.14.15/sound/soc/fsl/imx-pcm-dma.c linux-linaro-stable-mx6/soun
}
EXPORT_SYMBOL_GPL(imx_pcm_dma_init);
-diff -Nur linux-3.14.15/sound/soc/fsl/imx-pcm.h linux-linaro-stable-mx6/sound/soc/fsl/imx-pcm.h
---- linux-3.14.15/sound/soc/fsl/imx-pcm.h 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-pcm.h 2014-08-20 19:31:58.748923182 +0200
+diff -Nur linux-3.14.17/sound/soc/fsl/imx-pcm.h linux-imx6-3.14/sound/soc/fsl/imx-pcm.h
+--- linux-3.14.17/sound/soc/fsl/imx-pcm.h 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/sound/soc/fsl/imx-pcm.h 2014-09-09 10:13:52.788986249 +0200
@@ -18,13 +18,17 @@
/*
* Do not change this as the FIQ handler depends on this size
@@ -234627,9 +239274,9 @@ diff -Nur linux-3.14.15/sound/soc/fsl/imx-pcm.h linux-linaro-stable-mx6/sound/so
{
return -ENODEV;
}
-diff -Nur linux-3.14.15/sound/soc/fsl/imx-spdif.c linux-linaro-stable-mx6/sound/soc/fsl/imx-spdif.c
---- linux-3.14.15/sound/soc/fsl/imx-spdif.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-spdif.c 2014-08-20 19:31:58.752923199 +0200
+diff -Nur linux-3.14.17/sound/soc/fsl/imx-spdif.c linux-imx6-3.14/sound/soc/fsl/imx-spdif.c
+--- linux-3.14.17/sound/soc/fsl/imx-spdif.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/sound/soc/fsl/imx-spdif.c 2014-09-09 10:13:52.788986249 +0200
@@ -65,14 +65,15 @@
if (ret)
goto end;
@@ -234656,9 +239303,9 @@ diff -Nur linux-3.14.15/sound/soc/fsl/imx-spdif.c linux-linaro-stable-mx6/sound/
.of_match_table = imx_spdif_dt_ids,
},
.probe = imx_spdif_audio_probe,
-diff -Nur linux-3.14.15/sound/soc/fsl/imx-ssi.c linux-linaro-stable-mx6/sound/soc/fsl/imx-ssi.c
---- linux-3.14.15/sound/soc/fsl/imx-ssi.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-ssi.c 2014-08-20 19:31:58.752923199 +0200
+diff -Nur linux-3.14.17/sound/soc/fsl/imx-ssi.c linux-imx6-3.14/sound/soc/fsl/imx-ssi.c
+--- linux-3.14.17/sound/soc/fsl/imx-ssi.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/sound/soc/fsl/imx-ssi.c 2014-09-09 10:13:52.788986249 +0200
@@ -602,7 +602,8 @@
ssi->fiq_params.dma_params_tx = &ssi->dma_params_tx;
@@ -234669,9 +239316,9 @@ diff -Nur linux-3.14.15/sound/soc/fsl/imx-ssi.c linux-linaro-stable-mx6/sound/so
if (ssi->fiq_init && ssi->dma_init) {
ret = ssi->fiq_init;
-diff -Nur linux-3.14.15/sound/soc/fsl/imx-wm8962.c linux-linaro-stable-mx6/sound/soc/fsl/imx-wm8962.c
---- linux-3.14.15/sound/soc/fsl/imx-wm8962.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-wm8962.c 2014-08-20 19:31:58.752923199 +0200
+diff -Nur linux-3.14.17/sound/soc/fsl/imx-wm8962.c linux-imx6-3.14/sound/soc/fsl/imx-wm8962.c
+--- linux-3.14.17/sound/soc/fsl/imx-wm8962.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/sound/soc/fsl/imx-wm8962.c 2014-09-09 10:13:52.788986249 +0200
@@ -1,9 +1,9 @@
/*
- * Copyright 2013 Freescale Semiconductor, Inc.
@@ -235116,9 +239763,9 @@ diff -Nur linux-3.14.15/sound/soc/fsl/imx-wm8962.c linux-linaro-stable-mx6/sound
return 0;
}
-diff -Nur linux-3.14.15/sound/soc/fsl/Kconfig linux-linaro-stable-mx6/sound/soc/fsl/Kconfig
---- linux-3.14.15/sound/soc/fsl/Kconfig 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/fsl/Kconfig 2014-08-20 19:31:58.740923149 +0200
+diff -Nur linux-3.14.17/sound/soc/fsl/Kconfig linux-imx6-3.14/sound/soc/fsl/Kconfig
+--- linux-3.14.17/sound/soc/fsl/Kconfig 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/sound/soc/fsl/Kconfig 2014-09-09 11:49:34.388606557 +0200
@@ -11,6 +11,12 @@
config SND_SOC_FSL_ESAI
tristate
@@ -235137,7 +239784,7 @@ diff -Nur linux-3.14.15/sound/soc/fsl/Kconfig linux-linaro-stable-mx6/sound/soc/
select SND_SOC_GENERIC_DMAENGINE_PCM
+config SND_SOC_IMX_HDMI_DMA
-+ bool
++ tristate
+ select SND_SOC_GENERIC_DMAENGINE_PCM
+ select SND_SOC_IMX_PCM_DMA
+
@@ -235181,9 +239828,9 @@ diff -Nur linux-3.14.15/sound/soc/fsl/Kconfig linux-linaro-stable-mx6/sound/soc/
config SND_SOC_IMX_MC13783
tristate "SoC Audio support for I.MX boards with mc13783"
depends on MFD_MC13XXX && ARM
-diff -Nur linux-3.14.15/sound/soc/fsl/Makefile linux-linaro-stable-mx6/sound/soc/fsl/Makefile
---- linux-3.14.15/sound/soc/fsl/Makefile 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/fsl/Makefile 2014-08-20 19:31:58.740923149 +0200
+diff -Nur linux-3.14.17/sound/soc/fsl/Makefile linux-imx6-3.14/sound/soc/fsl/Makefile
+--- linux-3.14.17/sound/soc/fsl/Makefile 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/sound/soc/fsl/Makefile 2014-09-09 10:13:52.784986217 +0200
@@ -14,13 +14,19 @@
snd-soc-fsl-sai-objs := fsl_sai.o
snd-soc-fsl-ssi-objs := fsl_ssi.o
@@ -235232,9 +239879,9 @@ diff -Nur linux-3.14.15/sound/soc/fsl/Makefile linux-linaro-stable-mx6/sound/soc
obj-$(CONFIG_SND_SOC_IMX_SPDIF) += snd-soc-imx-spdif.o
+obj-$(CONFIG_SND_SOC_IMX_HDMI) += snd-soc-imx-hdmi.o
obj-$(CONFIG_SND_SOC_IMX_MC13783) += snd-soc-imx-mc13783.o
-diff -Nur linux-3.14.15/sound/soc/soc-pcm.c linux-linaro-stable-mx6/sound/soc/soc-pcm.c
---- linux-3.14.15/sound/soc/soc-pcm.c 2014-07-31 23:51:43.000000000 +0200
-+++ linux-linaro-stable-mx6/sound/soc/soc-pcm.c 2014-08-20 19:31:59.380925896 +0200
+diff -Nur linux-3.14.17/sound/soc/soc-pcm.c linux-imx6-3.14/sound/soc/soc-pcm.c
+--- linux-3.14.17/sound/soc/soc-pcm.c 2014-08-14 03:38:34.000000000 +0200
++++ linux-imx6-3.14/sound/soc/soc-pcm.c 2014-09-09 10:13:52.808986412 +0200
@@ -945,7 +945,7 @@
}
}
diff --git a/target/config/Config.in.libc.choice b/target/config/Config.in.libc.choice
index 609ab5cdb..31a626664 100644
--- a/target/config/Config.in.libc.choice
+++ b/target/config/Config.in.libc.choice
@@ -72,6 +72,11 @@ config ADK_TARGET_LIB_UCLIBC_NG_GIT
select ADK_DISABLE_CHECKSUM
depends on ADK_TARGET_LIB_UCLIBC_NG
+config ADK_TARGET_LIB_GLIBC_2_20
+ prompt "2.20"
+ boolean
+ depends on ADK_TARGET_LIB_GLIBC
+
config ADK_TARGET_LIB_GLIBC_2_19
prompt "2.19"
boolean
diff --git a/target/config/Config.in.libc.default b/target/config/Config.in.libc.default
index f0daedd2d..04c6b4204 100644
--- a/target/config/Config.in.libc.default
+++ b/target/config/Config.in.libc.default
@@ -24,7 +24,7 @@ config ADK_LIBC_VERSION
string
default "1.1.4" if ADK_TARGET_LIB_MUSL_1_1_4
default "0.9.33.2" if ADK_TARGET_LIB_UCLIBC_0_9_33_2
- default "2.19" if ADK_TARGET_LIB_GLIBC_2_19
+ default "2.20" if ADK_TARGET_LIB_GLIBC_2_20
default "git" if ADK_TARGET_LIB_UCLIBC_NG_GIT || \
ADK_TARGET_LIB_UCLIBC_GIT || \
ADK_TARGET_LIB_MUSL_GIT || \
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index 3f2541a7c..461605efd 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -104,13 +104,6 @@ config ADK_KERNEL_CPU_MIPS64_R1
config ADK_KERNEL_CPU_MIPS64_R2
boolean
-# page size
-config ADK_KERNEL_PAGE_SIZE_4KB
- boolean
-
-config ADK_KERNEL_PAGE_SIZE_16KB
- boolean
-
# ARM specific
config ADK_KERNEL_AEABI
boolean
@@ -212,4 +205,23 @@ config ADK_KERNEL_CC_OPTIMIZE_FOR_SIZE
depends on !ADK_LINUX_MICROBLAZE
default y
+choice
+prompt "Page size"
+depends on ADK_LINUX_MIPS64
+default ADK_KERNEL_PAGE_SIZE_16KB if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+default ADK_KERNEL_PAGE_SIZE_4KB
+
+config ADK_KERNEL_PAGE_SIZE_4KB
+ prompt "4kB"
+ boolean
+
+config ADK_KERNEL_PAGE_SIZE_16KB
+ prompt "16kB"
+ boolean
+
+config ADK_KERNEL_PAGE_SIZE_64KB
+ prompt "64kB"
+ boolean
+
+endchoice
endmenu