summaryrefslogtreecommitdiff
path: root/target/arm/solidrun-imx6/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-12-08 13:00:14 -0600
committerWaldemar Brodkorb <wbx@openadk.org>2014-12-08 13:00:25 -0600
commit1e60e4f0aa8e9dc5f03d58c8651d98742fdc36b7 (patch)
tree7b0d58ddb31378f453a6219abdd8eb2af6ede1aa /target/arm/solidrun-imx6/patches
parent5c105209db00b2a414a6796d2aef539dc963a310 (diff)
bump kernel to 3.14.26
Diffstat (limited to 'target/arm/solidrun-imx6/patches')
-rw-r--r--target/arm/solidrun-imx6/patches/3.14.26/solidrun.patch (renamed from target/arm/solidrun-imx6/patches/3.14.22/solidrun.patch)5731
1 files changed, 2880 insertions, 2851 deletions
diff --git a/target/arm/solidrun-imx6/patches/3.14.22/solidrun.patch b/target/arm/solidrun-imx6/patches/3.14.26/solidrun.patch
index 0d9621760..cc13ae013 100644
--- a/target/arm/solidrun-imx6/patches/3.14.22/solidrun.patch
+++ b/target/arm/solidrun-imx6/patches/3.14.26/solidrun.patch
@@ -1,6 +1,6 @@
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/clcd-panels.dtsi linux-3.14.22/arch/arm/boot/dts/clcd-panels.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/clcd-panels.dtsi 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/clcd-panels.dtsi 2014-10-22 14:55:49.026220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/clcd-panels.dtsi linux-imx6-3.14/arch/arm/boot/dts/clcd-panels.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/clcd-panels.dtsi 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/clcd-panels.dtsi 2014-12-08 00:31:51.112418001 -0600
@@ -0,0 +1,52 @@
+/*
+ * ARM Ltd. Versatile Express
@@ -54,9 +54,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/clcd-panels.dtsi linux-3.14.22/ar
+ };
+ };
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/efm32gg-dk3750.dts linux-3.14.22/arch/arm/boot/dts/efm32gg-dk3750.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/efm32gg-dk3750.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/efm32gg-dk3750.dts 2014-10-22 14:55:49.030220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/efm32gg-dk3750.dts linux-imx6-3.14/arch/arm/boot/dts/efm32gg-dk3750.dts
+--- linux-3.14.14/arch/arm/boot/dts/efm32gg-dk3750.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/efm32gg-dk3750.dts 2014-12-08 00:31:51.116418001 -0600
@@ -26,7 +26,7 @@
};
@@ -66,9 +66,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/efm32gg-dk3750.dts linux-3.14.22/
status = "ok";
temp@48 {
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx23.dtsi linux-3.14.22/arch/arm/boot/dts/imx23.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx23.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx23.dtsi 2014-10-22 14:55:49.030220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx23.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx23.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx23.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx23.dtsi 2014-12-08 00:31:51.116418001 -0600
@@ -363,7 +363,8 @@
compatible = "fsl,imx23-lcdif";
reg = <0x80030000 2000>;
@@ -79,9 +79,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx23.dtsi linux-3.14.22/arch/arm
status = "disabled";
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx25.dtsi linux-3.14.22/arch/arm/boot/dts/imx25.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx25.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx25.dtsi 2014-10-22 14:55:49.030220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx25.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx25.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx25.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx25.dtsi 2014-12-08 00:31:51.116418001 -0600
@@ -13,6 +13,7 @@
/ {
@@ -98,9 +98,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx25.dtsi linux-3.14.22/arch/arm
clock-frequency = <24000000>;
};
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx25-karo-tx25.dts linux-3.14.22/arch/arm/boot/dts/imx25-karo-tx25.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx25-karo-tx25.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx25-karo-tx25.dts 2014-10-22 14:55:49.030220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx25-karo-tx25.dts linux-imx6-3.14/arch/arm/boot/dts/imx25-karo-tx25.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx25-karo-tx25.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx25-karo-tx25.dts 2014-12-08 00:31:51.116418001 -0600
@@ -16,6 +16,10 @@
model = "Ka-Ro TX25";
compatible = "karo,imx25-tx25", "fsl,imx25";
@@ -112,9 +112,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx25-karo-tx25.dts linux-3.14.22
memory {
reg = <0x80000000 0x02000000 0x90000000 0x02000000>;
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx27-apf27.dts linux-3.14.22/arch/arm/boot/dts/imx27-apf27.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx27-apf27.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx27-apf27.dts 2014-10-22 14:55:49.030220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx27-apf27.dts linux-imx6-3.14/arch/arm/boot/dts/imx27-apf27.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx27-apf27.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx27-apf27.dts 2014-12-08 00:31:51.116418001 -0600
@@ -29,6 +29,7 @@
osc26m {
@@ -123,9 +123,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx27-apf27.dts linux-3.14.22/arc
clock-frequency = <0>;
};
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx27.dtsi linux-3.14.22/arch/arm/boot/dts/imx27.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx27.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx27.dtsi 2014-10-22 14:55:49.030220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx27.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx27.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx27.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx27.dtsi 2014-12-08 00:31:51.120418001 -0600
@@ -13,6 +13,7 @@
/ {
@@ -142,9 +142,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx27.dtsi linux-3.14.22/arch/arm
clock-frequency = <26000000>;
};
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts linux-3.14.22/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts 2014-10-22 14:55:49.142220001 -0500
+diff -Nur linux-3.14.14/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.14/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts 2014-12-08 00:31:51.120418001 -0600
@@ -15,6 +15,10 @@
model = "Phytec pca100 rapid development kit";
compatible = "phytec,imx27-pca100-rdk", "phytec,imx27-pca100", "fsl,imx27";
@@ -156,9 +156,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts li
display: display {
model = "Primeview-PD050VL1";
native-mode = <&timing0>;
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx28.dtsi linux-3.14.22/arch/arm/boot/dts/imx28.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx28.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx28.dtsi 2014-10-22 14:55:49.146220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx28.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx28.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx28.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx28.dtsi 2014-12-08 00:31:51.120418001 -0600
@@ -840,7 +840,8 @@
compatible = "fsl,imx28-lcdif";
reg = <0x80030000 0x2000>;
@@ -169,9 +169,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx28.dtsi linux-3.14.22/arch/arm
dmas = <&dma_apbh 13>;
dma-names = "rx";
status = "disabled";
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx51-babbage.dts linux-3.14.22/arch/arm/boot/dts/imx51-babbage.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx51-babbage.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx51-babbage.dts 2014-10-22 14:55:49.146220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx51-babbage.dts linux-imx6-3.14/arch/arm/boot/dts/imx51-babbage.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx51-babbage.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx51-babbage.dts 2014-12-08 00:31:51.120418001 -0600
@@ -17,6 +17,10 @@
model = "Freescale i.MX51 Babbage Board";
compatible = "fsl,imx51-babbage", "fsl,imx51";
@@ -183,9 +183,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx51-babbage.dts linux-3.14.22/a
memory {
reg = <0x90000000 0x20000000>;
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx51.dtsi linux-3.14.22/arch/arm/boot/dts/imx51.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx51.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx51.dtsi 2014-10-22 14:55:49.226220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx51.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx51.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx51.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx51.dtsi 2014-12-08 00:31:51.120418001 -0600
@@ -15,6 +15,7 @@
/ {
@@ -220,9 +220,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx51.dtsi linux-3.14.22/arch/arm
clock-frequency = <24000000>;
};
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx53.dtsi linux-3.14.22/arch/arm/boot/dts/imx53.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx53.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx53.dtsi 2014-10-22 14:55:49.342220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx53.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx53.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx53.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx53.dtsi 2014-12-08 00:31:51.120418001 -0600
@@ -15,6 +15,7 @@
/ {
@@ -257,9 +257,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx53.dtsi linux-3.14.22/arch/arm
clock-frequency = <24000000>;
};
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx53-mba53.dts linux-3.14.22/arch/arm/boot/dts/imx53-mba53.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx53-mba53.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx53-mba53.dts 2014-10-22 14:55:49.342220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx53-mba53.dts linux-imx6-3.14/arch/arm/boot/dts/imx53-mba53.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx53-mba53.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx53-mba53.dts 2014-12-08 00:31:51.120418001 -0600
@@ -25,6 +25,10 @@
enable-active-low;
};
@@ -271,9 +271,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx53-mba53.dts linux-3.14.22/arc
backlight {
compatible = "pwm-backlight";
pwms = <&pwm2 0 50000>;
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts linux-3.14.22/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts 2014-10-22 14:55:49.342220001 -0500
+diff -Nur linux-3.14.14/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.14/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts 2014-12-08 00:31:51.120418001 -0600
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013 Sascha Hauer <s.hauer@pengutronix.de>
@@ -298,9 +298,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts linux-3.
+ model = "DFI FS700-M60-6DL i.MX6dl Q7 Board";
+ compatible = "dfi,fs700-m60-6dl", "dfi,fs700e-m60", "fsl,imx6dl";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl.dtsi linux-3.14.22/arch/arm/boot/dts/imx6dl.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6dl.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx6dl.dtsi 2014-10-22 14:55:49.342220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6dl.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6dl.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx6dl.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl.dtsi 2014-12-08 00:31:51.124418001 -0600
@@ -8,6 +8,7 @@
*
*/
@@ -466,9 +466,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl.dtsi linux-3.14.22/arch/ar
status = "disabled";
};
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-gw51xx.dts linux-3.14.22/arch/arm/boot/dts/imx6dl-gw51xx.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-gw51xx.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6dl-gw51xx.dts 2014-10-22 14:55:49.342220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6dl-gw51xx.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw51xx.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6dl-gw51xx.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw51xx.dts 2014-12-08 00:31:51.120418001 -0600
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -489,9 +489,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-gw51xx.dts linux-3.14.22/a
+ model = "Gateworks Ventana i.MX6 DualLite GW51XX";
+ compatible = "gw,imx6dl-gw51xx", "gw,ventana", "fsl,imx6dl";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-gw52xx.dts linux-3.14.22/arch/arm/boot/dts/imx6dl-gw52xx.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-gw52xx.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6dl-gw52xx.dts 2014-10-22 14:55:49.342220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6dl-gw52xx.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw52xx.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6dl-gw52xx.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw52xx.dts 2014-12-08 00:31:51.120418001 -0600
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -512,9 +512,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-gw52xx.dts linux-3.14.22/a
+ model = "Gateworks Ventana i.MX6 DualLite GW52XX";
+ compatible = "gw,imx6dl-gw52xx", "gw,ventana", "fsl,imx6dl";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-gw53xx.dts linux-3.14.22/arch/arm/boot/dts/imx6dl-gw53xx.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-gw53xx.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6dl-gw53xx.dts 2014-10-22 14:55:49.342220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6dl-gw53xx.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw53xx.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6dl-gw53xx.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw53xx.dts 2014-12-08 00:31:51.120418001 -0600
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -535,9 +535,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-gw53xx.dts linux-3.14.22/a
+ model = "Gateworks Ventana i.MX6 DualLite GW53XX";
+ compatible = "gw,imx6dl-gw53xx", "gw,ventana", "fsl,imx6dl";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-gw54xx.dts linux-3.14.22/arch/arm/boot/dts/imx6dl-gw54xx.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-gw54xx.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6dl-gw54xx.dts 2014-10-22 14:55:49.342220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6dl-gw54xx.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw54xx.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6dl-gw54xx.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw54xx.dts 2014-12-08 00:31:51.120418001 -0600
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -558,9 +558,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-gw54xx.dts linux-3.14.22/a
+ model = "Gateworks Ventana i.MX6 DualLite GW54XX";
+ compatible = "gw,imx6dl-gw54xx", "gw,ventana", "fsl,imx6dl";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-hummingboard.dts linux-3.14.22/arch/arm/boot/dts/imx6dl-hummingboard.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-hummingboard.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx6dl-hummingboard.dts 2014-10-22 14:55:49.346220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6dl-hummingboard.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-hummingboard.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6dl-hummingboard.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-hummingboard.dts 2014-12-08 00:31:51.120418001 -0600
@@ -1,163 +1,13 @@
/*
- * Copyright (C) 2013,2014 Russell King
@@ -730,9 +730,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-hummingboard.dts linux-3.1
+ model = "SolidRun HummingBoard Solo/DualLite";
+ compatible = "solidrun,hummingboard/dl", "fsl,imx6dl";
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-nitrogen6x.dts linux-3.14.22/arch/arm/boot/dts/imx6dl-nitrogen6x.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-nitrogen6x.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6dl-nitrogen6x.dts 2014-10-22 14:55:49.346220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6dl-nitrogen6x.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-nitrogen6x.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6dl-nitrogen6x.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-nitrogen6x.dts 2014-12-08 00:31:51.120418001 -0600
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2013 Boundary Devices, Inc.
@@ -755,9 +755,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-nitrogen6x.dts linux-3.14.
+ model = "Freescale i.MX6 DualLite Nitrogen6x Board";
+ compatible = "fsl,imx6dl-nitrogen6x", "fsl,imx6dl";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts linux-3.14.22/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts 2014-10-22 14:55:49.346220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts 2014-12-08 00:31:51.120418001 -0600
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2013 Christian Hemp, Phytec Messtechnik GmbH
@@ -778,9 +778,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts linux-3.
+ model = "Phytec phyFLEX-i.MX6 DualLite/Solo Carrier-Board";
+ compatible = "phytec,imx6dl-pbab01", "phytec,imx6dl-pfla02", "fsl,imx6dl";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi linux-3.14.22/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi 2014-10-22 14:55:49.346220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi 2014-12-08 00:31:51.120418001 -0600
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2013 Christian Hemp, Phytec Messtechnik GmbH
@@ -804,9 +804,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi linux-3
+ reg = <0x10000000 0x20000000>;
+ };
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-pinfunc.h linux-3.14.22/arch/arm/boot/dts/imx6dl-pinfunc.h
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-pinfunc.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx6dl-pinfunc.h 2014-10-22 14:55:49.346220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6dl-pinfunc.h linux-imx6-3.14/arch/arm/boot/dts/imx6dl-pinfunc.h
+--- linux-3.14.14/arch/arm/boot/dts/imx6dl-pinfunc.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-pinfunc.h 2014-12-08 00:31:51.124418001 -0600
@@ -755,6 +755,7 @@
#define MX6QDL_PAD_GPIO_5__I2C3_SCL 0x230 0x600 0x878 0x6 0x2
#define MX6QDL_PAD_GPIO_5__ARM_EVENTI 0x230 0x600 0x000 0x7 0x0
@@ -823,9 +823,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-pinfunc.h linux-3.14.22/ar
#define MX6QDL_PAD_SD1_CLK__GPT_CLKIN 0x2dc 0x6c4 0x000 0x3 0x0
#define MX6QDL_PAD_SD1_CLK__GPIO1_IO20 0x2dc 0x6c4 0x000 0x5 0x0
#define MX6QDL_PAD_SD1_CMD__SD1_CMD 0x2e0 0x6c8 0x000 0x0 0x0
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-sabreauto.dts linux-3.14.22/arch/arm/boot/dts/imx6dl-sabreauto.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-sabreauto.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx6dl-sabreauto.dts 2014-10-22 14:55:49.498220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6dl-sabreauto.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-sabreauto.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6dl-sabreauto.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-sabreauto.dts 2014-12-08 00:31:51.124418001 -0600
@@ -15,3 +15,16 @@
model = "Freescale i.MX6 DualLite/Solo SABRE Automotive Board";
compatible = "fsl,imx6dl-sabreauto", "fsl,imx6dl";
@@ -843,9 +843,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-sabreauto.dts linux-3.14.2
+&mxcfb2 {
+ status = "okay";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-sabrelite.dts linux-3.14.22/arch/arm/boot/dts/imx6dl-sabrelite.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-sabrelite.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6dl-sabrelite.dts 2014-10-22 14:55:49.498220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6dl-sabrelite.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-sabrelite.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6dl-sabrelite.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-sabrelite.dts 2014-12-08 00:31:51.124418001 -0600
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2011 Freescale Semiconductor, Inc.
@@ -867,9 +867,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-sabrelite.dts linux-3.14.2
+ model = "Freescale i.MX6 DualLite SABRE Lite Board";
+ compatible = "fsl,imx6dl-sabrelite", "fsl,imx6dl";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-sabresd.dts linux-3.14.22/arch/arm/boot/dts/imx6dl-sabresd.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-sabresd.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx6dl-sabresd.dts 2014-10-22 14:55:49.498220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6dl-sabresd.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-sabresd.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6dl-sabresd.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-sabresd.dts 2014-12-08 00:31:51.124418001 -0600
@@ -15,3 +15,20 @@
model = "Freescale i.MX6 DualLite SABRE Smart Device Board";
compatible = "fsl,imx6dl-sabresd", "fsl,imx6dl";
@@ -891,9 +891,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-sabresd.dts linux-3.14.22/
+&mxcfb2 {
+ status = "okay";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts linux-3.14.22/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts 2014-10-22 14:55:49.498220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts 2014-12-08 00:31:51.124418001 -0600
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -914,9 +914,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts linux-3.1
+&i2c2 {
+ status = "disable";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-arm2.dts linux-3.14.22/arch/arm/boot/dts/imx6q-arm2.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6q-arm2.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx6q-arm2.dts 2014-10-22 14:55:49.502220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6q-arm2.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-arm2.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6q-arm2.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-arm2.dts 2014-12-08 00:31:51.124418001 -0600
@@ -23,14 +23,27 @@
regulators {
@@ -1127,9 +1127,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-arm2.dts linux-3.14.22/arch
+ pinctrl-0 = <&pinctrl_uart4>;
status = "okay";
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-arm2-hsic.dts linux-3.14.22/arch/arm/boot/dts/imx6q-arm2-hsic.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6q-arm2-hsic.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6q-arm2-hsic.dts 2014-10-22 14:55:49.502220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6q-arm2-hsic.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-arm2-hsic.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6q-arm2-hsic.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-arm2-hsic.dts 2014-12-08 00:31:51.124418001 -0600
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2013 Freescale Semiconductor, Inc.
@@ -1163,9 +1163,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-arm2-hsic.dts linux-3.14.22
+ osc-clkgate-delay = <0x3>;
+ status = "okay";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-cm-fx6.dts linux-3.14.22/arch/arm/boot/dts/imx6q-cm-fx6.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6q-cm-fx6.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6q-cm-fx6.dts 2014-10-22 14:55:49.502220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6q-cm-fx6.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-cm-fx6.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6q-cm-fx6.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-cm-fx6.dts 2014-12-08 00:31:51.124418001 -0600
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2013 CompuLab Ltd.
@@ -1274,9 +1274,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-cm-fx6.dts linux-3.14.22/ar
+ pinctrl-0 = <&pinctrl_uart4>;
+ status = "okay";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-cubox-i.dts linux-3.14.22/arch/arm/boot/dts/imx6q-cubox-i.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6q-cubox-i.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx6q-cubox-i.dts 2014-10-22 14:55:49.502220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6q-cubox-i.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-cubox-i.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6q-cubox-i.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-cubox-i.dts 2014-12-08 00:31:51.124418001 -0600
@@ -13,4 +13,8 @@
&sata {
@@ -1286,9 +1286,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-cubox-i.dts linux-3.14.22/a
+ fsl,transmit-atten-16ths = <9>;
+ fsl,no-spread-spectrum;
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts linux-3.14.22/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts 2014-10-22 14:55:49.502220001 -0500
+diff -Nur linux-3.14.14/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.14/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts 2014-12-08 00:31:51.124418001 -0600
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013 Sascha Hauer <s.hauer@pengutronix.de>
@@ -1313,9 +1313,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts linux-3.1
+ model = "DFI FS700-M60-6QD i.MX6qd Q7 Board";
+ compatible = "dfi,fs700-m60-6qd", "dfi,fs700e-m60", "fsl,imx6q";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-3.14.22/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2014-10-22 14:55:49.502220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2014-12-08 00:31:51.124418001 -0600
@@ -5,11 +5,33 @@
#include "imx6qdl-microsom-ar8035.dtsi"
@@ -1550,9 +1550,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-3.14.2
+ fsl,cpu_pdnscr_iso2sw = <0x1>;
+ fsl,cpu_pdnscr_iso = <0x1>;
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi linux-3.14.22/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi 2014-10-22 14:55:49.502220001 -0500
+diff -Nur linux-3.14.14/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.14/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi 2014-12-08 00:31:51.124418001 -0600
@@ -0,0 +1,199 @@
+/ {
+ regulators {
@@ -1753,9 +1753,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi linux-
+ non-removable;
+ status = "okay";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl.dtsi linux-3.14.22/arch/arm/boot/dts/imx6qdl.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx6qdl.dtsi 2014-10-22 14:55:49.506220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6qdl.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx6qdl.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl.dtsi 2014-12-08 00:31:51.124418001 -0600
@@ -10,10 +10,16 @@
* http://www.gnu.org/copyleft/gpl.html
*/
@@ -3447,9 +3447,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl.dtsi linux-3.14.22/arch/a
};
};
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi linux-3.14.22/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi 2014-10-22 14:55:49.510220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi 2014-12-08 00:31:51.124418001 -0600
@@ -0,0 +1,374 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -3825,9 +3825,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi linux-3.14.22
+&usbh1 {
+ status = "okay";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi linux-3.14.22/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi 2014-10-22 14:55:49.510220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi 2014-12-08 00:31:51.124418001 -0600
@@ -0,0 +1,527 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -4356,9 +4356,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi linux-3.14.22
+ vmmc-supply = <&reg_3p3v>;
+ status = "okay";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi linux-3.14.22/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi 2014-10-22 14:55:49.510220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi 2014-12-08 00:31:51.124418001 -0600
@@ -0,0 +1,572 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -4932,9 +4932,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi linux-3.14.22
+ vmmc-supply = <&reg_3p3v>;
+ status = "okay";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi linux-3.14.22/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi 2014-10-22 14:55:49.510220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi 2014-12-08 00:31:51.124418001 -0600
@@ -0,0 +1,599 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -5535,10 +5535,10 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi linux-3.14.22
+ vmmc-supply = <&reg_3p3v>;
+ status = "okay";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi linux-3.14.22/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi 2014-10-22 14:55:49.514220001 -0500
-@@ -0,0 +1,341 @@
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi 2014-12-08 00:31:51.124418001 -0600
+@@ -0,0 +1,367 @@
+/*
+ * Copyright (C) 2013,2014 Russell King
+ */
@@ -5814,6 +5814,13 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi linux-3
+ MX6QDL_PAD_EIM_DA4__GPIO3_IO04 0x80000000
+ >;
+ };
++
++ pinctrl_pwm1: pwm1grp {
++ fsl,pins = <
++ MX6QDL_PAD_DISP0_DAT8__PWM1_OUT 0x1b0b1
++ >;
++ };
++
+ };
+};
+
@@ -5880,9 +5887,28 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi linux-3
+ no-msi;
+};
+
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi linux-3.14.22/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi 2014-10-22 14:55:49.514220001 -0500
++&pwm1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_pwm1>;
++ status = "okay";
++};
++
++&pwm2 {
++ pinctrl-names = "default";
++ status = "okay";
++};
++
++&pwm3 {
++ status = "disabled";
++};
++
++&pwm4 {
++ status = "disabled";
++};
++
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi 2014-12-08 00:31:51.124418001 -0600
@@ -17,7 +17,7 @@
enet {
pinctrl_microsom_enet_ar8035: microsom-enet-ar8035 {
@@ -5929,9 +5955,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi linu
/*
* As the RMII pins are also connected to RGMII
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-microsom.dtsi linux-3.14.22/arch/arm/boot/dts/imx6qdl-microsom.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2014-10-22 14:55:49.514220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6qdl-microsom.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-microsom.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2014-12-08 00:31:51.124418001 -0600
@@ -1,9 +1,69 @@
/*
* Copyright (C) 2013,2014 Russell King
@@ -6059,9 +6085,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-microsom.dtsi linux-3.14.
+ status = "okay";
};
+
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi linux-3.14.22/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi 2014-10-22 14:55:49.514220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi 2014-12-08 00:31:51.124418001 -0600
@@ -0,0 +1,426 @@
+/*
+ * Copyright 2013 Boundary Devices, Inc.
@@ -6489,9 +6515,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi linux-3.1
+ vmmc-supply = <&reg_3p3v>;
+ status = "okay";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi linux-3.14.22/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi 2014-10-22 14:55:49.514220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi 2014-12-08 00:31:51.124418001 -0600
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2013 Christian Hemp, Phytec Messtechnik GmbH
@@ -6591,9 +6617,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi linux-
+ >;
+ };
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi linux-3.14.22/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi 2014-10-22 14:55:49.518220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi 2014-12-08 00:31:51.124418001 -0600
@@ -0,0 +1,356 @@
+/*
+ * Copyright 2013 Christian Hemp, Phytec Messtechnik GmbH
@@ -6951,9 +6977,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi linux-
+ wp-gpios = <&gpio1 29 0>;
+ status = "disabled";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi linux-3.14.22/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi 2014-10-22 14:55:49.518220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi 2014-12-08 00:31:51.124418001 -0600
@@ -10,17 +10,146 @@
* http://www.gnu.org/copyleft/gpl.html
*/
@@ -7652,9 +7678,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi linux-3.14
+ fsl,cpu_pdnscr_iso2sw = <0x1>;
+ fsl,cpu_pdnscr_iso = <0x1>;
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi linux-3.14.22/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi 2014-10-22 14:55:49.518220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi 2014-12-08 00:31:51.124418001 -0600
@@ -0,0 +1,427 @@
+/*
+ * Copyright 2011 Freescale Semiconductor, Inc.
@@ -8083,9 +8109,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi linux-3.14
+ vmmc-supply = <&reg_3p3v>;
+ status = "okay";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-3.14.22/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2014-10-22 14:55:49.566220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2014-12-08 00:31:51.124418001 -0600
@@ -10,16 +10,33 @@
* http://www.gnu.org/copyleft/gpl.html
*/
@@ -8778,9 +8804,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-3.14.2
+ fsl,cpu_pdnscr_iso2sw = <0x1>;
+ fsl,cpu_pdnscr_iso = <0x1>;
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-wandboard.dtsi linux-3.14.22/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-wandboard.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx6qdl-wandboard.dtsi 2014-10-22 14:55:49.570220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6qdl-wandboard.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx6qdl-wandboard.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6qdl-wandboard.dtsi 2014-12-08 00:31:51.124418001 -0600
@@ -12,17 +12,21 @@
/ {
regulators {
@@ -9005,9 +9031,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6qdl-wandboard.dtsi linux-3.14
cd-gpios = <&gpio3 9 0>;
status = "okay";
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts linux-3.14.22/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts 2014-10-22 14:55:49.570220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts 2014-12-08 00:31:51.124418001 -0600
@@ -0,0 +1,432 @@
+/*
+ * Copyright 2013 Data Modul AG
@@ -9441,9 +9467,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts linux-3.14.
+ bus-width = <8>;
+ status = "okay";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q.dtsi linux-3.14.22/arch/arm/boot/dts/imx6q.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6q.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx6q.dtsi 2014-10-22 14:55:49.570220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6q.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6q.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx6q.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q.dtsi 2014-12-08 00:31:51.124418001 -0600
@@ -8,10 +8,16 @@
*
*/
@@ -9640,9 +9666,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q.dtsi linux-3.14.22/arch/arm
- crtcs = <&ipu1 0>, <&ipu1 1>, <&ipu2 0>, <&ipu2 1>;
- };
-};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-gk802.dts linux-3.14.22/arch/arm/boot/dts/imx6q-gk802.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6q-gk802.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6q-gk802.dts 2014-10-22 14:55:49.570220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6q-gk802.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-gk802.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6q-gk802.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-gk802.dts 2014-12-08 00:31:51.124418001 -0600
@@ -0,0 +1,229 @@
+/*
+ * Copyright (C) 2013 Philipp Zabel
@@ -9873,9 +9899,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-gk802.dts linux-3.14.22/arc
+ vmmc-supply = <&reg_3p3v>;
+ status = "okay";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-gw51xx.dts linux-3.14.22/arch/arm/boot/dts/imx6q-gw51xx.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6q-gw51xx.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6q-gw51xx.dts 2014-10-22 14:55:49.570220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6q-gw51xx.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw51xx.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6q-gw51xx.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw51xx.dts 2014-12-08 00:31:51.124418001 -0600
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -9896,9 +9922,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-gw51xx.dts linux-3.14.22/ar
+ model = "Gateworks Ventana i.MX6 Quad GW51XX";
+ compatible = "gw,imx6q-gw51xx", "gw,ventana", "fsl,imx6q";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-gw52xx.dts linux-3.14.22/arch/arm/boot/dts/imx6q-gw52xx.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6q-gw52xx.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6q-gw52xx.dts 2014-10-22 14:55:49.570220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6q-gw52xx.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw52xx.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6q-gw52xx.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw52xx.dts 2014-12-08 00:31:51.124418001 -0600
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -9923,9 +9949,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-gw52xx.dts linux-3.14.22/ar
+&sata {
+ status = "okay";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-gw53xx.dts linux-3.14.22/arch/arm/boot/dts/imx6q-gw53xx.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6q-gw53xx.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6q-gw53xx.dts 2014-10-22 14:55:49.570220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6q-gw53xx.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw53xx.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6q-gw53xx.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw53xx.dts 2014-12-08 00:31:51.124418001 -0600
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -9950,9 +9976,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-gw53xx.dts linux-3.14.22/ar
+&sata {
+ status = "okay";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-gw5400-a.dts linux-3.14.22/arch/arm/boot/dts/imx6q-gw5400-a.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6q-gw5400-a.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6q-gw5400-a.dts 2014-10-22 14:55:49.574220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6q-gw5400-a.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw5400-a.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6q-gw5400-a.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw5400-a.dts 2014-12-08 00:31:51.124418001 -0600
@@ -0,0 +1,543 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -10497,9 +10523,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-gw5400-a.dts linux-3.14.22/
+ vmmc-supply = <&reg_3p3v>;
+ status = "okay";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-gw54xx.dts linux-3.14.22/arch/arm/boot/dts/imx6q-gw54xx.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6q-gw54xx.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6q-gw54xx.dts 2014-10-22 14:55:49.574220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6q-gw54xx.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw54xx.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6q-gw54xx.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-gw54xx.dts 2014-12-08 00:31:51.124418001 -0600
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -10524,9 +10550,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-gw54xx.dts linux-3.14.22/ar
+&sata {
+ status = "okay";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-hummingboard.dts linux-3.14.22/arch/arm/boot/dts/imx6q-hummingboard.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6q-hummingboard.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6q-hummingboard.dts 2014-10-22 14:55:49.574220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6q-hummingboard.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-hummingboard.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6q-hummingboard.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-hummingboard.dts 2014-12-08 00:31:51.124418001 -0600
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2014 Rabeeh Khoury (rabeeh@solid-run.com)
@@ -10549,9 +10575,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-hummingboard.dts linux-3.14
+ fsl,transmit-atten-16ths = <9>;
+ fsl,no-spread-spectrum;
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-nitrogen6x.dts linux-3.14.22/arch/arm/boot/dts/imx6q-nitrogen6x.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6q-nitrogen6x.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6q-nitrogen6x.dts 2014-10-22 14:55:49.574220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6q-nitrogen6x.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-nitrogen6x.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6q-nitrogen6x.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-nitrogen6x.dts 2014-12-08 00:31:51.124418001 -0600
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2013 Boundary Devices, Inc.
@@ -10578,9 +10604,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-nitrogen6x.dts linux-3.14.2
+&sata {
+ status = "okay";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-phytec-pbab01.dts linux-3.14.22/arch/arm/boot/dts/imx6q-phytec-pbab01.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6q-phytec-pbab01.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx6q-phytec-pbab01.dts 2014-10-22 14:55:49.574220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6q-phytec-pbab01.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-phytec-pbab01.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6q-phytec-pbab01.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-phytec-pbab01.dts 2014-12-08 00:31:51.124418001 -0600
@@ -11,24 +11,17 @@
/dts-v1/;
@@ -10612,9 +10638,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-phytec-pbab01.dts linux-3.1
+&sata {
+ status = "okay";
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi linux-3.14.22/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi 2014-10-22 14:55:49.574220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi 2014-12-08 00:31:51.124418001 -0600
@@ -10,171 +10,13 @@
*/
@@ -10789,9 +10815,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi linux-3.
- wp-gpios = <&gpio1 29 0>;
- status = "disabled";
-};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-pinfunc.h linux-3.14.22/arch/arm/boot/dts/imx6q-pinfunc.h
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6q-pinfunc.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx6q-pinfunc.h 2014-10-22 14:55:49.578220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6q-pinfunc.h linux-imx6-3.14/arch/arm/boot/dts/imx6q-pinfunc.h
+--- linux-3.14.14/arch/arm/boot/dts/imx6q-pinfunc.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-pinfunc.h 2014-12-08 00:31:51.124418001 -0600
@@ -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
@@ -10808,9 +10834,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-pinfunc.h linux-3.14.22/arc
#define MX6QDL_PAD_SD1_CLK__GPT_CLKIN 0x350 0x738 0x000 0x3 0x0
#define MX6QDL_PAD_SD1_CLK__GPIO1_IO20 0x350 0x738 0x000 0x5 0x0
#define MX6QDL_PAD_SD2_CLK__SD2_CLK 0x354 0x73c 0x000 0x0 0x0
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-sabreauto.dts linux-3.14.22/arch/arm/boot/dts/imx6q-sabreauto.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6q-sabreauto.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx6q-sabreauto.dts 2014-10-22 14:55:49.578220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6q-sabreauto.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-sabreauto.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6q-sabreauto.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-sabreauto.dts 2014-12-08 00:31:51.124418001 -0600
@@ -20,6 +20,22 @@
compatible = "fsl,imx6q-sabreauto", "fsl,imx6q";
};
@@ -10834,9 +10860,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-sabreauto.dts linux-3.14.22
&sata {
status = "okay";
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-sabrelite.dts linux-3.14.22/arch/arm/boot/dts/imx6q-sabrelite.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6q-sabrelite.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx6q-sabrelite.dts 2014-10-22 14:55:49.578220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6q-sabrelite.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-sabrelite.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6q-sabrelite.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-sabrelite.dts 2014-12-08 00:31:51.124418001 -0600
@@ -12,189 +12,13 @@
/dts-v1/;
@@ -11028,9 +11054,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-sabrelite.dts linux-3.14.22
- vmmc-supply = <&reg_3p3v>;
- status = "okay";
-};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-sabresd.dts linux-3.14.22/arch/arm/boot/dts/imx6q-sabresd.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6q-sabresd.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx6q-sabresd.dts 2014-10-22 14:55:49.578220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6q-sabresd.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-sabresd.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6q-sabresd.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-sabresd.dts 2014-12-08 00:31:51.124418001 -0600
@@ -23,3 +23,19 @@
&sata {
status = "okay";
@@ -11051,9 +11077,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-sabresd.dts linux-3.14.22/a
+&mxcfb4 {
+ status = "okay";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts linux-3.14.22/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts 2014-10-22 14:55:49.578220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts 2014-12-08 00:31:51.124418001 -0600
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2012-2013 Freescale Semiconductor, Inc.
@@ -11078,9 +11104,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts linux-3.14
+&i2c2 {
+ status = "disable";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-sbc6x.dts linux-3.14.22/arch/arm/boot/dts/imx6q-sbc6x.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6q-sbc6x.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx6q-sbc6x.dts 2014-10-22 14:55:49.578220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6q-sbc6x.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-sbc6x.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6q-sbc6x.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-sbc6x.dts 2014-12-08 00:31:51.124418001 -0600
@@ -17,28 +17,78 @@
};
};
@@ -11164,9 +11190,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-sbc6x.dts linux-3.14.22/arc
+ pinctrl-0 = <&pinctrl_usdhc3>;
status = "okay";
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-udoo.dts linux-3.14.22/arch/arm/boot/dts/imx6q-udoo.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6q-udoo.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx6q-udoo.dts 2014-10-22 14:55:49.578220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6q-udoo.dts linux-imx6-3.14/arch/arm/boot/dts/imx6q-udoo.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6q-udoo.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6q-udoo.dts 2014-12-08 00:31:51.124418001 -0600
@@ -16,24 +16,78 @@
model = "Udoo i.MX6 Quad Board";
compatible = "udoo,imx6q-udoo", "fsl,imx6q";
@@ -11248,9 +11274,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6q-udoo.dts linux-3.14.22/arch
non-removable;
status = "okay";
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6sl.dtsi linux-3.14.22/arch/arm/boot/dts/imx6sl.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6sl.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx6sl.dtsi 2014-10-22 14:55:49.582220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6sl.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6sl.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx6sl.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6sl.dtsi 2014-12-08 00:31:51.124418001 -0600
@@ -7,12 +7,14 @@
*
*/
@@ -12287,9 +12313,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6sl.dtsi linux-3.14.22/arch/ar
};
};
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6sl-evk-csi.dts linux-3.14.22/arch/arm/boot/dts/imx6sl-evk-csi.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6sl-evk-csi.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6sl-evk-csi.dts 2014-10-22 14:55:49.682220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6sl-evk-csi.dts linux-imx6-3.14/arch/arm/boot/dts/imx6sl-evk-csi.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6sl-evk-csi.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6sl-evk-csi.dts 2014-12-08 00:31:51.124418001 -0600
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -12318,9 +12344,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6sl-evk-csi.dts linux-3.14.22/
+&epdc {
+ status = "disabled";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6sl-evk.dts linux-3.14.22/arch/arm/boot/dts/imx6sl-evk.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6sl-evk.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx6sl-evk.dts 2014-10-22 14:55:49.682220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6sl-evk.dts linux-imx6-3.14/arch/arm/boot/dts/imx6sl-evk.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6sl-evk.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6sl-evk.dts 2014-12-08 00:31:51.124418001 -0600
@@ -8,6 +8,8 @@
/dts-v1/;
@@ -13082,9 +13108,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6sl-evk.dts linux-3.14.22/arch
+&gpu {
+ pu-supply = <&pu_dummy>; /* ldo-bypass:use pu_dummy if VDDSOC share with VDDPU */
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/Makefile linux-3.14.22/arch/arm/boot/dts/Makefile
---- linux-3.14.22.orig/arch/arm/boot/dts/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/Makefile 2014-10-22 14:55:49.682220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/Makefile linux-imx6-3.14/arch/arm/boot/dts/Makefile
+--- linux-3.14.14/arch/arm/boot/dts/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/Makefile 2014-12-08 00:31:51.108418001 -0600
@@ -154,16 +154,37 @@
imx53-qsb.dtb \
imx53-smd.dtb \
@@ -13139,9 +13165,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/Makefile linux-3.14.22/arch/arm/b
dtb-$(CONFIG_ARCH_VIRT) += xenvm-4.2.dtb
dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \
wm8505-ref.dtb \
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/marco.dtsi linux-3.14.22/arch/arm/boot/dts/marco.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/marco.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/marco.dtsi 2014-10-22 14:55:49.682220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/marco.dtsi linux-imx6-3.14/arch/arm/boot/dts/marco.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/marco.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/marco.dtsi 2014-12-08 00:31:51.128418001 -0600
@@ -36,7 +36,7 @@
ranges = <0x40000000 0x40000000 0xa0000000>;
@@ -13151,9 +13177,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/marco.dtsi linux-3.14.22/arch/arm
reg = <0xc0030000 0x1000>;
interrupts = <0 59 0>;
arm,tag-latency = <1 1 1>;
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/prima2.dtsi linux-3.14.22/arch/arm/boot/dts/prima2.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/prima2.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/prima2.dtsi 2014-10-22 14:55:49.686220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/prima2.dtsi linux-imx6-3.14/arch/arm/boot/dts/prima2.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/prima2.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/prima2.dtsi 2014-12-08 00:31:51.132418001 -0600
@@ -48,7 +48,7 @@
ranges = <0x40000000 0x40000000 0x80000000>;
@@ -13163,9 +13189,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/prima2.dtsi linux-3.14.22/arch/ar
reg = <0x80040000 0x1000>;
interrupts = <59>;
arm,tag-latency = <1 1 1>;
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts linux-3.14.22/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts 2014-10-22 14:55:49.686220001 -0500
+diff -Nur linux-3.14.14/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.14/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts 2014-12-08 00:31:51.136418001 -0600
@@ -0,0 +1,159 @@
+/*
+ * ARM Ltd. Fast Models
@@ -13326,9 +13352,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts linux-3.
+};
+
+/include/ "clcd-panels.dtsi"
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts linux-3.14.22/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts 2014-10-22 14:55:49.686220001 -0500
+diff -Nur linux-3.14.14/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.14/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts 2014-12-08 00:31:51.136418001 -0600
@@ -0,0 +1,165 @@
+/*
+ * ARM Ltd. Fast Models
@@ -13495,9 +13521,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts linux-3.
+};
+
+/include/ "clcd-panels.dtsi"
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts linux-3.14.22/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts 2014-10-22 14:55:49.686220001 -0500
+diff -Nur linux-3.14.14/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.14/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts 2014-12-08 00:31:51.136418001 -0600
@@ -0,0 +1,177 @@
+/*
+ * ARM Ltd. Fast Models
@@ -13676,9 +13702,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts linux-3.
+};
+
+/include/ "clcd-panels.dtsi"
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts linux-3.14.22/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts 2014-10-22 14:55:49.686220001 -0500
+diff -Nur linux-3.14.14/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.14/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts 2014-12-08 00:31:51.136418001 -0600
@@ -0,0 +1,171 @@
+/*
+ * ARM Ltd. Fast Models
@@ -13851,9 +13877,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts linux-3.1
+};
+
+/include/ "clcd-panels.dtsi"
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts linux-3.14.22/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts 2014-10-22 14:55:49.686220001 -0500
+diff -Nur linux-3.14.14/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.14/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts 2014-12-08 00:31:51.136418001 -0600
@@ -0,0 +1,183 @@
+/*
+ * ARM Ltd. Fast Models
@@ -14038,9 +14064,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts linux-3.1
+};
+
+/include/ "clcd-panels.dtsi"
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi linux-3.14.22/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi 2014-10-22 14:55:49.686220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi 2014-12-08 00:31:51.136418001 -0600
@@ -0,0 +1,231 @@
+/*
+ * ARM Ltd. Fast Models
@@ -14273,9 +14299,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi linux-3.
+ };
+ };
+ };
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts linux-3.14.22/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts 2014-10-22 14:55:49.686220001 -0500
+diff -Nur linux-3.14.14/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.14/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts 2014-12-08 00:31:51.136418001 -0600
@@ -0,0 +1,233 @@
+/*
+ * ARM Ltd. Fast Models
@@ -14510,9 +14536,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts linu
+};
+
+/include/ "clcd-panels.dtsi"
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts linux-3.14.22/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts 2014-10-22 14:55:49.690220001 -0500
+diff -Nur linux-3.14.14/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.14/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts 2014-12-08 00:31:51.136418001 -0600
@@ -0,0 +1,317 @@
+/*
+ * ARM Ltd. Fast Models
@@ -14831,9 +14857,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts linu
+};
+
+/include/ "clcd-panels.dtsi"
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/vexpress-v2m.dtsi linux-3.14.22/arch/arm/boot/dts/vexpress-v2m.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/vexpress-v2m.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/vexpress-v2m.dtsi 2014-10-22 14:55:49.690220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/vexpress-v2m.dtsi linux-imx6-3.14/arch/arm/boot/dts/vexpress-v2m.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/vexpress-v2m.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/vexpress-v2m.dtsi 2014-12-08 00:31:51.144418001 -0600
@@ -227,6 +227,7 @@
};
@@ -14842,9 +14868,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/vexpress-v2m.dtsi linux-3.14.22/a
compatible = "arm,pl111", "arm,primecell";
reg = <0x1f000 0x1000>;
interrupts = <14>;
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi linux-3.14.22/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi 2014-10-22 14:55:49.690220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi linux-imx6-3.14/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi 2014-12-08 00:31:51.144418001 -0600
@@ -228,6 +228,7 @@
};
@@ -14853,9 +14879,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi linux-3.14.
compatible = "arm,pl111", "arm,primecell";
reg = <0x1f0000 0x1000>;
interrupts = <14>;
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts linux-3.14.22/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts 2014-10-22 14:55:49.690220001 -0500
+diff -Nur linux-3.14.14/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.14/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts 2014-12-08 00:31:51.144418001 -0600
@@ -9,6 +9,8 @@
/dts-v1/;
@@ -15051,9 +15077,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts linux-3.
dcc {
compatible = "arm,vexpress,config-bus";
arm,vexpress,config-bridge = <&v2m_sysreg>;
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts linux-3.14.22/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts 2014-10-22 14:55:49.690220001 -0500
+diff -Nur linux-3.14.14/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.14/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts 2014-12-08 00:31:51.144418001 -0600
@@ -9,6 +9,8 @@
/dts-v1/;
@@ -15072,9 +15098,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts linux-3
};
memory-controller@2b0a0000 {
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/vexpress-v2p-ca5s.dts linux-3.14.22/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/vexpress-v2p-ca5s.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/vexpress-v2p-ca5s.dts 2014-10-22 14:55:49.690220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/vexpress-v2p-ca5s.dts linux-imx6-3.14/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
+--- linux-3.14.14/arch/arm/boot/dts/vexpress-v2p-ca5s.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/vexpress-v2p-ca5s.dts 2014-12-08 00:31:51.144418001 -0600
@@ -9,6 +9,8 @@
/dts-v1/;
@@ -15093,9 +15119,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/vexpress-v2p-ca5s.dts linux-3.14.
};
memory-controller@2a150000 {
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/vexpress-v2p-ca9.dts linux-3.14.22/arch/arm/boot/dts/vexpress-v2p-ca9.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/vexpress-v2p-ca9.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/vexpress-v2p-ca9.dts 2014-10-22 14:55:49.690220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/vexpress-v2p-ca9.dts linux-imx6-3.14/arch/arm/boot/dts/vexpress-v2p-ca9.dts
+--- linux-3.14.14/arch/arm/boot/dts/vexpress-v2p-ca9.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/vexpress-v2p-ca9.dts 2014-12-08 00:31:51.144418001 -0600
@@ -9,6 +9,8 @@
/dts-v1/;
@@ -15114,9 +15140,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/vexpress-v2p-ca9.dts linux-3.14.2
};
memory-controller@100e0000 {
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/vf610.dtsi linux-3.14.22/arch/arm/boot/dts/vf610.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/vf610.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/vf610.dtsi 2014-10-22 14:55:49.694220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/vf610.dtsi linux-imx6-3.14/arch/arm/boot/dts/vf610.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/vf610.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/vf610.dtsi 2014-12-08 00:31:51.144418001 -0600
@@ -44,11 +44,13 @@
sxosc {
@@ -15131,9 +15157,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/vf610.dtsi linux-3.14.22/arch/arm
clock-frequency = <24000000>;
};
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/vf610-twr.dts linux-3.14.22/arch/arm/boot/dts/vf610-twr.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/vf610-twr.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/vf610-twr.dts 2014-10-22 14:55:49.694220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/vf610-twr.dts linux-imx6-3.14/arch/arm/boot/dts/vf610-twr.dts
+--- linux-3.14.14/arch/arm/boot/dts/vf610-twr.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/vf610-twr.dts 2014-12-08 00:31:51.144418001 -0600
@@ -25,11 +25,13 @@
clocks {
audio_ext {
@@ -15148,9 +15174,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/vf610-twr.dts linux-3.14.22/arch/
clock-frequency = <50000000>;
};
};
-diff -Nur linux-3.14.22.orig/arch/arm/common/Makefile linux-3.14.22/arch/arm/common/Makefile
---- linux-3.14.22.orig/arch/arm/common/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/common/Makefile 2014-10-22 14:55:49.694220001 -0500
+diff -Nur linux-3.14.14/arch/arm/common/Makefile linux-imx6-3.14/arch/arm/common/Makefile
+--- linux-3.14.14/arch/arm/common/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/common/Makefile 2014-12-08 00:31:51.148418001 -0600
@@ -13,6 +13,7 @@
obj-$(CONFIG_PCI_HOST_ITE8152) += it8152.o
obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp.o
@@ -15159,9 +15185,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/common/Makefile linux-3.14.22/arch/arm/com
AFLAGS_mcpm_head.o := -march=armv7-a
AFLAGS_vlock.o := -march=armv7-a
obj-$(CONFIG_TI_PRIV_EDMA) += edma.o
-diff -Nur linux-3.14.22.orig/arch/arm/configs/imx_v6_v7_defconfig linux-3.14.22/arch/arm/configs/imx_v6_v7_defconfig
---- linux-3.14.22.orig/arch/arm/configs/imx_v6_v7_defconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/configs/imx_v6_v7_defconfig 2014-10-22 14:55:49.694220001 -0500
+diff -Nur linux-3.14.14/arch/arm/configs/imx_v6_v7_defconfig linux-imx6-3.14/arch/arm/configs/imx_v6_v7_defconfig
+--- linux-3.14.14/arch/arm/configs/imx_v6_v7_defconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/configs/imx_v6_v7_defconfig 2014-12-08 00:31:51.156418001 -0600
@@ -45,6 +45,9 @@
CONFIG_AEABI=y
CONFIG_HIGHMEM=y
@@ -15276,9 +15302,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/configs/imx_v6_v7_defconfig linux-3.14.22/
CONFIG_COMMON_CLK_DEBUG=y
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_PWM=y
-diff -Nur linux-3.14.22.orig/arch/arm/configs/imx_v7_cbi_hb_base_defconfig linux-3.14.22/arch/arm/configs/imx_v7_cbi_hb_base_defconfig
---- linux-3.14.22.orig/arch/arm/configs/imx_v7_cbi_hb_base_defconfig 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/configs/imx_v7_cbi_hb_base_defconfig 2014-10-22 14:55:49.694220001 -0500
+diff -Nur linux-3.14.14/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.14/arch/arm/configs/imx_v7_cbi_hb_base_defconfig 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/configs/imx_v7_cbi_hb_base_defconfig 2014-12-08 00:31:51.156418001 -0600
@@ -0,0 +1,367 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_KERNEL_LZO=y
@@ -15647,9 +15673,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/configs/imx_v7_cbi_hb_base_defconfig linux
+CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_IR_GPIO_CIR=m
-diff -Nur linux-3.14.22.orig/arch/arm/configs/imx_v7_cbi_hb_defconfig linux-3.14.22/arch/arm/configs/imx_v7_cbi_hb_defconfig
---- linux-3.14.22.orig/arch/arm/configs/imx_v7_cbi_hb_defconfig 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/configs/imx_v7_cbi_hb_defconfig 2014-10-22 14:55:49.702220001 -0500
+diff -Nur linux-3.14.14/arch/arm/configs/imx_v7_cbi_hb_defconfig linux-imx6-3.14/arch/arm/configs/imx_v7_cbi_hb_defconfig
+--- linux-3.14.14/arch/arm/configs/imx_v7_cbi_hb_defconfig 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/configs/imx_v7_cbi_hb_defconfig 2014-12-08 00:31:51.156418001 -0600
@@ -0,0 +1,5138 @@
+#
+# Automatically generated make config: don't edit
@@ -20789,9 +20815,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/configs/imx_v7_cbi_hb_defconfig linux-3.14
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_PROC_DEVICETREE=y
+
-diff -Nur linux-3.14.22.orig/arch/arm/configs/imx_v7_defconfig linux-3.14.22/arch/arm/configs/imx_v7_defconfig
---- linux-3.14.22.orig/arch/arm/configs/imx_v7_defconfig 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/configs/imx_v7_defconfig 2014-10-22 14:55:49.702220001 -0500
+diff -Nur linux-3.14.14/arch/arm/configs/imx_v7_defconfig linux-imx6-3.14/arch/arm/configs/imx_v7_defconfig
+--- linux-3.14.14/arch/arm/configs/imx_v7_defconfig 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/configs/imx_v7_defconfig 2014-12-08 00:31:51.156418001 -0600
@@ -0,0 +1,343 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_KERNEL_LZO=y
@@ -21136,9 +21162,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/configs/imx_v7_defconfig linux-3.14.22/arc
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
-diff -Nur linux-3.14.22.orig/arch/arm/configs/imx_v7_mfg_defconfig linux-3.14.22/arch/arm/configs/imx_v7_mfg_defconfig
---- linux-3.14.22.orig/arch/arm/configs/imx_v7_mfg_defconfig 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/configs/imx_v7_mfg_defconfig 2014-10-22 14:55:49.702220001 -0500
+diff -Nur linux-3.14.14/arch/arm/configs/imx_v7_mfg_defconfig linux-imx6-3.14/arch/arm/configs/imx_v7_mfg_defconfig
+--- linux-3.14.14/arch/arm/configs/imx_v7_mfg_defconfig 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/configs/imx_v7_mfg_defconfig 2014-12-08 00:31:51.156418001 -0600
@@ -0,0 +1,341 @@
+CONFIG_KERNEL_LZO=y
+CONFIG_SYSVIPC=y
@@ -21481,9 +21507,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/configs/imx_v7_mfg_defconfig linux-3.14.22
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
-diff -Nur linux-3.14.22.orig/arch/arm/include/asm/arch_timer.h linux-3.14.22/arch/arm/include/asm/arch_timer.h
---- linux-3.14.22.orig/arch/arm/include/asm/arch_timer.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/include/asm/arch_timer.h 2014-10-22 14:55:49.702220001 -0500
+diff -Nur linux-3.14.14/arch/arm/include/asm/arch_timer.h linux-imx6-3.14/arch/arm/include/asm/arch_timer.h
+--- linux-3.14.14/arch/arm/include/asm/arch_timer.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/include/asm/arch_timer.h 2014-12-08 00:31:51.168418001 -0600
@@ -107,7 +107,6 @@
/* Also disable virtual event stream */
cntkctl &= ~(ARCH_TIMER_USR_PT_ACCESS_EN
@@ -21492,9 +21518,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/include/asm/arch_timer.h linux-3.14.22/arc
| ARCH_TIMER_USR_VCT_ACCESS_EN
| ARCH_TIMER_USR_PCT_ACCESS_EN);
arch_timer_set_cntkctl(cntkctl);
-diff -Nur linux-3.14.22.orig/arch/arm/include/asm/atomic.h linux-3.14.22/arch/arm/include/asm/atomic.h
---- linux-3.14.22.orig/arch/arm/include/asm/atomic.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/include/asm/atomic.h 2014-10-22 14:55:49.702220001 -0500
+diff -Nur linux-3.14.14/arch/arm/include/asm/atomic.h linux-imx6-3.14/arch/arm/include/asm/atomic.h
+--- linux-3.14.14/arch/arm/include/asm/atomic.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/include/asm/atomic.h 2014-12-08 00:31:51.168418001 -0600
@@ -60,6 +60,7 @@
int result;
@@ -21623,9 +21649,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/include/asm/atomic.h linux-3.14.22/arch/ar
__asm__ __volatile__("@ atomic64_add_unless\n"
"1: ldrexd %0, %H0, [%4]\n"
-diff -Nur linux-3.14.22.orig/arch/arm/include/asm/cmpxchg.h linux-3.14.22/arch/arm/include/asm/cmpxchg.h
---- linux-3.14.22.orig/arch/arm/include/asm/cmpxchg.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/include/asm/cmpxchg.h 2014-10-22 14:55:49.702220001 -0500
+diff -Nur linux-3.14.14/arch/arm/include/asm/cmpxchg.h linux-imx6-3.14/arch/arm/include/asm/cmpxchg.h
+--- linux-3.14.14/arch/arm/include/asm/cmpxchg.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/include/asm/cmpxchg.h 2014-12-08 00:31:51.168418001 -0600
@@ -2,6 +2,7 @@
#define __ASM_ARM_CMPXCHG_H
@@ -21660,9 +21686,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/include/asm/cmpxchg.h linux-3.14.22/arch/a
__asm__ __volatile__(
"1: ldrexd %1, %H1, [%3]\n"
" teq %1, %4\n"
-diff -Nur linux-3.14.22.orig/arch/arm/include/asm/ftrace.h linux-3.14.22/arch/arm/include/asm/ftrace.h
---- linux-3.14.22.orig/arch/arm/include/asm/ftrace.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/include/asm/ftrace.h 2014-10-22 14:55:49.890220001 -0500
+diff -Nur linux-3.14.14/arch/arm/include/asm/ftrace.h linux-imx6-3.14/arch/arm/include/asm/ftrace.h
+--- linux-3.14.14/arch/arm/include/asm/ftrace.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/include/asm/ftrace.h 2014-12-08 00:31:51.172418001 -0600
@@ -52,15 +52,7 @@
#endif
@@ -21680,9 +21706,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/include/asm/ftrace.h linux-3.14.22/arch/ar
#endif /* ifndef __ASSEMBLY__ */
-diff -Nur linux-3.14.22.orig/arch/arm/include/asm/futex.h linux-3.14.22/arch/arm/include/asm/futex.h
---- linux-3.14.22.orig/arch/arm/include/asm/futex.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/include/asm/futex.h 2014-10-22 14:55:49.890220001 -0500
+diff -Nur linux-3.14.14/arch/arm/include/asm/futex.h linux-imx6-3.14/arch/arm/include/asm/futex.h
+--- linux-3.14.14/arch/arm/include/asm/futex.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/include/asm/futex.h 2014-12-08 00:31:51.172418001 -0600
@@ -23,6 +23,7 @@
#define __futex_atomic_op(insn, ret, oldval, tmp, uaddr, oparg) \
@@ -21700,9 +21726,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/include/asm/futex.h linux-3.14.22/arch/arm
__asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
"1: ldrex %1, [%4]\n"
" teq %1, %2\n"
-diff -Nur linux-3.14.22.orig/arch/arm/include/asm/glue-cache.h linux-3.14.22/arch/arm/include/asm/glue-cache.h
---- linux-3.14.22.orig/arch/arm/include/asm/glue-cache.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/include/asm/glue-cache.h 2014-10-22 14:55:49.890220001 -0500
+diff -Nur linux-3.14.14/arch/arm/include/asm/glue-cache.h linux-imx6-3.14/arch/arm/include/asm/glue-cache.h
+--- linux-3.14.14/arch/arm/include/asm/glue-cache.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/include/asm/glue-cache.h 2014-12-08 00:31:51.172418001 -0600
@@ -102,19 +102,19 @@
#endif
@@ -21731,9 +21757,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/include/asm/glue-cache.h linux-3.14.22/arc
#endif
#if defined(CONFIG_CPU_V7M)
-diff -Nur linux-3.14.22.orig/arch/arm/include/asm/hardware/cache-l2x0.h linux-3.14.22/arch/arm/include/asm/hardware/cache-l2x0.h
---- linux-3.14.22.orig/arch/arm/include/asm/hardware/cache-l2x0.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/include/asm/hardware/cache-l2x0.h 2014-10-22 14:55:49.890220001 -0500
+diff -Nur linux-3.14.14/arch/arm/include/asm/hardware/cache-l2x0.h linux-imx6-3.14/arch/arm/include/asm/hardware/cache-l2x0.h
+--- linux-3.14.14/arch/arm/include/asm/hardware/cache-l2x0.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/include/asm/hardware/cache-l2x0.h 2014-12-08 00:31:51.172418001 -0600
@@ -26,8 +26,8 @@
#define L2X0_CACHE_TYPE 0x004
#define L2X0_CTRL 0x100
@@ -21872,9 +21898,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/include/asm/hardware/cache-l2x0.h linux-3.
#define L2X0_CTRL_EN 1
-diff -Nur linux-3.14.22.orig/arch/arm/include/asm/outercache.h linux-3.14.22/arch/arm/include/asm/outercache.h
---- linux-3.14.22.orig/arch/arm/include/asm/outercache.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/include/asm/outercache.h 2014-10-22 14:55:49.890220001 -0500
+diff -Nur linux-3.14.14/arch/arm/include/asm/outercache.h linux-imx6-3.14/arch/arm/include/asm/outercache.h
+--- linux-3.14.14/arch/arm/include/asm/outercache.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/include/asm/outercache.h 2014-12-08 00:31:51.176418001 -0600
@@ -21,6 +21,7 @@
#ifndef __ASM_OUTERCACHE_H
#define __ASM_OUTERCACHE_H
@@ -22003,9 +22029,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/include/asm/outercache.h linux-3.14.22/arc
static inline void outer_sync(void)
{
if (outer_cache.sync)
-diff -Nur linux-3.14.22.orig/arch/arm/include/asm/pmu.h linux-3.14.22/arch/arm/include/asm/pmu.h
---- linux-3.14.22.orig/arch/arm/include/asm/pmu.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/include/asm/pmu.h 2014-10-22 14:55:49.890220001 -0500
+diff -Nur linux-3.14.14/arch/arm/include/asm/pmu.h linux-imx6-3.14/arch/arm/include/asm/pmu.h
+--- linux-3.14.14/arch/arm/include/asm/pmu.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/include/asm/pmu.h 2014-12-08 00:31:51.176418001 -0600
@@ -62,9 +62,19 @@
raw_spinlock_t pmu_lock;
};
@@ -22035,9 +22061,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/include/asm/pmu.h linux-3.14.22/arch/arm/i
int num_events;
atomic_t active_events;
struct mutex reserve_mutex;
-diff -Nur linux-3.14.22.orig/arch/arm/include/asm/psci.h linux-3.14.22/arch/arm/include/asm/psci.h
---- linux-3.14.22.orig/arch/arm/include/asm/psci.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/include/asm/psci.h 2014-10-22 14:55:49.890220001 -0500
+diff -Nur linux-3.14.14/arch/arm/include/asm/psci.h linux-imx6-3.14/arch/arm/include/asm/psci.h
+--- linux-3.14.14/arch/arm/include/asm/psci.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/include/asm/psci.h 2014-12-08 00:31:51.176418001 -0600
@@ -16,6 +16,10 @@
#define PSCI_POWER_STATE_TYPE_STANDBY 0
@@ -22062,9 +22088,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/include/asm/psci.h linux-3.14.22/arch/arm/
+}
+#endif
#endif /* __ASM_ARM_PSCI_H */
-diff -Nur linux-3.14.22.orig/arch/arm/include/asm/topology.h linux-3.14.22/arch/arm/include/asm/topology.h
---- linux-3.14.22.orig/arch/arm/include/asm/topology.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/include/asm/topology.h 2014-10-22 14:55:49.890220001 -0500
+diff -Nur linux-3.14.14/arch/arm/include/asm/topology.h linux-imx6-3.14/arch/arm/include/asm/topology.h
+--- linux-3.14.14/arch/arm/include/asm/topology.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/include/asm/topology.h 2014-12-08 00:31:51.176418001 -0600
@@ -26,11 +26,14 @@
void init_cpu_topology(void);
void store_cpu_topology(unsigned int cpuid);
@@ -22080,9 +22106,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/include/asm/topology.h linux-3.14.22/arch/
#endif
-diff -Nur linux-3.14.22.orig/arch/arm/Kconfig linux-3.14.22/arch/arm/Kconfig
---- linux-3.14.22.orig/arch/arm/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/Kconfig 2014-10-22 14:55:49.894220001 -0500
+diff -Nur linux-3.14.14/arch/arm/Kconfig linux-imx6-3.14/arch/arm/Kconfig
+--- linux-3.14.14/arch/arm/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/Kconfig 2014-12-08 00:31:51.108418001 -0600
@@ -1216,19 +1216,6 @@
register of the Cortex-A9 which reduces the linefill issuing
capabilities of the processor.
@@ -22200,9 +22226,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/Kconfig linux-3.14.22/arch/arm/Kconfig
default "11"
help
The kernel memory allocator divides physically contiguous memory
-diff -Nur linux-3.14.22.orig/arch/arm/kernel/perf_event.c linux-3.14.22/arch/arm/kernel/perf_event.c
---- linux-3.14.22.orig/arch/arm/kernel/perf_event.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/kernel/perf_event.c 2014-10-22 14:55:49.894220001 -0500
+diff -Nur linux-3.14.14/arch/arm/kernel/perf_event.c linux-imx6-3.14/arch/arm/kernel/perf_event.c
+--- linux-3.14.14/arch/arm/kernel/perf_event.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/kernel/perf_event.c 2014-12-08 00:31:51.184418001 -0600
@@ -12,6 +12,7 @@
*/
#define pr_fmt(fmt) "hw perfevents: " fmt
@@ -22271,9 +22297,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/kernel/perf_event.c linux-3.14.22/arch/arm
/* does not support taken branch sampling */
if (has_branch_stack(event))
return -EOPNOTSUPP;
-diff -Nur linux-3.14.22.orig/arch/arm/kernel/perf_event_cpu.c linux-3.14.22/arch/arm/kernel/perf_event_cpu.c
---- linux-3.14.22.orig/arch/arm/kernel/perf_event_cpu.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/kernel/perf_event_cpu.c 2014-10-22 14:55:49.898220001 -0500
+diff -Nur linux-3.14.14/arch/arm/kernel/perf_event_cpu.c linux-imx6-3.14/arch/arm/kernel/perf_event_cpu.c
+--- linux-3.14.14/arch/arm/kernel/perf_event_cpu.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/kernel/perf_event_cpu.c 2014-12-08 00:31:51.188418001 -0600
@@ -19,6 +19,7 @@
#define pr_fmt(fmt) "CPU PMU: " fmt
@@ -22537,9 +22563,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/kernel/perf_event_cpu.c linux-3.14.22/arch
return err;
}
-diff -Nur linux-3.14.22.orig/arch/arm/kernel/perf_event_v7.c linux-3.14.22/arch/arm/kernel/perf_event_v7.c
---- linux-3.14.22.orig/arch/arm/kernel/perf_event_v7.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/kernel/perf_event_v7.c 2014-10-22 14:55:49.898220001 -0500
+diff -Nur linux-3.14.14/arch/arm/kernel/perf_event_v7.c linux-imx6-3.14/arch/arm/kernel/perf_event_v7.c
+--- linux-3.14.14/arch/arm/kernel/perf_event_v7.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/kernel/perf_event_v7.c 2014-12-08 00:31:51.188418001 -0600
@@ -950,6 +950,51 @@
}
#endif
@@ -22646,9 +22672,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/kernel/perf_event_v7.c linux-3.14.22/arch/
cpu_pmu->map_event = armv7_a7_map_event;
cpu_pmu->num_events = armv7_read_num_pmnc_events();
cpu_pmu->set_event_filter = armv7pmu_set_event_filter;
-diff -Nur linux-3.14.22.orig/arch/arm/kernel/process.c linux-3.14.22/arch/arm/kernel/process.c
---- linux-3.14.22.orig/arch/arm/kernel/process.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/kernel/process.c 2014-10-22 14:55:49.898220001 -0500
+diff -Nur linux-3.14.14/arch/arm/kernel/process.c linux-imx6-3.14/arch/arm/kernel/process.c
+--- linux-3.14.14/arch/arm/kernel/process.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/kernel/process.c 2014-12-08 00:31:51.188418001 -0600
@@ -172,8 +172,10 @@
*/
void arch_cpu_idle(void)
@@ -22660,9 +22686,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/kernel/process.c linux-3.14.22/arch/arm/ke
}
/*
-diff -Nur linux-3.14.22.orig/arch/arm/kernel/psci.c linux-3.14.22/arch/arm/kernel/psci.c
---- linux-3.14.22.orig/arch/arm/kernel/psci.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/kernel/psci.c 2014-10-22 14:55:49.898220001 -0500
+diff -Nur linux-3.14.14/arch/arm/kernel/psci.c linux-imx6-3.14/arch/arm/kernel/psci.c
+--- linux-3.14.14/arch/arm/kernel/psci.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/kernel/psci.c 2014-12-08 00:31:51.188418001 -0600
@@ -42,6 +42,7 @@
#define PSCI_RET_EOPNOTSUPP -1
#define PSCI_RET_EINVAL -2
@@ -22706,9 +22732,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/kernel/psci.c linux-3.14.22/arch/arm/kerne
+ of_node_put(np);
+ return ret;
+}
-diff -Nur linux-3.14.22.orig/arch/arm/kernel/setup.c linux-3.14.22/arch/arm/kernel/setup.c
---- linux-3.14.22.orig/arch/arm/kernel/setup.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/kernel/setup.c 2014-10-22 14:55:49.898220001 -0500
+diff -Nur linux-3.14.14/arch/arm/kernel/setup.c linux-imx6-3.14/arch/arm/kernel/setup.c
+--- linux-3.14.14/arch/arm/kernel/setup.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/kernel/setup.c 2014-12-08 00:31:51.188418001 -0600
@@ -273,6 +273,19 @@
int aliasing_icache;
unsigned int id_reg, num_sets, line_size;
@@ -22729,9 +22755,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/kernel/setup.c linux-3.14.22/arch/arm/kern
/* PIPT caches never alias. */
if (icache_is_pipt())
return 0;
-diff -Nur linux-3.14.22.orig/arch/arm/kernel/topology.c linux-3.14.22/arch/arm/kernel/topology.c
---- linux-3.14.22.orig/arch/arm/kernel/topology.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/kernel/topology.c 2014-10-22 14:55:49.902220001 -0500
+diff -Nur linux-3.14.14/arch/arm/kernel/topology.c linux-imx6-3.14/arch/arm/kernel/topology.c
+--- linux-3.14.14/arch/arm/kernel/topology.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/kernel/topology.c 2014-12-08 00:31:51.188418001 -0600
@@ -267,6 +267,33 @@
}
@@ -22766,9 +22792,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/kernel/topology.c linux-3.14.22/arch/arm/k
* init_cpu_topology is called at boot when only one cpu is running
* which prevent simultaneous write access to cpu_topology array
*/
-diff -Nur linux-3.14.22.orig/arch/arm/lib/bitops.h linux-3.14.22/arch/arm/lib/bitops.h
---- linux-3.14.22.orig/arch/arm/lib/bitops.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/lib/bitops.h 2014-10-22 14:55:49.902220001 -0500
+diff -Nur linux-3.14.14/arch/arm/lib/bitops.h linux-imx6-3.14/arch/arm/lib/bitops.h
+--- linux-3.14.14/arch/arm/lib/bitops.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/lib/bitops.h 2014-12-08 00:31:51.192418001 -0600
@@ -37,6 +37,11 @@
add r1, r1, r0, lsl #2 @ Get word offset
mov r3, r2, lsl r3 @ create mask
@@ -22781,9 +22807,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/lib/bitops.h linux-3.14.22/arch/arm/lib/bi
1: ldrex r2, [r1]
ands r0, r2, r3 @ save old value of bit
\instr r2, r2, r3 @ toggle bit
-diff -Nur linux-3.14.22.orig/arch/arm/mach-berlin/berlin.c linux-3.14.22/arch/arm/mach-berlin/berlin.c
---- linux-3.14.22.orig/arch/arm/mach-berlin/berlin.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-berlin/berlin.c 2014-10-22 14:55:49.902220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-berlin/berlin.c linux-imx6-3.14/arch/arm/mach-berlin/berlin.c
+--- linux-3.14.14/arch/arm/mach-berlin/berlin.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-berlin/berlin.c 2014-12-08 00:31:51.204418001 -0600
@@ -24,7 +24,7 @@
* with DT probing for L2CCs, berlin_init_machine can be removed.
* Note: 88DE3005 (Armada 1500-mini) uses pl310 l2cc
@@ -22793,9 +22819,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-berlin/berlin.c linux-3.14.22/arch/ar
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
-diff -Nur linux-3.14.22.orig/arch/arm/mach-cns3xxx/core.c linux-3.14.22/arch/arm/mach-cns3xxx/core.c
---- linux-3.14.22.orig/arch/arm/mach-cns3xxx/core.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-cns3xxx/core.c 2014-10-22 14:55:49.902220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-cns3xxx/core.c linux-imx6-3.14/arch/arm/mach-cns3xxx/core.c
+--- linux-3.14.14/arch/arm/mach-cns3xxx/core.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-cns3xxx/core.c 2014-12-08 00:31:51.204418001 -0600
@@ -240,9 +240,9 @@
*
* 1 cycle of latency for setup, read and write accesses
@@ -22824,9 +22850,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-cns3xxx/core.c linux-3.14.22/arch/arm
}
#endif /* CONFIG_CACHE_L2X0 */
-diff -Nur linux-3.14.22.orig/arch/arm/mach-exynos/common.c linux-3.14.22/arch/arm/mach-exynos/common.c
---- linux-3.14.22.orig/arch/arm/mach-exynos/common.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-exynos/common.c 2014-10-22 14:55:49.902220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-exynos/common.c linux-imx6-3.14/arch/arm/mach-exynos/common.c
+--- linux-3.14.14/arch/arm/mach-exynos/common.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-exynos/common.c 2014-12-08 00:31:51.212418001 -0600
@@ -45,9 +45,6 @@
#include "common.h"
#include "regs-pmu.h"
@@ -22846,9 +22872,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-exynos/common.c linux-3.14.22/arch/ar
if (ret)
return ret;
-diff -Nur linux-3.14.22.orig/arch/arm/mach-highbank/highbank.c linux-3.14.22/arch/arm/mach-highbank/highbank.c
---- linux-3.14.22.orig/arch/arm/mach-highbank/highbank.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-highbank/highbank.c 2014-10-22 14:55:49.902220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-highbank/highbank.c linux-imx6-3.14/arch/arm/mach-highbank/highbank.c
+--- linux-3.14.14/arch/arm/mach-highbank/highbank.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-highbank/highbank.c 2014-12-08 00:31:51.216418001 -0600
@@ -20,7 +20,7 @@
#include <linux/input.h>
#include <linux/io.h>
@@ -22891,9 +22917,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-highbank/highbank.c linux-3.14.22/arc
}
}
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/anatop.c linux-3.14.22/arch/arm/mach-imx/anatop.c
---- linux-3.14.22.orig/arch/arm/mach-imx/anatop.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-imx/anatop.c 2014-10-22 14:55:49.906220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/anatop.c linux-imx6-3.14/arch/arm/mach-imx/anatop.c
+--- linux-3.14.14/arch/arm/mach-imx/anatop.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-imx/anatop.c 2014-12-08 00:31:51.220418001 -0600
@@ -9,6 +9,7 @@
* http://www.gnu.org/copyleft/gpl.html
*/
@@ -22958,9 +22984,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/anatop.c linux-3.14.22/arch/arm/m
default:
revision = IMX_CHIP_REVISION_UNKNOWN;
}
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/busfreq_ddr3.c linux-3.14.22/arch/arm/mach-imx/busfreq_ddr3.c
---- linux-3.14.22.orig/arch/arm/mach-imx/busfreq_ddr3.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/mach-imx/busfreq_ddr3.c 2014-10-22 14:55:49.906220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/busfreq_ddr3.c linux-imx6-3.14/arch/arm/mach-imx/busfreq_ddr3.c
+--- linux-3.14.14/arch/arm/mach-imx/busfreq_ddr3.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/mach-imx/busfreq_ddr3.c 2014-12-08 00:31:51.220418001 -0600
@@ -0,0 +1,471 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -23433,9 +23459,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/busfreq_ddr3.c linux-3.14.22/arch
+
+ return 0;
+}
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/busfreq-imx6.c linux-3.14.22/arch/arm/mach-imx/busfreq-imx6.c
---- linux-3.14.22.orig/arch/arm/mach-imx/busfreq-imx6.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/mach-imx/busfreq-imx6.c 2014-10-22 14:55:49.906220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/busfreq-imx6.c linux-imx6-3.14/arch/arm/mach-imx/busfreq-imx6.c
+--- linux-3.14.14/arch/arm/mach-imx/busfreq-imx6.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/mach-imx/busfreq-imx6.c 2014-12-08 00:31:51.220418001 -0600
@@ -0,0 +1,952 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -24389,9 +24415,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/busfreq-imx6.c linux-3.14.22/arch
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("BusFreq driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/busfreq_lpddr2.c linux-3.14.22/arch/arm/mach-imx/busfreq_lpddr2.c
---- linux-3.14.22.orig/arch/arm/mach-imx/busfreq_lpddr2.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/mach-imx/busfreq_lpddr2.c 2014-10-22 14:55:49.906220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/busfreq_lpddr2.c linux-imx6-3.14/arch/arm/mach-imx/busfreq_lpddr2.c
+--- linux-3.14.14/arch/arm/mach-imx/busfreq_lpddr2.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/mach-imx/busfreq_lpddr2.c 2014-12-08 00:31:51.220418001 -0600
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -24576,9 +24602,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/busfreq_lpddr2.c linux-3.14.22/ar
+
+ return 0;
+}
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/clk.h linux-3.14.22/arch/arm/mach-imx/clk.h
---- linux-3.14.22.orig/arch/arm/mach-imx/clk.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-imx/clk.h 2014-10-22 14:55:49.906220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/clk.h linux-imx6-3.14/arch/arm/mach-imx/clk.h
+--- linux-3.14.14/arch/arm/mach-imx/clk.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-imx/clk.h 2014-12-08 00:31:51.220418001 -0600
@@ -23,7 +23,8 @@
};
@@ -24589,9 +24615,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/clk.h linux-3.14.22/arch/arm/mach
struct clk *clk_register_gate2(struct device *dev, const char *name,
const char *parent_name, unsigned long flags,
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/clk-imx6q.c linux-3.14.22/arch/arm/mach-imx/clk-imx6q.c
---- linux-3.14.22.orig/arch/arm/mach-imx/clk-imx6q.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-imx/clk-imx6q.c 2014-10-22 14:55:49.906220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/clk-imx6q.c linux-imx6-3.14/arch/arm/mach-imx/clk-imx6q.c
+--- linux-3.14.14/arch/arm/mach-imx/clk-imx6q.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-imx/clk-imx6q.c 2014-12-08 00:31:51.220418001 -0600
@@ -1,5 +1,5 @@
/*
- * Copyright 2011-2013 Freescale Semiconductor, Inc.
@@ -25101,9 +25127,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/clk-imx6q.c linux-3.14.22/arch/ar
/* Set initial power mode */
imx6q_set_lpm(WAIT_CLOCKED);
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/clk-imx6sl.c linux-3.14.22/arch/arm/mach-imx/clk-imx6sl.c
---- linux-3.14.22.orig/arch/arm/mach-imx/clk-imx6sl.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-imx/clk-imx6sl.c 2014-10-22 14:55:49.906220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/clk-imx6sl.c linux-imx6-3.14/arch/arm/mach-imx/clk-imx6sl.c
+--- linux-3.14.14/arch/arm/mach-imx/clk-imx6sl.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-imx/clk-imx6sl.c 2014-12-08 00:31:51.220418001 -0600
@@ -7,9 +7,29 @@
*
*/
@@ -25425,9 +25451,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/clk-imx6sl.c linux-3.14.22/arch/a
np = of_find_compatible_node(NULL, NULL, "fsl,imx6sl-gpt");
base = of_iomap(np, 0);
WARN_ON(!base);
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/clk-pfd.c linux-3.14.22/arch/arm/mach-imx/clk-pfd.c
---- linux-3.14.22.orig/arch/arm/mach-imx/clk-pfd.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-imx/clk-pfd.c 2014-10-22 14:55:49.906220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/clk-pfd.c linux-imx6-3.14/arch/arm/mach-imx/clk-pfd.c
+--- linux-3.14.14/arch/arm/mach-imx/clk-pfd.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-imx/clk-pfd.c 2014-12-08 00:31:51.220418001 -0600
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 Freescale Semiconductor, Inc.
@@ -25506,9 +25532,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/clk-pfd.c linux-3.14.22/arch/arm/
tmp = tmp * 18 + rate / 2;
do_div(tmp, rate);
frac = tmp;
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/clk-pllv3.c linux-3.14.22/arch/arm/mach-imx/clk-pllv3.c
---- linux-3.14.22.orig/arch/arm/mach-imx/clk-pllv3.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-imx/clk-pllv3.c 2014-10-22 14:55:49.906220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/clk-pllv3.c linux-imx6-3.14/arch/arm/mach-imx/clk-pllv3.c
+--- linux-3.14.14/arch/arm/mach-imx/clk-pllv3.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-imx/clk-pllv3.c 2014-12-08 00:31:51.220418001 -0600
@@ -26,12 +26,15 @@
#define BM_PLL_ENABLE (0x1 << 13)
#define BM_PLL_BYPASS (0x1 << 16)
@@ -25877,9 +25903,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/clk-pllv3.c linux-3.14.22/arch/ar
init.name = name;
init.ops = ops;
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/common.h linux-3.14.22/arch/arm/mach-imx/common.h
---- linux-3.14.22.orig/arch/arm/mach-imx/common.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-imx/common.h 2014-10-22 14:55:49.906220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/common.h linux-imx6-3.14/arch/arm/mach-imx/common.h
+--- linux-3.14.14/arch/arm/mach-imx/common.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-imx/common.h 2014-12-08 00:31:51.220418001 -0600
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -25934,9 +25960,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/common.h linux-3.14.22/arch/arm/m
#ifdef CONFIG_PM
void imx5_pm_init(void);
#else
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/cpuidle.h linux-3.14.22/arch/arm/mach-imx/cpuidle.h
---- linux-3.14.22.orig/arch/arm/mach-imx/cpuidle.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-imx/cpuidle.h 2014-10-22 14:55:49.906220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/cpuidle.h linux-imx6-3.14/arch/arm/mach-imx/cpuidle.h
+--- linux-3.14.14/arch/arm/mach-imx/cpuidle.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-imx/cpuidle.h 2014-12-08 00:31:51.220418001 -0600
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 Freescale Semiconductor, Inc.
@@ -25961,9 +25987,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/cpuidle.h linux-3.14.22/arch/arm/
+ return 0;
+}
#endif
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/cpuidle-imx6q.c linux-3.14.22/arch/arm/mach-imx/cpuidle-imx6q.c
---- linux-3.14.22.orig/arch/arm/mach-imx/cpuidle-imx6q.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-imx/cpuidle-imx6q.c 2014-10-22 14:55:49.906220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/cpuidle-imx6q.c linux-imx6-3.14/arch/arm/mach-imx/cpuidle-imx6q.c
+--- linux-3.14.14/arch/arm/mach-imx/cpuidle-imx6q.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-imx/cpuidle-imx6q.c 2014-12-08 00:31:51.220418001 -0600
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 Freescale Semiconductor, Inc.
@@ -25982,9 +26008,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/cpuidle-imx6q.c linux-3.14.22/arc
return cpuidle_register(&imx6q_cpuidle_driver, NULL);
}
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/cpuidle-imx6sl.c linux-3.14.22/arch/arm/mach-imx/cpuidle-imx6sl.c
---- linux-3.14.22.orig/arch/arm/mach-imx/cpuidle-imx6sl.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/mach-imx/cpuidle-imx6sl.c 2014-10-22 14:55:49.906220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/cpuidle-imx6sl.c linux-imx6-3.14/arch/arm/mach-imx/cpuidle-imx6sl.c
+--- linux-3.14.14/arch/arm/mach-imx/cpuidle-imx6sl.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/mach-imx/cpuidle-imx6sl.c 2014-12-08 00:31:51.220418001 -0600
@@ -0,0 +1,149 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc.
@@ -26135,9 +26161,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/cpuidle-imx6sl.c linux-3.14.22/ar
+
+ return cpuidle_register(&imx6sl_cpuidle_driver, NULL);
+}
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/ddr3_freq_imx6.S linux-3.14.22/arch/arm/mach-imx/ddr3_freq_imx6.S
---- linux-3.14.22.orig/arch/arm/mach-imx/ddr3_freq_imx6.S 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/mach-imx/ddr3_freq_imx6.S 2014-10-22 14:55:49.906220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/ddr3_freq_imx6.S linux-imx6-3.14/arch/arm/mach-imx/ddr3_freq_imx6.S
+--- linux-3.14.14/arch/arm/mach-imx/ddr3_freq_imx6.S 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/mach-imx/ddr3_freq_imx6.S 2014-12-08 00:31:51.220418001 -0600
@@ -0,0 +1,893 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -27032,9 +27058,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/ddr3_freq_imx6.S linux-3.14.22/ar
+ENTRY(mx6_do_ddr_freq_change)
+ .word mx6_ddr3_freq_change
+ .size mx6_ddr3_freq_change, . - mx6_ddr3_freq_change
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/gpc.c linux-3.14.22/arch/arm/mach-imx/gpc.c
---- linux-3.14.22.orig/arch/arm/mach-imx/gpc.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-imx/gpc.c 2014-10-22 14:55:49.906220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/gpc.c linux-imx6-3.14/arch/arm/mach-imx/gpc.c
+--- linux-3.14.14/arch/arm/mach-imx/gpc.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-imx/gpc.c 2014-12-08 00:31:51.224418001 -0600
@@ -10,30 +10,69 @@
* http://www.gnu.org/copyleft/gpl.html
*/
@@ -27419,9 +27445,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/gpc.c linux-3.14.22/arch/arm/mach
+MODULE_AUTHOR("Anson Huang <b20788@freescale.com>");
+MODULE_DESCRIPTION("Freescale i.MX GPC driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/hardware.h linux-3.14.22/arch/arm/mach-imx/hardware.h
---- linux-3.14.22.orig/arch/arm/mach-imx/hardware.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-imx/hardware.h 2014-10-22 14:55:49.910220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/hardware.h linux-imx6-3.14/arch/arm/mach-imx/hardware.h
+--- linux-3.14.14/arch/arm/mach-imx/hardware.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-imx/hardware.h 2014-12-08 00:31:51.224418001 -0600
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -27439,9 +27465,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/hardware.h linux-3.14.22/arch/arm
#include <asm/sizes.h>
#define addr_in_module(addr, mod) \
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/headsmp.S linux-3.14.22/arch/arm/mach-imx/headsmp.S
---- linux-3.14.22.orig/arch/arm/mach-imx/headsmp.S 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-imx/headsmp.S 2014-10-22 14:55:49.910220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/headsmp.S linux-imx6-3.14/arch/arm/mach-imx/headsmp.S
+--- linux-3.14.14/arch/arm/mach-imx/headsmp.S 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-imx/headsmp.S 2014-12-08 00:31:51.224418001 -0600
@@ -12,8 +12,6 @@
#include <linux/linkage.h>
@@ -27489,9 +27515,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/headsmp.S linux-3.14.22/arch/arm/
- b cpu_resume
-ENDPROC(v7_cpu_resume)
-#endif
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/imx6sl_wfi.S linux-3.14.22/arch/arm/mach-imx/imx6sl_wfi.S
---- linux-3.14.22.orig/arch/arm/mach-imx/imx6sl_wfi.S 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/mach-imx/imx6sl_wfi.S 2014-10-22 14:55:49.910220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/imx6sl_wfi.S linux-imx6-3.14/arch/arm/mach-imx/imx6sl_wfi.S
+--- linux-3.14.14/arch/arm/mach-imx/imx6sl_wfi.S 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/mach-imx/imx6sl_wfi.S 2014-12-08 00:31:51.224418001 -0600
@@ -0,0 +1,639 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -28132,9 +28158,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/imx6sl_wfi.S linux-3.14.22/arch/a
+
+ /* Restore registers */
+ mov pc, lr
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/Kconfig linux-3.14.22/arch/arm/mach-imx/Kconfig
---- linux-3.14.22.orig/arch/arm/mach-imx/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-imx/Kconfig 2014-10-22 14:55:49.910220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/Kconfig linux-imx6-3.14/arch/arm/mach-imx/Kconfig
+--- linux-3.14.14/arch/arm/mach-imx/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-imx/Kconfig 2014-12-08 00:31:51.220418001 -0600
@@ -1,5 +1,6 @@
config ARCH_MXC
bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7
@@ -28181,9 +28207,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/Kconfig linux-3.14.22/arch/arm/ma
help
This enables support for Freescale i.MX6 Quad processor.
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/lpddr2_freq_imx6.S linux-3.14.22/arch/arm/mach-imx/lpddr2_freq_imx6.S
---- linux-3.14.22.orig/arch/arm/mach-imx/lpddr2_freq_imx6.S 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/mach-imx/lpddr2_freq_imx6.S 2014-10-22 14:55:49.910220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/lpddr2_freq_imx6.S linux-imx6-3.14/arch/arm/mach-imx/lpddr2_freq_imx6.S
+--- linux-3.14.14/arch/arm/mach-imx/lpddr2_freq_imx6.S 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/mach-imx/lpddr2_freq_imx6.S 2014-12-08 00:31:51.228418001 -0600
@@ -0,0 +1,484 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -28669,9 +28695,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/lpddr2_freq_imx6.S linux-3.14.22/
+ENTRY(mx6_lpddr2_do_iram)
+ .word mx6_lpddr2_freq_change
+ .size mx6_lpddr2_freq_change, . - mx6_lpddr2_freq_change
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/mach-imx6q.c linux-3.14.22/arch/arm/mach-imx/mach-imx6q.c
---- linux-3.14.22.orig/arch/arm/mach-imx/mach-imx6q.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-imx/mach-imx6q.c 2014-10-22 14:55:49.910220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/mach-imx6q.c linux-imx6-3.14/arch/arm/mach-imx/mach-imx6q.c
+--- linux-3.14.14/arch/arm/mach-imx/mach-imx6q.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-imx/mach-imx6q.c 2014-12-08 00:31:51.228418001 -0600
@@ -1,5 +1,5 @@
/*
- * Copyright 2011-2013 Freescale Semiconductor, Inc.
@@ -28959,9 +28985,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/mach-imx6q.c linux-3.14.22/arch/a
.smp = smp_ops(imx_smp_ops),
.map_io = imx6q_map_io,
.init_irq = imx6q_init_irq,
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/mach-imx6sl.c linux-3.14.22/arch/arm/mach-imx/mach-imx6sl.c
---- linux-3.14.22.orig/arch/arm/mach-imx/mach-imx6sl.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-imx/mach-imx6sl.c 2014-10-22 14:55:49.910220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/mach-imx6sl.c linux-imx6-3.14/arch/arm/mach-imx/mach-imx6sl.c
+--- linux-3.14.14/arch/arm/mach-imx/mach-imx6sl.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-imx/mach-imx6sl.c 2014-12-08 00:31:51.228418001 -0600
@@ -17,8 +17,9 @@
#include <asm/mach/map.h>
@@ -29001,9 +29027,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/mach-imx6sl.c linux-3.14.22/arch/
}
static void __init imx6sl_init_irq(void)
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/mach-vf610.c linux-3.14.22/arch/arm/mach-imx/mach-vf610.c
---- linux-3.14.22.orig/arch/arm/mach-imx/mach-vf610.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-imx/mach-vf610.c 2014-10-22 14:55:49.910220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/mach-vf610.c linux-imx6-3.14/arch/arm/mach-imx/mach-vf610.c
+--- linux-3.14.14/arch/arm/mach-imx/mach-vf610.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-imx/mach-vf610.c 2014-12-08 00:31:51.228418001 -0600
@@ -22,7 +22,7 @@
static void __init vf610_init_irq(void)
@@ -29013,9 +29039,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/mach-vf610.c linux-3.14.22/arch/a
irqchip_init();
}
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/Makefile linux-3.14.22/arch/arm/mach-imx/Makefile
---- linux-3.14.22.orig/arch/arm/mach-imx/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-imx/Makefile 2014-10-22 14:55:49.910220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/Makefile linux-imx6-3.14/arch/arm/mach-imx/Makefile
+--- linux-3.14.14/arch/arm/mach-imx/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-imx/Makefile 2014-12-08 00:31:51.220418001 -0600
@@ -30,6 +30,7 @@
ifeq ($(CONFIG_CPU_IDLE),y)
obj-$(CONFIG_SOC_IMX5) += cpuidle-imx5.o
@@ -29046,9 +29072,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/Makefile linux-3.14.22/arch/arm/m
# i.MX5 based machines
obj-$(CONFIG_MACH_MX51_BABBAGE) += mach-mx51_babbage.o
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/mx6.h linux-3.14.22/arch/arm/mach-imx/mx6.h
---- linux-3.14.22.orig/arch/arm/mach-imx/mx6.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/mach-imx/mx6.h 2014-10-22 14:55:49.910220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/mx6.h linux-imx6-3.14/arch/arm/mach-imx/mx6.h
+--- linux-3.14.14/arch/arm/mach-imx/mx6.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/mach-imx/mx6.h 2014-12-08 00:31:51.232418001 -0600
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -29085,9 +29111,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/mx6.h linux-3.14.22/arch/arm/mach
+
+#define MX6_SUSPEND_IRAM_SIZE 0x1000
+#endif
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/mxc.h linux-3.14.22/arch/arm/mach-imx/mxc.h
---- linux-3.14.22.orig/arch/arm/mach-imx/mxc.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-imx/mxc.h 2014-10-22 14:55:49.910220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/mxc.h linux-imx6-3.14/arch/arm/mach-imx/mxc.h
+--- linux-3.14.14/arch/arm/mach-imx/mxc.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-imx/mxc.h 2014-12-08 00:31:51.232418001 -0600
@@ -42,6 +42,8 @@
#define IMX_CHIP_REVISION_1_1 0x11
#define IMX_CHIP_REVISION_1_2 0x12
@@ -29105,9 +29131,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/mxc.h linux-3.14.22/arch/arm/mach
#define cpu_is_mx3() (cpu_is_mx31() || cpu_is_mx35())
#define cpu_is_mx2() (cpu_is_mx21() || cpu_is_mx27())
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/pm-imx6.c linux-3.14.22/arch/arm/mach-imx/pm-imx6.c
---- linux-3.14.22.orig/arch/arm/mach-imx/pm-imx6.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/mach-imx/pm-imx6.c 2014-10-22 14:55:49.910220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/pm-imx6.c linux-imx6-3.14/arch/arm/mach-imx/pm-imx6.c
+--- linux-3.14.14/arch/arm/mach-imx/pm-imx6.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/mach-imx/pm-imx6.c 2014-12-08 00:31:51.232418001 -0600
@@ -0,0 +1,580 @@
+/*
+ * Copyright 2011-2014 Freescale Semiconductor, Inc.
@@ -29689,9 +29715,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/pm-imx6.c linux-3.14.22/arch/arm/
+{
+ imx6_pm_common_init(NULL);
+}
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/pm-imx6q.c linux-3.14.22/arch/arm/mach-imx/pm-imx6q.c
---- linux-3.14.22.orig/arch/arm/mach-imx/pm-imx6q.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-imx/pm-imx6q.c 1969-12-31 18:00:00.000000000 -0600
+diff -Nur linux-3.14.14/arch/arm/mach-imx/pm-imx6q.c linux-imx6-3.14/arch/arm/mach-imx/pm-imx6q.c
+--- linux-3.14.14/arch/arm/mach-imx/pm-imx6q.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-imx/pm-imx6q.c 1969-12-31 18:00:00.000000000 -0600
@@ -1,241 +0,0 @@
-/*
- * Copyright 2011-2013 Freescale Semiconductor, Inc.
@@ -29934,9 +29960,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/pm-imx6q.c linux-3.14.22/arch/arm
-
- suspend_set_ops(&imx6q_pm_ops);
-}
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/suspend-imx6.S linux-3.14.22/arch/arm/mach-imx/suspend-imx6.S
---- linux-3.14.22.orig/arch/arm/mach-imx/suspend-imx6.S 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/mach-imx/suspend-imx6.S 2014-10-22 14:55:49.922220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/suspend-imx6.S linux-imx6-3.14/arch/arm/mach-imx/suspend-imx6.S
+--- linux-3.14.14/arch/arm/mach-imx/suspend-imx6.S 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/mach-imx/suspend-imx6.S 2014-12-08 00:31:51.232418001 -0600
@@ -0,0 +1,306 @@
+/*
+ * Copyright 2014 Freescale Semiconductor, Inc.
@@ -30244,9 +30270,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/suspend-imx6.S linux-3.14.22/arch
+#endif
+ b cpu_resume
+ENDPROC(v7_cpu_resume)
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/system.c linux-3.14.22/arch/arm/mach-imx/system.c
---- linux-3.14.22.orig/arch/arm/mach-imx/system.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-imx/system.c 2014-10-22 14:55:49.922220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/system.c linux-imx6-3.14/arch/arm/mach-imx/system.c
+--- linux-3.14.14/arch/arm/mach-imx/system.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-imx/system.c 2014-12-08 00:31:51.232418001 -0600
@@ -34,6 +34,7 @@
static void __iomem *wdog_base;
@@ -30328,9 +30354,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/system.c linux-3.14.22/arch/arm/m
+ l2x0_of_init(0, ~0);
}
#endif
-diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/time.c linux-3.14.22/arch/arm/mach-imx/time.c
---- linux-3.14.22.orig/arch/arm/mach-imx/time.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-imx/time.c 2014-10-22 14:55:49.926220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-imx/time.c linux-imx6-3.14/arch/arm/mach-imx/time.c
+--- linux-3.14.14/arch/arm/mach-imx/time.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-imx/time.c 2014-12-08 00:31:51.232418001 -0600
@@ -60,7 +60,11 @@
#define V2_TCTL_WAITEN (1 << 3) /* Wait enable mode */
#define V2_TCTL_CLK_IPG (1 << 6)
@@ -30394,9 +30420,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-imx/time.c linux-3.14.22/arch/arm/mac
__raw_writel(tctl_val, timer_base + MXC_TCTL);
-diff -Nur linux-3.14.22.orig/arch/arm/mach-nomadik/cpu-8815.c linux-3.14.22/arch/arm/mach-nomadik/cpu-8815.c
---- linux-3.14.22.orig/arch/arm/mach-nomadik/cpu-8815.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-nomadik/cpu-8815.c 2014-10-22 14:55:49.926220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-nomadik/cpu-8815.c linux-imx6-3.14/arch/arm/mach-nomadik/cpu-8815.c
+--- linux-3.14.14/arch/arm/mach-nomadik/cpu-8815.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-nomadik/cpu-8815.c 2014-12-08 00:31:51.256418001 -0600
@@ -147,7 +147,7 @@
{
#ifdef CONFIG_CACHE_L2X0
@@ -30406,9 +30432,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-nomadik/cpu-8815.c linux-3.14.22/arch
#endif
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
-diff -Nur linux-3.14.22.orig/arch/arm/mach-omap2/common.h linux-3.14.22/arch/arm/mach-omap2/common.h
---- linux-3.14.22.orig/arch/arm/mach-omap2/common.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-omap2/common.h 2014-10-22 14:55:49.926220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-omap2/common.h linux-imx6-3.14/arch/arm/mach-omap2/common.h
+--- linux-3.14.14/arch/arm/mach-omap2/common.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-omap2/common.h 2014-12-08 00:31:51.272418001 -0600
@@ -91,6 +91,7 @@
extern void omap3_secure_sync32k_timer_init(void);
extern void omap3_gptimer_timer_init(void);
@@ -30417,9 +30443,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-omap2/common.h linux-3.14.22/arch/arm
extern void omap5_realtime_timer_init(void);
void omap2420_init_early(void);
-diff -Nur linux-3.14.22.orig/arch/arm/mach-omap2/io.c linux-3.14.22/arch/arm/mach-omap2/io.c
---- linux-3.14.22.orig/arch/arm/mach-omap2/io.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-omap2/io.c 2014-10-22 14:55:49.926220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-omap2/io.c linux-imx6-3.14/arch/arm/mach-omap2/io.c
+--- linux-3.14.14/arch/arm/mach-omap2/io.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-omap2/io.c 2014-12-08 00:31:51.276418001 -0600
@@ -608,6 +608,7 @@
am43xx_clockdomains_init();
am43xx_hwmod_init();
@@ -30436,9 +30462,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-omap2/io.c linux-3.14.22/arch/arm/mac
omap_clk_soc_init = omap4xxx_dt_clk_init;
}
-diff -Nur linux-3.14.22.orig/arch/arm/mach-omap2/Kconfig linux-3.14.22/arch/arm/mach-omap2/Kconfig
---- linux-3.14.22.orig/arch/arm/mach-omap2/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-omap2/Kconfig 2014-10-22 14:55:49.926220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-omap2/Kconfig linux-imx6-3.14/arch/arm/mach-omap2/Kconfig
+--- linux-3.14.14/arch/arm/mach-omap2/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-omap2/Kconfig 2014-12-08 00:31:51.264418001 -0600
@@ -78,6 +78,7 @@
select MULTI_IRQ_HANDLER
select ARM_GIC
@@ -30447,9 +30473,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-omap2/Kconfig linux-3.14.22/arch/arm/
config SOC_DRA7XX
bool "TI DRA7XX"
-diff -Nur linux-3.14.22.orig/arch/arm/mach-omap2/omap4-common.c linux-3.14.22/arch/arm/mach-omap2/omap4-common.c
---- linux-3.14.22.orig/arch/arm/mach-omap2/omap4-common.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-omap2/omap4-common.c 2014-10-22 14:55:49.926220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-omap2/omap4-common.c linux-imx6-3.14/arch/arm/mach-omap2/omap4-common.c
+--- linux-3.14.14/arch/arm/mach-omap2/omap4-common.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-omap2/omap4-common.c 2014-12-08 00:31:51.280418001 -0600
@@ -166,75 +166,57 @@
return l2cache_base;
}
@@ -30560,9 +30586,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-omap2/omap4-common.c linux-3.14.22/ar
#endif
void __iomem *omap4_get_sar_ram_base(void)
-diff -Nur linux-3.14.22.orig/arch/arm/mach-omap2/omap-mpuss-lowpower.c linux-3.14.22/arch/arm/mach-omap2/omap-mpuss-lowpower.c
---- linux-3.14.22.orig/arch/arm/mach-omap2/omap-mpuss-lowpower.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-omap2/omap-mpuss-lowpower.c 2014-10-22 14:55:49.926220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-omap2/omap-mpuss-lowpower.c linux-imx6-3.14/arch/arm/mach-omap2/omap-mpuss-lowpower.c
+--- linux-3.14.14/arch/arm/mach-omap2/omap-mpuss-lowpower.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-omap2/omap-mpuss-lowpower.c 2014-12-08 00:31:51.280418001 -0600
@@ -187,19 +187,15 @@
* in every restore MPUSS OFF path.
*/
@@ -30589,9 +30615,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-omap2/omap-mpuss-lowpower.c linux-3.1
{}
#endif
-diff -Nur linux-3.14.22.orig/arch/arm/mach-prima2/l2x0.c linux-3.14.22/arch/arm/mach-prima2/l2x0.c
---- linux-3.14.22.orig/arch/arm/mach-prima2/l2x0.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-prima2/l2x0.c 2014-10-22 14:55:49.926220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-prima2/l2x0.c linux-imx6-3.14/arch/arm/mach-prima2/l2x0.c
+--- linux-3.14.14/arch/arm/mach-prima2/l2x0.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-prima2/l2x0.c 2014-12-08 00:31:51.296418001 -0600
@@ -8,43 +8,10 @@
#include <linux/init.h>
@@ -30637,9 +30663,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-prima2/l2x0.c linux-3.14.22/arch/arm/
+ return l2x0_of_init(0, ~0);
}
early_initcall(sirfsoc_l2x0_init);
-diff -Nur linux-3.14.22.orig/arch/arm/mach-prima2/pm.c linux-3.14.22/arch/arm/mach-prima2/pm.c
---- linux-3.14.22.orig/arch/arm/mach-prima2/pm.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-prima2/pm.c 2014-10-22 14:55:49.926220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-prima2/pm.c linux-imx6-3.14/arch/arm/mach-prima2/pm.c
+--- linux-3.14.14/arch/arm/mach-prima2/pm.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-prima2/pm.c 2014-12-08 00:31:51.296418001 -0600
@@ -71,7 +71,6 @@
case PM_SUSPEND_MEM:
sirfsoc_pre_suspend_power_off();
@@ -30648,9 +30674,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-prima2/pm.c linux-3.14.22/arch/arm/ma
outer_disable();
/* go zzz */
cpu_suspend(0, sirfsoc_finish_suspend);
-diff -Nur linux-3.14.22.orig/arch/arm/mach-realview/realview_eb.c linux-3.14.22/arch/arm/mach-realview/realview_eb.c
---- linux-3.14.22.orig/arch/arm/mach-realview/realview_eb.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-realview/realview_eb.c 2014-10-22 14:55:49.926220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-realview/realview_eb.c linux-imx6-3.14/arch/arm/mach-realview/realview_eb.c
+--- linux-3.14.14/arch/arm/mach-realview/realview_eb.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-realview/realview_eb.c 2014-12-08 00:31:51.348418001 -0600
@@ -442,8 +442,13 @@
realview_eb11mp_fixup();
@@ -30667,9 +30693,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-realview/realview_eb.c linux-3.14.22/
l2x0_init(__io_address(REALVIEW_EB11MP_L220_BASE), 0x00790000, 0xfe000fff);
#endif
platform_device_register(&pmu_device);
-diff -Nur linux-3.14.22.orig/arch/arm/mach-realview/realview_pb1176.c linux-3.14.22/arch/arm/mach-realview/realview_pb1176.c
---- linux-3.14.22.orig/arch/arm/mach-realview/realview_pb1176.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-realview/realview_pb1176.c 2014-10-22 14:55:49.926220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-realview/realview_pb1176.c linux-imx6-3.14/arch/arm/mach-realview/realview_pb1176.c
+--- linux-3.14.14/arch/arm/mach-realview/realview_pb1176.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-realview/realview_pb1176.c 2014-12-08 00:31:51.348418001 -0600
@@ -355,7 +355,13 @@
int i;
@@ -30685,9 +30711,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-realview/realview_pb1176.c linux-3.14
l2x0_init(__io_address(REALVIEW_PB1176_L220_BASE), 0x00730000, 0xfe000fff);
#endif
-diff -Nur linux-3.14.22.orig/arch/arm/mach-realview/realview_pb11mp.c linux-3.14.22/arch/arm/mach-realview/realview_pb11mp.c
---- linux-3.14.22.orig/arch/arm/mach-realview/realview_pb11mp.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-realview/realview_pb11mp.c 2014-10-22 14:55:49.926220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-realview/realview_pb11mp.c linux-imx6-3.14/arch/arm/mach-realview/realview_pb11mp.c
+--- linux-3.14.14/arch/arm/mach-realview/realview_pb11mp.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-realview/realview_pb11mp.c 2014-12-08 00:31:51.348418001 -0600
@@ -337,8 +337,13 @@
int i;
@@ -30704,9 +30730,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-realview/realview_pb11mp.c linux-3.14
l2x0_init(__io_address(REALVIEW_TC11MP_L220_BASE), 0x00790000, 0xfe000fff);
#endif
-diff -Nur linux-3.14.22.orig/arch/arm/mach-realview/realview_pbx.c linux-3.14.22/arch/arm/mach-realview/realview_pbx.c
---- linux-3.14.22.orig/arch/arm/mach-realview/realview_pbx.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-realview/realview_pbx.c 2014-10-22 14:55:49.926220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-realview/realview_pbx.c linux-imx6-3.14/arch/arm/mach-realview/realview_pbx.c
+--- linux-3.14.14/arch/arm/mach-realview/realview_pbx.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-realview/realview_pbx.c 2014-12-08 00:31:51.348418001 -0600
@@ -370,8 +370,8 @@
__io_address(REALVIEW_PBX_TILE_L220_BASE);
@@ -30718,9 +30744,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-realview/realview_pbx.c linux-3.14.22
/* 16KB way size, 8-way associativity, parity disabled
* Bits: .. 0 0 0 0 1 00 1 0 1 001 0 000 0 .... .... .... */
-diff -Nur linux-3.14.22.orig/arch/arm/mach-rockchip/rockchip.c linux-3.14.22/arch/arm/mach-rockchip/rockchip.c
---- linux-3.14.22.orig/arch/arm/mach-rockchip/rockchip.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-rockchip/rockchip.c 2014-10-22 14:55:49.926220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-rockchip/rockchip.c linux-imx6-3.14/arch/arm/mach-rockchip/rockchip.c
+--- linux-3.14.14/arch/arm/mach-rockchip/rockchip.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-rockchip/rockchip.c 2014-12-08 00:31:51.348418001 -0600
@@ -25,7 +25,7 @@
static void __init rockchip_dt_init(void)
@@ -30730,9 +30756,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-rockchip/rockchip.c linux-3.14.22/arc
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
-diff -Nur linux-3.14.22.orig/arch/arm/mach-shmobile/board-armadillo800eva.c linux-3.14.22/arch/arm/mach-shmobile/board-armadillo800eva.c
---- linux-3.14.22.orig/arch/arm/mach-shmobile/board-armadillo800eva.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-shmobile/board-armadillo800eva.c 2014-10-22 14:55:49.926220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-shmobile/board-armadillo800eva.c linux-imx6-3.14/arch/arm/mach-shmobile/board-armadillo800eva.c
+--- linux-3.14.14/arch/arm/mach-shmobile/board-armadillo800eva.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-shmobile/board-armadillo800eva.c 2014-12-08 00:31:51.372418001 -0600
@@ -1270,8 +1270,8 @@
@@ -30744,9 +30770,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-shmobile/board-armadillo800eva.c linu
#endif
i2c_register_board_info(0, i2c0_devices, ARRAY_SIZE(i2c0_devices));
-diff -Nur linux-3.14.22.orig/arch/arm/mach-shmobile/board-armadillo800eva-reference.c linux-3.14.22/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
---- linux-3.14.22.orig/arch/arm/mach-shmobile/board-armadillo800eva-reference.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-shmobile/board-armadillo800eva-reference.c 2014-10-22 14:55:49.926220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-shmobile/board-armadillo800eva-reference.c linux-imx6-3.14/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
+--- linux-3.14.14/arch/arm/mach-shmobile/board-armadillo800eva-reference.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-shmobile/board-armadillo800eva-reference.c 2014-12-08 00:31:51.372418001 -0600
@@ -164,8 +164,8 @@
r8a7740_meram_workaround();
@@ -30758,9 +30784,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-shmobile/board-armadillo800eva-refere
#endif
r8a7740_add_standard_devices_dt();
-diff -Nur linux-3.14.22.orig/arch/arm/mach-shmobile/board-kzm9g.c linux-3.14.22/arch/arm/mach-shmobile/board-kzm9g.c
---- linux-3.14.22.orig/arch/arm/mach-shmobile/board-kzm9g.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-shmobile/board-kzm9g.c 2014-10-22 14:55:49.926220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-shmobile/board-kzm9g.c linux-imx6-3.14/arch/arm/mach-shmobile/board-kzm9g.c
+--- linux-3.14.14/arch/arm/mach-shmobile/board-kzm9g.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-shmobile/board-kzm9g.c 2014-12-08 00:31:51.372418001 -0600
@@ -878,8 +878,8 @@
gpio_request_one(223, GPIOF_IN, NULL); /* IRQ8 */
@@ -30772,9 +30798,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-shmobile/board-kzm9g.c linux-3.14.22/
#endif
i2c_register_board_info(0, i2c0_devices, ARRAY_SIZE(i2c0_devices));
-diff -Nur linux-3.14.22.orig/arch/arm/mach-shmobile/board-kzm9g-reference.c linux-3.14.22/arch/arm/mach-shmobile/board-kzm9g-reference.c
---- linux-3.14.22.orig/arch/arm/mach-shmobile/board-kzm9g-reference.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-shmobile/board-kzm9g-reference.c 2014-10-22 14:55:49.926220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-shmobile/board-kzm9g-reference.c linux-imx6-3.14/arch/arm/mach-shmobile/board-kzm9g-reference.c
+--- linux-3.14.14/arch/arm/mach-shmobile/board-kzm9g-reference.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-shmobile/board-kzm9g-reference.c 2014-12-08 00:31:51.372418001 -0600
@@ -36,8 +36,8 @@
sh73a0_add_standard_devices_dt();
@@ -30786,9 +30812,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-shmobile/board-kzm9g-reference.c linu
#endif
}
-diff -Nur linux-3.14.22.orig/arch/arm/mach-shmobile/setup-r8a7778.c linux-3.14.22/arch/arm/mach-shmobile/setup-r8a7778.c
---- linux-3.14.22.orig/arch/arm/mach-shmobile/setup-r8a7778.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-shmobile/setup-r8a7778.c 2014-10-22 14:55:49.926220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-shmobile/setup-r8a7778.c linux-imx6-3.14/arch/arm/mach-shmobile/setup-r8a7778.c
+--- linux-3.14.14/arch/arm/mach-shmobile/setup-r8a7778.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-shmobile/setup-r8a7778.c 2014-12-08 00:31:51.376418001 -0600
@@ -298,10 +298,10 @@
void __iomem *base = ioremap_nocache(0xf0100000, 0x1000);
if (base) {
@@ -30802,9 +30828,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-shmobile/setup-r8a7778.c linux-3.14.2
}
#endif
-diff -Nur linux-3.14.22.orig/arch/arm/mach-shmobile/setup-r8a7779.c linux-3.14.22/arch/arm/mach-shmobile/setup-r8a7779.c
---- linux-3.14.22.orig/arch/arm/mach-shmobile/setup-r8a7779.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-shmobile/setup-r8a7779.c 2014-10-22 14:55:49.926220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-shmobile/setup-r8a7779.c linux-imx6-3.14/arch/arm/mach-shmobile/setup-r8a7779.c
+--- linux-3.14.14/arch/arm/mach-shmobile/setup-r8a7779.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-shmobile/setup-r8a7779.c 2014-12-08 00:31:51.376418001 -0600
@@ -700,8 +700,8 @@
void __init r8a7779_add_standard_devices(void)
{
@@ -30816,9 +30842,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-shmobile/setup-r8a7779.c linux-3.14.2
#endif
r8a7779_pm_init();
-diff -Nur linux-3.14.22.orig/arch/arm/mach-socfpga/socfpga.c linux-3.14.22/arch/arm/mach-socfpga/socfpga.c
---- linux-3.14.22.orig/arch/arm/mach-socfpga/socfpga.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-socfpga/socfpga.c 2014-10-22 14:55:49.926220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-socfpga/socfpga.c linux-imx6-3.14/arch/arm/mach-socfpga/socfpga.c
+--- linux-3.14.14/arch/arm/mach-socfpga/socfpga.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-socfpga/socfpga.c 2014-12-08 00:31:51.376418001 -0600
@@ -104,7 +104,7 @@
static void __init socfpga_cyclone5_init(void)
@@ -30828,9 +30854,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-socfpga/socfpga.c linux-3.14.22/arch/
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
socfpga_init_clocks();
}
-diff -Nur linux-3.14.22.orig/arch/arm/mach-spear/platsmp.c linux-3.14.22/arch/arm/mach-spear/platsmp.c
---- linux-3.14.22.orig/arch/arm/mach-spear/platsmp.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-spear/platsmp.c 2014-10-22 14:55:49.926220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-spear/platsmp.c linux-imx6-3.14/arch/arm/mach-spear/platsmp.c
+--- linux-3.14.14/arch/arm/mach-spear/platsmp.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-spear/platsmp.c 2014-12-08 00:31:51.376418001 -0600
@@ -20,6 +20,18 @@
#include <mach/spear.h>
#include "generic.h"
@@ -30871,9 +30897,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-spear/platsmp.c linux-3.14.22/arch/ar
timeout = jiffies + (1 * HZ);
while (time_before(jiffies, timeout)) {
-diff -Nur linux-3.14.22.orig/arch/arm/mach-spear/spear13xx.c linux-3.14.22/arch/arm/mach-spear/spear13xx.c
---- linux-3.14.22.orig/arch/arm/mach-spear/spear13xx.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-spear/spear13xx.c 2014-10-22 14:55:49.926220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-spear/spear13xx.c linux-imx6-3.14/arch/arm/mach-spear/spear13xx.c
+--- linux-3.14.14/arch/arm/mach-spear/spear13xx.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-spear/spear13xx.c 2014-12-08 00:31:51.380418001 -0600
@@ -38,15 +38,15 @@
if (!IS_ENABLED(CONFIG_CACHE_L2X0))
return;
@@ -30894,9 +30920,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-spear/spear13xx.c linux-3.14.22/arch/
}
/*
-diff -Nur linux-3.14.22.orig/arch/arm/mach-sti/board-dt.c linux-3.14.22/arch/arm/mach-sti/board-dt.c
---- linux-3.14.22.orig/arch/arm/mach-sti/board-dt.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-sti/board-dt.c 2014-10-22 14:55:49.926220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-sti/board-dt.c linux-imx6-3.14/arch/arm/mach-sti/board-dt.c
+--- linux-3.14.14/arch/arm/mach-sti/board-dt.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-sti/board-dt.c 2014-12-08 00:31:51.380418001 -0600
@@ -16,15 +16,9 @@
void __init stih41x_l2x0_init(void)
@@ -30916,9 +30942,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-sti/board-dt.c linux-3.14.22/arch/arm
}
static void __init stih41x_machine_init(void)
-diff -Nur linux-3.14.22.orig/arch/arm/mach-tegra/pm.h linux-3.14.22/arch/arm/mach-tegra/pm.h
---- linux-3.14.22.orig/arch/arm/mach-tegra/pm.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-tegra/pm.h 2014-10-22 14:55:49.926220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-tegra/pm.h linux-imx6-3.14/arch/arm/mach-tegra/pm.h
+--- linux-3.14.14/arch/arm/mach-tegra/pm.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-tegra/pm.h 2014-12-08 00:31:51.380418001 -0600
@@ -35,8 +35,6 @@
void tegra30_lp1_iram_hook(void);
void tegra30_sleep_core_init(void);
@@ -30928,9 +30954,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-tegra/pm.h linux-3.14.22/arch/arm/mac
void tegra_clear_cpu_in_lp2(void);
bool tegra_set_cpu_in_lp2(void);
-diff -Nur linux-3.14.22.orig/arch/arm/mach-tegra/reset-handler.S linux-3.14.22/arch/arm/mach-tegra/reset-handler.S
---- linux-3.14.22.orig/arch/arm/mach-tegra/reset-handler.S 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-tegra/reset-handler.S 2014-10-22 14:55:49.926220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-tegra/reset-handler.S linux-imx6-3.14/arch/arm/mach-tegra/reset-handler.S
+--- linux-3.14.14/arch/arm/mach-tegra/reset-handler.S 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-tegra/reset-handler.S 2014-12-08 00:31:51.380418001 -0600
@@ -19,7 +19,6 @@
#include <asm/cache.h>
@@ -30964,9 +30990,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-tegra/reset-handler.S linux-3.14.22/a
.align L1_CACHE_SHIFT
ENTRY(__tegra_cpu_reset_handler_start)
-diff -Nur linux-3.14.22.orig/arch/arm/mach-tegra/sleep.h linux-3.14.22/arch/arm/mach-tegra/sleep.h
---- linux-3.14.22.orig/arch/arm/mach-tegra/sleep.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-tegra/sleep.h 2014-10-22 14:55:49.926220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-tegra/sleep.h linux-imx6-3.14/arch/arm/mach-tegra/sleep.h
+--- linux-3.14.14/arch/arm/mach-tegra/sleep.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-tegra/sleep.h 2014-12-08 00:31:51.380418001 -0600
@@ -120,37 +120,6 @@
mov \tmp1, \tmp1, lsr #8
.endm
@@ -31005,9 +31031,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-tegra/sleep.h linux-3.14.22/arch/arm/
#else
void tegra_pen_lock(void);
void tegra_pen_unlock(void);
-diff -Nur linux-3.14.22.orig/arch/arm/mach-tegra/tegra.c linux-3.14.22/arch/arm/mach-tegra/tegra.c
---- linux-3.14.22.orig/arch/arm/mach-tegra/tegra.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-tegra/tegra.c 2014-10-22 14:55:49.930220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-tegra/tegra.c linux-imx6-3.14/arch/arm/mach-tegra/tegra.c
+--- linux-3.14.14/arch/arm/mach-tegra/tegra.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-tegra/tegra.c 2014-12-08 00:31:51.380418001 -0600
@@ -73,27 +73,7 @@
static void __init tegra_init_cache(void)
{
@@ -31037,9 +31063,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-tegra/tegra.c linux-3.14.22/arch/arm/
#endif
}
-diff -Nur linux-3.14.22.orig/arch/arm/mach-ux500/board-mop500-audio.c linux-3.14.22/arch/arm/mach-ux500/board-mop500-audio.c
---- linux-3.14.22.orig/arch/arm/mach-ux500/board-mop500-audio.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-ux500/board-mop500-audio.c 2014-10-22 14:55:49.930220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-ux500/board-mop500-audio.c linux-imx6-3.14/arch/arm/mach-ux500/board-mop500-audio.c
+--- linux-3.14.14/arch/arm/mach-ux500/board-mop500-audio.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-ux500/board-mop500-audio.c 2014-12-08 00:31:51.384418001 -0600
@@ -9,7 +9,6 @@
#include <linux/gpio.h>
#include <linux/platform_data/dma-ste-dma40.h>
@@ -31048,9 +31074,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-ux500/board-mop500-audio.c linux-3.14
#include <linux/platform_data/asoc-ux500-msp.h>
#include "ste-dma40-db8500.h"
-diff -Nur linux-3.14.22.orig/arch/arm/mach-ux500/cache-l2x0.c linux-3.14.22/arch/arm/mach-ux500/cache-l2x0.c
---- linux-3.14.22.orig/arch/arm/mach-ux500/cache-l2x0.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-ux500/cache-l2x0.c 2014-10-22 14:55:49.930220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-ux500/cache-l2x0.c linux-imx6-3.14/arch/arm/mach-ux500/cache-l2x0.c
+--- linux-3.14.14/arch/arm/mach-ux500/cache-l2x0.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-ux500/cache-l2x0.c 2014-12-08 00:31:51.384418001 -0600
@@ -35,10 +35,16 @@
return 0;
}
@@ -31102,9 +31128,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-ux500/cache-l2x0.c linux-3.14.22/arch
return 0;
}
-diff -Nur linux-3.14.22.orig/arch/arm/mach-ux500/cpu-db8500.c linux-3.14.22/arch/arm/mach-ux500/cpu-db8500.c
---- linux-3.14.22.orig/arch/arm/mach-ux500/cpu-db8500.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-ux500/cpu-db8500.c 2014-10-22 14:55:49.930220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-ux500/cpu-db8500.c linux-imx6-3.14/arch/arm/mach-ux500/cpu-db8500.c
+--- linux-3.14.14/arch/arm/mach-ux500/cpu-db8500.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-ux500/cpu-db8500.c 2014-12-08 00:31:51.384418001 -0600
@@ -27,7 +27,6 @@
#include <asm/mach/map.h>
@@ -31128,9 +31154,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-ux500/cpu-db8500.c linux-3.14.22/arch
.version_offset = DB8500_PRCMU_FW_VERSION_OFFSET,
.legacy_offset = DB8500_PRCMU_LEGACY_OFFSET,
};
-diff -Nur linux-3.14.22.orig/arch/arm/mach-ux500/irqs-board-mop500.h linux-3.14.22/arch/arm/mach-ux500/irqs-board-mop500.h
---- linux-3.14.22.orig/arch/arm/mach-ux500/irqs-board-mop500.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-ux500/irqs-board-mop500.h 1969-12-31 18:00:00.000000000 -0600
+diff -Nur linux-3.14.14/arch/arm/mach-ux500/irqs-board-mop500.h linux-imx6-3.14/arch/arm/mach-ux500/irqs-board-mop500.h
+--- linux-3.14.14/arch/arm/mach-ux500/irqs-board-mop500.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-ux500/irqs-board-mop500.h 1969-12-31 18:00:00.000000000 -0600
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
@@ -31187,9 +31213,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-ux500/irqs-board-mop500.h linux-3.14.
-#endif
-
-#endif
-diff -Nur linux-3.14.22.orig/arch/arm/mach-ux500/irqs-db8500.h linux-3.14.22/arch/arm/mach-ux500/irqs-db8500.h
---- linux-3.14.22.orig/arch/arm/mach-ux500/irqs-db8500.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-ux500/irqs-db8500.h 1969-12-31 18:00:00.000000000 -0600
+diff -Nur linux-3.14.14/arch/arm/mach-ux500/irqs-db8500.h linux-imx6-3.14/arch/arm/mach-ux500/irqs-db8500.h
+--- linux-3.14.14/arch/arm/mach-ux500/irqs-db8500.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-ux500/irqs-db8500.h 1969-12-31 18:00:00.000000000 -0600
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
@@ -31316,9 +31342,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-ux500/irqs-db8500.h linux-3.14.22/arc
-
-#endif /* CONFIG_UX500_SOC_DB8500 */
-#endif
-diff -Nur linux-3.14.22.orig/arch/arm/mach-ux500/irqs.h linux-3.14.22/arch/arm/mach-ux500/irqs.h
---- linux-3.14.22.orig/arch/arm/mach-ux500/irqs.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-ux500/irqs.h 1969-12-31 18:00:00.000000000 -0600
+diff -Nur linux-3.14.14/arch/arm/mach-ux500/irqs.h linux-imx6-3.14/arch/arm/mach-ux500/irqs.h
+--- linux-3.14.14/arch/arm/mach-ux500/irqs.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-ux500/irqs.h 1969-12-31 18:00:00.000000000 -0600
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2008 STMicroelectronics
@@ -31369,9 +31395,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-ux500/irqs.h linux-3.14.22/arch/arm/m
-#define UX500_NR_IRQS IRQ_BOARD_END
-
-#endif /* ASM_ARCH_IRQS_H */
-diff -Nur linux-3.14.22.orig/arch/arm/mach-vexpress/ct-ca9x4.c linux-3.14.22/arch/arm/mach-vexpress/ct-ca9x4.c
---- linux-3.14.22.orig/arch/arm/mach-vexpress/ct-ca9x4.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-vexpress/ct-ca9x4.c 2014-10-22 14:55:49.930220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-vexpress/ct-ca9x4.c linux-imx6-3.14/arch/arm/mach-vexpress/ct-ca9x4.c
+--- linux-3.14.14/arch/arm/mach-vexpress/ct-ca9x4.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-vexpress/ct-ca9x4.c 2014-12-08 00:31:51.384418001 -0600
@@ -45,6 +45,23 @@
iotable_init(ct_ca9x4_io_desc, ARRAY_SIZE(ct_ca9x4_io_desc));
}
@@ -31421,9 +31447,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-vexpress/ct-ca9x4.c linux-3.14.22/arc
for (i = 0; i < ARRAY_SIZE(ct_ca9x4_amba_devs); i++)
amba_device_register(ct_ca9x4_amba_devs[i], &iomem_resource);
-diff -Nur linux-3.14.22.orig/arch/arm/mach-vexpress/dcscb.c linux-3.14.22/arch/arm/mach-vexpress/dcscb.c
---- linux-3.14.22.orig/arch/arm/mach-vexpress/dcscb.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-vexpress/dcscb.c 2014-10-22 14:55:49.930220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-vexpress/dcscb.c linux-imx6-3.14/arch/arm/mach-vexpress/dcscb.c
+--- linux-3.14.14/arch/arm/mach-vexpress/dcscb.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-vexpress/dcscb.c 2014-12-08 00:31:51.384418001 -0600
@@ -23,6 +23,7 @@
#include <asm/cacheflush.h>
#include <asm/cputype.h>
@@ -31445,9 +31471,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-vexpress/dcscb.c linux-3.14.22/arch/a
if (!cci_probed())
return -ENODEV;
-diff -Nur linux-3.14.22.orig/arch/arm/mach-vexpress/Kconfig linux-3.14.22/arch/arm/mach-vexpress/Kconfig
---- linux-3.14.22.orig/arch/arm/mach-vexpress/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-vexpress/Kconfig 2014-10-22 14:55:49.930220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-vexpress/Kconfig linux-imx6-3.14/arch/arm/mach-vexpress/Kconfig
+--- linux-3.14.14/arch/arm/mach-vexpress/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-vexpress/Kconfig 2014-12-08 00:31:51.384418001 -0600
@@ -55,6 +55,7 @@
config ARCH_VEXPRESS_CA9X4
@@ -31456,9 +31482,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-vexpress/Kconfig linux-3.14.22/arch/a
config ARCH_VEXPRESS_DCSCB
bool "Dual Cluster System Control Block (DCSCB) support"
-diff -Nur linux-3.14.22.orig/arch/arm/mach-vexpress/Makefile linux-3.14.22/arch/arm/mach-vexpress/Makefile
---- linux-3.14.22.orig/arch/arm/mach-vexpress/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-vexpress/Makefile 2014-10-22 14:55:49.930220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-vexpress/Makefile linux-imx6-3.14/arch/arm/mach-vexpress/Makefile
+--- linux-3.14.14/arch/arm/mach-vexpress/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-vexpress/Makefile 2014-12-08 00:31:51.384418001 -0600
@@ -8,8 +8,15 @@
obj-$(CONFIG_ARCH_VEXPRESS_CA9X4) += ct-ca9x4.o
obj-$(CONFIG_ARCH_VEXPRESS_DCSCB) += dcscb.o dcscb_setup.o
@@ -31475,9 +31501,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-vexpress/Makefile linux-3.14.22/arch/
+endif
obj-$(CONFIG_SMP) += platsmp.o
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
-diff -Nur linux-3.14.22.orig/arch/arm/mach-vexpress/spc.c linux-3.14.22/arch/arm/mach-vexpress/spc.c
---- linux-3.14.22.orig/arch/arm/mach-vexpress/spc.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-vexpress/spc.c 2014-10-22 14:55:49.930220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-vexpress/spc.c linux-imx6-3.14/arch/arm/mach-vexpress/spc.c
+--- linux-3.14.14/arch/arm/mach-vexpress/spc.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-vexpress/spc.c 2014-12-08 00:31:51.388418001 -0600
@@ -392,7 +392,7 @@
* +--------------------------+
* | 31 20 | 19 0 |
@@ -31496,9 +31522,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-vexpress/spc.c linux-3.14.22/arch/arm
} else {
break;
}
-diff -Nur linux-3.14.22.orig/arch/arm/mach-vexpress/tc2_pm.c linux-3.14.22/arch/arm/mach-vexpress/tc2_pm.c
---- linux-3.14.22.orig/arch/arm/mach-vexpress/tc2_pm.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-vexpress/tc2_pm.c 2014-10-22 14:55:49.930220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-vexpress/tc2_pm.c linux-imx6-3.14/arch/arm/mach-vexpress/tc2_pm.c
+--- linux-3.14.14/arch/arm/mach-vexpress/tc2_pm.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-vexpress/tc2_pm.c 2014-12-08 00:31:51.388418001 -0600
@@ -27,6 +27,7 @@
#include <asm/cacheflush.h>
#include <asm/cputype.h>
@@ -31520,9 +31546,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-vexpress/tc2_pm.c linux-3.14.22/arch/
/*
* The power management-related features are hidden behind
* SCC registers. We need to extract runtime information like
-diff -Nur linux-3.14.22.orig/arch/arm/mach-vexpress/tc2_pm_psci.c linux-3.14.22/arch/arm/mach-vexpress/tc2_pm_psci.c
---- linux-3.14.22.orig/arch/arm/mach-vexpress/tc2_pm_psci.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/mach-vexpress/tc2_pm_psci.c 2014-10-22 14:55:49.930220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-vexpress/tc2_pm_psci.c linux-imx6-3.14/arch/arm/mach-vexpress/tc2_pm_psci.c
+--- linux-3.14.14/arch/arm/mach-vexpress/tc2_pm_psci.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/mach-vexpress/tc2_pm_psci.c 2014-12-08 00:31:51.388418001 -0600
@@ -0,0 +1,173 @@
+/*
+ * arch/arm/mach-vexpress/tc2_pm_psci.c - TC2 PSCI support
@@ -31697,9 +31723,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-vexpress/tc2_pm_psci.c linux-3.14.22/
+}
+
+early_initcall(tc2_pm_psci_init);
-diff -Nur linux-3.14.22.orig/arch/arm/mach-vexpress/v2m.c linux-3.14.22/arch/arm/mach-vexpress/v2m.c
---- linux-3.14.22.orig/arch/arm/mach-vexpress/v2m.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-vexpress/v2m.c 2014-10-22 14:55:49.930220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-vexpress/v2m.c linux-imx6-3.14/arch/arm/mach-vexpress/v2m.c
+--- linux-3.14.14/arch/arm/mach-vexpress/v2m.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-vexpress/v2m.c 2014-12-08 00:31:51.388418001 -0600
@@ -7,6 +7,7 @@
#include <linux/io.h>
#include <linux/smp.h>
@@ -31749,9 +31775,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-vexpress/v2m.c linux-3.14.22/arch/arm
}
static const struct of_device_id v2m_dt_bus_match[] __initconst = {
-diff -Nur linux-3.14.22.orig/arch/arm/mach-zynq/common.c linux-3.14.22/arch/arm/mach-zynq/common.c
---- linux-3.14.22.orig/arch/arm/mach-zynq/common.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mach-zynq/common.c 2014-10-22 14:55:49.930220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mach-zynq/common.c linux-imx6-3.14/arch/arm/mach-zynq/common.c
+--- linux-3.14.14/arch/arm/mach-zynq/common.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mach-zynq/common.c 2014-12-08 00:31:51.388418001 -0600
@@ -67,7 +67,7 @@
/*
* 64KB way size, 8-way associativity, parity disabled
@@ -31761,9 +31787,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mach-zynq/common.c linux-3.14.22/arch/arm/
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
-diff -Nur linux-3.14.22.orig/arch/arm/mm/cache-feroceon-l2.c linux-3.14.22/arch/arm/mm/cache-feroceon-l2.c
---- linux-3.14.22.orig/arch/arm/mm/cache-feroceon-l2.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mm/cache-feroceon-l2.c 2014-10-22 14:55:49.930220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mm/cache-feroceon-l2.c linux-imx6-3.14/arch/arm/mm/cache-feroceon-l2.c
+--- linux-3.14.14/arch/arm/mm/cache-feroceon-l2.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mm/cache-feroceon-l2.c 2014-12-08 00:31:51.388418001 -0600
@@ -343,7 +343,6 @@
outer_cache.inv_range = feroceon_l2_inv_range;
outer_cache.clean_range = feroceon_l2_clean_range;
@@ -31772,9 +31798,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mm/cache-feroceon-l2.c linux-3.14.22/arch/
enable_l2();
-diff -Nur linux-3.14.22.orig/arch/arm/mm/cache-l2x0.c linux-3.14.22/arch/arm/mm/cache-l2x0.c
---- linux-3.14.22.orig/arch/arm/mm/cache-l2x0.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mm/cache-l2x0.c 2014-10-22 14:55:49.934220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mm/cache-l2x0.c linux-imx6-3.14/arch/arm/mm/cache-l2x0.c
+--- linux-3.14.14/arch/arm/mm/cache-l2x0.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mm/cache-l2x0.c 2014-12-08 00:31:51.392418001 -0600
@@ -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
@@ -33591,9 +33617,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mm/cache-l2x0.c linux-3.14.22/arch/arm/mm/
return 0;
}
-diff -Nur linux-3.14.22.orig/arch/arm/mm/dma-mapping.c linux-3.14.22/arch/arm/mm/dma-mapping.c
---- linux-3.14.22.orig/arch/arm/mm/dma-mapping.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mm/dma-mapping.c 2014-10-22 14:55:49.934220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mm/dma-mapping.c linux-imx6-3.14/arch/arm/mm/dma-mapping.c
+--- linux-3.14.14/arch/arm/mm/dma-mapping.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mm/dma-mapping.c 2014-12-08 00:31:51.392418001 -0600
@@ -26,6 +26,7 @@
#include <linux/io.h>
#include <linux/vmalloc.h>
@@ -33602,9 +33628,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mm/dma-mapping.c linux-3.14.22/arch/arm/mm
#include <asm/memory.h>
#include <asm/highmem.h>
-diff -Nur linux-3.14.22.orig/arch/arm/mm/fault.c linux-3.14.22/arch/arm/mm/fault.c
---- linux-3.14.22.orig/arch/arm/mm/fault.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mm/fault.c 2014-10-22 14:55:49.934220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mm/fault.c linux-imx6-3.14/arch/arm/mm/fault.c
+--- linux-3.14.14/arch/arm/mm/fault.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mm/fault.c 2014-12-08 00:31:51.392418001 -0600
@@ -449,8 +449,16 @@
if (pud_none(*pud_k))
@@ -33634,9 +33660,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mm/fault.c linux-3.14.22/arch/arm/mm/fault
return 0;
bad_area:
-diff -Nur linux-3.14.22.orig/arch/arm/mm/init.c linux-3.14.22/arch/arm/mm/init.c
---- linux-3.14.22.orig/arch/arm/mm/init.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mm/init.c 2014-10-22 14:55:49.934220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mm/init.c linux-imx6-3.14/arch/arm/mm/init.c
+--- linux-3.14.14/arch/arm/mm/init.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mm/init.c 2014-12-08 00:31:51.392418001 -0600
@@ -327,7 +327,7 @@
* reserve memory for DMA contigouos allocations,
* must come from DMA area inside low memory
@@ -33646,9 +33672,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mm/init.c linux-3.14.22/arch/arm/mm/init.c
arm_memblock_steal_permitted = false;
memblock_dump_all();
-diff -Nur linux-3.14.22.orig/arch/arm/mm/Kconfig linux-3.14.22/arch/arm/mm/Kconfig
---- linux-3.14.22.orig/arch/arm/mm/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mm/Kconfig 2014-10-22 14:55:49.934220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mm/Kconfig linux-imx6-3.14/arch/arm/mm/Kconfig
+--- linux-3.14.14/arch/arm/mm/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mm/Kconfig 2014-12-08 00:31:51.388418001 -0600
@@ -897,6 +897,57 @@
This option enables optimisations for the PL310 cache
controller.
@@ -33707,9 +33733,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mm/Kconfig linux-3.14.22/arch/arm/mm/Kconf
config CACHE_TAUROS2
bool "Enable the Tauros2 L2 cache controller"
depends on (ARCH_DOVE || ARCH_MMP || CPU_PJ4)
-diff -Nur linux-3.14.22.orig/arch/arm/mm/l2c-common.c linux-3.14.22/arch/arm/mm/l2c-common.c
---- linux-3.14.22.orig/arch/arm/mm/l2c-common.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/mm/l2c-common.c 2014-10-22 14:55:49.934220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mm/l2c-common.c linux-imx6-3.14/arch/arm/mm/l2c-common.c
+--- linux-3.14.14/arch/arm/mm/l2c-common.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/mm/l2c-common.c 2014-12-08 00:31:51.392418001 -0600
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2010 ARM Ltd.
@@ -33731,9 +33757,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mm/l2c-common.c linux-3.14.22/arch/arm/mm/
+ if (outer_cache.disable)
+ outer_cache.disable();
+}
-diff -Nur linux-3.14.22.orig/arch/arm/mm/l2c-l2x0-resume.S linux-3.14.22/arch/arm/mm/l2c-l2x0-resume.S
---- linux-3.14.22.orig/arch/arm/mm/l2c-l2x0-resume.S 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/mm/l2c-l2x0-resume.S 2014-10-22 14:55:49.934220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mm/l2c-l2x0-resume.S linux-imx6-3.14/arch/arm/mm/l2c-l2x0-resume.S
+--- linux-3.14.14/arch/arm/mm/l2c-l2x0-resume.S 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/mm/l2c-l2x0-resume.S 2014-12-08 00:31:51.392418001 -0600
@@ -0,0 +1,58 @@
+/*
+ * L2C-310 early resume code. This can be used by platforms to restore
@@ -33793,9 +33819,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mm/l2c-l2x0-resume.S linux-3.14.22/arch/ar
+
+ .align
+1: .long l2x0_saved_regs - .
-diff -Nur linux-3.14.22.orig/arch/arm/mm/Makefile linux-3.14.22/arch/arm/mm/Makefile
---- linux-3.14.22.orig/arch/arm/mm/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mm/Makefile 2014-10-22 14:55:49.934220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mm/Makefile linux-imx6-3.14/arch/arm/mm/Makefile
+--- linux-3.14.14/arch/arm/mm/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mm/Makefile 2014-12-08 00:31:51.388418001 -0600
@@ -95,7 +95,8 @@
AFLAGS_proc-v6.o :=-Wa,-march=armv6
AFLAGS_proc-v7.o :=-Wa,-march=armv7-a
@@ -33806,9 +33832,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mm/Makefile linux-3.14.22/arch/arm/mm/Make
+obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o l2c-l2x0-resume.o
obj-$(CONFIG_CACHE_XSC3L2) += cache-xsc3l2.o
obj-$(CONFIG_CACHE_TAUROS2) += cache-tauros2.o
-diff -Nur linux-3.14.22.orig/arch/arm/mm/proc-v7.S linux-3.14.22/arch/arm/mm/proc-v7.S
---- linux-3.14.22.orig/arch/arm/mm/proc-v7.S 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/mm/proc-v7.S 2014-10-22 14:55:49.934220001 -0500
+diff -Nur linux-3.14.14/arch/arm/mm/proc-v7.S linux-imx6-3.14/arch/arm/mm/proc-v7.S
+--- linux-3.14.14/arch/arm/mm/proc-v7.S 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/mm/proc-v7.S 2014-12-08 00:31:51.396418001 -0600
@@ -336,6 +336,17 @@
mcrlt p15, 0, r10, c15, c0, 1 @ write diagnostic register
1:
@@ -33827,9 +33853,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/mm/proc-v7.S linux-3.14.22/arch/arm/mm/pro
/* Cortex-A15 Errata */
3: ldr r10, =0x00000c0f @ Cortex-A15 primary part number
-diff -Nur linux-3.14.22.orig/arch/arm64/boot/dts/apm-mustang.dts linux-3.14.22/arch/arm64/boot/dts/apm-mustang.dts
---- linux-3.14.22.orig/arch/arm64/boot/dts/apm-mustang.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/boot/dts/apm-mustang.dts 2014-10-22 14:55:49.934220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/boot/dts/apm-mustang.dts linux-imx6-3.14/arch/arm64/boot/dts/apm-mustang.dts
+--- linux-3.14.14/arch/arm64/boot/dts/apm-mustang.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/boot/dts/apm-mustang.dts 2014-12-08 00:31:51.408418001 -0600
@@ -24,3 +24,7 @@
reg = < 0x1 0x00000000 0x0 0x80000000 >; /* Updated by bootloader */
};
@@ -33838,9 +33864,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/boot/dts/apm-mustang.dts linux-3.14.22/a
+&serial0 {
+ status = "ok";
+};
-diff -Nur linux-3.14.22.orig/arch/arm64/boot/dts/apm-storm.dtsi linux-3.14.22/arch/arm64/boot/dts/apm-storm.dtsi
---- linux-3.14.22.orig/arch/arm64/boot/dts/apm-storm.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/boot/dts/apm-storm.dtsi 2014-10-22 14:55:49.934220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/boot/dts/apm-storm.dtsi linux-imx6-3.14/arch/arm64/boot/dts/apm-storm.dtsi
+--- linux-3.14.14/arch/arm64/boot/dts/apm-storm.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/boot/dts/apm-storm.dtsi 2014-12-08 00:31:51.408418001 -0600
@@ -176,16 +176,226 @@
reg-names = "csr-reg";
clock-output-names = "eth8clk";
@@ -34069,9 +34095,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/boot/dts/apm-storm.dtsi linux-3.14.22/ar
+ };
};
};
-diff -Nur linux-3.14.22.orig/arch/arm64/boot/dts/clcd-panels.dtsi linux-3.14.22/arch/arm64/boot/dts/clcd-panels.dtsi
---- linux-3.14.22.orig/arch/arm64/boot/dts/clcd-panels.dtsi 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/boot/dts/clcd-panels.dtsi 2014-10-22 14:55:49.934220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/boot/dts/clcd-panels.dtsi linux-imx6-3.14/arch/arm64/boot/dts/clcd-panels.dtsi
+--- linux-3.14.14/arch/arm64/boot/dts/clcd-panels.dtsi 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/boot/dts/clcd-panels.dtsi 2014-12-08 00:31:51.408418001 -0600
@@ -0,0 +1,52 @@
+/*
+ * ARM Ltd. Versatile Express
@@ -34125,9 +34151,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/boot/dts/clcd-panels.dtsi linux-3.14.22/
+ };
+ };
+};
-diff -Nur linux-3.14.22.orig/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts linux-3.14.22/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts
---- linux-3.14.22.orig/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts 2014-10-22 14:55:49.934220001 -0500
+diff -Nur linux-3.14.14/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.14/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts 2014-12-08 00:31:51.408418001 -0600
@@ -0,0 +1,266 @@
+/*
+ * Copyright (c) 2013, ARM Limited. All rights reserved.
@@ -34395,9 +34421,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts linux-3
+};
+
+/include/ "clcd-panels.dtsi"
-diff -Nur linux-3.14.22.orig/arch/arm64/boot/dts/juno.dts linux-3.14.22/arch/arm64/boot/dts/juno.dts
---- linux-3.14.22.orig/arch/arm64/boot/dts/juno.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/boot/dts/juno.dts 2014-10-22 14:55:49.934220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/boot/dts/juno.dts linux-imx6-3.14/arch/arm64/boot/dts/juno.dts
+--- linux-3.14.14/arch/arm64/boot/dts/juno.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/boot/dts/juno.dts 2014-12-08 00:31:51.408418001 -0600
@@ -0,0 +1,498 @@
+/*
+ * ARM Ltd. Juno Plaform
@@ -34897,9 +34923,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/boot/dts/juno.dts linux-3.14.22/arch/arm
+ };
+ };
+};
-diff -Nur linux-3.14.22.orig/arch/arm64/boot/dts/Makefile linux-3.14.22/arch/arm64/boot/dts/Makefile
---- linux-3.14.22.orig/arch/arm64/boot/dts/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/boot/dts/Makefile 2014-10-22 14:55:49.934220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/boot/dts/Makefile linux-imx6-3.14/arch/arm64/boot/dts/Makefile
+--- linux-3.14.14/arch/arm64/boot/dts/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/boot/dts/Makefile 2014-12-08 00:31:51.408418001 -0600
@@ -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 \
@@ -34909,18 +34935,18 @@ diff -Nur linux-3.14.22.orig/arch/arm64/boot/dts/Makefile linux-3.14.22/arch/arm
targets += dtbs
targets += $(dtb-y)
-diff -Nur linux-3.14.22.orig/arch/arm64/boot/dts/rtsm_ve-aemv8a.dts linux-3.14.22/arch/arm64/boot/dts/rtsm_ve-aemv8a.dts
---- linux-3.14.22.orig/arch/arm64/boot/dts/rtsm_ve-aemv8a.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/boot/dts/rtsm_ve-aemv8a.dts 2014-10-22 14:55:49.934220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/boot/dts/rtsm_ve-aemv8a.dts linux-imx6-3.14/arch/arm64/boot/dts/rtsm_ve-aemv8a.dts
+--- linux-3.14.14/arch/arm64/boot/dts/rtsm_ve-aemv8a.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/boot/dts/rtsm_ve-aemv8a.dts 2014-12-08 00:31:51.408418001 -0600
@@ -157,3 +157,5 @@
/include/ "rtsm_ve-motherboard.dtsi"
};
};
+
+/include/ "clcd-panels.dtsi"
-diff -Nur linux-3.14.22.orig/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi linux-3.14.22/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi
---- linux-3.14.22.orig/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi 2014-10-22 14:55:49.934220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi linux-imx6-3.14/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi
+--- linux-3.14.14/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi 2014-12-08 00:31:51.408418001 -0600
@@ -182,6 +182,9 @@
interrupts = <14>;
clocks = <&v2m_oscclk1>, <&v2m_clk24mhz>;
@@ -34931,9 +34957,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi linux-
};
virtio_block@0130000 {
-diff -Nur linux-3.14.22.orig/arch/arm64/crypto/aes-ce-ccm-core.S linux-3.14.22/arch/arm64/crypto/aes-ce-ccm-core.S
---- linux-3.14.22.orig/arch/arm64/crypto/aes-ce-ccm-core.S 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/crypto/aes-ce-ccm-core.S 2014-10-22 14:55:49.934220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/crypto/aes-ce-ccm-core.S linux-imx6-3.14/arch/arm64/crypto/aes-ce-ccm-core.S
+--- linux-3.14.14/arch/arm64/crypto/aes-ce-ccm-core.S 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/crypto/aes-ce-ccm-core.S 2014-12-08 00:31:51.412418001 -0600
@@ -0,0 +1,222 @@
+/*
+ * aesce-ccm-core.S - AES-CCM transform for ARMv8 with Crypto Extensions
@@ -35157,9 +35183,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/crypto/aes-ce-ccm-core.S linux-3.14.22/a
+ENTRY(ce_aes_ccm_decrypt)
+ aes_ccm_do_crypt 0
+ENDPROC(ce_aes_ccm_decrypt)
-diff -Nur linux-3.14.22.orig/arch/arm64/crypto/aes-ce-ccm-glue.c linux-3.14.22/arch/arm64/crypto/aes-ce-ccm-glue.c
---- linux-3.14.22.orig/arch/arm64/crypto/aes-ce-ccm-glue.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/crypto/aes-ce-ccm-glue.c 2014-10-22 14:55:49.938220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/crypto/aes-ce-ccm-glue.c linux-imx6-3.14/arch/arm64/crypto/aes-ce-ccm-glue.c
+--- linux-3.14.14/arch/arm64/crypto/aes-ce-ccm-glue.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/crypto/aes-ce-ccm-glue.c 2014-12-08 00:31:51.412418001 -0600
@@ -0,0 +1,297 @@
+/*
+ * aes-ccm-glue.c - AES-CCM transform for ARMv8 with Crypto Extensions
@@ -35458,9 +35484,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/crypto/aes-ce-ccm-glue.c linux-3.14.22/a
+MODULE_AUTHOR("Ard Biesheuvel <ard.biesheuvel@linaro.org>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("ccm(aes)");
-diff -Nur linux-3.14.22.orig/arch/arm64/crypto/aes-ce-cipher.c linux-3.14.22/arch/arm64/crypto/aes-ce-cipher.c
---- linux-3.14.22.orig/arch/arm64/crypto/aes-ce-cipher.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/crypto/aes-ce-cipher.c 2014-10-22 14:55:49.938220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/crypto/aes-ce-cipher.c linux-imx6-3.14/arch/arm64/crypto/aes-ce-cipher.c
+--- linux-3.14.14/arch/arm64/crypto/aes-ce-cipher.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/crypto/aes-ce-cipher.c 2014-12-08 00:31:51.412418001 -0600
@@ -0,0 +1,155 @@
+/*
+ * aes-ce-cipher.c - core AES cipher using ARMv8 Crypto Extensions
@@ -35617,9 +35643,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/crypto/aes-ce-cipher.c linux-3.14.22/arc
+
+module_cpu_feature_match(AES, aes_mod_init);
+module_exit(aes_mod_exit);
-diff -Nur linux-3.14.22.orig/arch/arm64/crypto/aes-ce.S linux-3.14.22/arch/arm64/crypto/aes-ce.S
---- linux-3.14.22.orig/arch/arm64/crypto/aes-ce.S 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/crypto/aes-ce.S 2014-10-22 14:55:49.938220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/crypto/aes-ce.S linux-imx6-3.14/arch/arm64/crypto/aes-ce.S
+--- linux-3.14.14/arch/arm64/crypto/aes-ce.S 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/crypto/aes-ce.S 2014-12-08 00:31:51.412418001 -0600
@@ -0,0 +1,133 @@
+/*
+ * linux/arch/arm64/crypto/aes-ce.S - AES cipher for ARMv8 with
@@ -35754,9 +35780,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/crypto/aes-ce.S linux-3.14.22/arch/arm64
+ .endm
+
+#include "aes-modes.S"
-diff -Nur linux-3.14.22.orig/arch/arm64/crypto/aes-glue.c linux-3.14.22/arch/arm64/crypto/aes-glue.c
---- linux-3.14.22.orig/arch/arm64/crypto/aes-glue.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/crypto/aes-glue.c 2014-10-22 14:55:49.938220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/crypto/aes-glue.c linux-imx6-3.14/arch/arm64/crypto/aes-glue.c
+--- linux-3.14.14/arch/arm64/crypto/aes-glue.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/crypto/aes-glue.c 2014-12-08 00:31:51.412418001 -0600
@@ -0,0 +1,446 @@
+/*
+ * linux/arch/arm64/crypto/aes-glue.c - wrapper code for ARMv8 AES
@@ -36204,9 +36230,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/crypto/aes-glue.c linux-3.14.22/arch/arm
+module_init(aes_init);
+#endif
+module_exit(aes_exit);
-diff -Nur linux-3.14.22.orig/arch/arm64/crypto/aes-modes.S linux-3.14.22/arch/arm64/crypto/aes-modes.S
---- linux-3.14.22.orig/arch/arm64/crypto/aes-modes.S 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/crypto/aes-modes.S 2014-10-22 14:55:49.938220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/crypto/aes-modes.S linux-imx6-3.14/arch/arm64/crypto/aes-modes.S
+--- linux-3.14.14/arch/arm64/crypto/aes-modes.S 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/crypto/aes-modes.S 2014-12-08 00:31:51.412418001 -0600
@@ -0,0 +1,532 @@
+/*
+ * linux/arch/arm64/crypto/aes-modes.S - chaining mode wrappers for AES
@@ -36740,9 +36766,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/crypto/aes-modes.S linux-3.14.22/arch/ar
+ FRAME_POP
+ ret
+AES_ENDPROC(aes_xts_decrypt)
-diff -Nur linux-3.14.22.orig/arch/arm64/crypto/aes-neon.S linux-3.14.22/arch/arm64/crypto/aes-neon.S
---- linux-3.14.22.orig/arch/arm64/crypto/aes-neon.S 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/crypto/aes-neon.S 2014-10-22 14:55:49.938220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/crypto/aes-neon.S linux-imx6-3.14/arch/arm64/crypto/aes-neon.S
+--- linux-3.14.14/arch/arm64/crypto/aes-neon.S 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/crypto/aes-neon.S 2014-12-08 00:31:51.412418001 -0600
@@ -0,0 +1,382 @@
+/*
+ * linux/arch/arm64/crypto/aes-neon.S - AES cipher for ARMv8 NEON
@@ -37126,9 +37152,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/crypto/aes-neon.S linux-3.14.22/arch/arm
+ .byte 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61
+ .byte 0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26
+ .byte 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d
-diff -Nur linux-3.14.22.orig/arch/arm64/crypto/ghash-ce-core.S linux-3.14.22/arch/arm64/crypto/ghash-ce-core.S
---- linux-3.14.22.orig/arch/arm64/crypto/ghash-ce-core.S 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/crypto/ghash-ce-core.S 2014-10-22 14:55:49.938220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/crypto/ghash-ce-core.S linux-imx6-3.14/arch/arm64/crypto/ghash-ce-core.S
+--- linux-3.14.14/arch/arm64/crypto/ghash-ce-core.S 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/crypto/ghash-ce-core.S 2014-12-08 00:31:51.412418001 -0600
@@ -0,0 +1,79 @@
+/*
+ * Accelerated GHASH implementation with ARMv8 PMULL instructions.
@@ -37209,9 +37235,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/crypto/ghash-ce-core.S linux-3.14.22/arc
+ st1 {XL.16b}, [x1]
+ ret
+ENDPROC(pmull_ghash_update)
-diff -Nur linux-3.14.22.orig/arch/arm64/crypto/ghash-ce-glue.c linux-3.14.22/arch/arm64/crypto/ghash-ce-glue.c
---- linux-3.14.22.orig/arch/arm64/crypto/ghash-ce-glue.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/crypto/ghash-ce-glue.c 2014-10-22 14:55:49.938220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/crypto/ghash-ce-glue.c linux-imx6-3.14/arch/arm64/crypto/ghash-ce-glue.c
+--- linux-3.14.14/arch/arm64/crypto/ghash-ce-glue.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/crypto/ghash-ce-glue.c 2014-12-08 00:31:51.412418001 -0600
@@ -0,0 +1,156 @@
+/*
+ * Accelerated GHASH implementation with ARMv8 PMULL instructions.
@@ -37369,9 +37395,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/crypto/ghash-ce-glue.c linux-3.14.22/arc
+
+module_cpu_feature_match(PMULL, ghash_ce_mod_init);
+module_exit(ghash_ce_mod_exit);
-diff -Nur linux-3.14.22.orig/arch/arm64/crypto/Kconfig linux-3.14.22/arch/arm64/crypto/Kconfig
---- linux-3.14.22.orig/arch/arm64/crypto/Kconfig 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/crypto/Kconfig 2014-10-22 14:55:49.938220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/crypto/Kconfig linux-imx6-3.14/arch/arm64/crypto/Kconfig
+--- linux-3.14.14/arch/arm64/crypto/Kconfig 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/crypto/Kconfig 2014-12-08 00:31:51.408418001 -0600
@@ -0,0 +1,53 @@
+
+menuconfig ARM64_CRYPTO
@@ -37426,9 +37452,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/crypto/Kconfig linux-3.14.22/arch/arm64/
+ select CRYPTO_ABLK_HELPER
+
+endif
-diff -Nur linux-3.14.22.orig/arch/arm64/crypto/Makefile linux-3.14.22/arch/arm64/crypto/Makefile
---- linux-3.14.22.orig/arch/arm64/crypto/Makefile 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/crypto/Makefile 2014-10-22 14:55:49.938220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/crypto/Makefile linux-imx6-3.14/arch/arm64/crypto/Makefile
+--- linux-3.14.14/arch/arm64/crypto/Makefile 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/crypto/Makefile 2014-12-08 00:31:51.408418001 -0600
@@ -0,0 +1,38 @@
+#
+# linux/arch/arm64/crypto/Makefile
@@ -37468,9 +37494,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/crypto/Makefile linux-3.14.22/arch/arm64
+
+$(obj)/aes-glue-%.o: $(src)/aes-glue.c FORCE
+ $(call if_changed_dep,cc_o_c)
-diff -Nur linux-3.14.22.orig/arch/arm64/crypto/sha1-ce-core.S linux-3.14.22/arch/arm64/crypto/sha1-ce-core.S
---- linux-3.14.22.orig/arch/arm64/crypto/sha1-ce-core.S 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/crypto/sha1-ce-core.S 2014-10-22 14:55:49.938220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/crypto/sha1-ce-core.S linux-imx6-3.14/arch/arm64/crypto/sha1-ce-core.S
+--- linux-3.14.14/arch/arm64/crypto/sha1-ce-core.S 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/crypto/sha1-ce-core.S 2014-12-08 00:31:51.412418001 -0600
@@ -0,0 +1,153 @@
+/*
+ * sha1-ce-core.S - SHA-1 secure hash using ARMv8 Crypto Extensions
@@ -37625,9 +37651,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/crypto/sha1-ce-core.S linux-3.14.22/arch
+ str dgb, [x2, #16]
+ ret
+ENDPROC(sha1_ce_transform)
-diff -Nur linux-3.14.22.orig/arch/arm64/crypto/sha1-ce-glue.c linux-3.14.22/arch/arm64/crypto/sha1-ce-glue.c
---- linux-3.14.22.orig/arch/arm64/crypto/sha1-ce-glue.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/crypto/sha1-ce-glue.c 2014-10-22 14:55:49.938220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/crypto/sha1-ce-glue.c linux-imx6-3.14/arch/arm64/crypto/sha1-ce-glue.c
+--- linux-3.14.14/arch/arm64/crypto/sha1-ce-glue.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/crypto/sha1-ce-glue.c 2014-12-08 00:31:51.412418001 -0600
@@ -0,0 +1,174 @@
+/*
+ * sha1-ce-glue.c - SHA-1 secure hash using ARMv8 Crypto Extensions
@@ -37803,9 +37829,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/crypto/sha1-ce-glue.c linux-3.14.22/arch
+
+module_cpu_feature_match(SHA1, sha1_ce_mod_init);
+module_exit(sha1_ce_mod_fini);
-diff -Nur linux-3.14.22.orig/arch/arm64/crypto/sha2-ce-core.S linux-3.14.22/arch/arm64/crypto/sha2-ce-core.S
---- linux-3.14.22.orig/arch/arm64/crypto/sha2-ce-core.S 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/crypto/sha2-ce-core.S 2014-10-22 14:55:49.938220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/crypto/sha2-ce-core.S linux-imx6-3.14/arch/arm64/crypto/sha2-ce-core.S
+--- linux-3.14.14/arch/arm64/crypto/sha2-ce-core.S 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/crypto/sha2-ce-core.S 2014-12-08 00:31:51.412418001 -0600
@@ -0,0 +1,156 @@
+/*
+ * sha2-ce-core.S - core SHA-224/SHA-256 transform using v8 Crypto Extensions
@@ -37963,9 +37989,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/crypto/sha2-ce-core.S linux-3.14.22/arch
+3: stp dga, dgb, [x2]
+ ret
+ENDPROC(sha2_ce_transform)
-diff -Nur linux-3.14.22.orig/arch/arm64/crypto/sha2-ce-glue.c linux-3.14.22/arch/arm64/crypto/sha2-ce-glue.c
---- linux-3.14.22.orig/arch/arm64/crypto/sha2-ce-glue.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/crypto/sha2-ce-glue.c 2014-10-22 14:55:49.938220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/crypto/sha2-ce-glue.c linux-imx6-3.14/arch/arm64/crypto/sha2-ce-glue.c
+--- linux-3.14.14/arch/arm64/crypto/sha2-ce-glue.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/crypto/sha2-ce-glue.c 2014-12-08 00:31:51.412418001 -0600
@@ -0,0 +1,255 @@
+/*
+ * sha2-ce-glue.c - SHA-224/SHA-256 using ARMv8 Crypto Extensions
@@ -38222,9 +38248,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/crypto/sha2-ce-glue.c linux-3.14.22/arch
+
+module_cpu_feature_match(SHA2, sha2_ce_mod_init);
+module_exit(sha2_ce_mod_fini);
-diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/bL_switcher.h linux-3.14.22/arch/arm64/include/asm/bL_switcher.h
---- linux-3.14.22.orig/arch/arm64/include/asm/bL_switcher.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/include/asm/bL_switcher.h 2014-10-22 14:55:49.938220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/include/asm/bL_switcher.h linux-imx6-3.14/arch/arm64/include/asm/bL_switcher.h
+--- linux-3.14.14/arch/arm64/include/asm/bL_switcher.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/include/asm/bL_switcher.h 2014-12-08 00:31:51.412418001 -0600
@@ -0,0 +1,54 @@
+/*
+ * Based on the stubs for the ARM implementation which is:
@@ -38280,9 +38306,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/bL_switcher.h linux-3.14.22/
+static inline int bL_switcher_get_logical_index(u32 mpidr) { return -EUNATCH; }
+
+#endif
-diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/cacheflush.h linux-3.14.22/arch/arm64/include/asm/cacheflush.h
---- linux-3.14.22.orig/arch/arm64/include/asm/cacheflush.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/include/asm/cacheflush.h 2014-10-22 14:55:49.938220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/include/asm/cacheflush.h linux-imx6-3.14/arch/arm64/include/asm/cacheflush.h
+--- linux-3.14.14/arch/arm64/include/asm/cacheflush.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/include/asm/cacheflush.h 2014-12-08 00:31:51.412418001 -0600
@@ -85,6 +85,13 @@
}
@@ -38297,9 +38323,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/cacheflush.h linux-3.14.22/a
* Copy user data from/to a page which is mapped into a different
* processes address space. Really, we want to allow our "user
* space" model to handle this.
-diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/compat.h linux-3.14.22/arch/arm64/include/asm/compat.h
---- linux-3.14.22.orig/arch/arm64/include/asm/compat.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/include/asm/compat.h 2014-10-22 14:55:50.170220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/include/asm/compat.h linux-imx6-3.14/arch/arm64/include/asm/compat.h
+--- linux-3.14.14/arch/arm64/include/asm/compat.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/include/asm/compat.h 2014-12-08 00:31:51.412418001 -0600
@@ -228,7 +228,7 @@
return (u32)(unsigned long)uptr;
}
@@ -38321,9 +38347,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/compat.h linux-3.14.22/arch/
static inline int is_compat_thread(struct thread_info *thread)
{
return 0;
-diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/cpufeature.h linux-3.14.22/arch/arm64/include/asm/cpufeature.h
---- linux-3.14.22.orig/arch/arm64/include/asm/cpufeature.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/include/asm/cpufeature.h 2014-10-22 14:55:50.170220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/include/asm/cpufeature.h linux-imx6-3.14/arch/arm64/include/asm/cpufeature.h
+--- linux-3.14.14/arch/arm64/include/asm/cpufeature.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/include/asm/cpufeature.h 2014-12-08 00:31:51.412418001 -0600
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2014 Linaro Ltd. <ard.biesheuvel@linaro.org>
@@ -38354,9 +38380,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/cpufeature.h linux-3.14.22/a
+}
+
+#endif
-diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/debug-monitors.h linux-3.14.22/arch/arm64/include/asm/debug-monitors.h
---- linux-3.14.22.orig/arch/arm64/include/asm/debug-monitors.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/include/asm/debug-monitors.h 2014-10-22 14:55:50.170220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/include/asm/debug-monitors.h linux-imx6-3.14/arch/arm64/include/asm/debug-monitors.h
+--- linux-3.14.14/arch/arm64/include/asm/debug-monitors.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/include/asm/debug-monitors.h 2014-12-08 00:31:51.412418001 -0600
@@ -26,6 +26,53 @@
#define DBG_ESR_EVT_HWWP 0x2
#define DBG_ESR_EVT_BRK 0x6
@@ -38435,9 +38461,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/debug-monitors.h linux-3.14.
#define DBG_ARCH_ID_RESERVED 0 /* In case of ptrace ABI updates. */
#define DBG_HOOK_HANDLED 0
-diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/dma-mapping.h linux-3.14.22/arch/arm64/include/asm/dma-mapping.h
---- linux-3.14.22.orig/arch/arm64/include/asm/dma-mapping.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/include/asm/dma-mapping.h 2014-10-22 14:55:50.170220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/include/asm/dma-mapping.h linux-imx6-3.14/arch/arm64/include/asm/dma-mapping.h
+--- linux-3.14.14/arch/arm64/include/asm/dma-mapping.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/include/asm/dma-mapping.h 2014-12-08 00:31:51.412418001 -0600
@@ -28,6 +28,8 @@
#define DMA_ERROR_CODE (~(dma_addr_t)0)
@@ -38459,9 +38485,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/dma-mapping.h linux-3.14.22/
#include <asm-generic/dma-mapping-common.h>
static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)
-diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/ftrace.h linux-3.14.22/arch/arm64/include/asm/ftrace.h
---- linux-3.14.22.orig/arch/arm64/include/asm/ftrace.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/include/asm/ftrace.h 2014-10-22 14:55:50.170220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/include/asm/ftrace.h linux-imx6-3.14/arch/arm64/include/asm/ftrace.h
+--- linux-3.14.14/arch/arm64/include/asm/ftrace.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/include/asm/ftrace.h 2014-12-08 00:31:51.412418001 -0600
@@ -0,0 +1,59 @@
+/*
+ * arch/arm64/include/asm/ftrace.h
@@ -38522,9 +38548,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/ftrace.h linux-3.14.22/arch/
+#endif /* ifndef __ASSEMBLY__ */
+
+#endif /* __ASM_FTRACE_H */
-diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/hwcap.h linux-3.14.22/arch/arm64/include/asm/hwcap.h
---- linux-3.14.22.orig/arch/arm64/include/asm/hwcap.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/include/asm/hwcap.h 2014-10-22 14:55:50.170220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/include/asm/hwcap.h linux-imx6-3.14/arch/arm64/include/asm/hwcap.h
+--- linux-3.14.14/arch/arm64/include/asm/hwcap.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/include/asm/hwcap.h 2014-12-08 00:31:51.412418001 -0600
@@ -32,6 +32,12 @@
#define COMPAT_HWCAP_IDIV (COMPAT_HWCAP_IDIVA|COMPAT_HWCAP_IDIVT)
#define COMPAT_HWCAP_EVTSTRM (1 << 21)
@@ -38548,9 +38574,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/hwcap.h linux-3.14.22/arch/a
#endif
extern unsigned long elf_hwcap;
-diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/insn.h linux-3.14.22/arch/arm64/include/asm/insn.h
---- linux-3.14.22.orig/arch/arm64/include/asm/insn.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/include/asm/insn.h 2014-10-22 14:55:50.174220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/include/asm/insn.h linux-imx6-3.14/arch/arm64/include/asm/insn.h
+--- linux-3.14.14/arch/arm64/include/asm/insn.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/include/asm/insn.h 2014-12-08 00:31:51.412418001 -0600
@@ -16,11 +16,14 @@
*/
#ifndef __ASM_INSN_H
@@ -38573,9 +38599,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/insn.h linux-3.14.22/arch/ar
+#endif /* __ASSEMBLY__ */
+
#endif /* __ASM_INSN_H */
-diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/irqflags.h linux-3.14.22/arch/arm64/include/asm/irqflags.h
---- linux-3.14.22.orig/arch/arm64/include/asm/irqflags.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/include/asm/irqflags.h 2014-10-22 14:55:50.174220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/include/asm/irqflags.h linux-imx6-3.14/arch/arm64/include/asm/irqflags.h
+--- linux-3.14.14/arch/arm64/include/asm/irqflags.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/include/asm/irqflags.h 2014-12-08 00:31:51.412418001 -0600
@@ -90,5 +90,28 @@
return flags & PSR_I_BIT;
}
@@ -38605,9 +38631,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/irqflags.h linux-3.14.22/arc
+
#endif
#endif
-diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/Kbuild linux-3.14.22/arch/arm64/include/asm/Kbuild
---- linux-3.14.22.orig/arch/arm64/include/asm/Kbuild 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/include/asm/Kbuild 2014-10-22 14:55:50.174220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/include/asm/Kbuild linux-imx6-3.14/arch/arm64/include/asm/Kbuild
+--- linux-3.14.14/arch/arm64/include/asm/Kbuild 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/include/asm/Kbuild 2014-12-08 00:31:51.412418001 -0600
@@ -35,6 +35,7 @@
generic-y += sembuf.h
generic-y += serial.h
@@ -38616,9 +38642,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/Kbuild linux-3.14.22/arch/ar
generic-y += sizes.h
generic-y += socket.h
generic-y += sockios.h
-diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/kgdb.h linux-3.14.22/arch/arm64/include/asm/kgdb.h
---- linux-3.14.22.orig/arch/arm64/include/asm/kgdb.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/include/asm/kgdb.h 2014-10-22 14:55:50.174220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/include/asm/kgdb.h linux-imx6-3.14/arch/arm64/include/asm/kgdb.h
+--- linux-3.14.14/arch/arm64/include/asm/kgdb.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/include/asm/kgdb.h 2014-12-08 00:31:51.412418001 -0600
@@ -0,0 +1,84 @@
+/*
+ * AArch64 KGDB support
@@ -38704,9 +38730,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/kgdb.h linux-3.14.22/arch/ar
+ (_EXTRA_REGS * 4))
+
+#endif /* __ASM_KGDB_H */
-diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/page.h linux-3.14.22/arch/arm64/include/asm/page.h
---- linux-3.14.22.orig/arch/arm64/include/asm/page.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/include/asm/page.h 2014-10-22 14:55:50.174220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/include/asm/page.h linux-imx6-3.14/arch/arm64/include/asm/page.h
+--- linux-3.14.14/arch/arm64/include/asm/page.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/include/asm/page.h 2014-12-08 00:31:51.412418001 -0600
@@ -31,6 +31,15 @@
/* We do define AT_SYSINFO_EHDR but don't use the gate mechanism */
#define __HAVE_ARCH_GATE_AREA 1
@@ -38723,9 +38749,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/page.h linux-3.14.22/arch/ar
#ifndef __ASSEMBLY__
#ifdef CONFIG_ARM64_64K_PAGES
-diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/pgtable.h linux-3.14.22/arch/arm64/include/asm/pgtable.h
---- linux-3.14.22.orig/arch/arm64/include/asm/pgtable.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/include/asm/pgtable.h 2014-10-22 14:55:50.174220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/include/asm/pgtable.h linux-imx6-3.14/arch/arm64/include/asm/pgtable.h
+--- linux-3.14.14/arch/arm64/include/asm/pgtable.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/include/asm/pgtable.h 2014-12-08 00:31:51.416418001 -0600
@@ -227,36 +227,36 @@
#define __HAVE_ARCH_PTE_SPECIAL
@@ -38818,9 +38844,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/pgtable.h linux-3.14.22/arch
/*
* Encode and decode a swap entry:
* bits 0-1: present (must be zero)
-diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/ptrace.h linux-3.14.22/arch/arm64/include/asm/ptrace.h
---- linux-3.14.22.orig/arch/arm64/include/asm/ptrace.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/include/asm/ptrace.h 2014-10-22 14:55:50.174220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/include/asm/ptrace.h linux-imx6-3.14/arch/arm64/include/asm/ptrace.h
+--- linux-3.14.14/arch/arm64/include/asm/ptrace.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/include/asm/ptrace.h 2014-12-08 00:31:51.416418001 -0600
@@ -68,6 +68,7 @@
/* Architecturally defined mapping between AArch32 and AArch64 registers */
@@ -38852,9 +38878,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/ptrace.h linux-3.14.22/arch/
#ifdef CONFIG_SMP
extern unsigned long profile_pc(struct pt_regs *regs);
-diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/syscall.h linux-3.14.22/arch/arm64/include/asm/syscall.h
---- linux-3.14.22.orig/arch/arm64/include/asm/syscall.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/include/asm/syscall.h 2014-10-22 14:55:50.178220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/include/asm/syscall.h linux-imx6-3.14/arch/arm64/include/asm/syscall.h
+--- linux-3.14.14/arch/arm64/include/asm/syscall.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/include/asm/syscall.h 2014-12-08 00:31:51.416418001 -0600
@@ -18,6 +18,7 @@
#include <linux/err.h>
@@ -38863,9 +38889,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/syscall.h linux-3.14.22/arch
static inline int syscall_get_nr(struct task_struct *task,
struct pt_regs *regs)
-diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/thread_info.h linux-3.14.22/arch/arm64/include/asm/thread_info.h
---- linux-3.14.22.orig/arch/arm64/include/asm/thread_info.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/include/asm/thread_info.h 2014-10-22 14:55:50.178220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/include/asm/thread_info.h linux-imx6-3.14/arch/arm64/include/asm/thread_info.h
+--- linux-3.14.14/arch/arm64/include/asm/thread_info.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/include/asm/thread_info.h 2014-12-08 00:31:51.416418001 -0600
@@ -91,6 +91,9 @@
/*
* thread information flags:
@@ -38904,9 +38930,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/thread_info.h linux-3.14.22/
+
#endif /* __KERNEL__ */
#endif /* __ASM_THREAD_INFO_H */
-diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/topology.h linux-3.14.22/arch/arm64/include/asm/topology.h
---- linux-3.14.22.orig/arch/arm64/include/asm/topology.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/include/asm/topology.h 2014-10-22 14:55:50.178220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/include/asm/topology.h linux-imx6-3.14/arch/arm64/include/asm/topology.h
+--- linux-3.14.14/arch/arm64/include/asm/topology.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/include/asm/topology.h 2014-12-08 00:31:51.416418001 -0600
@@ -0,0 +1,70 @@
+#ifndef __ASM_TOPOLOGY_H
+#define __ASM_TOPOLOGY_H
@@ -38978,18 +39004,18 @@ diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/topology.h linux-3.14.22/arc
+#include <asm-generic/topology.h>
+
+#endif /* _ASM_ARM_TOPOLOGY_H */
-diff -Nur linux-3.14.22.orig/arch/arm64/include/asm/unistd.h linux-3.14.22/arch/arm64/include/asm/unistd.h
---- linux-3.14.22.orig/arch/arm64/include/asm/unistd.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/include/asm/unistd.h 2014-10-22 14:55:50.178220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/include/asm/unistd.h linux-imx6-3.14/arch/arm64/include/asm/unistd.h
+--- linux-3.14.14/arch/arm64/include/asm/unistd.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/include/asm/unistd.h 2014-12-08 00:31:51.416418001 -0600
@@ -28,3 +28,5 @@
#endif
#define __ARCH_WANT_SYS_CLONE
#include <uapi/asm/unistd.h>
+
+#define NR_syscalls (__NR_syscalls)
-diff -Nur linux-3.14.22.orig/arch/arm64/include/uapi/asm/Kbuild linux-3.14.22/arch/arm64/include/uapi/asm/Kbuild
---- linux-3.14.22.orig/arch/arm64/include/uapi/asm/Kbuild 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/include/uapi/asm/Kbuild 2014-10-22 14:55:50.178220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/include/uapi/asm/Kbuild linux-imx6-3.14/arch/arm64/include/uapi/asm/Kbuild
+--- linux-3.14.14/arch/arm64/include/uapi/asm/Kbuild 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/include/uapi/asm/Kbuild 2014-12-08 00:31:51.416418001 -0600
@@ -9,6 +9,7 @@
header-y += fcntl.h
header-y += hwcap.h
@@ -38998,9 +39024,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/include/uapi/asm/Kbuild linux-3.14.22/ar
header-y += param.h
header-y += ptrace.h
header-y += setup.h
-diff -Nur linux-3.14.22.orig/arch/arm64/include/uapi/asm/perf_regs.h linux-3.14.22/arch/arm64/include/uapi/asm/perf_regs.h
---- linux-3.14.22.orig/arch/arm64/include/uapi/asm/perf_regs.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/include/uapi/asm/perf_regs.h 2014-10-22 14:55:50.178220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/include/uapi/asm/perf_regs.h linux-imx6-3.14/arch/arm64/include/uapi/asm/perf_regs.h
+--- linux-3.14.14/arch/arm64/include/uapi/asm/perf_regs.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/include/uapi/asm/perf_regs.h 2014-12-08 00:31:51.416418001 -0600
@@ -0,0 +1,40 @@
+#ifndef _ASM_ARM64_PERF_REGS_H
+#define _ASM_ARM64_PERF_REGS_H
@@ -39042,9 +39068,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/include/uapi/asm/perf_regs.h linux-3.14.
+ PERF_REG_ARM64_MAX,
+};
+#endif /* _ASM_ARM64_PERF_REGS_H */
-diff -Nur linux-3.14.22.orig/arch/arm64/Kconfig linux-3.14.22/arch/arm64/Kconfig
---- linux-3.14.22.orig/arch/arm64/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/Kconfig 2014-10-22 14:55:50.178220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/Kconfig linux-imx6-3.14/arch/arm64/Kconfig
+--- linux-3.14.14/arch/arm64/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/Kconfig 2014-12-08 00:31:51.408418001 -0600
@@ -4,6 +4,7 @@
select ARCH_USE_CMPXCHG_LOCKREF
select ARCH_SUPPORTS_ATOMIC_RMW
@@ -39242,9 +39268,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/Kconfig linux-3.14.22/arch/arm64/Kconfig
+endif
source "lib/Kconfig"
-diff -Nur linux-3.14.22.orig/arch/arm64/kernel/arm64ksyms.c linux-3.14.22/arch/arm64/kernel/arm64ksyms.c
---- linux-3.14.22.orig/arch/arm64/kernel/arm64ksyms.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/kernel/arm64ksyms.c 2014-10-22 14:55:50.182220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/kernel/arm64ksyms.c linux-imx6-3.14/arch/arm64/kernel/arm64ksyms.c
+--- linux-3.14.14/arch/arm64/kernel/arm64ksyms.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/kernel/arm64ksyms.c 2014-12-08 00:31:51.416418001 -0600
@@ -56,3 +56,7 @@
EXPORT_SYMBOL(test_and_clear_bit);
EXPORT_SYMBOL(change_bit);
@@ -39253,9 +39279,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/kernel/arm64ksyms.c linux-3.14.22/arch/a
+#ifdef CONFIG_FUNCTION_TRACER
+EXPORT_SYMBOL(_mcount);
+#endif
-diff -Nur linux-3.14.22.orig/arch/arm64/kernel/debug-monitors.c linux-3.14.22/arch/arm64/kernel/debug-monitors.c
---- linux-3.14.22.orig/arch/arm64/kernel/debug-monitors.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/kernel/debug-monitors.c 2014-10-22 14:55:50.182220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/kernel/debug-monitors.c linux-imx6-3.14/arch/arm64/kernel/debug-monitors.c
+--- linux-3.14.14/arch/arm64/kernel/debug-monitors.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/kernel/debug-monitors.c 2014-12-08 00:31:51.416418001 -0600
@@ -138,6 +138,7 @@
{
asm volatile("msr oslar_el1, %0" : : "r" (0));
@@ -39274,9 +39300,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/kernel/debug-monitors.c linux-3.14.22/ar
if (!user_mode(regs))
return -EFAULT;
-diff -Nur linux-3.14.22.orig/arch/arm64/kernel/entry-ftrace.S linux-3.14.22/arch/arm64/kernel/entry-ftrace.S
---- linux-3.14.22.orig/arch/arm64/kernel/entry-ftrace.S 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/kernel/entry-ftrace.S 2014-10-22 14:55:50.182220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/kernel/entry-ftrace.S linux-imx6-3.14/arch/arm64/kernel/entry-ftrace.S
+--- linux-3.14.14/arch/arm64/kernel/entry-ftrace.S 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/kernel/entry-ftrace.S 2014-12-08 00:31:51.416418001 -0600
@@ -0,0 +1,218 @@
+/*
+ * arch/arm64/kernel/entry-ftrace.S
@@ -39496,9 +39522,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/kernel/entry-ftrace.S linux-3.14.22/arch
+ ret
+END(return_to_handler)
+#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
-diff -Nur linux-3.14.22.orig/arch/arm64/kernel/entry.S linux-3.14.22/arch/arm64/kernel/entry.S
---- linux-3.14.22.orig/arch/arm64/kernel/entry.S 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/kernel/entry.S 2014-10-22 14:55:50.182220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/kernel/entry.S linux-imx6-3.14/arch/arm64/kernel/entry.S
+--- linux-3.14.14/arch/arm64/kernel/entry.S 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/kernel/entry.S 2014-12-08 00:31:51.416418001 -0600
@@ -630,8 +630,9 @@
enable_irq
@@ -39535,9 +39561,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/kernel/entry.S linux-3.14.22/arch/arm64/
b ret_to_user
/*
-diff -Nur linux-3.14.22.orig/arch/arm64/kernel/ftrace.c linux-3.14.22/arch/arm64/kernel/ftrace.c
---- linux-3.14.22.orig/arch/arm64/kernel/ftrace.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/kernel/ftrace.c 2014-10-22 14:55:50.182220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/kernel/ftrace.c linux-imx6-3.14/arch/arm64/kernel/ftrace.c
+--- linux-3.14.14/arch/arm64/kernel/ftrace.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/kernel/ftrace.c 2014-12-08 00:31:51.420418001 -0600
@@ -0,0 +1,177 @@
+/*
+ * arch/arm64/kernel/ftrace.c
@@ -39716,9 +39742,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/kernel/ftrace.c linux-3.14.22/arch/arm64
+}
+#endif /* CONFIG_DYNAMIC_FTRACE */
+#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
-diff -Nur linux-3.14.22.orig/arch/arm64/kernel/head.S linux-3.14.22/arch/arm64/kernel/head.S
---- linux-3.14.22.orig/arch/arm64/kernel/head.S 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/kernel/head.S 2014-10-22 14:55:50.182220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/kernel/head.S linux-imx6-3.14/arch/arm64/kernel/head.S
+--- linux-3.14.14/arch/arm64/kernel/head.S 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/kernel/head.S 2014-12-08 00:31:51.420418001 -0600
@@ -26,6 +26,7 @@
#include <asm/assembler.h>
#include <asm/ptrace.h>
@@ -39908,9 +39934,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/kernel/head.S linux-3.14.22/arch/arm64/k
.quad processor_id // x4
.quad __fdt_pointer // x5
.quad memstart_addr // x6
-diff -Nur linux-3.14.22.orig/arch/arm64/kernel/hw_breakpoint.c linux-3.14.22/arch/arm64/kernel/hw_breakpoint.c
---- linux-3.14.22.orig/arch/arm64/kernel/hw_breakpoint.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/kernel/hw_breakpoint.c 2014-10-22 14:55:50.182220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/kernel/hw_breakpoint.c linux-imx6-3.14/arch/arm64/kernel/hw_breakpoint.c
+--- linux-3.14.14/arch/arm64/kernel/hw_breakpoint.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/kernel/hw_breakpoint.c 2014-12-08 00:31:51.420418001 -0600
@@ -20,6 +20,7 @@
#define pr_fmt(fmt) "hw-breakpoint: " fmt
@@ -39927,9 +39953,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/kernel/hw_breakpoint.c linux-3.14.22/arc
#include <asm/current.h>
#include <asm/debug-monitors.h>
#include <asm/hw_breakpoint.h>
-diff -Nur linux-3.14.22.orig/arch/arm64/kernel/kgdb.c linux-3.14.22/arch/arm64/kernel/kgdb.c
---- linux-3.14.22.orig/arch/arm64/kernel/kgdb.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/kernel/kgdb.c 2014-10-22 14:55:50.182220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/kernel/kgdb.c linux-imx6-3.14/arch/arm64/kernel/kgdb.c
+--- linux-3.14.14/arch/arm64/kernel/kgdb.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/kernel/kgdb.c 2014-12-08 00:31:51.420418001 -0600
@@ -0,0 +1,336 @@
+/*
+ * AArch64 KGDB support
@@ -40267,9 +40293,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/kernel/kgdb.c linux-3.14.22/arch/arm64/k
+ KGDB_DYN_BRK_INS_BYTE3,
+ }
+};
-diff -Nur linux-3.14.22.orig/arch/arm64/kernel/Makefile linux-3.14.22/arch/arm64/kernel/Makefile
---- linux-3.14.22.orig/arch/arm64/kernel/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/kernel/Makefile 2014-10-22 14:55:50.182220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/kernel/Makefile linux-imx6-3.14/arch/arm64/kernel/Makefile
+--- linux-3.14.14/arch/arm64/kernel/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/kernel/Makefile 2014-12-08 00:31:51.416418001 -0600
@@ -5,21 +5,29 @@
CPPFLAGS_vmlinux.lds := -DTEXT_OFFSET=$(TEXT_OFFSET)
AFLAGS_head.o := -DTEXT_OFFSET=$(TEXT_OFFSET)
@@ -40302,9 +40328,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/kernel/Makefile linux-3.14.22/arch/arm64
obj-y += $(arm64-obj-y) vdso/
obj-m += $(arm64-obj-m)
-diff -Nur linux-3.14.22.orig/arch/arm64/kernel/perf_event.c linux-3.14.22/arch/arm64/kernel/perf_event.c
---- linux-3.14.22.orig/arch/arm64/kernel/perf_event.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/kernel/perf_event.c 2014-10-22 14:55:50.182220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/kernel/perf_event.c linux-imx6-3.14/arch/arm64/kernel/perf_event.c
+--- linux-3.14.14/arch/arm64/kernel/perf_event.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/kernel/perf_event.c 2014-12-08 00:31:51.420418001 -0600
@@ -1348,8 +1348,8 @@
* Callchain handling code.
*/
@@ -40415,9 +40441,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/kernel/perf_event.c linux-3.14.22/arch/a
walk_stackframe(&frame, callchain_trace, entry);
}
-diff -Nur linux-3.14.22.orig/arch/arm64/kernel/perf_regs.c linux-3.14.22/arch/arm64/kernel/perf_regs.c
---- linux-3.14.22.orig/arch/arm64/kernel/perf_regs.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/kernel/perf_regs.c 2014-10-22 14:55:50.182220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/kernel/perf_regs.c linux-imx6-3.14/arch/arm64/kernel/perf_regs.c
+--- linux-3.14.14/arch/arm64/kernel/perf_regs.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/kernel/perf_regs.c 2014-12-08 00:31:51.420418001 -0600
@@ -0,0 +1,46 @@
+#include <linux/errno.h>
+#include <linux/kernel.h>
@@ -40465,9 +40491,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/kernel/perf_regs.c linux-3.14.22/arch/ar
+ else
+ return PERF_SAMPLE_REGS_ABI_64;
+}
-diff -Nur linux-3.14.22.orig/arch/arm64/kernel/process.c linux-3.14.22/arch/arm64/kernel/process.c
---- linux-3.14.22.orig/arch/arm64/kernel/process.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/kernel/process.c 2014-10-22 14:55:50.182220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/kernel/process.c linux-imx6-3.14/arch/arm64/kernel/process.c
+--- linux-3.14.14/arch/arm64/kernel/process.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/kernel/process.c 2014-12-08 00:31:51.420418001 -0600
@@ -20,6 +20,7 @@
#include <stdarg.h>
@@ -40476,9 +40502,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/kernel/process.c linux-3.14.22/arch/arm6
#include <linux/export.h>
#include <linux/sched.h>
#include <linux/kernel.h>
-diff -Nur linux-3.14.22.orig/arch/arm64/kernel/ptrace.c linux-3.14.22/arch/arm64/kernel/ptrace.c
---- linux-3.14.22.orig/arch/arm64/kernel/ptrace.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/kernel/ptrace.c 2014-10-22 14:55:51.062220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/kernel/ptrace.c linux-imx6-3.14/arch/arm64/kernel/ptrace.c
+--- linux-3.14.14/arch/arm64/kernel/ptrace.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/kernel/ptrace.c 2014-12-08 00:31:51.420418001 -0600
@@ -19,6 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -40497,7 +40523,7 @@ diff -Nur linux-3.14.22.orig/arch/arm64/kernel/ptrace.c linux-3.14.22/arch/arm64
/*
* TODO: does not yet catch signals sent when the child dies.
* in exit.c or in signal.c.
-@@ -1073,35 +1077,49 @@
+@@ -1072,35 +1076,49 @@
return ptrace_request(child, request, addr, data);
}
@@ -40568,9 +40594,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/kernel/ptrace.c linux-3.14.22/arch/arm64
+ if (test_thread_flag(TIF_SYSCALL_TRACE))
+ tracehook_report_syscall(regs, PTRACE_SYSCALL_EXIT);
+}
-diff -Nur linux-3.14.22.orig/arch/arm64/kernel/return_address.c linux-3.14.22/arch/arm64/kernel/return_address.c
---- linux-3.14.22.orig/arch/arm64/kernel/return_address.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/kernel/return_address.c 2014-10-22 14:55:51.062220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/kernel/return_address.c linux-imx6-3.14/arch/arm64/kernel/return_address.c
+--- linux-3.14.14/arch/arm64/kernel/return_address.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/kernel/return_address.c 2014-12-08 00:31:51.420418001 -0600
@@ -0,0 +1,55 @@
+/*
+ * arch/arm64/kernel/return_address.c
@@ -40627,9 +40653,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/kernel/return_address.c linux-3.14.22/ar
+ return NULL;
+}
+EXPORT_SYMBOL_GPL(return_address);
-diff -Nur linux-3.14.22.orig/arch/arm64/kernel/setup.c linux-3.14.22/arch/arm64/kernel/setup.c
---- linux-3.14.22.orig/arch/arm64/kernel/setup.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/kernel/setup.c 2014-10-22 14:55:51.062220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/kernel/setup.c linux-imx6-3.14/arch/arm64/kernel/setup.c
+--- linux-3.14.14/arch/arm64/kernel/setup.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/kernel/setup.c 2014-12-08 00:31:51.420418001 -0600
@@ -69,6 +69,7 @@
COMPAT_HWCAP_VFPv3|COMPAT_HWCAP_VFPv4|\
COMPAT_HWCAP_NEON|COMPAT_HWCAP_IDIV)
@@ -40686,9 +40712,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/kernel/setup.c linux-3.14.22/arch/arm64/
static DEFINE_PER_CPU(struct cpu, cpu_data);
-diff -Nur linux-3.14.22.orig/arch/arm64/kernel/signal.c linux-3.14.22/arch/arm64/kernel/signal.c
---- linux-3.14.22.orig/arch/arm64/kernel/signal.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/kernel/signal.c 2014-10-22 14:55:51.062220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/kernel/signal.c linux-imx6-3.14/arch/arm64/kernel/signal.c
+--- linux-3.14.14/arch/arm64/kernel/signal.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/kernel/signal.c 2014-12-08 00:31:51.420418001 -0600
@@ -17,6 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -40705,9 +40731,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/kernel/signal.c linux-3.14.22/arch/arm64
#include <asm/debug-monitors.h>
#include <asm/elf.h>
#include <asm/cacheflush.h>
-diff -Nur linux-3.14.22.orig/arch/arm64/kernel/smp.c linux-3.14.22/arch/arm64/kernel/smp.c
---- linux-3.14.22.orig/arch/arm64/kernel/smp.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/kernel/smp.c 2014-10-22 14:55:51.066220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/kernel/smp.c linux-imx6-3.14/arch/arm64/kernel/smp.c
+--- linux-3.14.14/arch/arm64/kernel/smp.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/kernel/smp.c 2014-12-08 00:31:51.420418001 -0600
@@ -114,6 +114,11 @@
return ret;
}
@@ -40740,9 +40766,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/kernel/smp.c linux-3.14.22/arch/arm64/ke
/*
* are we trying to boot more cores than exist?
*/
-diff -Nur linux-3.14.22.orig/arch/arm64/kernel/stacktrace.c linux-3.14.22/arch/arm64/kernel/stacktrace.c
---- linux-3.14.22.orig/arch/arm64/kernel/stacktrace.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/kernel/stacktrace.c 2014-10-22 14:55:51.066220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/kernel/stacktrace.c linux-imx6-3.14/arch/arm64/kernel/stacktrace.c
+--- linux-3.14.14/arch/arm64/kernel/stacktrace.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/kernel/stacktrace.c 2014-12-08 00:31:51.420418001 -0600
@@ -35,7 +35,7 @@
* ldp x29, x30, [sp]
* add sp, sp, #0x10
@@ -40752,9 +40778,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/kernel/stacktrace.c linux-3.14.22/arch/a
{
unsigned long high, low;
unsigned long fp = frame->fp;
-diff -Nur linux-3.14.22.orig/arch/arm64/kernel/topology.c linux-3.14.22/arch/arm64/kernel/topology.c
---- linux-3.14.22.orig/arch/arm64/kernel/topology.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm64/kernel/topology.c 2014-10-22 14:55:51.066220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/kernel/topology.c linux-imx6-3.14/arch/arm64/kernel/topology.c
+--- linux-3.14.14/arch/arm64/kernel/topology.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm64/kernel/topology.c 2014-12-08 00:31:51.420418001 -0600
@@ -0,0 +1,558 @@
+/*
+ * arch/arm64/kernel/topology.c
@@ -41314,9 +41340,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/kernel/topology.c linux-3.14.22/arch/arm
+ reset_cpu_power();
+ parse_dt_cpu_power();
+}
-diff -Nur linux-3.14.22.orig/arch/arm64/kernel/vdso/Makefile linux-3.14.22/arch/arm64/kernel/vdso/Makefile
---- linux-3.14.22.orig/arch/arm64/kernel/vdso/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/kernel/vdso/Makefile 2014-10-22 14:55:51.066220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/kernel/vdso/Makefile linux-imx6-3.14/arch/arm64/kernel/vdso/Makefile
+--- linux-3.14.14/arch/arm64/kernel/vdso/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/kernel/vdso/Makefile 2014-12-08 00:31:51.420418001 -0600
@@ -47,9 +47,9 @@
$(call if_changed_dep,vdsoas)
@@ -41329,9 +41355,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/kernel/vdso/Makefile linux-3.14.22/arch/
cmd_vdsoas = $(CC) $(a_flags) -c -o $@ $<
# Install commands for the unstripped file
-diff -Nur linux-3.14.22.orig/arch/arm64/kernel/vdso.c linux-3.14.22/arch/arm64/kernel/vdso.c
---- linux-3.14.22.orig/arch/arm64/kernel/vdso.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/kernel/vdso.c 2014-10-22 14:55:51.066220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/kernel/vdso.c linux-imx6-3.14/arch/arm64/kernel/vdso.c
+--- linux-3.14.14/arch/arm64/kernel/vdso.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/kernel/vdso.c 2014-12-08 00:31:51.420418001 -0600
@@ -156,11 +156,12 @@
int uses_interp)
{
@@ -41406,9 +41432,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/kernel/vdso.c linux-3.14.22/arch/arm64/k
}
return NULL;
-diff -Nur linux-3.14.22.orig/arch/arm64/kernel/vmlinux.lds.S linux-3.14.22/arch/arm64/kernel/vmlinux.lds.S
---- linux-3.14.22.orig/arch/arm64/kernel/vmlinux.lds.S 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/kernel/vmlinux.lds.S 2014-10-22 14:55:51.066220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/kernel/vmlinux.lds.S linux-imx6-3.14/arch/arm64/kernel/vmlinux.lds.S
+--- linux-3.14.14/arch/arm64/kernel/vmlinux.lds.S 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/kernel/vmlinux.lds.S 2014-12-08 00:31:51.420418001 -0600
@@ -104,6 +104,13 @@
_edata = .;
@@ -41423,9 +41449,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/kernel/vmlinux.lds.S linux-3.14.22/arch/
_end = .;
STABS_DEBUG
-diff -Nur linux-3.14.22.orig/arch/arm64/Makefile linux-3.14.22/arch/arm64/Makefile
---- linux-3.14.22.orig/arch/arm64/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/Makefile 2014-10-22 14:55:51.066220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/Makefile linux-imx6-3.14/arch/arm64/Makefile
+--- linux-3.14.14/arch/arm64/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/Makefile 2014-12-08 00:31:51.408418001 -0600
@@ -45,6 +45,7 @@
core-y += arch/arm64/kernel/ arch/arm64/mm/
core-$(CONFIG_KVM) += arch/arm64/kvm/
@@ -41434,9 +41460,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/Makefile linux-3.14.22/arch/arm64/Makefi
libs-y := arch/arm64/lib/ $(libs-y)
libs-y += $(LIBGCC)
-diff -Nur linux-3.14.22.orig/arch/arm64/mm/cache.S linux-3.14.22/arch/arm64/mm/cache.S
---- linux-3.14.22.orig/arch/arm64/mm/cache.S 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/mm/cache.S 2014-10-22 14:55:51.070220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/mm/cache.S linux-imx6-3.14/arch/arm64/mm/cache.S
+--- linux-3.14.14/arch/arm64/mm/cache.S 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/mm/cache.S 2014-12-08 00:31:51.424418001 -0600
@@ -30,7 +30,7 @@
*
* Corrupted registers: x0-x7, x9-x11
@@ -41544,9 +41570,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/mm/cache.S linux-3.14.22/arch/arm64/mm/c
+ b.ne __dma_inv_range
+ ret
+ENDPROC(__dma_unmap_area)
-diff -Nur linux-3.14.22.orig/arch/arm64/mm/copypage.c linux-3.14.22/arch/arm64/mm/copypage.c
---- linux-3.14.22.orig/arch/arm64/mm/copypage.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/mm/copypage.c 2014-10-22 14:55:51.070220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/mm/copypage.c linux-imx6-3.14/arch/arm64/mm/copypage.c
+--- linux-3.14.14/arch/arm64/mm/copypage.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/mm/copypage.c 2014-12-08 00:31:51.424418001 -0600
@@ -27,8 +27,10 @@
copy_page(kto, kfrom);
__flush_dcache_area(kto, PAGE_SIZE);
@@ -41558,9 +41584,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/mm/copypage.c linux-3.14.22/arch/arm64/m
clear_page(kaddr);
}
+EXPORT_SYMBOL_GPL(__cpu_clear_user_page);
-diff -Nur linux-3.14.22.orig/arch/arm64/mm/dma-mapping.c linux-3.14.22/arch/arm64/mm/dma-mapping.c
---- linux-3.14.22.orig/arch/arm64/mm/dma-mapping.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/mm/dma-mapping.c 2014-10-22 14:55:51.070220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/mm/dma-mapping.c linux-imx6-3.14/arch/arm64/mm/dma-mapping.c
+--- linux-3.14.14/arch/arm64/mm/dma-mapping.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/mm/dma-mapping.c 2014-12-08 00:31:51.424418001 -0600
@@ -22,26 +22,39 @@
#include <linux/slab.h>
#include <linux/dma-mapping.h>
@@ -41886,9 +41912,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/mm/dma-mapping.c linux-3.14.22/arch/arm6
#define PREALLOC_DMA_DEBUG_ENTRIES 4096
-diff -Nur linux-3.14.22.orig/arch/arm64/mm/init.c linux-3.14.22/arch/arm64/mm/init.c
---- linux-3.14.22.orig/arch/arm64/mm/init.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/mm/init.c 2014-10-22 14:55:51.070220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/mm/init.c linux-imx6-3.14/arch/arm64/mm/init.c
+--- linux-3.14.14/arch/arm64/mm/init.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/mm/init.c 2014-12-08 00:31:51.424418001 -0600
@@ -30,6 +30,7 @@
#include <linux/memblock.h>
#include <linux/sort.h>
@@ -41985,9 +42011,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/mm/init.c linux-3.14.22/arch/arm64/mm/in
max_mapnr = pfn_to_page(max_pfn + PHYS_PFN_OFFSET) - mem_map;
#ifndef CONFIG_SPARSEMEM_VMEMMAP
-diff -Nur linux-3.14.22.orig/arch/arm64/mm/proc.S linux-3.14.22/arch/arm64/mm/proc.S
---- linux-3.14.22.orig/arch/arm64/mm/proc.S 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm64/mm/proc.S 2014-10-22 14:55:51.070220001 -0500
+diff -Nur linux-3.14.14/arch/arm64/mm/proc.S linux-imx6-3.14/arch/arm64/mm/proc.S
+--- linux-3.14.14/arch/arm64/mm/proc.S 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm64/mm/proc.S 2014-12-08 00:31:51.424418001 -0600
@@ -173,12 +173,6 @@
* value of the SCTLR_EL1 register.
*/
@@ -42001,9 +42027,9 @@ diff -Nur linux-3.14.22.orig/arch/arm64/mm/proc.S linux-3.14.22/arch/arm64/mm/pr
ic iallu // I+BTB cache invalidate
tlbi vmalle1is // invalidate I + D TLBs
dsb sy
-diff -Nur linux-3.14.22.orig/arch/avr32/kernel/cpu.c linux-3.14.22/arch/avr32/kernel/cpu.c
---- linux-3.14.22.orig/arch/avr32/kernel/cpu.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/avr32/kernel/cpu.c 2014-10-22 14:55:51.070220001 -0500
+diff -Nur linux-3.14.14/arch/avr32/kernel/cpu.c linux-imx6-3.14/arch/avr32/kernel/cpu.c
+--- linux-3.14.14/arch/avr32/kernel/cpu.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/avr32/kernel/cpu.c 2014-12-08 00:31:51.432418001 -0600
@@ -39,10 +39,12 @@
size_t count)
{
@@ -42100,9 +42126,9 @@ diff -Nur linux-3.14.22.orig/arch/avr32/kernel/cpu.c linux-3.14.22/arch/avr32/ke
if (val)
val = 1;
-diff -Nur linux-3.14.22.orig/arch/blackfin/include/asm/ftrace.h linux-3.14.22/arch/blackfin/include/asm/ftrace.h
---- linux-3.14.22.orig/arch/blackfin/include/asm/ftrace.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/blackfin/include/asm/ftrace.h 2014-10-22 14:55:51.070220001 -0500
+diff -Nur linux-3.14.14/arch/blackfin/include/asm/ftrace.h linux-imx6-3.14/arch/blackfin/include/asm/ftrace.h
+--- linux-3.14.14/arch/blackfin/include/asm/ftrace.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/blackfin/include/asm/ftrace.h 2014-12-08 00:31:51.440418001 -0600
@@ -66,16 +66,7 @@
#endif /* CONFIG_FRAME_POINTER */
@@ -42121,9 +42147,9 @@ diff -Nur linux-3.14.22.orig/arch/blackfin/include/asm/ftrace.h linux-3.14.22/ar
#endif /* __ASSEMBLY__ */
-diff -Nur linux-3.14.22.orig/arch/hexagon/include/asm/elf.h linux-3.14.22/arch/hexagon/include/asm/elf.h
---- linux-3.14.22.orig/arch/hexagon/include/asm/elf.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/hexagon/include/asm/elf.h 2014-10-22 14:55:51.926220001 -0500
+diff -Nur linux-3.14.14/arch/hexagon/include/asm/elf.h linux-imx6-3.14/arch/hexagon/include/asm/elf.h
+--- linux-3.14.14/arch/hexagon/include/asm/elf.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/hexagon/include/asm/elf.h 2014-12-08 00:31:51.536418001 -0600
@@ -1,7 +1,7 @@
/*
* ELF definitions for the Hexagon architecture
@@ -42133,9 +42159,9 @@ diff -Nur linux-3.14.22.orig/arch/hexagon/include/asm/elf.h linux-3.14.22/arch/h
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
-diff -Nur linux-3.14.22.orig/arch/parisc/include/asm/ftrace.h linux-3.14.22/arch/parisc/include/asm/ftrace.h
---- linux-3.14.22.orig/arch/parisc/include/asm/ftrace.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/parisc/include/asm/ftrace.h 2014-10-22 14:55:51.938220001 -0500
+diff -Nur linux-3.14.14/arch/parisc/include/asm/ftrace.h linux-imx6-3.14/arch/parisc/include/asm/ftrace.h
+--- linux-3.14.14/arch/parisc/include/asm/ftrace.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/parisc/include/asm/ftrace.h 2014-12-08 00:31:51.852418001 -0600
@@ -24,15 +24,7 @@
extern unsigned long return_address(unsigned int);
@@ -42153,9 +42179,9 @@ diff -Nur linux-3.14.22.orig/arch/parisc/include/asm/ftrace.h linux-3.14.22/arch
#endif /* __ASSEMBLY__ */
-diff -Nur linux-3.14.22.orig/arch/s390/include/asm/cio.h linux-3.14.22/arch/s390/include/asm/cio.h
---- linux-3.14.22.orig/arch/s390/include/asm/cio.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/s390/include/asm/cio.h 2014-10-22 14:55:51.942220001 -0500
+diff -Nur linux-3.14.14/arch/s390/include/asm/cio.h linux-imx6-3.14/arch/s390/include/asm/cio.h
+--- linux-3.14.14/arch/s390/include/asm/cio.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/s390/include/asm/cio.h 2014-12-08 00:31:52.040418001 -0600
@@ -199,7 +199,7 @@
/**
* struct irb - interruption response block
@@ -42165,9 +42191,9 @@ diff -Nur linux-3.14.22.orig/arch/s390/include/asm/cio.h linux-3.14.22/arch/s390
* @ecw: extended control word
*
* The irb that is handed to the device driver when an interrupt occurs. For
-diff -Nur linux-3.14.22.orig/arch/sh/include/asm/ftrace.h linux-3.14.22/arch/sh/include/asm/ftrace.h
---- linux-3.14.22.orig/arch/sh/include/asm/ftrace.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/sh/include/asm/ftrace.h 2014-10-22 14:55:51.942220001 -0500
+diff -Nur linux-3.14.14/arch/sh/include/asm/ftrace.h linux-imx6-3.14/arch/sh/include/asm/ftrace.h
+--- linux-3.14.14/arch/sh/include/asm/ftrace.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/sh/include/asm/ftrace.h 2014-12-08 00:31:52.108418001 -0600
@@ -40,15 +40,7 @@
/* arch/sh/kernel/return_address.c */
extern void *return_address(unsigned int);
@@ -42185,9 +42211,9 @@ diff -Nur linux-3.14.22.orig/arch/sh/include/asm/ftrace.h linux-3.14.22/arch/sh/
#endif /* __ASSEMBLY__ */
-diff -Nur linux-3.14.22.orig/arch/x86/kernel/setup.c linux-3.14.22/arch/x86/kernel/setup.c
---- linux-3.14.22.orig/arch/x86/kernel/setup.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/x86/kernel/setup.c 2014-10-22 14:55:51.942220001 -0500
+diff -Nur linux-3.14.14/arch/x86/kernel/setup.c linux-imx6-3.14/arch/x86/kernel/setup.c
+--- linux-3.14.14/arch/x86/kernel/setup.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/x86/kernel/setup.c 2014-12-08 00:31:52.308418001 -0600
@@ -1120,7 +1120,7 @@
setup_real_mode();
@@ -42197,9 +42223,9 @@ diff -Nur linux-3.14.22.orig/arch/x86/kernel/setup.c linux-3.14.22/arch/x86/kern
/*
* NOTE: On x86-32, only from this point on, fixmaps are ready for use.
-diff -Nur linux-3.14.22.orig/block/bfq-cgroup.c linux-3.14.22/block/bfq-cgroup.c
---- linux-3.14.22.orig/block/bfq-cgroup.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/block/bfq-cgroup.c 2014-10-22 14:55:51.950220001 -0500
+diff -Nur linux-3.14.14/block/bfq-cgroup.c linux-imx6-3.14/block/bfq-cgroup.c
+--- linux-3.14.14/block/bfq-cgroup.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/block/bfq-cgroup.c 2014-12-08 00:31:52.364418001 -0600
@@ -0,0 +1,932 @@
+/*
+ * BFQ: CGROUPS support.
@@ -43133,9 +43159,9 @@ diff -Nur linux-3.14.22.orig/block/bfq-cgroup.c linux-3.14.22/block/bfq-cgroup.c
+ return bfqg;
+}
+#endif
-diff -Nur linux-3.14.22.orig/block/bfq.h linux-3.14.22/block/bfq.h
---- linux-3.14.22.orig/block/bfq.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/block/bfq.h 2014-10-22 14:55:51.954220001 -0500
+diff -Nur linux-3.14.14/block/bfq.h linux-imx6-3.14/block/bfq.h
+--- linux-3.14.14/block/bfq.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/block/bfq.h 2014-12-08 00:31:52.364418001 -0600
@@ -0,0 +1,770 @@
+/*
+ * BFQ-v7r5 for 3.14.0: data structures and common functions prototypes.
@@ -43907,9 +43933,9 @@ diff -Nur linux-3.14.22.orig/block/bfq.h linux-3.14.22/block/bfq.h
+static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq);
+
+#endif /* _BFQ_H */
-diff -Nur linux-3.14.22.orig/block/bfq-ioc.c linux-3.14.22/block/bfq-ioc.c
---- linux-3.14.22.orig/block/bfq-ioc.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/block/bfq-ioc.c 2014-10-22 14:55:51.954220001 -0500
+diff -Nur linux-3.14.14/block/bfq-ioc.c linux-imx6-3.14/block/bfq-ioc.c
+--- linux-3.14.14/block/bfq-ioc.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/block/bfq-ioc.c 2014-12-08 00:31:52.364418001 -0600
@@ -0,0 +1,36 @@
+/*
+ * BFQ: I/O context handling.
@@ -43947,9 +43973,9 @@ diff -Nur linux-3.14.22.orig/block/bfq-ioc.c linux-3.14.22/block/bfq-ioc.c
+ return icq_to_bic(ioc_lookup_icq(ioc, bfqd->queue));
+ return NULL;
+}
-diff -Nur linux-3.14.22.orig/block/bfq-iosched.c linux-3.14.22/block/bfq-iosched.c
---- linux-3.14.22.orig/block/bfq-iosched.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/block/bfq-iosched.c 2014-10-22 14:55:51.958220001 -0500
+diff -Nur linux-3.14.14/block/bfq-iosched.c linux-imx6-3.14/block/bfq-iosched.c
+--- linux-3.14.14/block/bfq-iosched.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/block/bfq-iosched.c 2014-12-08 00:31:52.364418001 -0600
@@ -0,0 +1,3919 @@
+/*
+ * Budget Fair Queueing (BFQ) disk scheduler.
@@ -47870,9 +47896,9 @@ diff -Nur linux-3.14.22.orig/block/bfq-iosched.c linux-3.14.22/block/bfq-iosched
+
+MODULE_AUTHOR("Fabio Checconi, Paolo Valente");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/block/bfq-sched.c linux-3.14.22/block/bfq-sched.c
---- linux-3.14.22.orig/block/bfq-sched.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/block/bfq-sched.c 2014-10-22 14:55:51.958220001 -0500
+diff -Nur linux-3.14.14/block/bfq-sched.c linux-imx6-3.14/block/bfq-sched.c
+--- linux-3.14.14/block/bfq-sched.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/block/bfq-sched.c 2014-12-08 00:31:52.364418001 -0600
@@ -0,0 +1,1179 @@
+/*
+ * BFQ: Hierarchical B-WF2Q+ scheduler.
@@ -49053,9 +49079,9 @@ diff -Nur linux-3.14.22.orig/block/bfq-sched.c linux-3.14.22/block/bfq-sched.c
+ if (bfqq->wr_coeff > 1)
+ bfqd->wr_busy_queues++;
+}
-diff -Nur linux-3.14.22.orig/block/blk-core.c linux-3.14.22/block/blk-core.c
---- linux-3.14.22.orig/block/blk-core.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/block/blk-core.c 2014-10-22 14:55:51.958220001 -0500
+diff -Nur linux-3.14.14/block/blk-core.c linux-imx6-3.14/block/blk-core.c
+--- linux-3.14.14/block/blk-core.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/block/blk-core.c 2014-12-08 00:31:52.368418001 -0600
@@ -1928,7 +1928,7 @@
* in some cases below, so export this function.
* Request stacking drivers like request-based dm may change the queue
@@ -49065,9 +49091,9 @@ diff -Nur linux-3.14.22.orig/block/blk-core.c linux-3.14.22/block/blk-core.c
* the new queue limits again when they dispatch those requests,
* although such checkings are also done against the old queue limits
* when submitting requests.
-diff -Nur linux-3.14.22.orig/block/blk-map.c linux-3.14.22/block/blk-map.c
---- linux-3.14.22.orig/block/blk-map.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/block/blk-map.c 2014-10-22 14:55:51.962220001 -0500
+diff -Nur linux-3.14.14/block/blk-map.c linux-imx6-3.14/block/blk-map.c
+--- linux-3.14.14/block/blk-map.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/block/blk-map.c 2014-12-08 00:31:52.368418001 -0600
@@ -285,7 +285,7 @@
*
* Description:
@@ -49077,9 +49103,9 @@ diff -Nur linux-3.14.22.orig/block/blk-map.c linux-3.14.22/block/blk-map.c
* buffers.
*/
int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
-diff -Nur linux-3.14.22.orig/block/Kconfig.iosched linux-3.14.22/block/Kconfig.iosched
---- linux-3.14.22.orig/block/Kconfig.iosched 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/block/Kconfig.iosched 2014-10-22 14:55:51.962220001 -0500
+diff -Nur linux-3.14.14/block/Kconfig.iosched linux-imx6-3.14/block/Kconfig.iosched
+--- linux-3.14.14/block/Kconfig.iosched 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/block/Kconfig.iosched 2014-12-08 00:31:52.364418001 -0600
@@ -39,6 +39,27 @@
---help---
Enable group IO scheduling in CFQ.
@@ -49133,9 +49159,9 @@ diff -Nur linux-3.14.22.orig/block/Kconfig.iosched linux-3.14.22/block/Kconfig.i
default "noop" if DEFAULT_NOOP
endmenu
-diff -Nur linux-3.14.22.orig/block/Makefile linux-3.14.22/block/Makefile
---- linux-3.14.22.orig/block/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/block/Makefile 2014-10-22 14:55:51.962220001 -0500
+diff -Nur linux-3.14.14/block/Makefile linux-imx6-3.14/block/Makefile
+--- linux-3.14.14/block/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/block/Makefile 2014-12-08 00:31:52.364418001 -0600
@@ -16,6 +16,7 @@
obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o
obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o
@@ -49144,9 +49170,9 @@ diff -Nur linux-3.14.22.orig/block/Makefile linux-3.14.22/block/Makefile
obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o
obj-$(CONFIG_BLK_DEV_INTEGRITY) += blk-integrity.o
-diff -Nur linux-3.14.22.orig/crypto/blkcipher.c linux-3.14.22/crypto/blkcipher.c
---- linux-3.14.22.orig/crypto/blkcipher.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/crypto/blkcipher.c 2014-10-22 14:55:51.962220001 -0500
+diff -Nur linux-3.14.14/crypto/blkcipher.c linux-imx6-3.14/crypto/blkcipher.c
+--- linux-3.14.14/crypto/blkcipher.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/crypto/blkcipher.c 2014-12-08 00:31:52.376418001 -0600
@@ -70,14 +70,12 @@
return max(start, end_page);
}
@@ -49346,9 +49372,9 @@ diff -Nur linux-3.14.22.orig/crypto/blkcipher.c linux-3.14.22/crypto/blkcipher.c
static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
unsigned int keylen)
{
-diff -Nur linux-3.14.22.orig/crypto/tcrypt.c linux-3.14.22/crypto/tcrypt.c
---- linux-3.14.22.orig/crypto/tcrypt.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/crypto/tcrypt.c 2014-10-22 14:55:51.962220001 -0500
+diff -Nur linux-3.14.14/crypto/tcrypt.c linux-imx6-3.14/crypto/tcrypt.c
+--- linux-3.14.14/crypto/tcrypt.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/crypto/tcrypt.c 2014-12-08 00:31:52.384418001 -0600
@@ -33,6 +33,7 @@
#include <linux/jiffies.h>
#include <linux/timex.h>
@@ -49397,9 +49423,9 @@ diff -Nur linux-3.14.22.orig/crypto/tcrypt.c linux-3.14.22/crypto/tcrypt.c
name++;
}
}
-diff -Nur linux-3.14.22.orig/Documentation/ABI/testing/sysfs-class-net-statistics linux-3.14.22/Documentation/ABI/testing/sysfs-class-net-statistics
---- linux-3.14.22.orig/Documentation/ABI/testing/sysfs-class-net-statistics 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/Documentation/ABI/testing/sysfs-class-net-statistics 2014-10-22 14:55:51.962220001 -0500
+diff -Nur linux-3.14.14/Documentation/ABI/testing/sysfs-class-net-statistics linux-imx6-3.14/Documentation/ABI/testing/sysfs-class-net-statistics
+--- linux-3.14.14/Documentation/ABI/testing/sysfs-class-net-statistics 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/Documentation/ABI/testing/sysfs-class-net-statistics 2014-12-08 00:31:50.752418001 -0600
@@ -0,0 +1,201 @@
+What: /sys/class/<iface>/statistics/collisions
+Date: April 2005
@@ -49602,9 +49628,9 @@ diff -Nur linux-3.14.22.orig/Documentation/ABI/testing/sysfs-class-net-statistic
+ due to a window collision. The specific meaning depends on the
+ MAC layer used. On Ethernet this is usually used to report
+ late collisions errors.
-diff -Nur linux-3.14.22.orig/Documentation/arm64/booting.txt linux-3.14.22/Documentation/arm64/booting.txt
---- linux-3.14.22.orig/Documentation/arm64/booting.txt 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/Documentation/arm64/booting.txt 2014-10-22 14:55:51.962220001 -0500
+diff -Nur linux-3.14.14/Documentation/arm64/booting.txt linux-imx6-3.14/Documentation/arm64/booting.txt
+--- linux-3.14.14/Documentation/arm64/booting.txt 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/Documentation/arm64/booting.txt 2014-12-08 00:31:50.844418001 -0600
@@ -111,8 +111,14 @@
- Caches, MMUs
The MMU must be off.
@@ -49622,9 +49648,9 @@ diff -Nur linux-3.14.22.orig/Documentation/arm64/booting.txt linux-3.14.22/Docum
- Architected timers
CNTFRQ must be programmed with the timer frequency and CNTVOFF must
-diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt linux-3.14.22/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt
---- linux-3.14.22.orig/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt 2014-10-22 14:55:51.982220001 -0500
+diff -Nur linux-3.14.14/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt linux-imx6-3.14/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt
+--- linux-3.14.14/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt 2014-12-08 00:31:50.860418001 -0600
@@ -0,0 +1,64 @@
+Freescale Busfreq driver
+
@@ -49690,9 +49716,9 @@ diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/arm/imx/busfreq-i
+ SET_RUNTIME_PM_OPS(ipu_runtime_suspend, ipu_runtime_resume, NULL)
+ SET_SYSTEM_SLEEP_PM_OPS(ipu_suspend, ipu_resume)
+};
-diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/arm/imx/gpc.txt linux-3.14.22/Documentation/devicetree/bindings/arm/imx/gpc.txt
---- linux-3.14.22.orig/Documentation/devicetree/bindings/arm/imx/gpc.txt 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/Documentation/devicetree/bindings/arm/imx/gpc.txt 2014-10-22 14:55:51.982220001 -0500
+diff -Nur linux-3.14.14/Documentation/devicetree/bindings/arm/imx/gpc.txt linux-imx6-3.14/Documentation/devicetree/bindings/arm/imx/gpc.txt
+--- linux-3.14.14/Documentation/devicetree/bindings/arm/imx/gpc.txt 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/Documentation/devicetree/bindings/arm/imx/gpc.txt 2014-12-08 00:31:50.860418001 -0600
@@ -0,0 +1,20 @@
+Freescale imx GPC bindings
+
@@ -49714,9 +49740,9 @@ diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/arm/imx/gpc.txt l
+ fsl,cpu_pdnscr_iso2sw = <0x1>;
+ fsl,cpu_pdnscr_iso = <0x1>;
+ };
-diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/arm/pmu.txt linux-3.14.22/Documentation/devicetree/bindings/arm/pmu.txt
---- linux-3.14.22.orig/Documentation/devicetree/bindings/arm/pmu.txt 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/Documentation/devicetree/bindings/arm/pmu.txt 2014-10-22 14:55:51.982220001 -0500
+diff -Nur linux-3.14.14/Documentation/devicetree/bindings/arm/pmu.txt linux-imx6-3.14/Documentation/devicetree/bindings/arm/pmu.txt
+--- linux-3.14.14/Documentation/devicetree/bindings/arm/pmu.txt 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/Documentation/devicetree/bindings/arm/pmu.txt 2014-12-08 00:31:50.864418001 -0600
@@ -17,6 +17,9 @@
"arm,arm1176-pmu"
"arm,arm1136-pmu"
@@ -49727,9 +49753,9 @@ diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/arm/pmu.txt linux
Example:
-diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/ata/ahci-platform.txt linux-3.14.22/Documentation/devicetree/bindings/ata/ahci-platform.txt
---- linux-3.14.22.orig/Documentation/devicetree/bindings/ata/ahci-platform.txt 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/Documentation/devicetree/bindings/ata/ahci-platform.txt 2014-10-22 14:55:51.982220001 -0500
+diff -Nur linux-3.14.14/Documentation/devicetree/bindings/ata/ahci-platform.txt linux-imx6-3.14/Documentation/devicetree/bindings/ata/ahci-platform.txt
+--- linux-3.14.14/Documentation/devicetree/bindings/ata/ahci-platform.txt 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/Documentation/devicetree/bindings/ata/ahci-platform.txt 2014-12-08 00:31:50.880418001 -0600
@@ -4,12 +4,19 @@
Each SATA controller should have its own node.
@@ -49751,9 +49777,9 @@ diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/ata/ahci-platform
Example:
sata@ffe08000 {
-diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/clock/imx6q-clock.txt linux-3.14.22/Documentation/devicetree/bindings/clock/imx6q-clock.txt
---- linux-3.14.22.orig/Documentation/devicetree/bindings/clock/imx6q-clock.txt 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/Documentation/devicetree/bindings/clock/imx6q-clock.txt 2014-10-22 14:55:51.982220001 -0500
+diff -Nur linux-3.14.14/Documentation/devicetree/bindings/clock/imx6q-clock.txt linux-imx6-3.14/Documentation/devicetree/bindings/clock/imx6q-clock.txt
+--- linux-3.14.14/Documentation/devicetree/bindings/clock/imx6q-clock.txt 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/Documentation/devicetree/bindings/clock/imx6q-clock.txt 2014-12-08 00:31:50.884418001 -0600
@@ -89,8 +89,6 @@
gpu3d_shader 74
ipu1_podf 75
@@ -49784,9 +49810,9 @@ diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/clock/imx6q-clock
Examples:
-diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt linux-3.14.22/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
---- linux-3.14.22.orig/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt 2014-10-22 14:55:51.982220001 -0500
+diff -Nur linux-3.14.14/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt linux-imx6-3.14/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
+--- linux-3.14.14/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt 2014-12-08 00:31:50.892418001 -0600
@@ -47,6 +47,7 @@
20 ASRC
21 ESAI
@@ -49795,9 +49821,9 @@ diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/dma/fsl-imx-sdma.
The third cell specifies the transfer priority as below.
-diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt linux-3.14.22/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt
---- linux-3.14.22.orig/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt 2014-10-22 14:55:51.986220001 -0500
+diff -Nur linux-3.14.14/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt linux-imx6-3.14/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt
+--- linux-3.14.14/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt 2014-12-08 00:31:50.892418001 -0600
@@ -0,0 +1,146 @@
+* FSL IPUv3 Display/FB
+
@@ -49945,9 +49971,9 @@ diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.t
+ resets = <&mipi_dsi_reset>;
+ status = "okay";
+ };
-diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/leds/leds-pwm.txt linux-3.14.22/Documentation/devicetree/bindings/leds/leds-pwm.txt
---- linux-3.14.22.orig/Documentation/devicetree/bindings/leds/leds-pwm.txt 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/Documentation/devicetree/bindings/leds/leds-pwm.txt 2014-10-22 14:55:51.986220001 -0500
+diff -Nur linux-3.14.14/Documentation/devicetree/bindings/leds/leds-pwm.txt linux-imx6-3.14/Documentation/devicetree/bindings/leds/leds-pwm.txt
+--- linux-3.14.14/Documentation/devicetree/bindings/leds/leds-pwm.txt 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/Documentation/devicetree/bindings/leds/leds-pwm.txt 2014-12-08 00:31:50.928418001 -0600
@@ -13,6 +13,8 @@
For the pwms and pwm-names property please refer to:
Documentation/devicetree/bindings/pwm/pwm.txt
@@ -49957,9 +49983,9 @@ diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/leds/leds-pwm.txt
- label : (optional)
see Documentation/devicetree/bindings/leds/common.txt
- linux,default-trigger : (optional)
-diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/mailbox/mailbox.txt linux-3.14.22/Documentation/devicetree/bindings/mailbox/mailbox.txt
---- linux-3.14.22.orig/Documentation/devicetree/bindings/mailbox/mailbox.txt 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/Documentation/devicetree/bindings/mailbox/mailbox.txt 2014-10-22 14:55:51.986220001 -0500
+diff -Nur linux-3.14.14/Documentation/devicetree/bindings/mailbox/mailbox.txt linux-imx6-3.14/Documentation/devicetree/bindings/mailbox/mailbox.txt
+--- linux-3.14.14/Documentation/devicetree/bindings/mailbox/mailbox.txt 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/Documentation/devicetree/bindings/mailbox/mailbox.txt 2014-12-08 00:31:50.928418001 -0600
@@ -0,0 +1,33 @@
+* Generic Mailbox Controller and client driver bindings
+
@@ -49994,9 +50020,9 @@ diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/mailbox/mailbox.t
+ mbox = <&mailbox 0
+ &mailbox 1>;
+ };
-diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/mlb/mlb150.txt linux-3.14.22/Documentation/devicetree/bindings/mlb/mlb150.txt
---- linux-3.14.22.orig/Documentation/devicetree/bindings/mlb/mlb150.txt 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/Documentation/devicetree/bindings/mlb/mlb150.txt 2014-10-22 14:55:51.990220001 -0500
+diff -Nur linux-3.14.14/Documentation/devicetree/bindings/mlb/mlb150.txt linux-imx6-3.14/Documentation/devicetree/bindings/mlb/mlb150.txt
+--- linux-3.14.14/Documentation/devicetree/bindings/mlb/mlb150.txt 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/Documentation/devicetree/bindings/mlb/mlb150.txt 2014-12-08 00:31:50.932418001 -0600
@@ -0,0 +1,22 @@
+* Freescale Media Local Bus Host Controller (MLB) for i.MX6Q/DL
+
@@ -50020,9 +50046,9 @@ diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/mlb/mlb150.txt li
+ clock-names = "mlb", "pll8_mlb";
+ iram = <&ocram>;
+};
-diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/mmc/mmc.txt linux-3.14.22/Documentation/devicetree/bindings/mmc/mmc.txt
---- linux-3.14.22.orig/Documentation/devicetree/bindings/mmc/mmc.txt 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/Documentation/devicetree/bindings/mmc/mmc.txt 2014-10-22 14:55:51.990220001 -0500
+diff -Nur linux-3.14.14/Documentation/devicetree/bindings/mmc/mmc.txt linux-imx6-3.14/Documentation/devicetree/bindings/mmc/mmc.txt
+--- linux-3.14.14/Documentation/devicetree/bindings/mmc/mmc.txt 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/Documentation/devicetree/bindings/mmc/mmc.txt 2014-12-08 00:31:50.932418001 -0600
@@ -5,6 +5,8 @@
Interpreted by the OF core:
- reg: Registers location and length.
@@ -50048,9 +50074,9 @@ diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/mmc/mmc.txt linux
*NOTE* on CD and WP polarity. To use common for all SD/MMC host controllers line
polarity properties, we have to fix the meaning of the "normal" and "inverted"
line levels. We choose to follow the SDHCI standard, which specifies both those
-diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt linux-3.14.22/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
---- linux-3.14.22.orig/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt 2014-10-22 14:55:51.990220001 -0500
+diff -Nur linux-3.14.14/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt linux-imx6-3.14/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
+--- linux-3.14.14/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt 2014-12-08 00:31:50.940418001 -0600
@@ -71,6 +71,13 @@
name for integer state ID 0, list entry 1 for state ID 1, and
so on.
@@ -50065,9 +50091,9 @@ diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/pinctrl/pinctrl-b
For example:
/* For a client device requiring named states */
-diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/reset/gpio-reset.txt linux-3.14.22/Documentation/devicetree/bindings/reset/gpio-reset.txt
---- linux-3.14.22.orig/Documentation/devicetree/bindings/reset/gpio-reset.txt 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/Documentation/devicetree/bindings/reset/gpio-reset.txt 2014-10-22 14:55:51.990220001 -0500
+diff -Nur linux-3.14.14/Documentation/devicetree/bindings/reset/gpio-reset.txt linux-imx6-3.14/Documentation/devicetree/bindings/reset/gpio-reset.txt
+--- linux-3.14.14/Documentation/devicetree/bindings/reset/gpio-reset.txt 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/Documentation/devicetree/bindings/reset/gpio-reset.txt 2014-12-08 00:31:50.944418001 -0600
@@ -0,0 +1,35 @@
+GPIO reset controller
+=====================
@@ -50104,9 +50130,9 @@ diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/reset/gpio-reset.
+ /* ... */
+ resets = <&sii902x_reset>; /* active-low GPIO5_0, 10 ms delay */
+};
-diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/sound/cs42888.txt linux-3.14.22/Documentation/devicetree/bindings/sound/cs42888.txt
---- linux-3.14.22.orig/Documentation/devicetree/bindings/sound/cs42888.txt 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/Documentation/devicetree/bindings/sound/cs42888.txt 2014-10-22 14:55:51.990220001 -0500
+diff -Nur linux-3.14.14/Documentation/devicetree/bindings/sound/cs42888.txt linux-imx6-3.14/Documentation/devicetree/bindings/sound/cs42888.txt
+--- linux-3.14.14/Documentation/devicetree/bindings/sound/cs42888.txt 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/Documentation/devicetree/bindings/sound/cs42888.txt 2014-12-08 00:31:50.948418001 -0600
@@ -0,0 +1,29 @@
+CS42888 audio CODEC
+
@@ -50137,9 +50163,9 @@ diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/sound/cs42888.txt
+ VLS-supply = <&reg_audio>;
+ VLC-supply = <&reg_audio>;
+};
-diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt linux-3.14.22/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt
---- linux-3.14.22.orig/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt 2014-10-22 14:55:51.994220001 -0500
+diff -Nur linux-3.14.14/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt linux-imx6-3.14/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt
+--- linux-3.14.14/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt 2014-12-08 00:31:50.948418001 -0600
@@ -0,0 +1,23 @@
+* Freescale Asynchronous Sample Rate Converter (ASRC)
+
@@ -50164,9 +50190,9 @@ diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/sound/fsl-asrc-p2
+ fsl,asrc-dma-tx-events = <20 21 22>;
+ status = "okay";
+};
-diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt linux-3.14.22/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt
---- linux-3.14.22.orig/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt 2014-10-22 14:55:51.994220001 -0500
+diff -Nur linux-3.14.14/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt linux-imx6-3.14/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt
+--- linux-3.14.14/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt 2014-12-08 00:31:50.948418001 -0600
@@ -0,0 +1,25 @@
+Freescale i.MX audio complex with CS42888 codec
+
@@ -50193,9 +50219,9 @@ diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/sound/imx-audio-c
+ asrc-controller = <&asrc_p2p>;
+ audio-codec = <&codec>;
+};
-diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt linux-3.14.22/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt
---- linux-3.14.22.orig/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt 2014-10-22 14:55:51.994220001 -0500
+diff -Nur linux-3.14.14/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt linux-imx6-3.14/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt
+--- linux-3.14.14/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt 2014-12-08 00:31:50.948418001 -0600
@@ -24,6 +24,12 @@
Note: The AUDMUX port numbering should start at 1, which is consistent with
hardware manual.
@@ -50216,9 +50242,9 @@ diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/sound/imx-audio-w
+ hp-det-gpios = <&gpio7 8 1>;
+ mic-det-gpios = <&gpio1 9 1>;
};
-diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/sound/wm8962.txt linux-3.14.22/Documentation/devicetree/bindings/sound/wm8962.txt
---- linux-3.14.22.orig/Documentation/devicetree/bindings/sound/wm8962.txt 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/Documentation/devicetree/bindings/sound/wm8962.txt 2014-10-22 14:55:51.994220001 -0500
+diff -Nur linux-3.14.14/Documentation/devicetree/bindings/sound/wm8962.txt linux-imx6-3.14/Documentation/devicetree/bindings/sound/wm8962.txt
+--- linux-3.14.14/Documentation/devicetree/bindings/sound/wm8962.txt 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/Documentation/devicetree/bindings/sound/wm8962.txt 2014-12-08 00:31:50.948418001 -0600
@@ -13,6 +13,14 @@
of R51 (Class D Control 2) gets set, indicating that the speaker is
in mono mode.
@@ -50234,9 +50260,9 @@ diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/sound/wm8962.txt
- mic-cfg : Default register value for R48 (Additional Control 4).
If absent, the default should be the register default.
-diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/usb/mxs-phy.txt linux-3.14.22/Documentation/devicetree/bindings/usb/mxs-phy.txt
---- linux-3.14.22.orig/Documentation/devicetree/bindings/usb/mxs-phy.txt 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/Documentation/devicetree/bindings/usb/mxs-phy.txt 2014-10-22 14:55:51.994220001 -0500
+diff -Nur linux-3.14.14/Documentation/devicetree/bindings/usb/mxs-phy.txt linux-imx6-3.14/Documentation/devicetree/bindings/usb/mxs-phy.txt
+--- linux-3.14.14/Documentation/devicetree/bindings/usb/mxs-phy.txt 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/Documentation/devicetree/bindings/usb/mxs-phy.txt 2014-12-08 00:31:50.952418001 -0600
@@ -1,13 +1,16 @@
* Freescale MXS USB Phy Device
@@ -50255,9 +50281,9 @@ diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/usb/mxs-phy.txt l
interrupts = <0 44 0x04>;
+ fsl,anatop = <&anatop>;
};
-diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/video/fsl,csi-v4l2-capture.txt linux-3.14.22/Documentation/devicetree/bindings/video/fsl,csi-v4l2-capture.txt
---- linux-3.14.22.orig/Documentation/devicetree/bindings/video/fsl,csi-v4l2-capture.txt 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/Documentation/devicetree/bindings/video/fsl,csi-v4l2-capture.txt 2014-10-22 14:55:51.994220001 -0500
+diff -Nur linux-3.14.14/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.14/Documentation/devicetree/bindings/video/fsl,csi-v4l2-capture.txt 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/Documentation/devicetree/bindings/video/fsl,csi-v4l2-capture.txt 2014-12-08 00:31:50.952418001 -0600
@@ -0,0 +1,61 @@
+* Freescale CMOS Sensor Interface (CSI) V4L2 Capture
+
@@ -50320,9 +50346,9 @@ diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/video/fsl,csi-v4l
+ mclk = <24000000>;
+ mclk_source = <0>;
+ };
-diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt linux-3.14.22/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt
---- linux-3.14.22.orig/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt 2014-10-22 14:55:51.994220001 -0500
+diff -Nur linux-3.14.14/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt linux-imx6-3.14/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt
+--- linux-3.14.14/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt 2014-12-08 00:31:50.952418001 -0600
@@ -0,0 +1,42 @@
+* Freescale MIPI CSI2 Controller for i.MX6DQ/i.MX6SDL
+
@@ -50366,9 +50392,9 @@ diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/video/fsl,mipi-cs
+ v_channel = <0>;
+ lanes = <2>;
+ };
-diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/video/fsl,pxp.txt linux-3.14.22/Documentation/devicetree/bindings/video/fsl,pxp.txt
---- linux-3.14.22.orig/Documentation/devicetree/bindings/video/fsl,pxp.txt 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/Documentation/devicetree/bindings/video/fsl,pxp.txt 2014-10-22 14:55:51.994220001 -0500
+diff -Nur linux-3.14.14/Documentation/devicetree/bindings/video/fsl,pxp.txt linux-imx6-3.14/Documentation/devicetree/bindings/video/fsl,pxp.txt
+--- linux-3.14.14/Documentation/devicetree/bindings/video/fsl,pxp.txt 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/Documentation/devicetree/bindings/video/fsl,pxp.txt 2014-12-08 00:31:50.952418001 -0600
@@ -0,0 +1,30 @@
+* Freescale PxP Controller for i.MX6DL, i.MX6SL
+
@@ -50400,9 +50426,9 @@ diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/video/fsl,pxp.txt
+ &pxp {
+ status = "okay";
+ };
-diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt linux-3.14.22/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt
---- linux-3.14.22.orig/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt 2014-10-22 14:55:51.994220001 -0500
+diff -Nur linux-3.14.14/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt linux-imx6-3.14/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt
+--- linux-3.14.14/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt 2014-12-08 00:31:50.952418001 -0600
@@ -0,0 +1,102 @@
+* Freescale V4L2 Capture for i.MX6DQ/i.MX6SDL
+
@@ -50506,9 +50532,9 @@ diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/video/fsl,v4l2-ca
+ mclk_source = <0>;
+ cvbs = <1>;
+ };
-diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt linux-3.14.22/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt
---- linux-3.14.22.orig/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt 2014-10-22 14:55:51.994220001 -0500
+diff -Nur linux-3.14.14/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt linux-imx6-3.14/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt
+--- linux-3.14.14/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt 2014-12-08 00:31:50.952418001 -0600
@@ -0,0 +1,20 @@
+Device-Tree bindings for hdmi video driver
+
@@ -50530,18 +50556,18 @@ diff -Nur linux-3.14.22.orig/Documentation/devicetree/bindings/video/mxc_hdmi_vi
+ fsl,phy_reg_cksymtx = <0x800d>;
+ };
+
-diff -Nur linux-3.14.22.orig/Documentation/filesystems/hfsplus.txt linux-3.14.22/Documentation/filesystems/hfsplus.txt
---- linux-3.14.22.orig/Documentation/filesystems/hfsplus.txt 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/Documentation/filesystems/hfsplus.txt 2014-10-22 14:55:51.994220001 -0500
+diff -Nur linux-3.14.14/Documentation/filesystems/hfsplus.txt linux-imx6-3.14/Documentation/filesystems/hfsplus.txt
+--- linux-3.14.14/Documentation/filesystems/hfsplus.txt 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/Documentation/filesystems/hfsplus.txt 2014-12-08 00:31:50.968418001 -0600
@@ -56,4 +56,4 @@
kernel source: <file:fs/hfsplus>
-Apple Technote 1150 http://developer.apple.com/technotes/tn/tn1150.html
+Apple Technote 1150 https://developer.apple.com/legacy/library/technotes/tn/tn1150.html
-diff -Nur linux-3.14.22.orig/Documentation/kernel-parameters.txt linux-3.14.22/Documentation/kernel-parameters.txt
---- linux-3.14.22.orig/Documentation/kernel-parameters.txt 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/Documentation/kernel-parameters.txt 2014-10-22 14:55:51.994220001 -0500
+diff -Nur linux-3.14.14/Documentation/kernel-parameters.txt linux-imx6-3.14/Documentation/kernel-parameters.txt
+--- linux-3.14.14/Documentation/kernel-parameters.txt 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/Documentation/kernel-parameters.txt 2014-12-08 00:31:50.996418001 -0600
@@ -603,8 +603,11 @@
Also note the kernel might malfunction if you disable
some critical bits.
@@ -50556,9 +50582,9 @@ diff -Nur linux-3.14.22.orig/Documentation/kernel-parameters.txt linux-3.14.22/D
memory allocations. For more information, see
include/linux/dma-contiguous.h
-diff -Nur linux-3.14.22.orig/Documentation/networking/gianfar.txt linux-3.14.22/Documentation/networking/gianfar.txt
---- linux-3.14.22.orig/Documentation/networking/gianfar.txt 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/Documentation/networking/gianfar.txt 2014-10-22 14:55:51.994220001 -0500
+diff -Nur linux-3.14.14/Documentation/networking/gianfar.txt linux-imx6-3.14/Documentation/networking/gianfar.txt
+--- linux-3.14.14/Documentation/networking/gianfar.txt 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/Documentation/networking/gianfar.txt 2014-12-08 00:31:51.008418001 -0600
@@ -1,38 +1,8 @@
The Gianfar Ethernet Driver
-Sysfs File description
@@ -50598,9 +50624,9 @@ diff -Nur linux-3.14.22.orig/Documentation/networking/gianfar.txt linux-3.14.22/
CHECKSUM OFFLOADING
-diff -Nur linux-3.14.22.orig/drivers/ata/acard-ahci.c linux-3.14.22/drivers/ata/acard-ahci.c
---- linux-3.14.22.orig/drivers/ata/acard-ahci.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/acard-ahci.c 2014-10-22 14:55:51.994220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/acard-ahci.c linux-imx6-3.14/drivers/ata/acard-ahci.c
+--- linux-3.14.14/drivers/ata/acard-ahci.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/acard-ahci.c 2014-12-08 00:31:52.424418001 -0600
@@ -36,7 +36,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -50609,9 +50635,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/acard-ahci.c linux-3.14.22/drivers/ata/
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/ahci.c linux-3.14.22/drivers/ata/ahci.c
---- linux-3.14.22.orig/drivers/ata/ahci.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/ahci.c 2014-10-22 14:55:51.998220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/ahci.c linux-imx6-3.14/drivers/ata/ahci.c
+--- linux-3.14.14/drivers/ata/ahci.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/ahci.c 2014-12-08 00:31:52.424418001 -0600
@@ -35,7 +35,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -50620,7 +50646,7 @@ diff -Nur linux-3.14.22.orig/drivers/ata/ahci.c linux-3.14.22/drivers/ata/ahci.c
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
-@@ -593,6 +592,7 @@
+@@ -582,6 +581,7 @@
unsigned long deadline)
{
struct ata_port *ap = link->ap;
@@ -50628,7 +50654,7 @@ diff -Nur linux-3.14.22.orig/drivers/ata/ahci.c linux-3.14.22/drivers/ata/ahci.c
bool online;
int rc;
-@@ -603,7 +603,7 @@
+@@ -592,7 +592,7 @@
rc = sata_link_hardreset(link, sata_ehc_deb_timing(&link->eh_context),
deadline, &online, NULL);
@@ -50637,7 +50663,7 @@ diff -Nur linux-3.14.22.orig/drivers/ata/ahci.c linux-3.14.22/drivers/ata/ahci.c
DPRINTK("EXIT, rc=%d, class=%u\n", rc, *class);
-@@ -618,6 +618,7 @@
+@@ -607,6 +607,7 @@
{
struct ata_port *ap = link->ap;
struct ahci_port_priv *pp = ap->private_data;
@@ -50645,7 +50671,7 @@ diff -Nur linux-3.14.22.orig/drivers/ata/ahci.c linux-3.14.22/drivers/ata/ahci.c
u8 *d2h_fis = pp->rx_fis + RX_FIS_D2H_REG;
struct ata_taskfile tf;
bool online;
-@@ -633,7 +634,7 @@
+@@ -622,7 +623,7 @@
rc = sata_link_hardreset(link, sata_ehc_deb_timing(&link->eh_context),
deadline, &online, NULL);
@@ -50654,7 +50680,7 @@ diff -Nur linux-3.14.22.orig/drivers/ata/ahci.c linux-3.14.22/drivers/ata/ahci.c
/* The pseudo configuration device on SIMG4726 attached to
* ASUS P5W-DH Deluxe doesn't send signature FIS after
-@@ -1129,6 +1130,17 @@
+@@ -1118,6 +1119,17 @@
return pdev->bus->number == (val >> 8) && pdev->devfn == (val & 0xff);
}
@@ -50672,7 +50698,7 @@ diff -Nur linux-3.14.22.orig/drivers/ata/ahci.c linux-3.14.22/drivers/ata/ahci.c
#ifdef CONFIG_ATA_ACPI
static void ahci_gtf_filter_workaround(struct ata_host *host)
{
-@@ -1380,6 +1392,10 @@
+@@ -1369,6 +1381,10 @@
hpriv->mmio = pcim_iomap_table(pdev)[ahci_pci_bar];
@@ -50683,9 +50709,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/ahci.c linux-3.14.22/drivers/ata/ahci.c
/* save initial config */
ahci_pci_save_initial_config(pdev, hpriv);
-diff -Nur linux-3.14.22.orig/drivers/ata/ahci.h linux-3.14.22/drivers/ata/ahci.h
---- linux-3.14.22.orig/drivers/ata/ahci.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/ahci.h 2014-10-22 14:55:51.998220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/ahci.h linux-imx6-3.14/drivers/ata/ahci.h
+--- linux-3.14.14/drivers/ata/ahci.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/ahci.h 2014-12-08 00:31:52.424418001 -0600
@@ -37,6 +37,8 @@
#include <linux/clk.h>
@@ -50731,9 +50757,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/ahci.h linux-3.14.22/drivers/ata/ahci.h
};
extern int ahci_ignore_sss;
-diff -Nur linux-3.14.22.orig/drivers/ata/ahci_imx.c linux-3.14.22/drivers/ata/ahci_imx.c
---- linux-3.14.22.orig/drivers/ata/ahci_imx.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/ahci_imx.c 2014-10-22 14:55:51.998220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/ahci_imx.c linux-imx6-3.14/drivers/ata/ahci_imx.c
+--- linux-3.14.14/drivers/ata/ahci_imx.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/ahci_imx.c 2014-12-08 00:31:52.428418001 -0600
@@ -26,12 +26,29 @@
#include <linux/mfd/syscon.h>
#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
@@ -51554,9 +51580,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/ahci_imx.c linux-3.14.22/drivers/ata/ah
},
};
module_platform_driver(imx_ahci_driver);
-diff -Nur linux-3.14.22.orig/drivers/ata/ahci_platform.c linux-3.14.22/drivers/ata/ahci_platform.c
---- linux-3.14.22.orig/drivers/ata/ahci_platform.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/ahci_platform.c 2014-10-22 14:55:51.998220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/ahci_platform.c linux-imx6-3.14/drivers/ata/ahci_platform.c
+--- linux-3.14.14/drivers/ata/ahci_platform.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/ahci_platform.c 2014-12-08 00:31:52.428418001 -0600
@@ -12,135 +12,36 @@
* any later version.
*/
@@ -51905,9 +51931,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/ahci_platform.c linux-3.14.22/drivers/a
};
module_platform_driver(ahci_driver);
-diff -Nur linux-3.14.22.orig/drivers/ata/ata_generic.c linux-3.14.22/drivers/ata/ata_generic.c
---- linux-3.14.22.orig/drivers/ata/ata_generic.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/ata_generic.c 2014-10-22 14:55:51.998220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/ata_generic.c linux-imx6-3.14/drivers/ata/ata_generic.c
+--- linux-3.14.14/drivers/ata/ata_generic.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/ata_generic.c 2014-12-08 00:31:52.428418001 -0600
@@ -19,7 +19,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -51916,9 +51942,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/ata_generic.c linux-3.14.22/drivers/ata
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/Kconfig linux-3.14.22/drivers/ata/Kconfig
---- linux-3.14.22.orig/drivers/ata/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/Kconfig 2014-10-22 14:55:51.998220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/Kconfig linux-imx6-3.14/drivers/ata/Kconfig
+--- linux-3.14.14/drivers/ata/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/Kconfig 2014-12-08 00:31:52.424418001 -0600
@@ -99,7 +99,7 @@
config AHCI_IMX
@@ -51928,9 +51954,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/Kconfig linux-3.14.22/drivers/ata/Kconf
help
This option enables support for the Freescale i.MX SoC's
onboard AHCI SATA.
-diff -Nur linux-3.14.22.orig/drivers/ata/libahci.c linux-3.14.22/drivers/ata/libahci.c
---- linux-3.14.22.orig/drivers/ata/libahci.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/libahci.c 2014-10-22 14:55:52.002220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/libahci.c linux-imx6-3.14/drivers/ata/libahci.c
+--- linux-3.14.14/drivers/ata/libahci.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/libahci.c 2014-12-08 00:31:52.428418001 -0600
@@ -35,7 +35,6 @@
#include <linux/kernel.h>
#include <linux/gfp.h>
@@ -52080,9 +52106,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/libahci.c linux-3.14.22/drivers/ata/lib
}
static void ahci_pmp_attach(struct ata_port *ap)
-diff -Nur linux-3.14.22.orig/drivers/ata/libahci_platform.c linux-3.14.22/drivers/ata/libahci_platform.c
---- linux-3.14.22.orig/drivers/ata/libahci_platform.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/ata/libahci_platform.c 2014-10-22 14:55:52.002220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/libahci_platform.c linux-imx6-3.14/drivers/ata/libahci_platform.c
+--- linux-3.14.14/drivers/ata/libahci_platform.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/ata/libahci_platform.c 2014-12-08 00:31:52.428418001 -0600
@@ -0,0 +1,544 @@
+/*
+ * AHCI SATA platform library
@@ -52628,9 +52654,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/libahci_platform.c linux-3.14.22/driver
+MODULE_DESCRIPTION("AHCI SATA platform library");
+MODULE_AUTHOR("Anton Vorontsov <avorontsov@ru.mvista.com>");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/drivers/ata/libata-core.c linux-3.14.22/drivers/ata/libata-core.c
---- linux-3.14.22.orig/drivers/ata/libata-core.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/libata-core.c 2014-10-22 14:55:52.002220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/libata-core.c linux-imx6-3.14/drivers/ata/libata-core.c
+--- linux-3.14.14/drivers/ata/libata-core.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/libata-core.c 2014-12-08 00:31:52.428418001 -0600
@@ -1524,7 +1524,7 @@
* @dev: Device to which the command is sent
* @tf: Taskfile registers for the command and the result
@@ -52649,9 +52675,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/libata-core.c linux-3.14.22/drivers/ata
* @buf: Data buffer of the command
* @buflen: Length of data buffer
* @timeout: Timeout in msecs (0 for default)
-diff -Nur linux-3.14.22.orig/drivers/ata/Makefile linux-3.14.22/drivers/ata/Makefile
---- linux-3.14.22.orig/drivers/ata/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/Makefile 2014-10-22 14:55:52.002220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/Makefile linux-imx6-3.14/drivers/ata/Makefile
+--- linux-3.14.14/drivers/ata/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/Makefile 2014-12-08 00:31:52.424418001 -0600
@@ -4,13 +4,13 @@
# non-SFF interface
obj-$(CONFIG_SATA_AHCI) += ahci.o libahci.o
@@ -52668,9 +52694,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/Makefile linux-3.14.22/drivers/ata/Make
# SFF w/ custom DMA
obj-$(CONFIG_PDC_ADMA) += pdc_adma.o
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_acpi.c linux-3.14.22/drivers/ata/pata_acpi.c
---- linux-3.14.22.orig/drivers/ata/pata_acpi.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_acpi.c 2014-10-22 14:55:52.002220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_acpi.c linux-imx6-3.14/drivers/ata/pata_acpi.c
+--- linux-3.14.14/drivers/ata/pata_acpi.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_acpi.c 2014-12-08 00:31:52.432418001 -0600
@@ -7,7 +7,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52679,9 +52705,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_acpi.c linux-3.14.22/drivers/ata/p
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_amd.c linux-3.14.22/drivers/ata/pata_amd.c
---- linux-3.14.22.orig/drivers/ata/pata_amd.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_amd.c 2014-10-22 14:55:52.002220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_amd.c linux-imx6-3.14/drivers/ata/pata_amd.c
+--- linux-3.14.14/drivers/ata/pata_amd.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_amd.c 2014-12-08 00:31:52.432418001 -0600
@@ -17,7 +17,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52690,9 +52716,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_amd.c linux-3.14.22/drivers/ata/pa
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_artop.c linux-3.14.22/drivers/ata/pata_artop.c
---- linux-3.14.22.orig/drivers/ata/pata_artop.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_artop.c 2014-10-22 14:55:52.002220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_artop.c linux-imx6-3.14/drivers/ata/pata_artop.c
+--- linux-3.14.14/drivers/ata/pata_artop.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_artop.c 2014-12-08 00:31:52.432418001 -0600
@@ -19,7 +19,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52701,9 +52727,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_artop.c linux-3.14.22/drivers/ata/
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_at91.c linux-3.14.22/drivers/ata/pata_at91.c
---- linux-3.14.22.orig/drivers/ata/pata_at91.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_at91.c 2014-10-22 14:55:52.002220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_at91.c linux-imx6-3.14/drivers/ata/pata_at91.c
+--- linux-3.14.14/drivers/ata/pata_at91.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_at91.c 2014-12-08 00:31:52.432418001 -0600
@@ -18,7 +18,6 @@
#include <linux/kernel.h>
@@ -52712,9 +52738,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_at91.c linux-3.14.22/drivers/ata/p
#include <linux/blkdev.h>
#include <linux/gfp.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_atiixp.c linux-3.14.22/drivers/ata/pata_atiixp.c
---- linux-3.14.22.orig/drivers/ata/pata_atiixp.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_atiixp.c 2014-10-22 14:55:52.002220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_atiixp.c linux-imx6-3.14/drivers/ata/pata_atiixp.c
+--- linux-3.14.14/drivers/ata/pata_atiixp.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_atiixp.c 2014-12-08 00:31:52.432418001 -0600
@@ -15,7 +15,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52723,9 +52749,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_atiixp.c linux-3.14.22/drivers/ata
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_atp867x.c linux-3.14.22/drivers/ata/pata_atp867x.c
---- linux-3.14.22.orig/drivers/ata/pata_atp867x.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_atp867x.c 2014-10-22 14:55:52.002220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_atp867x.c linux-imx6-3.14/drivers/ata/pata_atp867x.c
+--- linux-3.14.14/drivers/ata/pata_atp867x.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_atp867x.c 2014-12-08 00:31:52.432418001 -0600
@@ -29,7 +29,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52734,9 +52760,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_atp867x.c linux-3.14.22/drivers/at
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_cmd640.c linux-3.14.22/drivers/ata/pata_cmd640.c
---- linux-3.14.22.orig/drivers/ata/pata_cmd640.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_cmd640.c 2014-10-22 14:55:52.006220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_cmd640.c linux-imx6-3.14/drivers/ata/pata_cmd640.c
+--- linux-3.14.14/drivers/ata/pata_cmd640.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_cmd640.c 2014-12-08 00:31:52.432418001 -0600
@@ -15,7 +15,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52745,9 +52771,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_cmd640.c linux-3.14.22/drivers/ata
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/gfp.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_cmd64x.c linux-3.14.22/drivers/ata/pata_cmd64x.c
---- linux-3.14.22.orig/drivers/ata/pata_cmd64x.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_cmd64x.c 2014-10-22 14:55:52.006220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_cmd64x.c linux-imx6-3.14/drivers/ata/pata_cmd64x.c
+--- linux-3.14.14/drivers/ata/pata_cmd64x.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_cmd64x.c 2014-12-08 00:31:52.432418001 -0600
@@ -26,7 +26,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52756,9 +52782,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_cmd64x.c linux-3.14.22/drivers/ata
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_cs5520.c linux-3.14.22/drivers/ata/pata_cs5520.c
---- linux-3.14.22.orig/drivers/ata/pata_cs5520.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_cs5520.c 2014-10-22 14:55:52.006220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_cs5520.c linux-imx6-3.14/drivers/ata/pata_cs5520.c
+--- linux-3.14.14/drivers/ata/pata_cs5520.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_cs5520.c 2014-12-08 00:31:52.432418001 -0600
@@ -34,7 +34,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52767,9 +52793,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_cs5520.c linux-3.14.22/drivers/ata
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_cs5530.c linux-3.14.22/drivers/ata/pata_cs5530.c
---- linux-3.14.22.orig/drivers/ata/pata_cs5530.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_cs5530.c 2014-10-22 14:55:52.006220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_cs5530.c linux-imx6-3.14/drivers/ata/pata_cs5530.c
+--- linux-3.14.14/drivers/ata/pata_cs5530.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_cs5530.c 2014-12-08 00:31:52.432418001 -0600
@@ -26,7 +26,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52778,9 +52804,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_cs5530.c linux-3.14.22/drivers/ata
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_cs5535.c linux-3.14.22/drivers/ata/pata_cs5535.c
---- linux-3.14.22.orig/drivers/ata/pata_cs5535.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_cs5535.c 2014-10-22 14:55:52.006220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_cs5535.c linux-imx6-3.14/drivers/ata/pata_cs5535.c
+--- linux-3.14.14/drivers/ata/pata_cs5535.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_cs5535.c 2014-12-08 00:31:52.432418001 -0600
@@ -31,7 +31,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52789,9 +52815,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_cs5535.c linux-3.14.22/drivers/ata
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_cs5536.c linux-3.14.22/drivers/ata/pata_cs5536.c
---- linux-3.14.22.orig/drivers/ata/pata_cs5536.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_cs5536.c 2014-10-22 14:55:52.006220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_cs5536.c linux-imx6-3.14/drivers/ata/pata_cs5536.c
+--- linux-3.14.14/drivers/ata/pata_cs5536.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_cs5536.c 2014-12-08 00:31:52.432418001 -0600
@@ -33,7 +33,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52800,9 +52826,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_cs5536.c linux-3.14.22/drivers/ata
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/libata.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_cypress.c linux-3.14.22/drivers/ata/pata_cypress.c
---- linux-3.14.22.orig/drivers/ata/pata_cypress.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_cypress.c 2014-10-22 14:55:52.006220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_cypress.c linux-imx6-3.14/drivers/ata/pata_cypress.c
+--- linux-3.14.14/drivers/ata/pata_cypress.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_cypress.c 2014-12-08 00:31:52.436418001 -0600
@@ -11,7 +11,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52811,9 +52837,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_cypress.c linux-3.14.22/drivers/at
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_efar.c linux-3.14.22/drivers/ata/pata_efar.c
---- linux-3.14.22.orig/drivers/ata/pata_efar.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_efar.c 2014-10-22 14:55:52.006220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_efar.c linux-imx6-3.14/drivers/ata/pata_efar.c
+--- linux-3.14.14/drivers/ata/pata_efar.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_efar.c 2014-12-08 00:31:52.436418001 -0600
@@ -14,7 +14,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52822,9 +52848,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_efar.c linux-3.14.22/drivers/ata/p
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_ep93xx.c linux-3.14.22/drivers/ata/pata_ep93xx.c
---- linux-3.14.22.orig/drivers/ata/pata_ep93xx.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_ep93xx.c 2014-10-22 14:55:52.006220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_ep93xx.c linux-imx6-3.14/drivers/ata/pata_ep93xx.c
+--- linux-3.14.14/drivers/ata/pata_ep93xx.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_ep93xx.c 2014-12-08 00:31:52.436418001 -0600
@@ -34,7 +34,6 @@
#include <linux/err.h>
#include <linux/kernel.h>
@@ -52833,9 +52859,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_ep93xx.c linux-3.14.22/drivers/ata
#include <linux/blkdev.h>
#include <scsi/scsi_host.h>
#include <linux/ata.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_hpt366.c linux-3.14.22/drivers/ata/pata_hpt366.c
---- linux-3.14.22.orig/drivers/ata/pata_hpt366.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_hpt366.c 2014-10-22 14:55:52.006220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_hpt366.c linux-imx6-3.14/drivers/ata/pata_hpt366.c
+--- linux-3.14.14/drivers/ata/pata_hpt366.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_hpt366.c 2014-12-08 00:31:52.436418001 -0600
@@ -19,7 +19,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52844,9 +52870,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_hpt366.c linux-3.14.22/drivers/ata
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_hpt37x.c linux-3.14.22/drivers/ata/pata_hpt37x.c
---- linux-3.14.22.orig/drivers/ata/pata_hpt37x.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_hpt37x.c 2014-10-22 14:55:52.006220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_hpt37x.c linux-imx6-3.14/drivers/ata/pata_hpt37x.c
+--- linux-3.14.14/drivers/ata/pata_hpt37x.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_hpt37x.c 2014-12-08 00:31:52.436418001 -0600
@@ -19,7 +19,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52855,9 +52881,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_hpt37x.c linux-3.14.22/drivers/ata
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_hpt3x2n.c linux-3.14.22/drivers/ata/pata_hpt3x2n.c
---- linux-3.14.22.orig/drivers/ata/pata_hpt3x2n.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_hpt3x2n.c 2014-10-22 14:55:52.006220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_hpt3x2n.c linux-imx6-3.14/drivers/ata/pata_hpt3x2n.c
+--- linux-3.14.14/drivers/ata/pata_hpt3x2n.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_hpt3x2n.c 2014-12-08 00:31:52.436418001 -0600
@@ -20,7 +20,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52866,9 +52892,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_hpt3x2n.c linux-3.14.22/drivers/at
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_hpt3x3.c linux-3.14.22/drivers/ata/pata_hpt3x3.c
---- linux-3.14.22.orig/drivers/ata/pata_hpt3x3.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_hpt3x3.c 2014-10-22 14:55:52.010220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_hpt3x3.c linux-imx6-3.14/drivers/ata/pata_hpt3x3.c
+--- linux-3.14.14/drivers/ata/pata_hpt3x3.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_hpt3x3.c 2014-12-08 00:31:52.436418001 -0600
@@ -16,7 +16,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52877,9 +52903,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_hpt3x3.c linux-3.14.22/drivers/ata
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_imx.c linux-3.14.22/drivers/ata/pata_imx.c
---- linux-3.14.22.orig/drivers/ata/pata_imx.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_imx.c 2014-10-22 14:55:52.010220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_imx.c linux-imx6-3.14/drivers/ata/pata_imx.c
+--- linux-3.14.14/drivers/ata/pata_imx.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_imx.c 2014-12-08 00:31:52.436418001 -0600
@@ -15,7 +15,6 @@
*/
#include <linux/kernel.h>
@@ -52888,9 +52914,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_imx.c linux-3.14.22/drivers/ata/pa
#include <linux/blkdev.h>
#include <scsi/scsi_host.h>
#include <linux/ata.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_it8213.c linux-3.14.22/drivers/ata/pata_it8213.c
---- linux-3.14.22.orig/drivers/ata/pata_it8213.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_it8213.c 2014-10-22 14:55:52.010220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_it8213.c linux-imx6-3.14/drivers/ata/pata_it8213.c
+--- linux-3.14.14/drivers/ata/pata_it8213.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_it8213.c 2014-12-08 00:31:52.436418001 -0600
@@ -10,7 +10,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52899,9 +52925,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_it8213.c linux-3.14.22/drivers/ata
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_it821x.c linux-3.14.22/drivers/ata/pata_it821x.c
---- linux-3.14.22.orig/drivers/ata/pata_it821x.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_it821x.c 2014-10-22 14:55:52.010220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_it821x.c linux-imx6-3.14/drivers/ata/pata_it821x.c
+--- linux-3.14.14/drivers/ata/pata_it821x.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_it821x.c 2014-12-08 00:31:52.436418001 -0600
@@ -72,7 +72,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52910,9 +52936,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_it821x.c linux-3.14.22/drivers/ata
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/slab.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_jmicron.c linux-3.14.22/drivers/ata/pata_jmicron.c
---- linux-3.14.22.orig/drivers/ata/pata_jmicron.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_jmicron.c 2014-10-22 14:55:52.010220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_jmicron.c linux-imx6-3.14/drivers/ata/pata_jmicron.c
+--- linux-3.14.14/drivers/ata/pata_jmicron.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_jmicron.c 2014-12-08 00:31:52.436418001 -0600
@@ -10,7 +10,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52921,9 +52947,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_jmicron.c linux-3.14.22/drivers/at
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_marvell.c linux-3.14.22/drivers/ata/pata_marvell.c
---- linux-3.14.22.orig/drivers/ata/pata_marvell.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_marvell.c 2014-10-22 14:55:52.010220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_marvell.c linux-imx6-3.14/drivers/ata/pata_marvell.c
+--- linux-3.14.14/drivers/ata/pata_marvell.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_marvell.c 2014-12-08 00:31:52.436418001 -0600
@@ -11,7 +11,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52932,9 +52958,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_marvell.c linux-3.14.22/drivers/at
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_mpiix.c linux-3.14.22/drivers/ata/pata_mpiix.c
---- linux-3.14.22.orig/drivers/ata/pata_mpiix.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_mpiix.c 2014-10-22 14:55:52.010220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_mpiix.c linux-imx6-3.14/drivers/ata/pata_mpiix.c
+--- linux-3.14.14/drivers/ata/pata_mpiix.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_mpiix.c 2014-12-08 00:31:52.436418001 -0600
@@ -28,7 +28,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52943,9 +52969,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_mpiix.c linux-3.14.22/drivers/ata/
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_netcell.c linux-3.14.22/drivers/ata/pata_netcell.c
---- linux-3.14.22.orig/drivers/ata/pata_netcell.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_netcell.c 2014-10-22 14:55:52.010220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_netcell.c linux-imx6-3.14/drivers/ata/pata_netcell.c
+--- linux-3.14.14/drivers/ata/pata_netcell.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_netcell.c 2014-12-08 00:31:52.436418001 -0600
@@ -7,7 +7,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52954,9 +52980,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_netcell.c linux-3.14.22/drivers/at
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_ninja32.c linux-3.14.22/drivers/ata/pata_ninja32.c
---- linux-3.14.22.orig/drivers/ata/pata_ninja32.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_ninja32.c 2014-10-22 14:55:52.010220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_ninja32.c linux-imx6-3.14/drivers/ata/pata_ninja32.c
+--- linux-3.14.14/drivers/ata/pata_ninja32.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_ninja32.c 2014-12-08 00:31:52.436418001 -0600
@@ -37,7 +37,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52965,9 +52991,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_ninja32.c linux-3.14.22/drivers/at
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_ns87410.c linux-3.14.22/drivers/ata/pata_ns87410.c
---- linux-3.14.22.orig/drivers/ata/pata_ns87410.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_ns87410.c 2014-10-22 14:55:52.010220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_ns87410.c linux-imx6-3.14/drivers/ata/pata_ns87410.c
+--- linux-3.14.14/drivers/ata/pata_ns87410.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_ns87410.c 2014-12-08 00:31:52.436418001 -0600
@@ -20,7 +20,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52976,9 +53002,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_ns87410.c linux-3.14.22/drivers/at
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_ns87415.c linux-3.14.22/drivers/ata/pata_ns87415.c
---- linux-3.14.22.orig/drivers/ata/pata_ns87415.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_ns87415.c 2014-10-22 14:55:52.010220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_ns87415.c linux-imx6-3.14/drivers/ata/pata_ns87415.c
+--- linux-3.14.14/drivers/ata/pata_ns87415.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_ns87415.c 2014-12-08 00:31:52.436418001 -0600
@@ -25,7 +25,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52987,9 +53013,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_ns87415.c linux-3.14.22/drivers/at
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_oldpiix.c linux-3.14.22/drivers/ata/pata_oldpiix.c
---- linux-3.14.22.orig/drivers/ata/pata_oldpiix.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_oldpiix.c 2014-10-22 14:55:52.010220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_oldpiix.c linux-imx6-3.14/drivers/ata/pata_oldpiix.c
+--- linux-3.14.14/drivers/ata/pata_oldpiix.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_oldpiix.c 2014-12-08 00:31:52.436418001 -0600
@@ -16,7 +16,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -52998,9 +53024,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_oldpiix.c linux-3.14.22/drivers/at
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_opti.c linux-3.14.22/drivers/ata/pata_opti.c
---- linux-3.14.22.orig/drivers/ata/pata_opti.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_opti.c 2014-10-22 14:55:52.010220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_opti.c linux-imx6-3.14/drivers/ata/pata_opti.c
+--- linux-3.14.14/drivers/ata/pata_opti.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_opti.c 2014-12-08 00:31:52.436418001 -0600
@@ -26,7 +26,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53009,9 +53035,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_opti.c linux-3.14.22/drivers/ata/p
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_optidma.c linux-3.14.22/drivers/ata/pata_optidma.c
---- linux-3.14.22.orig/drivers/ata/pata_optidma.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_optidma.c 2014-10-22 14:55:52.010220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_optidma.c linux-imx6-3.14/drivers/ata/pata_optidma.c
+--- linux-3.14.14/drivers/ata/pata_optidma.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_optidma.c 2014-12-08 00:31:52.436418001 -0600
@@ -25,7 +25,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53020,9 +53046,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_optidma.c linux-3.14.22/drivers/at
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_pcmcia.c linux-3.14.22/drivers/ata/pata_pcmcia.c
---- linux-3.14.22.orig/drivers/ata/pata_pcmcia.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_pcmcia.c 2014-10-22 14:55:52.010220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_pcmcia.c linux-imx6-3.14/drivers/ata/pata_pcmcia.c
+--- linux-3.14.14/drivers/ata/pata_pcmcia.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_pcmcia.c 2014-12-08 00:31:52.436418001 -0600
@@ -26,7 +26,6 @@
#include <linux/kernel.h>
@@ -53031,9 +53057,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_pcmcia.c linux-3.14.22/drivers/ata
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/slab.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_pdc2027x.c linux-3.14.22/drivers/ata/pata_pdc2027x.c
---- linux-3.14.22.orig/drivers/ata/pata_pdc2027x.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_pdc2027x.c 2014-10-22 14:55:52.014220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_pdc2027x.c linux-imx6-3.14/drivers/ata/pata_pdc2027x.c
+--- linux-3.14.14/drivers/ata/pata_pdc2027x.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_pdc2027x.c 2014-12-08 00:31:52.440418001 -0600
@@ -25,7 +25,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53042,9 +53068,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_pdc2027x.c linux-3.14.22/drivers/a
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_pdc202xx_old.c linux-3.14.22/drivers/ata/pata_pdc202xx_old.c
---- linux-3.14.22.orig/drivers/ata/pata_pdc202xx_old.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_pdc202xx_old.c 2014-10-22 14:55:52.014220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_pdc202xx_old.c linux-imx6-3.14/drivers/ata/pata_pdc202xx_old.c
+--- linux-3.14.14/drivers/ata/pata_pdc202xx_old.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_pdc202xx_old.c 2014-12-08 00:31:52.440418001 -0600
@@ -15,7 +15,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53053,9 +53079,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_pdc202xx_old.c linux-3.14.22/drive
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_piccolo.c linux-3.14.22/drivers/ata/pata_piccolo.c
---- linux-3.14.22.orig/drivers/ata/pata_piccolo.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_piccolo.c 2014-10-22 14:55:52.014220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_piccolo.c linux-imx6-3.14/drivers/ata/pata_piccolo.c
+--- linux-3.14.14/drivers/ata/pata_piccolo.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_piccolo.c 2014-12-08 00:31:52.440418001 -0600
@@ -18,7 +18,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53064,9 +53090,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_piccolo.c linux-3.14.22/drivers/at
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_platform.c linux-3.14.22/drivers/ata/pata_platform.c
---- linux-3.14.22.orig/drivers/ata/pata_platform.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_platform.c 2014-10-22 14:55:52.014220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_platform.c linux-imx6-3.14/drivers/ata/pata_platform.c
+--- linux-3.14.14/drivers/ata/pata_platform.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_platform.c 2014-12-08 00:31:52.440418001 -0600
@@ -13,7 +13,6 @@
*/
#include <linux/kernel.h>
@@ -53075,9 +53101,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_platform.c linux-3.14.22/drivers/a
#include <linux/blkdev.h>
#include <scsi/scsi_host.h>
#include <linux/ata.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_pxa.c linux-3.14.22/drivers/ata/pata_pxa.c
---- linux-3.14.22.orig/drivers/ata/pata_pxa.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_pxa.c 2014-10-22 14:55:52.014220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_pxa.c linux-imx6-3.14/drivers/ata/pata_pxa.c
+--- linux-3.14.14/drivers/ata/pata_pxa.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_pxa.c 2014-12-08 00:31:52.440418001 -0600
@@ -20,7 +20,6 @@
#include <linux/kernel.h>
@@ -53086,9 +53112,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_pxa.c linux-3.14.22/drivers/ata/pa
#include <linux/blkdev.h>
#include <linux/ata.h>
#include <linux/libata.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_radisys.c linux-3.14.22/drivers/ata/pata_radisys.c
---- linux-3.14.22.orig/drivers/ata/pata_radisys.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_radisys.c 2014-10-22 14:55:52.014220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_radisys.c linux-imx6-3.14/drivers/ata/pata_radisys.c
+--- linux-3.14.14/drivers/ata/pata_radisys.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_radisys.c 2014-12-08 00:31:52.440418001 -0600
@@ -15,7 +15,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53097,9 +53123,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_radisys.c linux-3.14.22/drivers/at
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_rdc.c linux-3.14.22/drivers/ata/pata_rdc.c
---- linux-3.14.22.orig/drivers/ata/pata_rdc.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_rdc.c 2014-10-22 14:55:52.014220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_rdc.c linux-imx6-3.14/drivers/ata/pata_rdc.c
+--- linux-3.14.14/drivers/ata/pata_rdc.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_rdc.c 2014-12-08 00:31:52.440418001 -0600
@@ -24,7 +24,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53108,9 +53134,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_rdc.c linux-3.14.22/drivers/ata/pa
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_rz1000.c linux-3.14.22/drivers/ata/pata_rz1000.c
---- linux-3.14.22.orig/drivers/ata/pata_rz1000.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_rz1000.c 2014-10-22 14:55:52.014220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_rz1000.c linux-imx6-3.14/drivers/ata/pata_rz1000.c
+--- linux-3.14.14/drivers/ata/pata_rz1000.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_rz1000.c 2014-12-08 00:31:52.440418001 -0600
@@ -14,7 +14,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53119,9 +53145,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_rz1000.c linux-3.14.22/drivers/ata
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_sc1200.c linux-3.14.22/drivers/ata/pata_sc1200.c
---- linux-3.14.22.orig/drivers/ata/pata_sc1200.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_sc1200.c 2014-10-22 14:55:52.014220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_sc1200.c linux-imx6-3.14/drivers/ata/pata_sc1200.c
+--- linux-3.14.14/drivers/ata/pata_sc1200.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_sc1200.c 2014-12-08 00:31:52.440418001 -0600
@@ -32,7 +32,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53130,9 +53156,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_sc1200.c linux-3.14.22/drivers/ata
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_scc.c linux-3.14.22/drivers/ata/pata_scc.c
---- linux-3.14.22.orig/drivers/ata/pata_scc.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_scc.c 2014-10-22 14:55:52.014220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_scc.c linux-imx6-3.14/drivers/ata/pata_scc.c
+--- linux-3.14.14/drivers/ata/pata_scc.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_scc.c 2014-12-08 00:31:52.440418001 -0600
@@ -35,7 +35,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53141,9 +53167,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_scc.c linux-3.14.22/drivers/ata/pa
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_sch.c linux-3.14.22/drivers/ata/pata_sch.c
---- linux-3.14.22.orig/drivers/ata/pata_sch.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_sch.c 2014-10-22 14:55:52.014220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_sch.c linux-imx6-3.14/drivers/ata/pata_sch.c
+--- linux-3.14.14/drivers/ata/pata_sch.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_sch.c 2014-12-08 00:31:52.440418001 -0600
@@ -27,7 +27,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53152,9 +53178,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_sch.c linux-3.14.22/drivers/ata/pa
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_serverworks.c linux-3.14.22/drivers/ata/pata_serverworks.c
---- linux-3.14.22.orig/drivers/ata/pata_serverworks.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_serverworks.c 2014-10-22 14:55:52.014220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_serverworks.c linux-imx6-3.14/drivers/ata/pata_serverworks.c
+--- linux-3.14.14/drivers/ata/pata_serverworks.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_serverworks.c 2014-12-08 00:31:52.440418001 -0600
@@ -34,7 +34,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53163,9 +53189,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_serverworks.c linux-3.14.22/driver
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_sil680.c linux-3.14.22/drivers/ata/pata_sil680.c
---- linux-3.14.22.orig/drivers/ata/pata_sil680.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_sil680.c 2014-10-22 14:55:52.014220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_sil680.c linux-imx6-3.14/drivers/ata/pata_sil680.c
+--- linux-3.14.14/drivers/ata/pata_sil680.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_sil680.c 2014-12-08 00:31:52.440418001 -0600
@@ -25,7 +25,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53174,9 +53200,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_sil680.c linux-3.14.22/drivers/ata
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_sis.c linux-3.14.22/drivers/ata/pata_sis.c
---- linux-3.14.22.orig/drivers/ata/pata_sis.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_sis.c 2014-10-22 14:55:52.014220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_sis.c linux-imx6-3.14/drivers/ata/pata_sis.c
+--- linux-3.14.14/drivers/ata/pata_sis.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_sis.c 2014-12-08 00:31:52.440418001 -0600
@@ -26,7 +26,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53185,9 +53211,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_sis.c linux-3.14.22/drivers/ata/pa
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_sl82c105.c linux-3.14.22/drivers/ata/pata_sl82c105.c
---- linux-3.14.22.orig/drivers/ata/pata_sl82c105.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_sl82c105.c 2014-10-22 14:55:52.018220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_sl82c105.c linux-imx6-3.14/drivers/ata/pata_sl82c105.c
+--- linux-3.14.14/drivers/ata/pata_sl82c105.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_sl82c105.c 2014-12-08 00:31:52.440418001 -0600
@@ -19,7 +19,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53196,9 +53222,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_sl82c105.c linux-3.14.22/drivers/a
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_triflex.c linux-3.14.22/drivers/ata/pata_triflex.c
---- linux-3.14.22.orig/drivers/ata/pata_triflex.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_triflex.c 2014-10-22 14:55:52.018220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_triflex.c linux-imx6-3.14/drivers/ata/pata_triflex.c
+--- linux-3.14.14/drivers/ata/pata_triflex.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_triflex.c 2014-12-08 00:31:52.440418001 -0600
@@ -36,7 +36,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53207,9 +53233,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_triflex.c linux-3.14.22/drivers/at
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pata_via.c linux-3.14.22/drivers/ata/pata_via.c
---- linux-3.14.22.orig/drivers/ata/pata_via.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pata_via.c 2014-10-22 14:55:52.018220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pata_via.c linux-imx6-3.14/drivers/ata/pata_via.c
+--- linux-3.14.14/drivers/ata/pata_via.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pata_via.c 2014-12-08 00:31:52.440418001 -0600
@@ -55,7 +55,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53218,9 +53244,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pata_via.c linux-3.14.22/drivers/ata/pa
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/gfp.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/pdc_adma.c linux-3.14.22/drivers/ata/pdc_adma.c
---- linux-3.14.22.orig/drivers/ata/pdc_adma.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/pdc_adma.c 2014-10-22 14:55:52.018220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/pdc_adma.c linux-imx6-3.14/drivers/ata/pdc_adma.c
+--- linux-3.14.14/drivers/ata/pdc_adma.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/pdc_adma.c 2014-12-08 00:31:52.440418001 -0600
@@ -36,7 +36,6 @@
#include <linux/module.h>
#include <linux/gfp.h>
@@ -53229,9 +53255,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/pdc_adma.c linux-3.14.22/drivers/ata/pd
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/sata_dwc_460ex.c linux-3.14.22/drivers/ata/sata_dwc_460ex.c
---- linux-3.14.22.orig/drivers/ata/sata_dwc_460ex.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/sata_dwc_460ex.c 2014-10-22 14:55:52.018220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/sata_dwc_460ex.c linux-imx6-3.14/drivers/ata/sata_dwc_460ex.c
+--- linux-3.14.14/drivers/ata/sata_dwc_460ex.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/sata_dwc_460ex.c 2014-12-08 00:31:52.440418001 -0600
@@ -29,7 +29,6 @@
#include <linux/kernel.h>
@@ -53240,9 +53266,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/sata_dwc_460ex.c linux-3.14.22/drivers/
#include <linux/device.h>
#include <linux/of_address.h>
#include <linux/of_irq.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/sata_highbank.c linux-3.14.22/drivers/ata/sata_highbank.c
---- linux-3.14.22.orig/drivers/ata/sata_highbank.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/sata_highbank.c 2014-10-22 14:55:52.018220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/sata_highbank.c linux-imx6-3.14/drivers/ata/sata_highbank.c
+--- linux-3.14.14/drivers/ata/sata_highbank.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/sata_highbank.c 2014-12-08 00:31:52.440418001 -0600
@@ -19,7 +19,6 @@
#include <linux/kernel.h>
#include <linux/gfp.h>
@@ -53268,9 +53294,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/sata_highbank.c linux-3.14.22/drivers/a
if (online)
*class = ahci_dev_classify(ap);
-diff -Nur linux-3.14.22.orig/drivers/ata/sata_nv.c linux-3.14.22/drivers/ata/sata_nv.c
---- linux-3.14.22.orig/drivers/ata/sata_nv.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/sata_nv.c 2014-10-22 14:55:52.018220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/sata_nv.c linux-imx6-3.14/drivers/ata/sata_nv.c
+--- linux-3.14.14/drivers/ata/sata_nv.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/sata_nv.c 2014-12-08 00:31:52.444418001 -0600
@@ -40,7 +40,6 @@
#include <linux/module.h>
#include <linux/gfp.h>
@@ -53279,9 +53305,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/sata_nv.c linux-3.14.22/drivers/ata/sat
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/sata_promise.c linux-3.14.22/drivers/ata/sata_promise.c
---- linux-3.14.22.orig/drivers/ata/sata_promise.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/sata_promise.c 2014-10-22 14:55:52.018220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/sata_promise.c linux-imx6-3.14/drivers/ata/sata_promise.c
+--- linux-3.14.14/drivers/ata/sata_promise.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/sata_promise.c 2014-12-08 00:31:52.444418001 -0600
@@ -35,7 +35,6 @@
#include <linux/module.h>
#include <linux/gfp.h>
@@ -53290,9 +53316,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/sata_promise.c linux-3.14.22/drivers/at
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/sata_qstor.c linux-3.14.22/drivers/ata/sata_qstor.c
---- linux-3.14.22.orig/drivers/ata/sata_qstor.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/sata_qstor.c 2014-10-22 14:55:52.018220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/sata_qstor.c linux-imx6-3.14/drivers/ata/sata_qstor.c
+--- linux-3.14.14/drivers/ata/sata_qstor.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/sata_qstor.c 2014-12-08 00:31:52.444418001 -0600
@@ -31,7 +31,6 @@
#include <linux/module.h>
#include <linux/gfp.h>
@@ -53301,9 +53327,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/sata_qstor.c linux-3.14.22/drivers/ata/
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/sata_sil.c linux-3.14.22/drivers/ata/sata_sil.c
---- linux-3.14.22.orig/drivers/ata/sata_sil.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/sata_sil.c 2014-10-22 14:55:52.018220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/sata_sil.c linux-imx6-3.14/drivers/ata/sata_sil.c
+--- linux-3.14.14/drivers/ata/sata_sil.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/sata_sil.c 2014-12-08 00:31:52.444418001 -0600
@@ -37,7 +37,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53312,9 +53338,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/sata_sil.c linux-3.14.22/drivers/ata/sa
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/sata_sis.c linux-3.14.22/drivers/ata/sata_sis.c
---- linux-3.14.22.orig/drivers/ata/sata_sis.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/sata_sis.c 2014-10-22 14:55:52.018220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/sata_sis.c linux-imx6-3.14/drivers/ata/sata_sis.c
+--- linux-3.14.14/drivers/ata/sata_sis.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/sata_sis.c 2014-12-08 00:31:52.444418001 -0600
@@ -33,7 +33,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53323,9 +53349,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/sata_sis.c linux-3.14.22/drivers/ata/sa
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/sata_svw.c linux-3.14.22/drivers/ata/sata_svw.c
---- linux-3.14.22.orig/drivers/ata/sata_svw.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/sata_svw.c 2014-10-22 14:55:52.022220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/sata_svw.c linux-imx6-3.14/drivers/ata/sata_svw.c
+--- linux-3.14.14/drivers/ata/sata_svw.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/sata_svw.c 2014-12-08 00:31:52.444418001 -0600
@@ -39,7 +39,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53334,9 +53360,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/sata_svw.c linux-3.14.22/drivers/ata/sa
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/sata_sx4.c linux-3.14.22/drivers/ata/sata_sx4.c
---- linux-3.14.22.orig/drivers/ata/sata_sx4.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/sata_sx4.c 2014-10-22 14:55:52.022220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/sata_sx4.c linux-imx6-3.14/drivers/ata/sata_sx4.c
+--- linux-3.14.14/drivers/ata/sata_sx4.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/sata_sx4.c 2014-12-08 00:31:52.444418001 -0600
@@ -82,7 +82,6 @@
#include <linux/module.h>
#include <linux/pci.h>
@@ -53345,9 +53371,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/sata_sx4.c linux-3.14.22/drivers/ata/sa
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/sata_uli.c linux-3.14.22/drivers/ata/sata_uli.c
---- linux-3.14.22.orig/drivers/ata/sata_uli.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/sata_uli.c 2014-10-22 14:55:52.022220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/sata_uli.c linux-imx6-3.14/drivers/ata/sata_uli.c
+--- linux-3.14.14/drivers/ata/sata_uli.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/sata_uli.c 2014-12-08 00:31:52.444418001 -0600
@@ -28,7 +28,6 @@
#include <linux/module.h>
#include <linux/gfp.h>
@@ -53356,9 +53382,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/sata_uli.c linux-3.14.22/drivers/ata/sa
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/sata_via.c linux-3.14.22/drivers/ata/sata_via.c
---- linux-3.14.22.orig/drivers/ata/sata_via.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/sata_via.c 2014-10-22 14:55:52.022220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/sata_via.c linux-imx6-3.14/drivers/ata/sata_via.c
+--- linux-3.14.14/drivers/ata/sata_via.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/sata_via.c 2014-12-08 00:31:52.444418001 -0600
@@ -36,7 +36,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53367,9 +53393,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/sata_via.c linux-3.14.22/drivers/ata/sa
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-diff -Nur linux-3.14.22.orig/drivers/ata/sata_vsc.c linux-3.14.22/drivers/ata/sata_vsc.c
---- linux-3.14.22.orig/drivers/ata/sata_vsc.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ata/sata_vsc.c 2014-10-22 14:55:52.022220001 -0500
+diff -Nur linux-3.14.14/drivers/ata/sata_vsc.c linux-imx6-3.14/drivers/ata/sata_vsc.c
+--- linux-3.14.14/drivers/ata/sata_vsc.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ata/sata_vsc.c 2014-12-08 00:31:52.444418001 -0600
@@ -37,7 +37,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -53378,9 +53404,9 @@ diff -Nur linux-3.14.22.orig/drivers/ata/sata_vsc.c linux-3.14.22/drivers/ata/sa
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
-diff -Nur linux-3.14.22.orig/drivers/base/bus.c linux-3.14.22/drivers/base/bus.c
---- linux-3.14.22.orig/drivers/base/bus.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/base/bus.c 2014-10-22 14:55:52.022220001 -0500
+diff -Nur linux-3.14.14/drivers/base/bus.c linux-imx6-3.14/drivers/base/bus.c
+--- linux-3.14.14/drivers/base/bus.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/base/bus.c 2014-12-08 00:31:52.456418001 -0600
@@ -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
@@ -53390,9 +53416,9 @@ diff -Nur linux-3.14.22.orig/drivers/base/bus.c linux-3.14.22/drivers/base/bus.c
* only 'id' in the device needs to be set.
*
* Do not use this interface for anything new, it exists for compatibility
-diff -Nur linux-3.14.22.orig/drivers/base/cpu.c linux-3.14.22/drivers/base/cpu.c
---- linux-3.14.22.orig/drivers/base/cpu.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/base/cpu.c 2014-10-22 14:55:52.022220001 -0500
+diff -Nur linux-3.14.14/drivers/base/cpu.c linux-imx6-3.14/drivers/base/cpu.c
+--- linux-3.14.14/drivers/base/cpu.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/base/cpu.c 2014-12-08 00:31:52.456418001 -0600
@@ -15,6 +15,7 @@
#include <linux/percpu.h>
#include <linux/acpi.h>
@@ -53478,9 +53504,9 @@ diff -Nur linux-3.14.22.orig/drivers/base/cpu.c linux-3.14.22/drivers/base/cpu.c
&dev_attr_modalias.attr,
#endif
NULL
-diff -Nur linux-3.14.22.orig/drivers/base/dma-buf.c linux-3.14.22/drivers/base/dma-buf.c
---- linux-3.14.22.orig/drivers/base/dma-buf.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/base/dma-buf.c 2014-10-22 14:55:52.022220001 -0500
+diff -Nur linux-3.14.14/drivers/base/dma-buf.c linux-imx6-3.14/drivers/base/dma-buf.c
+--- linux-3.14.14/drivers/base/dma-buf.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/base/dma-buf.c 2014-12-08 00:31:52.456418001 -0600
@@ -251,9 +251,8 @@
* @dmabuf: [in] buffer to attach device to.
* @dev: [in] device to be attached.
@@ -53534,9 +53560,9 @@ diff -Nur linux-3.14.22.orig/drivers/base/dma-buf.c linux-3.14.22/drivers/base/d
goto out_unlock;
dmabuf->vmap_ptr = ptr;
-diff -Nur linux-3.14.22.orig/drivers/base/dma-contiguous.c linux-3.14.22/drivers/base/dma-contiguous.c
---- linux-3.14.22.orig/drivers/base/dma-contiguous.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/base/dma-contiguous.c 2014-10-22 14:55:52.022220001 -0500
+diff -Nur linux-3.14.14/drivers/base/dma-contiguous.c linux-imx6-3.14/drivers/base/dma-contiguous.c
+--- linux-3.14.14/drivers/base/dma-contiguous.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/base/dma-contiguous.c 2014-12-08 00:31:52.456418001 -0600
@@ -24,22 +24,9 @@
#include <linux/memblock.h>
@@ -53864,9 +53890,9 @@ diff -Nur linux-3.14.22.orig/drivers/base/dma-contiguous.c linux-3.14.22/drivers
- return true;
+ return cma_release(dev_get_cma_area(dev), pages, count);
}
-diff -Nur linux-3.14.22.orig/drivers/base/Kconfig linux-3.14.22/drivers/base/Kconfig
---- linux-3.14.22.orig/drivers/base/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/base/Kconfig 2014-10-22 14:55:52.022220001 -0500
+diff -Nur linux-3.14.14/drivers/base/Kconfig linux-imx6-3.14/drivers/base/Kconfig
+--- linux-3.14.14/drivers/base/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/base/Kconfig 2014-12-08 00:31:52.456418001 -0600
@@ -185,6 +185,14 @@
bool
default n
@@ -53899,9 +53925,9 @@ diff -Nur linux-3.14.22.orig/drivers/base/Kconfig linux-3.14.22/drivers/base/Kco
endif
endmenu
-diff -Nur linux-3.14.22.orig/drivers/bus/arm-cci.c linux-3.14.22/drivers/bus/arm-cci.c
---- linux-3.14.22.orig/drivers/bus/arm-cci.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/bus/arm-cci.c 2014-10-22 14:55:52.022220001 -0500
+diff -Nur linux-3.14.14/drivers/bus/arm-cci.c linux-imx6-3.14/drivers/bus/arm-cci.c
+--- linux-3.14.14/drivers/bus/arm-cci.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/bus/arm-cci.c 2014-12-08 00:31:52.496418001 -0600
@@ -26,6 +26,7 @@
#include <asm/cacheflush.h>
@@ -53930,9 +53956,9 @@ diff -Nur linux-3.14.22.orig/drivers/bus/arm-cci.c linux-3.14.22/drivers/bus/arm
np = of_find_matching_node(NULL, arm_cci_matches);
if (!np)
return -ENODEV;
-diff -Nur linux-3.14.22.orig/drivers/char/fsl_otp.c linux-3.14.22/drivers/char/fsl_otp.c
---- linux-3.14.22.orig/drivers/char/fsl_otp.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/char/fsl_otp.c 2014-10-22 14:55:52.026220001 -0500
+diff -Nur linux-3.14.14/drivers/char/fsl_otp.c linux-imx6-3.14/drivers/char/fsl_otp.c
+--- linux-3.14.14/drivers/char/fsl_otp.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/char/fsl_otp.c 2014-12-08 00:31:52.500418001 -0600
@@ -0,0 +1,299 @@
+/*
+ * Freescale On-Chip OTP driver
@@ -54233,9 +54259,9 @@ diff -Nur linux-3.14.22.orig/drivers/char/fsl_otp.c linux-3.14.22/drivers/char/f
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Huang Shijie <b32955@freescale.com>");
+MODULE_DESCRIPTION("Freescale i.MX OCOTP driver");
-diff -Nur linux-3.14.22.orig/drivers/char/Kconfig linux-3.14.22/drivers/char/Kconfig
---- linux-3.14.22.orig/drivers/char/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/char/Kconfig 2014-10-22 14:55:52.026220001 -0500
+diff -Nur linux-3.14.14/drivers/char/Kconfig linux-imx6-3.14/drivers/char/Kconfig
+--- linux-3.14.14/drivers/char/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/char/Kconfig 2014-12-08 00:31:52.496418001 -0600
@@ -82,6 +82,21 @@
If unsure, say N.
@@ -54258,9 +54284,9 @@ diff -Nur linux-3.14.22.orig/drivers/char/Kconfig linux-3.14.22/drivers/char/Kco
config PRINTER
tristate "Parallel printer support"
depends on PARPORT
-diff -Nur linux-3.14.22.orig/drivers/char/Makefile linux-3.14.22/drivers/char/Makefile
---- linux-3.14.22.orig/drivers/char/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/char/Makefile 2014-10-22 14:55:52.026220001 -0500
+diff -Nur linux-3.14.14/drivers/char/Makefile linux-imx6-3.14/drivers/char/Makefile
+--- linux-3.14.14/drivers/char/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/char/Makefile 2014-12-08 00:31:52.496418001 -0600
@@ -16,6 +16,7 @@
obj-$(CONFIG_IBM_BSR) += bsr.o
obj-$(CONFIG_SGI_MBCS) += mbcs.o
@@ -54269,10 +54295,10 @@ diff -Nur linux-3.14.22.orig/drivers/char/Makefile linux-3.14.22/drivers/char/Ma
obj-$(CONFIG_PRINTER) += lp.o
-diff -Nur linux-3.14.22.orig/drivers/clk/clk.c linux-3.14.22/drivers/clk/clk.c
---- linux-3.14.22.orig/drivers/clk/clk.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/clk/clk.c 2014-10-22 14:55:52.026220001 -0500
-@@ -1707,6 +1707,7 @@
+diff -Nur linux-3.14.14/drivers/clk/clk.c linux-imx6-3.14/drivers/clk/clk.c
+--- linux-3.14.14/drivers/clk/clk.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/clk/clk.c 2014-12-08 00:31:52.520418001 -0600
+@@ -1702,6 +1702,7 @@
*/
int clk_set_parent(struct clk *clk, struct clk *parent)
{
@@ -54280,7 +54306,7 @@ diff -Nur linux-3.14.22.orig/drivers/clk/clk.c linux-3.14.22/drivers/clk/clk.c
int ret = 0;
int p_index = 0;
unsigned long p_rate = 0;
-@@ -1733,6 +1734,18 @@
+@@ -1728,6 +1729,18 @@
goto out;
}
@@ -54299,9 +54325,9 @@ diff -Nur linux-3.14.22.orig/drivers/clk/clk.c linux-3.14.22/drivers/clk/clk.c
/* try finding the new parent index */
if (parent) {
p_index = clk_fetch_parent_index(clk, parent);
-diff -Nur linux-3.14.22.orig/drivers/clk/clk-mux.c linux-3.14.22/drivers/clk/clk-mux.c
---- linux-3.14.22.orig/drivers/clk/clk-mux.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/clk/clk-mux.c 2014-10-22 14:55:52.026220001 -0500
+diff -Nur linux-3.14.14/drivers/clk/clk-mux.c linux-imx6-3.14/drivers/clk/clk-mux.c
+--- linux-3.14.14/drivers/clk/clk-mux.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/clk/clk-mux.c 2014-12-08 00:31:52.516418001 -0600
@@ -143,7 +143,7 @@
init.ops = &clk_mux_ro_ops;
else
@@ -54311,9 +54337,9 @@ diff -Nur linux-3.14.22.orig/drivers/clk/clk-mux.c linux-3.14.22/drivers/clk/clk
init.parent_names = parent_names;
init.num_parents = num_parents;
-diff -Nur linux-3.14.22.orig/drivers/cpufreq/cpufreq_interactive.c linux-3.14.22/drivers/cpufreq/cpufreq_interactive.c
---- linux-3.14.22.orig/drivers/cpufreq/cpufreq_interactive.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/cpufreq/cpufreq_interactive.c 2014-10-22 14:55:52.026220001 -0500
+diff -Nur linux-3.14.14/drivers/cpufreq/cpufreq_interactive.c linux-imx6-3.14/drivers/cpufreq/cpufreq_interactive.c
+--- linux-3.14.14/drivers/cpufreq/cpufreq_interactive.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/cpufreq/cpufreq_interactive.c 2014-12-08 00:31:52.540418001 -0600
@@ -0,0 +1,1349 @@
+/*
+ * drivers/cpufreq/cpufreq_interactive.c
@@ -55664,9 +55690,9 @@ diff -Nur linux-3.14.22.orig/drivers/cpufreq/cpufreq_interactive.c linux-3.14.22
+MODULE_DESCRIPTION("'cpufreq_interactive' - A cpufreq governor for "
+ "Latency sensitive workloads");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/drivers/cpufreq/highbank-cpufreq.c linux-3.14.22/drivers/cpufreq/highbank-cpufreq.c
---- linux-3.14.22.orig/drivers/cpufreq/highbank-cpufreq.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/cpufreq/highbank-cpufreq.c 2014-10-22 14:55:52.026220001 -0500
+diff -Nur linux-3.14.14/drivers/cpufreq/highbank-cpufreq.c linux-imx6-3.14/drivers/cpufreq/highbank-cpufreq.c
+--- linux-3.14.14/drivers/cpufreq/highbank-cpufreq.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/cpufreq/highbank-cpufreq.c 2014-12-08 00:31:52.540418001 -0600
@@ -19,7 +19,7 @@
#include <linux/cpu.h>
#include <linux/err.h>
@@ -55676,9 +55702,9 @@ diff -Nur linux-3.14.22.orig/drivers/cpufreq/highbank-cpufreq.c linux-3.14.22/dr
#include <linux/platform_device.h>
#define HB_CPUFREQ_CHANGE_NOTE 0x80000001
-diff -Nur linux-3.14.22.orig/drivers/cpufreq/imx6-cpufreq.c linux-3.14.22/drivers/cpufreq/imx6-cpufreq.c
---- linux-3.14.22.orig/drivers/cpufreq/imx6-cpufreq.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/cpufreq/imx6-cpufreq.c 2014-10-22 14:55:52.026220001 -0500
+diff -Nur linux-3.14.14/drivers/cpufreq/imx6-cpufreq.c linux-imx6-3.14/drivers/cpufreq/imx6-cpufreq.c
+--- linux-3.14.14/drivers/cpufreq/imx6-cpufreq.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/cpufreq/imx6-cpufreq.c 2014-12-08 00:31:52.540418001 -0600
@@ -0,0 +1,393 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -56073,9 +56099,9 @@ diff -Nur linux-3.14.22.orig/drivers/cpufreq/imx6-cpufreq.c linux-3.14.22/driver
+MODULE_AUTHOR("Shawn Guo <shawn.guo@linaro.org>");
+MODULE_DESCRIPTION("Freescale i.MX6Q cpufreq driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/drivers/cpufreq/imx6q-cpufreq.c linux-3.14.22/drivers/cpufreq/imx6q-cpufreq.c
---- linux-3.14.22.orig/drivers/cpufreq/imx6q-cpufreq.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/cpufreq/imx6q-cpufreq.c 1969-12-31 18:00:00.000000000 -0600
+diff -Nur linux-3.14.14/drivers/cpufreq/imx6q-cpufreq.c linux-imx6-3.14/drivers/cpufreq/imx6q-cpufreq.c
+--- linux-3.14.14/drivers/cpufreq/imx6q-cpufreq.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/cpufreq/imx6q-cpufreq.c 1969-12-31 18:00:00.000000000 -0600
@@ -1,330 +0,0 @@
-/*
- * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -56407,9 +56433,9 @@ diff -Nur linux-3.14.22.orig/drivers/cpufreq/imx6q-cpufreq.c linux-3.14.22/drive
-MODULE_AUTHOR("Shawn Guo <shawn.guo@linaro.org>");
-MODULE_DESCRIPTION("Freescale i.MX6Q cpufreq driver");
-MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/drivers/cpufreq/Kconfig linux-3.14.22/drivers/cpufreq/Kconfig
---- linux-3.14.22.orig/drivers/cpufreq/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/cpufreq/Kconfig 2014-10-22 14:55:52.042220001 -0500
+diff -Nur linux-3.14.14/drivers/cpufreq/Kconfig linux-imx6-3.14/drivers/cpufreq/Kconfig
+--- linux-3.14.14/drivers/cpufreq/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/cpufreq/Kconfig 2014-12-08 00:31:52.536418001 -0600
@@ -91,6 +91,15 @@
governor. If unsure have a look at the help section of the
driver. Fallback governor will be the performance governor.
@@ -56451,9 +56477,9 @@ diff -Nur linux-3.14.22.orig/drivers/cpufreq/Kconfig linux-3.14.22/drivers/cpufr
If in doubt, say N.
config CPU_FREQ_GOV_CONSERVATIVE
-diff -Nur linux-3.14.22.orig/drivers/cpufreq/Kconfig.arm linux-3.14.22/drivers/cpufreq/Kconfig.arm
---- linux-3.14.22.orig/drivers/cpufreq/Kconfig.arm 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/cpufreq/Kconfig.arm 2014-10-22 14:55:52.042220001 -0500
+diff -Nur linux-3.14.14/drivers/cpufreq/Kconfig.arm linux-imx6-3.14/drivers/cpufreq/Kconfig.arm
+--- linux-3.14.14/drivers/cpufreq/Kconfig.arm 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/cpufreq/Kconfig.arm 2014-12-08 00:31:52.536418001 -0600
@@ -4,7 +4,8 @@
config ARM_BIG_LITTLE_CPUFREQ
@@ -56473,9 +56499,9 @@ diff -Nur linux-3.14.22.orig/drivers/cpufreq/Kconfig.arm linux-3.14.22/drivers/c
tristate "Freescale i.MX6 cpufreq support"
depends on ARCH_MXC
depends on REGULATOR_ANATOP
-diff -Nur linux-3.14.22.orig/drivers/cpufreq/Makefile linux-3.14.22/drivers/cpufreq/Makefile
---- linux-3.14.22.orig/drivers/cpufreq/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/cpufreq/Makefile 2014-10-22 14:55:52.042220001 -0500
+diff -Nur linux-3.14.14/drivers/cpufreq/Makefile linux-imx6-3.14/drivers/cpufreq/Makefile
+--- linux-3.14.14/drivers/cpufreq/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/cpufreq/Makefile 2014-12-08 00:31:52.536418001 -0600
@@ -8,6 +8,7 @@
obj-$(CONFIG_CPU_FREQ_GOV_POWERSAVE) += cpufreq_powersave.o
obj-$(CONFIG_CPU_FREQ_GOV_USERSPACE) += cpufreq_userspace.o
@@ -56493,9 +56519,9 @@ diff -Nur linux-3.14.22.orig/drivers/cpufreq/Makefile linux-3.14.22/drivers/cpuf
obj-$(CONFIG_ARM_INTEGRATOR) += integrator-cpufreq.o
obj-$(CONFIG_ARM_KIRKWOOD_CPUFREQ) += kirkwood-cpufreq.o
obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ) += omap-cpufreq.o
-diff -Nur linux-3.14.22.orig/drivers/crypto/caam/secvio.c linux-3.14.22/drivers/crypto/caam/secvio.c
---- linux-3.14.22.orig/drivers/crypto/caam/secvio.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/crypto/caam/secvio.c 2014-10-22 14:55:52.042220001 -0500
+diff -Nur linux-3.14.14/drivers/crypto/caam/secvio.c linux-imx6-3.14/drivers/crypto/caam/secvio.c
+--- linux-3.14.14/drivers/crypto/caam/secvio.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/crypto/caam/secvio.c 2014-12-08 00:31:52.552418001 -0600
@@ -0,0 +1,335 @@
+
+/*
@@ -56832,9 +56858,9 @@ diff -Nur linux-3.14.22.orig/drivers/crypto/caam/secvio.c linux-3.14.22/drivers/
+MODULE_DESCRIPTION("FSL CAAM/SNVS Security Violation Handler");
+MODULE_AUTHOR("Freescale Semiconductor - NMSG/MAD");
+#endif
-diff -Nur linux-3.14.22.orig/drivers/crypto/caam/secvio.h linux-3.14.22/drivers/crypto/caam/secvio.h
---- linux-3.14.22.orig/drivers/crypto/caam/secvio.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/crypto/caam/secvio.h 2014-10-22 14:55:52.042220001 -0500
+diff -Nur linux-3.14.14/drivers/crypto/caam/secvio.h linux-imx6-3.14/drivers/crypto/caam/secvio.h
+--- linux-3.14.14/drivers/crypto/caam/secvio.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/crypto/caam/secvio.h 2014-12-08 00:31:52.552418001 -0600
@@ -0,0 +1,64 @@
+
+/*
@@ -56900,9 +56926,9 @@ diff -Nur linux-3.14.22.orig/drivers/crypto/caam/secvio.h linux-3.14.22/drivers/
+};
+
+#endif /* SECVIO_H */
-diff -Nur linux-3.14.22.orig/drivers/crypto/caam/sm.h linux-3.14.22/drivers/crypto/caam/sm.h
---- linux-3.14.22.orig/drivers/crypto/caam/sm.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/crypto/caam/sm.h 2014-10-22 14:55:52.042220001 -0500
+diff -Nur linux-3.14.14/drivers/crypto/caam/sm.h linux-imx6-3.14/drivers/crypto/caam/sm.h
+--- linux-3.14.14/drivers/crypto/caam/sm.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/crypto/caam/sm.h 2014-12-08 00:31:52.552418001 -0600
@@ -0,0 +1,88 @@
+
+/*
@@ -56992,9 +57018,9 @@ diff -Nur linux-3.14.22.orig/drivers/crypto/caam/sm.h linux-3.14.22/drivers/cryp
+};
+
+#endif /* SM_H */
-diff -Nur linux-3.14.22.orig/drivers/crypto/caam/sm_store.c linux-3.14.22/drivers/crypto/caam/sm_store.c
---- linux-3.14.22.orig/drivers/crypto/caam/sm_store.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/crypto/caam/sm_store.c 2014-10-22 14:55:52.046220001 -0500
+diff -Nur linux-3.14.14/drivers/crypto/caam/sm_store.c linux-imx6-3.14/drivers/crypto/caam/sm_store.c
+--- linux-3.14.14/drivers/crypto/caam/sm_store.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/crypto/caam/sm_store.c 2014-12-08 00:31:52.552418001 -0600
@@ -0,0 +1,896 @@
+
+/*
@@ -57892,9 +57918,9 @@ diff -Nur linux-3.14.22.orig/drivers/crypto/caam/sm_store.c linux-3.14.22/driver
+MODULE_DESCRIPTION("FSL CAAM Secure Memory / Keystore");
+MODULE_AUTHOR("Freescale Semiconductor - NMSG/MAD");
+#endif
-diff -Nur linux-3.14.22.orig/drivers/crypto/caam/sm_test.c linux-3.14.22/drivers/crypto/caam/sm_test.c
---- linux-3.14.22.orig/drivers/crypto/caam/sm_test.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/crypto/caam/sm_test.c 2014-10-22 14:55:52.046220001 -0500
+diff -Nur linux-3.14.14/drivers/crypto/caam/sm_test.c linux-imx6-3.14/drivers/crypto/caam/sm_test.c
+--- linux-3.14.14/drivers/crypto/caam/sm_test.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/crypto/caam/sm_test.c 2014-12-08 00:31:52.552418001 -0600
@@ -0,0 +1,844 @@
+/*
+ * Secure Memory / Keystore Exemplification Module
@@ -58740,9 +58766,9 @@ diff -Nur linux-3.14.22.orig/drivers/crypto/caam/sm_test.c linux-3.14.22/drivers
+MODULE_DESCRIPTION("FSL CAAM Keystore Usage Example");
+MODULE_AUTHOR("Freescale Semiconductor - NMSG/MAD");
+#endif
-diff -Nur linux-3.14.22.orig/drivers/crypto/caam/snvsregs.h linux-3.14.22/drivers/crypto/caam/snvsregs.h
---- linux-3.14.22.orig/drivers/crypto/caam/snvsregs.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/crypto/caam/snvsregs.h 2014-10-22 14:55:52.046220001 -0500
+diff -Nur linux-3.14.14/drivers/crypto/caam/snvsregs.h linux-imx6-3.14/drivers/crypto/caam/snvsregs.h
+--- linux-3.14.14/drivers/crypto/caam/snvsregs.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/crypto/caam/snvsregs.h 2014-12-08 00:31:52.552418001 -0600
@@ -0,0 +1,237 @@
+/*
+ * SNVS hardware register-level view
@@ -58981,9 +59007,9 @@ diff -Nur linux-3.14.22.orig/drivers/crypto/caam/snvsregs.h linux-3.14.22/driver
+};
+
+#endif /* SNVSREGS_H */
-diff -Nur linux-3.14.22.orig/drivers/dma/imx-sdma.c linux-3.14.22/drivers/dma/imx-sdma.c
---- linux-3.14.22.orig/drivers/dma/imx-sdma.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/dma/imx-sdma.c 2014-10-22 14:55:52.046220001 -0500
+diff -Nur linux-3.14.14/drivers/dma/imx-sdma.c linux-imx6-3.14/drivers/dma/imx-sdma.c
+--- linux-3.14.14/drivers/dma/imx-sdma.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/dma/imx-sdma.c 2014-12-08 00:31:52.568418001 -0600
@@ -29,6 +29,7 @@
#include <linux/semaphore.h>
#include <linux/spinlock.h>
@@ -59580,9 +59606,9 @@ diff -Nur linux-3.14.22.orig/drivers/dma/imx-sdma.c linux-3.14.22/drivers/dma/im
ret = sdma_init(sdma);
if (ret)
goto err_init;
-diff -Nur linux-3.14.22.orig/drivers/dma/Kconfig linux-3.14.22/drivers/dma/Kconfig
---- linux-3.14.22.orig/drivers/dma/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/dma/Kconfig 2014-10-22 14:55:52.046220001 -0500
+diff -Nur linux-3.14.14/drivers/dma/Kconfig linux-imx6-3.14/drivers/dma/Kconfig
+--- linux-3.14.14/drivers/dma/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/dma/Kconfig 2014-12-08 00:31:52.564418001 -0600
@@ -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.
@@ -59603,9 +59629,9 @@ diff -Nur linux-3.14.22.orig/drivers/dma/Kconfig linux-3.14.22/drivers/dma/Kconf
config TXX9_DMAC
tristate "Toshiba TXx9 SoC DMA support"
depends on MACH_TX49XX || MACH_TX39XX
-diff -Nur linux-3.14.22.orig/drivers/dma/Makefile linux-3.14.22/drivers/dma/Makefile
---- linux-3.14.22.orig/drivers/dma/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/dma/Makefile 2014-10-22 14:55:52.046220001 -0500
+diff -Nur linux-3.14.14/drivers/dma/Makefile linux-imx6-3.14/drivers/dma/Makefile
+--- linux-3.14.14/drivers/dma/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/dma/Makefile 2014-12-08 00:31:52.564418001 -0600
@@ -18,6 +18,7 @@
obj-$(CONFIG_DW_DMAC_CORE) += dw/
obj-$(CONFIG_AT_HDMAC) += at_hdmac.o
@@ -59614,15 +59640,15 @@ diff -Nur linux-3.14.22.orig/drivers/dma/Makefile linux-3.14.22/drivers/dma/Make
obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o
obj-$(CONFIG_SH_DMAE_BASE) += sh/
obj-$(CONFIG_COH901318) += coh901318.o coh901318_lli.o
-diff -Nur linux-3.14.22.orig/drivers/dma/pxp/Makefile linux-3.14.22/drivers/dma/pxp/Makefile
---- linux-3.14.22.orig/drivers/dma/pxp/Makefile 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/dma/pxp/Makefile 2014-10-22 14:55:52.046220001 -0500
+diff -Nur linux-3.14.14/drivers/dma/pxp/Makefile linux-imx6-3.14/drivers/dma/pxp/Makefile
+--- linux-3.14.14/drivers/dma/pxp/Makefile 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/dma/pxp/Makefile 2014-12-08 00:31:52.572418001 -0600
@@ -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.22.orig/drivers/dma/pxp/pxp_device.c linux-3.14.22/drivers/dma/pxp/pxp_device.c
---- linux-3.14.22.orig/drivers/dma/pxp/pxp_device.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/dma/pxp/pxp_device.c 2014-10-22 14:55:52.046220001 -0500
+diff -Nur linux-3.14.14/drivers/dma/pxp/pxp_device.c linux-imx6-3.14/drivers/dma/pxp/pxp_device.c
+--- linux-3.14.14/drivers/dma/pxp/pxp_device.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/dma/pxp/pxp_device.c 2014-12-08 00:31:52.572418001 -0600
@@ -0,0 +1,765 @@
+/*
+ * Copyright (C) 2010-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -60389,9 +60415,9 @@ diff -Nur linux-3.14.22.orig/drivers/dma/pxp/pxp_device.c linux-3.14.22/drivers/
+ pxp_ht_destroy(&bufhash);
+ misc_deregister(&pxp_device_miscdev);
+}
-diff -Nur linux-3.14.22.orig/drivers/dma/pxp/pxp_dma_v2.c linux-3.14.22/drivers/dma/pxp/pxp_dma_v2.c
---- linux-3.14.22.orig/drivers/dma/pxp/pxp_dma_v2.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/dma/pxp/pxp_dma_v2.c 2014-10-22 14:55:52.046220001 -0500
+diff -Nur linux-3.14.14/drivers/dma/pxp/pxp_dma_v2.c linux-imx6-3.14/drivers/dma/pxp/pxp_dma_v2.c
+--- linux-3.14.14/drivers/dma/pxp/pxp_dma_v2.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/dma/pxp/pxp_dma_v2.c 2014-12-08 00:31:52.576418001 -0600
@@ -0,0 +1,1854 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc.
@@ -62247,9 +62273,9 @@ diff -Nur linux-3.14.22.orig/drivers/dma/pxp/pxp_dma_v2.c linux-3.14.22/drivers/
+MODULE_DESCRIPTION("i.MX PxP driver");
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/drivers/dma/pxp/regs-pxp_v2.h linux-3.14.22/drivers/dma/pxp/regs-pxp_v2.h
---- linux-3.14.22.orig/drivers/dma/pxp/regs-pxp_v2.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/dma/pxp/regs-pxp_v2.h 2014-10-22 14:55:52.050220001 -0500
+diff -Nur linux-3.14.14/drivers/dma/pxp/regs-pxp_v2.h linux-imx6-3.14/drivers/dma/pxp/regs-pxp_v2.h
+--- linux-3.14.14/drivers/dma/pxp/regs-pxp_v2.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/dma/pxp/regs-pxp_v2.h 2014-12-08 00:31:52.576418001 -0600
@@ -0,0 +1,1152 @@
+/*
+ * Freescale PXP Register Definitions
@@ -63403,9 +63429,9 @@ diff -Nur linux-3.14.22.orig/drivers/dma/pxp/regs-pxp_v2.h linux-3.14.22/drivers
+#define BF_PXP_VERSION_STEP(v) \
+ (((v) << 0) & BM_PXP_VERSION_STEP)
+#endif /* __ARCH_ARM___PXP_H */
-diff -Nur linux-3.14.22.orig/drivers/gpio/gpio-pca953x.c linux-3.14.22/drivers/gpio/gpio-pca953x.c
---- linux-3.14.22.orig/drivers/gpio/gpio-pca953x.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/gpio/gpio-pca953x.c 2014-10-22 14:55:52.050220001 -0500
+diff -Nur linux-3.14.14/drivers/gpio/gpio-pca953x.c linux-imx6-3.14/drivers/gpio/gpio-pca953x.c
+--- linux-3.14.14/drivers/gpio/gpio-pca953x.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/gpio/gpio-pca953x.c 2014-12-08 00:31:52.600418001 -0600
@@ -19,6 +19,7 @@
#include <linux/irqdomain.h>
#include <linux/i2c.h>
@@ -63425,9 +63451,9 @@ diff -Nur linux-3.14.22.orig/drivers/gpio/gpio-pca953x.c linux-3.14.22/drivers/g
/* initialize cached registers from their original values.
* we can't share this chip with another i2c master.
*/
-diff -Nur linux-3.14.22.orig/drivers/gpu/drm/drm_crtc_helper.c linux-3.14.22/drivers/gpu/drm/drm_crtc_helper.c
---- linux-3.14.22.orig/drivers/gpu/drm/drm_crtc_helper.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/gpu/drm/drm_crtc_helper.c 2014-10-22 14:55:52.050220001 -0500
+diff -Nur linux-3.14.14/drivers/gpu/drm/drm_crtc_helper.c linux-imx6-3.14/drivers/gpu/drm/drm_crtc_helper.c
+--- linux-3.14.14/drivers/gpu/drm/drm_crtc_helper.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/gpu/drm/drm_crtc_helper.c 2014-12-08 00:31:52.608418001 -0600
@@ -564,7 +564,7 @@
* Caller must hold mode config lock.
*
@@ -63437,9 +63463,9 @@ diff -Nur linux-3.14.22.orig/drivers/gpu/drm/drm_crtc_helper.c linux-3.14.22/dri
* enable it. This is the main helper functions for drivers that implement
* kernel mode setting with the crtc helper functions and the assorted
* ->prepare(), ->modeset() and ->commit() helper callbacks.
-diff -Nur linux-3.14.22.orig/drivers/gpu/drm/drm_prime.c linux-3.14.22/drivers/gpu/drm/drm_prime.c
---- linux-3.14.22.orig/drivers/gpu/drm/drm_prime.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/gpu/drm/drm_prime.c 2014-10-22 14:55:52.050220001 -0500
+diff -Nur linux-3.14.14/drivers/gpu/drm/drm_prime.c linux-imx6-3.14/drivers/gpu/drm/drm_prime.c
+--- linux-3.14.14/drivers/gpu/drm/drm_prime.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/gpu/drm/drm_prime.c 2014-12-08 00:31:52.612418001 -0600
@@ -471,7 +471,7 @@
get_dma_buf(dma_buf);
@@ -63449,9 +63475,9 @@ diff -Nur linux-3.14.22.orig/drivers/gpu/drm/drm_prime.c linux-3.14.22/drivers/g
ret = PTR_ERR(sgt);
goto fail_detach;
}
-diff -Nur linux-3.14.22.orig/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c linux-3.14.22/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c
---- linux-3.14.22.orig/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c 2014-10-22 14:55:52.050220001 -0500
+diff -Nur linux-3.14.14/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c linux-imx6-3.14/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c
+--- linux-3.14.14/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c 2014-12-08 00:31:52.616418001 -0600
@@ -224,7 +224,7 @@
get_dma_buf(dma_buf);
@@ -63461,9 +63487,9 @@ diff -Nur linux-3.14.22.orig/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c linux-3.
ret = PTR_ERR(sgt);
goto err_buf_detach;
}
-diff -Nur linux-3.14.22.orig/drivers/gpu/drm/Kconfig linux-3.14.22/drivers/gpu/drm/Kconfig
---- linux-3.14.22.orig/drivers/gpu/drm/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/gpu/drm/Kconfig 2014-10-22 14:55:52.050220001 -0500
+diff -Nur linux-3.14.14/drivers/gpu/drm/Kconfig linux-imx6-3.14/drivers/gpu/drm/Kconfig
+--- linux-3.14.14/drivers/gpu/drm/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/gpu/drm/Kconfig 2014-12-08 00:31:52.604418001 -0600
@@ -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.
@@ -63478,9 +63504,9 @@ diff -Nur linux-3.14.22.orig/drivers/gpu/drm/Kconfig linux-3.14.22/drivers/gpu/d
source "drivers/gpu/drm/exynos/Kconfig"
source "drivers/gpu/drm/vmwgfx/Kconfig"
-diff -Nur linux-3.14.22.orig/drivers/gpu/drm/Makefile linux-3.14.22/drivers/gpu/drm/Makefile
---- linux-3.14.22.orig/drivers/gpu/drm/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/gpu/drm/Makefile 2014-10-22 14:55:52.050220001 -0500
+diff -Nur linux-3.14.14/drivers/gpu/drm/Makefile linux-imx6-3.14/drivers/gpu/drm/Makefile
+--- linux-3.14.14/drivers/gpu/drm/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/gpu/drm/Makefile 2014-12-08 00:31:52.604418001 -0600
@@ -1,3 +1,24 @@
+##############################################################################
+#
@@ -63514,9 +63540,9 @@ diff -Nur linux-3.14.22.orig/drivers/gpu/drm/Makefile linux-3.14.22/drivers/gpu/
obj-$(CONFIG_DRM_TDFX) += tdfx/
obj-$(CONFIG_DRM_R128) += r128/
obj-$(CONFIG_DRM_RADEON)+= radeon/
-diff -Nur linux-3.14.22.orig/drivers/gpu/drm/vivante/Makefile linux-3.14.22/drivers/gpu/drm/vivante/Makefile
---- linux-3.14.22.orig/drivers/gpu/drm/vivante/Makefile 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/gpu/drm/vivante/Makefile 2014-10-22 14:55:52.050220001 -0500
+diff -Nur linux-3.14.14/drivers/gpu/drm/vivante/Makefile linux-imx6-3.14/drivers/gpu/drm/vivante/Makefile
+--- linux-3.14.14/drivers/gpu/drm/vivante/Makefile 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/gpu/drm/vivante/Makefile 2014-12-08 00:31:52.828418001 -0600
@@ -0,0 +1,29 @@
+##############################################################################
+#
@@ -63547,9 +63573,9 @@ diff -Nur linux-3.14.22.orig/drivers/gpu/drm/vivante/Makefile linux-3.14.22/driv
+vivante-y := vivante_drv.o
+
+obj-$(CONFIG_DRM_VIVANTE) += vivante.o
-diff -Nur linux-3.14.22.orig/drivers/gpu/drm/vivante/vivante_drv.c linux-3.14.22/drivers/gpu/drm/vivante/vivante_drv.c
---- linux-3.14.22.orig/drivers/gpu/drm/vivante/vivante_drv.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/gpu/drm/vivante/vivante_drv.c 2014-10-22 14:55:52.050220001 -0500
+diff -Nur linux-3.14.14/drivers/gpu/drm/vivante/vivante_drv.c linux-imx6-3.14/drivers/gpu/drm/vivante/vivante_drv.c
+--- linux-3.14.14/drivers/gpu/drm/vivante/vivante_drv.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/gpu/drm/vivante/vivante_drv.c 2014-12-08 00:31:52.828418001 -0600
@@ -0,0 +1,108 @@
+/****************************************************************************
+*
@@ -63659,9 +63685,9 @@ diff -Nur linux-3.14.22.orig/drivers/gpu/drm/vivante/vivante_drv.c linux-3.14.22
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL and additional rights");
-diff -Nur linux-3.14.22.orig/drivers/gpu/drm/vivante/vivante_drv.h linux-3.14.22/drivers/gpu/drm/vivante/vivante_drv.h
---- linux-3.14.22.orig/drivers/gpu/drm/vivante/vivante_drv.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/gpu/drm/vivante/vivante_drv.h 2014-10-22 14:55:52.050220001 -0500
+diff -Nur linux-3.14.14/drivers/gpu/drm/vivante/vivante_drv.h linux-imx6-3.14/drivers/gpu/drm/vivante/vivante_drv.h
+--- linux-3.14.14/drivers/gpu/drm/vivante/vivante_drv.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/gpu/drm/vivante/vivante_drv.h 2014-12-08 00:31:52.828418001 -0600
@@ -0,0 +1,66 @@
+/****************************************************************************
+*
@@ -63729,9 +63755,9 @@ diff -Nur linux-3.14.22.orig/drivers/gpu/drm/vivante/vivante_drv.h linux-3.14.22
+#define DRIVER_PATCHLEVEL 0
+
+#endif
-diff -Nur linux-3.14.22.orig/drivers/hwmon/Kconfig linux-3.14.22/drivers/hwmon/Kconfig
---- linux-3.14.22.orig/drivers/hwmon/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/hwmon/Kconfig 2014-10-22 14:55:52.050220001 -0500
+diff -Nur linux-3.14.14/drivers/hwmon/Kconfig linux-imx6-3.14/drivers/hwmon/Kconfig
+--- linux-3.14.14/drivers/hwmon/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/hwmon/Kconfig 2014-12-08 00:31:52.852418001 -0600
@@ -1584,4 +1584,19 @@
endif # ACPI
@@ -63752,9 +63778,9 @@ diff -Nur linux-3.14.22.orig/drivers/hwmon/Kconfig linux-3.14.22/drivers/hwmon/K
+ default y
+
endif # HWMON
-diff -Nur linux-3.14.22.orig/drivers/hwmon/mag3110.c linux-3.14.22/drivers/hwmon/mag3110.c
---- linux-3.14.22.orig/drivers/hwmon/mag3110.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/hwmon/mag3110.c 2014-10-22 14:55:52.054220001 -0500
+diff -Nur linux-3.14.14/drivers/hwmon/mag3110.c linux-imx6-3.14/drivers/hwmon/mag3110.c
+--- linux-3.14.14/drivers/hwmon/mag3110.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/hwmon/mag3110.c 2014-12-08 00:31:52.868418001 -0600
@@ -0,0 +1,611 @@
+/*
+ *
@@ -64367,9 +64393,9 @@ diff -Nur linux-3.14.22.orig/drivers/hwmon/mag3110.c linux-3.14.22/drivers/hwmon
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("Freescale mag3110 3-axis magnetometer driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/drivers/hwmon/Makefile linux-3.14.22/drivers/hwmon/Makefile
---- linux-3.14.22.orig/drivers/hwmon/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/hwmon/Makefile 2014-10-22 14:55:52.054220001 -0500
+diff -Nur linux-3.14.14/drivers/hwmon/Makefile linux-imx6-3.14/drivers/hwmon/Makefile
+--- linux-3.14.14/drivers/hwmon/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/hwmon/Makefile 2014-12-08 00:31:52.852418001 -0600
@@ -142,6 +142,8 @@
obj-$(CONFIG_SENSORS_W83L786NG) += w83l786ng.o
obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o
@@ -64379,9 +64405,9 @@ diff -Nur linux-3.14.22.orig/drivers/hwmon/Makefile linux-3.14.22/drivers/hwmon/
obj-$(CONFIG_PMBUS) += pmbus/
-diff -Nur linux-3.14.22.orig/drivers/hwmon/mxc_mma8451.c linux-3.14.22/drivers/hwmon/mxc_mma8451.c
---- linux-3.14.22.orig/drivers/hwmon/mxc_mma8451.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/hwmon/mxc_mma8451.c 2014-10-22 14:55:52.054220001 -0500
+diff -Nur linux-3.14.14/drivers/hwmon/mxc_mma8451.c linux-imx6-3.14/drivers/hwmon/mxc_mma8451.c
+--- linux-3.14.14/drivers/hwmon/mxc_mma8451.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/hwmon/mxc_mma8451.c 2014-12-08 00:31:52.868418001 -0600
@@ -0,0 +1,598 @@
+/*
+ * mma8451.c - Linux kernel modules for 3-Axis Orientation/Motion
@@ -64981,9 +65007,9 @@ diff -Nur linux-3.14.22.orig/drivers/hwmon/mxc_mma8451.c linux-3.14.22/drivers/h
+
+module_init(mma8451_init);
+module_exit(mma8451_exit);
-diff -Nur linux-3.14.22.orig/drivers/i2c/busses/i2c-imx.c linux-3.14.22/drivers/i2c/busses/i2c-imx.c
---- linux-3.14.22.orig/drivers/i2c/busses/i2c-imx.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/i2c/busses/i2c-imx.c 2014-10-22 14:55:52.054220001 -0500
+diff -Nur linux-3.14.14/drivers/i2c/busses/i2c-imx.c linux-imx6-3.14/drivers/i2c/busses/i2c-imx.c
+--- linux-3.14.14/drivers/i2c/busses/i2c-imx.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/i2c/busses/i2c-imx.c 2014-12-08 00:31:52.884418001 -0600
@@ -184,6 +184,9 @@
int stopped;
unsigned int ifdr; /* IMX_I2C_IFDR */
@@ -65125,9 +65151,9 @@ diff -Nur linux-3.14.22.orig/drivers/i2c/busses/i2c-imx.c linux-3.14.22/drivers/
/* Set up chip registers to defaults */
imx_i2c_write_reg(i2c_imx->hwdata->i2cr_ien_opcode ^ I2CR_IEN,
-diff -Nur linux-3.14.22.orig/drivers/input/keyboard/gpio_keys.c linux-3.14.22/drivers/input/keyboard/gpio_keys.c
---- linux-3.14.22.orig/drivers/input/keyboard/gpio_keys.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/input/keyboard/gpio_keys.c 2014-10-22 14:55:52.054220001 -0500
+diff -Nur linux-3.14.14/drivers/input/keyboard/gpio_keys.c linux-imx6-3.14/drivers/input/keyboard/gpio_keys.c
+--- linux-3.14.14/drivers/input/keyboard/gpio_keys.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/input/keyboard/gpio_keys.c 2014-12-08 00:31:52.992418001 -0600
@@ -3,6 +3,7 @@
*
* Copyright 2005 Phil Blundell
@@ -65145,9 +65171,9 @@ diff -Nur linux-3.14.22.orig/drivers/input/keyboard/gpio_keys.c linux-3.14.22/dr
} else {
if (!button->irq) {
-diff -Nur linux-3.14.22.orig/drivers/input/keyboard/imx_keypad.c linux-3.14.22/drivers/input/keyboard/imx_keypad.c
---- linux-3.14.22.orig/drivers/input/keyboard/imx_keypad.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/input/keyboard/imx_keypad.c 2014-10-22 14:55:52.054220001 -0500
+diff -Nur linux-3.14.14/drivers/input/keyboard/imx_keypad.c linux-imx6-3.14/drivers/input/keyboard/imx_keypad.c
+--- linux-3.14.14/drivers/input/keyboard/imx_keypad.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/input/keyboard/imx_keypad.c 2014-12-08 00:31:52.992418001 -0600
@@ -1,6 +1,7 @@
/*
* Driver for the IMX keypad port.
@@ -65174,9 +65200,9 @@ diff -Nur linux-3.14.22.orig/drivers/input/keyboard/imx_keypad.c linux-3.14.22/d
mutex_lock(&input_dev->mutex);
-diff -Nur linux-3.14.22.orig/drivers/input/misc/mma8450.c linux-3.14.22/drivers/input/misc/mma8450.c
---- linux-3.14.22.orig/drivers/input/misc/mma8450.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/input/misc/mma8450.c 2014-10-22 14:55:52.054220001 -0500
+diff -Nur linux-3.14.14/drivers/input/misc/mma8450.c linux-imx6-3.14/drivers/input/misc/mma8450.c
+--- linux-3.14.14/drivers/input/misc/mma8450.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/input/misc/mma8450.c 2014-12-08 00:31:53.000418001 -0600
@@ -1,7 +1,7 @@
/*
* Driver for Freescale's 3-Axis Accelerometer MMA8450
@@ -65447,9 +65473,9 @@ diff -Nur linux-3.14.22.orig/drivers/input/misc/mma8450.c linux-3.14.22/drivers/
input_unregister_polled_device(idev);
input_free_polled_device(idev);
kfree(m);
-diff -Nur linux-3.14.22.orig/drivers/input/sparse-keymap.c linux-3.14.22/drivers/input/sparse-keymap.c
---- linux-3.14.22.orig/drivers/input/sparse-keymap.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/input/sparse-keymap.c 2014-10-22 14:55:52.090220001 -0500
+diff -Nur linux-3.14.14/drivers/input/sparse-keymap.c linux-imx6-3.14/drivers/input/sparse-keymap.c
+--- linux-3.14.14/drivers/input/sparse-keymap.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/input/sparse-keymap.c 2014-12-08 00:31:53.012418001 -0600
@@ -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
@@ -65459,9 +65485,9 @@ diff -Nur linux-3.14.22.orig/drivers/input/sparse-keymap.c linux-3.14.22/drivers
* before freeing the keymap).
*/
void sparse_keymap_free(struct input_dev *dev)
-diff -Nur linux-3.14.22.orig/drivers/Kconfig linux-3.14.22/drivers/Kconfig
---- linux-3.14.22.orig/drivers/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/Kconfig 2014-10-22 14:55:52.094220001 -0500
+diff -Nur linux-3.14.14/drivers/Kconfig linux-imx6-3.14/drivers/Kconfig
+--- linux-3.14.14/drivers/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/Kconfig 2014-12-08 00:31:52.392418001 -0600
@@ -96,6 +96,8 @@
source "drivers/memstick/Kconfig"
@@ -65471,9 +65497,9 @@ diff -Nur linux-3.14.22.orig/drivers/Kconfig linux-3.14.22/drivers/Kconfig
source "drivers/leds/Kconfig"
source "drivers/accessibility/Kconfig"
-diff -Nur linux-3.14.22.orig/drivers/leds/leds-gpio.c linux-3.14.22/drivers/leds/leds-gpio.c
---- linux-3.14.22.orig/drivers/leds/leds-gpio.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/leds/leds-gpio.c 2014-10-22 14:55:52.094220001 -0500
+diff -Nur linux-3.14.14/drivers/leds/leds-gpio.c linux-imx6-3.14/drivers/leds/leds-gpio.c
+--- linux-3.14.14/drivers/leds/leds-gpio.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/leds/leds-gpio.c 2014-12-08 00:31:53.080418001 -0600
@@ -3,7 +3,7 @@
*
* Copyright (C) 2007 8D Technologies inc.
@@ -65492,9 +65518,9 @@ diff -Nur linux-3.14.22.orig/drivers/leds/leds-gpio.c linux-3.14.22/drivers/leds
ret = create_gpio_led(&led, &priv->leds[priv->num_leds++],
&pdev->dev, NULL);
-diff -Nur linux-3.14.22.orig/drivers/leds/leds-pwm.c linux-3.14.22/drivers/leds/leds-pwm.c
---- linux-3.14.22.orig/drivers/leds/leds-pwm.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/leds/leds-pwm.c 2014-10-22 14:55:52.598220001 -0500
+diff -Nur linux-3.14.14/drivers/leds/leds-pwm.c linux-imx6-3.14/drivers/leds/leds-pwm.c
+--- linux-3.14.14/drivers/leds/leds-pwm.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/leds/leds-pwm.c 2014-12-08 00:31:53.080418001 -0600
@@ -70,6 +70,10 @@
duty *= brightness;
@@ -65680,9 +65706,9 @@ diff -Nur linux-3.14.22.orig/drivers/leds/leds-pwm.c linux-3.14.22/drivers/leds/
}
static int led_pwm_remove(struct platform_device *pdev)
-diff -Nur linux-3.14.22.orig/drivers/mailbox/mailbox.c linux-3.14.22/drivers/mailbox/mailbox.c
---- linux-3.14.22.orig/drivers/mailbox/mailbox.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mailbox/mailbox.c 2014-10-22 14:55:52.602220001 -0500
+diff -Nur linux-3.14.14/drivers/mailbox/mailbox.c linux-imx6-3.14/drivers/mailbox/mailbox.c
+--- linux-3.14.14/drivers/mailbox/mailbox.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mailbox/mailbox.c 2014-12-08 00:31:53.092418001 -0600
@@ -0,0 +1,488 @@
+/*
+ * Mailbox: Common code for Mailbox controllers and users
@@ -66172,9 +66198,9 @@ diff -Nur linux-3.14.22.orig/drivers/mailbox/mailbox.c linux-3.14.22/drivers/mai
+ mutex_unlock(&con_mutex);
+}
+EXPORT_SYMBOL_GPL(mbox_controller_unregister);
-diff -Nur linux-3.14.22.orig/drivers/mailbox/Makefile linux-3.14.22/drivers/mailbox/Makefile
---- linux-3.14.22.orig/drivers/mailbox/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mailbox/Makefile 2014-10-22 14:55:52.602220001 -0500
+diff -Nur linux-3.14.14/drivers/mailbox/Makefile linux-imx6-3.14/drivers/mailbox/Makefile
+--- linux-3.14.14/drivers/mailbox/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mailbox/Makefile 2014-12-08 00:31:53.092418001 -0600
@@ -1,3 +1,7 @@
+# Generic MAILBOX API
+
@@ -66183,9 +66209,9 @@ diff -Nur linux-3.14.22.orig/drivers/mailbox/Makefile linux-3.14.22/drivers/mail
obj-$(CONFIG_PL320_MBOX) += pl320-ipc.o
obj-$(CONFIG_OMAP_MBOX) += omap-mailbox.o
-diff -Nur linux-3.14.22.orig/drivers/mailbox/pl320-ipc.c linux-3.14.22/drivers/mailbox/pl320-ipc.c
---- linux-3.14.22.orig/drivers/mailbox/pl320-ipc.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mailbox/pl320-ipc.c 2014-10-22 14:55:52.602220001 -0500
+diff -Nur linux-3.14.14/drivers/mailbox/pl320-ipc.c linux-imx6-3.14/drivers/mailbox/pl320-ipc.c
+--- linux-3.14.14/drivers/mailbox/pl320-ipc.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mailbox/pl320-ipc.c 2014-12-08 00:31:53.092418001 -0600
@@ -26,7 +26,7 @@
#include <linux/device.h>
#include <linux/amba/bus.h>
@@ -66195,9 +66221,9 @@ diff -Nur linux-3.14.22.orig/drivers/mailbox/pl320-ipc.c linux-3.14.22/drivers/m
#define IPCMxSOURCE(m) ((m) * 0x40)
#define IPCMxDSET(m) (((m) * 0x40) + 0x004)
-diff -Nur linux-3.14.22.orig/drivers/Makefile linux-3.14.22/drivers/Makefile
---- linux-3.14.22.orig/drivers/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/Makefile 2014-10-22 14:55:52.602220001 -0500
+diff -Nur linux-3.14.14/drivers/Makefile linux-imx6-3.14/drivers/Makefile
+--- linux-3.14.14/drivers/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/Makefile 2014-12-08 00:31:52.392418001 -0600
@@ -111,6 +111,7 @@
obj-$(CONFIG_CPU_FREQ) += cpufreq/
obj-$(CONFIG_CPU_IDLE) += cpuidle/
@@ -66206,9 +66232,9 @@ diff -Nur linux-3.14.22.orig/drivers/Makefile linux-3.14.22/drivers/Makefile
obj-$(CONFIG_MEMSTICK) += memstick/
obj-y += leds/
obj-$(CONFIG_INFINIBAND) += infiniband/
-diff -Nur linux-3.14.22.orig/drivers/media/platform/Kconfig linux-3.14.22/drivers/media/platform/Kconfig
---- linux-3.14.22.orig/drivers/media/platform/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/media/platform/Kconfig 2014-10-22 14:55:52.602220001 -0500
+diff -Nur linux-3.14.14/drivers/media/platform/Kconfig linux-imx6-3.14/drivers/media/platform/Kconfig
+--- linux-3.14.14/drivers/media/platform/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/media/platform/Kconfig 2014-12-08 00:31:53.232418001 -0600
@@ -115,6 +115,21 @@
To compile this driver as a module, choose M here: the module
will be called s3c-camif.
@@ -66231,9 +66257,9 @@ diff -Nur linux-3.14.22.orig/drivers/media/platform/Kconfig linux-3.14.22/driver
source "drivers/media/platform/soc_camera/Kconfig"
source "drivers/media/platform/exynos4-is/Kconfig"
source "drivers/media/platform/s5p-tv/Kconfig"
-diff -Nur linux-3.14.22.orig/drivers/media/platform/Makefile linux-3.14.22/drivers/media/platform/Makefile
---- linux-3.14.22.orig/drivers/media/platform/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/media/platform/Makefile 2014-10-22 14:55:52.602220001 -0500
+diff -Nur linux-3.14.14/drivers/media/platform/Makefile linux-imx6-3.14/drivers/media/platform/Makefile
+--- linux-3.14.14/drivers/media/platform/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/media/platform/Makefile 2014-12-08 00:31:53.232418001 -0600
@@ -51,4 +51,7 @@
obj-$(CONFIG_ARCH_OMAP) += omap/
@@ -66242,9 +66268,9 @@ diff -Nur linux-3.14.22.orig/drivers/media/platform/Makefile linux-3.14.22/drive
+obj-$(CONFIG_VIDEO_MXC_OUTPUT) += mxc/output/
+
ccflags-y += -I$(srctree)/drivers/media/i2c
-diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/adv7180.c linux-3.14.22/drivers/media/platform/mxc/capture/adv7180.c
---- linux-3.14.22.orig/drivers/media/platform/mxc/capture/adv7180.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/media/platform/mxc/capture/adv7180.c 2014-10-22 14:55:52.606220001 -0500
+diff -Nur linux-3.14.14/drivers/media/platform/mxc/capture/adv7180.c linux-imx6-3.14/drivers/media/platform/mxc/capture/adv7180.c
+--- linux-3.14.14/drivers/media/platform/mxc/capture/adv7180.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/adv7180.c 2014-12-08 00:31:53.252418001 -0600
@@ -0,0 +1,1344 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -67590,9 +67616,9 @@ diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/adv7180.c linux-
+MODULE_AUTHOR("Freescale Semiconductor");
+MODULE_DESCRIPTION("Anolog Device ADV7180 video decoder driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/csi_v4l2_capture.c linux-3.14.22/drivers/media/platform/mxc/capture/csi_v4l2_capture.c
---- linux-3.14.22.orig/drivers/media/platform/mxc/capture/csi_v4l2_capture.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/media/platform/mxc/capture/csi_v4l2_capture.c 2014-10-22 14:55:52.610220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/media/platform/mxc/capture/csi_v4l2_capture.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/csi_v4l2_capture.c 2014-12-08 00:31:53.256418001 -0600
@@ -0,0 +1,2047 @@
+/*
+ * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -69641,9 +69667,9 @@ diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/csi_v4l2_capture
+MODULE_DESCRIPTION("V4L2 capture driver for Mx25 based cameras");
+MODULE_LICENSE("GPL");
+MODULE_SUPPORTED_DEVICE("video");
-diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/fsl_csi.c linux-3.14.22/drivers/media/platform/mxc/capture/fsl_csi.c
---- linux-3.14.22.orig/drivers/media/platform/mxc/capture/fsl_csi.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/media/platform/mxc/capture/fsl_csi.c 2014-10-22 14:55:52.614220001 -0500
+diff -Nur linux-3.14.14/drivers/media/platform/mxc/capture/fsl_csi.c linux-imx6-3.14/drivers/media/platform/mxc/capture/fsl_csi.c
+--- linux-3.14.14/drivers/media/platform/mxc/capture/fsl_csi.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/fsl_csi.c 2014-12-08 00:31:53.256418001 -0600
@@ -0,0 +1,302 @@
+/*
+ * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -69947,9 +69973,9 @@ diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/fsl_csi.c linux-
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("fsl CSI driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/fsl_csi.h linux-3.14.22/drivers/media/platform/mxc/capture/fsl_csi.h
---- linux-3.14.22.orig/drivers/media/platform/mxc/capture/fsl_csi.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/media/platform/mxc/capture/fsl_csi.h 2014-10-22 14:55:52.614220001 -0500
+diff -Nur linux-3.14.14/drivers/media/platform/mxc/capture/fsl_csi.h linux-imx6-3.14/drivers/media/platform/mxc/capture/fsl_csi.h
+--- linux-3.14.14/drivers/media/platform/mxc/capture/fsl_csi.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/fsl_csi.h 2014-12-08 00:31:53.256418001 -0600
@@ -0,0 +1,198 @@
+/*
+ * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -70149,9 +70175,9 @@ diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/fsl_csi.h linux-
+void csi_mclk_disable(void);
+void csi_dmareq_rff_enable(void);
+void csi_dmareq_rff_disable(void);
-diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c linux-3.14.22/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c
---- linux-3.14.22.orig/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c 2014-10-22 14:55:52.614220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c 2014-12-08 00:31:53.256418001 -0600
@@ -0,0 +1,546 @@
+
+/*
@@ -70699,9 +70725,9 @@ diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/ipu_bg_overlay_s
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("IPU PRP VF SDC Backgroud Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/ipu_csi_enc.c linux-3.14.22/drivers/media/platform/mxc/capture/ipu_csi_enc.c
---- linux-3.14.22.orig/drivers/media/platform/mxc/capture/ipu_csi_enc.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/media/platform/mxc/capture/ipu_csi_enc.c 2014-10-22 14:55:52.614220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/media/platform/mxc/capture/ipu_csi_enc.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_csi_enc.c 2014-12-08 00:31:53.256418001 -0600
@@ -0,0 +1,418 @@
+/*
+ * Copyright 2009-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -71121,9 +71147,9 @@ diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/ipu_csi_enc.c li
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("CSI ENC Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c linux-3.14.22/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c
---- linux-3.14.22.orig/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c 2014-10-22 14:55:52.618220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c 2014-12-08 00:31:53.256418001 -0600
@@ -0,0 +1,634 @@
+/*
+ * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -71759,9 +71785,9 @@ diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/ipu_fg_overlay_s
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("IPU PRP VF SDC Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/ipu_prp_enc.c linux-3.14.22/drivers/media/platform/mxc/capture/ipu_prp_enc.c
---- linux-3.14.22.orig/drivers/media/platform/mxc/capture/ipu_prp_enc.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/media/platform/mxc/capture/ipu_prp_enc.c 2014-10-22 14:55:52.618220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/media/platform/mxc/capture/ipu_prp_enc.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_prp_enc.c 2014-12-08 00:31:53.256418001 -0600
@@ -0,0 +1,595 @@
+/*
+ * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -72358,9 +72384,9 @@ diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/ipu_prp_enc.c li
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("IPU PRP ENC Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/ipu_prp_sw.h linux-3.14.22/drivers/media/platform/mxc/capture/ipu_prp_sw.h
---- linux-3.14.22.orig/drivers/media/platform/mxc/capture/ipu_prp_sw.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/media/platform/mxc/capture/ipu_prp_sw.h 2014-10-22 14:55:52.618220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/media/platform/mxc/capture/ipu_prp_sw.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_prp_sw.h 2014-12-08 00:31:53.256418001 -0600
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -72405,9 +72431,9 @@ diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/ipu_prp_sw.h lin
+int prp_still_deselect(void *private);
+
+#endif
-diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c linux-3.14.22/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c
---- linux-3.14.22.orig/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c 2014-10-22 14:55:52.618220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c 2014-12-08 00:31:53.256418001 -0600
@@ -0,0 +1,521 @@
+/*
+ * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -72930,9 +72956,9 @@ diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_b
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("IPU PRP VF SDC Backgroud Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c linux-3.14.22/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c
---- linux-3.14.22.orig/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c 2014-10-22 14:55:52.618220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c 2014-12-08 00:31:53.256418001 -0600
@@ -0,0 +1,582 @@
+/*
+ * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -73516,9 +73542,9 @@ diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("IPU PRP VF SDC Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/ipu_still.c linux-3.14.22/drivers/media/platform/mxc/capture/ipu_still.c
---- linux-3.14.22.orig/drivers/media/platform/mxc/capture/ipu_still.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/media/platform/mxc/capture/ipu_still.c 2014-10-22 14:55:52.618220001 -0500
+diff -Nur linux-3.14.14/drivers/media/platform/mxc/capture/ipu_still.c linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_still.c
+--- linux-3.14.14/drivers/media/platform/mxc/capture/ipu_still.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ipu_still.c 2014-12-08 00:31:53.256418001 -0600
@@ -0,0 +1,268 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -73788,9 +73814,9 @@ diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/ipu_still.c linu
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("IPU PRP STILL IMAGE Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/Kconfig linux-3.14.22/drivers/media/platform/mxc/capture/Kconfig
---- linux-3.14.22.orig/drivers/media/platform/mxc/capture/Kconfig 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/media/platform/mxc/capture/Kconfig 2014-10-22 14:55:52.618220001 -0500
+diff -Nur linux-3.14.14/drivers/media/platform/mxc/capture/Kconfig linux-imx6-3.14/drivers/media/platform/mxc/capture/Kconfig
+--- linux-3.14.14/drivers/media/platform/mxc/capture/Kconfig 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/Kconfig 2014-12-08 00:31:53.252418001 -0600
@@ -0,0 +1,86 @@
+if VIDEO_MXC_CAPTURE
+
@@ -73878,9 +73904,9 @@ diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/Kconfig linux-3.
+endmenu
+
+endif
-diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/Makefile linux-3.14.22/drivers/media/platform/mxc/capture/Makefile
---- linux-3.14.22.orig/drivers/media/platform/mxc/capture/Makefile 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/media/platform/mxc/capture/Makefile 2014-10-22 14:55:52.618220001 -0500
+diff -Nur linux-3.14.14/drivers/media/platform/mxc/capture/Makefile linux-imx6-3.14/drivers/media/platform/mxc/capture/Makefile
+--- linux-3.14.14/drivers/media/platform/mxc/capture/Makefile 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/Makefile 2014-12-08 00:31:53.252418001 -0600
@@ -0,0 +1,21 @@
+obj-$(CONFIG_VIDEO_MXC_CSI_CAMERA) += fsl_csi.o csi_v4l2_capture.o
+
@@ -73903,9 +73929,9 @@ diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/Makefile linux-3
+
+adv7180_tvin-objs := adv7180.o
+obj-$(CONFIG_MXC_TVIN_ADV7180) += adv7180_tvin.o
-diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c linux-3.14.22/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c
---- linux-3.14.22.orig/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c 2014-10-22 14:55:52.618220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c 2014-12-08 00:31:53.256418001 -0600
@@ -0,0 +1,3102 @@
+/*
+ * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -77009,9 +77035,9 @@ diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/mxc_v4l2_capture
+MODULE_DESCRIPTION("V4L2 capture driver for Mxc based cameras");
+MODULE_LICENSE("GPL");
+MODULE_SUPPORTED_DEVICE("video");
-diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h linux-3.14.22/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h
---- linux-3.14.22.orig/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h 2014-10-22 14:55:52.618220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h 2014-12-08 00:31:53.256418001 -0600
@@ -0,0 +1,260 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -77273,9 +77299,9 @@ diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/mxc_v4l2_capture
+
+void set_mclk_rate(uint32_t *p_mclk_freq, uint32_t csi);
+#endif /* __MXC_V4L2_CAPTURE_H__ */
-diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/ov5640.c linux-3.14.22/drivers/media/platform/mxc/capture/ov5640.c
---- linux-3.14.22.orig/drivers/media/platform/mxc/capture/ov5640.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/media/platform/mxc/capture/ov5640.c 2014-10-22 14:55:52.622220001 -0500
+diff -Nur linux-3.14.14/drivers/media/platform/mxc/capture/ov5640.c linux-imx6-3.14/drivers/media/platform/mxc/capture/ov5640.c
+--- linux-3.14.14/drivers/media/platform/mxc/capture/ov5640.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ov5640.c 2014-12-08 00:31:53.256418001 -0600
@@ -0,0 +1,1951 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -79228,9 +79254,9 @@ diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/ov5640.c linux-3
+MODULE_LICENSE("GPL");
+MODULE_VERSION("1.0");
+MODULE_ALIAS("CSI");
-diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/ov5640_mipi.c linux-3.14.22/drivers/media/platform/mxc/capture/ov5640_mipi.c
---- linux-3.14.22.orig/drivers/media/platform/mxc/capture/ov5640_mipi.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/media/platform/mxc/capture/ov5640_mipi.c 2014-10-22 14:55:52.622220001 -0500
+diff -Nur linux-3.14.14/drivers/media/platform/mxc/capture/ov5640_mipi.c linux-imx6-3.14/drivers/media/platform/mxc/capture/ov5640_mipi.c
+--- linux-3.14.14/drivers/media/platform/mxc/capture/ov5640_mipi.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ov5640_mipi.c 2014-12-08 00:31:53.256418001 -0600
@@ -0,0 +1,2104 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -81336,9 +81362,9 @@ diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/ov5640_mipi.c li
+MODULE_LICENSE("GPL");
+MODULE_VERSION("1.0");
+MODULE_ALIAS("CSI");
-diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/ov5642.c linux-3.14.22/drivers/media/platform/mxc/capture/ov5642.c
---- linux-3.14.22.orig/drivers/media/platform/mxc/capture/ov5642.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/media/platform/mxc/capture/ov5642.c 2014-10-22 14:55:52.626220001 -0500
+diff -Nur linux-3.14.14/drivers/media/platform/mxc/capture/ov5642.c linux-imx6-3.14/drivers/media/platform/mxc/capture/ov5642.c
+--- linux-3.14.14/drivers/media/platform/mxc/capture/ov5642.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/media/platform/mxc/capture/ov5642.c 2014-12-08 00:31:53.256418001 -0600
@@ -0,0 +1,4252 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -85592,23 +85618,23 @@ diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/capture/ov5642.c linux-3
+MODULE_LICENSE("GPL");
+MODULE_VERSION("1.0");
+MODULE_ALIAS("CSI");
-diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/output/Kconfig linux-3.14.22/drivers/media/platform/mxc/output/Kconfig
---- linux-3.14.22.orig/drivers/media/platform/mxc/output/Kconfig 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/media/platform/mxc/output/Kconfig 2014-10-22 14:55:52.626220001 -0500
+diff -Nur linux-3.14.14/drivers/media/platform/mxc/output/Kconfig linux-imx6-3.14/drivers/media/platform/mxc/output/Kconfig
+--- linux-3.14.14/drivers/media/platform/mxc/output/Kconfig 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/media/platform/mxc/output/Kconfig 2014-12-08 00:31:53.256418001 -0600
@@ -0,0 +1,5 @@
+config VIDEO_MXC_IPU_OUTPUT
+ tristate "IPU v4l2 output support"
+ depends on VIDEO_MXC_OUTPUT && MXC_IPU
+ ---help---
+ This is the video4linux2 driver for IPU post processing video output.
-diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/output/Makefile linux-3.14.22/drivers/media/platform/mxc/output/Makefile
---- linux-3.14.22.orig/drivers/media/platform/mxc/output/Makefile 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/media/platform/mxc/output/Makefile 2014-10-22 14:55:52.626220001 -0500
+diff -Nur linux-3.14.14/drivers/media/platform/mxc/output/Makefile linux-imx6-3.14/drivers/media/platform/mxc/output/Makefile
+--- linux-3.14.14/drivers/media/platform/mxc/output/Makefile 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/media/platform/mxc/output/Makefile 2014-12-08 00:31:53.256418001 -0600
@@ -0,0 +1 @@
+obj-$(CONFIG_VIDEO_MXC_IPU_OUTPUT) += mxc_vout.o
-diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/output/mxc_vout.c linux-3.14.22/drivers/media/platform/mxc/output/mxc_vout.c
---- linux-3.14.22.orig/drivers/media/platform/mxc/output/mxc_vout.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/media/platform/mxc/output/mxc_vout.c 2014-10-22 14:55:52.626220001 -0500
+diff -Nur linux-3.14.14/drivers/media/platform/mxc/output/mxc_vout.c linux-imx6-3.14/drivers/media/platform/mxc/output/mxc_vout.c
+--- linux-3.14.14/drivers/media/platform/mxc/output/mxc_vout.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/media/platform/mxc/output/mxc_vout.c 2014-12-08 00:31:53.256418001 -0600
@@ -0,0 +1,2265 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -87875,9 +87901,9 @@ diff -Nur linux-3.14.22.orig/drivers/media/platform/mxc/output/mxc_vout.c linux-
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("V4L2-driver for MXC video output");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/drivers/media/v4l2-core/videobuf2-dma-contig.c linux-3.14.22/drivers/media/v4l2-core/videobuf2-dma-contig.c
---- linux-3.14.22.orig/drivers/media/v4l2-core/videobuf2-dma-contig.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/media/v4l2-core/videobuf2-dma-contig.c 2014-10-22 14:55:52.626220001 -0500
+diff -Nur linux-3.14.14/drivers/media/v4l2-core/videobuf2-dma-contig.c linux-imx6-3.14/drivers/media/v4l2-core/videobuf2-dma-contig.c
+--- linux-3.14.14/drivers/media/v4l2-core/videobuf2-dma-contig.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/media/v4l2-core/videobuf2-dma-contig.c 2014-12-08 00:31:53.360418001 -0600
@@ -719,7 +719,7 @@
/* get the associated scatterlist for this buffer */
@@ -87887,9 +87913,9 @@ diff -Nur linux-3.14.22.orig/drivers/media/v4l2-core/videobuf2-dma-contig.c linu
pr_err("Error getting dmabuf scatterlist\n");
return -EINVAL;
}
-diff -Nur linux-3.14.22.orig/drivers/media/v4l2-core/videobuf-dma-contig.c linux-3.14.22/drivers/media/v4l2-core/videobuf-dma-contig.c
---- linux-3.14.22.orig/drivers/media/v4l2-core/videobuf-dma-contig.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/media/v4l2-core/videobuf-dma-contig.c 2014-10-22 14:55:52.626220001 -0500
+diff -Nur linux-3.14.14/drivers/media/v4l2-core/videobuf-dma-contig.c linux-imx6-3.14/drivers/media/v4l2-core/videobuf-dma-contig.c
+--- linux-3.14.14/drivers/media/v4l2-core/videobuf-dma-contig.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/media/v4l2-core/videobuf-dma-contig.c 2014-12-08 00:31:53.360418001 -0600
@@ -304,7 +304,7 @@
/* Try to remap memory */
@@ -87899,9 +87925,9 @@ diff -Nur linux-3.14.22.orig/drivers/media/v4l2-core/videobuf-dma-contig.c linux
retval = vm_iomap_memory(vma, vma->vm_start, size);
if (retval) {
dev_err(q->dev, "mmap: remap failed with error %d. ",
-diff -Nur linux-3.14.22.orig/drivers/mfd/ab8500-core.c linux-3.14.22/drivers/mfd/ab8500-core.c
---- linux-3.14.22.orig/drivers/mfd/ab8500-core.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mfd/ab8500-core.c 2014-10-22 14:55:52.626220001 -0500
+diff -Nur linux-3.14.14/drivers/mfd/ab8500-core.c linux-imx6-3.14/drivers/mfd/ab8500-core.c
+--- linux-3.14.14/drivers/mfd/ab8500-core.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mfd/ab8500-core.c 2014-12-08 00:31:53.376418001 -0600
@@ -592,7 +592,7 @@
/* If ->irq_base is zero this will give a linear mapping */
@@ -87987,9 +88013,9 @@ diff -Nur linux-3.14.22.orig/drivers/mfd/ab8500-core.c linux-3.14.22/drivers/mfd
if (ret)
dev_err(ab8500->dev, "error adding bm devices\n");
}
-diff -Nur linux-3.14.22.orig/drivers/mfd/db8500-prcmu.c linux-3.14.22/drivers/mfd/db8500-prcmu.c
---- linux-3.14.22.orig/drivers/mfd/db8500-prcmu.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mfd/db8500-prcmu.c 2014-10-22 14:55:52.626220001 -0500
+diff -Nur linux-3.14.14/drivers/mfd/db8500-prcmu.c linux-imx6-3.14/drivers/mfd/db8500-prcmu.c
+--- linux-3.14.14/drivers/mfd/db8500-prcmu.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mfd/db8500-prcmu.c 2014-12-08 00:31:53.380418001 -0600
@@ -25,6 +25,7 @@
#include <linux/bitops.h>
#include <linux/fs.h>
@@ -88071,9 +88097,9 @@ diff -Nur linux-3.14.22.orig/drivers/mfd/db8500-prcmu.c linux-3.14.22/drivers/mf
if (err) {
mfd_remove_devices(&pdev->dev);
pr_err("prcmu: Failed to add ab8500 subdevice\n");
-diff -Nur linux-3.14.22.orig/drivers/mfd/Kconfig linux-3.14.22/drivers/mfd/Kconfig
---- linux-3.14.22.orig/drivers/mfd/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mfd/Kconfig 2014-10-22 14:55:52.630220001 -0500
+diff -Nur linux-3.14.14/drivers/mfd/Kconfig linux-imx6-3.14/drivers/mfd/Kconfig
+--- linux-3.14.14/drivers/mfd/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mfd/Kconfig 2014-12-08 00:31:53.376418001 -0600
@@ -163,6 +163,14 @@
Additional drivers must be enabled in order to use the functionality
of the device.
@@ -88094,17 +88120,17 @@ diff -Nur linux-3.14.22.orig/drivers/mfd/Kconfig linux-3.14.22/drivers/mfd/Kconf
Platform configuration infrastructure for the ARM Ltd.
Versatile Express.
+
-diff -Nur linux-3.14.22.orig/drivers/mfd/Makefile linux-3.14.22/drivers/mfd/Makefile
---- linux-3.14.22.orig/drivers/mfd/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mfd/Makefile 2014-10-22 14:55:52.630220001 -0500
+diff -Nur linux-3.14.14/drivers/mfd/Makefile linux-imx6-3.14/drivers/mfd/Makefile
+--- linux-3.14.14/drivers/mfd/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mfd/Makefile 2014-12-08 00:31:53.376418001 -0600
@@ -166,3 +166,4 @@
obj-$(CONFIG_MFD_AS3711) += as3711.o
obj-$(CONFIG_MFD_AS3722) += as3722.o
obj-$(CONFIG_MFD_STW481X) += stw481x.o
+obj-$(CONFIG_MFD_MXC_HDMI) += mxc-hdmi-core.o
-diff -Nur linux-3.14.22.orig/drivers/mfd/mxc-hdmi-core.c linux-3.14.22/drivers/mfd/mxc-hdmi-core.c
---- linux-3.14.22.orig/drivers/mfd/mxc-hdmi-core.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mfd/mxc-hdmi-core.c 2014-10-22 14:55:52.630220001 -0500
+diff -Nur linux-3.14.14/drivers/mfd/mxc-hdmi-core.c linux-imx6-3.14/drivers/mfd/mxc-hdmi-core.c
+--- linux-3.14.14/drivers/mfd/mxc-hdmi-core.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mfd/mxc-hdmi-core.c 2014-12-08 00:31:53.384418001 -0600
@@ -0,0 +1,798 @@
+/*
+ * Copyright (C) 2011-2014 Freescale Semiconductor, Inc.
@@ -88904,9 +88930,9 @@ diff -Nur linux-3.14.22.orig/drivers/mfd/mxc-hdmi-core.c linux-3.14.22/drivers/m
+MODULE_DESCRIPTION("Core driver for Freescale i.Mx on-chip HDMI");
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/drivers/mfd/si476x-cmd.c linux-3.14.22/drivers/mfd/si476x-cmd.c
---- linux-3.14.22.orig/drivers/mfd/si476x-cmd.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mfd/si476x-cmd.c 2014-10-22 14:55:52.630220001 -0500
+diff -Nur linux-3.14.14/drivers/mfd/si476x-cmd.c linux-imx6-3.14/drivers/mfd/si476x-cmd.c
+--- linux-3.14.14/drivers/mfd/si476x-cmd.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mfd/si476x-cmd.c 2014-12-08 00:31:53.384418001 -0600
@@ -303,13 +303,13 @@
* possible racing conditions when working in polling mode */
atomic_set(&core->cts, 0);
@@ -88928,9 +88954,9 @@ diff -Nur linux-3.14.22.orig/drivers/mfd/si476x-cmd.c linux-3.14.22/drivers/mfd/
/*
When working in polling mode, for some reason the tuner will
-diff -Nur linux-3.14.22.orig/drivers/mfd/si476x-i2c.c linux-3.14.22/drivers/mfd/si476x-i2c.c
---- linux-3.14.22.orig/drivers/mfd/si476x-i2c.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mfd/si476x-i2c.c 2014-10-22 14:55:52.630220001 -0500
+diff -Nur linux-3.14.14/drivers/mfd/si476x-i2c.c linux-imx6-3.14/drivers/mfd/si476x-i2c.c
+--- linux-3.14.14/drivers/mfd/si476x-i2c.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mfd/si476x-i2c.c 2014-12-08 00:31:53.384418001 -0600
@@ -303,7 +303,7 @@
*/
udelay(100);
@@ -88978,9 +89004,9 @@ diff -Nur linux-3.14.22.orig/drivers/mfd/si476x-i2c.c linux-3.14.22/drivers/mfd/
rval = si476x_core_get_revision_info(core);
if (rval < 0) {
rval = -ENODEV;
-diff -Nur linux-3.14.22.orig/drivers/mfd/si476x-prop.c linux-3.14.22/drivers/mfd/si476x-prop.c
---- linux-3.14.22.orig/drivers/mfd/si476x-prop.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mfd/si476x-prop.c 2014-10-22 14:55:52.630220001 -0500
+diff -Nur linux-3.14.14/drivers/mfd/si476x-prop.c linux-imx6-3.14/drivers/mfd/si476x-prop.c
+--- linux-3.14.14/drivers/mfd/si476x-prop.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mfd/si476x-prop.c 2014-12-08 00:31:53.388418001 -0600
@@ -217,15 +217,36 @@
return 0;
}
@@ -89018,9 +89044,9 @@ diff -Nur linux-3.14.22.orig/drivers/mfd/si476x-prop.c linux-3.14.22/drivers/mfd
.reg_read = si476x_core_regmap_read,
.reg_write = si476x_core_regmap_write,
-diff -Nur linux-3.14.22.orig/drivers/misc/sram.c linux-3.14.22/drivers/misc/sram.c
---- linux-3.14.22.orig/drivers/misc/sram.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/misc/sram.c 2014-10-22 14:55:52.630220001 -0500
+diff -Nur linux-3.14.14/drivers/misc/sram.c linux-imx6-3.14/drivers/misc/sram.c
+--- linux-3.14.14/drivers/misc/sram.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/misc/sram.c 2014-12-08 00:31:53.412418001 -0600
@@ -29,7 +29,7 @@
#include <linux/spinlock.h>
#include <linux/genalloc.h>
@@ -89030,9 +89056,9 @@ diff -Nur linux-3.14.22.orig/drivers/misc/sram.c linux-3.14.22/drivers/misc/sram
struct sram_dev {
struct gen_pool *pool;
-diff -Nur linux-3.14.22.orig/drivers/mmc/core/core.c linux-3.14.22/drivers/mmc/core/core.c
---- linux-3.14.22.orig/drivers/mmc/core/core.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mmc/core/core.c 2014-10-22 14:55:52.630220001 -0500
+diff -Nur linux-3.14.14/drivers/mmc/core/core.c linux-imx6-3.14/drivers/mmc/core/core.c
+--- linux-3.14.14/drivers/mmc/core/core.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mmc/core/core.c 2014-12-08 00:31:53.416418001 -0600
@@ -13,11 +13,13 @@
#include <linux/module.h>
#include <linux/init.h>
@@ -89101,9 +89127,9 @@ diff -Nur linux-3.14.22.orig/drivers/mmc/core/core.c linux-3.14.22/drivers/mmc/c
mmc_host_clk_hold(host);
host->ios.vdd = fls(ocr) - 1;
-diff -Nur linux-3.14.22.orig/drivers/mmc/core/host.c linux-3.14.22/drivers/mmc/core/host.c
---- linux-3.14.22.orig/drivers/mmc/core/host.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mmc/core/host.c 2014-10-22 14:55:52.630220001 -0500
+diff -Nur linux-3.14.14/drivers/mmc/core/host.c linux-imx6-3.14/drivers/mmc/core/host.c
+--- linux-3.14.14/drivers/mmc/core/host.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mmc/core/host.c 2014-12-08 00:31:53.416418001 -0600
@@ -12,14 +12,18 @@
* MMC host class device management
*/
@@ -89201,9 +89227,9 @@ diff -Nur linux-3.14.22.orig/drivers/mmc/core/host.c linux-3.14.22/drivers/mmc/c
WARN_ON((host->caps & MMC_CAP_SDIO_IRQ) &&
!host->ops->enable_sdio_irq);
-diff -Nur linux-3.14.22.orig/drivers/mmc/core/mmc.c linux-3.14.22/drivers/mmc/core/mmc.c
---- linux-3.14.22.orig/drivers/mmc/core/mmc.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mmc/core/mmc.c 2014-10-22 14:55:52.630220001 -0500
+diff -Nur linux-3.14.14/drivers/mmc/core/mmc.c linux-imx6-3.14/drivers/mmc/core/mmc.c
+--- linux-3.14.14/drivers/mmc/core/mmc.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mmc/core/mmc.c 2014-12-08 00:31:53.420418001 -0600
@@ -317,6 +317,11 @@
mmc_card_set_blockaddr(card);
}
@@ -89609,9 +89635,9 @@ diff -Nur linux-3.14.22.orig/drivers/mmc/core/mmc.c linux-3.14.22/drivers/mmc/co
NULL,
};
-diff -Nur linux-3.14.22.orig/drivers/mmc/core/sdio_irq.c linux-3.14.22/drivers/mmc/core/sdio_irq.c
---- linux-3.14.22.orig/drivers/mmc/core/sdio_irq.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mmc/core/sdio_irq.c 2014-10-22 14:55:52.630220001 -0500
+diff -Nur linux-3.14.14/drivers/mmc/core/sdio_irq.c linux-imx6-3.14/drivers/mmc/core/sdio_irq.c
+--- linux-3.14.14/drivers/mmc/core/sdio_irq.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mmc/core/sdio_irq.c 2014-12-08 00:31:53.420418001 -0600
@@ -90,6 +90,15 @@
return ret;
}
@@ -89674,9 +89700,9 @@ diff -Nur linux-3.14.22.orig/drivers/mmc/core/sdio_irq.c linux-3.14.22/drivers/m
}
return 0;
-diff -Nur linux-3.14.22.orig/drivers/mmc/host/dw_mmc.c linux-3.14.22/drivers/mmc/host/dw_mmc.c
---- linux-3.14.22.orig/drivers/mmc/host/dw_mmc.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mmc/host/dw_mmc.c 2014-10-22 14:55:52.630220001 -0500
+diff -Nur linux-3.14.14/drivers/mmc/host/dw_mmc.c linux-imx6-3.14/drivers/mmc/host/dw_mmc.c
+--- linux-3.14.14/drivers/mmc/host/dw_mmc.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mmc/host/dw_mmc.c 2014-12-08 00:31:53.424418001 -0600
@@ -2140,6 +2140,8 @@
if (!mmc)
return -ENOMEM;
@@ -89686,9 +89712,9 @@ diff -Nur linux-3.14.22.orig/drivers/mmc/host/dw_mmc.c linux-3.14.22/drivers/mmc
slot = mmc_priv(mmc);
slot->id = id;
slot->mmc = mmc;
-diff -Nur linux-3.14.22.orig/drivers/mmc/host/Kconfig linux-3.14.22/drivers/mmc/host/Kconfig
---- linux-3.14.22.orig/drivers/mmc/host/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mmc/host/Kconfig 2014-10-22 14:55:52.634220001 -0500
+diff -Nur linux-3.14.14/drivers/mmc/host/Kconfig linux-imx6-3.14/drivers/mmc/host/Kconfig
+--- linux-3.14.14/drivers/mmc/host/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mmc/host/Kconfig 2014-12-08 00:31:53.420418001 -0600
@@ -25,8 +25,7 @@
If unsure, say N.
@@ -89884,9 +89910,9 @@ diff -Nur linux-3.14.22.orig/drivers/mmc/host/Kconfig linux-3.14.22/drivers/mmc/
help
This selects the BCM2835 SD/MMC controller. If you have a BCM2835
platform with SD or MMC devices, say Y or M here.
-diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-acpi.c linux-3.14.22/drivers/mmc/host/sdhci-acpi.c
---- linux-3.14.22.orig/drivers/mmc/host/sdhci-acpi.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mmc/host/sdhci-acpi.c 2014-10-22 14:55:52.634220001 -0500
+diff -Nur linux-3.14.14/drivers/mmc/host/sdhci-acpi.c linux-imx6-3.14/drivers/mmc/host/sdhci-acpi.c
+--- linux-3.14.14/drivers/mmc/host/sdhci-acpi.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-acpi.c 2014-12-08 00:31:53.428418001 -0600
@@ -101,11 +101,19 @@
}
@@ -89907,9 +89933,9 @@ diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-acpi.c linux-3.14.22/drivers
.hw_reset = sdhci_acpi_int_hw_reset,
};
-diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-bcm2835.c linux-3.14.22/drivers/mmc/host/sdhci-bcm2835.c
---- linux-3.14.22.orig/drivers/mmc/host/sdhci-bcm2835.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mmc/host/sdhci-bcm2835.c 2014-10-22 14:55:52.634220001 -0500
+diff -Nur linux-3.14.14/drivers/mmc/host/sdhci-bcm2835.c linux-imx6-3.14/drivers/mmc/host/sdhci-bcm2835.c
+--- linux-3.14.14/drivers/mmc/host/sdhci-bcm2835.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-bcm2835.c 2014-12-08 00:31:53.428418001 -0600
@@ -131,8 +131,12 @@
.read_l = bcm2835_sdhci_readl,
.read_w = bcm2835_sdhci_readw,
@@ -89923,9 +89949,9 @@ diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-bcm2835.c linux-3.14.22/driv
};
static const struct sdhci_pltfm_data bcm2835_sdhci_pdata = {
-diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-bcm-kona.c linux-3.14.22/drivers/mmc/host/sdhci-bcm-kona.c
---- linux-3.14.22.orig/drivers/mmc/host/sdhci-bcm-kona.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mmc/host/sdhci-bcm-kona.c 2014-10-22 14:55:52.634220001 -0500
+diff -Nur linux-3.14.14/drivers/mmc/host/sdhci-bcm-kona.c linux-imx6-3.14/drivers/mmc/host/sdhci-bcm-kona.c
+--- linux-3.14.14/drivers/mmc/host/sdhci-bcm-kona.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-bcm-kona.c 2014-12-08 00:31:53.428418001 -0600
@@ -205,9 +205,13 @@
}
@@ -89940,9 +89966,9 @@ diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-bcm-kona.c linux-3.14.22/dri
.card_event = sdhci_bcm_kona_card_event,
};
-diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci.c linux-3.14.22/drivers/mmc/host/sdhci.c
---- linux-3.14.22.orig/drivers/mmc/host/sdhci.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mmc/host/sdhci.c 2014-10-22 14:55:52.634220001 -0500
+diff -Nur linux-3.14.14/drivers/mmc/host/sdhci.c linux-imx6-3.14/drivers/mmc/host/sdhci.c
+--- linux-3.14.14/drivers/mmc/host/sdhci.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mmc/host/sdhci.c 2014-12-08 00:31:53.428418001 -0600
@@ -44,6 +44,8 @@
#define MAX_TUNING_LOOP 40
@@ -91196,9 +91222,9 @@ diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci.c linux-3.14.22/drivers/mmc/
kfree(host->align_buffer);
host->adma_desc = NULL;
-diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-cns3xxx.c linux-3.14.22/drivers/mmc/host/sdhci-cns3xxx.c
---- linux-3.14.22.orig/drivers/mmc/host/sdhci-cns3xxx.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mmc/host/sdhci-cns3xxx.c 2014-10-22 14:55:52.634220001 -0500
+diff -Nur linux-3.14.14/drivers/mmc/host/sdhci-cns3xxx.c linux-imx6-3.14/drivers/mmc/host/sdhci-cns3xxx.c
+--- linux-3.14.14/drivers/mmc/host/sdhci-cns3xxx.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-cns3xxx.c 2014-12-08 00:31:53.428418001 -0600
@@ -30,13 +30,12 @@
u16 clk;
unsigned long timeout;
@@ -91242,9 +91268,9 @@ diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-cns3xxx.c linux-3.14.22/driv
};
static int sdhci_cns3xxx_probe(struct platform_device *pdev)
-diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-dove.c linux-3.14.22/drivers/mmc/host/sdhci-dove.c
---- linux-3.14.22.orig/drivers/mmc/host/sdhci-dove.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mmc/host/sdhci-dove.c 2014-10-22 14:55:52.634220001 -0500
+diff -Nur linux-3.14.14/drivers/mmc/host/sdhci-dove.c linux-imx6-3.14/drivers/mmc/host/sdhci-dove.c
+--- linux-3.14.14/drivers/mmc/host/sdhci-dove.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-dove.c 2014-12-08 00:31:53.428418001 -0600
@@ -86,6 +86,10 @@
static const struct sdhci_ops sdhci_dove_ops = {
.read_w = sdhci_dove_readw,
@@ -91256,9 +91282,9 @@ diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-dove.c linux-3.14.22/drivers
};
static const struct sdhci_pltfm_data sdhci_dove_pdata = {
-diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-esdhc.h linux-3.14.22/drivers/mmc/host/sdhci-esdhc.h
---- linux-3.14.22.orig/drivers/mmc/host/sdhci-esdhc.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mmc/host/sdhci-esdhc.h 2014-10-22 14:55:52.634220001 -0500
+diff -Nur linux-3.14.14/drivers/mmc/host/sdhci-esdhc.h linux-imx6-3.14/drivers/mmc/host/sdhci-esdhc.h
+--- linux-3.14.14/drivers/mmc/host/sdhci-esdhc.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-esdhc.h 2014-12-08 00:31:53.428418001 -0600
@@ -20,12 +20,11 @@
#define ESDHC_DEFAULT_QUIRKS (SDHCI_QUIRK_FORCE_BLK_SZ_2048 | \
@@ -91274,9 +91300,9 @@ diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-esdhc.h linux-3.14.22/driver
#define ESDHC_CLOCK_MASK 0x0000fff0
#define ESDHC_PREDIV_SHIFT 8
#define ESDHC_DIVIDER_SHIFT 4
-diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-esdhc-imx.c linux-3.14.22/drivers/mmc/host/sdhci-esdhc-imx.c
---- linux-3.14.22.orig/drivers/mmc/host/sdhci-esdhc-imx.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mmc/host/sdhci-esdhc-imx.c 2014-10-22 14:55:52.634220001 -0500
+diff -Nur linux-3.14.14/drivers/mmc/host/sdhci-esdhc-imx.c linux-imx6-3.14/drivers/mmc/host/sdhci-esdhc-imx.c
+--- linux-3.14.14/drivers/mmc/host/sdhci-esdhc-imx.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-esdhc-imx.c 2014-12-08 00:31:53.428418001 -0600
@@ -11,6 +11,7 @@
* the Free Software Foundation; either version 2 of the License.
*/
@@ -91690,9 +91716,9 @@ diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-esdhc-imx.c linux-3.14.22/dr
clk_prepare_enable(imx_data->clk_ahb);
return sdhci_runtime_resume_host(host);
-diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci.h linux-3.14.22/drivers/mmc/host/sdhci.h
---- linux-3.14.22.orig/drivers/mmc/host/sdhci.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mmc/host/sdhci.h 2014-10-22 14:55:52.634220001 -0500
+diff -Nur linux-3.14.14/drivers/mmc/host/sdhci.h linux-imx6-3.14/drivers/mmc/host/sdhci.h
+--- linux-3.14.14/drivers/mmc/host/sdhci.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mmc/host/sdhci.h 2014-12-08 00:31:53.428418001 -0600
@@ -281,18 +281,15 @@
unsigned int (*get_max_clock)(struct sdhci_host *host);
unsigned int (*get_min_clock)(struct sdhci_host *host);
@@ -91733,9 +91759,9 @@ diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci.h linux-3.14.22/drivers/mmc/
#ifdef CONFIG_PM
extern int sdhci_suspend_host(struct sdhci_host *host);
extern int sdhci_resume_host(struct sdhci_host *host);
-diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-of-arasan.c linux-3.14.22/drivers/mmc/host/sdhci-of-arasan.c
---- linux-3.14.22.orig/drivers/mmc/host/sdhci-of-arasan.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mmc/host/sdhci-of-arasan.c 2014-10-22 14:55:52.634220001 -0500
+diff -Nur linux-3.14.14/drivers/mmc/host/sdhci-of-arasan.c linux-imx6-3.14/drivers/mmc/host/sdhci-of-arasan.c
+--- linux-3.14.14/drivers/mmc/host/sdhci-of-arasan.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-of-arasan.c 2014-12-08 00:31:53.428418001 -0600
@@ -52,8 +52,12 @@
}
@@ -91749,9 +91775,9 @@ diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-of-arasan.c linux-3.14.22/dr
};
static struct sdhci_pltfm_data sdhci_arasan_pdata = {
-diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-of-esdhc.c linux-3.14.22/drivers/mmc/host/sdhci-of-esdhc.c
---- linux-3.14.22.orig/drivers/mmc/host/sdhci-of-esdhc.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mmc/host/sdhci-of-esdhc.c 2014-10-22 14:55:52.634220001 -0500
+diff -Nur linux-3.14.14/drivers/mmc/host/sdhci-of-esdhc.c linux-imx6-3.14/drivers/mmc/host/sdhci-of-esdhc.c
+--- linux-3.14.14/drivers/mmc/host/sdhci-of-esdhc.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-of-esdhc.c 2014-12-08 00:31:53.428418001 -0600
@@ -199,13 +199,14 @@
static void esdhc_of_set_clock(struct sdhci_host *host, unsigned int clock)
@@ -91873,9 +91899,9 @@ diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-of-esdhc.c linux-3.14.22/dri
},
.probe = sdhci_esdhc_probe,
.remove = sdhci_esdhc_remove,
-diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-of-hlwd.c linux-3.14.22/drivers/mmc/host/sdhci-of-hlwd.c
---- linux-3.14.22.orig/drivers/mmc/host/sdhci-of-hlwd.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mmc/host/sdhci-of-hlwd.c 2014-10-22 14:55:52.634220001 -0500
+diff -Nur linux-3.14.14/drivers/mmc/host/sdhci-of-hlwd.c linux-imx6-3.14/drivers/mmc/host/sdhci-of-hlwd.c
+--- linux-3.14.14/drivers/mmc/host/sdhci-of-hlwd.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-of-hlwd.c 2014-12-08 00:31:53.428418001 -0600
@@ -58,6 +58,10 @@
.write_l = sdhci_hlwd_writel,
.write_w = sdhci_hlwd_writew,
@@ -91887,9 +91913,9 @@ diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-of-hlwd.c linux-3.14.22/driv
};
static const struct sdhci_pltfm_data sdhci_hlwd_pdata = {
-diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-pci.c linux-3.14.22/drivers/mmc/host/sdhci-pci.c
---- linux-3.14.22.orig/drivers/mmc/host/sdhci-pci.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mmc/host/sdhci-pci.c 2014-10-22 14:55:52.738220001 -0500
+diff -Nur linux-3.14.14/drivers/mmc/host/sdhci-pci.c linux-imx6-3.14/drivers/mmc/host/sdhci-pci.c
+--- linux-3.14.14/drivers/mmc/host/sdhci-pci.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-pci.c 2014-12-08 00:31:53.428418001 -0600
@@ -1011,7 +1011,7 @@
return 0;
}
@@ -91921,9 +91947,9 @@ diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-pci.c linux-3.14.22/drivers/
.hw_reset = sdhci_pci_hw_reset,
};
-diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-pltfm.c linux-3.14.22/drivers/mmc/host/sdhci-pltfm.c
---- linux-3.14.22.orig/drivers/mmc/host/sdhci-pltfm.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mmc/host/sdhci-pltfm.c 2014-10-22 14:55:52.738220001 -0500
+diff -Nur linux-3.14.14/drivers/mmc/host/sdhci-pltfm.c linux-imx6-3.14/drivers/mmc/host/sdhci-pltfm.c
+--- linux-3.14.14/drivers/mmc/host/sdhci-pltfm.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-pltfm.c 2014-12-08 00:31:53.428418001 -0600
@@ -45,6 +45,10 @@
EXPORT_SYMBOL_GPL(sdhci_pltfm_clk_get_max_clock);
@@ -91935,9 +91961,9 @@ diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-pltfm.c linux-3.14.22/driver
};
#ifdef CONFIG_OF
-diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-pxav2.c linux-3.14.22/drivers/mmc/host/sdhci-pxav2.c
---- linux-3.14.22.orig/drivers/mmc/host/sdhci-pxav2.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mmc/host/sdhci-pxav2.c 2014-10-22 14:55:52.738220001 -0500
+diff -Nur linux-3.14.14/drivers/mmc/host/sdhci-pxav2.c linux-imx6-3.14/drivers/mmc/host/sdhci-pxav2.c
+--- linux-3.14.14/drivers/mmc/host/sdhci-pxav2.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-pxav2.c 2014-12-08 00:31:53.428418001 -0600
@@ -51,11 +51,13 @@
#define MMC_CARD 0x1000
#define MMC_WIDTH 0x0100
@@ -91981,9 +92007,9 @@ diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-pxav2.c linux-3.14.22/driver
};
#ifdef CONFIG_OF
-diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-pxav3.c linux-3.14.22/drivers/mmc/host/sdhci-pxav3.c
---- linux-3.14.22.orig/drivers/mmc/host/sdhci-pxav3.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mmc/host/sdhci-pxav3.c 2014-10-22 14:55:52.738220001 -0500
+diff -Nur linux-3.14.14/drivers/mmc/host/sdhci-pxav3.c linux-imx6-3.14/drivers/mmc/host/sdhci-pxav3.c
+--- linux-3.14.14/drivers/mmc/host/sdhci-pxav3.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-pxav3.c 2014-12-08 00:31:53.428418001 -0600
@@ -57,11 +57,13 @@
#define SDCE_MISC_INT (1<<2)
#define SDCE_MISC_INT_EN (1<<1)
@@ -92028,9 +92054,9 @@ diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-pxav3.c linux-3.14.22/driver
};
static struct sdhci_pltfm_data sdhci_pxav3_pdata = {
-diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-s3c.c linux-3.14.22/drivers/mmc/host/sdhci-s3c.c
---- linux-3.14.22.orig/drivers/mmc/host/sdhci-s3c.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mmc/host/sdhci-s3c.c 2014-10-22 14:55:52.742220001 -0500
+diff -Nur linux-3.14.14/drivers/mmc/host/sdhci-s3c.c linux-imx6-3.14/drivers/mmc/host/sdhci-s3c.c
+--- linux-3.14.14/drivers/mmc/host/sdhci-s3c.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-s3c.c 2014-12-08 00:31:53.428418001 -0600
@@ -57,6 +57,8 @@
struct clk *clk_io;
@@ -92169,9 +92195,9 @@ diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-s3c.c linux-3.14.22/drivers/
};
#define EXYNOS4_SDHCI_DRV_DATA ((kernel_ulong_t)&exynos4_sdhci_drv_data)
#else
-diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-sirf.c linux-3.14.22/drivers/mmc/host/sdhci-sirf.c
---- linux-3.14.22.orig/drivers/mmc/host/sdhci-sirf.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mmc/host/sdhci-sirf.c 2014-10-22 14:55:52.742220001 -0500
+diff -Nur linux-3.14.14/drivers/mmc/host/sdhci-sirf.c linux-imx6-3.14/drivers/mmc/host/sdhci-sirf.c
+--- linux-3.14.14/drivers/mmc/host/sdhci-sirf.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-sirf.c 2014-12-08 00:31:53.428418001 -0600
@@ -28,7 +28,11 @@
}
@@ -92184,9 +92210,9 @@ diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-sirf.c linux-3.14.22/drivers
};
static struct sdhci_pltfm_data sdhci_sirf_pdata = {
-diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-spear.c linux-3.14.22/drivers/mmc/host/sdhci-spear.c
---- linux-3.14.22.orig/drivers/mmc/host/sdhci-spear.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mmc/host/sdhci-spear.c 2014-10-22 14:55:52.742220001 -0500
+diff -Nur linux-3.14.14/drivers/mmc/host/sdhci-spear.c linux-imx6-3.14/drivers/mmc/host/sdhci-spear.c
+--- linux-3.14.14/drivers/mmc/host/sdhci-spear.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-spear.c 2014-12-08 00:31:53.428418001 -0600
@@ -37,7 +37,10 @@
/* sdhci ops */
@@ -92199,9 +92225,9 @@ diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-spear.c linux-3.14.22/driver
};
/* gpio card detection interrupt handler */
-diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-tegra.c linux-3.14.22/drivers/mmc/host/sdhci-tegra.c
---- linux-3.14.22.orig/drivers/mmc/host/sdhci-tegra.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mmc/host/sdhci-tegra.c 2014-10-22 14:55:52.742220001 -0500
+diff -Nur linux-3.14.14/drivers/mmc/host/sdhci-tegra.c linux-imx6-3.14/drivers/mmc/host/sdhci-tegra.c
+--- linux-3.14.14/drivers/mmc/host/sdhci-tegra.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mmc/host/sdhci-tegra.c 2014-12-08 00:31:53.428418001 -0600
@@ -48,19 +48,6 @@
int power_gpio;
};
@@ -92268,9 +92294,9 @@ diff -Nur linux-3.14.22.orig/drivers/mmc/host/sdhci-tegra.c linux-3.14.22/driver
};
static const struct sdhci_pltfm_data sdhci_tegra20_pdata = {
-diff -Nur linux-3.14.22.orig/drivers/mtd/chips/cfi_cmdset_0002.c linux-3.14.22/drivers/mtd/chips/cfi_cmdset_0002.c
---- linux-3.14.22.orig/drivers/mtd/chips/cfi_cmdset_0002.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mtd/chips/cfi_cmdset_0002.c 2014-10-22 14:55:52.746220001 -0500
+diff -Nur linux-3.14.14/drivers/mtd/chips/cfi_cmdset_0002.c linux-imx6-3.14/drivers/mtd/chips/cfi_cmdset_0002.c
+--- linux-3.14.14/drivers/mtd/chips/cfi_cmdset_0002.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mtd/chips/cfi_cmdset_0002.c 2014-12-08 00:31:53.432418001 -0600
@@ -1058,17 +1058,13 @@
#define UDELAY(map, chip, adr, usec) \
@@ -92289,9 +92315,9 @@ diff -Nur linux-3.14.22.orig/drivers/mtd/chips/cfi_cmdset_0002.c linux-3.14.22/d
} while (0)
#endif
-diff -Nur linux-3.14.22.orig/drivers/mtd/ubi/build.c linux-3.14.22/drivers/mtd/ubi/build.c
---- linux-3.14.22.orig/drivers/mtd/ubi/build.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/mtd/ubi/build.c 2014-10-22 14:55:52.746220001 -0500
+diff -Nur linux-3.14.14/drivers/mtd/ubi/build.c linux-imx6-3.14/drivers/mtd/ubi/build.c
+--- linux-3.14.14/drivers/mtd/ubi/build.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/mtd/ubi/build.c 2014-12-08 00:31:53.456418001 -0600
@@ -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));
@@ -92301,9 +92327,9 @@ diff -Nur linux-3.14.22.orig/drivers/mtd/ubi/build.c linux-3.14.22/drivers/mtd/u
/*
* Some flashes have several erase regions. Different regions
* may have different eraseblock size and other
-diff -Nur linux-3.14.22.orig/drivers/mxc/asrc/Kconfig linux-3.14.22/drivers/mxc/asrc/Kconfig
---- linux-3.14.22.orig/drivers/mxc/asrc/Kconfig 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/asrc/Kconfig 2014-10-22 14:55:52.746220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/asrc/Kconfig linux-imx6-3.14/drivers/mxc/asrc/Kconfig
+--- linux-3.14.14/drivers/mxc/asrc/Kconfig 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/asrc/Kconfig 2014-12-08 00:31:53.460418001 -0600
@@ -0,0 +1,14 @@
+#
+# ASRC configuration
@@ -92319,17 +92345,17 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/asrc/Kconfig linux-3.14.22/drivers/mxc/
+ Say Y to get the ASRC service.
+
+endmenu
-diff -Nur linux-3.14.22.orig/drivers/mxc/asrc/Makefile linux-3.14.22/drivers/mxc/asrc/Makefile
---- linux-3.14.22.orig/drivers/mxc/asrc/Makefile 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/asrc/Makefile 2014-10-22 14:55:52.810220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/asrc/Makefile linux-imx6-3.14/drivers/mxc/asrc/Makefile
+--- linux-3.14.14/drivers/mxc/asrc/Makefile 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/asrc/Makefile 2014-12-08 00:31:53.460418001 -0600
@@ -0,0 +1,4 @@
+#
+# Makefile for the kernel Asynchronous Sample Rate Converter driver
+#
+obj-$(CONFIG_MXC_ASRC) += mxc_asrc.o
-diff -Nur linux-3.14.22.orig/drivers/mxc/asrc/mxc_asrc.c linux-3.14.22/drivers/mxc/asrc/mxc_asrc.c
---- linux-3.14.22.orig/drivers/mxc/asrc/mxc_asrc.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/asrc/mxc_asrc.c 2014-10-22 14:55:52.810220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/asrc/mxc_asrc.c linux-imx6-3.14/drivers/mxc/asrc/mxc_asrc.c
+--- linux-3.14.14/drivers/mxc/asrc/mxc_asrc.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/asrc/mxc_asrc.c 2014-12-08 00:31:53.460418001 -0600
@@ -0,0 +1,1957 @@
+/*
+ * Freescale Asynchronous Sample Rate Converter (ASRC) driver
@@ -94288,9 +94314,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/asrc/mxc_asrc.c linux-3.14.22/drivers/m
+MODULE_DESCRIPTION("Asynchronous Sample Rate Converter");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:mxc_asrc");
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c linux-3.14.22/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c 2014-10-22 14:55:52.810220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c 2014-12-08 00:31:53.460418001 -0600
@@ -0,0 +1,932 @@
+/****************************************************************************
+*
@@ -95224,9 +95250,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_ke
+
+#endif /* gcdENABLE_VG */
+
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h linux-3.14.22/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h 2014-10-22 14:55:52.810220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h 2014-12-08 00:31:53.460418001 -0600
@@ -0,0 +1,319 @@
+/****************************************************************************
+*
@@ -95547,9 +95573,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_ke
+
+#endif /* __gc_hal_kernel_hardware_command_h_ */
+
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c linux-3.14.22/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c 2014-10-22 14:55:52.814220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c 2014-12-08 00:31:53.460418001 -0600
@@ -0,0 +1,2114 @@
+/****************************************************************************
+*
@@ -97665,9 +97691,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_ke
+}
+#endif /* gcdENABLE_VG */
+
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h linux-3.14.22/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h 2014-10-22 14:55:52.814220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h 2014-12-08 00:31:53.460418001 -0600
@@ -0,0 +1,75 @@
+/****************************************************************************
+*
@@ -97744,9 +97770,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_ke
+
+#endif /* __gc_hal_kernel_hardware_h_ */
+
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c linux-3.14.22/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c 2014-10-22 14:55:52.814220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c 2014-12-08 00:31:53.460418001 -0600
@@ -0,0 +1,1735 @@
+/****************************************************************************
+*
@@ -99483,9 +99509,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_ker
+#endif
+}
+
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h linux-3.14.22/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h 2014-10-22 14:55:52.814220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h 2014-12-08 00:31:53.460418001 -0600
@@ -0,0 +1,157 @@
+/****************************************************************************
+*
@@ -99644,9 +99670,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_ker
+
+#endif /* __gc_hal_kernel_context_h_ */
+
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c linux-3.14.22/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c 2014-10-22 14:55:52.822220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c 2014-12-08 00:31:53.464418001 -0600
@@ -0,0 +1,7280 @@
+/****************************************************************************
+*
@@ -106928,9 +106954,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_ker
+#endif
+
+
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h linux-3.14.22/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h 2014-10-22 14:55:52.822220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h 2014-12-08 00:31:53.464418001 -0600
@@ -0,0 +1,136 @@
+/****************************************************************************
+*
@@ -107068,9 +107094,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_ker
+
+#endif /* __gc_hal_kernel_hardware_h_ */
+
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/config linux-3.14.22/drivers/mxc/gpu-viv/config
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/config 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/config 2014-10-22 14:55:52.822220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/gpu-viv/config linux-imx6-3.14/drivers/mxc/gpu-viv/config
+--- linux-3.14.14/drivers/mxc/gpu-viv/config 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/config 2014-12-08 00:31:53.464418001 -0600
@@ -0,0 +1,38 @@
+##############################################################################
+#
@@ -107110,9 +107136,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/config linux-3.14.22/drivers/mx
+BANK_CHANNEL_BIT ?= 12
+ENABLE_GPU_CLOCK_BY_DRIVER = 1
+
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c 2014-10-22 14:55:52.826220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c 2014-12-08 00:31:53.464418001 -0600
@@ -0,0 +1,3967 @@
+/****************************************************************************
+*
@@ -111081,9 +111107,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c linu
+***** Test Code ****************************************************************
+*******************************************************************************/
+
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c 2014-10-22 14:55:52.826220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c 2014-12-08 00:31:53.464418001 -0600
@@ -0,0 +1,3042 @@
+/****************************************************************************
+*
@@ -114127,9 +114153,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_comman
+#endif
+}
+#endif
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c 2014-10-22 14:55:52.830220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c 2014-12-08 00:31:53.464418001 -0600
@@ -0,0 +1,3677 @@
+/****************************************************************************
+*
@@ -117808,9 +117834,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_comman
+}
+
+#endif /* gcdENABLE_VG */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c 2014-10-22 14:55:52.830220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c 2014-12-08 00:31:53.464418001 -0600
@@ -0,0 +1,1604 @@
+/****************************************************************************
+*
@@ -119416,9 +119442,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c l
+ gcmkFOOTER_NO();
+ return gcvSTATUS_OK;
+}
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c 2014-10-22 14:55:52.830220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c 2014-12-08 00:31:53.464418001 -0600
@@ -0,0 +1,2559 @@
+/****************************************************************************
+*
@@ -121979,9 +122005,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.
+ return "nil";
+ }
+}
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c 2014-10-22 14:55:52.834220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c 2014-12-08 00:31:53.464418001 -0600
@@ -0,0 +1,2898 @@
+/****************************************************************************
+*
@@ -124881,9 +124907,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.
+
+ return gcvSTATUS_OK;
+}
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h 2014-10-22 14:55:52.834220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h 2014-12-08 00:31:53.464418001 -0600
@@ -0,0 +1,1011 @@
+/****************************************************************************
+*
@@ -125896,9 +125922,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h linu
+#endif
+
+#endif /* __gc_hal_kernel_h_ */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c 2014-10-22 14:55:52.834220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c 2014-12-08 00:31:53.464418001 -0600
@@ -0,0 +1,859 @@
+/****************************************************************************
+*
@@ -126759,9 +126785,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c
+***** Test Code ****************************************************************
+*******************************************************************************/
+
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c 2014-10-22 14:55:52.834220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c 2014-12-08 00:31:53.464418001 -0600
@@ -0,0 +1,877 @@
+/****************************************************************************
+*
@@ -127640,9 +127666,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interr
+}
+
+#endif /* gcdENABLE_VG */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c 2014-10-22 14:55:52.834220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c 2014-12-08 00:31:53.468418001 -0600
@@ -0,0 +1,1982 @@
+/****************************************************************************
+*
@@ -129626,9 +129652,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c
+****************************** T E S T C O D E ******************************
+******************************************************************************/
+
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c 2014-10-22 14:55:52.834220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c 2014-12-08 00:31:53.468418001 -0600
@@ -0,0 +1,522 @@
+/****************************************************************************
+*
@@ -130152,9 +130178,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg
+}
+
+#endif /* gcdENABLE_VG */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c 2014-10-22 14:55:52.838220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c 2014-12-08 00:31:53.468418001 -0600
@@ -0,0 +1,347 @@
+/****************************************************************************
+*
@@ -130503,9 +130529,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.
+ return gcvSTATUS_OK;
+}
+#endif
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h 2014-10-22 14:55:52.838220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h 2014-12-08 00:31:53.468418001 -0600
@@ -0,0 +1,29 @@
+/****************************************************************************
+*
@@ -130536,9 +130562,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precom
+#include "gc_hal_kernel.h"
+
+#endif /* __gc_hal_kernel_precomp_h_ */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c 2014-10-22 14:55:52.838220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c 2014-12-08 00:31:53.468418001 -0600
@@ -0,0 +1,895 @@
+/****************************************************************************
+*
@@ -131435,9 +131461,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c l
+}
+
+#endif /* gcdENABLE_VG */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h 2014-10-22 14:55:52.838220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h 2014-12-08 00:31:53.468418001 -0600
@@ -0,0 +1,85 @@
+/****************************************************************************
+*
@@ -131524,9 +131550,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h l
+};
+
+#endif /* __gc_hal_kernel_h_ */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c 2014-10-22 14:55:52.838220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c 2014-12-08 00:31:53.468418001 -0600
@@ -0,0 +1,2264 @@
+/****************************************************************************
+*
@@ -133792,9 +133818,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_
+ gcmkFOOTER();
+ return status;
+}
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h 2014-10-22 14:55:52.838220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h 2014-12-08 00:31:53.468418001 -0600
@@ -0,0 +1,3896 @@
+/****************************************************************************
+*
@@ -137692,9 +137718,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h li
+#endif
+
+#endif /* __gc_hal_base_h_ */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h 2014-10-22 14:55:52.842220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h 2014-12-08 00:31:53.468418001 -0600
@@ -0,0 +1,4298 @@
+/****************************************************************************
+*
@@ -141994,9 +142020,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.
+
+#endif /* VIVANTE_NO_3D */
+#endif /* __gc_hal_compiler_h_ */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h 2014-10-22 14:55:52.842220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h 2014-12-08 00:31:53.468418001 -0600
@@ -0,0 +1,1051 @@
+/****************************************************************************
+*
@@ -143049,9 +143075,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h
+#endif
+
+#endif /* __gc_hal_driver_h_ */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h 2014-10-22 14:55:52.842220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h 2014-12-08 00:31:53.468418001 -0600
@@ -0,0 +1,270 @@
+/****************************************************************************
+*
@@ -143323,9 +143349,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg
+#endif
+
+#endif /* __gc_hal_driver_h_ */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h 2014-10-22 14:55:52.842220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h 2014-12-08 00:31:53.468418001 -0600
@@ -0,0 +1,88 @@
+/****************************************************************************
+*
@@ -143415,9 +143441,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h li
+
+#endif /* __gc_hal_dump_h_ */
+
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h 2014-10-22 14:55:52.842220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h 2014-12-08 00:31:53.468418001 -0600
@@ -0,0 +1,627 @@
+/****************************************************************************
+*
@@ -144046,9 +144072,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatfo
+#endif
+
+#endif /* __gc_hal_eglplatform_h_ */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h 2014-10-22 14:55:52.842220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h 2014-12-08 00:31:53.468418001 -0600
@@ -0,0 +1,286 @@
+/****************************************************************************
+*
@@ -144336,9 +144362,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatfo
+#endif
+
+#endif /* __gc_hal_eglplatform_type_h_ */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h 2014-10-22 14:55:52.846220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h 2014-12-08 00:31:53.468418001 -0600
@@ -0,0 +1,2053 @@
+/****************************************************************************
+*
@@ -146393,9 +146419,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h
+
+#endif /* VIVANTE_NO_3D */
+#endif /* __gc_hal_engine_h_ */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h 2014-10-22 14:55:52.846220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h 2014-12-08 00:31:53.468418001 -0600
@@ -0,0 +1,904 @@
+/****************************************************************************
+*
@@ -147301,9 +147327,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg
+#endif
+
+#endif /* __gc_hal_vg_h_ */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h 2014-10-22 14:55:52.846220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h 2014-12-08 00:31:53.468418001 -0600
@@ -0,0 +1,965 @@
+/****************************************************************************
+*
@@ -148270,9 +148296,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h li
+#endif
+
+#endif /* __gc_hal_enum_h_ */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h 2014-10-22 14:55:52.846220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h 2014-12-08 00:31:53.468418001 -0600
@@ -0,0 +1,2661 @@
+/****************************************************************************
+*
@@ -150935,9 +150961,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h linux-3
+#endif
+
+#endif /* __gc_hal_h_ */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h 2014-10-22 14:55:52.846220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h 2014-12-08 00:31:53.468418001 -0600
@@ -0,0 +1,185 @@
+/****************************************************************************
+*
@@ -151124,9 +151150,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_bu
+#endif
+
+#endif /* __gc_hal_kernel_buffer_h_ */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h 2014-10-22 14:55:52.846220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h 2014-12-08 00:31:53.468418001 -0600
@@ -0,0 +1,530 @@
+/****************************************************************************
+*
@@ -151658,9 +151684,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h lin
+
+#endif /* VIVANTE_NO_3D */
+#endif /* __gc_hal_mem_h_ */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h 2014-10-22 14:55:52.846220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h 2014-12-08 00:31:53.468418001 -0600
@@ -0,0 +1,947 @@
+/****************************************************************************
+*
@@ -152609,9 +152635,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h
+#endif
+
+#endif /* __gc_hal_options_h_ */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h 2014-10-22 14:55:52.846220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h 2014-12-08 00:31:53.468418001 -0600
@@ -0,0 +1,584 @@
+/****************************************************************************
+*
@@ -153197,9 +153223,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.
+#endif
+
+#endif /* __gc_hal_profiler_h_ */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h 2014-10-22 14:55:52.850220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h 2014-12-08 00:31:53.472418001 -0600
@@ -0,0 +1,1010 @@
+/****************************************************************************
+*
@@ -154211,9 +154237,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h
+#endif
+
+#endif /* __gc_hal_raster_h_ */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h 2014-10-22 14:55:52.850220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h 2014-12-08 00:31:53.472418001 -0600
@@ -0,0 +1,248 @@
+/****************************************************************************
+*
@@ -154463,9 +154489,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h
+#endif
+
+#endif /* __gc_hal_rename_h_ */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h 2014-10-22 14:55:52.850220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h 2014-12-08 00:31:53.472418001 -0600
@@ -0,0 +1,115 @@
+/****************************************************************************
+*
@@ -154582,9 +154608,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistic
+
+#endif /*__gc_hal_statistics_h_ */
+
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h 2014-10-22 14:55:52.850220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h 2014-12-08 00:31:53.472418001 -0600
@@ -0,0 +1,1080 @@
+/****************************************************************************
+*
@@ -155666,9 +155692,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h l
+#endif
+
+#endif /* __gc_hal_types_h_ */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h 2014-10-22 14:55:52.850220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h 2014-12-08 00:31:53.472418001 -0600
@@ -0,0 +1,37 @@
+/****************************************************************************
+*
@@ -155707,9 +155733,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h
+#define gcvVERSION_TIME __TIME__
+
+#endif /* __gc_hal_version_h_ */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h 2014-10-22 14:55:52.850220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h 2014-12-08 00:31:53.472418001 -0600
@@ -0,0 +1,913 @@
+/****************************************************************************
+*
@@ -156624,9 +156650,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h linu
+#endif
+
+#endif /* __gc_hal_h_ */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c linux-3.14.22/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c 2014-10-22 14:55:52.850220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c 2014-12-08 00:31:53.472418001 -0600
@@ -0,0 +1,795 @@
+/****************************************************************************
+*
@@ -157423,9 +157449,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern
+{
+ gcmkDBGFSPRINT ( _GetArgumentSize ( Message ) , Message ) ;
+}
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h linux-3.14.22/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h 2014-10-22 14:55:52.850220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h 2014-12-08 00:31:53.472418001 -0600
@@ -0,0 +1,84 @@
+/****************************************************************************
+*
@@ -157511,9 +157537,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern
+#endif
+
+
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h linux-3.14.22/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h 2014-10-22 14:55:52.850220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h 2014-12-08 00:31:53.472418001 -0600
@@ -0,0 +1,102 @@
+/****************************************************************************
+*
@@ -157617,9 +157643,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern
+#endif
+
+#endif /* __gc_hal_kernel_debug_h_ */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c linux-3.14.22/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c 2014-10-22 14:55:52.850220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c 2014-12-08 00:31:53.472418001 -0600
@@ -0,0 +1,1676 @@
+/****************************************************************************
+*
@@ -159297,9 +159323,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern
+ gcmkFOOTER();
+ return status;
+}
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h linux-3.14.22/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h 2014-10-22 14:55:52.854220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h 2014-12-08 00:31:53.472418001 -0600
@@ -0,0 +1,192 @@
+/****************************************************************************
+*
@@ -159493,9 +159519,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern
+ );
+
+#endif /* __gc_hal_kernel_device_h_ */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c linux-3.14.22/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c 2014-10-22 14:55:52.854220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c 2014-12-08 00:31:53.472418001 -0600
@@ -0,0 +1,1471 @@
+/****************************************************************************
+*
@@ -160968,9 +160994,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern
+module_exit(gpu_exit);
+
+#endif
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c linux-3.14.22/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c 2014-10-22 14:55:52.854220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c 2014-12-08 00:31:53.472418001 -0600
@@ -0,0 +1,481 @@
+/****************************************************************************
+*
@@ -161453,9 +161479,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern
+ gcmkFOOTER_ARG("Settings->signal=%d", Settings->signal);
+ return gcvSTATUS_OK;
+}
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h linux-3.14.22/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h 2014-10-22 14:55:52.854220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h 2014-12-08 00:31:53.472418001 -0600
@@ -0,0 +1,94 @@
+/****************************************************************************
+*
@@ -161551,9 +161577,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern
+}
+
+#endif /* __gc_hal_kernel_linux_h_ */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c linux-3.14.22/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c 2014-10-22 14:55:52.854220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c 2014-12-08 00:31:53.472418001 -0600
@@ -0,0 +1,32 @@
+/****************************************************************************
+*
@@ -161587,9 +161613,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern
+ if(Y ==0) {return 0;}
+ else {return X % Y;}
+}
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c linux-3.14.22/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c 2014-10-22 14:55:52.858220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c 2014-12-08 00:31:53.472418001 -0600
@@ -0,0 +1,9019 @@
+/****************************************************************************
+*
@@ -170610,9 +170636,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern
+ return status;
+}
+#endif
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h linux-3.14.22/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h 2014-10-22 14:55:52.858220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h 2014-12-08 00:31:53.472418001 -0600
@@ -0,0 +1,83 @@
+/****************************************************************************
+*
@@ -170697,9 +170723,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern
+DRIVER_ARGS;
+
+#endif /* __gc_hal_kernel_os_h_ */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c linux-3.14.22/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c 2014-10-22 14:55:52.858220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c 2014-12-08 00:31:53.472418001 -0600
@@ -0,0 +1,174 @@
+/****************************************************************************
+*
@@ -170875,9 +170901,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern
+}
+
+#endif
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h linux-3.14.22/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h 2014-10-22 14:55:52.858220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h 2014-12-08 00:31:53.472418001 -0600
@@ -0,0 +1,71 @@
+/****************************************************************************
+*
@@ -170950,9 +170976,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern
+ );
+
+#endif /* __gc_hal_kernel_sync_h_ */
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/Kbuild linux-3.14.22/drivers/mxc/gpu-viv/Kbuild
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/Kbuild 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/Kbuild 2014-10-22 14:55:52.858220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/gpu-viv/Kbuild linux-imx6-3.14/drivers/mxc/gpu-viv/Kbuild
+--- linux-3.14.14/drivers/mxc/gpu-viv/Kbuild 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/Kbuild 2014-12-08 00:31:53.460418001 -0600
@@ -0,0 +1,236 @@
+##############################################################################
+#
@@ -171190,9 +171216,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/Kbuild linux-3.14.22/drivers/mx
+galcore-objs := $(OBJS)
+
+endif
-diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/Kconfig linux-3.14.22/drivers/mxc/gpu-viv/Kconfig
---- linux-3.14.22.orig/drivers/mxc/gpu-viv/Kconfig 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/gpu-viv/Kconfig 2014-10-22 14:55:52.858220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/gpu-viv/Kconfig linux-imx6-3.14/drivers/mxc/gpu-viv/Kconfig
+--- linux-3.14.14/drivers/mxc/gpu-viv/Kconfig 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/gpu-viv/Kconfig 2014-12-08 00:31:53.460418001 -0600
@@ -0,0 +1,9 @@
+menu "MXC Vivante GPU support"
+ depends on SOC_IMX6Q
@@ -171203,9 +171229,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/gpu-viv/Kconfig linux-3.14.22/drivers/m
+ Say Y to get the GPU driver support.
+
+endmenu
-diff -Nur linux-3.14.22.orig/drivers/mxc/hdmi-cec/Kconfig linux-3.14.22/drivers/mxc/hdmi-cec/Kconfig
---- linux-3.14.22.orig/drivers/mxc/hdmi-cec/Kconfig 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/hdmi-cec/Kconfig 2014-10-22 14:55:52.858220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/hdmi-cec/Kconfig linux-imx6-3.14/drivers/mxc/hdmi-cec/Kconfig
+--- linux-3.14.14/drivers/mxc/hdmi-cec/Kconfig 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/hdmi-cec/Kconfig 2014-12-08 00:31:53.472418001 -0600
@@ -0,0 +1,11 @@
+
+menu "MXC HDMI CEC (Consumer Electronics Control) support"
@@ -171218,14 +171244,14 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/hdmi-cec/Kconfig linux-3.14.22/drivers/
+ The HDMI CEC device implement low level protocol on i.MX6x platforms.
+
+endmenu
-diff -Nur linux-3.14.22.orig/drivers/mxc/hdmi-cec/Makefile linux-3.14.22/drivers/mxc/hdmi-cec/Makefile
---- linux-3.14.22.orig/drivers/mxc/hdmi-cec/Makefile 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/hdmi-cec/Makefile 2014-10-22 14:55:52.858220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/hdmi-cec/Makefile linux-imx6-3.14/drivers/mxc/hdmi-cec/Makefile
+--- linux-3.14.14/drivers/mxc/hdmi-cec/Makefile 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/hdmi-cec/Makefile 2014-12-08 00:31:53.472418001 -0600
@@ -0,0 +1 @@
+obj-$(CONFIG_MXC_HDMI_CEC) += mxc_hdmi-cec.o
-diff -Nur linux-3.14.22.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c linux-3.14.22/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c
---- linux-3.14.22.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c 2014-10-22 14:55:52.858220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c linux-imx6-3.14/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c
+--- linux-3.14.14/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c 2014-12-08 00:31:53.472418001 -0600
@@ -0,0 +1,629 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -171856,9 +171882,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c linux-3.14.22/d
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:mxc_hdmi_cec");
+
-diff -Nur linux-3.14.22.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h linux-3.14.22/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h
---- linux-3.14.22.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h 2014-10-22 14:55:52.858220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h linux-imx6-3.14/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h
+--- linux-3.14.14/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h 2014-12-08 00:31:53.472418001 -0600
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -171898,9 +171924,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h linux-3.14.22/d
+ _IOR(HDMICEC_IOC_MAGIC, 4, unsigned char[4])
+
+#endif /* !_HDMICEC_H_ */
-diff -Nur linux-3.14.22.orig/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c linux-3.14.22/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c
---- linux-3.14.22.orig/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c 2014-10-22 14:55:52.858220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c linux-imx6-3.14/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c
+--- linux-3.14.14/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c 2014-12-08 00:31:53.472418001 -0600
@@ -0,0 +1,495 @@
+/*
+ * Copyright 2009-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -172397,9 +172423,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c linux-3.1
+ return status;
+}
+EXPORT_SYMBOL(ipu_calc_stripes_sizes);
-diff -Nur linux-3.14.22.orig/drivers/mxc/ipu3/ipu_capture.c linux-3.14.22/drivers/mxc/ipu3/ipu_capture.c
---- linux-3.14.22.orig/drivers/mxc/ipu3/ipu_capture.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/ipu3/ipu_capture.c 2014-10-22 14:55:52.858220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/ipu3/ipu_capture.c linux-imx6-3.14/drivers/mxc/ipu3/ipu_capture.c
+--- linux-3.14.14/drivers/mxc/ipu3/ipu_capture.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_capture.c 2014-12-08 00:31:53.472418001 -0600
@@ -0,0 +1,816 @@
+/*
+ * Copyright 2008-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -173217,9 +173243,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/ipu3/ipu_capture.c linux-3.14.22/driver
+ ipu_free_irq(ipu, irq, ipu);
+ dev_dbg(ipu->dev, "CSI stop timeout - %d * 10ms\n", 5 - ret);
+}
-diff -Nur linux-3.14.22.orig/drivers/mxc/ipu3/ipu_common.c linux-3.14.22/drivers/mxc/ipu3/ipu_common.c
---- linux-3.14.22.orig/drivers/mxc/ipu3/ipu_common.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/ipu3/ipu_common.c 2014-10-22 14:55:52.862220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/ipu3/ipu_common.c linux-imx6-3.14/drivers/mxc/ipu3/ipu_common.c
+--- linux-3.14.14/drivers/mxc/ipu3/ipu_common.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_common.c 2014-12-08 00:31:53.472418001 -0600
@@ -0,0 +1,3134 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -176355,9 +176381,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/ipu3/ipu_common.c linux-3.14.22/drivers
+}
+
+module_exit(ipu_gen_uninit);
-diff -Nur linux-3.14.22.orig/drivers/mxc/ipu3/ipu_device.c linux-3.14.22/drivers/mxc/ipu3/ipu_device.c
---- linux-3.14.22.orig/drivers/mxc/ipu3/ipu_device.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/ipu3/ipu_device.c 2014-10-22 14:55:52.862220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/ipu3/ipu_device.c linux-imx6-3.14/drivers/mxc/ipu3/ipu_device.c
+--- linux-3.14.14/drivers/mxc/ipu3/ipu_device.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_device.c 2014-12-08 00:31:53.476418001 -0600
@@ -0,0 +1,3717 @@
+/*
+ * Copyright 2005-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -180076,9 +180102,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/ipu3/ipu_device.c linux-3.14.22/drivers
+ major = 0;
+ }
+}
-diff -Nur linux-3.14.22.orig/drivers/mxc/ipu3/ipu_disp.c linux-3.14.22/drivers/mxc/ipu3/ipu_disp.c
---- linux-3.14.22.orig/drivers/mxc/ipu3/ipu_disp.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/ipu3/ipu_disp.c 2014-10-22 14:55:52.862220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/ipu3/ipu_disp.c linux-imx6-3.14/drivers/mxc/ipu3/ipu_disp.c
+--- linux-3.14.14/drivers/mxc/ipu3/ipu_disp.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_disp.c 2014-12-08 00:31:53.476418001 -0600
@@ -0,0 +1,1962 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -182042,9 +182068,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/ipu3/ipu_disp.c linux-3.14.22/drivers/m
+ _ipu_init_dc_mappings(ipu);
+ _ipu_dmfc_init(ipu, DMFC_NORMAL, 1);
+}
-diff -Nur linux-3.14.22.orig/drivers/mxc/ipu3/ipu_ic.c linux-3.14.22/drivers/mxc/ipu3/ipu_ic.c
---- linux-3.14.22.orig/drivers/mxc/ipu3/ipu_ic.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/ipu3/ipu_ic.c 2014-10-22 14:55:52.866220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/ipu3/ipu_ic.c linux-imx6-3.14/drivers/mxc/ipu3/ipu_ic.c
+--- linux-3.14.14/drivers/mxc/ipu3/ipu_ic.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_ic.c 2014-12-08 00:31:53.476418001 -0600
@@ -0,0 +1,924 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -182970,9 +182996,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/ipu3/ipu_ic.c linux-3.14.22/drivers/mxc
+
+ ipu_vdi_write(ipu, reg, VDI_C);
+}
-diff -Nur linux-3.14.22.orig/drivers/mxc/ipu3/ipu_param_mem.h linux-3.14.22/drivers/mxc/ipu3/ipu_param_mem.h
---- linux-3.14.22.orig/drivers/mxc/ipu3/ipu_param_mem.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/ipu3/ipu_param_mem.h 2014-10-22 14:55:52.866220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/ipu3/ipu_param_mem.h linux-imx6-3.14/drivers/mxc/ipu3/ipu_param_mem.h
+--- linux-3.14.14/drivers/mxc/ipu3/ipu_param_mem.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_param_mem.h 2014-12-08 00:31:53.476418001 -0600
@@ -0,0 +1,921 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -183895,9 +183921,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/ipu3/ipu_param_mem.h linux-3.14.22/driv
+ return false;
+}
+#endif
-diff -Nur linux-3.14.22.orig/drivers/mxc/ipu3/ipu_pixel_clk.c linux-3.14.22/drivers/mxc/ipu3/ipu_pixel_clk.c
---- linux-3.14.22.orig/drivers/mxc/ipu3/ipu_pixel_clk.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/ipu3/ipu_pixel_clk.c 2014-10-22 14:55:52.866220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/ipu3/ipu_pixel_clk.c linux-imx6-3.14/drivers/mxc/ipu3/ipu_pixel_clk.c
+--- linux-3.14.14/drivers/mxc/ipu3/ipu_pixel_clk.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_pixel_clk.c 2014-12-08 00:31:53.476418001 -0600
@@ -0,0 +1,317 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -184216,9 +184242,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/ipu3/ipu_pixel_clk.c linux-3.14.22/driv
+
+ return clk;
+}
-diff -Nur linux-3.14.22.orig/drivers/mxc/ipu3/ipu_prv.h linux-3.14.22/drivers/mxc/ipu3/ipu_prv.h
---- linux-3.14.22.orig/drivers/mxc/ipu3/ipu_prv.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/ipu3/ipu_prv.h 2014-10-22 14:55:52.866220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/ipu3/ipu_prv.h linux-imx6-3.14/drivers/mxc/ipu3/ipu_prv.h
+--- linux-3.14.14/drivers/mxc/ipu3/ipu_prv.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_prv.h 2014-12-08 00:31:53.476418001 -0600
@@ -0,0 +1,356 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -184576,9 +184602,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/ipu3/ipu_prv.h linux-3.14.22/drivers/mx
+ const char *parent_name, unsigned long flags,
+ u8 ipu_id, u8 di_id, u8 clk_gate_flags);
+#endif /* __INCLUDE_IPU_PRV_H__ */
-diff -Nur linux-3.14.22.orig/drivers/mxc/ipu3/ipu_regs.h linux-3.14.22/drivers/mxc/ipu3/ipu_regs.h
---- linux-3.14.22.orig/drivers/mxc/ipu3/ipu_regs.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/ipu3/ipu_regs.h 2014-10-22 14:55:52.866220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/ipu3/ipu_regs.h linux-imx6-3.14/drivers/mxc/ipu3/ipu_regs.h
+--- linux-3.14.14/drivers/mxc/ipu3/ipu_regs.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/ipu3/ipu_regs.h 2014-12-08 00:31:53.476418001 -0600
@@ -0,0 +1,743 @@
+/*
+ * Copyright (C) 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -185323,23 +185349,23 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/ipu3/ipu_regs.h linux-3.14.22/drivers/m
+#define WRG (0x01)
+
+#endif
-diff -Nur linux-3.14.22.orig/drivers/mxc/ipu3/Kconfig linux-3.14.22/drivers/mxc/ipu3/Kconfig
---- linux-3.14.22.orig/drivers/mxc/ipu3/Kconfig 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/ipu3/Kconfig 2014-10-22 14:55:52.866220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/ipu3/Kconfig linux-imx6-3.14/drivers/mxc/ipu3/Kconfig
+--- linux-3.14.14/drivers/mxc/ipu3/Kconfig 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/ipu3/Kconfig 2014-12-08 00:31:53.472418001 -0600
@@ -0,0 +1,2 @@
+config MXC_IPU_V3
+ bool
-diff -Nur linux-3.14.22.orig/drivers/mxc/ipu3/Makefile linux-3.14.22/drivers/mxc/ipu3/Makefile
---- linux-3.14.22.orig/drivers/mxc/ipu3/Makefile 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/ipu3/Makefile 2014-10-22 14:55:52.866220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/ipu3/Makefile linux-imx6-3.14/drivers/mxc/ipu3/Makefile
+--- linux-3.14.14/drivers/mxc/ipu3/Makefile 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/ipu3/Makefile 2014-12-08 00:31:53.472418001 -0600
@@ -0,0 +1,4 @@
+obj-$(CONFIG_MXC_IPU_V3) = mxc_ipu.o
+
+mxc_ipu-objs := ipu_common.o ipu_ic.o ipu_disp.o ipu_capture.o ipu_device.o \
+ ipu_calc_stripes_sizes.o vdoa.o ipu_pixel_clk.o
-diff -Nur linux-3.14.22.orig/drivers/mxc/ipu3/vdoa.c linux-3.14.22/drivers/mxc/ipu3/vdoa.c
---- linux-3.14.22.orig/drivers/mxc/ipu3/vdoa.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/ipu3/vdoa.c 2014-10-22 14:55:52.866220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/ipu3/vdoa.c linux-imx6-3.14/drivers/mxc/ipu3/vdoa.c
+--- linux-3.14.14/drivers/mxc/ipu3/vdoa.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/ipu3/vdoa.c 2014-12-08 00:31:53.476418001 -0600
@@ -0,0 +1,543 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -185884,9 +185910,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/ipu3/vdoa.c linux-3.14.22/drivers/mxc/i
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("i.MX Video Data Order Adapter(VDOA) driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/drivers/mxc/ipu3/vdoa.h linux-3.14.22/drivers/mxc/ipu3/vdoa.h
---- linux-3.14.22.orig/drivers/mxc/ipu3/vdoa.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/ipu3/vdoa.h 2014-10-22 14:55:52.866220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/ipu3/vdoa.h linux-imx6-3.14/drivers/mxc/ipu3/vdoa.h
+--- linux-3.14.14/drivers/mxc/ipu3/vdoa.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/ipu3/vdoa.h 2014-12-08 00:31:53.476418001 -0600
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -185957,9 +185983,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/ipu3/vdoa.h linux-3.14.22/drivers/mxc/i
+void vdoa_get_handle(vdoa_handle_t *handle);
+void vdoa_put_handle(vdoa_handle_t *handle);
+#endif
-diff -Nur linux-3.14.22.orig/drivers/mxc/Kconfig linux-3.14.22/drivers/mxc/Kconfig
---- linux-3.14.22.orig/drivers/mxc/Kconfig 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/Kconfig 2014-10-22 14:55:52.866220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/Kconfig linux-imx6-3.14/drivers/mxc/Kconfig
+--- linux-3.14.14/drivers/mxc/Kconfig 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/Kconfig 2014-12-08 00:31:53.460418001 -0600
@@ -0,0 +1,24 @@
+# drivers/mxc/Kconfig
+
@@ -185985,9 +186011,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/Kconfig linux-3.14.22/drivers/mxc/Kconf
+endmenu
+
+endif
-diff -Nur linux-3.14.22.orig/drivers/mxc/Makefile linux-3.14.22/drivers/mxc/Makefile
---- linux-3.14.22.orig/drivers/mxc/Makefile 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/Makefile 2014-10-22 14:55:52.866220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/Makefile linux-imx6-3.14/drivers/mxc/Makefile
+--- linux-3.14.14/drivers/mxc/Makefile 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/Makefile 2014-12-08 00:31:53.460418001 -0600
@@ -0,0 +1,7 @@
+obj-$(CONFIG_MXC_GPU_VIV) += gpu-viv/
+obj-$(CONFIG_MXC_IPU_V3) += ipu3/
@@ -185996,9 +186022,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/Makefile linux-3.14.22/drivers/mxc/Make
+obj-$(CONFIG_MXC_HDMI_CEC) += hdmi-cec/
+obj-$(CONFIG_MXC_MIPI_CSI2) += mipi/
+obj-$(CONFIG_MXC_MLB) += mlb/
-diff -Nur linux-3.14.22.orig/drivers/mxc/mipi/Kconfig linux-3.14.22/drivers/mxc/mipi/Kconfig
---- linux-3.14.22.orig/drivers/mxc/mipi/Kconfig 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/mipi/Kconfig 2014-10-22 14:55:52.866220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/mipi/Kconfig linux-imx6-3.14/drivers/mxc/mipi/Kconfig
+--- linux-3.14.14/drivers/mxc/mipi/Kconfig 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/mipi/Kconfig 2014-12-08 00:31:53.476418001 -0600
@@ -0,0 +1,14 @@
+#
+# MIPI configuration
@@ -186014,17 +186040,17 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/mipi/Kconfig linux-3.14.22/drivers/mxc/
+ Say Y to get the MIPI CSI2 support.
+
+endmenu
-diff -Nur linux-3.14.22.orig/drivers/mxc/mipi/Makefile linux-3.14.22/drivers/mxc/mipi/Makefile
---- linux-3.14.22.orig/drivers/mxc/mipi/Makefile 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/mipi/Makefile 2014-10-22 14:55:52.866220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/mipi/Makefile linux-imx6-3.14/drivers/mxc/mipi/Makefile
+--- linux-3.14.14/drivers/mxc/mipi/Makefile 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/mipi/Makefile 2014-12-08 00:31:53.476418001 -0600
@@ -0,0 +1,4 @@
+#
+# Makefile for the mipi interface driver
+#
+obj-$(CONFIG_MXC_MIPI_CSI2) += mxc_mipi_csi2.o
-diff -Nur linux-3.14.22.orig/drivers/mxc/mipi/mxc_mipi_csi2.c linux-3.14.22/drivers/mxc/mipi/mxc_mipi_csi2.c
---- linux-3.14.22.orig/drivers/mxc/mipi/mxc_mipi_csi2.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/mipi/mxc_mipi_csi2.c 2014-10-22 14:55:52.866220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/mipi/mxc_mipi_csi2.c linux-imx6-3.14/drivers/mxc/mipi/mxc_mipi_csi2.c
+--- linux-3.14.14/drivers/mxc/mipi/mxc_mipi_csi2.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/mipi/mxc_mipi_csi2.c 2014-12-08 00:31:53.476418001 -0600
@@ -0,0 +1,540 @@
+/*
+ * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -186566,9 +186592,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/mipi/mxc_mipi_csi2.c linux-3.14.22/driv
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("i.MX MIPI CSI2 driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/drivers/mxc/mipi/mxc_mipi_csi2.h linux-3.14.22/drivers/mxc/mipi/mxc_mipi_csi2.h
---- linux-3.14.22.orig/drivers/mxc/mipi/mxc_mipi_csi2.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/mipi/mxc_mipi_csi2.h 2014-10-22 14:55:52.866220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/mipi/mxc_mipi_csi2.h linux-imx6-3.14/drivers/mxc/mipi/mxc_mipi_csi2.h
+--- linux-3.14.14/drivers/mxc/mipi/mxc_mipi_csi2.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/mipi/mxc_mipi_csi2.h 2014-12-08 00:31:53.476418001 -0600
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -186616,9 +186642,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/mipi/mxc_mipi_csi2.h linux-3.14.22/driv
+};
+
+#endif
-diff -Nur linux-3.14.22.orig/drivers/mxc/mlb/Kconfig linux-3.14.22/drivers/mxc/mlb/Kconfig
---- linux-3.14.22.orig/drivers/mxc/mlb/Kconfig 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/mlb/Kconfig 2014-10-22 14:55:52.866220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/mlb/Kconfig linux-imx6-3.14/drivers/mxc/mlb/Kconfig
+--- linux-3.14.14/drivers/mxc/mlb/Kconfig 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/mlb/Kconfig 2014-12-08 00:31:53.476418001 -0600
@@ -0,0 +1,17 @@
+#
+# MLB150 configuration
@@ -186637,18 +186663,18 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/mlb/Kconfig linux-3.14.22/drivers/mxc/m
+ Say Y to get the MLB150 support.
+
+endmenu
-diff -Nur linux-3.14.22.orig/drivers/mxc/mlb/Makefile linux-3.14.22/drivers/mxc/mlb/Makefile
---- linux-3.14.22.orig/drivers/mxc/mlb/Makefile 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/mlb/Makefile 2014-10-22 14:55:52.866220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/mlb/Makefile linux-imx6-3.14/drivers/mxc/mlb/Makefile
+--- linux-3.14.14/drivers/mxc/mlb/Makefile 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/mlb/Makefile 2014-12-08 00:31:53.476418001 -0600
@@ -0,0 +1,5 @@
+#
+# Makefile for the i.MX6Q/DL MLB150 driver
+#
+
+obj-$(CONFIG_MXC_MLB150) += mxc_mlb150.o
-diff -Nur linux-3.14.22.orig/drivers/mxc/mlb/mxc_mlb150.c linux-3.14.22/drivers/mxc/mlb/mxc_mlb150.c
---- linux-3.14.22.orig/drivers/mxc/mlb/mxc_mlb150.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/mlb/mxc_mlb150.c 2014-10-22 14:55:52.870220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/mlb/mxc_mlb150.c linux-imx6-3.14/drivers/mxc/mlb/mxc_mlb150.c
+--- linux-3.14.14/drivers/mxc/mlb/mxc_mlb150.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/mlb/mxc_mlb150.c 2014-12-08 00:31:53.476418001 -0600
@@ -0,0 +1,2778 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -189428,9 +189454,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/mlb/mxc_mlb150.c linux-3.14.22/drivers/
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("MLB150 low level driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/drivers/mxc/vpu/Kconfig linux-3.14.22/drivers/mxc/vpu/Kconfig
---- linux-3.14.22.orig/drivers/mxc/vpu/Kconfig 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/vpu/Kconfig 2014-10-22 14:55:52.870220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/vpu/Kconfig linux-imx6-3.14/drivers/mxc/vpu/Kconfig
+--- linux-3.14.14/drivers/mxc/vpu/Kconfig 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/vpu/Kconfig 2014-12-08 00:31:53.476418001 -0600
@@ -0,0 +1,31 @@
+#
+# Codec configuration
@@ -189463,9 +189489,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/vpu/Kconfig linux-3.14.22/drivers/mxc/v
+ This config is used for special VPU use case.
+
+endmenu
-diff -Nur linux-3.14.22.orig/drivers/mxc/vpu/Makefile linux-3.14.22/drivers/mxc/vpu/Makefile
---- linux-3.14.22.orig/drivers/mxc/vpu/Makefile 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/vpu/Makefile 2014-10-22 14:55:52.870220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/vpu/Makefile linux-imx6-3.14/drivers/mxc/vpu/Makefile
+--- linux-3.14.14/drivers/mxc/vpu/Makefile 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/vpu/Makefile 2014-12-08 00:31:53.476418001 -0600
@@ -0,0 +1,9 @@
+#
+# Makefile for the VPU drivers.
@@ -189476,9 +189502,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/vpu/Makefile linux-3.14.22/drivers/mxc/
+ifeq ($(CONFIG_MXC_VPU_DEBUG),y)
+EXTRA_CFLAGS += -DDEBUG
+endif
-diff -Nur linux-3.14.22.orig/drivers/mxc/vpu/mxc_vpu.c linux-3.14.22/drivers/mxc/vpu/mxc_vpu.c
---- linux-3.14.22.orig/drivers/mxc/vpu/mxc_vpu.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/mxc/vpu/mxc_vpu.c 2014-10-22 14:55:52.870220001 -0500
+diff -Nur linux-3.14.14/drivers/mxc/vpu/mxc_vpu.c linux-imx6-3.14/drivers/mxc/vpu/mxc_vpu.c
+--- linux-3.14.14/drivers/mxc/vpu/mxc_vpu.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/mxc/vpu/mxc_vpu.c 2014-12-08 00:31:53.476418001 -0600
@@ -0,0 +1,1342 @@
+/*
+ * Copyright 2006-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -190822,9 +190848,9 @@ diff -Nur linux-3.14.22.orig/drivers/mxc/vpu/mxc_vpu.c linux-3.14.22/drivers/mxc
+
+module_init(vpu_init);
+module_exit(vpu_exit);
-diff -Nur linux-3.14.22.orig/drivers/net/bonding/bonding.h linux-3.14.22/drivers/net/bonding/bonding.h
---- linux-3.14.22.orig/drivers/net/bonding/bonding.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/bonding/bonding.h 2014-10-22 14:55:52.870220001 -0500
+diff -Nur linux-3.14.14/drivers/net/bonding/bonding.h linux-imx6-3.14/drivers/net/bonding/bonding.h
+--- linux-3.14.14/drivers/net/bonding/bonding.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/bonding/bonding.h 2014-12-08 00:31:53.484418001 -0600
@@ -188,7 +188,8 @@
struct net_device *dev; /* first - useful for panic debug */
struct bonding *bond; /* our master */
@@ -190835,9 +190861,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/bonding/bonding.h linux-3.14.22/drivers
unsigned long last_arp_rx;
unsigned long target_last_arp_rx[BOND_MAX_ARP_TARGETS];
s8 link; /* one of BOND_LINK_XXXX */
-diff -Nur linux-3.14.22.orig/drivers/net/bonding/bond_main.c linux-3.14.22/drivers/net/bonding/bond_main.c
---- linux-3.14.22.orig/drivers/net/bonding/bond_main.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/bonding/bond_main.c 2014-10-22 14:55:53.018220001 -0500
+diff -Nur linux-3.14.14/drivers/net/bonding/bond_main.c linux-imx6-3.14/drivers/net/bonding/bond_main.c
+--- linux-3.14.14/drivers/net/bonding/bond_main.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/bonding/bond_main.c 2014-12-08 00:31:53.480418001 -0600
@@ -798,7 +798,7 @@
return;
@@ -190938,9 +190964,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/bonding/bond_main.c linux-3.14.22/drive
rcu_assign_pointer(bond->current_arp_slave, new_slave);
check_state:
-diff -Nur linux-3.14.22.orig/drivers/net/can/flexcan.c linux-3.14.22/drivers/net/can/flexcan.c
---- linux-3.14.22.orig/drivers/net/can/flexcan.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/can/flexcan.c 2014-10-22 14:55:53.022220001 -0500
+diff -Nur linux-3.14.14/drivers/net/can/flexcan.c linux-imx6-3.14/drivers/net/can/flexcan.c
+--- linux-3.14.14/drivers/net/can/flexcan.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/can/flexcan.c 2014-12-08 00:31:53.488418001 -0600
@@ -125,7 +125,8 @@
FLEXCAN_ESR_BOFF_INT | FLEXCAN_ESR_ERR_INT)
@@ -190980,9 +191006,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/can/flexcan.c linux-3.14.22/drivers/net
return NETDEV_TX_OK;
}
-diff -Nur linux-3.14.22.orig/drivers/net/ethernet/adi/bfin_mac.c linux-3.14.22/drivers/net/ethernet/adi/bfin_mac.c
---- linux-3.14.22.orig/drivers/net/ethernet/adi/bfin_mac.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/ethernet/adi/bfin_mac.c 2014-10-22 14:55:53.022220001 -0500
+diff -Nur linux-3.14.14/drivers/net/ethernet/adi/bfin_mac.c linux-imx6-3.14/drivers/net/ethernet/adi/bfin_mac.c
+--- linux-3.14.14/drivers/net/ethernet/adi/bfin_mac.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/ethernet/adi/bfin_mac.c 2014-12-08 00:31:53.500418001 -0600
@@ -1040,6 +1040,7 @@
.n_alarm = 0,
.n_ext_ts = 0,
@@ -190991,9 +191017,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/adi/bfin_mac.c linux-3.14.22/d
.pps = 0,
.adjfreq = bfin_ptp_adjfreq,
.adjtime = bfin_ptp_adjtime,
-diff -Nur linux-3.14.22.orig/drivers/net/ethernet/broadcom/tg3.c linux-3.14.22/drivers/net/ethernet/broadcom/tg3.c
---- linux-3.14.22.orig/drivers/net/ethernet/broadcom/tg3.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/ethernet/broadcom/tg3.c 2014-10-22 14:55:53.030220001 -0500
+diff -Nur linux-3.14.14/drivers/net/ethernet/broadcom/tg3.c linux-imx6-3.14/drivers/net/ethernet/broadcom/tg3.c
+--- linux-3.14.14/drivers/net/ethernet/broadcom/tg3.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/ethernet/broadcom/tg3.c 2014-12-08 00:31:53.540418001 -0600
@@ -6322,6 +6322,7 @@
.n_alarm = 0,
.n_ext_ts = 0,
@@ -191002,10 +191028,10 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/broadcom/tg3.c linux-3.14.22/d
.pps = 0,
.adjfreq = tg3_ptp_adjfreq,
.adjtime = tg3_ptp_adjtime,
-diff -Nur linux-3.14.22.orig/drivers/net/ethernet/cadence/macb.c linux-3.14.22/drivers/net/ethernet/cadence/macb.c
---- linux-3.14.22.orig/drivers/net/ethernet/cadence/macb.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/ethernet/cadence/macb.c 2014-10-22 14:55:53.034220001 -0500
-@@ -604,25 +604,16 @@
+diff -Nur linux-3.14.14/drivers/net/ethernet/cadence/macb.c linux-imx6-3.14/drivers/net/ethernet/cadence/macb.c
+--- linux-3.14.14/drivers/net/ethernet/cadence/macb.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/ethernet/cadence/macb.c 2014-12-08 00:31:53.548418001 -0600
+@@ -605,25 +605,16 @@
{
unsigned int entry;
struct sk_buff *skb;
@@ -191031,7 +191057,7 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/cadence/macb.c linux-3.14.22/d
if (bp->rx_skbuff[entry] == NULL) {
/* allocate sk_buff for this free entry in ring */
skb = netdev_alloc_skb(bp->dev, bp->rx_buffer_size);
-@@ -703,7 +694,6 @@
+@@ -704,7 +695,6 @@
if (!(addr & MACB_BIT(RX_USED)))
break;
@@ -191039,9 +191065,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/cadence/macb.c linux-3.14.22/d
bp->rx_tail++;
count++;
-diff -Nur linux-3.14.22.orig/drivers/net/ethernet/chelsio/cxgb4vf/sge.c linux-3.14.22/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
---- linux-3.14.22.orig/drivers/net/ethernet/chelsio/cxgb4vf/sge.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/ethernet/chelsio/cxgb4vf/sge.c 2014-10-22 14:55:53.034220001 -0500
+diff -Nur linux-3.14.14/drivers/net/ethernet/chelsio/cxgb4vf/sge.c linux-imx6-3.14/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
+--- linux-3.14.14/drivers/net/ethernet/chelsio/cxgb4vf/sge.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/ethernet/chelsio/cxgb4vf/sge.c 2014-12-08 00:31:53.560418001 -0600
@@ -1510,7 +1510,8 @@
{
struct sk_buff *skb;
@@ -191063,9 +191089,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/chelsio/cxgb4vf/sge.c linux-3.
if (!pkt->ip_frag)
skb->ip_summed = CHECKSUM_UNNECESSARY;
else {
-diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/fec.h linux-3.14.22/drivers/net/ethernet/freescale/fec.h
---- linux-3.14.22.orig/drivers/net/ethernet/freescale/fec.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/ethernet/freescale/fec.h 2014-10-22 14:55:53.034220001 -0500
+diff -Nur linux-3.14.14/drivers/net/ethernet/freescale/fec.h linux-imx6-3.14/drivers/net/ethernet/freescale/fec.h
+--- linux-3.14.14/drivers/net/ethernet/freescale/fec.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/fec.h 2014-12-08 00:31:53.592418001 -0600
@@ -221,7 +221,7 @@
#define BD_ENET_TX_RCMASK ((ushort)0x003c)
#define BD_ENET_TX_UN ((ushort)0x0002)
@@ -191136,9 +191162,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/fec.h linux-3.14.22/
struct regulator *reg_phy;
};
-diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/fec_main.c linux-3.14.22/drivers/net/ethernet/freescale/fec_main.c
---- linux-3.14.22.orig/drivers/net/ethernet/freescale/fec_main.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/ethernet/freescale/fec_main.c 2014-10-22 14:55:53.038220001 -0500
+diff -Nur linux-3.14.14/drivers/net/ethernet/freescale/fec_main.c linux-imx6-3.14/drivers/net/ethernet/freescale/fec_main.c
+--- linux-3.14.14/drivers/net/ethernet/freescale/fec_main.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/fec_main.c 2014-12-08 00:31:53.592418001 -0600
@@ -36,6 +36,7 @@
#include <linux/in.h>
#include <linux/ip.h>
@@ -191455,7 +191481,7 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/fec_main.c linux-3.1
+ memcpy(fep->tx_bounce[index], skb->data, buflen);
bufaddr = fep->tx_bounce[index];
- }
-
+-
- /*
- * Some design made an incorrect assumption on endian mode of
- * the system that it's running on. As the result, driver has to
@@ -191463,7 +191489,7 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/fec_main.c linux-3.1
- */
- if (id_entry->driver_data & FEC_QUIRK_SWAP_FRAME)
- swap_buffer(bufaddr, skb->len);
--
+
- /* Save skb pointer */
- fep->tx_skbuff[index] = skb;
+ if (id_entry->driver_data & FEC_QUIRK_SWAP_FRAME)
@@ -192660,9 +192686,12 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/fec_main.c linux-3.1
return 0;
failed_register:
-@@ -2247,15 +2705,7 @@
+@@ -2246,16 +2704,10 @@
+ failed_init:
if (fep->reg_phy)
regulator_disable(fep->reg_phy);
++ if (fep->ptp_clock)
++ ptp_clock_unregister(fep->ptp_clock);
failed_regulator:
- if (fep->clk_ptp)
- clk_disable_unprepare(fep->clk_ptp);
@@ -192677,7 +192706,7 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/fec_main.c linux-3.1
failed_clk:
failed_ioremap:
free_netdev(ndev);
-@@ -2269,42 +2719,40 @@
+@@ -2269,42 +2721,40 @@
struct net_device *ndev = platform_get_drvdata(pdev);
struct fec_enet_private *fep = netdev_priv(ndev);
@@ -192733,7 +192762,7 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/fec_main.c linux-3.1
if (fep->reg_phy)
regulator_disable(fep->reg_phy);
-@@ -2325,48 +2773,49 @@
+@@ -2325,48 +2775,49 @@
return ret;
}
@@ -192811,9 +192840,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/fec_main.c linux-3.1
static struct platform_driver fec_driver = {
.driver = {
-diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/fec_ptp.c linux-3.14.22/drivers/net/ethernet/freescale/fec_ptp.c
---- linux-3.14.22.orig/drivers/net/ethernet/freescale/fec_ptp.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/ethernet/freescale/fec_ptp.c 2014-10-22 14:55:53.038220001 -0500
+diff -Nur linux-3.14.14/drivers/net/ethernet/freescale/fec_ptp.c linux-imx6-3.14/drivers/net/ethernet/freescale/fec_ptp.c
+--- linux-3.14.14/drivers/net/ethernet/freescale/fec_ptp.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/fec_ptp.c 2014-12-08 00:31:53.592418001 -0600
@@ -372,6 +372,7 @@
fep->ptp_caps.n_alarm = 0;
fep->ptp_caps.n_ext_ts = 0;
@@ -192822,9 +192851,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/fec_ptp.c linux-3.14
fep->ptp_caps.pps = 0;
fep->ptp_caps.adjfreq = fec_ptp_adjfreq;
fep->ptp_caps.adjtime = fec_ptp_adjtime;
-diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c linux-3.14.22/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
---- linux-3.14.22.orig/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c 2014-10-22 14:55:53.038220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c 2014-12-08 00:31:53.592418001 -0600
@@ -91,6 +91,9 @@
u16 pkt_len, sc;
int curidx;
@@ -192866,9 +192895,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/fs_enet/fs_enet-main
if (of_device_is_compatible(ofdev->dev.of_node, "fsl,mpc5125-fec")) {
phy_connection_type = of_get_property(ofdev->dev.of_node,
-diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/fs_enet/mii-fec.c linux-3.14.22/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
---- linux-3.14.22.orig/drivers/net/ethernet/freescale/fs_enet/mii-fec.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/ethernet/freescale/fs_enet/mii-fec.c 2014-10-22 14:55:53.038220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/net/ethernet/freescale/fs_enet/mii-fec.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/fs_enet/mii-fec.c 2014-12-08 00:31:53.596418001 -0600
@@ -95,12 +95,6 @@
}
@@ -192890,9 +192919,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/fs_enet/mii-fec.c li
ret = of_address_to_resource(ofdev->dev.of_node, 0, &res);
if (ret)
-diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/gianfar.c linux-3.14.22/drivers/net/ethernet/freescale/gianfar.c
---- linux-3.14.22.orig/drivers/net/ethernet/freescale/gianfar.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/ethernet/freescale/gianfar.c 2014-10-22 14:55:53.038220001 -0500
+diff -Nur linux-3.14.14/drivers/net/ethernet/freescale/gianfar.c linux-imx6-3.14/drivers/net/ethernet/freescale/gianfar.c
+--- linux-3.14.14/drivers/net/ethernet/freescale/gianfar.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/gianfar.c 2014-12-08 00:31:53.596418001 -0600
@@ -9,7 +9,7 @@
* Maintainer: Kumar Gala
* Modifier: Sandeep Gopalpet <sandeep.kumar@freescale.com>
@@ -195095,9 +195124,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/gianfar.c linux-3.14
static struct of_device_id gfar_match[] =
{
{
-diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/gianfar_ethtool.c linux-3.14.22/drivers/net/ethernet/freescale/gianfar_ethtool.c
---- linux-3.14.22.orig/drivers/net/ethernet/freescale/gianfar_ethtool.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/ethernet/freescale/gianfar_ethtool.c 2014-10-22 14:55:53.038220001 -0500
+diff -Nur linux-3.14.14/drivers/net/ethernet/freescale/gianfar_ethtool.c linux-imx6-3.14/drivers/net/ethernet/freescale/gianfar_ethtool.c
+--- linux-3.14.14/drivers/net/ethernet/freescale/gianfar_ethtool.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/gianfar_ethtool.c 2014-12-08 00:31:53.596418001 -0600
@@ -44,10 +44,6 @@
#include "gianfar.h"
@@ -195377,9 +195406,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/gianfar_ethtool.c li
mutex_lock(&priv->rx_queue_access);
switch (cmd->cmd) {
-diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/gianfar.h linux-3.14.22/drivers/net/ethernet/freescale/gianfar.h
---- linux-3.14.22.orig/drivers/net/ethernet/freescale/gianfar.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/ethernet/freescale/gianfar.h 2014-10-22 14:55:53.038220001 -0500
+diff -Nur linux-3.14.14/drivers/net/ethernet/freescale/gianfar.h linux-imx6-3.14/drivers/net/ethernet/freescale/gianfar.h
+--- linux-3.14.14/drivers/net/ethernet/freescale/gianfar.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/gianfar.h 2014-12-08 00:31:53.596418001 -0600
@@ -9,7 +9,7 @@
* Maintainer: Kumar Gala
* Modifier: Sandeep Gopalpet <sandeep.kumar@freescale.com>
@@ -195619,9 +195648,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/gianfar.h linux-3.14
extern const struct ethtool_ops gfar_ethtool_ops;
-diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/gianfar_ptp.c linux-3.14.22/drivers/net/ethernet/freescale/gianfar_ptp.c
---- linux-3.14.22.orig/drivers/net/ethernet/freescale/gianfar_ptp.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/ethernet/freescale/gianfar_ptp.c 2014-10-22 14:55:53.042220001 -0500
+diff -Nur linux-3.14.14/drivers/net/ethernet/freescale/gianfar_ptp.c linux-imx6-3.14/drivers/net/ethernet/freescale/gianfar_ptp.c
+--- linux-3.14.14/drivers/net/ethernet/freescale/gianfar_ptp.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/gianfar_ptp.c 2014-12-08 00:31:53.596418001 -0600
@@ -414,6 +414,7 @@
.n_alarm = 0,
.n_ext_ts = N_EXT_TS,
@@ -195630,9 +195659,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/gianfar_ptp.c linux-
.pps = 1,
.adjfreq = ptp_gianfar_adjfreq,
.adjtime = ptp_gianfar_adjtime,
-diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/gianfar_sysfs.c linux-3.14.22/drivers/net/ethernet/freescale/gianfar_sysfs.c
---- linux-3.14.22.orig/drivers/net/ethernet/freescale/gianfar_sysfs.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/ethernet/freescale/gianfar_sysfs.c 1969-12-31 18:00:00.000000000 -0600
+diff -Nur linux-3.14.14/drivers/net/ethernet/freescale/gianfar_sysfs.c linux-imx6-3.14/drivers/net/ethernet/freescale/gianfar_sysfs.c
+--- linux-3.14.14/drivers/net/ethernet/freescale/gianfar_sysfs.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/gianfar_sysfs.c 1969-12-31 18:00:00.000000000 -0600
@@ -1,340 +0,0 @@
-/*
- * drivers/net/ethernet/freescale/gianfar_sysfs.c
@@ -195974,9 +196003,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/gianfar_sysfs.c linu
- if (rc)
- dev_err(&dev->dev, "Error creating gianfar sysfs files\n");
-}
-diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/Kconfig linux-3.14.22/drivers/net/ethernet/freescale/Kconfig
---- linux-3.14.22.orig/drivers/net/ethernet/freescale/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/ethernet/freescale/Kconfig 2014-10-22 14:55:53.042220001 -0500
+diff -Nur linux-3.14.14/drivers/net/ethernet/freescale/Kconfig linux-imx6-3.14/drivers/net/ethernet/freescale/Kconfig
+--- linux-3.14.14/drivers/net/ethernet/freescale/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/Kconfig 2014-12-08 00:31:53.592418001 -0600
@@ -67,6 +67,7 @@
tristate "Freescale XGMAC MDIO"
depends on FSL_SOC
@@ -195985,9 +196014,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/Kconfig linux-3.14.2
---help---
This driver supports the MDIO bus on the Fman 10G Ethernet MACs.
-diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/Makefile linux-3.14.22/drivers/net/ethernet/freescale/Makefile
---- linux-3.14.22.orig/drivers/net/ethernet/freescale/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/ethernet/freescale/Makefile 2014-10-22 14:55:53.042220001 -0500
+diff -Nur linux-3.14.14/drivers/net/ethernet/freescale/Makefile linux-imx6-3.14/drivers/net/ethernet/freescale/Makefile
+--- linux-3.14.14/drivers/net/ethernet/freescale/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/Makefile 2014-12-08 00:31:53.592418001 -0600
@@ -14,7 +14,6 @@
obj-$(CONFIG_GIANFAR) += gianfar_driver.o
obj-$(CONFIG_PTP_1588_CLOCK_GIANFAR) += gianfar_ptp.o
@@ -195997,9 +196026,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/Makefile linux-3.14.
+ gianfar_ethtool.o
obj-$(CONFIG_UCC_GETH) += ucc_geth_driver.o
ucc_geth_driver-objs := ucc_geth.o ucc_geth_ethtool.o
-diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/ucc_geth.c linux-3.14.22/drivers/net/ethernet/freescale/ucc_geth.c
---- linux-3.14.22.orig/drivers/net/ethernet/freescale/ucc_geth.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/ethernet/freescale/ucc_geth.c 2014-10-22 14:55:53.042220001 -0500
+diff -Nur linux-3.14.14/drivers/net/ethernet/freescale/ucc_geth.c linux-imx6-3.14/drivers/net/ethernet/freescale/ucc_geth.c
+--- linux-3.14.14/drivers/net/ethernet/freescale/ucc_geth.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/ucc_geth.c 2014-12-08 00:31:53.596418001 -0600
@@ -1728,9 +1728,6 @@
phydev = of_phy_connect(dev, ug_info->phy_node, &adjust_link, 0,
@@ -196037,9 +196066,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/ucc_geth.c linux-3.1
/* Find the TBI PHY node. If it's not there, we don't support SGMII */
ug_info->tbi_node = of_parse_phandle(np, "tbi-handle", 0);
-diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/xgmac_mdio.c linux-3.14.22/drivers/net/ethernet/freescale/xgmac_mdio.c
---- linux-3.14.22.orig/drivers/net/ethernet/freescale/xgmac_mdio.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/ethernet/freescale/xgmac_mdio.c 2014-10-22 14:55:53.042220001 -0500
+diff -Nur linux-3.14.14/drivers/net/ethernet/freescale/xgmac_mdio.c linux-imx6-3.14/drivers/net/ethernet/freescale/xgmac_mdio.c
+--- linux-3.14.14/drivers/net/ethernet/freescale/xgmac_mdio.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/ethernet/freescale/xgmac_mdio.c 2014-12-08 00:31:53.596418001 -0600
@@ -162,7 +162,9 @@
/* Return all Fs if nothing was there */
@@ -196051,9 +196080,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/freescale/xgmac_mdio.c linux-3
return 0xffff;
}
-diff -Nur linux-3.14.22.orig/drivers/net/ethernet/intel/e1000e/ptp.c linux-3.14.22/drivers/net/ethernet/intel/e1000e/ptp.c
---- linux-3.14.22.orig/drivers/net/ethernet/intel/e1000e/ptp.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/ethernet/intel/e1000e/ptp.c 2014-10-22 14:55:53.042220001 -0500
+diff -Nur linux-3.14.14/drivers/net/ethernet/intel/e1000e/ptp.c linux-imx6-3.14/drivers/net/ethernet/intel/e1000e/ptp.c
+--- linux-3.14.14/drivers/net/ethernet/intel/e1000e/ptp.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/ethernet/intel/e1000e/ptp.c 2014-12-08 00:31:53.616418001 -0600
@@ -191,6 +191,7 @@
.n_alarm = 0,
.n_ext_ts = 0,
@@ -196062,9 +196091,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/intel/e1000e/ptp.c linux-3.14.
.pps = 0,
.adjfreq = e1000e_phc_adjfreq,
.adjtime = e1000e_phc_adjtime,
-diff -Nur linux-3.14.22.orig/drivers/net/ethernet/mellanox/mlx4/en_clock.c linux-3.14.22/drivers/net/ethernet/mellanox/mlx4/en_clock.c
---- linux-3.14.22.orig/drivers/net/ethernet/mellanox/mlx4/en_clock.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/ethernet/mellanox/mlx4/en_clock.c 2014-10-22 14:55:53.042220001 -0500
+diff -Nur linux-3.14.14/drivers/net/ethernet/mellanox/mlx4/en_clock.c linux-imx6-3.14/drivers/net/ethernet/mellanox/mlx4/en_clock.c
+--- linux-3.14.14/drivers/net/ethernet/mellanox/mlx4/en_clock.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/ethernet/mellanox/mlx4/en_clock.c 2014-12-08 00:31:53.648418001 -0600
@@ -276,6 +276,7 @@
.n_alarm = 0,
.n_ext_ts = 0,
@@ -196073,9 +196102,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/mellanox/mlx4/en_clock.c linux
.pps = 0,
.adjfreq = mlx4_en_phc_adjfreq,
.adjtime = mlx4_en_phc_adjtime,
-diff -Nur linux-3.14.22.orig/drivers/net/ethernet/sfc/ptp.c linux-3.14.22/drivers/net/ethernet/sfc/ptp.c
---- linux-3.14.22.orig/drivers/net/ethernet/sfc/ptp.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/ethernet/sfc/ptp.c 2014-10-22 14:55:53.042220001 -0500
+diff -Nur linux-3.14.14/drivers/net/ethernet/sfc/ptp.c linux-imx6-3.14/drivers/net/ethernet/sfc/ptp.c
+--- linux-3.14.14/drivers/net/ethernet/sfc/ptp.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/ethernet/sfc/ptp.c 2014-12-08 00:31:53.696418001 -0600
@@ -1208,6 +1208,7 @@
.n_alarm = 0,
.n_ext_ts = 0,
@@ -196084,9 +196113,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/sfc/ptp.c linux-3.14.22/driver
.pps = 1,
.adjfreq = efx_phc_adjfreq,
.adjtime = efx_phc_adjtime,
-diff -Nur linux-3.14.22.orig/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c linux-3.14.22/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
---- linux-3.14.22.orig/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c 2014-10-22 14:55:53.042220001 -0500
+diff -Nur linux-3.14.14/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c linux-imx6-3.14/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
+--- linux-3.14.14/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c 2014-12-08 00:31:53.708418001 -0600
@@ -164,6 +164,7 @@
.n_alarm = 0,
.n_ext_ts = 0,
@@ -196095,9 +196124,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c li
.pps = 0,
.adjfreq = stmmac_adjust_freq,
.adjtime = stmmac_adjust_time,
-diff -Nur linux-3.14.22.orig/drivers/net/ethernet/ti/cpts.c linux-3.14.22/drivers/net/ethernet/ti/cpts.c
---- linux-3.14.22.orig/drivers/net/ethernet/ti/cpts.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/ethernet/ti/cpts.c 2014-10-22 14:55:53.042220001 -0500
+diff -Nur linux-3.14.14/drivers/net/ethernet/ti/cpts.c linux-imx6-3.14/drivers/net/ethernet/ti/cpts.c
+--- linux-3.14.14/drivers/net/ethernet/ti/cpts.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/ethernet/ti/cpts.c 2014-12-08 00:31:53.716418001 -0600
@@ -217,6 +217,7 @@
.name = "CTPS timer",
.max_adj = 1000000,
@@ -196106,9 +196135,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/ti/cpts.c linux-3.14.22/driver
.pps = 0,
.adjfreq = cpts_ptp_adjfreq,
.adjtime = cpts_ptp_adjtime,
-diff -Nur linux-3.14.22.orig/drivers/net/ethernet/tile/tilegx.c linux-3.14.22/drivers/net/ethernet/tile/tilegx.c
---- linux-3.14.22.orig/drivers/net/ethernet/tile/tilegx.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/ethernet/tile/tilegx.c 2014-10-22 14:55:53.042220001 -0500
+diff -Nur linux-3.14.14/drivers/net/ethernet/tile/tilegx.c linux-imx6-3.14/drivers/net/ethernet/tile/tilegx.c
+--- linux-3.14.14/drivers/net/ethernet/tile/tilegx.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/ethernet/tile/tilegx.c 2014-12-08 00:31:53.720418001 -0600
@@ -870,6 +870,7 @@
.name = "mPIPE clock",
.max_adj = 999999999,
@@ -196117,9 +196146,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/ethernet/tile/tilegx.c linux-3.14.22/dr
.pps = 0,
.adjfreq = ptp_mpipe_adjfreq,
.adjtime = ptp_mpipe_adjtime,
-diff -Nur linux-3.14.22.orig/drivers/net/ieee802154/Kconfig linux-3.14.22/drivers/net/ieee802154/Kconfig
---- linux-3.14.22.orig/drivers/net/ieee802154/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/ieee802154/Kconfig 2014-10-22 14:55:53.042220001 -0500
+diff -Nur linux-3.14.14/drivers/net/ieee802154/Kconfig linux-imx6-3.14/drivers/net/ieee802154/Kconfig
+--- linux-3.14.14/drivers/net/ieee802154/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/ieee802154/Kconfig 2014-12-08 00:31:53.736418001 -0600
@@ -15,9 +15,9 @@
depends on IEEE802154_DRIVERS
---help---
@@ -196161,9 +196190,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/ieee802154/Kconfig linux-3.14.22/driver
- the module will be called 'mrf24j40'.
+ This driver can also be built as a module. To do so, say M here.
+ the module will be called 'mrf24j40'.
-diff -Nur linux-3.14.22.orig/drivers/net/phy/at803x.c linux-3.14.22/drivers/net/phy/at803x.c
---- linux-3.14.22.orig/drivers/net/phy/at803x.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/phy/at803x.c 2014-10-22 14:55:53.042220001 -0500
+diff -Nur linux-3.14.14/drivers/net/phy/at803x.c linux-imx6-3.14/drivers/net/phy/at803x.c
+--- linux-3.14.14/drivers/net/phy/at803x.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/phy/at803x.c 2014-12-08 00:31:53.744418001 -0600
@@ -27,6 +27,9 @@
#define AT803X_MMD_ACCESS_CONTROL 0x0D
#define AT803X_MMD_ACCESS_CONTROL_DATA 0x0E
@@ -196270,9 +196299,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/phy/at803x.c linux-3.14.22/drivers/net/
}
module_init(atheros_init);
-diff -Nur linux-3.14.22.orig/drivers/net/phy/phy_device.c linux-3.14.22/drivers/net/phy/phy_device.c
---- linux-3.14.22.orig/drivers/net/phy/phy_device.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/phy/phy_device.c 2014-10-22 14:55:53.042220001 -0500
+diff -Nur linux-3.14.14/drivers/net/phy/phy_device.c linux-imx6-3.14/drivers/net/phy/phy_device.c
+--- linux-3.14.14/drivers/net/phy/phy_device.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/phy/phy_device.c 2014-12-08 00:31:53.748418001 -0600
@@ -1029,7 +1029,7 @@
return 0;
}
@@ -196291,9 +196320,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/phy/phy_device.c linux-3.14.22/drivers/
static int gen10g_config_init(struct phy_device *phydev)
{
/* Temporarily just say we support everything */
-diff -Nur linux-3.14.22.orig/drivers/net/phy/smsc.c linux-3.14.22/drivers/net/phy/smsc.c
---- linux-3.14.22.orig/drivers/net/phy/smsc.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/phy/smsc.c 2014-10-22 14:55:53.042220001 -0500
+diff -Nur linux-3.14.14/drivers/net/phy/smsc.c linux-imx6-3.14/drivers/net/phy/smsc.c
+--- linux-3.14.14/drivers/net/phy/smsc.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/phy/smsc.c 2014-12-08 00:31:53.748418001 -0600
@@ -249,8 +249,7 @@
static void __exit smsc_exit(void)
@@ -196304,9 +196333,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/phy/smsc.c linux-3.14.22/drivers/net/ph
}
MODULE_DESCRIPTION("SMSC PHY driver");
-diff -Nur linux-3.14.22.orig/drivers/net/phy/vitesse.c linux-3.14.22/drivers/net/phy/vitesse.c
---- linux-3.14.22.orig/drivers/net/phy/vitesse.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/phy/vitesse.c 2014-10-22 14:55:53.042220001 -0500
+diff -Nur linux-3.14.14/drivers/net/phy/vitesse.c linux-imx6-3.14/drivers/net/phy/vitesse.c
+--- linux-3.14.14/drivers/net/phy/vitesse.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/phy/vitesse.c 2014-12-08 00:31:53.748418001 -0600
@@ -319,8 +319,7 @@
static void __exit vsc82xx_exit(void)
@@ -196317,9 +196346,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/phy/vitesse.c linux-3.14.22/drivers/net
}
module_init(vsc82xx_init);
-diff -Nur linux-3.14.22.orig/drivers/net/veth.c linux-3.14.22/drivers/net/veth.c
---- linux-3.14.22.orig/drivers/net/veth.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/veth.c 2014-10-22 14:55:53.042220001 -0500
+diff -Nur linux-3.14.14/drivers/net/veth.c linux-imx6-3.14/drivers/net/veth.c
+--- linux-3.14.14/drivers/net/veth.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/veth.c 2014-12-08 00:31:53.760418001 -0600
@@ -14,6 +14,7 @@
#include <linux/etherdevice.h>
#include <linux/u64_stats_sync.h>
@@ -196342,9 +196371,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/veth.c linux-3.14.22/drivers/net/veth.c
if (err < 0)
return err;
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/ath/ar5523/ar5523.c linux-3.14.22/drivers/net/wireless/ath/ar5523/ar5523.c
---- linux-3.14.22.orig/drivers/net/wireless/ath/ar5523/ar5523.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/ath/ar5523/ar5523.c 2014-10-22 14:55:53.046220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/ath/ar5523/ar5523.c linux-imx6-3.14/drivers/net/wireless/ath/ar5523/ar5523.c
+--- linux-3.14.14/drivers/net/wireless/ath/ar5523/ar5523.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/ath/ar5523/ar5523.c 2014-12-08 00:31:53.776418001 -0600
@@ -1090,7 +1090,8 @@
return ret;
}
@@ -196355,9 +196384,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/ath/ar5523/ar5523.c linux-3.14
{
struct ar5523 *ar = hw->priv;
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/ath/ath10k/mac.c linux-3.14.22/drivers/net/wireless/ath/ath10k/mac.c
---- linux-3.14.22.orig/drivers/net/wireless/ath/ath10k/mac.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/ath/ath10k/mac.c 2014-10-22 14:55:53.046220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/ath/ath10k/mac.c linux-imx6-3.14/drivers/net/wireless/ath/ath10k/mac.c
+--- linux-3.14.14/drivers/net/wireless/ath/ath10k/mac.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/ath/ath10k/mac.c 2014-12-08 00:31:53.780418001 -0600
@@ -3183,7 +3183,8 @@
return ret;
}
@@ -196368,9 +196397,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/ath/ath10k/mac.c linux-3.14.22
{
struct ath10k *ar = hw->priv;
bool skip;
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/ath/ath6kl/cfg80211.c linux-3.14.22/drivers/net/wireless/ath/ath6kl/cfg80211.c
---- linux-3.14.22.orig/drivers/net/wireless/ath/ath6kl/cfg80211.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/ath/ath6kl/cfg80211.c 2014-10-22 14:55:53.046220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/ath/ath6kl/cfg80211.c linux-imx6-3.14/drivers/net/wireless/ath/ath6kl/cfg80211.c
+--- linux-3.14.14/drivers/net/wireless/ath/ath6kl/cfg80211.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/ath/ath6kl/cfg80211.c 2014-12-08 00:31:53.788418001 -0600
@@ -790,7 +790,7 @@
if (nw_type & ADHOC_NETWORK) {
ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "ad-hoc %s selected\n",
@@ -196395,9 +196424,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/ath/ath6kl/cfg80211.c linux-3.
return;
}
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/ath/ath6kl/hif.h linux-3.14.22/drivers/net/wireless/ath/ath6kl/hif.h
---- linux-3.14.22.orig/drivers/net/wireless/ath/ath6kl/hif.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/ath/ath6kl/hif.h 2014-10-22 14:55:53.046220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/ath/ath6kl/hif.h linux-imx6-3.14/drivers/net/wireless/ath/ath6kl/hif.h
+--- linux-3.14.14/drivers/net/wireless/ath/ath6kl/hif.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/ath/ath6kl/hif.h 2014-12-08 00:31:53.788418001 -0600
@@ -197,9 +197,9 @@
/* bounce buffer for upper layers to copy to/from */
u8 *virt_dma_buf;
@@ -196410,9 +196439,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/ath/ath6kl/hif.h linux-3.14.22
};
struct ath6kl_irq_proc_registers {
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/ath/ath6kl/sdio.c linux-3.14.22/drivers/net/wireless/ath/ath6kl/sdio.c
---- linux-3.14.22.orig/drivers/net/wireless/ath/ath6kl/sdio.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/ath/ath6kl/sdio.c 2014-10-22 14:55:53.046220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/ath/ath6kl/sdio.c linux-imx6-3.14/drivers/net/wireless/ath/ath6kl/sdio.c
+--- linux-3.14.14/drivers/net/wireless/ath/ath6kl/sdio.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/ath/ath6kl/sdio.c 2014-12-08 00:31:53.792418001 -0600
@@ -222,6 +222,7 @@
struct mmc_data *data)
{
@@ -196450,9 +196479,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/ath/ath6kl/sdio.c linux-3.14.2
scat_req_sz = sizeof(*s_req) + scat_list_sz;
if (!virt_scat)
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/ath/ath9k/main.c linux-3.14.22/drivers/net/wireless/ath/ath9k/main.c
---- linux-3.14.22.orig/drivers/net/wireless/ath/ath9k/main.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/ath/ath9k/main.c 2014-10-22 14:55:53.046220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/ath/ath9k/main.c linux-imx6-3.14/drivers/net/wireless/ath/ath9k/main.c
+--- linux-3.14.14/drivers/net/wireless/ath/ath9k/main.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/ath/ath9k/main.c 2014-12-08 00:31:53.808418001 -0600
@@ -1883,7 +1883,8 @@
return !!npend;
}
@@ -196463,9 +196492,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/ath/ath9k/main.c linux-3.14.22
{
struct ath_softc *sc = hw->priv;
struct ath_hw *ah = sc->sc_ah;
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/ath/carl9170/main.c linux-3.14.22/drivers/net/wireless/ath/carl9170/main.c
---- linux-3.14.22.orig/drivers/net/wireless/ath/carl9170/main.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/ath/carl9170/main.c 2014-10-22 14:55:53.046220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/ath/carl9170/main.c linux-imx6-3.14/drivers/net/wireless/ath/carl9170/main.c
+--- linux-3.14.14/drivers/net/wireless/ath/carl9170/main.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/ath/carl9170/main.c 2014-12-08 00:31:53.816418001 -0600
@@ -1707,7 +1707,9 @@
return 0;
}
@@ -196477,9 +196506,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/ath/carl9170/main.c linux-3.14
{
struct ar9170 *ar = hw->priv;
unsigned int vid;
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c 2014-10-22 14:55:53.046220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+--- linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c 2014-12-08 00:31:53.836418001 -0600
@@ -43,7 +43,6 @@
#include "dhd_bus.h"
#include "dhd_dbg.h"
@@ -196738,9 +196767,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c li
{
brcmf_dbg(SDIO, "Enter\n");
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/chip.c linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/chip.c
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/chip.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/chip.c 2014-10-22 14:55:53.046220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/chip.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/chip.c
+--- linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/chip.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/chip.c 2014-12-08 00:31:53.836418001 -0600
@@ -0,0 +1,1035 @@
+/*
+ * Copyright (c) 2014 Broadcom Corporation
@@ -197777,9 +197806,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/chip.c linu
+ PMU_RCTL_LOGIC_DISABLE_MASK)) == 0;
+ }
+}
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/chip.h linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/chip.h
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/chip.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/chip.h 2014-10-22 14:55:53.046220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/chip.h linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/chip.h
+--- linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/chip.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/chip.h 2014-12-08 00:31:53.836418001 -0600
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2014 Broadcom Corporation
@@ -197872,9 +197901,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/chip.h linu
+bool brcmf_chip_sr_capable(struct brcmf_chip *pub);
+
+#endif /* BRCMF_AXIDMP_H */
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h 2014-10-22 14:55:53.046220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
+--- linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h 2014-12-08 00:31:53.840418001 -0600
@@ -63,7 +63,6 @@
*/
struct brcmf_bus_ops {
@@ -197903,9 +197932,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h l
static inline void brcmf_bus_stop(struct brcmf_bus *bus)
{
bus->ops->stop(bus->dev);
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c 2014-10-22 14:55:53.046220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
+--- linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c 2014-12-08 00:31:53.840418001 -0600
@@ -32,6 +32,9 @@
#define BRCMF_DEFAULT_SCAN_UNASSOC_TIME 40
#define BRCMF_DEFAULT_PACKET_FILTER "100 0 0 0 0x01 0x00"
@@ -197945,9 +197974,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.
/* Setup event_msgs, enable E_IF */
err = brcmf_fil_iovar_data_get(ifp, "event_msgs", eventmask,
BRCMF_EVENTING_MASK_LEN);
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd.h linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/dhd.h 2014-10-22 14:55:53.050220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/dhd.h linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
+--- linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/dhd.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/dhd.h 2014-12-08 00:31:53.836418001 -0600
@@ -186,7 +186,7 @@
void brcmf_txflowblock_if(struct brcmf_if *ifp,
enum brcmf_netif_stop_reason reason, bool state);
@@ -197957,9 +197986,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd.h linux
bool success);
/* Sets dongle media info (drv_version, mac address). */
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c 2014-10-22 14:55:53.050220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+--- linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c 2014-12-08 00:31:53.840418001 -0600
@@ -190,7 +190,7 @@
int ret;
struct brcmf_if *ifp = netdev_priv(ndev);
@@ -198086,9 +198115,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
brcmf_debugfs_detach(drvr);
bus_if->drvr = NULL;
kfree(drvr);
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c 2014-10-22 14:55:53.050220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+--- linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c 2014-12-08 00:31:53.840418001 -0600
@@ -23,6 +23,7 @@
#include <linux/interrupt.h>
#include <linux/sched.h>
@@ -199963,9 +199992,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
}
kfree(bus->rxbuf);
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/firmware.c linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/firmware.c
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/firmware.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/firmware.c 2014-10-22 14:55:53.050220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/firmware.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/firmware.c
+--- linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/firmware.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/firmware.c 2014-12-08 00:31:53.840418001 -0600
@@ -0,0 +1,332 @@
+/*
+ * Copyright (c) 2013 Broadcom Corporation
@@ -200299,9 +200328,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/firmware.c
+ GFP_KERNEL, fwctx,
+ brcmf_fw_request_code_done);
+}
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/firmware.h linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/firmware.h
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/firmware.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/firmware.h 2014-10-22 14:55:53.050220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/firmware.h linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/firmware.h
+--- linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/firmware.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/firmware.h 2014-12-08 00:31:53.840418001 -0600
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2013 Broadcom Corporation
@@ -200339,9 +200368,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/firmware.h
+ void *nvram_image, u32 nvram_len));
+
+#endif /* BRCMFMAC_FIRMWARE_H */
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/fwil.c linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/fwil.c
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/fwil.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/fwil.c 2014-10-22 14:55:53.050220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/fwil.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/fwil.c
+--- linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/fwil.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/fwil.c 2014-12-08 00:31:53.840418001 -0600
@@ -54,7 +54,7 @@
if (err >= 0)
err = 0;
@@ -200370,9 +200399,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/fwil.c linu
u32 len)
{
struct brcmf_pub *drvr = ifp->drvr;
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/fwil.h linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/fwil.h
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/fwil.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/fwil.h 2014-10-22 14:55:53.050220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/fwil.h linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/fwil.h
+--- linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/fwil.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/fwil.h 2014-12-08 00:31:53.840418001 -0600
@@ -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);
@@ -200382,9 +200411,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/fwil.h linu
u32 len);
s32 brcmf_fil_iovar_data_get(struct brcmf_if *ifp, char *name, void *data,
u32 len);
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h 2014-10-22 14:55:53.050220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h
+--- linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h 2014-12-08 00:31:53.840418001 -0600
@@ -48,6 +48,19 @@
#define BRCMF_MAXRATES_IN_SET 16 /* max # of rates in rateset */
@@ -200440,9 +200469,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.
/* used for join with or without a specific bssid and channel list */
struct brcmf_join_params {
struct brcmf_ssid_le ssid_le;
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c 2014-10-22 14:55:53.050220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
+--- linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c 2014-12-08 00:31:53.840418001 -0600
@@ -476,6 +476,7 @@
bool bus_flow_blocked;
bool creditmap_received;
@@ -200605,9 +200634,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
fws->fws_wq = create_singlethread_workqueue("brcmf_fws_wq");
if (fws->fws_wq == NULL) {
brcmf_err("workqueue creation failed\n");
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/Makefile linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/Makefile
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/Makefile 2014-10-22 14:55:53.050220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/Makefile linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/Makefile
+--- linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/Makefile 2014-12-08 00:31:53.836418001 -0600
@@ -24,6 +24,7 @@
obj-$(CONFIG_BRCMFMAC) += brcmfmac.o
brcmfmac-objs += \
@@ -200631,9 +200660,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/Makefile li
brcmfmac-$(CONFIG_BRCMFMAC_USB) += \
usb.o
brcmfmac-$(CONFIG_BRCMDBG) += \
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/nvram.c linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/nvram.c
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/nvram.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/nvram.c 1969-12-31 18:00:00.000000000 -0600
+diff -Nur linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/nvram.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/nvram.c
+--- linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/nvram.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/nvram.c 1969-12-31 18:00:00.000000000 -0600
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2013 Broadcom Corporation
@@ -200729,9 +200758,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/nvram.c lin
-}
-
-
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/nvram.h linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/nvram.h
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/nvram.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/nvram.h 1969-12-31 18:00:00.000000000 -0600
+diff -Nur linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/nvram.h linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/nvram.h
+--- linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/nvram.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/nvram.h 1969-12-31 18:00:00.000000000 -0600
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2013 Broadcom Corporation
@@ -200757,9 +200786,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/nvram.h lin
-
-
-#endif /* BRCMFMAC_NVRAM_H */
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/p2p.c linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/p2p.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/p2p.c 2014-10-22 14:55:53.050220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/p2p.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
+--- linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/p2p.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/p2p.c 2014-12-08 00:31:53.840418001 -0600
@@ -797,7 +797,8 @@
/* SOCIAL CHANNELS 1, 6, 11 */
search_state = WL_P2P_DISC_ST_SEARCH;
@@ -200790,9 +200819,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/p2p.c linux
break;
case NL80211_IFTYPE_P2P_DEVICE:
return brcmf_p2p_create_p2pdev(&cfg->p2p, wiphy,
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c 1969-12-31 18:00:00.000000000 -0600
+diff -Nur linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
+--- linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c 1969-12-31 18:00:00.000000000 -0600
@@ -1,973 +0,0 @@
-/*
- * Copyright (c) 2011 Broadcom Corporation
@@ -201767,9 +201796,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
-
- return brcmf_sdio_chip_cr4_exitdl(sdiodev, ci, rstvec);
-}
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h 1969-12-31 18:00:00.000000000 -0600
+diff -Nur linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h
+--- linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h 1969-12-31 18:00:00.000000000 -0600
@@ -1,231 +0,0 @@
-/*
- * Copyright (c) 2011 Broadcom Corporation
@@ -202002,9 +202031,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h
- struct brcmf_chip *ci, u32 rstvec);
-
-#endif /* _BRCMFMAC_SDIO_CHIP_H_ */
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h 2014-10-22 14:55:53.054220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
+--- linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h 2014-12-08 00:31:53.840418001 -0600
@@ -180,6 +180,97 @@
uint max_request_size;
ushort max_segment_count;
@@ -202103,9 +202132,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
};
/* Register/deregister interrupt handler. */
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/usb.c linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/usb.c
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2014-10-22 14:55:53.054220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/usb.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+--- linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2014-12-08 00:31:53.840418001 -0600
@@ -25,6 +25,7 @@
#include <dhd_bus.h>
#include <dhd_dbg.h>
@@ -202557,9 +202586,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/usb.c linux
- INIT_LIST_HEAD(&fw_image_list);
usb_register(&brcmf_usbdrvr);
}
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c 2014-10-22 14:55:53.054220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+--- linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c 2014-12-08 00:31:53.844418001 -0600
@@ -18,6 +18,7 @@
#include <linux/kernel.h>
@@ -203472,9 +203501,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211
if (err)
goto default_conf_out;
err = brcmf_cfg80211_change_iface(wdev->wiphy, ndev, wdev->iftype,
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h 2014-10-22 14:55:53.054220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
+--- linux-3.14.14/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h 2014-12-08 00:31:53.844418001 -0600
@@ -89,21 +89,6 @@
BRCMF_SCAN_STATUS_SUPPRESS,
};
@@ -203531,9 +203560,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211
u16 channel_to_chanspec(struct brcmu_d11inf *d11inf,
struct ieee80211_channel *ch);
u32 wl_get_vif_state_all(struct brcmf_cfg80211_info *cfg, unsigned long state);
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c linux-3.14.22/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c 2014-10-22 14:55:53.054220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+--- linux-3.14.14/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c 2014-12-08 00:31:53.848418001 -0600
@@ -897,7 +897,8 @@
return result;
}
@@ -203557,9 +203586,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if
* is called in brcms_bcma_probe() context, therefore no locking required.
*/
static struct brcms_info *brcms_attach(struct bcma_device *pdev)
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmsmac/main.c linux-3.14.22/drivers/net/wireless/brcm80211/brcmsmac/main.c
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmsmac/main.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/brcmsmac/main.c 2014-10-22 14:55:53.058220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/brcm80211/brcmsmac/main.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmsmac/main.c
+--- linux-3.14.14/drivers/net/wireless/brcm80211/brcmsmac/main.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmsmac/main.c 2014-12-08 00:31:53.848418001 -0600
@@ -4870,14 +4870,11 @@
/*
* low level detach
@@ -203604,9 +203633,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmsmac/main.c linu
if (!brcms_c_radio_monitor_stop(wlc))
callbacks++;
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmutil/d11.c linux-3.14.22/drivers/net/wireless/brcm80211/brcmutil/d11.c
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmutil/d11.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/brcmutil/d11.c 2014-10-22 14:55:53.058220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/brcm80211/brcmutil/d11.c linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmutil/d11.c
+--- linux-3.14.14/drivers/net/wireless/brcm80211/brcmutil/d11.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/brcmutil/d11.c 2014-12-08 00:31:53.860418001 -0600
@@ -21,19 +21,46 @@
#include <brcmu_wifi.h>
#include <brcmu_d11.h>
@@ -203748,9 +203777,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/brcmutil/d11.c linux
break;
case BRCMU_CHSPEC_D11AC_BW_8080:
case BRCMU_CHSPEC_D11AC_BW_160:
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h linux-3.14.22/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h 2014-10-22 14:55:53.058220001 -0500
+diff -Nur linux-3.14.14/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.14/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h 2014-12-08 00:31:53.860418001 -0600
@@ -43,5 +43,6 @@
#define BCM4335_CHIP_ID 0x4335
#define BCM43362_CHIP_ID 43362
@@ -203758,9 +203787,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/include/brcm_hw_ids.
+#define BCM4354_CHIP_ID 0x4354
#endif /* _BRCM_HW_IDS_H_ */
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/include/brcmu_d11.h linux-3.14.22/drivers/net/wireless/brcm80211/include/brcmu_d11.h
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/include/brcmu_d11.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/include/brcmu_d11.h 2014-10-22 14:55:53.058220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/brcm80211/include/brcmu_d11.h linux-imx6-3.14/drivers/net/wireless/brcm80211/include/brcmu_d11.h
+--- linux-3.14.14/drivers/net/wireless/brcm80211/include/brcmu_d11.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/include/brcmu_d11.h 2014-12-08 00:31:53.860418001 -0600
@@ -108,13 +108,7 @@
};
@@ -203789,9 +203818,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/include/brcmu_d11.h
};
struct brcmu_chan {
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/include/brcmu_wifi.h linux-3.14.22/drivers/net/wireless/brcm80211/include/brcmu_wifi.h
---- linux-3.14.22.orig/drivers/net/wireless/brcm80211/include/brcmu_wifi.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/brcm80211/include/brcmu_wifi.h 2014-10-22 14:55:53.058220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/brcm80211/include/brcmu_wifi.h linux-imx6-3.14/drivers/net/wireless/brcm80211/include/brcmu_wifi.h
+--- linux-3.14.14/drivers/net/wireless/brcm80211/include/brcmu_wifi.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/brcm80211/include/brcmu_wifi.h 2014-12-08 00:31:53.860418001 -0600
@@ -29,6 +29,7 @@
#define CH_UPPER_SB 0x01
#define CH_LOWER_SB 0x02
@@ -203810,9 +203839,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/brcm80211/include/brcmu_wifi.h
/* WPA authentication mode bitvec */
#define WPA_AUTH_DISABLED 0x0000 /* Legacy (i.e., non-WPA) */
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/cw1200/sta.c linux-3.14.22/drivers/net/wireless/cw1200/sta.c
---- linux-3.14.22.orig/drivers/net/wireless/cw1200/sta.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/cw1200/sta.c 2014-10-22 14:55:53.058220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/cw1200/sta.c linux-imx6-3.14/drivers/net/wireless/cw1200/sta.c
+--- linux-3.14.14/drivers/net/wireless/cw1200/sta.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/cw1200/sta.c 2014-12-08 00:31:53.860418001 -0600
@@ -936,7 +936,8 @@
return ret;
}
@@ -203823,9 +203852,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/cw1200/sta.c linux-3.14.22/dri
{
struct cw1200_common *priv = hw->priv;
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/cw1200/sta.h linux-3.14.22/drivers/net/wireless/cw1200/sta.h
---- linux-3.14.22.orig/drivers/net/wireless/cw1200/sta.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/cw1200/sta.h 2014-10-22 14:55:53.058220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/cw1200/sta.h linux-imx6-3.14/drivers/net/wireless/cw1200/sta.h
+--- linux-3.14.14/drivers/net/wireless/cw1200/sta.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/cw1200/sta.h 2014-12-08 00:31:53.860418001 -0600
@@ -40,7 +40,8 @@
int cw1200_set_rts_threshold(struct ieee80211_hw *hw, u32 value);
@@ -203836,9 +203865,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/cw1200/sta.h linux-3.14.22/dri
u64 cw1200_prepare_multicast(struct ieee80211_hw *hw,
struct netdev_hw_addr_list *mc_list);
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/iwlegacy/common.c linux-3.14.22/drivers/net/wireless/iwlegacy/common.c
---- linux-3.14.22.orig/drivers/net/wireless/iwlegacy/common.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/iwlegacy/common.c 2014-10-22 14:55:53.058220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/iwlegacy/common.c linux-imx6-3.14/drivers/net/wireless/iwlegacy/common.c
+--- linux-3.14.14/drivers/net/wireless/iwlegacy/common.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/iwlegacy/common.c 2014-12-08 00:31:53.876418001 -0600
@@ -4701,7 +4701,8 @@
}
EXPORT_SYMBOL(il_mac_change_interface);
@@ -203849,9 +203878,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/iwlegacy/common.c linux-3.14.2
{
struct il_priv *il = hw->priv;
unsigned long timeout = jiffies + msecs_to_jiffies(500);
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/iwlegacy/common.h linux-3.14.22/drivers/net/wireless/iwlegacy/common.h
---- linux-3.14.22.orig/drivers/net/wireless/iwlegacy/common.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/iwlegacy/common.h 2014-10-22 14:55:53.058220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/iwlegacy/common.h linux-imx6-3.14/drivers/net/wireless/iwlegacy/common.h
+--- linux-3.14.14/drivers/net/wireless/iwlegacy/common.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/iwlegacy/common.h 2014-12-08 00:31:53.880418001 -0600
@@ -1722,7 +1722,8 @@
struct ieee80211_vif *vif);
int il_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
@@ -203862,9 +203891,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/iwlegacy/common.h linux-3.14.2
int il_alloc_txq_mem(struct il_priv *il);
void il_free_txq_mem(struct il_priv *il);
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/iwlwifi/dvm/mac80211.c linux-3.14.22/drivers/net/wireless/iwlwifi/dvm/mac80211.c
---- linux-3.14.22.orig/drivers/net/wireless/iwlwifi/dvm/mac80211.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/iwlwifi/dvm/mac80211.c 2014-10-22 14:55:53.058220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/iwlwifi/dvm/mac80211.c linux-imx6-3.14/drivers/net/wireless/iwlwifi/dvm/mac80211.c
+--- linux-3.14.14/drivers/net/wireless/iwlwifi/dvm/mac80211.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/iwlwifi/dvm/mac80211.c 2014-12-08 00:31:53.880418001 -0600
@@ -1091,7 +1091,8 @@
FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL;
}
@@ -203875,9 +203904,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/iwlwifi/dvm/mac80211.c linux-3
{
struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/libertas/cfg.c linux-3.14.22/drivers/net/wireless/libertas/cfg.c
---- linux-3.14.22.orig/drivers/net/wireless/libertas/cfg.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/libertas/cfg.c 2014-10-22 14:55:53.058220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/libertas/cfg.c linux-imx6-3.14/drivers/net/wireless/libertas/cfg.c
+--- linux-3.14.14/drivers/net/wireless/libertas/cfg.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/libertas/cfg.c 2014-12-08 00:31:53.900418001 -0600
@@ -1766,7 +1766,8 @@
memcpy(priv->wdev->ssid, params->ssid, params->ssid_len);
priv->wdev->ssid_len = params->ssid_len;
@@ -203888,9 +203917,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/libertas/cfg.c linux-3.14.22/d
/* TODO: consider doing this at MACREG_INT_CODE_LINK_SENSED time */
priv->connect_status = LBS_CONNECTED;
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/mac80211_hwsim.c linux-3.14.22/drivers/net/wireless/mac80211_hwsim.c
---- linux-3.14.22.orig/drivers/net/wireless/mac80211_hwsim.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/mac80211_hwsim.c 2014-10-22 14:55:53.058220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/mac80211_hwsim.c linux-imx6-3.14/drivers/net/wireless/mac80211_hwsim.c
+--- linux-3.14.14/drivers/net/wireless/mac80211_hwsim.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/mac80211_hwsim.c 2014-12-08 00:31:53.904418001 -0600
@@ -1671,7 +1671,9 @@
return 0;
}
@@ -203902,9 +203931,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/mac80211_hwsim.c linux-3.14.22
{
/* Not implemented, queues only on kernel side */
}
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/mwifiex/cfg80211.c linux-3.14.22/drivers/net/wireless/mwifiex/cfg80211.c
---- linux-3.14.22.orig/drivers/net/wireless/mwifiex/cfg80211.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/mwifiex/cfg80211.c 2014-10-22 14:55:53.062220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/mwifiex/cfg80211.c linux-imx6-3.14/drivers/net/wireless/mwifiex/cfg80211.c
+--- linux-3.14.14/drivers/net/wireless/mwifiex/cfg80211.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/mwifiex/cfg80211.c 2014-12-08 00:31:53.904418001 -0600
@@ -1881,7 +1881,8 @@
params->privacy);
done:
@@ -203915,9 +203944,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/mwifiex/cfg80211.c linux-3.14.
dev_dbg(priv->adapter->dev,
"info: joined/created adhoc network with bssid"
" %pM successfully\n", priv->cfg_bssid);
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/mwifiex/main.h linux-3.14.22/drivers/net/wireless/mwifiex/main.h
---- linux-3.14.22.orig/drivers/net/wireless/mwifiex/main.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/mwifiex/main.h 2014-10-22 14:55:53.062220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/mwifiex/main.h linux-imx6-3.14/drivers/net/wireless/mwifiex/main.h
+--- linux-3.14.14/drivers/net/wireless/mwifiex/main.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/mwifiex/main.h 2014-12-08 00:31:53.908418001 -0600
@@ -1078,7 +1078,7 @@
const u8 *key, int key_len, u8 key_index,
const u8 *mac_addr, int disable);
@@ -203927,9 +203956,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/mwifiex/main.h linux-3.14.22/d
int mwifiex_get_ver_ext(struct mwifiex_private *priv);
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/mwifiex/sta_ioctl.c linux-3.14.22/drivers/net/wireless/mwifiex/sta_ioctl.c
---- linux-3.14.22.orig/drivers/net/wireless/mwifiex/sta_ioctl.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/mwifiex/sta_ioctl.c 2014-10-22 14:55:53.062220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/mwifiex/sta_ioctl.c linux-imx6-3.14/drivers/net/wireless/mwifiex/sta_ioctl.c
+--- linux-3.14.14/drivers/net/wireless/mwifiex/sta_ioctl.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/mwifiex/sta_ioctl.c 2014-12-08 00:31:53.908418001 -0600
@@ -1391,7 +1391,7 @@
* with requisite parameters and calls the IOCTL handler.
*/
@@ -203939,9 +203968,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/mwifiex/sta_ioctl.c linux-3.14
{
struct mwifiex_ds_misc_gen_ie gen_ie;
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/p54/main.c linux-3.14.22/drivers/net/wireless/p54/main.c
---- linux-3.14.22.orig/drivers/net/wireless/p54/main.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/p54/main.c 2014-10-22 14:55:53.062220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/p54/main.c linux-imx6-3.14/drivers/net/wireless/p54/main.c
+--- linux-3.14.14/drivers/net/wireless/p54/main.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/p54/main.c 2014-12-08 00:31:53.916418001 -0600
@@ -669,7 +669,8 @@
return total;
}
@@ -203952,9 +203981,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/p54/main.c linux-3.14.22/drive
{
struct p54_common *priv = dev->priv;
unsigned int total, i;
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/rndis_wlan.c linux-3.14.22/drivers/net/wireless/rndis_wlan.c
---- linux-3.14.22.orig/drivers/net/wireless/rndis_wlan.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/rndis_wlan.c 2014-10-22 14:55:53.062220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/rndis_wlan.c linux-imx6-3.14/drivers/net/wireless/rndis_wlan.c
+--- linux-3.14.14/drivers/net/wireless/rndis_wlan.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/rndis_wlan.c 2014-12-08 00:31:53.920418001 -0600
@@ -2835,7 +2835,9 @@
bssid, req_ie, req_ie_len,
resp_ie, resp_ie_len, GFP_KERNEL);
@@ -203966,9 +203995,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/rndis_wlan.c linux-3.14.22/dri
kfree(info);
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/rt2x00/rt2x00.h linux-3.14.22/drivers/net/wireless/rt2x00/rt2x00.h
---- linux-3.14.22.orig/drivers/net/wireless/rt2x00/rt2x00.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/rt2x00/rt2x00.h 2014-10-22 14:55:53.062220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/rt2x00/rt2x00.h linux-imx6-3.14/drivers/net/wireless/rt2x00/rt2x00.h
+--- linux-3.14.14/drivers/net/wireless/rt2x00/rt2x00.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/rt2x00/rt2x00.h 2014-12-08 00:31:53.928418001 -0600
@@ -1449,7 +1449,8 @@
struct ieee80211_vif *vif, u16 queue,
const struct ieee80211_tx_queue_params *params);
@@ -203979,9 +204008,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/rt2x00/rt2x00.h linux-3.14.22/
int rt2x00mac_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant);
int rt2x00mac_get_antenna(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant);
void rt2x00mac_get_ringparam(struct ieee80211_hw *hw,
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/rt2x00/rt2x00mac.c linux-3.14.22/drivers/net/wireless/rt2x00/rt2x00mac.c
---- linux-3.14.22.orig/drivers/net/wireless/rt2x00/rt2x00mac.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/rt2x00/rt2x00mac.c 2014-10-22 14:55:53.062220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/rt2x00/rt2x00mac.c linux-imx6-3.14/drivers/net/wireless/rt2x00/rt2x00mac.c
+--- linux-3.14.14/drivers/net/wireless/rt2x00/rt2x00mac.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/rt2x00/rt2x00mac.c 2014-12-08 00:31:53.928418001 -0600
@@ -751,7 +751,8 @@
}
EXPORT_SYMBOL_GPL(rt2x00mac_rfkill_poll);
@@ -203992,9 +204021,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/rt2x00/rt2x00mac.c linux-3.14.
{
struct rt2x00_dev *rt2x00dev = hw->priv;
struct data_queue *queue;
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/rtl818x/rtl8187/dev.c linux-3.14.22/drivers/net/wireless/rtl818x/rtl8187/dev.c
---- linux-3.14.22.orig/drivers/net/wireless/rtl818x/rtl8187/dev.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/rtl818x/rtl8187/dev.c 2014-10-22 14:55:53.062220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/rtl818x/rtl8187/dev.c linux-imx6-3.14/drivers/net/wireless/rtl818x/rtl8187/dev.c
+--- linux-3.14.14/drivers/net/wireless/rtl818x/rtl8187/dev.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/rtl818x/rtl8187/dev.c 2014-12-08 00:31:53.932418001 -0600
@@ -1636,10 +1636,10 @@
err_free_dmabuf:
@@ -204008,9 +204037,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/rtl818x/rtl8187/dev.c linux-3.
return err;
}
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/rtlwifi/core.c linux-3.14.22/drivers/net/wireless/rtlwifi/core.c
---- linux-3.14.22.orig/drivers/net/wireless/rtlwifi/core.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/rtlwifi/core.c 2014-10-22 14:55:53.062220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/rtlwifi/core.c linux-imx6-3.14/drivers/net/wireless/rtlwifi/core.c
+--- linux-3.14.14/drivers/net/wireless/rtlwifi/core.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/rtlwifi/core.c 2014-12-08 00:31:53.936418001 -0600
@@ -1309,7 +1309,8 @@
* before switch channel or power save, or tx buffer packet
* maybe send after offchannel or rf sleep, this may cause
@@ -204021,9 +204050,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/rtlwifi/core.c linux-3.14.22/d
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
-diff -Nur linux-3.14.22.orig/drivers/net/wireless/ti/wlcore/main.c linux-3.14.22/drivers/net/wireless/ti/wlcore/main.c
---- linux-3.14.22.orig/drivers/net/wireless/ti/wlcore/main.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/net/wireless/ti/wlcore/main.c 2014-10-22 14:55:53.062220001 -0500
+diff -Nur linux-3.14.14/drivers/net/wireless/ti/wlcore/main.c linux-imx6-3.14/drivers/net/wireless/ti/wlcore/main.c
+--- linux-3.14.14/drivers/net/wireless/ti/wlcore/main.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/net/wireless/ti/wlcore/main.c 2014-12-08 00:31:53.964418001 -0600
@@ -5156,7 +5156,8 @@
mutex_unlock(&wl->mutex);
}
@@ -204034,9 +204063,9 @@ diff -Nur linux-3.14.22.orig/drivers/net/wireless/ti/wlcore/main.c linux-3.14.22
{
struct wl1271 *wl = hw->priv;
-diff -Nur linux-3.14.22.orig/drivers/pci/host/Kconfig linux-3.14.22/drivers/pci/host/Kconfig
---- linux-3.14.22.orig/drivers/pci/host/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/pci/host/Kconfig 2014-10-22 14:55:53.062220001 -0500
+diff -Nur linux-3.14.14/drivers/pci/host/Kconfig linux-imx6-3.14/drivers/pci/host/Kconfig
+--- linux-3.14.14/drivers/pci/host/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/pci/host/Kconfig 2014-12-08 00:31:53.984418001 -0600
@@ -21,6 +21,23 @@
select PCIEPORTBUS
select PCIE_DW
@@ -204061,9 +204090,9 @@ diff -Nur linux-3.14.22.orig/drivers/pci/host/Kconfig linux-3.14.22/drivers/pci/
config PCI_TEGRA
bool "NVIDIA Tegra PCIe controller"
depends on ARCH_TEGRA
-diff -Nur linux-3.14.22.orig/drivers/pci/host/Makefile linux-3.14.22/drivers/pci/host/Makefile
---- linux-3.14.22.orig/drivers/pci/host/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/pci/host/Makefile 2014-10-22 14:55:53.062220001 -0500
+diff -Nur linux-3.14.14/drivers/pci/host/Makefile linux-imx6-3.14/drivers/pci/host/Makefile
+--- linux-3.14.14/drivers/pci/host/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/pci/host/Makefile 2014-12-08 00:31:53.984418001 -0600
@@ -1,6 +1,7 @@
obj-$(CONFIG_PCIE_DW) += pcie-designware.o
obj-$(CONFIG_PCI_EXYNOS) += pci-exynos.o
@@ -204072,9 +204101,9 @@ diff -Nur linux-3.14.22.orig/drivers/pci/host/Makefile linux-3.14.22/drivers/pci
obj-$(CONFIG_PCI_MVEBU) += pci-mvebu.o
obj-$(CONFIG_PCI_TEGRA) += pci-tegra.o
obj-$(CONFIG_PCI_RCAR_GEN2) += pci-rcar-gen2.o
-diff -Nur linux-3.14.22.orig/drivers/pci/host/pcie-designware.c linux-3.14.22/drivers/pci/host/pcie-designware.c
---- linux-3.14.22.orig/drivers/pci/host/pcie-designware.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/pci/host/pcie-designware.c 2014-10-22 14:55:53.066220001 -0500
+diff -Nur linux-3.14.14/drivers/pci/host/pcie-designware.c linux-imx6-3.14/drivers/pci/host/pcie-designware.c
+--- linux-3.14.14/drivers/pci/host/pcie-designware.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/pci/host/pcie-designware.c 2014-12-08 00:31:53.984418001 -0600
@@ -23,48 +23,6 @@
#include "pcie-designware.h"
@@ -204281,9 +204310,9 @@ diff -Nur linux-3.14.22.orig/drivers/pci/host/pcie-designware.c linux-3.14.22/dr
}
static void dw_pcie_add_bus(struct pci_bus *bus)
-diff -Nur linux-3.14.22.orig/drivers/pci/host/pcie-designware.h linux-3.14.22/drivers/pci/host/pcie-designware.h
---- linux-3.14.22.orig/drivers/pci/host/pcie-designware.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/pci/host/pcie-designware.h 2014-10-22 14:55:53.066220001 -0500
+diff -Nur linux-3.14.14/drivers/pci/host/pcie-designware.h linux-imx6-3.14/drivers/pci/host/pcie-designware.h
+--- linux-3.14.14/drivers/pci/host/pcie-designware.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/pci/host/pcie-designware.h 2014-12-08 00:31:53.984418001 -0600
@@ -14,6 +14,48 @@
#ifndef _PCIE_DESIGNWARE_H
#define _PCIE_DESIGNWARE_H
@@ -204345,9 +204374,9 @@ diff -Nur linux-3.14.22.orig/drivers/pci/host/pcie-designware.h linux-3.14.22/dr
int msi_irq;
struct irq_domain *irq_domain;
unsigned long msi_data;
-diff -Nur linux-3.14.22.orig/drivers/pci/host/pci-imx6.c linux-3.14.22/drivers/pci/host/pci-imx6.c
---- linux-3.14.22.orig/drivers/pci/host/pci-imx6.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/pci/host/pci-imx6.c 2014-10-22 14:55:53.066220001 -0500
+diff -Nur linux-3.14.14/drivers/pci/host/pci-imx6.c linux-imx6-3.14/drivers/pci/host/pci-imx6.c
+--- linux-3.14.14/drivers/pci/host/pci-imx6.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/pci/host/pci-imx6.c 2014-12-08 00:31:53.984418001 -0600
@@ -1,6 +1,7 @@
/*
* PCIe host controller driver for Freescale i.MX6 SoCs
@@ -205028,9 +205057,9 @@ diff -Nur linux-3.14.22.orig/drivers/pci/host/pci-imx6.c linux-3.14.22/drivers/p
};
/* Freescale PCIe driver does not allow module unload */
-diff -Nur linux-3.14.22.orig/drivers/pci/host/pci-imx6-ep-driver.c linux-3.14.22/drivers/pci/host/pci-imx6-ep-driver.c
---- linux-3.14.22.orig/drivers/pci/host/pci-imx6-ep-driver.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/pci/host/pci-imx6-ep-driver.c 2014-10-22 14:55:53.066220001 -0500
+diff -Nur linux-3.14.14/drivers/pci/host/pci-imx6-ep-driver.c linux-imx6-3.14/drivers/pci/host/pci-imx6-ep-driver.c
+--- linux-3.14.14/drivers/pci/host/pci-imx6-ep-driver.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/pci/host/pci-imx6-ep-driver.c 2014-12-08 00:31:53.984418001 -0600
@@ -0,0 +1,159 @@
+/*
+ * PCIe endpoint skeleton driver for IMX6 SOCs
@@ -205191,9 +205220,9 @@ diff -Nur linux-3.14.22.orig/drivers/pci/host/pci-imx6-ep-driver.c linux-3.14.22
+MODULE_VERSION(DRV_VERSION);
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("imx_pcie_ep");
-diff -Nur linux-3.14.22.orig/drivers/pinctrl/devicetree.c linux-3.14.22/drivers/pinctrl/devicetree.c
---- linux-3.14.22.orig/drivers/pinctrl/devicetree.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/pinctrl/devicetree.c 2014-10-22 14:55:53.066220001 -0500
+diff -Nur linux-3.14.14/drivers/pinctrl/devicetree.c linux-imx6-3.14/drivers/pinctrl/devicetree.c
+--- linux-3.14.14/drivers/pinctrl/devicetree.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/pinctrl/devicetree.c 2014-12-08 00:31:54.008418001 -0600
@@ -18,6 +18,7 @@
#include <linux/device.h>
@@ -205259,9 +205288,9 @@ diff -Nur linux-3.14.22.orig/drivers/pinctrl/devicetree.c linux-3.14.22/drivers/
/* We may store pointers to property names within the node */
of_node_get(np);
-diff -Nur linux-3.14.22.orig/drivers/pinctrl/pinctrl-imx6sl.c linux-3.14.22/drivers/pinctrl/pinctrl-imx6sl.c
---- linux-3.14.22.orig/drivers/pinctrl/pinctrl-imx6sl.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/pinctrl/pinctrl-imx6sl.c 2014-10-22 14:55:53.066220001 -0500
+diff -Nur linux-3.14.14/drivers/pinctrl/pinctrl-imx6sl.c linux-imx6-3.14/drivers/pinctrl/pinctrl-imx6sl.c
+--- linux-3.14.14/drivers/pinctrl/pinctrl-imx6sl.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/pinctrl/pinctrl-imx6sl.c 2014-12-08 00:31:54.016418001 -0600
@@ -384,6 +384,10 @@
},
.probe = imx6sl_pinctrl_probe,
@@ -205273,9 +205302,9 @@ diff -Nur linux-3.14.22.orig/drivers/pinctrl/pinctrl-imx6sl.c linux-3.14.22/driv
};
static int __init imx6sl_pinctrl_init(void)
-diff -Nur linux-3.14.22.orig/drivers/pinctrl/pinctrl-imx.c linux-3.14.22/drivers/pinctrl/pinctrl-imx.c
---- linux-3.14.22.orig/drivers/pinctrl/pinctrl-imx.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/pinctrl/pinctrl-imx.c 2014-10-22 14:55:53.066220001 -0500
+diff -Nur linux-3.14.14/drivers/pinctrl/pinctrl-imx.c linux-imx6-3.14/drivers/pinctrl/pinctrl-imx.c
+--- linux-3.14.14/drivers/pinctrl/pinctrl-imx.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/pinctrl/pinctrl-imx.c 2014-12-08 00:31:54.012418001 -0600
@@ -1,7 +1,7 @@
/*
* Core driver for the imx pin controller
@@ -205311,9 +205340,9 @@ diff -Nur linux-3.14.22.orig/drivers/pinctrl/pinctrl-imx.c linux-3.14.22/drivers
+ return pinctrl_force_default(ipctl->pctl);
+}
+#endif
-diff -Nur linux-3.14.22.orig/drivers/pinctrl/pinctrl-imx.h linux-3.14.22/drivers/pinctrl/pinctrl-imx.h
---- linux-3.14.22.orig/drivers/pinctrl/pinctrl-imx.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/pinctrl/pinctrl-imx.h 2014-10-22 14:55:53.066220001 -0500
+diff -Nur linux-3.14.14/drivers/pinctrl/pinctrl-imx.h linux-imx6-3.14/drivers/pinctrl/pinctrl-imx.h
+--- linux-3.14.14/drivers/pinctrl/pinctrl-imx.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/pinctrl/pinctrl-imx.h 2014-12-08 00:31:54.012418001 -0600
@@ -1,7 +1,7 @@
/*
* IMX pinmux core definitions
@@ -205332,9 +205361,9 @@ diff -Nur linux-3.14.22.orig/drivers/pinctrl/pinctrl-imx.h linux-3.14.22/drivers
+int imx_pinctrl_resume(struct platform_device *pdev);
+#endif
#endif /* __DRIVERS_PINCTRL_IMX_H */
-diff -Nur linux-3.14.22.orig/drivers/power/imx6_usb_charger.c linux-3.14.22/drivers/power/imx6_usb_charger.c
---- linux-3.14.22.orig/drivers/power/imx6_usb_charger.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/power/imx6_usb_charger.c 2014-10-22 14:55:53.066220001 -0500
+diff -Nur linux-3.14.14/drivers/power/imx6_usb_charger.c linux-imx6-3.14/drivers/power/imx6_usb_charger.c
+--- linux-3.14.14/drivers/power/imx6_usb_charger.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/power/imx6_usb_charger.c 2014-12-08 00:31:54.052418001 -0600
@@ -0,0 +1,294 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -205630,9 +205659,9 @@ diff -Nur linux-3.14.22.orig/drivers/power/imx6_usb_charger.c linux-3.14.22/driv
+ power_supply_unregister(&charger->psy);
+}
+EXPORT_SYMBOL(imx6_usb_remove_charger);
-diff -Nur linux-3.14.22.orig/drivers/power/Kconfig linux-3.14.22/drivers/power/Kconfig
---- linux-3.14.22.orig/drivers/power/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/power/Kconfig 2014-10-22 14:55:53.202220001 -0500
+diff -Nur linux-3.14.14/drivers/power/Kconfig linux-imx6-3.14/drivers/power/Kconfig
+--- linux-3.14.14/drivers/power/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/power/Kconfig 2014-12-08 00:31:54.048418001 -0600
@@ -389,6 +389,12 @@
Say Y to enable support for the battery and AC power in the
Goldfish emulator.
@@ -205646,17 +205675,17 @@ diff -Nur linux-3.14.22.orig/drivers/power/Kconfig linux-3.14.22/drivers/power/K
source "drivers/power/reset/Kconfig"
endif # POWER_SUPPLY
-diff -Nur linux-3.14.22.orig/drivers/power/Makefile linux-3.14.22/drivers/power/Makefile
---- linux-3.14.22.orig/drivers/power/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/power/Makefile 2014-10-22 14:55:53.282220001 -0500
+diff -Nur linux-3.14.14/drivers/power/Makefile linux-imx6-3.14/drivers/power/Makefile
+--- linux-3.14.14/drivers/power/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/power/Makefile 2014-12-08 00:31:54.048418001 -0600
@@ -58,3 +58,4 @@
obj-$(CONFIG_CHARGER_SMB347) += smb347-charger.o
obj-$(CONFIG_CHARGER_TPS65090) += tps65090-charger.o
obj-$(CONFIG_POWER_RESET) += reset/
+obj-$(CONFIG_IMX6_USB_CHARGER) += imx6_usb_charger.o
-diff -Nur linux-3.14.22.orig/drivers/ptp/ptp_chardev.c linux-3.14.22/drivers/ptp/ptp_chardev.c
---- linux-3.14.22.orig/drivers/ptp/ptp_chardev.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ptp/ptp_chardev.c 2014-10-22 14:55:53.282220001 -0500
+diff -Nur linux-3.14.14/drivers/ptp/ptp_chardev.c linux-imx6-3.14/drivers/ptp/ptp_chardev.c
+--- linux-3.14.14/drivers/ptp/ptp_chardev.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ptp/ptp_chardev.c 2014-12-08 00:31:54.060418001 -0600
@@ -25,6 +25,96 @@
#include "ptp_private.h"
@@ -205818,9 +205847,9 @@ diff -Nur linux-3.14.22.orig/drivers/ptp/ptp_chardev.c linux-3.14.22/drivers/ptp
default:
err = -ENOTTY;
break;
-diff -Nur linux-3.14.22.orig/drivers/ptp/ptp_clock.c linux-3.14.22/drivers/ptp/ptp_clock.c
---- linux-3.14.22.orig/drivers/ptp/ptp_clock.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ptp/ptp_clock.c 2014-10-22 14:55:53.286220001 -0500
+diff -Nur linux-3.14.14/drivers/ptp/ptp_clock.c linux-imx6-3.14/drivers/ptp/ptp_clock.c
+--- linux-3.14.14/drivers/ptp/ptp_clock.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ptp/ptp_clock.c 2014-12-08 00:31:54.060418001 -0600
@@ -169,6 +169,7 @@
struct ptp_clock *ptp = container_of(pc, struct ptp_clock, clock);
@@ -205872,9 +205901,9 @@ diff -Nur linux-3.14.22.orig/drivers/ptp/ptp_clock.c linux-3.14.22/drivers/ptp/p
/* module operations */
static void __exit ptp_exit(void)
-diff -Nur linux-3.14.22.orig/drivers/ptp/ptp_ixp46x.c linux-3.14.22/drivers/ptp/ptp_ixp46x.c
---- linux-3.14.22.orig/drivers/ptp/ptp_ixp46x.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ptp/ptp_ixp46x.c 2014-10-22 14:55:53.286220001 -0500
+diff -Nur linux-3.14.14/drivers/ptp/ptp_ixp46x.c linux-imx6-3.14/drivers/ptp/ptp_ixp46x.c
+--- linux-3.14.14/drivers/ptp/ptp_ixp46x.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ptp/ptp_ixp46x.c 2014-12-08 00:31:54.060418001 -0600
@@ -244,6 +244,7 @@
.name = "IXP46X timer",
.max_adj = 66666655,
@@ -205883,9 +205912,9 @@ diff -Nur linux-3.14.22.orig/drivers/ptp/ptp_ixp46x.c linux-3.14.22/drivers/ptp/
.pps = 0,
.adjfreq = ptp_ixp_adjfreq,
.adjtime = ptp_ixp_adjtime,
-diff -Nur linux-3.14.22.orig/drivers/ptp/ptp_pch.c linux-3.14.22/drivers/ptp/ptp_pch.c
---- linux-3.14.22.orig/drivers/ptp/ptp_pch.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ptp/ptp_pch.c 2014-10-22 14:55:53.286220001 -0500
+diff -Nur linux-3.14.14/drivers/ptp/ptp_pch.c linux-imx6-3.14/drivers/ptp/ptp_pch.c
+--- linux-3.14.14/drivers/ptp/ptp_pch.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ptp/ptp_pch.c 2014-12-08 00:31:54.060418001 -0600
@@ -514,6 +514,7 @@
.name = "PCH timer",
.max_adj = 50000000,
@@ -205894,9 +205923,9 @@ diff -Nur linux-3.14.22.orig/drivers/ptp/ptp_pch.c linux-3.14.22/drivers/ptp/ptp
.pps = 0,
.adjfreq = ptp_pch_adjfreq,
.adjtime = ptp_pch_adjtime,
-diff -Nur linux-3.14.22.orig/drivers/ptp/ptp_private.h linux-3.14.22/drivers/ptp/ptp_private.h
---- linux-3.14.22.orig/drivers/ptp/ptp_private.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/ptp/ptp_private.h 2014-10-22 14:55:53.286220001 -0500
+diff -Nur linux-3.14.14/drivers/ptp/ptp_private.h linux-imx6-3.14/drivers/ptp/ptp_private.h
+--- linux-3.14.14/drivers/ptp/ptp_private.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/ptp/ptp_private.h 2014-12-08 00:31:54.060418001 -0600
@@ -48,6 +48,7 @@
long dialed_frequency; /* remembers the frequency adjustment */
struct timestamp_event_queue tsevq; /* simple fifo for time stamps */
@@ -205916,9 +205945,9 @@ diff -Nur linux-3.14.22.orig/drivers/ptp/ptp_private.h linux-3.14.22/drivers/ptp
long ptp_ioctl(struct posix_clock *pc,
unsigned int cmd, unsigned long arg);
-diff -Nur linux-3.14.22.orig/drivers/pwm/pwm-imx.c linux-3.14.22/drivers/pwm/pwm-imx.c
---- linux-3.14.22.orig/drivers/pwm/pwm-imx.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/pwm/pwm-imx.c 2014-10-22 14:55:53.286220001 -0500
+diff -Nur linux-3.14.14/drivers/pwm/pwm-imx.c linux-imx6-3.14/drivers/pwm/pwm-imx.c
+--- linux-3.14.14/drivers/pwm/pwm-imx.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/pwm/pwm-imx.c 2014-12-08 00:31:54.060418001 -0600
@@ -1,4 +1,5 @@
/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -205960,9 +205989,9 @@ diff -Nur linux-3.14.22.orig/drivers/pwm/pwm-imx.c linux-3.14.22/drivers/pwm/pwm
},
.probe = imx_pwm_probe,
.remove = imx_pwm_remove,
-diff -Nur linux-3.14.22.orig/drivers/regulator/anatop-regulator.c linux-3.14.22/drivers/regulator/anatop-regulator.c
---- linux-3.14.22.orig/drivers/regulator/anatop-regulator.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/regulator/anatop-regulator.c 2014-10-22 14:55:53.286220001 -0500
+diff -Nur linux-3.14.14/drivers/regulator/anatop-regulator.c linux-imx6-3.14/drivers/regulator/anatop-regulator.c
+--- linux-3.14.14/drivers/regulator/anatop-regulator.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/regulator/anatop-regulator.c 2014-12-08 00:31:54.068418001 -0600
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -206088,9 +206117,9 @@ diff -Nur linux-3.14.22.orig/drivers/regulator/anatop-regulator.c linux-3.14.22/
/* register regulator */
rdev = devm_regulator_register(dev, rdesc, &config);
-diff -Nur linux-3.14.22.orig/drivers/regulator/core.c linux-3.14.22/drivers/regulator/core.c
---- linux-3.14.22.orig/drivers/regulator/core.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/regulator/core.c 2014-10-22 14:55:53.290220001 -0500
+diff -Nur linux-3.14.14/drivers/regulator/core.c linux-imx6-3.14/drivers/regulator/core.c
+--- linux-3.14.14/drivers/regulator/core.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/regulator/core.c 2014-12-08 00:31:54.068418001 -0600
@@ -3,6 +3,7 @@
*
* Copyright 2007, 2008 Wolfson Microelectronics PLC.
@@ -206209,9 +206238,9 @@ diff -Nur linux-3.14.22.orig/drivers/regulator/core.c linux-3.14.22/drivers/regu
ret = regulator_ena_gpio_request(rdev, config);
if (ret != 0) {
rdev_err(rdev, "Failed to request enable GPIO%d: %d\n",
-diff -Nur linux-3.14.22.orig/drivers/regulator/dummy.c linux-3.14.22/drivers/regulator/dummy.c
---- linux-3.14.22.orig/drivers/regulator/dummy.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/regulator/dummy.c 2014-10-22 14:55:53.290220001 -0500
+diff -Nur linux-3.14.14/drivers/regulator/dummy.c linux-imx6-3.14/drivers/regulator/dummy.c
+--- linux-3.14.14/drivers/regulator/dummy.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/regulator/dummy.c 2014-12-08 00:31:54.068418001 -0600
@@ -44,6 +44,7 @@
config.dev = &pdev->dev;
@@ -206220,9 +206249,9 @@ diff -Nur linux-3.14.22.orig/drivers/regulator/dummy.c linux-3.14.22/drivers/reg
dummy_regulator_rdev = regulator_register(&dummy_desc, &config);
if (IS_ERR(dummy_regulator_rdev)) {
-diff -Nur linux-3.14.22.orig/drivers/regulator/fixed.c linux-3.14.22/drivers/regulator/fixed.c
---- linux-3.14.22.orig/drivers/regulator/fixed.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/regulator/fixed.c 2014-10-22 14:55:53.290220001 -0500
+diff -Nur linux-3.14.14/drivers/regulator/fixed.c linux-imx6-3.14/drivers/regulator/fixed.c
+--- linux-3.14.14/drivers/regulator/fixed.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/regulator/fixed.c 2014-12-08 00:31:54.068418001 -0600
@@ -163,9 +163,7 @@
drvdata->desc.n_voltages = 1;
@@ -206234,9 +206263,9 @@ diff -Nur linux-3.14.22.orig/drivers/regulator/fixed.c linux-3.14.22/drivers/reg
cfg.ena_gpio_invert = !config->enable_high;
if (config->enabled_at_boot) {
if (config->enable_high)
-diff -Nur linux-3.14.22.orig/drivers/reset/gpio-reset.c linux-3.14.22/drivers/reset/gpio-reset.c
---- linux-3.14.22.orig/drivers/reset/gpio-reset.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/reset/gpio-reset.c 2014-10-22 14:55:53.290220001 -0500
+diff -Nur linux-3.14.14/drivers/reset/gpio-reset.c linux-imx6-3.14/drivers/reset/gpio-reset.c
+--- linux-3.14.14/drivers/reset/gpio-reset.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/reset/gpio-reset.c 2014-12-08 00:31:54.076418001 -0600
@@ -0,0 +1,187 @@
+/*
+ * GPIO Reset Controller driver
@@ -206425,9 +206454,9 @@ diff -Nur linux-3.14.22.orig/drivers/reset/gpio-reset.c linux-3.14.22/drivers/re
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:gpio-reset");
+MODULE_DEVICE_TABLE(of, gpio_reset_dt_ids);
-diff -Nur linux-3.14.22.orig/drivers/reset/Kconfig linux-3.14.22/drivers/reset/Kconfig
---- linux-3.14.22.orig/drivers/reset/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/reset/Kconfig 2014-10-22 14:55:53.290220001 -0500
+diff -Nur linux-3.14.14/drivers/reset/Kconfig linux-imx6-3.14/drivers/reset/Kconfig
+--- linux-3.14.14/drivers/reset/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/reset/Kconfig 2014-12-08 00:31:54.076418001 -0600
@@ -11,3 +11,15 @@
via GPIOs or SoC-internal reset controller modules.
@@ -206444,16 +206473,16 @@ diff -Nur linux-3.14.22.orig/drivers/reset/Kconfig linux-3.14.22/drivers/reset/K
+ directly by GPIOs.
+
+endif
-diff -Nur linux-3.14.22.orig/drivers/reset/Makefile linux-3.14.22/drivers/reset/Makefile
---- linux-3.14.22.orig/drivers/reset/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/reset/Makefile 2014-10-22 14:55:53.290220001 -0500
+diff -Nur linux-3.14.14/drivers/reset/Makefile linux-imx6-3.14/drivers/reset/Makefile
+--- linux-3.14.14/drivers/reset/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/reset/Makefile 2014-12-08 00:31:54.076418001 -0600
@@ -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.22.orig/drivers/rtc/rtc-pcf8523.c linux-3.14.22/drivers/rtc/rtc-pcf8523.c
---- linux-3.14.22.orig/drivers/rtc/rtc-pcf8523.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/rtc/rtc-pcf8523.c 2014-10-22 14:55:53.294220001 -0500
+diff -Nur linux-3.14.14/drivers/rtc/rtc-pcf8523.c linux-imx6-3.14/drivers/rtc/rtc-pcf8523.c
+--- linux-3.14.14/drivers/rtc/rtc-pcf8523.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/rtc/rtc-pcf8523.c 2014-12-08 00:31:54.088418001 -0600
@@ -7,6 +7,7 @@
*/
@@ -206585,9 +206614,9 @@ diff -Nur linux-3.14.22.orig/drivers/rtc/rtc-pcf8523.c linux-3.14.22/drivers/rtc
err = pcf8523_set_pm(client, 0);
if (err < 0)
return err;
-diff -Nur linux-3.14.22.orig/drivers/rtc/rtc-snvs.c linux-3.14.22/drivers/rtc/rtc-snvs.c
---- linux-3.14.22.orig/drivers/rtc/rtc-snvs.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/rtc/rtc-snvs.c 2014-10-22 14:55:53.294220001 -0500
+diff -Nur linux-3.14.14/drivers/rtc/rtc-snvs.c linux-imx6-3.14/drivers/rtc/rtc-snvs.c
+--- linux-3.14.14/drivers/rtc/rtc-snvs.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/rtc/rtc-snvs.c 2014-12-08 00:31:54.088418001 -0600
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2012 Freescale Semiconductor, Inc.
@@ -206650,9 +206679,9 @@ diff -Nur linux-3.14.22.orig/drivers/rtc/rtc-snvs.c linux-3.14.22/drivers/rtc/rt
return 0;
}
-diff -Nur linux-3.14.22.orig/drivers/scsi/scsi_transport_iscsi.c linux-3.14.22/drivers/scsi/scsi_transport_iscsi.c
---- linux-3.14.22.orig/drivers/scsi/scsi_transport_iscsi.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/scsi/scsi_transport_iscsi.c 2014-10-22 14:55:53.294220001 -0500
+diff -Nur linux-3.14.14/drivers/scsi/scsi_transport_iscsi.c linux-imx6-3.14/drivers/scsi/scsi_transport_iscsi.c
+--- linux-3.14.14/drivers/scsi/scsi_transport_iscsi.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/scsi/scsi_transport_iscsi.c 2014-12-08 00:31:54.276418001 -0600
@@ -1225,7 +1225,7 @@
* Adds a sysfs entry for the flashnode session attributes
*
@@ -206680,9 +206709,9 @@ diff -Nur linux-3.14.22.orig/drivers/scsi/scsi_transport_iscsi.c linux-3.14.22/d
* @shost: pointer to host data
*
* Destroys all the flashnode session entries and all corresponding children
-diff -Nur linux-3.14.22.orig/drivers/staging/bcm/Typedefs.h linux-3.14.22/drivers/staging/bcm/Typedefs.h
---- linux-3.14.22.orig/drivers/staging/bcm/Typedefs.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/staging/bcm/Typedefs.h 2014-10-22 14:55:53.298220001 -0500
+diff -Nur linux-3.14.14/drivers/staging/bcm/Typedefs.h linux-imx6-3.14/drivers/staging/bcm/Typedefs.h
+--- linux-3.14.14/drivers/staging/bcm/Typedefs.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/staging/bcm/Typedefs.h 2014-12-08 00:31:54.316418001 -0600
@@ -25,16 +25,16 @@
typedef unsigned long ULONG;
typedef unsigned long DWORD;
@@ -206709,9 +206738,9 @@ diff -Nur linux-3.14.22.orig/drivers/staging/bcm/Typedefs.h linux-3.14.22/driver
typedef unsigned long long ULONG64;
typedef unsigned long long LARGE_INTEGER;
typedef unsigned int UINT32;
-diff -Nur linux-3.14.22.orig/drivers/staging/media/lirc/Kconfig linux-3.14.22/drivers/staging/media/lirc/Kconfig
---- linux-3.14.22.orig/drivers/staging/media/lirc/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/staging/media/lirc/Kconfig 2014-10-22 14:55:53.298220001 -0500
+diff -Nur linux-3.14.14/drivers/staging/media/lirc/Kconfig linux-imx6-3.14/drivers/staging/media/lirc/Kconfig
+--- linux-3.14.14/drivers/staging/media/lirc/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/staging/media/lirc/Kconfig 2014-12-08 00:31:54.468418001 -0600
@@ -38,6 +38,12 @@
help
Driver for Homebrew Parallel Port Receivers
@@ -206725,9 +206754,9 @@ diff -Nur linux-3.14.22.orig/drivers/staging/media/lirc/Kconfig linux-3.14.22/dr
config LIRC_SASEM
tristate "Sasem USB IR Remote"
depends on LIRC && USB
-diff -Nur linux-3.14.22.orig/drivers/staging/media/lirc/lirc_gpio.c linux-3.14.22/drivers/staging/media/lirc/lirc_gpio.c
---- linux-3.14.22.orig/drivers/staging/media/lirc/lirc_gpio.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/staging/media/lirc/lirc_gpio.c 2014-10-22 14:55:53.298220001 -0500
+diff -Nur linux-3.14.14/drivers/staging/media/lirc/lirc_gpio.c linux-imx6-3.14/drivers/staging/media/lirc/lirc_gpio.c
+--- linux-3.14.14/drivers/staging/media/lirc/lirc_gpio.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/staging/media/lirc/lirc_gpio.c 2014-12-08 00:31:54.468418001 -0600
@@ -0,0 +1,782 @@
+/*
+ * lirc_gpio.c
@@ -207511,9 +207540,9 @@ diff -Nur linux-3.14.22.orig/drivers/staging/media/lirc/lirc_gpio.c linux-3.14.2
+module_param(softcarrier, int, S_IRUGO);
+MODULE_PARM_DESC(softcarrier, "Software carrier (0 = off, 1 = on, default on)");
+
-diff -Nur linux-3.14.22.orig/drivers/staging/octeon/ethernet-rgmii.c linux-3.14.22/drivers/staging/octeon/ethernet-rgmii.c
---- linux-3.14.22.orig/drivers/staging/octeon/ethernet-rgmii.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/staging/octeon/ethernet-rgmii.c 2014-10-22 14:55:53.298220001 -0500
+diff -Nur linux-3.14.14/drivers/staging/octeon/ethernet-rgmii.c linux-imx6-3.14/drivers/staging/octeon/ethernet-rgmii.c
+--- linux-3.14.14/drivers/staging/octeon/ethernet-rgmii.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/staging/octeon/ethernet-rgmii.c 2014-12-08 00:31:54.480418001 -0600
@@ -166,9 +166,8 @@
if (use_global_register_lock)
@@ -207525,9 +207554,9 @@ diff -Nur linux-3.14.22.orig/drivers/staging/octeon/ethernet-rgmii.c linux-3.14.
if (priv->phydev == NULL) {
/* Tell core. */
-diff -Nur linux-3.14.22.orig/drivers/staging/rtl8821ae/core.c linux-3.14.22/drivers/staging/rtl8821ae/core.c
---- linux-3.14.22.orig/drivers/staging/rtl8821ae/core.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/staging/rtl8821ae/core.c 2014-10-22 14:55:53.302220001 -0500
+diff -Nur linux-3.14.14/drivers/staging/rtl8821ae/core.c linux-imx6-3.14/drivers/staging/rtl8821ae/core.c
+--- linux-3.14.14/drivers/staging/rtl8821ae/core.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/staging/rtl8821ae/core.c 2014-12-08 00:31:54.552418001 -0600
@@ -1414,23 +1414,15 @@
* before switch channle or power save, or tx buffer packet
* maybe send after offchannel or rf sleep, this may cause
@@ -207555,9 +207584,9 @@ diff -Nur linux-3.14.22.orig/drivers/staging/rtl8821ae/core.c linux-3.14.22/driv
const struct ieee80211_ops rtl_ops = {
.start = rtl_op_start,
-diff -Nur linux-3.14.22.orig/drivers/thermal/device_cooling.c linux-3.14.22/drivers/thermal/device_cooling.c
---- linux-3.14.22.orig/drivers/thermal/device_cooling.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/thermal/device_cooling.c 2014-10-22 14:55:53.302220001 -0500
+diff -Nur linux-3.14.14/drivers/thermal/device_cooling.c linux-imx6-3.14/drivers/thermal/device_cooling.c
+--- linux-3.14.14/drivers/thermal/device_cooling.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/thermal/device_cooling.c 2014-12-08 00:31:54.668418001 -0600
@@ -0,0 +1,151 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -207710,9 +207739,9 @@ diff -Nur linux-3.14.22.orig/drivers/thermal/device_cooling.c linux-3.14.22/driv
+ kfree(devfreq_dev);
+}
+EXPORT_SYMBOL_GPL(devfreq_cooling_unregister);
-diff -Nur linux-3.14.22.orig/drivers/thermal/imx_thermal.c linux-3.14.22/drivers/thermal/imx_thermal.c
---- linux-3.14.22.orig/drivers/thermal/imx_thermal.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/thermal/imx_thermal.c 2014-10-22 14:55:53.302220001 -0500
+diff -Nur linux-3.14.14/drivers/thermal/imx_thermal.c linux-imx6-3.14/drivers/thermal/imx_thermal.c
+--- linux-3.14.14/drivers/thermal/imx_thermal.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/thermal/imx_thermal.c 2014-12-08 00:31:54.668418001 -0600
@@ -12,6 +12,7 @@
#include <linux/cpufreq.h>
#include <linux/delay.h>
@@ -207811,9 +207840,9 @@ diff -Nur linux-3.14.22.orig/drivers/thermal/imx_thermal.c linux-3.14.22/drivers
return 0;
}
-diff -Nur linux-3.14.22.orig/drivers/thermal/Kconfig linux-3.14.22/drivers/thermal/Kconfig
---- linux-3.14.22.orig/drivers/thermal/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/thermal/Kconfig 2014-10-22 14:55:53.302220001 -0500
+diff -Nur linux-3.14.14/drivers/thermal/Kconfig linux-imx6-3.14/drivers/thermal/Kconfig
+--- linux-3.14.14/drivers/thermal/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/thermal/Kconfig 2014-12-08 00:31:54.668418001 -0600
@@ -125,6 +125,13 @@
cpufreq is used as the cooling device to throttle CPUs when the
passive trip is crossed.
@@ -207828,9 +207857,9 @@ diff -Nur linux-3.14.22.orig/drivers/thermal/Kconfig linux-3.14.22/drivers/therm
config SPEAR_THERMAL
bool "SPEAr thermal sensor driver"
depends on PLAT_SPEAR
-diff -Nur linux-3.14.22.orig/drivers/thermal/Makefile linux-3.14.22/drivers/thermal/Makefile
---- linux-3.14.22.orig/drivers/thermal/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/thermal/Makefile 2014-10-22 14:55:53.302220001 -0500
+diff -Nur linux-3.14.14/drivers/thermal/Makefile linux-imx6-3.14/drivers/thermal/Makefile
+--- linux-3.14.14/drivers/thermal/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/thermal/Makefile 2014-12-08 00:31:54.668418001 -0600
@@ -26,6 +26,7 @@
obj-$(CONFIG_DB8500_THERMAL) += db8500_thermal.o
obj-$(CONFIG_ARMADA_THERMAL) += armada_thermal.o
@@ -207839,9 +207868,9 @@ diff -Nur linux-3.14.22.orig/drivers/thermal/Makefile linux-3.14.22/drivers/ther
obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o
obj-$(CONFIG_INTEL_POWERCLAMP) += intel_powerclamp.o
obj-$(CONFIG_X86_PKG_TEMP_THERMAL) += x86_pkg_temp_thermal.o
-diff -Nur linux-3.14.22.orig/drivers/tty/serial/earlycon.c linux-3.14.22/drivers/tty/serial/earlycon.c
---- linux-3.14.22.orig/drivers/tty/serial/earlycon.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/tty/serial/earlycon.c 2014-10-22 14:55:53.302220001 -0500
+diff -Nur linux-3.14.14/drivers/tty/serial/earlycon.c linux-imx6-3.14/drivers/tty/serial/earlycon.c
+--- linux-3.14.14/drivers/tty/serial/earlycon.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/tty/serial/earlycon.c 2014-12-08 00:31:54.688418001 -0600
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2014 Linaro Ltd.
@@ -207995,9 +208024,9 @@ diff -Nur linux-3.14.22.orig/drivers/tty/serial/earlycon.c linux-3.14.22/drivers
+ register_console(early_console_dev.con);
+ return 0;
+}
-diff -Nur linux-3.14.22.orig/drivers/tty/serial/Kconfig linux-3.14.22/drivers/tty/serial/Kconfig
---- linux-3.14.22.orig/drivers/tty/serial/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/tty/serial/Kconfig 2014-10-22 14:55:53.302220001 -0500
+diff -Nur linux-3.14.14/drivers/tty/serial/Kconfig linux-imx6-3.14/drivers/tty/serial/Kconfig
+--- linux-3.14.14/drivers/tty/serial/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/tty/serial/Kconfig 2014-12-08 00:31:54.684418001 -0600
@@ -7,6 +7,13 @@
menu "Serial drivers"
depends on HAS_IOMEM
@@ -208012,9 +208041,9 @@ diff -Nur linux-3.14.22.orig/drivers/tty/serial/Kconfig linux-3.14.22/drivers/tt
source "drivers/tty/serial/8250/Kconfig"
comment "Non-8250 serial port support"
-diff -Nur linux-3.14.22.orig/drivers/tty/serial/Makefile linux-3.14.22/drivers/tty/serial/Makefile
---- linux-3.14.22.orig/drivers/tty/serial/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/tty/serial/Makefile 2014-10-22 14:55:53.326220001 -0500
+diff -Nur linux-3.14.14/drivers/tty/serial/Makefile linux-imx6-3.14/drivers/tty/serial/Makefile
+--- linux-3.14.14/drivers/tty/serial/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/tty/serial/Makefile 2014-12-08 00:31:54.684418001 -0600
@@ -5,6 +5,8 @@
obj-$(CONFIG_SERIAL_CORE) += serial_core.o
obj-$(CONFIG_SERIAL_21285) += 21285.o
@@ -208024,9 +208053,9 @@ diff -Nur linux-3.14.22.orig/drivers/tty/serial/Makefile linux-3.14.22/drivers/t
# These Sparc drivers have to appear before others such as 8250
# which share ttySx minor node space. Otherwise console device
# names change and other unplesantries.
-diff -Nur linux-3.14.22.orig/drivers/usb/chipidea/ci.h linux-3.14.22/drivers/usb/chipidea/ci.h
---- linux-3.14.22.orig/drivers/usb/chipidea/ci.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/usb/chipidea/ci.h 2014-10-22 14:55:53.330220001 -0500
+diff -Nur linux-3.14.14/drivers/usb/chipidea/ci.h linux-imx6-3.14/drivers/usb/chipidea/ci.h
+--- linux-3.14.14/drivers/usb/chipidea/ci.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/usb/chipidea/ci.h 2014-12-08 00:31:54.712418001 -0600
@@ -139,8 +139,8 @@
* @roles: array of supported roles for this controller
* @role: current role
@@ -208071,9 +208100,9 @@ diff -Nur linux-3.14.22.orig/drivers/usb/chipidea/ci.h linux-3.14.22/drivers/usb
};
static inline struct ci_role_driver *ci_role(struct ci_hdrc *ci)
-diff -Nur linux-3.14.22.orig/drivers/usb/chipidea/ci_hdrc_imx.c linux-3.14.22/drivers/usb/chipidea/ci_hdrc_imx.c
---- linux-3.14.22.orig/drivers/usb/chipidea/ci_hdrc_imx.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/usb/chipidea/ci_hdrc_imx.c 2014-10-22 14:55:53.330220001 -0500
+diff -Nur linux-3.14.14/drivers/usb/chipidea/ci_hdrc_imx.c linux-imx6-3.14/drivers/usb/chipidea/ci_hdrc_imx.c
+--- linux-3.14.14/drivers/usb/chipidea/ci_hdrc_imx.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/usb/chipidea/ci_hdrc_imx.c 2014-12-08 00:31:54.712418001 -0600
@@ -19,11 +19,14 @@
#include <linux/dma-mapping.h>
#include <linux/usb/chipidea.h>
@@ -208331,9 +208360,9 @@ diff -Nur linux-3.14.22.orig/drivers/usb/chipidea/ci_hdrc_imx.c linux-3.14.22/dr
},
};
-diff -Nur linux-3.14.22.orig/drivers/usb/chipidea/ci_hdrc_imx.h linux-3.14.22/drivers/usb/chipidea/ci_hdrc_imx.h
---- linux-3.14.22.orig/drivers/usb/chipidea/ci_hdrc_imx.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/usb/chipidea/ci_hdrc_imx.h 2014-10-22 14:55:53.330220001 -0500
+diff -Nur linux-3.14.14/drivers/usb/chipidea/ci_hdrc_imx.h linux-imx6-3.14/drivers/usb/chipidea/ci_hdrc_imx.h
+--- linux-3.14.14/drivers/usb/chipidea/ci_hdrc_imx.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/usb/chipidea/ci_hdrc_imx.h 2014-12-08 00:31:54.712418001 -0600
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 Freescale Semiconductor, Inc.
@@ -208360,9 +208389,9 @@ diff -Nur linux-3.14.22.orig/drivers/usb/chipidea/ci_hdrc_imx.h linux-3.14.22/dr
+int imx_usbmisc_set_wakeup(struct imx_usbmisc_data *, bool);
#endif /* __DRIVER_USB_CHIPIDEA_CI_HDRC_IMX_H */
-diff -Nur linux-3.14.22.orig/drivers/usb/chipidea/ci_hdrc_msm.c linux-3.14.22/drivers/usb/chipidea/ci_hdrc_msm.c
---- linux-3.14.22.orig/drivers/usb/chipidea/ci_hdrc_msm.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/usb/chipidea/ci_hdrc_msm.c 2014-10-22 14:55:53.330220001 -0500
+diff -Nur linux-3.14.14/drivers/usb/chipidea/ci_hdrc_msm.c linux-imx6-3.14/drivers/usb/chipidea/ci_hdrc_msm.c
+--- linux-3.14.14/drivers/usb/chipidea/ci_hdrc_msm.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/usb/chipidea/ci_hdrc_msm.c 2014-12-08 00:31:54.712418001 -0600
@@ -17,7 +17,7 @@
#define MSM_USB_BASE (ci->hw_bank.abs)
@@ -208371,8 +208400,8 @@ diff -Nur linux-3.14.22.orig/drivers/usb/chipidea/ci_hdrc_msm.c linux-3.14.22/dr
+static int ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event)
{
struct device *dev = ci->gadget.dev.parent;
-
-@@ -40,6 +40,8 @@
+ int val;
+@@ -43,6 +43,8 @@
dev_dbg(dev, "unknown ci_hdrc event\n");
break;
}
@@ -208381,9 +208410,9 @@ diff -Nur linux-3.14.22.orig/drivers/usb/chipidea/ci_hdrc_msm.c linux-3.14.22/dr
}
static struct ci_hdrc_platform_data ci_hdrc_msm_platdata = {
-diff -Nur linux-3.14.22.orig/drivers/usb/chipidea/core.c linux-3.14.22/drivers/usb/chipidea/core.c
---- linux-3.14.22.orig/drivers/usb/chipidea/core.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/usb/chipidea/core.c 2014-10-22 14:55:53.334220001 -0500
+diff -Nur linux-3.14.14/drivers/usb/chipidea/core.c linux-imx6-3.14/drivers/usb/chipidea/core.c
+--- linux-3.14.14/drivers/usb/chipidea/core.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/usb/chipidea/core.c 2014-12-08 00:31:54.712418001 -0600
@@ -165,25 +165,30 @@
return hw_read(ci, OP_PORTSC, PORTSC_PTC) >> __ffs(PORTSC_PTC);
}
@@ -208692,9 +208721,9 @@ diff -Nur linux-3.14.22.orig/drivers/usb/chipidea/core.c linux-3.14.22/drivers/u
},
};
-diff -Nur linux-3.14.22.orig/drivers/usb/chipidea/host.c linux-3.14.22/drivers/usb/chipidea/host.c
---- linux-3.14.22.orig/drivers/usb/chipidea/host.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/usb/chipidea/host.c 2014-10-22 14:55:53.334220001 -0500
+diff -Nur linux-3.14.14/drivers/usb/chipidea/host.c linux-imx6-3.14/drivers/usb/chipidea/host.c
+--- linux-3.14.14/drivers/usb/chipidea/host.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/usb/chipidea/host.c 2014-12-08 00:31:54.712418001 -0600
@@ -33,6 +33,176 @@
#include "host.h"
@@ -208896,9 +208925,9 @@ diff -Nur linux-3.14.22.orig/drivers/usb/chipidea/host.c linux-3.14.22/drivers/u
+
return 0;
}
-diff -Nur linux-3.14.22.orig/drivers/usb/chipidea/otg.c linux-3.14.22/drivers/usb/chipidea/otg.c
---- linux-3.14.22.orig/drivers/usb/chipidea/otg.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/usb/chipidea/otg.c 2014-10-22 14:55:53.334220001 -0500
+diff -Nur linux-3.14.14/drivers/usb/chipidea/otg.c linux-imx6-3.14/drivers/usb/chipidea/otg.c
+--- linux-3.14.14/drivers/usb/chipidea/otg.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/usb/chipidea/otg.c 2014-12-08 00:31:54.712418001 -0600
@@ -18,6 +18,8 @@
#include <linux/usb/otg.h>
#include <linux/usb/gadget.h>
@@ -208997,9 +209026,9 @@ diff -Nur linux-3.14.22.orig/drivers/usb/chipidea/otg.c linux-3.14.22/drivers/us
ci_disable_otg_interrupt(ci, OTGSC_INT_EN_BITS);
ci_clear_otg_interrupt(ci, OTGSC_INT_STATUS_BITS);
}
-diff -Nur linux-3.14.22.orig/drivers/usb/chipidea/udc.c linux-3.14.22/drivers/usb/chipidea/udc.c
---- linux-3.14.22.orig/drivers/usb/chipidea/udc.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/usb/chipidea/udc.c 2014-10-22 14:55:53.334220001 -0500
+diff -Nur linux-3.14.14/drivers/usb/chipidea/udc.c linux-imx6-3.14/drivers/usb/chipidea/udc.c
+--- linux-3.14.14/drivers/usb/chipidea/udc.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/usb/chipidea/udc.c 2014-12-08 00:31:54.712418001 -0600
@@ -681,12 +681,6 @@
struct ci_hdrc *ci = container_of(gadget, struct ci_hdrc, gadget);
unsigned long flags;
@@ -209092,9 +209121,9 @@ diff -Nur linux-3.14.22.orig/drivers/usb/chipidea/udc.c linux-3.14.22/drivers/us
if (!ci->remote_wakeup) {
ret = -EOPNOTSUPP;
goto out;
-diff -Nur linux-3.14.22.orig/drivers/usb/chipidea/usbmisc_imx.c linux-3.14.22/drivers/usb/chipidea/usbmisc_imx.c
---- linux-3.14.22.orig/drivers/usb/chipidea/usbmisc_imx.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/usb/chipidea/usbmisc_imx.c 2014-10-22 14:55:53.338220001 -0500
+diff -Nur linux-3.14.14/drivers/usb/chipidea/usbmisc_imx.c linux-imx6-3.14/drivers/usb/chipidea/usbmisc_imx.c
+--- linux-3.14.14/drivers/usb/chipidea/usbmisc_imx.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/usb/chipidea/usbmisc_imx.c 2014-12-08 00:31:54.712418001 -0600
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 Freescale Semiconductor, Inc.
@@ -209269,10 +209298,10 @@ diff -Nur linux-3.14.22.orig/drivers/usb/chipidea/usbmisc_imx.c linux-3.14.22/dr
usbmisc = NULL;
return 0;
}
-diff -Nur linux-3.14.22.orig/drivers/usb/core/hub.c linux-3.14.22/drivers/usb/core/hub.c
---- linux-3.14.22.orig/drivers/usb/core/hub.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/usb/core/hub.c 2014-10-22 14:55:53.338220001 -0500
-@@ -3916,6 +3916,12 @@
+diff -Nur linux-3.14.14/drivers/usb/core/hub.c linux-imx6-3.14/drivers/usb/core/hub.c
+--- linux-3.14.14/drivers/usb/core/hub.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/usb/core/hub.c 2014-12-08 00:31:54.720418001 -0600
+@@ -3867,6 +3867,12 @@
void usb_enable_ltm(struct usb_device *udev) { }
EXPORT_SYMBOL_GPL(usb_enable_ltm);
@@ -209285,7 +209314,7 @@ diff -Nur linux-3.14.22.orig/drivers/usb/core/hub.c linux-3.14.22/drivers/usb/co
#endif /* CONFIG_PM */
-@@ -4509,8 +4515,7 @@
+@@ -4460,8 +4466,7 @@
/* Disconnect any existing devices under this port */
if (udev) {
@@ -209295,9 +209324,9 @@ diff -Nur linux-3.14.22.orig/drivers/usb/core/hub.c linux-3.14.22/drivers/usb/co
usb_phy_notify_disconnect(hcd->phy, udev->speed);
usb_disconnect(&hub->ports[port1 - 1]->child);
}
-diff -Nur linux-3.14.22.orig/drivers/usb/core/message.c linux-3.14.22/drivers/usb/core/message.c
---- linux-3.14.22.orig/drivers/usb/core/message.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/usb/core/message.c 2014-10-22 14:55:53.390220001 -0500
+diff -Nur linux-3.14.14/drivers/usb/core/message.c linux-imx6-3.14/drivers/usb/core/message.c
+--- linux-3.14.14/drivers/usb/core/message.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/usb/core/message.c 2014-12-08 00:31:54.720418001 -0600
@@ -178,7 +178,7 @@
*
* Return:
@@ -209307,9 +209336,9 @@ diff -Nur linux-3.14.22.orig/drivers/usb/core/message.c linux-3.14.22/drivers/us
*/
int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
void *data, int len, int *actual_length, int timeout)
-diff -Nur linux-3.14.22.orig/drivers/usb/core/urb.c linux-3.14.22/drivers/usb/core/urb.c
---- linux-3.14.22.orig/drivers/usb/core/urb.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/usb/core/urb.c 2014-10-22 14:55:53.390220001 -0500
+diff -Nur linux-3.14.14/drivers/usb/core/urb.c linux-imx6-3.14/drivers/usb/core/urb.c
+--- linux-3.14.14/drivers/usb/core/urb.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/usb/core/urb.c 2014-12-08 00:31:54.720418001 -0600
@@ -831,7 +831,7 @@
*
* this allows all outstanding URBs to be unlinked starting
@@ -209319,9 +209348,9 @@ diff -Nur linux-3.14.22.orig/drivers/usb/core/urb.c linux-3.14.22/drivers/usb/co
* function has returned.
*
* This routine should not be called by a driver after its disconnect
-diff -Nur linux-3.14.22.orig/drivers/usb/gadget/f_mass_storage.c linux-3.14.22/drivers/usb/gadget/f_mass_storage.c
---- linux-3.14.22.orig/drivers/usb/gadget/f_mass_storage.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/usb/gadget/f_mass_storage.c 2014-10-22 14:55:53.394220001 -0500
+diff -Nur linux-3.14.14/drivers/usb/gadget/f_mass_storage.c linux-imx6-3.14/drivers/usb/gadget/f_mass_storage.c
+--- linux-3.14.14/drivers/usb/gadget/f_mass_storage.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/usb/gadget/f_mass_storage.c 2014-12-08 00:31:54.732418001 -0600
@@ -336,8 +336,15 @@
struct usb_ep *bulk_in;
@@ -209443,9 +209472,9 @@ diff -Nur linux-3.14.22.orig/drivers/usb/gadget/f_mass_storage.c linux-3.14.22/d
}
static inline struct fsg_lun_opts *to_fsg_lun_opts(struct config_item *item)
-diff -Nur linux-3.14.22.orig/drivers/usb/gadget/fsl_updater.c linux-3.14.22/drivers/usb/gadget/fsl_updater.c
---- linux-3.14.22.orig/drivers/usb/gadget/fsl_updater.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/usb/gadget/fsl_updater.c 2014-10-22 14:55:53.394220001 -0500
+diff -Nur linux-3.14.14/drivers/usb/gadget/fsl_updater.c linux-imx6-3.14/drivers/usb/gadget/fsl_updater.c
+--- linux-3.14.14/drivers/usb/gadget/fsl_updater.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/usb/gadget/fsl_updater.c 2014-12-08 00:31:54.736418001 -0600
@@ -0,0 +1,594 @@
+/*
+ * Freescale UUT driver
@@ -210041,9 +210070,9 @@ diff -Nur linux-3.14.22.orig/drivers/usb/gadget/fsl_updater.c linux-3.14.22/driv
+ utp_send_status(fsg);
+ return -1;
+}
-diff -Nur linux-3.14.22.orig/drivers/usb/gadget/fsl_updater.h linux-3.14.22/drivers/usb/gadget/fsl_updater.h
---- linux-3.14.22.orig/drivers/usb/gadget/fsl_updater.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/usb/gadget/fsl_updater.h 2014-10-22 14:55:53.398220001 -0500
+diff -Nur linux-3.14.14/drivers/usb/gadget/fsl_updater.h linux-imx6-3.14/drivers/usb/gadget/fsl_updater.h
+--- linux-3.14.14/drivers/usb/gadget/fsl_updater.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/usb/gadget/fsl_updater.h 2014-12-08 00:31:54.736418001 -0600
@@ -0,0 +1,150 @@
+/*
+ * Freescale UUT driver
@@ -210195,9 +210224,9 @@ diff -Nur linux-3.14.22.orig/drivers/usb/gadget/fsl_updater.h linux-3.14.22/driv
+
+#endif /* __FSL_UPDATER_H */
+
-diff -Nur linux-3.14.22.orig/drivers/usb/gadget/Kconfig linux-3.14.22/drivers/usb/gadget/Kconfig
---- linux-3.14.22.orig/drivers/usb/gadget/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/usb/gadget/Kconfig 2014-10-22 14:55:53.398220001 -0500
+diff -Nur linux-3.14.14/drivers/usb/gadget/Kconfig linux-imx6-3.14/drivers/usb/gadget/Kconfig
+--- linux-3.14.14/drivers/usb/gadget/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/usb/gadget/Kconfig 2014-12-08 00:31:54.724418001 -0600
@@ -952,6 +952,12 @@
Say "y" to link the driver statically, or "m" to build
a dynamically linked module called "g_mass_storage".
@@ -210211,9 +210240,9 @@ diff -Nur linux-3.14.22.orig/drivers/usb/gadget/Kconfig linux-3.14.22/drivers/us
config USB_GADGET_TARGET
tristate "USB Gadget Target Fabric Module"
depends on TARGET_CORE
-diff -Nur linux-3.14.22.orig/drivers/usb/gadget/mass_storage.c linux-3.14.22/drivers/usb/gadget/mass_storage.c
---- linux-3.14.22.orig/drivers/usb/gadget/mass_storage.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/usb/gadget/mass_storage.c 2014-10-22 14:55:53.398220001 -0500
+diff -Nur linux-3.14.14/drivers/usb/gadget/mass_storage.c linux-imx6-3.14/drivers/usb/gadget/mass_storage.c
+--- linux-3.14.14/drivers/usb/gadget/mass_storage.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/usb/gadget/mass_storage.c 2014-12-08 00:31:54.740418001 -0600
@@ -266,7 +266,7 @@
{
return usb_composite_probe(&msg_driver);
@@ -210223,9 +210252,9 @@ diff -Nur linux-3.14.22.orig/drivers/usb/gadget/mass_storage.c linux-3.14.22/dri
static void msg_cleanup(void)
{
-diff -Nur linux-3.14.22.orig/drivers/usb/host/ehci-h20ahb.c linux-3.14.22/drivers/usb/host/ehci-h20ahb.c
---- linux-3.14.22.orig/drivers/usb/host/ehci-h20ahb.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/usb/host/ehci-h20ahb.c 2014-10-22 14:55:53.398220001 -0500
+diff -Nur linux-3.14.14/drivers/usb/host/ehci-h20ahb.c linux-imx6-3.14/drivers/usb/host/ehci-h20ahb.c
+--- linux-3.14.14/drivers/usb/host/ehci-h20ahb.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/usb/host/ehci-h20ahb.c 2014-12-08 00:31:54.748418001 -0600
@@ -0,0 +1,341 @@
+/*
+ * Copyright (C) 2007-2013 Texas Instruments, Inc.
@@ -210568,9 +210597,9 @@ diff -Nur linux-3.14.22.orig/drivers/usb/host/ehci-h20ahb.c linux-3.14.22/driver
+
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/drivers/usb/host/ehci-hcd.c linux-3.14.22/drivers/usb/host/ehci-hcd.c
---- linux-3.14.22.orig/drivers/usb/host/ehci-hcd.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/usb/host/ehci-hcd.c 2014-10-22 14:55:53.398220001 -0500
+diff -Nur linux-3.14.14/drivers/usb/host/ehci-hcd.c linux-imx6-3.14/drivers/usb/host/ehci-hcd.c
+--- linux-3.14.14/drivers/usb/host/ehci-hcd.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/usb/host/ehci-hcd.c 2014-12-08 00:31:54.752418001 -0600
@@ -590,11 +590,16 @@
*/
hcc_params = ehci_readl(ehci, &ehci->caps->hcc_params);
@@ -210591,9 +210620,9 @@ diff -Nur linux-3.14.22.orig/drivers/usb/host/ehci-hcd.c linux-3.14.22/drivers/u
#endif
}
-diff -Nur linux-3.14.22.orig/drivers/usb/host/ehci-hub.c linux-3.14.22/drivers/usb/host/ehci-hub.c
---- linux-3.14.22.orig/drivers/usb/host/ehci-hub.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/usb/host/ehci-hub.c 2014-10-22 14:55:53.402220001 -0500
+diff -Nur linux-3.14.14/drivers/usb/host/ehci-hub.c linux-imx6-3.14/drivers/usb/host/ehci-hub.c
+--- linux-3.14.14/drivers/usb/host/ehci-hub.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/usb/host/ehci-hub.c 2014-12-08 00:31:54.752418001 -0600
@@ -313,6 +313,15 @@
USB_PORT_STAT_HIGH_SPEED)
fs_idle_delay = true;
@@ -210610,9 +210639,9 @@ diff -Nur linux-3.14.22.orig/drivers/usb/host/ehci-hub.c linux-3.14.22/drivers/u
changed = 1;
}
}
-diff -Nur linux-3.14.22.orig/drivers/usb/host/Kconfig linux-3.14.22/drivers/usb/host/Kconfig
---- linux-3.14.22.orig/drivers/usb/host/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/usb/host/Kconfig 2014-10-22 14:55:53.402220001 -0500
+diff -Nur linux-3.14.14/drivers/usb/host/Kconfig linux-imx6-3.14/drivers/usb/host/Kconfig
+--- linux-3.14.14/drivers/usb/host/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/usb/host/Kconfig 2014-12-08 00:31:54.748418001 -0600
@@ -158,6 +158,13 @@
Enables support for the on-chip EHCI controller on
ST SPEAr chips.
@@ -210627,9 +210656,9 @@ diff -Nur linux-3.14.22.orig/drivers/usb/host/Kconfig linux-3.14.22/drivers/usb/
config USB_EHCI_HCD_AT91
tristate "Support for Atmel on-chip EHCI USB controller"
depends on USB_EHCI_HCD && ARCH_AT91
-diff -Nur linux-3.14.22.orig/drivers/usb/host/Makefile linux-3.14.22/drivers/usb/host/Makefile
---- linux-3.14.22.orig/drivers/usb/host/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/usb/host/Makefile 2014-10-22 14:55:53.402220001 -0500
+diff -Nur linux-3.14.14/drivers/usb/host/Makefile linux-imx6-3.14/drivers/usb/host/Makefile
+--- linux-3.14.14/drivers/usb/host/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/usb/host/Makefile 2014-12-08 00:31:54.748418001 -0600
@@ -33,6 +33,8 @@
obj-$(CONFIG_USB_EHCI_HCD_ORION) += ehci-orion.o
obj-$(CONFIG_USB_EHCI_HCD_SPEAR) += ehci-spear.o
@@ -210639,9 +210668,9 @@ diff -Nur linux-3.14.22.orig/drivers/usb/host/Makefile linux-3.14.22/drivers/usb
obj-$(CONFIG_USB_EHCI_HCD_AT91) += ehci-atmel.o
obj-$(CONFIG_USB_EHCI_MSM) += ehci-msm.o
obj-$(CONFIG_USB_EHCI_TEGRA) += ehci-tegra.o
-diff -Nur linux-3.14.22.orig/drivers/usb/phy/Kconfig linux-3.14.22/drivers/usb/phy/Kconfig
---- linux-3.14.22.orig/drivers/usb/phy/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/usb/phy/Kconfig 2014-10-22 14:55:53.402220001 -0500
+diff -Nur linux-3.14.14/drivers/usb/phy/Kconfig linux-imx6-3.14/drivers/usb/phy/Kconfig
+--- linux-3.14.14/drivers/usb/phy/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/usb/phy/Kconfig 2014-12-08 00:31:54.784418001 -0600
@@ -253,7 +253,7 @@
config USB_ULPI
@@ -210651,9 +210680,9 @@ diff -Nur linux-3.14.22.orig/drivers/usb/phy/Kconfig linux-3.14.22/drivers/usb/p
help
Enable this to support ULPI connected USB OTG transceivers which
are likely found on embedded boards.
-diff -Nur linux-3.14.22.orig/drivers/usb/phy/phy-mxs-usb.c linux-3.14.22/drivers/usb/phy/phy-mxs-usb.c
---- linux-3.14.22.orig/drivers/usb/phy/phy-mxs-usb.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/usb/phy/phy-mxs-usb.c 2014-10-22 14:55:53.402220001 -0500
+diff -Nur linux-3.14.14/drivers/usb/phy/phy-mxs-usb.c linux-imx6-3.14/drivers/usb/phy/phy-mxs-usb.c
+--- linux-3.14.14/drivers/usb/phy/phy-mxs-usb.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/usb/phy/phy-mxs-usb.c 2014-12-08 00:31:54.788418001 -0600
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 Freescale Semiconductor, Inc.
@@ -211186,9 +211215,9 @@ diff -Nur linux-3.14.22.orig/drivers/usb/phy/phy-mxs-usb.c linux-3.14.22/drivers
},
};
-diff -Nur linux-3.14.22.orig/drivers/usb/phy/phy-ulpi.c linux-3.14.22/drivers/usb/phy/phy-ulpi.c
---- linux-3.14.22.orig/drivers/usb/phy/phy-ulpi.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/usb/phy/phy-ulpi.c 2014-10-22 14:55:53.406220001 -0500
+diff -Nur linux-3.14.14/drivers/usb/phy/phy-ulpi.c linux-imx6-3.14/drivers/usb/phy/phy-ulpi.c
+--- linux-3.14.14/drivers/usb/phy/phy-ulpi.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/usb/phy/phy-ulpi.c 2014-12-08 00:31:54.788418001 -0600
@@ -48,6 +48,7 @@
ULPI_INFO(ULPI_ID(0x04cc, 0x1504), "NXP ISP1504"),
ULPI_INFO(ULPI_ID(0x0424, 0x0006), "SMSC USB331x"),
@@ -211197,9 +211226,9 @@ diff -Nur linux-3.14.22.orig/drivers/usb/phy/phy-ulpi.c linux-3.14.22/drivers/us
ULPI_INFO(ULPI_ID(0x0451, 0x1507), "TI TUSB1210"),
};
-diff -Nur linux-3.14.22.orig/drivers/video/amba-clcd.c linux-3.14.22/drivers/video/amba-clcd.c
---- linux-3.14.22.orig/drivers/video/amba-clcd.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/video/amba-clcd.c 2014-10-22 14:55:56.614220001 -0500
+diff -Nur linux-3.14.14/drivers/video/amba-clcd.c linux-imx6-3.14/drivers/video/amba-clcd.c
+--- linux-3.14.14/drivers/video/amba-clcd.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/video/amba-clcd.c 2014-12-08 00:31:54.820418001 -0600
@@ -17,7 +17,10 @@
#include <linux/string.h>
#include <linux/slab.h>
@@ -211545,9 +211574,9 @@ diff -Nur linux-3.14.22.orig/drivers/video/amba-clcd.c linux-3.14.22/drivers/vid
ret = dma_set_mask_and_coherent(&dev->dev, DMA_BIT_MASK(32));
if (ret)
-diff -Nur linux-3.14.22.orig/drivers/video/arm-hdlcd.c linux-3.14.22/drivers/video/arm-hdlcd.c
---- linux-3.14.22.orig/drivers/video/arm-hdlcd.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/video/arm-hdlcd.c 2014-10-22 14:55:56.638220001 -0500
+diff -Nur linux-3.14.14/drivers/video/arm-hdlcd.c linux-imx6-3.14/drivers/video/arm-hdlcd.c
+--- linux-3.14.14/drivers/video/arm-hdlcd.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/video/arm-hdlcd.c 2014-12-08 00:31:54.824418001 -0600
@@ -0,0 +1,844 @@
+/*
+ * drivers/video/arm-hdlcd.c
@@ -212393,9 +212422,9 @@ diff -Nur linux-3.14.22.orig/drivers/video/arm-hdlcd.c linux-3.14.22/drivers/vid
+MODULE_AUTHOR("Liviu Dudau");
+MODULE_DESCRIPTION("ARM HDLCD core driver");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-3.14.22.orig/drivers/video/backlight/backlight.c linux-3.14.22/drivers/video/backlight/backlight.c
---- linux-3.14.22.orig/drivers/video/backlight/backlight.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/video/backlight/backlight.c 2014-10-22 14:55:56.638220001 -0500
+diff -Nur linux-3.14.14/drivers/video/backlight/backlight.c linux-imx6-3.14/drivers/video/backlight/backlight.c
+--- linux-3.14.14/drivers/video/backlight/backlight.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/video/backlight/backlight.c 2014-12-08 00:31:54.828418001 -0600
@@ -41,6 +41,8 @@
{
struct backlight_device *bd;
@@ -212436,9 +212465,9 @@ diff -Nur linux-3.14.22.orig/drivers/video/backlight/backlight.c linux-3.14.22/d
}
mutex_unlock(&bd->ops_lock);
return 0;
-diff -Nur linux-3.14.22.orig/drivers/video/Kconfig linux-3.14.22/drivers/video/Kconfig
---- linux-3.14.22.orig/drivers/video/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/video/Kconfig 2014-10-22 14:55:56.638220001 -0500
+diff -Nur linux-3.14.14/drivers/video/Kconfig linux-imx6-3.14/drivers/video/Kconfig
+--- linux-3.14.14/drivers/video/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/video/Kconfig 2014-12-08 00:31:54.820418001 -0600
@@ -39,6 +39,11 @@
config HDMI
bool
@@ -212484,9 +212513,9 @@ diff -Nur linux-3.14.22.orig/drivers/video/Kconfig linux-3.14.22/drivers/video/K
if VT
source "drivers/video/console/Kconfig"
endif
-diff -Nur linux-3.14.22.orig/drivers/video/Makefile linux-3.14.22/drivers/video/Makefile
---- linux-3.14.22.orig/drivers/video/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/video/Makefile 2014-10-22 14:55:56.638220001 -0500
+diff -Nur linux-3.14.14/drivers/video/Makefile linux-imx6-3.14/drivers/video/Makefile
+--- linux-3.14.14/drivers/video/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/video/Makefile 2014-12-08 00:31:54.820418001 -0600
@@ -53,6 +53,7 @@
obj-$(CONFIG_FB_SAVAGE) += savage/
obj-$(CONFIG_FB_GEODE) += geode/
@@ -212510,9 +212539,9 @@ diff -Nur linux-3.14.22.orig/drivers/video/Makefile linux-3.14.22/drivers/video/
+
+# platform specific output drivers
+obj-$(CONFIG_VEXPRESS_DVI_CONTROL) += vexpress-dvi.o
-diff -Nur linux-3.14.22.orig/drivers/video/mxc/Kconfig linux-3.14.22/drivers/video/mxc/Kconfig
---- linux-3.14.22.orig/drivers/video/mxc/Kconfig 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/video/mxc/Kconfig 2014-10-22 14:55:56.638220001 -0500
+diff -Nur linux-3.14.14/drivers/video/mxc/Kconfig linux-imx6-3.14/drivers/video/mxc/Kconfig
+--- linux-3.14.14/drivers/video/mxc/Kconfig 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/video/mxc/Kconfig 2014-12-08 00:31:54.860418001 -0600
@@ -0,0 +1,48 @@
+config FB_MXC
+ tristate "MXC Framebuffer support"
@@ -212562,9 +212591,9 @@ diff -Nur linux-3.14.22.orig/drivers/video/mxc/Kconfig linux-3.14.22/drivers/vid
+ depends on FB_MXC && I2C
+ tristate "MXC EDID support"
+ default y
-diff -Nur linux-3.14.22.orig/drivers/video/mxc/ldb.c linux-3.14.22/drivers/video/mxc/ldb.c
---- linux-3.14.22.orig/drivers/video/mxc/ldb.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/video/mxc/ldb.c 2014-10-22 14:55:56.642220001 -0500
+diff -Nur linux-3.14.14/drivers/video/mxc/ldb.c linux-imx6-3.14/drivers/video/mxc/ldb.c
+--- linux-3.14.14/drivers/video/mxc/ldb.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/video/mxc/ldb.c 2014-12-08 00:31:54.860418001 -0600
@@ -0,0 +1,1036 @@
+/*
+ * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -213602,9 +213631,9 @@ diff -Nur linux-3.14.22.orig/drivers/video/mxc/ldb.c linux-3.14.22/drivers/video
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("MXC LDB driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/drivers/video/mxc/Makefile linux-3.14.22/drivers/video/mxc/Makefile
---- linux-3.14.22.orig/drivers/video/mxc/Makefile 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/video/mxc/Makefile 2014-10-22 14:55:56.642220001 -0500
+diff -Nur linux-3.14.14/drivers/video/mxc/Makefile linux-imx6-3.14/drivers/video/mxc/Makefile
+--- linux-3.14.14/drivers/video/mxc/Makefile 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/video/mxc/Makefile 2014-12-08 00:31:54.860418001 -0600
@@ -0,0 +1,6 @@
+obj-$(CONFIG_FB_MXC_LDB) += ldb.o
+obj-$(CONFIG_FB_MXC_MIPI_DSI) += mipi_dsi.o
@@ -213612,9 +213641,9 @@ diff -Nur linux-3.14.22.orig/drivers/video/mxc/Makefile linux-3.14.22/drivers/vi
+obj-$(CONFIG_FB_MXC_HDMI) += mxc_hdmi.o
+obj-$(CONFIG_FB_MXC_EDID) += mxc_edid.o
+obj-$(CONFIG_FB_MXC_SYNC_PANEL) += mxc_dispdrv.o mxc_lcdif.o mxc_ipuv3_fb.o
-diff -Nur linux-3.14.22.orig/drivers/video/mxc/mipi_dsi.c linux-3.14.22/drivers/video/mxc/mipi_dsi.c
---- linux-3.14.22.orig/drivers/video/mxc/mipi_dsi.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/video/mxc/mipi_dsi.c 2014-10-22 14:55:56.642220001 -0500
+diff -Nur linux-3.14.14/drivers/video/mxc/mipi_dsi.c linux-imx6-3.14/drivers/video/mxc/mipi_dsi.c
+--- linux-3.14.14/drivers/video/mxc/mipi_dsi.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/video/mxc/mipi_dsi.c 2014-12-08 00:31:54.860418001 -0600
@@ -0,0 +1,953 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -214569,9 +214598,9 @@ diff -Nur linux-3.14.22.orig/drivers/video/mxc/mipi_dsi.c linux-3.14.22/drivers/
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("i.MX MIPI DSI driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/drivers/video/mxc/mipi_dsi.h linux-3.14.22/drivers/video/mxc/mipi_dsi.h
---- linux-3.14.22.orig/drivers/video/mxc/mipi_dsi.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/video/mxc/mipi_dsi.h 2014-10-22 14:55:56.646220001 -0500
+diff -Nur linux-3.14.14/drivers/video/mxc/mipi_dsi.h linux-imx6-3.14/drivers/video/mxc/mipi_dsi.h
+--- linux-3.14.14/drivers/video/mxc/mipi_dsi.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/video/mxc/mipi_dsi.h 2014-12-08 00:31:54.860418001 -0600
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -214685,9 +214714,9 @@ diff -Nur linux-3.14.22.orig/drivers/video/mxc/mipi_dsi.h linux-3.14.22/drivers/
+#endif
+
+#endif
-diff -Nur linux-3.14.22.orig/drivers/video/mxc/mxc_dispdrv.c linux-3.14.22/drivers/video/mxc/mxc_dispdrv.c
---- linux-3.14.22.orig/drivers/video/mxc/mxc_dispdrv.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/video/mxc/mxc_dispdrv.c 2014-10-22 14:55:56.646220001 -0500
+diff -Nur linux-3.14.14/drivers/video/mxc/mxc_dispdrv.c linux-imx6-3.14/drivers/video/mxc/mxc_dispdrv.c
+--- linux-3.14.14/drivers/video/mxc/mxc_dispdrv.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/video/mxc/mxc_dispdrv.c 2014-12-08 00:31:54.860418001 -0600
@@ -0,0 +1,150 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -214839,9 +214868,9 @@ diff -Nur linux-3.14.22.orig/drivers/video/mxc/mxc_dispdrv.c linux-3.14.22/drive
+ return ERR_PTR(-EINVAL);
+}
+EXPORT_SYMBOL_GPL(mxc_dispdrv_getdata);
-diff -Nur linux-3.14.22.orig/drivers/video/mxc/mxc_dispdrv.h linux-3.14.22/drivers/video/mxc/mxc_dispdrv.h
---- linux-3.14.22.orig/drivers/video/mxc/mxc_dispdrv.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/video/mxc/mxc_dispdrv.h 2014-10-22 14:55:56.646220001 -0500
+diff -Nur linux-3.14.14/drivers/video/mxc/mxc_dispdrv.h linux-imx6-3.14/drivers/video/mxc/mxc_dispdrv.h
+--- linux-3.14.14/drivers/video/mxc/mxc_dispdrv.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/video/mxc/mxc_dispdrv.h 2014-12-08 00:31:54.860418001 -0600
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -214897,9 +214926,9 @@ diff -Nur linux-3.14.22.orig/drivers/video/mxc/mxc_dispdrv.h linux-3.14.22/drive
+int mxc_dispdrv_setdata(struct mxc_dispdrv_handle *handle, void *data);
+void *mxc_dispdrv_getdata(struct mxc_dispdrv_handle *handle);
+#endif
-diff -Nur linux-3.14.22.orig/drivers/video/mxc/mxc_edid.c linux-3.14.22/drivers/video/mxc/mxc_edid.c
---- linux-3.14.22.orig/drivers/video/mxc/mxc_edid.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/video/mxc/mxc_edid.c 2014-10-22 14:55:56.646220001 -0500
+diff -Nur linux-3.14.14/drivers/video/mxc/mxc_edid.c linux-imx6-3.14/drivers/video/mxc/mxc_edid.c
+--- linux-3.14.14/drivers/video/mxc/mxc_edid.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/video/mxc/mxc_edid.c 2014-12-08 00:31:54.860418001 -0600
@@ -0,0 +1,762 @@
+/*
+ * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -215663,9 +215692,9 @@ diff -Nur linux-3.14.22.orig/drivers/video/mxc/mxc_edid.c linux-3.14.22/drivers/
+}
+EXPORT_SYMBOL(mxc_edid_read);
+
-diff -Nur linux-3.14.22.orig/drivers/video/mxc/mxcfb_hx8369_wvga.c linux-3.14.22/drivers/video/mxc/mxcfb_hx8369_wvga.c
---- linux-3.14.22.orig/drivers/video/mxc/mxcfb_hx8369_wvga.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/video/mxc/mxcfb_hx8369_wvga.c 2014-10-22 14:55:56.646220001 -0500
+diff -Nur linux-3.14.14/drivers/video/mxc/mxcfb_hx8369_wvga.c linux-imx6-3.14/drivers/video/mxc/mxcfb_hx8369_wvga.c
+--- linux-3.14.14/drivers/video/mxc/mxcfb_hx8369_wvga.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/video/mxc/mxcfb_hx8369_wvga.c 2014-12-08 00:31:54.860418001 -0600
@@ -0,0 +1,449 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -216116,9 +216145,9 @@ diff -Nur linux-3.14.22.orig/drivers/video/mxc/mxcfb_hx8369_wvga.c linux-3.14.22
+ mipid_bl_update_status(bl);
+ return 0;
+}
-diff -Nur linux-3.14.22.orig/drivers/video/mxc/mxc_hdmi.c linux-3.14.22/drivers/video/mxc/mxc_hdmi.c
---- linux-3.14.22.orig/drivers/video/mxc/mxc_hdmi.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/video/mxc/mxc_hdmi.c 2014-10-22 14:55:56.650220001 -0500
+diff -Nur linux-3.14.14/drivers/video/mxc/mxc_hdmi.c linux-imx6-3.14/drivers/video/mxc/mxc_hdmi.c
+--- linux-3.14.14/drivers/video/mxc/mxc_hdmi.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/video/mxc/mxc_hdmi.c 2014-12-08 00:31:54.860418001 -0600
@@ -0,0 +1,3042 @@
+/*
+ * Copyright (C) 2011-2014 Freescale Semiconductor, Inc.
@@ -219162,9 +219191,9 @@ diff -Nur linux-3.14.22.orig/drivers/video/mxc/mxc_hdmi.c linux-3.14.22/drivers/
+module_exit(mxc_hdmi_i2c_exit);
+
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
-diff -Nur linux-3.14.22.orig/drivers/video/mxc/mxc_ipuv3_fb.c linux-3.14.22/drivers/video/mxc/mxc_ipuv3_fb.c
---- linux-3.14.22.orig/drivers/video/mxc/mxc_ipuv3_fb.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/video/mxc/mxc_ipuv3_fb.c 2014-10-22 14:55:56.650220001 -0500
+diff -Nur linux-3.14.14/drivers/video/mxc/mxc_ipuv3_fb.c linux-imx6-3.14/drivers/video/mxc/mxc_ipuv3_fb.c
+--- linux-3.14.14/drivers/video/mxc/mxc_ipuv3_fb.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/video/mxc/mxc_ipuv3_fb.c 2014-12-08 00:31:54.860418001 -0600
@@ -0,0 +1,2578 @@
+/*
+ * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -221744,9 +221773,9 @@ diff -Nur linux-3.14.22.orig/drivers/video/mxc/mxc_ipuv3_fb.c linux-3.14.22/driv
+MODULE_DESCRIPTION("MXC framebuffer driver");
+MODULE_LICENSE("GPL");
+MODULE_SUPPORTED_DEVICE("fb");
-diff -Nur linux-3.14.22.orig/drivers/video/mxc/mxc_lcdif.c linux-3.14.22/drivers/video/mxc/mxc_lcdif.c
---- linux-3.14.22.orig/drivers/video/mxc/mxc_lcdif.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/video/mxc/mxc_lcdif.c 2014-10-22 14:55:56.650220001 -0500
+diff -Nur linux-3.14.14/drivers/video/mxc/mxc_lcdif.c linux-imx6-3.14/drivers/video/mxc/mxc_lcdif.c
+--- linux-3.14.14/drivers/video/mxc/mxc_lcdif.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/video/mxc/mxc_lcdif.c 2014-12-08 00:31:54.860418001 -0600
@@ -0,0 +1,235 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -221983,9 +222012,9 @@ diff -Nur linux-3.14.22.orig/drivers/video/mxc/mxc_lcdif.c linux-3.14.22/drivers
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("i.MX ipuv3 LCD extern port driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/drivers/video/mxsfb.c linux-3.14.22/drivers/video/mxsfb.c
---- linux-3.14.22.orig/drivers/video/mxsfb.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/drivers/video/mxsfb.c 2014-10-22 14:55:56.650220001 -0500
+diff -Nur linux-3.14.14/drivers/video/mxsfb.c linux-imx6-3.14/drivers/video/mxsfb.c
+--- linux-3.14.14/drivers/video/mxsfb.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/drivers/video/mxsfb.c 2014-12-08 00:31:54.860418001 -0600
@@ -96,9 +96,10 @@
#define CTRL_DF24 (1 << 1)
#define CTRL_RUN (1 << 0)
@@ -222201,9 +222230,9 @@ diff -Nur linux-3.14.22.orig/drivers/video/mxsfb.c linux-3.14.22/drivers/video/m
}
static struct platform_device_id mxsfb_devtype[] = {
-diff -Nur linux-3.14.22.orig/drivers/video/vexpress-dvi.c linux-3.14.22/drivers/video/vexpress-dvi.c
---- linux-3.14.22.orig/drivers/video/vexpress-dvi.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/drivers/video/vexpress-dvi.c 2014-10-22 14:55:56.650220001 -0500
+diff -Nur linux-3.14.14/drivers/video/vexpress-dvi.c linux-imx6-3.14/drivers/video/vexpress-dvi.c
+--- linux-3.14.14/drivers/video/vexpress-dvi.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/drivers/video/vexpress-dvi.c 2014-12-08 00:31:54.892418001 -0600
@@ -0,0 +1,220 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -222425,9 +222454,9 @@ diff -Nur linux-3.14.22.orig/drivers/video/vexpress-dvi.c linux-3.14.22/drivers/
+ return platform_driver_register(&vexpress_dvi_driver);
+}
+device_initcall(vexpress_dvi_init);
-diff -Nur linux-3.14.22.orig/firmware/imx/sdma/sdma-imx6q.bin.ihex linux-3.14.22/firmware/imx/sdma/sdma-imx6q.bin.ihex
---- linux-3.14.22.orig/firmware/imx/sdma/sdma-imx6q.bin.ihex 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/firmware/imx/sdma/sdma-imx6q.bin.ihex 2014-10-22 14:55:56.650220001 -0500
+diff -Nur linux-3.14.14/firmware/imx/sdma/sdma-imx6q.bin.ihex linux-imx6-3.14/firmware/imx/sdma/sdma-imx6q.bin.ihex
+--- linux-3.14.14/firmware/imx/sdma/sdma-imx6q.bin.ihex 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/firmware/imx/sdma/sdma-imx6q.bin.ihex 2014-12-08 00:31:54.948418001 -0600
@@ -0,0 +1,116 @@
+:1000000053444D4101000000010000001C000000AD
+:1000100026000000B40000007A0600008202000002
@@ -222545,9 +222574,9 @@ diff -Nur linux-3.14.22.orig/firmware/imx/sdma/sdma-imx6q.bin.ihex linux-3.14.22
+:10071000DD6F087FD169010FC86FDD6F037F0101B5
+:0E0720000004129B0700FF680C680002129B89
+:00000001FF
-diff -Nur linux-3.14.22.orig/firmware/Makefile linux-3.14.22/firmware/Makefile
---- linux-3.14.22.orig/firmware/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/firmware/Makefile 2014-10-22 14:55:56.650220001 -0500
+diff -Nur linux-3.14.14/firmware/Makefile linux-imx6-3.14/firmware/Makefile
+--- linux-3.14.14/firmware/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/firmware/Makefile 2014-12-08 00:31:54.924418001 -0600
@@ -61,6 +61,7 @@
radeon/RV770_pfp.bin radeon/RV770_me.bin \
radeon/RV730_pfp.bin radeon/RV730_me.bin \
@@ -222565,9 +222594,9 @@ diff -Nur linux-3.14.22.orig/firmware/Makefile linux-3.14.22/firmware/Makefile
# Don't depend on ihex2fw if we're installing and it already exists.
# Putting it after | in the dependencies doesn't seem sufficient when
# we're installing after a cross-compile, because ihex2fw has dependencies
-diff -Nur linux-3.14.22.orig/fs/btrfs/Kconfig linux-3.14.22/fs/btrfs/Kconfig
---- linux-3.14.22.orig/fs/btrfs/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/fs/btrfs/Kconfig 2014-10-22 14:55:56.650220001 -0500
+diff -Nur linux-3.14.14/fs/btrfs/Kconfig linux-imx6-3.14/fs/btrfs/Kconfig
+--- linux-3.14.14/fs/btrfs/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/fs/btrfs/Kconfig 2014-12-08 00:31:54.976418001 -0600
@@ -1,5 +1,6 @@
config BTRFS_FS
tristate "Btrfs filesystem support"
@@ -222575,10 +222604,10 @@ diff -Nur linux-3.14.22.orig/fs/btrfs/Kconfig linux-3.14.22/fs/btrfs/Kconfig
select CRYPTO
select CRYPTO_CRC32C
select ZLIB_INFLATE
-diff -Nur linux-3.14.22.orig/fs/buffer.c linux-3.14.22/fs/buffer.c
---- linux-3.14.22.orig/fs/buffer.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/fs/buffer.c 2014-10-22 14:55:56.654220001 -0500
-@@ -3090,7 +3090,7 @@
+diff -Nur linux-3.14.14/fs/buffer.c linux-imx6-3.14/fs/buffer.c
+--- linux-3.14.14/fs/buffer.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/fs/buffer.c 2014-12-08 00:31:54.996418001 -0600
+@@ -3088,7 +3088,7 @@
* until the buffer gets unlocked).
*
* ll_rw_block sets b_end_io to simple completion handler that marks
@@ -222587,9 +222616,9 @@ diff -Nur linux-3.14.22.orig/fs/buffer.c linux-3.14.22/fs/buffer.c
* any waiters.
*
* All of the buffers must be for the same device, and must also be a
-diff -Nur linux-3.14.22.orig/fs/compat_binfmt_elf.c linux-3.14.22/fs/compat_binfmt_elf.c
---- linux-3.14.22.orig/fs/compat_binfmt_elf.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/fs/compat_binfmt_elf.c 2014-10-22 14:55:56.654220001 -0500
+diff -Nur linux-3.14.14/fs/compat_binfmt_elf.c linux-imx6-3.14/fs/compat_binfmt_elf.c
+--- linux-3.14.14/fs/compat_binfmt_elf.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/fs/compat_binfmt_elf.c 2014-12-08 00:31:55.016418001 -0600
@@ -88,6 +88,11 @@
#define ELF_HWCAP COMPAT_ELF_HWCAP
#endif
@@ -222602,9 +222631,9 @@ diff -Nur linux-3.14.22.orig/fs/compat_binfmt_elf.c linux-3.14.22/fs/compat_binf
#ifdef COMPAT_ARCH_DLINFO
#undef ARCH_DLINFO
#define ARCH_DLINFO COMPAT_ARCH_DLINFO
-diff -Nur linux-3.14.22.orig/fs/debugfs/inode.c linux-3.14.22/fs/debugfs/inode.c
---- linux-3.14.22.orig/fs/debugfs/inode.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/fs/debugfs/inode.c 2014-10-22 14:55:56.654220001 -0500
+diff -Nur linux-3.14.14/fs/debugfs/inode.c linux-imx6-3.14/fs/debugfs/inode.c
+--- linux-3.14.14/fs/debugfs/inode.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/fs/debugfs/inode.c 2014-12-08 00:31:55.020418001 -0600
@@ -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.
@@ -222632,9 +222661,9 @@ diff -Nur linux-3.14.22.orig/fs/debugfs/inode.c linux-3.14.22/fs/debugfs/inode.c
* then the symbolic link will be created in the root of the debugfs
* filesystem.
* @target: a pointer to a string containing the path to the target of the
-diff -Nur linux-3.14.22.orig/include/asm-generic/word-at-a-time.h linux-3.14.22/include/asm-generic/word-at-a-time.h
---- linux-3.14.22.orig/include/asm-generic/word-at-a-time.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/asm-generic/word-at-a-time.h 2014-10-22 14:55:56.654220001 -0500
+diff -Nur linux-3.14.14/include/asm-generic/word-at-a-time.h linux-imx6-3.14/include/asm-generic/word-at-a-time.h
+--- linux-3.14.14/include/asm-generic/word-at-a-time.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/asm-generic/word-at-a-time.h 2014-12-08 00:31:55.240418001 -0600
@@ -50,7 +50,7 @@
}
@@ -222644,9 +222673,9 @@ diff -Nur linux-3.14.22.orig/include/asm-generic/word-at-a-time.h linux-3.14.22/
#endif
#endif /* _ASM_WORD_AT_A_TIME_H */
-diff -Nur linux-3.14.22.orig/include/crypto/algapi.h linux-3.14.22/include/crypto/algapi.h
---- linux-3.14.22.orig/include/crypto/algapi.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/crypto/algapi.h 2014-10-22 14:55:56.654220001 -0500
+diff -Nur linux-3.14.14/include/crypto/algapi.h linux-imx6-3.14/include/crypto/algapi.h
+--- linux-3.14.14/include/crypto/algapi.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/crypto/algapi.h 2014-12-08 00:31:55.240418001 -0600
@@ -100,9 +100,12 @@
void *page;
u8 *buffer;
@@ -222672,9 +222701,9 @@ diff -Nur linux-3.14.22.orig/include/crypto/algapi.h linux-3.14.22/include/crypt
int ablkcipher_walk_done(struct ablkcipher_request *req,
struct ablkcipher_walk *walk, int err);
-diff -Nur linux-3.14.22.orig/include/drm/drm_fb_helper.h linux-3.14.22/include/drm/drm_fb_helper.h
---- linux-3.14.22.orig/include/drm/drm_fb_helper.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/drm/drm_fb_helper.h 2014-10-22 14:55:56.654220001 -0500
+diff -Nur linux-3.14.14/include/drm/drm_fb_helper.h linux-imx6-3.14/include/drm/drm_fb_helper.h
+--- linux-3.14.14/include/drm/drm_fb_helper.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/drm/drm_fb_helper.h 2014-12-08 00:31:55.240418001 -0600
@@ -55,7 +55,7 @@
* save the current lut when force-restoring the fbdev for e.g.
* kdbg.
@@ -222684,9 +222713,9 @@ diff -Nur linux-3.14.22.orig/include/drm/drm_fb_helper.h linux-3.14.22/include/d
* framebuffer used to back the fbdev.
* @initial_config: Setup an initial fbdev display configuration
*
-diff -Nur linux-3.14.22.orig/include/dt-bindings/clock/imx6sl-clock.h linux-3.14.22/include/dt-bindings/clock/imx6sl-clock.h
---- linux-3.14.22.orig/include/dt-bindings/clock/imx6sl-clock.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/dt-bindings/clock/imx6sl-clock.h 2014-10-22 14:55:56.654220001 -0500
+diff -Nur linux-3.14.14/include/dt-bindings/clock/imx6sl-clock.h linux-imx6-3.14/include/dt-bindings/clock/imx6sl-clock.h
+--- linux-3.14.14/include/dt-bindings/clock/imx6sl-clock.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/dt-bindings/clock/imx6sl-clock.h 2014-12-08 00:31:55.244418001 -0600
@@ -1,5 +1,5 @@
/*
- * Copyright 2013 Freescale Semiconductor, Inc.
@@ -222714,9 +222743,9 @@ diff -Nur linux-3.14.22.orig/include/dt-bindings/clock/imx6sl-clock.h linux-3.14
+#define IMX6SL_CLK_END 136
#endif /* __DT_BINDINGS_CLOCK_IMX6SL_H */
-diff -Nur linux-3.14.22.orig/include/linux/ahci_platform.h linux-3.14.22/include/linux/ahci_platform.h
---- linux-3.14.22.orig/include/linux/ahci_platform.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/ahci_platform.h 2014-10-22 14:55:56.654220001 -0500
+diff -Nur linux-3.14.14/include/linux/ahci_platform.h linux-imx6-3.14/include/linux/ahci_platform.h
+--- linux-3.14.14/include/linux/ahci_platform.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/ahci_platform.h 2014-12-08 00:31:55.248418001 -0600
@@ -19,15 +19,38 @@
struct device;
@@ -222759,9 +222788,9 @@ diff -Nur linux-3.14.22.orig/include/linux/ahci_platform.h linux-3.14.22/include
+int ahci_platform_resume(struct device *dev);
+
#endif /* _AHCI_PLATFORM_H */
-diff -Nur linux-3.14.22.orig/include/linux/amba/clcd.h linux-3.14.22/include/linux/amba/clcd.h
---- linux-3.14.22.orig/include/linux/amba/clcd.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/amba/clcd.h 2014-10-22 14:55:56.706220001 -0500
+diff -Nur linux-3.14.14/include/linux/amba/clcd.h linux-imx6-3.14/include/linux/amba/clcd.h
+--- linux-3.14.14/include/linux/amba/clcd.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/amba/clcd.h 2014-12-08 00:31:55.248418001 -0600
@@ -243,6 +243,9 @@
val |= CNTL_BGR;
}
@@ -222791,9 +222820,9 @@ diff -Nur linux-3.14.22.orig/include/linux/amba/clcd.h linux-3.14.22/include/lin
break;
}
-diff -Nur linux-3.14.22.orig/include/linux/arm-hdlcd.h linux-3.14.22/include/linux/arm-hdlcd.h
---- linux-3.14.22.orig/include/linux/arm-hdlcd.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/linux/arm-hdlcd.h 2014-10-22 14:55:56.706220001 -0500
+diff -Nur linux-3.14.14/include/linux/arm-hdlcd.h linux-imx6-3.14/include/linux/arm-hdlcd.h
+--- linux-3.14.14/include/linux/arm-hdlcd.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/linux/arm-hdlcd.h 2014-12-08 00:31:55.248418001 -0600
@@ -0,0 +1,122 @@
+/*
+ * include/linux/arm-hdlcd.h
@@ -222917,9 +222946,9 @@ diff -Nur linux-3.14.22.orig/include/linux/arm-hdlcd.h linux-3.14.22/include/lin
+ struct completion vsync_completion;
+ unsigned char *edid;
+};
-diff -Nur linux-3.14.22.orig/include/linux/backlight.h linux-3.14.22/include/linux/backlight.h
---- linux-3.14.22.orig/include/linux/backlight.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/backlight.h 2014-10-22 14:55:56.710220001 -0500
+diff -Nur linux-3.14.14/include/linux/backlight.h linux-imx6-3.14/include/linux/backlight.h
+--- linux-3.14.14/include/linux/backlight.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/backlight.h 2014-12-08 00:31:55.252418001 -0600
@@ -9,6 +9,7 @@
#define _LINUX_BACKLIGHT_H
@@ -222940,9 +222969,9 @@ diff -Nur linux-3.14.22.orig/include/linux/backlight.h linux-3.14.22/include/lin
};
static inline void backlight_update_status(struct backlight_device *bd)
-diff -Nur linux-3.14.22.orig/include/linux/busfreq-imx6.h linux-3.14.22/include/linux/busfreq-imx6.h
---- linux-3.14.22.orig/include/linux/busfreq-imx6.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/linux/busfreq-imx6.h 2014-10-22 14:55:56.710220001 -0500
+diff -Nur linux-3.14.14/include/linux/busfreq-imx6.h linux-imx6-3.14/include/linux/busfreq-imx6.h
+--- linux-3.14.14/include/linux/busfreq-imx6.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/linux/busfreq-imx6.h 2014-12-08 00:31:55.252418001 -0600
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -222967,9 +222996,9 @@ diff -Nur linux-3.14.22.orig/include/linux/busfreq-imx6.h linux-3.14.22/include/
+void request_bus_freq(enum bus_freq_mode mode);
+void release_bus_freq(enum bus_freq_mode mode);
+#endif
-diff -Nur linux-3.14.22.orig/include/linux/cgroup_subsys.h linux-3.14.22/include/linux/cgroup_subsys.h
---- linux-3.14.22.orig/include/linux/cgroup_subsys.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/cgroup_subsys.h 2014-10-22 14:55:56.710220001 -0500
+diff -Nur linux-3.14.14/include/linux/cgroup_subsys.h linux-imx6-3.14/include/linux/cgroup_subsys.h
+--- linux-3.14.14/include/linux/cgroup_subsys.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/cgroup_subsys.h 2014-12-08 00:31:55.256418001 -0600
@@ -39,6 +39,10 @@
SUBSYS(blkio)
#endif
@@ -222981,9 +223010,9 @@ diff -Nur linux-3.14.22.orig/include/linux/cgroup_subsys.h linux-3.14.22/include
#if IS_SUBSYS_ENABLED(CONFIG_CGROUP_PERF)
SUBSYS(perf)
#endif
-diff -Nur linux-3.14.22.orig/include/linux/clk-provider.h linux-3.14.22/include/linux/clk-provider.h
---- linux-3.14.22.orig/include/linux/clk-provider.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/clk-provider.h 2014-10-22 14:55:56.710220001 -0500
+diff -Nur linux-3.14.14/include/linux/clk-provider.h linux-imx6-3.14/include/linux/clk-provider.h
+--- linux-3.14.14/include/linux/clk-provider.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/clk-provider.h 2014-12-08 00:31:55.256418001 -0600
@@ -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 */
@@ -222998,9 +223027,9 @@ diff -Nur linux-3.14.22.orig/include/linux/clk-provider.h linux-3.14.22/include/
struct clk_hw;
-diff -Nur linux-3.14.22.orig/include/linux/cma.h linux-3.14.22/include/linux/cma.h
---- linux-3.14.22.orig/include/linux/cma.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/linux/cma.h 2014-10-22 14:55:56.710220001 -0500
+diff -Nur linux-3.14.14/include/linux/cma.h linux-imx6-3.14/include/linux/cma.h
+--- linux-3.14.14/include/linux/cma.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/linux/cma.h 2014-12-08 00:31:55.260418001 -0600
@@ -0,0 +1,27 @@
+#ifndef __CMA_H__
+#define __CMA_H__
@@ -223029,9 +223058,9 @@ diff -Nur linux-3.14.22.orig/include/linux/cma.h linux-3.14.22/include/linux/cma
+extern struct page *cma_alloc(struct cma *cma, int count, unsigned int align);
+extern bool cma_release(struct cma *cma, struct page *pages, int count);
+#endif
-diff -Nur linux-3.14.22.orig/include/linux/cpufeature.h linux-3.14.22/include/linux/cpufeature.h
---- linux-3.14.22.orig/include/linux/cpufeature.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/linux/cpufeature.h 2014-10-22 14:55:56.710220001 -0500
+diff -Nur linux-3.14.14/include/linux/cpufeature.h linux-imx6-3.14/include/linux/cpufeature.h
+--- linux-3.14.14/include/linux/cpufeature.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/linux/cpufeature.h 2014-12-08 00:31:55.260418001 -0600
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2014 Linaro Ltd. <ard.biesheuvel@linaro.org>
@@ -223093,9 +223122,9 @@ diff -Nur linux-3.14.22.orig/include/linux/cpufeature.h linux-3.14.22/include/li
+
+#endif
+#endif
-diff -Nur linux-3.14.22.orig/include/linux/cpufreq.h linux-3.14.22/include/linux/cpufreq.h
---- linux-3.14.22.orig/include/linux/cpufreq.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/cpufreq.h 2014-10-22 14:55:56.710220001 -0500
+diff -Nur linux-3.14.14/include/linux/cpufreq.h linux-imx6-3.14/include/linux/cpufreq.h
+--- linux-3.14.14/include/linux/cpufreq.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/cpufreq.h 2014-12-08 00:31:55.260418001 -0600
@@ -429,6 +429,9 @@
#elif defined(CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND)
extern struct cpufreq_governor cpufreq_gov_ondemand;
@@ -223106,9 +223135,9 @@ diff -Nur linux-3.14.22.orig/include/linux/cpufreq.h linux-3.14.22/include/linux
#elif defined(CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE)
extern struct cpufreq_governor cpufreq_gov_conservative;
#define CPUFREQ_DEFAULT_GOVERNOR (&cpufreq_gov_conservative)
-diff -Nur linux-3.14.22.orig/include/linux/cpu.h linux-3.14.22/include/linux/cpu.h
---- linux-3.14.22.orig/include/linux/cpu.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/cpu.h 2014-10-22 14:55:56.714220001 -0500
+diff -Nur linux-3.14.14/include/linux/cpu.h linux-imx6-3.14/include/linux/cpu.h
+--- linux-3.14.14/include/linux/cpu.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/cpu.h 2014-12-08 00:31:55.260418001 -0600
@@ -226,4 +226,11 @@
void arch_cpu_idle_exit(void);
void arch_cpu_idle_dead(void);
@@ -223121,9 +223150,9 @@ diff -Nur linux-3.14.22.orig/include/linux/cpu.h linux-3.14.22/include/linux/cpu
+void idle_notifier_call_chain(unsigned long val);
+
#endif /* _LINUX_CPU_H_ */
-diff -Nur linux-3.14.22.orig/include/linux/device_cooling.h linux-3.14.22/include/linux/device_cooling.h
---- linux-3.14.22.orig/include/linux/device_cooling.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/linux/device_cooling.h 2014-10-22 14:55:56.714220001 -0500
+diff -Nur linux-3.14.14/include/linux/device_cooling.h linux-imx6-3.14/include/linux/device_cooling.h
+--- linux-3.14.14/include/linux/device_cooling.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/linux/device_cooling.h 2014-12-08 00:31:55.264418001 -0600
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -223170,9 +223199,9 @@ diff -Nur linux-3.14.22.orig/include/linux/device_cooling.h linux-3.14.22/includ
+}
+#endif
+#endif /* __DEVICE_THERMAL_H__ */
-diff -Nur linux-3.14.22.orig/include/linux/dma-contiguous.h linux-3.14.22/include/linux/dma-contiguous.h
---- linux-3.14.22.orig/include/linux/dma-contiguous.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/dma-contiguous.h 2014-10-22 14:55:56.714220001 -0500
+diff -Nur linux-3.14.14/include/linux/dma-contiguous.h linux-imx6-3.14/include/linux/dma-contiguous.h
+--- linux-3.14.14/include/linux/dma-contiguous.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/dma-contiguous.h 2014-12-08 00:31:55.264418001 -0600
@@ -53,18 +53,13 @@
#ifdef __KERNEL__
@@ -223233,9 +223262,9 @@ diff -Nur linux-3.14.22.orig/include/linux/dma-contiguous.h linux-3.14.22/includ
return -ENOSYS;
}
-diff -Nur linux-3.14.22.orig/include/linux/dmaengine.h linux-3.14.22/include/linux/dmaengine.h
---- linux-3.14.22.orig/include/linux/dmaengine.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/dmaengine.h 2014-10-22 14:55:56.714220001 -0500
+diff -Nur linux-3.14.14/include/linux/dmaengine.h linux-imx6-3.14/include/linux/dmaengine.h
+--- linux-3.14.14/include/linux/dmaengine.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/dmaengine.h 2014-12-08 00:31:55.264418001 -0600
@@ -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
@@ -223254,9 +223283,9 @@ diff -Nur linux-3.14.22.orig/include/linux/dmaengine.h linux-3.14.22/include/lin
};
/**
-diff -Nur linux-3.14.22.orig/include/linux/ftrace.h linux-3.14.22/include/linux/ftrace.h
---- linux-3.14.22.orig/include/linux/ftrace.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/ftrace.h 2014-10-22 14:55:56.714220001 -0500
+diff -Nur linux-3.14.14/include/linux/ftrace.h linux-imx6-3.14/include/linux/ftrace.h
+--- linux-3.14.14/include/linux/ftrace.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/ftrace.h 2014-12-08 00:31:55.272418001 -0600
@@ -605,25 +605,27 @@
#endif
}
@@ -223301,9 +223330,9 @@ diff -Nur linux-3.14.22.orig/include/linux/ftrace.h linux-3.14.22/include/linux/
#ifdef CONFIG_IRQSOFF_TRACER
extern void time_hardirqs_on(unsigned long a0, unsigned long a1);
-diff -Nur linux-3.14.22.orig/include/linux/hardirq.h linux-3.14.22/include/linux/hardirq.h
---- linux-3.14.22.orig/include/linux/hardirq.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/hardirq.h 2014-10-22 14:55:56.718220001 -0500
+diff -Nur linux-3.14.14/include/linux/hardirq.h linux-imx6-3.14/include/linux/hardirq.h
+--- linux-3.14.14/include/linux/hardirq.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/hardirq.h 2014-12-08 00:31:55.276418001 -0600
@@ -9,6 +9,7 @@
@@ -223312,9 +223341,9 @@ diff -Nur linux-3.14.22.orig/include/linux/hardirq.h linux-3.14.22/include/linux
#if defined(CONFIG_TINY_RCU)
-diff -Nur linux-3.14.22.orig/include/linux/hsi/hsi.h linux-3.14.22/include/linux/hsi/hsi.h
---- linux-3.14.22.orig/include/linux/hsi/hsi.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/hsi/hsi.h 2014-10-22 14:55:56.718220001 -0500
+diff -Nur linux-3.14.14/include/linux/hsi/hsi.h linux-imx6-3.14/include/linux/hsi/hsi.h
+--- linux-3.14.14/include/linux/hsi/hsi.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/hsi/hsi.h 2014-12-08 00:31:55.276418001 -0600
@@ -178,7 +178,7 @@
* @complete: Transfer completion callback
* @destructor: Destructor to free resources when flushing
@@ -223324,9 +223353,9 @@ diff -Nur linux-3.14.22.orig/include/linux/hsi/hsi.h linux-3.14.22/include/linux
* @channel: Channel were to TX/RX the message
* @ttype: Transfer type (TX if set, RX otherwise)
* @break_frame: if true HSI will send/receive a break frame. Data buffers are
-diff -Nur linux-3.14.22.orig/include/linux/ipu.h linux-3.14.22/include/linux/ipu.h
---- linux-3.14.22.orig/include/linux/ipu.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/linux/ipu.h 2014-10-22 14:55:56.718220001 -0500
+diff -Nur linux-3.14.14/include/linux/ipu.h linux-imx6-3.14/include/linux/ipu.h
+--- linux-3.14.14/include/linux/ipu.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/linux/ipu.h 2014-12-08 00:31:55.288418001 -0600
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2005-2013 Freescale Semiconductor, Inc.
@@ -223366,9 +223395,9 @@ diff -Nur linux-3.14.22.orig/include/linux/ipu.h linux-3.14.22/include/linux/ipu
+int ipu_check_task(struct ipu_task *task);
+
+#endif
-diff -Nur linux-3.14.22.orig/include/linux/ipu-v3.h linux-3.14.22/include/linux/ipu-v3.h
---- linux-3.14.22.orig/include/linux/ipu-v3.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/linux/ipu-v3.h 2014-10-22 14:55:56.718220001 -0500
+diff -Nur linux-3.14.14/include/linux/ipu-v3.h linux-imx6-3.14/include/linux/ipu-v3.h
+--- linux-3.14.14/include/linux/ipu-v3.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/linux/ipu-v3.h 2014-12-08 00:31:55.288418001 -0600
@@ -0,0 +1,752 @@
+/*
+ * Copyright (c) 2010 Sascha Hauer <s.hauer@pengutronix.de>
@@ -224122,9 +224151,9 @@ diff -Nur linux-3.14.22.orig/include/linux/ipu-v3.h linux-3.14.22/include/linux/
+};
+
+#endif /* __LINUX_IPU_V3_H_ */
-diff -Nur linux-3.14.22.orig/include/linux/isl29023.h linux-3.14.22/include/linux/isl29023.h
---- linux-3.14.22.orig/include/linux/isl29023.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/linux/isl29023.h 2014-10-22 14:55:56.718220001 -0500
+diff -Nur linux-3.14.14/include/linux/isl29023.h linux-imx6-3.14/include/linux/isl29023.h
+--- linux-3.14.14/include/linux/isl29023.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/linux/isl29023.h 2014-12-08 00:31:55.288418001 -0600
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -224173,9 +224202,9 @@ diff -Nur linux-3.14.22.orig/include/linux/isl29023.h linux-3.14.22/include/linu
+#define ISL29023_RANGE_64K 0x3
+
+#endif
-diff -Nur linux-3.14.22.orig/include/linux/kfifo.h linux-3.14.22/include/linux/kfifo.h
---- linux-3.14.22.orig/include/linux/kfifo.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/kfifo.h 2014-10-22 14:55:56.718220001 -0500
+diff -Nur linux-3.14.14/include/linux/kfifo.h linux-imx6-3.14/include/linux/kfifo.h
+--- linux-3.14.14/include/linux/kfifo.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/kfifo.h 2014-12-08 00:31:55.292418001 -0600
@@ -722,7 +722,7 @@
/**
* kfifo_dma_out_finish - finish a DMA OUT operation
@@ -224185,9 +224214,9 @@ diff -Nur linux-3.14.22.orig/include/linux/kfifo.h linux-3.14.22/include/linux/k
*
* This macro finish a DMA OUT operation. The out counter will be updated by
* the len parameter. No error checking will be done.
-diff -Nur linux-3.14.22.orig/include/linux/mailbox_client.h linux-3.14.22/include/linux/mailbox_client.h
---- linux-3.14.22.orig/include/linux/mailbox_client.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/linux/mailbox_client.h 2014-10-22 14:55:56.722220001 -0500
+diff -Nur linux-3.14.14/include/linux/mailbox_client.h linux-imx6-3.14/include/linux/mailbox_client.h
+--- linux-3.14.14/include/linux/mailbox_client.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/linux/mailbox_client.h 2014-12-08 00:31:55.296418001 -0600
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2014 Linaro Ltd.
@@ -224235,9 +224264,9 @@ diff -Nur linux-3.14.22.orig/include/linux/mailbox_client.h linux-3.14.22/includ
+void mbox_free_channel(struct mbox_chan *chan);
+
+#endif /* __MAILBOX_CLIENT_H */
-diff -Nur linux-3.14.22.orig/include/linux/mailbox_controller.h linux-3.14.22/include/linux/mailbox_controller.h
---- linux-3.14.22.orig/include/linux/mailbox_controller.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/linux/mailbox_controller.h 2014-10-22 14:55:56.722220001 -0500
+diff -Nur linux-3.14.14/include/linux/mailbox_controller.h linux-imx6-3.14/include/linux/mailbox_controller.h
+--- linux-3.14.14/include/linux/mailbox_controller.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/linux/mailbox_controller.h 2014-12-08 00:31:55.296418001 -0600
@@ -0,0 +1,121 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -224360,9 +224389,9 @@ diff -Nur linux-3.14.22.orig/include/linux/mailbox_controller.h linux-3.14.22/in
+void mbox_controller_unregister(struct mbox_controller *mbox);
+
+#endif /* __MAILBOX_CONTROLLER_H */
-diff -Nur linux-3.14.22.orig/include/linux/mailbox.h linux-3.14.22/include/linux/mailbox.h
---- linux-3.14.22.orig/include/linux/mailbox.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/mailbox.h 1969-12-31 18:00:00.000000000 -0600
+diff -Nur linux-3.14.14/include/linux/mailbox.h linux-imx6-3.14/include/linux/mailbox.h
+--- linux-3.14.14/include/linux/mailbox.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/mailbox.h 1969-12-31 18:00:00.000000000 -0600
@@ -1,17 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or modify it
@@ -224381,9 +224410,9 @@ diff -Nur linux-3.14.22.orig/include/linux/mailbox.h linux-3.14.22/include/linux
-int pl320_ipc_transmit(u32 *data);
-int pl320_ipc_register_notifier(struct notifier_block *nb);
-int pl320_ipc_unregister_notifier(struct notifier_block *nb);
-diff -Nur linux-3.14.22.orig/include/linux/memblock.h linux-3.14.22/include/linux/memblock.h
---- linux-3.14.22.orig/include/linux/memblock.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/memblock.h 2014-10-22 14:55:56.722220001 -0500
+diff -Nur linux-3.14.14/include/linux/memblock.h linux-imx6-3.14/include/linux/memblock.h
+--- linux-3.14.14/include/linux/memblock.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/memblock.h 2014-12-08 00:31:55.296418001 -0600
@@ -221,6 +221,8 @@
#define MEMBLOCK_ALLOC_ANYWHERE (~(phys_addr_t)0)
#define MEMBLOCK_ALLOC_ACCESSIBLE 0
@@ -224393,9 +224422,9 @@ diff -Nur linux-3.14.22.orig/include/linux/memblock.h linux-3.14.22/include/linu
phys_addr_t memblock_alloc_base(phys_addr_t size, phys_addr_t align,
phys_addr_t max_addr);
phys_addr_t __memblock_alloc_base(phys_addr_t size, phys_addr_t align,
-diff -Nur linux-3.14.22.orig/include/linux/mfd/abx500/ab8500.h linux-3.14.22/include/linux/mfd/abx500/ab8500.h
---- linux-3.14.22.orig/include/linux/mfd/abx500/ab8500.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/mfd/abx500/ab8500.h 2014-10-22 14:55:56.722220001 -0500
+diff -Nur linux-3.14.14/include/linux/mfd/abx500/ab8500.h linux-imx6-3.14/include/linux/mfd/abx500/ab8500.h
+--- linux-3.14.14/include/linux/mfd/abx500/ab8500.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/mfd/abx500/ab8500.h 2014-12-08 00:31:55.300418001 -0600
@@ -347,7 +347,6 @@
struct mutex lock;
struct mutex irq_lock;
@@ -224412,9 +224441,9 @@ diff -Nur linux-3.14.22.orig/include/linux/mfd/abx500/ab8500.h linux-3.14.22/inc
void (*init) (struct ab8500 *);
struct ab8500_regulator_platform_data *regulator;
struct ab8500_codec_platform_data *codec;
-diff -Nur linux-3.14.22.orig/include/linux/mfd/dbx500-prcmu.h linux-3.14.22/include/linux/mfd/dbx500-prcmu.h
---- linux-3.14.22.orig/include/linux/mfd/dbx500-prcmu.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/mfd/dbx500-prcmu.h 2014-10-22 14:55:56.722220001 -0500
+diff -Nur linux-3.14.14/include/linux/mfd/dbx500-prcmu.h linux-imx6-3.14/include/linux/mfd/dbx500-prcmu.h
+--- linux-3.14.14/include/linux/mfd/dbx500-prcmu.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/mfd/dbx500-prcmu.h 2014-12-08 00:31:55.304418001 -0600
@@ -183,8 +183,6 @@
bool enable_set_ddr_opp;
bool enable_ape_opp_100_voltage;
@@ -224424,9 +224453,9 @@ diff -Nur linux-3.14.22.orig/include/linux/mfd/dbx500-prcmu.h linux-3.14.22/incl
u32 version_offset;
u32 legacy_offset;
u32 adt_offset;
-diff -Nur linux-3.14.22.orig/include/linux/mfd/mxc-hdmi-core.h linux-3.14.22/include/linux/mfd/mxc-hdmi-core.h
---- linux-3.14.22.orig/include/linux/mfd/mxc-hdmi-core.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/linux/mfd/mxc-hdmi-core.h 2014-10-22 14:55:56.722220001 -0500
+diff -Nur linux-3.14.14/include/linux/mfd/mxc-hdmi-core.h linux-imx6-3.14/include/linux/mfd/mxc-hdmi-core.h
+--- linux-3.14.14/include/linux/mfd/mxc-hdmi-core.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/linux/mfd/mxc-hdmi-core.h 2014-12-08 00:31:55.304418001 -0600
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -224496,9 +224525,9 @@ diff -Nur linux-3.14.22.orig/include/linux/mfd/mxc-hdmi-core.h linux-3.14.22/inc
+void hdmi_cec_stop_device(void);
+
+#endif
-diff -Nur linux-3.14.22.orig/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h linux-3.14.22/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
---- linux-3.14.22.orig/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h 2014-10-22 14:55:56.722220001 -0500
+diff -Nur linux-3.14.14/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h linux-imx6-3.14/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
+--- linux-3.14.14/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h 2014-12-08 00:31:55.308418001 -0600
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 Freescale Semiconductor, Inc.
@@ -224517,9 +224546,9 @@ diff -Nur linux-3.14.22.orig/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h linux-3
#define IMX6Q_GPR1_ADDRS3_MASK (0x3 << 10)
#define IMX6Q_GPR1_ADDRS3_32MB (0x0 << 10)
#define IMX6Q_GPR1_ADDRS3_64MB (0x1 << 10)
-diff -Nur linux-3.14.22.orig/include/linux/mipi_csi2.h linux-3.14.22/include/linux/mipi_csi2.h
---- linux-3.14.22.orig/include/linux/mipi_csi2.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/linux/mipi_csi2.h 2014-10-22 14:55:56.722220001 -0500
+diff -Nur linux-3.14.14/include/linux/mipi_csi2.h linux-imx6-3.14/include/linux/mipi_csi2.h
+--- linux-3.14.14/include/linux/mipi_csi2.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/linux/mipi_csi2.h 2014-12-08 00:31:55.312418001 -0600
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -224614,9 +224643,9 @@ diff -Nur linux-3.14.22.orig/include/linux/mipi_csi2.h linux-3.14.22/include/lin
+int mipi_csi2_reset(struct mipi_csi2_info *info);
+
+#endif
-diff -Nur linux-3.14.22.orig/include/linux/mipi_dsi.h linux-3.14.22/include/linux/mipi_dsi.h
---- linux-3.14.22.orig/include/linux/mipi_dsi.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/linux/mipi_dsi.h 2014-10-22 14:55:56.726220001 -0500
+diff -Nur linux-3.14.14/include/linux/mipi_dsi.h linux-imx6-3.14/include/linux/mipi_dsi.h
+--- linux-3.14.14/include/linux/mipi_dsi.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/linux/mipi_dsi.h 2014-12-08 00:31:55.312418001 -0600
@@ -0,0 +1,171 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -224789,9 +224818,9 @@ diff -Nur linux-3.14.22.orig/include/linux/mipi_dsi.h linux-3.14.22/include/linu
+#define DSI_PHY_CLK_INIT_COMMAND (0x44)
+#define DSI_GEN_PLD_DATA_BUF_SIZE (0x4)
+#endif
-diff -Nur linux-3.14.22.orig/include/linux/mmc/card.h linux-3.14.22/include/linux/mmc/card.h
---- linux-3.14.22.orig/include/linux/mmc/card.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/mmc/card.h 2014-10-22 14:55:56.726220001 -0500
+diff -Nur linux-3.14.14/include/linux/mmc/card.h linux-imx6-3.14/include/linux/mmc/card.h
+--- linux-3.14.14/include/linux/mmc/card.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/mmc/card.h 2014-12-08 00:31:55.316418001 -0600
@@ -86,10 +86,13 @@
unsigned int data_sector_size; /* 512 bytes or 4KB */
unsigned int data_tag_unit_size; /* DATA TAG UNIT size */
@@ -224814,9 +224843,9 @@ diff -Nur linux-3.14.22.orig/include/linux/mmc/card.h linux-3.14.22/include/linu
u8 raw_sec_trim_mult; /* 229 */
u8 raw_sec_erase_mult; /* 230 */
u8 raw_sec_feature_support;/* 231 */
-diff -Nur linux-3.14.22.orig/include/linux/mmc/host.h linux-3.14.22/include/linux/mmc/host.h
---- linux-3.14.22.orig/include/linux/mmc/host.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/mmc/host.h 2014-10-22 14:55:56.726220001 -0500
+diff -Nur linux-3.14.14/include/linux/mmc/host.h linux-imx6-3.14/include/linux/mmc/host.h
+--- linux-3.14.14/include/linux/mmc/host.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/mmc/host.h 2014-12-08 00:31:55.316418001 -0600
@@ -282,6 +282,7 @@
MMC_CAP2_PACKED_WR)
#define MMC_CAP2_NO_PRESCAN_POWERUP (1 << 14) /* Don't power up before scan */
@@ -224846,9 +224875,9 @@ diff -Nur linux-3.14.22.orig/include/linux/mmc/host.h linux-3.14.22/include/linu
#ifdef CONFIG_REGULATOR
int mmc_regulator_get_ocrmask(struct regulator *supply);
int mmc_regulator_set_ocr(struct mmc_host *mmc,
-diff -Nur linux-3.14.22.orig/include/linux/mmc/mmc.h linux-3.14.22/include/linux/mmc/mmc.h
---- linux-3.14.22.orig/include/linux/mmc/mmc.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/mmc/mmc.h 2014-10-22 14:55:56.726220001 -0500
+diff -Nur linux-3.14.14/include/linux/mmc/mmc.h linux-imx6-3.14/include/linux/mmc/mmc.h
+--- linux-3.14.14/include/linux/mmc/mmc.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/mmc/mmc.h 2014-12-08 00:31:55.316418001 -0600
@@ -292,6 +292,7 @@
#define EXT_CSD_RPMB_MULT 168 /* RO */
#define EXT_CSD_BOOT_WP 173 /* R/W */
@@ -224895,9 +224924,9 @@ diff -Nur linux-3.14.22.orig/include/linux/mmc/mmc.h linux-3.14.22/include/linux
#define EXT_CSD_RST_N_EN_MASK 0x3
#define EXT_CSD_RST_N_ENABLED 1 /* RST_n is enabled on card */
-diff -Nur linux-3.14.22.orig/include/linux/mmc/sdhci.h linux-3.14.22/include/linux/mmc/sdhci.h
---- linux-3.14.22.orig/include/linux/mmc/sdhci.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/mmc/sdhci.h 2014-10-22 14:55:56.726220001 -0500
+diff -Nur linux-3.14.14/include/linux/mmc/sdhci.h linux-imx6-3.14/include/linux/mmc/sdhci.h
+--- linux-3.14.14/include/linux/mmc/sdhci.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/mmc/sdhci.h 2014-12-08 00:31:55.316418001 -0600
@@ -57,12 +57,8 @@
#define SDHCI_QUIRK_BROKEN_CARD_DETECTION (1<<15)
/* Controller reports inverted write-protect state */
@@ -224951,9 +224980,9 @@ diff -Nur linux-3.14.22.orig/include/linux/mmc/sdhci.h linux-3.14.22/include/lin
wait_queue_head_t buf_ready_int; /* Waitqueue for Buffer Read Ready interrupt */
unsigned int tuning_done; /* Condition flag set when CMD19 succeeds */
-diff -Nur linux-3.14.22.orig/include/linux/mmc/sdio_ids.h linux-3.14.22/include/linux/mmc/sdio_ids.h
---- linux-3.14.22.orig/include/linux/mmc/sdio_ids.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/mmc/sdio_ids.h 2014-10-22 14:55:56.726220001 -0500
+diff -Nur linux-3.14.14/include/linux/mmc/sdio_ids.h linux-imx6-3.14/include/linux/mmc/sdio_ids.h
+--- linux-3.14.14/include/linux/mmc/sdio_ids.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/mmc/sdio_ids.h 2014-12-08 00:31:55.316418001 -0600
@@ -31,6 +31,7 @@
#define SDIO_DEVICE_ID_BROADCOM_4334 0x4334
#define SDIO_DEVICE_ID_BROADCOM_4335_4339 0x4335
@@ -224962,9 +224991,9 @@ diff -Nur linux-3.14.22.orig/include/linux/mmc/sdio_ids.h linux-3.14.22/include/
#define SDIO_VENDOR_ID_INTEL 0x0089
#define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX 0x1402
-diff -Nur linux-3.14.22.orig/include/linux/mod_devicetable.h linux-3.14.22/include/linux/mod_devicetable.h
---- linux-3.14.22.orig/include/linux/mod_devicetable.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/mod_devicetable.h 2014-10-22 14:55:56.726220001 -0500
+diff -Nur linux-3.14.14/include/linux/mod_devicetable.h linux-imx6-3.14/include/linux/mod_devicetable.h
+--- linux-3.14.14/include/linux/mod_devicetable.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/mod_devicetable.h 2014-12-08 00:31:55.316418001 -0600
@@ -564,6 +564,15 @@
#define X86_MODEL_ANY 0
#define X86_FEATURE_ANY 0 /* Same as FPU, you can't test for that */
@@ -224981,9 +225010,9 @@ diff -Nur linux-3.14.22.orig/include/linux/mod_devicetable.h linux-3.14.22/inclu
#define IPACK_ANY_FORMAT 0xff
#define IPACK_ANY_ID (~0)
struct ipack_device_id {
-diff -Nur linux-3.14.22.orig/include/linux/mtd/map.h linux-3.14.22/include/linux/mtd/map.h
---- linux-3.14.22.orig/include/linux/mtd/map.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/mtd/map.h 2014-10-22 14:55:56.726220001 -0500
+diff -Nur linux-3.14.14/include/linux/mtd/map.h linux-imx6-3.14/include/linux/mtd/map.h
+--- linux-3.14.14/include/linux/mtd/map.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/mtd/map.h 2014-12-08 00:31:55.320418001 -0600
@@ -438,7 +438,7 @@
if (map->cached)
memcpy(to, (char *)map->cached + from, len);
@@ -224993,9 +225022,9 @@ diff -Nur linux-3.14.22.orig/include/linux/mtd/map.h linux-3.14.22/include/linux
}
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.22.orig/include/linux/mxc_asrc.h linux-3.14.22/include/linux/mxc_asrc.h
---- linux-3.14.22.orig/include/linux/mxc_asrc.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/linux/mxc_asrc.h 2014-10-22 14:55:56.726220001 -0500
+diff -Nur linux-3.14.14/include/linux/mxc_asrc.h linux-imx6-3.14/include/linux/mxc_asrc.h
+--- linux-3.14.14/include/linux/mxc_asrc.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/linux/mxc_asrc.h 2014-12-08 00:31:55.320418001 -0600
@@ -0,0 +1,386 @@
+/*
+ * Copyright 2008-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -225383,9 +225412,9 @@ diff -Nur linux-3.14.22.orig/include/linux/mxc_asrc.h linux-3.14.22/include/linu
+ u32 in_wm, u32 out_wm);
+
+#endif/* __MXC_ASRC_H__ */
-diff -Nur linux-3.14.22.orig/include/linux/mxcfb.h linux-3.14.22/include/linux/mxcfb.h
---- linux-3.14.22.orig/include/linux/mxcfb.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/linux/mxcfb.h 2014-10-22 14:55:56.726220001 -0500
+diff -Nur linux-3.14.14/include/linux/mxcfb.h linux-imx6-3.14/include/linux/mxcfb.h
+--- linux-3.14.14/include/linux/mxcfb.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/linux/mxcfb.h 2014-12-08 00:31:55.320418001 -0600
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -225433,9 +225462,9 @@ diff -Nur linux-3.14.22.orig/include/linux/mxcfb.h linux-3.14.22/include/linux/m
+ int num_modes, int dev_mode);
+
+#endif
-diff -Nur linux-3.14.22.orig/include/linux/mxc_mlb.h linux-3.14.22/include/linux/mxc_mlb.h
---- linux-3.14.22.orig/include/linux/mxc_mlb.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/linux/mxc_mlb.h 2014-10-22 14:55:56.726220001 -0500
+diff -Nur linux-3.14.14/include/linux/mxc_mlb.h linux-imx6-3.14/include/linux/mxc_mlb.h
+--- linux-3.14.14/include/linux/mxc_mlb.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/linux/mxc_mlb.h 2014-12-08 00:31:55.320418001 -0600
@@ -0,0 +1,55 @@
+/*
+ * mxc_mlb.h
@@ -225492,9 +225521,9 @@ diff -Nur linux-3.14.22.orig/include/linux/mxc_mlb.h linux-3.14.22/include/linux
+
+
+#endif /* _MXC_MLB_H */
-diff -Nur linux-3.14.22.orig/include/linux/mxc_v4l2.h linux-3.14.22/include/linux/mxc_v4l2.h
---- linux-3.14.22.orig/include/linux/mxc_v4l2.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/linux/mxc_v4l2.h 2014-10-22 14:55:56.726220001 -0500
+diff -Nur linux-3.14.14/include/linux/mxc_v4l2.h linux-imx6-3.14/include/linux/mxc_v4l2.h
+--- linux-3.14.14/include/linux/mxc_v4l2.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/linux/mxc_v4l2.h 2014-12-08 00:31:55.320418001 -0600
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -225523,9 +225552,9 @@ diff -Nur linux-3.14.22.orig/include/linux/mxc_v4l2.h linux-3.14.22/include/linu
+#include <uapi/linux/mxc_v4l2.h>
+
+#endif
-diff -Nur linux-3.14.22.orig/include/linux/mxc_vpu.h linux-3.14.22/include/linux/mxc_vpu.h
---- linux-3.14.22.orig/include/linux/mxc_vpu.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/linux/mxc_vpu.h 2014-10-22 14:55:56.726220001 -0500
+diff -Nur linux-3.14.14/include/linux/mxc_vpu.h linux-imx6-3.14/include/linux/mxc_vpu.h
+--- linux-3.14.14/include/linux/mxc_vpu.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/linux/mxc_vpu.h 2014-12-08 00:31:55.320418001 -0600
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -225645,9 +225674,9 @@ diff -Nur linux-3.14.22.orig/include/linux/mxc_vpu.h linux-3.14.22/include/linux
+void vl2cc_cleanup(void);
+
+#endif
-diff -Nur linux-3.14.22.orig/include/linux/phy.h linux-3.14.22/include/linux/phy.h
---- linux-3.14.22.orig/include/linux/phy.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/phy.h 2014-10-22 14:55:56.726220001 -0500
+diff -Nur linux-3.14.14/include/linux/phy.h linux-imx6-3.14/include/linux/phy.h
+--- linux-3.14.14/include/linux/phy.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/phy.h 2014-12-08 00:31:55.332418001 -0600
@@ -609,6 +609,7 @@
return phydev->drv->read_status(phydev);
}
@@ -225656,9 +225685,9 @@ diff -Nur linux-3.14.22.orig/include/linux/phy.h linux-3.14.22/include/linux/phy
int genphy_setup_forced(struct phy_device *phydev);
int genphy_restart_aneg(struct phy_device *phydev);
int genphy_config_aneg(struct phy_device *phydev);
-diff -Nur linux-3.14.22.orig/include/linux/pipe_fs_i.h linux-3.14.22/include/linux/pipe_fs_i.h
---- linux-3.14.22.orig/include/linux/pipe_fs_i.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/pipe_fs_i.h 2014-10-22 14:55:56.726220001 -0500
+diff -Nur linux-3.14.14/include/linux/pipe_fs_i.h linux-imx6-3.14/include/linux/pipe_fs_i.h
+--- linux-3.14.14/include/linux/pipe_fs_i.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/pipe_fs_i.h 2014-12-08 00:31:55.332418001 -0600
@@ -35,7 +35,7 @@
* @tmp_page: cached released page
* @readers: number of current readers of this pipe
@@ -225668,9 +225697,9 @@ diff -Nur linux-3.14.22.orig/include/linux/pipe_fs_i.h linux-3.14.22/include/lin
* @waiting_writers: number of writers blocked waiting for room
* @r_counter: reader counter
* @w_counter: writer counter
-diff -Nur linux-3.14.22.orig/include/linux/pl320-ipc.h linux-3.14.22/include/linux/pl320-ipc.h
---- linux-3.14.22.orig/include/linux/pl320-ipc.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/linux/pl320-ipc.h 2014-10-22 14:55:56.726220001 -0500
+diff -Nur linux-3.14.14/include/linux/pl320-ipc.h linux-imx6-3.14/include/linux/pl320-ipc.h
+--- linux-3.14.14/include/linux/pl320-ipc.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/linux/pl320-ipc.h 2014-12-08 00:31:55.332418001 -0600
@@ -0,0 +1,17 @@
+/*
+ * This program is free software; you can redistribute it and/or modify it
@@ -225689,9 +225718,9 @@ diff -Nur linux-3.14.22.orig/include/linux/pl320-ipc.h linux-3.14.22/include/lin
+int pl320_ipc_transmit(u32 *data);
+int pl320_ipc_register_notifier(struct notifier_block *nb);
+int pl320_ipc_unregister_notifier(struct notifier_block *nb);
-diff -Nur linux-3.14.22.orig/include/linux/platform_data/dma-imx.h linux-3.14.22/include/linux/platform_data/dma-imx.h
---- linux-3.14.22.orig/include/linux/platform_data/dma-imx.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/platform_data/dma-imx.h 2014-10-22 14:55:56.726220001 -0500
+diff -Nur linux-3.14.14/include/linux/platform_data/dma-imx.h linux-imx6-3.14/include/linux/platform_data/dma-imx.h
+--- linux-3.14.14/include/linux/platform_data/dma-imx.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/platform_data/dma-imx.h 2014-12-08 00:31:55.336418001 -0600
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2009 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -225732,9 +225761,9 @@ diff -Nur linux-3.14.22.orig/include/linux/platform_data/dma-imx.h linux-3.14.22
static inline int imx_dma_is_general_purpose(struct dma_chan *chan)
{
return !strcmp(chan->device->dev->driver->name, "imx-sdma") ||
-diff -Nur linux-3.14.22.orig/include/linux/power/imx6_usb_charger.h linux-3.14.22/include/linux/power/imx6_usb_charger.h
---- linux-3.14.22.orig/include/linux/power/imx6_usb_charger.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/linux/power/imx6_usb_charger.h 2014-10-22 14:55:56.726220001 -0500
+diff -Nur linux-3.14.14/include/linux/power/imx6_usb_charger.h linux-imx6-3.14/include/linux/power/imx6_usb_charger.h
+--- linux-3.14.14/include/linux/power/imx6_usb_charger.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/linux/power/imx6_usb_charger.h 2014-12-08 00:31:55.344418001 -0600
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -225816,9 +225845,9 @@ diff -Nur linux-3.14.22.orig/include/linux/power/imx6_usb_charger.h linux-3.14.2
+#endif
+
+#endif /* __IMXUSB6_CHARGER_H */
-diff -Nur linux-3.14.22.orig/include/linux/ptp_clock_kernel.h linux-3.14.22/include/linux/ptp_clock_kernel.h
---- linux-3.14.22.orig/include/linux/ptp_clock_kernel.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/ptp_clock_kernel.h 2014-10-22 14:55:56.726220001 -0500
+diff -Nur linux-3.14.14/include/linux/ptp_clock_kernel.h linux-imx6-3.14/include/linux/ptp_clock_kernel.h
+--- linux-3.14.14/include/linux/ptp_clock_kernel.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/ptp_clock_kernel.h 2014-12-08 00:31:55.344418001 -0600
@@ -49,7 +49,11 @@
* @n_alarm: The number of programmable alarms.
* @n_ext_ts: The number of external time stamp channels.
@@ -225886,9 +225915,9 @@ diff -Nur linux-3.14.22.orig/include/linux/ptp_clock_kernel.h linux-3.14.22/incl
+ enum ptp_pin_function func, unsigned int chan);
+
#endif
-diff -Nur linux-3.14.22.orig/include/linux/pxp_device.h linux-3.14.22/include/linux/pxp_device.h
---- linux-3.14.22.orig/include/linux/pxp_device.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/linux/pxp_device.h 2014-10-22 14:55:56.726220001 -0500
+diff -Nur linux-3.14.14/include/linux/pxp_device.h linux-imx6-3.14/include/linux/pxp_device.h
+--- linux-3.14.14/include/linux/pxp_device.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/linux/pxp_device.h 2014-12-08 00:31:55.344418001 -0600
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2013-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -225958,9 +225987,9 @@ diff -Nur linux-3.14.22.orig/include/linux/pxp_device.h linux-3.14.22/include/li
+};
+
+#endif
-diff -Nur linux-3.14.22.orig/include/linux/pxp_dma.h linux-3.14.22/include/linux/pxp_dma.h
---- linux-3.14.22.orig/include/linux/pxp_dma.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/linux/pxp_dma.h 2014-10-22 14:55:56.726220001 -0500
+diff -Nur linux-3.14.14/include/linux/pxp_dma.h linux-imx6-3.14/include/linux/pxp_dma.h
+--- linux-3.14.14/include/linux/pxp_dma.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/linux/pxp_dma.h 2014-12-08 00:31:55.344418001 -0600
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -226034,9 +226063,9 @@ diff -Nur linux-3.14.22.orig/include/linux/pxp_dma.h linux-3.14.22/include/linux
+#endif
+
+#endif
-diff -Nur linux-3.14.22.orig/include/linux/regulator/consumer.h linux-3.14.22/include/linux/regulator/consumer.h
---- linux-3.14.22.orig/include/linux/regulator/consumer.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/regulator/consumer.h 2014-10-22 14:55:56.726220001 -0500
+diff -Nur linux-3.14.14/include/linux/regulator/consumer.h linux-imx6-3.14/include/linux/regulator/consumer.h
+--- linux-3.14.14/include/linux/regulator/consumer.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/regulator/consumer.h 2014-12-08 00:31:55.348418001 -0600
@@ -2,6 +2,7 @@
* consumer.h -- SoC Regulator consumer support.
*
@@ -226054,9 +226083,9 @@ diff -Nur linux-3.14.22.orig/include/linux/regulator/consumer.h linux-3.14.22/in
struct regulator;
-diff -Nur linux-3.14.22.orig/include/linux/reset.h linux-3.14.22/include/linux/reset.h
---- linux-3.14.22.orig/include/linux/reset.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/reset.h 2014-10-22 14:55:56.726220001 -0500
+diff -Nur linux-3.14.14/include/linux/reset.h linux-imx6-3.14/include/linux/reset.h
+--- linux-3.14.14/include/linux/reset.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/reset.h 2014-12-08 00:31:55.348418001 -0600
@@ -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);
@@ -226071,9 +226100,9 @@ diff -Nur linux-3.14.22.orig/include/linux/reset.h linux-3.14.22/include/linux/r
+#endif /* CONFIG_RESET_CONTROLLER */
#endif
-diff -Nur linux-3.14.22.orig/include/linux/serial_core.h linux-3.14.22/include/linux/serial_core.h
---- linux-3.14.22.orig/include/linux/serial_core.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/serial_core.h 2014-10-22 14:55:56.726220001 -0500
+diff -Nur linux-3.14.14/include/linux/serial_core.h linux-imx6-3.14/include/linux/serial_core.h
+--- linux-3.14.14/include/linux/serial_core.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/serial_core.h 2014-12-08 00:31:55.356418001 -0600
@@ -285,6 +285,22 @@
/*
* Console helpers.
@@ -226097,9 +226126,9 @@ diff -Nur linux-3.14.22.orig/include/linux/serial_core.h linux-3.14.22/include/l
struct uart_port *uart_get_console(struct uart_port *ports, int nr,
struct console *c);
void uart_parse_options(char *options, int *baud, int *parity, int *bits,
-diff -Nur linux-3.14.22.orig/include/linux/skbuff.h linux-3.14.22/include/linux/skbuff.h
---- linux-3.14.22.orig/include/linux/skbuff.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/skbuff.h 2014-10-22 14:55:56.730220001 -0500
+diff -Nur linux-3.14.14/include/linux/skbuff.h linux-imx6-3.14/include/linux/skbuff.h
+--- linux-3.14.14/include/linux/skbuff.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/skbuff.h 2014-12-08 00:31:55.356418001 -0600
@@ -2038,7 +2038,7 @@
}
@@ -226109,9 +226138,9 @@ diff -Nur linux-3.14.22.orig/include/linux/skbuff.h linux-3.14.22/include/linux/
* @frag: the paged fragment
*
* Returns the &struct page associated with @frag.
-diff -Nur linux-3.14.22.orig/include/linux/spi/spi.h linux-3.14.22/include/linux/spi/spi.h
---- linux-3.14.22.orig/include/linux/spi/spi.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/spi/spi.h 2014-10-22 14:55:56.730220001 -0500
+diff -Nur linux-3.14.14/include/linux/spi/spi.h linux-imx6-3.14/include/linux/spi/spi.h
+--- linux-3.14.14/include/linux/spi/spi.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/spi/spi.h 2014-12-08 00:31:55.360418001 -0600
@@ -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
@@ -226148,9 +226177,9 @@ diff -Nur linux-3.14.22.orig/include/linux/spi/spi.h linux-3.14.22/include/linux
* from device through @tx_nbits and @rx_nbits. In Bi-direction, these
* two should both be set. User can set transfer mode with SPI_NBITS_SINGLE(1x)
* SPI_NBITS_DUAL(2x) and SPI_NBITS_QUAD(4x) to support these three transfer.
-diff -Nur linux-3.14.22.orig/include/linux/syscalls.h linux-3.14.22/include/linux/syscalls.h
---- linux-3.14.22.orig/include/linux/syscalls.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/syscalls.h 2014-10-22 14:55:56.762220001 -0500
+diff -Nur linux-3.14.14/include/linux/syscalls.h linux-imx6-3.14/include/linux/syscalls.h
+--- linux-3.14.14/include/linux/syscalls.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/syscalls.h 2014-12-08 00:31:55.364418001 -0600
@@ -744,6 +744,9 @@
int newdfd, const char __user *newname, int flags);
asmlinkage long sys_renameat(int olddfd, const char __user * oldname,
@@ -226161,9 +226190,9 @@ diff -Nur linux-3.14.22.orig/include/linux/syscalls.h linux-3.14.22/include/linu
asmlinkage long sys_futimesat(int dfd, const char __user *filename,
struct timeval __user *utimes);
asmlinkage long sys_faccessat(int dfd, const char __user *filename, int mode);
-diff -Nur linux-3.14.22.orig/include/linux/usb/chipidea.h linux-3.14.22/include/linux/usb/chipidea.h
---- linux-3.14.22.orig/include/linux/usb/chipidea.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/usb/chipidea.h 2014-10-22 14:55:56.762220001 -0500
+diff -Nur linux-3.14.14/include/linux/usb/chipidea.h linux-imx6-3.14/include/linux/usb/chipidea.h
+--- linux-3.14.14/include/linux/usb/chipidea.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/usb/chipidea.h 2014-12-08 00:31:55.372418001 -0600
@@ -18,6 +18,7 @@
unsigned long flags;
#define CI_HDRC_REGS_SHARED BIT(0)
@@ -226187,9 +226216,9 @@ diff -Nur linux-3.14.22.orig/include/linux/usb/chipidea.h linux-3.14.22/include/
+/* Get current available role */
+enum usb_dr_mode ci_hdrc_query_available_role(struct platform_device *pdev);
#endif
-diff -Nur linux-3.14.22.orig/include/linux/usb/composite.h linux-3.14.22/include/linux/usb/composite.h
---- linux-3.14.22.orig/include/linux/usb/composite.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/usb/composite.h 2014-10-22 14:55:56.762220001 -0500
+diff -Nur linux-3.14.14/include/linux/usb/composite.h linux-imx6-3.14/include/linux/usb/composite.h
+--- linux-3.14.14/include/linux/usb/composite.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/usb/composite.h 2014-12-08 00:31:55.372418001 -0600
@@ -92,7 +92,7 @@
* @suspend: Notifies functions when the host stops sending USB traffic.
* @resume: Notifies functions when the host restarts USB traffic.
@@ -226199,9 +226228,9 @@ diff -Nur linux-3.14.22.orig/include/linux/usb/composite.h linux-3.14.22/include
* @func_suspend: callback to be called when
* SetFeature(FUNCTION_SUSPEND) is reseived
*
-diff -Nur linux-3.14.22.orig/include/linux/usb/phy.h linux-3.14.22/include/linux/usb/phy.h
---- linux-3.14.22.orig/include/linux/usb/phy.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/linux/usb/phy.h 2014-10-22 14:55:56.762220001 -0500
+diff -Nur linux-3.14.14/include/linux/usb/phy.h linux-imx6-3.14/include/linux/usb/phy.h
+--- linux-3.14.14/include/linux/usb/phy.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/linux/usb/phy.h 2014-12-08 00:31:55.372418001 -0600
@@ -111,11 +111,23 @@
int (*set_suspend)(struct usb_phy *x,
int suspend);
@@ -226267,9 +226296,9 @@ diff -Nur linux-3.14.22.orig/include/linux/usb/phy.h linux-3.14.22/include/linux
/* notifiers */
static inline int
-diff -Nur linux-3.14.22.orig/include/net/cfg80211.h linux-3.14.22/include/net/cfg80211.h
---- linux-3.14.22.orig/include/net/cfg80211.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/net/cfg80211.h 2014-10-22 14:55:56.766220001 -0500
+diff -Nur linux-3.14.14/include/net/cfg80211.h linux-imx6-3.14/include/net/cfg80211.h
+--- linux-3.14.14/include/net/cfg80211.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/net/cfg80211.h 2014-12-08 00:31:55.392418001 -0600
@@ -1729,7 +1729,7 @@
u8 *ssid;
size_t ssid_len;
@@ -226297,9 +226326,9 @@ diff -Nur linux-3.14.22.orig/include/net/cfg80211.h linux-3.14.22/include/net/cf
/**
* cfg80211_notify_new_candidate - notify cfg80211 of a new mesh peer candidate
-diff -Nur linux-3.14.22.orig/include/net/mac80211.h linux-3.14.22/include/net/mac80211.h
---- linux-3.14.22.orig/include/net/mac80211.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/net/mac80211.h 2014-10-22 14:55:56.794220001 -0500
+diff -Nur linux-3.14.14/include/net/mac80211.h linux-imx6-3.14/include/net/mac80211.h
+--- linux-3.14.14/include/net/mac80211.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/net/mac80211.h 2014-12-08 00:31:55.400418001 -0600
@@ -1895,7 +1895,7 @@
*
* Driver informs U-APSD client support by enabling
@@ -226345,9 +226374,9 @@ diff -Nur linux-3.14.22.orig/include/net/mac80211.h linux-3.14.22/include/net/ma
void (*channel_switch)(struct ieee80211_hw *hw,
struct ieee80211_channel_switch *ch_switch);
int (*napi_poll)(struct ieee80211_hw *hw, int budget);
-diff -Nur linux-3.14.22.orig/include/net/rtnetlink.h linux-3.14.22/include/net/rtnetlink.h
---- linux-3.14.22.orig/include/net/rtnetlink.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/net/rtnetlink.h 2014-10-22 14:55:56.794220001 -0500
+diff -Nur linux-3.14.14/include/net/rtnetlink.h linux-imx6-3.14/include/net/rtnetlink.h
+--- linux-3.14.14/include/net/rtnetlink.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/net/rtnetlink.h 2014-12-08 00:31:55.404418001 -0600
@@ -140,7 +140,7 @@
struct nlattr *tb[]);
int rtnl_configure_link(struct net_device *dev, const struct ifinfomsg *ifm);
@@ -226357,9 +226386,9 @@ diff -Nur linux-3.14.22.orig/include/net/rtnetlink.h linux-3.14.22/include/net/r
#define MODULE_ALIAS_RTNL_LINK(kind) MODULE_ALIAS("rtnl-link-" kind)
-diff -Nur linux-3.14.22.orig/include/net/tso.h linux-3.14.22/include/net/tso.h
---- linux-3.14.22.orig/include/net/tso.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/net/tso.h 2014-10-22 14:55:56.794220001 -0500
+diff -Nur linux-3.14.14/include/net/tso.h linux-imx6-3.14/include/net/tso.h
+--- linux-3.14.14/include/net/tso.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/net/tso.h 2014-12-08 00:31:55.408418001 -0600
@@ -0,0 +1,20 @@
+#ifndef _TSO_H
+#define _TSO_H
@@ -226381,9 +226410,9 @@ diff -Nur linux-3.14.22.orig/include/net/tso.h linux-3.14.22/include/net/tso.h
+void tso_start(struct sk_buff *skb, struct tso_t *tso);
+
+#endif /* _TSO_H */
-diff -Nur linux-3.14.22.orig/include/sound/wm8962.h linux-3.14.22/include/sound/wm8962.h
---- linux-3.14.22.orig/include/sound/wm8962.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/sound/wm8962.h 2014-10-22 14:55:56.794220001 -0500
+diff -Nur linux-3.14.14/include/sound/wm8962.h linux-imx6-3.14/include/sound/wm8962.h
+--- linux-3.14.14/include/sound/wm8962.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/sound/wm8962.h 2014-12-08 00:31:55.424418001 -0600
@@ -55,6 +55,9 @@
* in a DC measurement configuration.
*/
@@ -226394,9 +226423,9 @@ diff -Nur linux-3.14.22.orig/include/sound/wm8962.h linux-3.14.22/include/sound/
};
#endif
-diff -Nur linux-3.14.22.orig/include/trace/events/cpufreq_interactive.h linux-3.14.22/include/trace/events/cpufreq_interactive.h
---- linux-3.14.22.orig/include/trace/events/cpufreq_interactive.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/trace/events/cpufreq_interactive.h 2014-10-22 14:55:56.802220001 -0500
+diff -Nur linux-3.14.14/include/trace/events/cpufreq_interactive.h linux-imx6-3.14/include/trace/events/cpufreq_interactive.h
+--- linux-3.14.14/include/trace/events/cpufreq_interactive.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/trace/events/cpufreq_interactive.h 2014-12-08 00:31:55.428418001 -0600
@@ -0,0 +1,112 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM cpufreq_interactive
@@ -226510,9 +226539,9 @@ diff -Nur linux-3.14.22.orig/include/trace/events/cpufreq_interactive.h linux-3.
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
-diff -Nur linux-3.14.22.orig/include/uapi/linux/ipu.h linux-3.14.22/include/uapi/linux/ipu.h
---- linux-3.14.22.orig/include/uapi/linux/ipu.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/uapi/linux/ipu.h 2014-10-22 14:55:56.806220001 -0500
+diff -Nur linux-3.14.14/include/uapi/linux/ipu.h linux-imx6-3.14/include/uapi/linux/ipu.h
+--- linux-3.14.14/include/uapi/linux/ipu.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/uapi/linux/ipu.h 2014-12-08 00:31:55.448418001 -0600
@@ -0,0 +1,282 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved
@@ -226796,9 +226825,9 @@ diff -Nur linux-3.14.22.orig/include/uapi/linux/ipu.h linux-3.14.22/include/uapi
+#define IPU_FREE _IOW('I', 0x4, int)
+
+#endif
-diff -Nur linux-3.14.22.orig/include/uapi/linux/isl29023.h linux-3.14.22/include/uapi/linux/isl29023.h
---- linux-3.14.22.orig/include/uapi/linux/isl29023.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/uapi/linux/isl29023.h 2014-10-22 14:55:56.806220001 -0500
+diff -Nur linux-3.14.14/include/uapi/linux/isl29023.h linux-imx6-3.14/include/uapi/linux/isl29023.h
+--- linux-3.14.14/include/uapi/linux/isl29023.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/uapi/linux/isl29023.h 2014-12-08 00:31:55.448418001 -0600
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -226847,9 +226876,9 @@ diff -Nur linux-3.14.22.orig/include/uapi/linux/isl29023.h linux-3.14.22/include
+#define ISL29023_RANGE_64K 0x3
+
+#endif
-diff -Nur linux-3.14.22.orig/include/uapi/linux/Kbuild linux-3.14.22/include/uapi/linux/Kbuild
---- linux-3.14.22.orig/include/uapi/linux/Kbuild 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/uapi/linux/Kbuild 2014-10-22 14:55:56.806220001 -0500
+diff -Nur linux-3.14.14/include/uapi/linux/Kbuild linux-imx6-3.14/include/uapi/linux/Kbuild
+--- linux-3.14.14/include/uapi/linux/Kbuild 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/uapi/linux/Kbuild 2014-12-08 00:31:55.432418001 -0600
@@ -226,6 +226,7 @@
header-y += kvm_para.h
endif
@@ -226877,9 +226906,9 @@ diff -Nur linux-3.14.22.orig/include/uapi/linux/Kbuild linux-3.14.22/include/uap
header-y += qnx4_fs.h
header-y += qnxtypes.h
header-y += quota.h
-diff -Nur linux-3.14.22.orig/include/uapi/linux/mxc_asrc.h linux-3.14.22/include/uapi/linux/mxc_asrc.h
---- linux-3.14.22.orig/include/uapi/linux/mxc_asrc.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/uapi/linux/mxc_asrc.h 2014-10-22 14:55:56.806220001 -0500
+diff -Nur linux-3.14.14/include/uapi/linux/mxc_asrc.h linux-imx6-3.14/include/uapi/linux/mxc_asrc.h
+--- linux-3.14.14/include/uapi/linux/mxc_asrc.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/uapi/linux/mxc_asrc.h 2014-12-08 00:31:55.452418001 -0600
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2008-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -227024,9 +227053,9 @@ diff -Nur linux-3.14.22.orig/include/uapi/linux/mxc_asrc.h linux-3.14.22/include
+ ASRC_INPUT_BUFFER_UNDERRUN = 0x10,
+};
+#endif/* __MXC_ASRC_UAPI_H__ */
-diff -Nur linux-3.14.22.orig/include/uapi/linux/mxcfb.h linux-3.14.22/include/uapi/linux/mxcfb.h
---- linux-3.14.22.orig/include/uapi/linux/mxcfb.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/uapi/linux/mxcfb.h 2014-10-22 14:55:56.806220001 -0500
+diff -Nur linux-3.14.14/include/uapi/linux/mxcfb.h linux-imx6-3.14/include/uapi/linux/mxcfb.h
+--- linux-3.14.14/include/uapi/linux/mxcfb.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/uapi/linux/mxcfb.h 2014-12-08 00:31:55.452418001 -0600
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved
@@ -227202,9 +227231,9 @@ diff -Nur linux-3.14.22.orig/include/uapi/linux/mxcfb.h linux-3.14.22/include/ua
+#define MXCFB_SET_UPDATE_SCHEME _IOW('F', 0x32, __u32)
+#define MXCFB_GET_WORK_BUFFER _IOWR('F', 0x34, unsigned long)
+#endif
-diff -Nur linux-3.14.22.orig/include/uapi/linux/mxc_mlb.h linux-3.14.22/include/uapi/linux/mxc_mlb.h
---- linux-3.14.22.orig/include/uapi/linux/mxc_mlb.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/uapi/linux/mxc_mlb.h 2014-10-22 14:55:56.806220001 -0500
+diff -Nur linux-3.14.14/include/uapi/linux/mxc_mlb.h linux-imx6-3.14/include/uapi/linux/mxc_mlb.h
+--- linux-3.14.14/include/uapi/linux/mxc_mlb.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/uapi/linux/mxc_mlb.h 2014-12-08 00:31:55.452418001 -0600
@@ -0,0 +1,55 @@
+/*
+ * mxc_mlb.h
@@ -227261,9 +227290,9 @@ diff -Nur linux-3.14.22.orig/include/uapi/linux/mxc_mlb.h linux-3.14.22/include/
+
+
+#endif /* _MXC_MLB_H */
-diff -Nur linux-3.14.22.orig/include/uapi/linux/mxc_v4l2.h linux-3.14.22/include/uapi/linux/mxc_v4l2.h
---- linux-3.14.22.orig/include/uapi/linux/mxc_v4l2.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/uapi/linux/mxc_v4l2.h 2014-10-22 14:55:56.806220001 -0500
+diff -Nur linux-3.14.14/include/uapi/linux/mxc_v4l2.h linux-imx6-3.14/include/uapi/linux/mxc_v4l2.h
+--- linux-3.14.14/include/uapi/linux/mxc_v4l2.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/uapi/linux/mxc_v4l2.h 2014-12-08 00:31:55.452418001 -0600
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved
@@ -227321,9 +227350,9 @@ diff -Nur linux-3.14.22.orig/include/uapi/linux/mxc_v4l2.h linux-3.14.22/include
+};
+
+#endif
-diff -Nur linux-3.14.22.orig/include/uapi/linux/ptp_clock.h linux-3.14.22/include/uapi/linux/ptp_clock.h
---- linux-3.14.22.orig/include/uapi/linux/ptp_clock.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/include/uapi/linux/ptp_clock.h 2014-10-22 14:55:56.810220001 -0500
+diff -Nur linux-3.14.14/include/uapi/linux/ptp_clock.h linux-imx6-3.14/include/uapi/linux/ptp_clock.h
+--- linux-3.14.14/include/uapi/linux/ptp_clock.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/include/uapi/linux/ptp_clock.h 2014-12-08 00:31:55.460418001 -0600
@@ -50,7 +50,8 @@
int n_ext_ts; /* Number of external time stamp channels. */
int n_per_out; /* Number of programmable periodic signals. */
@@ -227384,9 +227413,9 @@ diff -Nur linux-3.14.22.orig/include/uapi/linux/ptp_clock.h linux-3.14.22/includ
struct ptp_extts_event {
struct ptp_clock_time t; /* Time event occured. */
-diff -Nur linux-3.14.22.orig/include/uapi/linux/pxp_device.h linux-3.14.22/include/uapi/linux/pxp_device.h
---- linux-3.14.22.orig/include/uapi/linux/pxp_device.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/uapi/linux/pxp_device.h 2014-10-22 14:55:56.810220001 -0500
+diff -Nur linux-3.14.14/include/uapi/linux/pxp_device.h linux-imx6-3.14/include/uapi/linux/pxp_device.h
+--- linux-3.14.14/include/uapi/linux/pxp_device.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/uapi/linux/pxp_device.h 2014-12-08 00:31:55.460418001 -0600
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2013-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -227451,9 +227480,9 @@ diff -Nur linux-3.14.22.orig/include/uapi/linux/pxp_device.h linux-3.14.22/inclu
+#define CACHE_FLUSH 0x4
+
+#endif
-diff -Nur linux-3.14.22.orig/include/uapi/linux/pxp_dma.h linux-3.14.22/include/uapi/linux/pxp_dma.h
---- linux-3.14.22.orig/include/uapi/linux/pxp_dma.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/uapi/linux/pxp_dma.h 2014-10-22 14:55:56.810220001 -0500
+diff -Nur linux-3.14.14/include/uapi/linux/pxp_dma.h linux-imx6-3.14/include/uapi/linux/pxp_dma.h
+--- linux-3.14.14/include/uapi/linux/pxp_dma.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/uapi/linux/pxp_dma.h 2014-12-08 00:31:55.460418001 -0600
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2013-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -227628,9 +227657,9 @@ diff -Nur linux-3.14.22.orig/include/uapi/linux/pxp_dma.h linux-3.14.22/include/
+
+
+#endif
-diff -Nur linux-3.14.22.orig/include/video/mxc_edid.h linux-3.14.22/include/video/mxc_edid.h
---- linux-3.14.22.orig/include/video/mxc_edid.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/video/mxc_edid.h 2014-10-22 14:55:56.810220001 -0500
+diff -Nur linux-3.14.14/include/video/mxc_edid.h linux-imx6-3.14/include/video/mxc_edid.h
+--- linux-3.14.14/include/video/mxc_edid.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/video/mxc_edid.h 2014-12-08 00:31:55.476418001 -0600
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -227737,9 +227766,9 @@ diff -Nur linux-3.14.22.orig/include/video/mxc_edid.h linux-3.14.22/include/vide
+int mxc_edid_parse_ext_blk(unsigned char *edid, struct mxc_edid_cfg *cfg,
+ struct fb_monspecs *specs);
+#endif
-diff -Nur linux-3.14.22.orig/include/video/mxc_hdmi.h linux-3.14.22/include/video/mxc_hdmi.h
---- linux-3.14.22.orig/include/video/mxc_hdmi.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/include/video/mxc_hdmi.h 2014-10-22 14:55:56.814220001 -0500
+diff -Nur linux-3.14.14/include/video/mxc_hdmi.h linux-imx6-3.14/include/video/mxc_hdmi.h
+--- linux-3.14.14/include/video/mxc_hdmi.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/include/video/mxc_hdmi.h 2014-12-08 00:31:55.476418001 -0600
@@ -0,0 +1,1027 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc.
@@ -228768,9 +228797,9 @@ diff -Nur linux-3.14.22.orig/include/video/mxc_hdmi.h linux-3.14.22/include/vide
+
+
+#endif /* __MXC_HDMI_H__ */
-diff -Nur linux-3.14.22.orig/kernel/cpu.c linux-3.14.22/kernel/cpu.c
---- linux-3.14.22.orig/kernel/cpu.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/kernel/cpu.c 2014-10-22 14:55:56.814220001 -0500
+diff -Nur linux-3.14.14/kernel/cpu.c linux-imx6-3.14/kernel/cpu.c
+--- linux-3.14.14/kernel/cpu.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/kernel/cpu.c 2014-12-08 00:31:55.492418001 -0600
@@ -722,3 +722,22 @@
{
cpumask_copy(to_cpumask(cpu_online_bits), src);
@@ -228794,9 +228823,9 @@ diff -Nur linux-3.14.22.orig/kernel/cpu.c linux-3.14.22/kernel/cpu.c
+ atomic_notifier_call_chain(&idle_notifier, val, NULL);
+}
+EXPORT_SYMBOL_GPL(idle_notifier_call_chain);
-diff -Nur linux-3.14.22.orig/kernel/irq/manage.c linux-3.14.22/kernel/irq/manage.c
---- linux-3.14.22.orig/kernel/irq/manage.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/kernel/irq/manage.c 2014-10-22 14:55:56.814220001 -0500
+diff -Nur linux-3.14.14/kernel/irq/manage.c linux-imx6-3.14/kernel/irq/manage.c
+--- linux-3.14.14/kernel/irq/manage.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/kernel/irq/manage.c 2014-12-08 00:31:55.500418001 -0600
@@ -32,24 +32,10 @@
early_param("threadirqs", setup_forced_irqthreads);
#endif
@@ -228885,9 +228914,9 @@ diff -Nur linux-3.14.22.orig/kernel/irq/manage.c linux-3.14.22/kernel/irq/manage
}
EXPORT_SYMBOL(synchronize_irq);
-diff -Nur linux-3.14.22.orig/kernel/relay.c linux-3.14.22/kernel/relay.c
---- linux-3.14.22.orig/kernel/relay.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/kernel/relay.c 2014-10-22 14:55:56.830220001 -0500
+diff -Nur linux-3.14.14/kernel/relay.c linux-imx6-3.14/kernel/relay.c
+--- linux-3.14.14/kernel/relay.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/kernel/relay.c 2014-12-08 00:31:55.516418001 -0600
@@ -227,7 +227,7 @@
* relay_remove_buf - remove a channel buffer
* @kref: target kernel reference that contains the relay buffer
@@ -228897,9 +228926,9 @@ diff -Nur linux-3.14.22.orig/kernel/relay.c linux-3.14.22/kernel/relay.c
* rchan_buf_struct and the channel buffer. Should only be called from
* kref_put().
*/
-diff -Nur linux-3.14.22.orig/kernel/signal.c linux-3.14.22/kernel/signal.c
---- linux-3.14.22.orig/kernel/signal.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/kernel/signal.c 2014-10-22 14:55:56.830220001 -0500
+diff -Nur linux-3.14.14/kernel/signal.c linux-imx6-3.14/kernel/signal.c
+--- linux-3.14.14/kernel/signal.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/kernel/signal.c 2014-12-08 00:31:55.524418001 -0600
@@ -2382,7 +2382,7 @@
* @regs: user register state
* @stepping: nonzero if debugger single-step or block-step in use
@@ -228909,9 +228938,9 @@ diff -Nur linux-3.14.22.orig/kernel/signal.c linux-3.14.22/kernel/signal.c
* delivered. It updates the blocked signals accordingly (@ka->sa.sa_mask
* is always blocked, and the signal itself is blocked unless %SA_NODEFER
* is set in @ka->sa.sa_flags. Tracing is notified.
-diff -Nur linux-3.14.22.orig/linaro/configs/android.conf linux-3.14.22/linaro/configs/android.conf
---- linux-3.14.22.orig/linaro/configs/android.conf 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/linaro/configs/android.conf 2014-10-22 14:55:56.834220001 -0500
+diff -Nur linux-3.14.14/linaro/configs/android.conf linux-imx6-3.14/linaro/configs/android.conf
+--- linux-3.14.14/linaro/configs/android.conf 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/linaro/configs/android.conf 2014-12-08 00:31:55.560418001 -0600
@@ -0,0 +1,42 @@
+CONFIG_IPV6=y
+# CONFIG_IPV6_SIT is not set
@@ -228955,9 +228984,9 @@ diff -Nur linux-3.14.22.orig/linaro/configs/android.conf linux-3.14.22/linaro/co
+CONFIG_ADF_MEMBLOCK=y
+CONFIG_DMA_SHARED_BUFFER=y
+CONFIG_TUN=y
-diff -Nur linux-3.14.22.orig/linaro/configs/arndale.conf linux-3.14.22/linaro/configs/arndale.conf
---- linux-3.14.22.orig/linaro/configs/arndale.conf 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/linaro/configs/arndale.conf 2014-10-22 14:55:56.834220001 -0500
+diff -Nur linux-3.14.14/linaro/configs/arndale.conf linux-imx6-3.14/linaro/configs/arndale.conf
+--- linux-3.14.14/linaro/configs/arndale.conf 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/linaro/configs/arndale.conf 2014-12-08 00:31:55.560418001 -0600
@@ -0,0 +1,66 @@
+CONFIG_KALLSYMS_ALL=y
+CONFIG_PARTITION_ADVANCED=y
@@ -229025,31 +229054,31 @@ diff -Nur linux-3.14.22.orig/linaro/configs/arndale.conf linux-3.14.22/linaro/co
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+CONFIG_DEBUG_USER=y
+CONFIG_TUN=y
-diff -Nur linux-3.14.22.orig/linaro/configs/bigendian.conf linux-3.14.22/linaro/configs/bigendian.conf
---- linux-3.14.22.orig/linaro/configs/bigendian.conf 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/linaro/configs/bigendian.conf 2014-10-22 14:55:56.834220001 -0500
+diff -Nur linux-3.14.14/linaro/configs/bigendian.conf linux-imx6-3.14/linaro/configs/bigendian.conf
+--- linux-3.14.14/linaro/configs/bigendian.conf 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/linaro/configs/bigendian.conf 2014-12-08 00:31:55.560418001 -0600
@@ -0,0 +1,4 @@
+CONFIG_CPU_BIG_ENDIAN=y
+CONFIG_CPU_ENDIAN_BE8=y
+# CONFIG_VIRTUALIZATION is not set
+# CONFIG_MMC_DW_IDMAC is not set
-diff -Nur linux-3.14.22.orig/linaro/configs/big-LITTLE-IKS.conf linux-3.14.22/linaro/configs/big-LITTLE-IKS.conf
---- linux-3.14.22.orig/linaro/configs/big-LITTLE-IKS.conf 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/linaro/configs/big-LITTLE-IKS.conf 2014-10-22 14:55:56.834220001 -0500
+diff -Nur linux-3.14.14/linaro/configs/big-LITTLE-IKS.conf linux-imx6-3.14/linaro/configs/big-LITTLE-IKS.conf
+--- linux-3.14.14/linaro/configs/big-LITTLE-IKS.conf 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/linaro/configs/big-LITTLE-IKS.conf 2014-12-08 00:31:55.560418001 -0600
@@ -0,0 +1,5 @@
+CONFIG_BIG_LITTLE=y
+CONFIG_BL_SWITCHER=y
+CONFIG_ARM_DT_BL_CPUFREQ=y
+CONFIG_ARM_VEXPRESS_BL_CPUFREQ=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
-diff -Nur linux-3.14.22.orig/linaro/configs/debug.conf linux-3.14.22/linaro/configs/debug.conf
---- linux-3.14.22.orig/linaro/configs/debug.conf 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/linaro/configs/debug.conf 2014-10-22 14:55:56.834220001 -0500
+diff -Nur linux-3.14.14/linaro/configs/debug.conf linux-imx6-3.14/linaro/configs/debug.conf
+--- linux-3.14.14/linaro/configs/debug.conf 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/linaro/configs/debug.conf 2014-12-08 00:31:55.560418001 -0600
@@ -0,0 +1 @@
+CONFIG_PROVE_LOCKING=y
-diff -Nur linux-3.14.22.orig/linaro/configs/distribution.conf linux-3.14.22/linaro/configs/distribution.conf
---- linux-3.14.22.orig/linaro/configs/distribution.conf 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/linaro/configs/distribution.conf 2014-10-22 14:55:56.834220001 -0500
+diff -Nur linux-3.14.14/linaro/configs/distribution.conf linux-imx6-3.14/linaro/configs/distribution.conf
+--- linux-3.14.14/linaro/configs/distribution.conf 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/linaro/configs/distribution.conf 2014-12-08 00:31:55.560418001 -0600
@@ -0,0 +1,49 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_CGROUPS=y
@@ -229100,9 +229129,9 @@ diff -Nur linux-3.14.22.orig/linaro/configs/distribution.conf linux-3.14.22/lina
+CONFIG_HUGETLB_PAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
-diff -Nur linux-3.14.22.orig/linaro/configs/highbank.conf linux-3.14.22/linaro/configs/highbank.conf
---- linux-3.14.22.orig/linaro/configs/highbank.conf 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/linaro/configs/highbank.conf 2014-10-22 14:55:56.834220001 -0500
+diff -Nur linux-3.14.14/linaro/configs/highbank.conf linux-imx6-3.14/linaro/configs/highbank.conf
+--- linux-3.14.14/linaro/configs/highbank.conf 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/linaro/configs/highbank.conf 2014-12-08 00:31:55.560418001 -0600
@@ -0,0 +1,40 @@
+CONFIG_EXPERIMENTAL=y
+CONFIG_NO_HZ=y
@@ -229144,9 +229173,9 @@ diff -Nur linux-3.14.22.orig/linaro/configs/highbank.conf linux-3.14.22/linaro/c
+CONFIG_RTC_DRV_PL031=y
+CONFIG_DMADEVICES=y
+CONFIG_PL330_DMA=y
-diff -Nur linux-3.14.22.orig/linaro/configs/kvm-guest.conf linux-3.14.22/linaro/configs/kvm-guest.conf
---- linux-3.14.22.orig/linaro/configs/kvm-guest.conf 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/linaro/configs/kvm-guest.conf 2014-10-22 14:55:56.834220001 -0500
+diff -Nur linux-3.14.14/linaro/configs/kvm-guest.conf linux-imx6-3.14/linaro/configs/kvm-guest.conf
+--- linux-3.14.14/linaro/configs/kvm-guest.conf 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/linaro/configs/kvm-guest.conf 2014-12-08 00:31:55.560418001 -0600
@@ -0,0 +1,11 @@
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_VIRTIO_BLK=y
@@ -229159,9 +229188,9 @@ diff -Nur linux-3.14.22.orig/linaro/configs/kvm-guest.conf linux-3.14.22/linaro/
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+CONFIG_VIRTUALIZATION=y
+# CONFIG_THUMB2_KERNEL is not set
-diff -Nur linux-3.14.22.orig/linaro/configs/kvm-host.conf linux-3.14.22/linaro/configs/kvm-host.conf
---- linux-3.14.22.orig/linaro/configs/kvm-host.conf 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/linaro/configs/kvm-host.conf 2014-10-22 14:55:56.834220001 -0500
+diff -Nur linux-3.14.14/linaro/configs/kvm-host.conf linux-imx6-3.14/linaro/configs/kvm-host.conf
+--- linux-3.14.14/linaro/configs/kvm-host.conf 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/linaro/configs/kvm-host.conf 2014-12-08 00:31:55.560418001 -0600
@@ -0,0 +1,11 @@
+CONFIG_VIRTUALIZATION=y
+CONFIG_ARM_LPAE=y
@@ -229174,9 +229203,9 @@ diff -Nur linux-3.14.22.orig/linaro/configs/kvm-host.conf linux-3.14.22/linaro/c
+CONFIG_KVM_MMIO=y
+CONFIG_KVM=y
+CONFIG_BLK_DEV_NBD=m
-diff -Nur linux-3.14.22.orig/linaro/configs/linaro-base.conf linux-3.14.22/linaro/configs/linaro-base.conf
---- linux-3.14.22.orig/linaro/configs/linaro-base.conf 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/linaro/configs/linaro-base.conf 2014-10-22 14:55:56.834220001 -0500
+diff -Nur linux-3.14.14/linaro/configs/linaro-base.conf linux-imx6-3.14/linaro/configs/linaro-base.conf
+--- linux-3.14.14/linaro/configs/linaro-base.conf 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/linaro/configs/linaro-base.conf 2014-12-08 00:31:55.560418001 -0600
@@ -0,0 +1,115 @@
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
@@ -229293,9 +229322,9 @@ diff -Nur linux-3.14.22.orig/linaro/configs/linaro-base.conf linux-3.14.22/linar
+CONFIG_LSM_MMAP_MIN_ADDR=4096
+CONFIG_SECURITY_SELINUX=y
+CONFIG_EXT4_FS_SECURITY=y
-diff -Nur linux-3.14.22.orig/linaro/configs/omap4.conf linux-3.14.22/linaro/configs/omap4.conf
---- linux-3.14.22.orig/linaro/configs/omap4.conf 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/linaro/configs/omap4.conf 2014-10-22 14:55:56.838220001 -0500
+diff -Nur linux-3.14.14/linaro/configs/omap4.conf linux-imx6-3.14/linaro/configs/omap4.conf
+--- linux-3.14.14/linaro/configs/omap4.conf 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/linaro/configs/omap4.conf 2014-12-08 00:31:55.560418001 -0600
@@ -0,0 +1,196 @@
+CONFIG_EXPERT=y
+CONFIG_KPROBES=y
@@ -229493,17 +229522,17 @@ diff -Nur linux-3.14.22.orig/linaro/configs/omap4.conf linux-3.14.22/linaro/conf
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_LIBCRC32C=y
+# CONFIG_CPU_FREQ is not set
-diff -Nur linux-3.14.22.orig/linaro/configs/preempt-rt.conf linux-3.14.22/linaro/configs/preempt-rt.conf
---- linux-3.14.22.orig/linaro/configs/preempt-rt.conf 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/linaro/configs/preempt-rt.conf 2014-10-22 14:55:56.838220001 -0500
+diff -Nur linux-3.14.14/linaro/configs/preempt-rt.conf linux-imx6-3.14/linaro/configs/preempt-rt.conf
+--- linux-3.14.14/linaro/configs/preempt-rt.conf 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/linaro/configs/preempt-rt.conf 2014-12-08 00:31:55.560418001 -0600
@@ -0,0 +1,4 @@
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_RT_FULL=y
+CONFIG_SLUB=y
+# CONFIG_CPU_FREQ is not set
-diff -Nur linux-3.14.22.orig/linaro/configs/vexpress64.conf linux-3.14.22/linaro/configs/vexpress64.conf
---- linux-3.14.22.orig/linaro/configs/vexpress64.conf 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/linaro/configs/vexpress64.conf 2014-10-22 14:55:56.838220001 -0500
+diff -Nur linux-3.14.14/linaro/configs/vexpress64.conf linux-imx6-3.14/linaro/configs/vexpress64.conf
+--- linux-3.14.14/linaro/configs/vexpress64.conf 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/linaro/configs/vexpress64.conf 2014-12-08 00:31:55.560418001 -0600
@@ -0,0 +1,56 @@
+CONFIG_ARCH_VEXPRESS=y
+CONFIG_SMP=y
@@ -229561,9 +229590,9 @@ diff -Nur linux-3.14.22.orig/linaro/configs/vexpress64.conf linux-3.14.22/linaro
+CONFIG_ARM_DT_BL_CPUFREQ=y
+CONFIG_ARM64_CPUIDLE=y
+CONFIG_ARM64_CRYPTO=y
-diff -Nur linux-3.14.22.orig/linaro/configs/vexpress.conf linux-3.14.22/linaro/configs/vexpress.conf
---- linux-3.14.22.orig/linaro/configs/vexpress.conf 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/linaro/configs/vexpress.conf 2014-10-22 14:55:56.838220001 -0500
+diff -Nur linux-3.14.14/linaro/configs/vexpress.conf linux-imx6-3.14/linaro/configs/vexpress.conf
+--- linux-3.14.14/linaro/configs/vexpress.conf 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/linaro/configs/vexpress.conf 2014-12-08 00:31:55.560418001 -0600
@@ -0,0 +1,64 @@
+CONFIG_ARCH_VEXPRESS=y
+CONFIG_ARCH_VEXPRESS_CA9X4=y
@@ -229629,14 +229658,14 @@ diff -Nur linux-3.14.22.orig/linaro/configs/vexpress.conf linux-3.14.22/linaro/c
+CONFIG_VIRTIO_BLK=y
+CONFIG_VIRTIO_MMIO=y
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
-diff -Nur linux-3.14.22.orig/linaro/configs/vexpress-tuning.conf linux-3.14.22/linaro/configs/vexpress-tuning.conf
---- linux-3.14.22.orig/linaro/configs/vexpress-tuning.conf 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/linaro/configs/vexpress-tuning.conf 2014-10-22 14:55:56.838220001 -0500
+diff -Nur linux-3.14.14/linaro/configs/vexpress-tuning.conf linux-imx6-3.14/linaro/configs/vexpress-tuning.conf
+--- linux-3.14.14/linaro/configs/vexpress-tuning.conf 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/linaro/configs/vexpress-tuning.conf 2014-12-08 00:31:55.560418001 -0600
@@ -0,0 +1 @@
+# CONFIG_PROVE_LOCKING is not set
-diff -Nur linux-3.14.22.orig/linaro/configs/xen.conf linux-3.14.22/linaro/configs/xen.conf
---- linux-3.14.22.orig/linaro/configs/xen.conf 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/linaro/configs/xen.conf 2014-10-22 14:55:56.838220001 -0500
+diff -Nur linux-3.14.14/linaro/configs/xen.conf linux-imx6-3.14/linaro/configs/xen.conf
+--- linux-3.14.14/linaro/configs/xen.conf 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/linaro/configs/xen.conf 2014-12-08 00:31:55.560418001 -0600
@@ -0,0 +1,7 @@
+CONFIG_XEN=y
+CONFIG_XEN_NETDEV_FRONTEND=y
@@ -229645,9 +229674,9 @@ diff -Nur linux-3.14.22.orig/linaro/configs/xen.conf linux-3.14.22/linaro/config
+CONFIG_XEN_BLKDEV_BACKEND=y
+CONFIG_XENFS=y
+CONFIG_XEN_COMPAT_XENFS=y
-diff -Nur linux-3.14.22.orig/MAINTAINERS linux-3.14.22/MAINTAINERS
---- linux-3.14.22.orig/MAINTAINERS 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/MAINTAINERS 2014-10-22 14:55:56.842220001 -0500
+diff -Nur linux-3.14.14/MAINTAINERS linux-imx6-3.14/MAINTAINERS
+--- linux-3.14.14/MAINTAINERS 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/MAINTAINERS 2014-12-08 00:31:51.072418001 -0600
@@ -5511,6 +5511,14 @@
F: drivers/net/macvlan.c
F: include/linux/if_macvlan.h
@@ -229663,9 +229692,9 @@ diff -Nur linux-3.14.22.orig/MAINTAINERS linux-3.14.22/MAINTAINERS
MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7
M: Michael Kerrisk <mtk.manpages@gmail.com>
W: http://www.kernel.org/doc/man-pages
-diff -Nur linux-3.14.22.orig/mm/cma.c linux-3.14.22/mm/cma.c
---- linux-3.14.22.orig/mm/cma.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/mm/cma.c 2014-10-22 14:55:56.842220001 -0500
+diff -Nur linux-3.14.14/mm/cma.c linux-imx6-3.14/mm/cma.c
+--- linux-3.14.14/mm/cma.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/mm/cma.c 2014-12-08 00:31:55.568418001 -0600
@@ -0,0 +1,356 @@
+/*
+ * Contiguous Memory Allocator
@@ -230023,9 +230052,9 @@ diff -Nur linux-3.14.22.orig/mm/cma.c linux-3.14.22/mm/cma.c
+
+ return true;
+}
-diff -Nur linux-3.14.22.orig/mm/Kconfig linux-3.14.22/mm/Kconfig
---- linux-3.14.22.orig/mm/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/mm/Kconfig 2014-10-22 14:55:56.842220001 -0500
+diff -Nur linux-3.14.14/mm/Kconfig linux-imx6-3.14/mm/Kconfig
+--- linux-3.14.14/mm/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/mm/Kconfig 2014-12-08 00:31:55.568418001 -0600
@@ -514,6 +514,17 @@
processing calls such as dma_alloc_from_contiguous().
This option does not affect warning and error messages.
@@ -230044,18 +230073,18 @@ diff -Nur linux-3.14.22.orig/mm/Kconfig linux-3.14.22/mm/Kconfig
config ZBUD
tristate
default n
-diff -Nur linux-3.14.22.orig/mm/Makefile linux-3.14.22/mm/Makefile
---- linux-3.14.22.orig/mm/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/mm/Makefile 2014-10-22 14:55:56.842220001 -0500
+diff -Nur linux-3.14.14/mm/Makefile linux-imx6-3.14/mm/Makefile
+--- linux-3.14.14/mm/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/mm/Makefile 2014-12-08 00:31:55.568418001 -0600
@@ -61,3 +61,4 @@
obj-$(CONFIG_MEMORY_ISOLATION) += page_isolation.o
obj-$(CONFIG_ZBUD) += zbud.o
obj-$(CONFIG_ZSMALLOC) += zsmalloc.o
+obj-$(CONFIG_CMA) += cma.o
-diff -Nur linux-3.14.22.orig/mm/memblock.c linux-3.14.22/mm/memblock.c
---- linux-3.14.22.orig/mm/memblock.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/mm/memblock.c 2014-10-22 14:55:56.842220001 -0500
-@@ -974,22 +974,35 @@
+diff -Nur linux-3.14.14/mm/memblock.c linux-imx6-3.14/mm/memblock.c
+--- linux-3.14.14/mm/memblock.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/mm/memblock.c 2014-12-08 00:31:55.572418001 -0600
+@@ -975,22 +975,35 @@
}
#endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */
@@ -230095,9 +230124,9 @@ diff -Nur linux-3.14.22.orig/mm/memblock.c linux-3.14.22/mm/memblock.c
phys_addr_t __init memblock_alloc_nid(phys_addr_t size, phys_addr_t align, int nid)
{
return memblock_alloc_base_nid(size, align, MEMBLOCK_ALLOC_ACCESSIBLE, nid);
-diff -Nur linux-3.14.22.orig/net/atm/svc.c linux-3.14.22/net/atm/svc.c
---- linux-3.14.22.orig/net/atm/svc.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/net/atm/svc.c 2014-10-22 14:55:56.842220001 -0500
+diff -Nur linux-3.14.14/net/atm/svc.c linux-imx6-3.14/net/atm/svc.c
+--- linux-3.14.14/net/atm/svc.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/net/atm/svc.c 2014-12-08 00:31:55.688418001 -0600
@@ -263,17 +263,11 @@
goto out;
}
@@ -230118,9 +230147,9 @@ diff -Nur linux-3.14.22.orig/net/atm/svc.c linux-3.14.22/net/atm/svc.c
error = vcc_connect(sock, vcc->itf, vcc->vpi, vcc->vci);
if (!error)
sock->state = SS_CONNECTED;
-diff -Nur linux-3.14.22.orig/net/core/dev.c linux-3.14.22/net/core/dev.c
---- linux-3.14.22.orig/net/core/dev.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/net/core/dev.c 2014-10-22 14:55:56.842220001 -0500
+diff -Nur linux-3.14.14/net/core/dev.c linux-imx6-3.14/net/core/dev.c
+--- linux-3.14.14/net/core/dev.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/net/core/dev.c 2014-12-08 00:31:55.716418001 -0600
@@ -3453,7 +3453,7 @@
* @rx_handler: receive handler to register
* @rx_handler_data: data pointer that is used by rx handler
@@ -230130,9 +230159,9 @@ diff -Nur linux-3.14.22.orig/net/core/dev.c linux-3.14.22/net/core/dev.c
* called from __netif_receive_skb. A negative errno code is returned
* on a failure.
*
-diff -Nur linux-3.14.22.orig/net/core/Makefile linux-3.14.22/net/core/Makefile
---- linux-3.14.22.orig/net/core/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/net/core/Makefile 2014-10-22 14:55:56.842220001 -0500
+diff -Nur linux-3.14.14/net/core/Makefile linux-imx6-3.14/net/core/Makefile
+--- linux-3.14.14/net/core/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/net/core/Makefile 2014-12-08 00:31:55.712418001 -0600
@@ -9,7 +9,7 @@
obj-y += dev.o ethtool.o dev_addr_lists.o dst.o netevent.o \
@@ -230142,10 +230171,10 @@ diff -Nur linux-3.14.22.orig/net/core/Makefile linux-3.14.22/net/core/Makefile
obj-$(CONFIG_XFRM) += flow.o
obj-y += net-sysfs.o
-diff -Nur linux-3.14.22.orig/net/core/rtnetlink.c linux-3.14.22/net/core/rtnetlink.c
---- linux-3.14.22.orig/net/core/rtnetlink.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/net/core/rtnetlink.c 2014-10-22 14:55:56.842220001 -0500
-@@ -1157,73 +1157,7 @@
+diff -Nur linux-3.14.14/net/core/rtnetlink.c linux-imx6-3.14/net/core/rtnetlink.c
+--- linux-3.14.14/net/core/rtnetlink.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/net/core/rtnetlink.c 2014-12-08 00:31:55.720418001 -0600
+@@ -1156,73 +1156,7 @@
return -EMSGSIZE;
}
@@ -230220,7 +230249,7 @@ diff -Nur linux-3.14.22.orig/net/core/rtnetlink.c linux-3.14.22/net/core/rtnetli
[IFLA_IFNAME] = { .type = NLA_STRING, .len = IFNAMSIZ-1 },
[IFLA_ADDRESS] = { .type = NLA_BINARY, .len = MAX_ADDR_LEN },
[IFLA_BROADCAST] = { .type = NLA_BINARY, .len = MAX_ADDR_LEN },
-@@ -1250,7 +1184,6 @@
+@@ -1249,7 +1183,6 @@
[IFLA_NUM_RX_QUEUES] = { .type = NLA_U32 },
[IFLA_PHYS_PORT_ID] = { .type = NLA_BINARY, .len = MAX_PHYS_PORT_ID_LEN },
};
@@ -230228,7 +230257,7 @@ diff -Nur linux-3.14.22.orig/net/core/rtnetlink.c linux-3.14.22/net/core/rtnetli
static const struct nla_policy ifla_info_policy[IFLA_INFO_MAX+1] = {
[IFLA_INFO_KIND] = { .type = NLA_STRING },
-@@ -1288,6 +1221,61 @@
+@@ -1287,6 +1220,61 @@
[IFLA_PORT_RESPONSE] = { .type = NLA_U16, },
};
@@ -230290,9 +230319,9 @@ diff -Nur linux-3.14.22.orig/net/core/rtnetlink.c linux-3.14.22/net/core/rtnetli
struct net *rtnl_link_get_net(struct net *src_net, struct nlattr *tb[])
{
struct net *net;
-diff -Nur linux-3.14.22.orig/net/core/tso.c linux-3.14.22/net/core/tso.c
---- linux-3.14.22.orig/net/core/tso.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/net/core/tso.c 2014-10-22 14:55:56.842220001 -0500
+diff -Nur linux-3.14.14/net/core/tso.c linux-imx6-3.14/net/core/tso.c
+--- linux-3.14.14/net/core/tso.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/net/core/tso.c 2014-12-08 00:31:55.720418001 -0600
@@ -0,0 +1,72 @@
+#include <net/ip.h>
+#include <net/tso.h>
@@ -230366,9 +230395,9 @@ diff -Nur linux-3.14.22.orig/net/core/tso.c linux-3.14.22/net/core/tso.c
+ tso->next_frag_idx++;
+ }
+}
-diff -Nur linux-3.14.22.orig/net/ieee802154/Kconfig linux-3.14.22/net/ieee802154/Kconfig
---- linux-3.14.22.orig/net/ieee802154/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/net/ieee802154/Kconfig 2014-10-22 14:55:56.846220001 -0500
+diff -Nur linux-3.14.14/net/ieee802154/Kconfig linux-imx6-3.14/net/ieee802154/Kconfig
+--- linux-3.14.14/net/ieee802154/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/net/ieee802154/Kconfig 2014-12-08 00:31:55.728418001 -0600
@@ -15,7 +15,7 @@
depends on IEEE802154 && IPV6
select 6LOWPAN_IPHC
@@ -230378,9 +230407,9 @@ diff -Nur linux-3.14.22.orig/net/ieee802154/Kconfig linux-3.14.22/net/ieee802154
config 6LOWPAN_IPHC
tristate
-diff -Nur linux-3.14.22.orig/net/mac80211/driver-ops.h linux-3.14.22/net/mac80211/driver-ops.h
---- linux-3.14.22.orig/net/mac80211/driver-ops.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/net/mac80211/driver-ops.h 2014-10-22 14:55:56.846220001 -0500
+diff -Nur linux-3.14.14/net/mac80211/driver-ops.h linux-imx6-3.14/net/mac80211/driver-ops.h
+--- linux-3.14.14/net/mac80211/driver-ops.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/net/mac80211/driver-ops.h 2014-12-08 00:31:55.780418001 -0600
@@ -722,13 +722,19 @@
}
@@ -230402,9 +230431,9 @@ diff -Nur linux-3.14.22.orig/net/mac80211/driver-ops.h linux-3.14.22/net/mac8021
trace_drv_return_void(local);
}
-diff -Nur linux-3.14.22.orig/net/mac80211/ibss.c linux-3.14.22/net/mac80211/ibss.c
---- linux-3.14.22.orig/net/mac80211/ibss.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/net/mac80211/ibss.c 2014-10-22 14:55:56.846220001 -0500
+diff -Nur linux-3.14.14/net/mac80211/ibss.c linux-imx6-3.14/net/mac80211/ibss.c
+--- linux-3.14.14/net/mac80211/ibss.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/net/mac80211/ibss.c 2014-12-08 00:31:55.780418001 -0600
@@ -386,7 +386,7 @@
presp->head_len, 0, GFP_KERNEL);
cfg80211_put_bss(local->hw.wiphy, bss);
@@ -230414,9 +230443,9 @@ diff -Nur linux-3.14.22.orig/net/mac80211/ibss.c linux-3.14.22/net/mac80211/ibss
}
static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
-diff -Nur linux-3.14.22.orig/net/mac80211/util.c linux-3.14.22/net/mac80211/util.c
---- linux-3.14.22.orig/net/mac80211/util.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/net/mac80211/util.c 2014-10-22 14:55:56.846220001 -0500
+diff -Nur linux-3.14.14/net/mac80211/util.c linux-imx6-3.14/net/mac80211/util.c
+--- linux-3.14.14/net/mac80211/util.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/net/mac80211/util.c 2014-12-08 00:31:55.788418001 -0600
@@ -554,7 +554,7 @@
ieee80211_stop_queues_by_reason(&local->hw, IEEE80211_MAX_QUEUE_MAP,
IEEE80211_QUEUE_STOP_REASON_FLUSH);
@@ -230426,9 +230455,9 @@ diff -Nur linux-3.14.22.orig/net/mac80211/util.c linux-3.14.22/net/mac80211/util
ieee80211_wake_queues_by_reason(&local->hw, IEEE80211_MAX_QUEUE_MAP,
IEEE80211_QUEUE_STOP_REASON_FLUSH);
-diff -Nur linux-3.14.22.orig/net/wireless/core.h linux-3.14.22/net/wireless/core.h
---- linux-3.14.22.orig/net/wireless/core.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/net/wireless/core.h 2014-10-22 14:55:56.846220001 -0500
+diff -Nur linux-3.14.14/net/wireless/core.h linux-imx6-3.14/net/wireless/core.h
+--- linux-3.14.14/net/wireless/core.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/net/wireless/core.h 2014-12-08 00:31:55.864418001 -0600
@@ -211,6 +211,7 @@
} dc;
struct {
@@ -230447,9 +230476,9 @@ diff -Nur linux-3.14.22.orig/net/wireless/core.h linux-3.14.22/net/wireless/core
int cfg80211_ibss_wext_join(struct cfg80211_registered_device *rdev,
struct wireless_dev *wdev);
-diff -Nur linux-3.14.22.orig/net/wireless/ibss.c linux-3.14.22/net/wireless/ibss.c
---- linux-3.14.22.orig/net/wireless/ibss.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/net/wireless/ibss.c 2014-10-22 14:55:56.846220001 -0500
+diff -Nur linux-3.14.14/net/wireless/ibss.c linux-imx6-3.14/net/wireless/ibss.c
+--- linux-3.14.14/net/wireless/ibss.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/net/wireless/ibss.c 2014-12-08 00:31:55.864418001 -0600
@@ -14,7 +14,8 @@
#include "rdev-ops.h"
@@ -230500,10 +230529,10 @@ diff -Nur linux-3.14.22.orig/net/wireless/ibss.c linux-3.14.22/net/wireless/ibss
spin_lock_irqsave(&wdev->event_lock, flags);
list_add_tail(&ev->list, &wdev->event_list);
-diff -Nur linux-3.14.22.orig/net/wireless/trace.h linux-3.14.22/net/wireless/trace.h
---- linux-3.14.22.orig/net/wireless/trace.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/net/wireless/trace.h 2014-10-22 14:55:56.846220001 -0500
-@@ -2279,11 +2279,6 @@
+diff -Nur linux-3.14.14/net/wireless/trace.h linux-imx6-3.14/net/wireless/trace.h
+--- linux-3.14.14/net/wireless/trace.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/net/wireless/trace.h 2014-12-08 00:31:55.868418001 -0600
+@@ -2278,11 +2278,6 @@
TP_printk(NETDEV_PR_FMT ", " MAC_PR_FMT, NETDEV_PR_ARG, MAC_PR_ARG(addr))
);
@@ -230515,7 +230544,7 @@ diff -Nur linux-3.14.22.orig/net/wireless/trace.h linux-3.14.22/net/wireless/tra
DEFINE_EVENT(cfg80211_rx_evt, cfg80211_rx_spurious_frame,
TP_PROTO(struct net_device *netdev, const u8 *addr),
TP_ARGS(netdev, addr)
-@@ -2294,6 +2289,24 @@
+@@ -2293,6 +2288,24 @@
TP_ARGS(netdev, addr)
);
@@ -230540,9 +230569,9 @@ diff -Nur linux-3.14.22.orig/net/wireless/trace.h linux-3.14.22/net/wireless/tra
TRACE_EVENT(cfg80211_probe_status,
TP_PROTO(struct net_device *netdev, const u8 *addr, u64 cookie,
bool acked),
-diff -Nur linux-3.14.22.orig/net/wireless/util.c linux-3.14.22/net/wireless/util.c
---- linux-3.14.22.orig/net/wireless/util.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/net/wireless/util.c 2014-10-22 14:55:56.846220001 -0500
+diff -Nur linux-3.14.14/net/wireless/util.c linux-imx6-3.14/net/wireless/util.c
+--- linux-3.14.14/net/wireless/util.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/net/wireless/util.c 2014-12-08 00:31:55.868418001 -0600
@@ -820,7 +820,8 @@
ev->dc.reason, true);
break;
@@ -230553,9 +230582,9 @@ diff -Nur linux-3.14.22.orig/net/wireless/util.c linux-3.14.22/net/wireless/util
break;
}
wdev_unlock(wdev);
-diff -Nur linux-3.14.22.orig/scripts/Makefile.lib linux-3.14.22/scripts/Makefile.lib
---- linux-3.14.22.orig/scripts/Makefile.lib 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/scripts/Makefile.lib 2014-10-22 14:55:56.846220001 -0500
+diff -Nur linux-3.14.14/scripts/Makefile.lib linux-imx6-3.14/scripts/Makefile.lib
+--- linux-3.14.14/scripts/Makefile.lib 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/scripts/Makefile.lib 2014-12-08 00:31:55.876418001 -0600
@@ -153,6 +153,7 @@
-I$(srctree)/arch/$(SRCARCH)/boot/dts \
-I$(srctree)/arch/$(SRCARCH)/boot/dts/include \
@@ -230564,9 +230593,9 @@ diff -Nur linux-3.14.22.orig/scripts/Makefile.lib linux-3.14.22/scripts/Makefile
-undef -D__DTS__
# Finds the multi-part object the current object will be linked into
-diff -Nur linux-3.14.22.orig/scripts/mod/devicetable-offsets.c linux-3.14.22/scripts/mod/devicetable-offsets.c
---- linux-3.14.22.orig/scripts/mod/devicetable-offsets.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/scripts/mod/devicetable-offsets.c 2014-10-22 14:55:56.846220001 -0500
+diff -Nur linux-3.14.14/scripts/mod/devicetable-offsets.c linux-imx6-3.14/scripts/mod/devicetable-offsets.c
+--- linux-3.14.14/scripts/mod/devicetable-offsets.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/scripts/mod/devicetable-offsets.c 2014-12-08 00:31:55.892418001 -0600
@@ -174,6 +174,9 @@
DEVID_FIELD(x86_cpu_id, model);
DEVID_FIELD(x86_cpu_id, vendor);
@@ -230577,9 +230606,9 @@ diff -Nur linux-3.14.22.orig/scripts/mod/devicetable-offsets.c linux-3.14.22/scr
DEVID(mei_cl_device_id);
DEVID_FIELD(mei_cl_device_id, name);
-diff -Nur linux-3.14.22.orig/scripts/mod/file2alias.c linux-3.14.22/scripts/mod/file2alias.c
---- linux-3.14.22.orig/scripts/mod/file2alias.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/scripts/mod/file2alias.c 2014-10-22 14:55:56.846220001 -0500
+diff -Nur linux-3.14.14/scripts/mod/file2alias.c linux-imx6-3.14/scripts/mod/file2alias.c
+--- linux-3.14.14/scripts/mod/file2alias.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/scripts/mod/file2alias.c 2014-12-08 00:31:55.892418001 -0600
@@ -1135,6 +1135,16 @@
}
ADD_TO_DEVTABLE("x86cpu", x86_cpu_id, do_x86cpu_entry);
@@ -230597,9 +230626,9 @@ diff -Nur linux-3.14.22.orig/scripts/mod/file2alias.c linux-3.14.22/scripts/mod/
/* Looks like: mei:S */
static int do_mei_entry(const char *filename, void *symval,
char *alias)
-diff -Nur linux-3.14.22.orig/scripts/recordmcount.c linux-3.14.22/scripts/recordmcount.c
---- linux-3.14.22.orig/scripts/recordmcount.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/scripts/recordmcount.c 2014-10-22 14:55:56.846220001 -0500
+diff -Nur linux-3.14.14/scripts/recordmcount.c linux-imx6-3.14/scripts/recordmcount.c
+--- linux-3.14.14/scripts/recordmcount.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/scripts/recordmcount.c 2014-12-08 00:31:55.896418001 -0600
@@ -40,6 +40,11 @@
#define R_METAG_NONE 3
#endif
@@ -230621,9 +230650,9 @@ diff -Nur linux-3.14.22.orig/scripts/recordmcount.c linux-3.14.22/scripts/record
case EM_IA_64: reltype = R_IA64_IMM64; gpfx = '_'; break;
case EM_METAG: reltype = R_METAG_ADDR32;
altmcount = "_mcount_wrapper";
-diff -Nur linux-3.14.22.orig/scripts/recordmcount.pl linux-3.14.22/scripts/recordmcount.pl
---- linux-3.14.22.orig/scripts/recordmcount.pl 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/scripts/recordmcount.pl 2014-10-22 14:55:56.846220001 -0500
+diff -Nur linux-3.14.14/scripts/recordmcount.pl linux-imx6-3.14/scripts/recordmcount.pl
+--- linux-3.14.14/scripts/recordmcount.pl 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/scripts/recordmcount.pl 2014-12-08 00:31:55.896418001 -0600
@@ -279,6 +279,11 @@
$mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*R_ARM_(CALL|PC24|THM_CALL)" .
"\\s+(__gnu_mcount_nc|mcount)\$";
@@ -230636,9 +230665,9 @@ diff -Nur linux-3.14.22.orig/scripts/recordmcount.pl linux-3.14.22/scripts/recor
} elsif ($arch eq "ia64") {
$mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s_mcount\$";
$type = "data8";
-diff -Nur linux-3.14.22.orig/sound/soc/codecs/cs42888.c linux-3.14.22/sound/soc/codecs/cs42888.c
---- linux-3.14.22.orig/sound/soc/codecs/cs42888.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/sound/soc/codecs/cs42888.c 2014-10-22 14:55:56.846220001 -0500
+diff -Nur linux-3.14.14/sound/soc/codecs/cs42888.c linux-imx6-3.14/sound/soc/codecs/cs42888.c
+--- linux-3.14.14/sound/soc/codecs/cs42888.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/sound/soc/codecs/cs42888.c 2014-12-08 00:31:56.076418001 -0600
@@ -0,0 +1,934 @@
+/*
+ * cs42888.c -- CS42888 ALSA SoC Audio Driver
@@ -231574,9 +231603,9 @@ diff -Nur linux-3.14.22.orig/sound/soc/codecs/cs42888.c linux-3.14.22/sound/soc/
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("Cirrus Logic CS42888 ALSA SoC Codec Driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/sound/soc/codecs/cs42888.h linux-3.14.22/sound/soc/codecs/cs42888.h
---- linux-3.14.22.orig/sound/soc/codecs/cs42888.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/sound/soc/codecs/cs42888.h 2014-10-22 14:55:56.850220001 -0500
+diff -Nur linux-3.14.14/sound/soc/codecs/cs42888.h linux-imx6-3.14/sound/soc/codecs/cs42888.h
+--- linux-3.14.14/sound/soc/codecs/cs42888.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/sound/soc/codecs/cs42888.h 2014-12-08 00:31:56.076418001 -0600
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -231701,9 +231730,9 @@ diff -Nur linux-3.14.22.orig/sound/soc/codecs/cs42888.h linux-3.14.22/sound/soc/
+
+
+#endif
-diff -Nur linux-3.14.22.orig/sound/soc/codecs/Kconfig linux-3.14.22/sound/soc/codecs/Kconfig
---- linux-3.14.22.orig/sound/soc/codecs/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/sound/soc/codecs/Kconfig 2014-10-22 14:55:56.850220001 -0500
+diff -Nur linux-3.14.14/sound/soc/codecs/Kconfig linux-imx6-3.14/sound/soc/codecs/Kconfig
+--- linux-3.14.14/sound/soc/codecs/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/sound/soc/codecs/Kconfig 2014-12-08 00:31:56.072418001 -0600
@@ -37,6 +37,7 @@
select SND_SOC_CS42L73 if I2C
select SND_SOC_CS4270 if I2C
@@ -231722,9 +231751,9 @@ diff -Nur linux-3.14.22.orig/sound/soc/codecs/Kconfig linux-3.14.22/sound/soc/co
config SND_SOC_CX20442
tristate
depends on TTY
-diff -Nur linux-3.14.22.orig/sound/soc/codecs/Makefile linux-3.14.22/sound/soc/codecs/Makefile
---- linux-3.14.22.orig/sound/soc/codecs/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/sound/soc/codecs/Makefile 2014-10-22 14:55:56.850220001 -0500
+diff -Nur linux-3.14.14/sound/soc/codecs/Makefile linux-imx6-3.14/sound/soc/codecs/Makefile
+--- linux-3.14.14/sound/soc/codecs/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/sound/soc/codecs/Makefile 2014-12-08 00:31:56.072418001 -0600
@@ -23,6 +23,7 @@
snd-soc-cs42l73-objs := cs42l73.o
snd-soc-cs4270-objs := cs4270.o
@@ -231741,9 +231770,9 @@ diff -Nur linux-3.14.22.orig/sound/soc/codecs/Makefile linux-3.14.22/sound/soc/c
obj-$(CONFIG_SND_SOC_CX20442) += snd-soc-cx20442.o
obj-$(CONFIG_SND_SOC_DA7210) += snd-soc-da7210.o
obj-$(CONFIG_SND_SOC_DA7213) += snd-soc-da7213.o
-diff -Nur linux-3.14.22.orig/sound/soc/codecs/sgtl5000.c linux-3.14.22/sound/soc/codecs/sgtl5000.c
---- linux-3.14.22.orig/sound/soc/codecs/sgtl5000.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/sound/soc/codecs/sgtl5000.c 2014-10-22 14:55:56.850220001 -0500
+diff -Nur linux-3.14.14/sound/soc/codecs/sgtl5000.c linux-imx6-3.14/sound/soc/codecs/sgtl5000.c
+--- linux-3.14.14/sound/soc/codecs/sgtl5000.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/sound/soc/codecs/sgtl5000.c 2014-12-08 00:31:56.084418001 -0600
@@ -756,7 +756,7 @@
struct ldo_regulator *ldo = rdev_get_drvdata(dev);
struct snd_soc_codec *codec = (struct snd_soc_codec *)ldo->codec_data;
@@ -231853,9 +231882,9 @@ diff -Nur linux-3.14.22.orig/sound/soc/codecs/sgtl5000.c linux-3.14.22/sound/soc
ldo_regulator_remove(codec);
return 0;
-diff -Nur linux-3.14.22.orig/sound/soc/codecs/spdif_transmitter.c linux-3.14.22/sound/soc/codecs/spdif_transmitter.c
---- linux-3.14.22.orig/sound/soc/codecs/spdif_transmitter.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/sound/soc/codecs/spdif_transmitter.c 2014-10-22 14:55:56.850220001 -0500
+diff -Nur linux-3.14.14/sound/soc/codecs/spdif_transmitter.c linux-imx6-3.14/sound/soc/codecs/spdif_transmitter.c
+--- linux-3.14.14/sound/soc/codecs/spdif_transmitter.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/sound/soc/codecs/spdif_transmitter.c 2014-12-08 00:31:56.084418001 -0600
@@ -24,7 +24,7 @@
#define DRV_NAME "spdif-dit"
@@ -231865,9 +231894,9 @@ diff -Nur linux-3.14.22.orig/sound/soc/codecs/spdif_transmitter.c linux-3.14.22/
#define STUB_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \
SNDRV_PCM_FMTBIT_S20_3LE | \
SNDRV_PCM_FMTBIT_S24_LE)
-diff -Nur linux-3.14.22.orig/sound/soc/codecs/wm8962.c linux-3.14.22/sound/soc/codecs/wm8962.c
---- linux-3.14.22.orig/sound/soc/codecs/wm8962.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/sound/soc/codecs/wm8962.c 2014-10-22 14:55:56.850220001 -0500
+diff -Nur linux-3.14.14/sound/soc/codecs/wm8962.c linux-imx6-3.14/sound/soc/codecs/wm8962.c
+--- linux-3.14.14/sound/soc/codecs/wm8962.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/sound/soc/codecs/wm8962.c 2014-12-08 00:31:56.100418001 -0600
@@ -16,6 +16,7 @@
#include <linux/init.h>
#include <linux/delay.h>
@@ -231991,9 +232020,9 @@ diff -Nur linux-3.14.22.orig/sound/soc/codecs/wm8962.c linux-3.14.22/sound/soc/c
return 0;
}
#endif
-diff -Nur linux-3.14.22.orig/sound/soc/fsl/fsl_asrc.c linux-3.14.22/sound/soc/fsl/fsl_asrc.c
---- linux-3.14.22.orig/sound/soc/fsl/fsl_asrc.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/sound/soc/fsl/fsl_asrc.c 2014-10-22 14:55:56.850220001 -0500
+diff -Nur linux-3.14.14/sound/soc/fsl/fsl_asrc.c linux-imx6-3.14/sound/soc/fsl/fsl_asrc.c
+--- linux-3.14.14/sound/soc/fsl/fsl_asrc.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/sound/soc/fsl/fsl_asrc.c 2014-12-08 00:31:56.116418001 -0600
@@ -0,0 +1,498 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -232493,9 +232522,9 @@ diff -Nur linux-3.14.22.orig/sound/soc/fsl/fsl_asrc.c linux-3.14.22/sound/soc/fs
+MODULE_DESCRIPTION("i.MX ASoC ASRC P2P driver");
+MODULE_ALIAS("platform:fsl-asrc-p2p");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/sound/soc/fsl/fsl_asrc.h linux-3.14.22/sound/soc/fsl/fsl_asrc.h
---- linux-3.14.22.orig/sound/soc/fsl/fsl_asrc.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/sound/soc/fsl/fsl_asrc.h 2014-10-22 14:55:56.850220001 -0500
+diff -Nur linux-3.14.14/sound/soc/fsl/fsl_asrc.h linux-imx6-3.14/sound/soc/fsl/fsl_asrc.h
+--- linux-3.14.14/sound/soc/fsl/fsl_asrc.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/sound/soc/fsl/fsl_asrc.h 2014-12-08 00:31:56.116418001 -0600
@@ -0,0 +1,48 @@
+/*
+ * fsl_asrc.h - ALSA ASRC interface
@@ -232545,9 +232574,9 @@ diff -Nur linux-3.14.22.orig/sound/soc/fsl/fsl_asrc.h linux-3.14.22/sound/soc/fs
+};
+
+#endif
-diff -Nur linux-3.14.22.orig/sound/soc/fsl/fsl_asrc_pcm.c linux-3.14.22/sound/soc/fsl/fsl_asrc_pcm.c
---- linux-3.14.22.orig/sound/soc/fsl/fsl_asrc_pcm.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/sound/soc/fsl/fsl_asrc_pcm.c 2014-10-22 14:55:56.850220001 -0500
+diff -Nur linux-3.14.14/sound/soc/fsl/fsl_asrc_pcm.c linux-imx6-3.14/sound/soc/fsl/fsl_asrc_pcm.c
+--- linux-3.14.14/sound/soc/fsl/fsl_asrc_pcm.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/sound/soc/fsl/fsl_asrc_pcm.c 2014-12-08 00:31:56.116418001 -0600
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -232590,9 +232619,9 @@ diff -Nur linux-3.14.22.orig/sound/soc/fsl/fsl_asrc_pcm.c linux-3.14.22/sound/so
+MODULE_DESCRIPTION("i.MX ASoC PCM driver");
+MODULE_ALIAS("platform:imx-pcm-asrc");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/sound/soc/fsl/fsl_esai.c linux-3.14.22/sound/soc/fsl/fsl_esai.c
---- linux-3.14.22.orig/sound/soc/fsl/fsl_esai.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/sound/soc/fsl/fsl_esai.c 2014-10-22 14:55:56.850220001 -0500
+diff -Nur linux-3.14.14/sound/soc/fsl/fsl_esai.c linux-imx6-3.14/sound/soc/fsl/fsl_esai.c
+--- linux-3.14.14/sound/soc/fsl/fsl_esai.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/sound/soc/fsl/fsl_esai.c 2014-12-08 00:31:56.116418001 -0600
@@ -785,7 +785,7 @@
return ret;
}
@@ -232602,9 +232631,9 @@ diff -Nur linux-3.14.22.orig/sound/soc/fsl/fsl_esai.c linux-3.14.22/sound/soc/fs
if (ret)
dev_err(&pdev->dev, "failed to init imx pcm dma: %d\n", ret);
-diff -Nur linux-3.14.22.orig/sound/soc/fsl/fsl_hdmi.c linux-3.14.22/sound/soc/fsl/fsl_hdmi.c
---- linux-3.14.22.orig/sound/soc/fsl/fsl_hdmi.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/sound/soc/fsl/fsl_hdmi.c 2014-10-22 14:55:56.850220001 -0500
+diff -Nur linux-3.14.14/sound/soc/fsl/fsl_hdmi.c linux-imx6-3.14/sound/soc/fsl/fsl_hdmi.c
+--- linux-3.14.14/sound/soc/fsl/fsl_hdmi.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/sound/soc/fsl/fsl_hdmi.c 2014-12-08 00:31:56.116418001 -0600
@@ -0,0 +1,614 @@
+/*
+ * ALSA SoC HDMI Audio Layer for Freescale i.MX
@@ -233220,9 +233249,9 @@ diff -Nur linux-3.14.22.orig/sound/soc/fsl/fsl_hdmi.c linux-3.14.22/sound/soc/fs
+MODULE_DESCRIPTION("IMX HDMI TX DAI");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:fsl-hdmi-dai");
-diff -Nur linux-3.14.22.orig/sound/soc/fsl/fsl_spdif.c linux-3.14.22/sound/soc/fsl/fsl_spdif.c
---- linux-3.14.22.orig/sound/soc/fsl/fsl_spdif.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/sound/soc/fsl/fsl_spdif.c 2014-10-22 14:55:56.850220001 -0500
+diff -Nur linux-3.14.14/sound/soc/fsl/fsl_spdif.c linux-imx6-3.14/sound/soc/fsl/fsl_spdif.c
+--- linux-3.14.14/sound/soc/fsl/fsl_spdif.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/sound/soc/fsl/fsl_spdif.c 2014-12-08 00:31:56.116418001 -0600
@@ -21,6 +21,8 @@
#include <linux/of_address.h>
#include <linux/of_device.h>
@@ -233548,9 +233577,9 @@ diff -Nur linux-3.14.22.orig/sound/soc/fsl/fsl_spdif.c linux-3.14.22/sound/soc/f
},
.probe = fsl_spdif_probe,
};
-diff -Nur linux-3.14.22.orig/sound/soc/fsl/fsl_spdif.h linux-3.14.22/sound/soc/fsl/fsl_spdif.h
---- linux-3.14.22.orig/sound/soc/fsl/fsl_spdif.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/sound/soc/fsl/fsl_spdif.h 2014-10-22 14:55:56.850220001 -0500
+diff -Nur linux-3.14.14/sound/soc/fsl/fsl_spdif.h linux-imx6-3.14/sound/soc/fsl/fsl_spdif.h
+--- linux-3.14.14/sound/soc/fsl/fsl_spdif.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/sound/soc/fsl/fsl_spdif.h 2014-12-08 00:31:56.116418001 -0600
@@ -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
@@ -233585,9 +233614,9 @@ diff -Nur linux-3.14.22.orig/sound/soc/fsl/fsl_spdif.h linux-3.14.22/sound/soc/f
#define FSL_SPDIF_RATES_CAPTURE (SNDRV_PCM_RATE_16000 | \
SNDRV_PCM_RATE_32000 | \
-diff -Nur linux-3.14.22.orig/sound/soc/fsl/fsl_ssi.c linux-3.14.22/sound/soc/fsl/fsl_ssi.c
---- linux-3.14.22.orig/sound/soc/fsl/fsl_ssi.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/sound/soc/fsl/fsl_ssi.c 2014-10-22 14:55:56.850220001 -0500
+diff -Nur linux-3.14.14/sound/soc/fsl/fsl_ssi.c linux-imx6-3.14/sound/soc/fsl/fsl_ssi.c
+--- linux-3.14.14/sound/soc/fsl/fsl_ssi.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/sound/soc/fsl/fsl_ssi.c 2014-12-08 00:31:56.116418001 -0600
@@ -3,7 +3,7 @@
*
* Author: Timur Tabi <timur@freescale.com>
@@ -233911,9 +233940,9 @@ diff -Nur linux-3.14.22.orig/sound/soc/fsl/fsl_ssi.c linux-3.14.22/sound/soc/fsl
},
.probe = fsl_ssi_probe,
.remove = fsl_ssi_remove,
-diff -Nur linux-3.14.22.orig/sound/soc/fsl/imx-cs42888.c linux-3.14.22/sound/soc/fsl/imx-cs42888.c
---- linux-3.14.22.orig/sound/soc/fsl/imx-cs42888.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/sound/soc/fsl/imx-cs42888.c 2014-10-22 14:55:56.854220001 -0500
+diff -Nur linux-3.14.14/sound/soc/fsl/imx-cs42888.c linux-imx6-3.14/sound/soc/fsl/imx-cs42888.c
+--- linux-3.14.14/sound/soc/fsl/imx-cs42888.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/sound/soc/fsl/imx-cs42888.c 2014-12-08 00:31:56.116418001 -0600
@@ -0,0 +1,369 @@
+/*
+ * Copyright (C) 2010-2014 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -234284,9 +234313,9 @@ diff -Nur linux-3.14.22.orig/sound/soc/fsl/imx-cs42888.c linux-3.14.22/sound/soc
+MODULE_DESCRIPTION("ALSA SoC cs42888 Machine Layer Driver");
+MODULE_ALIAS("platform:imx-cs42888");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/sound/soc/fsl/imx-hdmi.c linux-3.14.22/sound/soc/fsl/imx-hdmi.c
---- linux-3.14.22.orig/sound/soc/fsl/imx-hdmi.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/sound/soc/fsl/imx-hdmi.c 2014-10-22 14:55:56.854220001 -0500
+diff -Nur linux-3.14.14/sound/soc/fsl/imx-hdmi.c linux-imx6-3.14/sound/soc/fsl/imx-hdmi.c
+--- linux-3.14.14/sound/soc/fsl/imx-hdmi.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/sound/soc/fsl/imx-hdmi.c 2014-12-08 00:31:56.116418001 -0600
@@ -0,0 +1,113 @@
+/*
+ * ASoC HDMI Transmitter driver for IMX development boards
@@ -234401,9 +234430,9 @@ diff -Nur linux-3.14.22.orig/sound/soc/fsl/imx-hdmi.c linux-3.14.22/sound/soc/fs
+MODULE_DESCRIPTION("IMX HDMI TX ASoC driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:imx-audio-hdmi");
-diff -Nur linux-3.14.22.orig/sound/soc/fsl/imx-hdmi-dma.c linux-3.14.22/sound/soc/fsl/imx-hdmi-dma.c
---- linux-3.14.22.orig/sound/soc/fsl/imx-hdmi-dma.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/sound/soc/fsl/imx-hdmi-dma.c 2014-10-22 14:55:56.854220001 -0500
+diff -Nur linux-3.14.14/sound/soc/fsl/imx-hdmi-dma.c linux-imx6-3.14/sound/soc/fsl/imx-hdmi-dma.c
+--- linux-3.14.14/sound/soc/fsl/imx-hdmi-dma.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/sound/soc/fsl/imx-hdmi-dma.c 2014-12-08 00:31:56.116418001 -0600
@@ -0,0 +1,1240 @@
+/*
+ * imx-hdmi-dma.c -- HDMI DMA driver for ALSA Soc Audio Layer
@@ -235645,9 +235674,9 @@ diff -Nur linux-3.14.22.orig/sound/soc/fsl/imx-hdmi-dma.c linux-3.14.22/sound/so
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("i.MX HDMI audio DMA");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.14.22.orig/sound/soc/fsl/imx-hdmi.h linux-3.14.22/sound/soc/fsl/imx-hdmi.h
---- linux-3.14.22.orig/sound/soc/fsl/imx-hdmi.h 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/sound/soc/fsl/imx-hdmi.h 2014-10-22 14:55:56.854220001 -0500
+diff -Nur linux-3.14.14/sound/soc/fsl/imx-hdmi.h linux-imx6-3.14/sound/soc/fsl/imx-hdmi.h
+--- linux-3.14.14/sound/soc/fsl/imx-hdmi.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/sound/soc/fsl/imx-hdmi.h 2014-12-08 00:31:56.116418001 -0600
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc.
@@ -235754,9 +235783,9 @@ diff -Nur linux-3.14.22.orig/sound/soc/fsl/imx-hdmi.h linux-3.14.22/sound/soc/fs
+ } while (0)
+
+#endif /* __IMX_HDMI_H */
-diff -Nur linux-3.14.22.orig/sound/soc/fsl/imx-pcm-dma.c linux-3.14.22/sound/soc/fsl/imx-pcm-dma.c
---- linux-3.14.22.orig/sound/soc/fsl/imx-pcm-dma.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/sound/soc/fsl/imx-pcm-dma.c 2014-10-22 14:55:56.854220001 -0500
+diff -Nur linux-3.14.14/sound/soc/fsl/imx-pcm-dma.c linux-imx6-3.14/sound/soc/fsl/imx-pcm-dma.c
+--- linux-3.14.14/sound/soc/fsl/imx-pcm-dma.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/sound/soc/fsl/imx-pcm-dma.c 2014-12-08 00:31:56.116418001 -0600
@@ -11,6 +11,10 @@
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
@@ -235884,9 +235913,9 @@ diff -Nur linux-3.14.22.orig/sound/soc/fsl/imx-pcm-dma.c linux-3.14.22/sound/soc
}
EXPORT_SYMBOL_GPL(imx_pcm_dma_init);
-diff -Nur linux-3.14.22.orig/sound/soc/fsl/imx-pcm.h linux-3.14.22/sound/soc/fsl/imx-pcm.h
---- linux-3.14.22.orig/sound/soc/fsl/imx-pcm.h 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/sound/soc/fsl/imx-pcm.h 2014-10-22 14:55:56.854220001 -0500
+diff -Nur linux-3.14.14/sound/soc/fsl/imx-pcm.h linux-imx6-3.14/sound/soc/fsl/imx-pcm.h
+--- linux-3.14.14/sound/soc/fsl/imx-pcm.h 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/sound/soc/fsl/imx-pcm.h 2014-12-08 00:31:56.116418001 -0600
@@ -18,13 +18,17 @@
/*
* Do not change this as the FIQ handler depends on this size
@@ -235919,9 +235948,9 @@ diff -Nur linux-3.14.22.orig/sound/soc/fsl/imx-pcm.h linux-3.14.22/sound/soc/fsl
{
return -ENODEV;
}
-diff -Nur linux-3.14.22.orig/sound/soc/fsl/imx-spdif.c linux-3.14.22/sound/soc/fsl/imx-spdif.c
---- linux-3.14.22.orig/sound/soc/fsl/imx-spdif.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/sound/soc/fsl/imx-spdif.c 2014-10-22 14:55:56.854220001 -0500
+diff -Nur linux-3.14.14/sound/soc/fsl/imx-spdif.c linux-imx6-3.14/sound/soc/fsl/imx-spdif.c
+--- linux-3.14.14/sound/soc/fsl/imx-spdif.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/sound/soc/fsl/imx-spdif.c 2014-12-08 00:31:56.116418001 -0600
@@ -65,14 +65,15 @@
if (ret)
goto end;
@@ -235948,9 +235977,9 @@ diff -Nur linux-3.14.22.orig/sound/soc/fsl/imx-spdif.c linux-3.14.22/sound/soc/f
.of_match_table = imx_spdif_dt_ids,
},
.probe = imx_spdif_audio_probe,
-diff -Nur linux-3.14.22.orig/sound/soc/fsl/imx-ssi.c linux-3.14.22/sound/soc/fsl/imx-ssi.c
---- linux-3.14.22.orig/sound/soc/fsl/imx-ssi.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/sound/soc/fsl/imx-ssi.c 2014-10-22 14:55:56.854220001 -0500
+diff -Nur linux-3.14.14/sound/soc/fsl/imx-ssi.c linux-imx6-3.14/sound/soc/fsl/imx-ssi.c
+--- linux-3.14.14/sound/soc/fsl/imx-ssi.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/sound/soc/fsl/imx-ssi.c 2014-12-08 00:31:56.116418001 -0600
@@ -602,7 +602,8 @@
ssi->fiq_params.dma_params_tx = &ssi->dma_params_tx;
@@ -235961,9 +235990,9 @@ diff -Nur linux-3.14.22.orig/sound/soc/fsl/imx-ssi.c linux-3.14.22/sound/soc/fsl
if (ssi->fiq_init && ssi->dma_init) {
ret = ssi->fiq_init;
-diff -Nur linux-3.14.22.orig/sound/soc/fsl/imx-wm8962.c linux-3.14.22/sound/soc/fsl/imx-wm8962.c
---- linux-3.14.22.orig/sound/soc/fsl/imx-wm8962.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/sound/soc/fsl/imx-wm8962.c 2014-10-22 14:55:56.854220001 -0500
+diff -Nur linux-3.14.14/sound/soc/fsl/imx-wm8962.c linux-imx6-3.14/sound/soc/fsl/imx-wm8962.c
+--- linux-3.14.14/sound/soc/fsl/imx-wm8962.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/sound/soc/fsl/imx-wm8962.c 2014-12-08 00:31:56.116418001 -0600
@@ -1,9 +1,9 @@
/*
- * Copyright 2013 Freescale Semiconductor, Inc.
@@ -236408,9 +236437,9 @@ diff -Nur linux-3.14.22.orig/sound/soc/fsl/imx-wm8962.c linux-3.14.22/sound/soc/
return 0;
}
-diff -Nur linux-3.14.22.orig/sound/soc/fsl/Kconfig linux-3.14.22/sound/soc/fsl/Kconfig
---- linux-3.14.22.orig/sound/soc/fsl/Kconfig 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/sound/soc/fsl/Kconfig 2014-10-22 14:55:56.854220001 -0500
+diff -Nur linux-3.14.14/sound/soc/fsl/Kconfig linux-imx6-3.14/sound/soc/fsl/Kconfig
+--- linux-3.14.14/sound/soc/fsl/Kconfig 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/sound/soc/fsl/Kconfig 2014-12-08 00:31:56.116418001 -0600
@@ -11,6 +11,12 @@
config SND_SOC_FSL_ESAI
tristate
@@ -236473,9 +236502,9 @@ diff -Nur linux-3.14.22.orig/sound/soc/fsl/Kconfig linux-3.14.22/sound/soc/fsl/K
config SND_SOC_IMX_MC13783
tristate "SoC Audio support for I.MX boards with mc13783"
depends on MFD_MC13XXX && ARM
-diff -Nur linux-3.14.22.orig/sound/soc/fsl/Makefile linux-3.14.22/sound/soc/fsl/Makefile
---- linux-3.14.22.orig/sound/soc/fsl/Makefile 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/sound/soc/fsl/Makefile 2014-10-22 14:55:56.854220001 -0500
+diff -Nur linux-3.14.14/sound/soc/fsl/Makefile linux-imx6-3.14/sound/soc/fsl/Makefile
+--- linux-3.14.14/sound/soc/fsl/Makefile 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/sound/soc/fsl/Makefile 2014-12-08 00:31:56.116418001 -0600
@@ -14,13 +14,19 @@
snd-soc-fsl-sai-objs := fsl_sai.o
snd-soc-fsl-ssi-objs := fsl_ssi.o
@@ -236524,9 +236553,9 @@ diff -Nur linux-3.14.22.orig/sound/soc/fsl/Makefile linux-3.14.22/sound/soc/fsl/
obj-$(CONFIG_SND_SOC_IMX_SPDIF) += snd-soc-imx-spdif.o
+obj-$(CONFIG_SND_SOC_IMX_HDMI) += snd-soc-imx-hdmi.o
obj-$(CONFIG_SND_SOC_IMX_MC13783) += snd-soc-imx-mc13783.o
-diff -Nur linux-3.14.22.orig/sound/soc/soc-pcm.c linux-3.14.22/sound/soc/soc-pcm.c
---- linux-3.14.22.orig/sound/soc/soc-pcm.c 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/sound/soc/soc-pcm.c 2014-10-22 14:55:56.854220001 -0500
+diff -Nur linux-3.14.14/sound/soc/soc-pcm.c linux-imx6-3.14/sound/soc/soc-pcm.c
+--- linux-3.14.14/sound/soc/soc-pcm.c 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/sound/soc/soc-pcm.c 2014-12-08 00:31:56.132418001 -0600
@@ -945,7 +945,7 @@
}
}