summaryrefslogtreecommitdiff
path: root/target/arm
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-16 16:01:29 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-16 16:01:29 +0200
commit45fb984290b5c0fe88ac5716f40e825e87c9ddee (patch)
treeac7dccc6bffdf282962cfe6d45705a499f396f91 /target/arm
parent6dd7b5873803da595b6e1c6cc7b6f003ba1c095a (diff)
fix audio driver build
Diffstat (limited to 'target/arm')
-rw-r--r--target/arm/cubox-i/patches/3.10.30/linux4kix.patch2801
-rw-r--r--target/arm/cubox-i/patches/3.10.30/snd-soc.patch43
2 files changed, 1281 insertions, 1563 deletions
diff --git a/target/arm/cubox-i/patches/3.10.30/linux4kix.patch b/target/arm/cubox-i/patches/3.10.30/linux4kix.patch
index 50ed15121..bf1fe6eaa 100644
--- a/target/arm/cubox-i/patches/3.10.30/linux4kix.patch
+++ b/target/arm/cubox-i/patches/3.10.30/linux4kix.patch
@@ -1,6 +1,6 @@
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/clcd-panels.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/clcd-panels.dtsi
--- linux-3.10.30.orig/arch/arm/boot/dts/clcd-panels.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/clcd-panels.dtsi 2014-05-15 20:33:34.137841852 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/clcd-panels.dtsi 2014-05-16 15:28:19.605375946 +0200
@@ -0,0 +1,52 @@
+/*
+ * ARM Ltd. Versatile Express
@@ -56,7 +56,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/clcd-panels.dtsi linux-linaro-sta
+};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/exynos5440.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/exynos5440.dtsi
--- linux-3.10.30.orig/arch/arm/boot/dts/exynos5440.dtsi 2014-02-13 22:48:15.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/exynos5440.dtsi 2014-05-15 20:33:34.169842082 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/exynos5440.dtsi 2014-05-16 15:28:19.609375967 +0200
@@ -113,7 +113,7 @@
clock-names = "spi", "spi_busclk0";
};
@@ -113,7 +113,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/exynos5440.dtsi linux-linaro-stab
};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/exynos5440-ssdk5440.dts linux-linaro-stable-mx6/arch/arm/boot/dts/exynos5440-ssdk5440.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/exynos5440-ssdk5440.dts 2014-02-13 22:48:15.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/exynos5440-ssdk5440.dts 2014-05-15 20:33:34.169842082 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/exynos5440-ssdk5440.dts 2014-05-16 15:28:19.609375967 +0200
@@ -30,4 +30,12 @@
clock-frequency = <50000000>;
};
@@ -129,7 +129,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/exynos5440-ssdk5440.dts linux-lin
};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx23.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx23.dtsi
--- linux-3.10.30.orig/arch/arm/boot/dts/imx23.dtsi 2014-02-13 22:48:15.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx23.dtsi 2014-05-15 20:33:34.173842112 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx23.dtsi 2014-05-16 15:28:19.609375967 +0200
@@ -20,6 +20,7 @@
gpio2 = &gpio2;
serial0 = &auart0;
@@ -150,7 +150,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx23.dtsi linux-linaro-stable-mx
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx28.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx28.dtsi
--- linux-3.10.30.orig/arch/arm/boot/dts/imx28.dtsi 2014-02-13 22:48:15.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx28.dtsi 2014-05-15 20:33:34.189842227 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx28.dtsi 2014-05-16 15:28:19.609375967 +0200
@@ -29,6 +29,8 @@
serial4 = &auart4;
ethernet0 = &mac0;
@@ -172,7 +172,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx28.dtsi linux-linaro-stable-mx
status = "disabled";
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx53.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx53.dtsi
--- linux-3.10.30.orig/arch/arm/boot/dts/imx53.dtsi 2014-02-13 22:48:15.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx53.dtsi 2014-05-15 20:33:34.209842371 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx53.dtsi 2014-05-16 15:28:19.613375988 +0200
@@ -782,5 +782,10 @@
status = "disabled";
};
@@ -186,7 +186,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx53.dtsi linux-linaro-stable-mx
};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-cubox-i.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-cubox-i.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-cubox-i.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-cubox-i.dts 2014-05-15 20:33:34.209842371 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-cubox-i.dts 2014-05-16 15:28:19.613375988 +0200
@@ -0,0 +1,12 @@
+/*
+ * Copyright (C) 2014 Russell King
@@ -202,7 +202,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-cubox-i.dts linux-linaro-s
+};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl.dtsi
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6dl.dtsi 2014-02-13 22:48:15.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl.dtsi 2014-05-15 20:33:34.209842371 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl.dtsi 2014-05-16 15:28:19.613375988 +0200
@@ -8,19 +8,39 @@
*
*/
@@ -562,7 +562,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl.dtsi linux-linaro-stable-m
+};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-hummingboard.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-hummingboard.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-hummingboard.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-hummingboard.dts 2014-05-15 20:33:34.209842371 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-hummingboard.dts 2014-05-16 15:28:19.613375988 +0200
@@ -0,0 +1,258 @@
+/*
+ * Copyright (C) 2013 Russell King
@@ -824,7 +824,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-hummingboard.dts linux-lin
+};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-pinfunc.h linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-pinfunc.h
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-pinfunc.h 2014-02-13 22:48:15.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-pinfunc.h 2014-05-15 20:33:34.209842371 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-pinfunc.h 2014-05-16 15:28:19.613375988 +0200
@@ -14,1072 +14,1076 @@
* The pin function ID is a tuple of
* <mux_reg conf_reg input_reg mux_mode input_val>
@@ -2971,7 +2971,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-pinfunc.h linux-linaro-sta
#endif /* __DTS_IMX6DL_PINFUNC_H */
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabreauto.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabreauto.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabreauto.dts 2014-02-13 22:48:15.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabreauto.dts 2014-05-15 20:33:34.209842371 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabreauto.dts 2014-05-16 15:28:19.613375988 +0200
@@ -16,16 +16,15 @@
compatible = "fsl,imx6dl-sabreauto", "fsl,imx6dl";
};
@@ -3001,7 +3001,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabreauto.dts linux-linaro
};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabreauto-ecspi.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabreauto-ecspi.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabreauto-ecspi.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabreauto-ecspi.dts 2014-05-15 20:33:34.209842371 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabreauto-ecspi.dts 2014-05-16 15:28:19.613375988 +0200
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -3043,7 +3043,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabreauto-ecspi.dts linux-
+};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts 2014-05-15 20:33:34.209842371 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts 2014-05-16 15:28:19.613375988 +0200
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -3065,7 +3065,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts lin
+};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabreauto-gpmi-weim.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabreauto-gpmi-weim.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabreauto-gpmi-weim.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabreauto-gpmi-weim.dts 2014-05-15 20:33:34.209842371 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabreauto-gpmi-weim.dts 2014-05-16 15:28:19.613375988 +0200
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -3116,7 +3116,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabreauto-gpmi-weim.dts li
+};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabresd.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabresd.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabresd.dts 2014-02-13 22:48:15.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabresd.dts 2014-05-15 20:33:34.209842371 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabresd.dts 2014-05-16 15:28:19.613375988 +0200
@@ -16,20 +16,126 @@
compatible = "fsl,imx6dl-sabresd", "fsl,imx6dl";
};
@@ -3254,7 +3254,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabresd.dts linux-linaro-s
+
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts 2014-05-15 20:33:34.209842371 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts 2014-05-16 15:28:19.613375988 +0200
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -3277,7 +3277,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts linux-lin
+};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabresd-ldo.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabresd-ldo.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabresd-ldo.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabresd-ldo.dts 2014-05-15 20:33:34.209842371 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-sabresd-ldo.dts 2014-05-16 15:28:19.613375988 +0200
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -3310,7 +3310,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabresd-ldo.dts linux-lina
+};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-wandboard.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-wandboard.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-wandboard.dts 2014-02-13 22:48:15.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-wandboard.dts 2014-05-15 20:33:34.209842371 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl-wandboard.dts 2014-05-16 15:28:19.613375988 +0200
@@ -10,6 +10,7 @@
*/
/dts-v1/;
@@ -3348,7 +3348,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-wandboard.dts linux-linaro
-};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-arm2.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-arm2.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6q-arm2.dts 2014-02-13 22:48:15.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-arm2.dts 2014-05-15 20:33:34.209842371 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-arm2.dts 2014-05-16 15:28:19.613375988 +0200
@@ -31,6 +31,15 @@
regulator-max-microvolt = <3300000>;
regulator-always-on;
@@ -3449,7 +3449,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-arm2.dts linux-linaro-stabl
pinctrl-0 = <&pinctrl_uart4_1>;
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-cubox-i.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-cubox-i.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6q-cubox-i.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-cubox-i.dts 2014-05-15 20:33:34.209842371 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-cubox-i.dts 2014-05-16 15:28:19.613375988 +0200
@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2014 Russell King
@@ -3469,7 +3469,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-cubox-i.dts linux-linaro-st
+};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2014-05-15 20:33:34.213842400 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2014-05-16 15:28:19.613375988 +0200
@@ -0,0 +1,289 @@
+/*
+ * Copyright (C) 2014 Russell King
@@ -3762,7 +3762,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-linaro
+};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6qdl.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl.dtsi
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6qdl.dtsi 2014-02-13 22:48:15.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl.dtsi 2014-05-15 20:33:34.213842400 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl.dtsi 2014-05-16 15:28:19.617376010 +0200
@@ -11,14 +11,12 @@
*/
@@ -5102,7 +5102,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6qdl.dtsi linux-linaro-stable-
};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi 2014-05-15 20:33:34.213842400 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi 2014-05-16 15:28:19.613375988 +0200
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2013 Russell King
@@ -5164,7 +5164,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi linu
+};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6qdl-microsom.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-microsom.dtsi
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6qdl-microsom.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2014-05-15 20:33:34.213842400 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2014-05-16 15:28:19.613375988 +0200
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2013,2014 Russell King
@@ -5288,7 +5288,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6qdl-microsom.dtsi linux-linar
+};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi 2014-02-13 22:48:15.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi 2014-05-15 20:33:34.213842400 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi 2014-05-16 15:28:19.613375988 +0200
@@ -11,9 +11,282 @@
*/
@@ -5985,7 +5985,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi linux-lina
+};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2014-02-13 22:48:15.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2014-05-15 20:33:34.213842400 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2014-05-16 15:28:19.613375988 +0200
@@ -11,10 +11,30 @@
*/
@@ -6720,7 +6720,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-linaro
+};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q.dtsi
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6q.dtsi 2014-02-13 22:48:15.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q.dtsi 2014-05-15 20:33:34.213842400 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q.dtsi 2014-05-16 15:28:19.613375988 +0200
@@ -8,15 +8,19 @@
*
*/
@@ -7201,7 +7201,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q.dtsi linux-linaro-stable-mx
};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-pinfunc.h linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-pinfunc.h
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6q-pinfunc.h 2014-02-13 22:48:15.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-pinfunc.h 2014-05-15 20:33:34.209842371 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-pinfunc.h 2014-05-16 15:28:19.613375988 +0200
@@ -14,1028 +14,1032 @@
* The pin function ID is a tuple of
* <mux_reg conf_reg input_reg mux_mode input_val>
@@ -9260,7 +9260,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-pinfunc.h linux-linaro-stab
#endif /* __DTS_IMX6Q_PINFUNC_H */
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabreauto.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabreauto.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabreauto.dts 2014-02-13 22:48:15.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabreauto.dts 2014-05-15 20:33:34.213842400 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabreauto.dts 2014-05-16 15:28:19.613375988 +0200
@@ -20,16 +20,22 @@
compatible = "fsl,imx6q-sabreauto", "fsl,imx6q";
};
@@ -9297,7 +9297,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabreauto.dts linux-linaro-
};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabreauto-ecspi.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabreauto-ecspi.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabreauto-ecspi.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabreauto-ecspi.dts 2014-05-15 20:33:34.209842371 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabreauto-ecspi.dts 2014-05-16 15:28:19.613375988 +0200
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -9340,7 +9340,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabreauto-ecspi.dts linux-l
+};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts 2014-05-15 20:33:34.213842400 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts 2014-05-16 15:28:19.613375988 +0200
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -9362,7 +9362,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts linu
+};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts 2014-05-15 20:33:34.213842400 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts 2014-05-16 15:28:19.613375988 +0200
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -9414,7 +9414,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts lin
+};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabrelite.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabrelite.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabrelite.dts 2014-02-13 22:48:15.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabrelite.dts 2014-05-15 20:33:34.213842400 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabrelite.dts 2014-05-16 15:28:19.613375988 +0200
@@ -65,6 +65,12 @@
};
};
@@ -9578,7 +9578,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabrelite.dts linux-linaro-
-};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabresd.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabresd.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabresd.dts 2014-02-13 22:48:15.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabresd.dts 2014-05-15 20:33:34.213842400 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabresd.dts 2014-05-16 15:28:19.613375988 +0200
@@ -20,20 +20,32 @@
compatible = "fsl,imx6q-sabresd", "fsl,imx6q";
};
@@ -9630,7 +9630,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabresd.dts linux-linaro-st
};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts 2014-05-15 20:33:34.213842400 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts 2014-05-16 15:28:19.613375988 +0200
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2012-2013 Freescale Semiconductor, Inc.
@@ -9657,7 +9657,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts linux-lina
+};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabresd-ldo.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabresd-ldo.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabresd-ldo.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabresd-ldo.dts 2014-05-15 20:33:34.213842400 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q-sabresd-ldo.dts 2014-05-16 15:28:19.613375988 +0200
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2012 Freescale Semiconductor, Inc.
@@ -9695,7 +9695,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabresd-ldo.dts linux-linar
+};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6sl.dtsi
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6sl.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6sl.dtsi 2014-05-15 20:33:34.217842428 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6sl.dtsi 2014-05-16 15:28:19.617376010 +0200
@@ -0,0 +1,1255 @@
+/*
+ * Copyright 2013 Freescale Semiconductor, Inc.
@@ -10954,7 +10954,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-m
+};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6sl-evk-csi.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6sl-evk-csi.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6sl-evk-csi.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6sl-evk-csi.dts 2014-05-15 20:33:34.213842400 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6sl-evk-csi.dts 2014-05-16 15:28:19.617376010 +0200
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -10985,7 +10985,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6sl-evk-csi.dts linux-linaro-s
+};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6sl-evk.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6sl-evk.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6sl-evk.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6sl-evk.dts 2014-05-15 20:33:34.213842400 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6sl-evk.dts 2014-05-16 15:28:19.617376010 +0200
@@ -0,0 +1,604 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -11593,7 +11593,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6sl-evk.dts linux-linaro-stabl
+};
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6sl-evk-ldo.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx6sl-evk-ldo.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/imx6sl-evk-ldo.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6sl-evk-ldo.dts 2014-05-15 20:33:34.213842400 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx6sl-evk-ldo.dts 2014-05-16 15:28:19.617376010 +0200
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -11620,334 +11620,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6sl-evk-ldo.dts linux-linaro-s
+&gpu {
+ pu-supply = <&reg_pu>; /* ldo-bypass:use pu_dummy if VDDSOC share with VDDPU */
+};
-diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/include/dt-bindings/clock/imx6sl-clock.h linux-linaro-stable-mx6/arch/arm/boot/dts/include/dt-bindings/clock/imx6sl-clock.h
---- linux-3.10.30.orig/arch/arm/boot/dts/include/dt-bindings/clock/imx6sl-clock.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/include/dt-bindings/clock/imx6sl-clock.h 2014-05-15 20:34:14.046129478 +0200
-@@ -0,0 +1,152 @@
-+/*
-+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ */
-+
-+#ifndef __DT_BINDINGS_CLOCK_IMX6SL_H
-+#define __DT_BINDINGS_CLOCK_IMX6SL_H
-+
-+#define IMX6SL_CLK_DUMMY 0
-+#define IMX6SL_CLK_CKIL 1
-+#define IMX6SL_CLK_OSC 2
-+#define IMX6SL_CLK_PLL1_SYS 3
-+#define IMX6SL_CLK_PLL2_BUS 4
-+#define IMX6SL_CLK_PLL3_USB_OTG 5
-+#define IMX6SL_CLK_PLL4_AUDIO 6
-+#define IMX6SL_CLK_PLL5_VIDEO 7
-+#define IMX6SL_CLK_PLL6_ENET 8
-+#define IMX6SL_CLK_PLL7_USB_HOST 9
-+#define IMX6SL_CLK_USBPHY1 10
-+#define IMX6SL_CLK_USBPHY2 11
-+#define IMX6SL_CLK_USBPHY1_GATE 12
-+#define IMX6SL_CLK_USBPHY2_GATE 13
-+#define IMX6SL_CLK_PLL4_POST_DIV 14
-+#define IMX6SL_CLK_PLL5_POST_DIV 15
-+#define IMX6SL_CLK_PLL5_VIDEO_DIV 16
-+#define IMX6SL_CLK_ENET_REF 17
-+#define IMX6SL_CLK_PLL2_PFD0 18
-+#define IMX6SL_CLK_PLL2_PFD1 19
-+#define IMX6SL_CLK_PLL2_PFD2 20
-+#define IMX6SL_CLK_PLL3_PFD0 21
-+#define IMX6SL_CLK_PLL3_PFD1 22
-+#define IMX6SL_CLK_PLL3_PFD2 23
-+#define IMX6SL_CLK_PLL3_PFD3 24
-+#define IMX6SL_CLK_PLL2_198M 25
-+#define IMX6SL_CLK_PLL3_120M 26
-+#define IMX6SL_CLK_PLL3_80M 27
-+#define IMX6SL_CLK_PLL3_60M 28
-+#define IMX6SL_CLK_STEP 29
-+#define IMX6SL_CLK_PLL1_SW 30
-+#define IMX6SL_CLK_OCRAM_ALT_SEL 31
-+#define IMX6SL_CLK_OCRAM_SEL 32
-+#define IMX6SL_CLK_PRE_PERIPH2_SEL 33
-+#define IMX6SL_CLK_PRE_PERIPH_SEL 34
-+#define IMX6SL_CLK_PERIPH2_CLK2_SEL 35
-+#define IMX6SL_CLK_PERIPH_CLK2_SEL 36
-+#define IMX6SL_CLK_CSI_SEL 37
-+#define IMX6SL_CLK_LCDIF_AXI_SEL 38
-+#define IMX6SL_CLK_USDHC1_SEL 39
-+#define IMX6SL_CLK_USDHC2_SEL 40
-+#define IMX6SL_CLK_USDHC3_SEL 41
-+#define IMX6SL_CLK_USDHC4_SEL 42
-+#define IMX6SL_CLK_SSI1_SEL 43
-+#define IMX6SL_CLK_SSI2_SEL 44
-+#define IMX6SL_CLK_SSI3_SEL 45
-+#define IMX6SL_CLK_PERCLK_SEL 46
-+#define IMX6SL_CLK_PXP_AXI_SEL 47
-+#define IMX6SL_CLK_EPDC_AXI_SEL 48
-+#define IMX6SL_CLK_GPU2D_OVG_SEL 49
-+#define IMX6SL_CLK_GPU2D_SEL 50
-+#define IMX6SL_CLK_LCDIF_PIX_SEL 51
-+#define IMX6SL_CLK_EPDC_PIX_SEL 52
-+#define IMX6SL_CLK_SPDIF0_SEL 53
-+#define IMX6SL_CLK_SPDIF1_SEL 54
-+#define IMX6SL_CLK_EXTERN_AUDIO_SEL 55
-+#define IMX6SL_CLK_ECSPI_SEL 56
-+#define IMX6SL_CLK_UART_SEL 57
-+#define IMX6SL_CLK_PERIPH 58
-+#define IMX6SL_CLK_PERIPH2 59
-+#define IMX6SL_CLK_OCRAM_PODF 60
-+#define IMX6SL_CLK_PERIPH_CLK2 61
-+#define IMX6SL_CLK_PERIPH2_CLK2 62
-+#define IMX6SL_CLK_IPG 63
-+#define IMX6SL_CLK_CSI_PODF 64
-+#define IMX6SL_CLK_LCDIF_AXI_PODF 65
-+#define IMX6SL_CLK_USDHC1_PODF 66
-+#define IMX6SL_CLK_USDHC2_PODF 67
-+#define IMX6SL_CLK_USDHC3_PODF 68
-+#define IMX6SL_CLK_USDHC4_PODF 69
-+#define IMX6SL_CLK_SSI1_PRED 70
-+#define IMX6SL_CLK_SSI1_PODF 71
-+#define IMX6SL_CLK_SSI2_PRED 72
-+#define IMX6SL_CLK_SSI2_PODF 73
-+#define IMX6SL_CLK_SSI3_PRED 74
-+#define IMX6SL_CLK_SSI3_PODF 75
-+#define IMX6SL_CLK_PERCLK 76
-+#define IMX6SL_CLK_PXP_AXI_PODF 77
-+#define IMX6SL_CLK_EPDC_AXI_PODF 78
-+#define IMX6SL_CLK_GPU2D_OVG_PODF 79
-+#define IMX6SL_CLK_GPU2D_PODF 80
-+#define IMX6SL_CLK_LCDIF_PIX_PRED 81
-+#define IMX6SL_CLK_EPDC_PIX_PRED 82
-+#define IMX6SL_CLK_LCDIF_PIX_PODF 83
-+#define IMX6SL_CLK_EPDC_PIX_PODF 84
-+#define IMX6SL_CLK_SPDIF0_PRED 85
-+#define IMX6SL_CLK_SPDIF0_PODF 86
-+#define IMX6SL_CLK_SPDIF1_PRED 87
-+#define IMX6SL_CLK_SPDIF1_PODF 88
-+#define IMX6SL_CLK_EXTERN_AUDIO_PRED 89
-+#define IMX6SL_CLK_EXTERN_AUDIO_PODF 90
-+#define IMX6SL_CLK_ECSPI_ROOT 91
-+#define IMX6SL_CLK_UART_ROOT 92
-+#define IMX6SL_CLK_AHB 93
-+#define IMX6SL_CLK_MMDC_ROOT 94
-+#define IMX6SL_CLK_ARM 95
-+#define IMX6SL_CLK_ECSPI1 96
-+#define IMX6SL_CLK_ECSPI2 97
-+#define IMX6SL_CLK_ECSPI3 98
-+#define IMX6SL_CLK_ECSPI4 99
-+#define IMX6SL_CLK_EPIT1 100
-+#define IMX6SL_CLK_EPIT2 101
-+#define IMX6SL_CLK_EXTERN_AUDIO 102
-+#define IMX6SL_CLK_GPT 103
-+#define IMX6SL_CLK_GPT_SERIAL 104
-+#define IMX6SL_CLK_GPU2D_OVG 105
-+#define IMX6SL_CLK_I2C1 106
-+#define IMX6SL_CLK_I2C2 107
-+#define IMX6SL_CLK_I2C3 108
-+#define IMX6SL_CLK_OCOTP 109
-+#define IMX6SL_CLK_CSI 110
-+#define IMX6SL_CLK_PXP_AXI 111
-+#define IMX6SL_CLK_EPDC_AXI 112
-+#define IMX6SL_CLK_LCDIF_AXI 113
-+#define IMX6SL_CLK_LCDIF_PIX 114
-+#define IMX6SL_CLK_EPDC_PIX 115
-+#define IMX6SL_CLK_OCRAM 116
-+#define IMX6SL_CLK_PWM1 117
-+#define IMX6SL_CLK_PWM2 118
-+#define IMX6SL_CLK_PWM3 119
-+#define IMX6SL_CLK_PWM4 120
-+#define IMX6SL_CLK_SDMA 121
-+#define IMX6SL_CLK_SPDIF 122
-+#define IMX6SL_CLK_SSI1 123
-+#define IMX6SL_CLK_SSI2 124
-+#define IMX6SL_CLK_SSI3 125
-+#define IMX6SL_CLK_UART 126
-+#define IMX6SL_CLK_UART_SERIAL 127
-+#define IMX6SL_CLK_USBOH3 128
-+#define IMX6SL_CLK_USDHC1 129
-+#define IMX6SL_CLK_USDHC2 130
-+#define IMX6SL_CLK_USDHC3 131
-+#define IMX6SL_CLK_USDHC4 132
-+#define IMX6SL_CLK_PLL4_AUDIO_DIV 133
-+#define IMX6SL_CLK_ENET 134
-+#define IMX6SL_CLK_UART_OSC_4M 135
-+#define IMX6SL_CLK_SPBA 136
-+#define IMX6SL_CLK_CLK_END 137
-+
-+#endif /* __DT_BINDINGS_CLOCK_IMX6SL_H */
-diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/include/dt-bindings/clock/vf610-clock.h linux-linaro-stable-mx6/arch/arm/boot/dts/include/dt-bindings/clock/vf610-clock.h
---- linux-3.10.30.orig/arch/arm/boot/dts/include/dt-bindings/clock/vf610-clock.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/include/dt-bindings/clock/vf610-clock.h 2014-05-15 20:34:14.046129478 +0200
-@@ -0,0 +1,165 @@
-+/*
-+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ */
-+
-+#ifndef __DT_BINDINGS_CLOCK_VF610_H
-+#define __DT_BINDINGS_CLOCK_VF610_H
-+
-+#define VF610_CLK_DUMMY 0
-+#define VF610_CLK_SIRC_128K 1
-+#define VF610_CLK_SIRC_32K 2
-+#define VF610_CLK_FIRC 3
-+#define VF610_CLK_SXOSC 4
-+#define VF610_CLK_FXOSC 5
-+#define VF610_CLK_FXOSC_HALF 6
-+#define VF610_CLK_SLOW_CLK_SEL 7
-+#define VF610_CLK_FASK_CLK_SEL 8
-+#define VF610_CLK_AUDIO_EXT 9
-+#define VF610_CLK_ENET_EXT 10
-+#define VF610_CLK_PLL1_MAIN 11
-+#define VF610_CLK_PLL1_PFD1 12
-+#define VF610_CLK_PLL1_PFD2 13
-+#define VF610_CLK_PLL1_PFD3 14
-+#define VF610_CLK_PLL1_PFD4 15
-+#define VF610_CLK_PLL2_MAIN 16
-+#define VF610_CLK_PLL2_PFD1 17
-+#define VF610_CLK_PLL2_PFD2 18
-+#define VF610_CLK_PLL2_PFD3 19
-+#define VF610_CLK_PLL2_PFD4 20
-+#define VF610_CLK_PLL3_MAIN 21
-+#define VF610_CLK_PLL3_PFD1 22
-+#define VF610_CLK_PLL3_PFD2 23
-+#define VF610_CLK_PLL3_PFD3 24
-+#define VF610_CLK_PLL3_PFD4 25
-+#define VF610_CLK_PLL4_MAIN 26
-+#define VF610_CLK_PLL5_MAIN 27
-+#define VF610_CLK_PLL6_MAIN 28
-+#define VF610_CLK_PLL3_MAIN_DIV 29
-+#define VF610_CLK_PLL4_MAIN_DIV 30
-+#define VF610_CLK_PLL6_MAIN_DIV 31
-+#define VF610_CLK_PLL1_PFD_SEL 32
-+#define VF610_CLK_PLL2_PFD_SEL 33
-+#define VF610_CLK_SYS_SEL 34
-+#define VF610_CLK_DDR_SEL 35
-+#define VF610_CLK_SYS_BUS 36
-+#define VF610_CLK_PLATFORM_BUS 37
-+#define VF610_CLK_IPG_BUS 38
-+#define VF610_CLK_UART0 39
-+#define VF610_CLK_UART1 40
-+#define VF610_CLK_UART2 41
-+#define VF610_CLK_UART3 42
-+#define VF610_CLK_UART4 43
-+#define VF610_CLK_UART5 44
-+#define VF610_CLK_PIT 45
-+#define VF610_CLK_I2C0 46
-+#define VF610_CLK_I2C1 47
-+#define VF610_CLK_I2C2 48
-+#define VF610_CLK_I2C3 49
-+#define VF610_CLK_FTM0_EXT_SEL 50
-+#define VF610_CLK_FTM0_FIX_SEL 51
-+#define VF610_CLK_FTM0_EXT_FIX_EN 52
-+#define VF610_CLK_FTM1_EXT_SEL 53
-+#define VF610_CLK_FTM1_FIX_SEL 54
-+#define VF610_CLK_FTM1_EXT_FIX_EN 55
-+#define VF610_CLK_FTM2_EXT_SEL 56
-+#define VF610_CLK_FTM2_FIX_SEL 57
-+#define VF610_CLK_FTM2_EXT_FIX_EN 58
-+#define VF610_CLK_FTM3_EXT_SEL 59
-+#define VF610_CLK_FTM3_FIX_SEL 60
-+#define VF610_CLK_FTM3_EXT_FIX_EN 61
-+#define VF610_CLK_FTM0 62
-+#define VF610_CLK_FTM1 63
-+#define VF610_CLK_FTM2 64
-+#define VF610_CLK_FTM3 65
-+#define VF610_CLK_ENET_50M 66
-+#define VF610_CLK_ENET_25M 67
-+#define VF610_CLK_ENET_SEL 68
-+#define VF610_CLK_ENET 69
-+#define VF610_CLK_ENET_TS_SEL 70
-+#define VF610_CLK_ENET_TS 71
-+#define VF610_CLK_DSPI0 72
-+#define VF610_CLK_DSPI1 73
-+#define VF610_CLK_DSPI2 74
-+#define VF610_CLK_DSPI3 75
-+#define VF610_CLK_WDT 76
-+#define VF610_CLK_ESDHC0_SEL 77
-+#define VF610_CLK_ESDHC0_EN 78
-+#define VF610_CLK_ESDHC0_DIV 79
-+#define VF610_CLK_ESDHC0 80
-+#define VF610_CLK_ESDHC1_SEL 81
-+#define VF610_CLK_ESDHC1_EN 82
-+#define VF610_CLK_ESDHC1_DIV 83
-+#define VF610_CLK_ESDHC1 84
-+#define VF610_CLK_DCU0_SEL 85
-+#define VF610_CLK_DCU0_EN 86
-+#define VF610_CLK_DCU0_DIV 87
-+#define VF610_CLK_DCU0 88
-+#define VF610_CLK_DCU1_SEL 89
-+#define VF610_CLK_DCU1_EN 90
-+#define VF610_CLK_DCU1_DIV 91
-+#define VF610_CLK_DCU1 92
-+#define VF610_CLK_ESAI_SEL 93
-+#define VF610_CLK_ESAI_EN 94
-+#define VF610_CLK_ESAI_DIV 95
-+#define VF610_CLK_ESAI 96
-+#define VF610_CLK_SAI0_SEL 97
-+#define VF610_CLK_SAI0_EN 98
-+#define VF610_CLK_SAI0_DIV 99
-+#define VF610_CLK_SAI0 100
-+#define VF610_CLK_SAI1_SEL 101
-+#define VF610_CLK_SAI1_EN 102
-+#define VF610_CLK_SAI1_DIV 103
-+#define VF610_CLK_SAI1 104
-+#define VF610_CLK_SAI2_SEL 105
-+#define VF610_CLK_SAI2_EN 106
-+#define VF610_CLK_SAI2_DIV 107
-+#define VF610_CLK_SAI2 108
-+#define VF610_CLK_SAI3_SEL 109
-+#define VF610_CLK_SAI3_EN 110
-+#define VF610_CLK_SAI3_DIV 111
-+#define VF610_CLK_SAI3 112
-+#define VF610_CLK_USBC0 113
-+#define VF610_CLK_USBC1 114
-+#define VF610_CLK_QSPI0_SEL 115
-+#define VF610_CLK_QSPI0_EN 116
-+#define VF610_CLK_QSPI0_X4_DIV 117
-+#define VF610_CLK_QSPI0_X2_DIV 118
-+#define VF610_CLK_QSPI0_X1_DIV 119
-+#define VF610_CLK_QSPI1_SEL 120
-+#define VF610_CLK_QSPI1_EN 121
-+#define VF610_CLK_QSPI1_X4_DIV 122
-+#define VF610_CLK_QSPI1_X2_DIV 123
-+#define VF610_CLK_QSPI1_X1_DIV 124
-+#define VF610_CLK_QSPI0 125
-+#define VF610_CLK_QSPI1 126
-+#define VF610_CLK_NFC_SEL 127
-+#define VF610_CLK_NFC_EN 128
-+#define VF610_CLK_NFC_PRE_DIV 129
-+#define VF610_CLK_NFC_FRAC_DIV 130
-+#define VF610_CLK_NFC_INV 131
-+#define VF610_CLK_NFC 132
-+#define VF610_CLK_VADC_SEL 133
-+#define VF610_CLK_VADC_EN 134
-+#define VF610_CLK_VADC_DIV 135
-+#define VF610_CLK_VADC_DIV_HALF 136
-+#define VF610_CLK_VADC 137
-+#define VF610_CLK_ADC0 138
-+#define VF610_CLK_ADC1 139
-+#define VF610_CLK_DAC0 140
-+#define VF610_CLK_DAC1 141
-+#define VF610_CLK_FLEXCAN0 142
-+#define VF610_CLK_FLEXCAN1 143
-+#define VF610_CLK_ASRC 144
-+#define VF610_CLK_GPU_SEL 145
-+#define VF610_CLK_GPU_EN 146
-+#define VF610_CLK_GPU2D 147
-+#define VF610_CLK_ENET0 148
-+#define VF610_CLK_ENET1 149
-+#define VF610_CLK_END 150
-+
-+#endif /* __DT_BINDINGS_CLOCK_VF610_H */
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/Makefile linux-linaro-stable-mx6/arch/arm/boot/dts/Makefile
--- linux-3.10.30.orig/arch/arm/boot/dts/Makefile 2014-02-13 22:48:15.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/Makefile 2014-05-15 20:33:34.117841707 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/Makefile 2014-05-16 15:28:19.601375925 +0200
@@ -113,14 +113,31 @@
imx53-mba53.dtb \
imx53-qsb.dtb \
@@ -11999,7 +11674,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/Makefile linux-linaro-stable-mx6/
wm8505-ref.dtb \
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts 2014-05-15 20:33:34.241842601 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts 2014-05-16 15:28:19.621376031 +0200
@@ -0,0 +1,159 @@
+/*
+ * ARM Ltd. Fast Models
@@ -12162,7 +11837,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts linux-li
+/include/ "clcd-panels.dtsi"
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts 2014-05-15 20:33:34.241842601 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts 2014-05-16 15:28:19.621376031 +0200
@@ -0,0 +1,165 @@
+/*
+ * ARM Ltd. Fast Models
@@ -12331,7 +12006,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts linux-li
+/include/ "clcd-panels.dtsi"
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts 2014-05-15 20:33:34.241842601 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts 2014-05-16 15:28:19.621376031 +0200
@@ -0,0 +1,177 @@
+/*
+ * ARM Ltd. Fast Models
@@ -12512,7 +12187,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts linux-li
+/include/ "clcd-panels.dtsi"
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts 2014-05-15 20:33:34.241842601 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts 2014-05-16 15:28:19.621376031 +0200
@@ -0,0 +1,171 @@
+/*
+ * ARM Ltd. Fast Models
@@ -12687,7 +12362,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts linux-lin
+/include/ "clcd-panels.dtsi"
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts 2014-05-15 20:33:34.245842631 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts 2014-05-16 15:28:19.621376031 +0200
@@ -0,0 +1,183 @@
+/*
+ * ARM Ltd. Fast Models
@@ -12874,7 +12549,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts linux-lin
+/include/ "clcd-panels.dtsi"
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi
--- linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi 2014-05-15 20:33:34.249842659 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi 2014-05-16 15:28:19.621376031 +0200
@@ -0,0 +1,231 @@
+/*
+ * ARM Ltd. Fast Models
@@ -13109,7 +12784,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi linux-li
+ };
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts
--- linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts 1970-01-01 01:00:00.000000000 +0100
-+++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts 2014-05-15 20:33:34.249842659 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts 2014-05-16 15:28:19.621376031 +0200
@@ -0,0 +1,244 @@
+/*
+ * ARM Ltd. Fast Models
@@ -13357,7 +13032,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts linu
+/include/ "clcd-panels.dtsi"
diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts