summaryrefslogtreecommitdiff
path: root/target/arm/solidrun-imx6/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-09-11 21:55:34 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-09-11 21:55:34 +0200
commit4d8e57a9ba0a95bd0c9c461ee8f6345d0f4b43fc (patch)
treedd6904bc07859ea8e55d1d2437e2df70d0d3b090 /target/arm/solidrun-imx6/patches
parent0694a413be00c3e67b056686985a76d2554e60d4 (diff)
sync kernel patch, maybe analog audio works for hummingboard
Diffstat (limited to 'target/arm/solidrun-imx6/patches')
-rw-r--r--target/arm/solidrun-imx6/patches/3.14.17/solidrun.patch2166
1 files changed, 1089 insertions, 1077 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 509e58943..d2eac10fb 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.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
++++ linux-imx6-3.14/arch/arm/boot/dts/clcd-panels.dtsi 2014-09-11 18:05:52.586000344 +0200
@@ -0,0 +1,52 @@
+/*
+ * ARM Ltd. Versatile Express
@@ -56,7 +56,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/clcd-panels.dtsi linux-imx6-3.14/arch/
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/dra7-evm.dts 2014-09-11 18:05:52.590000359 +0200
@@ -182,7 +182,6 @@
regulator-name = "ldo3";
regulator-min-microvolt = <1800000>;
@@ -67,7 +67,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/dra7-evm.dts linux-imx6-3.14/arch/arm/
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
++++ linux-imx6-3.14/arch/arm/boot/dts/efm32gg-dk3750.dts 2014-09-11 18:05:52.590000359 +0200
@@ -26,7 +26,7 @@
};
@@ -79,7 +79,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/efm32gg-dk3750.dts linux-imx6-3.14/arc
temp@48 {
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
++++ linux-imx6-3.14/arch/arm/boot/dts/hi3620.dtsi 2014-09-11 18:05:52.590000359 +0200
@@ -73,7 +73,7 @@
L2: l2-cache {
@@ -91,7 +91,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/hi3620.dtsi linux-imx6-3.14/arch/arm/b
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx23.dtsi 2014-09-11 18:05:52.594000374 +0200
@@ -363,7 +363,8 @@
compatible = "fsl,imx23-lcdif";
reg = <0x80030000 2000>;
@@ -104,7 +104,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx23.dtsi linux-imx6-3.14/arch/arm/bo
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx25.dtsi 2014-09-11 18:05:52.594000374 +0200
@@ -13,6 +13,7 @@
/ {
@@ -123,7 +123,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx25.dtsi linux-imx6-3.14/arch/arm/bo
};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx25-karo-tx25.dts 2014-09-11 18:05:52.594000374 +0200
@@ -16,6 +16,10 @@
model = "Ka-Ro TX25";
compatible = "karo,imx25-tx25", "fsl,imx25";
@@ -137,7 +137,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx25-karo-tx25.dts linux-imx6-3.14/ar
};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx27-apf27.dts 2014-09-11 18:05:52.594000374 +0200
@@ -29,6 +29,7 @@
osc26m {
@@ -148,7 +148,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx27-apf27.dts linux-imx6-3.14/arch/a
};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx27.dtsi 2014-09-11 18:05:52.594000374 +0200
@@ -13,6 +13,7 @@
/ {
@@ -167,7 +167,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx27.dtsi linux-imx6-3.14/arch/arm/bo
};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts 2014-09-11 18:05:52.594000374 +0200
@@ -15,6 +15,10 @@
model = "Phytec pca100 rapid development kit";
compatible = "phytec,imx27-pca100-rdk", "phytec,imx27-pca100", "fsl,imx27";
@@ -181,7 +181,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts linux-i
native-mode = <&timing0>;
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx28.dtsi 2014-09-11 18:05:52.614000456 +0200
@@ -840,7 +840,8 @@
compatible = "fsl,imx28-lcdif";
reg = <0x80030000 0x2000>;
@@ -194,7 +194,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx28.dtsi linux-imx6-3.14/arch/arm/bo
status = "disabled";
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx51-babbage.dts 2014-09-11 18:05:52.614000456 +0200
@@ -17,6 +17,10 @@
model = "Freescale i.MX51 Babbage Board";
compatible = "fsl,imx51-babbage", "fsl,imx51";
@@ -208,7 +208,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx51-babbage.dts linux-imx6-3.14/arch
};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx51.dtsi 2014-09-11 18:05:52.614000456 +0200
@@ -15,6 +15,7 @@
/ {
@@ -245,7 +245,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx51.dtsi linux-imx6-3.14/arch/arm/bo
};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx53.dtsi 2014-09-11 18:05:52.634000535 +0200
@@ -15,6 +15,7 @@
/ {
@@ -282,7 +282,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx53.dtsi linux-imx6-3.14/arch/arm/bo
};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx53-mba53.dts 2014-09-11 18:05:52.614000456 +0200
@@ -25,6 +25,10 @@
enable-active-low;
};
@@ -296,7 +296,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx53-mba53.dts linux-imx6-3.14/arch/a
pwms = <&pwm2 0 50000>;
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts 2014-09-11 18:05:52.634000535 +0200
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013 Sascha Hauer <s.hauer@pengutronix.de>
@@ -323,7 +323,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts linux-imx6-3.
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl.dtsi 2014-09-11 18:05:52.634000535 +0200
@@ -8,6 +8,7 @@
*
*/
@@ -491,7 +491,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl.dtsi linux-imx6-3.14/arch/arm/b
};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw51xx.dts 2014-09-11 18:05:52.634000535 +0200
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -514,7 +514,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-gw51xx.dts linux-imx6-3.14/arch
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw52xx.dts 2014-09-11 18:05:52.634000535 +0200
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -537,7 +537,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-gw52xx.dts linux-imx6-3.14/arch
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw53xx.dts 2014-09-11 18:05:52.634000535 +0200
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -560,7 +560,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-gw53xx.dts linux-imx6-3.14/arch
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw54xx.dts 2014-09-11 18:05:52.634000535 +0200
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -583,7 +583,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-gw54xx.dts linux-imx6-3.14/arch
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-hummingboard.dts 2014-09-11 18:05:52.634000535 +0200
@@ -1,163 +1,13 @@
/*
- * Copyright (C) 2013,2014 Russell King
@@ -755,7 +755,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-hummingboard.dts linux-imx6-3.1
};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-nitrogen6x.dts 2014-09-11 18:05:52.634000535 +0200
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2013 Boundary Devices, Inc.
@@ -780,7 +780,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-nitrogen6x.dts linux-imx6-3.14/
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts 2014-09-11 18:05:52.634000535 +0200
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2013 Christian Hemp, Phytec Messtechnik GmbH
@@ -803,7 +803,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts linux-imx6-3.
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi 2014-09-11 18:05:52.634000535 +0200
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2013 Christian Hemp, Phytec Messtechnik GmbH
@@ -829,7 +829,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi linux-imx6-3
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-pinfunc.h 2014-09-11 18:05:52.634000535 +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
@@ -848,7 +848,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-pinfunc.h linux-imx6-3.14/arch/
#define MX6QDL_PAD_SD1_CMD__SD1_CMD 0x2e0 0x6c8 0x000 0x0 0x0
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-sabreauto.dts 2014-09-11 18:05:52.634000535 +0200
@@ -15,3 +15,16 @@
model = "Freescale i.MX6 DualLite/Solo SABRE Automotive Board";
compatible = "fsl,imx6dl-sabreauto", "fsl,imx6dl";
@@ -868,7 +868,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-sabreauto.dts linux-imx6-3.14/a
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-sabrelite.dts 2014-09-11 18:05:52.634000535 +0200
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2011 Freescale Semiconductor, Inc.
@@ -892,7 +892,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-sabrelite.dts linux-imx6-3.14/a
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-sabresd.dts 2014-09-11 18:05:52.634000535 +0200
@@ -15,3 +15,20 @@
model = "Freescale i.MX6 DualLite SABRE Smart Device Board";
compatible = "fsl,imx6dl-sabresd", "fsl,imx6dl";
@@ -916,7 +916,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-sabresd.dts linux-imx6-3.14/arc
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts 2014-09-11 18:05:52.634000535 +0200
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -939,7 +939,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts linux-imx6-3.1
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-arm2.dts 2014-09-11 18:05:52.634000535 +0200
@@ -23,14 +23,27 @@
regulators {
@@ -1152,7 +1152,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-arm2.dts linux-imx6-3.14/arch/ar
};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-arm2-hsic.dts 2014-09-11 18:05:52.634000535 +0200
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2013 Freescale Semiconductor, Inc.
@@ -1188,7 +1188,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-arm2-hsic.dts linux-imx6-3.14/ar
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-cm-fx6.dts 2014-09-11 18:05:52.634000535 +0200
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2013 CompuLab Ltd.
@@ -1299,7 +1299,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-cm-fx6.dts linux-imx6-3.14/arch/
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-cubox-i.dts 2014-09-11 18:05:52.634000535 +0200
@@ -13,4 +13,8 @@
&sata {
@@ -1311,7 +1311,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-cubox-i.dts linux-imx6-3.14/arch
};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts 2014-09-11 18:05:52.634000535 +0200
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013 Sascha Hauer <s.hauer@pengutronix.de>
@@ -1338,7 +1338,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts linux-imx6-3.1
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2014-09-11 18:05:52.642000568 +0200
@@ -5,11 +5,33 @@
#include "imx6qdl-microsom-ar8035.dtsi"
@@ -1575,7 +1575,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-imx6-3.14/a
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi 2014-09-11 18:05:52.642000568 +0200
@@ -0,0 +1,199 @@
+/ {
+ regulators {
@@ -1778,7 +1778,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi linux-imx6-
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl.dtsi 2014-09-11 18:05:52.646000583 +0200
@@ -10,10 +10,16 @@
* http://www.gnu.org/copyleft/gpl.html
*/
@@ -3472,7 +3472,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl.dtsi linux-imx6-3.14/arch/arm/
};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi 2014-09-11 18:05:52.642000568 +0200
@@ -0,0 +1,374 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -3850,7 +3850,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi linux-imx6-3.14/ar
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi 2014-09-11 18:05:52.642000568 +0200
@@ -0,0 +1,527 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -4381,7 +4381,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi linux-imx6-3.14/ar
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi 2014-09-11 18:05:52.642000568 +0200
@@ -0,0 +1,572 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -4957,7 +4957,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi linux-imx6-3.14/ar
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi 2014-09-11 18:05:52.642000568 +0200
@@ -0,0 +1,599 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -5560,7 +5560,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi linux-imx6-3.14/ar
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi 2014-09-11 18:05:52.642000568 +0200
@@ -0,0 +1,339 @@
+/*
+ * Copyright (C) 2013,2014 Russell King
@@ -5903,7 +5903,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi linux-imx6-3
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi 2014-09-11 18:05:52.642000568 +0200
@@ -17,7 +17,7 @@
enet {
pinctrl_microsom_enet_ar8035: microsom-enet-ar8035 {
@@ -5952,7 +5952,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi linux-imx
* As the RMII pins are also connected to RGMII
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2014-09-11 18:05:52.642000568 +0200
@@ -1,9 +1,69 @@
/*
* Copyright (C) 2013,2014 Russell King
@@ -6082,7 +6082,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-microsom.dtsi linux-imx6-3.14/
+
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi 2014-09-11 18:05:52.642000568 +0200
@@ -0,0 +1,426 @@
+/*
+ * Copyright 2013 Boundary Devices, Inc.
@@ -6512,7 +6512,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi linux-imx6-3.1
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi 2014-09-11 18:05:52.642000568 +0200
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2013 Christian Hemp, Phytec Messtechnik GmbH
@@ -6614,7 +6614,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi linux-imx6-
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi 2014-09-11 18:05:52.642000568 +0200
@@ -0,0 +1,356 @@
+/*
+ * Copyright 2013 Christian Hemp, Phytec Messtechnik GmbH
@@ -6974,7 +6974,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi linux-imx6-
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi 2014-09-11 18:05:52.642000568 +0200
@@ -10,17 +10,146 @@
* http://www.gnu.org/copyleft/gpl.html
*/
@@ -7675,7 +7675,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi linux-imx6-3.14
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi 2014-09-11 18:05:52.642000568 +0200
@@ -0,0 +1,427 @@
+/*
+ * Copyright 2011 Freescale Semiconductor, Inc.
@@ -8106,7 +8106,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi linux-imx6-3.14
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2014-09-11 18:05:52.646000583 +0200
@@ -10,16 +10,33 @@
* http://www.gnu.org/copyleft/gpl.html
*/
@@ -8801,7 +8801,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-imx6-3.14/a
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-wandboard.dtsi 2014-09-11 18:05:52.646000583 +0200
@@ -12,17 +12,21 @@
/ {
regulators {
@@ -9028,7 +9028,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6qdl-wandboard.dtsi linux-imx6-3.14
};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts 2014-09-11 18:05:52.634000535 +0200
@@ -0,0 +1,432 @@
+/*
+ * Copyright 2013 Data Modul AG
@@ -9464,7 +9464,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts linux-imx6-3.14/
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q.dtsi 2014-09-11 18:05:52.642000568 +0200
@@ -8,10 +8,16 @@
*
*/
@@ -9663,7 +9663,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q.dtsi linux-imx6-3.14/arch/arm/bo
-};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-gk802.dts 2014-09-11 18:05:52.634000535 +0200
@@ -0,0 +1,229 @@
+/*
+ * Copyright (C) 2013 Philipp Zabel
@@ -9896,7 +9896,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-gk802.dts linux-imx6-3.14/arch/a
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw51xx.dts 2014-09-11 18:05:52.634000535 +0200
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -9919,7 +9919,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-gw51xx.dts linux-imx6-3.14/arch/
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw52xx.dts 2014-09-11 18:05:52.634000535 +0200
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -9946,7 +9946,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-gw52xx.dts linux-imx6-3.14/arch/
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw53xx.dts 2014-09-11 18:05:52.642000568 +0200
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -9973,7 +9973,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-gw53xx.dts linux-imx6-3.14/arch/
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw5400-a.dts 2014-09-11 18:05:52.642000568 +0200
@@ -0,0 +1,543 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -10520,7 +10520,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-gw5400-a.dts linux-imx6-3.14/arc
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw54xx.dts 2014-09-11 18:05:52.642000568 +0200
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -10547,7 +10547,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-gw54xx.dts linux-imx6-3.14/arch/
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-hummingboard.dts 2014-09-11 18:05:52.642000568 +0200
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2014 Rabeeh Khoury (rabeeh@solid-run.com)
@@ -10572,7 +10572,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-hummingboard.dts linux-imx6-3.14
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-nitrogen6x.dts 2014-09-11 18:05:52.642000568 +0200
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2013 Boundary Devices, Inc.
@@ -10601,7 +10601,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-nitrogen6x.dts linux-imx6-3.14/a
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-phytec-pbab01.dts 2014-09-11 18:05:52.642000568 +0200
@@ -11,24 +11,17 @@
/dts-v1/;
@@ -10635,7 +10635,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-phytec-pbab01.dts linux-imx6-3.1
};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi 2014-09-11 18:05:52.642000568 +0200
@@ -10,171 +10,13 @@
*/
@@ -10812,7 +10812,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi linux-imx6-3.
-};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-pinfunc.h 2014-09-11 18:05:52.642000568 +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
@@ -10831,7 +10831,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-pinfunc.h linux-imx6-3.14/arch/a
#define MX6QDL_PAD_SD2_CLK__SD2_CLK 0x354 0x73c 0x000 0x0 0x0
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-sabreauto.dts 2014-09-11 18:05:52.642000568 +0200
@@ -20,6 +20,22 @@
compatible = "fsl,imx6q-sabreauto", "fsl,imx6q";
};
@@ -10857,7 +10857,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-sabreauto.dts linux-imx6-3.14/ar
};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-sabrelite.dts 2014-09-11 18:05:52.642000568 +0200
@@ -12,189 +12,13 @@
/dts-v1/;
@@ -11051,7 +11051,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-sabrelite.dts linux-imx6-3.14/ar
-};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-sabresd.dts 2014-09-11 18:05:52.642000568 +0200
@@ -23,3 +23,19 @@
&sata {
status = "okay";
@@ -11074,7 +11074,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-sabresd.dts linux-imx6-3.14/arch
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts 2014-09-11 18:05:52.642000568 +0200
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2012-2013 Freescale Semiconductor, Inc.
@@ -11101,7 +11101,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts linux-imx6-3.14
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-sbc6x.dts 2014-09-11 18:05:52.642000568 +0200
@@ -17,28 +17,78 @@
};
};
@@ -11187,7 +11187,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-sbc6x.dts linux-imx6-3.14/arch/a
};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-udoo.dts 2014-09-11 18:05:52.642000568 +0200
@@ -16,24 +16,78 @@
model = "Udoo i.MX6 Quad Board";
compatible = "udoo,imx6q-udoo", "fsl,imx6q";
@@ -11271,7 +11271,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6q-udoo.dts linux-imx6-3.14/arch/ar
};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6sl.dtsi 2014-09-11 18:05:52.646000583 +0200
@@ -7,12 +7,14 @@
*
*/
@@ -12310,7 +12310,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6sl.dtsi linux-imx6-3.14/arch/arm/b
};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6sl-evk-csi.dts 2014-09-11 18:05:52.646000583 +0200
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -12341,7 +12341,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6sl-evk-csi.dts linux-imx6-3.14/arc
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6sl-evk.dts 2014-09-11 18:05:52.646000583 +0200
@@ -8,6 +8,8 @@
/dts-v1/;
@@ -13105,7 +13105,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6sl-evk.dts linux-imx6-3.14/arch/ar
+};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/Makefile 2014-09-11 18:05:52.582000327 +0200
@@ -154,16 +154,37 @@
imx53-qsb.dtb \
imx53-smd.dtb \
@@ -13162,7 +13162,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/Makefile linux-imx6-3.14/arch/arm/boot
wm8505-ref.dtb \
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
++++ linux-imx6-3.14/arch/arm/boot/dts/marco.dtsi 2014-09-11 18:05:52.662000648 +0200
@@ -36,7 +36,7 @@
ranges = <0x40000000 0x40000000 0xa0000000>;
@@ -13174,7 +13174,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/marco.dtsi linux-imx6-3.14/arch/arm/bo
arm,tag-latency = <1 1 1>;
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
++++ linux-imx6-3.14/arch/arm/boot/dts/prima2.dtsi 2014-09-11 18:05:52.686000742 +0200
@@ -48,7 +48,7 @@
ranges = <0x40000000 0x40000000 0x80000000>;
@@ -13186,7 +13186,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/prima2.dtsi linux-imx6-3.14/arch/arm/b
arm,tag-latency = <1 1 1>;
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
++++ linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts 2014-09-11 18:05:52.686000742 +0200
@@ -0,0 +1,159 @@
+/*
+ * ARM Ltd. Fast Models
@@ -13349,7 +13349,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts linux-imx6-3.
+/include/ "clcd-panels.dtsi"
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
++++ linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts 2014-09-11 18:05:52.686000742 +0200
@@ -0,0 +1,165 @@
+/*
+ * ARM Ltd. Fast Models
@@ -13518,7 +13518,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts linux-imx6-3.
+/include/ "clcd-panels.dtsi"
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
++++ linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts 2014-09-11 18:05:52.686000742 +0200
@@ -0,0 +1,177 @@
+/*
+ * ARM Ltd. Fast Models
@@ -13699,7 +13699,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts linux-imx6-3.
+/include/ "clcd-panels.dtsi"
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
++++ linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts 2014-09-11 18:05:52.686000742 +0200
@@ -0,0 +1,171 @@
+/*
+ * ARM Ltd. Fast Models
@@ -13874,7 +13874,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts linux-imx6-3.1
+/include/ "clcd-panels.dtsi"
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
++++ linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts 2014-09-11 18:05:52.686000742 +0200
@@ -0,0 +1,183 @@
+/*
+ * ARM Ltd. Fast Models
@@ -14061,7 +14061,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts linux-imx6-3.1
+/include/ "clcd-panels.dtsi"
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
++++ linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi 2014-09-11 18:05:52.686000742 +0200
@@ -0,0 +1,231 @@
+/*
+ * ARM Ltd. Fast Models
@@ -14296,7 +14296,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi linux-imx6-3.
+ };
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
++++ linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts 2014-09-11 18:05:52.686000742 +0200
@@ -0,0 +1,233 @@
+/*
+ * ARM Ltd. Fast Models
@@ -14533,7 +14533,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts linux-imx
+/include/ "clcd-panels.dtsi"
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
++++ linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts 2014-09-11 18:05:52.686000742 +0200
@@ -0,0 +1,317 @@
+/*
+ * ARM Ltd. Fast Models
@@ -14854,7 +14854,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts linux-imx
+/include/ "clcd-panels.dtsi"
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
++++ linux-imx6-3.14/arch/arm/boot/dts/vexpress-v2m.dtsi 2014-09-11 18:05:52.742000967 +0200
@@ -227,6 +227,7 @@
};
@@ -14865,7 +14865,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/vexpress-v2m.dtsi linux-imx6-3.14/arch
interrupts = <14>;
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
++++ linux-imx6-3.14/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi 2014-09-11 18:05:52.742000967 +0200
@@ -228,6 +228,7 @@
};
@@ -14876,7 +14876,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi linux-imx6-3.14/
interrupts = <14>;
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
++++ linux-imx6-3.14/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts 2014-09-11 18:05:52.742000967 +0200
@@ -9,6 +9,8 @@
/dts-v1/;
@@ -15074,7 +15074,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts linux-imx6-3.
arm,vexpress,config-bridge = <&v2m_sysreg>;
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
++++ linux-imx6-3.14/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts 2014-09-11 18:05:52.742000967 +0200
@@ -9,6 +9,8 @@
/dts-v1/;
@@ -15095,7 +15095,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts linux-imx6-3
memory-controller@2b0a0000 {
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
++++ linux-imx6-3.14/arch/arm/boot/dts/vexpress-v2p-ca5s.dts 2014-09-11 18:05:52.742000967 +0200
@@ -9,6 +9,8 @@
/dts-v1/;
@@ -15116,7 +15116,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/vexpress-v2p-ca5s.dts linux-imx6-3.14/
memory-controller@2a150000 {
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
++++ linux-imx6-3.14/arch/arm/boot/dts/vexpress-v2p-ca9.dts 2014-09-11 18:05:52.746000984 +0200
@@ -9,6 +9,8 @@
/dts-v1/;
@@ -15137,7 +15137,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/vexpress-v2p-ca9.dts linux-imx6-3.14/a
memory-controller@100e0000 {
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
++++ linux-imx6-3.14/arch/arm/boot/dts/vf610.dtsi 2014-09-11 18:05:52.746000984 +0200
@@ -44,11 +44,13 @@
sxosc {
@@ -15154,7 +15154,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/vf610.dtsi linux-imx6-3.14/arch/arm/bo
};
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
++++ linux-imx6-3.14/arch/arm/boot/dts/vf610-twr.dts 2014-09-11 18:05:52.746000984 +0200
@@ -25,11 +25,13 @@
clocks {
audio_ext {
@@ -15171,7 +15171,7 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/vf610-twr.dts linux-imx6-3.14/arch/arm
};
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
++++ linux-imx6-3.14/arch/arm/common/Makefile 2014-09-11 18:05:52.754001015 +0200
@@ -13,6 +13,7 @@
obj-$(CONFIG_PCI_HOST_ITE8152) += it8152.o
obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp.o
@@ -15182,7 +15182,7 @@ diff -Nur linux-3.14.17/arch/arm/common/Makefile linux-imx6-3.14/arch/arm/common
obj-$(CONFIG_TI_PRIV_EDMA) += edma.o
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
++++ linux-imx6-3.14/arch/arm/configs/imx_v6_v7_defconfig 2014-09-11 18:05:52.798001191 +0200
@@ -45,6 +45,9 @@
CONFIG_AEABI=y
CONFIG_HIGHMEM=y
@@ -15299,7 +15299,7 @@ diff -Nur linux-3.14.17/arch/arm/configs/imx_v6_v7_defconfig linux-imx6-3.14/arc
CONFIG_PWM=y
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
++++ linux-imx6-3.14/arch/arm/configs/imx_v7_cbi_hb_base_defconfig 2014-09-11 18:05:52.798001191 +0200
@@ -0,0 +1,367 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_KERNEL_LZO=y
@@ -15670,7 +15670,7 @@ diff -Nur linux-3.14.17/arch/arm/configs/imx_v7_cbi_hb_base_defconfig linux-imx6
+CONFIG_IR_GPIO_CIR=m
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
++++ linux-imx6-3.14/arch/arm/configs/imx_v7_cbi_hb_defconfig 2014-09-11 18:05:52.798001191 +0200
@@ -0,0 +1,5138 @@
+#
+# Automatically generated make config: don't edit
@@ -20812,7 +20812,7 @@ diff -Nur linux-3.14.17/arch/arm/configs/imx_v7_cbi_hb_defconfig linux-imx6-3.14
+
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
++++ linux-imx6-3.14/arch/arm/configs/imx_v7_defconfig 2014-09-11 18:05:52.798001191 +0200
@@ -0,0 +1,343 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_KERNEL_LZO=y
@@ -21159,7 +21159,7 @@ diff -Nur linux-3.14.17/arch/arm/configs/imx_v7_defconfig linux-imx6-3.14/arch/a
+CONFIG_LIBCRC32C=m
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
++++ linux-imx6-3.14/arch/arm/configs/imx_v7_mfg_defconfig 2014-09-11 18:05:52.798001191 +0200
@@ -0,0 +1,341 @@
+CONFIG_KERNEL_LZO=y
+CONFIG_SYSVIPC=y
@@ -21504,7 +21504,7 @@ diff -Nur linux-3.14.17/arch/arm/configs/imx_v7_mfg_defconfig linux-imx6-3.14/ar
+CONFIG_LIBCRC32C=m
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
++++ linux-imx6-3.14/arch/arm/crypto/aesbs-glue.c 2014-09-11 18:05:52.806001223 +0200
@@ -137,7 +137,7 @@
dst += AES_BLOCK_SIZE;
} while (--blocks);
@@ -21552,7 +21552,7 @@ diff -Nur linux-3.14.17/arch/arm/crypto/aesbs-glue.c linux-imx6-3.14/arch/arm/cr
}
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
++++ linux-imx6-3.14/arch/arm/include/asm/arch_timer.h 2014-09-11 18:05:52.810001239 +0200
@@ -107,7 +107,6 @@
/* Also disable virtual event stream */
cntkctl &= ~(ARCH_TIMER_USR_PT_ACCESS_EN
@@ -21563,7 +21563,7 @@ diff -Nur linux-3.14.17/arch/arm/include/asm/arch_timer.h linux-imx6-3.14/arch/a
arch_timer_set_cntkctl(cntkctl);
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
++++ linux-imx6-3.14/arch/arm/include/asm/atomic.h 2014-09-11 18:05:52.810001239 +0200
@@ -60,6 +60,7 @@
int result;
@@ -21694,7 +21694,7 @@ diff -Nur linux-3.14.17/arch/arm/include/asm/atomic.h linux-imx6-3.14/arch/arm/i
"1: ldrexd %0, %H0, [%4]\n"
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
++++ linux-imx6-3.14/arch/arm/include/asm/cmpxchg.h 2014-09-11 18:05:52.810001239 +0200
@@ -2,6 +2,7 @@
#define __ASM_ARM_CMPXCHG_H
@@ -21731,7 +21731,7 @@ diff -Nur linux-3.14.17/arch/arm/include/asm/cmpxchg.h linux-imx6-3.14/arch/arm/
" teq %1, %4\n"
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
++++ linux-imx6-3.14/arch/arm/include/asm/ftrace.h 2014-09-11 18:05:52.810001239 +0200
@@ -52,15 +52,7 @@
#endif
@@ -21751,7 +21751,7 @@ diff -Nur linux-3.14.17/arch/arm/include/asm/ftrace.h linux-imx6-3.14/arch/arm/i
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
++++ linux-imx6-3.14/arch/arm/include/asm/futex.h 2014-09-11 18:05:52.810001239 +0200
@@ -23,6 +23,7 @@
#define __futex_atomic_op(insn, ret, oldval, tmp, uaddr, oparg) \
@@ -21771,7 +21771,7 @@ diff -Nur linux-3.14.17/arch/arm/include/asm/futex.h linux-imx6-3.14/arch/arm/in
" teq %1, %2\n"
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
++++ linux-imx6-3.14/arch/arm/include/asm/glue-cache.h 2014-09-11 18:05:52.810001239 +0200
@@ -102,19 +102,19 @@
#endif
@@ -21802,7 +21802,7 @@ diff -Nur linux-3.14.17/arch/arm/include/asm/glue-cache.h linux-imx6-3.14/arch/a
#if defined(CONFIG_CPU_V7M)
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
++++ linux-imx6-3.14/arch/arm/include/asm/hardware/cache-l2x0.h 2014-09-11 18:05:52.814001255 +0200
@@ -26,8 +26,8 @@
#define L2X0_CACHE_TYPE 0x004
#define L2X0_CTRL 0x100
@@ -21943,7 +21943,7 @@ diff -Nur linux-3.14.17/arch/arm/include/asm/hardware/cache-l2x0.h linux-imx6-3.
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
++++ linux-imx6-3.14/arch/arm/include/asm/outercache.h 2014-09-11 18:05:52.898001590 +0200
@@ -21,6 +21,7 @@
#ifndef __ASM_OUTERCACHE_H
#define __ASM_OUTERCACHE_H
@@ -22074,7 +22074,7 @@ diff -Nur linux-3.14.17/arch/arm/include/asm/outercache.h linux-imx6-3.14/arch/a
if (outer_cache.sync)
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
++++ linux-imx6-3.14/arch/arm/include/asm/pmu.h 2014-09-11 18:05:52.902001607 +0200
@@ -62,9 +62,19 @@
raw_spinlock_t pmu_lock;
};
@@ -22106,7 +22106,7 @@ diff -Nur linux-3.14.17/arch/arm/include/asm/pmu.h linux-imx6-3.14/arch/arm/incl
struct mutex reserve_mutex;
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
++++ linux-imx6-3.14/arch/arm/include/asm/psci.h 2014-09-11 18:05:52.902001607 +0200
@@ -16,6 +16,10 @@
#define PSCI_POWER_STATE_TYPE_STANDBY 0
@@ -22133,7 +22133,7 @@ diff -Nur linux-3.14.17/arch/arm/include/asm/psci.h linux-imx6-3.14/arch/arm/inc
#endif /* __ASM_ARM_PSCI_H */
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
++++ linux-imx6-3.14/arch/arm/include/asm/topology.h 2014-09-11 18:05:52.906001623 +0200
@@ -26,11 +26,14 @@
void init_cpu_topology(void);
void store_cpu_topology(unsigned int cpuid);
@@ -22151,7 +22151,7 @@ diff -Nur linux-3.14.17/arch/arm/include/asm/topology.h linux-imx6-3.14/arch/arm
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
++++ linux-imx6-3.14/arch/arm/Kconfig 2014-09-11 18:05:52.578000311 +0200
@@ -1216,19 +1216,6 @@
register of the Cortex-A9 which reduces the linefill issuing
capabilities of the processor.
@@ -22271,7 +22271,7 @@ diff -Nur linux-3.14.17/arch/arm/Kconfig linux-imx6-3.14/arch/arm/Kconfig
The kernel memory allocator divides physically contiguous memory
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
++++ linux-imx6-3.14/arch/arm/kernel/perf_event.c 2014-09-11 18:05:52.950001797 +0200
@@ -12,6 +12,7 @@
*/
#define pr_fmt(fmt) "hw perfevents: " fmt
@@ -22342,7 +22342,7 @@ diff -Nur linux-3.14.17/arch/arm/kernel/perf_event.c linux-imx6-3.14/arch/arm/ke
return -EOPNOTSUPP;
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
++++ linux-imx6-3.14/arch/arm/kernel/perf_event_cpu.c 2014-09-11 18:05:52.950001797 +0200
@@ -19,6 +19,7 @@
#define pr_fmt(fmt) "CPU PMU: " fmt
@@ -22608,7 +22608,7 @@ diff -Nur linux-3.14.17/arch/arm/kernel/perf_event_cpu.c linux-imx6-3.14/arch/ar
}
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
++++ linux-imx6-3.14/arch/arm/kernel/perf_event_v7.c 2014-09-11 18:05:52.950001797 +0200
@@ -950,6 +950,51 @@
}
#endif
@@ -22717,7 +22717,7 @@ diff -Nur linux-3.14.17/arch/arm/kernel/perf_event_v7.c linux-imx6-3.14/arch/arm
cpu_pmu->set_event_filter = armv7pmu_set_event_filter;
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
++++ linux-imx6-3.14/arch/arm/kernel/process.c 2014-09-11 18:05:52.950001797 +0200
@@ -172,8 +172,10 @@
*/
void arch_cpu_idle(void)
@@ -22731,7 +22731,7 @@ diff -Nur linux-3.14.17/arch/arm/kernel/process.c linux-imx6-3.14/arch/arm/kerne
/*
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
++++ linux-imx6-3.14/arch/arm/kernel/psci.c 2014-09-11 18:05:52.950001797 +0200
@@ -42,6 +42,7 @@
#define PSCI_RET_EOPNOTSUPP -1
#define PSCI_RET_EINVAL -2
@@ -22777,7 +22777,7 @@ diff -Nur linux-3.14.17/arch/arm/kernel/psci.c linux-imx6-3.14/arch/arm/kernel/p
+}
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
++++ linux-imx6-3.14/arch/arm/kernel/setup.c 2014-09-11 18:05:52.950001797 +0200
@@ -273,6 +273,19 @@
int aliasing_icache;
unsigned int id_reg, num_sets, line_size;
@@ -22800,7 +22800,7 @@ diff -Nur linux-3.14.17/arch/arm/kernel/setup.c linux-imx6-3.14/arch/arm/kernel/
return 0;
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
++++ linux-imx6-3.14/arch/arm/kernel/topology.c 2014-09-11 18:05:52.970001878 +0200
@@ -267,6 +267,33 @@
}
@@ -22837,7 +22837,7 @@ diff -Nur linux-3.14.17/arch/arm/kernel/topology.c linux-imx6-3.14/arch/arm/kern
*/
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
++++ linux-imx6-3.14/arch/arm/lib/bitops.h 2014-09-11 18:05:52.978001911 +0200
@@ -37,6 +37,11 @@
add r1, r1, r0, lsl #2 @ Get word offset
mov r3, r2, lsl r3 @ create mask
@@ -22852,7 +22852,7 @@ diff -Nur linux-3.14.17/arch/arm/lib/bitops.h linux-imx6-3.14/arch/arm/lib/bitop
\instr r2, r2, r3 @ toggle bit
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
++++ linux-imx6-3.14/arch/arm/mach-berlin/berlin.c 2014-09-11 18:05:53.170002677 +0200
@@ -24,7 +24,7 @@
* with DT probing for L2CCs, berlin_init_machine can be removed.
* Note: 88DE3005 (Armada 1500-mini) uses pl310 l2cc
@@ -22864,7 +22864,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-berlin/berlin.c linux-imx6-3.14/arch/arm/m
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
++++ linux-imx6-3.14/arch/arm/mach-cns3xxx/core.c 2014-09-11 18:05:53.178002711 +0200
@@ -240,9 +240,9 @@
*
* 1 cycle of latency for setup, read and write accesses
@@ -22895,7 +22895,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-cns3xxx/core.c linux-imx6-3.14/arch/arm/ma
#endif /* CONFIG_CACHE_L2X0 */
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
++++ linux-imx6-3.14/arch/arm/mach-exynos/common.c 2014-09-11 18:05:53.238002950 +0200
@@ -45,9 +45,6 @@
#include "common.h"
#include "regs-pmu.h"
@@ -22917,7 +22917,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-exynos/common.c linux-imx6-3.14/arch/arm/m
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
++++ linux-imx6-3.14/arch/arm/mach-highbank/highbank.c 2014-09-11 18:05:53.274003094 +0200
@@ -20,7 +20,7 @@
#include <linux/input.h>
#include <linux/io.h>
@@ -22962,7 +22962,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-highbank/highbank.c linux-imx6-3.14/arch/a
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
++++ linux-imx6-3.14/arch/arm/mach-imx/anatop.c 2014-09-11 18:05:53.278003110 +0200
@@ -9,6 +9,7 @@
* http://www.gnu.org/copyleft/gpl.html
*/
@@ -23029,7 +23029,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/anatop.c linux-imx6-3.14/arch/arm/mach
}
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
++++ linux-imx6-3.14/arch/arm/mach-imx/busfreq_ddr3.c 2014-09-11 18:05:53.278003110 +0200
@@ -0,0 +1,471 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -23504,7 +23504,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/busfreq_ddr3.c linux-imx6-3.14/arch/ar
+}
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
++++ linux-imx6-3.14/arch/arm/mach-imx/busfreq-imx6.c 2014-09-11 18:05:53.278003110 +0200
@@ -0,0 +1,952 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -24460,7 +24460,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/busfreq-imx6.c linux-imx6-3.14/arch/ar
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/arch/arm/mach-imx/busfreq_lpddr2.c 2014-09-11 18:05:53.278003110 +0200
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -24647,7 +24647,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/busfreq_lpddr2.c linux-imx6-3.14/arch/
+}
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
++++ linux-imx6-3.14/arch/arm/mach-imx/clk.h 2014-09-11 18:05:53.302003205 +0200
@@ -23,7 +23,8 @@
};
@@ -24660,7 +24660,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/clk.h linux-imx6-3.14/arch/arm/mach-im
const char *parent_name, unsigned long flags,
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
++++ linux-imx6-3.14/arch/arm/mach-imx/clk-imx6q.c 2014-09-11 18:05:53.278003110 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2011-2013 Freescale Semiconductor, Inc.
@@ -25172,7 +25172,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/clk-imx6q.c linux-imx6-3.14/arch/arm/m
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
++++ linux-imx6-3.14/arch/arm/mach-imx/clk-imx6sl.c 2014-09-11 18:05:53.278003110 +0200
@@ -7,9 +7,29 @@
*
*/
@@ -25496,7 +25496,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/clk-imx6sl.c linux-imx6-3.14/arch/arm/
WARN_ON(!base);
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
++++ linux-imx6-3.14/arch/arm/mach-imx/clk-pfd.c 2014-09-11 18:05:53.282003126 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 Freescale Semiconductor, Inc.
@@ -25577,7 +25577,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/clk-pfd.c linux-imx6-3.14/arch/arm/mac
frac = tmp;
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
++++ linux-imx6-3.14/arch/arm/mach-imx/clk-pllv3.c 2014-09-11 18:05:53.302003205 +0200
@@ -26,12 +26,15 @@
#define BM_PLL_ENABLE (0x1 << 13)
#define BM_PLL_BYPASS (0x1 << 16)
@@ -25948,7 +25948,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/clk-pllv3.c linux-imx6-3.14/arch/arm/m
init.ops = ops;
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
++++ linux-imx6-3.14/arch/arm/mach-imx/common.h 2014-09-11 18:05:53.302003205 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -26005,7 +26005,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/common.h linux-imx6-3.14/arch/arm/mach
#else
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
++++ linux-imx6-3.14/arch/arm/mach-imx/cpuidle.h 2014-09-11 18:05:53.306003222 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 Freescale Semiconductor, Inc.
@@ -26032,7 +26032,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/cpuidle.h linux-imx6-3.14/arch/arm/mac
#endif
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
++++ linux-imx6-3.14/arch/arm/mach-imx/cpuidle-imx6q.c 2014-09-11 18:05:53.302003205 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 Freescale Semiconductor, Inc.
@@ -26053,7 +26053,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/cpuidle-imx6q.c linux-imx6-3.14/arch/a
}
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
++++ linux-imx6-3.14/arch/arm/mach-imx/cpuidle-imx6sl.c 2014-09-11 18:05:53.306003222 +0200
@@ -0,0 +1,149 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc.
@@ -26206,7 +26206,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/cpuidle-imx6sl.c linux-imx6-3.14/arch/
+}
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
++++ linux-imx6-3.14/arch/arm/mach-imx/ddr3_freq_imx6.S 2014-09-11 18:05:53.306003222 +0200
@@ -0,0 +1,893 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -27103,7 +27103,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/ddr3_freq_imx6.S linux-imx6-3.14/arch/
+ .size mx6_ddr3_freq_change, . - mx6_ddr3_freq_change
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
++++ linux-imx6-3.14/arch/arm/mach-imx/gpc.c 2014-09-11 18:05:53.346003382 +0200
@@ -10,30 +10,69 @@
* http://www.gnu.org/copyleft/gpl.html
*/
@@ -27490,7 +27490,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/gpc.c linux-imx6-3.14/arch/arm/mach-im
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/arch/arm/mach-imx/hardware.h 2014-09-11 18:05:53.346003382 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -27510,7 +27510,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/hardware.h linux-imx6-3.14/arch/arm/ma
#define addr_in_module(addr, mod) \
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
++++ linux-imx6-3.14/arch/arm/mach-imx/headsmp.S 2014-09-11 18:05:53.346003382 +0200
@@ -12,8 +12,6 @@
#include <linux/linkage.h>
@@ -27560,7 +27560,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/headsmp.S linux-imx6-3.14/arch/arm/mac
-#endif
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
++++ linux-imx6-3.14/arch/arm/mach-imx/imx6sl_wfi.S 2014-09-11 18:05:53.346003382 +0200
@@ -0,0 +1,639 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -28203,7 +28203,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/imx6sl_wfi.S linux-imx6-3.14/arch/arm/
+ mov pc, lr
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
++++ linux-imx6-3.14/arch/arm/mach-imx/Kconfig 2014-09-11 18:05:53.278003110 +0200
@@ -1,5 +1,6 @@
config ARCH_MXC
bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7
@@ -28252,7 +28252,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/Kconfig linux-imx6-3.14/arch/arm/mach-
This enables support for Freescale i.MX6 Quad processor.
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
++++ linux-imx6-3.14/arch/arm/mach-imx/lpddr2_freq_imx6.S 2014-09-11 18:05:53.378003511 +0200
@@ -0,0 +1,484 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -28740,7 +28740,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/lpddr2_freq_imx6.S linux-imx6-3.14/arc
+ .size mx6_lpddr2_freq_change, . - mx6_lpddr2_freq_change
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
++++ linux-imx6-3.14/arch/arm/mach-imx/mach-imx6q.c 2014-09-11 18:05:53.382003527 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2011-2013 Freescale Semiconductor, Inc.
@@ -29030,7 +29030,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/mach-imx6q.c linux-imx6-3.14/arch/arm/
.init_irq = imx6q_init_irq,
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
++++ linux-imx6-3.14/arch/arm/mach-imx/mach-imx6sl.c 2014-09-11 18:05:53.382003527 +0200
@@ -17,8 +17,9 @@
#include <asm/mach/map.h>
@@ -29072,7 +29072,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/mach-imx6sl.c linux-imx6-3.14/arch/arm
static void __init imx6sl_init_irq(void)
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
++++ linux-imx6-3.14/arch/arm/mach-imx/mach-vf610.c 2014-09-11 18:05:53.386003542 +0200
@@ -22,7 +22,7 @@
static void __init vf610_init_irq(void)
@@ -29084,7 +29084,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/mach-vf610.c linux-imx6-3.14/arch/arm/
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
++++ linux-imx6-3.14/arch/arm/mach-imx/Makefile 2014-09-11 18:05:53.278003110 +0200
@@ -30,6 +30,7 @@
ifeq ($(CONFIG_CPU_IDLE),y)
obj-$(CONFIG_SOC_IMX5) += cpuidle-imx5.o
@@ -29117,7 +29117,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/Makefile linux-imx6-3.14/arch/arm/mach
obj-$(CONFIG_MACH_MX51_BABBAGE) += mach-mx51_babbage.o
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
++++ linux-imx6-3.14/arch/arm/mach-imx/mx6.h 2014-09-11 18:05:53.394003573 +0200
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -29156,7 +29156,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/mx6.h linux-imx6-3.14/arch/arm/mach-im
+#endif
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
++++ linux-imx6-3.14/arch/arm/mach-imx/mxc.h 2014-09-11 18:05:53.394003573 +0200
@@ -42,6 +42,8 @@
#define IMX_CHIP_REVISION_1_1 0x11
#define IMX_CHIP_REVISION_1_2 0x12
@@ -29176,7 +29176,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/mxc.h linux-imx6-3.14/arch/arm/mach-im
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
++++ linux-imx6-3.14/arch/arm/mach-imx/pm-imx6.c 2014-09-11 18:05:53.394003573 +0200
@@ -0,0 +1,580 @@
+/*
+ * Copyright 2011-2014 Freescale Semiconductor, Inc.
@@ -30005,7 +30005,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/pm-imx6q.c linux-imx6-3.14/arch/arm/ma
-}
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
++++ linux-imx6-3.14/arch/arm/mach-imx/suspend-imx6.S 2014-09-11 18:05:53.394003573 +0200
@@ -0,0 +1,306 @@
+/*
+ * Copyright 2014 Freescale Semiconductor, Inc.
@@ -30315,7 +30315,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/suspend-imx6.S linux-imx6-3.14/arch/ar
+ENDPROC(v7_cpu_resume)
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
++++ linux-imx6-3.14/arch/arm/mach-imx/system.c 2014-09-11 18:05:53.394003573 +0200
@@ -34,6 +34,7 @@
static void __iomem *wdog_base;
@@ -30399,7 +30399,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/system.c linux-imx6-3.14/arch/arm/mach
#endif
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
++++ linux-imx6-3.14/arch/arm/mach-imx/time.c 2014-09-11 18:05:53.394003573 +0200
@@ -60,7 +60,11 @@
#define V2_TCTL_WAITEN (1 << 3) /* Wait enable mode */
#define V2_TCTL_CLK_IPG (1 << 6)
@@ -30465,7 +30465,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-imx/time.c linux-imx6-3.14/arch/arm/mach-i
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
++++ linux-imx6-3.14/arch/arm/mach-nomadik/cpu-8815.c 2014-09-11 18:05:53.698004788 +0200
@@ -147,7 +147,7 @@
{
#ifdef CONFIG_CACHE_L2X0
@@ -30477,7 +30477,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-nomadik/cpu-8815.c linux-imx6-3.14/arch/ar
}
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
++++ linux-imx6-3.14/arch/arm/mach-omap2/common.h 2014-09-11 18:05:53.814005253 +0200
@@ -91,6 +91,7 @@
extern void omap3_secure_sync32k_timer_init(void);
extern void omap3_gptimer_timer_init(void);
@@ -30488,7 +30488,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-omap2/common.h linux-imx6-3.14/arch/arm/ma
void omap2420_init_early(void);
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
++++ linux-imx6-3.14/arch/arm/mach-omap2/io.c 2014-09-11 18:05:53.862005446 +0200
@@ -608,6 +608,7 @@
am43xx_clockdomains_init();
am43xx_hwmod_init();
@@ -30507,7 +30507,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-omap2/io.c linux-imx6-3.14/arch/arm/mach-o
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
++++ linux-imx6-3.14/arch/arm/mach-omap2/Kconfig 2014-09-11 18:05:53.730004917 +0200
@@ -78,6 +78,7 @@
select MULTI_IRQ_HANDLER
select ARM_GIC
@@ -30518,7 +30518,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-omap2/Kconfig linux-imx6-3.14/arch/arm/mac
bool "TI DRA7XX"
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
++++ linux-imx6-3.14/arch/arm/mach-omap2/omap4-common.c 2014-09-11 18:05:53.870005477 +0200
@@ -166,75 +166,57 @@
return l2cache_base;
}
@@ -30631,7 +30631,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-omap2/omap4-common.c linux-imx6-3.14/arch/
void __iomem *omap4_get_sar_ram_base(void)
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
++++ linux-imx6-3.14/arch/arm/mach-omap2/omap-mpuss-lowpower.c 2014-09-11 18:05:53.866005462 +0200
@@ -187,19 +187,15 @@
* in every restore MPUSS OFF path.
*/
@@ -30660,7 +30660,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-omap2/omap-mpuss-lowpower.c linux-imx6-3.1
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
++++ linux-imx6-3.14/arch/arm/mach-prima2/l2x0.c 2014-09-11 18:05:53.898005589 +0200
@@ -8,43 +8,10 @@
#include <linux/init.h>
@@ -30708,7 +30708,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-prima2/l2x0.c linux-imx6-3.14/arch/arm/mac
early_initcall(sirfsoc_l2x0_init);
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
++++ linux-imx6-3.14/arch/arm/mach-prima2/pm.c 2014-09-11 18:05:53.898005589 +0200
@@ -71,7 +71,6 @@
case PM_SUSPEND_MEM:
sirfsoc_pre_suspend_power_off();
@@ -30719,7 +30719,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-prima2/pm.c linux-imx6-3.14/arch/arm/mach-
cpu_suspend(0, sirfsoc_finish_suspend);
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
++++ linux-imx6-3.14/arch/arm/mach-realview/realview_eb.c 2014-09-11 18:05:53.954005813 +0200
@@ -442,8 +442,13 @@
realview_eb11mp_fixup();
@@ -30738,7 +30738,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-realview/realview_eb.c linux-imx6-3.14/arc
platform_device_register(&pmu_device);
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
++++ linux-imx6-3.14/arch/arm/mach-realview/realview_pb1176.c 2014-09-11 18:05:53.954005813 +0200
@@ -355,7 +355,13 @@
int i;
@@ -30756,7 +30756,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-realview/realview_pb1176.c linux-imx6-3.14
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
++++ linux-imx6-3.14/arch/arm/mach-realview/realview_pb11mp.c 2014-09-11 18:05:53.954005813 +0200
@@ -337,8 +337,13 @@
int i;
@@ -30775,7 +30775,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-realview/realview_pb11mp.c linux-imx6-3.14
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
++++ linux-imx6-3.14/arch/arm/mach-realview/realview_pbx.c 2014-09-11 18:05:53.958005828 +0200
@@ -370,8 +370,8 @@
__io_address(REALVIEW_PBX_TILE_L220_BASE);
@@ -30789,7 +30789,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-realview/realview_pbx.c linux-imx6-3.14/ar
* Bits: .. 0 0 0 0 1 00 1 0 1 001 0 000 0 .... .... .... */
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
++++ linux-imx6-3.14/arch/arm/mach-rockchip/rockchip.c 2014-09-11 18:05:53.962005845 +0200
@@ -25,7 +25,7 @@
static void __init rockchip_dt_init(void)
@@ -30801,7 +30801,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-rockchip/rockchip.c linux-imx6-3.14/arch/a
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
++++ linux-imx6-3.14/arch/arm/mach-shmobile/board-armadillo800eva.c 2014-09-11 18:05:54.134006532 +0200
@@ -1270,8 +1270,8 @@
@@ -30815,7 +30815,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-shmobile/board-armadillo800eva.c linux-imx
i2c_register_board_info(0, i2c0_devices, ARRAY_SIZE(i2c0_devices));
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
++++ linux-imx6-3.14/arch/arm/mach-shmobile/board-armadillo800eva-reference.c 2014-09-11 18:05:54.134006532 +0200
@@ -164,8 +164,8 @@
r8a7740_meram_workaround();
@@ -30829,7 +30829,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
r8a7740_add_standard_devices_dt();
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
++++ linux-imx6-3.14/arch/arm/mach-shmobile/board-kzm9g.c 2014-09-11 18:05:54.138006549 +0200
@@ -878,8 +878,8 @@
gpio_request_one(223, GPIOF_IN, NULL); /* IRQ8 */
@@ -30843,7 +30843,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-shmobile/board-kzm9g.c linux-imx6-3.14/arc
i2c_register_board_info(0, i2c0_devices, ARRAY_SIZE(i2c0_devices));
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
++++ linux-imx6-3.14/arch/arm/mach-shmobile/board-kzm9g-reference.c 2014-09-11 18:05:54.138006549 +0200
@@ -36,8 +36,8 @@
sh73a0_add_standard_devices_dt();
@@ -30857,7 +30857,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-shmobile/board-kzm9g-reference.c linux-imx
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
++++ linux-imx6-3.14/arch/arm/mach-shmobile/setup-r8a7778.c 2014-09-11 18:05:54.142006566 +0200
@@ -298,10 +298,10 @@
void __iomem *base = ioremap_nocache(0xf0100000, 0x1000);
if (base) {
@@ -30873,7 +30873,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-shmobile/setup-r8a7778.c linux-imx6-3.14/a
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
++++ linux-imx6-3.14/arch/arm/mach-shmobile/setup-r8a7779.c 2014-09-11 18:05:54.142006566 +0200
@@ -700,8 +700,8 @@
void __init r8a7779_add_standard_devices(void)
{
@@ -30887,7 +30887,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-shmobile/setup-r8a7779.c linux-imx6-3.14/a
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
++++ linux-imx6-3.14/arch/arm/mach-socfpga/socfpga.c 2014-09-11 18:05:54.146006581 +0200
@@ -104,7 +104,7 @@
static void __init socfpga_cyclone5_init(void)
@@ -30899,7 +30899,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-socfpga/socfpga.c linux-imx6-3.14/arch/arm
}
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
++++ linux-imx6-3.14/arch/arm/mach-spear/platsmp.c 2014-09-11 18:05:54.150006596 +0200
@@ -20,6 +20,18 @@
#include <mach/spear.h>
#include "generic.h"
@@ -30942,7 +30942,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-spear/platsmp.c linux-imx6-3.14/arch/arm/m
while (time_before(jiffies, timeout)) {
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
++++ linux-imx6-3.14/arch/arm/mach-spear/spear13xx.c 2014-09-11 18:05:54.150006596 +0200
@@ -38,15 +38,15 @@
if (!IS_ENABLED(CONFIG_CACHE_L2X0))
return;
@@ -30965,7 +30965,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-spear/spear13xx.c linux-imx6-3.14/arch/arm
/*
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
++++ linux-imx6-3.14/arch/arm/mach-sti/board-dt.c 2014-09-11 18:05:54.178006708 +0200
@@ -16,15 +16,9 @@
void __init stih41x_l2x0_init(void)
@@ -30987,7 +30987,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-sti/board-dt.c linux-imx6-3.14/arch/arm/ma
static void __init stih41x_machine_init(void)
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
++++ linux-imx6-3.14/arch/arm/mach-tegra/pm.h 2014-09-11 18:05:54.206006821 +0200
@@ -35,8 +35,6 @@
void tegra30_lp1_iram_hook(void);
void tegra30_sleep_core_init(void);
@@ -30999,7 +30999,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-tegra/pm.h linux-imx6-3.14/arch/arm/mach-t
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
++++ linux-imx6-3.14/arch/arm/mach-tegra/reset-handler.S 2014-09-11 18:05:54.206006821 +0200
@@ -19,7 +19,6 @@
#include <asm/cache.h>
@@ -31035,7 +31035,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-tegra/reset-handler.S linux-imx6-3.14/arch
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
++++ linux-imx6-3.14/arch/arm/mach-tegra/sleep.h 2014-09-11 18:05:54.218006868 +0200
@@ -120,37 +120,6 @@
mov \tmp1, \tmp1, lsr #8
.endm
@@ -31076,7 +31076,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-tegra/sleep.h linux-imx6-3.14/arch/arm/mac
void tegra_pen_unlock(void);
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
++++ linux-imx6-3.14/arch/arm/mach-tegra/tegra.c 2014-09-11 18:05:54.218006868 +0200
@@ -73,27 +73,7 @@
static void __init tegra_init_cache(void)
{
@@ -31108,7 +31108,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-tegra/tegra.c linux-imx6-3.14/arch/arm/mac
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
++++ linux-imx6-3.14/arch/arm/mach-ux500/board-mop500-audio.c 2014-09-11 18:05:54.230006916 +0200
@@ -9,7 +9,6 @@
#include <linux/gpio.h>
#include <linux/platform_data/dma-ste-dma40.h>
@@ -31119,7 +31119,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-ux500/board-mop500-audio.c linux-imx6-3.14
#include "ste-dma40-db8500.h"
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
++++ linux-imx6-3.14/arch/arm/mach-ux500/cache-l2x0.c 2014-09-11 18:05:54.230006916 +0200
@@ -35,10 +35,16 @@
return 0;
}
@@ -31173,7 +31173,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-ux500/cache-l2x0.c linux-imx6-3.14/arch/ar
}
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
++++ linux-imx6-3.14/arch/arm/mach-ux500/cpu-db8500.c 2014-09-11 18:05:54.230006916 +0200
@@ -27,7 +27,6 @@
#include <asm/mach/map.h>
@@ -31440,7 +31440,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-ux500/irqs.h linux-imx6-3.14/arch/arm/mach
-#endif /* ASM_ARCH_IRQS_H */
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
++++ linux-imx6-3.14/arch/arm/mach-vexpress/ct-ca9x4.c 2014-09-11 18:05:54.266007061 +0200
@@ -45,6 +45,23 @@
iotable_init(ct_ca9x4_io_desc, ARRAY_SIZE(ct_ca9x4_io_desc));
}
@@ -31492,7 +31492,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-vexpress/ct-ca9x4.c linux-imx6-3.14/arch/a
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
++++ linux-imx6-3.14/arch/arm/mach-vexpress/dcscb.c 2014-09-11 18:05:54.266007061 +0200
@@ -23,6 +23,7 @@
#include <asm/cacheflush.h>
#include <asm/cputype.h>
@@ -31516,7 +31516,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-vexpress/dcscb.c linux-imx6-3.14/arch/arm/
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
++++ linux-imx6-3.14/arch/arm/mach-vexpress/Kconfig 2014-09-11 18:05:54.266007061 +0200
@@ -55,6 +55,7 @@
config ARCH_VEXPRESS_CA9X4
@@ -31527,7 +31527,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-vexpress/Kconfig linux-imx6-3.14/arch/arm/
bool "Dual Cluster System Control Block (DCSCB) support"
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
++++ linux-imx6-3.14/arch/arm/mach-vexpress/Makefile 2014-09-11 18:05:54.266007061 +0200
@@ -8,8 +8,15 @@
obj-$(CONFIG_ARCH_VEXPRESS_CA9X4) += ct-ca9x4.o
obj-$(CONFIG_ARCH_VEXPRESS_DCSCB) += dcscb.o dcscb_setup.o
@@ -31546,7 +31546,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-vexpress/Makefile linux-imx6-3.14/arch/arm
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
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
++++ linux-imx6-3.14/arch/arm/mach-vexpress/spc.c 2014-09-11 18:05:54.270007076 +0200
@@ -392,7 +392,7 @@
* +--------------------------+
* | 31 20 | 19 0 |
@@ -31567,7 +31567,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-vexpress/spc.c linux-imx6-3.14/arch/arm/ma
}
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
++++ linux-imx6-3.14/arch/arm/mach-vexpress/tc2_pm.c 2014-09-11 18:05:54.270007076 +0200
@@ -27,6 +27,7 @@
#include <asm/cacheflush.h>
#include <asm/cputype.h>
@@ -31591,7 +31591,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-vexpress/tc2_pm.c linux-imx6-3.14/arch/arm
* SCC registers. We need to extract runtime information like
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
++++ linux-imx6-3.14/arch/arm/mach-vexpress/tc2_pm_psci.c 2014-09-11 18:05:54.270007076 +0200
@@ -0,0 +1,173 @@
+/*
+ * arch/arm/mach-vexpress/tc2_pm_psci.c - TC2 PSCI support
@@ -31768,7 +31768,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-vexpress/tc2_pm_psci.c linux-imx6-3.14/arc
+early_initcall(tc2_pm_psci_init);
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
++++ linux-imx6-3.14/arch/arm/mach-vexpress/v2m.c 2014-09-11 18:05:54.270007076 +0200
@@ -7,6 +7,7 @@
#include <linux/io.h>
#include <linux/smp.h>
@@ -31820,7 +31820,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-vexpress/v2m.c linux-imx6-3.14/arch/arm/ma
static const struct of_device_id v2m_dt_bus_match[] __initconst = {
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
++++ linux-imx6-3.14/arch/arm/mach-zynq/common.c 2014-09-11 18:05:54.274007092 +0200
@@ -67,7 +67,7 @@
/*
* 64KB way size, 8-way associativity, parity disabled
@@ -31832,7 +31832,7 @@ diff -Nur linux-3.14.17/arch/arm/mach-zynq/common.c linux-imx6-3.14/arch/arm/mac
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
++++ linux-imx6-3.14/arch/arm/mm/cache-feroceon-l2.c 2014-09-11 18:05:54.278007108 +0200
@@ -343,7 +343,6 @@
outer_cache.inv_range = feroceon_l2_inv_range;
outer_cache.clean_range = feroceon_l2_clean_range;
@@ -31843,7 +31843,7 @@ diff -Nur linux-3.14.17/arch/arm/mm/cache-feroceon-l2.c linux-imx6-3.14/arch/arm
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
++++ linux-imx6-3.14/arch/arm/mm/cache-l2x0.c 2014-09-11 18:05:54.278007108 +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
@@ -33662,7 +33662,7 @@ diff -Nur linux-3.14.17/arch/arm/mm/cache-l2x0.c linux-imx6-3.14/arch/arm/mm/cac
}
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
++++ linux-imx6-3.14/arch/arm/mm/dma-mapping.c 2014-09-11 18:05:54.278007108 +0200
@@ -26,6 +26,7 @@
#include <linux/io.h>
#include <linux/vmalloc.h>
@@ -33673,7 +33673,7 @@ diff -Nur linux-3.14.17/arch/arm/mm/dma-mapping.c linux-imx6-3.14/arch/arm/mm/dm
#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
++++ linux-imx6-3.14/arch/arm/mm/fault.c 2014-09-11 18:05:54.278007108 +0200
@@ -449,8 +449,16 @@
if (pud_none(*pud_k))
@@ -33705,7 +33705,7 @@ diff -Nur linux-3.14.17/arch/arm/mm/fault.c linux-imx6-3.14/arch/arm/mm/fault.c
bad_area:
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
++++ linux-imx6-3.14/arch/arm/mm/idmap.c 2014-09-11 18:05:54.282007125 +0200
@@ -25,13 +25,6 @@
pr_warning("Failed to allocate identity pmd.\n");
return;
@@ -33722,7 +33722,7 @@ diff -Nur linux-3.14.17/arch/arm/mm/idmap.c linux-imx6-3.14/arch/arm/mm/idmap.c
} 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
++++ linux-imx6-3.14/arch/arm/mm/init.c 2014-09-11 18:05:54.282007125 +0200
@@ -327,7 +327,7 @@
* reserve memory for DMA contigouos allocations,
* must come from DMA area inside low memory
@@ -33734,7 +33734,7 @@ diff -Nur linux-3.14.17/arch/arm/mm/init.c linux-imx6-3.14/arch/arm/mm/init.c
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
++++ linux-imx6-3.14/arch/arm/mm/Kconfig 2014-09-11 18:05:54.274007092 +0200
@@ -897,6 +897,57 @@
This option enables optimisations for the PL310 cache
controller.
@@ -33795,7 +33795,7 @@ diff -Nur linux-3.14.17/arch/arm/mm/Kconfig linux-imx6-3.14/arch/arm/mm/Kconfig
depends on (ARCH_DOVE || ARCH_MMP || CPU_PJ4)
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
++++ linux-imx6-3.14/arch/arm/mm/l2c-common.c 2014-09-11 18:05:54.282007125 +0200
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2010 ARM Ltd.
@@ -33819,7 +33819,7 @@ diff -Nur linux-3.14.17/arch/arm/mm/l2c-common.c linux-imx6-3.14/arch/arm/mm/l2c
+}
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
++++ linux-imx6-3.14/arch/arm/mm/l2c-l2x0-resume.S 2014-09-11 18:05:54.282007125 +0200
@@ -0,0 +1,58 @@
+/*
+ * L2C-310 early resume code. This can be used by platforms to restore
@@ -33881,7 +33881,7 @@ diff -Nur linux-3.14.17/arch/arm/mm/l2c-l2x0-resume.S linux-imx6-3.14/arch/arm/m
+1: .long l2x0_saved_regs - .
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
++++ linux-imx6-3.14/arch/arm/mm/Makefile 2014-09-11 18:05:54.274007092 +0200
@@ -95,7 +95,8 @@
AFLAGS_proc-v6.o :=-Wa,-march=armv6
AFLAGS_proc-v7.o :=-Wa,-march=armv7-a
@@ -33894,7 +33894,7 @@ diff -Nur linux-3.14.17/arch/arm/mm/Makefile linux-imx6-3.14/arch/arm/mm/Makefil
obj-$(CONFIG_CACHE_TAUROS2) += cache-tauros2.o
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
++++ linux-imx6-3.14/arch/arm/mm/mmu.c 2014-09-11 18:05:54.282007125 +0200
@@ -1436,8 +1436,8 @@
return;
@@ -33917,7 +33917,7 @@ diff -Nur linux-3.14.17/arch/arm/mm/mmu.c linux-imx6-3.14/arch/arm/mm/mmu.c
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
++++ linux-imx6-3.14/arch/arm/mm/proc-v7.S 2014-09-11 18:05:54.286007140 +0200
@@ -336,6 +336,17 @@
mcrlt p15, 0, r10, c15, c0, 1 @ write diagnostic register
1:
@@ -33938,7 +33938,7 @@ diff -Nur linux-3.14.17/arch/arm/mm/proc-v7.S linux-imx6-3.14/arch/arm/mm/proc-v
3: ldr r10, =0x00000c0f @ Cortex-A15 primary part number
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
++++ linux-imx6-3.14/arch/arm64/boot/dts/apm-mustang.dts 2014-09-11 18:05:54.354007412 +0200
@@ -24,3 +24,7 @@
reg = < 0x1 0x00000000 0x0 0x80000000 >; /* Updated by bootloader */
};
@@ -33949,7 +33949,7 @@ diff -Nur linux-3.14.17/arch/arm64/boot/dts/apm-mustang.dts linux-imx6-3.14/arch
+};
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
++++ linux-imx6-3.14/arch/arm64/boot/dts/apm-storm.dtsi 2014-09-11 18:05:54.354007412 +0200
@@ -176,16 +176,226 @@
reg-names = "csr-reg";
clock-output-names = "eth8clk";
@@ -34180,7 +34180,7 @@ diff -Nur linux-3.14.17/arch/arm64/boot/dts/apm-storm.dtsi linux-imx6-3.14/arch/
};
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
++++ linux-imx6-3.14/arch/arm64/boot/dts/clcd-panels.dtsi 2014-09-11 18:05:54.354007412 +0200
@@ -0,0 +1,52 @@
+/*
+ * ARM Ltd. Versatile Express
@@ -34236,7 +34236,7 @@ diff -Nur linux-3.14.17/arch/arm64/boot/dts/clcd-panels.dtsi linux-imx6-3.14/arc
+};
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
++++ linux-imx6-3.14/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts 2014-09-11 18:05:54.354007412 +0200
@@ -0,0 +1,266 @@
+/*
+ * Copyright (c) 2013, ARM Limited. All rights reserved.
@@ -34506,7 +34506,7 @@ diff -Nur linux-3.14.17/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts linux-imx6-3
+/include/ "clcd-panels.dtsi"
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
++++ linux-imx6-3.14/arch/arm64/boot/dts/juno.dts 2014-09-11 18:05:54.354007412 +0200
@@ -0,0 +1,498 @@
+/*
+ * ARM Ltd. Juno Plaform
@@ -35008,7 +35008,7 @@ diff -Nur linux-3.14.17/arch/arm64/boot/dts/juno.dts linux-imx6-3.14/arch/arm64/
+};
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
++++ linux-imx6-3.14/arch/arm64/boot/dts/Makefile 2014-09-11 18:05:54.354007412 +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 \
@@ -35020,7 +35020,7 @@ diff -Nur linux-3.14.17/arch/arm64/boot/dts/Makefile linux-imx6-3.14/arch/arm64/
targets += $(dtb-y)
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
++++ linux-imx6-3.14/arch/arm64/boot/dts/rtsm_ve-aemv8a.dts 2014-09-11 18:05:54.354007412 +0200
@@ -157,3 +157,5 @@
/include/ "rtsm_ve-motherboard.dtsi"
};
@@ -35029,7 +35029,7 @@ diff -Nur linux-3.14.17/arch/arm64/boot/dts/rtsm_ve-aemv8a.dts linux-imx6-3.14/a
+/include/ "clcd-panels.dtsi"
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
++++ linux-imx6-3.14/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi 2014-09-11 18:05:54.354007412 +0200
@@ -182,6 +182,9 @@
interrupts = <14>;
clocks = <&v2m_oscclk1>, <&v2m_clk24mhz>;
@@ -35042,7 +35042,7 @@ diff -Nur linux-3.14.17/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi linux-imx6-
virtio_block@0130000 {
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
++++ linux-imx6-3.14/arch/arm64/crypto/aes-ce-ccm-core.S 2014-09-11 18:05:54.354007412 +0200
@@ -0,0 +1,222 @@
+/*
+ * aesce-ccm-core.S - AES-CCM transform for ARMv8 with Crypto Extensions
@@ -35268,7 +35268,7 @@ diff -Nur linux-3.14.17/arch/arm64/crypto/aes-ce-ccm-core.S linux-imx6-3.14/arch
+ENDPROC(ce_aes_ccm_decrypt)
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
++++ linux-imx6-3.14/arch/arm64/crypto/aes-ce-ccm-glue.c 2014-09-11 18:05:54.354007412 +0200
@@ -0,0 +1,297 @@
+/*
+ * aes-ccm-glue.c - AES-CCM transform for ARMv8 with Crypto Extensions
@@ -35569,7 +35569,7 @@ diff -Nur linux-3.14.17/arch/arm64/crypto/aes-ce-ccm-glue.c linux-imx6-3.14/arch
+MODULE_ALIAS("ccm(aes)");
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
++++ linux-imx6-3.14/arch/arm64/crypto/aes-ce-cipher.c 2014-09-11 18:05:54.354007412 +0200
@@ -0,0 +1,155 @@
+/*
+ * aes-ce-cipher.c - core AES cipher using ARMv8 Crypto Extensions
@@ -35728,7 +35728,7 @@ diff -Nur linux-3.14.17/arch/arm64/crypto/aes-ce-cipher.c linux-imx6-3.14/arch/a
+module_exit(aes_mod_exit);
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
++++ linux-imx6-3.14/arch/arm64/crypto/aes-ce.S 2014-09-11 18:05:54.354007412 +0200
@@ -0,0 +1,133 @@
+/*
+ * linux/arch/arm64/crypto/aes-ce.S - AES cipher for ARMv8 with
@@ -35865,7 +35865,7 @@ diff -Nur linux-3.14.17/arch/arm64/crypto/aes-ce.S linux-imx6-3.14/arch/arm64/cr
+#include "aes-modes.S"
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
++++ linux-imx6-3.14/arch/arm64/crypto/aes-glue.c 2014-09-11 18:05:54.354007412 +0200
@@ -0,0 +1,446 @@
+/*
+ * linux/arch/arm64/crypto/aes-glue.c - wrapper code for ARMv8 AES
@@ -36315,7 +36315,7 @@ diff -Nur linux-3.14.17/arch/arm64/crypto/aes-glue.c linux-imx6-3.14/arch/arm64/
+module_exit(aes_exit);
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
++++ linux-imx6-3.14/arch/arm64/crypto/aes-modes.S 2014-09-11 18:05:54.354007412 +0200
@@ -0,0 +1,532 @@
+/*
+ * linux/arch/arm64/crypto/aes-modes.S - chaining mode wrappers for AES
@@ -36851,7 +36851,7 @@ diff -Nur linux-3.14.17/arch/arm64/crypto/aes-modes.S linux-imx6-3.14/arch/arm64
+AES_ENDPROC(aes_xts_decrypt)
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
++++ linux-imx6-3.14/arch/arm64/crypto/aes-neon.S 2014-09-11 18:05:54.394007574 +0200
@@ -0,0 +1,382 @@
+/*
+ * linux/arch/arm64/crypto/aes-neon.S - AES cipher for ARMv8 NEON
@@ -37237,7 +37237,7 @@ diff -Nur linux-3.14.17/arch/arm64/crypto/aes-neon.S linux-imx6-3.14/arch/arm64/
+ .byte 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d
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
++++ linux-imx6-3.14/arch/arm64/crypto/ghash-ce-core.S 2014-09-11 18:05:54.394007574 +0200
@@ -0,0 +1,79 @@
+/*
+ * Accelerated GHASH implementation with ARMv8 PMULL instructions.
@@ -37320,7 +37320,7 @@ diff -Nur linux-3.14.17/arch/arm64/crypto/ghash-ce-core.S linux-imx6-3.14/arch/a
+ENDPROC(pmull_ghash_update)
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
++++ linux-imx6-3.14/arch/arm64/crypto/ghash-ce-glue.c 2014-09-11 18:05:54.394007574 +0200
@@ -0,0 +1,156 @@
+/*
+ * Accelerated GHASH implementation with ARMv8 PMULL instructions.
@@ -37480,7 +37480,7 @@ diff -Nur linux-3.14.17/arch/arm64/crypto/ghash-ce-glue.c linux-imx6-3.14/arch/a
+module_exit(ghash_ce_mod_exit);
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
++++ linux-imx6-3.14/arch/arm64/crypto/Kconfig 2014-09-11 18:05:54.354007412 +0200
@@ -0,0 +1,53 @@
+
+menuconfig ARM64_CRYPTO
@@ -37537,7 +37537,7 @@ diff -Nur linux-3.14.17/arch/arm64/crypto/Kconfig linux-imx6-3.14/arch/arm64/cry
+endif
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
++++ linux-imx6-3.14/arch/arm64/crypto/Makefile 2014-09-11 18:05:54.354007412 +0200
@@ -0,0 +1,38 @@
+#
+# linux/arch/arm64/crypto/Makefile
@@ -37579,7 +37579,7 @@ diff -Nur linux-3.14.17/arch/arm64/crypto/Makefile linux-imx6-3.14/arch/arm64/cr
+ $(call if_changed_dep,cc_o_c)
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
++++ linux-imx6-3.14/arch/arm64/crypto/sha1-ce-core.S 2014-09-11 18:05:54.394007574 +0200
@@ -0,0 +1,153 @@
+/*
+ * sha1-ce-core.S - SHA-1 secure hash using ARMv8 Crypto Extensions
@@ -37736,7 +37736,7 @@ diff -Nur linux-3.14.17/arch/arm64/crypto/sha1-ce-core.S linux-imx6-3.14/arch/ar
+ENDPROC(sha1_ce_transform)
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
++++ linux-imx6-3.14/arch/arm64/crypto/sha1-ce-glue.c 2014-09-11 18:05:54.394007574 +0200
@@ -0,0 +1,174 @@
+/*
+ * sha1-ce-glue.c - SHA-1 secure hash using ARMv8 Crypto Extensions
@@ -37914,7 +37914,7 @@ diff -Nur linux-3.14.17/arch/arm64/crypto/sha1-ce-glue.c linux-imx6-3.14/arch/ar
+module_exit(sha1_ce_mod_fini);
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
++++ linux-imx6-3.14/arch/arm64/crypto/sha2-ce-core.S 2014-09-11 18:05:54.394007574 +0200
@@ -0,0 +1,156 @@
+/*
+ * sha2-ce-core.S - core SHA-224/SHA-256 transform using v8 Crypto Extensions
@@ -38074,7 +38074,7 @@ diff -Nur linux-3.14.17/arch/arm64/crypto/sha2-ce-core.S linux-imx6-3.14/arch/ar
+ENDPROC(sha2_ce_transform)
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
++++ linux-imx6-3.14/arch/arm64/crypto/sha2-ce-glue.c 2014-09-11 18:05:54.394007574 +0200
@@ -0,0 +1,255 @@
+/*
+ * sha2-ce-glue.c - SHA-224/SHA-256 using ARMv8 Crypto Extensions
@@ -38333,7 +38333,7 @@ diff -Nur linux-3.14.17/arch/arm64/crypto/sha2-ce-glue.c linux-imx6-3.14/arch/ar
+module_exit(sha2_ce_mod_fini);
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
++++ linux-imx6-3.14/arch/arm64/include/asm/bL_switcher.h 2014-09-11 18:05:54.398007590 +0200
@@ -0,0 +1,54 @@
+/*
+ * Based on the stubs for the ARM implementation which is:
@@ -38391,7 +38391,7 @@ diff -Nur linux-3.14.17/arch/arm64/include/asm/bL_switcher.h linux-imx6-3.14/arc
+#endif
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
++++ linux-imx6-3.14/arch/arm64/include/asm/cacheflush.h 2014-09-11 18:05:54.398007590 +0200
@@ -85,6 +85,13 @@
}
@@ -38408,7 +38408,7 @@ diff -Nur linux-3.14.17/arch/arm64/include/asm/cacheflush.h linux-imx6-3.14/arch
* space" model to handle this.
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
++++ linux-imx6-3.14/arch/arm64/include/asm/compat.h 2014-09-11 18:05:54.398007590 +0200
@@ -228,7 +228,7 @@
return (u32)(unsigned long)uptr;
}
@@ -38432,7 +38432,7 @@ diff -Nur linux-3.14.17/arch/arm64/include/asm/compat.h linux-imx6-3.14/arch/arm
return 0;
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
++++ linux-imx6-3.14/arch/arm64/include/asm/cpufeature.h 2014-09-11 18:05:54.398007590 +0200
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2014 Linaro Ltd. <ard.biesheuvel@linaro.org>
@@ -38465,7 +38465,7 @@ diff -Nur linux-3.14.17/arch/arm64/include/asm/cpufeature.h linux-imx6-3.14/arch
+#endif
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
++++ linux-imx6-3.14/arch/arm64/include/asm/debug-monitors.h 2014-09-11 18:05:54.398007590 +0200
@@ -26,6 +26,53 @@
#define DBG_ESR_EVT_HWWP 0x2
#define DBG_ESR_EVT_BRK 0x6
@@ -38546,7 +38546,7 @@ diff -Nur linux-3.14.17/arch/arm64/include/asm/debug-monitors.h linux-imx6-3.14/
#define DBG_HOOK_HANDLED 0
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
++++ linux-imx6-3.14/arch/arm64/include/asm/dma-mapping.h 2014-09-11 18:05:54.398007590 +0200
@@ -28,6 +28,8 @@
#define DMA_ERROR_CODE (~(dma_addr_t)0)
@@ -38570,7 +38570,7 @@ diff -Nur linux-3.14.17/arch/arm64/include/asm/dma-mapping.h linux-imx6-3.14/arc
static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)
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
++++ linux-imx6-3.14/arch/arm64/include/asm/ftrace.h 2014-09-11 18:05:54.402007605 +0200
@@ -0,0 +1,59 @@
+/*
+ * arch/arm64/include/asm/ftrace.h
@@ -38633,7 +38633,7 @@ diff -Nur linux-3.14.17/arch/arm64/include/asm/ftrace.h linux-imx6-3.14/arch/arm
+#endif /* __ASM_FTRACE_H */
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
++++ linux-imx6-3.14/arch/arm64/include/asm/hwcap.h 2014-09-11 18:05:54.402007605 +0200
@@ -32,6 +32,12 @@
#define COMPAT_HWCAP_IDIV (COMPAT_HWCAP_IDIVA|COMPAT_HWCAP_IDIVT)
#define COMPAT_HWCAP_EVTSTRM (1 << 21)
@@ -38659,7 +38659,7 @@ diff -Nur linux-3.14.17/arch/arm64/include/asm/hwcap.h linux-imx6-3.14/arch/arm6
extern unsigned long elf_hwcap;
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
++++ linux-imx6-3.14/arch/arm64/include/asm/insn.h 2014-09-11 18:05:54.402007605 +0200
@@ -16,11 +16,14 @@
*/
#ifndef __ASM_INSN_H
@@ -38684,7 +38684,7 @@ diff -Nur linux-3.14.17/arch/arm64/include/asm/insn.h linux-imx6-3.14/arch/arm64
#endif /* __ASM_INSN_H */
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
++++ linux-imx6-3.14/arch/arm64/include/asm/irqflags.h 2014-09-11 18:05:54.402007605 +0200
@@ -90,5 +90,28 @@
return flags & PSR_I_BIT;
}
@@ -38716,7 +38716,7 @@ diff -Nur linux-3.14.17/arch/arm64/include/asm/irqflags.h linux-imx6-3.14/arch/a
#endif
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
++++ linux-imx6-3.14/arch/arm64/include/asm/Kbuild 2014-09-11 18:05:54.394007574 +0200
@@ -35,6 +35,7 @@
generic-y += sembuf.h
generic-y += serial.h
@@ -38727,7 +38727,7 @@ diff -Nur linux-3.14.17/arch/arm64/include/asm/Kbuild linux-imx6-3.14/arch/arm64
generic-y += sockios.h
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
++++ linux-imx6-3.14/arch/arm64/include/asm/kgdb.h 2014-09-11 18:05:54.402007605 +0200
@@ -0,0 +1,84 @@
+/*
+ * AArch64 KGDB support
@@ -38815,7 +38815,7 @@ diff -Nur linux-3.14.17/arch/arm64/include/asm/kgdb.h linux-imx6-3.14/arch/arm64
+#endif /* __ASM_KGDB_H */
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
++++ linux-imx6-3.14/arch/arm64/include/asm/page.h 2014-09-11 18:05:54.402007605 +0200
@@ -31,6 +31,15 @@
/* We do define AT_SYSINFO_EHDR but don't use the gate mechanism */
#define __HAVE_ARCH_GATE_AREA 1
@@ -38834,7 +38834,7 @@ diff -Nur linux-3.14.17/arch/arm64/include/asm/page.h linux-imx6-3.14/arch/arm64
#ifdef CONFIG_ARM64_64K_PAGES
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
++++ linux-imx6-3.14/arch/arm64/include/asm/pgtable.h 2014-09-11 18:05:54.446007779 +0200
@@ -227,36 +227,36 @@
#define __HAVE_ARCH_PTE_SPECIAL
@@ -38929,7 +38929,7 @@ diff -Nur linux-3.14.17/arch/arm64/include/asm/pgtable.h linux-imx6-3.14/arch/ar
* bits 0-1: present (must be zero)
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
++++ linux-imx6-3.14/arch/arm64/include/asm/ptrace.h 2014-09-11 18:05:54.446007779 +0200
@@ -68,6 +68,7 @@
/* Architecturally defined mapping between AArch32 and AArch64 registers */
@@ -38963,7 +38963,7 @@ diff -Nur linux-3.14.17/arch/arm64/include/asm/ptrace.h linux-imx6-3.14/arch/arm
extern unsigned long profile_pc(struct pt_regs *regs);
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
++++ linux-imx6-3.14/arch/arm64/include/asm/syscall.h 2014-09-11 18:05:54.450007796 +0200
@@ -18,6 +18,7 @@
#include <linux/err.h>
@@ -38974,7 +38974,7 @@ diff -Nur linux-3.14.17/arch/arm64/include/asm/syscall.h linux-imx6-3.14/arch/ar
struct pt_regs *regs)
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
++++ linux-imx6-3.14/arch/arm64/include/asm/thread_info.h 2014-09-11 18:05:54.450007796 +0200
@@ -91,6 +91,9 @@
/*
* thread information flags:
@@ -39015,7 +39015,7 @@ diff -Nur linux-3.14.17/arch/arm64/include/asm/thread_info.h linux-imx6-3.14/arc
#endif /* __ASM_THREAD_INFO_H */
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
++++ linux-imx6-3.14/arch/arm64/include/asm/topology.h 2014-09-11 18:05:54.450007796 +0200
@@ -0,0 +1,70 @@
+#ifndef __ASM_TOPOLOGY_H
+#define __ASM_TOPOLOGY_H
@@ -39089,7 +39089,7 @@ diff -Nur linux-3.14.17/arch/arm64/include/asm/topology.h linux-imx6-3.14/arch/a
+#endif /* _ASM_ARM_TOPOLOGY_H */
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
++++ linux-imx6-3.14/arch/arm64/include/asm/unistd.h 2014-09-11 18:05:54.450007796 +0200
@@ -28,3 +28,5 @@
#endif
#define __ARCH_WANT_SYS_CLONE
@@ -39098,7 +39098,7 @@ diff -Nur linux-3.14.17/arch/arm64/include/asm/unistd.h linux-imx6-3.14/arch/arm
+#define NR_syscalls (__NR_syscalls)
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
++++ linux-imx6-3.14/arch/arm64/include/uapi/asm/Kbuild 2014-09-11 18:05:54.458007828 +0200
@@ -9,6 +9,7 @@
header-y += fcntl.h
header-y += hwcap.h
@@ -39109,7 +39109,7 @@ diff -Nur linux-3.14.17/arch/arm64/include/uapi/asm/Kbuild linux-imx6-3.14/arch/
header-y += setup.h
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
++++ linux-imx6-3.14/arch/arm64/include/uapi/asm/perf_regs.h 2014-09-11 18:05:54.458007828 +0200
@@ -0,0 +1,40 @@
+#ifndef _ASM_ARM64_PERF_REGS_H
+#define _ASM_ARM64_PERF_REGS_H
@@ -39153,7 +39153,7 @@ diff -Nur linux-3.14.17/arch/arm64/include/uapi/asm/perf_regs.h linux-imx6-3.14/
+#endif /* _ASM_ARM64_PERF_REGS_H */
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
++++ linux-imx6-3.14/arch/arm64/Kconfig 2014-09-11 18:05:54.354007412 +0200
@@ -4,6 +4,7 @@
select ARCH_USE_CMPXCHG_LOCKREF
select ARCH_SUPPORTS_ATOMIC_RMW
@@ -39353,7 +39353,7 @@ diff -Nur linux-3.14.17/arch/arm64/Kconfig linux-imx6-3.14/arch/arm64/Kconfig
source "lib/Kconfig"
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
++++ linux-imx6-3.14/arch/arm64/kernel/arm64ksyms.c 2014-09-11 18:05:54.458007828 +0200
@@ -56,3 +56,7 @@
EXPORT_SYMBOL(test_and_clear_bit);
EXPORT_SYMBOL(change_bit);
@@ -39364,7 +39364,7 @@ diff -Nur linux-3.14.17/arch/arm64/kernel/arm64ksyms.c linux-imx6-3.14/arch/arm6
+#endif
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
++++ linux-imx6-3.14/arch/arm64/kernel/debug-monitors.c 2014-09-11 18:05:54.458007828 +0200
@@ -138,6 +138,7 @@
{
asm volatile("msr oslar_el1, %0" : : "r" (0));
@@ -39385,7 +39385,7 @@ diff -Nur linux-3.14.17/arch/arm64/kernel/debug-monitors.c linux-imx6-3.14/arch/
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
++++ linux-imx6-3.14/arch/arm64/kernel/entry-ftrace.S 2014-09-11 18:05:54.462007844 +0200
@@ -0,0 +1,218 @@
+/*
+ * arch/arm64/kernel/entry-ftrace.S
@@ -39607,7 +39607,7 @@ diff -Nur linux-3.14.17/arch/arm64/kernel/entry-ftrace.S linux-imx6-3.14/arch/ar
+#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
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
++++ linux-imx6-3.14/arch/arm64/kernel/entry.S 2014-09-11 18:05:54.462007844 +0200
@@ -630,8 +630,9 @@
enable_irq
@@ -39646,7 +39646,7 @@ diff -Nur linux-3.14.17/arch/arm64/kernel/entry.S linux-imx6-3.14/arch/arm64/ker
/*
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
++++ linux-imx6-3.14/arch/arm64/kernel/ftrace.c 2014-09-11 18:05:54.462007844 +0200
@@ -0,0 +1,177 @@
+/*
+ * arch/arm64/kernel/ftrace.c
@@ -39827,7 +39827,7 @@ diff -Nur linux-3.14.17/arch/arm64/kernel/ftrace.c linux-imx6-3.14/arch/arm64/ke
+#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
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
++++ linux-imx6-3.14/arch/arm64/kernel/head.S 2014-09-11 18:05:54.462007844 +0200
@@ -26,6 +26,7 @@
#include <asm/assembler.h>
#include <asm/ptrace.h>
@@ -40019,7 +40019,7 @@ diff -Nur linux-3.14.17/arch/arm64/kernel/head.S linux-imx6-3.14/arch/arm64/kern
.quad memstart_addr // x6
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
++++ linux-imx6-3.14/arch/arm64/kernel/hw_breakpoint.c 2014-09-11 18:05:54.462007844 +0200
@@ -20,6 +20,7 @@
#define pr_fmt(fmt) "hw-breakpoint: " fmt
@@ -40038,7 +40038,7 @@ diff -Nur linux-3.14.17/arch/arm64/kernel/hw_breakpoint.c linux-imx6-3.14/arch/a
#include <asm/hw_breakpoint.h>
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
++++ linux-imx6-3.14/arch/arm64/kernel/kgdb.c 2014-09-11 18:05:54.470007876 +0200
@@ -0,0 +1,336 @@
+/*
+ * AArch64 KGDB support
@@ -40378,7 +40378,7 @@ diff -Nur linux-3.14.17/arch/arm64/kernel/kgdb.c linux-imx6-3.14/arch/arm64/kern
+};
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
++++ linux-imx6-3.14/arch/arm64/kernel/Makefile 2014-09-11 18:05:54.458007828 +0200
@@ -5,21 +5,29 @@
CPPFLAGS_vmlinux.lds := -DTEXT_OFFSET=$(TEXT_OFFSET)
AFLAGS_head.o := -DTEXT_OFFSET=$(TEXT_OFFSET)
@@ -40413,7 +40413,7 @@ diff -Nur linux-3.14.17/arch/arm64/kernel/Makefile linux-imx6-3.14/arch/arm64/ke
obj-m += $(arm64-obj-m)
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
++++ linux-imx6-3.14/arch/arm64/kernel/perf_event.c 2014-09-11 18:05:54.474007892 +0200
@@ -1348,8 +1348,8 @@
* Callchain handling code.
*/
@@ -40526,7 +40526,7 @@ diff -Nur linux-3.14.17/arch/arm64/kernel/perf_event.c linux-imx6-3.14/arch/arm6
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
++++ linux-imx6-3.14/arch/arm64/kernel/perf_regs.c 2014-09-11 18:05:54.474007892 +0200
@@ -0,0 +1,46 @@
+#include <linux/errno.h>
+#include <linux/kernel.h>
@@ -40576,7 +40576,7 @@ diff -Nur linux-3.14.17/arch/arm64/kernel/perf_regs.c linux-imx6-3.14/arch/arm64
+}
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
++++ linux-imx6-3.14/arch/arm64/kernel/process.c 2014-09-11 18:05:54.474007892 +0200
@@ -20,6 +20,7 @@
#include <stdarg.h>
@@ -40587,7 +40587,7 @@ diff -Nur linux-3.14.17/arch/arm64/kernel/process.c linux-imx6-3.14/arch/arm64/k
#include <linux/kernel.h>
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
++++ linux-imx6-3.14/arch/arm64/kernel/ptrace.c 2014-09-11 18:05:54.474007892 +0200
@@ -19,6 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -40679,7 +40679,7 @@ diff -Nur linux-3.14.17/arch/arm64/kernel/ptrace.c linux-imx6-3.14/arch/arm64/ke
+}
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
++++ linux-imx6-3.14/arch/arm64/kernel/return_address.c 2014-09-11 18:05:54.474007892 +0200
@@ -0,0 +1,55 @@
+/*
+ * arch/arm64/kernel/return_address.c
@@ -40738,7 +40738,7 @@ diff -Nur linux-3.14.17/arch/arm64/kernel/return_address.c linux-imx6-3.14/arch/
+EXPORT_SYMBOL_GPL(return_address);
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
++++ linux-imx6-3.14/arch/arm64/kernel/setup.c 2014-09-11 18:05:54.474007892 +0200
@@ -69,6 +69,7 @@
COMPAT_HWCAP_VFPv3|COMPAT_HWCAP_VFPv4|\
COMPAT_HWCAP_NEON|COMPAT_HWCAP_IDIV)
@@ -40797,7 +40797,7 @@ diff -Nur linux-3.14.17/arch/arm64/kernel/setup.c linux-imx6-3.14/arch/arm64/ker
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
++++ linux-imx6-3.14/arch/arm64/kernel/signal.c 2014-09-11 18:05:54.474007892 +0200
@@ -17,6 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -40816,7 +40816,7 @@ diff -Nur linux-3.14.17/arch/arm64/kernel/signal.c linux-imx6-3.14/arch/arm64/ke
#include <asm/cacheflush.h>
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
++++ linux-imx6-3.14/arch/arm64/kernel/smp.c 2014-09-11 18:05:54.474007892 +0200
@@ -114,6 +114,11 @@
return ret;
}
@@ -40851,7 +40851,7 @@ diff -Nur linux-3.14.17/arch/arm64/kernel/smp.c linux-imx6-3.14/arch/arm64/kerne
*/
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
++++ linux-imx6-3.14/arch/arm64/kernel/stacktrace.c 2014-09-11 18:05:54.474007892 +0200
@@ -35,7 +35,7 @@
* ldp x29, x30, [sp]
* add sp, sp, #0x10
@@ -40863,7 +40863,7 @@ diff -Nur linux-3.14.17/arch/arm64/kernel/stacktrace.c linux-imx6-3.14/arch/arm6
unsigned long fp = frame->fp;
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
++++ linux-imx6-3.14/arch/arm64/kernel/topology.c 2014-09-11 18:05:54.478007908 +0200
@@ -0,0 +1,558 @@
+/*
+ * arch/arm64/kernel/topology.c
@@ -41425,7 +41425,7 @@ diff -Nur linux-3.14.17/arch/arm64/kernel/topology.c linux-imx6-3.14/arch/arm64/
+}
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
++++ linux-imx6-3.14/arch/arm64/kernel/vdso/Makefile 2014-09-11 18:05:54.478007908 +0200
@@ -47,9 +47,9 @@
$(call if_changed_dep,vdsoas)
@@ -41440,7 +41440,7 @@ diff -Nur linux-3.14.17/arch/arm64/kernel/vdso/Makefile linux-imx6-3.14/arch/arm
# Install commands for the unstripped file
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
++++ linux-imx6-3.14/arch/arm64/kernel/vdso.c 2014-09-11 18:05:54.478007908 +0200
@@ -156,11 +156,12 @@
int uses_interp)
{
@@ -41517,7 +41517,7 @@ diff -Nur linux-3.14.17/arch/arm64/kernel/vdso.c linux-imx6-3.14/arch/arm64/kern
return NULL;
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
++++ linux-imx6-3.14/arch/arm64/kernel/vmlinux.lds.S 2014-09-11 18:05:54.478007908 +0200
@@ -104,6 +104,13 @@
_edata = .;
@@ -41534,7 +41534,7 @@ diff -Nur linux-3.14.17/arch/arm64/kernel/vmlinux.lds.S linux-imx6-3.14/arch/arm
STABS_DEBUG
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
++++ linux-imx6-3.14/arch/arm64/Makefile 2014-09-11 18:05:54.354007412 +0200
@@ -45,6 +45,7 @@
core-y += arch/arm64/kernel/ arch/arm64/mm/
core-$(CONFIG_KVM) += arch/arm64/kvm/
@@ -41545,7 +41545,7 @@ diff -Nur linux-3.14.17/arch/arm64/Makefile linux-imx6-3.14/arch/arm64/Makefile
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
++++ linux-imx6-3.14/arch/arm64/mm/cache.S 2014-09-11 18:05:54.486007940 +0200
@@ -30,7 +30,7 @@
*
* Corrupted registers: x0-x7, x9-x11
@@ -41655,7 +41655,7 @@ diff -Nur linux-3.14.17/arch/arm64/mm/cache.S linux-imx6-3.14/arch/arm64/mm/cach
+ENDPROC(__dma_unmap_area)
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
++++ linux-imx6-3.14/arch/arm64/mm/copypage.c 2014-09-11 18:05:54.486007940 +0200
@@ -27,8 +27,10 @@
copy_page(kto, kfrom);
__flush_dcache_area(kto, PAGE_SIZE);
@@ -41669,7 +41669,7 @@ diff -Nur linux-3.14.17/arch/arm64/mm/copypage.c linux-imx6-3.14/arch/arm64/mm/c
+EXPORT_SYMBOL_GPL(__cpu_clear_user_page);
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
++++ linux-imx6-3.14/arch/arm64/mm/dma-mapping.c 2014-09-11 18:05:54.486007940 +0200
@@ -22,26 +22,39 @@
#include <linux/slab.h>
#include <linux/dma-mapping.h>
@@ -41997,7 +41997,7 @@ diff -Nur linux-3.14.17/arch/arm64/mm/dma-mapping.c linux-imx6-3.14/arch/arm64/m
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
++++ linux-imx6-3.14/arch/arm64/mm/init.c 2014-09-11 18:05:54.486007940 +0200
@@ -30,6 +30,7 @@
#include <linux/memblock.h>
#include <linux/sort.h>
@@ -42096,7 +42096,7 @@ diff -Nur linux-3.14.17/arch/arm64/mm/init.c linux-imx6-3.14/arch/arm64/mm/init.
#ifndef CONFIG_SPARSEMEM_VMEMMAP
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
++++ linux-imx6-3.14/arch/arm64/mm/proc.S 2014-09-11 18:05:54.490007955 +0200
@@ -173,12 +173,6 @@
* value of the SCTLR_EL1 register.
*/
@@ -42112,7 +42112,7 @@ diff -Nur linux-3.14.17/arch/arm64/mm/proc.S linux-imx6-3.14/arch/arm64/mm/proc.
dsb sy
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
++++ linux-imx6-3.14/arch/avr32/kernel/cpu.c 2014-09-11 18:05:54.514008051 +0200
@@ -39,10 +39,12 @@
size_t count)
{
@@ -42211,7 +42211,7 @@ diff -Nur linux-3.14.17/arch/avr32/kernel/cpu.c linux-imx6-3.14/arch/avr32/kerne
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
++++ linux-imx6-3.14/arch/blackfin/include/asm/ftrace.h 2014-09-11 18:05:54.538008148 +0200
@@ -66,16 +66,7 @@
#endif /* CONFIG_FRAME_POINTER */
@@ -42232,7 +42232,7 @@ diff -Nur linux-3.14.17/arch/blackfin/include/asm/ftrace.h linux-imx6-3.14/arch/
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
++++ linux-imx6-3.14/arch/hexagon/include/asm/elf.h 2014-09-11 18:05:55.318011266 +0200
@@ -1,7 +1,7 @@
/*
* ELF definitions for the Hexagon architecture
@@ -42244,7 +42244,7 @@ diff -Nur linux-3.14.17/arch/hexagon/include/asm/elf.h linux-imx6-3.14/arch/hexa
* it under the terms of the GNU General Public License version 2 and
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
++++ linux-imx6-3.14/arch/parisc/include/asm/ftrace.h 2014-09-11 18:05:56.270015072 +0200
@@ -24,15 +24,7 @@
extern unsigned long return_address(unsigned int);
@@ -42264,7 +42264,7 @@ diff -Nur linux-3.14.17/arch/parisc/include/asm/ftrace.h linux-imx6-3.14/arch/pa
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
++++ linux-imx6-3.14/arch/parisc/include/uapi/asm/signal.h 2014-09-11 18:05:56.278015104 +0200
@@ -69,6 +69,8 @@
#define SA_NOMASK SA_NODEFER
#define SA_ONESHOT SA_RESETHAND
@@ -42276,7 +42276,7 @@ diff -Nur linux-3.14.17/arch/parisc/include/uapi/asm/signal.h linux-imx6-3.14/ar
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
++++ linux-imx6-3.14/arch/s390/include/asm/cio.h 2014-09-11 18:05:56.974017886 +0200
@@ -199,7 +199,7 @@
/**
* struct irb - interruption response block
@@ -42288,7 +42288,7 @@ diff -Nur linux-3.14.17/arch/s390/include/asm/cio.h linux-imx6-3.14/arch/s390/in
* The irb that is handed to the device driver when an interrupt occurs. For
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
++++ linux-imx6-3.14/arch/s390/kernel/ptrace.c 2014-09-11 18:05:57.078018301 +0200
@@ -323,14 +323,9 @@
unsigned long mask = PSW_MASK_USER;
@@ -42321,7 +42321,7 @@ diff -Nur linux-3.14.17/arch/s390/kernel/ptrace.c linux-imx6-3.14/arch/s390/kern
(__u64)(tmp & mask) << 32;
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
++++ linux-imx6-3.14/arch/sh/include/asm/ftrace.h 2014-09-11 18:05:57.446019771 +0200
@@ -40,15 +40,7 @@
/* arch/sh/kernel/return_address.c */
extern void *return_address(unsigned int);
@@ -42341,7 +42341,7 @@ diff -Nur linux-3.14.17/arch/sh/include/asm/ftrace.h linux-imx6-3.14/arch/sh/inc
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
++++ linux-imx6-3.14/arch/sparc/include/asm/pgtable_64.h 2014-09-11 18:05:57.682020716 +0200
@@ -24,8 +24,7 @@
/* The kernel image occupies 0x4000000 to 0x6000000 (4MB --> 96MB).
@@ -42520,7 +42520,7 @@ diff -Nur linux-3.14.17/arch/sparc/include/asm/pgtable_64.h linux-imx6-3.14/arch
/*
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
++++ linux-imx6-3.14/arch/sparc/include/asm/tlbflush_64.h 2014-09-11 18:05:57.694020763 +0200
@@ -34,8 +34,6 @@
{
}
@@ -42556,7 +42556,7 @@ diff -Nur linux-3.14.17/arch/sparc/include/asm/tlbflush_64.h linux-imx6-3.14/arc
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
++++ linux-imx6-3.14/arch/sparc/include/asm/tsb.h 2014-09-11 18:05:57.694020763 +0200
@@ -171,8 +171,7 @@
andcc REG1, REG2, %g0; \
be,pt %xcc, 700f; \
@@ -42569,7 +42569,7 @@ diff -Nur linux-3.14.17/arch/sparc/include/asm/tsb.h linux-imx6-3.14/arch/sparc/
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
++++ linux-imx6-3.14/arch/sparc/kernel/head_64.S 2014-09-11 18:05:57.710020827 +0200
@@ -282,8 +282,8 @@
stx %l2, [%l4 + 0x0]
ldx [%sp + 2047 + 128 + 0x50], %l3 ! physaddr low
@@ -42583,7 +42583,7 @@ diff -Nur linux-3.14.17/arch/sparc/kernel/head_64.S linux-imx6-3.14/arch/sparc/k
/* 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
++++ linux-imx6-3.14/arch/sparc/kernel/ktlb.S 2014-09-11 18:05:57.714020844 +0200
@@ -277,7 +277,7 @@
#ifdef CONFIG_SPARSEMEM_VMEMMAP
kvmap_vmemmap:
@@ -42595,7 +42595,7 @@ diff -Nur linux-3.14.17/arch/sparc/kernel/ktlb.S linux-imx6-3.14/arch/sparc/kern
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
++++ linux-imx6-3.14/arch/sparc/kernel/ldc.c 2014-09-11 18:05:57.714020844 +0200
@@ -1336,7 +1336,7 @@
if (!(lp->flags & LDC_FLAG_ALLOCED_QUEUES) ||
!(lp->flags & LDC_FLAG_REGISTERED_QUEUES) ||
@@ -42607,7 +42607,7 @@ diff -Nur linux-3.14.17/arch/sparc/kernel/ldc.c linux-imx6-3.14/arch/sparc/kerne
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
++++ linux-imx6-3.14/arch/sparc/kernel/smp_64.c 2014-09-11 18:05:57.754021003 +0200
@@ -151,7 +151,7 @@
#define NUM_ROUNDS 64 /* magic value */
#define NUM_ITERS 5 /* likewise */
@@ -42637,7 +42637,7 @@ diff -Nur linux-3.14.17/arch/sparc/kernel/smp_64.c linux-imx6-3.14/arch/sparc/ke
#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
++++ linux-imx6-3.14/arch/sparc/kernel/sys32.S 2014-09-11 18:05:57.766021051 +0200
@@ -44,7 +44,7 @@
SIGN1(sys32_io_submit, compat_sys_io_submit, %o1)
SIGN1(sys32_mq_open, compat_sys_mq_open, %o1)
@@ -42649,7 +42649,7 @@ diff -Nur linux-3.14.17/arch/sparc/kernel/sys32.S linux-imx6-3.14/arch/sparc/ker
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
++++ linux-imx6-3.14/arch/sparc/kernel/unaligned_64.c 2014-09-11 18:05:57.774021083 +0200
@@ -166,23 +166,17 @@
unsigned long compute_effective_address(struct pt_regs *regs,
unsigned int insn, unsigned int rd)
@@ -42679,7 +42679,7 @@ diff -Nur linux-3.14.17/arch/sparc/kernel/unaligned_64.c linux-imx6-3.14/arch/sp
/* 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
++++ linux-imx6-3.14/arch/sparc/lib/NG2memcpy.S 2014-09-11 18:05:57.814021242 +0200
@@ -236,7 +236,6 @@
*/
VISEntryHalf
@@ -42690,7 +42690,7 @@ diff -Nur linux-3.14.17/arch/sparc/lib/NG2memcpy.S linux-imx6-3.14/arch/sparc/li
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
++++ linux-imx6-3.14/arch/sparc/math-emu/math_32.c 2014-09-11 18:05:57.866021451 +0200
@@ -499,7 +499,7 @@
case 0: fsr = *pfsr;
if (IR == -1) IR = 2;
@@ -42702,7 +42702,7 @@ diff -Nur linux-3.14.17/arch/sparc/math-emu/math_32.c linux-imx6-3.14/arch/sparc
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
++++ linux-imx6-3.14/arch/sparc/mm/fault_64.c 2014-09-11 18:05:57.866021451 +0200
@@ -96,51 +96,38 @@
pte_t *ptep, pte;
unsigned long pa;
@@ -42863,7 +42863,7 @@ diff -Nur linux-3.14.17/arch/sparc/mm/fault_64.c linux-imx6-3.14/arch/sparc/mm/f
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
++++ linux-imx6-3.14/arch/sparc/mm/gup.c 2014-09-11 18:05:57.866021451 +0200
@@ -73,7 +73,7 @@
struct page *head, *page, *tail;
int refs;
@@ -42875,7 +42875,7 @@ diff -Nur linux-3.14.17/arch/sparc/mm/gup.c linux-imx6-3.14/arch/sparc/mm/gup.c
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
++++ linux-imx6-3.14/arch/sparc/mm/init_64.c 2014-09-11 18:05:57.870021467 +0200
@@ -350,10 +350,6 @@
mm = vma->vm_mm;
@@ -42981,7 +42981,7 @@ diff -Nur linux-3.14.17/arch/sparc/mm/init_64.c linux-imx6-3.14/arch/sparc/mm/in
-}
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
++++ linux-imx6-3.14/arch/sparc/mm/tlb.c 2014-09-11 18:05:57.870021467 +0200
@@ -134,7 +134,7 @@
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
@@ -43041,7 +43041,7 @@ diff -Nur linux-3.14.17/arch/sparc/mm/tlb.c linux-imx6-3.14/arch/sparc/mm/tlb.c
{
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
++++ linux-imx6-3.14/arch/sparc/mm/tsb.c 2014-09-11 18:05:57.870021467 +0200
@@ -133,19 +133,7 @@
mm->context.tsb_block[tsb_idx].tsb_nentries =
tsb_bytes / sizeof(struct tsb);
@@ -43065,7 +43065,7 @@ diff -Nur linux-3.14.17/arch/sparc/mm/tsb.c linux-imx6-3.14/arch/sparc/mm/tsb.c
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
++++ linux-imx6-3.14/arch/x86/boot/header.S 2014-09-11 18:05:58.266023049 +0200
@@ -91,9 +91,10 @@
.section ".bsdata", "a"
@@ -43116,7 +43116,7 @@ diff -Nur linux-3.14.17/arch/x86/boot/header.S linux-imx6-3.14/arch/x86/boot/hea
# Kernel attributes; used by setup. This is part 1 of the
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
++++ linux-imx6-3.14/arch/x86/boot/tools/build.c 2014-09-11 18:05:58.326023289 +0200
@@ -142,7 +142,7 @@
#ifdef CONFIG_EFI_STUB
@@ -43227,7 +43227,7 @@ diff -Nur linux-3.14.17/arch/x86/include/asm/espfix.h linux-imx6-3.14/arch/x86/i
-#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
++++ linux-imx6-3.14/arch/x86/include/asm/irqflags.h 2014-09-11 18:05:58.386023528 +0200
@@ -129,7 +129,7 @@
#define PARAVIRT_ADJUST_EXCEPTION_FRAME /* */
@@ -43239,7 +43239,7 @@ diff -Nur linux-3.14.17/arch/x86/include/asm/irqflags.h linux-imx6-3.14/arch/x86
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
++++ linux-imx6-3.14/arch/x86/include/asm/pgtable_64_types.h 2014-09-11 18:05:58.390023544 +0200
@@ -61,8 +61,6 @@
#define MODULES_VADDR (__START_KERNEL_map + KERNEL_IMAGE_SIZE)
#define MODULES_END _AC(0xffffffffff000000, UL)
@@ -43251,7 +43251,7 @@ diff -Nur linux-3.14.17/arch/x86/include/asm/pgtable_64_types.h linux-imx6-3.14/
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
++++ linux-imx6-3.14/arch/x86/include/asm/setup.h 2014-09-11 18:05:58.414023641 +0200
@@ -65,8 +65,6 @@
#ifndef _SETUP
@@ -43263,7 +43263,7 @@ diff -Nur linux-3.14.17/arch/x86/include/asm/setup.h linux-imx6-3.14/arch/x86/in
*/
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
++++ linux-imx6-3.14/arch/x86/Kconfig 2014-09-11 18:05:58.262023032 +0200
@@ -966,27 +966,10 @@
default y
depends on X86_32
@@ -43298,7 +43298,7 @@ diff -Nur linux-3.14.17/arch/x86/Kconfig linux-imx6-3.14/arch/x86/Kconfig
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
++++ linux-imx6-3.14/arch/x86/kernel/entry_32.S 2014-09-11 18:05:58.538024137 +0200
@@ -433,8 +433,8 @@
cmpl $(NR_syscalls), %eax
jae sysenter_badsys
@@ -43424,7 +43424,7 @@ diff -Nur linux-3.14.17/arch/x86/kernel/entry_32.S linux-imx6-3.14/arch/x86/kern
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
++++ linux-imx6-3.14/arch/x86/kernel/entry_64.S 2014-09-11 18:05:58.538024137 +0200
@@ -58,7 +58,6 @@
#include <asm/asm.h>
#include <asm/context_tracking.h>
@@ -43756,7 +43756,7 @@ diff -Nur linux-3.14.17/arch/x86/kernel/espfix_64.c linux-imx6-3.14/arch/x86/ker
-}
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
++++ linux-imx6-3.14/arch/x86/kernel/ldt.c 2014-09-11 18:05:58.546024168 +0200
@@ -20,6 +20,8 @@
#include <asm/mmu_context.h>
#include <asm/syscalls.h>
@@ -43786,7 +43786,7 @@ diff -Nur linux-3.14.17/arch/x86/kernel/ldt.c linux-imx6-3.14/arch/x86/kernel/ld
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
++++ linux-imx6-3.14/arch/x86/kernel/Makefile 2014-09-11 18:05:58.478023896 +0200
@@ -29,7 +29,6 @@
obj-y += syscall_$(BITS).o
obj-$(CONFIG_X86_64) += vsyscall_64.o
@@ -43797,7 +43797,7 @@ diff -Nur linux-3.14.17/arch/x86/kernel/Makefile linux-imx6-3.14/arch/x86/kernel
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
++++ linux-imx6-3.14/arch/x86/kernel/paravirt_patch_64.c 2014-09-11 18:05:58.546024168 +0200
@@ -6,6 +6,7 @@
DEF_NATIVE(pv_irq_ops, irq_enable, "sti");
DEF_NATIVE(pv_irq_ops, restore_fl, "pushq %rdi; popfq");
@@ -43816,7 +43816,7 @@ diff -Nur linux-3.14.17/arch/x86/kernel/paravirt_patch_64.c linux-imx6-3.14/arch
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
++++ linux-imx6-3.14/arch/x86/kernel/setup.c 2014-09-11 18:05:58.578024296 +0200
@@ -1120,7 +1120,7 @@
setup_real_mode();
@@ -43828,7 +43828,7 @@ diff -Nur linux-3.14.17/arch/x86/kernel/setup.c linux-imx6-3.14/arch/x86/kernel/
* 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
++++ linux-imx6-3.14/arch/x86/kernel/smpboot.c 2014-09-11 18:05:58.582024312 +0200
@@ -243,13 +243,6 @@
check_tsc_sync_target();
@@ -43845,7 +43845,7 @@ diff -Nur linux-3.14.17/arch/x86/kernel/smpboot.c linux-imx6-3.14/arch/x86/kerne
* 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
++++ linux-imx6-3.14/arch/x86/mm/dump_pagetables.c 2014-09-11 18:05:58.694024760 +0200
@@ -30,13 +30,11 @@
unsigned long start_address;
unsigned long current_address;
@@ -43927,7 +43927,7 @@ diff -Nur linux-3.14.17/arch/x86/mm/dump_pagetables.c linux-imx6-3.14/arch/x86/m
* 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
++++ linux-imx6-3.14/arch/x86/vdso/vdso32-setup.c 2014-09-11 18:05:58.862025430 +0200
@@ -41,6 +41,7 @@
#ifdef CONFIG_X86_64
#define vdso_enabled sysctl_vsyscall32
@@ -43952,7 +43952,7 @@ diff -Nur linux-3.14.17/arch/x86/vdso/vdso32-setup.c linux-imx6-3.14/arch/x86/vd
};
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
++++ linux-imx6-3.14/arch/x86/xen/setup.c 2014-09-11 18:05:58.890025543 +0200
@@ -574,7 +574,13 @@
}
#endif /* CONFIG_X86_64 */
@@ -43978,7 +43978,7 @@ diff -Nur linux-3.14.17/arch/x86/xen/setup.c linux-imx6-3.14/arch/x86/xen/setup.
/* 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
++++ linux-imx6-3.14/arch/xtensa/kernel/vectors.S 2014-09-11 18:05:59.070026262 +0200
@@ -376,42 +376,38 @@
beqz a2, 1f # if at start of vector, don't restore
@@ -44175,7 +44175,7 @@ diff -Nur linux-3.14.17/arch/xtensa/kernel/vectors.S linux-imx6-3.14/arch/xtensa
* 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
++++ linux-imx6-3.14/arch/xtensa/kernel/vmlinux.lds.S 2014-09-11 18:05:59.070026262 +0200
@@ -269,13 +269,13 @@
.UserExceptionVector.literal)
SECTION_VECTOR (_DoubleExceptionVector_literal,
@@ -44194,7 +44194,7 @@ diff -Nur linux-3.14.17/arch/xtensa/kernel/vmlinux.lds.S linux-imx6-3.14/arch/xt
. = (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
++++ linux-imx6-3.14/block/bfq-cgroup.c 2014-09-11 18:05:59.118026454 +0200
@@ -0,0 +1,932 @@
+/*
+ * BFQ: CGROUPS support.
@@ -45130,7 +45130,7 @@ diff -Nur linux-3.14.17/block/bfq-cgroup.c linux-imx6-3.14/block/bfq-cgroup.c
+#endif
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
++++ linux-imx6-3.14/block/bfq.h 2014-09-11 18:05:59.118026454 +0200
@@ -0,0 +1,770 @@
+/*
+ * BFQ-v7r5 for 3.14.0: data structures and common functions prototypes.
@@ -45904,7 +45904,7 @@ diff -Nur linux-3.14.17/block/bfq.h linux-imx6-3.14/block/bfq.h
+#endif /* _BFQ_H */
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
++++ linux-imx6-3.14/block/bfq-ioc.c 2014-09-11 18:05:59.118026454 +0200
@@ -0,0 +1,36 @@
+/*
+ * BFQ: I/O context handling.
@@ -45944,7 +45944,7 @@ diff -Nur linux-3.14.17/block/bfq-ioc.c linux-imx6-3.14/block/bfq-ioc.c
+}
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
++++ linux-imx6-3.14/block/bfq-iosched.c 2014-09-11 18:05:59.118026454 +0200
@@ -0,0 +1,3919 @@
+/*
+ * Budget Fair Queueing (BFQ) disk scheduler.
@@ -49867,7 +49867,7 @@ diff -Nur linux-3.14.17/block/bfq-iosched.c linux-imx6-3.14/block/bfq-iosched.c
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/block/bfq-sched.c 2014-09-11 18:05:59.118026454 +0200
@@ -0,0 +1,1179 @@
+/*
+ * BFQ: Hierarchical B-WF2Q+ scheduler.
@@ -51050,7 +51050,7 @@ diff -Nur linux-3.14.17/block/bfq-sched.c linux-imx6-3.14/block/bfq-sched.c
+}
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
++++ linux-imx6-3.14/block/blk-cgroup.c 2014-09-11 18:05:59.118026454 +0200
@@ -859,13 +859,6 @@
{
lockdep_assert_held(q->queue_lock);
@@ -51067,7 +51067,7 @@ diff -Nur linux-3.14.17/block/blk-cgroup.c linux-imx6-3.14/block/blk-cgroup.c
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
++++ linux-imx6-3.14/block/blk-core.c 2014-09-11 18:05:59.122026470 +0200
@@ -1928,7 +1928,7 @@
* in some cases below, so export this function.
* Request stacking drivers like request-based dm may change the queue
@@ -51079,7 +51079,7 @@ diff -Nur linux-3.14.17/block/blk-core.c linux-imx6-3.14/block/blk-core.c
* when submitting requests.
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
++++ linux-imx6-3.14/block/blk-map.c 2014-09-11 18:05:59.122026470 +0200
@@ -285,7 +285,7 @@
*
* Description:
@@ -51091,7 +51091,7 @@ diff -Nur linux-3.14.17/block/blk-map.c linux-imx6-3.14/block/blk-map.c
int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
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
++++ linux-imx6-3.14/block/blk-tag.c 2014-09-11 18:05:59.122026470 +0200
@@ -27,15 +27,18 @@
EXPORT_SYMBOL(blk_queue_find_tag);
@@ -51159,7 +51159,7 @@ diff -Nur linux-3.14.17/block/blk-tag.c linux-imx6-3.14/block/blk-tag.c
*
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
++++ linux-imx6-3.14/block/compat_ioctl.c 2014-09-11 18:05:59.126026486 +0200
@@ -690,7 +690,6 @@
case BLKROSET:
case BLKDISCARD:
@@ -51170,7 +51170,7 @@ diff -Nur linux-3.14.17/block/compat_ioctl.c linux-imx6-3.14/block/compat_ioctl.
* but we call blkdev_ioctl, which gets the lock for us
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
++++ linux-imx6-3.14/block/Kconfig.iosched 2014-09-11 18:05:59.118026454 +0200
@@ -39,6 +39,27 @@
---help---
Enable group IO scheduling in CFQ.
@@ -51226,7 +51226,7 @@ diff -Nur linux-3.14.17/block/Kconfig.iosched linux-imx6-3.14/block/Kconfig.iosc
endmenu
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
++++ linux-imx6-3.14/block/Makefile 2014-09-11 18:05:59.118026454 +0200
@@ -16,6 +16,7 @@
obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o
obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o
@@ -51237,7 +51237,7 @@ diff -Nur linux-3.14.17/block/Makefile linux-imx6-3.14/block/Makefile
obj-$(CONFIG_BLK_DEV_INTEGRITY) += blk-integrity.o
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
++++ linux-imx6-3.14/crypto/af_alg.c 2014-09-11 18:05:59.134026519 +0200
@@ -21,7 +21,6 @@
#include <linux/module.h>
#include <linux/net.h>
@@ -51256,7 +51256,7 @@ diff -Nur linux-3.14.17/crypto/af_alg.c linux-imx6-3.14/crypto/af_alg.c
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
++++ linux-imx6-3.14/crypto/blkcipher.c 2014-09-11 18:05:59.150026582 +0200
@@ -70,14 +70,12 @@
return max(start, end_page);
}
@@ -51458,7 +51458,7 @@ diff -Nur linux-3.14.17/crypto/blkcipher.c linux-imx6-3.14/crypto/blkcipher.c
{
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
++++ linux-imx6-3.14/crypto/tcrypt.c 2014-09-11 18:05:59.186026726 +0200
@@ -33,6 +33,7 @@
#include <linux/jiffies.h>
#include <linux/timex.h>
@@ -51509,7 +51509,7 @@ diff -Nur linux-3.14.17/crypto/tcrypt.c linux-imx6-3.14/crypto/tcrypt.c
}
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
++++ linux-imx6-3.14/Documentation/ABI/testing/sysfs-class-net-statistics 2014-09-11 18:05:51.685996745 +0200
@@ -0,0 +1,201 @@
+What: /sys/class/<iface>/statistics/collisions
+Date: April 2005
@@ -51714,7 +51714,7 @@ diff -Nur linux-3.14.17/Documentation/ABI/testing/sysfs-class-net-statistics lin
+ late collisions errors.
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
++++ linux-imx6-3.14/Documentation/arm64/booting.txt 2014-09-11 18:05:51.793997177 +0200
@@ -111,8 +111,14 @@
- Caches, MMUs
The MMU must be off.
@@ -51734,7 +51734,7 @@ diff -Nur linux-3.14.17/Documentation/arm64/booting.txt linux-imx6-3.14/Document
CNTFRQ must be programmed with the timer frequency and CNTVOFF must
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
++++ linux-imx6-3.14/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt 2014-09-11 18:05:51.825997304 +0200
@@ -0,0 +1,64 @@
+Freescale Busfreq driver
+
@@ -51802,7 +51802,7 @@ diff -Nur linux-3.14.17/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.t
+};
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
++++ linux-imx6-3.14/Documentation/devicetree/bindings/arm/imx/gpc.txt 2014-09-11 18:05:51.825997304 +0200
@@ -0,0 +1,20 @@
+Freescale imx GPC bindings
+
@@ -51826,7 +51826,7 @@ diff -Nur linux-3.14.17/Documentation/devicetree/bindings/arm/imx/gpc.txt linux-
+ };
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
++++ linux-imx6-3.14/Documentation/devicetree/bindings/arm/pmu.txt 2014-09-11 18:05:51.825997304 +0200
@@ -17,6 +17,9 @@
"arm,arm1176-pmu"
"arm,arm1136-pmu"
@@ -51839,7 +51839,7 @@ diff -Nur linux-3.14.17/Documentation/devicetree/bindings/arm/pmu.txt linux-imx6
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
++++ linux-imx6-3.14/Documentation/devicetree/bindings/ata/ahci-platform.txt 2014-09-11 18:05:51.833997337 +0200
@@ -4,12 +4,19 @@
Each SATA controller should have its own node.
@@ -51863,7 +51863,7 @@ diff -Nur linux-3.14.17/Documentation/devicetree/bindings/ata/ahci-platform.txt
sata@ffe08000 {
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
++++ linux-imx6-3.14/Documentation/devicetree/bindings/clock/imx6q-clock.txt 2014-09-11 18:05:51.837997352 +0200
@@ -89,8 +89,6 @@
gpu3d_shader 74
ipu1_podf 75
@@ -51896,7 +51896,7 @@ diff -Nur linux-3.14.17/Documentation/devicetree/bindings/clock/imx6q-clock.txt
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
++++ linux-imx6-3.14/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt 2014-09-11 18:05:51.845997384 +0200
@@ -47,6 +47,7 @@
20 ASRC
21 ESAI
@@ -51907,7 +51907,7 @@ diff -Nur linux-3.14.17/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt l
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
++++ linux-imx6-3.14/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt 2014-09-11 18:05:51.845997384 +0200
@@ -0,0 +1,146 @@
+* FSL IPUv3 Display/FB
+
@@ -52057,7 +52057,7 @@ diff -Nur linux-3.14.17/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt li
+ };
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
++++ linux-imx6-3.14/Documentation/devicetree/bindings/leds/leds-pwm.txt 2014-09-11 18:05:51.857997433 +0200
@@ -13,6 +13,8 @@
For the pwms and pwm-names property please refer to:
Documentation/devicetree/bindings/pwm/pwm.txt
@@ -52069,7 +52069,7 @@ diff -Nur linux-3.14.17/Documentation/devicetree/bindings/leds/leds-pwm.txt linu
- linux,default-trigger : (optional)
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
++++ linux-imx6-3.14/Documentation/devicetree/bindings/mailbox/mailbox.txt 2014-09-11 18:05:51.857997433 +0200
@@ -0,0 +1,33 @@
+* Generic Mailbox Controller and client driver bindings
+
@@ -52106,7 +52106,7 @@ diff -Nur linux-3.14.17/Documentation/devicetree/bindings/mailbox/mailbox.txt li
+ };
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
++++ linux-imx6-3.14/Documentation/devicetree/bindings/mlb/mlb150.txt 2014-09-11 18:05:51.865997464 +0200
@@ -0,0 +1,22 @@
+* Freescale Media Local Bus Host Controller (MLB) for i.MX6Q/DL
+
@@ -52132,7 +52132,7 @@ diff -Nur linux-3.14.17/Documentation/devicetree/bindings/mlb/mlb150.txt linux-i
+};
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
++++ linux-imx6-3.14/Documentation/devicetree/bindings/mmc/mmc.txt 2014-09-11 18:05:51.865997464 +0200
@@ -5,6 +5,8 @@
Interpreted by the OF core:
- reg: Registers location and length.
@@ -52160,7 +52160,7 @@ diff -Nur linux-3.14.17/Documentation/devicetree/bindings/mmc/mmc.txt linux-imx6
line levels. We choose to follow the SDHCI standard, which specifies both those
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
++++ linux-imx6-3.14/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt 2014-09-11 18:05:51.905997624 +0200
@@ -71,6 +71,13 @@
name for integer state ID 0, list entry 1 for state ID 1, and
so on.
@@ -52177,7 +52177,7 @@ diff -Nur linux-3.14.17/Documentation/devicetree/bindings/pinctrl/pinctrl-bindin
/* For a client device requiring named states */
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
++++ linux-imx6-3.14/Documentation/devicetree/bindings/reset/gpio-reset.txt 2014-09-11 18:05:51.929997720 +0200
@@ -0,0 +1,35 @@
+GPIO reset controller
+=====================
@@ -52216,7 +52216,7 @@ diff -Nur linux-3.14.17/Documentation/devicetree/bindings/reset/gpio-reset.txt l
+};
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
++++ linux-imx6-3.14/Documentation/devicetree/bindings/sound/cs42888.txt 2014-09-11 18:05:51.937997752 +0200
@@ -0,0 +1,29 @@
+CS42888 audio CODEC
+
@@ -52249,7 +52249,7 @@ diff -Nur linux-3.14.17/Documentation/devicetree/bindings/sound/cs42888.txt linu
+};
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
++++ linux-imx6-3.14/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt 2014-09-11 18:05:51.937997752 +0200
@@ -0,0 +1,23 @@
+* Freescale Asynchronous Sample Rate Converter (ASRC)
+
@@ -52276,7 +52276,7 @@ diff -Nur linux-3.14.17/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt
+};
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
++++ linux-imx6-3.14/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt 2014-09-11 18:05:51.937997752 +0200
@@ -0,0 +1,25 @@
+Freescale i.MX audio complex with CS42888 codec
+
@@ -52305,7 +52305,7 @@ diff -Nur linux-3.14.17/Documentation/devicetree/bindings/sound/imx-audio-cs4288
+};
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
++++ linux-imx6-3.14/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt 2014-09-11 18:05:51.937997752 +0200
@@ -24,6 +24,12 @@
Note: The AUDMUX port numbering should start at 1, which is consistent with
hardware manual.
@@ -52328,7 +52328,7 @@ diff -Nur linux-3.14.17/Documentation/devicetree/bindings/sound/imx-audio-wm8962
};
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
++++ linux-imx6-3.14/Documentation/devicetree/bindings/sound/wm8962.txt 2014-09-11 18:05:51.949997800 +0200
@@ -13,6 +13,14 @@
of R51 (Class D Control 2) gets set, indicating that the speaker is
in mono mode.
@@ -52346,7 +52346,7 @@ diff -Nur linux-3.14.17/Documentation/devicetree/bindings/sound/wm8962.txt linux
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
++++ linux-imx6-3.14/Documentation/devicetree/bindings/usb/mxs-phy.txt 2014-09-11 18:05:51.977997912 +0200
@@ -1,13 +1,16 @@
* Freescale MXS USB Phy Device
@@ -52367,7 +52367,7 @@ diff -Nur linux-3.14.17/Documentation/devicetree/bindings/usb/mxs-phy.txt linux-
};
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
++++ linux-imx6-3.14/Documentation/devicetree/bindings/video/fsl,csi-v4l2-capture.txt 2014-09-11 18:05:51.981997928 +0200
@@ -0,0 +1,61 @@
+* Freescale CMOS Sensor Interface (CSI) V4L2 Capture
+
@@ -52432,7 +52432,7 @@ diff -Nur linux-3.14.17/Documentation/devicetree/bindings/video/fsl,csi-v4l2-cap
+ };
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
++++ linux-imx6-3.14/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt 2014-09-11 18:05:51.981997928 +0200
@@ -0,0 +1,42 @@
+* Freescale MIPI CSI2 Controller for i.MX6DQ/i.MX6SDL
+
@@ -52478,7 +52478,7 @@ diff -Nur linux-3.14.17/Documentation/devicetree/bindings/video/fsl,mipi-csi2.tx
+ };
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
++++ linux-imx6-3.14/Documentation/devicetree/bindings/video/fsl,pxp.txt 2014-09-11 18:05:51.981997928 +0200
@@ -0,0 +1,30 @@
+* Freescale PxP Controller for i.MX6DL, i.MX6SL
+
@@ -52512,7 +52512,7 @@ diff -Nur linux-3.14.17/Documentation/devicetree/bindings/video/fsl,pxp.txt linu
+ };
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
++++ linux-imx6-3.14/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt 2014-09-11 18:05:51.981997928 +0200
@@ -0,0 +1,102 @@
+* Freescale V4L2 Capture for i.MX6DQ/i.MX6SDL
+
@@ -52618,7 +52618,7 @@ diff -Nur linux-3.14.17/Documentation/devicetree/bindings/video/fsl,v4l2-capture
+ };
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
++++ linux-imx6-3.14/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt 2014-09-11 18:05:51.981997928 +0200
@@ -0,0 +1,20 @@
+Device-Tree bindings for hdmi video driver
+
@@ -52642,7 +52642,7 @@ diff -Nur linux-3.14.17/Documentation/devicetree/bindings/video/mxc_hdmi_video.t
+
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
++++ linux-imx6-3.14/Documentation/filesystems/hfsplus.txt 2014-09-11 18:05:52.081998328 +0200
@@ -56,4 +56,4 @@
kernel source: <file:fs/hfsplus>
@@ -52651,7 +52651,7 @@ diff -Nur linux-3.14.17/Documentation/filesystems/hfsplus.txt linux-imx6-3.14/Do
+Apple Technote 1150 https://developer.apple.com/legacy/library/technotes/tn/tn1150.html
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
++++ linux-imx6-3.14/Documentation/kernel-parameters.txt 2014-09-11 18:05:52.177998711 +0200
@@ -603,8 +603,11 @@
Also note the kernel might malfunction if you disable
some critical bits.
@@ -52668,7 +52668,7 @@ diff -Nur linux-3.14.17/Documentation/kernel-parameters.txt linux-imx6-3.14/Docu
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
++++ linux-imx6-3.14/Documentation/networking/gianfar.txt 2014-09-11 18:05:52.233998935 +0200
@@ -1,38 +1,8 @@
The Gianfar Ethernet Driver
-Sysfs File description
@@ -52710,7 +52710,7 @@ diff -Nur linux-3.14.17/Documentation/networking/gianfar.txt linux-imx6-3.14/Doc
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
++++ linux-imx6-3.14/Documentation/x86/x86_64/mm.txt 2014-09-11 18:05:52.449999800 +0200
@@ -12,8 +12,6 @@
ffffe90000000000 - ffffe9ffffffffff (=40 bits) hole
ffffea0000000000 - ffffeaffffffffff (=40 bits) virtual memory map (1TB)
@@ -52722,7 +52722,7 @@ diff -Nur linux-3.14.17/Documentation/x86/x86_64/mm.txt linux-imx6-3.14/Document
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
++++ linux-imx6-3.14/drivers/ata/acard-ahci.c 2014-09-11 18:05:59.410027622 +0200
@@ -36,7 +36,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52733,7 +52733,7 @@ diff -Nur linux-3.14.17/drivers/ata/acard-ahci.c linux-imx6-3.14/drivers/ata/aca
#include <linux/interrupt.h>
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
++++ linux-imx6-3.14/drivers/ata/ahci.c 2014-09-11 18:05:59.410027622 +0200
@@ -35,7 +35,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52815,7 +52815,7 @@ diff -Nur linux-3.14.17/drivers/ata/ahci.c linux-imx6-3.14/drivers/ata/ahci.c
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
++++ linux-imx6-3.14/drivers/ata/ahci.h 2014-09-11 18:05:59.414027637 +0200
@@ -37,6 +37,8 @@
#include <linux/clk.h>
@@ -52863,7 +52863,7 @@ diff -Nur linux-3.14.17/drivers/ata/ahci.h linux-imx6-3.14/drivers/ata/ahci.h
extern int ahci_ignore_sss;
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
++++ linux-imx6-3.14/drivers/ata/ahci_imx.c 2014-09-11 18:05:59.414027637 +0200
@@ -26,12 +26,29 @@
#include <linux/mfd/syscon.h>
#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
@@ -53686,7 +53686,7 @@ diff -Nur linux-3.14.17/drivers/ata/ahci_imx.c linux-imx6-3.14/drivers/ata/ahci_
module_platform_driver(imx_ahci_driver);
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
++++ linux-imx6-3.14/drivers/ata/ahci_platform.c 2014-09-11 18:05:59.414027637 +0200
@@ -12,135 +12,36 @@
* any later version.
*/
@@ -54037,7 +54037,7 @@ diff -Nur linux-3.14.17/drivers/ata/ahci_platform.c linux-imx6-3.14/drivers/ata/
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
++++ linux-imx6-3.14/drivers/ata/ata_generic.c 2014-09-11 18:05:59.414027637 +0200
@@ -19,7 +19,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -54048,7 +54048,7 @@ diff -Nur linux-3.14.17/drivers/ata/ata_generic.c linux-imx6-3.14/drivers/ata/at
#include <scsi/scsi_host.h>
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
++++ linux-imx6-3.14/drivers/ata/Kconfig 2014-09-11 18:05:59.410027622 +0200
@@ -99,7 +99,7 @@
config AHCI_IMX
@@ -54060,7 +54060,7 @@ diff -Nur linux-3.14.17/drivers/ata/Kconfig linux-imx6-3.14/drivers/ata/Kconfig
onboard AHCI SATA.
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
++++ linux-imx6-3.14/drivers/ata/libahci.c 2014-09-11 18:05:59.414027637 +0200
@@ -35,7 +35,6 @@
#include <linux/kernel.h>
#include <linux/gfp.h>
@@ -54212,7 +54212,7 @@ diff -Nur linux-3.14.17/drivers/ata/libahci.c linux-imx6-3.14/drivers/ata/libahc
static void ahci_pmp_attach(struct ata_port *ap)
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
++++ linux-imx6-3.14/drivers/ata/libahci_platform.c 2014-09-11 18:05:59.414027637 +0200
@@ -0,0 +1,544 @@
+/*
+ * AHCI SATA platform library
@@ -54760,7 +54760,7 @@ diff -Nur linux-3.14.17/drivers/ata/libahci_platform.c linux-imx6-3.14/drivers/a
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/drivers/ata/libata-core.c 2014-09-11 18:05:59.418027652 +0200
@@ -1524,7 +1524,7 @@
* @dev: Device to which the command is sent
* @tf: Taskfile registers for the command and the result
@@ -54827,7 +54827,7 @@ diff -Nur linux-3.14.17/drivers/ata/libata-core.c linux-imx6-3.14/drivers/ata/li
dev_err(host->dev, "BUG: trying to register unstarted host\n");
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
++++ linux-imx6-3.14/drivers/ata/Makefile 2014-09-11 18:05:59.410027622 +0200
@@ -4,13 +4,13 @@
# non-SFF interface
obj-$(CONFIG_SATA_AHCI) += ahci.o libahci.o
@@ -54846,7 +54846,7 @@ diff -Nur linux-3.14.17/drivers/ata/Makefile linux-imx6-3.14/drivers/ata/Makefil
obj-$(CONFIG_PDC_ADMA) += pdc_adma.o
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
++++ linux-imx6-3.14/drivers/ata/pata_acpi.c 2014-09-11 18:05:59.422027668 +0200
@@ -7,7 +7,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -54857,7 +54857,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_acpi.c linux-imx6-3.14/drivers/ata/pata
#include <linux/device.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_amd.c 2014-09-11 18:05:59.422027668 +0200
@@ -17,7 +17,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -54868,7 +54868,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_amd.c linux-imx6-3.14/drivers/ata/pata_
#include <scsi/scsi_host.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_artop.c 2014-09-11 18:05:59.422027668 +0200
@@ -19,7 +19,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -54879,7 +54879,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_artop.c linux-imx6-3.14/drivers/ata/pat
#include <linux/device.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_at91.c 2014-09-11 18:05:59.422027668 +0200
@@ -18,7 +18,6 @@
#include <linux/kernel.h>
@@ -54890,7 +54890,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_at91.c linux-imx6-3.14/drivers/ata/pata
#include <scsi/scsi_host.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_atiixp.c 2014-09-11 18:05:59.422027668 +0200
@@ -15,7 +15,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -54901,7 +54901,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_atiixp.c linux-imx6-3.14/drivers/ata/pa
#include <scsi/scsi_host.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_atp867x.c 2014-09-11 18:05:59.422027668 +0200
@@ -29,7 +29,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -54912,7 +54912,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_atp867x.c linux-imx6-3.14/drivers/ata/p
#include <linux/device.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_cmd640.c 2014-09-11 18:05:59.422027668 +0200
@@ -15,7 +15,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -54923,7 +54923,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_cmd640.c linux-imx6-3.14/drivers/ata/pa
#include <linux/gfp.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_cmd64x.c 2014-09-11 18:05:59.422027668 +0200
@@ -26,7 +26,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -54934,7 +54934,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_cmd64x.c linux-imx6-3.14/drivers/ata/pa
#include <scsi/scsi_host.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_cs5520.c 2014-09-11 18:05:59.422027668 +0200
@@ -34,7 +34,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -54945,7 +54945,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_cs5520.c linux-imx6-3.14/drivers/ata/pa
#include <scsi/scsi_host.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_cs5530.c 2014-09-11 18:05:59.422027668 +0200
@@ -26,7 +26,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -54956,7 +54956,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_cs5530.c linux-imx6-3.14/drivers/ata/pa
#include <scsi/scsi_host.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_cs5535.c 2014-09-11 18:05:59.422027668 +0200
@@ -31,7 +31,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -54967,7 +54967,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_cs5535.c linux-imx6-3.14/drivers/ata/pa
#include <scsi/scsi_host.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_cs5536.c 2014-09-11 18:05:59.422027668 +0200
@@ -33,7 +33,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -54978,7 +54978,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_cs5536.c linux-imx6-3.14/drivers/ata/pa
#include <linux/libata.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_cypress.c 2014-09-11 18:05:59.422027668 +0200
@@ -11,7 +11,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -54989,7 +54989,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_cypress.c linux-imx6-3.14/drivers/ata/p
#include <scsi/scsi_host.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_efar.c 2014-09-11 18:05:59.426027685 +0200
@@ -14,7 +14,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55000,7 +55000,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_efar.c linux-imx6-3.14/drivers/ata/pata
#include <linux/device.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_ep93xx.c 2014-09-11 18:05:59.426027685 +0200
@@ -34,7 +34,6 @@
#include <linux/err.h>
#include <linux/kernel.h>
@@ -55011,7 +55011,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_ep93xx.c linux-imx6-3.14/drivers/ata/pa
#include <linux/ata.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_hpt366.c 2014-09-11 18:05:59.426027685 +0200
@@ -19,7 +19,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55022,7 +55022,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_hpt366.c linux-imx6-3.14/drivers/ata/pa
#include <scsi/scsi_host.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_hpt37x.c 2014-09-11 18:05:59.426027685 +0200
@@ -19,7 +19,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55033,7 +55033,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_hpt37x.c linux-imx6-3.14/drivers/ata/pa
#include <scsi/scsi_host.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_hpt3x2n.c 2014-09-11 18:05:59.426027685 +0200
@@ -20,7 +20,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55044,7 +55044,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_hpt3x2n.c linux-imx6-3.14/drivers/ata/p
#include <scsi/scsi_host.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_hpt3x3.c 2014-09-11 18:05:59.426027685 +0200
@@ -16,7 +16,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55055,7 +55055,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_hpt3x3.c linux-imx6-3.14/drivers/ata/pa
#include <scsi/scsi_host.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_imx.c 2014-09-11 18:05:59.426027685 +0200
@@ -15,7 +15,6 @@
*/
#include <linux/kernel.h>
@@ -55066,7 +55066,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_imx.c linux-imx6-3.14/drivers/ata/pata_
#include <linux/ata.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_it8213.c 2014-09-11 18:05:59.426027685 +0200
@@ -10,7 +10,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55077,7 +55077,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_it8213.c linux-imx6-3.14/drivers/ata/pa
#include <linux/device.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_it821x.c 2014-09-11 18:05:59.426027685 +0200
@@ -72,7 +72,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55088,7 +55088,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_it821x.c linux-imx6-3.14/drivers/ata/pa
#include <linux/slab.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_jmicron.c 2014-09-11 18:05:59.426027685 +0200
@@ -10,7 +10,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55099,7 +55099,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_jmicron.c linux-imx6-3.14/drivers/ata/p
#include <linux/device.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_marvell.c 2014-09-11 18:05:59.430027701 +0200
@@ -11,7 +11,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55110,7 +55110,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_marvell.c linux-imx6-3.14/drivers/ata/p
#include <linux/device.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_mpiix.c 2014-09-11 18:05:59.430027701 +0200
@@ -28,7 +28,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55121,7 +55121,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_mpiix.c linux-imx6-3.14/drivers/ata/pat
#include <scsi/scsi_host.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_netcell.c 2014-09-11 18:05:59.430027701 +0200
@@ -7,7 +7,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55132,7 +55132,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_netcell.c linux-imx6-3.14/drivers/ata/p
#include <linux/device.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_ninja32.c 2014-09-11 18:05:59.430027701 +0200
@@ -37,7 +37,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55143,7 +55143,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_ninja32.c linux-imx6-3.14/drivers/ata/p
#include <scsi/scsi_host.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_ns87410.c 2014-09-11 18:05:59.430027701 +0200
@@ -20,7 +20,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55154,7 +55154,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_ns87410.c linux-imx6-3.14/drivers/ata/p
#include <scsi/scsi_host.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_ns87415.c 2014-09-11 18:05:59.430027701 +0200
@@ -25,7 +25,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55165,7 +55165,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_ns87415.c linux-imx6-3.14/drivers/ata/p
#include <linux/device.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_oldpiix.c 2014-09-11 18:05:59.430027701 +0200
@@ -16,7 +16,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55176,7 +55176,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_oldpiix.c linux-imx6-3.14/drivers/ata/p
#include <linux/device.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_opti.c 2014-09-11 18:05:59.430027701 +0200
@@ -26,7 +26,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55187,7 +55187,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_opti.c linux-imx6-3.14/drivers/ata/pata
#include <scsi/scsi_host.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_optidma.c 2014-09-11 18:05:59.430027701 +0200
@@ -25,7 +25,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55198,7 +55198,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_optidma.c linux-imx6-3.14/drivers/ata/p
#include <scsi/scsi_host.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_pcmcia.c 2014-09-11 18:05:59.430027701 +0200
@@ -26,7 +26,6 @@
#include <linux/kernel.h>
@@ -55209,7 +55209,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_pcmcia.c linux-imx6-3.14/drivers/ata/pa
#include <linux/slab.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_pdc2027x.c 2014-09-11 18:05:59.430027701 +0200
@@ -25,7 +25,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55220,7 +55220,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_pdc2027x.c linux-imx6-3.14/drivers/ata/
#include <linux/device.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_pdc202xx_old.c 2014-09-11 18:05:59.430027701 +0200
@@ -15,7 +15,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55231,7 +55231,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_pdc202xx_old.c linux-imx6-3.14/drivers/
#include <scsi/scsi_host.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_piccolo.c 2014-09-11 18:05:59.430027701 +0200
@@ -18,7 +18,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55242,7 +55242,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_piccolo.c linux-imx6-3.14/drivers/ata/p
#include <scsi/scsi_host.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_platform.c 2014-09-11 18:05:59.430027701 +0200
@@ -13,7 +13,6 @@
*/
#include <linux/kernel.h>
@@ -55253,7 +55253,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_platform.c linux-imx6-3.14/drivers/ata/
#include <linux/ata.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_pxa.c 2014-09-11 18:05:59.430027701 +0200
@@ -20,7 +20,6 @@
#include <linux/kernel.h>
@@ -55264,7 +55264,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_pxa.c linux-imx6-3.14/drivers/ata/pata_
#include <linux/libata.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_radisys.c 2014-09-11 18:05:59.430027701 +0200
@@ -15,7 +15,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55275,7 +55275,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_radisys.c linux-imx6-3.14/drivers/ata/p
#include <linux/device.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_rdc.c 2014-09-11 18:05:59.430027701 +0200
@@ -24,7 +24,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55286,7 +55286,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_rdc.c linux-imx6-3.14/drivers/ata/pata_
#include <linux/device.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_rz1000.c 2014-09-11 18:05:59.430027701 +0200
@@ -14,7 +14,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55297,7 +55297,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_rz1000.c linux-imx6-3.14/drivers/ata/pa
#include <scsi/scsi_host.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_sc1200.c 2014-09-11 18:05:59.434027716 +0200
@@ -32,7 +32,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55308,7 +55308,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_sc1200.c linux-imx6-3.14/drivers/ata/pa
#include <scsi/scsi_host.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_scc.c 2014-09-11 18:05:59.434027716 +0200
@@ -35,7 +35,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55319,7 +55319,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_scc.c linux-imx6-3.14/drivers/ata/pata_
#include <linux/device.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_sch.c 2014-09-11 18:05:59.434027716 +0200
@@ -27,7 +27,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55330,7 +55330,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_sch.c linux-imx6-3.14/drivers/ata/pata_
#include <linux/device.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_serverworks.c 2014-09-11 18:05:59.434027716 +0200
@@ -34,7 +34,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55341,7 +55341,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_serverworks.c linux-imx6-3.14/drivers/a
#include <scsi/scsi_host.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_sil680.c 2014-09-11 18:05:59.434027716 +0200
@@ -25,7 +25,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55352,7 +55352,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_sil680.c linux-imx6-3.14/drivers/ata/pa
#include <scsi/scsi_host.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_sis.c 2014-09-11 18:05:59.434027716 +0200
@@ -26,7 +26,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55363,7 +55363,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_sis.c linux-imx6-3.14/drivers/ata/pata_
#include <linux/device.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_sl82c105.c 2014-09-11 18:05:59.434027716 +0200
@@ -19,7 +19,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55374,7 +55374,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_sl82c105.c linux-imx6-3.14/drivers/ata/
#include <scsi/scsi_host.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_triflex.c 2014-09-11 18:05:59.434027716 +0200
@@ -36,7 +36,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55385,7 +55385,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_triflex.c linux-imx6-3.14/drivers/ata/p
#include <scsi/scsi_host.h>
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
++++ linux-imx6-3.14/drivers/ata/pata_via.c 2014-09-11 18:05:59.434027716 +0200
@@ -55,7 +55,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55396,7 +55396,7 @@ diff -Nur linux-3.14.17/drivers/ata/pata_via.c linux-imx6-3.14/drivers/ata/pata_
#include <linux/gfp.h>
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
++++ linux-imx6-3.14/drivers/ata/pdc_adma.c 2014-09-11 18:05:59.434027716 +0200
@@ -36,7 +36,6 @@
#include <linux/module.h>
#include <linux/gfp.h>
@@ -55407,7 +55407,7 @@ diff -Nur linux-3.14.17/drivers/ata/pdc_adma.c linux-imx6-3.14/drivers/ata/pdc_a
#include <linux/interrupt.h>
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
++++ linux-imx6-3.14/drivers/ata/sata_dwc_460ex.c 2014-09-11 18:05:59.434027716 +0200
@@ -29,7 +29,6 @@
#include <linux/kernel.h>
@@ -55418,7 +55418,7 @@ diff -Nur linux-3.14.17/drivers/ata/sata_dwc_460ex.c linux-imx6-3.14/drivers/ata
#include <linux/of_irq.h>
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
++++ linux-imx6-3.14/drivers/ata/sata_highbank.c 2014-09-11 18:05:59.434027716 +0200
@@ -19,7 +19,6 @@
#include <linux/kernel.h>
#include <linux/gfp.h>
@@ -55446,7 +55446,7 @@ diff -Nur linux-3.14.17/drivers/ata/sata_highbank.c linux-imx6-3.14/drivers/ata/
*class = ahci_dev_classify(ap);
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
++++ linux-imx6-3.14/drivers/ata/sata_nv.c 2014-09-11 18:05:59.438027733 +0200
@@ -40,7 +40,6 @@
#include <linux/module.h>
#include <linux/gfp.h>
@@ -55457,7 +55457,7 @@ diff -Nur linux-3.14.17/drivers/ata/sata_nv.c linux-imx6-3.14/drivers/ata/sata_n
#include <linux/interrupt.h>
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
++++ linux-imx6-3.14/drivers/ata/sata_promise.c 2014-09-11 18:05:59.438027733 +0200
@@ -35,7 +35,6 @@
#include <linux/module.h>
#include <linux/gfp.h>
@@ -55468,7 +55468,7 @@ diff -Nur linux-3.14.17/drivers/ata/sata_promise.c linux-imx6-3.14/drivers/ata/s
#include <linux/interrupt.h>
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
++++ linux-imx6-3.14/drivers/ata/sata_qstor.c 2014-09-11 18:05:59.438027733 +0200
@@ -31,7 +31,6 @@
#include <linux/module.h>
#include <linux/gfp.h>
@@ -55479,7 +55479,7 @@ diff -Nur linux-3.14.17/drivers/ata/sata_qstor.c linux-imx6-3.14/drivers/ata/sat
#include <linux/interrupt.h>
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
++++ linux-imx6-3.14/drivers/ata/sata_sil.c 2014-09-11 18:05:59.438027733 +0200
@@ -37,7 +37,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55490,7 +55490,7 @@ diff -Nur linux-3.14.17/drivers/ata/sata_sil.c linux-imx6-3.14/drivers/ata/sata_
#include <linux/interrupt.h>
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
++++ linux-imx6-3.14/drivers/ata/sata_sis.c 2014-09-11 18:05:59.438027733 +0200
@@ -33,7 +33,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55501,7 +55501,7 @@ diff -Nur linux-3.14.17/drivers/ata/sata_sis.c linux-imx6-3.14/drivers/ata/sata_
#include <linux/interrupt.h>
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
++++ linux-imx6-3.14/drivers/ata/sata_svw.c 2014-09-11 18:05:59.438027733 +0200
@@ -39,7 +39,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55512,7 +55512,7 @@ diff -Nur linux-3.14.17/drivers/ata/sata_svw.c linux-imx6-3.14/drivers/ata/sata_
#include <linux/interrupt.h>
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
++++ linux-imx6-3.14/drivers/ata/sata_sx4.c 2014-09-11 18:05:59.438027733 +0200
@@ -82,7 +82,6 @@
#include <linux/module.h>
#include <linux/pci.h>
@@ -55523,7 +55523,7 @@ diff -Nur linux-3.14.17/drivers/ata/sata_sx4.c linux-imx6-3.14/drivers/ata/sata_
#include <linux/interrupt.h>
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
++++ linux-imx6-3.14/drivers/ata/sata_uli.c 2014-09-11 18:05:59.438027733 +0200
@@ -28,7 +28,6 @@
#include <linux/module.h>
#include <linux/gfp.h>
@@ -55534,7 +55534,7 @@ diff -Nur linux-3.14.17/drivers/ata/sata_uli.c linux-imx6-3.14/drivers/ata/sata_
#include <linux/interrupt.h>
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
++++ linux-imx6-3.14/drivers/ata/sata_via.c 2014-09-11 18:05:59.438027733 +0200
@@ -36,7 +36,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55545,7 +55545,7 @@ diff -Nur linux-3.14.17/drivers/ata/sata_via.c linux-imx6-3.14/drivers/ata/sata_
#include <linux/device.h>
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
++++ linux-imx6-3.14/drivers/ata/sata_vsc.c 2014-09-11 18:05:59.438027733 +0200
@@ -37,7 +37,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -55556,7 +55556,7 @@ diff -Nur linux-3.14.17/drivers/ata/sata_vsc.c linux-imx6-3.14/drivers/ata/sata_
#include <linux/interrupt.h>
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
++++ linux-imx6-3.14/drivers/base/bus.c 2014-09-11 18:05:59.498027972 +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
@@ -55568,7 +55568,7 @@ diff -Nur linux-3.14.17/drivers/base/bus.c linux-imx6-3.14/drivers/base/bus.c
* Do not use this interface for anything new, it exists for compatibility
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
++++ linux-imx6-3.14/drivers/base/cpu.c 2014-09-11 18:05:59.522028069 +0200
@@ -15,6 +15,7 @@
#include <linux/percpu.h>
#include <linux/acpi.h>
@@ -55656,7 +55656,7 @@ diff -Nur linux-3.14.17/drivers/base/cpu.c linux-imx6-3.14/drivers/base/cpu.c
NULL
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
++++ linux-imx6-3.14/drivers/base/dma-buf.c 2014-09-11 18:05:59.522028069 +0200
@@ -251,9 +251,8 @@
* @dmabuf: [in] buffer to attach device to.
* @dev: [in] device to be attached.
@@ -55712,7 +55712,7 @@ diff -Nur linux-3.14.17/drivers/base/dma-buf.c linux-imx6-3.14/drivers/base/dma-
dmabuf->vmap_ptr = ptr;
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
++++ linux-imx6-3.14/drivers/base/dma-contiguous.c 2014-09-11 18:05:59.522028069 +0200
@@ -24,22 +24,9 @@
#include <linux/memblock.h>
@@ -56042,7 +56042,7 @@ diff -Nur linux-3.14.17/drivers/base/dma-contiguous.c linux-imx6-3.14/drivers/ba
}
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
++++ linux-imx6-3.14/drivers/base/Kconfig 2014-09-11 18:05:59.498027972 +0200
@@ -185,6 +185,14 @@
bool
default n
@@ -56077,7 +56077,7 @@ diff -Nur linux-3.14.17/drivers/base/Kconfig linux-imx6-3.14/drivers/base/Kconfi
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
++++ linux-imx6-3.14/drivers/base/platform.c 2014-09-11 18:05:59.526028085 +0200
@@ -89,13 +89,8 @@
return dev->archdata.irqs[num];
#else
@@ -56096,7 +56096,7 @@ diff -Nur linux-3.14.17/drivers/base/platform.c linux-imx6-3.14/drivers/base/pla
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
++++ linux-imx6-3.14/drivers/bus/arm-cci.c 2014-09-11 18:05:59.666028644 +0200
@@ -26,6 +26,7 @@
#include <asm/cacheflush.h>
@@ -56127,7 +56127,7 @@ diff -Nur linux-3.14.17/drivers/bus/arm-cci.c linux-imx6-3.14/drivers/bus/arm-cc
return -ENODEV;
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
++++ linux-imx6-3.14/drivers/char/fsl_otp.c 2014-09-11 18:05:59.682028708 +0200
@@ -0,0 +1,299 @@
+/*
+ * Freescale On-Chip OTP driver
@@ -56430,7 +56430,7 @@ diff -Nur linux-3.14.17/drivers/char/fsl_otp.c linux-imx6-3.14/drivers/char/fsl_
+MODULE_DESCRIPTION("Freescale i.MX OCOTP driver");
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
++++ linux-imx6-3.14/drivers/char/Kconfig 2014-09-11 18:05:59.670028659 +0200
@@ -82,6 +82,21 @@
If unsure, say N.
@@ -56455,7 +56455,7 @@ diff -Nur linux-3.14.17/drivers/char/Kconfig linux-imx6-3.14/drivers/char/Kconfi
depends on PARPORT
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
++++ linux-imx6-3.14/drivers/char/Makefile 2014-09-11 18:05:59.670028659 +0200
@@ -16,6 +16,7 @@
obj-$(CONFIG_IBM_BSR) += bsr.o
obj-$(CONFIG_SGI_MBCS) += mbcs.o
@@ -56466,7 +56466,7 @@ diff -Nur linux-3.14.17/drivers/char/Makefile linux-imx6-3.14/drivers/char/Makef
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
++++ linux-imx6-3.14/drivers/clk/clk.c 2014-09-11 18:05:59.854029395 +0200
@@ -1702,6 +1702,7 @@
*/
int clk_set_parent(struct clk *clk, struct clk *parent)
@@ -56496,7 +56496,7 @@ diff -Nur linux-3.14.17/drivers/clk/clk.c linux-imx6-3.14/drivers/clk/clk.c
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
++++ linux-imx6-3.14/drivers/clk/clk-mux.c 2014-09-11 18:05:59.826029283 +0200
@@ -143,7 +143,7 @@
init.ops = &clk_mux_ro_ops;
else
@@ -56508,7 +56508,7 @@ diff -Nur linux-3.14.17/drivers/clk/clk-mux.c linux-imx6-3.14/drivers/clk/clk-mu
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
++++ linux-imx6-3.14/drivers/cpufreq/cpufreq.c 2014-09-11 18:05:59.998029971 +0200
@@ -1089,12 +1089,10 @@
* the creation of a brand new one. So we need to perform this update
* by invoking update_policy_cpu().
@@ -56526,7 +56526,7 @@ diff -Nur linux-3.14.17/drivers/cpufreq/cpufreq.c linux-imx6-3.14/drivers/cpufre
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
++++ linux-imx6-3.14/drivers/cpufreq/cpufreq_interactive.c 2014-09-11 18:05:59.998029971 +0200
@@ -0,0 +1,1349 @@
+/*
+ * drivers/cpufreq/cpufreq_interactive.c
@@ -57879,7 +57879,7 @@ diff -Nur linux-3.14.17/drivers/cpufreq/cpufreq_interactive.c linux-imx6-3.14/dr
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/drivers/cpufreq/highbank-cpufreq.c 2014-09-11 18:06:00.006030002 +0200
@@ -19,7 +19,7 @@
#include <linux/cpu.h>
#include <linux/err.h>
@@ -57891,7 +57891,7 @@ diff -Nur linux-3.14.17/drivers/cpufreq/highbank-cpufreq.c linux-imx6-3.14/drive
#define HB_CPUFREQ_CHANGE_NOTE 0x80000001
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
++++ linux-imx6-3.14/drivers/cpufreq/imx6-cpufreq.c 2014-09-11 18:06:00.006030002 +0200
@@ -0,0 +1,393 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -58622,7 +58622,7 @@ diff -Nur linux-3.14.17/drivers/cpufreq/imx6q-cpufreq.c linux-imx6-3.14/drivers/
-MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/drivers/cpufreq/Kconfig 2014-09-11 18:05:59.970029858 +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.
@@ -58666,7 +58666,7 @@ diff -Nur linux-3.14.17/drivers/cpufreq/Kconfig linux-imx6-3.14/drivers/cpufreq/
config CPU_FREQ_GOV_CONSERVATIVE
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
++++ linux-imx6-3.14/drivers/cpufreq/Kconfig.arm 2014-09-11 18:05:59.970029858 +0200
@@ -4,7 +4,8 @@
config ARM_BIG_LITTLE_CPUFREQ
@@ -58688,7 +58688,7 @@ diff -Nur linux-3.14.17/drivers/cpufreq/Kconfig.arm linux-imx6-3.14/drivers/cpuf
depends on REGULATOR_ANATOP
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
++++ linux-imx6-3.14/drivers/cpufreq/Makefile 2014-09-11 18:05:59.970029858 +0200
@@ -8,6 +8,7 @@
obj-$(CONFIG_CPU_FREQ_GOV_POWERSAVE) += cpufreq_powersave.o
obj-$(CONFIG_CPU_FREQ_GOV_USERSPACE) += cpufreq_userspace.o
@@ -58708,7 +58708,7 @@ diff -Nur linux-3.14.17/drivers/cpufreq/Makefile linux-imx6-3.14/drivers/cpufreq
obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ) += omap-cpufreq.o
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
++++ linux-imx6-3.14/drivers/crypto/caam/secvio.c 2014-09-11 18:06:00.054030194 +0200
@@ -0,0 +1,335 @@
+
+/*
@@ -59047,7 +59047,7 @@ diff -Nur linux-3.14.17/drivers/crypto/caam/secvio.c linux-imx6-3.14/drivers/cry
+#endif
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
++++ linux-imx6-3.14/drivers/crypto/caam/secvio.h 2014-09-11 18:06:00.062030226 +0200
@@ -0,0 +1,64 @@
+
+/*
@@ -59115,7 +59115,7 @@ diff -Nur linux-3.14.17/drivers/crypto/caam/secvio.h linux-imx6-3.14/drivers/cry
+#endif /* SECVIO_H */
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
++++ linux-imx6-3.14/drivers/crypto/caam/sm.h 2014-09-11 18:06:00.066030242 +0200
@@ -0,0 +1,88 @@
+
+/*
@@ -59207,7 +59207,7 @@ diff -Nur linux-3.14.17/drivers/crypto/caam/sm.h linux-imx6-3.14/drivers/crypto/
+#endif /* SM_H */
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
++++ linux-imx6-3.14/drivers/crypto/caam/sm_store.c 2014-09-11 18:06:00.066030242 +0200
@@ -0,0 +1,896 @@
+
+/*
@@ -60107,7 +60107,7 @@ diff -Nur linux-3.14.17/drivers/crypto/caam/sm_store.c linux-imx6-3.14/drivers/c
+#endif
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
++++ linux-imx6-3.14/drivers/crypto/caam/sm_test.c 2014-09-11 18:06:00.066030242 +0200
@@ -0,0 +1,844 @@
+/*
+ * Secure Memory / Keystore Exemplification Module
@@ -60955,7 +60955,7 @@ diff -Nur linux-3.14.17/drivers/crypto/caam/sm_test.c linux-imx6-3.14/drivers/cr
+#endif
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
++++ linux-imx6-3.14/drivers/crypto/caam/snvsregs.h 2014-09-11 18:06:00.066030242 +0200
@@ -0,0 +1,237 @@
+/*
+ * SNVS hardware register-level view
@@ -61196,7 +61196,7 @@ diff -Nur linux-3.14.17/drivers/crypto/caam/snvsregs.h linux-imx6-3.14/drivers/c
+#endif /* SNVSREGS_H */
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
++++ linux-imx6-3.14/drivers/dma/imx-sdma.c 2014-09-11 18:06:00.162030626 +0200
@@ -29,6 +29,7 @@
#include <linux/semaphore.h>
#include <linux/spinlock.h>
@@ -61795,7 +61795,7 @@ diff -Nur linux-3.14.17/drivers/dma/imx-sdma.c linux-imx6-3.14/drivers/dma/imx-s
goto err_init;
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
++++ linux-imx6-3.14/drivers/dma/Kconfig 2014-09-11 18:06:00.122030466 +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.
@@ -61818,7 +61818,7 @@ diff -Nur linux-3.14.17/drivers/dma/Kconfig linux-imx6-3.14/drivers/dma/Kconfig
depends on MACH_TX49XX || MACH_TX39XX
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
++++ linux-imx6-3.14/drivers/dma/Makefile 2014-09-11 18:06:00.122030466 +0200
@@ -18,6 +18,7 @@
obj-$(CONFIG_DW_DMAC_CORE) += dw/
obj-$(CONFIG_AT_HDMAC) += at_hdmac.o
@@ -61829,13 +61829,13 @@ diff -Nur linux-3.14.17/drivers/dma/Makefile linux-imx6-3.14/drivers/dma/Makefil
obj-$(CONFIG_COH901318) += coh901318.o coh901318_lli.o
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
++++ linux-imx6-3.14/drivers/dma/pxp/Makefile 2014-09-11 18:06:00.198030770 +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.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
++++ linux-imx6-3.14/drivers/dma/pxp/pxp_device.c 2014-09-11 18:06:00.198030770 +0200
@@ -0,0 +1,765 @@
+/*
+ * Copyright (C) 2010-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -62604,7 +62604,7 @@ diff -Nur linux-3.14.17/drivers/dma/pxp/pxp_device.c linux-imx6-3.14/drivers/dma
+}
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
++++ linux-imx6-3.14/drivers/dma/pxp/pxp_dma_v2.c 2014-09-11 18:06:00.198030770 +0200
@@ -0,0 +1,1854 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc.
@@ -64462,7 +64462,7 @@ diff -Nur linux-3.14.17/drivers/dma/pxp/pxp_dma_v2.c linux-imx6-3.14/drivers/dma
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/drivers/dma/pxp/regs-pxp_v2.h 2014-09-11 18:06:00.198030770 +0200
@@ -0,0 +1,1152 @@
+/*
+ * Freescale PXP Register Definitions
@@ -65618,7 +65618,7 @@ diff -Nur linux-3.14.17/drivers/dma/pxp/regs-pxp_v2.h linux-imx6-3.14/drivers/dm
+#endif /* __ARCH_ARM___PXP_H */
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
++++ linux-imx6-3.14/drivers/gpio/gpio-pca953x.c 2014-09-11 18:06:00.354031392 +0200
@@ -19,6 +19,7 @@
#include <linux/irqdomain.h>
#include <linux/i2c.h>
@@ -65640,7 +65640,7 @@ diff -Nur linux-3.14.17/drivers/gpio/gpio-pca953x.c linux-imx6-3.14/drivers/gpio
*/
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
++++ linux-imx6-3.14/drivers/gpu/drm/drm_crtc_helper.c 2014-09-11 18:06:00.478031888 +0200
@@ -564,7 +564,7 @@
* Caller must hold mode config lock.
*
@@ -65652,7 +65652,7 @@ diff -Nur linux-3.14.17/drivers/gpu/drm/drm_crtc_helper.c linux-imx6-3.14/driver
* ->prepare(), ->modeset() and ->commit() helper callbacks.
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
++++ linux-imx6-3.14/drivers/gpu/drm/drm_prime.c 2014-09-11 18:06:00.494031953 +0200
@@ -471,7 +471,7 @@
get_dma_buf(dma_buf);
@@ -65664,7 +65664,7 @@ diff -Nur linux-3.14.17/drivers/gpu/drm/drm_prime.c linux-imx6-3.14/drivers/gpu/
}
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
++++ linux-imx6-3.14/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c 2014-09-11 18:06:00.498031968 +0200
@@ -224,7 +224,7 @@
get_dma_buf(dma_buf);
@@ -65676,7 +65676,7 @@ diff -Nur linux-3.14.17/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c linux-imx6-3.
}
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
++++ linux-imx6-3.14/drivers/gpu/drm/Kconfig 2014-09-11 18:06:00.394031553 +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.
@@ -65693,7 +65693,7 @@ diff -Nur linux-3.14.17/drivers/gpu/drm/Kconfig linux-imx6-3.14/drivers/gpu/drm/
source "drivers/gpu/drm/vmwgfx/Kconfig"
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
++++ linux-imx6-3.14/drivers/gpu/drm/Makefile 2014-09-11 18:06:00.394031553 +0200
@@ -1,3 +1,24 @@
+##############################################################################
+#
@@ -65729,7 +65729,7 @@ diff -Nur linux-3.14.17/drivers/gpu/drm/Makefile linux-imx6-3.14/drivers/gpu/drm
obj-$(CONFIG_DRM_RADEON)+= radeon/
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
++++ linux-imx6-3.14/drivers/gpu/drm/radeon/cik.c 2014-09-11 18:06:00.878033486 +0200
@@ -2219,7 +2219,6 @@
gb_tile_moden = 0;
break;
@@ -65748,7 +65748,7 @@ diff -Nur linux-3.14.17/drivers/gpu/drm/radeon/cik.c linux-imx6-3.14/drivers/gpu
}
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
++++ linux-imx6-3.14/drivers/gpu/drm/radeon/evergreen.c 2014-09-11 18:06:00.882033502 +0200
@@ -4763,7 +4763,6 @@
tmp = RREG32(IH_RB_CNTL);
tmp |= IH_WPTR_OVERFLOW_CLEAR;
@@ -65759,7 +65759,7 @@ diff -Nur linux-3.14.17/drivers/gpu/drm/radeon/evergreen.c linux-imx6-3.14/drive
}
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
++++ linux-imx6-3.14/drivers/gpu/drm/radeon/r600.c 2014-09-11 18:06:00.890033535 +0200
@@ -3795,7 +3795,6 @@
tmp = RREG32(IH_RB_CNTL);
tmp |= IH_WPTR_OVERFLOW_CLEAR;
@@ -65770,7 +65770,7 @@ diff -Nur linux-3.14.17/drivers/gpu/drm/radeon/r600.c linux-imx6-3.14/drivers/gp
}
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
++++ linux-imx6-3.14/drivers/gpu/drm/radeon/si.c 2014-09-11 18:06:00.910033615 +0200
@@ -6098,7 +6098,6 @@
tmp = RREG32(IH_RB_CNTL);
tmp |= IH_WPTR_OVERFLOW_CLEAR;
@@ -65781,7 +65781,7 @@ diff -Nur linux-3.14.17/drivers/gpu/drm/radeon/si.c linux-imx6-3.14/drivers/gpu/
}
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
++++ linux-imx6-3.14/drivers/gpu/drm/vivante/Makefile 2014-09-11 18:06:00.966033837 +0200
@@ -0,0 +1,29 @@
+##############################################################################
+#
@@ -65814,7 +65814,7 @@ diff -Nur linux-3.14.17/drivers/gpu/drm/vivante/Makefile linux-imx6-3.14/drivers
+obj-$(CONFIG_DRM_VIVANTE) += vivante.o
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
++++ linux-imx6-3.14/drivers/gpu/drm/vivante/vivante_drv.c 2014-09-11 18:06:00.966033837 +0200
@@ -0,0 +1,108 @@
+/****************************************************************************
+*
@@ -65926,7 +65926,7 @@ diff -Nur linux-3.14.17/drivers/gpu/drm/vivante/vivante_drv.c linux-imx6-3.14/dr
+MODULE_LICENSE("GPL and additional rights");
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
++++ linux-imx6-3.14/drivers/gpu/drm/vivante/vivante_drv.h 2014-09-11 18:06:00.966033837 +0200
@@ -0,0 +1,66 @@
+/****************************************************************************
+*
@@ -65996,7 +65996,7 @@ diff -Nur linux-3.14.17/drivers/gpu/drm/vivante/vivante_drv.h linux-imx6-3.14/dr
+#endif
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
++++ linux-imx6-3.14/drivers/hwmon/Kconfig 2014-09-11 18:06:01.102034382 +0200
@@ -1584,4 +1584,19 @@
endif # ACPI
@@ -66019,7 +66019,7 @@ diff -Nur linux-3.14.17/drivers/hwmon/Kconfig linux-imx6-3.14/drivers/hwmon/Kcon
endif # HWMON
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
++++ linux-imx6-3.14/drivers/hwmon/mag3110.c 2014-09-11 18:06:01.178034686 +0200
@@ -0,0 +1,611 @@
+/*
+ *
@@ -66634,7 +66634,7 @@ diff -Nur linux-3.14.17/drivers/hwmon/mag3110.c linux-imx6-3.14/drivers/hwmon/ma
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/drivers/hwmon/Makefile 2014-09-11 18:06:01.102034382 +0200
@@ -142,6 +142,8 @@
obj-$(CONFIG_SENSORS_W83L786NG) += w83l786ng.o
obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o
@@ -66646,7 +66646,7 @@ diff -Nur linux-3.14.17/drivers/hwmon/Makefile linux-imx6-3.14/drivers/hwmon/Mak
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
++++ linux-imx6-3.14/drivers/hwmon/mxc_mma8451.c 2014-09-11 18:06:01.178034686 +0200
@@ -0,0 +1,598 @@
+/*
+ * mma8451.c - Linux kernel modules for 3-Axis Orientation/Motion
@@ -67248,7 +67248,7 @@ diff -Nur linux-3.14.17/drivers/hwmon/mxc_mma8451.c linux-imx6-3.14/drivers/hwmo
+module_exit(mma8451_exit);
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
++++ linux-imx6-3.14/drivers/hwmon/smsc47m192.c 2014-09-11 18:06:01.198034765 +0200
@@ -86,7 +86,7 @@
*/
static inline s8 TEMP_TO_REG(int val)
@@ -67269,7 +67269,7 @@ diff -Nur linux-3.14.17/drivers/hwmon/smsc47m192.c linux-imx6-3.14/drivers/hwmon
return count;
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
++++ linux-imx6-3.14/drivers/i2c/busses/i2c-imx.c 2014-09-11 18:06:01.214034829 +0200
@@ -184,6 +184,9 @@
int stopped;
unsigned int ifdr; /* IMX_I2C_IFDR */
@@ -67413,7 +67413,7 @@ diff -Nur linux-3.14.17/drivers/i2c/busses/i2c-imx.c linux-imx6-3.14/drivers/i2c
imx_i2c_write_reg(i2c_imx->hwdata->i2cr_ien_opcode ^ I2CR_IEN,
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
++++ linux-imx6-3.14/drivers/iio/accel/bma180.c 2014-09-11 18:06:01.246034957 +0200
@@ -68,13 +68,13 @@
/* Defaults values */
#define BMA180_DEF_PMODE 0
@@ -67450,7 +67450,7 @@ diff -Nur linux-3.14.17/drivers/iio/accel/bma180.c linux-imx6-3.14/drivers/iio/a
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
++++ linux-imx6-3.14/drivers/iio/industrialio-buffer.c 2014-09-11 18:06:01.286035116 +0200
@@ -953,7 +953,7 @@
/* Now we have the two masks, work from least sig and build up sizes */
@@ -67462,7 +67462,7 @@ diff -Nur linux-3.14.17/drivers/iio/industrialio-buffer.c linux-imx6-3.14/driver
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
++++ linux-imx6-3.14/drivers/input/input.c 2014-09-11 18:06:01.434035708 +0200
@@ -257,10 +257,9 @@
}
@@ -67494,7 +67494,7 @@ diff -Nur linux-3.14.17/drivers/input/input.c linux-imx6-3.14/drivers/input/inpu
dev->event(dev, type, code, value);
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
++++ linux-imx6-3.14/drivers/input/keyboard/gpio_keys.c 2014-09-11 18:06:01.486035915 +0200
@@ -3,6 +3,7 @@
*
* Copyright 2005 Phil Blundell
@@ -67514,7 +67514,7 @@ diff -Nur linux-3.14.17/drivers/input/keyboard/gpio_keys.c linux-imx6-3.14/drive
if (!button->irq) {
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
++++ linux-imx6-3.14/drivers/input/keyboard/imx_keypad.c 2014-09-11 18:06:01.486035915 +0200
@@ -1,6 +1,7 @@
/*
* Driver for the IMX keypad port.
@@ -67543,7 +67543,7 @@ diff -Nur linux-3.14.17/drivers/input/keyboard/imx_keypad.c linux-imx6-3.14/driv
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
++++ linux-imx6-3.14/drivers/input/misc/mma8450.c 2014-09-11 18:06:01.498035963 +0200
@@ -1,7 +1,7 @@
/*
* Driver for Freescale's 3-Axis Accelerometer MMA8450
@@ -67816,7 +67816,7 @@ diff -Nur linux-3.14.17/drivers/input/misc/mma8450.c linux-imx6-3.14/drivers/inp
kfree(m);
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
++++ linux-imx6-3.14/drivers/input/mouse/synaptics.c 2014-09-11 18:06:01.526036075 +0200
@@ -132,8 +132,7 @@
1232, 5710, 1156, 4696
},
@@ -67838,7 +67838,7 @@ diff -Nur linux-3.14.17/drivers/input/mouse/synaptics.c linux-imx6-3.14/drivers/
"LEN2005",
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
++++ linux-imx6-3.14/drivers/input/sparse-keymap.c 2014-09-11 18:06:01.554036186 +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
@@ -67850,7 +67850,7 @@ diff -Nur linux-3.14.17/drivers/input/sparse-keymap.c linux-imx6-3.14/drivers/in
void sparse_keymap_free(struct input_dev *dev)
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
++++ linux-imx6-3.14/drivers/Kconfig 2014-09-11 18:05:59.194026757 +0200
@@ -96,6 +96,8 @@
source "drivers/memstick/Kconfig"
@@ -67862,7 +67862,7 @@ diff -Nur linux-3.14.17/drivers/Kconfig linux-imx6-3.14/drivers/Kconfig
source "drivers/accessibility/Kconfig"
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
++++ linux-imx6-3.14/drivers/leds/leds-gpio.c 2014-09-11 18:06:01.842037338 +0200
@@ -3,7 +3,7 @@
*
* Copyright (C) 2007 8D Technologies inc.
@@ -67883,7 +67883,7 @@ diff -Nur linux-3.14.17/drivers/leds/leds-gpio.c linux-imx6-3.14/drivers/leds/le
&pdev->dev, NULL);
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
++++ linux-imx6-3.14/drivers/leds/leds-pwm.c 2014-09-11 18:06:01.846037353 +0200
@@ -70,6 +70,10 @@
duty *= brightness;
@@ -68071,7 +68071,7 @@ diff -Nur linux-3.14.17/drivers/leds/leds-pwm.c linux-imx6-3.14/drivers/leds/led
static int led_pwm_remove(struct platform_device *pdev)
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
++++ linux-imx6-3.14/drivers/mailbox/mailbox.c 2014-09-11 18:06:01.890037529 +0200
@@ -0,0 +1,488 @@
+/*
+ * Mailbox: Common code for Mailbox controllers and users
@@ -68563,7 +68563,7 @@ diff -Nur linux-3.14.17/drivers/mailbox/mailbox.c linux-imx6-3.14/drivers/mailbo
+EXPORT_SYMBOL_GPL(mbox_controller_unregister);
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
++++ linux-imx6-3.14/drivers/mailbox/Makefile 2014-09-11 18:06:01.890037529 +0200
@@ -1,3 +1,7 @@
+# Generic MAILBOX API
+
@@ -68574,7 +68574,7 @@ diff -Nur linux-3.14.17/drivers/mailbox/Makefile linux-imx6-3.14/drivers/mailbox
obj-$(CONFIG_OMAP_MBOX) += omap-mailbox.o
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
++++ linux-imx6-3.14/drivers/mailbox/pl320-ipc.c 2014-09-11 18:06:01.890037529 +0200
@@ -26,7 +26,7 @@
#include <linux/device.h>
#include <linux/amba/bus.h>
@@ -68586,7 +68586,7 @@ diff -Nur linux-3.14.17/drivers/mailbox/pl320-ipc.c linux-imx6-3.14/drivers/mail
#define IPCMxDSET(m) (((m) * 0x40) + 0x004)
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
++++ linux-imx6-3.14/drivers/Makefile 2014-09-11 18:05:59.194026757 +0200
@@ -111,6 +111,7 @@
obj-$(CONFIG_CPU_FREQ) += cpufreq/
obj-$(CONFIG_CPU_IDLE) += cpuidle/
@@ -68597,7 +68597,7 @@ diff -Nur linux-3.14.17/drivers/Makefile linux-imx6-3.14/drivers/Makefile
obj-$(CONFIG_INFINIBAND) += infiniband/
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
++++ linux-imx6-3.14/drivers/md/dm-bufio.c 2014-09-11 18:06:01.898037562 +0200
@@ -1541,7 +1541,7 @@
BUG_ON(block_size < 1 << SECTOR_SHIFT ||
(block_size & (block_size - 1)));
@@ -68609,7 +68609,7 @@ diff -Nur linux-3.14.17/drivers/md/dm-bufio.c linux-imx6-3.14/drivers/md/dm-bufi
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
++++ linux-imx6-3.14/drivers/md/dm-cache-target.c 2014-09-11 18:06:01.902037577 +0200
@@ -231,7 +231,7 @@
/*
* cache_size entries, dirty if set
@@ -68667,7 +68667,7 @@ diff -Nur linux-3.14.17/drivers/md/dm-cache-target.c linux-imx6-3.14/drivers/md/
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
++++ linux-imx6-3.14/drivers/media/dvb-frontends/tda10071.c 2014-09-11 18:06:02.026038073 +0200
@@ -667,7 +667,6 @@
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
int ret, i;
@@ -68701,7 +68701,7 @@ diff -Nur linux-3.14.17/drivers/media/dvb-frontends/tda10071.c linux-imx6-3.14/d
dev_dbg(&priv->i2c->dev, "%s: mode found=%02x\n",
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
++++ linux-imx6-3.14/drivers/media/platform/Kconfig 2014-09-11 18:06:02.238038919 +0200
@@ -115,6 +115,21 @@
To compile this driver as a module, choose M here: the module
will be called s3c-camif.
@@ -68726,7 +68726,7 @@ diff -Nur linux-3.14.17/drivers/media/platform/Kconfig linux-imx6-3.14/drivers/m
source "drivers/media/platform/s5p-tv/Kconfig"
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
++++ linux-imx6-3.14/drivers/media/platform/Makefile 2014-09-11 18:06:02.238038919 +0200
@@ -51,4 +51,7 @@
obj-$(CONFIG_ARCH_OMAP) += omap/
@@ -68737,7 +68737,7 @@ diff -Nur linux-3.14.17/drivers/media/platform/Makefile linux-imx6-3.14/drivers/
ccflags-y += -I$(srctree)/drivers/media/i2c
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
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/adv7180.c 2014-09-11 18:06:02.254038983 +0200
@@ -0,0 +1,1344 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -70085,7 +70085,7 @@ diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/adv7180.c linux-imx6-
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/csi_v4l2_capture.c 2014-09-11 18:06:02.254038983 +0200
@@ -0,0 +1,2047 @@
+/*
+ * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -72136,7 +72136,7 @@ diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/csi_v4l2_capture.c li
+MODULE_SUPPORTED_DEVICE("video");
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
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/fsl_csi.c 2014-09-11 18:06:02.254038983 +0200
@@ -0,0 +1,302 @@
+/*
+ * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -72442,7 +72442,7 @@ diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/fsl_csi.c linux-imx6-
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/fsl_csi.h 2014-09-11 18:06:02.254038983 +0200
@@ -0,0 +1,198 @@
+/*
+ * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -72644,7 +72644,7 @@ diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/fsl_csi.h linux-imx6-
+void csi_dmareq_rff_disable(void);
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
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c 2014-09-11 18:06:02.254038983 +0200
@@ -0,0 +1,546 @@
+
+/*
@@ -73194,7 +73194,7 @@ diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_csi_enc.c 2014-09-11 18:06:02.254038983 +0200
@@ -0,0 +1,418 @@
+/*
+ * Copyright 2009-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -73616,7 +73616,7 @@ diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/ipu_csi_enc.c linux-i
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c 2014-09-11 18:06:02.254038983 +0200
@@ -0,0 +1,634 @@
+/*
+ * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -74254,7 +74254,7 @@ diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_prp_enc.c 2014-09-11 18:06:02.254038983 +0200
@@ -0,0 +1,595 @@
+/*
+ * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -74853,7 +74853,7 @@ diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/ipu_prp_enc.c linux-i
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_prp_sw.h 2014-09-11 18:06:02.254038983 +0200
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -74900,7 +74900,7 @@ diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/ipu_prp_sw.h linux-im
+#endif
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
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c 2014-09-11 18:06:02.254038983 +0200
@@ -0,0 +1,521 @@
+/*
+ * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -75425,7 +75425,7 @@ diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c l
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c 2014-09-11 18:06:02.254038983 +0200
@@ -0,0 +1,582 @@
+/*
+ * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -76011,7 +76011,7 @@ diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c linu
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_still.c 2014-09-11 18:06:02.254038983 +0200
@@ -0,0 +1,268 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -76283,7 +76283,7 @@ diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/ipu_still.c linux-imx
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/Kconfig 2014-09-11 18:06:02.250038968 +0200
@@ -0,0 +1,86 @@
+if VIDEO_MXC_CAPTURE
+
@@ -76373,7 +76373,7 @@ diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/Kconfig linux-imx6-3.
+endif
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
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/Makefile 2014-09-11 18:06:02.250038968 +0200
@@ -0,0 +1,21 @@
+obj-$(CONFIG_VIDEO_MXC_CSI_CAMERA) += fsl_csi.o csi_v4l2_capture.o
+
@@ -76398,7 +76398,7 @@ diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/Makefile linux-imx6-3
+obj-$(CONFIG_MXC_TVIN_ADV7180) += adv7180_tvin.o
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
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c 2014-09-11 18:06:02.254038983 +0200
@@ -0,0 +1,3102 @@
+/*
+ * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -79504,7 +79504,7 @@ diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c li
+MODULE_SUPPORTED_DEVICE("video");
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
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h 2014-09-11 18:06:02.254038983 +0200
@@ -0,0 +1,260 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -79768,7 +79768,7 @@ diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h li
+#endif /* __MXC_V4L2_CAPTURE_H__ */
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
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ov5640.c 2014-09-11 18:06:02.254038983 +0200
@@ -0,0 +1,1951 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -81723,7 +81723,7 @@ diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/ov5640.c linux-imx6-3
+MODULE_ALIAS("CSI");
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
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ov5640_mipi.c 2014-09-11 18:06:02.254038983 +0200
@@ -0,0 +1,2104 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -83831,7 +83831,7 @@ diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/ov5640_mipi.c linux-i
+MODULE_ALIAS("CSI");
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
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ov5642.c 2014-09-11 18:06:02.254038983 +0200
@@ -0,0 +1,4252 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -88087,7 +88087,7 @@ diff -Nur linux-3.14.17/drivers/media/platform/mxc/capture/ov5642.c linux-imx6-3
+MODULE_ALIAS("CSI");
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
++++ linux-imx6-3.14/drivers/media/platform/mxc/output/Kconfig 2014-09-11 18:06:02.254038983 +0200
@@ -0,0 +1,5 @@
+config VIDEO_MXC_IPU_OUTPUT
+ tristate "IPU v4l2 output support"
@@ -88096,12 +88096,12 @@ diff -Nur linux-3.14.17/drivers/media/platform/mxc/output/Kconfig linux-imx6-3.1
+ This is the video4linux2 driver for IPU post processing video output.
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
++++ linux-imx6-3.14/drivers/media/platform/mxc/output/Makefile 2014-09-11 18:06:02.254038983 +0200
@@ -0,0 +1 @@
+obj-$(CONFIG_VIDEO_MXC_IPU_OUTPUT) += mxc_vout.o
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
++++ linux-imx6-3.14/drivers/media/platform/mxc/output/mxc_vout.c 2014-09-11 18:06:02.258038999 +0200
@@ -0,0 +1,2265 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -90370,7 +90370,7 @@ diff -Nur linux-3.14.17/drivers/media/platform/mxc/output/mxc_vout.c linux-imx6-
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/drivers/media/usb/hdpvr/hdpvr-video.c 2014-09-11 18:06:02.730040885 +0200
@@ -82,7 +82,7 @@
}
@@ -90400,7 +90400,7 @@ diff -Nur linux-3.14.17/drivers/media/usb/hdpvr/hdpvr-video.c linux-imx6-3.14/dr
V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC, 0x3,
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
++++ linux-imx6-3.14/drivers/media/v4l2-core/v4l2-dv-timings.c 2014-09-11 18:06:02.834041301 +0200
@@ -595,10 +595,10 @@
aspect.denominator = 9;
} else if (ratio == 34) {
@@ -90416,7 +90416,7 @@ diff -Nur linux-3.14.17/drivers/media/v4l2-core/v4l2-dv-timings.c linux-imx6-3.1
aspect.denominator = 100;
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
++++ linux-imx6-3.14/drivers/media/v4l2-core/videobuf2-dma-contig.c 2014-09-11 18:06:02.838041316 +0200
@@ -719,7 +719,7 @@
/* get the associated scatterlist for this buffer */
@@ -90428,7 +90428,7 @@ diff -Nur linux-3.14.17/drivers/media/v4l2-core/videobuf2-dma-contig.c linux-imx
}
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
++++ linux-imx6-3.14/drivers/media/v4l2-core/videobuf-dma-contig.c 2014-09-11 18:06:02.834041301 +0200
@@ -304,7 +304,7 @@
/* Try to remap memory */
@@ -90440,7 +90440,7 @@ diff -Nur linux-3.14.17/drivers/media/v4l2-core/videobuf-dma-contig.c linux-imx6
dev_err(q->dev, "mmap: remap failed with error %d. ",
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
++++ linux-imx6-3.14/drivers/mfd/ab8500-core.c 2014-09-11 18:06:02.862041412 +0200
@@ -592,7 +592,7 @@
/* If ->irq_base is zero this will give a linear mapping */
@@ -90528,7 +90528,7 @@ diff -Nur linux-3.14.17/drivers/mfd/ab8500-core.c linux-imx6-3.14/drivers/mfd/ab
}
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
++++ linux-imx6-3.14/drivers/mfd/db8500-prcmu.c 2014-09-11 18:06:02.866041428 +0200
@@ -25,6 +25,7 @@
#include <linux/bitops.h>
#include <linux/fs.h>
@@ -90612,7 +90612,7 @@ diff -Nur linux-3.14.17/drivers/mfd/db8500-prcmu.c linux-imx6-3.14/drivers/mfd/d
pr_err("prcmu: Failed to add ab8500 subdevice\n");
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
++++ linux-imx6-3.14/drivers/mfd/Kconfig 2014-09-11 18:06:02.862041412 +0200
@@ -163,6 +163,14 @@
Additional drivers must be enabled in order to use the functionality
of the device.
@@ -90635,7 +90635,7 @@ diff -Nur linux-3.14.17/drivers/mfd/Kconfig linux-imx6-3.14/drivers/mfd/Kconfig
+
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
++++ linux-imx6-3.14/drivers/mfd/Makefile 2014-09-11 18:06:02.862041412 +0200
@@ -166,3 +166,4 @@
obj-$(CONFIG_MFD_AS3711) += as3711.o
obj-$(CONFIG_MFD_AS3722) += as3722.o
@@ -90643,7 +90643,7 @@ diff -Nur linux-3.14.17/drivers/mfd/Makefile linux-imx6-3.14/drivers/mfd/Makefil
+obj-$(CONFIG_MFD_MXC_HDMI) += mxc-hdmi-core.o
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
++++ linux-imx6-3.14/drivers/mfd/mxc-hdmi-core.c 2014-09-11 18:06:02.874041460 +0200
@@ -0,0 +1,798 @@
+/*
+ * Copyright (C) 2011-2014 Freescale Semiconductor, Inc.
@@ -91445,7 +91445,7 @@ diff -Nur linux-3.14.17/drivers/mfd/mxc-hdmi-core.c linux-imx6-3.14/drivers/mfd/
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/drivers/mfd/si476x-cmd.c 2014-09-11 18:06:02.910041603 +0200
@@ -303,13 +303,13 @@
* possible racing conditions when working in polling mode */
atomic_set(&core->cts, 0);
@@ -91469,7 +91469,7 @@ diff -Nur linux-3.14.17/drivers/mfd/si476x-cmd.c linux-imx6-3.14/drivers/mfd/si4
When working in polling mode, for some reason the tuner will
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
++++ linux-imx6-3.14/drivers/mfd/si476x-i2c.c 2014-09-11 18:06:02.910041603 +0200
@@ -303,7 +303,7 @@
*/
udelay(100);
@@ -91519,7 +91519,7 @@ diff -Nur linux-3.14.17/drivers/mfd/si476x-i2c.c linux-imx6-3.14/drivers/mfd/si4
rval = -ENODEV;
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
++++ linux-imx6-3.14/drivers/mfd/si476x-prop.c 2014-09-11 18:06:02.910041603 +0200
@@ -217,15 +217,36 @@
return 0;
}
@@ -91559,7 +91559,7 @@ diff -Nur linux-3.14.17/drivers/mfd/si476x-prop.c linux-imx6-3.14/drivers/mfd/si
.reg_write = si476x_core_regmap_write,
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
++++ linux-imx6-3.14/drivers/misc/sram.c 2014-09-11 18:06:03.010042004 +0200
@@ -29,7 +29,7 @@
#include <linux/spinlock.h>
#include <linux/genalloc.h>
@@ -91571,7 +91571,7 @@ diff -Nur linux-3.14.17/drivers/misc/sram.c linux-imx6-3.14/drivers/misc/sram.c
struct gen_pool *pool;
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
++++ linux-imx6-3.14/drivers/mmc/core/core.c 2014-09-11 18:06:03.018042035 +0200
@@ -13,11 +13,13 @@
#include <linux/module.h>
#include <linux/init.h>
@@ -91642,7 +91642,7 @@ diff -Nur linux-3.14.17/drivers/mmc/core/core.c linux-imx6-3.14/drivers/mmc/core
host->ios.vdd = fls(ocr) - 1;
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
++++ linux-imx6-3.14/drivers/mmc/core/host.c 2014-09-11 18:06:03.018042035 +0200
@@ -12,14 +12,18 @@
* MMC host class device management
*/
@@ -91742,7 +91742,7 @@ diff -Nur linux-3.14.17/drivers/mmc/core/host.c linux-imx6-3.14/drivers/mmc/core
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
++++ linux-imx6-3.14/drivers/mmc/core/mmc.c 2014-09-11 18:06:03.018042035 +0200
@@ -317,6 +317,11 @@
mmc_card_set_blockaddr(card);
}
@@ -92150,7 +92150,7 @@ diff -Nur linux-3.14.17/drivers/mmc/core/mmc.c linux-imx6-3.14/drivers/mmc/core/
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
++++ linux-imx6-3.14/drivers/mmc/core/sdio_irq.c 2014-09-11 18:06:03.022042051 +0200
@@ -90,6 +90,15 @@
return ret;
}
@@ -92215,7 +92215,7 @@ diff -Nur linux-3.14.17/drivers/mmc/core/sdio_irq.c linux-imx6-3.14/drivers/mmc/
return 0;
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
++++ linux-imx6-3.14/drivers/mmc/host/dw_mmc.c 2014-09-11 18:06:03.026042067 +0200
@@ -2140,6 +2140,8 @@
if (!mmc)
return -ENOMEM;
@@ -92227,7 +92227,7 @@ diff -Nur linux-3.14.17/drivers/mmc/host/dw_mmc.c linux-imx6-3.14/drivers/mmc/ho
slot->mmc = mmc;
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
++++ linux-imx6-3.14/drivers/mmc/host/Kconfig 2014-09-11 18:06:03.022042051 +0200
@@ -25,8 +25,7 @@
If unsure, say N.
@@ -92425,7 +92425,7 @@ diff -Nur linux-3.14.17/drivers/mmc/host/Kconfig linux-imx6-3.14/drivers/mmc/hos
platform with SD or MMC devices, say Y or M here.
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
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-acpi.c 2014-09-11 18:06:03.030042084 +0200
@@ -101,11 +101,19 @@
}
@@ -92448,7 +92448,7 @@ diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-acpi.c linux-imx6-3.14/drivers/mm
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
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-bcm2835.c 2014-09-11 18:06:03.030042084 +0200
@@ -131,8 +131,12 @@
.read_l = bcm2835_sdhci_readl,
.read_w = bcm2835_sdhci_readw,
@@ -92464,7 +92464,7 @@ diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-bcm2835.c linux-imx6-3.14/drivers
static const struct sdhci_pltfm_data bcm2835_sdhci_pdata = {
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
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-bcm-kona.c 2014-09-11 18:06:03.030042084 +0200
@@ -205,9 +205,13 @@
}
@@ -92481,7 +92481,7 @@ diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-bcm-kona.c linux-imx6-3.14/driver
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
++++ linux-imx6-3.14/drivers/mmc/host/sdhci.c 2014-09-11 18:06:03.034042099 +0200
@@ -44,6 +44,8 @@
#define MAX_TUNING_LOOP 40
@@ -93737,7 +93737,7 @@ diff -Nur linux-3.14.17/drivers/mmc/host/sdhci.c linux-imx6-3.14/drivers/mmc/hos
host->adma_desc = NULL;
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
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-cns3xxx.c 2014-09-11 18:06:03.030042084 +0200
@@ -30,13 +30,12 @@
u16 clk;
unsigned long timeout;
@@ -93783,7 +93783,7 @@ diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-cns3xxx.c linux-imx6-3.14/drivers
static int sdhci_cns3xxx_probe(struct platform_device *pdev)
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
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-dove.c 2014-09-11 18:06:03.030042084 +0200
@@ -86,6 +86,10 @@
static const struct sdhci_ops sdhci_dove_ops = {
.read_w = sdhci_dove_readw,
@@ -93797,7 +93797,7 @@ diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-dove.c linux-imx6-3.14/drivers/mm
static const struct sdhci_pltfm_data sdhci_dove_pdata = {
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
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-esdhc.h 2014-09-11 18:06:03.030042084 +0200
@@ -20,12 +20,11 @@
#define ESDHC_DEFAULT_QUIRKS (SDHCI_QUIRK_FORCE_BLK_SZ_2048 | \
@@ -93815,7 +93815,7 @@ diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-esdhc.h linux-imx6-3.14/drivers/m
#define ESDHC_DIVIDER_SHIFT 4
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
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-esdhc-imx.c 2014-09-11 18:06:03.030042084 +0200
@@ -11,6 +11,7 @@
* the Free Software Foundation; either version 2 of the License.
*/
@@ -94231,7 +94231,7 @@ diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-esdhc-imx.c linux-imx6-3.14/drive
return sdhci_runtime_resume_host(host);
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
++++ linux-imx6-3.14/drivers/mmc/host/sdhci.h 2014-09-11 18:06:03.034042099 +0200
@@ -281,18 +281,15 @@
unsigned int (*get_max_clock)(struct sdhci_host *host);
unsigned int (*get_min_clock)(struct sdhci_host *host);
@@ -94274,7 +94274,7 @@ diff -Nur linux-3.14.17/drivers/mmc/host/sdhci.h linux-imx6-3.14/drivers/mmc/hos
extern int sdhci_resume_host(struct sdhci_host *host);
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
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-of-arasan.c 2014-09-11 18:06:03.030042084 +0200
@@ -52,8 +52,12 @@
}
@@ -94290,7 +94290,7 @@ diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-of-arasan.c linux-imx6-3.14/drive
static struct sdhci_pltfm_data sdhci_arasan_pdata = {
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
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-of-esdhc.c 2014-09-11 18:06:03.030042084 +0200
@@ -199,13 +199,14 @@
static void esdhc_of_set_clock(struct sdhci_host *host, unsigned int clock)
@@ -94414,7 +94414,7 @@ diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-of-esdhc.c linux-imx6-3.14/driver
.remove = sdhci_esdhc_remove,
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
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-of-hlwd.c 2014-09-11 18:06:03.030042084 +0200
@@ -58,6 +58,10 @@
.write_l = sdhci_hlwd_writel,
.write_w = sdhci_hlwd_writew,
@@ -94428,7 +94428,7 @@ diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-of-hlwd.c linux-imx6-3.14/drivers
static const struct sdhci_pltfm_data sdhci_hlwd_pdata = {
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
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-pci.c 2014-09-11 18:06:03.030042084 +0200
@@ -1011,7 +1011,7 @@
return 0;
}
@@ -94462,7 +94462,7 @@ diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-pci.c linux-imx6-3.14/drivers/mmc
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
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-pltfm.c 2014-09-11 18:06:03.030042084 +0200
@@ -45,6 +45,10 @@
EXPORT_SYMBOL_GPL(sdhci_pltfm_clk_get_max_clock);
@@ -94476,7 +94476,7 @@ diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-pltfm.c linux-imx6-3.14/drivers/m
#ifdef CONFIG_OF
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
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-pxav2.c 2014-09-11 18:06:03.030042084 +0200
@@ -51,11 +51,13 @@
#define MMC_CARD 0x1000
#define MMC_WIDTH 0x0100
@@ -94522,7 +94522,7 @@ diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-pxav2.c linux-imx6-3.14/drivers/m
#ifdef CONFIG_OF
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
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-pxav3.c 2014-09-11 18:06:03.030042084 +0200
@@ -57,11 +57,13 @@
#define SDCE_MISC_INT (1<<2)
#define SDCE_MISC_INT_EN (1<<1)
@@ -94569,7 +94569,7 @@ diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-pxav3.c linux-imx6-3.14/drivers/m
static struct sdhci_pltfm_data sdhci_pxav3_pdata = {
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
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-s3c.c 2014-09-11 18:06:03.034042099 +0200
@@ -57,6 +57,8 @@
struct clk *clk_io;
@@ -94710,7 +94710,7 @@ diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-s3c.c linux-imx6-3.14/drivers/mmc
#else
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
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-sirf.c 2014-09-11 18:06:03.034042099 +0200
@@ -28,7 +28,11 @@
}
@@ -94725,7 +94725,7 @@ diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-sirf.c linux-imx6-3.14/drivers/mm
static struct sdhci_pltfm_data sdhci_sirf_pdata = {
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
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-spear.c 2014-09-11 18:06:03.034042099 +0200
@@ -37,7 +37,10 @@
/* sdhci ops */
@@ -94740,7 +94740,7 @@ diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-spear.c linux-imx6-3.14/drivers/m
/* gpio card detection interrupt handler */
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
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-tegra.c 2014-09-11 18:06:03.034042099 +0200
@@ -48,19 +48,6 @@
int power_gpio;
};
@@ -94809,7 +94809,7 @@ diff -Nur linux-3.14.17/drivers/mmc/host/sdhci-tegra.c linux-imx6-3.14/drivers/m
static const struct sdhci_pltfm_data sdhci_tegra20_pdata = {
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
++++ linux-imx6-3.14/drivers/mtd/chips/cfi_cmdset_0002.c 2014-09-11 18:06:03.038042115 +0200
@@ -1058,17 +1058,13 @@
#define UDELAY(map, chip, adr, usec) \
@@ -94830,7 +94830,7 @@ diff -Nur linux-3.14.17/drivers/mtd/chips/cfi_cmdset_0002.c linux-imx6-3.14/driv
#endif
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
++++ linux-imx6-3.14/drivers/mtd/ubi/build.c 2014-09-11 18:06:03.074042259 +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));
@@ -94842,7 +94842,7 @@ diff -Nur linux-3.14.17/drivers/mtd/ubi/build.c linux-imx6-3.14/drivers/mtd/ubi/
* may have different eraseblock size and other
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
++++ linux-imx6-3.14/drivers/mxc/asrc/Kconfig 2014-09-11 18:06:03.078042276 +0200
@@ -0,0 +1,14 @@
+#
+# ASRC configuration
@@ -94860,7 +94860,7 @@ diff -Nur linux-3.14.17/drivers/mxc/asrc/Kconfig linux-imx6-3.14/drivers/mxc/asr
+endmenu
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
++++ linux-imx6-3.14/drivers/mxc/asrc/Makefile 2014-09-11 18:06:03.078042276 +0200
@@ -0,0 +1,4 @@
+#
+# Makefile for the kernel Asynchronous Sample Rate Converter driver
@@ -94868,7 +94868,7 @@ diff -Nur linux-3.14.17/drivers/mxc/asrc/Makefile linux-imx6-3.14/drivers/mxc/as
+obj-$(CONFIG_MXC_ASRC) += mxc_asrc.o
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
++++ linux-imx6-3.14/drivers/mxc/asrc/mxc_asrc.c 2014-09-11 18:06:03.078042276 +0200
@@ -0,0 +1,1957 @@
+/*
+ * Freescale Asynchronous Sample Rate Converter (ASRC) driver
@@ -96829,7 +96829,7 @@ diff -Nur linux-3.14.17/drivers/mxc/asrc/mxc_asrc.c linux-imx6-3.14/drivers/mxc/
+MODULE_ALIAS("platform:mxc_asrc");
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c 2014-09-11 18:06:03.078042276 +0200
@@ -0,0 +1,932 @@
+/****************************************************************************
+*
@@ -97765,7 +97765,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_
+
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h 2014-09-11 18:06:03.078042276 +0200
@@ -0,0 +1,319 @@
+/****************************************************************************
+*
@@ -98088,7 +98088,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_
+
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c 2014-09-11 18:06:03.078042276 +0200
@@ -0,0 +1,2114 @@
+/****************************************************************************
+*
@@ -100206,7 +100206,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_
+
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h 2014-09-11 18:06:03.078042276 +0200
@@ -0,0 +1,75 @@
+/****************************************************************************
+*
@@ -100285,7 +100285,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_
+
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c 2014-09-11 18:06:03.082042291 +0200
@@ -0,0 +1,1735 @@
+/****************************************************************************
+*
@@ -102024,7 +102024,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_c
+
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h 2014-09-11 18:06:03.082042291 +0200
@@ -0,0 +1,157 @@
+/****************************************************************************
+*
@@ -102185,7 +102185,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_c
+
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c 2014-09-11 18:06:03.082042291 +0200
@@ -0,0 +1,7280 @@
+/****************************************************************************
+*
@@ -109469,7 +109469,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_h
+
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h 2014-09-11 18:06:03.082042291 +0200
@@ -0,0 +1,136 @@
+/****************************************************************************
+*
@@ -109609,7 +109609,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_h
+
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/config 2014-09-11 18:06:03.082042291 +0200
@@ -0,0 +1,38 @@
+##############################################################################
+#
@@ -109651,7 +109651,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/config linux-imx6-3.14/drivers/mxc/g
+
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c 2014-09-11 18:06:03.082042291 +0200
@@ -0,0 +1,3967 @@
+/****************************************************************************
+*
@@ -113622,7 +113622,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c linux-imx
+
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c 2014-09-11 18:06:03.082042291 +0200
@@ -0,0 +1,3042 @@
+/****************************************************************************
+*
@@ -116668,7 +116668,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c l
+#endif
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c 2014-09-11 18:06:03.082042291 +0200
@@ -0,0 +1,3677 @@
+/****************************************************************************
+*
@@ -120349,7 +120349,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.
+#endif /* gcdENABLE_VG */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c 2014-09-11 18:06:03.086042307 +0200
@@ -0,0 +1,1604 @@
+/****************************************************************************
+*
@@ -121957,7 +121957,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c linux-
+}
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c 2014-09-11 18:06:03.086042307 +0200
@@ -0,0 +1,2559 @@
+/****************************************************************************
+*
@@ -124520,7 +124520,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c lin
+}
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c 2014-09-11 18:06:03.110042404 +0200
@@ -0,0 +1,2898 @@
+/****************************************************************************
+*
@@ -127422,7 +127422,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c lin
+}
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h 2014-09-11 18:06:03.082042291 +0200
@@ -0,0 +1,1011 @@
+/****************************************************************************
+*
@@ -128437,7 +128437,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h linux-imx
+#endif /* __gc_hal_kernel_h_ */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c 2014-09-11 18:06:03.110042404 +0200
@@ -0,0 +1,859 @@
+/****************************************************************************
+*
@@ -129300,7 +129300,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c linu
+
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c 2014-09-11 18:06:03.110042404 +0200
@@ -0,0 +1,877 @@
+/****************************************************************************
+*
@@ -130181,7 +130181,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_v
+#endif /* gcdENABLE_VG */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c 2014-09-11 18:06:03.114042420 +0200
@@ -0,0 +1,1982 @@
+/****************************************************************************
+*
@@ -132167,7 +132167,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c linux
+
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c 2014-09-11 18:06:03.114042420 +0200
@@ -0,0 +1,522 @@
+/****************************************************************************
+*
@@ -132693,7 +132693,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c li
+#endif /* gcdENABLE_VG */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c 2014-09-11 18:06:03.114042420 +0200
@@ -0,0 +1,347 @@
+/****************************************************************************
+*
@@ -133044,7 +133044,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c lin
+#endif
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h 2014-09-11 18:06:03.114042420 +0200
@@ -0,0 +1,29 @@
+/****************************************************************************
+*
@@ -133077,7 +133077,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h l
+#endif /* __gc_hal_kernel_precomp_h_ */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c 2014-09-11 18:06:03.114042420 +0200
@@ -0,0 +1,895 @@
+/****************************************************************************
+*
@@ -133976,7 +133976,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c linux-
+#endif /* gcdENABLE_VG */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h 2014-09-11 18:06:03.114042420 +0200
@@ -0,0 +1,85 @@
+/****************************************************************************
+*
@@ -134065,7 +134065,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h linux-
+#endif /* __gc_hal_kernel_h_ */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c 2014-09-11 18:06:03.114042420 +0200
@@ -0,0 +1,2264 @@
+/****************************************************************************
+*
@@ -136333,7 +136333,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memor
+}
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h 2014-09-11 18:06:03.118042434 +0200
@@ -0,0 +1,3896 @@
+/****************************************************************************
+*
@@ -140233,7 +140233,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h linux-i
+#endif /* __gc_hal_base_h_ */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h 2014-09-11 18:06:03.118042434 +0200
@@ -0,0 +1,4298 @@
+/****************************************************************************
+*
@@ -144535,7 +144535,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h lin
+#endif /* __gc_hal_compiler_h_ */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h 2014-09-11 18:06:03.118042434 +0200
@@ -0,0 +1,1051 @@
+/****************************************************************************
+*
@@ -145590,7 +145590,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h linux
+#endif /* __gc_hal_driver_h_ */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h 2014-09-11 18:06:03.118042434 +0200
@@ -0,0 +1,270 @@
+/****************************************************************************
+*
@@ -145864,7 +145864,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h li
+#endif /* __gc_hal_driver_h_ */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h 2014-09-11 18:06:03.118042434 +0200
@@ -0,0 +1,88 @@
+/****************************************************************************
+*
@@ -145956,7 +145956,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h linux-i
+
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h 2014-09-11 18:06:03.118042434 +0200
@@ -0,0 +1,627 @@
+/****************************************************************************
+*
@@ -146587,7 +146587,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h
+#endif /* __gc_hal_eglplatform_h_ */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h 2014-09-11 18:06:03.118042434 +0200
@@ -0,0 +1,286 @@
+/****************************************************************************
+*
@@ -146877,7 +146877,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_ty
+#endif /* __gc_hal_eglplatform_type_h_ */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h 2014-09-11 18:06:03.118042434 +0200
@@ -0,0 +1,2053 @@
+/****************************************************************************
+*
@@ -148934,7 +148934,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h linux
+#endif /* __gc_hal_engine_h_ */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h 2014-09-11 18:06:03.118042434 +0200
@@ -0,0 +1,904 @@
+/****************************************************************************
+*
@@ -149842,7 +149842,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h li
+#endif /* __gc_hal_vg_h_ */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h 2014-09-11 18:06:03.118042434 +0200
@@ -0,0 +1,965 @@
+/****************************************************************************
+*
@@ -150811,7 +150811,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h linux-i
+#endif /* __gc_hal_enum_h_ */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h 2014-09-11 18:06:03.114042420 +0200
@@ -0,0 +1,2661 @@
+/****************************************************************************
+*
@@ -153476,7 +153476,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h linux-imx6-3
+#endif /* __gc_hal_h_ */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h 2014-09-11 18:06:03.122042450 +0200
@@ -0,0 +1,185 @@
+/****************************************************************************
+*
@@ -153665,7 +153665,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.
+#endif /* __gc_hal_kernel_buffer_h_ */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h 2014-09-11 18:06:03.122042450 +0200
@@ -0,0 +1,530 @@
+/****************************************************************************
+*
@@ -154199,7 +154199,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h linux-im
+#endif /* __gc_hal_mem_h_ */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h 2014-09-11 18:06:03.122042450 +0200
@@ -0,0 +1,947 @@
+/****************************************************************************
+*
@@ -155150,7 +155150,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h linu
+#endif /* __gc_hal_options_h_ */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h 2014-09-11 18:06:03.122042450 +0200
@@ -0,0 +1,584 @@
+/****************************************************************************
+*
@@ -155738,7 +155738,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h lin
+#endif /* __gc_hal_profiler_h_ */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h 2014-09-11 18:06:03.122042450 +0200
@@ -0,0 +1,1010 @@
+/****************************************************************************
+*
@@ -156752,7 +156752,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h linux
+#endif /* __gc_hal_raster_h_ */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h 2014-09-11 18:06:03.122042450 +0200
@@ -0,0 +1,248 @@
+/****************************************************************************
+*
@@ -157004,7 +157004,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h linux
+#endif /* __gc_hal_rename_h_ */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h 2014-09-11 18:06:03.122042450 +0200
@@ -0,0 +1,115 @@
+/****************************************************************************
+*
@@ -157123,7 +157123,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h l
+
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h 2014-09-11 18:06:03.122042450 +0200
@@ -0,0 +1,1080 @@
+/****************************************************************************
+*
@@ -158207,7 +158207,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h linux-
+#endif /* __gc_hal_types_h_ */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h 2014-09-11 18:06:03.122042450 +0200
@@ -0,0 +1,37 @@
+/****************************************************************************
+*
@@ -158248,7 +158248,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h linu
+#endif /* __gc_hal_version_h_ */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h 2014-09-11 18:06:03.122042450 +0200
@@ -0,0 +1,913 @@
+/****************************************************************************
+*
@@ -159165,7 +159165,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h linux-imx
+#endif /* __gc_hal_h_ */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c 2014-09-11 18:06:03.126042465 +0200
@@ -0,0 +1,795 @@
+/****************************************************************************
+*
@@ -159964,7 +159964,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_de
+}
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h 2014-09-11 18:06:03.126042465 +0200
@@ -0,0 +1,84 @@
+/****************************************************************************
+*
@@ -160052,7 +160052,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_de
+
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h 2014-09-11 18:06:03.126042465 +0200
@@ -0,0 +1,102 @@
+/****************************************************************************
+*
@@ -160158,7 +160158,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_de
+#endif /* __gc_hal_kernel_debug_h_ */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c 2014-09-11 18:06:03.126042465 +0200
@@ -0,0 +1,1676 @@
+/****************************************************************************
+*
@@ -161838,7 +161838,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_de
+}
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h 2014-09-11 18:06:03.126042465 +0200
@@ -0,0 +1,192 @@
+/****************************************************************************
+*
@@ -162034,7 +162034,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_de
+#endif /* __gc_hal_kernel_device_h_ */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c 2014-09-11 18:06:03.126042465 +0200
@@ -0,0 +1,1471 @@
+/****************************************************************************
+*
@@ -163509,7 +163509,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_dr
+#endif
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c 2014-09-11 18:06:03.126042465 +0200
@@ -0,0 +1,481 @@
+/****************************************************************************
+*
@@ -163994,7 +163994,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_li
+}
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h 2014-09-11 18:06:03.126042465 +0200
@@ -0,0 +1,94 @@
+/****************************************************************************
+*
@@ -164092,7 +164092,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_li
+#endif /* __gc_hal_kernel_linux_h_ */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c 2014-09-11 18:06:03.126042465 +0200
@@ -0,0 +1,32 @@
+/****************************************************************************
+*
@@ -164128,7 +164128,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_ma
+}
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c 2014-09-11 18:06:03.130042483 +0200
@@ -0,0 +1,9019 @@
+/****************************************************************************
+*
@@ -173151,7 +173151,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os
+#endif
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h 2014-09-11 18:06:03.130042483 +0200
@@ -0,0 +1,83 @@
+/****************************************************************************
+*
@@ -173238,7 +173238,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os
+#endif /* __gc_hal_kernel_os_h_ */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c 2014-09-11 18:06:03.130042483 +0200
@@ -0,0 +1,174 @@
+/****************************************************************************
+*
@@ -173416,7 +173416,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sy
+#endif
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h 2014-09-11 18:06:03.130042483 +0200
@@ -0,0 +1,71 @@
+/****************************************************************************
+*
@@ -173491,7 +173491,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sy
+#endif /* __gc_hal_kernel_sync_h_ */
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/Kbuild 2014-09-11 18:06:03.078042276 +0200
@@ -0,0 +1,236 @@
+##############################################################################
+#
@@ -173731,7 +173731,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/Kbuild linux-imx6-3.14/drivers/mxc/g
+endif
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
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/Kconfig 2014-09-11 18:06:03.078042276 +0200
@@ -0,0 +1,9 @@
+menu "MXC Vivante GPU support"
+ depends on SOC_IMX6Q
@@ -173744,7 +173744,7 @@ diff -Nur linux-3.14.17/drivers/mxc/gpu-viv/Kconfig linux-imx6-3.14/drivers/mxc/
+endmenu
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
++++ linux-imx6-3.14/drivers/mxc/hdmi-cec/Kconfig 2014-09-11 18:06:03.130042483 +0200
@@ -0,0 +1,11 @@
+
+menu "MXC HDMI CEC (Consumer Electronics Control) support"
@@ -173759,12 +173759,12 @@ diff -Nur linux-3.14.17/drivers/mxc/hdmi-cec/Kconfig linux-imx6-3.14/drivers/mxc
+endmenu
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
++++ linux-imx6-3.14/drivers/mxc/hdmi-cec/Makefile 2014-09-11 18:06:03.130042483 +0200
@@ -0,0 +1 @@
+obj-$(CONFIG_MXC_HDMI_CEC) += mxc_hdmi-cec.o
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
++++ linux-imx6-3.14/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c 2014-09-11 18:06:03.130042483 +0200
@@ -0,0 +1,629 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -174397,7 +174397,7 @@ diff -Nur linux-3.14.17/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c linux-imx6-3.14/driv
+
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
++++ linux-imx6-3.14/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h 2014-09-11 18:06:03.130042483 +0200
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -174439,7 +174439,7 @@ diff -Nur linux-3.14.17/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h linux-imx6-3.14/driv
+#endif /* !_HDMICEC_H_ */
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
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c 2014-09-11 18:06:03.130042483 +0200
@@ -0,0 +1,495 @@
+/*
+ * Copyright 2009-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -174938,7 +174938,7 @@ diff -Nur linux-3.14.17/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c linux-imx6-3.1
+EXPORT_SYMBOL(ipu_calc_stripes_sizes);
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
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_capture.c 2014-09-11 18:06:03.130042483 +0200
@@ -0,0 +1,816 @@
+/*
+ * Copyright 2008-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -175758,7 +175758,7 @@ diff -Nur linux-3.14.17/drivers/mxc/ipu3/ipu_capture.c linux-imx6-3.14/drivers/m
+}
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
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_common.c 2014-09-11 18:06:03.134042499 +0200
@@ -0,0 +1,3134 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -178896,7 +178896,7 @@ diff -Nur linux-3.14.17/drivers/mxc/ipu3/ipu_common.c linux-imx6-3.14/drivers/mx
+module_exit(ipu_gen_uninit);
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
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_device.c 2014-09-11 18:06:03.134042499 +0200
@@ -0,0 +1,3717 @@
+/*
+ * Copyright 2005-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -182617,7 +182617,7 @@ diff -Nur linux-3.14.17/drivers/mxc/ipu3/ipu_device.c linux-imx6-3.14/drivers/mx
+}
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
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_disp.c 2014-09-11 18:06:03.134042499 +0200
@@ -0,0 +1,1962 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -184583,7 +184583,7 @@ diff -Nur linux-3.14.17/drivers/mxc/ipu3/ipu_disp.c linux-imx6-3.14/drivers/mxc/
+}
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
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_ic.c 2014-09-11 18:06:03.134042499 +0200
@@ -0,0 +1,924 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -185511,7 +185511,7 @@ diff -Nur linux-3.14.17/drivers/mxc/ipu3/ipu_ic.c linux-imx6-3.14/drivers/mxc/ip
+}
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
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_param_mem.h 2014-09-11 18:06:03.134042499 +0200
@@ -0,0 +1,921 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -186436,7 +186436,7 @@ diff -Nur linux-3.14.17/drivers/mxc/ipu3/ipu_param_mem.h linux-imx6-3.14/drivers
+#endif
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
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_pixel_clk.c 2014-09-11 18:06:03.134042499 +0200
@@ -0,0 +1,317 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -186757,7 +186757,7 @@ diff -Nur linux-3.14.17/drivers/mxc/ipu3/ipu_pixel_clk.c linux-imx6-3.14/drivers
+}
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
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_prv.h 2014-09-11 18:06:03.138042515 +0200
@@ -0,0 +1,356 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -187117,7 +187117,7 @@ diff -Nur linux-3.14.17/drivers/mxc/ipu3/ipu_prv.h linux-imx6-3.14/drivers/mxc/i
+#endif /* __INCLUDE_IPU_PRV_H__ */
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
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_regs.h 2014-09-11 18:06:03.138042515 +0200
@@ -0,0 +1,743 @@
+/*
+ * Copyright (C) 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -187864,13 +187864,13 @@ diff -Nur linux-3.14.17/drivers/mxc/ipu3/ipu_regs.h linux-imx6-3.14/drivers/mxc/
+#endif
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
++++ linux-imx6-3.14/drivers/mxc/ipu3/Kconfig 2014-09-11 18:06:03.130042483 +0200
@@ -0,0 +1,2 @@
+config MXC_IPU_V3
+ bool
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
++++ linux-imx6-3.14/drivers/mxc/ipu3/Makefile 2014-09-11 18:06:03.130042483 +0200
@@ -0,0 +1,4 @@
+obj-$(CONFIG_MXC_IPU_V3) = mxc_ipu.o
+
@@ -187878,7 +187878,7 @@ diff -Nur linux-3.14.17/drivers/mxc/ipu3/Makefile linux-imx6-3.14/drivers/mxc/ip
+ ipu_calc_stripes_sizes.o vdoa.o ipu_pixel_clk.o
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
++++ linux-imx6-3.14/drivers/mxc/ipu3/vdoa.c 2014-09-11 18:06:03.138042515 +0200
@@ -0,0 +1,543 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -188425,7 +188425,7 @@ diff -Nur linux-3.14.17/drivers/mxc/ipu3/vdoa.c linux-imx6-3.14/drivers/mxc/ipu3
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/drivers/mxc/ipu3/vdoa.h 2014-09-11 18:06:03.138042515 +0200
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -188498,7 +188498,7 @@ diff -Nur linux-3.14.17/drivers/mxc/ipu3/vdoa.h linux-imx6-3.14/drivers/mxc/ipu3
+#endif
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
++++ linux-imx6-3.14/drivers/mxc/Kconfig 2014-09-11 18:06:03.078042276 +0200
@@ -0,0 +1,24 @@
+# drivers/mxc/Kconfig
+
@@ -188526,7 +188526,7 @@ diff -Nur linux-3.14.17/drivers/mxc/Kconfig linux-imx6-3.14/drivers/mxc/Kconfig
+endif
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
++++ linux-imx6-3.14/drivers/mxc/Makefile 2014-09-11 18:06:03.078042276 +0200
@@ -0,0 +1,7 @@
+obj-$(CONFIG_MXC_GPU_VIV) += gpu-viv/
+obj-$(CONFIG_MXC_IPU_V3) += ipu3/
@@ -188537,7 +188537,7 @@ diff -Nur linux-3.14.17/drivers/mxc/Makefile linux-imx6-3.14/drivers/mxc/Makefil
+obj-$(CONFIG_MXC_MLB) += mlb/
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
++++ linux-imx6-3.14/drivers/mxc/mipi/Kconfig 2014-09-11 18:06:03.138042515 +0200
@@ -0,0 +1,14 @@
+#
+# MIPI configuration
@@ -188555,7 +188555,7 @@ diff -Nur linux-3.14.17/drivers/mxc/mipi/Kconfig linux-imx6-3.14/drivers/mxc/mip
+endmenu
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
++++ linux-imx6-3.14/drivers/mxc/mipi/Makefile 2014-09-11 18:06:03.138042515 +0200
@@ -0,0 +1,4 @@
+#
+# Makefile for the mipi interface driver
@@ -188563,7 +188563,7 @@ diff -Nur linux-3.14.17/drivers/mxc/mipi/Makefile linux-imx6-3.14/drivers/mxc/mi
+obj-$(CONFIG_MXC_MIPI_CSI2) += mxc_mipi_csi2.o
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
++++ linux-imx6-3.14/drivers/mxc/mipi/mxc_mipi_csi2.c 2014-09-11 18:06:03.138042515 +0200
@@ -0,0 +1,540 @@
+/*
+ * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -189107,7 +189107,7 @@ diff -Nur linux-3.14.17/drivers/mxc/mipi/mxc_mipi_csi2.c linux-imx6-3.14/drivers
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/drivers/mxc/mipi/mxc_mipi_csi2.h 2014-09-11 18:06:03.138042515 +0200
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -189157,7 +189157,7 @@ diff -Nur linux-3.14.17/drivers/mxc/mipi/mxc_mipi_csi2.h linux-imx6-3.14/drivers
+#endif
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
++++ linux-imx6-3.14/drivers/mxc/mlb/Kconfig 2014-09-11 18:06:03.138042515 +0200
@@ -0,0 +1,17 @@
+#
+# MLB150 configuration
@@ -189178,7 +189178,7 @@ diff -Nur linux-3.14.17/drivers/mxc/mlb/Kconfig linux-imx6-3.14/drivers/mxc/mlb/
+endmenu
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
++++ linux-imx6-3.14/drivers/mxc/mlb/Makefile 2014-09-11 18:06:03.138042515 +0200
@@ -0,0 +1,5 @@
+#
+# Makefile for the i.MX6Q/DL MLB150 driver
@@ -189187,7 +189187,7 @@ diff -Nur linux-3.14.17/drivers/mxc/mlb/Makefile linux-imx6-3.14/drivers/mxc/mlb
+obj-$(CONFIG_MXC_MLB150) += mxc_mlb150.o
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
++++ linux-imx6-3.14/drivers/mxc/mlb/mxc_mlb150.c 2014-09-11 18:06:03.142042530 +0200
@@ -0,0 +1,2778 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -191969,7 +191969,7 @@ diff -Nur linux-3.14.17/drivers/mxc/mlb/mxc_mlb150.c linux-imx6-3.14/drivers/mxc
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/drivers/mxc/vpu/Kconfig 2014-09-11 18:06:03.142042530 +0200
@@ -0,0 +1,31 @@
+#
+# Codec configuration
@@ -192004,7 +192004,7 @@ diff -Nur linux-3.14.17/drivers/mxc/vpu/Kconfig linux-imx6-3.14/drivers/mxc/vpu/
+endmenu
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
++++ linux-imx6-3.14/drivers/mxc/vpu/Makefile 2014-09-11 18:06:03.142042530 +0200
@@ -0,0 +1,9 @@
+#
+# Makefile for the VPU drivers.
@@ -192017,7 +192017,7 @@ diff -Nur linux-3.14.17/drivers/mxc/vpu/Makefile linux-imx6-3.14/drivers/mxc/vpu
+endif
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
++++ linux-imx6-3.14/drivers/mxc/vpu/mxc_vpu.c 2014-09-11 18:06:03.142042530 +0200
@@ -0,0 +1,1342 @@
+/*
+ * Copyright 2006-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -193363,7 +193363,7 @@ diff -Nur linux-3.14.17/drivers/mxc/vpu/mxc_vpu.c linux-imx6-3.14/drivers/mxc/vp
+module_exit(vpu_exit);
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
++++ linux-imx6-3.14/drivers/net/bonding/bonding.h 2014-09-11 18:06:03.218042834 +0200
@@ -188,7 +188,8 @@
struct net_device *dev; /* first - useful for panic debug */
struct bonding *bond; /* our master */
@@ -193376,7 +193376,7 @@ diff -Nur linux-3.14.17/drivers/net/bonding/bonding.h linux-imx6-3.14/drivers/ne
s8 link; /* one of BOND_LINK_XXXX */
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
++++ linux-imx6-3.14/drivers/net/bonding/bond_main.c 2014-09-11 18:06:03.218042834 +0200
@@ -798,7 +798,7 @@
return;
@@ -193479,7 +193479,7 @@ diff -Nur linux-3.14.17/drivers/net/bonding/bond_main.c linux-imx6-3.14/drivers/
check_state:
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
++++ linux-imx6-3.14/drivers/net/can/flexcan.c 2014-09-11 18:06:03.246042945 +0200
@@ -125,7 +125,8 @@
FLEXCAN_ESR_BOFF_INT | FLEXCAN_ESR_ERR_INT)
@@ -193521,7 +193521,7 @@ diff -Nur linux-3.14.17/drivers/net/can/flexcan.c linux-imx6-3.14/drivers/net/ca
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
++++ linux-imx6-3.14/drivers/net/ethernet/adi/bfin_mac.c 2014-09-11 18:06:03.270043041 +0200
@@ -1040,6 +1040,7 @@
.n_alarm = 0,
.n_ext_ts = 0,
@@ -193532,7 +193532,7 @@ diff -Nur linux-3.14.17/drivers/net/ethernet/adi/bfin_mac.c linux-imx6-3.14/driv
.adjtime = bfin_ptp_adjtime,
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
++++ linux-imx6-3.14/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c 2014-09-11 18:06:03.362043409 +0200
@@ -223,12 +223,6 @@
--nbd;
bd_idx = TX_BD(NEXT_TX_IDX(bd_idx));
@@ -193558,7 +193558,7 @@ diff -Nur linux-3.14.17/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c linux-im
/* 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
++++ linux-imx6-3.14/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h 2014-09-11 18:06:03.362043409 +0200
@@ -337,7 +337,6 @@
u8 flags;
/* Set on the first BD descriptor when there is a split BD */
@@ -193569,7 +193569,7 @@ diff -Nur linux-3.14.17/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h linux-imx6-3
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
++++ linux-imx6-3.14/drivers/net/ethernet/broadcom/tg3.c 2014-09-11 18:06:03.422043649 +0200
@@ -6322,6 +6322,7 @@
.n_alarm = 0,
.n_ext_ts = 0,
@@ -193580,7 +193580,7 @@ diff -Nur linux-3.14.17/drivers/net/ethernet/broadcom/tg3.c linux-imx6-3.14/driv
.adjtime = tg3_ptp_adjtime,
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
++++ linux-imx6-3.14/drivers/net/ethernet/brocade/bna/bnad.c 2014-09-11 18:06:03.426043665 +0200
@@ -600,9 +600,9 @@
prefetch(bnad->netdev);
@@ -193594,7 +193594,7 @@ diff -Nur linux-3.14.17/drivers/net/ethernet/brocade/bna/bnad.c linux-imx6-3.14/
/* 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
++++ linux-imx6-3.14/drivers/net/ethernet/cadence/macb.c 2014-09-11 18:06:03.430043681 +0200
@@ -605,25 +605,16 @@
{
unsigned int entry;
@@ -193631,7 +193631,7 @@ diff -Nur linux-3.14.17/drivers/net/ethernet/cadence/macb.c linux-imx6-3.14/driv
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
++++ linux-imx6-3.14/drivers/net/ethernet/chelsio/cxgb4vf/sge.c 2014-09-11 18:06:03.478043873 +0200
@@ -1510,7 +1510,8 @@
{
struct sk_buff *skb;
@@ -193655,7 +193655,7 @@ diff -Nur linux-3.14.17/drivers/net/ethernet/chelsio/cxgb4vf/sge.c linux-imx6-3.
else {
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
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/fec.h 2014-09-11 18:06:03.498043952 +0200
@@ -221,7 +221,7 @@
#define BD_ENET_TX_RCMASK ((ushort)0x003c)
#define BD_ENET_TX_UN ((ushort)0x0002)
@@ -193728,7 +193728,7 @@ diff -Nur linux-3.14.17/drivers/net/ethernet/freescale/fec.h linux-imx6-3.14/dri
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
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/fec_main.c 2014-09-11 18:06:03.498043952 +0200
@@ -36,6 +36,7 @@
#include <linux/in.h>
#include <linux/ip.h>
@@ -195403,7 +195403,7 @@ diff -Nur linux-3.14.17/drivers/net/ethernet/freescale/fec_main.c linux-imx6-3.1
.driver = {
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
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/fec_ptp.c 2014-09-11 18:06:03.498043952 +0200
@@ -372,6 +372,7 @@
fep->ptp_caps.n_alarm = 0;
fep->ptp_caps.n_ext_ts = 0;
@@ -195414,7 +195414,7 @@ diff -Nur linux-3.14.17/drivers/net/ethernet/freescale/fec_ptp.c linux-imx6-3.14
fep->ptp_caps.adjtime = fec_ptp_adjtime;
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
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c 2014-09-11 18:06:03.498043952 +0200
@@ -91,6 +91,9 @@
u16 pkt_len, sc;
int curidx;
@@ -195458,7 +195458,7 @@ diff -Nur linux-3.14.17/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c li
phy_connection_type = of_get_property(ofdev->dev.of_node,
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
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/fs_enet/mii-fec.c 2014-09-11 18:06:03.498043952 +0200
@@ -95,12 +95,6 @@
}
@@ -195482,7 +195482,7 @@ diff -Nur linux-3.14.17/drivers/net/ethernet/freescale/fs_enet/mii-fec.c linux-i
if (ret)
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
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/gianfar.c 2014-09-11 18:06:03.502043969 +0200
@@ -9,7 +9,7 @@
* Maintainer: Kumar Gala
* Modifier: Sandeep Gopalpet <sandeep.kumar@freescale.com>
@@ -197687,7 +197687,7 @@ diff -Nur linux-3.14.17/drivers/net/ethernet/freescale/gianfar.c linux-imx6-3.14
{
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
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/gianfar_ethtool.c 2014-09-11 18:06:03.502043969 +0200
@@ -44,10 +44,6 @@
#include "gianfar.h"
@@ -197969,7 +197969,7 @@ diff -Nur linux-3.14.17/drivers/net/ethernet/freescale/gianfar_ethtool.c linux-i
switch (cmd->cmd) {
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
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/gianfar.h 2014-09-11 18:06:03.502043969 +0200
@@ -9,7 +9,7 @@
* Maintainer: Kumar Gala
* Modifier: Sandeep Gopalpet <sandeep.kumar@freescale.com>
@@ -198211,7 +198211,7 @@ diff -Nur linux-3.14.17/drivers/net/ethernet/freescale/gianfar.h linux-imx6-3.14
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
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/gianfar_ptp.c 2014-09-11 18:06:03.502043969 +0200
@@ -414,6 +414,7 @@
.n_alarm = 0,
.n_ext_ts = N_EXT_TS,
@@ -198566,7 +198566,7 @@ diff -Nur linux-3.14.17/drivers/net/ethernet/freescale/gianfar_sysfs.c linux-imx
-}
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
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/Kconfig 2014-09-11 18:06:03.498043952 +0200
@@ -67,6 +67,7 @@
tristate "Freescale XGMAC MDIO"
depends on FSL_SOC
@@ -198577,7 +198577,7 @@ diff -Nur linux-3.14.17/drivers/net/ethernet/freescale/Kconfig linux-imx6-3.14/d
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
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/Makefile 2014-09-11 18:06:03.498043952 +0200
@@ -14,7 +14,6 @@
obj-$(CONFIG_GIANFAR) += gianfar_driver.o
obj-$(CONFIG_PTP_1588_CLOCK_GIANFAR) += gianfar_ptp.o
@@ -198589,7 +198589,7 @@ diff -Nur linux-3.14.17/drivers/net/ethernet/freescale/Makefile linux-imx6-3.14/
ucc_geth_driver-objs := ucc_geth.o ucc_geth_ethtool.o
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
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/ucc_geth.c 2014-09-11 18:06:03.502043969 +0200
@@ -1728,9 +1728,6 @@
phydev = of_phy_connect(dev, ug_info->phy_node, &adjust_link, 0,
@@ -198629,7 +198629,7 @@ diff -Nur linux-3.14.17/drivers/net/ethernet/freescale/ucc_geth.c linux-imx6-3.1
ug_info->tbi_node = of_parse_phandle(np, "tbi-handle", 0);
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
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/xgmac_mdio.c 2014-09-11 18:06:03.502043969 +0200
@@ -162,7 +162,9 @@
/* Return all Fs if nothing was there */
@@ -198643,7 +198643,7 @@ diff -Nur linux-3.14.17/drivers/net/ethernet/freescale/xgmac_mdio.c linux-imx6-3
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
++++ linux-imx6-3.14/drivers/net/ethernet/intel/e1000e/ptp.c 2014-09-11 18:06:03.558044192 +0200
@@ -191,6 +191,7 @@
.n_alarm = 0,
.n_ext_ts = 0,
@@ -198654,7 +198654,7 @@ diff -Nur linux-3.14.17/drivers/net/ethernet/intel/e1000e/ptp.c linux-imx6-3.14/
.adjtime = e1000e_phc_adjtime,
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
++++ linux-imx6-3.14/drivers/net/ethernet/mellanox/mlx4/en_clock.c 2014-09-11 18:06:03.614044416 +0200
@@ -276,6 +276,7 @@
.n_alarm = 0,
.n_ext_ts = 0,
@@ -198665,7 +198665,7 @@ diff -Nur linux-3.14.17/drivers/net/ethernet/mellanox/mlx4/en_clock.c linux-imx6
.adjtime = mlx4_en_phc_adjtime,
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
++++ linux-imx6-3.14/drivers/net/ethernet/sfc/ptp.c 2014-09-11 18:06:03.674044656 +0200
@@ -1208,6 +1208,7 @@
.n_alarm = 0,
.n_ext_ts = 0,
@@ -198676,7 +198676,7 @@ diff -Nur linux-3.14.17/drivers/net/ethernet/sfc/ptp.c linux-imx6-3.14/drivers/n
.adjtime = efx_phc_adjtime,
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
++++ linux-imx6-3.14/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c 2014-09-11 18:06:03.690044720 +0200
@@ -164,6 +164,7 @@
.n_alarm = 0,
.n_ext_ts = 0,
@@ -198687,7 +198687,7 @@ diff -Nur linux-3.14.17/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c linux-i
.adjtime = stmmac_adjust_time,
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
++++ linux-imx6-3.14/drivers/net/ethernet/ti/cpts.c 2014-09-11 18:06:03.698044751 +0200
@@ -217,6 +217,7 @@
.name = "CTPS timer",
.max_adj = 1000000,
@@ -198698,7 +198698,7 @@ diff -Nur linux-3.14.17/drivers/net/ethernet/ti/cpts.c linux-imx6-3.14/drivers/n
.adjtime = cpts_ptp_adjtime,
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
++++ linux-imx6-3.14/drivers/net/ethernet/tile/tilegx.c 2014-09-11 18:06:03.702044768 +0200
@@ -870,6 +870,7 @@
.name = "mPIPE clock",
.max_adj = 999999999,
@@ -198709,7 +198709,7 @@ diff -Nur linux-3.14.17/drivers/net/ethernet/tile/tilegx.c linux-imx6-3.14/drive
.adjtime = ptp_mpipe_adjtime,
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
++++ linux-imx6-3.14/drivers/net/ieee802154/Kconfig 2014-09-11 18:06:03.730044879 +0200
@@ -15,9 +15,9 @@
depends on IEEE802154_DRIVERS
---help---
@@ -198753,7 +198753,7 @@ diff -Nur linux-3.14.17/drivers/net/ieee802154/Kconfig linux-imx6-3.14/drivers/n
+ the module will be called 'mrf24j40'.
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
++++ linux-imx6-3.14/drivers/net/macvlan.c 2014-09-11 18:06:03.746044943 +0200
@@ -548,7 +548,6 @@
(lowerdev->state & MACVLAN_STATE_MASK);
dev->features = lowerdev->features & MACVLAN_FEATURES;
@@ -198764,7 +198764,7 @@ diff -Nur linux-3.14.17/drivers/net/macvlan.c linux-imx6-3.14/drivers/net/macvla
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
++++ linux-imx6-3.14/drivers/net/phy/at803x.c 2014-09-11 18:06:03.746044943 +0200
@@ -27,6 +27,9 @@
#define AT803X_MMD_ACCESS_CONTROL 0x0D
#define AT803X_MMD_ACCESS_CONTROL_DATA 0x0E
@@ -198873,7 +198873,7 @@ diff -Nur linux-3.14.17/drivers/net/phy/at803x.c linux-imx6-3.14/drivers/net/phy
module_init(atheros_init);
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
++++ linux-imx6-3.14/drivers/net/phy/phy_device.c 2014-09-11 18:06:03.750044960 +0200
@@ -353,7 +353,7 @@
phydev->bus->phy_map[phydev->addr] = phydev;
@@ -198903,7 +198903,7 @@ diff -Nur linux-3.14.17/drivers/net/phy/phy_device.c linux-imx6-3.14/drivers/net
/* Temporarily just say we support everything */
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
++++ linux-imx6-3.14/drivers/net/phy/smsc.c 2014-09-11 18:06:03.750044960 +0200
@@ -249,8 +249,7 @@
static void __exit smsc_exit(void)
@@ -198916,7 +198916,7 @@ diff -Nur linux-3.14.17/drivers/net/phy/smsc.c linux-imx6-3.14/drivers/net/phy/s
MODULE_DESCRIPTION("SMSC PHY driver");
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
++++ linux-imx6-3.14/drivers/net/phy/vitesse.c 2014-09-11 18:06:03.750044960 +0200
@@ -319,8 +319,7 @@
static void __exit vsc82xx_exit(void)
@@ -198929,7 +198929,7 @@ diff -Nur linux-3.14.17/drivers/net/phy/vitesse.c linux-imx6-3.14/drivers/net/ph
module_init(vsc82xx_init);
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
++++ linux-imx6-3.14/drivers/net/ppp/pptp.c 2014-09-11 18:06:03.754044975 +0200
@@ -281,7 +281,7 @@
nf_reset(skb);
@@ -198941,7 +198941,7 @@ diff -Nur linux-3.14.17/drivers/net/ppp/pptp.c linux-imx6-3.14/drivers/net/ppp/p
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
++++ linux-imx6-3.14/drivers/net/veth.c 2014-09-11 18:06:03.790045119 +0200
@@ -14,6 +14,7 @@
#include <linux/etherdevice.h>
#include <linux/u64_stats_sync.h>
@@ -198966,7 +198966,7 @@ diff -Nur linux-3.14.17/drivers/net/veth.c linux-imx6-3.14/drivers/net/veth.c
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
++++ linux-imx6-3.14/drivers/net/wireless/ath/ar5523/ar5523.c 2014-09-11 18:06:03.806045183 +0200
@@ -1090,7 +1090,8 @@
return ret;
}
@@ -198979,7 +198979,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/ath/ar5523/ar5523.c linux-imx6-3.14
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
++++ linux-imx6-3.14/drivers/net/wireless/ath/ath10k/mac.c 2014-09-11 18:06:03.818045231 +0200
@@ -3183,7 +3183,8 @@
return ret;
}
@@ -198992,7 +198992,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/ath/ath10k/mac.c linux-imx6-3.14/dr
bool skip;
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
++++ linux-imx6-3.14/drivers/net/wireless/ath/ath6kl/cfg80211.c 2014-09-11 18:06:03.850045358 +0200
@@ -790,7 +790,7 @@
if (nw_type & ADHOC_NETWORK) {
ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "ad-hoc %s selected\n",
@@ -199019,7 +199019,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/ath/ath6kl/cfg80211.c linux-imx6-3.
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
++++ linux-imx6-3.14/drivers/net/wireless/ath/ath6kl/hif.h 2014-09-11 18:06:03.850045358 +0200
@@ -197,9 +197,9 @@
/* bounce buffer for upper layers to copy to/from */
u8 *virt_dma_buf;
@@ -199034,7 +199034,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/ath/ath6kl/hif.h linux-imx6-3.14/dr
struct ath6kl_irq_proc_registers {
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
++++ linux-imx6-3.14/drivers/net/wireless/ath/ath6kl/sdio.c 2014-09-11 18:06:03.850045358 +0200
@@ -222,6 +222,7 @@
struct mmc_data *data)
{
@@ -199074,7 +199074,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/ath/ath6kl/sdio.c linux-imx6-3.14/d
if (!virt_scat)
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
++++ linux-imx6-3.14/drivers/net/wireless/ath/ath9k/main.c 2014-09-11 18:06:03.870045438 +0200
@@ -1883,7 +1883,8 @@
return !!npend;
}
@@ -199087,7 +199087,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/ath/ath9k/main.c linux-imx6-3.14/dr
struct ath_hw *ah = sc->sc_ah;
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
++++ linux-imx6-3.14/drivers/net/wireless/ath/ath9k/xmit.c 2014-09-11 18:06:03.874045454 +0200
@@ -890,15 +890,6 @@
tx_info = IEEE80211_SKB_CB(skb);
@@ -199106,7 +199106,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/ath/ath9k/xmit.c linux-imx6-3.14/dr
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
++++ linux-imx6-3.14/drivers/net/wireless/ath/carl9170/main.c 2014-09-11 18:06:03.878045470 +0200
@@ -1707,7 +1707,9 @@
return 0;
}
@@ -199120,7 +199120,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/ath/carl9170/main.c linux-imx6-3.14
unsigned int vid;
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
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c 2014-09-11 18:06:03.902045566 +0200
@@ -43,7 +43,6 @@
#include "dhd_bus.h"
#include "dhd_dbg.h"
@@ -199381,7 +199381,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c linux-i
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
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/chip.c 2014-09-11 18:06:03.902045566 +0200
@@ -0,0 +1,1035 @@
+/*
+ * Copyright (c) 2014 Broadcom Corporation
@@ -200420,7 +200420,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/chip.c linux-imx
+}
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
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/chip.h 2014-09-11 18:06:03.902045566 +0200
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2014 Broadcom Corporation
@@ -200515,7 +200515,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/chip.h linux-imx
+#endif /* BRCMF_AXIDMP_H */
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
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h 2014-09-11 18:06:03.902045566 +0200
@@ -63,7 +63,6 @@
*/
struct brcmf_bus_ops {
@@ -200546,7 +200546,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h linux-
bus->ops->stop(bus->dev);
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
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c 2014-09-11 18:06:03.902045566 +0200
@@ -32,6 +32,9 @@
#define BRCMF_DEFAULT_SCAN_UNASSOC_TIME 40
#define BRCMF_DEFAULT_PACKET_FILTER "100 0 0 0 0x01 0x00"
@@ -200588,7 +200588,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c lin
BRCMF_EVENTING_MASK_LEN);
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
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/dhd.h 2014-09-11 18:06:03.902045566 +0200
@@ -186,7 +186,7 @@
void brcmf_txflowblock_if(struct brcmf_if *ifp,
enum brcmf_netif_stop_reason reason, bool state);
@@ -200600,7 +200600,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/dhd.h linux-imx6
/* Sets dongle media info (drv_version, mac address). */
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
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c 2014-09-11 18:06:03.902045566 +0200
@@ -190,7 +190,7 @@
int ret;
struct brcmf_if *ifp = netdev_priv(ndev);
@@ -200711,7 +200711,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c linu
kfree(drvr);
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
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c 2014-09-11 18:06:03.906045582 +0200
@@ -23,6 +23,7 @@
#include <linux/interrupt.h>
#include <linux/sched.h>
@@ -202588,7 +202588,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c linux
kfree(bus->rxbuf);
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
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/firmware.c 2014-09-11 18:06:03.906045582 +0200
@@ -0,0 +1,332 @@
+/*
+ * Copyright (c) 2013 Broadcom Corporation
@@ -202924,7 +202924,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/firmware.c linux
+}
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
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/firmware.h 2014-09-11 18:06:03.906045582 +0200
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2013 Broadcom Corporation
@@ -202964,7 +202964,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/firmware.h linux
+#endif /* BRCMFMAC_FIRMWARE_H */
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
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/fwil.c 2014-09-11 18:06:03.906045582 +0200
@@ -124,7 +124,8 @@
}
@@ -202986,7 +202986,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/fwil.c linux-imx
struct brcmf_pub *drvr = ifp->drvr;
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
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/fwil.h 2014-09-11 18:06:03.906045582 +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);
@@ -202998,7 +202998,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/fwil.h linux-imx
u32 len);
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
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h 2014-09-11 18:06:03.906045582 +0200
@@ -48,6 +48,19 @@
#define BRCMF_MAXRATES_IN_SET 16 /* max # of rates in rateset */
@@ -203056,7 +203056,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h lin
struct brcmf_ssid_le ssid_le;
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
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c 2014-09-11 18:06:03.906045582 +0200
@@ -476,6 +476,7 @@
bool bus_flow_blocked;
bool creditmap_received;
@@ -203221,7 +203221,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c linux
brcmf_err("workqueue creation failed\n");
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
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/Makefile 2014-09-11 18:06:03.902045566 +0200
@@ -24,6 +24,7 @@
obj-$(CONFIG_BRCMFMAC) += brcmfmac.o
brcmfmac-objs += \
@@ -203373,7 +203373,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/nvram.h linux-im
-#endif /* BRCMFMAC_NVRAM_H */
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
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/p2p.c 2014-09-11 18:06:03.906045582 +0200
@@ -797,7 +797,8 @@
/* SOCIAL CHANNELS 1, 6, 11 */
search_state = WL_P2P_DISC_ST_SEARCH;
@@ -204618,7 +204618,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h linu
-#endif /* _BRCMFMAC_SDIO_CHIP_H_ */
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
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h 2014-09-11 18:06:03.906045582 +0200
@@ -180,6 +180,97 @@
uint max_request_size;
ushort max_segment_count;
@@ -204719,7 +204719,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h linu
/* Register/deregister interrupt handler. */
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
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2014-09-11 18:06:03.906045582 +0200
@@ -25,6 +25,7 @@
#include <dhd_bus.h>
#include <dhd_dbg.h>
@@ -205173,7 +205173,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/usb.c linux-imx6
}
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
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c 2014-09-11 18:06:03.910045599 +0200
@@ -18,6 +18,7 @@
#include <linux/kernel.h>
@@ -206087,7 +206087,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c li
err = brcmf_cfg80211_change_iface(wdev->wiphy, ndev, wdev->iftype,
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
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h 2014-09-11 18:06:03.910045599 +0200
@@ -89,21 +89,6 @@
BRCMF_SCAN_STATUS_SUPPRESS,
};
@@ -206146,7 +206146,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h li
u32 wl_get_vif_state_all(struct brcmf_cfg80211_info *cfg, unsigned long state);
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
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c 2014-09-11 18:06:03.914045614 +0200
@@ -897,7 +897,8 @@
return result;
}
@@ -206172,7 +206172,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c li
static struct brcms_info *brcms_attach(struct bcma_device *pdev)
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
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmsmac/main.c 2014-09-11 18:06:03.914045614 +0200
@@ -4870,14 +4870,11 @@
/*
* low level detach
@@ -206219,7 +206219,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmsmac/main.c linux-imx
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
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmutil/d11.c 2014-09-11 18:06:03.922045646 +0200
@@ -21,19 +21,46 @@
#include <brcmu_wifi.h>
#include <brcmu_d11.h>
@@ -206363,7 +206363,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/brcmutil/d11.c linux-imx6
case BRCMU_CHSPEC_D11AC_BW_160:
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
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h 2014-09-11 18:06:03.926045662 +0200
@@ -43,5 +43,6 @@
#define BCM4335_CHIP_ID 0x4335
#define BCM43362_CHIP_ID 43362
@@ -206373,7 +206373,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h lin
#endif /* _BRCM_HW_IDS_H_ */
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
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/include/brcmu_d11.h 2014-09-11 18:06:03.926045662 +0200
@@ -108,13 +108,7 @@
};
@@ -206404,7 +206404,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/include/brcmu_d11.h linux
struct brcmu_chan {
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
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/include/brcmu_wifi.h 2014-09-11 18:06:03.926045662 +0200
@@ -29,6 +29,7 @@
#define CH_UPPER_SB 0x01
#define CH_LOWER_SB 0x02
@@ -206425,7 +206425,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/brcm80211/include/brcmu_wifi.h linu
#define WPA_AUTH_DISABLED 0x0000 /* Legacy (i.e., non-WPA) */
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
++++ linux-imx6-3.14/drivers/net/wireless/cw1200/sta.c 2014-09-11 18:06:03.926045662 +0200
@@ -936,7 +936,8 @@
return ret;
}
@@ -206438,7 +206438,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/cw1200/sta.c linux-imx6-3.14/driver
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
++++ linux-imx6-3.14/drivers/net/wireless/cw1200/sta.h 2014-09-11 18:06:03.926045662 +0200
@@ -40,7 +40,8 @@
int cw1200_set_rts_threshold(struct ieee80211_hw *hw, u32 value);
@@ -206451,7 +206451,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/cw1200/sta.h linux-imx6-3.14/driver
struct netdev_hw_addr_list *mc_list);
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
++++ linux-imx6-3.14/drivers/net/wireless/iwlegacy/common.c 2014-09-11 18:06:03.942045725 +0200
@@ -4701,7 +4701,8 @@
}
EXPORT_SYMBOL(il_mac_change_interface);
@@ -206464,7 +206464,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/iwlegacy/common.c linux-imx6-3.14/d
unsigned long timeout = jiffies + msecs_to_jiffies(500);
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
++++ linux-imx6-3.14/drivers/net/wireless/iwlegacy/common.h 2014-09-11 18:06:03.946045742 +0200
@@ -1722,7 +1722,8 @@
struct ieee80211_vif *vif);
int il_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
@@ -206477,7 +206477,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/iwlegacy/common.h linux-imx6-3.14/d
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
++++ linux-imx6-3.14/drivers/net/wireless/iwlwifi/dvm/mac80211.c 2014-09-11 18:06:03.950045758 +0200
@@ -1091,7 +1091,8 @@
FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL;
}
@@ -206490,7 +206490,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/iwlwifi/dvm/mac80211.c linux-imx6-3
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
++++ linux-imx6-3.14/drivers/net/wireless/libertas/cfg.c 2014-09-11 18:06:04.002045966 +0200
@@ -1766,7 +1766,8 @@
memcpy(priv->wdev->ssid, params->ssid, params->ssid_len);
priv->wdev->ssid_len = params->ssid_len;
@@ -206503,7 +206503,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/libertas/cfg.c linux-imx6-3.14/driv
priv->connect_status = LBS_CONNECTED;
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
++++ linux-imx6-3.14/drivers/net/wireless/mac80211_hwsim.c 2014-09-11 18:06:04.014046014 +0200
@@ -1671,7 +1671,9 @@
return 0;
}
@@ -206517,7 +206517,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/mac80211_hwsim.c linux-imx6-3.14/dr
}
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
++++ linux-imx6-3.14/drivers/net/wireless/mwifiex/cfg80211.c 2014-09-11 18:06:04.014046014 +0200
@@ -1881,7 +1881,8 @@
params->privacy);
done:
@@ -206530,7 +206530,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/mwifiex/cfg80211.c linux-imx6-3.14/
" %pM successfully\n", priv->cfg_bssid);
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
++++ linux-imx6-3.14/drivers/net/wireless/mwifiex/main.h 2014-09-11 18:06:04.026046061 +0200
@@ -1078,7 +1078,7 @@
const u8 *key, int key_len, u8 key_index,
const u8 *mac_addr, int disable);
@@ -206542,7 +206542,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/mwifiex/main.h linux-imx6-3.14/driv
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
++++ linux-imx6-3.14/drivers/net/wireless/mwifiex/sta_ioctl.c 2014-09-11 18:06:04.034046094 +0200
@@ -1391,7 +1391,7 @@
* with requisite parameters and calls the IOCTL handler.
*/
@@ -206554,7 +206554,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/mwifiex/sta_ioctl.c linux-imx6-3.14
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
++++ linux-imx6-3.14/drivers/net/wireless/p54/main.c 2014-09-11 18:06:04.054046173 +0200
@@ -669,7 +669,8 @@
return total;
}
@@ -206567,7 +206567,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/p54/main.c linux-imx6-3.14/drivers/
unsigned int total, i;
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
++++ linux-imx6-3.14/drivers/net/wireless/rndis_wlan.c 2014-09-11 18:06:04.062046206 +0200
@@ -2835,7 +2835,9 @@
bssid, req_ie, req_ie_len,
resp_ie, resp_ie_len, GFP_KERNEL);
@@ -206581,7 +206581,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/rndis_wlan.c linux-imx6-3.14/driver
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
++++ linux-imx6-3.14/drivers/net/wireless/rt2x00/rt2x00.h 2014-09-11 18:06:04.086046302 +0200
@@ -1449,7 +1449,8 @@
struct ieee80211_vif *vif, u16 queue,
const struct ieee80211_tx_queue_params *params);
@@ -206594,7 +206594,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/rt2x00/rt2x00.h linux-imx6-3.14/dri
void rt2x00mac_get_ringparam(struct ieee80211_hw *hw,
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
++++ linux-imx6-3.14/drivers/net/wireless/rt2x00/rt2x00mac.c 2014-09-11 18:06:04.086046302 +0200
@@ -751,7 +751,8 @@
}
EXPORT_SYMBOL_GPL(rt2x00mac_rfkill_poll);
@@ -206607,7 +206607,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/rt2x00/rt2x00mac.c linux-imx6-3.14/
struct data_queue *queue;
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
++++ linux-imx6-3.14/drivers/net/wireless/rtl818x/rtl8187/dev.c 2014-09-11 18:06:04.110046397 +0200
@@ -1636,10 +1636,10 @@
err_free_dmabuf:
@@ -206623,7 +206623,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/rtl818x/rtl8187/dev.c linux-imx6-3.
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
++++ linux-imx6-3.14/drivers/net/wireless/rtlwifi/core.c 2014-09-11 18:06:04.110046397 +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
@@ -206636,7 +206636,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/rtlwifi/core.c linux-imx6-3.14/driv
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
++++ linux-imx6-3.14/drivers/net/wireless/ti/wlcore/main.c 2014-09-11 18:06:04.150046556 +0200
@@ -5156,7 +5156,8 @@
mutex_unlock(&wl->mutex);
}
@@ -206649,7 +206649,7 @@ diff -Nur linux-3.14.17/drivers/net/wireless/ti/wlcore/main.c linux-imx6-3.14/dr
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
++++ linux-imx6-3.14/drivers/parport/Kconfig 2014-09-11 18:06:04.270047036 +0200
@@ -5,12 +5,6 @@
# Parport configuration.
#
@@ -206678,7 +206678,7 @@ diff -Nur linux-3.14.17/drivers/parport/Kconfig linux-imx6-3.14/drivers/parport/
config PARPORT_PC
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
++++ linux-imx6-3.14/drivers/pci/host/Kconfig 2014-09-11 18:06:04.274047051 +0200
@@ -21,6 +21,23 @@
select PCIEPORTBUS
select PCIE_DW
@@ -206705,7 +206705,7 @@ diff -Nur linux-3.14.17/drivers/pci/host/Kconfig linux-imx6-3.14/drivers/pci/hos
depends on ARCH_TEGRA
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
++++ linux-imx6-3.14/drivers/pci/host/Makefile 2014-09-11 18:06:04.274047051 +0200
@@ -1,6 +1,7 @@
obj-$(CONFIG_PCIE_DW) += pcie-designware.o
obj-$(CONFIG_PCI_EXYNOS) += pci-exynos.o
@@ -206716,7 +206716,7 @@ diff -Nur linux-3.14.17/drivers/pci/host/Makefile linux-imx6-3.14/drivers/pci/ho
obj-$(CONFIG_PCI_RCAR_GEN2) += pci-rcar-gen2.o
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
++++ linux-imx6-3.14/drivers/pci/host/pcie-designware.c 2014-09-11 18:06:04.274047051 +0200
@@ -23,48 +23,6 @@
#include "pcie-designware.h"
@@ -206925,7 +206925,7 @@ diff -Nur linux-3.14.17/drivers/pci/host/pcie-designware.c linux-imx6-3.14/drive
static void dw_pcie_add_bus(struct pci_bus *bus)
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
++++ linux-imx6-3.14/drivers/pci/host/pcie-designware.h 2014-09-11 18:06:04.274047051 +0200
@@ -14,6 +14,48 @@
#ifndef _PCIE_DESIGNWARE_H
#define _PCIE_DESIGNWARE_H
@@ -206989,7 +206989,7 @@ diff -Nur linux-3.14.17/drivers/pci/host/pcie-designware.h linux-imx6-3.14/drive
unsigned long msi_data;
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
++++ linux-imx6-3.14/drivers/pci/host/pci-imx6.c 2014-09-11 18:06:04.274047051 +0200
@@ -1,6 +1,7 @@
/*
* PCIe host controller driver for Freescale i.MX6 SoCs
@@ -207668,7 +207668,7 @@ diff -Nur linux-3.14.17/drivers/pci/host/pci-imx6.c linux-imx6-3.14/drivers/pci/
/* 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
++++ linux-imx6-3.14/drivers/pci/host/pci-imx6-ep-driver.c 2014-09-11 18:06:04.274047051 +0200
@@ -0,0 +1,159 @@
+/*
+ * PCIe endpoint skeleton driver for IMX6 SOCs
@@ -207831,7 +207831,7 @@ diff -Nur linux-3.14.17/drivers/pci/host/pci-imx6-ep-driver.c linux-imx6-3.14/dr
+MODULE_ALIAS("imx_pcie_ep");
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
++++ linux-imx6-3.14/drivers/pinctrl/devicetree.c 2014-09-11 18:06:04.358047388 +0200
@@ -18,6 +18,7 @@
#include <linux/device.h>
@@ -207899,7 +207899,7 @@ diff -Nur linux-3.14.17/drivers/pinctrl/devicetree.c linux-imx6-3.14/drivers/pin
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
++++ linux-imx6-3.14/drivers/pinctrl/pinctrl-imx6sl.c 2014-09-11 18:06:04.390047515 +0200
@@ -384,6 +384,10 @@
},
.probe = imx6sl_pinctrl_probe,
@@ -207913,7 +207913,7 @@ diff -Nur linux-3.14.17/drivers/pinctrl/pinctrl-imx6sl.c linux-imx6-3.14/drivers
static int __init imx6sl_pinctrl_init(void)
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
++++ linux-imx6-3.14/drivers/pinctrl/pinctrl-imx.c 2014-09-11 18:06:04.370047435 +0200
@@ -1,7 +1,7 @@
/*
* Core driver for the imx pin controller
@@ -207951,7 +207951,7 @@ diff -Nur linux-3.14.17/drivers/pinctrl/pinctrl-imx.c linux-imx6-3.14/drivers/pi
+#endif
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
++++ linux-imx6-3.14/drivers/pinctrl/pinctrl-imx.h 2014-09-11 18:06:04.370047435 +0200
@@ -1,7 +1,7 @@
/*
* IMX pinmux core definitions
@@ -207972,7 +207972,7 @@ diff -Nur linux-3.14.17/drivers/pinctrl/pinctrl-imx.h linux-imx6-3.14/drivers/pi
#endif /* __DRIVERS_PINCTRL_IMX_H */
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
++++ linux-imx6-3.14/drivers/pnp/pnpacpi/core.c 2014-09-11 18:06:04.434047691 +0200
@@ -339,7 +339,8 @@
struct pnp_dev *pnp = _pnp;
@@ -207985,7 +207985,7 @@ diff -Nur linux-3.14.17/drivers/pnp/pnpacpi/core.c linux-imx6-3.14/drivers/pnp/p
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
++++ linux-imx6-3.14/drivers/power/imx6_usb_charger.c 2014-09-11 18:06:04.446047739 +0200
@@ -0,0 +1,294 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -208283,7 +208283,7 @@ diff -Nur linux-3.14.17/drivers/power/imx6_usb_charger.c linux-imx6-3.14/drivers
+EXPORT_SYMBOL(imx6_usb_remove_charger);
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
++++ linux-imx6-3.14/drivers/power/Kconfig 2014-09-11 18:06:04.438047706 +0200
@@ -389,6 +389,12 @@
Say Y to enable support for the battery and AC power in the
Goldfish emulator.
@@ -208299,7 +208299,7 @@ diff -Nur linux-3.14.17/drivers/power/Kconfig linux-imx6-3.14/drivers/power/Kcon
endif # POWER_SUPPLY
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
++++ linux-imx6-3.14/drivers/power/Makefile 2014-09-11 18:06:04.438047706 +0200
@@ -58,3 +58,4 @@
obj-$(CONFIG_CHARGER_SMB347) += smb347-charger.o
obj-$(CONFIG_CHARGER_TPS65090) += tps65090-charger.o
@@ -208307,7 +208307,7 @@ diff -Nur linux-3.14.17/drivers/power/Makefile linux-imx6-3.14/drivers/power/Mak
+obj-$(CONFIG_IMX6_USB_CHARGER) += imx6_usb_charger.o
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
++++ linux-imx6-3.14/drivers/ptp/ptp_chardev.c 2014-09-11 18:06:04.482047883 +0200
@@ -25,6 +25,96 @@
#include "ptp_private.h"
@@ -208471,7 +208471,7 @@ diff -Nur linux-3.14.17/drivers/ptp/ptp_chardev.c linux-imx6-3.14/drivers/ptp/pt
break;
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
++++ linux-imx6-3.14/drivers/ptp/ptp_clock.c 2014-09-11 18:06:04.482047883 +0200
@@ -169,6 +169,7 @@
struct ptp_clock *ptp = container_of(pc, struct ptp_clock, clock);
@@ -208525,7 +208525,7 @@ diff -Nur linux-3.14.17/drivers/ptp/ptp_clock.c linux-imx6-3.14/drivers/ptp/ptp_
static void __exit ptp_exit(void)
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
++++ linux-imx6-3.14/drivers/ptp/ptp_ixp46x.c 2014-09-11 18:06:04.482047883 +0200
@@ -244,6 +244,7 @@
.name = "IXP46X timer",
.max_adj = 66666655,
@@ -208536,7 +208536,7 @@ diff -Nur linux-3.14.17/drivers/ptp/ptp_ixp46x.c linux-imx6-3.14/drivers/ptp/ptp
.adjtime = ptp_ixp_adjtime,
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
++++ linux-imx6-3.14/drivers/ptp/ptp_pch.c 2014-09-11 18:06:04.482047883 +0200
@@ -514,6 +514,7 @@
.name = "PCH timer",
.max_adj = 50000000,
@@ -208547,7 +208547,7 @@ diff -Nur linux-3.14.17/drivers/ptp/ptp_pch.c linux-imx6-3.14/drivers/ptp/ptp_pc
.adjtime = ptp_pch_adjtime,
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
++++ linux-imx6-3.14/drivers/ptp/ptp_private.h 2014-09-11 18:06:04.482047883 +0200
@@ -48,6 +48,7 @@
long dialed_frequency; /* remembers the frequency adjustment */
struct timestamp_event_queue tsevq; /* simple fifo for time stamps */
@@ -208569,7 +208569,7 @@ diff -Nur linux-3.14.17/drivers/ptp/ptp_private.h linux-imx6-3.14/drivers/ptp/pt
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
++++ linux-imx6-3.14/drivers/pwm/pwm-imx.c 2014-09-11 18:06:04.482047883 +0200
@@ -1,4 +1,5 @@
/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -208613,7 +208613,7 @@ diff -Nur linux-3.14.17/drivers/pwm/pwm-imx.c linux-imx6-3.14/drivers/pwm/pwm-im
.remove = imx_pwm_remove,
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
++++ linux-imx6-3.14/drivers/rapidio/devices/tsi721_dma.c 2014-09-11 18:06:04.486047898 +0200
@@ -287,12 +287,6 @@
"desc %p not ACKed\n", tx_desc);
}
@@ -208638,7 +208638,7 @@ diff -Nur linux-3.14.17/drivers/rapidio/devices/tsi721_dma.c linux-imx6-3.14/dri
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
++++ linux-imx6-3.14/drivers/regulator/anatop-regulator.c 2014-09-11 18:06:04.490047915 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -208766,7 +208766,7 @@ diff -Nur linux-3.14.17/drivers/regulator/anatop-regulator.c linux-imx6-3.14/dri
rdev = devm_regulator_register(dev, rdesc, &config);
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
++++ linux-imx6-3.14/drivers/regulator/core.c 2014-09-11 18:06:04.490047915 +0200
@@ -3,6 +3,7 @@
*
* Copyright 2007, 2008 Wolfson Microelectronics PLC.
@@ -208887,7 +208887,7 @@ diff -Nur linux-3.14.17/drivers/regulator/core.c linux-imx6-3.14/drivers/regulat
rdev_err(rdev, "Failed to request enable GPIO%d: %d\n",
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
++++ linux-imx6-3.14/drivers/regulator/dummy.c 2014-09-11 18:06:04.510047994 +0200
@@ -44,6 +44,7 @@
config.dev = &pdev->dev;
@@ -208898,7 +208898,7 @@ diff -Nur linux-3.14.17/drivers/regulator/dummy.c linux-imx6-3.14/drivers/regula
if (IS_ERR(dummy_regulator_rdev)) {
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
++++ linux-imx6-3.14/drivers/regulator/fixed.c 2014-09-11 18:06:04.510047994 +0200
@@ -163,9 +163,7 @@
drvdata->desc.n_voltages = 1;
@@ -208912,7 +208912,7 @@ diff -Nur linux-3.14.17/drivers/regulator/fixed.c linux-imx6-3.14/drivers/regula
if (config->enable_high)
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
++++ linux-imx6-3.14/drivers/reset/gpio-reset.c 2014-09-11 18:06:04.530048075 +0200
@@ -0,0 +1,187 @@
+/*
+ * GPIO Reset Controller driver
@@ -209103,7 +209103,7 @@ diff -Nur linux-3.14.17/drivers/reset/gpio-reset.c linux-imx6-3.14/drivers/reset
+MODULE_DEVICE_TABLE(of, gpio_reset_dt_ids);
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
++++ linux-imx6-3.14/drivers/reset/Kconfig 2014-09-11 18:06:04.530048075 +0200
@@ -11,3 +11,15 @@
via GPIOs or SoC-internal reset controller modules.
@@ -209122,14 +209122,14 @@ diff -Nur linux-3.14.17/drivers/reset/Kconfig linux-imx6-3.14/drivers/reset/Kcon
+endif
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
++++ linux-imx6-3.14/drivers/reset/Makefile 2014-09-11 18:06:04.530048075 +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.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
++++ linux-imx6-3.14/drivers/rtc/rtc-pcf8523.c 2014-09-11 18:06:04.546048138 +0200
@@ -7,6 +7,7 @@
*/
@@ -209263,7 +209263,7 @@ diff -Nur linux-3.14.17/drivers/rtc/rtc-pcf8523.c linux-imx6-3.14/drivers/rtc/rt
return err;
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
++++ linux-imx6-3.14/drivers/rtc/rtc-snvs.c 2014-09-11 18:06:04.550048154 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2012 Freescale Semiconductor, Inc.
@@ -209328,7 +209328,7 @@ diff -Nur linux-3.14.17/drivers/rtc/rtc-snvs.c linux-imx6-3.14/drivers/rtc/rtc-s
}
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
++++ linux-imx6-3.14/drivers/sbus/char/bbc_envctrl.c 2014-09-11 18:06:04.622048441 +0200
@@ -452,9 +452,6 @@
if (!tp)
return;
@@ -209351,7 +209351,7 @@ diff -Nur linux-3.14.17/drivers/sbus/char/bbc_envctrl.c linux-imx6-3.14/drivers/
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
++++ linux-imx6-3.14/drivers/sbus/char/bbc_i2c.c 2014-09-11 18:06:04.622048441 +0200
@@ -300,18 +300,13 @@
if (!bp)
return NULL;
@@ -209376,7 +209376,7 @@ diff -Nur linux-3.14.17/drivers/sbus/char/bbc_i2c.c linux-imx6-3.14/drivers/sbus
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
++++ linux-imx6-3.14/drivers/scsi/scsi_lib.c 2014-09-11 18:06:07.698060725 +0200
@@ -831,14 +831,6 @@
scsi_next_command(cmd);
return;
@@ -209394,7 +209394,7 @@ diff -Nur linux-3.14.17/drivers/scsi/scsi_lib.c linux-imx6-3.14/drivers/scsi/scs
/* 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
++++ linux-imx6-3.14/drivers/scsi/scsi_transport_iscsi.c 2014-09-11 18:06:07.698060725 +0200
@@ -1225,7 +1225,7 @@
* Adds a sysfs entry for the flashnode session attributes
*
@@ -209424,7 +209424,7 @@ diff -Nur linux-3.14.17/drivers/scsi/scsi_transport_iscsi.c linux-imx6-3.14/driv
* Destroys all the flashnode session entries and all corresponding children
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
++++ linux-imx6-3.14/drivers/staging/bcm/Typedefs.h 2014-09-11 18:06:08.118062401 +0200
@@ -25,16 +25,16 @@
typedef unsigned long ULONG;
typedef unsigned long DWORD;
@@ -209453,7 +209453,7 @@ diff -Nur linux-3.14.17/drivers/staging/bcm/Typedefs.h linux-imx6-3.14/drivers/s
typedef unsigned int UINT32;
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
++++ linux-imx6-3.14/drivers/staging/media/omap4iss/Kconfig 2014-09-11 18:06:08.558064158 +0200
@@ -1,6 +1,6 @@
config VIDEO_OMAP4
bool "OMAP 4 Camera support"
@@ -209464,7 +209464,7 @@ diff -Nur linux-3.14.17/drivers/staging/media/omap4iss/Kconfig linux-imx6-3.14/d
Driver for an OMAP 4 ISS controller.
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
++++ linux-imx6-3.14/drivers/staging/octeon/ethernet-rgmii.c 2014-09-11 18:06:08.570064206 +0200
@@ -166,9 +166,8 @@
if (use_global_register_lock)
@@ -209478,7 +209478,7 @@ diff -Nur linux-3.14.17/drivers/staging/octeon/ethernet-rgmii.c linux-imx6-3.14/
/* Tell core. */
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
++++ linux-imx6-3.14/drivers/staging/rtl8821ae/core.c 2014-09-11 18:06:08.650064525 +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
@@ -209508,7 +209508,7 @@ diff -Nur linux-3.14.17/drivers/staging/rtl8821ae/core.c linux-imx6-3.14/drivers
.start = rtl_op_start,
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
++++ linux-imx6-3.14/drivers/staging/vt6655/bssdb.c 2014-09-11 18:06:08.798065116 +0200
@@ -983,7 +983,7 @@
pDevice->byERPFlag &= ~(WLAN_SET_ERP_USE_PROTECTION(1));
}
@@ -209520,7 +209520,7 @@ diff -Nur linux-3.14.17/drivers/staging/vt6655/bssdb.c linux-imx6-3.14/drivers/s
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
++++ linux-imx6-3.14/drivers/staging/vt6655/device_main.c 2014-09-11 18:06:08.802065132 +0200
@@ -2430,7 +2430,6 @@
int handled = 0;
unsigned char byData = 0;
@@ -209551,7 +209551,7 @@ diff -Nur linux-3.14.17/drivers/staging/vt6655/device_main.c linux-imx6-3.14/dri
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
++++ linux-imx6-3.14/drivers/thermal/device_cooling.c 2014-09-11 18:06:08.970065802 +0200
@@ -0,0 +1,151 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -209706,7 +209706,7 @@ diff -Nur linux-3.14.17/drivers/thermal/device_cooling.c linux-imx6-3.14/drivers
+EXPORT_SYMBOL_GPL(devfreq_cooling_unregister);
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
++++ linux-imx6-3.14/drivers/thermal/imx_thermal.c 2014-09-11 18:06:08.970065802 +0200
@@ -12,6 +12,7 @@
#include <linux/cpufreq.h>
#include <linux/delay.h>
@@ -209807,7 +209807,7 @@ diff -Nur linux-3.14.17/drivers/thermal/imx_thermal.c linux-imx6-3.14/drivers/th
}
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
++++ linux-imx6-3.14/drivers/thermal/Kconfig 2014-09-11 18:06:08.966065786 +0200
@@ -125,6 +125,13 @@
cpufreq is used as the cooling device to throttle CPUs when the
passive trip is crossed.
@@ -209824,7 +209824,7 @@ diff -Nur linux-3.14.17/drivers/thermal/Kconfig linux-imx6-3.14/drivers/thermal/
depends on PLAT_SPEAR
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
++++ linux-imx6-3.14/drivers/thermal/Makefile 2014-09-11 18:06:08.966065786 +0200
@@ -26,6 +26,7 @@
obj-$(CONFIG_DB8500_THERMAL) += db8500_thermal.o
obj-$(CONFIG_ARMADA_THERMAL) += armada_thermal.o
@@ -209835,7 +209835,7 @@ diff -Nur linux-3.14.17/drivers/thermal/Makefile linux-imx6-3.14/drivers/thermal
obj-$(CONFIG_X86_PKG_TEMP_THERMAL) += x86_pkg_temp_thermal.o
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
++++ linux-imx6-3.14/drivers/tty/serial/earlycon.c 2014-09-11 18:06:09.002065930 +0200
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2014 Linaro Ltd.
@@ -209991,7 +209991,7 @@ diff -Nur linux-3.14.17/drivers/tty/serial/earlycon.c linux-imx6-3.14/drivers/tt
+}
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
++++ linux-imx6-3.14/drivers/tty/serial/Kconfig 2014-09-11 18:06:08.994065898 +0200
@@ -7,6 +7,13 @@
menu "Serial drivers"
depends on HAS_IOMEM
@@ -210008,7 +210008,7 @@ diff -Nur linux-3.14.17/drivers/tty/serial/Kconfig linux-imx6-3.14/drivers/tty/s
comment "Non-8250 serial port support"
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
++++ linux-imx6-3.14/drivers/tty/serial/Makefile 2014-09-11 18:06:08.994065898 +0200
@@ -5,6 +5,8 @@
obj-$(CONFIG_SERIAL_CORE) += serial_core.o
obj-$(CONFIG_SERIAL_21285) += 21285.o
@@ -210020,7 +210020,7 @@ diff -Nur linux-3.14.17/drivers/tty/serial/Makefile linux-imx6-3.14/drivers/tty/
# names change and other unplesantries.
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
++++ linux-imx6-3.14/drivers/tty/serial/sunsab.c 2014-09-11 18:06:09.018065994 +0200
@@ -157,15 +157,6 @@
(up->port.line == up->port.cons->index))
saw_console_brk = 1;
@@ -210039,7 +210039,7 @@ diff -Nur linux-3.14.17/drivers/tty/serial/sunsab.c linux-imx6-3.14/drivers/tty/
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
++++ linux-imx6-3.14/drivers/usb/chipidea/ci.h 2014-09-11 18:06:09.078066233 +0200
@@ -139,8 +139,8 @@
* @roles: array of supported roles for this controller
* @role: current role
@@ -210086,7 +210086,7 @@ diff -Nur linux-3.14.17/drivers/usb/chipidea/ci.h linux-imx6-3.14/drivers/usb/ch
static inline struct ci_role_driver *ci_role(struct ci_hdrc *ci)
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
++++ linux-imx6-3.14/drivers/usb/chipidea/ci_hdrc_imx.c 2014-09-11 18:06:09.078066233 +0200
@@ -19,11 +19,14 @@
#include <linux/dma-mapping.h>
#include <linux/usb/chipidea.h>
@@ -210346,7 +210346,7 @@ diff -Nur linux-3.14.17/drivers/usb/chipidea/ci_hdrc_imx.c linux-imx6-3.14/drive
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
++++ linux-imx6-3.14/drivers/usb/chipidea/ci_hdrc_imx.h 2014-09-11 18:06:09.078066233 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 Freescale Semiconductor, Inc.
@@ -210375,7 +210375,7 @@ diff -Nur linux-3.14.17/drivers/usb/chipidea/ci_hdrc_imx.h linux-imx6-3.14/drive
#endif /* __DRIVER_USB_CHIPIDEA_CI_HDRC_IMX_H */
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
++++ linux-imx6-3.14/drivers/usb/chipidea/ci_hdrc_msm.c 2014-09-11 18:06:09.078066233 +0200
@@ -17,7 +17,7 @@
#define MSM_USB_BASE (ci->hw_bank.abs)
@@ -210396,7 +210396,7 @@ diff -Nur linux-3.14.17/drivers/usb/chipidea/ci_hdrc_msm.c linux-imx6-3.14/drive
static struct ci_hdrc_platform_data ci_hdrc_msm_platdata = {
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
++++ linux-imx6-3.14/drivers/usb/chipidea/core.c 2014-09-11 18:06:09.078066233 +0200
@@ -165,25 +165,30 @@
return hw_read(ci, OP_PORTSC, PORTSC_PTC) >> __ffs(PORTSC_PTC);
}
@@ -210707,7 +210707,7 @@ diff -Nur linux-3.14.17/drivers/usb/chipidea/core.c linux-imx6-3.14/drivers/usb/
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
++++ linux-imx6-3.14/drivers/usb/chipidea/host.c 2014-09-11 18:06:09.078066233 +0200
@@ -33,6 +33,176 @@
#include "host.h"
@@ -210911,7 +210911,7 @@ diff -Nur linux-3.14.17/drivers/usb/chipidea/host.c linux-imx6-3.14/drivers/usb/
}
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
++++ linux-imx6-3.14/drivers/usb/chipidea/otg.c 2014-09-11 18:06:09.078066233 +0200
@@ -18,6 +18,8 @@
#include <linux/usb/otg.h>
#include <linux/usb/gadget.h>
@@ -211012,7 +211012,7 @@ diff -Nur linux-3.14.17/drivers/usb/chipidea/otg.c linux-imx6-3.14/drivers/usb/c
}
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
++++ linux-imx6-3.14/drivers/usb/chipidea/udc.c 2014-09-11 18:06:09.134066455 +0200
@@ -681,12 +681,6 @@
struct ci_hdrc *ci = container_of(gadget, struct ci_hdrc, gadget);
unsigned long flags;
@@ -211107,7 +211107,7 @@ diff -Nur linux-3.14.17/drivers/usb/chipidea/udc.c linux-imx6-3.14/drivers/usb/c
goto out;
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
++++ linux-imx6-3.14/drivers/usb/chipidea/usbmisc_imx.c 2014-09-11 18:06:09.134066455 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 Freescale Semiconductor, Inc.
@@ -211284,7 +211284,7 @@ diff -Nur linux-3.14.17/drivers/usb/chipidea/usbmisc_imx.c linux-imx6-3.14/drive
}
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
++++ linux-imx6-3.14/drivers/usb/core/hub.c 2014-09-11 18:06:09.138066472 +0200
@@ -3867,6 +3867,12 @@
void usb_enable_ltm(struct usb_device *udev) { }
EXPORT_SYMBOL_GPL(usb_enable_ltm);
@@ -211310,7 +211310,7 @@ diff -Nur linux-3.14.17/drivers/usb/core/hub.c linux-imx6-3.14/drivers/usb/core/
}
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
++++ linux-imx6-3.14/drivers/usb/core/message.c 2014-09-11 18:06:09.138066472 +0200
@@ -178,7 +178,7 @@
*
* Return:
@@ -211322,7 +211322,7 @@ diff -Nur linux-3.14.17/drivers/usb/core/message.c linux-imx6-3.14/drivers/usb/c
void *data, int len, int *actual_length, int timeout)
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
++++ linux-imx6-3.14/drivers/usb/core/urb.c 2014-09-11 18:06:09.142066489 +0200
@@ -831,7 +831,7 @@
*
* this allows all outstanding URBs to be unlinked starting
@@ -211334,7 +211334,7 @@ diff -Nur linux-3.14.17/drivers/usb/core/urb.c linux-imx6-3.14/drivers/usb/core/
* This routine should not be called by a driver after its disconnect
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
++++ linux-imx6-3.14/drivers/usb/gadget/f_mass_storage.c 2014-09-11 18:06:09.154066537 +0200
@@ -336,8 +336,15 @@
struct usb_ep *bulk_in;
@@ -211458,7 +211458,7 @@ diff -Nur linux-3.14.17/drivers/usb/gadget/f_mass_storage.c linux-imx6-3.14/driv
static inline struct fsg_lun_opts *to_fsg_lun_opts(struct config_item *item)
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
++++ linux-imx6-3.14/drivers/usb/gadget/fsl_updater.c 2014-09-11 18:06:09.158066553 +0200
@@ -0,0 +1,594 @@
+/*
+ * Freescale UUT driver
@@ -212056,7 +212056,7 @@ diff -Nur linux-3.14.17/drivers/usb/gadget/fsl_updater.c linux-imx6-3.14/drivers
+}
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
++++ linux-imx6-3.14/drivers/usb/gadget/fsl_updater.h 2014-09-11 18:06:09.158066553 +0200
@@ -0,0 +1,150 @@
+/*
+ * Freescale UUT driver
@@ -212210,7 +212210,7 @@ diff -Nur linux-3.14.17/drivers/usb/gadget/fsl_updater.h linux-imx6-3.14/drivers
+
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
++++ linux-imx6-3.14/drivers/usb/gadget/Kconfig 2014-09-11 18:06:09.146066506 +0200
@@ -952,6 +952,12 @@
Say "y" to link the driver statically, or "m" to build
a dynamically linked module called "g_mass_storage".
@@ -212226,7 +212226,7 @@ diff -Nur linux-3.14.17/drivers/usb/gadget/Kconfig linux-imx6-3.14/drivers/usb/g
depends on TARGET_CORE
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
++++ linux-imx6-3.14/drivers/usb/gadget/mass_storage.c 2014-09-11 18:06:09.162066569 +0200
@@ -266,7 +266,7 @@
{
return usb_composite_probe(&msg_driver);
@@ -212238,7 +212238,7 @@ diff -Nur linux-3.14.17/drivers/usb/gadget/mass_storage.c linux-imx6-3.14/driver
{
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
++++ linux-imx6-3.14/drivers/usb/host/ehci-h20ahb.c 2014-09-11 18:06:09.170066601 +0200
@@ -0,0 +1,341 @@
+/*
+ * Copyright (C) 2007-2013 Texas Instruments, Inc.
@@ -212583,7 +212583,7 @@ diff -Nur linux-3.14.17/drivers/usb/host/ehci-h20ahb.c linux-imx6-3.14/drivers/u
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/drivers/usb/host/ehci-hcd.c 2014-09-11 18:06:09.174066617 +0200
@@ -590,11 +590,16 @@
*/
hcc_params = ehci_readl(ehci, &ehci->caps->hcc_params);
@@ -212606,7 +212606,7 @@ diff -Nur linux-3.14.17/drivers/usb/host/ehci-hcd.c linux-imx6-3.14/drivers/usb/
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
++++ linux-imx6-3.14/drivers/usb/host/ehci-hub.c 2014-09-11 18:06:09.174066617 +0200
@@ -313,6 +313,15 @@
USB_PORT_STAT_HIGH_SPEED)
fs_idle_delay = true;
@@ -212625,7 +212625,7 @@ diff -Nur linux-3.14.17/drivers/usb/host/ehci-hub.c linux-imx6-3.14/drivers/usb/
}
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
++++ linux-imx6-3.14/drivers/usb/host/Kconfig 2014-09-11 18:06:09.170066601 +0200
@@ -158,6 +158,13 @@
Enables support for the on-chip EHCI controller on
ST SPEAr chips.
@@ -212642,7 +212642,7 @@ diff -Nur linux-3.14.17/drivers/usb/host/Kconfig linux-imx6-3.14/drivers/usb/hos
depends on USB_EHCI_HCD && ARCH_AT91
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
++++ linux-imx6-3.14/drivers/usb/host/Makefile 2014-09-11 18:06:09.170066601 +0200
@@ -33,6 +33,8 @@
obj-$(CONFIG_USB_EHCI_HCD_ORION) += ehci-orion.o
obj-$(CONFIG_USB_EHCI_HCD_SPEAR) += ehci-spear.o
@@ -212654,7 +212654,7 @@ diff -Nur linux-3.14.17/drivers/usb/host/Makefile linux-imx6-3.14/drivers/usb/ho
obj-$(CONFIG_USB_EHCI_TEGRA) += ehci-tegra.o
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
++++ linux-imx6-3.14/drivers/usb/phy/Kconfig 2014-09-11 18:06:09.250066921 +0200
@@ -253,7 +253,7 @@
config USB_ULPI
@@ -212666,7 +212666,7 @@ diff -Nur linux-3.14.17/drivers/usb/phy/Kconfig linux-imx6-3.14/drivers/usb/phy/
are likely found on embedded boards.
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
++++ linux-imx6-3.14/drivers/usb/phy/phy-mxs-usb.c 2014-09-11 18:06:09.254066936 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 Freescale Semiconductor, Inc.
@@ -213201,7 +213201,7 @@ diff -Nur linux-3.14.17/drivers/usb/phy/phy-mxs-usb.c linux-imx6-3.14/drivers/us
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
++++ linux-imx6-3.14/drivers/usb/phy/phy-ulpi.c 2014-09-11 18:06:09.254066936 +0200
@@ -48,6 +48,7 @@
ULPI_INFO(ULPI_ID(0x04cc, 0x1504), "NXP ISP1504"),
ULPI_INFO(ULPI_ID(0x0424, 0x0006), "SMSC USB331x"),
@@ -213212,7 +213212,7 @@ diff -Nur linux-3.14.17/drivers/usb/phy/phy-ulpi.c linux-imx6-3.14/drivers/usb/p
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
++++ linux-imx6-3.14/drivers/usb/serial/option.c 2014-09-11 18:06:09.274067016 +0200
@@ -1917,6 +1917,8 @@
dev_dbg(dev, "%s: type %x req %x\n", __func__,
req_pkt->bRequestType, req_pkt->bRequest);
@@ -213224,7 +213224,7 @@ diff -Nur linux-3.14.17/drivers/usb/serial/option.c linux-imx6-3.14/drivers/usb/
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
++++ linux-imx6-3.14/drivers/video/amba-clcd.c 2014-09-11 18:06:09.354067336 +0200
@@ -17,7 +17,10 @@
#include <linux/string.h>
#include <linux/slab.h>
@@ -213572,7 +213572,7 @@ diff -Nur linux-3.14.17/drivers/video/amba-clcd.c linux-imx6-3.14/drivers/video/
if (ret)
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
++++ linux-imx6-3.14/drivers/video/arm-hdlcd.c 2014-09-11 18:06:09.354067336 +0200
@@ -0,0 +1,844 @@
+/*
+ * drivers/video/arm-hdlcd.c
@@ -214420,7 +214420,7 @@ diff -Nur linux-3.14.17/drivers/video/arm-hdlcd.c linux-imx6-3.14/drivers/video/
+MODULE_LICENSE("GPL v2");
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
++++ linux-imx6-3.14/drivers/video/backlight/backlight.c 2014-09-11 18:06:09.362067367 +0200
@@ -41,6 +41,8 @@
{
struct backlight_device *bd;
@@ -214463,7 +214463,7 @@ diff -Nur linux-3.14.17/drivers/video/backlight/backlight.c linux-imx6-3.14/driv
return 0;
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
++++ linux-imx6-3.14/drivers/video/Kconfig 2014-09-11 18:06:09.354067336 +0200
@@ -39,6 +39,11 @@
config HDMI
bool
@@ -214511,7 +214511,7 @@ diff -Nur linux-3.14.17/drivers/video/Kconfig linux-imx6-3.14/drivers/video/Kcon
endif
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
++++ linux-imx6-3.14/drivers/video/Makefile 2014-09-11 18:06:09.354067336 +0200
@@ -53,6 +53,7 @@
obj-$(CONFIG_FB_SAVAGE) += savage/
obj-$(CONFIG_FB_GEODE) += geode/
@@ -214537,7 +214537,7 @@ diff -Nur linux-3.14.17/drivers/video/Makefile linux-imx6-3.14/drivers/video/Mak
+obj-$(CONFIG_VEXPRESS_DVI_CONTROL) += vexpress-dvi.o
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
++++ linux-imx6-3.14/drivers/video/mxc/Kconfig 2014-09-11 18:06:09.534068054 +0200
@@ -0,0 +1,48 @@
+config FB_MXC
+ tristate "MXC Framebuffer support"
@@ -214589,7 +214589,7 @@ diff -Nur linux-3.14.17/drivers/video/mxc/Kconfig linux-imx6-3.14/drivers/video/
+ default y
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
++++ linux-imx6-3.14/drivers/video/mxc/ldb.c 2014-09-11 18:06:09.534068054 +0200
@@ -0,0 +1,1036 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -215629,7 +215629,7 @@ diff -Nur linux-3.14.17/drivers/video/mxc/ldb.c linux-imx6-3.14/drivers/video/mx
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/drivers/video/mxc/Makefile 2014-09-11 18:06:09.534068054 +0200
@@ -0,0 +1,6 @@
+obj-$(CONFIG_FB_MXC_LDB) += ldb.o
+obj-$(CONFIG_FB_MXC_MIPI_DSI) += mipi_dsi.o
@@ -215639,7 +215639,7 @@ diff -Nur linux-3.14.17/drivers/video/mxc/Makefile linux-imx6-3.14/drivers/video
+obj-$(CONFIG_FB_MXC_SYNC_PANEL) += mxc_dispdrv.o mxc_lcdif.o mxc_ipuv3_fb.o
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
++++ linux-imx6-3.14/drivers/video/mxc/mipi_dsi.c 2014-09-11 18:06:09.534068054 +0200
@@ -0,0 +1,953 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -216596,7 +216596,7 @@ diff -Nur linux-3.14.17/drivers/video/mxc/mipi_dsi.c linux-imx6-3.14/drivers/vid
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/drivers/video/mxc/mipi_dsi.h 2014-09-11 18:06:09.534068054 +0200
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -216712,7 +216712,7 @@ diff -Nur linux-3.14.17/drivers/video/mxc/mipi_dsi.h linux-imx6-3.14/drivers/vid
+#endif
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
++++ linux-imx6-3.14/drivers/video/mxc/mxc_dispdrv.c 2014-09-11 18:06:09.534068054 +0200
@@ -0,0 +1,150 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -216866,7 +216866,7 @@ diff -Nur linux-3.14.17/drivers/video/mxc/mxc_dispdrv.c linux-imx6-3.14/drivers/
+EXPORT_SYMBOL_GPL(mxc_dispdrv_getdata);
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
++++ linux-imx6-3.14/drivers/video/mxc/mxc_dispdrv.h 2014-09-11 18:06:09.534068054 +0200
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -216924,7 +216924,7 @@ diff -Nur linux-3.14.17/drivers/video/mxc/mxc_dispdrv.h linux-imx6-3.14/drivers/
+#endif
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
++++ linux-imx6-3.14/drivers/video/mxc/mxc_edid.c 2014-09-11 18:06:09.534068054 +0200
@@ -0,0 +1,762 @@
+/*
+ * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -217690,7 +217690,7 @@ diff -Nur linux-3.14.17/drivers/video/mxc/mxc_edid.c linux-imx6-3.14/drivers/vid
+
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
++++ linux-imx6-3.14/drivers/video/mxc/mxcfb_hx8369_wvga.c 2014-09-11 18:06:09.534068054 +0200
@@ -0,0 +1,449 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -218143,7 +218143,7 @@ diff -Nur linux-3.14.17/drivers/video/mxc/mxcfb_hx8369_wvga.c linux-imx6-3.14/dr
+}
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
++++ linux-imx6-3.14/drivers/video/mxc/mxc_hdmi.c 2014-09-11 18:06:09.534068054 +0200
@@ -0,0 +1,3022 @@
+/*
+ * Copyright (C) 2011-2014 Freescale Semiconductor, Inc.
@@ -221169,7 +221169,7 @@ diff -Nur linux-3.14.17/drivers/video/mxc/mxc_hdmi.c linux-imx6-3.14/drivers/vid
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
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
++++ linux-imx6-3.14/drivers/video/mxc/mxc_ipuv3_fb.c 2014-09-11 18:06:09.534068054 +0200
@@ -0,0 +1,2578 @@
+/*
+ * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -223751,7 +223751,7 @@ diff -Nur linux-3.14.17/drivers/video/mxc/mxc_ipuv3_fb.c linux-imx6-3.14/drivers
+MODULE_SUPPORTED_DEVICE("fb");
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
++++ linux-imx6-3.14/drivers/video/mxc/mxc_lcdif.c 2014-09-11 18:06:09.534068054 +0200
@@ -0,0 +1,235 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -223990,7 +223990,7 @@ diff -Nur linux-3.14.17/drivers/video/mxc/mxc_lcdif.c linux-imx6-3.14/drivers/vi
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/drivers/video/mxsfb.c 2014-09-11 18:06:09.534068054 +0200
@@ -96,9 +96,10 @@
#define CTRL_DF24 (1 << 1)
#define CTRL_RUN (1 << 0)
@@ -224208,7 +224208,7 @@ diff -Nur linux-3.14.17/drivers/video/mxsfb.c linux-imx6-3.14/drivers/video/mxsf
static struct platform_device_id mxsfb_devtype[] = {
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
++++ linux-imx6-3.14/drivers/video/vexpress-dvi.c 2014-09-11 18:06:09.850069315 +0200
@@ -0,0 +1,220 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -224432,7 +224432,7 @@ diff -Nur linux-3.14.17/drivers/video/vexpress-dvi.c linux-imx6-3.14/drivers/vid
+device_initcall(vexpress_dvi_init);
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
++++ linux-imx6-3.14/firmware/imx/sdma/sdma-imx6q.bin.ihex 2014-09-11 18:06:10.050070113 +0200
@@ -0,0 +1,116 @@
+:1000000053444D4101000000010000001C000000AD
+:1000100026000000B40000007A0600008202000002
@@ -224552,7 +224552,7 @@ diff -Nur linux-3.14.17/firmware/imx/sdma/sdma-imx6q.bin.ihex linux-imx6-3.14/fi
+:00000001FF
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
++++ linux-imx6-3.14/firmware/Makefile 2014-09-11 18:06:09.998069907 +0200
@@ -61,6 +61,7 @@
radeon/RV770_pfp.bin radeon/RV770_me.bin \
radeon/RV730_pfp.bin radeon/RV730_me.bin \
@@ -224572,7 +224572,7 @@ diff -Nur linux-3.14.17/firmware/Makefile linux-imx6-3.14/firmware/Makefile
# we're installing after a cross-compile, because ihex2fw has dependencies
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
++++ linux-imx6-3.14/fs/btrfs/Kconfig 2014-09-11 18:06:10.122070401 +0200
@@ -1,5 +1,6 @@
config BTRFS_FS
tristate "Btrfs filesystem support"
@@ -224582,7 +224582,7 @@ diff -Nur linux-3.14.17/fs/btrfs/Kconfig linux-imx6-3.14/fs/btrfs/Kconfig
select ZLIB_INFLATE
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
++++ linux-imx6-3.14/fs/buffer.c 2014-09-11 18:06:10.218070784 +0200
@@ -3088,7 +3088,7 @@
* until the buffer gets unlocked).
*
@@ -224594,7 +224594,7 @@ diff -Nur linux-3.14.17/fs/buffer.c linux-imx6-3.14/fs/buffer.c
* All of the buffers must be for the same device, and must also be a
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
++++ linux-imx6-3.14/fs/compat_binfmt_elf.c 2014-09-11 18:06:10.286071055 +0200
@@ -88,6 +88,11 @@
#define ELF_HWCAP COMPAT_ELF_HWCAP
#endif
@@ -224609,7 +224609,7 @@ diff -Nur linux-3.14.17/fs/compat_binfmt_elf.c linux-imx6-3.14/fs/compat_binfmt_
#define ARCH_DLINFO COMPAT_ARCH_DLINFO
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
++++ linux-imx6-3.14/fs/coredump.c 2014-09-11 18:06:10.290071071 +0200
@@ -306,7 +306,7 @@
if (unlikely(nr < 0))
return nr;
@@ -224621,7 +224621,7 @@ diff -Nur linux-3.14.17/fs/coredump.c linux-imx6-3.14/fs/coredump.c
/*
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
++++ linux-imx6-3.14/fs/debugfs/inode.c 2014-09-11 18:06:10.294071087 +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.
@@ -224651,7 +224651,7 @@ diff -Nur linux-3.14.17/fs/debugfs/inode.c linux-imx6-3.14/fs/debugfs/inode.c
* @target: a pointer to a string containing the path to the target of the
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
++++ linux-imx6-3.14/fs/namei.c 2014-09-11 18:06:10.446071695 +0200
@@ -2247,10 +2247,9 @@
goto out;
}
@@ -224666,7 +224666,7 @@ diff -Nur linux-3.14.17/fs/namei.c linux-imx6-3.14/fs/namei.c
out:
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
++++ linux-imx6-3.14/fs/nfs/nfs3acl.c 2014-09-11 18:06:10.458071742 +0200
@@ -247,46 +247,3 @@
&posix_acl_default_xattr_handler,
NULL,
@@ -224716,7 +224716,7 @@ diff -Nur linux-3.14.17/fs/nfs/nfs3acl.c linux-imx6-3.14/fs/nfs/nfs3acl.c
-}
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
++++ linux-imx6-3.14/fs/nfs/nfs3proc.c 2014-09-11 18:06:10.458071742 +0200
@@ -926,7 +926,7 @@
.getattr = nfs_getattr,
.setattr = nfs_setattr,
@@ -224737,7 +224737,7 @@ diff -Nur linux-3.14.17/fs/nfs/nfs3proc.c linux-imx6-3.14/fs/nfs/nfs3proc.c
.removexattr = generic_removexattr,
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
++++ linux-imx6-3.14/fs/xfs/xfs_log_cil.c 2014-09-11 18:06:10.606072333 +0200
@@ -97,7 +97,7 @@
{
/* Account for the new LV being passed in */
@@ -224775,7 +224775,7 @@ diff -Nur linux-3.14.17/fs/xfs/xfs_log_cil.c linux-imx6-3.14/fs/xfs/xfs_log_cil.
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
++++ linux-imx6-3.14/fs/xfs/xfs_log.h 2014-09-11 18:06:10.602072317 +0200
@@ -24,8 +24,7 @@
struct xfs_log_iovec *lv_iovecp; /* iovec array */
struct xfs_log_item *lv_item; /* owner */
@@ -224815,7 +224815,7 @@ diff -Nur linux-3.14.17/fs/xfs/xfs_log.h linux-imx6-3.14/fs/xfs/xfs_log.h
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
++++ linux-imx6-3.14/include/asm-generic/word-at-a-time.h 2014-09-11 18:06:10.650072508 +0200
@@ -50,7 +50,7 @@
}
@@ -224827,7 +224827,7 @@ diff -Nur linux-3.14.17/include/asm-generic/word-at-a-time.h linux-imx6-3.14/inc
#endif /* _ASM_WORD_AT_A_TIME_H */
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
++++ linux-imx6-3.14/include/crypto/algapi.h 2014-09-11 18:06:10.650072508 +0200
@@ -100,9 +100,12 @@
void *page;
u8 *buffer;
@@ -224855,7 +224855,7 @@ diff -Nur linux-3.14.17/include/crypto/algapi.h linux-imx6-3.14/include/crypto/a
struct ablkcipher_walk *walk, int err);
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
++++ linux-imx6-3.14/include/drm/drm_fb_helper.h 2014-09-11 18:06:10.674072603 +0200
@@ -55,7 +55,7 @@
* save the current lut when force-restoring the fbdev for e.g.
* kdbg.
@@ -224867,7 +224867,7 @@ diff -Nur linux-3.14.17/include/drm/drm_fb_helper.h linux-imx6-3.14/include/drm/
*
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
++++ linux-imx6-3.14/include/dt-bindings/clock/imx6sl-clock.h 2014-09-11 18:06:10.686072652 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2013 Freescale Semiconductor, Inc.
@@ -224897,7 +224897,7 @@ diff -Nur linux-3.14.17/include/dt-bindings/clock/imx6sl-clock.h linux-imx6-3.14
#endif /* __DT_BINDINGS_CLOCK_IMX6SL_H */
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
++++ linux-imx6-3.14/include/dt-bindings/pinctrl/dra.h 2014-09-11 18:06:10.702072715 +0200
@@ -30,8 +30,7 @@
#define MUX_MODE14 0xe
#define MUX_MODE15 0xf
@@ -224923,7 +224923,7 @@ diff -Nur linux-3.14.17/include/dt-bindings/pinctrl/dra.h linux-imx6-3.14/includ
#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
++++ linux-imx6-3.14/include/linux/ahci_platform.h 2014-09-11 18:06:10.706072732 +0200
@@ -19,15 +19,38 @@
struct device;
@@ -224968,7 +224968,7 @@ diff -Nur linux-3.14.17/include/linux/ahci_platform.h linux-imx6-3.14/include/li
#endif /* _AHCI_PLATFORM_H */
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
++++ linux-imx6-3.14/include/linux/amba/clcd.h 2014-09-11 18:06:10.706072732 +0200
@@ -243,6 +243,9 @@
val |= CNTL_BGR;
}
@@ -225000,7 +225000,7 @@ diff -Nur linux-3.14.17/include/linux/amba/clcd.h linux-imx6-3.14/include/linux/
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
++++ linux-imx6-3.14/include/linux/arm-hdlcd.h 2014-09-11 18:06:10.710072748 +0200
@@ -0,0 +1,122 @@
+/*
+ * include/linux/arm-hdlcd.h
@@ -225126,7 +225126,7 @@ diff -Nur linux-3.14.17/include/linux/arm-hdlcd.h linux-imx6-3.14/include/linux/
+};
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
++++ linux-imx6-3.14/include/linux/backlight.h 2014-09-11 18:06:10.722072796 +0200
@@ -9,6 +9,7 @@
#define _LINUX_BACKLIGHT_H
@@ -225149,7 +225149,7 @@ diff -Nur linux-3.14.17/include/linux/backlight.h linux-imx6-3.14/include/linux/
static inline void backlight_update_status(struct backlight_device *bd)
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
++++ linux-imx6-3.14/include/linux/busfreq-imx6.h 2014-09-11 18:06:10.730072828 +0200
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -225176,7 +225176,7 @@ diff -Nur linux-3.14.17/include/linux/busfreq-imx6.h linux-imx6-3.14/include/lin
+#endif
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
++++ linux-imx6-3.14/include/linux/cgroup_subsys.h 2014-09-11 18:06:10.734072844 +0200
@@ -39,6 +39,10 @@
SUBSYS(blkio)
#endif
@@ -225190,7 +225190,7 @@ diff -Nur linux-3.14.17/include/linux/cgroup_subsys.h linux-imx6-3.14/include/li
#endif
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
++++ linux-imx6-3.14/include/linux/clk-provider.h 2014-09-11 18:06:10.734072844 +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 */
@@ -225207,7 +225207,7 @@ diff -Nur linux-3.14.17/include/linux/clk-provider.h linux-imx6-3.14/include/lin
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
++++ linux-imx6-3.14/include/linux/cma.h 2014-09-11 18:06:10.758072940 +0200
@@ -0,0 +1,27 @@
+#ifndef __CMA_H__
+#define __CMA_H__
@@ -225238,7 +225238,7 @@ diff -Nur linux-3.14.17/include/linux/cma.h linux-imx6-3.14/include/linux/cma.h
+#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
++++ linux-imx6-3.14/include/linux/cpufeature.h 2014-09-11 18:06:10.762072955 +0200
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2014 Linaro Ltd. <ard.biesheuvel@linaro.org>
@@ -225302,7 +225302,7 @@ diff -Nur linux-3.14.17/include/linux/cpufeature.h linux-imx6-3.14/include/linux
+#endif
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
++++ linux-imx6-3.14/include/linux/cpufreq.h 2014-09-11 18:06:10.762072955 +0200
@@ -429,6 +429,9 @@
#elif defined(CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND)
extern struct cpufreq_governor cpufreq_gov_ondemand;
@@ -225315,7 +225315,7 @@ diff -Nur linux-3.14.17/include/linux/cpufreq.h linux-imx6-3.14/include/linux/cp
#define CPUFREQ_DEFAULT_GOVERNOR (&cpufreq_gov_conservative)
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
++++ linux-imx6-3.14/include/linux/cpu.h 2014-09-11 18:06:10.762072955 +0200
@@ -226,4 +226,11 @@
void arch_cpu_idle_exit(void);
void arch_cpu_idle_dead(void);
@@ -225330,7 +225330,7 @@ diff -Nur linux-3.14.17/include/linux/cpu.h linux-imx6-3.14/include/linux/cpu.h
#endif /* _LINUX_CPU_H_ */
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
++++ linux-imx6-3.14/include/linux/device_cooling.h 2014-09-11 18:06:10.770072987 +0200
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -225379,7 +225379,7 @@ diff -Nur linux-3.14.17/include/linux/device_cooling.h linux-imx6-3.14/include/l
+#endif /* __DEVICE_THERMAL_H__ */
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
++++ linux-imx6-3.14/include/linux/dma-contiguous.h 2014-09-11 18:06:10.770072987 +0200
@@ -53,18 +53,13 @@
#ifdef __KERNEL__
@@ -225442,7 +225442,7 @@ diff -Nur linux-3.14.17/include/linux/dma-contiguous.h linux-imx6-3.14/include/l
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
++++ linux-imx6-3.14/include/linux/dmaengine.h 2014-09-11 18:06:10.774073003 +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
@@ -225463,7 +225463,7 @@ diff -Nur linux-3.14.17/include/linux/dmaengine.h linux-imx6-3.14/include/linux/
/**
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
++++ linux-imx6-3.14/include/linux/ftrace.h 2014-09-11 18:06:10.794073083 +0200
@@ -605,25 +605,27 @@
#endif
}
@@ -225510,7 +225510,7 @@ diff -Nur linux-3.14.17/include/linux/ftrace.h linux-imx6-3.14/include/linux/ftr
extern void time_hardirqs_on(unsigned long a0, unsigned long a1);
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
++++ linux-imx6-3.14/include/linux/hardirq.h 2014-09-11 18:06:10.794073083 +0200
@@ -9,6 +9,7 @@
@@ -225521,7 +225521,7 @@ diff -Nur linux-3.14.17/include/linux/hardirq.h linux-imx6-3.14/include/linux/ha
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
++++ linux-imx6-3.14/include/linux/hsi/hsi.h 2014-09-11 18:06:10.798073099 +0200
@@ -178,7 +178,7 @@
* @complete: Transfer completion callback
* @destructor: Destructor to free resources when flushing
@@ -225533,7 +225533,7 @@ diff -Nur linux-3.14.17/include/linux/hsi/hsi.h linux-imx6-3.14/include/linux/hs
* @break_frame: if true HSI will send/receive a break frame. Data buffers are
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
++++ linux-imx6-3.14/include/linux/ipu.h 2014-09-11 18:06:10.850073307 +0200
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc.
@@ -225575,7 +225575,7 @@ diff -Nur linux-3.14.17/include/linux/ipu.h linux-imx6-3.14/include/linux/ipu.h
+#endif
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
++++ linux-imx6-3.14/include/linux/ipu-v3.h 2014-09-11 18:06:10.850073307 +0200
@@ -0,0 +1,752 @@
+/*
+ * Copyright (c) 2010 Sascha Hauer <s.hauer@pengutronix.de>
@@ -226331,7 +226331,7 @@ diff -Nur linux-3.14.17/include/linux/ipu-v3.h linux-imx6-3.14/include/linux/ipu
+#endif /* __LINUX_IPU_V3_H_ */
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
++++ linux-imx6-3.14/include/linux/isl29023.h 2014-09-11 18:06:10.854073322 +0200
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -226382,7 +226382,7 @@ diff -Nur linux-3.14.17/include/linux/isl29023.h linux-imx6-3.14/include/linux/i
+#endif
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
++++ linux-imx6-3.14/include/linux/kfifo.h 2014-09-11 18:06:10.858073338 +0200
@@ -722,7 +722,7 @@
/**
* kfifo_dma_out_finish - finish a DMA OUT operation
@@ -226394,7 +226394,7 @@ diff -Nur linux-3.14.17/include/linux/kfifo.h linux-imx6-3.14/include/linux/kfif
* the len parameter. No error checking will be done.
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
++++ linux-imx6-3.14/include/linux/libata.h 2014-09-11 18:06:10.862073355 +0200
@@ -593,7 +593,6 @@
struct device *dev;
void __iomem * const *iomap;
@@ -226405,7 +226405,7 @@ diff -Nur linux-3.14.17/include/linux/libata.h linux-imx6-3.14/include/linux/lib
unsigned long flags;
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
++++ linux-imx6-3.14/include/linux/mailbox_client.h 2014-09-11 18:06:10.866073370 +0200
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2014 Linaro Ltd.
@@ -226455,7 +226455,7 @@ diff -Nur linux-3.14.17/include/linux/mailbox_client.h linux-imx6-3.14/include/l
+#endif /* __MAILBOX_CLIENT_H */
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
++++ linux-imx6-3.14/include/linux/mailbox_controller.h 2014-09-11 18:06:10.866073370 +0200
@@ -0,0 +1,121 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -226601,7 +226601,7 @@ diff -Nur linux-3.14.17/include/linux/mailbox.h linux-imx6-3.14/include/linux/ma
-int pl320_ipc_unregister_notifier(struct notifier_block *nb);
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
++++ linux-imx6-3.14/include/linux/memblock.h 2014-09-11 18:06:10.866073370 +0200
@@ -221,6 +221,8 @@
#define MEMBLOCK_ALLOC_ANYWHERE (~(phys_addr_t)0)
#define MEMBLOCK_ALLOC_ACCESSIBLE 0
@@ -226613,7 +226613,7 @@ diff -Nur linux-3.14.17/include/linux/memblock.h linux-imx6-3.14/include/linux/m
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
++++ linux-imx6-3.14/include/linux/mfd/abx500/ab8500.h 2014-09-11 18:06:10.870073386 +0200
@@ -347,7 +347,6 @@
struct mutex lock;
struct mutex irq_lock;
@@ -226632,7 +226632,7 @@ diff -Nur linux-3.14.17/include/linux/mfd/abx500/ab8500.h linux-imx6-3.14/includ
struct ab8500_codec_platform_data *codec;
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
++++ linux-imx6-3.14/include/linux/mfd/dbx500-prcmu.h 2014-09-11 18:06:10.874073403 +0200
@@ -183,8 +183,6 @@
bool enable_set_ddr_opp;
bool enable_ape_opp_100_voltage;
@@ -226644,7 +226644,7 @@ diff -Nur linux-3.14.17/include/linux/mfd/dbx500-prcmu.h linux-imx6-3.14/include
u32 adt_offset;
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
++++ linux-imx6-3.14/include/linux/mfd/mxc-hdmi-core.h 2014-09-11 18:06:10.878073418 +0200
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -226716,7 +226716,7 @@ diff -Nur linux-3.14.17/include/linux/mfd/mxc-hdmi-core.h linux-imx6-3.14/includ
+#endif
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
++++ linux-imx6-3.14/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h 2014-09-11 18:06:10.882073433 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 Freescale Semiconductor, Inc.
@@ -226737,7 +226737,7 @@ diff -Nur linux-3.14.17/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h linux-imx6-3
#define IMX6Q_GPR1_ADDRS3_64MB (0x1 << 10)
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
++++ linux-imx6-3.14/include/linux/mipi_csi2.h 2014-09-11 18:06:10.890073466 +0200
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -226834,7 +226834,7 @@ diff -Nur linux-3.14.17/include/linux/mipi_csi2.h linux-imx6-3.14/include/linux/
+#endif
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
++++ linux-imx6-3.14/include/linux/mipi_dsi.h 2014-09-11 18:06:10.890073466 +0200
@@ -0,0 +1,171 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -227009,7 +227009,7 @@ diff -Nur linux-3.14.17/include/linux/mipi_dsi.h linux-imx6-3.14/include/linux/m
+#endif
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
++++ linux-imx6-3.14/include/linux/mmc/card.h 2014-09-11 18:06:10.890073466 +0200
@@ -86,10 +86,13 @@
unsigned int data_sector_size; /* 512 bytes or 4KB */
unsigned int data_tag_unit_size; /* DATA TAG UNIT size */
@@ -227034,7 +227034,7 @@ diff -Nur linux-3.14.17/include/linux/mmc/card.h linux-imx6-3.14/include/linux/m
u8 raw_sec_feature_support;/* 231 */
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
++++ linux-imx6-3.14/include/linux/mmc/host.h 2014-09-11 18:06:10.890073466 +0200
@@ -282,6 +282,7 @@
MMC_CAP2_PACKED_WR)
#define MMC_CAP2_NO_PRESCAN_POWERUP (1 << 14) /* Don't power up before scan */
@@ -227066,7 +227066,7 @@ diff -Nur linux-3.14.17/include/linux/mmc/host.h linux-imx6-3.14/include/linux/m
int mmc_regulator_set_ocr(struct mmc_host *mmc,
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
++++ linux-imx6-3.14/include/linux/mmc/mmc.h 2014-09-11 18:06:10.890073466 +0200
@@ -292,6 +292,7 @@
#define EXT_CSD_RPMB_MULT 168 /* RO */
#define EXT_CSD_BOOT_WP 173 /* R/W */
@@ -227115,7 +227115,7 @@ diff -Nur linux-3.14.17/include/linux/mmc/mmc.h linux-imx6-3.14/include/linux/mm
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
++++ linux-imx6-3.14/include/linux/mmc/sdhci.h 2014-09-11 18:06:10.890073466 +0200
@@ -57,12 +57,8 @@
#define SDHCI_QUIRK_BROKEN_CARD_DETECTION (1<<15)
/* Controller reports inverted write-protect state */
@@ -227171,7 +227171,7 @@ diff -Nur linux-3.14.17/include/linux/mmc/sdhci.h linux-imx6-3.14/include/linux/
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
++++ linux-imx6-3.14/include/linux/mmc/sdio_ids.h 2014-09-11 18:06:10.894073482 +0200
@@ -31,6 +31,7 @@
#define SDIO_DEVICE_ID_BROADCOM_4334 0x4334
#define SDIO_DEVICE_ID_BROADCOM_4335_4339 0x4335
@@ -227182,7 +227182,7 @@ diff -Nur linux-3.14.17/include/linux/mmc/sdio_ids.h linux-imx6-3.14/include/lin
#define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX 0x1402
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
++++ linux-imx6-3.14/include/linux/mod_devicetable.h 2014-09-11 18:06:10.894073482 +0200
@@ -564,6 +564,15 @@
#define X86_MODEL_ANY 0
#define X86_FEATURE_ANY 0 /* Same as FPU, you can't test for that */
@@ -227201,7 +227201,7 @@ diff -Nur linux-3.14.17/include/linux/mod_devicetable.h linux-imx6-3.14/include/
struct ipack_device_id {
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
++++ linux-imx6-3.14/include/linux/mtd/map.h 2014-09-11 18:06:10.894073482 +0200
@@ -438,7 +438,7 @@
if (map->cached)
memcpy(to, (char *)map->cached + from, len);
@@ -227213,7 +227213,7 @@ diff -Nur linux-3.14.17/include/linux/mtd/map.h linux-imx6-3.14/include/linux/mt
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.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
++++ linux-imx6-3.14/include/linux/mxc_asrc.h 2014-09-11 18:06:10.898073499 +0200
@@ -0,0 +1,386 @@
+/*
+ * Copyright 2008-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -227603,7 +227603,7 @@ diff -Nur linux-3.14.17/include/linux/mxc_asrc.h linux-imx6-3.14/include/linux/m
+#endif/* __MXC_ASRC_H__ */
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
++++ linux-imx6-3.14/include/linux/mxcfb.h 2014-09-11 18:06:10.898073499 +0200
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -227653,7 +227653,7 @@ diff -Nur linux-3.14.17/include/linux/mxcfb.h linux-imx6-3.14/include/linux/mxcf
+#endif
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
++++ linux-imx6-3.14/include/linux/mxc_mlb.h 2014-09-11 18:06:10.898073499 +0200
@@ -0,0 +1,55 @@
+/*
+ * mxc_mlb.h
@@ -227712,7 +227712,7 @@ diff -Nur linux-3.14.17/include/linux/mxc_mlb.h linux-imx6-3.14/include/linux/mx
+#endif /* _MXC_MLB_H */
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
++++ linux-imx6-3.14/include/linux/mxc_v4l2.h 2014-09-11 18:06:10.898073499 +0200
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -227743,7 +227743,7 @@ diff -Nur linux-3.14.17/include/linux/mxc_v4l2.h linux-imx6-3.14/include/linux/m
+#endif
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
++++ linux-imx6-3.14/include/linux/mxc_vpu.h 2014-09-11 18:06:10.898073499 +0200
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -227865,7 +227865,7 @@ diff -Nur linux-3.14.17/include/linux/mxc_vpu.h linux-imx6-3.14/include/linux/mx
+#endif
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
++++ linux-imx6-3.14/include/linux/phy.h 2014-09-11 18:06:10.970073785 +0200
@@ -609,6 +609,7 @@
return phydev->drv->read_status(phydev);
}
@@ -227876,7 +227876,7 @@ diff -Nur linux-3.14.17/include/linux/phy.h linux-imx6-3.14/include/linux/phy.h
int genphy_config_aneg(struct phy_device *phydev);
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
++++ linux-imx6-3.14/include/linux/pipe_fs_i.h 2014-09-11 18:06:10.974073802 +0200
@@ -35,7 +35,7 @@
* @tmp_page: cached released page
* @readers: number of current readers of this pipe
@@ -227888,7 +227888,7 @@ diff -Nur linux-3.14.17/include/linux/pipe_fs_i.h linux-imx6-3.14/include/linux/
* @w_counter: writer counter
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
++++ linux-imx6-3.14/include/linux/pl320-ipc.h 2014-09-11 18:06:10.978073817 +0200
@@ -0,0 +1,17 @@
+/*
+ * This program is free software; you can redistribute it and/or modify it
@@ -227909,7 +227909,7 @@ diff -Nur linux-3.14.17/include/linux/pl320-ipc.h linux-imx6-3.14/include/linux/
+int pl320_ipc_unregister_notifier(struct notifier_block *nb);
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
++++ linux-imx6-3.14/include/linux/platform_data/dma-imx.h 2014-09-11 18:06:10.982073833 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2009 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -227952,7 +227952,7 @@ diff -Nur linux-3.14.17/include/linux/platform_data/dma-imx.h linux-imx6-3.14/in
return !strcmp(chan->device->dev->driver->name, "imx-sdma") ||
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
++++ linux-imx6-3.14/include/linux/power/imx6_usb_charger.h 2014-09-11 18:06:10.994073881 +0200
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -228036,7 +228036,7 @@ diff -Nur linux-3.14.17/include/linux/power/imx6_usb_charger.h linux-imx6-3.14/i
+#endif /* __IMXUSB6_CHARGER_H */
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
++++ linux-imx6-3.14/include/linux/printk.h 2014-09-11 18:06:10.994073881 +0200
@@ -132,9 +132,9 @@
int printk(const char *fmt, ...);
@@ -228060,7 +228060,7 @@ diff -Nur linux-3.14.17/include/linux/printk.h linux-imx6-3.14/include/linux/pri
}
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
++++ linux-imx6-3.14/include/linux/ptp_clock_kernel.h 2014-09-11 18:06:10.998073898 +0200
@@ -49,7 +49,11 @@
* @n_alarm: The number of programmable alarms.
* @n_ext_ts: The number of external time stamp channels.
@@ -228130,7 +228130,7 @@ diff -Nur linux-3.14.17/include/linux/ptp_clock_kernel.h linux-imx6-3.14/include
#endif
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
++++ linux-imx6-3.14/include/linux/pxp_device.h 2014-09-11 18:06:10.998073898 +0200
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2013-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -228202,7 +228202,7 @@ diff -Nur linux-3.14.17/include/linux/pxp_device.h linux-imx6-3.14/include/linux
+#endif
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
++++ linux-imx6-3.14/include/linux/pxp_dma.h 2014-09-11 18:06:10.998073898 +0200
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -228278,7 +228278,7 @@ diff -Nur linux-3.14.17/include/linux/pxp_dma.h linux-imx6-3.14/include/linux/px
+#endif
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
++++ linux-imx6-3.14/include/linux/regulator/consumer.h 2014-09-11 18:06:11.002073913 +0200
@@ -2,6 +2,7 @@
* consumer.h -- SoC Regulator consumer support.
*
@@ -228298,7 +228298,7 @@ diff -Nur linux-3.14.17/include/linux/regulator/consumer.h linux-imx6-3.14/inclu
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
++++ linux-imx6-3.14/include/linux/reset.h 2014-09-11 18:06:11.002073913 +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);
@@ -228315,7 +228315,7 @@ diff -Nur linux-3.14.17/include/linux/reset.h linux-imx6-3.14/include/linux/rese
#endif
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
++++ linux-imx6-3.14/include/linux/serial_core.h 2014-09-11 18:06:11.010073945 +0200
@@ -285,6 +285,22 @@
/*
* Console helpers.
@@ -228341,7 +228341,7 @@ diff -Nur linux-3.14.17/include/linux/serial_core.h linux-imx6-3.14/include/linu
void uart_parse_options(char *options, int *baud, int *parity, int *bits,
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
++++ linux-imx6-3.14/include/linux/skbuff.h 2014-09-11 18:06:11.010073945 +0200
@@ -2038,7 +2038,7 @@
}
@@ -228353,7 +228353,7 @@ diff -Nur linux-3.14.17/include/linux/skbuff.h linux-imx6-3.14/include/linux/skb
* Returns the &struct page associated with @frag.
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
++++ linux-imx6-3.14/include/linux/spi/spi.h 2014-09-11 18:06:11.014073961 +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
@@ -228392,7 +228392,7 @@ diff -Nur linux-3.14.17/include/linux/spi/spi.h linux-imx6-3.14/include/linux/sp
* SPI_NBITS_DUAL(2x) and SPI_NBITS_QUAD(4x) to support these three transfer.
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
++++ linux-imx6-3.14/include/linux/syscalls.h 2014-09-11 18:06:11.022073994 +0200
@@ -744,6 +744,9 @@
int newdfd, const char __user *newname, int flags);
asmlinkage long sys_renameat(int olddfd, const char __user * oldname,
@@ -228405,7 +228405,7 @@ diff -Nur linux-3.14.17/include/linux/syscalls.h linux-imx6-3.14/include/linux/s
asmlinkage long sys_faccessat(int dfd, const char __user *filename, int mode);
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
++++ linux-imx6-3.14/include/linux/usb/chipidea.h 2014-09-11 18:06:11.030074024 +0200
@@ -18,6 +18,7 @@
unsigned long flags;
#define CI_HDRC_REGS_SHARED BIT(0)
@@ -228431,7 +228431,7 @@ diff -Nur linux-3.14.17/include/linux/usb/chipidea.h linux-imx6-3.14/include/lin
#endif
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
++++ linux-imx6-3.14/include/linux/usb/composite.h 2014-09-11 18:06:11.034074040 +0200
@@ -92,7 +92,7 @@
* @suspend: Notifies functions when the host stops sending USB traffic.
* @resume: Notifies functions when the host restarts USB traffic.
@@ -228443,7 +228443,7 @@ diff -Nur linux-3.14.17/include/linux/usb/composite.h linux-imx6-3.14/include/li
*
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
++++ linux-imx6-3.14/include/linux/usb/phy.h 2014-09-11 18:06:11.034074040 +0200
@@ -111,11 +111,23 @@
int (*set_suspend)(struct usb_phy *x,
int suspend);
@@ -228511,7 +228511,7 @@ diff -Nur linux-3.14.17/include/linux/usb/phy.h linux-imx6-3.14/include/linux/us
static inline int
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
++++ linux-imx6-3.14/include/net/cfg80211.h 2014-09-11 18:06:14.058086106 +0200
@@ -1729,7 +1729,7 @@
u8 *ssid;
size_t ssid_len;
@@ -228541,7 +228541,7 @@ diff -Nur linux-3.14.17/include/net/cfg80211.h linux-imx6-3.14/include/net/cfg80
* cfg80211_notify_new_candidate - notify cfg80211 of a new mesh peer candidate
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
++++ linux-imx6-3.14/include/net/inetpeer.h 2014-09-11 18:06:14.066086140 +0200
@@ -41,13 +41,14 @@
struct rcu_head gc_rcu;
};
@@ -228584,7 +228584,7 @@ diff -Nur linux-3.14.17/include/net/inetpeer.h linux-imx6-3.14/include/net/inetp
#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
++++ linux-imx6-3.14/include/net/ip.h 2014-09-11 18:06:14.066086140 +0200
@@ -297,10 +297,9 @@
}
}
@@ -228636,7 +228636,7 @@ diff -Nur linux-3.14.17/include/net/ip.h linux-imx6-3.14/include/net/ip.h
/*
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
++++ linux-imx6-3.14/include/net/ip_tunnels.h 2014-09-11 18:06:14.066086140 +0200
@@ -40,7 +40,6 @@
struct ip_tunnel_dst {
@@ -228647,7 +228647,7 @@ diff -Nur linux-3.14.17/include/net/ip_tunnels.h linux-imx6-3.14/include/net/ip_
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
++++ linux-imx6-3.14/include/net/ipv6.h 2014-09-11 18:06:14.066086140 +0200
@@ -660,6 +660,8 @@
return __ipv6_addr_diff(a1, a2, sizeof(struct in6_addr));
}
@@ -228659,7 +228659,7 @@ diff -Nur linux-3.14.17/include/net/ipv6.h linux-imx6-3.14/include/net/ipv6.h
/*
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
++++ linux-imx6-3.14/include/net/mac80211.h 2014-09-11 18:06:14.082086204 +0200
@@ -1895,7 +1895,7 @@
*
* Driver informs U-APSD client support by enabling
@@ -228707,7 +228707,7 @@ diff -Nur linux-3.14.17/include/net/mac80211.h linux-imx6-3.14/include/net/mac80
int (*napi_poll)(struct ieee80211_hw *hw, int budget);
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
++++ linux-imx6-3.14/include/net/rtnetlink.h 2014-09-11 18:06:14.118086347 +0200
@@ -140,7 +140,7 @@
struct nlattr *tb[]);
int rtnl_configure_link(struct net_device *dev, const struct ifinfomsg *ifm);
@@ -228719,7 +228719,7 @@ diff -Nur linux-3.14.17/include/net/rtnetlink.h linux-imx6-3.14/include/net/rtne
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
++++ linux-imx6-3.14/include/net/secure_seq.h 2014-09-11 18:06:14.142086442 +0200
@@ -3,6 +3,8 @@
#include <linux/types.h>
@@ -228731,7 +228731,7 @@ diff -Nur linux-3.14.17/include/net/secure_seq.h linux-imx6-3.14/include/net/sec
__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
++++ linux-imx6-3.14/include/net/tso.h 2014-09-11 18:06:14.142086442 +0200
@@ -0,0 +1,20 @@
+#ifndef _TSO_H
+#define _TSO_H
@@ -228755,7 +228755,7 @@ diff -Nur linux-3.14.17/include/net/tso.h linux-imx6-3.14/include/net/tso.h
+#endif /* _TSO_H */
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
++++ linux-imx6-3.14/include/sound/wm8962.h 2014-09-11 18:06:14.210086714 +0200
@@ -55,6 +55,9 @@
* in a DC measurement configuration.
*/
@@ -228768,7 +228768,7 @@ diff -Nur linux-3.14.17/include/sound/wm8962.h linux-imx6-3.14/include/sound/wm8
#endif
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
++++ linux-imx6-3.14/include/trace/events/cpufreq_interactive.h 2014-09-11 18:06:14.210086714 +0200
@@ -0,0 +1,112 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM cpufreq_interactive
@@ -228884,7 +228884,7 @@ diff -Nur linux-3.14.17/include/trace/events/cpufreq_interactive.h linux-imx6-3.
+#include <trace/define_trace.h>
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
++++ linux-imx6-3.14/include/uapi/linux/ipu.h 2014-09-11 18:06:14.378087384 +0200
@@ -0,0 +1,282 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved
@@ -229170,7 +229170,7 @@ diff -Nur linux-3.14.17/include/uapi/linux/ipu.h linux-imx6-3.14/include/uapi/li
+#endif
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
++++ linux-imx6-3.14/include/uapi/linux/isl29023.h 2014-09-11 18:06:14.378087384 +0200
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -229221,7 +229221,7 @@ diff -Nur linux-3.14.17/include/uapi/linux/isl29023.h linux-imx6-3.14/include/ua
+#endif
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
++++ linux-imx6-3.14/include/uapi/linux/Kbuild 2014-09-11 18:06:14.290087032 +0200
@@ -226,6 +226,7 @@
header-y += kvm_para.h
endif
@@ -229251,7 +229251,7 @@ diff -Nur linux-3.14.17/include/uapi/linux/Kbuild linux-imx6-3.14/include/uapi/l
header-y += quota.h
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
++++ linux-imx6-3.14/include/uapi/linux/mxc_asrc.h 2014-09-11 18:06:14.386087416 +0200
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2008-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -229398,7 +229398,7 @@ diff -Nur linux-3.14.17/include/uapi/linux/mxc_asrc.h linux-imx6-3.14/include/ua
+#endif/* __MXC_ASRC_UAPI_H__ */
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
++++ linux-imx6-3.14/include/uapi/linux/mxcfb.h 2014-09-11 18:06:14.386087416 +0200
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved
@@ -229576,7 +229576,7 @@ diff -Nur linux-3.14.17/include/uapi/linux/mxcfb.h linux-imx6-3.14/include/uapi/
+#endif
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
++++ linux-imx6-3.14/include/uapi/linux/mxc_mlb.h 2014-09-11 18:06:14.386087416 +0200
@@ -0,0 +1,55 @@
+/*
+ * mxc_mlb.h
@@ -229635,7 +229635,7 @@ diff -Nur linux-3.14.17/include/uapi/linux/mxc_mlb.h linux-imx6-3.14/include/uap
+#endif /* _MXC_MLB_H */
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
++++ linux-imx6-3.14/include/uapi/linux/mxc_v4l2.h 2014-09-11 18:06:14.386087416 +0200
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved
@@ -229695,7 +229695,7 @@ diff -Nur linux-3.14.17/include/uapi/linux/mxc_v4l2.h linux-imx6-3.14/include/ua
+#endif
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
++++ linux-imx6-3.14/include/uapi/linux/ptp_clock.h 2014-09-11 18:06:14.414087528 +0200
@@ -50,7 +50,8 @@
int n_ext_ts; /* Number of external time stamp channels. */
int n_per_out; /* Number of programmable periodic signals. */
@@ -229758,7 +229758,7 @@ diff -Nur linux-3.14.17/include/uapi/linux/ptp_clock.h linux-imx6-3.14/include/u
struct ptp_clock_time t; /* Time event occured. */
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
++++ linux-imx6-3.14/include/uapi/linux/pxp_device.h 2014-09-11 18:06:14.414087528 +0200
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2013-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -229825,7 +229825,7 @@ diff -Nur linux-3.14.17/include/uapi/linux/pxp_device.h linux-imx6-3.14/include/
+#endif
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
++++ linux-imx6-3.14/include/uapi/linux/pxp_dma.h 2014-09-11 18:06:14.414087528 +0200
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2013-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -230002,7 +230002,7 @@ diff -Nur linux-3.14.17/include/uapi/linux/pxp_dma.h linux-imx6-3.14/include/uap
+#endif
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
++++ linux-imx6-3.14/include/video/mxc_edid.h 2014-09-11 18:06:14.438087624 +0200
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -230111,7 +230111,7 @@ diff -Nur linux-3.14.17/include/video/mxc_edid.h linux-imx6-3.14/include/video/m
+#endif
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
++++ linux-imx6-3.14/include/video/mxc_hdmi.h 2014-09-11 18:06:14.438087624 +0200
@@ -0,0 +1,1027 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc.
@@ -231142,7 +231142,7 @@ diff -Nur linux-3.14.17/include/video/mxc_hdmi.h linux-imx6-3.14/include/video/m
+#endif /* __MXC_HDMI_H__ */
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
++++ linux-imx6-3.14/init/main.c 2014-09-11 18:06:14.446087655 +0200
@@ -617,10 +617,6 @@
if (efi_enabled(EFI_RUNTIME_SERVICES))
efi_enter_virtual_mode();
@@ -231156,7 +231156,7 @@ diff -Nur linux-3.14.17/init/main.c linux-imx6-3.14/init/main.c
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
++++ linux-imx6-3.14/kernel/cpu.c 2014-09-11 18:06:14.486087815 +0200
@@ -722,3 +722,22 @@
{
cpumask_copy(to_cpumask(cpu_online_bits), src);
@@ -231182,7 +231182,7 @@ diff -Nur linux-3.14.17/kernel/cpu.c linux-imx6-3.14/kernel/cpu.c
+EXPORT_SYMBOL_GPL(idle_notifier_call_chain);
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
++++ linux-imx6-3.14/kernel/irq/manage.c 2014-09-11 18:06:14.630088390 +0200
@@ -32,24 +32,10 @@
early_param("threadirqs", setup_forced_irqthreads);
#endif
@@ -231273,7 +231273,7 @@ diff -Nur linux-3.14.17/kernel/irq/manage.c linux-imx6-3.14/kernel/irq/manage.c
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
++++ linux-imx6-3.14/kernel/printk/printk.c 2014-09-11 18:06:14.678088581 +0200
@@ -2468,7 +2468,7 @@
preempt_enable();
}
@@ -231285,7 +231285,7 @@ diff -Nur linux-3.14.17/kernel/printk/printk.c linux-imx6-3.14/kernel/printk/pri
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
++++ linux-imx6-3.14/kernel/relay.c 2014-09-11 18:06:14.746088855 +0200
@@ -227,7 +227,7 @@
* relay_remove_buf - remove a channel buffer
* @kref: target kernel reference that contains the relay buffer
@@ -231297,7 +231297,7 @@ diff -Nur linux-3.14.17/kernel/relay.c linux-imx6-3.14/kernel/relay.c
*/
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
++++ linux-imx6-3.14/kernel/sched/core.c 2014-09-11 18:06:14.750088870 +0200
@@ -1322,7 +1322,7 @@
* leave kernel.
*/
@@ -231309,7 +231309,7 @@ diff -Nur linux-3.14.17/kernel/sched/core.c linux-imx6-3.14/kernel/sched/core.c
}
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
++++ linux-imx6-3.14/kernel/sched/deadline.c 2014-09-11 18:06:14.754088885 +0200
@@ -329,7 +329,7 @@
if (!lag_once) {
@@ -231321,7 +231321,7 @@ diff -Nur linux-3.14.17/kernel/sched/deadline.c linux-imx6-3.14/kernel/sched/dea
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
++++ linux-imx6-3.14/kernel/sched/rt.c 2014-09-11 18:06:14.754088885 +0200
@@ -837,7 +837,7 @@
if (!once) {
@@ -231333,7 +231333,7 @@ diff -Nur linux-3.14.17/kernel/sched/rt.c linux-imx6-3.14/kernel/sched/rt.c
/*
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
++++ linux-imx6-3.14/kernel/signal.c 2014-09-11 18:06:14.754088885 +0200
@@ -2382,7 +2382,7 @@
* @regs: user register state
* @stepping: nonzero if debugger single-step or block-step in use
@@ -231345,7 +231345,7 @@ diff -Nur linux-3.14.17/kernel/signal.c linux-imx6-3.14/kernel/signal.c
* is set in @ka->sa.sa_flags. Tracing is notified.
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
++++ linux-imx6-3.14/kernel/time/clockevents.c 2014-09-11 18:06:14.758088900 +0200
@@ -146,8 +146,7 @@
{
/* Nothing to do if we already reached the limit */
@@ -231372,7 +231372,7 @@ diff -Nur linux-3.14.17/kernel/time/clockevents.c linux-imx6-3.14/kernel/time/cl
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
++++ linux-imx6-3.14/kernel/time/sched_clock.c 2014-09-11 18:06:15.154090207 +0200
@@ -204,8 +204,7 @@
static int sched_clock_suspend(void)
@@ -231393,7 +231393,7 @@ diff -Nur linux-3.14.17/kernel/time/sched_clock.c linux-imx6-3.14/kernel/time/sc
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
++++ linux-imx6-3.14/kernel/trace/trace.c 2014-09-11 18:06:15.162090371 +0200
@@ -811,7 +811,7 @@
{ trace_clock_local, "local", 1 },
{ trace_clock_global, "global", 1 },
@@ -231405,7 +231405,7 @@ diff -Nur linux-3.14.17/kernel/trace/trace.c linux-imx6-3.14/kernel/trace/trace.
};
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
++++ linux-imx6-3.14/kernel/trace/trace_clock.c 2014-09-11 18:06:15.162090371 +0200
@@ -59,14 +59,13 @@
/*
@@ -231427,7 +231427,7 @@ diff -Nur linux-3.14.17/kernel/trace/trace_clock.c linux-imx6-3.14/kernel/trace/
/*
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
++++ linux-imx6-3.14/lib/btree.c 2014-09-11 18:06:15.278090964 +0200
@@ -198,7 +198,6 @@
void btree_destroy(struct btree_head *head)
@@ -231438,7 +231438,7 @@ diff -Nur linux-3.14.17/lib/btree.c linux-imx6-3.14/lib/btree.c
}
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
++++ linux-imx6-3.14/linaro/configs/android.conf 2014-09-11 18:06:15.338091214 +0200
@@ -0,0 +1,42 @@
+CONFIG_IPV6=y
+# CONFIG_IPV6_SIT is not set
@@ -231484,7 +231484,7 @@ diff -Nur linux-3.14.17/linaro/configs/android.conf linux-imx6-3.14/linaro/confi
+CONFIG_TUN=y
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
++++ linux-imx6-3.14/linaro/configs/arndale.conf 2014-09-11 18:06:15.342091230 +0200
@@ -0,0 +1,66 @@
+CONFIG_KALLSYMS_ALL=y
+CONFIG_PARTITION_ADVANCED=y
@@ -231554,7 +231554,7 @@ diff -Nur linux-3.14.17/linaro/configs/arndale.conf linux-imx6-3.14/linaro/confi
+CONFIG_TUN=y
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
++++ linux-imx6-3.14/linaro/configs/bigendian.conf 2014-09-11 18:06:15.342091230 +0200
@@ -0,0 +1,4 @@
+CONFIG_CPU_BIG_ENDIAN=y
+CONFIG_CPU_ENDIAN_BE8=y
@@ -231562,7 +231562,7 @@ diff -Nur linux-3.14.17/linaro/configs/bigendian.conf linux-imx6-3.14/linaro/con
+# CONFIG_MMC_DW_IDMAC is not set
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
++++ linux-imx6-3.14/linaro/configs/big-LITTLE-IKS.conf 2014-09-11 18:06:15.342091230 +0200
@@ -0,0 +1,5 @@
+CONFIG_BIG_LITTLE=y
+CONFIG_BL_SWITCHER=y
@@ -231571,12 +231571,12 @@ diff -Nur linux-3.14.17/linaro/configs/big-LITTLE-IKS.conf linux-imx6-3.14/linar
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
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
++++ linux-imx6-3.14/linaro/configs/debug.conf 2014-09-11 18:06:15.342091230 +0200
@@ -0,0 +1 @@
+CONFIG_PROVE_LOCKING=y
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
++++ linux-imx6-3.14/linaro/configs/distribution.conf 2014-09-11 18:06:15.342091230 +0200
@@ -0,0 +1,49 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_CGROUPS=y
@@ -231629,7 +231629,7 @@ diff -Nur linux-3.14.17/linaro/configs/distribution.conf linux-imx6-3.14/linaro/
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
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
++++ linux-imx6-3.14/linaro/configs/highbank.conf 2014-09-11 18:06:15.342091230 +0200
@@ -0,0 +1,40 @@
+CONFIG_EXPERIMENTAL=y
+CONFIG_NO_HZ=y
@@ -231673,7 +231673,7 @@ diff -Nur linux-3.14.17/linaro/configs/highbank.conf linux-imx6-3.14/linaro/conf
+CONFIG_PL330_DMA=y
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
++++ linux-imx6-3.14/linaro/configs/kvm-guest.conf 2014-09-11 18:06:15.342091230 +0200
@@ -0,0 +1,11 @@
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_VIRTIO_BLK=y
@@ -231688,7 +231688,7 @@ diff -Nur linux-3.14.17/linaro/configs/kvm-guest.conf linux-imx6-3.14/linaro/con
+# CONFIG_THUMB2_KERNEL is not set
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
++++ linux-imx6-3.14/linaro/configs/kvm-host.conf 2014-09-11 18:06:15.342091230 +0200
@@ -0,0 +1,11 @@
+CONFIG_VIRTUALIZATION=y
+CONFIG_ARM_LPAE=y
@@ -231703,7 +231703,7 @@ diff -Nur linux-3.14.17/linaro/configs/kvm-host.conf linux-imx6-3.14/linaro/conf
+CONFIG_BLK_DEV_NBD=m
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
++++ linux-imx6-3.14/linaro/configs/linaro-base.conf 2014-09-11 18:06:15.342091230 +0200
@@ -0,0 +1,115 @@
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
@@ -231822,7 +231822,7 @@ diff -Nur linux-3.14.17/linaro/configs/linaro-base.conf linux-imx6-3.14/linaro/c
+CONFIG_EXT4_FS_SECURITY=y
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
++++ linux-imx6-3.14/linaro/configs/omap4.conf 2014-09-11 18:06:15.342091230 +0200
@@ -0,0 +1,196 @@
+CONFIG_EXPERT=y
+CONFIG_KPROBES=y
@@ -232022,7 +232022,7 @@ diff -Nur linux-3.14.17/linaro/configs/omap4.conf linux-imx6-3.14/linaro/configs
+# CONFIG_CPU_FREQ is not set
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
++++ linux-imx6-3.14/linaro/configs/preempt-rt.conf 2014-09-11 18:06:15.342091230 +0200
@@ -0,0 +1,4 @@
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_RT_FULL=y
@@ -232030,7 +232030,7 @@ diff -Nur linux-3.14.17/linaro/configs/preempt-rt.conf linux-imx6-3.14/linaro/co
+# CONFIG_CPU_FREQ is not set
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
++++ linux-imx6-3.14/linaro/configs/vexpress64.conf 2014-09-11 18:06:15.342091230 +0200
@@ -0,0 +1,56 @@
+CONFIG_ARCH_VEXPRESS=y
+CONFIG_SMP=y
@@ -232090,7 +232090,7 @@ diff -Nur linux-3.14.17/linaro/configs/vexpress64.conf linux-imx6-3.14/linaro/co
+CONFIG_ARM64_CRYPTO=y
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
++++ linux-imx6-3.14/linaro/configs/vexpress.conf 2014-09-11 18:06:15.342091230 +0200
@@ -0,0 +1,64 @@
+CONFIG_ARCH_VEXPRESS=y
+CONFIG_ARCH_VEXPRESS_CA9X4=y
@@ -232158,12 +232158,12 @@ diff -Nur linux-3.14.17/linaro/configs/vexpress.conf linux-imx6-3.14/linaro/conf
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
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
++++ linux-imx6-3.14/linaro/configs/vexpress-tuning.conf 2014-09-11 18:06:15.342091230 +0200
@@ -0,0 +1 @@
+# CONFIG_PROVE_LOCKING is not set
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
++++ linux-imx6-3.14/linaro/configs/xen.conf 2014-09-11 18:06:15.342091230 +0200
@@ -0,0 +1,7 @@
+CONFIG_XEN=y
+CONFIG_XEN_NETDEV_FRONTEND=y
@@ -232174,7 +232174,7 @@ diff -Nur linux-3.14.17/linaro/configs/xen.conf linux-imx6-3.14/linaro/configs/x
+CONFIG_XEN_COMPAT_XENFS=y
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
++++ linux-imx6-3.14/MAINTAINERS 2014-09-11 18:05:52.461999847 +0200
@@ -5511,6 +5511,14 @@
F: drivers/net/macvlan.c
F: include/linux/if_macvlan.h
@@ -232192,7 +232192,7 @@ diff -Nur linux-3.14.17/MAINTAINERS linux-imx6-3.14/MAINTAINERS
W: http://www.kernel.org/doc/man-pages
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
++++ linux-imx6-3.14/Makefile 2014-09-11 18:09:02.718753157 +0200
@@ -639,8 +639,6 @@
endif
endif
@@ -232204,7 +232204,7 @@ diff -Nur linux-3.14.17/Makefile linux-imx6-3.14/Makefile
KBUILD_AFLAGS += -Wa,--gdwarf-2
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
++++ linux-imx6-3.14/mm/cma.c 2014-09-11 18:06:15.342091230 +0200
@@ -0,0 +1,356 @@
+/*
+ * Contiguous Memory Allocator
@@ -232564,7 +232564,7 @@ diff -Nur linux-3.14.17/mm/cma.c linux-imx6-3.14/mm/cma.c
+}
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
++++ linux-imx6-3.14/mm/hugetlb.c 2014-09-11 18:06:15.346091247 +0200
@@ -2422,7 +2422,6 @@
} else {
if (cow)
@@ -232575,7 +232575,7 @@ diff -Nur linux-3.14.17/mm/hugetlb.c linux-imx6-3.14/mm/hugetlb.c
page_dup_rmap(ptepage);
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
++++ linux-imx6-3.14/mm/Kconfig 2014-09-11 18:06:15.342091230 +0200
@@ -514,6 +514,17 @@
processing calls such as dma_alloc_from_contiguous().
This option does not affect warning and error messages.
@@ -232596,7 +232596,7 @@ diff -Nur linux-3.14.17/mm/Kconfig linux-imx6-3.14/mm/Kconfig
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
++++ linux-imx6-3.14/mm/Makefile 2014-09-11 18:06:15.342091230 +0200
@@ -61,3 +61,4 @@
obj-$(CONFIG_MEMORY_ISOLATION) += page_isolation.o
obj-$(CONFIG_ZBUD) += zbud.o
@@ -232604,7 +232604,7 @@ diff -Nur linux-3.14.17/mm/Makefile linux-imx6-3.14/mm/Makefile
+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
++++ linux-imx6-3.14/mm/memblock.c 2014-09-11 18:06:15.346091247 +0200
@@ -975,22 +975,35 @@
}
#endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */
@@ -232647,7 +232647,7 @@ diff -Nur linux-3.14.17/mm/memblock.c linux-imx6-3.14/mm/memblock.c
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
++++ linux-imx6-3.14/mm/memcontrol.c 2014-09-11 18:06:15.346091247 +0200
@@ -5670,12 +5670,8 @@
{
struct mem_cgroup_eventfd_list *ev;
@@ -232663,7 +232663,7 @@ diff -Nur linux-3.14.17/mm/memcontrol.c linux-imx6-3.14/mm/memcontrol.c
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
++++ linux-imx6-3.14/mm/page_alloc.c 2014-09-11 18:06:15.354091278 +0200
@@ -2434,7 +2434,7 @@
gfp_to_alloc_flags(gfp_t gfp_mask)
{
@@ -232703,7 +232703,7 @@ diff -Nur linux-3.14.17/mm/page_alloc.c linux-imx6-3.14/mm/page_alloc.c
} 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
++++ linux-imx6-3.14/mm/page-writeback.c 2014-09-11 18:06:15.354091278 +0200
@@ -1324,9 +1324,9 @@
*bdi_thresh = bdi_dirty_limit(bdi, dirty_thresh);
@@ -232719,7 +232719,7 @@ diff -Nur linux-3.14.17/mm/page-writeback.c linux-imx6-3.14/mm/page-writeback.c
* 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
++++ linux-imx6-3.14/mm/slab_common.c 2014-09-11 18:06:15.358091295 +0200
@@ -56,7 +56,7 @@
continue;
}
@@ -232731,7 +232731,7 @@ diff -Nur linux-3.14.17/mm/slab_common.c linux-imx6-3.14/mm/slab_common.c
* caches. We have control over memcg naming, and if there
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
++++ linux-imx6-3.14/net/atm/svc.c 2014-09-11 18:06:15.426091565 +0200
@@ -263,17 +263,11 @@
goto out;
}
@@ -232754,7 +232754,7 @@ diff -Nur linux-3.14.17/net/atm/svc.c linux-imx6-3.14/net/atm/svc.c
sock->state = SS_CONNECTED;
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
++++ linux-imx6-3.14/net/batman-adv/fragmentation.c 2014-09-11 18:06:15.434091598 +0200
@@ -128,7 +128,6 @@
{
struct batadv_frag_table_entry *chain;
@@ -232783,7 +232783,7 @@ diff -Nur linux-3.14.17/net/batman-adv/fragmentation.c linux-imx6-3.14/net/batma
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
++++ linux-imx6-3.14/net/compat.c 2014-09-11 18:06:15.510091900 +0200
@@ -85,7 +85,7 @@
{
int tot_len;
@@ -232810,7 +232810,7 @@ diff -Nur linux-3.14.17/net/compat.c linux-imx6-3.14/net/compat.c
(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
++++ linux-imx6-3.14/net/core/dev.c 2014-09-11 18:06:15.510091900 +0200
@@ -3453,7 +3453,7 @@
* @rx_handler: receive handler to register
* @rx_handler_data: data pointer that is used by rx handler
@@ -232822,7 +232822,7 @@ diff -Nur linux-3.14.17/net/core/dev.c linux-imx6-3.14/net/core/dev.c
*
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
++++ linux-imx6-3.14/net/core/iovec.c 2014-09-11 18:06:15.514091916 +0200
@@ -39,7 +39,7 @@
{
int size, ct, err;
@@ -232858,7 +232858,7 @@ diff -Nur linux-3.14.17/net/core/iovec.c linux-imx6-3.14/net/core/iovec.c
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
++++ linux-imx6-3.14/net/core/Makefile 2014-09-11 18:06:15.510091900 +0200
@@ -9,7 +9,7 @@
obj-y += dev.o ethtool.o dev_addr_lists.o dst.o netevent.o \
@@ -232870,7 +232870,7 @@ diff -Nur linux-3.14.17/net/core/Makefile linux-imx6-3.14/net/core/Makefile
obj-y += net-sysfs.o
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
++++ linux-imx6-3.14/net/core/rtnetlink.c 2014-09-11 18:06:15.518091933 +0200
@@ -1156,73 +1156,7 @@
return -EMSGSIZE;
}
@@ -233018,7 +233018,7 @@ diff -Nur linux-3.14.17/net/core/rtnetlink.c linux-imx6-3.14/net/core/rtnetlink.
struct net *net;
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
++++ linux-imx6-3.14/net/core/secure_seq.c 2014-09-11 18:06:15.518091933 +0200
@@ -85,6 +85,31 @@
#endif
@@ -233053,7 +233053,7 @@ diff -Nur linux-3.14.17/net/core/secure_seq.c linux-imx6-3.14/net/core/secure_se
__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
++++ linux-imx6-3.14/net/core/skbuff.c 2014-09-11 18:06:15.518091933 +0200
@@ -2968,9 +2968,9 @@
tail = nskb;
@@ -233067,7 +233067,7 @@ diff -Nur linux-3.14.17/net/core/skbuff.c linux-imx6-3.14/net/core/skbuff.c
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
++++ linux-imx6-3.14/net/core/tso.c 2014-09-11 18:06:15.522091948 +0200
@@ -0,0 +1,72 @@
+#include <net/ip.h>
+#include <net/tso.h>
@@ -233143,7 +233143,7 @@ diff -Nur linux-3.14.17/net/core/tso.c linux-imx6-3.14/net/core/tso.c
+}
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
++++ linux-imx6-3.14/net/ieee802154/Kconfig 2014-09-11 18:06:15.578092171 +0200
@@ -15,7 +15,7 @@
depends on IEEE802154 && IPV6
select 6LOWPAN_IPHC
@@ -233155,7 +233155,7 @@ diff -Nur linux-3.14.17/net/ieee802154/Kconfig linux-imx6-3.14/net/ieee802154/Kc
tristate
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
++++ linux-imx6-3.14/net/ipv4/igmp.c 2014-09-11 18:06:15.586092204 +0200
@@ -369,7 +369,7 @@
pip->saddr = fl4.saddr;
pip->protocol = IPPROTO_IGMP;
@@ -233176,7 +233176,7 @@ diff -Nur linux-3.14.17/net/ipv4/igmp.c linux-imx6-3.14/net/ipv4/igmp.c
((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
++++ linux-imx6-3.14/net/ipv4/inetpeer.c 2014-09-11 18:06:15.586092204 +0200
@@ -26,7 +26,20 @@
* Theory of operations.
* We keep one entry for each peer IP address. The nodes contains long-living
@@ -233219,7 +233219,7 @@ diff -Nur linux-3.14.17/net/ipv4/inetpeer.c linux-imx6-3.14/net/ipv4/inetpeer.c
/* 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
++++ linux-imx6-3.14/net/ipv4/ipmr.c 2014-09-11 18:06:15.590092220 +0200
@@ -1663,7 +1663,7 @@
iph->protocol = IPPROTO_IPIP;
iph->ihl = 5;
@@ -233231,7 +233231,7 @@ diff -Nur linux-3.14.17/net/ipv4/ipmr.c linux-imx6-3.14/net/ipv4/ipmr.c
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
++++ linux-imx6-3.14/net/ipv4/ip_output.c 2014-09-11 18:06:15.590092220 +0200
@@ -148,7 +148,7 @@
iph->daddr = (opt && opt->opt.srr ? opt->opt.faddr : daddr);
iph->saddr = saddr;
@@ -233262,7 +233262,7 @@ diff -Nur linux-3.14.17/net/ipv4/ip_output.c linux-imx6-3.14/net/ipv4/ip_output.
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
++++ linux-imx6-3.14/net/ipv4/ip_tunnel.c 2014-09-11 18:06:15.590092220 +0200
@@ -69,25 +69,23 @@
}
@@ -233352,7 +233352,7 @@ diff -Nur linux-3.14.17/net/ipv4/ip_tunnel.c linux-imx6-3.14/net/ipv4/ip_tunnel.
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
++++ linux-imx6-3.14/net/ipv4/ip_tunnel_core.c 2014-09-11 18:06:15.590092220 +0200
@@ -74,7 +74,7 @@
iph->daddr = dst;
iph->saddr = src;
@@ -233364,7 +233364,7 @@ diff -Nur linux-3.14.17/net/ipv4/ip_tunnel_core.c linux-imx6-3.14/net/ipv4/ip_tu
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
++++ linux-imx6-3.14/net/ipv4/raw.c 2014-09-11 18:06:15.626092363 +0200
@@ -389,7 +389,7 @@
iph->check = 0;
iph->tot_len = htons(length);
@@ -233376,7 +233376,7 @@ diff -Nur linux-3.14.17/net/ipv4/raw.c linux-imx6-3.14/net/ipv4/raw.c
}
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
++++ linux-imx6-3.14/net/ipv4/route.c 2014-09-11 18:06:15.630092380 +0200
@@ -89,7 +89,6 @@
#include <linux/rcupdate.h>
#include <linux/times.h>
@@ -233471,7 +233471,7 @@ diff -Nur linux-3.14.17/net/ipv4/route.c linux-imx6-3.14/net/ipv4/route.c
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
++++ linux-imx6-3.14/net/ipv4/tcp_vegas.c 2014-09-11 18:06:15.642092428 +0200
@@ -219,8 +219,7 @@
* This is:
* (actual rate in segments) * baseRTT
@@ -233484,7 +233484,7 @@ diff -Nur linux-3.14.17/net/ipv4/tcp_vegas.c linux-imx6-3.14/net/ipv4/tcp_vegas.
* 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
++++ linux-imx6-3.14/net/ipv4/tcp_veno.c 2014-09-11 18:06:15.642092428 +0200
@@ -145,7 +145,7 @@
rtt = veno->minrtt;
@@ -233496,7 +233496,7 @@ diff -Nur linux-3.14.17/net/ipv4/tcp_veno.c linux-imx6-3.14/net/ipv4/tcp_veno.c
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
++++ linux-imx6-3.14/net/ipv4/xfrm4_mode_tunnel.c 2014-09-11 18:06:15.642092428 +0200
@@ -117,12 +117,12 @@
top_iph->frag_off = (flags & XFRM_STATE_NOPMTUDISC) ?
@@ -233513,7 +233513,7 @@ diff -Nur linux-3.14.17/net/ipv4/xfrm4_mode_tunnel.c linux-imx6-3.14/net/ipv4/xf
}
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
++++ linux-imx6-3.14/net/ipv6/ip6_output.c 2014-09-11 18:06:15.654092474 +0200
@@ -537,20 +537,6 @@
skb_copy_secmark(to, from);
}
@@ -233537,7 +233537,7 @@ diff -Nur linux-3.14.17/net/ipv6/ip6_output.c linux-imx6-3.14/net/ipv6/ip6_outpu
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
++++ linux-imx6-3.14/net/ipv6/output_core.c 2014-09-11 18:06:15.662092507 +0200
@@ -7,6 +7,29 @@
#include <net/ip6_fib.h>
#include <net/addrconf.h>
@@ -233570,7 +233570,7 @@ diff -Nur linux-3.14.17/net/ipv6/output_core.c linux-imx6-3.14/net/ipv6/output_c
{
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
++++ linux-imx6-3.14/net/l2tp/l2tp_ppp.c 2014-09-11 18:06:15.742092826 +0200
@@ -1368,7 +1368,7 @@
int err;
@@ -233591,7 +233591,7 @@ diff -Nur linux-3.14.17/net/l2tp/l2tp_ppp.c linux-imx6-3.14/net/l2tp/l2tp_ppp.c
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
++++ linux-imx6-3.14/net/mac80211/driver-ops.h 2014-09-11 18:06:15.754092874 +0200
@@ -722,13 +722,19 @@
}
@@ -233615,7 +233615,7 @@ diff -Nur linux-3.14.17/net/mac80211/driver-ops.h linux-imx6-3.14/net/mac80211/d
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
++++ linux-imx6-3.14/net/mac80211/ibss.c 2014-09-11 18:06:15.754092874 +0200
@@ -386,7 +386,7 @@
presp->head_len, 0, GFP_KERNEL);
cfg80211_put_bss(local->hw.wiphy, bss);
@@ -233627,7 +233627,7 @@ diff -Nur linux-3.14.17/net/mac80211/ibss.c linux-imx6-3.14/net/mac80211/ibss.c
static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
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
++++ linux-imx6-3.14/net/mac80211/tx.c 2014-09-11 18:06:15.778092969 +0200
@@ -414,9 +414,6 @@
if (ieee80211_has_order(hdr->frame_control))
return TX_CONTINUE;
@@ -233687,7 +233687,7 @@ diff -Nur linux-3.14.17/net/mac80211/tx.c linux-imx6-3.14/net/mac80211/tx.c
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
++++ linux-imx6-3.14/net/mac80211/util.c 2014-09-11 18:06:15.778092969 +0200
@@ -554,7 +554,7 @@
ieee80211_stop_queues_by_reason(&local->hw, IEEE80211_MAX_QUEUE_MAP,
IEEE80211_QUEUE_STOP_REASON_FLUSH);
@@ -233699,7 +233699,7 @@ diff -Nur linux-3.14.17/net/mac80211/util.c linux-imx6-3.14/net/mac80211/util.c
IEEE80211_QUEUE_STOP_REASON_FLUSH);
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
++++ linux-imx6-3.14/net/netfilter/ipvs/ip_vs_xmit.c 2014-09-11 18:06:15.790093017 +0200
@@ -883,7 +883,7 @@
iph->daddr = cp->daddr.ip;
iph->saddr = saddr;
@@ -233711,7 +233711,7 @@ diff -Nur linux-3.14.17/net/netfilter/ipvs/ip_vs_xmit.c linux-imx6-3.14/net/netf
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
++++ linux-imx6-3.14/net/sctp/associola.c 2014-09-11 18:06:16.074094150 +0200
@@ -1151,7 +1151,6 @@
asoc->c = new->c;
asoc->peer.rwnd = new->peer.rwnd;
@@ -233722,7 +233722,7 @@ diff -Nur linux-3.14.17/net/sctp/associola.c linux-imx6-3.14/net/sctp/associola.
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
++++ linux-imx6-3.14/net/sctp/output.c 2014-09-11 18:06:16.074094150 +0200
@@ -599,7 +599,7 @@
return err;
no_route:
@@ -233734,7 +233734,7 @@ diff -Nur linux-3.14.17/net/sctp/output.c linux-imx6-3.14/net/sctp/output.c
* 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
++++ linux-imx6-3.14/net/wireless/core.h 2014-09-11 18:06:16.190094613 +0200
@@ -211,6 +211,7 @@
} dc;
struct {
@@ -233755,7 +233755,7 @@ diff -Nur linux-3.14.17/net/wireless/core.h linux-imx6-3.14/net/wireless/core.h
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
++++ linux-imx6-3.14/net/wireless/ibss.c 2014-09-11 18:06:16.190094613 +0200
@@ -14,7 +14,8 @@
#include "rdev-ops.h"
@@ -233808,7 +233808,7 @@ diff -Nur linux-3.14.17/net/wireless/ibss.c linux-imx6-3.14/net/wireless/ibss.c
list_add_tail(&ev->list, &wdev->event_list);
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
++++ linux-imx6-3.14/net/wireless/nl80211.c 2014-09-11 18:06:16.198094644 +0200
@@ -1450,17 +1450,18 @@
}
CMD(start_p2p_device, START_P2P_DEVICE);
@@ -233835,7 +233835,7 @@ diff -Nur linux-3.14.17/net/wireless/nl80211.c linux-imx6-3.14/net/wireless/nl80
if (dev->ops->connect || dev->ops->auth) {
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
++++ linux-imx6-3.14/net/wireless/trace.h 2014-09-11 18:06:16.202094661 +0200
@@ -2068,8 +2068,7 @@
MAC_ASSIGN(addr, addr);
__entry->key_type = key_type;
@@ -233885,7 +233885,7 @@ diff -Nur linux-3.14.17/net/wireless/trace.h linux-imx6-3.14/net/wireless/trace.
bool acked),
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
++++ linux-imx6-3.14/net/wireless/util.c 2014-09-11 18:06:16.202094661 +0200
@@ -820,7 +820,8 @@
ev->dc.reason, true);
break;
@@ -233898,7 +233898,7 @@ diff -Nur linux-3.14.17/net/wireless/util.c linux-imx6-3.14/net/wireless/util.c
wdev_unlock(wdev);
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
++++ linux-imx6-3.14/net/xfrm/xfrm_user.c 2014-09-11 18:06:16.218094725 +0200
@@ -176,7 +176,9 @@
attrs[XFRMA_ALG_AEAD] ||
attrs[XFRMA_ALG_CRYPT] ||
@@ -233922,7 +233922,7 @@ diff -Nur linux-3.14.17/net/xfrm/xfrm_user.c linux-imx6-3.14/net/xfrm/xfrm_user.
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
++++ linux-imx6-3.14/scripts/Makefile.lib 2014-09-11 18:06:16.334095188 +0200
@@ -153,6 +153,7 @@
-I$(srctree)/arch/$(SRCARCH)/boot/dts \
-I$(srctree)/arch/$(SRCARCH)/boot/dts/include \
@@ -233933,7 +233933,7 @@ diff -Nur linux-3.14.17/scripts/Makefile.lib linux-imx6-3.14/scripts/Makefile.li
# Finds the multi-part object the current object will be linked into
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
++++ linux-imx6-3.14/scripts/mod/devicetable-offsets.c 2014-09-11 18:06:16.482095778 +0200
@@ -174,6 +174,9 @@
DEVID_FIELD(x86_cpu_id, model);
DEVID_FIELD(x86_cpu_id, vendor);
@@ -233946,7 +233946,7 @@ diff -Nur linux-3.14.17/scripts/mod/devicetable-offsets.c linux-imx6-3.14/script
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
++++ linux-imx6-3.14/scripts/mod/file2alias.c 2014-09-11 18:06:16.486095794 +0200
@@ -1135,6 +1135,16 @@
}
ADD_TO_DEVTABLE("x86cpu", x86_cpu_id, do_x86cpu_entry);
@@ -233966,7 +233966,7 @@ diff -Nur linux-3.14.17/scripts/mod/file2alias.c linux-imx6-3.14/scripts/mod/fil
char *alias)
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
++++ linux-imx6-3.14/scripts/recordmcount.c 2014-09-11 18:06:16.490095810 +0200
@@ -40,6 +40,11 @@
#define R_METAG_NONE 3
#endif
@@ -233990,7 +233990,7 @@ diff -Nur linux-3.14.17/scripts/recordmcount.c linux-imx6-3.14/scripts/recordmco
altmcount = "_mcount_wrapper";
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
++++ linux-imx6-3.14/scripts/recordmcount.pl 2014-09-11 18:06:16.490095810 +0200
@@ -279,6 +279,11 @@
$mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*R_ARM_(CALL|PC24|THM_CALL)" .
"\\s+(__gnu_mcount_nc|mcount)\$";
@@ -234005,7 +234005,7 @@ diff -Nur linux-3.14.17/scripts/recordmcount.pl linux-imx6-3.14/scripts/recordmc
$type = "data8";
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
++++ linux-imx6-3.14/sound/soc/codecs/cs42888.c 2014-09-11 18:06:18.638104376 +0200
@@ -0,0 +1,934 @@
+/*
+ * cs42888.c -- CS42888 ALSA SoC Audio Driver
@@ -234943,7 +234943,7 @@ diff -Nur linux-3.14.17/sound/soc/codecs/cs42888.c linux-imx6-3.14/sound/soc/cod
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/sound/soc/codecs/cs42888.h 2014-09-11 18:06:18.638104376 +0200
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -235070,7 +235070,7 @@ diff -Nur linux-3.14.17/sound/soc/codecs/cs42888.h linux-imx6-3.14/sound/soc/cod
+#endif
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
++++ linux-imx6-3.14/sound/soc/codecs/Kconfig 2014-09-11 18:06:18.630104344 +0200
@@ -37,6 +37,7 @@
select SND_SOC_CS42L73 if I2C
select SND_SOC_CS4270 if I2C
@@ -235091,7 +235091,7 @@ diff -Nur linux-3.14.17/sound/soc/codecs/Kconfig linux-imx6-3.14/sound/soc/codec
depends on TTY
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
++++ linux-imx6-3.14/sound/soc/codecs/Makefile 2014-09-11 18:06:18.630104344 +0200
@@ -23,6 +23,7 @@
snd-soc-cs42l73-objs := cs42l73.o
snd-soc-cs4270-objs := cs4270.o
@@ -235110,7 +235110,7 @@ diff -Nur linux-3.14.17/sound/soc/codecs/Makefile linux-imx6-3.14/sound/soc/code
obj-$(CONFIG_SND_SOC_DA7213) += snd-soc-da7213.o
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
++++ linux-imx6-3.14/sound/soc/codecs/sgtl5000.c 2014-09-11 18:06:18.646104409 +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;
@@ -235222,7 +235222,7 @@ diff -Nur linux-3.14.17/sound/soc/codecs/sgtl5000.c linux-imx6-3.14/sound/soc/co
return 0;
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
++++ linux-imx6-3.14/sound/soc/codecs/spdif_transmitter.c 2014-09-11 18:06:18.646104409 +0200
@@ -24,7 +24,7 @@
#define DRV_NAME "spdif-dit"
@@ -235234,7 +235234,7 @@ diff -Nur linux-3.14.17/sound/soc/codecs/spdif_transmitter.c linux-imx6-3.14/sou
SNDRV_PCM_FMTBIT_S24_LE)
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
++++ linux-imx6-3.14/sound/soc/codecs/wm8962.c 2014-09-11 18:06:18.674104519 +0200
@@ -16,6 +16,7 @@
#include <linux/init.h>
#include <linux/delay.h>
@@ -235360,7 +235360,7 @@ diff -Nur linux-3.14.17/sound/soc/codecs/wm8962.c linux-imx6-3.14/sound/soc/code
#endif
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
++++ linux-imx6-3.14/sound/soc/fsl/fsl_asrc.c 2014-09-11 18:06:18.690104584 +0200
@@ -0,0 +1,498 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -235862,7 +235862,7 @@ diff -Nur linux-3.14.17/sound/soc/fsl/fsl_asrc.c linux-imx6-3.14/sound/soc/fsl/f
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/sound/soc/fsl/fsl_asrc.h 2014-09-11 18:06:18.690104584 +0200
@@ -0,0 +1,48 @@
+/*
+ * fsl_asrc.h - ALSA ASRC interface
@@ -235914,7 +235914,7 @@ diff -Nur linux-3.14.17/sound/soc/fsl/fsl_asrc.h linux-imx6-3.14/sound/soc/fsl/f
+#endif
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
++++ linux-imx6-3.14/sound/soc/fsl/fsl_asrc_pcm.c 2014-09-11 18:06:18.690104584 +0200
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -235959,7 +235959,7 @@ diff -Nur linux-3.14.17/sound/soc/fsl/fsl_asrc_pcm.c linux-imx6-3.14/sound/soc/f
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/sound/soc/fsl/fsl_esai.c 2014-09-11 18:06:18.690104584 +0200
@@ -785,7 +785,7 @@
return ret;
}
@@ -235971,7 +235971,7 @@ diff -Nur linux-3.14.17/sound/soc/fsl/fsl_esai.c linux-imx6-3.14/sound/soc/fsl/f
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
++++ linux-imx6-3.14/sound/soc/fsl/fsl_hdmi.c 2014-09-11 18:06:18.690104584 +0200
@@ -0,0 +1,614 @@
+/*
+ * ALSA SoC HDMI Audio Layer for Freescale i.MX
@@ -236589,7 +236589,7 @@ diff -Nur linux-3.14.17/sound/soc/fsl/fsl_hdmi.c linux-imx6-3.14/sound/soc/fsl/f
+MODULE_ALIAS("platform:fsl-hdmi-dai");
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
++++ linux-imx6-3.14/sound/soc/fsl/fsl_spdif.c 2014-09-11 18:06:18.690104584 +0200
@@ -21,6 +21,8 @@
#include <linux/of_address.h>
#include <linux/of_device.h>
@@ -236917,7 +236917,7 @@ diff -Nur linux-3.14.17/sound/soc/fsl/fsl_spdif.c linux-imx6-3.14/sound/soc/fsl/
};
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
++++ linux-imx6-3.14/sound/soc/fsl/fsl_spdif.h 2014-09-11 18:06:18.690104584 +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
@@ -236954,7 +236954,7 @@ diff -Nur linux-3.14.17/sound/soc/fsl/fsl_spdif.h linux-imx6-3.14/sound/soc/fsl/
SNDRV_PCM_RATE_32000 | \
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
++++ linux-imx6-3.14/sound/soc/fsl/fsl_ssi.c 2014-09-11 18:06:18.690104584 +0200
@@ -3,7 +3,7 @@
*
* Author: Timur Tabi <timur@freescale.com>
@@ -237122,7 +237122,14 @@ diff -Nur linux-3.14.17/sound/soc/fsl/fsl_ssi.c linux-imx6-3.14/sound/soc/fsl/fs
};
/* Template for the CPU dai driver structure */
-@@ -1263,7 +1332,6 @@
+@@ -1257,13 +1326,13 @@
+ int ret = 0;
+ struct device_attribute *dev_attr = NULL;
+ struct device_node *np = pdev->dev.of_node;
++ u32 dmas[4];
+ const struct of_device_id *of_id;
+ enum fsl_ssi_type hw_type;
+ const char *p, *sprop;
const uint32_t *iprop;
struct resource res;
char name[64];
@@ -237130,7 +237137,7 @@ diff -Nur linux-3.14.17/sound/soc/fsl/fsl_ssi.c linux-imx6-3.14/sound/soc/fsl/fs
bool ac97 = false;
/* SSIs that are not connected on the board should have a
-@@ -1381,7 +1449,6 @@
+@@ -1381,7 +1450,6 @@
if (hw_type == FSL_SSI_MX21 || hw_type == FSL_SSI_MX51 ||
hw_type == FSL_SSI_MX35) {
@@ -237138,7 +237145,7 @@ diff -Nur linux-3.14.17/sound/soc/fsl/fsl_ssi.c linux-imx6-3.14/sound/soc/fsl/fs
ssi_private->ssi_on_imx = true;
ssi_private->clk = devm_clk_get(&pdev->dev, NULL);
-@@ -1390,9 +1457,9 @@
+@@ -1390,9 +1458,9 @@
dev_err(&pdev->dev, "could not get clock: %d\n", ret);
goto error_irqmap;
}
@@ -237150,7 +237157,7 @@ diff -Nur linux-3.14.17/sound/soc/fsl/fsl_ssi.c linux-imx6-3.14/sound/soc/fsl/fs
ret);
goto error_irqmap;
}
-@@ -1405,56 +1472,16 @@
+@@ -1405,41 +1473,21 @@
dev_dbg(&pdev->dev, "could not get baud clock: %ld\n",
PTR_ERR(ssi_private->baudclk));
else
@@ -237165,6 +237172,8 @@ diff -Nur linux-3.14.17/sound/soc/fsl/fsl_ssi.c linux-imx6-3.14/sound/soc/fsl/fs
- ssi_private->fifo_depth - 2;
- ssi_private->dma_params_rx.maxburst =
- ssi_private->fifo_depth - 2;
++ ssi_private->dma_params_tx.maxburst = ssi_private->fifo_depth - 2;
++ ssi_private->dma_params_rx.maxburst = ssi_private->fifo_depth - 2;
ssi_private->dma_params_tx.addr =
ssi_private->ssi_phys + offsetof(struct ccsr_ssi, stx0);
ssi_private->dma_params_rx.addr =
@@ -237190,13 +237199,16 @@ diff -Nur linux-3.14.17/sound/soc/fsl/fsl_ssi.c linux-imx6-3.14/sound/soc/fsl/fs
- /* Should this be merge with the above? */
- if (!of_property_read_u32_array(pdev->dev.of_node, "dmas", dmas, 4)
- && dmas[2] == IMX_DMATYPE_SSI_DUAL) {
-- ssi_private->use_dual_fifo = true;
-- /* When using dual fifo mode, we need to keep watermark
-- * as even numbers due to dma script limitation.
-- */
-- ssi_private->dma_params_tx.maxburst &= ~0x1;
-- ssi_private->dma_params_rx.maxburst &= ~0x1;
-- }
++
++ ret = !of_property_read_u32_array(np, "dmas", dmas, 4);
++ if (ssi_private->use_dma && !ret && dmas[2] == IMX_DMATYPE_SSI_DUAL) {
+ ssi_private->use_dual_fifo = true;
+ /* When using dual fifo mode, we need to keep watermark
+ * as even numbers due to dma script limitation.
+@@ -1447,14 +1495,6 @@
+ ssi_private->dma_params_tx.maxburst &= ~0x1;
+ ssi_private->dma_params_rx.maxburst &= ~0x1;
+ }
-
- shared = of_device_is_compatible(of_get_parent(np),
- "fsl,spba-bus");
@@ -237208,7 +237220,7 @@ diff -Nur linux-3.14.17/sound/soc/fsl/fsl_ssi.c linux-imx6-3.14/sound/soc/fsl/fs
}
/*
-@@ -1474,6 +1501,8 @@
+@@ -1474,6 +1514,8 @@
}
}
@@ -237217,7 +237229,7 @@ diff -Nur linux-3.14.17/sound/soc/fsl/fsl_ssi.c linux-imx6-3.14/sound/soc/fsl/fs
/* Register with ASoC */
dev_set_drvdata(&pdev->dev, ssi_private);
-@@ -1509,7 +1538,8 @@
+@@ -1509,7 +1551,8 @@
if (ret)
goto error_pcm;
} else {
@@ -237227,7 +237239,7 @@ diff -Nur linux-3.14.17/sound/soc/fsl/fsl_ssi.c linux-imx6-3.14/sound/soc/fsl/fs
if (ret)
goto error_pcm;
}
-@@ -1565,12 +1595,16 @@
+@@ -1565,12 +1608,16 @@
error_dev:
device_remove_file(&pdev->dev, dev_attr);
@@ -237247,7 +237259,7 @@ diff -Nur linux-3.14.17/sound/soc/fsl/fsl_ssi.c linux-imx6-3.14/sound/soc/fsl/fs
error_irqmap:
if (ssi_private->irq_stats)
-@@ -1590,8 +1624,8 @@
+@@ -1590,8 +1637,8 @@
snd_soc_unregister_component(&pdev->dev);
if (ssi_private->ssi_on_imx) {
if (!IS_ERR(ssi_private->baudclk))
@@ -237258,7 +237270,7 @@ diff -Nur linux-3.14.17/sound/soc/fsl/fsl_ssi.c linux-imx6-3.14/sound/soc/fsl/fs
}
if (ssi_private->irq_stats)
irq_dispose_mapping(ssi_private->irq);
-@@ -1604,6 +1638,7 @@
+@@ -1604,6 +1651,7 @@
.name = "fsl-ssi-dai",
.owner = THIS_MODULE,
.of_match_table = fsl_ssi_ids,
@@ -237268,7 +237280,7 @@ diff -Nur linux-3.14.17/sound/soc/fsl/fsl_ssi.c linux-imx6-3.14/sound/soc/fsl/fs
.remove = fsl_ssi_remove,
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
++++ linux-imx6-3.14/sound/soc/fsl/imx-cs42888.c 2014-09-11 18:06:18.714104678 +0200
@@ -0,0 +1,369 @@
+/*
+ * Copyright (C) 2010-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -237641,7 +237653,7 @@ diff -Nur linux-3.14.17/sound/soc/fsl/imx-cs42888.c linux-imx6-3.14/sound/soc/fs
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/sound/soc/fsl/imx-hdmi.c 2014-09-11 18:06:18.714104678 +0200
@@ -0,0 +1,113 @@
+/*
+ * ASoC HDMI Transmitter driver for IMX development boards
@@ -237758,7 +237770,7 @@ diff -Nur linux-3.14.17/sound/soc/fsl/imx-hdmi.c linux-imx6-3.14/sound/soc/fsl/i
+MODULE_ALIAS("platform:imx-audio-hdmi");
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
++++ linux-imx6-3.14/sound/soc/fsl/imx-hdmi-dma.c 2014-09-11 18:06:18.714104678 +0200
@@ -0,0 +1,1240 @@
+/*
+ * imx-hdmi-dma.c -- HDMI DMA driver for ALSA Soc Audio Layer
@@ -239002,7 +239014,7 @@ diff -Nur linux-3.14.17/sound/soc/fsl/imx-hdmi-dma.c linux-imx6-3.14/sound/soc/f
+MODULE_LICENSE("GPL");
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
++++ linux-imx6-3.14/sound/soc/fsl/imx-hdmi.h 2014-09-11 18:06:18.714104678 +0200
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc.
@@ -239111,7 +239123,7 @@ diff -Nur linux-3.14.17/sound/soc/fsl/imx-hdmi.h linux-imx6-3.14/sound/soc/fsl/i
+#endif /* __IMX_HDMI_H */
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
++++ linux-imx6-3.14/sound/soc/fsl/imx-pcm-dma.c 2014-09-11 18:06:18.714104678 +0200
@@ -11,6 +11,10 @@
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
@@ -239241,7 +239253,7 @@ diff -Nur linux-3.14.17/sound/soc/fsl/imx-pcm-dma.c linux-imx6-3.14/sound/soc/fs
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
++++ linux-imx6-3.14/sound/soc/fsl/imx-pcm.h 2014-09-11 18:06:18.714104678 +0200
@@ -18,13 +18,17 @@
/*
* Do not change this as the FIQ handler depends on this size
@@ -239276,7 +239288,7 @@ diff -Nur linux-3.14.17/sound/soc/fsl/imx-pcm.h linux-imx6-3.14/sound/soc/fsl/im
}
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
++++ linux-imx6-3.14/sound/soc/fsl/imx-spdif.c 2014-09-11 18:06:18.714104678 +0200
@@ -65,14 +65,15 @@
if (ret)
goto end;
@@ -239305,7 +239317,7 @@ diff -Nur linux-3.14.17/sound/soc/fsl/imx-spdif.c linux-imx6-3.14/sound/soc/fsl/
.probe = imx_spdif_audio_probe,
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
++++ linux-imx6-3.14/sound/soc/fsl/imx-ssi.c 2014-09-11 18:06:18.714104678 +0200
@@ -602,7 +602,8 @@
ssi->fiq_params.dma_params_tx = &ssi->dma_params_tx;
@@ -239318,7 +239330,7 @@ diff -Nur linux-3.14.17/sound/soc/fsl/imx-ssi.c linux-imx6-3.14/sound/soc/fsl/im
ret = ssi->fiq_init;
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
++++ linux-imx6-3.14/sound/soc/fsl/imx-wm8962.c 2014-09-11 18:06:18.718104695 +0200
@@ -1,9 +1,9 @@
/*
- * Copyright 2013 Freescale Semiconductor, Inc.
@@ -239765,7 +239777,7 @@ diff -Nur linux-3.14.17/sound/soc/fsl/imx-wm8962.c linux-imx6-3.14/sound/soc/fsl
}
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
++++ linux-imx6-3.14/sound/soc/fsl/Kconfig 2014-09-11 18:37:37.616046899 +0200
@@ -11,6 +11,12 @@
config SND_SOC_FSL_ESAI
tristate
@@ -239830,7 +239842,7 @@ diff -Nur linux-3.14.17/sound/soc/fsl/Kconfig linux-imx6-3.14/sound/soc/fsl/Kcon
depends on MFD_MC13XXX && ARM
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
++++ linux-imx6-3.14/sound/soc/fsl/Makefile 2014-09-11 18:06:18.690104584 +0200
@@ -14,13 +14,19 @@
snd-soc-fsl-sai-objs := fsl_sai.o
snd-soc-fsl-ssi-objs := fsl_ssi.o
@@ -239881,7 +239893,7 @@ diff -Nur linux-3.14.17/sound/soc/fsl/Makefile linux-imx6-3.14/sound/soc/fsl/Mak
obj-$(CONFIG_SND_SOC_IMX_MC13783) += snd-soc-imx-mc13783.o
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
++++ linux-imx6-3.14/sound/soc/soc-pcm.c 2014-09-11 18:06:18.754104839 +0200
@@ -945,7 +945,7 @@
}
}