diff options
Diffstat (limited to 'target/arm/cubox-i/patches/3.10.30')
| -rw-r--r-- | target/arm/cubox-i/patches/3.10.30/linux4kix.patch | 2801 | ||||
| -rw-r--r-- | target/arm/cubox-i/patches/3.10.30/snd-soc.patch | 43 |
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 = <®_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 --- linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts 2014-05-15 20:33:34.249842659 +0200 ++++ linux-linaro-stable-mx6/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts 2014-05-16 15:28:19.621376031 +0200 @@ -0,0 +1,358 @@ +/* + * ARM Ltd. Fast Models @@ -13719,7 +13394,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts linu +/include/ "clcd-panels.dtsi" diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vexpress-v2m.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2m.dtsi --- linux-3.10.30.orig/arch/arm/boot/dts/vexpress-v2m.dtsi 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2m.dtsi 2014-05-15 20:33:34.281842890 +0200 ++++ linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2m.dtsi 2014-05-16 15:28:19.629376073 +0200 @@ -227,6 +227,7 @@ }; @@ -13730,7 +13405,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vexpress-v2m.dtsi linux-linaro-st interrupts = <14>; diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi --- linux-3.10.30.orig/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi 2014-05-15 20:33:34.281842890 +0200 ++++ linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi 2014-05-16 15:28:19.629376073 +0200 @@ -228,6 +228,7 @@ }; @@ -13741,7 +13416,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi linux-linar interrupts = <14>; diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts --- linux-3.10.30.orig/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts 2014-05-15 20:33:34.281842890 +0200 ++++ linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts 2014-05-16 15:28:19.629376073 +0200 @@ -9,11 +9,13 @@ /dts-v1/; @@ -14000,7 +13675,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts linux-li arm,vexpress,config-bridge = <&v2m_sysreg>; diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts --- linux-3.10.30.orig/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts 2014-05-15 20:33:34.281842890 +0200 ++++ linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts 2014-05-16 15:28:19.629376073 +0200 @@ -9,6 +9,8 @@ /dts-v1/; @@ -14021,7 +13696,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts linux-l memory-controller@2b0a0000 { diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vexpress-v2p-ca5s.dts linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2p-ca5s.dts --- linux-3.10.30.orig/arch/arm/boot/dts/vexpress-v2p-ca5s.dts 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2p-ca5s.dts 2014-05-15 20:33:34.281842890 +0200 ++++ linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2p-ca5s.dts 2014-05-16 15:28:19.629376073 +0200 @@ -9,6 +9,8 @@ /dts-v1/; @@ -14042,7 +13717,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vexpress-v2p-ca5s.dts linux-linar memory-controller@2a150000 { diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vexpress-v2p-ca9.dts linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2p-ca9.dts --- linux-3.10.30.orig/arch/arm/boot/dts/vexpress-v2p-ca9.dts 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2p-ca9.dts 2014-05-15 20:33:34.281842890 +0200 ++++ linux-linaro-stable-mx6/arch/arm/boot/dts/vexpress-v2p-ca9.dts 2014-05-16 15:28:19.629376073 +0200 @@ -9,6 +9,8 @@ /dts-v1/; @@ -14063,7 +13738,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vexpress-v2p-ca9.dts linux-linaro memory-controller@100e0000 { diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vf610.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/vf610.dtsi --- linux-3.10.30.orig/arch/arm/boot/dts/vf610.dtsi 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/boot/dts/vf610.dtsi 2014-05-15 20:33:34.285842919 +0200 ++++ linux-linaro-stable-mx6/arch/arm/boot/dts/vf610.dtsi 2014-05-16 15:28:19.629376073 +0200 @@ -0,0 +1,464 @@ +/* + * Copyright 2013 Freescale Semiconductor, Inc. @@ -14531,7 +14206,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vf610.dtsi linux-linaro-stable-mx +}; diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vf610-pinfunc.h linux-linaro-stable-mx6/arch/arm/boot/dts/vf610-pinfunc.h --- linux-3.10.30.orig/arch/arm/boot/dts/vf610-pinfunc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/boot/dts/vf610-pinfunc.h 2014-05-15 20:33:34.285842919 +0200 ++++ linux-linaro-stable-mx6/arch/arm/boot/dts/vf610-pinfunc.h 2014-05-16 15:28:19.629376073 +0200 @@ -0,0 +1,810 @@ +/* + * Copyright 2013 Freescale Semiconductor, Inc. @@ -15345,7 +15020,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vf610-pinfunc.h linux-linaro-stab +#endif diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vf610-twr.dts linux-linaro-stable-mx6/arch/arm/boot/dts/vf610-twr.dts --- linux-3.10.30.orig/arch/arm/boot/dts/vf610-twr.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/boot/dts/vf610-twr.dts 2014-05-15 20:33:34.285842919 +0200 ++++ linux-linaro-stable-mx6/arch/arm/boot/dts/vf610-twr.dts 2014-05-16 15:28:19.629376073 +0200 @@ -0,0 +1,57 @@ +/* + * Copyright 2013 Freescale Semiconductor, Inc. @@ -15406,7 +15081,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vf610-twr.dts linux-linaro-stable +}; diff -Nur linux-3.10.30.orig/arch/arm/common/bL_switcher.c linux-linaro-stable-mx6/arch/arm/common/bL_switcher.c --- linux-3.10.30.orig/arch/arm/common/bL_switcher.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/common/bL_switcher.c 2014-05-15 20:33:34.301843035 +0200 ++++ linux-linaro-stable-mx6/arch/arm/common/bL_switcher.c 2014-05-16 15:28:19.629376073 +0200 @@ -0,0 +1,864 @@ +/* + * arch/arm/common/bL_switcher.c -- big.LITTLE cluster switcher core driver @@ -16274,7 +15949,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/common/bL_switcher.c linux-linaro-stable-m +late_initcall(bL_switcher_init); diff -Nur linux-3.10.30.orig/arch/arm/common/bL_switcher_dummy_if.c linux-linaro-stable-mx6/arch/arm/common/bL_switcher_dummy_if.c --- linux-3.10.30.orig/arch/arm/common/bL_switcher_dummy_if.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/common/bL_switcher_dummy_if.c 2014-05-15 20:33:34.301843035 +0200 ++++ linux-linaro-stable-mx6/arch/arm/common/bL_switcher_dummy_if.c 2014-05-16 15:28:19.629376073 +0200 @@ -0,0 +1,71 @@ +/* + * arch/arm/common/bL_switcher_dummy_if.c -- b.L switcher dummy interface @@ -16349,7 +16024,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/common/bL_switcher_dummy_if.c linux-linaro +module_exit(bL_switcher_dummy_if_exit); diff -Nur linux-3.10.30.orig/arch/arm/common/Makefile linux-linaro-stable-mx6/arch/arm/common/Makefile --- linux-3.10.30.orig/arch/arm/common/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/common/Makefile 2014-05-15 20:33:34.297843005 +0200 ++++ linux-linaro-stable-mx6/arch/arm/common/Makefile 2014-05-16 15:28:19.629376073 +0200 @@ -14,5 +14,9 @@ obj-$(CONFIG_PCI_HOST_ITE8152) += it8152.o obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp.o @@ -16362,7 +16037,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/common/Makefile linux-linaro-stable-mx6/ar +CFLAGS_REMOVE_mcpm_entry.o = -pg diff -Nur linux-3.10.30.orig/arch/arm/common/mcpm_entry.c linux-linaro-stable-mx6/arch/arm/common/mcpm_entry.c --- linux-3.10.30.orig/arch/arm/common/mcpm_entry.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/common/mcpm_entry.c 2014-05-15 20:33:34.301843035 +0200 ++++ linux-linaro-stable-mx6/arch/arm/common/mcpm_entry.c 2014-05-16 15:28:19.633376095 +0200 @@ -27,6 +27,18 @@ sync_cache_w(&mcpm_entry_vectors[cluster][cpu]); } @@ -16384,7 +16059,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/common/mcpm_entry.c linux-linaro-stable-mx int __init mcpm_platform_register(const struct mcpm_platform_ops *ops) diff -Nur linux-3.10.30.orig/arch/arm/common/mcpm_head.S linux-linaro-stable-mx6/arch/arm/common/mcpm_head.S --- linux-3.10.30.orig/arch/arm/common/mcpm_head.S 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/common/mcpm_head.S 2014-05-15 20:33:34.309843092 +0200 ++++ linux-linaro-stable-mx6/arch/arm/common/mcpm_head.S 2014-05-16 15:28:19.633376095 +0200 @@ -71,12 +71,19 @@ * position independent way. */ @@ -16429,7 +16104,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/common/mcpm_head.S linux-linaro-stable-mx6 .space 4 @ set by mcpm_sync_init() diff -Nur linux-3.10.30.orig/arch/arm/configs/imx_v6_v7_defconfig linux-linaro-stable-mx6/arch/arm/configs/imx_v6_v7_defconfig --- linux-3.10.30.orig/arch/arm/configs/imx_v6_v7_defconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/configs/imx_v6_v7_defconfig 2014-05-15 20:33:34.345843352 +0200 ++++ linux-linaro-stable-mx6/arch/arm/configs/imx_v6_v7_defconfig 2014-05-16 15:28:19.641376136 +0200 @@ -1,4 +1,3 @@ -CONFIG_EXPERIMENTAL=y # CONFIG_LOCALVERSION_AUTO is not set @@ -16677,7 +16352,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/configs/imx_v6_v7_defconfig linux-linaro-s CONFIG_NFS_FS=y diff -Nur linux-3.10.30.orig/arch/arm/configs/imx_v7_cubox-i_hummingboard_defconfig linux-linaro-stable-mx6/arch/arm/configs/imx_v7_cubox-i_hummingboard_defconfig --- linux-3.10.30.orig/arch/arm/configs/imx_v7_cubox-i_hummingboard_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/configs/imx_v7_cubox-i_hummingboard_defconfig 2014-05-15 20:33:34.345843352 +0200 ++++ linux-linaro-stable-mx6/arch/arm/configs/imx_v7_cubox-i_hummingboard_defconfig 2014-05-16 15:28:19.641376136 +0200 @@ -0,0 +1,384 @@ +CONFIG_KERNEL_LZO=y +CONFIG_SYSVIPC=y @@ -17065,7 +16740,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/configs/imx_v7_cubox-i_hummingboard_defcon +CONFIG_LIBCRC32C=m diff -Nur linux-3.10.30.orig/arch/arm/configs/imx_v7_defconfig linux-linaro-stable-mx6/arch/arm/configs/imx_v7_defconfig --- linux-3.10.30.orig/arch/arm/configs/imx_v7_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/configs/imx_v7_defconfig 2014-05-15 20:33:34.345843352 +0200 ++++ linux-linaro-stable-mx6/arch/arm/configs/imx_v7_defconfig 2014-05-16 15:28:19.641376136 +0200 @@ -0,0 +1,332 @@ +CONFIG_KERNEL_LZO=y +CONFIG_SYSVIPC=y @@ -17401,7 +17076,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/configs/imx_v7_defconfig linux-linaro-stab +CONFIG_LIBCRC32C=m diff -Nur linux-3.10.30.orig/arch/arm/configs/imx_v7_mfg_defconfig linux-linaro-stable-mx6/arch/arm/configs/imx_v7_mfg_defconfig --- linux-3.10.30.orig/arch/arm/configs/imx_v7_mfg_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/configs/imx_v7_mfg_defconfig 2014-05-15 20:33:34.345843352 +0200 ++++ linux-linaro-stable-mx6/arch/arm/configs/imx_v7_mfg_defconfig 2014-05-16 15:28:19.641376136 +0200 @@ -0,0 +1,341 @@ +CONFIG_KERNEL_LZO=y +CONFIG_SYSVIPC=y @@ -17746,7 +17421,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/configs/imx_v7_mfg_defconfig linux-linaro- +CONFIG_LIBCRC32C=m diff -Nur linux-3.10.30.orig/arch/arm/include/asm/arch_timer.h linux-linaro-stable-mx6/arch/arm/include/asm/arch_timer.h --- linux-3.10.30.orig/arch/arm/include/asm/arch_timer.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/include/asm/arch_timer.h 2014-05-15 20:33:34.393843699 +0200 ++++ linux-linaro-stable-mx6/arch/arm/include/asm/arch_timer.h 2014-05-16 15:28:19.653376199 +0200 @@ -96,7 +96,7 @@ asm volatile("mrc p15, 0, %0, c14, c1, 0" : "=r" (cntkctl)); @@ -17758,7 +17433,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/asm/arch_timer.h linux-linaro-stab } diff -Nur linux-3.10.30.orig/arch/arm/include/asm/bL_switcher.h linux-linaro-stable-mx6/arch/arm/include/asm/bL_switcher.h --- linux-3.10.30.orig/arch/arm/include/asm/bL_switcher.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/include/asm/bL_switcher.h 2014-05-15 20:33:34.393843699 +0200 ++++ linux-linaro-stable-mx6/arch/arm/include/asm/bL_switcher.h 2014-05-16 15:28:19.653376199 +0200 @@ -0,0 +1,83 @@ +/* + * arch/arm/include/asm/bL_switcher.h @@ -17845,7 +17520,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/asm/bL_switcher.h linux-linaro-sta +#endif diff -Nur linux-3.10.30.orig/arch/arm/include/asm/cacheflush.h linux-linaro-stable-mx6/arch/arm/include/asm/cacheflush.h --- linux-3.10.30.orig/arch/arm/include/asm/cacheflush.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/include/asm/cacheflush.h 2014-05-15 20:33:34.393843699 +0200 ++++ linux-linaro-stable-mx6/arch/arm/include/asm/cacheflush.h 2014-05-16 15:28:19.653376199 +0200 @@ -436,4 +436,50 @@ #define sync_cache_w(ptr) __sync_cache_range_w(ptr, sizeof *(ptr)) #define sync_cache_r(ptr) __sync_cache_range_r(ptr, sizeof *(ptr)) @@ -17899,7 +17574,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/asm/cacheflush.h linux-linaro-stab #endif diff -Nur linux-3.10.30.orig/arch/arm/include/asm/cp15.h linux-linaro-stable-mx6/arch/arm/include/asm/cp15.h --- linux-3.10.30.orig/arch/arm/include/asm/cp15.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/include/asm/cp15.h 2014-05-15 20:33:34.393843699 +0200 ++++ linux-linaro-stable-mx6/arch/arm/include/asm/cp15.h 2014-05-16 15:28:19.653376199 +0200 @@ -61,6 +61,20 @@ isb(); } @@ -17923,7 +17598,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/asm/cp15.h linux-linaro-stable-mx6 #endif diff -Nur linux-3.10.30.orig/arch/arm/include/asm/glue-cache.h linux-linaro-stable-mx6/arch/arm/include/asm/glue-cache.h --- linux-3.10.30.orig/arch/arm/include/asm/glue-cache.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/include/asm/glue-cache.h 2014-05-15 20:33:34.393843699 +0200 ++++ linux-linaro-stable-mx6/arch/arm/include/asm/glue-cache.h 2014-05-16 15:28:19.661376242 +0200 @@ -102,19 +102,19 @@ #endif @@ -17954,7 +17629,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/asm/glue-cache.h linux-linaro-stab #if !defined(_CACHE) && !defined(MULTI_CACHE) diff -Nur linux-3.10.30.orig/arch/arm/include/asm/hardirq.h linux-linaro-stable-mx6/arch/arm/include/asm/hardirq.h --- linux-3.10.30.orig/arch/arm/include/asm/hardirq.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/include/asm/hardirq.h 2014-05-15 20:33:34.417843871 +0200 ++++ linux-linaro-stable-mx6/arch/arm/include/asm/hardirq.h 2014-05-16 15:28:19.665376263 +0200 @@ -5,7 +5,7 @@ #include <linux/threads.h> #include <asm/irq.h> @@ -17966,7 +17641,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/asm/hardirq.h linux-linaro-stable- unsigned int __softirq_pending; diff -Nur linux-3.10.30.orig/arch/arm/include/asm/mach/arch.h linux-linaro-stable-mx6/arch/arm/include/asm/mach/arch.h --- linux-3.10.30.orig/arch/arm/include/asm/mach/arch.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/include/asm/mach/arch.h 2014-05-15 20:33:34.425843929 +0200 ++++ linux-linaro-stable-mx6/arch/arm/include/asm/mach/arch.h 2014-05-16 15:28:19.673376305 +0200 @@ -8,6 +8,8 @@ * published by the Free Software Foundation. */ @@ -17997,7 +17672,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/asm/mach/arch.h linux-linaro-stabl void (*reserve)(void);/* reserve mem blocks */ diff -Nur linux-3.10.30.orig/arch/arm/include/asm/mach/pci.h linux-linaro-stable-mx6/arch/arm/include/asm/mach/pci.h --- linux-3.10.30.orig/arch/arm/include/asm/mach/pci.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/include/asm/mach/pci.h 2014-05-15 20:33:34.449844101 +0200 ++++ linux-linaro-stable-mx6/arch/arm/include/asm/mach/pci.h 2014-05-16 15:28:19.673376305 +0200 @@ -35,6 +35,8 @@ resource_size_t start, resource_size_t size, @@ -18028,7 +17703,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/asm/mach/pci.h linux-linaro-stable #endif /* __ASM_MACH_PCI_H */ diff -Nur linux-3.10.30.orig/arch/arm/include/asm/mcpm.h linux-linaro-stable-mx6/arch/arm/include/asm/mcpm.h --- linux-3.10.30.orig/arch/arm/include/asm/mcpm.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/include/asm/mcpm.h 2014-05-15 20:33:34.449844101 +0200 ++++ linux-linaro-stable-mx6/arch/arm/include/asm/mcpm.h 2014-05-16 15:28:19.673376305 +0200 @@ -42,6 +42,14 @@ void mcpm_set_entry_vector(unsigned cpu, unsigned cluster, void *ptr); @@ -18046,7 +17721,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/asm/mcpm.h linux-linaro-stable-mx6 diff -Nur linux-3.10.30.orig/arch/arm/include/asm/pmu.h linux-linaro-stable-mx6/arch/arm/include/asm/pmu.h --- linux-3.10.30.orig/arch/arm/include/asm/pmu.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/include/asm/pmu.h 2014-05-15 20:33:34.469844246 +0200 ++++ linux-linaro-stable-mx6/arch/arm/include/asm/pmu.h 2014-05-16 15:28:19.677376326 +0200 @@ -62,9 +62,19 @@ raw_spinlock_t pmu_lock; }; @@ -18078,7 +17753,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/asm/pmu.h linux-linaro-stable-mx6/ struct mutex reserve_mutex; diff -Nur linux-3.10.30.orig/arch/arm/include/asm/psci.h linux-linaro-stable-mx6/arch/arm/include/asm/psci.h --- linux-3.10.30.orig/arch/arm/include/asm/psci.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/include/asm/psci.h 2014-05-15 20:33:34.481844332 +0200 ++++ linux-linaro-stable-mx6/arch/arm/include/asm/psci.h 2014-05-16 15:28:19.677376326 +0200 @@ -16,6 +16,10 @@ #define PSCI_POWER_STATE_TYPE_STANDBY 0 @@ -18115,7 +17790,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/asm/psci.h linux-linaro-stable-mx6 #endif /* __ASM_ARM_PSCI_H */ diff -Nur linux-3.10.30.orig/arch/arm/include/asm/smp.h linux-linaro-stable-mx6/arch/arm/include/asm/smp.h --- linux-3.10.30.orig/arch/arm/include/asm/smp.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/include/asm/smp.h 2014-05-15 20:33:34.481844332 +0200 ++++ linux-linaro-stable-mx6/arch/arm/include/asm/smp.h 2014-05-16 15:28:19.677376326 +0200 @@ -81,6 +81,8 @@ extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); extern void arch_send_wakeup_ipi_mask(const struct cpumask *mask); @@ -18127,7 +17802,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/asm/smp.h linux-linaro-stable-mx6/ /* diff -Nur linux-3.10.30.orig/arch/arm/include/asm/topology.h linux-linaro-stable-mx6/arch/arm/include/asm/topology.h --- linux-3.10.30.orig/arch/arm/include/asm/topology.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/include/asm/topology.h 2014-05-15 20:33:34.481844332 +0200 ++++ linux-linaro-stable-mx6/arch/arm/include/asm/topology.h 2014-05-16 15:28:19.677376326 +0200 @@ -26,11 +26,45 @@ void init_cpu_topology(void); void store_cpu_topology(unsigned int cpuid); @@ -18176,7 +17851,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/asm/topology.h linux-linaro-stable diff -Nur linux-3.10.30.orig/arch/arm/include/debug/imx-uart.h linux-linaro-stable-mx6/arch/arm/include/debug/imx-uart.h --- linux-3.10.30.orig/arch/arm/include/debug/imx-uart.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/include/debug/imx-uart.h 2014-05-15 20:33:34.493844419 +0200 ++++ linux-linaro-stable-mx6/arch/arm/include/debug/imx-uart.h 2014-05-16 15:28:19.681376347 +0200 @@ -65,6 +65,14 @@ #define IMX6Q_UART_BASE_ADDR(n) IMX6Q_UART##n##_BASE_ADDR #define IMX6Q_UART_BASE(n) IMX6Q_UART_BASE_ADDR(n) @@ -18203,7 +17878,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/debug/imx-uart.h linux-linaro-stab #endif /* __DEBUG_IMX_UART_H */ diff -Nur linux-3.10.30.orig/arch/arm/include/debug/vf.S linux-linaro-stable-mx6/arch/arm/include/debug/vf.S --- linux-3.10.30.orig/arch/arm/include/debug/vf.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/include/debug/vf.S 2014-05-15 20:33:34.513844563 +0200 ++++ linux-linaro-stable-mx6/arch/arm/include/debug/vf.S 2014-05-16 15:28:19.681376347 +0200 @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -18233,7 +17908,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/debug/vf.S linux-linaro-stable-mx6 + .endm diff -Nur linux-3.10.30.orig/arch/arm/Kconfig linux-linaro-stable-mx6/arch/arm/Kconfig --- linux-3.10.30.orig/arch/arm/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/Kconfig 2014-05-15 20:33:34.029841073 +0200 ++++ linux-linaro-stable-mx6/arch/arm/Kconfig 2014-05-16 15:28:19.593375884 +0200 @@ -1494,6 +1494,109 @@ MultiThreading at a cost of slightly increased overhead in some places. If unsure say N here. @@ -18386,7 +18061,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/Kconfig linux-linaro-stable-mx6/arch/arm/K The kernel memory allocator divides physically contiguous memory diff -Nur linux-3.10.30.orig/arch/arm/Kconfig.debug linux-linaro-stable-mx6/arch/arm/Kconfig.debug --- linux-3.10.30.orig/arch/arm/Kconfig.debug 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/Kconfig.debug 2014-05-15 20:33:34.029841073 +0200 ++++ linux-linaro-stable-mx6/arch/arm/Kconfig.debug 2014-05-16 15:28:19.597375904 +0200 @@ -251,6 +251,13 @@ Say Y here if you want kernel low-level debugging support on i.MX6Q/DL. @@ -18445,7 +18120,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/Kconfig.debug linux-linaro-stable-mx6/arch default "mach/debug-macro.S" diff -Nur linux-3.10.30.orig/arch/arm/kernel/bios32.c linux-linaro-stable-mx6/arch/arm/kernel/bios32.c --- linux-3.10.30.orig/arch/arm/kernel/bios32.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/kernel/bios32.c 2014-05-15 20:33:34.521844622 +0200 ++++ linux-linaro-stable-mx6/arch/arm/kernel/bios32.c 2014-05-16 15:28:19.685376368 +0200 @@ -363,6 +363,20 @@ } EXPORT_SYMBOL(pcibios_fixup_bus); @@ -18478,7 +18153,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/kernel/bios32.c linux-linaro-stable-mx6/ar if (hw->private_data) diff -Nur linux-3.10.30.orig/arch/arm/kernel/head.S linux-linaro-stable-mx6/arch/arm/kernel/head.S --- linux-3.10.30.orig/arch/arm/kernel/head.S 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/kernel/head.S 2014-05-15 20:33:34.545844794 +0200 ++++ linux-linaro-stable-mx6/arch/arm/kernel/head.S 2014-05-16 15:28:19.685376368 +0200 @@ -342,7 +342,6 @@ .long __turn_mmu_on_end @@ -18489,7 +18164,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/kernel/head.S linux-linaro-stable-mx6/arch * Common entry point for secondary CPUs. diff -Nur linux-3.10.30.orig/arch/arm/kernel/hw_breakpoint.c linux-linaro-stable-mx6/arch/arm/kernel/hw_breakpoint.c --- linux-3.10.30.orig/arch/arm/kernel/hw_breakpoint.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/kernel/hw_breakpoint.c 2014-05-15 20:33:34.545844794 +0200 ++++ linux-linaro-stable-mx6/arch/arm/kernel/hw_breakpoint.c 2014-05-16 15:28:19.685376368 +0200 @@ -1049,7 +1049,8 @@ static void __init pm_init(void) @@ -18502,7 +18177,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/kernel/hw_breakpoint.c linux-linaro-stable static inline void pm_init(void) diff -Nur linux-3.10.30.orig/arch/arm/kernel/Makefile linux-linaro-stable-mx6/arch/arm/kernel/Makefile --- linux-3.10.30.orig/arch/arm/kernel/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/kernel/Makefile 2014-05-15 20:33:34.517844592 +0200 ++++ linux-linaro-stable-mx6/arch/arm/kernel/Makefile 2014-05-16 15:28:19.685376368 +0200 @@ -82,6 +82,9 @@ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o @@ -18516,7 +18191,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/kernel/Makefile linux-linaro-stable-mx6/ar extra-y := $(head-y) vmlinux.lds diff -Nur linux-3.10.30.orig/arch/arm/kernel/perf_event.c linux-linaro-stable-mx6/arch/arm/kernel/perf_event.c --- linux-3.10.30.orig/arch/arm/kernel/perf_event.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/kernel/perf_event.c 2014-05-15 20:33:34.589845112 +0200 ++++ linux-linaro-stable-mx6/arch/arm/kernel/perf_event.c 2014-05-16 15:28:19.689376389 +0200 @@ -12,6 +12,7 @@ */ #define pr_fmt(fmt) "hw perfevents: " fmt @@ -18587,7 +18262,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/kernel/perf_event.c linux-linaro-stable-mx return -EOPNOTSUPP; diff -Nur linux-3.10.30.orig/arch/arm/kernel/perf_event_cpu.c linux-linaro-stable-mx6/arch/arm/kernel/perf_event_cpu.c --- linux-3.10.30.orig/arch/arm/kernel/perf_event_cpu.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/kernel/perf_event_cpu.c 2014-05-15 20:33:34.589845112 +0200 ++++ linux-linaro-stable-mx6/arch/arm/kernel/perf_event_cpu.c 2014-05-16 15:28:19.689376389 +0200 @@ -19,6 +19,7 @@ #define pr_fmt(fmt) "CPU PMU: " fmt @@ -18853,7 +18528,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/kernel/perf_event_cpu.c linux-linaro-stabl } diff -Nur linux-3.10.30.orig/arch/arm/kernel/perf_event_v7.c linux-linaro-stable-mx6/arch/arm/kernel/perf_event_v7.c --- linux-3.10.30.orig/arch/arm/kernel/perf_event_v7.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/kernel/perf_event_v7.c 2014-05-15 20:33:34.589845112 +0200 ++++ linux-linaro-stable-mx6/arch/arm/kernel/perf_event_v7.c 2014-05-16 15:28:19.689376389 +0200 @@ -950,6 +950,51 @@ } #endif @@ -18962,7 +18637,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/kernel/perf_event_v7.c linux-linaro-stable cpu_pmu->set_event_filter = armv7pmu_set_event_filter; diff -Nur linux-3.10.30.orig/arch/arm/kernel/process.c linux-linaro-stable-mx6/arch/arm/kernel/process.c --- linux-3.10.30.orig/arch/arm/kernel/process.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/kernel/process.c 2014-05-15 20:33:34.589845112 +0200 ++++ linux-linaro-stable-mx6/arch/arm/kernel/process.c 2014-05-16 15:28:19.689376389 +0200 @@ -170,8 +170,10 @@ */ void arch_cpu_idle(void) @@ -18976,7 +18651,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/kernel/process.c linux-linaro-stable-mx6/a static char reboot_mode = 'h'; diff -Nur linux-3.10.30.orig/arch/arm/kernel/psci.c linux-linaro-stable-mx6/arch/arm/kernel/psci.c --- linux-3.10.30.orig/arch/arm/kernel/psci.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/kernel/psci.c 2014-05-15 20:33:34.609845255 +0200 ++++ linux-linaro-stable-mx6/arch/arm/kernel/psci.c 2014-05-16 15:28:19.689376389 +0200 @@ -17,6 +17,7 @@ #include <linux/init.h> @@ -19075,7 +18750,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/kernel/psci.c linux-linaro-stable-mx6/arch +early_param("psci", early_psci); diff -Nur linux-3.10.30.orig/arch/arm/kernel/psci_smp.c linux-linaro-stable-mx6/arch/arm/kernel/psci_smp.c --- linux-3.10.30.orig/arch/arm/kernel/psci_smp.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/kernel/psci_smp.c 2014-05-15 20:33:34.609845255 +0200 ++++ linux-linaro-stable-mx6/arch/arm/kernel/psci_smp.c 2014-05-16 15:28:19.689376389 +0200 @@ -0,0 +1,84 @@ +/* + * This program is free software; you can redistribute it and/or modify @@ -19163,7 +18838,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/kernel/psci_smp.c linux-linaro-stable-mx6/ +}; diff -Nur linux-3.10.30.orig/arch/arm/kernel/setup.c linux-linaro-stable-mx6/arch/arm/kernel/setup.c --- linux-3.10.30.orig/arch/arm/kernel/setup.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/kernel/setup.c 2014-05-15 20:33:34.613845284 +0200 ++++ linux-linaro-stable-mx6/arch/arm/kernel/setup.c 2014-05-16 15:28:19.693376410 +0200 @@ -37,6 +37,7 @@ #include <asm/cputype.h> #include <asm/elf.h> @@ -19211,7 +18886,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/kernel/setup.c linux-linaro-stable-mx6/arc #endif diff -Nur linux-3.10.30.orig/arch/arm/kernel/sleep.S linux-linaro-stable-mx6/arch/arm/kernel/sleep.S --- linux-3.10.30.orig/arch/arm/kernel/sleep.S 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/kernel/sleep.S 2014-05-15 20:33:34.613845284 +0200 ++++ linux-linaro-stable-mx6/arch/arm/kernel/sleep.S 2014-05-16 15:28:19.693376410 +0200 @@ -4,6 +4,7 @@ #include <asm/assembler.h> #include <asm/glue-cache.h> @@ -19272,7 +18947,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/kernel/sleep.S linux-linaro-stable-mx6/arc +#endif diff -Nur linux-3.10.30.orig/arch/arm/kernel/smp.c linux-linaro-stable-mx6/arch/arm/kernel/smp.c --- linux-3.10.30.orig/arch/arm/kernel/smp.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/kernel/smp.c 2014-05-15 20:33:34.613845284 +0200 ++++ linux-linaro-stable-mx6/arch/arm/kernel/smp.c 2014-05-16 15:28:19.693376410 +0200 @@ -46,6 +46,9 @@ #include <asm/virt.h> #include <asm/mach/arch.h> @@ -19357,7 +19032,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/kernel/smp.c linux-linaro-stable-mx6/arch/ diff -Nur linux-3.10.30.orig/arch/arm/kernel/topology.c linux-linaro-stable-mx6/arch/arm/kernel/topology.c --- linux-3.10.30.orig/arch/arm/kernel/topology.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/kernel/topology.c 2014-05-15 20:33:34.665845660 +0200 ++++ linux-linaro-stable-mx6/arch/arm/kernel/topology.c 2014-05-16 15:28:19.693376410 +0200 @@ -23,6 +23,7 @@ #include <linux/slab.h> @@ -19509,7 +19184,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/kernel/topology.c linux-linaro-stable-mx6/ * which prevent simultaneous write access to cpu_topology array diff -Nur linux-3.10.30.orig/arch/arm/kernel/traps.c linux-linaro-stable-mx6/arch/arm/kernel/traps.c --- linux-3.10.30.orig/arch/arm/kernel/traps.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/kernel/traps.c 2014-05-15 20:33:34.665845660 +0200 ++++ linux-linaro-stable-mx6/arch/arm/kernel/traps.c 2014-05-16 15:28:19.693376410 +0200 @@ -61,7 +61,7 @@ void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame) { @@ -19521,7 +19196,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/kernel/traps.c linux-linaro-stable-mx6/arc #endif diff -Nur linux-3.10.30.orig/arch/arm/lib/backtrace.S linux-linaro-stable-mx6/arch/arm/lib/backtrace.S --- linux-3.10.30.orig/arch/arm/lib/backtrace.S 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/lib/backtrace.S 2014-05-15 20:33:34.717846034 +0200 ++++ linux-linaro-stable-mx6/arch/arm/lib/backtrace.S 2014-05-16 15:28:19.697376431 +0200 @@ -80,14 +80,14 @@ ldr r1, [sv_pc, #-4] @ if stmfd sp!, {args} exists, @@ -19573,7 +19248,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/lib/backtrace.S linux-linaro-stable-mx6/ar #endif diff -Nur linux-3.10.30.orig/arch/arm/mach-exynos/mach-exynos5-dt.c linux-linaro-stable-mx6/arch/arm/mach-exynos/mach-exynos5-dt.c --- linux-3.10.30.orig/arch/arm/mach-exynos/mach-exynos5-dt.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-exynos/mach-exynos5-dt.c 2014-05-15 20:33:35.129849006 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-exynos/mach-exynos5-dt.c 2014-05-16 15:28:19.733376621 +0200 @@ -14,6 +14,7 @@ #include <linux/memblock.h> #include <linux/io.h> @@ -19628,7 +19303,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-exynos/mach-exynos5-dt.c linux-linaro diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/anatop.c linux-linaro-stable-mx6/arch/arm/mach-imx/anatop.c --- linux-3.10.30.orig/arch/arm/mach-imx/anatop.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/anatop.c 2014-05-15 20:33:35.353850621 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/anatop.c 2014-05-16 15:28:19.745376685 +0200 @@ -9,6 +9,7 @@ * http://www.gnu.org/copyleft/gpl.html */ @@ -19806,7 +19481,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/anatop.c linux-linaro-stable-mx6/ } diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/busfreq_ddr3.c linux-linaro-stable-mx6/arch/arm/mach-imx/busfreq_ddr3.c --- linux-3.10.30.orig/arch/arm/mach-imx/busfreq_ddr3.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/busfreq_ddr3.c 2014-05-15 20:33:35.353850621 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/busfreq_ddr3.c 2014-05-16 15:28:19.745376685 +0200 @@ -0,0 +1,476 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -20286,7 +19961,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/busfreq_ddr3.c linux-linaro-stabl +} diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/busfreq-imx6.c linux-linaro-stable-mx6/arch/arm/mach-imx/busfreq-imx6.c --- linux-3.10.30.orig/arch/arm/mach-imx/busfreq-imx6.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/busfreq-imx6.c 2014-05-15 20:33:35.353850621 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/busfreq-imx6.c 2014-05-16 15:28:19.745376685 +0200 @@ -0,0 +1,938 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -21228,7 +20903,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/busfreq-imx6.c linux-linaro-stabl +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/busfreq_lpddr2.c linux-linaro-stable-mx6/arch/arm/mach-imx/busfreq_lpddr2.c --- linux-3.10.30.orig/arch/arm/mach-imx/busfreq_lpddr2.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/busfreq_lpddr2.c 2014-05-15 20:33:35.353850621 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/busfreq_lpddr2.c 2014-05-16 15:28:19.745376685 +0200 @@ -0,0 +1,183 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -21415,7 +21090,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/busfreq_lpddr2.c linux-linaro-sta +} diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk.c linux-linaro-stable-mx6/arch/arm/mach-imx/clk.c --- linux-3.10.30.orig/arch/arm/mach-imx/clk.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk.c 2014-05-15 20:33:35.373850766 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk.c 2014-05-16 15:28:19.749376706 +0200 @@ -1,4 +1,65 @@ +#include <linux/clk.h> +#include <linux/err.h> @@ -21484,7 +21159,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk.c linux-linaro-stable-mx6/arc +} diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-fixup-div.c linux-linaro-stable-mx6/arch/arm/mach-imx/clk-fixup-div.c --- linux-3.10.30.orig/arch/arm/mach-imx/clk-fixup-div.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-fixup-div.c 2014-05-15 20:33:35.353850621 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-fixup-div.c 2014-05-16 15:28:19.745376685 +0200 @@ -0,0 +1,129 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -21617,7 +21292,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-fixup-div.c linux-linaro-stab +} diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-fixup-mux.c linux-linaro-stable-mx6/arch/arm/mach-imx/clk-fixup-mux.c --- linux-3.10.30.orig/arch/arm/mach-imx/clk-fixup-mux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-fixup-mux.c 2014-05-15 20:33:35.353850621 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-fixup-mux.c 2014-05-16 15:28:19.745376685 +0200 @@ -0,0 +1,107 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -21728,7 +21403,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-fixup-mux.c linux-linaro-stab +} diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-gate2.c linux-linaro-stable-mx6/arch/arm/mach-imx/clk-gate2.c --- linux-3.10.30.orig/arch/arm/mach-imx/clk-gate2.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-gate2.c 2014-05-15 20:33:35.373850766 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-gate2.c 2014-05-16 15:28:19.745376685 +0200 @@ -1,6 +1,7 @@ /* * Copyright (C) 2010-2011 Canonical Ltd <jeremy.kerr@canonical.com> @@ -21748,7 +21423,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-gate2.c linux-linaro-stable-m return 0; diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk.h linux-linaro-stable-mx6/arch/arm/mach-imx/clk.h --- linux-3.10.30.orig/arch/arm/mach-imx/clk.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk.h 2014-05-15 20:33:35.373850766 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk.h 2014-05-16 15:28:19.749376706 +0200 @@ -6,6 +6,8 @@ extern spinlock_t imx_ccm_lock; @@ -21794,7 +21469,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk.h linux-linaro-stable-mx6/arc return clk_register_fixed_rate(NULL, name, NULL, CLK_IS_ROOT, rate); diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-imx51-imx53.c linux-linaro-stable-mx6/arch/arm/mach-imx/clk-imx51-imx53.c --- linux-3.10.30.orig/arch/arm/mach-imx/clk-imx51-imx53.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-imx51-imx53.c 2014-05-15 20:33:35.373850766 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-imx51-imx53.c 2014-05-16 15:28:19.745376685 +0200 @@ -123,11 +123,13 @@ { int i; @@ -21860,7 +21535,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-imx51-imx53.c linux-linaro-st -#endif diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-imx6q.c linux-linaro-stable-mx6/arch/arm/mach-imx/clk-imx6q.c --- linux-3.10.30.orig/arch/arm/mach-imx/clk-imx6q.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-imx6q.c 2014-05-15 20:33:35.373850766 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-imx6q.c 2014-05-16 15:28:19.749376706 +0200 @@ -14,7 +14,6 @@ #include <linux/types.h> #include <linux/clk.h> @@ -22519,7 +22194,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-imx6q.c linux-linaro-stable-m +CLK_OF_DECLARE(imx6q, "fsl,imx6q-ccm", imx6q_clocks_init); diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-imx6sl.c linux-linaro-stable-mx6/arch/arm/mach-imx/clk-imx6sl.c --- linux-3.10.30.orig/arch/arm/mach-imx/clk-imx6sl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-imx6sl.c 2014-05-15 20:33:35.373850766 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-imx6sl.c 2014-05-16 15:28:19.749376706 +0200 @@ -0,0 +1,493 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -23016,7 +22691,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-imx6sl.c linux-linaro-stable- +CLK_OF_DECLARE(imx6sl, "fsl,imx6sl-ccm", imx6sl_clocks_init); diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-pfd.c linux-linaro-stable-mx6/arch/arm/mach-imx/clk-pfd.c --- linux-3.10.30.orig/arch/arm/mach-imx/clk-pfd.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-pfd.c 2014-05-15 20:33:35.373850766 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-pfd.c 2014-05-16 15:28:19.749376706 +0200 @@ -1,5 +1,5 @@ /* - * Copyright 2012 Freescale Semiconductor, Inc. @@ -23122,7 +22797,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-pfd.c linux-linaro-stable-mx6 struct clk *imx_clk_pfd(const char *name, const char *parent_name, diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-pllv3.c linux-linaro-stable-mx6/arch/arm/mach-imx/clk-pllv3.c --- linux-3.10.30.orig/arch/arm/mach-imx/clk-pllv3.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-pllv3.c 2014-05-15 20:33:35.373850766 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-pllv3.c 2014-05-16 15:28:19.749376706 +0200 @@ -1,5 +1,5 @@ /* - * Copyright 2012 Freescale Semiconductor, Inc. @@ -23516,7 +23191,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-pllv3.c linux-linaro-stable-m init.ops = ops; diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-vf610.c linux-linaro-stable-mx6/arch/arm/mach-imx/clk-vf610.c --- linux-3.10.30.orig/arch/arm/mach-imx/clk-vf610.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-vf610.c 2014-05-15 20:33:35.373850766 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/clk-vf610.c 2014-05-16 15:28:19.749376706 +0200 @@ -0,0 +1,321 @@ +/* + * Copyright 2012-2013 Freescale Semiconductor, Inc. @@ -23841,7 +23516,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-vf610.c linux-linaro-stable-m +CLK_OF_DECLARE(vf610, "fsl,vf610-ccm", vf610_clocks_init); diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/common.h linux-linaro-stable-mx6/arch/arm/mach-imx/common.h --- linux-3.10.30.orig/arch/arm/mach-imx/common.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/common.h 2014-05-15 20:33:35.373850766 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/common.h 2014-05-16 15:28:19.749376706 +0200 @@ -14,6 +14,7 @@ struct platform_device; struct pt_regs; @@ -23938,7 +23613,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/common.h linux-linaro-stable-mx6/ #endif diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/cpu.c linux-linaro-stable-mx6/arch/arm/mach-imx/cpu.c --- linux-3.10.30.orig/arch/arm/mach-imx/cpu.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/cpu.c 2014-05-15 20:33:35.373850766 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/cpu.c 2014-05-16 15:28:19.749376706 +0200 @@ -1,6 +1,9 @@ #include <linux/module.h> @@ -24063,7 +23738,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/cpu.c linux-linaro-stable-mx6/arc +} diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/cpuidle.h linux-linaro-stable-mx6/arch/arm/mach-imx/cpuidle.h --- linux-3.10.30.orig/arch/arm/mach-imx/cpuidle.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/cpuidle.h 2014-05-15 20:33:35.377850795 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/cpuidle.h 2014-05-16 15:28:19.749376706 +0200 @@ -1,5 +1,5 @@ /* - * Copyright 2012 Freescale Semiconductor, Inc. @@ -24090,7 +23765,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/cpuidle.h linux-linaro-stable-mx6 #endif diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/cpuidle-imx6q.c linux-linaro-stable-mx6/arch/arm/mach-imx/cpuidle-imx6q.c --- linux-3.10.30.orig/arch/arm/mach-imx/cpuidle-imx6q.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/cpuidle-imx6q.c 2014-05-15 20:33:35.377850795 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/cpuidle-imx6q.c 2014-05-16 15:28:19.749376706 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Freescale Semiconductor, Inc. @@ -24123,7 +23798,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/cpuidle-imx6q.c linux-linaro-stab } diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/cpuidle-imx6sl.c linux-linaro-stable-mx6/arch/arm/mach-imx/cpuidle-imx6sl.c --- linux-3.10.30.orig/arch/arm/mach-imx/cpuidle-imx6sl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/cpuidle-imx6sl.c 2014-05-15 20:33:35.377850795 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/cpuidle-imx6sl.c 2014-05-16 15:28:19.749376706 +0200 @@ -0,0 +1,145 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. @@ -24272,7 +23947,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/cpuidle-imx6sl.c linux-linaro-sta +} diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/ddr3_freq_imx6.S linux-linaro-stable-mx6/arch/arm/mach-imx/ddr3_freq_imx6.S --- linux-3.10.30.orig/arch/arm/mach-imx/ddr3_freq_imx6.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/ddr3_freq_imx6.S 2014-05-15 20:33:35.377850795 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/ddr3_freq_imx6.S 2014-05-16 15:28:19.749376706 +0200 @@ -0,0 +1,893 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -25169,7 +24844,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/ddr3_freq_imx6.S linux-linaro-sta + .size mx6_ddr3_freq_change, . - mx6_ddr3_freq_change diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/gpc.c linux-linaro-stable-mx6/arch/arm/mach-imx/gpc.c --- linux-3.10.30.orig/arch/arm/mach-imx/gpc.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/gpc.c 2014-05-15 20:33:35.381850824 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/gpc.c 2014-05-16 15:28:19.753376727 +0200 @@ -10,30 +10,127 @@ * http://www.gnu.org/copyleft/gpl.html */ @@ -25648,7 +25323,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/gpc.c linux-linaro-stable-mx6/arc +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/hardware.h linux-linaro-stable-mx6/arch/arm/mach-imx/hardware.h --- linux-3.10.30.orig/arch/arm/mach-imx/hardware.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/hardware.h 2014-05-15 20:33:35.381850824 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/hardware.h 2014-05-16 15:28:19.753376727 +0200 @@ -1,5 +1,5 @@ /* - * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved. @@ -25676,7 +25351,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/hardware.h linux-linaro-stable-mx #include "mx35.h" diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/hotplug.c linux-linaro-stable-mx6/arch/arm/mach-imx/hotplug.c --- linux-3.10.30.orig/arch/arm/mach-imx/hotplug.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/hotplug.c 2014-05-15 20:33:35.381850824 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/hotplug.c 2014-05-16 15:28:19.753376727 +0200 @@ -1,5 +1,5 @@ /* - * Copyright 2011 Freescale Semiconductor, Inc. @@ -25696,7 +25371,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/hotplug.c linux-linaro-stable-mx6 int imx_cpu_kill(unsigned int cpu) diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/imx25-dt.c linux-linaro-stable-mx6/arch/arm/mach-imx/imx25-dt.c --- linux-3.10.30.orig/arch/arm/mach-imx/imx25-dt.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/imx25-dt.c 2014-05-15 20:33:35.381850824 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/imx25-dt.c 2014-05-16 15:28:19.753376727 +0200 @@ -19,6 +19,8 @@ static void __init imx25_dt_init(void) @@ -25708,7 +25383,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/imx25-dt.c linux-linaro-stable-mx diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/imx27-dt.c linux-linaro-stable-mx6/arch/arm/mach-imx/imx27-dt.c --- linux-3.10.30.orig/arch/arm/mach-imx/imx27-dt.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/imx27-dt.c 2014-05-15 20:33:35.381850824 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/imx27-dt.c 2014-05-16 15:28:19.753376727 +0200 @@ -22,6 +22,8 @@ { struct platform_device_info devinfo = { .name = "cpufreq-cpu0", }; @@ -25720,7 +25395,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/imx27-dt.c linux-linaro-stable-mx platform_device_register_full(&devinfo); diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/imx31-dt.c linux-linaro-stable-mx6/arch/arm/mach-imx/imx31-dt.c --- linux-3.10.30.orig/arch/arm/mach-imx/imx31-dt.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/imx31-dt.c 2014-05-15 20:33:35.381850824 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/imx31-dt.c 2014-05-16 15:28:19.753376727 +0200 @@ -20,6 +20,8 @@ static void __init imx31_dt_init(void) @@ -25732,7 +25407,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/imx31-dt.c linux-linaro-stable-mx diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/imx51-dt.c linux-linaro-stable-mx6/arch/arm/mach-imx/imx51-dt.c --- linux-3.10.30.orig/arch/arm/mach-imx/imx51-dt.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/imx51-dt.c 2014-05-15 20:33:35.381850824 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/imx51-dt.c 2014-05-16 15:28:19.753376727 +0200 @@ -23,6 +23,8 @@ { struct platform_device_info devinfo = { .name = "cpufreq-cpu0", }; @@ -25744,7 +25419,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/imx51-dt.c linux-linaro-stable-mx } diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/imx6sl_wfi.S linux-linaro-stable-mx6/arch/arm/mach-imx/imx6sl_wfi.S --- linux-3.10.30.orig/arch/arm/mach-imx/imx6sl_wfi.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/imx6sl_wfi.S 2014-05-15 20:33:35.381850824 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/imx6sl_wfi.S 2014-05-16 15:28:19.753376727 +0200 @@ -0,0 +1,639 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -26387,7 +26062,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/imx6sl_wfi.S linux-linaro-stable- + mov pc, lr diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/Kconfig linux-linaro-stable-mx6/arch/arm/mach-imx/Kconfig --- linux-3.10.30.orig/arch/arm/mach-imx/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/Kconfig 2014-05-15 20:33:35.353850621 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/Kconfig 2014-05-16 15:28:19.745376685 +0200 @@ -1,5 +1,6 @@ config ARCH_MXC bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 @@ -26472,7 +26147,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/Kconfig linux-linaro-stable-mx6/a source "arch/arm/mach-imx/devices/Kconfig" diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/lpddr2_freq_imx6.S linux-linaro-stable-mx6/arch/arm/mach-imx/lpddr2_freq_imx6.S --- linux-3.10.30.orig/arch/arm/mach-imx/lpddr2_freq_imx6.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/lpddr2_freq_imx6.S 2014-05-15 20:33:35.385850852 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/lpddr2_freq_imx6.S 2014-05-16 15:28:19.757376748 +0200 @@ -0,0 +1,484 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -26960,7 +26635,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/lpddr2_freq_imx6.S linux-linaro-s + .size mx6_lpddr2_freq_change, . - mx6_lpddr2_freq_change diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mach-imx53.c linux-linaro-stable-mx6/arch/arm/mach-imx/mach-imx53.c --- linux-3.10.30.orig/arch/arm/mach-imx/mach-imx53.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/mach-imx53.c 2014-05-15 20:33:35.385850852 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/mach-imx53.c 2014-05-16 15:28:19.757376748 +0200 @@ -21,6 +21,7 @@ #include <asm/mach/time.h> @@ -26980,7 +26655,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mach-imx53.c linux-linaro-stable- diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mach-imx6q.c linux-linaro-stable-mx6/arch/arm/mach-imx/mach-imx6q.c --- linux-3.10.30.orig/arch/arm/mach-imx/mach-imx6q.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/mach-imx6q.c 2014-05-15 20:33:35.385850852 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/mach-imx6q.c 2014-05-16 15:28:19.757376748 +0200 @@ -10,12 +10,14 @@ * http://www.gnu.org/copyleft/gpl.html */ @@ -27584,7 +27259,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mach-imx6q.c linux-linaro-stable- MACHINE_END diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mach-imx6sl.c linux-linaro-stable-mx6/arch/arm/mach-imx/mach-imx6sl.c --- linux-3.10.30.orig/arch/arm/mach-imx/mach-imx6sl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/mach-imx6sl.c 2014-05-15 20:33:35.385850852 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/mach-imx6sl.c 2014-05-16 15:28:19.757376748 +0200 @@ -0,0 +1,149 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -27737,7 +27412,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mach-imx6sl.c linux-linaro-stable +MACHINE_END diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mach-vf610.c linux-linaro-stable-mx6/arch/arm/mach-imx/mach-vf610.c --- linux-3.10.30.orig/arch/arm/mach-imx/mach-vf610.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/mach-vf610.c 2014-05-15 20:33:35.389850881 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/mach-vf610.c 2014-05-16 15:28:19.761376769 +0200 @@ -0,0 +1,50 @@ +/* + * Copyright 2012-2013 Freescale Semiconductor, Inc. @@ -27791,7 +27466,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mach-vf610.c linux-linaro-stable- +MACHINE_END diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/Makefile linux-linaro-stable-mx6/arch/arm/mach-imx/Makefile --- linux-3.10.30.orig/arch/arm/mach-imx/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/Makefile 2014-05-15 20:33:35.353850621 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/Makefile 2014-05-16 15:28:19.745376685 +0200 @@ -15,7 +15,8 @@ obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o mm-imx5.o clk-imx51-imx53.o ehci-imx5.o $(imx5-pm-y) @@ -27842,7 +27517,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/Makefile linux-linaro-stable-mx6/ obj-y += devices/ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mm-imx1.c linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx1.c --- linux-3.10.30.orig/arch/arm/mach-imx/mm-imx1.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx1.c 2014-05-15 20:33:35.389850881 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx1.c 2014-05-16 15:28:19.761376769 +0200 @@ -39,7 +39,6 @@ void __init imx1_init_early(void) { @@ -27861,7 +27536,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mm-imx1.c linux-linaro-stable-mx6 mxc_register_gpio("imx1-gpio", 0, MX1_GPIO1_BASE_ADDR, SZ_256, diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mm-imx21.c linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx21.c --- linux-3.10.30.orig/arch/arm/mach-imx/mm-imx21.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx21.c 2014-05-15 20:33:35.389850881 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx21.c 2014-05-16 15:28:19.761376769 +0200 @@ -66,7 +66,6 @@ void __init imx21_init_early(void) { @@ -27880,7 +27555,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mm-imx21.c linux-linaro-stable-mx mxc_register_gpio("imx21-gpio", 0, MX21_GPIO1_BASE_ADDR, SZ_256, MX21_INT_GPIO, 0); diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mm-imx25.c linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx25.c --- linux-3.10.30.orig/arch/arm/mach-imx/mm-imx25.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx25.c 2014-05-15 20:33:35.389850881 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx25.c 2014-05-16 15:28:19.761376769 +0200 @@ -54,7 +54,6 @@ { mxc_set_cpu_type(MXC_CPU_MX25); @@ -27899,7 +27574,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mm-imx25.c linux-linaro-stable-mx /* i.mx25 has the i.mx35 type gpio */ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mm-imx27.c linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx27.c --- linux-3.10.30.orig/arch/arm/mach-imx/mm-imx27.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx27.c 2014-05-15 20:33:35.389850881 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx27.c 2014-05-16 15:28:19.761376769 +0200 @@ -66,7 +66,6 @@ void __init imx27_init_early(void) { @@ -27918,7 +27593,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mm-imx27.c linux-linaro-stable-mx /* i.mx27 has the i.mx21 type gpio */ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mm-imx3.c linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx3.c --- linux-3.10.30.orig/arch/arm/mach-imx/mm-imx3.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx3.c 2014-05-15 20:33:35.389850881 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx3.c 2014-05-16 15:28:19.761376769 +0200 @@ -138,7 +138,6 @@ void __init imx31_init_early(void) { @@ -27953,7 +27628,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mm-imx3.c linux-linaro-stable-mx6 mxc_register_gpio("imx35-gpio", 0, MX35_GPIO1_BASE_ADDR, SZ_16K, MX35_INT_GPIO1, 0); diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mm-imx5.c linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx5.c --- linux-3.10.30.orig/arch/arm/mach-imx/mm-imx5.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx5.c 2014-05-15 20:33:35.389850881 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/mm-imx5.c 2014-05-16 15:28:19.761376769 +0200 @@ -83,7 +83,6 @@ imx51_ipu_mipi_setup(); mxc_set_cpu_type(MXC_CPU_MX51); @@ -27980,7 +27655,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mm-imx5.c linux-linaro-stable-mx6 /* i.mx51 has the i.mx35 type gpio */ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mx6.h linux-linaro-stable-mx6/arch/arm/mach-imx/mx6.h --- linux-3.10.30.orig/arch/arm/mach-imx/mx6.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/mx6.h 2014-05-15 20:33:35.397850939 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/mx6.h 2014-05-16 15:28:19.761376769 +0200 @@ -0,0 +1,35 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -28019,7 +27694,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mx6.h linux-linaro-stable-mx6/arc +#endif diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mxc.h linux-linaro-stable-mx6/arch/arm/mach-imx/mxc.h --- linux-3.10.30.orig/arch/arm/mach-imx/mxc.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/mxc.h 2014-05-15 20:33:35.397850939 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/mxc.h 2014-05-16 15:28:19.761376769 +0200 @@ -1,5 +1,5 @@ /* - * Copyright 2004-2007, 2010 Freescale Semiconductor, Inc. All Rights Reserved. @@ -28066,7 +27741,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mxc.h linux-linaro-stable-mx6/arc diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/pm-imx6.c linux-linaro-stable-mx6/arch/arm/mach-imx/pm-imx6.c --- linux-3.10.30.orig/arch/arm/mach-imx/pm-imx6.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/pm-imx6.c 2014-05-15 20:33:35.397850939 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/pm-imx6.c 2014-05-16 15:28:19.761376769 +0200 @@ -0,0 +1,379 @@ +/* + * Copyright 2011-2013 Freescale Semiconductor, Inc. @@ -28514,7 +28189,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/pm-imx6q.c linux-linaro-stable-mx -} diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/src.c linux-linaro-stable-mx6/arch/arm/mach-imx/src.c --- linux-3.10.30.orig/arch/arm/mach-imx/src.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/src.c 2014-05-15 20:33:35.397850939 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/src.c 2014-05-16 15:28:19.761376769 +0200 @@ -1,5 +1,5 @@ /* - * Copyright 2011 Freescale Semiconductor, Inc. @@ -28554,7 +28229,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/src.c linux-linaro-stable-mx6/arc struct device_node *np; diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/suspend-imx6.S linux-linaro-stable-mx6/arch/arm/mach-imx/suspend-imx6.S --- linux-3.10.30.orig/arch/arm/mach-imx/suspend-imx6.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/suspend-imx6.S 2014-05-15 20:33:35.397850939 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/suspend-imx6.S 2014-05-16 15:28:19.761376769 +0200 @@ -0,0 +1,801 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -29359,7 +29034,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/suspend-imx6.S linux-linaro-stabl + mov pc, lr diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/system.c linux-linaro-stable-mx6/arch/arm/mach-imx/system.c --- linux-3.10.30.orig/arch/arm/mach-imx/system.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/system.c 2014-05-15 20:33:35.397850939 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/system.c 2014-05-16 15:28:19.761376769 +0200 @@ -1,7 +1,7 @@ /* * Copyright (C) 1999 ARM Limited @@ -29530,7 +29205,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/system.c linux-linaro-stable-mx6/ +#endif diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/time.c linux-linaro-stable-mx6/arch/arm/mach-imx/time.c --- linux-3.10.30.orig/arch/arm/mach-imx/time.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/time.c 2014-05-15 20:33:35.397850939 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-imx/time.c 2014-05-16 15:28:19.765376790 +0200 @@ -60,7 +60,11 @@ #define V2_TCTL_WAITEN (1 << 3) /* Wait enable mode */ #define V2_TCTL_CLK_IPG (1 << 6) @@ -29596,7 +29271,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/time.c linux-linaro-stable-mx6/ar diff -Nur linux-3.10.30.orig/arch/arm/mach-integrator/Makefile linux-linaro-stable-mx6/arch/arm/mach-integrator/Makefile --- linux-3.10.30.orig/arch/arm/mach-integrator/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-integrator/Makefile 2014-05-15 20:33:35.405850997 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-integrator/Makefile 2014-05-16 15:28:19.765376790 +0200 @@ -8,5 +8,5 @@ obj-$(CONFIG_ARCH_INTEGRATOR_AP) += integrator_ap.o obj-$(CONFIG_ARCH_INTEGRATOR_CP) += integrator_cp.o @@ -29723,7 +29398,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-integrator/pci.c linux-linaro-stable- -subsys_initcall(integrator_pci_init); diff -Nur linux-3.10.30.orig/arch/arm/mach-integrator/pci_v3.c linux-linaro-stable-mx6/arch/arm/mach-integrator/pci_v3.c --- linux-3.10.30.orig/arch/arm/mach-integrator/pci_v3.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-integrator/pci_v3.c 2014-05-15 20:33:35.405850997 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-integrator/pci_v3.c 2014-05-16 15:28:19.765376790 +0200 @@ -35,6 +35,7 @@ #include <asm/signal.h> #include <asm/mach/pci.h> @@ -29853,7 +29528,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-integrator/pci_v3.c linux-linaro-stab +subsys_initcall(integrator_pci_init); diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/core.h linux-linaro-stable-mx6/arch/arm/mach-vexpress/core.h --- linux-3.10.30.orig/arch/arm/mach-vexpress/core.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/core.h 2014-05-15 20:33:37.481865968 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/core.h 2014-05-16 15:28:19.953377782 +0200 @@ -6,6 +6,8 @@ void vexpress_dt_smp_map_io(void); @@ -29865,7 +29540,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/core.h linux-linaro-stable-m extern void vexpress_cpu_die(unsigned int cpu); diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/dcscb.c linux-linaro-stable-mx6/arch/arm/mach-vexpress/dcscb.c --- linux-3.10.30.orig/arch/arm/mach-vexpress/dcscb.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/dcscb.c 2014-05-15 20:33:37.485865997 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/dcscb.c 2014-05-16 15:28:19.953377782 +0200 @@ -0,0 +1,236 @@ +/* + * arch/arm/mach-vexpress/dcscb.c - Dual Cluster System Configuration Block @@ -30105,7 +29780,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/dcscb.c linux-linaro-stable- +early_initcall(dcscb_init); diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/dcscb_setup.S linux-linaro-stable-mx6/arch/arm/mach-vexpress/dcscb_setup.S --- linux-3.10.30.orig/arch/arm/mach-vexpress/dcscb_setup.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/dcscb_setup.S 2014-05-15 20:33:37.485865997 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/dcscb_setup.S 2014-05-16 15:28:19.953377782 +0200 @@ -0,0 +1,38 @@ +/* + * arch/arm/include/asm/dcscb_setup.S @@ -30147,7 +29822,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/dcscb_setup.S linux-linaro-s +ENDPROC(dcscb_power_up_setup) diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/include/mach/tc2.h linux-linaro-stable-mx6/arch/arm/mach-vexpress/include/mach/tc2.h --- linux-3.10.30.orig/arch/arm/mach-vexpress/include/mach/tc2.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/include/mach/tc2.h 2014-05-15 20:33:37.485865997 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/include/mach/tc2.h 2014-05-16 15:28:19.953377782 +0200 @@ -0,0 +1,10 @@ +#ifndef __MACH_TC2_H +#define __MACH_TC2_H @@ -30161,7 +29836,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/include/mach/tc2.h linux-lin +#endif diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/Kconfig linux-linaro-stable-mx6/arch/arm/mach-vexpress/Kconfig --- linux-3.10.30.orig/arch/arm/mach-vexpress/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/Kconfig 2014-05-15 20:33:37.481865968 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/Kconfig 2014-05-16 15:28:19.953377782 +0200 @@ -1,5 +1,7 @@ config ARCH_VEXPRESS bool "ARM Ltd. Versatile Express family" if ARCH_MULTI_V7 @@ -30196,7 +29871,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/Kconfig linux-linaro-stable- endmenu diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/Makefile linux-linaro-stable-mx6/arch/arm/mach-vexpress/Makefile --- linux-3.10.30.orig/arch/arm/mach-vexpress/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/Makefile 2014-05-15 20:33:37.481865968 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/Makefile 2014-05-16 15:28:19.953377782 +0200 @@ -6,5 +6,13 @@ obj-y := v2m.o @@ -30213,7 +29888,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/Makefile linux-linaro-stable obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/platsmp.c linux-linaro-stable-mx6/arch/arm/mach-vexpress/platsmp.c --- linux-3.10.30.orig/arch/arm/mach-vexpress/platsmp.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/platsmp.c 2014-05-15 20:33:37.485865997 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/platsmp.c 2014-05-16 15:28:19.953377782 +0200 @@ -12,9 +12,11 @@ #include <linux/errno.h> #include <linux/smp.h> @@ -30250,7 +29925,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/platsmp.c linux-linaro-stabl +} diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/tc2_pm.c linux-linaro-stable-mx6/arch/arm/mach-vexpress/tc2_pm.c --- linux-3.10.30.orig/arch/arm/mach-vexpress/tc2_pm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/tc2_pm.c 2014-05-15 20:33:37.485865997 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/tc2_pm.c 2014-05-16 15:28:19.953377782 +0200 @@ -0,0 +1,277 @@ +/* + * arch/arm/mach-vexpress/tc2_pm.c - TC2 power management support @@ -30531,7 +30206,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/tc2_pm.c linux-linaro-stable +early_initcall(tc2_pm_init); diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/tc2_pm_psci.c linux-linaro-stable-mx6/arch/arm/mach-vexpress/tc2_pm_psci.c --- linux-3.10.30.orig/arch/arm/mach-vexpress/tc2_pm_psci.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/tc2_pm_psci.c 2014-05-15 20:33:37.485865997 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/tc2_pm_psci.c 2014-05-16 15:28:19.953377782 +0200 @@ -0,0 +1,173 @@ +/* + * arch/arm/mach-vexpress/tc2_pm_psci.c - TC2 PSCI support @@ -30708,7 +30383,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/tc2_pm_psci.c linux-linaro-s +early_initcall(tc2_pm_psci_init); diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/tc2_pm_setup.S linux-linaro-stable-mx6/arch/arm/mach-vexpress/tc2_pm_setup.S --- linux-3.10.30.orig/arch/arm/mach-vexpress/tc2_pm_setup.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/tc2_pm_setup.S 2014-05-15 20:33:37.485865997 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/tc2_pm_setup.S 2014-05-16 15:28:19.953377782 +0200 @@ -0,0 +1,68 @@ +/* + * arch/arm/include/asm/tc2_pm_setup.S @@ -30780,7 +30455,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/tc2_pm_setup.S linux-linaro- +ENDPROC(tc2_pm_power_up_setup) diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/v2m.c linux-linaro-stable-mx6/arch/arm/mach-vexpress/v2m.c --- linux-3.10.30.orig/arch/arm/mach-vexpress/v2m.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/v2m.c 2014-05-15 20:33:37.485865997 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-vexpress/v2m.c 2014-05-16 15:28:19.953377782 +0200 @@ -10,6 +10,7 @@ #include <linux/smp.h> #include <linux/init.h> @@ -30840,7 +30515,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/v2m.c linux-linaro-stable-mx .init_irq = irqchip_init, diff -Nur linux-3.10.30.orig/arch/arm/mach-virt/Makefile linux-linaro-stable-mx6/arch/arm/mach-virt/Makefile --- linux-3.10.30.orig/arch/arm/mach-virt/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-virt/Makefile 2014-05-15 20:33:37.485865997 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-virt/Makefile 2014-05-16 15:28:19.953377782 +0200 @@ -3,4 +3,3 @@ # @@ -30902,7 +30577,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-virt/platsmp.c linux-linaro-stable-mx -}; diff -Nur linux-3.10.30.orig/arch/arm/mach-virt/virt.c linux-linaro-stable-mx6/arch/arm/mach-virt/virt.c --- linux-3.10.30.orig/arch/arm/mach-virt/virt.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-virt/virt.c 2014-05-15 20:33:37.485865997 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mach-virt/virt.c 2014-05-16 15:28:19.957377803 +0200 @@ -36,11 +36,8 @@ NULL }; @@ -30917,7 +30592,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-virt/virt.c linux-linaro-stable-mx6/a MACHINE_END diff -Nur linux-3.10.30.orig/arch/arm/mm/cache-v7.S linux-linaro-stable-mx6/arch/arm/mm/cache-v7.S --- linux-3.10.30.orig/arch/arm/mm/cache-v7.S 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mm/cache-v7.S 2014-05-15 20:33:37.521866257 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mm/cache-v7.S 2014-05-16 15:28:19.961377823 +0200 @@ -146,18 +146,18 @@ ldr r7, =0x7fff ands r7, r7, r1, lsr #13 @ extract max number of the index size @@ -30946,7 +30621,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mm/cache-v7.S linux-linaro-stable-mx6/arch add r10, r10, #2 @ increment cache number diff -Nur linux-3.10.30.orig/arch/arm/mm/fault.c linux-linaro-stable-mx6/arch/arm/mm/fault.c --- linux-3.10.30.orig/arch/arm/mm/fault.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mm/fault.c 2014-05-15 20:33:37.525866286 +0200 ++++ linux-linaro-stable-mx6/arch/arm/mm/fault.c 2014-05-16 15:28:19.961377823 +0200 @@ -446,8 +446,16 @@ if (pud_none(*pud_k)) @@ -30978,7 +30653,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/mm/fault.c linux-linaro-stable-mx6/arch/ar bad_area: diff -Nur linux-3.10.30.orig/arch/arm/plat-versatile/headsmp.S linux-linaro-stable-mx6/arch/arm/plat-versatile/headsmp.S --- linux-3.10.30.orig/arch/arm/plat-versatile/headsmp.S 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/plat-versatile/headsmp.S 2014-05-15 20:33:37.653867209 +0200 ++++ linux-linaro-stable-mx6/arch/arm/plat-versatile/headsmp.S 2014-05-16 15:28:19.985377950 +0200 @@ -11,8 +11,6 @@ #include <linux/linkage.h> #include <linux/init.h> @@ -30990,7 +30665,7 @@ diff -Nur linux-3.10.30.orig/arch/arm/plat-versatile/headsmp.S linux-linaro-stab * This provides a "holding pen" into which all secondary cores are held diff -Nur linux-3.10.30.orig/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts linux-linaro-stable-mx6/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts --- linux-3.10.30.orig/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts 2014-05-15 20:33:37.681867411 +0200 ++++ linux-linaro-stable-mx6/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts 2014-05-16 15:28:19.993377993 +0200 @@ -0,0 +1,287 @@ +/* + * Copyright (c) 2013, ARM Limited. All rights reserved. @@ -31281,7 +30956,7 @@ diff -Nur linux-3.10.30.orig/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts linux-l +}; diff -Nur linux-3.10.30.orig/arch/arm64/boot/dts/Makefile linux-linaro-stable-mx6/arch/arm64/boot/dts/Makefile --- linux-3.10.30.orig/arch/arm64/boot/dts/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm64/boot/dts/Makefile 2014-05-15 20:33:37.681867411 +0200 ++++ linux-linaro-stable-mx6/arch/arm64/boot/dts/Makefile 2014-05-16 15:28:19.993377993 +0200 @@ -1,4 +1,5 @@ -dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb foundation-v8.dtb +dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb foundation-v8.dtb \ @@ -31291,7 +30966,7 @@ diff -Nur linux-3.10.30.orig/arch/arm64/boot/dts/Makefile linux-linaro-stable-mx targets += $(dtb-y) diff -Nur linux-3.10.30.orig/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi linux-linaro-stable-mx6/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi --- linux-3.10.30.orig/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi 2014-05-15 20:33:37.681867411 +0200 ++++ linux-linaro-stable-mx6/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi 2014-05-16 15:28:19.993377993 +0200 @@ -182,6 +182,15 @@ interrupts = <14>; clocks = <&v2m_oscclk1>, <&v2m_clk24mhz>; @@ -31310,7 +30985,7 @@ diff -Nur linux-3.10.30.orig/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi linux- diff -Nur linux-3.10.30.orig/arch/arm64/include/asm/cmpxchg.h linux-linaro-stable-mx6/arch/arm64/include/asm/cmpxchg.h --- linux-3.10.30.orig/arch/arm64/include/asm/cmpxchg.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm64/include/asm/cmpxchg.h 2014-05-15 20:33:37.685867440 +0200 ++++ linux-linaro-stable-mx6/arch/arm64/include/asm/cmpxchg.h 2014-05-16 15:28:19.997378014 +0200 @@ -158,17 +158,23 @@ return ret; } @@ -31347,7 +31022,7 @@ diff -Nur linux-3.10.30.orig/arch/arm64/include/asm/cmpxchg.h linux-linaro-stabl #define cmpxchg64_local(ptr,o,n) cmpxchg_local((ptr),(o),(n)) diff -Nur linux-3.10.30.orig/arch/arm64/include/asm/cpu_ops.h linux-linaro-stable-mx6/arch/arm64/include/asm/cpu_ops.h --- linux-3.10.30.orig/arch/arm64/include/asm/cpu_ops.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm64/include/asm/cpu_ops.h 2014-05-15 20:33:37.685867440 +0200 ++++ linux-linaro-stable-mx6/arch/arm64/include/asm/cpu_ops.h 2014-05-16 15:28:19.997378014 +0200 @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2013 ARM Ltd. @@ -31410,7 +31085,7 @@ diff -Nur linux-3.10.30.orig/arch/arm64/include/asm/cpu_ops.h linux-linaro-stabl +#endif /* ifndef __ASM_CPU_OPS_H */ diff -Nur linux-3.10.30.orig/arch/arm64/include/asm/irq.h linux-linaro-stable-mx6/arch/arm64/include/asm/irq.h --- linux-3.10.30.orig/arch/arm64/include/asm/irq.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm64/include/asm/irq.h 2014-05-15 20:33:37.685867440 +0200 ++++ linux-linaro-stable-mx6/arch/arm64/include/asm/irq.h 2014-05-16 15:28:19.997378014 +0200 @@ -4,6 +4,7 @@ #include <asm-generic/irq.h> @@ -31421,7 +31096,7 @@ diff -Nur linux-3.10.30.orig/arch/arm64/include/asm/irq.h linux-linaro-stable-mx #endif diff -Nur linux-3.10.30.orig/arch/arm64/include/asm/pgtable-3level-types.h linux-linaro-stable-mx6/arch/arm64/include/asm/pgtable-3level-types.h --- linux-3.10.30.orig/arch/arm64/include/asm/pgtable-3level-types.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm64/include/asm/pgtable-3level-types.h 2014-05-15 20:33:37.709867612 +0200 ++++ linux-linaro-stable-mx6/arch/arm64/include/asm/pgtable-3level-types.h 2014-05-16 15:28:19.997378014 +0200 @@ -16,6 +16,8 @@ #ifndef __ASM_PGTABLE_3LEVEL_TYPES_H #define __ASM_PGTABLE_3LEVEL_TYPES_H @@ -31433,7 +31108,7 @@ diff -Nur linux-3.10.30.orig/arch/arm64/include/asm/pgtable-3level-types.h linux typedef u64 pgdval_t; diff -Nur linux-3.10.30.orig/arch/arm64/include/asm/psci.h linux-linaro-stable-mx6/arch/arm64/include/asm/psci.h --- linux-3.10.30.orig/arch/arm64/include/asm/psci.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm64/include/asm/psci.h 2014-05-15 20:33:37.709867612 +0200 ++++ linux-linaro-stable-mx6/arch/arm64/include/asm/psci.h 2014-05-16 15:28:19.997378014 +0200 @@ -14,25 +14,6 @@ #ifndef __ASM_PSCI_H #define __ASM_PSCI_H @@ -31462,7 +31137,7 @@ diff -Nur linux-3.10.30.orig/arch/arm64/include/asm/psci.h linux-linaro-stable-m #endif /* __ASM_PSCI_H */ diff -Nur linux-3.10.30.orig/arch/arm64/include/asm/smp.h linux-linaro-stable-mx6/arch/arm64/include/asm/smp.h --- linux-3.10.30.orig/arch/arm64/include/asm/smp.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm64/include/asm/smp.h 2014-05-15 20:33:37.709867612 +0200 ++++ linux-linaro-stable-mx6/arch/arm64/include/asm/smp.h 2014-05-16 15:28:19.997378014 +0200 @@ -60,21 +60,14 @@ void *stack; }; @@ -31491,7 +31166,7 @@ diff -Nur linux-3.10.30.orig/arch/arm64/include/asm/smp.h linux-linaro-stable-mx #endif /* ifndef __ASM_SMP_H */ diff -Nur linux-3.10.30.orig/arch/arm64/include/asm/topology.h linux-linaro-stable-mx6/arch/arm64/include/asm/topology.h --- linux-3.10.30.orig/arch/arm64/include/asm/topology.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm64/include/asm/topology.h 2014-05-15 20:33:37.713867642 +0200 ++++ linux-linaro-stable-mx6/arch/arm64/include/asm/topology.h 2014-05-16 15:28:20.001378034 +0200 @@ -0,0 +1,73 @@ +#ifndef _ASM_ARM_TOPOLOGY_H +#define _ASM_ARM_TOPOLOGY_H @@ -31568,7 +31243,7 @@ diff -Nur linux-3.10.30.orig/arch/arm64/include/asm/topology.h linux-linaro-stab +#endif /* _ASM_ARM_TOPOLOGY_H */ diff -Nur linux-3.10.30.orig/arch/arm64/Kconfig linux-linaro-stable-mx6/arch/arm64/Kconfig --- linux-3.10.30.orig/arch/arm64/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm64/Kconfig 2014-05-15 20:33:37.657867237 +0200 ++++ linux-linaro-stable-mx6/arch/arm64/Kconfig 2014-05-16 15:28:19.989377972 +0200 @@ -144,12 +144,139 @@ If you don't know what to do here, say N. @@ -31726,7 +31401,7 @@ diff -Nur linux-3.10.30.orig/arch/arm64/Kconfig linux-linaro-stable-mx6/arch/arm source "drivers/Kconfig" diff -Nur linux-3.10.30.orig/arch/arm64/kernel/cpu_ops.c linux-linaro-stable-mx6/arch/arm64/kernel/cpu_ops.c --- linux-3.10.30.orig/arch/arm64/kernel/cpu_ops.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm64/kernel/cpu_ops.c 2014-05-15 20:33:37.713867642 +0200 ++++ linux-linaro-stable-mx6/arch/arm64/kernel/cpu_ops.c 2014-05-16 15:28:20.001378034 +0200 @@ -0,0 +1,99 @@ +/* + * CPU kernel entry/exit control @@ -31829,7 +31504,7 @@ diff -Nur linux-3.10.30.orig/arch/arm64/kernel/cpu_ops.c linux-linaro-stable-mx6 +} diff -Nur linux-3.10.30.orig/arch/arm64/kernel/cputable.c linux-linaro-stable-mx6/arch/arm64/kernel/cputable.c --- linux-3.10.30.orig/arch/arm64/kernel/cputable.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm64/kernel/cputable.c 2014-05-15 20:33:37.713867642 +0200 ++++ linux-linaro-stable-mx6/arch/arm64/kernel/cputable.c 2014-05-16 15:28:20.001378034 +0200 @@ -22,7 +22,7 @@ extern unsigned long __cpu_setup(void); @@ -31841,7 +31516,7 @@ diff -Nur linux-3.10.30.orig/arch/arm64/kernel/cputable.c linux-linaro-stable-mx .cpu_id_mask = 0x000f0000, diff -Nur linux-3.10.30.orig/arch/arm64/kernel/head.S linux-linaro-stable-mx6/arch/arm64/kernel/head.S --- linux-3.10.30.orig/arch/arm64/kernel/head.S 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm64/kernel/head.S 2014-05-15 20:33:37.717867670 +0200 ++++ linux-linaro-stable-mx6/arch/arm64/kernel/head.S 2014-05-16 15:28:20.001378034 +0200 @@ -217,7 +217,6 @@ .quad PAGE_OFFSET @@ -31870,7 +31545,7 @@ diff -Nur linux-3.10.30.orig/arch/arm64/kernel/head.S linux-linaro-stable-mx6/ar /* diff -Nur linux-3.10.30.orig/arch/arm64/kernel/irq.c linux-linaro-stable-mx6/arch/arm64/kernel/irq.c --- linux-3.10.30.orig/arch/arm64/kernel/irq.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm64/kernel/irq.c 2014-05-15 20:33:37.717867670 +0200 ++++ linux-linaro-stable-mx6/arch/arm64/kernel/irq.c 2014-05-16 15:28:20.005378056 +0200 @@ -81,3 +81,64 @@ if (!handle_arch_irq) panic("No interrupt controller found."); @@ -31938,7 +31613,7 @@ diff -Nur linux-3.10.30.orig/arch/arm64/kernel/irq.c linux-linaro-stable-mx6/arc +#endif /* CONFIG_HOTPLUG_CPU */ diff -Nur linux-3.10.30.orig/arch/arm64/kernel/Makefile linux-linaro-stable-mx6/arch/arm64/kernel/Makefile --- linux-3.10.30.orig/arch/arm64/kernel/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm64/kernel/Makefile 2014-05-15 20:33:37.713867642 +0200 ++++ linux-linaro-stable-mx6/arch/arm64/kernel/Makefile 2014-05-16 15:28:20.001378034 +0200 @@ -9,15 +9,16 @@ arm64-obj-y := cputable.o debug-monitors.o entry.o irq.o fpsimd.o \ entry-fpsimd.o process.o ptrace.o setup.o signal.o \ @@ -31960,7 +31635,7 @@ diff -Nur linux-3.10.30.orig/arch/arm64/kernel/Makefile linux-linaro-stable-mx6/ obj-m += $(arm64-obj-m) diff -Nur linux-3.10.30.orig/arch/arm64/kernel/process.c linux-linaro-stable-mx6/arch/arm64/kernel/process.c --- linux-3.10.30.orig/arch/arm64/kernel/process.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm64/kernel/process.c 2014-05-15 20:33:37.717867670 +0200 ++++ linux-linaro-stable-mx6/arch/arm64/kernel/process.c 2014-05-16 15:28:20.005378056 +0200 @@ -102,6 +102,13 @@ local_irq_enable(); } @@ -31977,7 +31652,7 @@ diff -Nur linux-3.10.30.orig/arch/arm64/kernel/process.c linux-linaro-stable-mx6 #ifdef CONFIG_SMP diff -Nur linux-3.10.30.orig/arch/arm64/kernel/psci.c linux-linaro-stable-mx6/arch/arm64/kernel/psci.c --- linux-3.10.30.orig/arch/arm64/kernel/psci.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm64/kernel/psci.c 2014-05-15 20:33:37.717867670 +0200 ++++ linux-linaro-stable-mx6/arch/arm64/kernel/psci.c 2014-05-16 15:28:20.005378056 +0200 @@ -17,12 +17,32 @@ #include <linux/init.h> @@ -32083,7 +31758,7 @@ diff -Nur linux-3.10.30.orig/arch/arm64/kernel/psci.c linux-linaro-stable-mx6/ar +#endif diff -Nur linux-3.10.30.orig/arch/arm64/kernel/setup.c linux-linaro-stable-mx6/arch/arm64/kernel/setup.c --- linux-3.10.30.orig/arch/arm64/kernel/setup.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm64/kernel/setup.c 2014-05-15 20:33:37.717867670 +0200 ++++ linux-linaro-stable-mx6/arch/arm64/kernel/setup.c 2014-05-16 15:28:20.005378056 +0200 @@ -45,6 +45,7 @@ #include <asm/cputype.h> #include <asm/elf.h> @@ -32114,7 +31789,7 @@ diff -Nur linux-3.10.30.orig/arch/arm64/kernel/setup.c linux-linaro-stable-mx6/a #endif diff -Nur linux-3.10.30.orig/arch/arm64/kernel/smp.c linux-linaro-stable-mx6/arch/arm64/kernel/smp.c --- linux-3.10.30.orig/arch/arm64/kernel/smp.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm64/kernel/smp.c 2014-05-15 20:33:37.717867670 +0200 ++++ linux-linaro-stable-mx6/arch/arm64/kernel/smp.c 2014-05-16 15:28:20.005378056 +0200 @@ -39,6 +39,7 @@ #include <asm/atomic.h> #include <asm/cacheflush.h> @@ -32520,7 +32195,7 @@ diff -Nur linux-3.10.30.orig/arch/arm64/kernel/smp_psci.c linux-linaro-stable-mx -}; diff -Nur linux-3.10.30.orig/arch/arm64/kernel/smp_spin_table.c linux-linaro-stable-mx6/arch/arm64/kernel/smp_spin_table.c --- linux-3.10.30.orig/arch/arm64/kernel/smp_spin_table.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm64/kernel/smp_spin_table.c 2014-05-15 20:33:37.717867670 +0200 ++++ linux-linaro-stable-mx6/arch/arm64/kernel/smp_spin_table.c 2014-05-16 15:28:20.005378056 +0200 @@ -16,15 +16,39 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ @@ -32637,7 +32312,7 @@ diff -Nur linux-3.10.30.orig/arch/arm64/kernel/smp_spin_table.c linux-linaro-sta }; diff -Nur linux-3.10.30.orig/arch/arm64/kernel/topology.c linux-linaro-stable-mx6/arch/arm64/kernel/topology.c --- linux-3.10.30.orig/arch/arm64/kernel/topology.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm64/kernel/topology.c 2014-05-15 20:33:37.717867670 +0200 ++++ linux-linaro-stable-mx6/arch/arm64/kernel/topology.c 2014-05-16 15:28:20.005378056 +0200 @@ -0,0 +1,537 @@ +/* + * arch/arm64/kernel/topology.c @@ -33178,7 +32853,7 @@ diff -Nur linux-3.10.30.orig/arch/arm64/kernel/topology.c linux-linaro-stable-mx +} diff -Nur linux-3.10.30.orig/arch/arm64/kernel/vmlinux.lds.S linux-linaro-stable-mx6/arch/arm64/kernel/vmlinux.lds.S --- linux-3.10.30.orig/arch/arm64/kernel/vmlinux.lds.S 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm64/kernel/vmlinux.lds.S 2014-05-15 20:33:37.721867699 +0200 ++++ linux-linaro-stable-mx6/arch/arm64/kernel/vmlinux.lds.S 2014-05-16 15:28:20.005378056 +0200 @@ -41,7 +41,6 @@ } .text : { /* Real text segment */ @@ -33189,7 +32864,7 @@ diff -Nur linux-3.10.30.orig/arch/arm64/kernel/vmlinux.lds.S linux-linaro-stable __exception_text_end = .; diff -Nur linux-3.10.30.orig/arch/mips/include/asm/pci.h linux-linaro-stable-mx6/arch/mips/include/asm/pci.h --- linux-3.10.30.orig/arch/mips/include/asm/pci.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/mips/include/asm/pci.h 2014-05-15 20:33:39.817882813 +0200 ++++ linux-linaro-stable-mx6/arch/mips/include/asm/pci.h 2014-05-16 15:28:20.521380778 +0200 @@ -137,11 +137,6 @@ return channel ? 15 : 14; } @@ -33204,7 +32879,7 @@ diff -Nur linux-3.10.30.orig/arch/mips/include/asm/pci.h linux-linaro-stable-mx6 #ifdef CONFIG_OF diff -Nur linux-3.10.30.orig/arch/powerpc/include/asm/pci.h linux-linaro-stable-mx6/arch/powerpc/include/asm/pci.h --- linux-3.10.30.orig/arch/powerpc/include/asm/pci.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/powerpc/include/asm/pci.h 2014-05-15 20:33:41.013891438 +0200 ++++ linux-linaro-stable-mx6/arch/powerpc/include/asm/pci.h 2014-05-16 15:28:20.757382022 +0200 @@ -113,11 +113,6 @@ /* Decide whether to display the domain number in /proc */ extern int pci_proc_domain(struct pci_bus *bus); @@ -33219,7 +32894,7 @@ diff -Nur linux-3.10.30.orig/arch/powerpc/include/asm/pci.h linux-linaro-stable- int pci_mmap_page_range(struct pci_dev *pdev, struct vm_area_struct *vma, diff -Nur linux-3.10.30.orig/arch/powerpc/include/asm/prom.h linux-linaro-stable-mx6/arch/powerpc/include/asm/prom.h --- linux-3.10.30.orig/arch/powerpc/include/asm/prom.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/powerpc/include/asm/prom.h 2014-05-15 20:33:41.033891582 +0200 ++++ linux-linaro-stable-mx6/arch/powerpc/include/asm/prom.h 2014-05-16 15:28:20.761382044 +0200 @@ -43,9 +43,6 @@ extern void kdump_move_device_tree(void); @@ -33232,7 +32907,7 @@ diff -Nur linux-3.10.30.orig/arch/powerpc/include/asm/prom.h linux-linaro-stable diff -Nur linux-3.10.30.orig/arch/powerpc/kernel/prom.c linux-linaro-stable-mx6/arch/powerpc/kernel/prom.c --- linux-3.10.30.orig/arch/powerpc/kernel/prom.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/powerpc/kernel/prom.c 2014-05-15 20:33:41.437894495 +0200 ++++ linux-linaro-stable-mx6/arch/powerpc/kernel/prom.c 2014-05-16 15:28:20.785382170 +0200 @@ -827,49 +827,10 @@ __initcall(prom_reconfig_setup); #endif @@ -33287,7 +32962,7 @@ diff -Nur linux-3.10.30.orig/arch/powerpc/kernel/prom.c linux-linaro-stable-mx6/ static struct debugfs_blob_wrapper flat_dt_blob; diff -Nur linux-3.10.30.orig/arch/s390/include/asm/pci.h linux-linaro-stable-mx6/arch/s390/include/asm/pci.h --- linux-3.10.30.orig/arch/s390/include/asm/pci.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/s390/include/asm/pci.h 2014-05-15 20:33:42.549902513 +0200 ++++ linux-linaro-stable-mx6/arch/s390/include/asm/pci.h 2014-05-16 15:28:20.885382697 +0200 @@ -21,10 +21,6 @@ int pci_domain_nr(struct pci_bus *); int pci_proc_domain(struct pci_bus *); @@ -33301,7 +32976,7 @@ diff -Nur linux-3.10.30.orig/arch/s390/include/asm/pci.h linux-linaro-stable-mx6 diff -Nur linux-3.10.30.orig/arch/x86/include/asm/pci.h linux-linaro-stable-mx6/arch/x86/include/asm/pci.h --- linux-3.10.30.orig/arch/x86/include/asm/pci.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/x86/include/asm/pci.h 2014-05-15 20:33:44.465916327 +0200 ++++ linux-linaro-stable-mx6/arch/x86/include/asm/pci.h 2014-05-16 15:28:21.161384153 +0200 @@ -100,29 +100,6 @@ extern void pci_iommu_alloc(void); @@ -33351,7 +33026,7 @@ diff -Nur linux-3.10.30.orig/arch/x86/include/asm/pci.h linux-linaro-stable-mx6/ #define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys) diff -Nur linux-3.10.30.orig/arch/x86/kernel/x86_init.c linux-linaro-stable-mx6/arch/x86/kernel/x86_init.c --- linux-3.10.30.orig/arch/x86/kernel/x86_init.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/x86/kernel/x86_init.c 2014-05-15 20:33:44.553916962 +0200 ++++ linux-linaro-stable-mx6/arch/x86/kernel/x86_init.c 2014-05-16 15:28:21.209384406 +0200 @@ -107,6 +107,8 @@ }; @@ -33392,7 +33067,7 @@ diff -Nur linux-3.10.30.orig/arch/x86/kernel/x86_init.c linux-linaro-stable-mx6/ .read = native_io_apic_read, diff -Nur linux-3.10.30.orig/block/blk-core.c linux-linaro-stable-mx6/block/blk-core.c --- linux-3.10.30.orig/block/blk-core.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/block/blk-core.c 2014-05-15 20:33:44.881919327 +0200 ++++ linux-linaro-stable-mx6/block/blk-core.c 2014-05-16 15:28:21.285384807 +0200 @@ -3191,7 +3191,8 @@ /* used for unplugging and affects IO latency/throughput - HIGHPRI */ @@ -33405,7 +33080,7 @@ diff -Nur linux-3.10.30.orig/block/blk-core.c linux-linaro-stable-mx6/block/blk- diff -Nur linux-3.10.30.orig/block/blk-ioc.c linux-linaro-stable-mx6/block/blk-ioc.c --- linux-3.10.30.orig/block/blk-ioc.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/block/blk-ioc.c 2014-05-15 20:33:44.881919327 +0200 ++++ linux-linaro-stable-mx6/block/blk-ioc.c 2014-05-16 15:28:21.285384807 +0200 @@ -144,7 +144,8 @@ if (atomic_long_dec_and_test(&ioc->refcount)) { spin_lock_irqsave(&ioc->lock, flags); @@ -33418,7 +33093,7 @@ diff -Nur linux-3.10.30.orig/block/blk-ioc.c linux-linaro-stable-mx6/block/blk-i spin_unlock_irqrestore(&ioc->lock, flags); diff -Nur linux-3.10.30.orig/block/genhd.c linux-linaro-stable-mx6/block/genhd.c --- linux-3.10.30.orig/block/genhd.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/block/genhd.c 2014-05-15 20:33:44.885919355 +0200 ++++ linux-linaro-stable-mx6/block/genhd.c 2014-05-16 15:28:21.289384827 +0200 @@ -1489,9 +1489,11 @@ intv = disk_events_poll_jiffies(disk); set_timer_slack(&ev->dwork.timer, intv / 4); @@ -33455,7 +33130,7 @@ diff -Nur linux-3.10.30.orig/block/genhd.c linux-linaro-stable-mx6/block/genhd.c diff -Nur linux-3.10.30.orig/Documentation/ABI/testing/sysfs-class-mtd linux-linaro-stable-mx6/Documentation/ABI/testing/sysfs-class-mtd --- linux-3.10.30.orig/Documentation/ABI/testing/sysfs-class-mtd 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/ABI/testing/sysfs-class-mtd 2014-05-15 20:33:31.513822926 +0200 ++++ linux-linaro-stable-mx6/Documentation/ABI/testing/sysfs-class-mtd 2014-05-16 15:28:19.173373668 +0200 @@ -104,7 +104,7 @@ One of the following ASCII strings, representing the device type: @@ -33495,7 +33170,7 @@ diff -Nur linux-3.10.30.orig/Documentation/ABI/testing/sysfs-class-mtd linux-lin + devices lacking any ECC capability, it is 0. diff -Nur linux-3.10.30.orig/Documentation/arm/small_task_packing.txt linux-linaro-stable-mx6/Documentation/arm/small_task_packing.txt --- linux-3.10.30.orig/Documentation/arm/small_task_packing.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/arm/small_task_packing.txt 2014-05-15 20:33:31.841825292 +0200 ++++ linux-linaro-stable-mx6/Documentation/arm/small_task_packing.txt 2014-05-16 15:28:19.257374111 +0200 @@ -0,0 +1,136 @@ +Small Task Packing in the big.LITTLE MP Reference Patch Set + @@ -33635,7 +33310,7 @@ diff -Nur linux-3.10.30.orig/Documentation/arm/small_task_packing.txt linux-lina + diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/arm/cci.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/cci.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/arm/cci.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/cci.txt 2014-05-15 20:33:32.017826561 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/cci.txt 2014-05-16 15:28:19.281374237 +0200 @@ -0,0 +1,172 @@ +======================================================= +ARM CCI cache coherent interconnect binding description @@ -33811,7 +33486,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/arm/cci.txt linux +CCI slave interface @0x000000002c095000 is connected to CPUs {CPU2, CPU3}; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt 2014-05-15 20:33:32.017826561 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt 2014-05-16 15:28:19.281374237 +0200 @@ -0,0 +1,64 @@ +Freescale Busfreq driver + @@ -33879,7 +33554,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/arm/imx/busfreq-i +}; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/arm/imx/gpc.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/imx/gpc.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/arm/imx/gpc.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/imx/gpc.txt 2014-05-15 20:33:32.017826561 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/imx/gpc.txt 2014-05-16 15:28:19.281374237 +0200 @@ -0,0 +1,20 @@ +Freescale imx GPC bindings + @@ -33903,7 +33578,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/arm/imx/gpc.txt l + }; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/arm/pmu.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/pmu.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/arm/pmu.txt 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/pmu.txt 2014-05-15 20:33:32.021826590 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/pmu.txt 2014-05-16 15:28:19.281374237 +0200 @@ -16,6 +16,9 @@ "arm,arm1176-pmu" "arm,arm1136-pmu" @@ -33916,7 +33591,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/arm/pmu.txt linux diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/arm/rtsm-dcscb.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/rtsm-dcscb.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/arm/rtsm-dcscb.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/rtsm-dcscb.txt 2014-05-15 20:33:32.021826590 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/rtsm-dcscb.txt 2014-05-16 15:28:19.281374237 +0200 @@ -0,0 +1,19 @@ +ARM Dual Cluster System Configuration Block +------------------------------------------- @@ -33939,7 +33614,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/arm/rtsm-dcscb.tx + }; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/bus/imx-weim.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/bus/imx-weim.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/bus/imx-weim.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/bus/imx-weim.txt 2014-05-15 20:33:32.025826619 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/bus/imx-weim.txt 2014-05-16 15:28:19.289374280 +0200 @@ -0,0 +1,49 @@ +Device tree bindings for i.MX Wireless External Interface Module (WEIM) + @@ -33992,7 +33667,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/bus/imx-weim.txt + }; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/clock/imx6q-clock.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/clock/imx6q-clock.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/clock/imx6q-clock.txt 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/clock/imx6q-clock.txt 2014-05-15 20:33:32.077826993 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/clock/imx6q-clock.txt 2014-05-16 15:28:19.293374301 +0200 @@ -89,8 +89,6 @@ gpu3d_shader 74 ipu1_podf 75 @@ -34034,7 +33709,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/clock/imx6q-clock diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/clock/imx6sl-clock.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/clock/imx6sl-clock.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/clock/imx6sl-clock.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/clock/imx6sl-clock.txt 2014-05-15 20:33:32.077826993 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/clock/imx6sl-clock.txt 2014-05-16 15:28:19.293374301 +0200 @@ -0,0 +1,10 @@ +* Clock bindings for Freescale i.MX6 SoloLite + @@ -34048,7 +33723,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/clock/imx6sl-cloc +for the full list of i.MX6 SoloLite clock IDs. diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/clock/vf610-clock.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/clock/vf610-clock.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/clock/vf610-clock.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/clock/vf610-clock.txt 2014-05-15 20:33:32.121827311 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/clock/vf610-clock.txt 2014-05-16 15:28:19.293374301 +0200 @@ -0,0 +1,26 @@ +* Clock bindings for Freescale Vybrid VF610 SOC + @@ -34078,7 +33753,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/clock/vf610-clock +}; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/cpufreq/cpufreq-imx6q.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/cpufreq/cpufreq-imx6q.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/cpufreq/cpufreq-imx6q.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/cpufreq/cpufreq-imx6q.txt 2014-05-15 20:33:32.121827311 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/cpufreq/cpufreq-imx6q.txt 2014-05-16 15:28:19.293374301 +0200 @@ -0,0 +1,59 @@ +iMX6q/iMX6dl/iMX6sl specific CPUFREQ settings + @@ -34141,7 +33816,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/cpufreq/cpufreq-i +}; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt 2014-05-15 20:33:32.121827311 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt 2014-05-16 15:28:19.293374301 +0200 @@ -4,14 +4,71 @@ - compatible : Should be "fsl,<chip>-sdma" - reg : Should contain SDMA registers location and length @@ -34216,7 +33891,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/dma/fsl-imx-sdma. +}; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/fb/fsl_epdc_fb.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/fb/fsl_epdc_fb.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/fb/fsl_epdc_fb.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/fb/fsl_epdc_fb.txt 2014-05-15 20:33:32.141827456 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/fb/fsl_epdc_fb.txt 2014-05-16 15:28:19.297374322 +0200 @@ -0,0 +1,30 @@ +* Freescale MXC Electrophoretic Display Controller (EPDC) + @@ -34250,7 +33925,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/fb/fsl_epdc_fb.tx +}; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt 2014-05-15 20:33:32.173827687 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt 2014-05-16 15:28:19.297374322 +0200 @@ -0,0 +1,146 @@ +* FSL IPUv3 Display/FB + @@ -34400,7 +34075,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.t + }; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/fb/mxsfb.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/fb/mxsfb.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/fb/mxsfb.txt 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/fb/mxsfb.txt 2014-05-15 20:33:32.173827687 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/fb/mxsfb.txt 2014-05-16 15:28:19.297374322 +0200 @@ -3,6 +3,9 @@ Required properties: - compatible: Should be "fsl,<chip>-lcdif". Supported chips include @@ -34424,7 +34099,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/fb/mxsfb.txt linu bits-per-pixel = <32>; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/input/touchscreen/elan-ts.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/input/touchscreen/elan-ts.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/input/touchscreen/elan-ts.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/input/touchscreen/elan-ts.txt 2014-05-15 20:33:32.281828465 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/input/touchscreen/elan-ts.txt 2014-05-16 15:28:19.309374386 +0200 @@ -0,0 +1,23 @@ +* ELAN Resistive Touch Controller + @@ -34451,7 +34126,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/input/touchscreen + }; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/leds/leds-pwm.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/leds/leds-pwm.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/leds/leds-pwm.txt 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/leds/leds-pwm.txt 2014-05-15 20:33:32.281828465 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/leds/leds-pwm.txt 2014-05-16 15:28:19.313374406 +0200 @@ -13,6 +13,9 @@ For the pwms and pwm-names property please refer to: Documentation/devicetree/bindings/pwm/pwm.txt @@ -34464,7 +34139,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/leds/leds-pwm.txt - linux,default-trigger : (optional) diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/mfd/vexpress-spc.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/mfd/vexpress-spc.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/mfd/vexpress-spc.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/mfd/vexpress-spc.txt 2014-05-15 20:33:32.289828523 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/mfd/vexpress-spc.txt 2014-05-16 15:28:19.317374427 +0200 @@ -0,0 +1,35 @@ +* ARM Versatile Express Serial Power Controller device tree bindings + @@ -34503,7 +34178,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/mfd/vexpress-spc. +}; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/mlb/mlb150.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/mlb/mlb150.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/mlb/mlb150.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/mlb/mlb150.txt 2014-05-15 20:33:32.293828552 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/mlb/mlb150.txt 2014-05-16 15:28:19.321374448 +0200 @@ -0,0 +1,22 @@ +* Freescale Media Local Bus Host Controller (MLB) for i.MX6Q/DL + @@ -34529,7 +34204,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/mlb/mlb150.txt li +}; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt 2014-05-15 20:33:32.293828552 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt 2014-05-16 15:28:19.321374448 +0200 @@ -12,6 +12,11 @@ Optional properties: - fsl,cd-controller : Indicate to use controller internal card detection @@ -34544,7 +34219,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/mmc/mmc.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/mmc/mmc.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/mmc/mmc.txt 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/mmc/mmc.txt 2014-05-15 20:33:32.293828552 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/mmc/mmc.txt 2014-05-16 15:28:19.321374448 +0200 @@ -5,6 +5,8 @@ Interpreted by the OF core: - reg: Registers location and length. @@ -34572,7 +34247,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/mmc/mmc.txt linux line levels. We choose to follow the SDHCI standard, which specifies both those diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/mtd/gpmi-nand.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/mtd/gpmi-nand.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/mtd/gpmi-nand.txt 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/mtd/gpmi-nand.txt 2014-05-15 20:33:32.297828580 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/mtd/gpmi-nand.txt 2014-05-16 15:28:19.325374469 +0200 @@ -17,6 +17,14 @@ Optional properties: - nand-on-flash-bbt: boolean to enable on flash bbt option if not @@ -34590,7 +34265,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/mtd/gpmi-nand.txt address space. See partition.txt for more detail. diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt 2014-05-15 20:33:32.297828580 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt 2014-05-16 15:28:19.325374469 +0200 @@ -15,6 +15,13 @@ Optional properties: @@ -34607,7 +34282,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/net/can/fsl-flexc diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/pci/designware-pcie.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/pci/designware-pcie.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/pci/designware-pcie.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/pci/designware-pcie.txt 2014-05-15 20:33:32.321828754 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/pci/designware-pcie.txt 2014-05-16 15:28:19.329374490 +0200 @@ -0,0 +1,81 @@ +* Synopsis Designware PCIe interface + @@ -34692,7 +34367,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/pci/designware-pc + }; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/pci/mvebu-pci.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/pci/mvebu-pci.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/pci/mvebu-pci.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/pci/mvebu-pci.txt 2014-05-15 20:33:32.321828754 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/pci/mvebu-pci.txt 2014-05-16 15:28:19.329374490 +0200 @@ -0,0 +1,221 @@ +* Marvell EBU PCIe interfaces + @@ -34917,7 +34592,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/pci/mvebu-pci.txt +}; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/pinctrl/fsl,vf610-pinctrl.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/pinctrl/fsl,vf610-pinctrl.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/pinctrl/fsl,vf610-pinctrl.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/pinctrl/fsl,vf610-pinctrl.txt 2014-05-15 20:33:32.345828926 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/pinctrl/fsl,vf610-pinctrl.txt 2014-05-16 15:28:19.329374490 +0200 @@ -0,0 +1,41 @@ +Freescale Vybrid VF610 IOMUX Controller + @@ -34962,7 +34637,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/pinctrl/fsl,vf610 +for all available PIN_FUNC_ID for Vybrid VF610. diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt 2014-05-15 20:33:32.349828956 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt 2014-05-16 15:28:19.333374512 +0200 @@ -71,6 +71,13 @@ name for integer state ID 0, list entry 1 for state ID 1, and so on. @@ -34979,7 +34654,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/pinctrl/pinctrl-b /* For a client device requiring named states */ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/regulator/max17135-regulator.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/regulator/max17135-regulator.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/regulator/max17135-regulator.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/regulator/max17135-regulator.txt 2014-05-15 20:33:32.473829850 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/regulator/max17135-regulator.txt 2014-05-16 15:28:19.341374554 +0200 @@ -0,0 +1,112 @@ +Maxim MAX17135 Voltage Regulator + @@ -35095,7 +34770,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/regulator/max1713 + }; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/regulator/pfuze100.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/regulator/pfuze100.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/regulator/pfuze100.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/regulator/pfuze100.txt 2014-05-15 20:33:32.489829966 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/regulator/pfuze100.txt 2014-05-16 15:28:19.341374554 +0200 @@ -0,0 +1,115 @@ +PFUZE100 family of regulators + @@ -35214,7 +34889,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/regulator/pfuze10 + }; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/reset/gpio-reset.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/reset/gpio-reset.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/reset/gpio-reset.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/reset/gpio-reset.txt 2014-05-15 20:33:32.493829994 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/reset/gpio-reset.txt 2014-05-16 15:28:19.341374554 +0200 @@ -0,0 +1,35 @@ +GPIO reset controller +===================== @@ -35253,7 +34928,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/reset/gpio-reset. +}; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/cs42888.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/cs42888.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/sound/cs42888.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/cs42888.txt 2014-05-15 20:33:32.501830053 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/cs42888.txt 2014-05-16 15:28:19.345374575 +0200 @@ -0,0 +1,29 @@ +CS42888 audio CODEC + @@ -35286,7 +34961,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/cs42888.txt +}; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt 2014-05-15 20:33:32.501830053 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt 2014-05-16 15:28:19.345374575 +0200 @@ -0,0 +1,23 @@ +* Freescale Asynchronous Sample Rate Converter (ASRC) + @@ -35313,7 +34988,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/fsl-asrc-p2 +}; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/fsl-easi.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/fsl-easi.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/sound/fsl-easi.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/fsl-easi.txt 2014-05-15 20:33:32.501830053 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/fsl-easi.txt 2014-05-16 15:28:19.345374575 +0200 @@ -0,0 +1,26 @@ +* Freescale Enhanced Serial Audio Interface (ESAI) + @@ -35343,7 +35018,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/fsl-easi.tx +}; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/fsl,spdif.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/fsl,spdif.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/sound/fsl,spdif.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/fsl,spdif.txt 2014-05-15 20:33:32.501830053 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/fsl,spdif.txt 2014-05-16 15:28:19.345374575 +0200 @@ -0,0 +1,54 @@ +Freescale Sony/Philips Digital Interface Format (S/PDIF) Controller + @@ -35401,7 +35076,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/fsl,spdif.t +}; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt 2014-05-15 20:33:32.501830053 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt 2014-05-16 15:28:19.345374575 +0200 @@ -0,0 +1,25 @@ +Freescale i.MX audio complex with CS42888 codec + @@ -35430,7 +35105,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/imx-audio-c +}; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/imx-audio-si476x.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/imx-audio-si476x.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/sound/imx-audio-si476x.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/imx-audio-si476x.txt 2014-05-15 20:33:32.501830053 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/imx-audio-si476x.txt 2014-05-16 15:28:19.345374575 +0200 @@ -0,0 +1,24 @@ +Freescale i.MX audio complex with si476x codec + @@ -35458,7 +35133,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/imx-audio-s +}; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/imx-audio-spdif.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/imx-audio-spdif.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/sound/imx-audio-spdif.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/imx-audio-spdif.txt 2014-05-15 20:33:32.501830053 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/imx-audio-spdif.txt 2014-05-16 15:28:19.345374575 +0200 @@ -0,0 +1,34 @@ +Freescale i.MX audio complex with S/PDIF transceiver + @@ -35496,7 +35171,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/imx-audio-s +}; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt 2014-05-15 20:33:32.501830053 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt 2014-05-16 15:28:19.345374575 +0200 @@ -0,0 +1,54 @@ +Freescale i.MX audio complex with WM8962 codec + @@ -35554,7 +35229,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/imx-audio-w +}; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/wm8962.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/wm8962.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/sound/wm8962.txt 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/wm8962.txt 2014-05-15 20:33:32.525830225 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/wm8962.txt 2014-05-16 15:28:19.349374597 +0200 @@ -8,9 +8,40 @@ - reg : the I2C address of the device. @@ -35598,7 +35273,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/wm8962.txt }; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/spi/spi-bus.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/spi/spi-bus.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/spi/spi-bus.txt 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/spi/spi-bus.txt 2014-05-15 20:33:32.529830254 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/spi/spi-bus.txt 2014-05-16 15:28:19.349374597 +0200 @@ -55,6 +55,16 @@ chip select active high - spi-3wire - (optional) Empty property indicating device requires @@ -35618,7 +35293,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/spi/spi-bus.txt l via the cs_gpio diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/thermal/imx-thermal.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/thermal/imx-thermal.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/thermal/imx-thermal.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/thermal/imx-thermal.txt 2014-05-15 20:33:32.585830658 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/thermal/imx-thermal.txt 2014-05-16 15:28:19.349374597 +0200 @@ -0,0 +1,17 @@ +* Temperature Monitor (TEMPMON) on Freescale i.MX SoCs + @@ -35639,7 +35314,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/thermal/imx-therm +}; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt 2014-05-15 20:33:32.589830686 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt 2014-05-16 15:28:19.353374617 +0200 @@ -8,6 +8,8 @@ Optional properties: - fsl,uart-has-rtscts : Indicate the uart has rts and cts @@ -35657,7 +35332,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/tty/serial/fsl-im }; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/tty/serial/fsl-lpuart.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/tty/serial/fsl-lpuart.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/tty/serial/fsl-lpuart.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/tty/serial/fsl-lpuart.txt 2014-05-15 20:33:32.589830686 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/tty/serial/fsl-lpuart.txt 2014-05-16 15:28:19.353374617 +0200 @@ -0,0 +1,14 @@ +* Freescale low power universal asynchronous receiver/transmitter (lpuart) + @@ -35675,7 +35350,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/tty/serial/fsl-lp + }; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt 2014-05-15 20:33:32.589830686 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt 2014-05-16 15:28:19.353374617 +0200 @@ -5,6 +5,12 @@ - reg: Should contain registers location and length - interrupts: Should contain controller interrupt @@ -35711,7 +35386,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/usb/ci13xxx-imx.t }; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/usb/mxs-phy.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/usb/mxs-phy.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/usb/mxs-phy.txt 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/usb/mxs-phy.txt 2014-05-15 20:33:32.589830686 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/usb/mxs-phy.txt 2014-05-16 15:28:19.353374617 +0200 @@ -1,13 +1,16 @@ * Freescale MXS USB Phy Device @@ -35732,7 +35407,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/usb/mxs-phy.txt l }; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/video/fsl,csi-v4l2-capture.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/fsl,csi-v4l2-capture.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/video/fsl,csi-v4l2-capture.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/fsl,csi-v4l2-capture.txt 2014-05-15 20:33:32.613830860 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/fsl,csi-v4l2-capture.txt 2014-05-16 15:28:19.357374638 +0200 @@ -0,0 +1,61 @@ +* Freescale CMOS Sensor Interface (CSI) V4L2 Capture + @@ -35797,7 +35472,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/video/fsl,csi-v4l + }; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt 2014-05-15 20:33:32.629830976 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt 2014-05-16 15:28:19.357374638 +0200 @@ -0,0 +1,42 @@ +* Freescale MIPI CSI2 Controller for i.MX6DQ/i.MX6SDL + @@ -35843,7 +35518,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/video/fsl,mipi-cs + }; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/video/fsl,pxp.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/fsl,pxp.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/video/fsl,pxp.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/fsl,pxp.txt 2014-05-15 20:33:32.629830976 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/fsl,pxp.txt 2014-05-16 15:28:19.357374638 +0200 @@ -0,0 +1,30 @@ +* Freescale PxP Controller for i.MX6DL, i.MX6SL + @@ -35877,7 +35552,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/video/fsl,pxp.txt + }; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt 2014-05-15 20:33:32.629830976 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt 2014-05-16 15:28:19.357374638 +0200 @@ -0,0 +1,102 @@ +* Freescale V4L2 Capture for i.MX6DQ/i.MX6SDL + @@ -35983,7 +35658,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/video/fsl,v4l2-ca + }; diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt --- linux-3.10.30.orig/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt 2014-05-15 20:33:32.629830976 +0200 ++++ linux-linaro-stable-mx6/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt 2014-05-16 15:28:19.357374638 +0200 @@ -0,0 +1,20 @@ +Device-Tree bindings for hdmi video driver + @@ -36007,7 +35682,7 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/video/mxc_hdmi_vi + diff -Nur linux-3.10.30.orig/Documentation/DocBook/mtdnand.tmpl linux-linaro-stable-mx6/Documentation/DocBook/mtdnand.tmpl --- linux-3.10.30.orig/Documentation/DocBook/mtdnand.tmpl 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/DocBook/mtdnand.tmpl 2014-05-15 20:33:31.737824541 +0200 ++++ linux-linaro-stable-mx6/Documentation/DocBook/mtdnand.tmpl 2014-05-16 15:28:19.237374005 +0200 @@ -1222,10 +1222,6 @@ #define NAND_BBT_VERSION 0x00000100 /* Create a bbt if none axists */ @@ -36021,7 +35696,7 @@ diff -Nur linux-3.10.30.orig/Documentation/DocBook/mtdnand.tmpl linux-linaro-sta /* Read and write back block contents when writing bbt */ diff -Nur linux-3.10.30.orig/Documentation/driver-model/devres.txt linux-linaro-stable-mx6/Documentation/driver-model/devres.txt --- linux-3.10.30.orig/Documentation/driver-model/devres.txt 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/driver-model/devres.txt 2014-05-15 20:33:32.653831149 +0200 ++++ linux-linaro-stable-mx6/Documentation/driver-model/devres.txt 2014-05-16 15:28:19.361374659 +0200 @@ -293,3 +293,6 @@ PHY devm_usb_get_phy() @@ -36031,7 +35706,7 @@ diff -Nur linux-3.10.30.orig/Documentation/driver-model/devres.txt linux-linaro- + devm_spi_register_master() diff -Nur linux-3.10.30.orig/Documentation/kernel-parameters.txt linux-linaro-stable-mx6/Documentation/kernel-parameters.txt --- linux-3.10.30.orig/Documentation/kernel-parameters.txt 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/kernel-parameters.txt 2014-05-15 20:33:33.053834033 +0200 ++++ linux-linaro-stable-mx6/Documentation/kernel-parameters.txt 2014-05-16 15:28:19.421374976 +0200 @@ -1240,6 +1240,15 @@ See comment before ip2_setup() in drivers/char/ip2/ip2base.c. @@ -36072,7 +35747,7 @@ diff -Nur linux-3.10.30.orig/Documentation/kernel-parameters.txt linux-linaro-st supporting x2apic. diff -Nur linux-3.10.30.orig/Documentation/vm/zswap.txt linux-linaro-stable-mx6/Documentation/vm/zswap.txt --- linux-3.10.30.orig/Documentation/vm/zswap.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/Documentation/vm/zswap.txt 2014-05-15 20:33:33.625838158 +0200 ++++ linux-linaro-stable-mx6/Documentation/vm/zswap.txt 2014-05-16 15:28:19.525375524 +0200 @@ -0,0 +1,72 @@ +Overview: + @@ -36148,7 +35823,7 @@ diff -Nur linux-3.10.30.orig/Documentation/vm/zswap.txt linux-linaro-stable-mx6/ +of pages stored, and various counters for the reasons pages are rejected. diff -Nur linux-3.10.30.orig/drivers/ata/ahci.h linux-linaro-stable-mx6/drivers/ata/ahci.h --- linux-3.10.30.orig/drivers/ata/ahci.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/ata/ahci.h 2014-05-15 20:33:45.049920537 +0200 ++++ linux-linaro-stable-mx6/drivers/ata/ahci.h 2014-05-16 15:28:21.357385187 +0200 @@ -337,6 +337,7 @@ .sdev_attrs = ahci_sdev_attrs @@ -36167,7 +35842,7 @@ diff -Nur linux-3.10.30.orig/drivers/ata/ahci.h linux-linaro-stable-mx6/drivers/ unsigned int port_no) diff -Nur linux-3.10.30.orig/drivers/ata/ahci_imx.c linux-linaro-stable-mx6/drivers/ata/ahci_imx.c --- linux-3.10.30.orig/drivers/ata/ahci_imx.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/ata/ahci_imx.c 2014-05-15 20:33:45.049920537 +0200 ++++ linux-linaro-stable-mx6/drivers/ata/ahci_imx.c 2014-05-16 15:28:21.357385187 +0200 @@ -0,0 +1,351 @@ +/* + * copyright (c) 2013 Freescale Semiconductor, Inc. @@ -36522,7 +36197,7 @@ diff -Nur linux-3.10.30.orig/drivers/ata/ahci_imx.c linux-linaro-stable-mx6/driv +MODULE_ALIAS("ahci:imx"); diff -Nur linux-3.10.30.orig/drivers/ata/ahci_platform.c linux-linaro-stable-mx6/drivers/ata/ahci_platform.c --- linux-3.10.30.orig/drivers/ata/ahci_platform.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/ata/ahci_platform.c 2014-05-15 20:33:45.049920537 +0200 ++++ linux-linaro-stable-mx6/drivers/ata/ahci_platform.c 2014-05-16 15:28:21.357385187 +0200 @@ -49,10 +49,11 @@ }; MODULE_DEVICE_TABLE(platform, ahci_devtype); @@ -36538,7 +36213,7 @@ diff -Nur linux-3.10.30.orig/drivers/ata/ahci_platform.c linux-linaro-stable-mx6 .inherits = &ahci_pmp_retry_srst_ops, diff -Nur linux-3.10.30.orig/drivers/ata/Kconfig linux-linaro-stable-mx6/drivers/ata/Kconfig --- linux-3.10.30.orig/drivers/ata/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/ata/Kconfig 2014-05-15 20:33:45.045920509 +0200 ++++ linux-linaro-stable-mx6/drivers/ata/Kconfig 2014-05-16 15:28:21.357385187 +0200 @@ -97,6 +97,15 @@ If unsure, say N. @@ -36557,7 +36232,7 @@ diff -Nur linux-3.10.30.orig/drivers/ata/Kconfig linux-linaro-stable-mx6/drivers depends on FSL_SOC diff -Nur linux-3.10.30.orig/drivers/ata/libahci.c linux-linaro-stable-mx6/drivers/ata/libahci.c --- linux-3.10.30.orig/drivers/ata/libahci.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/ata/libahci.c 2014-05-15 20:33:45.049920537 +0200 ++++ linux-linaro-stable-mx6/drivers/ata/libahci.c 2014-05-16 15:28:21.361385208 +0200 @@ -89,7 +89,6 @@ static int ahci_hardreset(struct ata_link *link, unsigned int *class, unsigned long deadline); @@ -36585,7 +36260,7 @@ diff -Nur linux-3.10.30.orig/drivers/ata/libahci.c linux-linaro-stable-mx6/drive { diff -Nur linux-3.10.30.orig/drivers/ata/Makefile linux-linaro-stable-mx6/drivers/ata/Makefile --- linux-3.10.30.orig/drivers/ata/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/ata/Makefile 2014-05-15 20:33:45.045920509 +0200 ++++ linux-linaro-stable-mx6/drivers/ata/Makefile 2014-05-16 15:28:21.357385187 +0200 @@ -10,6 +10,7 @@ obj-$(CONFIG_SATA_SIL24) += sata_sil24.o obj-$(CONFIG_SATA_DWC) += sata_dwc_460ex.o @@ -36596,7 +36271,7 @@ diff -Nur linux-3.10.30.orig/drivers/ata/Makefile linux-linaro-stable-mx6/driver obj-$(CONFIG_PDC_ADMA) += pdc_adma.o diff -Nur linux-3.10.30.orig/drivers/base/base.h linux-linaro-stable-mx6/drivers/base/base.h --- linux-3.10.30.orig/drivers/base/base.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/base/base.h 2014-05-15 20:33:45.257922037 +0200 ++++ linux-linaro-stable-mx6/drivers/base/base.h 2014-05-16 15:28:21.393385376 +0200 @@ -119,6 +119,11 @@ return drv->bus->match ? drv->bus->match(dev, drv) : 1; } @@ -36611,7 +36286,7 @@ diff -Nur linux-3.10.30.orig/drivers/base/base.h linux-linaro-stable-mx6/drivers extern int devres_release_all(struct device *dev); diff -Nur linux-3.10.30.orig/drivers/base/bus.c linux-linaro-stable-mx6/drivers/base/bus.c --- linux-3.10.30.orig/drivers/base/bus.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/base/bus.c 2014-05-15 20:33:45.277922181 +0200 ++++ linux-linaro-stable-mx6/drivers/base/bus.c 2014-05-16 15:28:21.393385376 +0200 @@ -499,6 +499,9 @@ error = device_add_attrs(bus, dev); if (error) @@ -36641,7 +36316,7 @@ diff -Nur linux-3.10.30.orig/drivers/base/bus.c linux-linaro-stable-mx6/drivers/ diff -Nur linux-3.10.30.orig/drivers/base/component.c linux-linaro-stable-mx6/drivers/base/component.c --- linux-3.10.30.orig/drivers/base/component.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/base/component.c 2014-05-15 20:33:45.277922181 +0200 ++++ linux-linaro-stable-mx6/drivers/base/component.c 2014-05-16 15:28:21.393385376 +0200 @@ -0,0 +1,382 @@ +/* + * Componentized device handling. @@ -37027,7 +36702,7 @@ diff -Nur linux-3.10.30.orig/drivers/base/component.c linux-linaro-stable-mx6/dr +MODULE_LICENSE("GPL v2"); diff -Nur linux-3.10.30.orig/drivers/base/core.c linux-linaro-stable-mx6/drivers/base/core.c --- linux-3.10.30.orig/drivers/base/core.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/base/core.c 2014-05-15 20:33:45.289922268 +0200 ++++ linux-linaro-stable-mx6/drivers/base/core.c 2014-05-16 15:28:21.393385376 +0200 @@ -461,8 +461,7 @@ device_remove_bin_file(dev, &attrs[i]); } @@ -37051,7 +36726,7 @@ diff -Nur linux-3.10.30.orig/drivers/base/core.c linux-linaro-stable-mx6/drivers diff -Nur linux-3.10.30.orig/drivers/base/Makefile linux-linaro-stable-mx6/drivers/base/Makefile --- linux-3.10.30.orig/drivers/base/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/base/Makefile 2014-05-15 20:33:45.257922037 +0200 ++++ linux-linaro-stable-mx6/drivers/base/Makefile 2014-05-16 15:28:21.389385355 +0200 @@ -1,6 +1,6 @@ # Makefile for the Linux device tree @@ -37062,7 +36737,7 @@ diff -Nur linux-3.10.30.orig/drivers/base/Makefile linux-linaro-stable-mx6/drive attribute_container.o transport_class.o \ diff -Nur linux-3.10.30.orig/drivers/base/pinctrl.c linux-linaro-stable-mx6/drivers/base/pinctrl.c --- linux-3.10.30.orig/drivers/base/pinctrl.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/base/pinctrl.c 2014-05-15 20:33:45.293922296 +0200 ++++ linux-linaro-stable-mx6/drivers/base/pinctrl.c 2014-05-16 15:28:21.397385398 +0200 @@ -48,6 +48,25 @@ goto cleanup_get; } @@ -37091,7 +36766,7 @@ diff -Nur linux-3.10.30.orig/drivers/base/pinctrl.c linux-linaro-stable-mx6/driv /* diff -Nur linux-3.10.30.orig/drivers/base/regmap/internal.h linux-linaro-stable-mx6/drivers/base/regmap/internal.h --- linux-3.10.30.orig/drivers/base/regmap/internal.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/base/regmap/internal.h 2014-05-15 20:33:45.297922326 +0200 ++++ linux-linaro-stable-mx6/drivers/base/regmap/internal.h 2014-05-16 15:28:21.401385419 +0200 @@ -52,6 +52,7 @@ struct regmap { struct mutex mutex; @@ -37102,7 +36777,7 @@ diff -Nur linux-3.10.30.orig/drivers/base/regmap/internal.h linux-linaro-stable- void *lock_arg; /* This is passed to lock/unlock functions */ diff -Nur linux-3.10.30.orig/drivers/base/regmap/regmap.c linux-linaro-stable-mx6/drivers/base/regmap/regmap.c --- linux-3.10.30.orig/drivers/base/regmap/regmap.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/base/regmap/regmap.c 2014-05-15 20:33:45.297922326 +0200 ++++ linux-linaro-stable-mx6/drivers/base/regmap/regmap.c 2014-05-16 15:28:21.401385419 +0200 @@ -302,13 +302,16 @@ static void regmap_lock_spinlock(void *__map) { @@ -37124,7 +36799,7 @@ diff -Nur linux-3.10.30.orig/drivers/base/regmap/regmap.c linux-linaro-stable-mx static void dev_get_regmap_release(struct device *dev, void *res) diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_conf.c linux-linaro-stable-mx6/drivers/block/enhanceio/eio_conf.c --- linux-3.10.30.orig/drivers/block/enhanceio/eio_conf.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_conf.c 2014-05-15 20:33:45.317922470 +0200 ++++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_conf.c 2014-05-16 15:28:21.417385503 +0200 @@ -0,0 +1,2630 @@ +/* + * eio_conf.c @@ -39758,7 +39433,7 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_conf.c linux-linaro-sta +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_fifo.c linux-linaro-stable-mx6/drivers/block/enhanceio/eio_fifo.c --- linux-3.10.30.orig/drivers/block/enhanceio/eio_fifo.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_fifo.c 2014-05-15 20:33:45.317922470 +0200 ++++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_fifo.c 2014-05-16 15:28:21.417385503 +0200 @@ -0,0 +1,239 @@ +/* + * eio_fifo.c @@ -40001,7 +39676,7 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_fifo.c linux-linaro-sta +MODULE_AUTHOR("STEC, Inc. based on code by Facebook"); diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio.h linux-linaro-stable-mx6/drivers/block/enhanceio/eio.h --- linux-3.10.30.orig/drivers/block/enhanceio/eio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio.h 2014-05-15 20:33:45.317922470 +0200 ++++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio.h 2014-05-16 15:28:21.417385503 +0200 @@ -0,0 +1,1150 @@ +/* + * eio.h @@ -41155,7 +40830,7 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio.h linux-linaro-stable-m +#endif /* !EIO_INC_H */ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_ioctl.c linux-linaro-stable-mx6/drivers/block/enhanceio/eio_ioctl.c --- linux-3.10.30.orig/drivers/block/enhanceio/eio_ioctl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_ioctl.c 2014-05-15 20:33:45.317922470 +0200 ++++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_ioctl.c 2014-05-16 15:28:21.417385503 +0200 @@ -0,0 +1,157 @@ +/* + * eio_ioctl.c @@ -41316,7 +40991,7 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_ioctl.c linux-linaro-st +} diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_ioctl.h linux-linaro-stable-mx6/drivers/block/enhanceio/eio_ioctl.h --- linux-3.10.30.orig/drivers/block/enhanceio/eio_ioctl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_ioctl.h 2014-05-15 20:33:45.317922470 +0200 ++++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_ioctl.h 2014-05-16 15:28:21.417385503 +0200 @@ -0,0 +1,86 @@ +/* + * eio_ioctl.h @@ -41406,7 +41081,7 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_ioctl.h linux-linaro-st +#endif /* !EIO_IOCTL_H */ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_lru.c linux-linaro-stable-mx6/drivers/block/enhanceio/eio_lru.c --- linux-3.10.30.orig/drivers/block/enhanceio/eio_lru.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_lru.c 2014-05-15 20:33:45.317922470 +0200 ++++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_lru.c 2014-05-16 15:28:21.417385503 +0200 @@ -0,0 +1,322 @@ +/* + * eio_lru.c @@ -41732,7 +41407,7 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_lru.c linux-linaro-stab +MODULE_AUTHOR("STEC, Inc. based on code by Facebook"); diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_main.c linux-linaro-stable-mx6/drivers/block/enhanceio/eio_main.c --- linux-3.10.30.orig/drivers/block/enhanceio/eio_main.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_main.c 2014-05-15 20:33:45.317922470 +0200 ++++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_main.c 2014-05-16 15:28:21.417385503 +0200 @@ -0,0 +1,3546 @@ +/* + * eio_main.c @@ -45282,7 +44957,7 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_main.c linux-linaro-sta +} diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_mem.c linux-linaro-stable-mx6/drivers/block/enhanceio/eio_mem.c --- linux-3.10.30.orig/drivers/block/enhanceio/eio_mem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_mem.c 2014-05-15 20:33:46.537931265 +0200 ++++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_mem.c 2014-05-16 15:28:21.417385503 +0200 @@ -0,0 +1,236 @@ +/* + * eio_mem.c @@ -45522,7 +45197,7 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_mem.c linux-linaro-stab +} diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_policy.c linux-linaro-stable-mx6/drivers/block/enhanceio/eio_policy.c --- linux-3.10.30.orig/drivers/block/enhanceio/eio_policy.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_policy.c 2014-05-15 20:33:46.541931294 +0200 ++++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_policy.c 2014-05-16 15:28:21.417385503 +0200 @@ -0,0 +1,146 @@ +/* + * eio_policy.c @@ -45672,7 +45347,7 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_policy.c linux-linaro-s +} diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_policy.h linux-linaro-stable-mx6/drivers/block/enhanceio/eio_policy.h --- linux-3.10.30.orig/drivers/block/enhanceio/eio_policy.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_policy.h 2014-05-15 20:33:46.541931294 +0200 ++++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_policy.h 2014-05-16 15:28:21.417385503 +0200 @@ -0,0 +1,105 @@ +/* + * eio_policy.h @@ -45781,7 +45456,7 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_policy.h linux-linaro-s +#endif /* EIO_POLICY_H */ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_procfs.c linux-linaro-stable-mx6/drivers/block/enhanceio/eio_procfs.c --- linux-3.10.30.orig/drivers/block/enhanceio/eio_procfs.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_procfs.c 2014-05-15 20:33:46.541931294 +0200 ++++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_procfs.c 2014-05-16 15:28:21.417385503 +0200 @@ -0,0 +1,1932 @@ +/* + * eio_procfs.c @@ -47717,7 +47392,7 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_procfs.c linux-linaro-s +} diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_rand.c linux-linaro-stable-mx6/drivers/block/enhanceio/eio_rand.c --- linux-3.10.30.orig/drivers/block/enhanceio/eio_rand.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_rand.c 2014-05-15 20:33:46.541931294 +0200 ++++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_rand.c 2014-05-16 15:28:21.417385503 +0200 @@ -0,0 +1,201 @@ +/* + * eio_rand.c @@ -47922,7 +47597,7 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_rand.c linux-linaro-sta +MODULE_AUTHOR("STEC, Inc. based on code by Facebook"); diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_setlru.c linux-linaro-stable-mx6/drivers/block/enhanceio/eio_setlru.c --- linux-3.10.30.orig/drivers/block/enhanceio/eio_setlru.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_setlru.c 2014-05-15 20:33:46.541931294 +0200 ++++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_setlru.c 2014-05-16 15:28:21.417385503 +0200 @@ -0,0 +1,170 @@ +/* + * eio_setlru.c @@ -48096,7 +47771,7 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_setlru.c linux-linaro-s +} diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_setlru.h linux-linaro-stable-mx6/drivers/block/enhanceio/eio_setlru.h --- linux-3.10.30.orig/drivers/block/enhanceio/eio_setlru.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_setlru.h 2014-05-15 20:33:46.541931294 +0200 ++++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_setlru.h 2014-05-16 15:28:21.417385503 +0200 @@ -0,0 +1,49 @@ +/* + * eio_setlru.h @@ -48149,7 +47824,7 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_setlru.h linux-linaro-s +#endif /* _EIO_SETLRU_H_ */ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_subr.c linux-linaro-stable-mx6/drivers/block/enhanceio/eio_subr.c --- linux-3.10.30.orig/drivers/block/enhanceio/eio_subr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_subr.c 2014-05-15 20:33:46.541931294 +0200 ++++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_subr.c 2014-05-16 15:28:21.421385524 +0200 @@ -0,0 +1,444 @@ +/* + * eio_subr.c @@ -48597,7 +48272,7 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_subr.c linux-linaro-sta +} diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_ttc.c linux-linaro-stable-mx6/drivers/block/enhanceio/eio_ttc.c --- linux-3.10.30.orig/drivers/block/enhanceio/eio_ttc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_ttc.c 2014-05-15 20:33:46.541931294 +0200 ++++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_ttc.c 2014-05-16 15:28:21.421385524 +0200 @@ -0,0 +1,1665 @@ +/* + * True Transparent Caching (TTC) code. @@ -50266,7 +49941,7 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_ttc.c linux-linaro-stab +} diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_ttc.h linux-linaro-stable-mx6/drivers/block/enhanceio/eio_ttc.h --- linux-3.10.30.orig/drivers/block/enhanceio/eio_ttc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_ttc.h 2014-05-15 20:33:46.541931294 +0200 ++++ linux-linaro-stable-mx6/drivers/block/enhanceio/eio_ttc.h 2014-05-16 15:28:21.421385524 +0200 @@ -0,0 +1,152 @@ +/* + * Copyright (C) 2012 STEC, Inc. All rights not specifically granted @@ -50422,7 +50097,7 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_ttc.h linux-linaro-stab +#endif /* EIO_TTC_H */ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/Kconfig linux-linaro-stable-mx6/drivers/block/enhanceio/Kconfig --- linux-3.10.30.orig/drivers/block/enhanceio/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/block/enhanceio/Kconfig 2014-05-15 20:33:45.313922441 +0200 ++++ linux-linaro-stable-mx6/drivers/block/enhanceio/Kconfig 2014-05-16 15:28:21.417385503 +0200 @@ -0,0 +1,21 @@ +# +# EnhanceIO caching solution by STEC INC. @@ -50447,7 +50122,7 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/Kconfig linux-linaro-stable + If unsure, say N. diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/Makefile linux-linaro-stable-mx6/drivers/block/enhanceio/Makefile --- linux-3.10.30.orig/drivers/block/enhanceio/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/block/enhanceio/Makefile 2014-05-15 20:33:45.313922441 +0200 ++++ linux-linaro-stable-mx6/drivers/block/enhanceio/Makefile 2014-05-16 15:28:21.417385503 +0200 @@ -0,0 +1,66 @@ +# test +# Makefile for EnhanceIO block device caching. @@ -50517,7 +50192,7 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/Makefile linux-linaro-stabl + diff -Nur linux-3.10.30.orig/drivers/block/Kconfig linux-linaro-stable-mx6/drivers/block/Kconfig --- linux-3.10.30.orig/drivers/block/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/block/Kconfig 2014-05-15 20:33:45.301922354 +0200 ++++ linux-linaro-stable-mx6/drivers/block/Kconfig 2014-05-16 15:28:21.405385440 +0200 @@ -541,4 +541,6 @@ To compile this driver as a module, choose M here: the module will be called rsxx. @@ -50527,7 +50202,7 @@ diff -Nur linux-3.10.30.orig/drivers/block/Kconfig linux-linaro-stable-mx6/drive endif # BLK_DEV diff -Nur linux-3.10.30.orig/drivers/block/Makefile linux-linaro-stable-mx6/drivers/block/Makefile --- linux-3.10.30.orig/drivers/block/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/block/Makefile 2014-05-15 20:33:45.301922354 +0200 ++++ linux-linaro-stable-mx6/drivers/block/Makefile 2014-05-16 15:28:21.405385440 +0200 @@ -42,5 +42,7 @@ obj-$(CONFIG_BLK_DEV_RSXX) += rsxx/ @@ -50538,7 +50213,7 @@ diff -Nur linux-3.10.30.orig/drivers/block/Makefile linux-linaro-stable-mx6/driv swim_mod-y := swim.o swim_asm.o diff -Nur linux-3.10.30.orig/drivers/bus/arm-cci.c linux-linaro-stable-mx6/drivers/bus/arm-cci.c --- linux-3.10.30.orig/drivers/bus/arm-cci.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/bus/arm-cci.c 2014-05-15 20:33:46.649932072 +0200 ++++ linux-linaro-stable-mx6/drivers/bus/arm-cci.c 2014-05-16 15:28:21.437385608 +0200 @@ -0,0 +1,945 @@ +/* + * CCI cache coherent interconnect driver @@ -51487,7 +51162,7 @@ diff -Nur linux-3.10.30.orig/drivers/bus/arm-cci.c linux-linaro-stable-mx6/drive +MODULE_DESCRIPTION("ARM CCI support"); diff -Nur linux-3.10.30.orig/drivers/bus/imx-weim.c linux-linaro-stable-mx6/drivers/bus/imx-weim.c --- linux-3.10.30.orig/drivers/bus/imx-weim.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/bus/imx-weim.c 2014-05-15 20:33:46.649932072 +0200 ++++ linux-linaro-stable-mx6/drivers/bus/imx-weim.c 2014-05-16 15:28:21.437385608 +0200 @@ -0,0 +1,138 @@ +/* + * EIM driver for Freescale's i.MX chips @@ -51629,7 +51304,7 @@ diff -Nur linux-3.10.30.orig/drivers/bus/imx-weim.c linux-linaro-stable-mx6/driv +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/bus/Kconfig linux-linaro-stable-mx6/drivers/bus/Kconfig --- linux-3.10.30.orig/drivers/bus/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/bus/Kconfig 2014-05-15 20:33:46.649932072 +0200 ++++ linux-linaro-stable-mx6/drivers/bus/Kconfig 2014-05-16 15:28:21.437385608 +0200 @@ -4,6 +4,15 @@ menu "Bus devices" @@ -51660,7 +51335,7 @@ diff -Nur linux-3.10.30.orig/drivers/bus/Kconfig linux-linaro-stable-mx6/drivers endmenu diff -Nur linux-3.10.30.orig/drivers/bus/Makefile linux-linaro-stable-mx6/drivers/bus/Makefile --- linux-3.10.30.orig/drivers/bus/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/bus/Makefile 2014-05-15 20:33:46.649932072 +0200 ++++ linux-linaro-stable-mx6/drivers/bus/Makefile 2014-05-16 15:28:21.437385608 +0200 @@ -2,8 +2,11 @@ # Makefile for the bus drivers. # @@ -51675,7 +51350,7 @@ diff -Nur linux-3.10.30.orig/drivers/bus/Makefile linux-linaro-stable-mx6/driver +obj-$(CONFIG_ARM_CCI) += arm-cci.o diff -Nur linux-3.10.30.orig/drivers/char/fsl_otp.c linux-linaro-stable-mx6/drivers/char/fsl_otp.c --- linux-3.10.30.orig/drivers/char/fsl_otp.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/char/fsl_otp.c 2014-05-15 20:33:46.661932159 +0200 ++++ linux-linaro-stable-mx6/drivers/char/fsl_otp.c 2014-05-16 15:28:21.445385651 +0200 @@ -0,0 +1,299 @@ +/* + * Freescale On-Chip OTP driver @@ -51978,7 +51653,7 @@ diff -Nur linux-3.10.30.orig/drivers/char/fsl_otp.c linux-linaro-stable-mx6/driv +MODULE_DESCRIPTION("Freescale i.MX OCOTP driver"); diff -Nur linux-3.10.30.orig/drivers/char/Kconfig linux-linaro-stable-mx6/drivers/char/Kconfig --- linux-3.10.30.orig/drivers/char/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/char/Kconfig 2014-05-15 20:33:46.653932101 +0200 ++++ linux-linaro-stable-mx6/drivers/char/Kconfig 2014-05-16 15:28:21.441385630 +0200 @@ -94,6 +94,21 @@ If unsure, say N. @@ -52003,7 +51678,7 @@ diff -Nur linux-3.10.30.orig/drivers/char/Kconfig linux-linaro-stable-mx6/driver depends on PARPORT diff -Nur linux-3.10.30.orig/drivers/char/Makefile linux-linaro-stable-mx6/drivers/char/Makefile --- linux-3.10.30.orig/drivers/char/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/char/Makefile 2014-05-15 20:33:46.653932101 +0200 ++++ linux-linaro-stable-mx6/drivers/char/Makefile 2014-05-16 15:28:21.441385630 +0200 @@ -17,6 +17,7 @@ obj-$(CONFIG_IBM_BSR) += bsr.o obj-$(CONFIG_SGI_MBCS) += mbcs.o @@ -52014,7 +51689,7 @@ diff -Nur linux-3.10.30.orig/drivers/char/Makefile linux-linaro-stable-mx6/drive diff -Nur linux-3.10.30.orig/drivers/clk/clk-divider.c linux-linaro-stable-mx6/drivers/clk/clk-divider.c --- linux-3.10.30.orig/drivers/clk/clk-divider.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/clk/clk-divider.c 2014-05-15 20:33:46.721932591 +0200 ++++ linux-linaro-stable-mx6/drivers/clk/clk-divider.c 2014-05-16 15:28:21.465385756 +0200 @@ -150,6 +150,7 @@ struct clk_divider *divider = to_clk_divider(hw); int i, bestdiv = 0; @@ -52041,7 +51716,7 @@ diff -Nur linux-3.10.30.orig/drivers/clk/clk-divider.c linux-linaro-stable-mx6/d now = parent_rate / i; diff -Nur linux-3.10.30.orig/drivers/clk/Kconfig linux-linaro-stable-mx6/drivers/clk/Kconfig --- linux-3.10.30.orig/drivers/clk/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/clk/Kconfig 2014-05-15 20:33:46.713932534 +0200 ++++ linux-linaro-stable-mx6/drivers/clk/Kconfig 2014-05-16 15:28:21.465385756 +0200 @@ -42,7 +42,7 @@ config COMMON_CLK_VERSATILE @@ -52053,7 +51728,7 @@ diff -Nur linux-3.10.30.orig/drivers/clk/Kconfig linux-linaro-stable-mx6/drivers - Integrator/AP and Integrator/CP diff -Nur linux-3.10.30.orig/drivers/clk/versatile/clk-vexpress-osc.c linux-linaro-stable-mx6/drivers/clk/versatile/clk-vexpress-osc.c --- linux-3.10.30.orig/drivers/clk/versatile/clk-vexpress-osc.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/clk/versatile/clk-vexpress-osc.c 2014-05-15 20:33:46.757932851 +0200 ++++ linux-linaro-stable-mx6/drivers/clk/versatile/clk-vexpress-osc.c 2014-05-16 15:28:21.477385819 +0200 @@ -107,7 +107,7 @@ osc->func = vexpress_config_func_get_by_node(node); if (!osc->func) { @@ -52074,7 +51749,7 @@ diff -Nur linux-3.10.30.orig/drivers/clk/versatile/clk-vexpress-osc.c linux-lina init.flags = CLK_IS_ROOT; diff -Nur linux-3.10.30.orig/drivers/clk/versatile/clk-vexpress-spc.c linux-linaro-stable-mx6/drivers/clk/versatile/clk-vexpress-spc.c --- linux-3.10.30.orig/drivers/clk/versatile/clk-vexpress-spc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/clk/versatile/clk-vexpress-spc.c 2014-05-15 20:33:46.757932851 +0200 ++++ linux-linaro-stable-mx6/drivers/clk/versatile/clk-vexpress-spc.c 2014-05-16 15:28:21.477385819 +0200 @@ -0,0 +1,131 @@ +/* + * Copyright (C) 2012 ARM Limited @@ -52209,7 +51884,7 @@ diff -Nur linux-3.10.30.orig/drivers/clk/versatile/clk-vexpress-spc.c linux-lina +#endif diff -Nur linux-3.10.30.orig/drivers/clk/versatile/Makefile linux-linaro-stable-mx6/drivers/clk/versatile/Makefile --- linux-3.10.30.orig/drivers/clk/versatile/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/clk/versatile/Makefile 2014-05-15 20:33:46.757932851 +0200 ++++ linux-linaro-stable-mx6/drivers/clk/versatile/Makefile 2014-05-16 15:28:21.477385819 +0200 @@ -4,4 +4,4 @@ obj-$(CONFIG_INTEGRATOR_IMPD1) += clk-impd1.o obj-$(CONFIG_ARCH_REALVIEW) += clk-realview.o @@ -52218,7 +51893,7 @@ diff -Nur linux-3.10.30.orig/drivers/clk/versatile/Makefile linux-linaro-stable- +obj-$(CONFIG_VEXPRESS_CONFIG) += clk-vexpress-osc.o clk-vexpress-spc.o diff -Nur linux-3.10.30.orig/drivers/clocksource/Kconfig linux-linaro-stable-mx6/drivers/clocksource/Kconfig --- linux-3.10.30.orig/drivers/clocksource/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/clocksource/Kconfig 2014-05-15 20:33:46.781933025 +0200 ++++ linux-linaro-stable-mx6/drivers/clocksource/Kconfig 2014-05-16 15:28:21.477385819 +0200 @@ -85,3 +85,8 @@ Samsung S3C, S5P and Exynos SoCs, replacing an earlier driver for all devicetree enabled platforms. This driver will be @@ -52230,7 +51905,7 @@ diff -Nur linux-3.10.30.orig/drivers/clocksource/Kconfig linux-linaro-stable-mx6 + Support for Period Interrupt Timer on Freescale Vybrid Family SoCs. diff -Nur linux-3.10.30.orig/drivers/clocksource/Makefile linux-linaro-stable-mx6/drivers/clocksource/Makefile --- linux-3.10.30.orig/drivers/clocksource/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/clocksource/Makefile 2014-05-15 20:33:46.781933025 +0200 ++++ linux-linaro-stable-mx6/drivers/clocksource/Makefile 2014-05-16 15:28:21.477385819 +0200 @@ -26,6 +26,7 @@ obj-$(CONFIG_CADENCE_TTC_TIMER) += cadence_ttc_timer.o obj-$(CONFIG_CLKSRC_EXYNOS_MCT) += exynos_mct.o @@ -52241,7 +51916,7 @@ diff -Nur linux-3.10.30.orig/drivers/clocksource/Makefile linux-linaro-stable-mx obj-$(CONFIG_CLKSRC_METAG_GENERIC) += metag_generic.o diff -Nur linux-3.10.30.orig/drivers/clocksource/vf_pit_timer.c linux-linaro-stable-mx6/drivers/clocksource/vf_pit_timer.c --- linux-3.10.30.orig/drivers/clocksource/vf_pit_timer.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/clocksource/vf_pit_timer.c 2014-05-15 20:33:46.805933197 +0200 ++++ linux-linaro-stable-mx6/drivers/clocksource/vf_pit_timer.c 2014-05-16 15:28:21.481385841 +0200 @@ -0,0 +1,194 @@ +/* + * Copyright 2012-2013 Freescale Semiconductor, Inc. @@ -52439,7 +52114,7 @@ diff -Nur linux-3.10.30.orig/drivers/clocksource/vf_pit_timer.c linux-linaro-sta +CLOCKSOURCE_OF_DECLARE(vf610, "fsl,vf610-pit", pit_timer_init); diff -Nur linux-3.10.30.orig/drivers/cpufreq/arm_big_little.c linux-linaro-stable-mx6/drivers/cpufreq/arm_big_little.c --- linux-3.10.30.orig/drivers/cpufreq/arm_big_little.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/cpufreq/arm_big_little.c 2014-05-15 20:33:46.805933197 +0200 ++++ linux-linaro-stable-mx6/drivers/cpufreq/arm_big_little.c 2014-05-16 15:28:21.481385841 +0200 @@ -24,27 +24,148 @@ #include <linux/cpufreq.h> #include <linux/cpumask.h> @@ -52983,7 +52658,7 @@ diff -Nur linux-3.10.30.orig/drivers/cpufreq/arm_big_little.c linux-linaro-stabl EXPORT_SYMBOL_GPL(bL_cpufreq_unregister); diff -Nur linux-3.10.30.orig/drivers/cpufreq/arm_big_little.h linux-linaro-stable-mx6/drivers/cpufreq/arm_big_little.h --- linux-3.10.30.orig/drivers/cpufreq/arm_big_little.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/cpufreq/arm_big_little.h 2014-05-15 20:33:46.805933197 +0200 ++++ linux-linaro-stable-mx6/drivers/cpufreq/arm_big_little.h 2014-05-16 15:28:21.481385841 +0200 @@ -23,6 +23,20 @@ #include <linux/device.h> #include <linux/types.h> @@ -53017,7 +52692,7 @@ diff -Nur linux-3.10.30.orig/drivers/cpufreq/arm_big_little.h linux-linaro-stabl int bL_cpufreq_register(struct cpufreq_arm_bL_ops *ops); diff -Nur linux-3.10.30.orig/drivers/cpufreq/cpufreq-imx6.c linux-linaro-stable-mx6/drivers/cpufreq/cpufreq-imx6.c --- linux-3.10.30.orig/drivers/cpufreq/cpufreq-imx6.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/cpufreq/cpufreq-imx6.c 2014-05-15 20:33:46.825933341 +0200 ++++ linux-linaro-stable-mx6/drivers/cpufreq/cpufreq-imx6.c 2014-05-16 15:28:21.481385841 +0200 @@ -0,0 +1,483 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -53504,7 +53179,7 @@ diff -Nur linux-3.10.30.orig/drivers/cpufreq/cpufreq-imx6.c linux-linaro-stable- +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/cpufreq/cpufreq_interactive.c linux-linaro-stable-mx6/drivers/cpufreq/cpufreq_interactive.c --- linux-3.10.30.orig/drivers/cpufreq/cpufreq_interactive.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/cpufreq/cpufreq_interactive.c 2014-05-15 20:33:46.825933341 +0200 ++++ linux-linaro-stable-mx6/drivers/cpufreq/cpufreq_interactive.c 2014-05-16 15:28:21.485385862 +0200 @@ -0,0 +1,705 @@ +/* + * drivers/cpufreq/cpufreq_interactive.c @@ -54213,7 +53888,7 @@ diff -Nur linux-3.10.30.orig/drivers/cpufreq/cpufreq_interactive.c linux-linaro- +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/cpufreq/cpufreq_ondemand.c linux-linaro-stable-mx6/drivers/cpufreq/cpufreq_ondemand.c --- linux-3.10.30.orig/drivers/cpufreq/cpufreq_ondemand.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/cpufreq/cpufreq_ondemand.c 2014-05-15 20:33:46.825933341 +0200 ++++ linux-linaro-stable-mx6/drivers/cpufreq/cpufreq_ondemand.c 2014-05-16 15:28:21.485385862 +0200 @@ -76,6 +76,8 @@ boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model >= 15) @@ -54225,7 +53900,7 @@ diff -Nur linux-3.10.30.orig/drivers/cpufreq/cpufreq_ondemand.c linux-linaro-sta } diff -Nur linux-3.10.30.orig/drivers/cpufreq/cpufreq_stats.c linux-linaro-stable-mx6/drivers/cpufreq/cpufreq_stats.c --- linux-3.10.30.orig/drivers/cpufreq/cpufreq_stats.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/cpufreq/cpufreq_stats.c 2014-05-15 20:33:46.825933341 +0200 ++++ linux-linaro-stable-mx6/drivers/cpufreq/cpufreq_stats.c 2014-05-16 15:28:21.485385862 +0200 @@ -21,6 +21,9 @@ #include <linux/spinlock.h> #include <linux/notifier.h> @@ -54646,7 +54321,7 @@ diff -Nur linux-3.10.30.orig/drivers/cpufreq/imx6q-cpufreq.c linux-linaro-stable -MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/cpufreq/Kconfig linux-linaro-stable-mx6/drivers/cpufreq/Kconfig --- linux-3.10.30.orig/drivers/cpufreq/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/cpufreq/Kconfig 2014-05-15 20:33:46.805933197 +0200 ++++ linux-linaro-stable-mx6/drivers/cpufreq/Kconfig 2014-05-16 15:28:21.481385841 +0200 @@ -102,6 +102,18 @@ Be aware that not all cpufreq drivers support the conservative governor. If unsure have a look at the help section of the @@ -54701,7 +54376,7 @@ diff -Nur linux-3.10.30.orig/drivers/cpufreq/Kconfig linux-linaro-stable-mx6/dri diff -Nur linux-3.10.30.orig/drivers/cpufreq/Kconfig.arm linux-linaro-stable-mx6/drivers/cpufreq/Kconfig.arm --- linux-3.10.30.orig/drivers/cpufreq/Kconfig.arm 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/cpufreq/Kconfig.arm 2014-05-15 20:33:46.805933197 +0200 ++++ linux-linaro-stable-mx6/drivers/cpufreq/Kconfig.arm 2014-05-16 15:28:21.481385841 +0200 @@ -4,7 +4,7 @@ config ARM_BIG_LITTLE_CPUFREQ @@ -54745,7 +54420,7 @@ diff -Nur linux-3.10.30.orig/drivers/cpufreq/Kconfig.arm linux-linaro-stable-mx6 diff -Nur linux-3.10.30.orig/drivers/cpufreq/Makefile linux-linaro-stable-mx6/drivers/cpufreq/Makefile --- linux-3.10.30.orig/drivers/cpufreq/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/cpufreq/Makefile 2014-05-15 20:33:46.805933197 +0200 ++++ linux-linaro-stable-mx6/drivers/cpufreq/Makefile 2014-05-16 15:28:21.481385841 +0200 @@ -9,6 +9,7 @@ obj-$(CONFIG_CPU_FREQ_GOV_USERSPACE) += cpufreq_userspace.o obj-$(CONFIG_CPU_FREQ_GOV_ONDEMAND) += cpufreq_ondemand.o @@ -54773,7 +54448,7 @@ diff -Nur linux-3.10.30.orig/drivers/cpufreq/Makefile linux-linaro-stable-mx6/dr obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ) += omap-cpufreq.o diff -Nur linux-3.10.30.orig/drivers/cpufreq/vexpress_big_little.c linux-linaro-stable-mx6/drivers/cpufreq/vexpress_big_little.c --- linux-3.10.30.orig/drivers/cpufreq/vexpress_big_little.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/cpufreq/vexpress_big_little.c 2014-05-15 20:33:46.841933457 +0200 ++++ linux-linaro-stable-mx6/drivers/cpufreq/vexpress_big_little.c 2014-05-16 15:28:21.493385903 +0200 @@ -0,0 +1,86 @@ +/* + * Vexpress big.LITTLE CPUFreq Interface driver @@ -54863,7 +54538,7 @@ diff -Nur linux-3.10.30.orig/drivers/cpufreq/vexpress_big_little.c linux-linaro- +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/cpuidle/arm_big_little.c linux-linaro-stable-mx6/drivers/cpuidle/arm_big_little.c --- linux-3.10.30.orig/drivers/cpuidle/arm_big_little.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/cpuidle/arm_big_little.c 2014-05-15 20:33:46.841933457 +0200 ++++ linux-linaro-stable-mx6/drivers/cpuidle/arm_big_little.c 2014-05-16 15:28:21.493385903 +0200 @@ -0,0 +1,183 @@ +/* + * big.LITTLE CPU idle driver. @@ -55050,7 +54725,7 @@ diff -Nur linux-3.10.30.orig/drivers/cpuidle/arm_big_little.c linux-linaro-stabl +device_initcall(bl_idle_init); diff -Nur linux-3.10.30.orig/drivers/cpuidle/cpuidle-calxeda.c linux-linaro-stable-mx6/drivers/cpuidle/cpuidle-calxeda.c --- linux-3.10.30.orig/drivers/cpuidle/cpuidle-calxeda.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/cpuidle/cpuidle-calxeda.c 2014-05-15 20:33:46.841933457 +0200 ++++ linux-linaro-stable-mx6/drivers/cpuidle/cpuidle-calxeda.c 2014-05-16 15:28:21.497385925 +0200 @@ -37,20 +37,6 @@ extern void highbank_set_cpu_jump(int cpu, void *jump_addr); extern void *scu_base_addr; @@ -55074,7 +54749,7 @@ diff -Nur linux-3.10.30.orig/drivers/cpuidle/cpuidle-calxeda.c linux-linaro-stab set_cr(get_cr() | CR_C); diff -Nur linux-3.10.30.orig/drivers/cpuidle/Kconfig linux-linaro-stable-mx6/drivers/cpuidle/Kconfig --- linux-3.10.30.orig/drivers/cpuidle/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/cpuidle/Kconfig 2014-05-15 20:33:46.841933457 +0200 ++++ linux-linaro-stable-mx6/drivers/cpuidle/Kconfig 2014-05-16 15:28:21.493385903 +0200 @@ -20,7 +20,7 @@ config CPU_IDLE_GOV_LADDER @@ -55086,7 +54761,7 @@ diff -Nur linux-3.10.30.orig/drivers/cpuidle/Kconfig linux-linaro-stable-mx6/dri config CPU_IDLE_GOV_MENU diff -Nur linux-3.10.30.orig/drivers/cpuidle/Makefile linux-linaro-stable-mx6/drivers/cpuidle/Makefile --- linux-3.10.30.orig/drivers/cpuidle/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/cpuidle/Makefile 2014-05-15 20:33:46.841933457 +0200 ++++ linux-linaro-stable-mx6/drivers/cpuidle/Makefile 2014-05-16 15:28:21.493385903 +0200 @@ -4,6 +4,6 @@ obj-y += cpuidle.o driver.o governor.o sysfs.o governors/ @@ -55097,7 +54772,7 @@ diff -Nur linux-3.10.30.orig/drivers/cpuidle/Makefile linux-linaro-stable-mx6/dr obj-$(CONFIG_ARCH_KIRKWOOD) += cpuidle-kirkwood.o diff -Nur linux-3.10.30.orig/drivers/crypto/caam/caamalg.c linux-linaro-stable-mx6/drivers/crypto/caam/caamalg.c --- linux-3.10.30.orig/drivers/crypto/caam/caamalg.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/crypto/caam/caamalg.c 2014-05-15 20:33:46.849933515 +0200 ++++ linux-linaro-stable-mx6/drivers/crypto/caam/caamalg.c 2014-05-16 15:28:21.501385946 +0200 @@ -1,7 +1,7 @@ /* * caam - Freescale FSL CAAM support for crypto API @@ -55613,7 +55288,7 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/caamalg.c linux-linaro-stable-m diff -Nur linux-3.10.30.orig/drivers/crypto/caam/caamhash.c linux-linaro-stable-mx6/drivers/crypto/caam/caamhash.c --- linux-3.10.30.orig/drivers/crypto/caam/caamhash.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/crypto/caam/caamhash.c 2014-05-15 20:33:46.849933515 +0200 ++++ linux-linaro-stable-mx6/drivers/crypto/caam/caamhash.c 2014-05-16 15:28:21.501385946 +0200 @@ -1,7 +1,7 @@ /* * caam - Freescale FSL CAAM support for ahash functions of crypto API @@ -56347,7 +56022,7 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/caamhash.c linux-linaro-stable- diff -Nur linux-3.10.30.orig/drivers/crypto/caam/caamrng.c linux-linaro-stable-mx6/drivers/crypto/caam/caamrng.c --- linux-3.10.30.orig/drivers/crypto/caam/caamrng.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/crypto/caam/caamrng.c 2014-05-15 20:33:46.849933515 +0200 ++++ linux-linaro-stable-mx6/drivers/crypto/caam/caamrng.c 2014-05-16 15:28:21.501385946 +0200 @@ -1,7 +1,7 @@ /* * caam - Freescale FSL CAAM support for hw_random @@ -56475,7 +56150,7 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/caamrng.c linux-linaro-stable-m return hwrng_register(&caam_rng); diff -Nur linux-3.10.30.orig/drivers/crypto/caam/compat.h linux-linaro-stable-mx6/drivers/crypto/caam/compat.h --- linux-3.10.30.orig/drivers/crypto/caam/compat.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/crypto/caam/compat.h 2014-05-15 20:33:46.849933515 +0200 ++++ linux-linaro-stable-mx6/drivers/crypto/caam/compat.h 2014-05-16 15:28:21.501385946 +0200 @@ -14,6 +14,8 @@ #include <linux/hash.h> #include <linux/hw_random.h> @@ -56498,7 +56173,7 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/compat.h linux-linaro-stable-mx #include <crypto/algapi.h> diff -Nur linux-3.10.30.orig/drivers/crypto/caam/ctrl.c linux-linaro-stable-mx6/drivers/crypto/caam/ctrl.c --- linux-3.10.30.orig/drivers/crypto/caam/ctrl.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/crypto/caam/ctrl.c 2014-05-15 20:33:46.849933515 +0200 ++++ linux-linaro-stable-mx6/drivers/crypto/caam/ctrl.c 2014-05-16 15:28:21.501385946 +0200 @@ -2,7 +2,7 @@ * CAAM control-plane driver backend * Controller-level driver, kernel property detection, initialization @@ -56851,7 +56526,7 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/ctrl.c linux-linaro-stable-mx6/ /* NOTE: RTIC detection ought to go here, around Si time */ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/desc.h linux-linaro-stable-mx6/drivers/crypto/caam/desc.h --- linux-3.10.30.orig/drivers/crypto/caam/desc.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/crypto/caam/desc.h 2014-05-15 20:33:46.849933515 +0200 ++++ linux-linaro-stable-mx6/drivers/crypto/caam/desc.h 2014-05-16 15:28:21.501385946 +0200 @@ -2,19 +2,35 @@ * CAAM descriptor composition header * Definitions to support CAAM descriptor instruction generation @@ -56948,7 +56623,7 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/desc.h linux-linaro-stable-mx6/ #endif /* DESC_H */ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/intern.h linux-linaro-stable-mx6/drivers/crypto/caam/intern.h --- linux-3.10.30.orig/drivers/crypto/caam/intern.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/crypto/caam/intern.h 2014-05-15 20:33:46.849933515 +0200 ++++ linux-linaro-stable-mx6/drivers/crypto/caam/intern.h 2014-05-16 15:28:21.501385946 +0200 @@ -2,7 +2,7 @@ * CAAM/SEC 4.x driver backend * Private/internal definitions between modules @@ -57012,7 +56687,7 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/intern.h linux-linaro-stable-mx * variables at runtime. diff -Nur linux-3.10.30.orig/drivers/crypto/caam/jr.c linux-linaro-stable-mx6/drivers/crypto/caam/jr.c --- linux-3.10.30.orig/drivers/crypto/caam/jr.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/crypto/caam/jr.c 2014-05-15 20:33:46.849933515 +0200 ++++ linux-linaro-stable-mx6/drivers/crypto/caam/jr.c 2014-05-16 15:28:21.505385967 +0200 @@ -2,7 +2,7 @@ * CAAM/SEC 4.x transport/backend driver * JobR backend functionality @@ -57140,7 +56815,7 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/jr.c linux-linaro-stable-mx6/dr error = caam_jr_init(jrdev); /* now turn on hardware */ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/jr.h linux-linaro-stable-mx6/drivers/crypto/caam/jr.h --- linux-3.10.30.orig/drivers/crypto/caam/jr.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/crypto/caam/jr.h 2014-05-15 20:33:46.849933515 +0200 ++++ linux-linaro-stable-mx6/drivers/crypto/caam/jr.h 2014-05-16 15:28:21.505385967 +0200 @@ -1,7 +1,7 @@ /* * CAAM public-level include definitions for the JobR backend @@ -57158,7 +56833,7 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/jr.h linux-linaro-stable-mx6/dr #endif /* JR_H */ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/Kconfig linux-linaro-stable-mx6/drivers/crypto/caam/Kconfig --- linux-3.10.30.orig/drivers/crypto/caam/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/crypto/caam/Kconfig 2014-05-15 20:33:46.849933515 +0200 ++++ linux-linaro-stable-mx6/drivers/crypto/caam/Kconfig 2014-05-16 15:28:21.501385946 +0200 @@ -1,6 +1,6 @@ config CRYPTO_DEV_FSL_CAAM tristate "Freescale CAAM-Multicore driver backend" @@ -57221,7 +56896,7 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/Kconfig linux-linaro-stable-mx6 + of a security violation. diff -Nur linux-3.10.30.orig/drivers/crypto/caam/key_gen.c linux-linaro-stable-mx6/drivers/crypto/caam/key_gen.c --- linux-3.10.30.orig/drivers/crypto/caam/key_gen.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/crypto/caam/key_gen.c 2014-05-15 20:33:46.849933515 +0200 ++++ linux-linaro-stable-mx6/drivers/crypto/caam/key_gen.c 2014-05-16 15:28:21.505385967 +0200 @@ -1,7 +1,7 @@ /* * CAAM/SEC 4.x functions for handling key-generation jobs @@ -57251,7 +56926,7 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/key_gen.c linux-linaro-stable-m dma_unmap_single(jrdev, dma_addr_in, keylen, DMA_TO_DEVICE); diff -Nur linux-3.10.30.orig/drivers/crypto/caam/Makefile linux-linaro-stable-mx6/drivers/crypto/caam/Makefile --- linux-3.10.30.orig/drivers/crypto/caam/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/crypto/caam/Makefile 2014-05-15 20:33:46.849933515 +0200 ++++ linux-linaro-stable-mx6/drivers/crypto/caam/Makefile 2014-05-16 15:28:21.501385946 +0200 @@ -6,5 +6,8 @@ obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API) += caamalg.o obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API) += caamhash.o @@ -57263,7 +56938,7 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/Makefile linux-linaro-stable-mx caam-objs := ctrl.o jr.o error.o key_gen.o diff -Nur linux-3.10.30.orig/drivers/crypto/caam/regs.h linux-linaro-stable-mx6/drivers/crypto/caam/regs.h --- linux-3.10.30.orig/drivers/crypto/caam/regs.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/crypto/caam/regs.h 2014-05-15 20:33:46.849933515 +0200 ++++ linux-linaro-stable-mx6/drivers/crypto/caam/regs.h 2014-05-16 15:28:21.505385967 +0200 @@ -1,7 +1,7 @@ /* * CAAM hardware register-level view @@ -57597,7 +57272,7 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/regs.h linux-linaro-stable-mx6/ * base + 0x6000 padded out to 0x1000 diff -Nur linux-3.10.30.orig/drivers/crypto/caam/secvio.c linux-linaro-stable-mx6/drivers/crypto/caam/secvio.c --- linux-3.10.30.orig/drivers/crypto/caam/secvio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/crypto/caam/secvio.c 2014-05-15 20:33:46.849933515 +0200 ++++ linux-linaro-stable-mx6/drivers/crypto/caam/secvio.c 2014-05-16 15:28:21.505385967 +0200 @@ -0,0 +1,333 @@ + +/* @@ -57934,7 +57609,7 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/secvio.c linux-linaro-stable-mx +#endif diff -Nur linux-3.10.30.orig/drivers/crypto/caam/secvio.h linux-linaro-stable-mx6/drivers/crypto/caam/secvio.h --- linux-3.10.30.orig/drivers/crypto/caam/secvio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/crypto/caam/secvio.h 2014-05-15 20:33:46.849933515 +0200 ++++ linux-linaro-stable-mx6/drivers/crypto/caam/secvio.h 2014-05-16 15:28:21.505385967 +0200 @@ -0,0 +1,64 @@ + +/* @@ -58002,7 +57677,7 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/secvio.h linux-linaro-stable-mx +#endif /* SECVIO_H */ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/sg_sw_sec4.h linux-linaro-stable-mx6/drivers/crypto/caam/sg_sw_sec4.h --- linux-3.10.30.orig/drivers/crypto/caam/sg_sw_sec4.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/crypto/caam/sg_sw_sec4.h 2014-05-15 20:33:46.849933515 +0200 ++++ linux-linaro-stable-mx6/drivers/crypto/caam/sg_sw_sec4.h 2014-05-16 15:28:21.505385967 +0200 @@ -1,7 +1,7 @@ /* * CAAM/SEC 4.x functions for using scatterlists in caam driver @@ -58049,7 +57724,7 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/sg_sw_sec4.h linux-linaro-stabl for (i = 0; i < nents; i++) { diff -Nur linux-3.10.30.orig/drivers/crypto/caam/sm.h linux-linaro-stable-mx6/drivers/crypto/caam/sm.h --- linux-3.10.30.orig/drivers/crypto/caam/sm.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/crypto/caam/sm.h 2014-05-15 20:33:46.849933515 +0200 ++++ linux-linaro-stable-mx6/drivers/crypto/caam/sm.h 2014-05-16 15:28:21.505385967 +0200 @@ -0,0 +1,88 @@ + +/* @@ -58141,7 +57816,7 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/sm.h linux-linaro-stable-mx6/dr +#endif /* SM_H */ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/sm_store.c linux-linaro-stable-mx6/drivers/crypto/caam/sm_store.c --- linux-3.10.30.orig/drivers/crypto/caam/sm_store.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/crypto/caam/sm_store.c 2014-05-15 20:33:46.849933515 +0200 ++++ linux-linaro-stable-mx6/drivers/crypto/caam/sm_store.c 2014-05-16 15:28:21.505385967 +0200 @@ -0,0 +1,896 @@ + +/* @@ -59041,7 +58716,7 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/sm_store.c linux-linaro-stable- +#endif diff -Nur linux-3.10.30.orig/drivers/crypto/caam/sm_test.c linux-linaro-stable-mx6/drivers/crypto/caam/sm_test.c --- linux-3.10.30.orig/drivers/crypto/caam/sm_test.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/crypto/caam/sm_test.c 2014-05-15 20:33:46.849933515 +0200 ++++ linux-linaro-stable-mx6/drivers/crypto/caam/sm_test.c 2014-05-16 15:28:21.505385967 +0200 @@ -0,0 +1,844 @@ +/* + * Secure Memory / Keystore Exemplification Module @@ -59889,7 +59564,7 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/sm_test.c linux-linaro-stable-m +#endif diff -Nur linux-3.10.30.orig/drivers/crypto/caam/snvsregs.h linux-linaro-stable-mx6/drivers/crypto/caam/snvsregs.h --- linux-3.10.30.orig/drivers/crypto/caam/snvsregs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/crypto/caam/snvsregs.h 2014-05-15 20:33:46.853933543 +0200 ++++ linux-linaro-stable-mx6/drivers/crypto/caam/snvsregs.h 2014-05-16 15:28:21.505385967 +0200 @@ -0,0 +1,237 @@ +/* + * SNVS hardware register-level view @@ -60130,7 +59805,7 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/snvsregs.h linux-linaro-stable- +#endif /* SNVSREGS_H */ diff -Nur linux-3.10.30.orig/drivers/dma/imx-sdma.c linux-linaro-stable-mx6/drivers/dma/imx-sdma.c --- linux-3.10.30.orig/drivers/dma/imx-sdma.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/dma/imx-sdma.c 2014-05-15 20:33:46.909933947 +0200 ++++ linux-linaro-stable-mx6/drivers/dma/imx-sdma.c 2014-05-16 15:28:21.521386052 +0200 @@ -7,7 +7,7 @@ * * Based on code from Freescale: @@ -60740,7 +60415,7 @@ diff -Nur linux-3.10.30.orig/drivers/dma/imx-sdma.c linux-linaro-stable-mx6/driv err_alloc: diff -Nur linux-3.10.30.orig/drivers/dma/Kconfig linux-linaro-stable-mx6/drivers/dma/Kconfig --- linux-3.10.30.orig/drivers/dma/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/dma/Kconfig 2014-05-15 20:33:46.877933716 +0200 ++++ linux-linaro-stable-mx6/drivers/dma/Kconfig 2014-05-16 15:28:21.513386009 +0200 @@ -152,6 +152,19 @@ To avoid bloating the irq_desc[] array we allocate a sufficient number of IRQ slots and map them dynamically to specific sources. @@ -60763,7 +60438,7 @@ diff -Nur linux-3.10.30.orig/drivers/dma/Kconfig linux-linaro-stable-mx6/drivers depends on MACH_TX49XX || MACH_TX39XX diff -Nur linux-3.10.30.orig/drivers/dma/Makefile linux-linaro-stable-mx6/drivers/dma/Makefile --- linux-3.10.30.orig/drivers/dma/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/dma/Makefile 2014-05-15 20:33:46.877933716 +0200 ++++ linux-linaro-stable-mx6/drivers/dma/Makefile 2014-05-16 15:28:21.513386009 +0200 @@ -18,6 +18,7 @@ obj-$(CONFIG_DW_DMAC) += dw_dmac.o obj-$(CONFIG_AT_HDMAC) += at_hdmac.o @@ -60774,13 +60449,13 @@ diff -Nur linux-3.10.30.orig/drivers/dma/Makefile linux-linaro-stable-mx6/driver obj-$(CONFIG_COH901318) += coh901318.o coh901318_lli.o diff -Nur linux-3.10.30.orig/drivers/dma/pxp/Makefile linux-linaro-stable-mx6/drivers/dma/pxp/Makefile --- linux-3.10.30.orig/drivers/dma/pxp/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/dma/pxp/Makefile 2014-05-15 20:33:46.917934005 +0200 ++++ linux-linaro-stable-mx6/drivers/dma/pxp/Makefile 2014-05-16 15:28:21.525386073 +0200 @@ -0,0 +1,2 @@ +obj-$(CONFIG_MXC_PXP_V2) += pxp_dma_v2.o +obj-$(CONFIG_MXC_PXP_CLIENT_DEVICE) += pxp_device.o diff -Nur linux-3.10.30.orig/drivers/dma/pxp/pxp_device.c linux-linaro-stable-mx6/drivers/dma/pxp/pxp_device.c --- linux-3.10.30.orig/drivers/dma/pxp/pxp_device.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/dma/pxp/pxp_device.c 2014-05-15 20:33:46.917934005 +0200 ++++ linux-linaro-stable-mx6/drivers/dma/pxp/pxp_device.c 2014-05-16 15:28:21.525386073 +0200 @@ -0,0 +1,489 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -61273,7 +60948,7 @@ diff -Nur linux-3.10.30.orig/drivers/dma/pxp/pxp_device.c linux-linaro-stable-mx +} diff -Nur linux-3.10.30.orig/drivers/dma/pxp/pxp_dma_v2.c linux-linaro-stable-mx6/drivers/dma/pxp/pxp_dma_v2.c --- linux-3.10.30.orig/drivers/dma/pxp/pxp_dma_v2.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/dma/pxp/pxp_dma_v2.c 2014-05-15 20:33:46.917934005 +0200 ++++ linux-linaro-stable-mx6/drivers/dma/pxp/pxp_dma_v2.c 2014-05-16 15:28:21.529386093 +0200 @@ -0,0 +1,1936 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. @@ -63213,7 +62888,7 @@ diff -Nur linux-3.10.30.orig/drivers/dma/pxp/pxp_dma_v2.c linux-linaro-stable-mx +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/dma/pxp/regs-pxp_v2.h linux-linaro-stable-mx6/drivers/dma/pxp/regs-pxp_v2.h --- linux-3.10.30.orig/drivers/dma/pxp/regs-pxp_v2.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/dma/pxp/regs-pxp_v2.h 2014-05-15 20:33:46.917934005 +0200 ++++ linux-linaro-stable-mx6/drivers/dma/pxp/regs-pxp_v2.h 2014-05-16 15:28:21.529386093 +0200 @@ -0,0 +1,1152 @@ +/* + * Freescale PXP Register Definitions @@ -64369,7 +64044,7 @@ diff -Nur linux-3.10.30.orig/drivers/dma/pxp/regs-pxp_v2.h linux-linaro-stable-m +#endif /* __ARCH_ARM___PXP_H */ diff -Nur linux-3.10.30.orig/drivers/extcon/extcon-adc-jack.c linux-linaro-stable-mx6/drivers/extcon/extcon-adc-jack.c --- linux-3.10.30.orig/drivers/extcon/extcon-adc-jack.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/extcon/extcon-adc-jack.c 2014-05-15 20:33:46.949934235 +0200 ++++ linux-linaro-stable-mx6/drivers/extcon/extcon-adc-jack.c 2014-05-16 15:28:21.541386157 +0200 @@ -87,7 +87,8 @@ { struct adc_jack_data *data = _data; @@ -64382,7 +64057,7 @@ diff -Nur linux-3.10.30.orig/drivers/extcon/extcon-adc-jack.c linux-linaro-stabl diff -Nur linux-3.10.30.orig/drivers/extcon/extcon-gpio.c linux-linaro-stable-mx6/drivers/extcon/extcon-gpio.c --- linux-3.10.30.orig/drivers/extcon/extcon-gpio.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/extcon/extcon-gpio.c 2014-05-15 20:33:46.949934235 +0200 ++++ linux-linaro-stable-mx6/drivers/extcon/extcon-gpio.c 2014-05-16 15:28:21.541386157 +0200 @@ -56,7 +56,7 @@ { struct gpio_extcon_data *extcon_data = dev_id; @@ -64394,7 +64069,7 @@ diff -Nur linux-3.10.30.orig/drivers/extcon/extcon-gpio.c linux-linaro-stable-mx } diff -Nur linux-3.10.30.orig/drivers/gator/gator_annotate.c linux-linaro-stable-mx6/drivers/gator/gator_annotate.c --- linux-3.10.30.orig/drivers/gator/gator_annotate.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_annotate.c 2014-05-15 20:33:46.961934322 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_annotate.c 2014-05-16 15:28:21.549386199 +0200 @@ -0,0 +1,186 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -64584,7 +64259,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_annotate.c linux-linaro-stable- +} diff -Nur linux-3.10.30.orig/drivers/gator/gator_annotate_kernel.c linux-linaro-stable-mx6/drivers/gator/gator_annotate_kernel.c --- linux-3.10.30.orig/drivers/gator/gator_annotate_kernel.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_annotate_kernel.c 2014-05-15 20:33:46.961934322 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_annotate_kernel.c 2014-05-16 15:28:21.549386199 +0200 @@ -0,0 +1,200 @@ +/** + * Copyright (C) ARM Limited 2012-2013. All rights reserved. @@ -64788,7 +64463,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_annotate_kernel.c linux-linaro- +EXPORT_SYMBOL(gator_annotate_marker_color_str); diff -Nur linux-3.10.30.orig/drivers/gator/gator_backtrace.c linux-linaro-stable-mx6/drivers/gator/gator_backtrace.c --- linux-3.10.30.orig/drivers/gator/gator_backtrace.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_backtrace.c 2014-05-15 20:33:46.961934322 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_backtrace.c 2014-05-16 15:28:21.549386199 +0200 @@ -0,0 +1,168 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -64960,7 +64635,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_backtrace.c linux-linaro-stable +} diff -Nur linux-3.10.30.orig/drivers/gator/gator_cookies.c linux-linaro-stable-mx6/drivers/gator/gator_cookies.c --- linux-3.10.30.orig/drivers/gator/gator_cookies.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_cookies.c 2014-05-15 20:33:46.961934322 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_cookies.c 2014-05-16 15:28:21.549386199 +0200 @@ -0,0 +1,433 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -65397,7 +65072,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_cookies.c linux-linaro-stable-m +} diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_armv6.c linux-linaro-stable-mx6/drivers/gator/gator_events_armv6.c --- linux-3.10.30.orig/drivers/gator/gator_events_armv6.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_events_armv6.c 2014-05-15 20:33:46.961934322 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_events_armv6.c 2014-05-16 15:28:21.549386199 +0200 @@ -0,0 +1,237 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -65638,7 +65313,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_armv6.c linux-linaro-sta +#endif diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_armv7.c linux-linaro-stable-mx6/drivers/gator/gator_events_armv7.c --- linux-3.10.30.orig/drivers/gator/gator_events_armv7.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_events_armv7.c 2014-05-15 20:33:46.961934322 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_events_armv7.c 2014-05-16 15:28:21.549386199 +0200 @@ -0,0 +1,312 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -65954,7 +65629,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_armv7.c linux-linaro-sta +#endif diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_block.c linux-linaro-stable-mx6/drivers/gator/gator_events_block.c --- linux-3.10.30.orig/drivers/gator/gator_events_block.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_events_block.c 2014-05-15 20:33:46.961934322 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_events_block.c 2014-05-16 15:28:21.549386199 +0200 @@ -0,0 +1,153 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -66111,7 +65786,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_block.c linux-linaro-sta +} diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_ccn-504.c linux-linaro-stable-mx6/drivers/gator/gator_events_ccn-504.c --- linux-3.10.30.orig/drivers/gator/gator_events_ccn-504.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_events_ccn-504.c 2014-05-15 20:33:46.961934322 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_events_ccn-504.c 2014-05-16 15:28:21.549386199 +0200 @@ -0,0 +1,346 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -66461,7 +66136,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_ccn-504.c linux-linaro-s +} diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_irq.c linux-linaro-stable-mx6/drivers/gator/gator_events_irq.c --- linux-3.10.30.orig/drivers/gator/gator_events_irq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_events_irq.c 2014-05-15 20:33:46.961934322 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_events_irq.c 2014-05-16 15:28:21.549386199 +0200 @@ -0,0 +1,165 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -66630,7 +66305,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_irq.c linux-linaro-stabl +} diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_l2c-310.c linux-linaro-stable-mx6/drivers/gator/gator_events_l2c-310.c --- linux-3.10.30.orig/drivers/gator/gator_events_l2c-310.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_events_l2c-310.c 2014-05-15 20:33:46.961934322 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_events_l2c-310.c 2014-05-16 15:28:21.549386199 +0200 @@ -0,0 +1,208 @@ +/** + * l2c310 (L2 Cache Controller) event counters for gator @@ -66842,7 +66517,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_l2c-310.c linux-linaro-s +} diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mali_4xx.c linux-linaro-stable-mx6/drivers/gator/gator_events_mali_4xx.c --- linux-3.10.30.orig/drivers/gator/gator_events_mali_4xx.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_events_mali_4xx.c 2014-05-15 20:33:46.961934322 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_events_mali_4xx.c 2014-05-16 15:28:21.549386199 +0200 @@ -0,0 +1,723 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -67569,7 +67244,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mali_4xx.c linux-linaro- +} diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mali_4xx.h linux-linaro-stable-mx6/drivers/gator/gator_events_mali_4xx.h --- linux-3.10.30.orig/drivers/gator/gator_events_mali_4xx.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_events_mali_4xx.h 2014-05-15 20:33:46.961934322 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_events_mali_4xx.h 2014-05-16 15:28:21.549386199 +0200 @@ -0,0 +1,18 @@ +/** + * Copyright (C) ARM Limited 2011-2013. All rights reserved. @@ -67591,7 +67266,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mali_4xx.h linux-linaro- +#endif /* GATOR_EVENTS_MALI_4xx_H */ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mali_common.c linux-linaro-stable-mx6/drivers/gator/gator_events_mali_common.c --- linux-3.10.30.orig/drivers/gator/gator_events_mali_common.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_events_mali_common.c 2014-05-15 20:33:46.961934322 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_events_mali_common.c 2014-05-16 15:28:21.549386199 +0200 @@ -0,0 +1,81 @@ +/** + * Copyright (C) ARM Limited 2012-2013. All rights reserved. @@ -67676,7 +67351,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mali_common.c linux-lina +} diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mali_common.h linux-linaro-stable-mx6/drivers/gator/gator_events_mali_common.h --- linux-3.10.30.orig/drivers/gator/gator_events_mali_common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_events_mali_common.h 2014-05-15 20:33:46.961934322 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_events_mali_common.h 2014-05-16 15:28:21.553386220 +0200 @@ -0,0 +1,86 @@ +/** + * Copyright (C) ARM Limited 2012-2013. All rights reserved. @@ -67766,7 +67441,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mali_common.h linux-lina +#endif /* GATOR_EVENTS_MALI_COMMON_H */ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mali_t6xx.c linux-linaro-stable-mx6/drivers/gator/gator_events_mali_t6xx.c --- linux-3.10.30.orig/drivers/gator/gator_events_mali_t6xx.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_events_mali_t6xx.c 2014-05-15 20:33:46.961934322 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_events_mali_t6xx.c 2014-05-16 15:28:21.553386220 +0200 @@ -0,0 +1,560 @@ +/** + * Copyright (C) ARM Limited 2011-2013. All rights reserved. @@ -68330,7 +68005,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mali_t6xx.c linux-linaro +} diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mali_t6xx_hw.c linux-linaro-stable-mx6/drivers/gator/gator_events_mali_t6xx_hw.c --- linux-3.10.30.orig/drivers/gator/gator_events_mali_t6xx_hw.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_events_mali_t6xx_hw.c 2014-05-15 20:33:46.961934322 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_events_mali_t6xx_hw.c 2014-05-16 15:28:21.553386220 +0200 @@ -0,0 +1,784 @@ +/** + * Copyright (C) ARM Limited 2012-2013. All rights reserved. @@ -69118,7 +68793,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mali_t6xx_hw.c linux-lin +} diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mali_t6xx_hw_test.c linux-linaro-stable-mx6/drivers/gator/gator_events_mali_t6xx_hw_test.c --- linux-3.10.30.orig/drivers/gator/gator_events_mali_t6xx_hw_test.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_events_mali_t6xx_hw_test.c 2014-05-15 20:33:46.961934322 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_events_mali_t6xx_hw_test.c 2014-05-16 15:28:21.553386220 +0200 @@ -0,0 +1,55 @@ +/** + * Copyright (C) ARM Limited 2012-2013. All rights reserved. @@ -69177,7 +68852,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mali_t6xx_hw_test.c linu +} diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_meminfo.c linux-linaro-stable-mx6/drivers/gator/gator_events_meminfo.c --- linux-3.10.30.orig/drivers/gator/gator_events_meminfo.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_events_meminfo.c 2014-05-15 20:33:46.961934322 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_events_meminfo.c 2014-05-16 15:28:21.553386220 +0200 @@ -0,0 +1,387 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -69568,7 +69243,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_meminfo.c linux-linaro-s +} diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mmapped.c linux-linaro-stable-mx6/drivers/gator/gator_events_mmapped.c --- linux-3.10.30.orig/drivers/gator/gator_events_mmapped.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_events_mmapped.c 2014-05-15 20:33:46.961934322 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_events_mmapped.c 2014-05-16 15:28:21.553386220 +0200 @@ -0,0 +1,209 @@ +/* + * Example events provider @@ -69781,7 +69456,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mmapped.c linux-linaro-s +} diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_net.c linux-linaro-stable-mx6/drivers/gator/gator_events_net.c --- linux-3.10.30.orig/drivers/gator/gator_events_net.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_events_net.c 2014-05-15 20:33:46.961934322 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_events_net.c 2014-05-16 15:28:21.553386220 +0200 @@ -0,0 +1,172 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -69957,7 +69632,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_net.c linux-linaro-stabl +} diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_perf_pmu.c linux-linaro-stable-mx6/drivers/gator/gator_events_perf_pmu.c --- linux-3.10.30.orig/drivers/gator/gator_events_perf_pmu.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_events_perf_pmu.c 2014-05-15 20:33:46.965934351 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_events_perf_pmu.c 2014-05-16 15:28:21.553386220 +0200 @@ -0,0 +1,587 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -70548,7 +70223,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_perf_pmu.c linux-linaro- +#endif diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_sched.c linux-linaro-stable-mx6/drivers/gator/gator_events_sched.c --- linux-3.10.30.orig/drivers/gator/gator_events_sched.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_events_sched.c 2014-05-15 20:33:46.965934351 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_events_sched.c 2014-05-16 15:28:21.553386220 +0200 @@ -0,0 +1,113 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -70665,7 +70340,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_sched.c linux-linaro-sta +} diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_scorpion.c linux-linaro-stable-mx6/drivers/gator/gator_events_scorpion.c --- linux-3.10.30.orig/drivers/gator/gator_events_scorpion.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_events_scorpion.c 2014-05-15 20:33:46.965934351 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_events_scorpion.c 2014-05-16 15:28:21.553386220 +0200 @@ -0,0 +1,669 @@ +/** + * Copyright (C) ARM Limited 2011-2013. All rights reserved. @@ -71338,7 +71013,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_scorpion.c linux-linaro- +#endif diff -Nur linux-3.10.30.orig/drivers/gator/gator_fs.c linux-linaro-stable-mx6/drivers/gator/gator_fs.c --- linux-3.10.30.orig/drivers/gator/gator_fs.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_fs.c 2014-05-15 20:33:46.965934351 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_fs.c 2014-05-16 15:28:21.553386220 +0200 @@ -0,0 +1,382 @@ +/** + * @file gatorfs.c @@ -71724,7 +71399,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_fs.c linux-linaro-stable-mx6/dr +} diff -Nur linux-3.10.30.orig/drivers/gator/gator.h linux-linaro-stable-mx6/drivers/gator/gator.h --- linux-3.10.30.orig/drivers/gator/gator.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator.h 2014-05-15 20:33:46.961934322 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator.h 2014-05-16 15:28:21.549386199 +0200 @@ -0,0 +1,142 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -71870,7 +71545,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator.h linux-linaro-stable-mx6/drive +#endif // GATOR_H_ diff -Nur linux-3.10.30.orig/drivers/gator/gator_hrtimer_gator.c linux-linaro-stable-mx6/drivers/gator/gator_hrtimer_gator.c --- linux-3.10.30.orig/drivers/gator/gator_hrtimer_gator.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_hrtimer_gator.c 2014-05-15 20:33:46.965934351 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_hrtimer_gator.c 2014-05-16 15:28:21.553386220 +0200 @@ -0,0 +1,86 @@ +/** + * Copyright (C) ARM Limited 2011-2013. All rights reserved. @@ -71960,7 +71635,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_hrtimer_gator.c linux-linaro-st +#endif diff -Nur linux-3.10.30.orig/drivers/gator/gator_hrtimer_perf.c linux-linaro-stable-mx6/drivers/gator/gator_hrtimer_perf.c --- linux-3.10.30.orig/drivers/gator/gator_hrtimer_perf.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_hrtimer_perf.c 2014-05-15 20:33:46.965934351 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_hrtimer_perf.c 2014-05-16 15:28:21.553386220 +0200 @@ -0,0 +1,113 @@ +/** + * Copyright (C) ARM Limited 2011-2013. All rights reserved. @@ -72077,7 +71752,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_hrtimer_perf.c linux-linaro-sta +#endif diff -Nur linux-3.10.30.orig/drivers/gator/gator_iks.c linux-linaro-stable-mx6/drivers/gator/gator_iks.c --- linux-3.10.30.orig/drivers/gator/gator_iks.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_iks.c 2014-05-15 20:33:46.965934351 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_iks.c 2014-05-16 15:28:21.553386220 +0200 @@ -0,0 +1,197 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -72278,7 +71953,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_iks.c linux-linaro-stable-mx6/d +#endif diff -Nur linux-3.10.30.orig/drivers/gator/gator_main.c linux-linaro-stable-mx6/drivers/gator/gator_main.c --- linux-3.10.30.orig/drivers/gator/gator_main.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_main.c 2014-05-15 20:33:46.965934351 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_main.c 2014-05-16 15:28:21.553386220 +0200 @@ -0,0 +1,1532 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -73814,7 +73489,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_main.c linux-linaro-stable-mx6/ +MODULE_VERSION(STRIFY(PROTOCOL_VERSION)); diff -Nur linux-3.10.30.orig/drivers/gator/gator_marshaling.c linux-linaro-stable-mx6/drivers/gator/gator_marshaling.c --- linux-3.10.30.orig/drivers/gator/gator_marshaling.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_marshaling.c 2014-05-15 20:33:46.965934351 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_marshaling.c 2014-05-16 15:28:21.553386220 +0200 @@ -0,0 +1,432 @@ +/** + * Copyright (C) ARM Limited 2012-2013. All rights reserved. @@ -74250,7 +73925,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_marshaling.c linux-linaro-stabl +#endif diff -Nur linux-3.10.30.orig/drivers/gator/gator_pack.c linux-linaro-stable-mx6/drivers/gator/gator_pack.c --- linux-3.10.30.orig/drivers/gator/gator_pack.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_pack.c 2014-05-15 20:33:46.965934351 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_pack.c 2014-05-16 15:28:21.553386220 +0200 @@ -0,0 +1,58 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -74312,7 +73987,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_pack.c linux-linaro-stable-mx6/ +} diff -Nur linux-3.10.30.orig/drivers/gator/gator_trace_gpu.c linux-linaro-stable-mx6/drivers/gator/gator_trace_gpu.c --- linux-3.10.30.orig/drivers/gator/gator_trace_gpu.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_trace_gpu.c 2014-05-15 20:33:46.965934351 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_trace_gpu.c 2014-05-16 15:28:21.553386220 +0200 @@ -0,0 +1,294 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -74610,7 +74285,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_trace_gpu.c linux-linaro-stable +} diff -Nur linux-3.10.30.orig/drivers/gator/gator_trace_gpu.h linux-linaro-stable-mx6/drivers/gator/gator_trace_gpu.h --- linux-3.10.30.orig/drivers/gator/gator_trace_gpu.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_trace_gpu.h 2014-05-15 20:33:46.965934351 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_trace_gpu.h 2014-05-16 15:28:21.553386220 +0200 @@ -0,0 +1,79 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -74693,7 +74368,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_trace_gpu.h linux-linaro-stable +#include <trace/define_trace.h> diff -Nur linux-3.10.30.orig/drivers/gator/gator_trace_power.c linux-linaro-stable-mx6/drivers/gator/gator_trace_power.c --- linux-3.10.30.orig/drivers/gator/gator_trace_power.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_trace_power.c 2014-05-15 20:33:46.965934351 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_trace_power.c 2014-05-16 15:28:21.553386220 +0200 @@ -0,0 +1,203 @@ +/** + * Copyright (C) ARM Limited 2011-2013. All rights reserved. @@ -74900,7 +74575,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_trace_power.c linux-linaro-stab +#endif diff -Nur linux-3.10.30.orig/drivers/gator/gator_trace_sched.c linux-linaro-stable-mx6/drivers/gator/gator_trace_sched.c --- linux-3.10.30.orig/drivers/gator/gator_trace_sched.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/gator_trace_sched.c 2014-05-15 20:33:46.965934351 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/gator_trace_sched.c 2014-05-16 15:28:21.553386220 +0200 @@ -0,0 +1,270 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -75174,7 +74849,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_trace_sched.c linux-linaro-stab +} diff -Nur linux-3.10.30.orig/drivers/gator/Kconfig linux-linaro-stable-mx6/drivers/gator/Kconfig --- linux-3.10.30.orig/drivers/gator/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/Kconfig 2014-05-15 20:33:46.961934322 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/Kconfig 2014-05-16 15:28:21.549386199 +0200 @@ -0,0 +1,33 @@ +config GATOR + tristate "Gator module for ARM's Streamline Performance Analyzer" @@ -75211,7 +74886,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/Kconfig linux-linaro-stable-mx6/drive + trace headers with: #include "linux/mali_linux_trace.h" diff -Nur linux-3.10.30.orig/drivers/gator/LICENSE linux-linaro-stable-mx6/drivers/gator/LICENSE --- linux-3.10.30.orig/drivers/gator/LICENSE 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/LICENSE 2014-05-15 20:33:46.961934322 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/LICENSE 2014-05-16 15:28:21.549386199 +0200 @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 @@ -75554,7 +75229,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/LICENSE linux-linaro-stable-mx6/drive +Public License instead of this License. diff -Nur linux-3.10.30.orig/drivers/gator/Makefile linux-linaro-stable-mx6/drivers/gator/Makefile --- linux-3.10.30.orig/drivers/gator/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/Makefile 2014-05-15 20:33:46.961934322 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/Makefile 2014-05-16 15:28:21.549386199 +0200 @@ -0,0 +1,76 @@ +ifneq ($(KERNELRELEASE),) + @@ -75634,7 +75309,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/Makefile linux-linaro-stable-mx6/driv +endif diff -Nur linux-3.10.30.orig/drivers/gator/mali/mali_mjollnir_profiling_gator_api.h linux-linaro-stable-mx6/drivers/gator/mali/mali_mjollnir_profiling_gator_api.h --- linux-3.10.30.orig/drivers/gator/mali/mali_mjollnir_profiling_gator_api.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/mali/mali_mjollnir_profiling_gator_api.h 2014-05-15 20:33:46.965934351 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/mali/mali_mjollnir_profiling_gator_api.h 2014-05-16 15:28:21.553386220 +0200 @@ -0,0 +1,163 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -75801,7 +75476,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/mali/mali_mjollnir_profiling_gator_ap +#endif /* __MALI_MJOLLNIR_PROFILING_GATOR_API_H__ */ diff -Nur linux-3.10.30.orig/drivers/gator/mali/mali_utgard_profiling_gator_api.h linux-linaro-stable-mx6/drivers/gator/mali/mali_utgard_profiling_gator_api.h --- linux-3.10.30.orig/drivers/gator/mali/mali_utgard_profiling_gator_api.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/mali/mali_utgard_profiling_gator_api.h 2014-05-15 20:33:46.965934351 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/mali/mali_utgard_profiling_gator_api.h 2014-05-16 15:28:21.553386220 +0200 @@ -0,0 +1,201 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -76006,7 +75681,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/mali/mali_utgard_profiling_gator_api. +#endif /* __MALI_UTGARD_PROFILING_GATOR_API_H__ */ diff -Nur linux-3.10.30.orig/drivers/gator/mali_t6xx.mk linux-linaro-stable-mx6/drivers/gator/mali_t6xx.mk --- linux-3.10.30.orig/drivers/gator/mali_t6xx.mk 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gator/mali_t6xx.mk 2014-05-15 20:33:46.965934351 +0200 ++++ linux-linaro-stable-mx6/drivers/gator/mali_t6xx.mk 2014-05-16 15:28:21.553386220 +0200 @@ -0,0 +1,26 @@ +# Defines for Mali-T6xx driver +EXTRA_CFLAGS += -DMALI_USE_UMP=1 \ @@ -76036,7 +75711,7 @@ diff -Nur linux-3.10.30.orig/drivers/gator/mali_t6xx.mk linux-linaro-stable-mx6/ + diff -Nur linux-3.10.30.orig/drivers/gpio/devres.c linux-linaro-stable-mx6/drivers/gpio/devres.c --- linux-3.10.30.orig/drivers/gpio/devres.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gpio/devres.c 2014-05-15 20:33:46.981934466 +0200 ++++ linux-linaro-stable-mx6/drivers/gpio/devres.c 2014-05-16 15:28:21.553386220 +0200 @@ -19,6 +19,89 @@ #include <linux/device.h> #include <linux/gfp.h> @@ -76129,7 +75804,7 @@ diff -Nur linux-3.10.30.orig/drivers/gpio/devres.c linux-linaro-stable-mx6/drive unsigned *gpio = res; diff -Nur linux-3.10.30.orig/drivers/gpio/gpiolib.c linux-linaro-stable-mx6/drivers/gpio/gpiolib.c --- linux-3.10.30.orig/drivers/gpio/gpiolib.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gpio/gpiolib.c 2014-05-15 20:33:47.001934610 +0200 ++++ linux-linaro-stable-mx6/drivers/gpio/gpiolib.c 2014-05-16 15:28:21.561386263 +0200 @@ -12,20 +12,16 @@ #include <linux/of_gpio.h> #include <linux/idr.h> @@ -77449,7 +77124,7 @@ diff -Nur linux-3.10.30.orig/drivers/gpio/gpiolib.c linux-linaro-stable-mx6/driv } diff -Nur linux-3.10.30.orig/drivers/gpio/gpiolib-of.c linux-linaro-stable-mx6/drivers/gpio/gpiolib-of.c --- linux-3.10.30.orig/drivers/gpio/gpiolib-of.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gpio/gpiolib-of.c 2014-05-15 20:33:47.001934610 +0200 ++++ linux-linaro-stable-mx6/drivers/gpio/gpiolib-of.c 2014-05-16 15:28:21.561386263 +0200 @@ -15,19 +15,21 @@ #include <linux/errno.h> #include <linux/module.h> @@ -77549,7 +77224,7 @@ diff -Nur linux-3.10.30.orig/drivers/gpio/gpiolib-of.c linux-linaro-stable-mx6/d diff -Nur linux-3.10.30.orig/drivers/gpio/gpio-mxc.c linux-linaro-stable-mx6/drivers/gpio/gpio-mxc.c --- linux-3.10.30.orig/drivers/gpio/gpio-mxc.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gpio/gpio-mxc.c 2014-05-15 20:33:46.985934494 +0200 ++++ linux-linaro-stable-mx6/drivers/gpio/gpio-mxc.c 2014-05-16 15:28:21.557386241 +0200 @@ -405,34 +405,19 @@ mxc_gpio_get_hw(pdev); @@ -77616,7 +77291,7 @@ diff -Nur linux-3.10.30.orig/drivers/gpio/gpio-mxc.c linux-linaro-stable-mx6/dri } diff -Nur linux-3.10.30.orig/drivers/gpio/gpio-pca953x.c linux-linaro-stable-mx6/drivers/gpio/gpio-pca953x.c --- linux-3.10.30.orig/drivers/gpio/gpio-pca953x.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gpio/gpio-pca953x.c 2014-05-15 20:33:46.985934494 +0200 ++++ linux-linaro-stable-mx6/drivers/gpio/gpio-pca953x.c 2014-05-16 15:28:21.557386241 +0200 @@ -19,6 +19,7 @@ #include <linux/irqdomain.h> #include <linux/i2c.h> @@ -77638,7 +77313,7 @@ diff -Nur linux-3.10.30.orig/drivers/gpio/gpio-pca953x.c linux-linaro-stable-mx6 */ diff -Nur linux-3.10.30.orig/drivers/gpu/drm/drm_crtc_helper.c linux-linaro-stable-mx6/drivers/gpu/drm/drm_crtc_helper.c --- linux-3.10.30.orig/drivers/gpu/drm/drm_crtc_helper.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gpu/drm/drm_crtc_helper.c 2014-05-15 20:33:47.029934812 +0200 ++++ linux-linaro-stable-mx6/drivers/gpu/drm/drm_crtc_helper.c 2014-05-16 15:28:21.569386304 +0200 @@ -308,6 +308,29 @@ EXPORT_SYMBOL(drm_helper_disable_unused_functions); @@ -77698,7 +77373,7 @@ diff -Nur linux-3.10.30.orig/drivers/gpu/drm/drm_crtc_helper.c linux-linaro-stab /* diff -Nur linux-3.10.30.orig/drivers/gpu/drm/Kconfig linux-linaro-stable-mx6/drivers/gpu/drm/Kconfig --- linux-3.10.30.orig/drivers/gpu/drm/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gpu/drm/Kconfig 2014-05-15 20:33:47.001934610 +0200 ++++ linux-linaro-stable-mx6/drivers/gpu/drm/Kconfig 2014-05-16 15:28:21.565386284 +0200 @@ -199,6 +199,13 @@ Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister chipset. If M is selected the module will be called savage. @@ -77715,7 +77390,7 @@ diff -Nur linux-3.10.30.orig/drivers/gpu/drm/Kconfig linux-linaro-stable-mx6/dri source "drivers/gpu/drm/vmwgfx/Kconfig" diff -Nur linux-3.10.30.orig/drivers/gpu/drm/Makefile linux-linaro-stable-mx6/drivers/gpu/drm/Makefile --- linux-3.10.30.orig/drivers/gpu/drm/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gpu/drm/Makefile 2014-05-15 20:33:47.001934610 +0200 ++++ linux-linaro-stable-mx6/drivers/gpu/drm/Makefile 2014-05-16 15:28:21.565386284 +0200 @@ -1,3 +1,24 @@ +############################################################################## +# @@ -77753,7 +77428,7 @@ diff -Nur linux-3.10.30.orig/drivers/gpu/drm/Makefile linux-linaro-stable-mx6/dr obj-$(CONFIG_DRM_RADEON)+= radeon/ diff -Nur linux-3.10.30.orig/drivers/gpu/drm/vivante/Makefile linux-linaro-stable-mx6/drivers/gpu/drm/vivante/Makefile --- linux-3.10.30.orig/drivers/gpu/drm/vivante/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gpu/drm/vivante/Makefile 2014-05-15 20:33:54.229986710 +0200 ++++ linux-linaro-stable-mx6/drivers/gpu/drm/vivante/Makefile 2014-05-16 15:28:21.705387022 +0200 @@ -0,0 +1,29 @@ +############################################################################## +# @@ -77786,7 +77461,7 @@ diff -Nur linux-3.10.30.orig/drivers/gpu/drm/vivante/Makefile linux-linaro-stabl +obj-$(CONFIG_DRM_VIVANTE) += vivante.o diff -Nur linux-3.10.30.orig/drivers/gpu/drm/vivante/vivante_drv.c linux-linaro-stable-mx6/drivers/gpu/drm/vivante/vivante_drv.c --- linux-3.10.30.orig/drivers/gpu/drm/vivante/vivante_drv.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gpu/drm/vivante/vivante_drv.c 2014-05-15 20:33:54.229986710 +0200 ++++ linux-linaro-stable-mx6/drivers/gpu/drm/vivante/vivante_drv.c 2014-05-16 15:28:21.705387022 +0200 @@ -0,0 +1,111 @@ +/**************************************************************************** +* @@ -77901,7 +77576,7 @@ diff -Nur linux-3.10.30.orig/drivers/gpu/drm/vivante/vivante_drv.c linux-linaro- +MODULE_LICENSE("GPL and additional rights"); diff -Nur linux-3.10.30.orig/drivers/gpu/drm/vivante/vivante_drv.h linux-linaro-stable-mx6/drivers/gpu/drm/vivante/vivante_drv.h --- linux-3.10.30.orig/drivers/gpu/drm/vivante/vivante_drv.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/gpu/drm/vivante/vivante_drv.h 2014-05-15 20:33:54.229986710 +0200 ++++ linux-linaro-stable-mx6/drivers/gpu/drm/vivante/vivante_drv.h 2014-05-16 15:28:21.705387022 +0200 @@ -0,0 +1,66 @@ +/**************************************************************************** +* @@ -77971,7 +77646,7 @@ diff -Nur linux-3.10.30.orig/drivers/gpu/drm/vivante/vivante_drv.h linux-linaro- +#endif diff -Nur linux-3.10.30.orig/drivers/hwmon/Kconfig linux-linaro-stable-mx6/drivers/hwmon/Kconfig --- linux-3.10.30.orig/drivers/hwmon/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/hwmon/Kconfig 2014-05-15 20:33:54.425988123 +0200 ++++ linux-linaro-stable-mx6/drivers/hwmon/Kconfig 2014-05-16 15:28:21.733387169 +0200 @@ -867,6 +867,15 @@ This driver can also be built as a module. If so, the module will be called max1668. @@ -78009,7 +77684,7 @@ diff -Nur linux-3.10.30.orig/drivers/hwmon/Kconfig linux-linaro-stable-mx6/drive endif # HWMON diff -Nur linux-3.10.30.orig/drivers/hwmon/mag3110.c linux-linaro-stable-mx6/drivers/hwmon/mag3110.c --- linux-3.10.30.orig/drivers/hwmon/mag3110.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/hwmon/mag3110.c 2014-05-15 20:33:54.505988699 +0200 ++++ linux-linaro-stable-mx6/drivers/hwmon/mag3110.c 2014-05-16 15:28:21.749387254 +0200 @@ -0,0 +1,611 @@ +/* + * @@ -78624,7 +78299,7 @@ diff -Nur linux-3.10.30.orig/drivers/hwmon/mag3110.c linux-linaro-stable-mx6/dri +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/hwmon/Makefile linux-linaro-stable-mx6/drivers/hwmon/Makefile --- linux-3.10.30.orig/drivers/hwmon/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/hwmon/Makefile 2014-05-15 20:33:54.425988123 +0200 ++++ linux-linaro-stable-mx6/drivers/hwmon/Makefile 2014-05-16 15:28:21.733387169 +0200 @@ -101,6 +101,7 @@ obj-$(CONFIG_SENSORS_MAX16065) += max16065.o obj-$(CONFIG_SENSORS_MAX1619) += max1619.o @@ -78644,7 +78319,7 @@ diff -Nur linux-3.10.30.orig/drivers/hwmon/Makefile linux-linaro-stable-mx6/driv diff -Nur linux-3.10.30.orig/drivers/hwmon/max17135-hwmon.c linux-linaro-stable-mx6/drivers/hwmon/max17135-hwmon.c --- linux-3.10.30.orig/drivers/hwmon/max17135-hwmon.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/hwmon/max17135-hwmon.c 2014-05-15 20:33:54.505988699 +0200 ++++ linux-linaro-stable-mx6/drivers/hwmon/max17135-hwmon.c 2014-05-16 15:28:21.749387254 +0200 @@ -0,0 +1,176 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. @@ -78824,7 +78499,7 @@ diff -Nur linux-3.10.30.orig/drivers/hwmon/max17135-hwmon.c linux-linaro-stable- + diff -Nur linux-3.10.30.orig/drivers/hwmon/mxc_mma8451.c linux-linaro-stable-mx6/drivers/hwmon/mxc_mma8451.c --- linux-3.10.30.orig/drivers/hwmon/mxc_mma8451.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/hwmon/mxc_mma8451.c 2014-05-15 20:33:54.509988729 +0200 ++++ linux-linaro-stable-mx6/drivers/hwmon/mxc_mma8451.c 2014-05-16 15:28:21.749387254 +0200 @@ -0,0 +1,538 @@ +/* + * mma8451.c - Linux kernel modules for 3-Axis Orientation/Motion @@ -79366,7 +79041,7 @@ diff -Nur linux-3.10.30.orig/drivers/hwmon/mxc_mma8451.c linux-linaro-stable-mx6 +module_exit(mma8451_exit); diff -Nur linux-3.10.30.orig/drivers/i2c/busses/i2c-davinci.c linux-linaro-stable-mx6/drivers/i2c/busses/i2c-davinci.c --- linux-3.10.30.orig/drivers/i2c/busses/i2c-davinci.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/i2c/busses/i2c-davinci.c 2014-05-15 20:33:54.569989161 +0200 ++++ linux-linaro-stable-mx6/drivers/i2c/busses/i2c-davinci.c 2014-05-16 15:28:21.765387339 +0200 @@ -646,13 +646,6 @@ struct resource *mem, *irq; int r; @@ -79391,7 +79066,7 @@ diff -Nur linux-3.10.30.orig/drivers/i2c/busses/i2c-davinci.c linux-linaro-stabl r = PTR_ERR(dev->base); diff -Nur linux-3.10.30.orig/drivers/i2c/busses/i2c-designware-platdrv.c linux-linaro-stable-mx6/drivers/i2c/busses/i2c-designware-platdrv.c --- linux-3.10.30.orig/drivers/i2c/busses/i2c-designware-platdrv.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/i2c/busses/i2c-designware-platdrv.c 2014-05-15 20:33:54.569989161 +0200 ++++ linux-linaro-stable-mx6/drivers/i2c/busses/i2c-designware-platdrv.c 2014-05-16 15:28:21.769387359 +0200 @@ -87,13 +87,6 @@ struct resource *mem; int irq, r; @@ -79416,7 +79091,7 @@ diff -Nur linux-3.10.30.orig/drivers/i2c/busses/i2c-designware-platdrv.c linux-l return PTR_ERR(dev->base); diff -Nur linux-3.10.30.orig/drivers/i2c/busses/i2c-imx.c linux-linaro-stable-mx6/drivers/i2c/busses/i2c-imx.c --- linux-3.10.30.orig/drivers/i2c/busses/i2c-imx.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/i2c/busses/i2c-imx.c 2014-05-15 20:33:54.581989248 +0200 ++++ linux-linaro-stable-mx6/drivers/i2c/busses/i2c-imx.c 2014-05-16 15:28:21.769387359 +0200 @@ -51,7 +51,6 @@ #include <linux/of.h> #include <linux/of_device.h> @@ -79633,7 +79308,7 @@ diff -Nur linux-3.10.30.orig/drivers/i2c/busses/i2c-imx.c linux-linaro-stable-mx dev_dbg(&i2c_imx->adapter.dev, "device resources from 0x%x to 0x%x\n", diff -Nur linux-3.10.30.orig/drivers/i2c/busses/i2c-omap.c linux-linaro-stable-mx6/drivers/i2c/busses/i2c-omap.c --- linux-3.10.30.orig/drivers/i2c/busses/i2c-omap.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/i2c/busses/i2c-omap.c 2014-05-15 20:33:54.581989248 +0200 ++++ linux-linaro-stable-mx6/drivers/i2c/busses/i2c-omap.c 2014-05-16 15:28:21.773387380 +0200 @@ -1087,13 +1087,6 @@ u32 rev; u16 minor, major, scheme; @@ -79658,7 +79333,7 @@ diff -Nur linux-3.10.30.orig/drivers/i2c/busses/i2c-omap.c linux-linaro-stable-m return PTR_ERR(dev->base); diff -Nur linux-3.10.30.orig/drivers/i2c/busses/i2c-rcar.c linux-linaro-stable-mx6/drivers/i2c/busses/i2c-rcar.c --- linux-3.10.30.orig/drivers/i2c/busses/i2c-rcar.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/i2c/busses/i2c-rcar.c 2014-05-15 20:33:54.585989276 +0200 ++++ linux-linaro-stable-mx6/drivers/i2c/busses/i2c-rcar.c 2014-05-16 15:28:21.773387380 +0200 @@ -623,12 +623,6 @@ u32 bus_speed; int ret; @@ -79682,7 +79357,7 @@ diff -Nur linux-3.10.30.orig/drivers/i2c/busses/i2c-rcar.c linux-linaro-stable-m return PTR_ERR(priv->io); diff -Nur linux-3.10.30.orig/drivers/input/keyboard/gpio_keys.c linux-linaro-stable-mx6/drivers/input/keyboard/gpio_keys.c --- linux-3.10.30.orig/drivers/input/keyboard/gpio_keys.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/input/keyboard/gpio_keys.c 2014-05-15 20:33:55.033992505 +0200 ++++ linux-linaro-stable-mx6/drivers/input/keyboard/gpio_keys.c 2014-05-16 15:28:21.889387992 +0200 @@ -3,6 +3,7 @@ * * Copyright 2005 Phil Blundell @@ -79702,7 +79377,7 @@ diff -Nur linux-3.10.30.orig/drivers/input/keyboard/gpio_keys.c linux-linaro-sta if (!button->irq) { diff -Nur linux-3.10.30.orig/drivers/input/keyboard/imx_keypad.c linux-linaro-stable-mx6/drivers/input/keyboard/imx_keypad.c --- linux-3.10.30.orig/drivers/input/keyboard/imx_keypad.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/input/keyboard/imx_keypad.c 2014-05-15 20:33:55.033992505 +0200 ++++ linux-linaro-stable-mx6/drivers/input/keyboard/imx_keypad.c 2014-05-16 15:28:21.889387992 +0200 @@ -1,6 +1,7 @@ /* * Driver for the IMX keypad port. @@ -79731,7 +79406,7 @@ diff -Nur linux-3.10.30.orig/drivers/input/keyboard/imx_keypad.c linux-linaro-st diff -Nur linux-3.10.30.orig/drivers/input/misc/isl29023.c linux-linaro-stable-mx6/drivers/input/misc/isl29023.c --- linux-3.10.30.orig/drivers/input/misc/isl29023.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/input/misc/isl29023.c 2014-05-15 20:33:55.061992707 +0200 ++++ linux-linaro-stable-mx6/drivers/input/misc/isl29023.c 2014-05-16 15:28:21.897388034 +0200 @@ -0,0 +1,1029 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -80764,7 +80439,7 @@ diff -Nur linux-3.10.30.orig/drivers/input/misc/isl29023.c linux-linaro-stable-m +module_exit(isl29023_exit); diff -Nur linux-3.10.30.orig/drivers/input/misc/Kconfig linux-linaro-stable-mx6/drivers/input/misc/Kconfig --- linux-3.10.30.orig/drivers/input/misc/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/input/misc/Kconfig 2014-05-15 20:33:55.061992707 +0200 ++++ linux-linaro-stable-mx6/drivers/input/misc/Kconfig 2014-05-16 15:28:21.893388013 +0200 @@ -637,4 +637,14 @@ To compile this driver as a module, choose M here: the module will be called xen-kbdfront. @@ -80782,7 +80457,7 @@ diff -Nur linux-3.10.30.orig/drivers/input/misc/Kconfig linux-linaro-stable-mx6/ endif diff -Nur linux-3.10.30.orig/drivers/input/misc/Makefile linux-linaro-stable-mx6/drivers/input/misc/Makefile --- linux-3.10.30.orig/drivers/input/misc/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/input/misc/Makefile 2014-05-15 20:33:55.061992707 +0200 ++++ linux-linaro-stable-mx6/drivers/input/misc/Makefile 2014-05-16 15:28:21.893388013 +0200 @@ -60,3 +60,4 @@ obj-$(CONFIG_INPUT_WM831X_ON) += wm831x-on.o obj-$(CONFIG_INPUT_XEN_KBDDEV_FRONTEND) += xen-kbdfront.o @@ -80790,7 +80465,7 @@ diff -Nur linux-3.10.30.orig/drivers/input/misc/Makefile linux-linaro-stable-mx6 +obj-$(CONFIG_INPUT_ISL29023) += isl29023.o diff -Nur linux-3.10.30.orig/drivers/input/misc/mma8450.c linux-linaro-stable-mx6/drivers/input/misc/mma8450.c --- linux-3.10.30.orig/drivers/input/misc/mma8450.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/input/misc/mma8450.c 2014-05-15 20:33:55.065992735 +0200 ++++ linux-linaro-stable-mx6/drivers/input/misc/mma8450.c 2014-05-16 15:28:21.897388034 +0200 @@ -1,7 +1,7 @@ /* * Driver for Freescale's 3-Axis Accelerometer MMA8450 @@ -80846,7 +80521,7 @@ diff -Nur linux-3.10.30.orig/drivers/input/misc/mma8450.c linux-linaro-stable-mx diff -Nur linux-3.10.30.orig/drivers/input/touchscreen/egalax_ts.c linux-linaro-stable-mx6/drivers/input/touchscreen/egalax_ts.c --- linux-3.10.30.orig/drivers/input/touchscreen/egalax_ts.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/input/touchscreen/egalax_ts.c 2014-05-15 20:33:55.141993284 +0200 ++++ linux-linaro-stable-mx6/drivers/input/touchscreen/egalax_ts.c 2014-05-16 15:28:21.917388140 +0200 @@ -1,7 +1,7 @@ /* * Driver for EETI eGalax Multiple Touch Controller @@ -81056,7 +80731,7 @@ diff -Nur linux-3.10.30.orig/drivers/input/touchscreen/egalax_ts.c linux-linaro- error = request_threaded_irq(client->irq, NULL, egalax_ts_interrupt, diff -Nur linux-3.10.30.orig/drivers/input/touchscreen/elan_ts.c linux-linaro-stable-mx6/drivers/input/touchscreen/elan_ts.c --- linux-3.10.30.orig/drivers/input/touchscreen/elan_ts.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/input/touchscreen/elan_ts.c 2014-05-15 20:33:55.141993284 +0200 ++++ linux-linaro-stable-mx6/drivers/input/touchscreen/elan_ts.c 2014-05-16 15:28:21.917388140 +0200 @@ -0,0 +1,472 @@ +/* + * Copyright (C) 2007-2008 HTC Corporation. @@ -81532,7 +81207,7 @@ diff -Nur linux-3.10.30.orig/drivers/input/touchscreen/elan_ts.c linux-linaro-st +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/input/touchscreen/Kconfig linux-linaro-stable-mx6/drivers/input/touchscreen/Kconfig --- linux-3.10.30.orig/drivers/input/touchscreen/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/input/touchscreen/Kconfig 2014-05-15 20:33:55.129993197 +0200 ++++ linux-linaro-stable-mx6/drivers/input/touchscreen/Kconfig 2014-05-16 15:28:21.913388119 +0200 @@ -235,6 +235,27 @@ To compile this driver as a module, choose M here: the module will be called egalax_ts. @@ -81563,7 +81238,7 @@ diff -Nur linux-3.10.30.orig/drivers/input/touchscreen/Kconfig linux-linaro-stab select SERIO diff -Nur linux-3.10.30.orig/drivers/input/touchscreen/Makefile linux-linaro-stable-mx6/drivers/input/touchscreen/Makefile --- linux-3.10.30.orig/drivers/input/touchscreen/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/input/touchscreen/Makefile 2014-05-15 20:33:55.129993197 +0200 ++++ linux-linaro-stable-mx6/drivers/input/touchscreen/Makefile 2014-05-16 15:28:21.913388119 +0200 @@ -27,6 +27,7 @@ obj-$(CONFIG_TOUCHSCREEN_HAMPSHIRE) += hampshire.o obj-$(CONFIG_TOUCHSCREEN_GUNZE) += gunze.o @@ -81574,7 +81249,7 @@ diff -Nur linux-3.10.30.orig/drivers/input/touchscreen/Makefile linux-linaro-sta obj-$(CONFIG_TOUCHSCREEN_FUJITSU) += fujitsu_ts.o diff -Nur linux-3.10.30.orig/drivers/input/touchscreen/max11801_ts.c linux-linaro-stable-mx6/drivers/input/touchscreen/max11801_ts.c --- linux-3.10.30.orig/drivers/input/touchscreen/max11801_ts.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/input/touchscreen/max11801_ts.c 2014-05-15 20:33:55.145993312 +0200 ++++ linux-linaro-stable-mx6/drivers/input/touchscreen/max11801_ts.c 2014-05-16 15:28:21.917388140 +0200 @@ -2,7 +2,7 @@ * Driver for MAXI MAX11801 - A Resistive touch screen controller with * i2c interface @@ -81878,7 +81553,7 @@ diff -Nur linux-3.10.30.orig/drivers/input/touchscreen/max11801_ts.c linux-linar .probe = max11801_ts_probe, diff -Nur linux-3.10.30.orig/drivers/irqchip/irq-gic.c linux-linaro-stable-mx6/drivers/irqchip/irq-gic.c --- linux-3.10.30.orig/drivers/irqchip/irq-gic.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/irqchip/irq-gic.c 2014-05-15 20:33:55.245994033 +0200 ++++ linux-linaro-stable-mx6/drivers/irqchip/irq-gic.c 2014-05-16 15:28:21.929388203 +0200 @@ -41,6 +41,7 @@ #include <linux/slab.h> #include <linux/irqchip/chained_irq.h> @@ -82085,7 +81760,7 @@ diff -Nur linux-3.10.30.orig/drivers/irqchip/irq-gic.c linux-linaro-stable-mx6/d irq = irq_of_parse_and_map(node, 0); diff -Nur linux-3.10.30.orig/drivers/Kconfig linux-linaro-stable-mx6/drivers/Kconfig --- linux-3.10.30.orig/drivers/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/Kconfig 2014-05-15 20:33:44.917919586 +0200 ++++ linux-linaro-stable-mx6/drivers/Kconfig 2014-05-16 15:28:21.313384954 +0200 @@ -98,6 +98,8 @@ source "drivers/memstick/Kconfig" @@ -82104,7 +81779,7 @@ diff -Nur linux-3.10.30.orig/drivers/Kconfig linux-linaro-stable-mx6/drivers/Kco endmenu diff -Nur linux-3.10.30.orig/drivers/leds/leds-pwm.c linux-linaro-stable-mx6/drivers/leds/leds-pwm.c --- linux-3.10.30.orig/drivers/leds/leds-pwm.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/leds/leds-pwm.c 2014-05-15 20:33:55.805998069 +0200 ++++ linux-linaro-stable-mx6/drivers/leds/leds-pwm.c 2014-05-16 15:28:21.997388562 +0200 @@ -67,8 +67,13 @@ container_of(led_cdev, struct led_pwm_data, cdev); unsigned int max = led_dat->cdev.max_brightness; @@ -82147,7 +81822,7 @@ diff -Nur linux-3.10.30.orig/drivers/leds/leds-pwm.c linux-linaro-stable-mx6/dri if (led_dat->can_sleep) diff -Nur linux-3.10.30.orig/drivers/Makefile linux-linaro-stable-mx6/drivers/Makefile --- linux-3.10.30.orig/drivers/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/Makefile 2014-05-15 20:33:44.917919586 +0200 ++++ linux-linaro-stable-mx6/drivers/Makefile 2014-05-16 15:28:21.313384954 +0200 @@ -109,6 +109,7 @@ obj-$(CONFIG_CPU_FREQ) += cpufreq/ obj-$(CONFIG_CPU_IDLE) += cpuidle/ @@ -82164,7 +81839,7 @@ diff -Nur linux-3.10.30.orig/drivers/Makefile linux-linaro-stable-mx6/drivers/Ma +obj-$(CONFIG_GATOR) += gator/ diff -Nur linux-3.10.30.orig/drivers/media/platform/Kconfig linux-linaro-stable-mx6/drivers/media/platform/Kconfig --- linux-3.10.30.orig/drivers/media/platform/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/media/platform/Kconfig 2014-05-15 20:33:56.994006630 +0200 ++++ linux-linaro-stable-mx6/drivers/media/platform/Kconfig 2014-05-16 15:28:22.177389511 +0200 @@ -121,6 +121,21 @@ To compile this driver as a module, choose M here: the module will be called s3c-camif. @@ -82189,7 +81864,7 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/Kconfig linux-linaro-stable- source "drivers/media/platform/s5p-tv/Kconfig" diff -Nur linux-3.10.30.orig/drivers/media/platform/Makefile linux-linaro-stable-mx6/drivers/media/platform/Makefile --- linux-3.10.30.orig/drivers/media/platform/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/media/platform/Makefile 2014-05-15 20:33:56.994006630 +0200 ++++ linux-linaro-stable-mx6/drivers/media/platform/Makefile 2014-05-16 15:28:22.177389511 +0200 @@ -50,4 +50,7 @@ obj-$(CONFIG_ARCH_OMAP) += omap/ @@ -82200,7 +81875,7 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/Makefile linux-linaro-stable ccflags-y += -I$(srctree)/drivers/media/i2c diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/adv7180.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/adv7180.c --- linux-3.10.30.orig/drivers/media/platform/mxc/capture/adv7180.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/adv7180.c 2014-05-15 20:33:57.110007467 +0200 ++++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/adv7180.c 2014-05-16 15:28:22.189389574 +0200 @@ -0,0 +1,1344 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -83548,7 +83223,7 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/adv7180.c linux- +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/csi_v4l2_capture.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/csi_v4l2_capture.c --- linux-3.10.30.orig/drivers/media/platform/mxc/capture/csi_v4l2_capture.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/csi_v4l2_capture.c 2014-05-15 20:33:57.110007467 +0200 ++++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/csi_v4l2_capture.c 2014-05-16 15:28:22.193389596 +0200 @@ -0,0 +1,2047 @@ +/* + * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -85599,7 +85274,7 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/csi_v4l2_capture +MODULE_SUPPORTED_DEVICE("video"); diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/fsl_csi.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/fsl_csi.c --- linux-3.10.30.orig/drivers/media/platform/mxc/capture/fsl_csi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/fsl_csi.c 2014-05-15 20:33:57.110007467 +0200 ++++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/fsl_csi.c 2014-05-16 15:28:22.193389596 +0200 @@ -0,0 +1,302 @@ +/* + * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -85905,7 +85580,7 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/fsl_csi.c linux- +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/fsl_csi.h linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/fsl_csi.h --- linux-3.10.30.orig/drivers/media/platform/mxc/capture/fsl_csi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/fsl_csi.h 2014-05-15 20:33:57.110007467 +0200 ++++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/fsl_csi.h 2014-05-16 15:28:22.193389596 +0200 @@ -0,0 +1,198 @@ +/* + * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -86107,7 +85782,7 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/fsl_csi.h linux- +void csi_dmareq_rff_disable(void); diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c --- linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c 2014-05-15 20:33:57.110007467 +0200 ++++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c 2014-05-16 15:28:22.193389596 +0200 @@ -0,0 +1,554 @@ + +/* @@ -86665,7 +86340,7 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_bg_overlay_s +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_csi_enc.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_csi_enc.c --- linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_csi_enc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_csi_enc.c 2014-05-15 20:33:57.134007639 +0200 ++++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_csi_enc.c 2014-05-16 15:28:22.193389596 +0200 @@ -0,0 +1,426 @@ +/* + * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -87095,7 +86770,7 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_csi_enc.c li +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c --- linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c 2014-05-15 20:33:57.134007639 +0200 ++++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c 2014-05-16 15:28:22.193389596 +0200 @@ -0,0 +1,642 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -87741,7 +87416,7 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_fg_overlay_s +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_prp_enc.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_prp_enc.c --- linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_prp_enc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_prp_enc.c 2014-05-15 20:33:57.134007639 +0200 ++++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_prp_enc.c 2014-05-16 15:28:22.193389596 +0200 @@ -0,0 +1,603 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -88348,7 +88023,7 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_prp_enc.c li +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_prp_sw.h linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_prp_sw.h --- linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_prp_sw.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_prp_sw.h 2014-05-15 20:33:57.134007639 +0200 ++++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_prp_sw.h 2014-05-16 15:28:22.193389596 +0200 @@ -0,0 +1,43 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -88395,7 +88070,7 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_prp_sw.h lin +#endif diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c --- linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c 2014-05-15 20:33:57.138007668 +0200 ++++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c 2014-05-16 15:28:22.193389596 +0200 @@ -0,0 +1,529 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -88928,7 +88603,7 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_b +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c --- linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c 2014-05-15 20:33:57.138007668 +0200 ++++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c 2014-05-16 15:28:22.193389596 +0200 @@ -0,0 +1,590 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -89522,7 +89197,7 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_still.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_still.c --- linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_still.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_still.c 2014-05-15 20:33:57.138007668 +0200 ++++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_still.c 2014-05-16 15:28:22.193389596 +0200 @@ -0,0 +1,268 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -89794,7 +89469,7 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_still.c linu +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/Kconfig linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/Kconfig --- linux-3.10.30.orig/drivers/media/platform/mxc/capture/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/Kconfig 2014-05-15 20:33:57.110007467 +0200 ++++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/Kconfig 2014-05-16 15:28:22.189389574 +0200 @@ -0,0 +1,86 @@ +if VIDEO_MXC_CAPTURE + @@ -89884,7 +89559,7 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/Kconfig linux-li +endif diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/Makefile linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/Makefile --- linux-3.10.30.orig/drivers/media/platform/mxc/capture/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/Makefile 2014-05-15 20:33:57.110007467 +0200 ++++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/Makefile 2014-05-16 15:28:22.189389574 +0200 @@ -0,0 +1,21 @@ +obj-$(CONFIG_VIDEO_MXC_CSI_CAMERA) += fsl_csi.o csi_v4l2_capture.o + @@ -89909,7 +89584,7 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/Makefile linux-l +obj-$(CONFIG_MXC_TVIN_ADV7180) += adv7180_tvin.o diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c --- linux-3.10.30.orig/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c 2014-05-15 20:33:57.138007668 +0200 ++++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c 2014-05-16 15:28:22.193389596 +0200 @@ -0,0 +1,3109 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -93022,7 +92697,7 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/mxc_v4l2_capture +MODULE_SUPPORTED_DEVICE("video"); diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h --- linux-3.10.30.orig/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h 2014-05-15 20:33:57.138007668 +0200 ++++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h 2014-05-16 15:28:22.193389596 +0200 @@ -0,0 +1,260 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -93286,7 +92961,7 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/mxc_v4l2_capture +#endif /* __MXC_V4L2_CAPTURE_H__ */ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ov5640.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ov5640.c --- linux-3.10.30.orig/drivers/media/platform/mxc/capture/ov5640.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ov5640.c 2014-05-15 20:33:57.138007668 +0200 ++++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ov5640.c 2014-05-16 15:28:22.193389596 +0200 @@ -0,0 +1,1951 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -95241,7 +94916,7 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ov5640.c linux-l +MODULE_ALIAS("CSI"); diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ov5640_mipi.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ov5640_mipi.c --- linux-3.10.30.orig/drivers/media/platform/mxc/capture/ov5640_mipi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ov5640_mipi.c 2014-05-15 20:33:57.138007668 +0200 ++++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ov5640_mipi.c 2014-05-16 15:28:22.193389596 +0200 @@ -0,0 +1,2104 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -97349,7 +97024,7 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ov5640_mipi.c li +MODULE_ALIAS("CSI"); diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ov5642.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ov5642.c --- linux-3.10.30.orig/drivers/media/platform/mxc/capture/ov5642.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ov5642.c 2014-05-15 20:33:57.138007668 +0200 ++++ linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ov5642.c 2014-05-16 15:28:22.193389596 +0200 @@ -0,0 +1,4252 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -101605,7 +101280,7 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ov5642.c linux-l +MODULE_ALIAS("CSI"); diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/output/Kconfig linux-linaro-stable-mx6/drivers/media/platform/mxc/output/Kconfig --- linux-3.10.30.orig/drivers/media/platform/mxc/output/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/output/Kconfig 2014-05-15 20:33:57.142007696 +0200 ++++ linux-linaro-stable-mx6/drivers/media/platform/mxc/output/Kconfig 2014-05-16 15:28:22.193389596 +0200 @@ -0,0 +1,16 @@ +config VIDEO_MXC_IPU_OUTPUT + tristate "IPU v4l2 output support" @@ -101625,13 +101300,13 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/output/Kconfig linux-lin + To compile this driver as a module, choose M here. diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/output/Makefile linux-linaro-stable-mx6/drivers/media/platform/mxc/output/Makefile --- linux-3.10.30.orig/drivers/media/platform/mxc/output/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/output/Makefile 2014-05-15 20:33:57.142007696 +0200 ++++ linux-linaro-stable-mx6/drivers/media/platform/mxc/output/Makefile 2014-05-16 15:28:22.193389596 +0200 @@ -0,0 +1,2 @@ +obj-$(CONFIG_VIDEO_MXC_IPU_OUTPUT) += mxc_vout.o +obj-$(CONFIG_VIDEO_MXC_PXP_V4L2) += mxc_pxp_v4l2.o diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/output/mxc_pxp_v4l2.c linux-linaro-stable-mx6/drivers/media/platform/mxc/output/mxc_pxp_v4l2.c --- linux-3.10.30.orig/drivers/media/platform/mxc/output/mxc_pxp_v4l2.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/output/mxc_pxp_v4l2.c 2014-05-15 20:33:57.142007696 +0200 ++++ linux-linaro-stable-mx6/drivers/media/platform/mxc/output/mxc_pxp_v4l2.c 2014-05-16 15:28:22.193389596 +0200 @@ -0,0 +1,1263 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. @@ -102898,7 +102573,7 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/output/mxc_pxp_v4l2.c li +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/output/mxc_pxp_v4l2.h linux-linaro-stable-mx6/drivers/media/platform/mxc/output/mxc_pxp_v4l2.h --- linux-3.10.30.orig/drivers/media/platform/mxc/output/mxc_pxp_v4l2.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/output/mxc_pxp_v4l2.h 2014-05-15 20:33:57.142007696 +0200 ++++ linux-linaro-stable-mx6/drivers/media/platform/mxc/output/mxc_pxp_v4l2.h 2014-05-16 15:28:22.193389596 +0200 @@ -0,0 +1,83 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. @@ -102985,7 +102660,7 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/output/mxc_pxp_v4l2.h li +#endif diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/output/mxc_vout.c linux-linaro-stable-mx6/drivers/media/platform/mxc/output/mxc_vout.c --- linux-3.10.30.orig/drivers/media/platform/mxc/output/mxc_vout.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/media/platform/mxc/output/mxc_vout.c 2014-05-15 20:33:57.142007696 +0200 ++++ linux-linaro-stable-mx6/drivers/media/platform/mxc/output/mxc_vout.c 2014-05-16 15:28:22.193389596 +0200 @@ -0,0 +1,2265 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -105254,7 +104929,7 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/output/mxc_vout.c linux- +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/media/v4l2-core/videobuf-dma-contig.c linux-linaro-stable-mx6/drivers/media/v4l2-core/videobuf-dma-contig.c --- linux-3.10.30.orig/drivers/media/v4l2-core/videobuf-dma-contig.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/media/v4l2-core/videobuf-dma-contig.c 2014-05-15 20:33:57.950013520 +0200 ++++ linux-linaro-stable-mx6/drivers/media/v4l2-core/videobuf-dma-contig.c 2014-05-16 15:28:22.321390271 +0200 @@ -307,7 +307,7 @@ size = vma->vm_end - vma->vm_start; size = (size < mem->size) ? size : mem->size; @@ -105266,7 +104941,7 @@ diff -Nur linux-3.10.30.orig/drivers/media/v4l2-core/videobuf-dma-contig.c linux size, vma->vm_page_prot); diff -Nur linux-3.10.30.orig/drivers/mfd/Kconfig linux-linaro-stable-mx6/drivers/mfd/Kconfig --- linux-3.10.30.orig/drivers/mfd/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mfd/Kconfig 2014-05-15 20:33:58.030014096 +0200 ++++ linux-linaro-stable-mx6/drivers/mfd/Kconfig 2014-05-16 15:28:22.341390376 +0200 @@ -139,6 +139,13 @@ This driver can be built as a module. If built as a module it will be called "da9055" @@ -105315,7 +104990,7 @@ diff -Nur linux-3.10.30.orig/drivers/mfd/Kconfig linux-linaro-stable-mx6/drivers + diff -Nur linux-3.10.30.orig/drivers/mfd/Makefile linux-linaro-stable-mx6/drivers/mfd/Makefile --- linux-3.10.30.orig/drivers/mfd/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mfd/Makefile 2014-05-15 20:33:58.030014096 +0200 ++++ linux-linaro-stable-mx6/drivers/mfd/Makefile 2014-05-16 15:28:22.341390376 +0200 @@ -104,6 +104,7 @@ da9055-objs := da9055-core.o da9055-i2c.o obj-$(CONFIG_MFD_DA9055) += da9055.o @@ -105334,7 +105009,7 @@ diff -Nur linux-3.10.30.orig/drivers/mfd/Makefile linux-linaro-stable-mx6/driver +obj-$(CONFIG_MFD_MXC_HDMI) += mxc-hdmi-core.o diff -Nur linux-3.10.30.orig/drivers/mfd/max17135-core.c linux-linaro-stable-mx6/drivers/mfd/max17135-core.c --- linux-3.10.30.orig/drivers/mfd/max17135-core.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mfd/max17135-core.c 2014-05-15 20:33:58.050014240 +0200 ++++ linux-linaro-stable-mx6/drivers/mfd/max17135-core.c 2014-05-16 15:28:22.345390397 +0200 @@ -0,0 +1,295 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. @@ -105633,7 +105308,7 @@ diff -Nur linux-3.10.30.orig/drivers/mfd/max17135-core.c linux-linaro-stable-mx6 +module_exit(max17135_exit); diff -Nur linux-3.10.30.orig/drivers/mfd/mxc-hdmi-core.c linux-linaro-stable-mx6/drivers/mfd/mxc-hdmi-core.c --- linux-3.10.30.orig/drivers/mfd/mxc-hdmi-core.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mfd/mxc-hdmi-core.c 2014-05-15 20:33:58.050014240 +0200 ++++ linux-linaro-stable-mx6/drivers/mfd/mxc-hdmi-core.c 2014-05-16 15:28:22.349390418 +0200 @@ -0,0 +1,775 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. @@ -106412,7 +106087,7 @@ diff -Nur linux-3.10.30.orig/drivers/mfd/mxc-hdmi-core.c linux-linaro-stable-mx6 +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/mfd/si476x-cmd.c linux-linaro-stable-mx6/drivers/mfd/si476x-cmd.c --- linux-3.10.30.orig/drivers/mfd/si476x-cmd.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mfd/si476x-cmd.c 2014-05-15 20:33:58.066014355 +0200 ++++ linux-linaro-stable-mx6/drivers/mfd/si476x-cmd.c 2014-05-16 15:28:22.349390418 +0200 @@ -303,13 +303,13 @@ * possible racing conditions when working in polling mode */ atomic_set(&core->cts, 0); @@ -106436,7 +106111,7 @@ diff -Nur linux-3.10.30.orig/drivers/mfd/si476x-cmd.c linux-linaro-stable-mx6/dr When working in polling mode, for some reason the tuner will diff -Nur linux-3.10.30.orig/drivers/mfd/si476x-i2c.c linux-linaro-stable-mx6/drivers/mfd/si476x-i2c.c --- linux-3.10.30.orig/drivers/mfd/si476x-i2c.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mfd/si476x-i2c.c 2014-05-15 20:33:58.066014355 +0200 ++++ linux-linaro-stable-mx6/drivers/mfd/si476x-i2c.c 2014-05-16 15:28:22.349390418 +0200 @@ -303,7 +303,7 @@ */ udelay(100); @@ -106486,7 +106161,7 @@ diff -Nur linux-3.10.30.orig/drivers/mfd/si476x-i2c.c linux-linaro-stable-mx6/dr rval = -ENODEV; diff -Nur linux-3.10.30.orig/drivers/mfd/si476x-prop.c linux-linaro-stable-mx6/drivers/mfd/si476x-prop.c --- linux-3.10.30.orig/drivers/mfd/si476x-prop.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mfd/si476x-prop.c 2014-05-15 20:33:58.066014355 +0200 ++++ linux-linaro-stable-mx6/drivers/mfd/si476x-prop.c 2014-05-16 15:28:22.349390418 +0200 @@ -217,15 +217,36 @@ return 0; } @@ -106526,7 +106201,7 @@ diff -Nur linux-3.10.30.orig/drivers/mfd/si476x-prop.c linux-linaro-stable-mx6/d .reg_write = si476x_core_regmap_write, diff -Nur linux-3.10.30.orig/drivers/mfd/vexpress-config.c linux-linaro-stable-mx6/drivers/mfd/vexpress-config.c --- linux-3.10.30.orig/drivers/mfd/vexpress-config.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mfd/vexpress-config.c 2014-05-15 20:33:58.090014528 +0200 ++++ linux-linaro-stable-mx6/drivers/mfd/vexpress-config.c 2014-05-16 15:28:22.357390461 +0200 @@ -86,29 +86,13 @@ } EXPORT_SYMBOL(vexpress_config_bridge_unregister); @@ -106612,7 +106287,7 @@ diff -Nur linux-3.10.30.orig/drivers/mfd/vexpress-config.c linux-linaro-stable-m kfree(func); diff -Nur linux-3.10.30.orig/drivers/mfd/vexpress-spc.c linux-linaro-stable-mx6/drivers/mfd/vexpress-spc.c --- linux-3.10.30.orig/drivers/mfd/vexpress-spc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mfd/vexpress-spc.c 2014-05-15 20:33:58.090014528 +0200 ++++ linux-linaro-stable-mx6/drivers/mfd/vexpress-spc.c 2014-05-16 15:28:22.357390461 +0200 @@ -0,0 +1,633 @@ +/* + * Versatile Express Serial Power Controller (SPC) support @@ -107249,7 +106924,7 @@ diff -Nur linux-3.10.30.orig/drivers/mfd/vexpress-spc.c linux-linaro-stable-mx6/ +MODULE_DESCRIPTION("Serial Power Controller (SPC) support"); diff -Nur linux-3.10.30.orig/drivers/mfd/vexpress-sysreg.c linux-linaro-stable-mx6/drivers/mfd/vexpress-sysreg.c --- linux-3.10.30.orig/drivers/mfd/vexpress-sysreg.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mfd/vexpress-sysreg.c 2014-05-15 20:33:58.090014528 +0200 ++++ linux-linaro-stable-mx6/drivers/mfd/vexpress-sysreg.c 2014-05-16 15:28:22.357390461 +0200 @@ -165,7 +165,7 @@ static int vexpress_sysreg_config_tries; @@ -107302,7 +106977,7 @@ diff -Nur linux-3.10.30.orig/drivers/mfd/vexpress-sysreg.c linux-linaro-stable-m diff -Nur linux-3.10.30.orig/drivers/misc/sram.c linux-linaro-stable-mx6/drivers/misc/sram.c --- linux-3.10.30.orig/drivers/misc/sram.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/misc/sram.c 2014-05-15 20:33:58.166015076 +0200 ++++ linux-linaro-stable-mx6/drivers/misc/sram.c 2014-05-16 15:28:22.377390566 +0200 @@ -29,7 +29,7 @@ #include <linux/spinlock.h> #include <linux/genalloc.h> @@ -107314,7 +106989,7 @@ diff -Nur linux-3.10.30.orig/drivers/misc/sram.c linux-linaro-stable-mx6/drivers struct gen_pool *pool; diff -Nur linux-3.10.30.orig/drivers/mmc/card/block.c linux-linaro-stable-mx6/drivers/mmc/card/block.c --- linux-3.10.30.orig/drivers/mmc/card/block.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/card/block.c 2014-05-15 20:33:58.202015335 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/card/block.c 2014-05-16 15:28:22.385390608 +0200 @@ -58,6 +58,8 @@ #define INAND_CMD38_ARG_SECTRIM1 0x81 #define INAND_CMD38_ARG_SECTRIM2 0x88 @@ -107430,7 +107105,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/card/block.c linux-linaro-stable-mx6/dr goto retry; diff -Nur linux-3.10.30.orig/drivers/mmc/card/queue.c linux-linaro-stable-mx6/drivers/mmc/card/queue.c --- linux-3.10.30.orig/drivers/mmc/card/queue.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/card/queue.c 2014-05-15 20:33:58.202015335 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/card/queue.c 2014-05-16 15:28:22.385390608 +0200 @@ -173,7 +173,7 @@ /* granularity must not be greater than max. discard */ if (card->pref_erase > max_discard) @@ -107442,7 +107117,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/card/queue.c linux-linaro-stable-mx6/dr diff -Nur linux-3.10.30.orig/drivers/mmc/core/core.c linux-linaro-stable-mx6/drivers/mmc/core/core.c --- linux-3.10.30.orig/drivers/mmc/core/core.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/core/core.c 2014-05-15 20:33:58.218015451 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/core/core.c 2014-05-16 15:28:22.385390608 +0200 @@ -13,11 +13,13 @@ #include <linux/module.h> #include <linux/init.h> @@ -107546,7 +107221,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/core/core.c linux-linaro-stable-mx6/dri /* If ocr is set, we use it */ diff -Nur linux-3.10.30.orig/drivers/mmc/core/host.c linux-linaro-stable-mx6/drivers/mmc/core/host.c --- linux-3.10.30.orig/drivers/mmc/core/host.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/core/host.c 2014-05-15 20:33:58.218015451 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/core/host.c 2014-05-16 15:28:22.385390608 +0200 @@ -12,14 +12,18 @@ * MMC host class device management */ @@ -107733,7 +107408,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/core/host.c linux-linaro-stable-mx6/dri diff -Nur linux-3.10.30.orig/drivers/mmc/core/mmc.c linux-linaro-stable-mx6/drivers/mmc/core/mmc.c --- linux-3.10.30.orig/drivers/mmc/core/mmc.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/core/mmc.c 2014-05-15 20:33:58.218015451 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/core/mmc.c 2014-05-16 15:28:22.385390608 +0200 @@ -316,6 +316,11 @@ mmc_card_set_blockaddr(card); } @@ -108158,7 +107833,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/core/mmc.c linux-linaro-stable-mx6/driv diff -Nur linux-3.10.30.orig/drivers/mmc/core/mmc_ops.c linux-linaro-stable-mx6/drivers/mmc/core/mmc_ops.c --- linux-3.10.30.orig/drivers/mmc/core/mmc_ops.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/core/mmc_ops.c 2014-05-15 20:33:58.218015451 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/core/mmc_ops.c 2014-05-16 15:28:22.385390608 +0200 @@ -431,6 +431,8 @@ @@ -108183,7 +107858,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/core/mmc_ops.c linux-linaro-stable-mx6/ do { diff -Nur linux-3.10.30.orig/drivers/mmc/core/sd.c linux-linaro-stable-mx6/drivers/mmc/core/sd.c --- linux-3.10.30.orig/drivers/mmc/core/sd.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/core/sd.c 2014-05-15 20:33:58.218015451 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/core/sd.c 2014-05-16 15:28:22.385390608 +0200 @@ -215,7 +215,7 @@ static int mmc_read_ssr(struct mmc_card *card) { @@ -108228,7 +107903,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/core/sd.c linux-linaro-stable-mx6/drive MMC_SEND_TUNING_BLOCK); diff -Nur linux-3.10.30.orig/drivers/mmc/core/sdio.c linux-linaro-stable-mx6/drivers/mmc/core/sdio.c --- linux-3.10.30.orig/drivers/mmc/core/sdio.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/core/sdio.c 2014-05-15 20:33:58.218015451 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/core/sdio.c 2014-05-16 15:28:22.389390629 +0200 @@ -563,10 +563,18 @@ if (err) goto out; @@ -108252,7 +107927,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/core/sdio.c linux-linaro-stable-mx6/dri diff -Nur linux-3.10.30.orig/drivers/mmc/core/sdio_irq.c linux-linaro-stable-mx6/drivers/mmc/core/sdio_irq.c --- linux-3.10.30.orig/drivers/mmc/core/sdio_irq.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/core/sdio_irq.c 2014-05-15 20:33:58.218015451 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/core/sdio_irq.c 2014-05-16 15:28:22.389390629 +0200 @@ -79,6 +79,15 @@ return ret; } @@ -108317,7 +107992,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/core/sdio_irq.c linux-linaro-stable-mx6 return 0; diff -Nur linux-3.10.30.orig/drivers/mmc/core/slot-gpio.c linux-linaro-stable-mx6/drivers/mmc/core/slot-gpio.c --- linux-3.10.30.orig/drivers/mmc/core/slot-gpio.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/core/slot-gpio.c 2014-05-15 20:33:58.218015451 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/core/slot-gpio.c 2014-05-16 15:28:22.389390629 +0200 @@ -135,6 +135,7 @@ * mmc_gpio_request_cd - request a gpio for card-detection * @host: mmc host @@ -108357,7 +108032,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/core/slot-gpio.c linux-linaro-stable-mx * still prefer to poll, e.g., because that IRQ number is already used diff -Nur linux-3.10.30.orig/drivers/mmc/host/dw_mmc.c linux-linaro-stable-mx6/drivers/mmc/host/dw_mmc.c --- linux-3.10.30.orig/drivers/mmc/host/dw_mmc.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/host/dw_mmc.c 2014-05-15 20:33:58.222015480 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/host/dw_mmc.c 2014-05-16 15:28:22.389390629 +0200 @@ -1902,6 +1902,8 @@ if (!mmc) return -ENOMEM; @@ -108369,7 +108044,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/dw_mmc.c linux-linaro-stable-mx6/d slot->mmc = mmc; diff -Nur linux-3.10.30.orig/drivers/mmc/host/jz4740_mmc.c linux-linaro-stable-mx6/drivers/mmc/host/jz4740_mmc.c --- linux-3.10.30.orig/drivers/mmc/host/jz4740_mmc.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/host/jz4740_mmc.c 2014-05-15 20:33:58.222015480 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/host/jz4740_mmc.c 2014-05-16 15:28:22.393390650 +0200 @@ -14,6 +14,7 @@ */ @@ -108562,7 +108237,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/jz4740_mmc.c linux-linaro-stable-m jz_gpio_bulk_free(jz4740_mmc_pins, jz4740_mmc_num_pins(host)); diff -Nur linux-3.10.30.orig/drivers/mmc/host/mvsdio.c linux-linaro-stable-mx6/drivers/mmc/host/mvsdio.c --- linux-3.10.30.orig/drivers/mmc/host/mvsdio.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/host/mvsdio.c 2014-05-15 20:33:58.238015595 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/host/mvsdio.c 2014-05-16 15:28:22.393390650 +0200 @@ -35,7 +35,7 @@ #define DRIVER_NAME "mvsdio" @@ -108692,7 +108367,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/mvsdio.c linux-linaro-stable-mx6/d out: diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-bcm2835.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-bcm2835.c --- linux-3.10.30.orig/drivers/mmc/host/sdhci-bcm2835.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-bcm2835.c 2014-05-15 20:33:58.242015624 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-bcm2835.c 2014-05-16 15:28:22.393390650 +0200 @@ -131,8 +131,12 @@ .read_l = bcm2835_sdhci_readl, .read_w = bcm2835_sdhci_readw, @@ -108708,7 +108383,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-bcm2835.c linux-linaro-stabl static const struct sdhci_pltfm_data bcm2835_sdhci_pdata = { diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci.c --- linux-3.10.30.orig/drivers/mmc/host/sdhci.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci.c 2014-05-15 20:33:58.246015652 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci.c 2014-05-16 15:28:22.397390671 +0200 @@ -44,12 +44,13 @@ #define MAX_TUNING_LOOP 40 @@ -109967,7 +109642,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci.c linux-linaro-stable-mx6/dr host->adma_desc = NULL; diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-cns3xxx.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-cns3xxx.c --- linux-3.10.30.orig/drivers/mmc/host/sdhci-cns3xxx.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-cns3xxx.c 2014-05-15 20:33:58.242015624 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-cns3xxx.c 2014-05-16 15:28:22.393390650 +0200 @@ -30,13 +30,12 @@ u16 clk; unsigned long timeout; @@ -110013,7 +109688,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-cns3xxx.c linux-linaro-stabl static int sdhci_cns3xxx_probe(struct platform_device *pdev) diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-dove.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-dove.c --- linux-3.10.30.orig/drivers/mmc/host/sdhci-dove.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-dove.c 2014-05-15 20:33:58.242015624 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-dove.c 2014-05-16 15:28:22.397390671 +0200 @@ -86,6 +86,10 @@ static const struct sdhci_ops sdhci_dove_ops = { .read_w = sdhci_dove_readw, @@ -110027,7 +109702,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-dove.c linux-linaro-stable-m static const struct sdhci_pltfm_data sdhci_dove_pdata = { diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-esdhc.h linux-linaro-stable-mx6/drivers/mmc/host/sdhci-esdhc.h --- linux-3.10.30.orig/drivers/mmc/host/sdhci-esdhc.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-esdhc.h 2014-05-15 20:33:58.242015624 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-esdhc.h 2014-05-16 15:28:22.397390671 +0200 @@ -1,7 +1,7 @@ /* * Freescale eSDHC controller driver generics for OF and pltfm. @@ -110089,7 +109764,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-esdhc.h linux-linaro-stable- #endif /* _DRIVERS_MMC_SDHCI_ESDHC_H */ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-esdhc-imx.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-esdhc-imx.c --- linux-3.10.30.orig/drivers/mmc/host/sdhci-esdhc-imx.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-esdhc-imx.c 2014-05-15 20:33:58.242015624 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-esdhc-imx.c 2014-05-16 15:28:22.397390671 +0200 @@ -11,6 +11,7 @@ * the Free Software Foundation; either version 2 of the License. */ @@ -111084,7 +110759,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-esdhc-imx.c linux-linaro-sta .probe = sdhci_esdhc_imx_probe, diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci.h linux-linaro-stable-mx6/drivers/mmc/host/sdhci.h --- linux-3.10.30.orig/drivers/mmc/host/sdhci.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci.h 2014-05-15 20:33:58.246015652 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci.h 2014-05-16 15:28:22.397390671 +0200 @@ -281,17 +281,15 @@ unsigned int (*get_max_clock)(struct sdhci_host *host); unsigned int (*get_min_clock)(struct sdhci_host *host); @@ -111128,7 +110803,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci.h linux-linaro-stable-mx6/dr extern int sdhci_suspend_host(struct sdhci_host *host); diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-of-esdhc.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-of-esdhc.c --- linux-3.10.30.orig/drivers/mmc/host/sdhci-of-esdhc.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-of-esdhc.c 2014-05-15 20:33:58.242015624 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-of-esdhc.c 2014-05-16 15:28:22.397390671 +0200 @@ -13,6 +13,7 @@ * your option) any later version. */ @@ -111275,7 +110950,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-of-esdhc.c linux-linaro-stab .remove = sdhci_esdhc_remove, diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-of-hlwd.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-of-hlwd.c --- linux-3.10.30.orig/drivers/mmc/host/sdhci-of-hlwd.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-of-hlwd.c 2014-05-15 20:33:58.242015624 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-of-hlwd.c 2014-05-16 15:28:22.397390671 +0200 @@ -58,6 +58,10 @@ .write_l = sdhci_hlwd_writel, .write_w = sdhci_hlwd_writew, @@ -111289,7 +110964,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-of-hlwd.c linux-linaro-stabl static const struct sdhci_pltfm_data sdhci_hlwd_pdata = { diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-pci.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pci.c --- linux-3.10.30.orig/drivers/mmc/host/sdhci-pci.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pci.c 2014-05-15 20:33:58.242015624 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pci.c 2014-05-16 15:28:22.397390671 +0200 @@ -989,7 +989,7 @@ return 0; } @@ -111323,7 +110998,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-pci.c linux-linaro-stable-mx diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-pltfm.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pltfm.c --- linux-3.10.30.orig/drivers/mmc/host/sdhci-pltfm.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pltfm.c 2014-05-15 20:33:58.242015624 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pltfm.c 2014-05-16 15:28:22.397390671 +0200 @@ -45,6 +45,10 @@ EXPORT_SYMBOL_GPL(sdhci_pltfm_clk_get_max_clock); @@ -111361,7 +111036,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-pltfm.c linux-linaro-stable- .suspend = sdhci_pltfm_suspend, diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-pltfm.h linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pltfm.h --- linux-3.10.30.orig/drivers/mmc/host/sdhci-pltfm.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pltfm.h 2014-05-15 20:33:58.242015624 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pltfm.h 2014-05-16 15:28:22.397390671 +0200 @@ -101,6 +101,8 @@ extern unsigned int sdhci_pltfm_clk_get_max_clock(struct sdhci_host *host); @@ -111373,7 +111048,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-pltfm.h linux-linaro-stable- #else diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-pxav2.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pxav2.c --- linux-3.10.30.orig/drivers/mmc/host/sdhci-pxav2.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pxav2.c 2014-05-15 20:33:58.242015624 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pxav2.c 2014-05-16 15:28:22.397390671 +0200 @@ -51,11 +51,13 @@ #define MMC_CARD 0x1000 #define MMC_WIDTH 0x0100 @@ -111419,7 +111094,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-pxav2.c linux-linaro-stable- #ifdef CONFIG_OF diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-pxav3.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pxav3.c --- linux-3.10.30.orig/drivers/mmc/host/sdhci-pxav3.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pxav3.c 2014-05-15 20:33:58.242015624 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pxav3.c 2014-05-16 15:28:22.397390671 +0200 @@ -57,11 +57,13 @@ #define SDCE_MISC_INT (1<<2) #define SDCE_MISC_INT_EN (1<<1) @@ -111462,7 +111137,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-pxav3.c linux-linaro-stable- "failed to allocate card detect gpio\n"); diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-s3c.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-s3c.c --- linux-3.10.30.orig/drivers/mmc/host/sdhci-s3c.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-s3c.c 2014-05-15 20:33:58.246015652 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-s3c.c 2014-05-16 15:28:22.397390671 +0200 @@ -57,6 +57,8 @@ struct clk *clk_io; @@ -111599,7 +111274,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-s3c.c linux-linaro-stable-mx #else diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-sirf.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-sirf.c --- linux-3.10.30.orig/drivers/mmc/host/sdhci-sirf.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-sirf.c 2014-05-15 20:33:58.246015652 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-sirf.c 2014-05-16 15:28:22.397390671 +0200 @@ -29,7 +29,11 @@ } @@ -111623,7 +111298,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-sirf.c linux-linaro-stable-m ret); diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-spear.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-spear.c --- linux-3.10.30.orig/drivers/mmc/host/sdhci-spear.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-spear.c 2014-05-15 20:33:58.246015652 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-spear.c 2014-05-16 15:28:22.397390671 +0200 @@ -37,7 +37,10 @@ /* sdhci ops */ @@ -111638,7 +111313,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-spear.c linux-linaro-stable- /* gpio card detection interrupt handler */ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-tegra.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-tegra.c --- linux-3.10.30.orig/drivers/mmc/host/sdhci-tegra.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-tegra.c 2014-05-15 20:33:58.246015652 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/host/sdhci-tegra.c 2014-05-16 15:28:22.397390671 +0200 @@ -48,19 +48,6 @@ int power_gpio; }; @@ -111707,7 +111382,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-tegra.c linux-linaro-stable- static const struct sdhci_pltfm_data sdhci_tegra20_pdata = { diff -Nur linux-3.10.30.orig/drivers/mmc/host/sh_mmcif.c linux-linaro-stable-mx6/drivers/mmc/host/sh_mmcif.c --- linux-3.10.30.orig/drivers/mmc/host/sh_mmcif.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/host/sh_mmcif.c 2014-05-15 20:33:58.246015652 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/host/sh_mmcif.c 2014-05-16 15:28:22.397390671 +0200 @@ -1431,7 +1431,7 @@ } @@ -111719,7 +111394,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sh_mmcif.c linux-linaro-stable-mx6 } diff -Nur linux-3.10.30.orig/drivers/mmc/host/tmio_mmc_pio.c linux-linaro-stable-mx6/drivers/mmc/host/tmio_mmc_pio.c --- linux-3.10.30.orig/drivers/mmc/host/tmio_mmc_pio.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mmc/host/tmio_mmc_pio.c 2014-05-15 20:33:58.258015739 +0200 ++++ linux-linaro-stable-mx6/drivers/mmc/host/tmio_mmc_pio.c 2014-05-16 15:28:22.401390693 +0200 @@ -1091,7 +1091,7 @@ dev_pm_qos_expose_latency_limit(&pdev->dev, 100); @@ -111731,7 +111406,7 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/tmio_mmc_pio.c linux-linaro-stable return ret; diff -Nur linux-3.10.30.orig/drivers/mtd/chips/cfi_cmdset_0002.c linux-linaro-stable-mx6/drivers/mtd/chips/cfi_cmdset_0002.c --- linux-3.10.30.orig/drivers/mtd/chips/cfi_cmdset_0002.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/chips/cfi_cmdset_0002.c 2014-05-15 20:33:58.262015767 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/chips/cfi_cmdset_0002.c 2014-05-16 15:28:22.401390693 +0200 @@ -1058,17 +1058,13 @@ #define UDELAY(map, chip, adr, usec) \ @@ -111752,7 +111427,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/chips/cfi_cmdset_0002.c linux-linaro-st #endif diff -Nur linux-3.10.30.orig/drivers/mtd/inftlcore.c linux-linaro-stable-mx6/drivers/mtd/inftlcore.c --- linux-3.10.30.orig/drivers/mtd/inftlcore.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/inftlcore.c 2014-05-15 20:33:58.362016488 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/inftlcore.c 2014-05-16 15:28:22.409390734 +0200 @@ -50,7 +50,7 @@ struct INFTLrecord *inftl; unsigned long temp; @@ -111764,7 +111439,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/inftlcore.c linux-linaro-stable-mx6/dri if (memcmp(mtd->name, "DiskOnChip", 10)) diff -Nur linux-3.10.30.orig/drivers/mtd/mtdcore.c linux-linaro-stable-mx6/drivers/mtd/mtdcore.c --- linux-3.10.30.orig/drivers/mtd/mtdcore.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/mtdcore.c 2014-05-15 20:33:58.398016748 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/mtdcore.c 2014-05-16 15:28:22.417390777 +0200 @@ -157,6 +157,9 @@ case MTD_UBIVOLUME: type = "ubi"; @@ -111802,7 +111477,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/mtdcore.c linux-linaro-stable-mx6/drive }; diff -Nur linux-3.10.30.orig/drivers/mtd/mtdpart.c linux-linaro-stable-mx6/drivers/mtd/mtdpart.c --- linux-3.10.30.orig/drivers/mtd/mtdpart.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/mtdpart.c 2014-05-15 20:33:58.398016748 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/mtdpart.c 2014-05-16 15:28:22.417390777 +0200 @@ -516,6 +516,7 @@ } @@ -111813,7 +111488,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/mtdpart.c linux-linaro-stable-mx6/drive diff -Nur linux-3.10.30.orig/drivers/mtd/nand/denali.c linux-linaro-stable-mx6/drivers/mtd/nand/denali.c --- linux-3.10.30.orig/drivers/mtd/nand/denali.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/nand/denali.c 2014-05-15 20:33:58.402016777 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/nand/denali.c 2014-05-16 15:28:22.421390798 +0200 @@ -1520,7 +1520,7 @@ * so just let controller do 15bit ECC for MLC and 8bit ECC for * SLC if possible. @@ -111825,7 +111500,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/nand/denali.c linux-linaro-stable-mx6/d ECC_SECTOR_SIZE)))) { diff -Nur linux-3.10.30.orig/drivers/mtd/nand/docg4.c linux-linaro-stable-mx6/drivers/mtd/nand/docg4.c --- linux-3.10.30.orig/drivers/mtd/nand/docg4.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/nand/docg4.c 2014-05-15 20:33:58.406016805 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/nand/docg4.c 2014-05-16 15:28:22.421390798 +0200 @@ -1093,7 +1093,6 @@ struct nand_chip *nand = mtd->priv; struct docg4_priv *doc = nand->priv; @@ -111855,7 +111530,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/nand/docg4.c linux-linaro-stable-mx6/dr diff -Nur linux-3.10.30.orig/drivers/mtd/nand/fsl_elbc_nand.c linux-linaro-stable-mx6/drivers/mtd/nand/fsl_elbc_nand.c --- linux-3.10.30.orig/drivers/mtd/nand/fsl_elbc_nand.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/nand/fsl_elbc_nand.c 2014-05-15 20:33:58.406016805 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/nand/fsl_elbc_nand.c 2014-05-16 15:28:22.421390798 +0200 @@ -650,8 +650,6 @@ chip->page_shift); dev_dbg(priv->dev, "fsl_elbc_init: nand->phys_erase_shift = %d\n", @@ -111867,7 +111542,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/nand/fsl_elbc_nand.c linux-linaro-stabl dev_dbg(priv->dev, "fsl_elbc_init: nand->ecc.steps = %d\n", diff -Nur linux-3.10.30.orig/drivers/mtd/nand/fsl_ifc_nand.c linux-linaro-stable-mx6/drivers/mtd/nand/fsl_ifc_nand.c --- linux-3.10.30.orig/drivers/mtd/nand/fsl_ifc_nand.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/nand/fsl_ifc_nand.c 2014-05-15 20:33:58.422016921 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/nand/fsl_ifc_nand.c 2014-05-16 15:28:22.421390798 +0200 @@ -718,8 +718,6 @@ chip->page_shift); dev_dbg(priv->dev, "%s: nand->phys_erase_shift = %d\n", __func__, @@ -111879,7 +111554,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/nand/fsl_ifc_nand.c linux-linaro-stable dev_dbg(priv->dev, "%s: nand->ecc.steps = %d\n", __func__, diff -Nur linux-3.10.30.orig/drivers/mtd/nand/gpmi-nand/gpmi-lib.c linux-linaro-stable-mx6/drivers/mtd/nand/gpmi-nand/gpmi-lib.c --- linux-3.10.30.orig/drivers/mtd/nand/gpmi-nand/gpmi-lib.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/nand/gpmi-nand/gpmi-lib.c 2014-05-15 20:33:58.426016950 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/nand/gpmi-nand/gpmi-lib.c 2014-05-16 15:28:22.425390819 +0200 @@ -20,6 +20,7 @@ */ #include <linux/delay.h> @@ -112180,7 +111855,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/nand/gpmi-nand/gpmi-lib.c linux-linaro- set_dma_type(this, DMA_FOR_READ_ECC_PAGE); diff -Nur linux-3.10.30.orig/drivers/mtd/nand/gpmi-nand/gpmi-nand.c linux-linaro-stable-mx6/drivers/mtd/nand/gpmi-nand/gpmi-nand.c --- linux-3.10.30.orig/drivers/mtd/nand/gpmi-nand/gpmi-nand.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/nand/gpmi-nand/gpmi-nand.c 2014-05-15 20:33:58.426016950 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/nand/gpmi-nand/gpmi-nand.c 2014-05-16 15:28:22.425390819 +0200 @@ -18,15 +18,11 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @@ -113052,7 +112727,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/nand/gpmi-nand/gpmi-nand.c linux-linaro diff -Nur linux-3.10.30.orig/drivers/mtd/nand/gpmi-nand/gpmi-nand.h linux-linaro-stable-mx6/drivers/mtd/nand/gpmi-nand/gpmi-nand.h --- linux-3.10.30.orig/drivers/mtd/nand/gpmi-nand/gpmi-nand.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/nand/gpmi-nand/gpmi-nand.h 2014-05-15 20:33:58.426016950 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/nand/gpmi-nand/gpmi-nand.h 2014-05-16 15:28:22.425390819 +0200 @@ -26,8 +26,6 @@ struct resources { void __iomem *gpmi_regs; @@ -113064,7 +112739,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/nand/gpmi-nand/gpmi-nand.h linux-linaro struct clk *clock[GPMI_CLK_MAX]; diff -Nur linux-3.10.30.orig/drivers/mtd/nand/gpmi-nand/gpmi-regs.h linux-linaro-stable-mx6/drivers/mtd/nand/gpmi-nand/gpmi-regs.h --- linux-3.10.30.orig/drivers/mtd/nand/gpmi-nand/gpmi-regs.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/nand/gpmi-nand/gpmi-regs.h 2014-05-15 20:33:58.426016950 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/nand/gpmi-nand/gpmi-regs.h 2014-05-16 15:28:22.425390819 +0200 @@ -108,6 +108,9 @@ #define HW_GPMI_CTRL1_CLR 0x00000068 #define HW_GPMI_CTRL1_TOG 0x0000006c @@ -113077,7 +112752,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/nand/gpmi-nand/gpmi-regs.h linux-linaro #define BF_GPMI_CTRL1_WRN_DLY_SEL(v) \ diff -Nur linux-3.10.30.orig/drivers/mtd/nand/nand_base.c linux-linaro-stable-mx6/drivers/mtd/nand/nand_base.c --- linux-3.10.30.orig/drivers/mtd/nand/nand_base.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/nand/nand_base.c 2014-05-15 20:33:58.430016978 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/nand/nand_base.c 2014-05-16 15:28:22.425390819 +0200 @@ -108,13 +108,13 @@ int ret = 0; @@ -114021,7 +113696,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/nand/nand_base.c linux-linaro-stable-mx * scan_bbt() might invoke mtd_read(), thus bitflip_threshold must be diff -Nur linux-3.10.30.orig/drivers/mtd/nand/nand_bbt.c linux-linaro-stable-mx6/drivers/mtd/nand/nand_bbt.c --- linux-3.10.30.orig/drivers/mtd/nand/nand_bbt.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/nand/nand_bbt.c 2014-05-15 20:33:58.430016978 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/nand/nand_bbt.c 2014-05-16 15:28:22.425390819 +0200 @@ -71,6 +71,30 @@ #include <linux/export.h> #include <linux/string.h> @@ -114455,7 +114130,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/nand/nand_bbt.c linux-linaro-stable-mx6 -EXPORT_SYMBOL_GPL(nand_update_bbt); diff -Nur linux-3.10.30.orig/drivers/mtd/nand/nand_ids.c linux-linaro-stable-mx6/drivers/mtd/nand/nand_ids.c --- linux-3.10.30.orig/drivers/mtd/nand/nand_ids.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/nand/nand_ids.c 2014-05-15 20:33:58.430016978 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/nand/nand_ids.c 2014-05-16 15:28:22.425390819 +0200 @@ -33,16 +33,16 @@ */ {"TC58NVG2S0F 4G 3.3V 8-bit", @@ -114479,7 +114154,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/nand/nand_ids.c linux-linaro-stable-mx6 LEGACY_ID_NAND("NAND 4MiB 3,3V 8-bit", 0xE3, 4, SZ_8K, SP_OPTIONS), diff -Nur linux-3.10.30.orig/drivers/mtd/nand/omap2.c linux-linaro-stable-mx6/drivers/mtd/nand/omap2.c --- linux-3.10.30.orig/drivers/mtd/nand/omap2.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/nand/omap2.c 2014-05-15 20:33:58.430016978 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/nand/omap2.c 2014-05-16 15:28:22.429390840 +0200 @@ -154,7 +154,7 @@ */ static uint8_t scan_ff_pattern[] = { 0xff }; @@ -114491,7 +114166,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/nand/omap2.c linux-linaro-stable-mx6/dr .pattern = scan_ff_pattern, diff -Nur linux-3.10.30.orig/drivers/mtd/nand/sm_common.c linux-linaro-stable-mx6/drivers/mtd/nand/sm_common.c --- linux-3.10.30.orig/drivers/mtd/nand/sm_common.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/nand/sm_common.c 2014-05-15 20:33:58.434017007 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/nand/sm_common.c 2014-05-16 15:28:22.429390840 +0200 @@ -42,7 +42,7 @@ { struct mtd_oob_ops ops; @@ -114518,7 +114193,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/nand/sm_common.c linux-linaro-stable-mx static struct nand_flash_dev nand_smartmedia_flash_ids[] = { diff -Nur linux-3.10.30.orig/drivers/mtd/nftlcore.c linux-linaro-stable-mx6/drivers/mtd/nftlcore.c --- linux-3.10.30.orig/drivers/mtd/nftlcore.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/nftlcore.c 2014-05-15 20:33:58.502017497 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/nftlcore.c 2014-05-16 15:28:22.429390840 +0200 @@ -50,7 +50,7 @@ struct NFTLrecord *nftl; unsigned long temp; @@ -114530,7 +114205,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/nftlcore.c linux-linaro-stable-mx6/driv if (memcmp(mtd->name, "DiskOnChip", 10)) diff -Nur linux-3.10.30.orig/drivers/mtd/onenand/onenand_bbt.c linux-linaro-stable-mx6/drivers/mtd/onenand/onenand_bbt.c --- linux-3.10.30.orig/drivers/mtd/onenand/onenand_bbt.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/onenand/onenand_bbt.c 2014-05-15 20:33:58.538017757 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/onenand/onenand_bbt.c 2014-05-16 15:28:22.429390840 +0200 @@ -133,7 +133,6 @@ { struct onenand_chip *this = mtd->priv; @@ -114541,7 +114216,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/onenand/onenand_bbt.c linux-linaro-stab diff -Nur linux-3.10.30.orig/drivers/mtd/ssfdc.c linux-linaro-stable-mx6/drivers/mtd/ssfdc.c --- linux-3.10.30.orig/drivers/mtd/ssfdc.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/ssfdc.c 2014-05-15 20:33:58.538017757 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/ssfdc.c 2014-05-16 15:28:22.433390861 +0200 @@ -290,7 +290,7 @@ int cis_sector; @@ -114553,7 +114228,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/ssfdc.c linux-linaro-stable-mx6/drivers diff -Nur linux-3.10.30.orig/drivers/mtd/tests/Makefile linux-linaro-stable-mx6/drivers/mtd/tests/Makefile --- linux-3.10.30.orig/drivers/mtd/tests/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/tests/Makefile 2014-05-15 20:33:58.542017785 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/tests/Makefile 2014-05-16 15:28:22.433390861 +0200 @@ -7,3 +7,12 @@ obj-$(CONFIG_MTD_TESTS) += mtd_torturetest.o obj-$(CONFIG_MTD_TESTS) += mtd_nandecctest.o @@ -118051,7 +117726,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_subpagetest.c linux-linaro-st -MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_test.c linux-linaro-stable-mx6/drivers/mtd/tests/mtd_test.c --- linux-3.10.30.orig/drivers/mtd/tests/mtd_test.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/tests/mtd_test.c 2014-05-15 20:33:58.542017785 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/tests/mtd_test.c 2014-05-16 15:28:22.433390861 +0200 @@ -0,0 +1,110 @@ +#define pr_fmt(fmt) "mtd_test: " fmt + @@ -118165,7 +117840,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_test.c linux-linaro-stable-mx +} diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_test.h linux-linaro-stable-mx6/drivers/mtd/tests/mtd_test.h --- linux-3.10.30.orig/drivers/mtd/tests/mtd_test.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/tests/mtd_test.h 2014-05-15 20:33:58.542017785 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/tests/mtd_test.h 2014-05-16 15:28:22.433390861 +0200 @@ -0,0 +1,11 @@ +#include <linux/mtd/mtd.h> + @@ -118719,7 +118394,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_torturetest.c linux-linaro-st -MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/mtd/tests/nandbiterrs.c linux-linaro-stable-mx6/drivers/mtd/tests/nandbiterrs.c --- linux-3.10.30.orig/drivers/mtd/tests/nandbiterrs.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/tests/nandbiterrs.c 2014-05-15 20:33:58.542017785 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/tests/nandbiterrs.c 2014-05-16 15:28:22.433390861 +0200 @@ -0,0 +1,461 @@ +/* + * Copyright © 2012 NetCommWireless @@ -119184,7 +118859,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/nandbiterrs.c linux-linaro-stable +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/mtd/tests/oobtest.c linux-linaro-stable-mx6/drivers/mtd/tests/oobtest.c --- linux-3.10.30.orig/drivers/mtd/tests/oobtest.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/tests/oobtest.c 2014-05-15 20:33:58.542017785 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/tests/oobtest.c 2014-05-16 15:28:22.433390861 +0200 @@ -0,0 +1,714 @@ +/* + * Copyright (C) 2006-2008 Nokia Corporation @@ -119902,7 +119577,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/oobtest.c linux-linaro-stable-mx6 +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/mtd/tests/pagetest.c linux-linaro-stable-mx6/drivers/mtd/tests/pagetest.c --- linux-3.10.30.orig/drivers/mtd/tests/pagetest.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/tests/pagetest.c 2014-05-15 20:33:58.542017785 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/tests/pagetest.c 2014-05-16 15:28:22.433390861 +0200 @@ -0,0 +1,605 @@ +/* + * Copyright (C) 2006-2008 Nokia Corporation @@ -120511,7 +120186,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/pagetest.c linux-linaro-stable-mx +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/mtd/tests/readtest.c linux-linaro-stable-mx6/drivers/mtd/tests/readtest.c --- linux-3.10.30.orig/drivers/mtd/tests/readtest.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/tests/readtest.c 2014-05-15 20:33:58.542017785 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/tests/readtest.c 2014-05-16 15:28:22.433390861 +0200 @@ -0,0 +1,257 @@ +/* + * Copyright (C) 2006-2008 Nokia Corporation @@ -120772,7 +120447,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/readtest.c linux-linaro-stable-mx +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/mtd/tests/speedtest.c linux-linaro-stable-mx6/drivers/mtd/tests/speedtest.c --- linux-3.10.30.orig/drivers/mtd/tests/speedtest.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/tests/speedtest.c 2014-05-15 20:33:58.542017785 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/tests/speedtest.c 2014-05-16 15:28:22.433390861 +0200 @@ -0,0 +1,556 @@ +/* + * Copyright (C) 2007 Nokia Corporation @@ -121332,7 +121007,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/speedtest.c linux-linaro-stable-m +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/mtd/tests/stresstest.c linux-linaro-stable-mx6/drivers/mtd/tests/stresstest.c --- linux-3.10.30.orig/drivers/mtd/tests/stresstest.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/tests/stresstest.c 2014-05-15 20:33:58.542017785 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/tests/stresstest.c 2014-05-16 15:28:22.433390861 +0200 @@ -0,0 +1,321 @@ +/* + * Copyright (C) 2006-2008 Nokia Corporation @@ -121657,7 +121332,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/stresstest.c linux-linaro-stable- +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/mtd/tests/subpagetest.c linux-linaro-stable-mx6/drivers/mtd/tests/subpagetest.c --- linux-3.10.30.orig/drivers/mtd/tests/subpagetest.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/tests/subpagetest.c 2014-05-15 20:33:58.542017785 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/tests/subpagetest.c 2014-05-16 15:28:22.433390861 +0200 @@ -0,0 +1,504 @@ +/* + * Copyright (C) 2006-2007 Nokia Corporation @@ -122165,7 +121840,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/subpagetest.c linux-linaro-stable +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/mtd/tests/torturetest.c linux-linaro-stable-mx6/drivers/mtd/tests/torturetest.c --- linux-3.10.30.orig/drivers/mtd/tests/torturetest.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/tests/torturetest.c 2014-05-15 20:33:58.542017785 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/tests/torturetest.c 2014-05-16 15:28:22.433390861 +0200 @@ -0,0 +1,535 @@ +/* + * Copyright (C) 2006-2008 Artem Bityutskiy @@ -122704,7 +122379,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/torturetest.c linux-linaro-stable +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/mtd/ubi/build.c linux-linaro-stable-mx6/drivers/mtd/ubi/build.c --- linux-3.10.30.orig/drivers/mtd/ubi/build.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/ubi/build.c 2014-05-15 20:33:58.542017785 +0200 ++++ linux-linaro-stable-mx6/drivers/mtd/ubi/build.c 2014-05-16 15:28:22.433390861 +0200 @@ -638,7 +638,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)); @@ -122716,7 +122391,7 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/ubi/build.c linux-linaro-stable-mx6/dri * may have different eraseblock size and other diff -Nur linux-3.10.30.orig/drivers/mxc/asrc/Kconfig linux-linaro-stable-mx6/drivers/mxc/asrc/Kconfig --- linux-3.10.30.orig/drivers/mxc/asrc/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/asrc/Kconfig 2014-05-15 20:33:58.586018102 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/asrc/Kconfig 2014-05-16 15:28:22.437390882 +0200 @@ -0,0 +1,14 @@ +# +# ASRC configuration @@ -122734,7 +122409,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/asrc/Kconfig linux-linaro-stable-mx6/dr +endmenu diff -Nur linux-3.10.30.orig/drivers/mxc/asrc/Makefile linux-linaro-stable-mx6/drivers/mxc/asrc/Makefile --- linux-3.10.30.orig/drivers/mxc/asrc/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/asrc/Makefile 2014-05-15 20:33:58.586018102 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/asrc/Makefile 2014-05-16 15:28:22.437390882 +0200 @@ -0,0 +1,4 @@ +# +# Makefile for the kernel Asynchronous Sample Rate Converter driver @@ -122742,7 +122417,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/asrc/Makefile linux-linaro-stable-mx6/d +obj-$(CONFIG_MXC_ASRC) += mxc_asrc.o diff -Nur linux-3.10.30.orig/drivers/mxc/asrc/mxc_asrc.c linux-linaro-stable-mx6/drivers/mxc/asrc/mxc_asrc.c --- linux-3.10.30.orig/drivers/mxc/asrc/mxc_asrc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/asrc/mxc_asrc.c 2014-05-15 20:33:58.586018102 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/asrc/mxc_asrc.c 2014-05-16 15:28:22.437390882 +0200 @@ -0,0 +1,1957 @@ +/* + * Freescale Asynchronous Sample Rate Converter (ASRC) driver @@ -124703,7 +124378,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/asrc/mxc_asrc.c linux-linaro-stable-mx6 +MODULE_ALIAS("platform:mxc_asrc"); diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c --- linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c 2014-05-15 20:33:58.590018132 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c 2014-05-16 15:28:22.441390904 +0200 @@ -0,0 +1,932 @@ +/**************************************************************************** +* @@ -125639,7 +125314,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_ke + diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h 2014-05-15 20:33:58.590018132 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h 2014-05-16 15:28:22.441390904 +0200 @@ -0,0 +1,319 @@ +/**************************************************************************** +* @@ -125962,7 +125637,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_ke + diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c --- linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c 2014-05-15 20:33:58.590018132 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c 2014-05-16 15:28:22.441390904 +0200 @@ -0,0 +1,2110 @@ +/**************************************************************************** +* @@ -128076,7 +127751,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_ke + diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h 2014-05-15 20:33:58.590018132 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h 2014-05-16 15:28:22.441390904 +0200 @@ -0,0 +1,75 @@ +/**************************************************************************** +* @@ -128155,7 +127830,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_ke + diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c --- linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c 2014-05-15 20:33:58.590018132 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c 2014-05-16 15:28:22.441390904 +0200 @@ -0,0 +1,1735 @@ +/**************************************************************************** +* @@ -129894,7 +129569,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_ker + diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h 2014-05-15 20:33:58.594018160 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h 2014-05-16 15:28:22.441390904 +0200 @@ -0,0 +1,157 @@ +/**************************************************************************** +* @@ -130055,7 +129730,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_ker + diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c --- linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c 2014-05-15 20:33:58.594018160 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c 2014-05-16 15:28:22.445390925 +0200 @@ -0,0 +1,7247 @@ +/**************************************************************************** +* @@ -137306,7 +136981,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_ker + diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h 2014-05-15 20:33:58.594018160 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h 2014-05-16 15:28:22.445390925 +0200 @@ -0,0 +1,136 @@ +/**************************************************************************** +* @@ -137446,7 +137121,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_ker + diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/config linux-linaro-stable-mx6/drivers/mxc/gpu-viv/config --- linux-3.10.30.orig/drivers/mxc/gpu-viv/config 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/config 2014-05-15 20:33:58.594018160 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/config 2014-05-16 15:28:22.445390925 +0200 @@ -0,0 +1,38 @@ +############################################################################## +# @@ -137488,7 +137163,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/config linux-linaro-stable-mx6/ + diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c 2014-05-15 20:33:58.594018160 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c 2014-05-16 15:28:22.445390925 +0200 @@ -0,0 +1,3881 @@ +/**************************************************************************** +* @@ -141373,7 +141048,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c linu + diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c 2014-05-15 20:33:58.594018160 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c 2014-05-16 15:28:22.445390925 +0200 @@ -0,0 +1,3042 @@ +/**************************************************************************** +* @@ -144419,7 +144094,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_comman +#endif diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c 2014-05-15 20:33:58.594018160 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c 2014-05-16 15:28:22.445390925 +0200 @@ -0,0 +1,3677 @@ +/**************************************************************************** +* @@ -148100,7 +147775,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_comman +#endif /* gcdENABLE_VG */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c 2014-05-15 20:33:58.594018160 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c 2014-05-16 15:28:22.445390925 +0200 @@ -0,0 +1,1548 @@ +/**************************************************************************** +* @@ -149652,7 +149327,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c l +} diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c 2014-05-15 20:33:58.594018160 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c 2014-05-16 15:28:22.445390925 +0200 @@ -0,0 +1,2559 @@ +/**************************************************************************** +* @@ -152215,7 +151890,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug. +} diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c 2014-05-15 20:33:58.598018189 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c 2014-05-16 15:28:22.445390925 +0200 @@ -0,0 +1,2888 @@ +/**************************************************************************** +* @@ -155107,7 +154782,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event. +} diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h 2014-05-15 20:33:58.594018160 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h 2014-05-16 15:28:22.445390925 +0200 @@ -0,0 +1,999 @@ +/**************************************************************************** +* @@ -156110,7 +155785,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h linu +#endif /* __gc_hal_kernel_h_ */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c 2014-05-15 20:33:58.598018189 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c 2014-05-16 15:28:22.445390925 +0200 @@ -0,0 +1,859 @@ +/**************************************************************************** +* @@ -156973,7 +156648,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c + diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c 2014-05-15 20:33:58.598018189 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c 2014-05-16 15:28:22.449390945 +0200 @@ -0,0 +1,877 @@ +/**************************************************************************** +* @@ -157854,7 +157529,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interr +#endif /* gcdENABLE_VG */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c 2014-05-15 20:33:58.598018189 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c 2014-05-16 15:28:22.449390945 +0200 @@ -0,0 +1,1870 @@ +/**************************************************************************** +* @@ -159728,7 +159403,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c + diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c 2014-05-15 20:33:58.598018189 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c 2014-05-16 15:28:22.449390945 +0200 @@ -0,0 +1,522 @@ +/**************************************************************************** +* @@ -160254,7 +159929,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg +#endif /* gcdENABLE_VG */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c 2014-05-15 20:33:58.598018189 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c 2014-05-16 15:28:22.449390945 +0200 @@ -0,0 +1,347 @@ +/**************************************************************************** +* @@ -160605,7 +160280,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power. +#endif diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h 2014-05-15 20:33:58.598018189 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h 2014-05-16 15:28:22.449390945 +0200 @@ -0,0 +1,29 @@ +/**************************************************************************** +* @@ -160638,7 +160313,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precom +#endif /* __gc_hal_kernel_precomp_h_ */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c 2014-05-15 20:33:58.598018189 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c 2014-05-16 15:28:22.449390945 +0200 @@ -0,0 +1,893 @@ +/**************************************************************************** +* @@ -161535,7 +161210,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c l +#endif /* gcdENABLE_VG */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h 2014-05-15 20:33:58.598018189 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h 2014-05-16 15:28:22.449390945 +0200 @@ -0,0 +1,85 @@ +/**************************************************************************** +* @@ -161624,7 +161299,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h l +#endif /* __gc_hal_kernel_h_ */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c 2014-05-15 20:33:58.606018247 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c 2014-05-16 15:28:22.449390945 +0200 @@ -0,0 +1,2249 @@ +/**************************************************************************** +* @@ -163877,7 +163552,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_ +} diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h 2014-05-15 20:33:58.610018275 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h 2014-05-16 15:28:22.449390945 +0200 @@ -0,0 +1,3896 @@ +/**************************************************************************** +* @@ -167777,7 +167452,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h li +#endif /* __gc_hal_base_h_ */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h 2014-05-15 20:33:58.610018275 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h 2014-05-16 15:28:22.449390945 +0200 @@ -0,0 +1,4278 @@ +/**************************************************************************** +* @@ -172059,7 +171734,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler. +#endif /* __gc_hal_compiler_h_ */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h 2014-05-15 20:33:58.610018275 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h 2014-05-16 15:28:22.449390945 +0200 @@ -0,0 +1,1028 @@ +/**************************************************************************** +* @@ -173091,7 +172766,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h +#endif /* __gc_hal_driver_h_ */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h 2014-05-15 20:33:58.610018275 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h 2014-05-16 15:28:22.449390945 +0200 @@ -0,0 +1,270 @@ +/**************************************************************************** +* @@ -173365,7 +173040,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg +#endif /* __gc_hal_driver_h_ */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h 2014-05-15 20:33:58.610018275 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h 2014-05-16 15:28:22.449390945 +0200 @@ -0,0 +1,88 @@ +/**************************************************************************** +* @@ -173457,7 +173132,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h li + diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h 2014-05-15 20:33:58.610018275 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h 2014-05-16 15:28:22.449390945 +0200 @@ -0,0 +1,617 @@ +/**************************************************************************** +* @@ -174078,7 +173753,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatfo +#endif /* __gc_hal_eglplatform_h_ */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h 2014-05-15 20:33:58.634018448 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h 2014-05-16 15:28:22.449390945 +0200 @@ -0,0 +1,286 @@ +/**************************************************************************** +* @@ -174368,7 +174043,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatfo +#endif /* __gc_hal_eglplatform_type_h_ */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h 2014-05-15 20:33:58.634018448 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h 2014-05-16 15:28:22.449390945 +0200 @@ -0,0 +1,2053 @@ +/**************************************************************************** +* @@ -176425,7 +176100,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h +#endif /* __gc_hal_engine_h_ */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h 2014-05-15 20:33:58.646018535 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h 2014-05-16 15:28:22.449390945 +0200 @@ -0,0 +1,904 @@ +/**************************************************************************** +* @@ -177333,7 +177008,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg +#endif /* __gc_hal_vg_h_ */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h 2014-05-15 20:33:58.646018535 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h 2014-05-16 15:28:22.449390945 +0200 @@ -0,0 +1,962 @@ +/**************************************************************************** +* @@ -178299,7 +177974,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h li +#endif /* __gc_hal_enum_h_ */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h 2014-05-15 20:33:58.606018247 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h 2014-05-16 15:28:22.449390945 +0200 @@ -0,0 +1,2652 @@ +/**************************************************************************** +* @@ -180955,7 +180630,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h linux-l +#endif /* __gc_hal_h_ */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h 2014-05-15 20:33:58.646018535 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h 2014-05-16 15:28:22.449390945 +0200 @@ -0,0 +1,185 @@ +/**************************************************************************** +* @@ -181144,7 +180819,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_bu +#endif /* __gc_hal_kernel_buffer_h_ */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h 2014-05-15 20:33:58.646018535 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h 2014-05-16 15:28:22.449390945 +0200 @@ -0,0 +1,530 @@ +/**************************************************************************** +* @@ -181678,7 +181353,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h lin +#endif /* __gc_hal_mem_h_ */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h 2014-05-15 20:33:58.646018535 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h 2014-05-16 15:28:22.449390945 +0200 @@ -0,0 +1,947 @@ +/**************************************************************************** +* @@ -182629,7 +182304,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h +#endif /* __gc_hal_options_h_ */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h 2014-05-15 20:33:58.646018535 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h 2014-05-16 15:28:22.449390945 +0200 @@ -0,0 +1,584 @@ +/**************************************************************************** +* @@ -183217,7 +182892,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler. +#endif /* __gc_hal_profiler_h_ */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h 2014-05-15 20:33:58.646018535 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h 2014-05-16 15:28:22.453390966 +0200 @@ -0,0 +1,1010 @@ +/**************************************************************************** +* @@ -184231,7 +183906,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h +#endif /* __gc_hal_raster_h_ */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h 2014-05-15 20:33:58.646018535 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h 2014-05-16 15:28:22.453390966 +0200 @@ -0,0 +1,248 @@ +/**************************************************************************** +* @@ -184483,7 +184158,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h +#endif /* __gc_hal_rename_h_ */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h 2014-05-15 20:33:58.646018535 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h 2014-05-16 15:28:22.453390966 +0200 @@ -0,0 +1,115 @@ +/**************************************************************************** +* @@ -184602,7 +184277,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistic + diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h 2014-05-15 20:33:58.646018535 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h 2014-05-16 15:28:22.453390966 +0200 @@ -0,0 +1,1079 @@ +/**************************************************************************** +* @@ -185685,7 +185360,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h l +#endif /* __gc_hal_types_h_ */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h 2014-05-15 20:33:58.646018535 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h 2014-05-16 15:28:22.453390966 +0200 @@ -0,0 +1,37 @@ +/**************************************************************************** +* @@ -185726,7 +185401,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h +#endif /* __gc_hal_version_h_ */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h 2014-05-15 20:33:58.646018535 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h 2014-05-16 15:28:22.453390966 +0200 @@ -0,0 +1,913 @@ +/**************************************************************************** +* @@ -186643,7 +186318,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h linu +#endif /* __gc_hal_h_ */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c 2014-05-15 20:33:58.650018564 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c 2014-05-16 15:28:22.453390966 +0200 @@ -0,0 +1,795 @@ +/**************************************************************************** +* @@ -187442,7 +187117,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern +} diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h 2014-05-15 20:33:58.650018564 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h 2014-05-16 15:28:22.453390966 +0200 @@ -0,0 +1,84 @@ +/**************************************************************************** +* @@ -187530,7 +187205,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern + diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h 2014-05-15 20:33:58.650018564 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h 2014-05-16 15:28:22.453390966 +0200 @@ -0,0 +1,102 @@ +/**************************************************************************** +* @@ -187636,7 +187311,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern +#endif /* __gc_hal_kernel_debug_h_ */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c 2014-05-15 20:33:58.650018564 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c 2014-05-16 15:28:22.453390966 +0200 @@ -0,0 +1,1652 @@ +/**************************************************************************** +* @@ -189292,7 +188967,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern +} diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h 2014-05-15 20:33:58.650018564 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h 2014-05-16 15:28:22.453390966 +0200 @@ -0,0 +1,172 @@ +/**************************************************************************** +* @@ -189468,7 +189143,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern +#endif /* __gc_hal_kernel_device_h_ */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c 2014-05-15 20:33:58.650018564 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c 2014-05-16 15:28:22.453390966 +0200 @@ -0,0 +1,1472 @@ +/**************************************************************************** +* @@ -190944,7 +190619,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern +#endif diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c 2014-05-15 20:33:58.650018564 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c 2014-05-16 15:28:22.453390966 +0200 @@ -0,0 +1,481 @@ +/**************************************************************************** +* @@ -191429,7 +191104,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern +} diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h 2014-05-15 20:33:58.650018564 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h 2014-05-16 15:28:22.453390966 +0200 @@ -0,0 +1,94 @@ +/**************************************************************************** +* @@ -191527,7 +191202,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern +#endif /* __gc_hal_kernel_linux_h_ */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c 2014-05-15 20:33:58.650018564 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c 2014-05-16 15:28:22.453390966 +0200 @@ -0,0 +1,32 @@ +/**************************************************************************** +* @@ -191563,7 +191238,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern +} diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c 2014-05-15 20:33:58.650018564 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c 2014-05-16 15:28:22.453390966 +0200 @@ -0,0 +1,9022 @@ +/**************************************************************************** +* @@ -200589,7 +200264,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern +#endif diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h 2014-05-15 20:33:58.650018564 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h 2014-05-16 15:28:22.453390966 +0200 @@ -0,0 +1,83 @@ +/**************************************************************************** +* @@ -200676,7 +200351,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern +#endif /* __gc_hal_kernel_os_h_ */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c 2014-05-15 20:33:58.650018564 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c 2014-05-16 15:28:22.453390966 +0200 @@ -0,0 +1,174 @@ +/**************************************************************************** +* @@ -200854,7 +200529,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern +#endif diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h --- linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h 2014-05-15 20:33:58.650018564 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h 2014-05-16 15:28:22.453390966 +0200 @@ -0,0 +1,71 @@ +/**************************************************************************** +* @@ -200929,7 +200604,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern +#endif /* __gc_hal_kernel_sync_h_ */ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/Kbuild linux-linaro-stable-mx6/drivers/mxc/gpu-viv/Kbuild --- linux-3.10.30.orig/drivers/mxc/gpu-viv/Kbuild 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/Kbuild 2014-05-15 20:33:58.586018102 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/Kbuild 2014-05-16 15:28:22.441390904 +0200 @@ -0,0 +1,236 @@ +############################################################################## +# @@ -201169,7 +200844,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/Kbuild linux-linaro-stable-mx6/ +endif diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/Kconfig linux-linaro-stable-mx6/drivers/mxc/gpu-viv/Kconfig --- linux-3.10.30.orig/drivers/mxc/gpu-viv/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/Kconfig 2014-05-15 20:33:58.586018102 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/gpu-viv/Kconfig 2014-05-16 15:28:22.441390904 +0200 @@ -0,0 +1,9 @@ +menu "MXC Vivante GPU support" + depends on SOC_IMX6Q @@ -201182,7 +200857,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/Kconfig linux-linaro-stable-mx6 +endmenu diff -Nur linux-3.10.30.orig/drivers/mxc/hdmi-cec/Kconfig linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/Kconfig --- linux-3.10.30.orig/drivers/mxc/hdmi-cec/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/Kconfig 2014-05-15 20:33:58.650018564 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/Kconfig 2014-05-16 15:28:22.453390966 +0200 @@ -0,0 +1,11 @@ + +menu "MXC HDMI CEC (Consumer Electronics Control) support" @@ -201197,12 +200872,12 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/hdmi-cec/Kconfig linux-linaro-stable-mx +endmenu diff -Nur linux-3.10.30.orig/drivers/mxc/hdmi-cec/Makefile linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/Makefile --- linux-3.10.30.orig/drivers/mxc/hdmi-cec/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/Makefile 2014-05-15 20:33:58.650018564 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/Makefile 2014-05-16 15:28:22.457390988 +0200 @@ -0,0 +1 @@ +obj-$(CONFIG_MXC_HDMI_CEC) += mxc_hdmi-cec.o diff -Nur linux-3.10.30.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c --- linux-3.10.30.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c 2014-05-15 20:33:58.650018564 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c 2014-05-16 15:28:22.457390988 +0200 @@ -0,0 +1,608 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -201814,7 +201489,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c linux-linaro-st + diff -Nur linux-3.10.30.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h --- linux-3.10.30.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h 2014-05-15 20:33:58.650018564 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h 2014-05-16 15:28:22.457390988 +0200 @@ -0,0 +1,38 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -201856,7 +201531,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h linux-linaro-st +#endif /* !_HDMICEC_H_ */ diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c --- linux-3.10.30.orig/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c 2014-05-15 20:33:58.654018592 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c 2014-05-16 15:28:22.457390988 +0200 @@ -0,0 +1,491 @@ +/* + * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -202351,7 +202026,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c linux-lin +EXPORT_SYMBOL(ipu_calc_stripes_sizes); diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_capture.c linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_capture.c --- linux-3.10.30.orig/drivers/mxc/ipu3/ipu_capture.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_capture.c 2014-05-15 20:33:58.654018592 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_capture.c 2014-05-16 15:28:22.457390988 +0200 @@ -0,0 +1,819 @@ +/* + * Copyright 2008-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -203174,7 +202849,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_capture.c linux-linaro-stable- +} diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_common.c linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_common.c --- linux-3.10.30.orig/drivers/mxc/ipu3/ipu_common.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_common.c 2014-05-15 20:33:58.654018592 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_common.c 2014-05-16 15:28:22.457390988 +0200 @@ -0,0 +1,3134 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -206312,7 +205987,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_common.c linux-linaro-stable-m +module_exit(ipu_gen_uninit); diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_device.c linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_device.c --- linux-3.10.30.orig/drivers/mxc/ipu3/ipu_device.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_device.c 2014-05-15 20:33:58.654018592 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_device.c 2014-05-16 15:28:22.457390988 +0200 @@ -0,0 +1,3690 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -210006,7 +209681,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_device.c linux-linaro-stable-m +} diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_disp.c linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_disp.c --- linux-3.10.30.orig/drivers/mxc/ipu3/ipu_disp.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_disp.c 2014-05-15 20:33:58.654018592 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_disp.c 2014-05-16 15:28:22.457390988 +0200 @@ -0,0 +1,1962 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -211972,7 +211647,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_disp.c linux-linaro-stable-mx6 +} diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_ic.c linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_ic.c --- linux-3.10.30.orig/drivers/mxc/ipu3/ipu_ic.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_ic.c 2014-05-15 20:33:58.654018592 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_ic.c 2014-05-16 15:28:22.457390988 +0200 @@ -0,0 +1,924 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -212900,7 +212575,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_ic.c linux-linaro-stable-mx6/d +} diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_param_mem.h linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_param_mem.h --- linux-3.10.30.orig/drivers/mxc/ipu3/ipu_param_mem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_param_mem.h 2014-05-15 20:33:58.654018592 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_param_mem.h 2014-05-16 15:28:22.457390988 +0200 @@ -0,0 +1,921 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -213825,7 +213500,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_param_mem.h linux-linaro-stabl +#endif diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_pixel_clk.c linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_pixel_clk.c --- linux-3.10.30.orig/drivers/mxc/ipu3/ipu_pixel_clk.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_pixel_clk.c 2014-05-15 20:33:58.654018592 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_pixel_clk.c 2014-05-16 15:28:22.457390988 +0200 @@ -0,0 +1,317 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -214146,7 +213821,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_pixel_clk.c linux-linaro-stabl +} diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_prv.h linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_prv.h --- linux-3.10.30.orig/drivers/mxc/ipu3/ipu_prv.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_prv.h 2014-05-15 20:33:58.654018592 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_prv.h 2014-05-16 15:28:22.457390988 +0200 @@ -0,0 +1,356 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -214506,7 +214181,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_prv.h linux-linaro-stable-mx6/ +#endif /* __INCLUDE_IPU_PRV_H__ */ diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_regs.h linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_regs.h --- linux-3.10.30.orig/drivers/mxc/ipu3/ipu_regs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_regs.h 2014-05-15 20:33:58.654018592 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_regs.h 2014-05-16 15:28:22.457390988 +0200 @@ -0,0 +1,719 @@ +/* + * Copyright (C) 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -215229,13 +214904,13 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_regs.h linux-linaro-stable-mx6 +#endif diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/Kconfig linux-linaro-stable-mx6/drivers/mxc/ipu3/Kconfig --- linux-3.10.30.orig/drivers/mxc/ipu3/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/Kconfig 2014-05-15 20:33:58.654018592 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/ipu3/Kconfig 2014-05-16 15:28:22.457390988 +0200 @@ -0,0 +1,2 @@ +config MXC_IPU_V3 + bool diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/Makefile linux-linaro-stable-mx6/drivers/mxc/ipu3/Makefile --- linux-3.10.30.orig/drivers/mxc/ipu3/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/Makefile 2014-05-15 20:33:58.654018592 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/ipu3/Makefile 2014-05-16 15:28:22.457390988 +0200 @@ -0,0 +1,4 @@ +obj-$(CONFIG_MXC_IPU_V3) = mxc_ipu.o + @@ -215243,7 +214918,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/Makefile linux-linaro-stable-mx6/d + ipu_calc_stripes_sizes.o vdoa.o ipu_pixel_clk.o diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/vdoa.c linux-linaro-stable-mx6/drivers/mxc/ipu3/vdoa.c --- linux-3.10.30.orig/drivers/mxc/ipu3/vdoa.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/vdoa.c 2014-05-15 20:33:58.654018592 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/ipu3/vdoa.c 2014-05-16 15:28:22.457390988 +0200 @@ -0,0 +1,543 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -215790,7 +215465,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/vdoa.c linux-linaro-stable-mx6/dri +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/vdoa.h linux-linaro-stable-mx6/drivers/mxc/ipu3/vdoa.h --- linux-3.10.30.orig/drivers/mxc/ipu3/vdoa.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/ipu3/vdoa.h 2014-05-15 20:33:58.654018592 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/ipu3/vdoa.h 2014-05-16 15:28:22.457390988 +0200 @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -215863,7 +215538,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/vdoa.h linux-linaro-stable-mx6/dri +#endif diff -Nur linux-3.10.30.orig/drivers/mxc/Kconfig linux-linaro-stable-mx6/drivers/mxc/Kconfig --- linux-3.10.30.orig/drivers/mxc/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/Kconfig 2014-05-15 20:33:58.586018102 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/Kconfig 2014-05-16 15:28:22.437390882 +0200 @@ -0,0 +1,24 @@ +# drivers/mxc/Kconfig + @@ -215891,7 +215566,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/Kconfig linux-linaro-stable-mx6/drivers +endif diff -Nur linux-3.10.30.orig/drivers/mxc/Makefile linux-linaro-stable-mx6/drivers/mxc/Makefile --- linux-3.10.30.orig/drivers/mxc/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/Makefile 2014-05-15 20:33:58.586018102 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/Makefile 2014-05-16 15:28:22.437390882 +0200 @@ -0,0 +1,7 @@ +obj-$(CONFIG_MXC_GPU_VIV) += gpu-viv/ +obj-$(CONFIG_MXC_IPU_V3) += ipu3/ @@ -215902,7 +215577,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/Makefile linux-linaro-stable-mx6/driver +obj-$(CONFIG_MXC_MLB) += mlb/ diff -Nur linux-3.10.30.orig/drivers/mxc/mipi/Kconfig linux-linaro-stable-mx6/drivers/mxc/mipi/Kconfig --- linux-3.10.30.orig/drivers/mxc/mipi/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/mipi/Kconfig 2014-05-15 20:33:58.658018622 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/mipi/Kconfig 2014-05-16 15:28:22.457390988 +0200 @@ -0,0 +1,14 @@ +# +# MIPI configuration @@ -215920,7 +215595,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/mipi/Kconfig linux-linaro-stable-mx6/dr +endmenu diff -Nur linux-3.10.30.orig/drivers/mxc/mipi/Makefile linux-linaro-stable-mx6/drivers/mxc/mipi/Makefile --- linux-3.10.30.orig/drivers/mxc/mipi/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/mipi/Makefile 2014-05-15 20:33:58.658018622 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/mipi/Makefile 2014-05-16 15:28:22.457390988 +0200 @@ -0,0 +1,4 @@ +# +# Makefile for the mipi interface driver @@ -215928,7 +215603,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/mipi/Makefile linux-linaro-stable-mx6/d +obj-$(CONFIG_MXC_MIPI_CSI2) += mxc_mipi_csi2.o diff -Nur linux-3.10.30.orig/drivers/mxc/mipi/mxc_mipi_csi2.c linux-linaro-stable-mx6/drivers/mxc/mipi/mxc_mipi_csi2.c --- linux-3.10.30.orig/drivers/mxc/mipi/mxc_mipi_csi2.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/mipi/mxc_mipi_csi2.c 2014-05-15 20:33:58.658018622 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/mipi/mxc_mipi_csi2.c 2014-05-16 15:28:22.457390988 +0200 @@ -0,0 +1,531 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -216463,7 +216138,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/mipi/mxc_mipi_csi2.c linux-linaro-stabl +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/mxc/mipi/mxc_mipi_csi2.h linux-linaro-stable-mx6/drivers/mxc/mipi/mxc_mipi_csi2.h --- linux-3.10.30.orig/drivers/mxc/mipi/mxc_mipi_csi2.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/mipi/mxc_mipi_csi2.h 2014-05-15 20:33:58.658018622 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/mipi/mxc_mipi_csi2.h 2014-05-16 15:28:22.457390988 +0200 @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -216512,7 +216187,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/mipi/mxc_mipi_csi2.h linux-linaro-stabl +#endif diff -Nur linux-3.10.30.orig/drivers/mxc/mlb/Kconfig linux-linaro-stable-mx6/drivers/mxc/mlb/Kconfig --- linux-3.10.30.orig/drivers/mxc/mlb/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/mlb/Kconfig 2014-05-15 20:33:58.658018622 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/mlb/Kconfig 2014-05-16 15:28:22.457390988 +0200 @@ -0,0 +1,17 @@ +# +# MLB150 configuration @@ -216533,7 +216208,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/mlb/Kconfig linux-linaro-stable-mx6/dri +endmenu diff -Nur linux-3.10.30.orig/drivers/mxc/mlb/Makefile linux-linaro-stable-mx6/drivers/mxc/mlb/Makefile --- linux-3.10.30.orig/drivers/mxc/mlb/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/mlb/Makefile 2014-05-15 20:33:58.658018622 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/mlb/Makefile 2014-05-16 15:28:22.461391009 +0200 @@ -0,0 +1,5 @@ +# +# Makefile for the i.MX6Q/DL MLB150 driver @@ -216542,7 +216217,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/mlb/Makefile linux-linaro-stable-mx6/dr +obj-$(CONFIG_MXC_MLB150) += mxc_mlb150.o diff -Nur linux-3.10.30.orig/drivers/mxc/mlb/mxc_mlb150.c linux-linaro-stable-mx6/drivers/mxc/mlb/mxc_mlb150.c --- linux-3.10.30.orig/drivers/mxc/mlb/mxc_mlb150.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/mlb/mxc_mlb150.c 2014-05-15 20:33:58.658018622 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/mlb/mxc_mlb150.c 2014-05-16 15:28:22.461391009 +0200 @@ -0,0 +1,2778 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -219324,7 +218999,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/mlb/mxc_mlb150.c linux-linaro-stable-mx +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/mxc/vpu/Kconfig linux-linaro-stable-mx6/drivers/mxc/vpu/Kconfig --- linux-3.10.30.orig/drivers/mxc/vpu/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/vpu/Kconfig 2014-05-15 20:33:58.658018622 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/vpu/Kconfig 2014-05-16 15:28:22.461391009 +0200 @@ -0,0 +1,31 @@ +# +# Codec configuration @@ -219359,7 +219034,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/vpu/Kconfig linux-linaro-stable-mx6/dri +endmenu diff -Nur linux-3.10.30.orig/drivers/mxc/vpu/Makefile linux-linaro-stable-mx6/drivers/mxc/vpu/Makefile --- linux-3.10.30.orig/drivers/mxc/vpu/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/vpu/Makefile 2014-05-15 20:33:58.658018622 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/vpu/Makefile 2014-05-16 15:28:22.461391009 +0200 @@ -0,0 +1,9 @@ +# +# Makefile for the VPU drivers. @@ -219372,7 +219047,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/vpu/Makefile linux-linaro-stable-mx6/dr +endif diff -Nur linux-3.10.30.orig/drivers/mxc/vpu/mxc_vpu.c linux-linaro-stable-mx6/drivers/mxc/vpu/mxc_vpu.c --- linux-3.10.30.orig/drivers/mxc/vpu/mxc_vpu.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mxc/vpu/mxc_vpu.c 2014-05-15 20:33:58.658018622 +0200 ++++ linux-linaro-stable-mx6/drivers/mxc/vpu/mxc_vpu.c 2014-05-16 15:28:22.461391009 +0200 @@ -0,0 +1,1342 @@ +/* + * Copyright 2006-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -220718,7 +220393,7 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/vpu/mxc_vpu.c linux-linaro-stable-mx6/d +module_exit(vpu_exit); diff -Nur linux-3.10.30.orig/drivers/net/can/flexcan.c linux-linaro-stable-mx6/drivers/net/can/flexcan.c --- linux-3.10.30.orig/drivers/net/can/flexcan.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/can/flexcan.c 2014-05-15 20:33:58.714019025 +0200 ++++ linux-linaro-stable-mx6/drivers/net/can/flexcan.c 2014-05-16 15:28:22.473391072 +0200 @@ -33,11 +33,14 @@ #include <linux/io.h> #include <linux/kernel.h> @@ -220939,7 +220614,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/can/flexcan.c linux-linaro-stable-mx6/d } diff -Nur linux-3.10.30.orig/drivers/net/ethernet/8390/ne.c linux-linaro-stable-mx6/drivers/net/ethernet/8390/ne.c --- linux-3.10.30.orig/drivers/net/ethernet/8390/ne.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/8390/ne.c 2014-05-15 20:33:58.822019803 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/8390/ne.c 2014-05-16 15:28:22.489391156 +0200 @@ -849,7 +849,6 @@ free_irq(dev->irq, dev); release_region(dev->base_addr, NE_IO_EXTENT); @@ -220950,7 +220625,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/8390/ne.c linux-linaro-stable- } diff -Nur linux-3.10.30.orig/drivers/net/ethernet/adi/bfin_mac.c linux-linaro-stable-mx6/drivers/net/ethernet/adi/bfin_mac.c --- linux-3.10.30.orig/drivers/net/ethernet/adi/bfin_mac.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/adi/bfin_mac.c 2014-05-15 20:33:58.826019832 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/adi/bfin_mac.c 2014-05-16 15:28:22.489391156 +0200 @@ -1719,7 +1719,6 @@ mdiobus_unregister(lp->mii_bus); mdiobus_free(lp->mii_bus); @@ -220978,7 +220653,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/adi/bfin_mac.c linux-linaro-st mdiobus_free(miibus); diff -Nur linux-3.10.30.orig/drivers/net/ethernet/amd/au1000_eth.c linux-linaro-stable-mx6/drivers/net/ethernet/amd/au1000_eth.c --- linux-3.10.30.orig/drivers/net/ethernet/amd/au1000_eth.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/amd/au1000_eth.c 2014-05-15 20:33:58.830019861 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/amd/au1000_eth.c 2014-05-16 15:28:22.493391177 +0200 @@ -1301,8 +1301,6 @@ int i; struct resource *base, *macen; @@ -220990,7 +220665,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/amd/au1000_eth.c linux-linaro- mdiobus_free(aup->mii_bus); diff -Nur linux-3.10.30.orig/drivers/net/ethernet/broadcom/bcm63xx_enet.c linux-linaro-stable-mx6/drivers/net/ethernet/broadcom/bcm63xx_enet.c --- linux-3.10.30.orig/drivers/net/ethernet/broadcom/bcm63xx_enet.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/broadcom/bcm63xx_enet.c 2014-05-15 20:33:58.942020668 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/broadcom/bcm63xx_enet.c 2014-05-16 15:28:22.505391241 +0200 @@ -1847,7 +1847,6 @@ clk_disable_unprepare(priv->mac_clk); clk_put(priv->mac_clk); @@ -221001,7 +220676,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/broadcom/bcm63xx_enet.c linux- } diff -Nur linux-3.10.30.orig/drivers/net/ethernet/cadence/at91_ether.c linux-linaro-stable-mx6/drivers/net/ethernet/cadence/at91_ether.c --- linux-3.10.30.orig/drivers/net/ethernet/cadence/at91_ether.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/cadence/at91_ether.c 2014-05-15 20:33:59.062021532 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/cadence/at91_ether.c 2014-05-16 15:28:22.537391409 +0200 @@ -435,7 +435,6 @@ unregister_netdev(dev); clk_disable(lp->pclk); @@ -221012,7 +220687,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/cadence/at91_ether.c linux-lin } diff -Nur linux-3.10.30.orig/drivers/net/ethernet/cadence/macb.c linux-linaro-stable-mx6/drivers/net/ethernet/cadence/macb.c --- linux-3.10.30.orig/drivers/net/ethernet/cadence/macb.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/cadence/macb.c 2014-05-15 20:33:59.062021532 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/cadence/macb.c 2014-05-16 15:28:22.537391409 +0200 @@ -1649,7 +1649,6 @@ err_out_free_dev: free_netdev(dev); @@ -221031,7 +220706,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/cadence/macb.c linux-linaro-st return 0; diff -Nur linux-3.10.30.orig/drivers/net/ethernet/calxeda/xgmac.c linux-linaro-stable-mx6/drivers/net/ethernet/calxeda/xgmac.c --- linux-3.10.30.orig/drivers/net/ethernet/calxeda/xgmac.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/calxeda/xgmac.c 2014-05-15 20:33:59.062021532 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/calxeda/xgmac.c 2014-05-16 15:28:22.537391409 +0200 @@ -1790,7 +1790,6 @@ free_netdev(ndev); err_alloc: @@ -221050,7 +220725,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/calxeda/xgmac.c linux-linaro-s diff -Nur linux-3.10.30.orig/drivers/net/ethernet/cirrus/ep93xx_eth.c linux-linaro-stable-mx6/drivers/net/ethernet/cirrus/ep93xx_eth.c --- linux-3.10.30.orig/drivers/net/ethernet/cirrus/ep93xx_eth.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/cirrus/ep93xx_eth.c 2014-05-15 20:33:59.178022369 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/cirrus/ep93xx_eth.c 2014-05-16 15:28:22.553391494 +0200 @@ -783,7 +783,6 @@ dev = platform_get_drvdata(pdev); if (dev == NULL) @@ -221061,7 +220736,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/cirrus/ep93xx_eth.c linux-lina diff -Nur linux-3.10.30.orig/drivers/net/ethernet/davicom/dm9000.c linux-linaro-stable-mx6/drivers/net/ethernet/davicom/dm9000.c --- linux-3.10.30.orig/drivers/net/ethernet/davicom/dm9000.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/davicom/dm9000.c 2014-05-15 20:33:59.186022426 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/davicom/dm9000.c 2014-05-16 15:28:22.557391515 +0200 @@ -1673,8 +1673,6 @@ { struct net_device *ndev = platform_get_drvdata(pdev); @@ -221073,7 +220748,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/davicom/dm9000.c linux-linaro- free_netdev(ndev); /* free device structure */ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/ethoc.c linux-linaro-stable-mx6/drivers/net/ethernet/ethoc.c --- linux-3.10.30.orig/drivers/net/ethernet/ethoc.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/ethoc.c 2014-05-15 20:33:59.206022570 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/ethoc.c 2014-05-16 15:28:22.569391578 +0200 @@ -1147,8 +1147,6 @@ struct net_device *netdev = platform_get_drvdata(pdev); struct ethoc *priv = netdev_priv(netdev); @@ -221085,7 +220760,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/ethoc.c linux-linaro-stable-mx phy_disconnect(priv->phy); diff -Nur linux-3.10.30.orig/drivers/net/ethernet/faraday/ftgmac100.c linux-linaro-stable-mx6/drivers/net/ethernet/faraday/ftgmac100.c --- linux-3.10.30.orig/drivers/net/ethernet/faraday/ftgmac100.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/faraday/ftgmac100.c 2014-05-15 20:33:59.218022657 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/faraday/ftgmac100.c 2014-05-16 15:28:22.569391578 +0200 @@ -1311,7 +1311,6 @@ release_resource(priv->res); err_req_mem: @@ -221104,7 +220779,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/faraday/ftgmac100.c linux-lina } diff -Nur linux-3.10.30.orig/drivers/net/ethernet/faraday/ftmac100.c linux-linaro-stable-mx6/drivers/net/ethernet/faraday/ftmac100.c --- linux-3.10.30.orig/drivers/net/ethernet/faraday/ftmac100.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/faraday/ftmac100.c 2014-05-15 20:33:59.218022657 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/faraday/ftmac100.c 2014-05-16 15:28:22.569391578 +0200 @@ -1149,7 +1149,6 @@ release_resource(priv->res); err_req_mem: @@ -221123,7 +220798,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/faraday/ftmac100.c linux-linar } diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fec.h linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec.h --- linux-3.10.30.orig/drivers/net/ethernet/freescale/fec.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec.h 2014-05-15 20:33:59.242022829 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec.h 2014-05-16 15:28:22.573391599 +0200 @@ -16,6 +16,9 @@ #include <linux/clocksource.h> #include <linux/net_tstamp.h> @@ -221385,7 +221060,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fec.h linux-linaro-s #endif /* FEC_H */ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fec_main.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec_main.c --- linux-3.10.30.orig/drivers/net/ethernet/freescale/fec_main.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec_main.c 2014-05-15 20:33:59.278023090 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec_main.c 2014-05-16 15:28:22.573391599 +0200 @@ -18,7 +18,7 @@ * Bug fixes and cleanup by Philippe De Muyter (phdm@macqel.be) * Copyright (c) 2004-2006 Macq Electronique SA. @@ -222827,7 +222502,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fec_main.c linux-lin MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fec_mpc52xx.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec_mpc52xx.c --- linux-3.10.30.orig/drivers/net/ethernet/freescale/fec_mpc52xx.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec_mpc52xx.c 2014-05-15 20:33:59.278023090 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec_mpc52xx.c 2014-05-16 15:28:22.573391599 +0200 @@ -981,7 +981,7 @@ goto err_node; @@ -222873,7 +222548,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fec_mpc52xx.c linux- mpc52xx_fec_reset_stats(dev); diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c --- linux-3.10.30.orig/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c 2014-05-15 20:33:59.278023090 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c 2014-05-16 15:28:22.573391599 +0200 @@ -123,12 +123,10 @@ static int mpc52xx_fec_mdio_remove(struct platform_device *of) @@ -222890,7 +222565,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c li mdiobus_free(bus); diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fec_ptp.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec_ptp.c --- linux-3.10.30.orig/drivers/net/ethernet/freescale/fec_ptp.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec_ptp.c 2014-05-15 20:33:59.278023090 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec_ptp.c 2014-05-16 15:28:22.573391599 +0200 @@ -1,7 +1,7 @@ /* * Fast Ethernet Controller (ENET) PTP driver for MX6x. @@ -223634,7 +223309,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fec_ptp.c linux-lina + diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c --- linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c 2014-05-15 20:33:59.282023118 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c 2014-05-16 15:28:22.573391599 +0200 @@ -583,7 +583,6 @@ struct sk_buff *skb) { @@ -223723,7 +223398,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/fs_enet-main } diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/Kconfig linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/Kconfig --- linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/Kconfig 2014-05-15 20:33:59.282023118 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/Kconfig 2014-05-16 15:28:22.573391599 +0200 @@ -1,7 +1,6 @@ config FS_ENET tristate "Freescale Ethernet Driver" @@ -223734,7 +223409,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/Kconfig linu diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c --- linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c 2014-05-15 20:33:59.282023118 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c 2014-05-16 15:28:22.573391599 +0200 @@ -32,7 +32,9 @@ #include <linux/fs.h> #include <linux/platform_device.h> @@ -223756,7 +223431,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c li diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/mac-fec.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/mac-fec.c --- linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/mac-fec.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/mac-fec.c 2014-05-15 20:33:59.282023118 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/mac-fec.c 2014-05-16 15:28:22.573391599 +0200 @@ -31,7 +31,9 @@ #include <linux/bitops.h> #include <linux/fs.h> @@ -223778,7 +223453,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/mac-fec.c li diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/mac-scc.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/mac-scc.c --- linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/mac-scc.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/mac-scc.c 2014-05-15 20:33:59.282023118 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/mac-scc.c 2014-05-16 15:28:22.573391599 +0200 @@ -31,6 +31,8 @@ #include <linux/bitops.h> #include <linux/fs.h> @@ -223799,7 +223474,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/mac-scc.c li diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c --- linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c 2014-05-15 20:33:59.282023118 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c 2014-05-16 15:28:22.573391599 +0200 @@ -22,6 +22,7 @@ #include <linux/mii.h> #include <linux/platform_device.h> @@ -223840,7 +223515,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/mii-bitbang. iounmap(bitbang->dir); diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/mii-fec.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/mii-fec.c --- linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/mii-fec.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/mii-fec.c 2014-05-15 20:33:59.282023118 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fs_enet/mii-fec.c 2014-05-16 15:28:22.573391599 +0200 @@ -31,6 +31,7 @@ #include <linux/ethtool.h> #include <linux/bitops.h> @@ -223881,7 +223556,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/mii-fec.c li kfree(fec); diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fsl_pq_mdio.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fsl_pq_mdio.c --- linux-3.10.30.orig/drivers/net/ethernet/freescale/fsl_pq_mdio.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fsl_pq_mdio.c 2014-05-15 20:33:59.282023118 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fsl_pq_mdio.c 2014-05-16 15:28:22.573391599 +0200 @@ -409,7 +409,7 @@ priv->regs = priv->map + data->mii_offset; @@ -223902,7 +223577,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fsl_pq_mdio.c linux- diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/gianfar.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar.c --- linux-3.10.30.orig/drivers/net/ethernet/freescale/gianfar.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar.c 2014-05-15 20:33:59.282023118 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar.c 2014-05-16 15:28:22.577391620 +0200 @@ -78,6 +78,8 @@ #include <linux/if_vlan.h> #include <linux/spinlock.h> @@ -224493,7 +224168,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/gianfar.c linux-lina diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/gianfar_ethtool.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar_ethtool.c --- linux-3.10.30.orig/drivers/net/ethernet/freescale/gianfar_ethtool.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar_ethtool.c 2014-05-15 20:33:59.282023118 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar_ethtool.c 2014-05-16 15:28:22.577391620 +0200 @@ -535,6 +535,78 @@ return err; } @@ -224584,7 +224259,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/gianfar_ethtool.c li .get_ethtool_stats = gfar_fill_stats, diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/gianfar.h linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar.h --- linux-3.10.30.orig/drivers/net/ethernet/freescale/gianfar.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar.h 2014-05-15 20:33:59.282023118 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar.h 2014-05-16 15:28:22.577391620 +0200 @@ -146,6 +146,10 @@ | SUPPORTED_Autoneg \ | SUPPORTED_MII) @@ -224676,7 +224351,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/gianfar.h linux-lina diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/gianfar_ptp.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar_ptp.c --- linux-3.10.30.orig/drivers/net/ethernet/freescale/gianfar_ptp.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar_ptp.c 2014-05-15 20:33:59.282023118 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar_ptp.c 2014-05-16 15:28:22.577391620 +0200 @@ -452,7 +452,9 @@ err = -ENODEV; @@ -224708,7 +224383,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/gianfar_ptp.c linux- gfar_write(&etsects->regs->tmr_ctrl, 0); diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/ucc_geth.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/ucc_geth.c --- linux-3.10.30.orig/drivers/net/ethernet/freescale/ucc_geth.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/ucc_geth.c 2014-05-15 20:33:59.286023146 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/ucc_geth.c 2014-05-16 15:28:22.581391642 +0200 @@ -31,6 +31,8 @@ #include <linux/mii.h> #include <linux/phy.h> @@ -224763,7 +224438,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/ucc_geth.c linux-lin } diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/xgmac_mdio.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/xgmac_mdio.c --- linux-3.10.30.orig/drivers/net/ethernet/freescale/xgmac_mdio.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/xgmac_mdio.c 2014-05-15 20:33:59.286023146 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/freescale/xgmac_mdio.c 2014-05-16 15:28:22.581391642 +0200 @@ -17,6 +17,7 @@ #include <linux/module.h> #include <linux/phy.h> @@ -224792,7 +224467,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/xgmac_mdio.c linux-l iounmap(bus->priv); diff -Nur linux-3.10.30.orig/drivers/net/ethernet/korina.c linux-linaro-stable-mx6/drivers/net/ethernet/korina.c --- linux-3.10.30.orig/drivers/net/ethernet/korina.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/korina.c 2014-05-15 20:33:59.606025453 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/korina.c 2014-05-16 15:28:23.989399067 +0200 @@ -1214,7 +1214,6 @@ iounmap(lp->rx_dma_regs); iounmap(lp->tx_dma_regs); @@ -224803,7 +224478,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/korina.c linux-linaro-stable-m diff -Nur linux-3.10.30.orig/drivers/net/ethernet/marvell/mv643xx_eth.c linux-linaro-stable-mx6/drivers/net/ethernet/marvell/mv643xx_eth.c --- linux-3.10.30.orig/drivers/net/ethernet/marvell/mv643xx_eth.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/marvell/mv643xx_eth.c 2014-05-15 20:33:59.610025481 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/marvell/mv643xx_eth.c 2014-05-16 15:28:23.989399067 +0200 @@ -2811,8 +2811,6 @@ free_netdev(mp->dev); @@ -224815,7 +224490,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/marvell/mv643xx_eth.c linux-li diff -Nur linux-3.10.30.orig/drivers/net/ethernet/marvell/mvneta.c linux-linaro-stable-mx6/drivers/net/ethernet/marvell/mvneta.c --- linux-3.10.30.orig/drivers/net/ethernet/marvell/mvneta.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/marvell/mvneta.c 2014-05-15 20:33:59.650025770 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/marvell/mvneta.c 2014-05-16 15:28:23.989399067 +0200 @@ -2815,8 +2815,6 @@ irq_dispose_mapping(dev->irq); free_netdev(dev); @@ -224827,7 +224502,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/marvell/mvneta.c linux-linaro- diff -Nur linux-3.10.30.orig/drivers/net/ethernet/marvell/pxa168_eth.c linux-linaro-stable-mx6/drivers/net/ethernet/marvell/pxa168_eth.c --- linux-3.10.30.orig/drivers/net/ethernet/marvell/pxa168_eth.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/marvell/pxa168_eth.c 2014-05-15 20:33:59.650025770 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/marvell/pxa168_eth.c 2014-05-16 15:28:23.989399067 +0200 @@ -1602,7 +1602,6 @@ unregister_netdev(dev); cancel_work_sync(&pep->tx_timeout_task); @@ -224838,7 +224513,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/marvell/pxa168_eth.c linux-lin diff -Nur linux-3.10.30.orig/drivers/net/ethernet/micrel/ks8695net.c linux-linaro-stable-mx6/drivers/net/ethernet/micrel/ks8695net.c --- linux-3.10.30.orig/drivers/net/ethernet/micrel/ks8695net.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/micrel/ks8695net.c 2014-05-15 20:33:59.662025857 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/micrel/ks8695net.c 2014-05-16 15:28:24.001399131 +0200 @@ -1600,7 +1600,6 @@ struct net_device *ndev = platform_get_drvdata(pdev); struct ks8695_priv *ksp = netdev_priv(ndev); @@ -224849,7 +224524,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/micrel/ks8695net.c linux-linar unregister_netdev(ndev); diff -Nur linux-3.10.30.orig/drivers/net/ethernet/micrel/ks8842.c linux-linaro-stable-mx6/drivers/net/ethernet/micrel/ks8842.c --- linux-3.10.30.orig/drivers/net/ethernet/micrel/ks8842.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/micrel/ks8842.c 2014-05-15 20:33:59.666025885 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/micrel/ks8842.c 2014-05-16 15:28:24.001399131 +0200 @@ -1250,7 +1250,6 @@ iounmap(adapter->hw_addr); free_netdev(netdev); @@ -224860,7 +224535,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/micrel/ks8842.c linux-linaro-s diff -Nur linux-3.10.30.orig/drivers/net/ethernet/micrel/ks8851_mll.c linux-linaro-stable-mx6/drivers/net/ethernet/micrel/ks8851_mll.c --- linux-3.10.30.orig/drivers/net/ethernet/micrel/ks8851_mll.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/micrel/ks8851_mll.c 2014-05-15 20:33:59.666025885 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/micrel/ks8851_mll.c 2014-05-16 15:28:24.001399131 +0200 @@ -1671,7 +1671,6 @@ iounmap(ks->hw_addr); free_netdev(netdev); @@ -224871,7 +224546,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/micrel/ks8851_mll.c linux-lina } diff -Nur linux-3.10.30.orig/drivers/net/ethernet/netx-eth.c linux-linaro-stable-mx6/drivers/net/ethernet/netx-eth.c --- linux-3.10.30.orig/drivers/net/ethernet/netx-eth.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/netx-eth.c 2014-05-15 20:33:59.742026433 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/netx-eth.c 2014-05-16 15:28:24.013399194 +0200 @@ -422,7 +422,6 @@ exit_free_xc: free_xc(priv->xc); @@ -224882,7 +224557,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/netx-eth.c linux-linaro-stable return ret; diff -Nur linux-3.10.30.orig/drivers/net/ethernet/nuvoton/w90p910_ether.c linux-linaro-stable-mx6/drivers/net/ethernet/nuvoton/w90p910_ether.c --- linux-3.10.30.orig/drivers/net/ethernet/nuvoton/w90p910_ether.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/nuvoton/w90p910_ether.c 2014-05-15 20:33:59.742026433 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/nuvoton/w90p910_ether.c 2014-05-16 15:28:24.013399194 +0200 @@ -1051,7 +1051,6 @@ clk_put(ether->clk); failed_free_rxirq: @@ -224901,7 +224576,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/nuvoton/w90p910_ether.c linux- return 0; diff -Nur linux-3.10.30.orig/drivers/net/ethernet/nxp/lpc_eth.c linux-linaro-stable-mx6/drivers/net/ethernet/nxp/lpc_eth.c --- linux-3.10.30.orig/drivers/net/ethernet/nxp/lpc_eth.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/nxp/lpc_eth.c 2014-05-15 20:33:59.746026462 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/nxp/lpc_eth.c 2014-05-16 15:28:24.013399194 +0200 @@ -1483,7 +1483,6 @@ return 0; @@ -224920,7 +224595,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/nxp/lpc_eth.c linux-linaro-sta pldat->dma_buff_size > lpc32xx_return_iram_size()) diff -Nur linux-3.10.30.orig/drivers/net/ethernet/renesas/sh_eth.c linux-linaro-stable-mx6/drivers/net/ethernet/renesas/sh_eth.c --- linux-3.10.30.orig/drivers/net/ethernet/renesas/sh_eth.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/renesas/sh_eth.c 2014-05-15 20:33:59.814026951 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/renesas/sh_eth.c 2014-05-16 15:28:24.037399321 +0200 @@ -2814,7 +2814,6 @@ unregister_netdev(ndev); pm_runtime_disable(&pdev->dev); @@ -224931,7 +224606,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/renesas/sh_eth.c linux-linaro- } diff -Nur linux-3.10.30.orig/drivers/net/ethernet/s6gmac.c linux-linaro-stable-mx6/drivers/net/ethernet/s6gmac.c --- linux-3.10.30.orig/drivers/net/ethernet/s6gmac.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/s6gmac.c 2014-05-15 20:33:59.814026951 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/s6gmac.c 2014-05-16 15:28:24.041399342 +0200 @@ -1040,7 +1040,6 @@ unregister_netdev(dev); free_irq(dev->irq, dev); @@ -224942,7 +224617,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/s6gmac.c linux-linaro-stable-m } diff -Nur linux-3.10.30.orig/drivers/net/ethernet/seeq/sgiseeq.c linux-linaro-stable-mx6/drivers/net/ethernet/seeq/sgiseeq.c --- linux-3.10.30.orig/drivers/net/ethernet/seeq/sgiseeq.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/seeq/sgiseeq.c 2014-05-15 20:33:59.818026980 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/seeq/sgiseeq.c 2014-05-16 15:28:24.041399342 +0200 @@ -818,7 +818,6 @@ dma_free_noncoherent(&pdev->dev, sizeof(*sp->srings), sp->srings, sp->srings_dma); @@ -224953,7 +224628,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/seeq/sgiseeq.c linux-linaro-st } diff -Nur linux-3.10.30.orig/drivers/net/ethernet/sgi/meth.c linux-linaro-stable-mx6/drivers/net/ethernet/sgi/meth.c --- linux-3.10.30.orig/drivers/net/ethernet/sgi/meth.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/sgi/meth.c 2014-05-15 20:33:59.826027038 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/sgi/meth.c 2014-05-16 15:28:24.049399384 +0200 @@ -863,7 +863,6 @@ unregister_netdev(dev); @@ -224964,7 +224639,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/sgi/meth.c linux-linaro-stable } diff -Nur linux-3.10.30.orig/drivers/net/ethernet/smsc/smc911x.c linux-linaro-stable-mx6/drivers/net/ethernet/smsc/smc911x.c --- linux-3.10.30.orig/drivers/net/ethernet/smsc/smc911x.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/smsc/smc911x.c 2014-05-15 20:33:59.830027066 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/smsc/smc911x.c 2014-05-16 15:28:24.053399405 +0200 @@ -2087,7 +2087,6 @@ ndev->base_addr = res->start; ret = smc911x_probe(ndev); @@ -224983,7 +224658,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/smsc/smc911x.c linux-linaro-st diff -Nur linux-3.10.30.orig/drivers/net/ethernet/smsc/smc91x.c linux-linaro-stable-mx6/drivers/net/ethernet/smsc/smc91x.c --- linux-3.10.30.orig/drivers/net/ethernet/smsc/smc91x.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/smsc/smc91x.c 2014-05-15 20:33:59.834027096 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/smsc/smc91x.c 2014-05-16 15:28:24.053399405 +0200 @@ -1896,7 +1896,7 @@ SMC_SELECT_BANK(lp, 1); val = SMC_GET_BASE(lp); @@ -225012,7 +224687,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/smsc/smc91x.c linux-linaro-sta free_irq(ndev->irq, ndev); diff -Nur linux-3.10.30.orig/drivers/net/ethernet/smsc/smsc911x.c linux-linaro-stable-mx6/drivers/net/ethernet/smsc/smsc911x.c --- linux-3.10.30.orig/drivers/net/ethernet/smsc/smsc911x.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/smsc/smsc911x.c 2014-05-15 20:33:59.834027096 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/smsc/smsc911x.c 2014-05-16 15:28:24.053399405 +0200 @@ -2284,7 +2284,6 @@ mdiobus_unregister(pdata->mii_bus); mdiobus_free(pdata->mii_bus); @@ -225031,7 +224706,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/smsc/smsc911x.c linux-linaro-s out_release_io_1: diff -Nur linux-3.10.30.orig/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c linux-linaro-stable-mx6/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c --- linux-3.10.30.orig/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c 2014-05-15 20:33:59.850027210 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c 2014-05-16 15:28:24.065399468 +0200 @@ -171,8 +171,6 @@ if (priv->plat->exit) priv->plat->exit(pdev); @@ -225043,7 +224718,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/stmicro/stmmac/stmmac_platform diff -Nur linux-3.10.30.orig/drivers/net/ethernet/ti/cpsw.c linux-linaro-stable-mx6/drivers/net/ethernet/ti/cpsw.c --- linux-3.10.30.orig/drivers/net/ethernet/ti/cpsw.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/ti/cpsw.c 2014-05-15 20:33:59.862027297 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/ti/cpsw.c 2014-05-16 15:28:24.073399511 +0200 @@ -1940,7 +1940,6 @@ struct cpsw_priv *priv = netdev_priv(ndev); int i; @@ -225054,7 +224729,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/ti/cpsw.c linux-linaro-stable- unregister_netdev(ndev); diff -Nur linux-3.10.30.orig/drivers/net/ethernet/ti/davinci_emac.c linux-linaro-stable-mx6/drivers/net/ethernet/ti/davinci_emac.c --- linux-3.10.30.orig/drivers/net/ethernet/ti/davinci_emac.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/ti/davinci_emac.c 2014-05-15 20:33:59.862027297 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/ti/davinci_emac.c 2014-05-16 15:28:24.073399511 +0200 @@ -2036,8 +2036,6 @@ dev_notice(&ndev->dev, "DaVinci EMAC: davinci_emac_remove()\n"); @@ -225066,7 +224741,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/ti/davinci_emac.c linux-linaro if (priv->rxchan) diff -Nur linux-3.10.30.orig/drivers/net/ethernet/tundra/tsi108_eth.c linux-linaro-stable-mx6/drivers/net/ethernet/tundra/tsi108_eth.c --- linux-3.10.30.orig/drivers/net/ethernet/tundra/tsi108_eth.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/tundra/tsi108_eth.c 2014-05-15 20:33:59.886027470 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/tundra/tsi108_eth.c 2014-05-16 15:28:24.081399553 +0200 @@ -1682,7 +1682,6 @@ unregister_netdev(dev); @@ -225077,7 +224752,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/tundra/tsi108_eth.c linux-lina free_netdev(dev); diff -Nur linux-3.10.30.orig/drivers/net/ethernet/wiznet/w5100.c linux-linaro-stable-mx6/drivers/net/ethernet/wiznet/w5100.c --- linux-3.10.30.orig/drivers/net/ethernet/wiznet/w5100.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/wiznet/w5100.c 2014-05-15 20:33:59.914027672 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/wiznet/w5100.c 2014-05-16 15:28:24.081399553 +0200 @@ -734,7 +734,6 @@ unregister_netdev(ndev); err_register: @@ -225096,7 +224771,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/wiznet/w5100.c linux-linaro-st diff -Nur linux-3.10.30.orig/drivers/net/ethernet/wiznet/w5300.c linux-linaro-stable-mx6/drivers/net/ethernet/wiznet/w5300.c --- linux-3.10.30.orig/drivers/net/ethernet/wiznet/w5300.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/wiznet/w5300.c 2014-05-15 20:33:59.918027701 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/wiznet/w5300.c 2014-05-16 15:28:24.081399553 +0200 @@ -646,7 +646,6 @@ unregister_netdev(ndev); err_register: @@ -225115,7 +224790,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/wiznet/w5300.c linux-linaro-st diff -Nur linux-3.10.30.orig/drivers/net/ethernet/xscale/ixp4xx_eth.c linux-linaro-stable-mx6/drivers/net/ethernet/xscale/ixp4xx_eth.c --- linux-3.10.30.orig/drivers/net/ethernet/xscale/ixp4xx_eth.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/ethernet/xscale/ixp4xx_eth.c 2014-05-15 20:33:59.942027873 +0200 ++++ linux-linaro-stable-mx6/drivers/net/ethernet/xscale/ixp4xx_eth.c 2014-05-16 15:28:24.085399573 +0200 @@ -1472,7 +1472,6 @@ phy_disconnect(port->phydev); err_free_mem: @@ -225134,7 +224809,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/xscale/ixp4xx_eth.c linux-lina free_netdev(dev); diff -Nur linux-3.10.30.orig/drivers/net/phy/phy.c linux-linaro-stable-mx6/drivers/net/phy/phy.c --- linux-3.10.30.orig/drivers/net/phy/phy.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/phy/phy.c 2014-05-15 20:34:00.050028652 +0200 ++++ linux-linaro-stable-mx6/drivers/net/phy/phy.c 2014-05-16 15:28:24.113399722 +0200 @@ -439,7 +439,7 @@ { phydev->adjust_state = handler; @@ -225174,7 +224849,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/phy/phy.c linux-linaro-stable-mx6/drive static inline void mmd_phy_indirect(struct mii_bus *bus, int prtad, int devad, diff -Nur linux-3.10.30.orig/drivers/net/wireless/ath/ath6kl/hif.h linux-linaro-stable-mx6/drivers/net/wireless/ath/ath6kl/hif.h --- linux-3.10.30.orig/drivers/net/wireless/ath/ath6kl/hif.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/ath/ath6kl/hif.h 2014-05-15 20:34:00.358030871 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/ath/ath6kl/hif.h 2014-05-16 15:28:24.157399954 +0200 @@ -197,9 +197,9 @@ /* bounce buffer for upper layers to copy to/from */ u8 *virt_dma_buf; @@ -225189,7 +224864,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/ath/ath6kl/hif.h linux-linaro- struct ath6kl_irq_proc_registers { diff -Nur linux-3.10.30.orig/drivers/net/wireless/ath/ath6kl/sdio.c linux-linaro-stable-mx6/drivers/net/wireless/ath/ath6kl/sdio.c --- linux-3.10.30.orig/drivers/net/wireless/ath/ath6kl/sdio.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/ath/ath6kl/sdio.c 2014-05-15 20:34:00.362030900 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/ath/ath6kl/sdio.c 2014-05-16 15:28:24.161399975 +0200 @@ -222,6 +222,7 @@ struct mmc_data *data) { @@ -225229,7 +224904,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/ath/ath6kl/sdio.c linux-linaro if (!virt_scat) diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c 2014-05-15 20:34:00.550032255 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c 2014-05-16 15:28:24.201400186 +0200 @@ -0,0 +1,375 @@ +/* + * Copyright (c) 2010 Broadcom Corporation @@ -225608,7 +225283,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c linu +} diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/bcdc.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/bcdc.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/bcdc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/bcdc.h 2014-05-15 20:34:00.554032284 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/bcdc.h 2014-05-16 15:28:24.205400206 +0200 @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2013 Broadcom Corporation @@ -225636,7 +225311,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/bcdc.h linu +#endif /* BRCMFMAC_BCDC_H */ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c 2014-05-15 20:34:00.554032284 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c 2014-05-16 15:28:24.205400206 +0200 @@ -17,15 +17,23 @@ #include <linux/types.h> @@ -227550,7 +227225,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmm -} diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h 2014-05-15 20:34:00.554032284 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h 2014-05-16 15:28:24.205400206 +0200 @@ -17,13 +17,23 @@ #ifndef _BRCMF_BUS_H_ #define _BRCMF_BUS_H_ @@ -228114,7 +227789,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c l -} diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c 2014-05-15 20:34:00.554032284 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c 2014-05-16 15:28:24.205400206 +0200 @@ -21,9 +21,9 @@ #include <brcmu_utils.h> #include "dhd.h" @@ -228188,7 +227863,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_common. } diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c 2014-05-15 20:34:00.554032284 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c 2014-05-16 15:28:24.205400206 +0200 @@ -22,7 +22,6 @@ #include "dhd.h" #include "dhd_bus.h" @@ -228286,7 +227961,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c l } diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h 2014-05-15 20:34:00.554032284 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h 2014-05-16 15:28:24.205400206 +0200 @@ -33,7 +33,7 @@ #define BRCMF_USB_VAL 0x00002000 #define BRCMF_SCAN_VAL 0x00004000 @@ -228318,7 +227993,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h l struct brcmf_pub; diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd.h 2014-05-15 20:34:00.554032284 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd.h 2014-05-16 15:28:24.205400206 +0200 @@ -21,479 +21,33 @@ #ifndef _BRCMF_H_ #define _BRCMF_H_ @@ -228937,7 +228612,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd.h linux #endif /* _BRCMF_H_ */ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c 2014-05-15 20:34:00.554032284 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c 2014-05-16 15:28:24.205400206 +0200 @@ -24,13 +24,13 @@ #include "dhd.h" @@ -229753,7 +229428,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h -#endif /* _BRCMF_PROTO_H_ */ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c 2014-05-15 20:34:00.554032284 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c 2014-05-16 15:28:24.205400206 +0200 @@ -32,6 +32,7 @@ #include <linux/debugfs.h> #include <linux/vmalloc.h> @@ -233587,7 +233262,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c if (wdtick) { diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fweh.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fweh.c --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fweh.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fweh.c 2014-05-15 20:34:00.554032284 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fweh.c 2014-05-16 15:28:24.205400206 +0200 @@ -185,6 +185,10 @@ ifevent->action, ifevent->ifidx, ifevent->bssidx, ifevent->flags, ifevent->role); @@ -233601,7 +233276,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fweh.c linu ifevent->ifidx); diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fweh.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fweh.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fweh.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fweh.h 2014-05-15 20:34:00.554032284 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fweh.h 2014-05-16 15:28:24.205400206 +0200 @@ -101,7 +101,9 @@ BRCMF_ENUM_DEF(P2P_PROBEREQ_MSG, 72) \ BRCMF_ENUM_DEF(DCS_REQUEST, 73) \ @@ -233690,7 +233365,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fweh.h linu void *data); diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fwil.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwil.c --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fwil.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwil.c 2014-05-15 20:34:00.578032457 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwil.c 2014-05-16 15:28:24.205400206 +0200 @@ -27,6 +27,7 @@ #include "dhd_dbg.h" #include "tracepoint.h" @@ -233769,7 +233444,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fwil.c linu return err; diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fwil.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwil.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fwil.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwil.h 2014-05-15 20:34:00.578032457 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwil.h 2014-05-16 15:28:24.205400206 +0200 @@ -17,6 +17,67 @@ #ifndef _fwil_h_ #define _fwil_h_ @@ -233840,7 +233515,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fwil.h linu s32 brcmf_fil_cmd_int_set(struct brcmf_if *ifp, u32 cmd, u32 data); diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h 2014-05-15 20:34:00.578032457 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h 2014-05-16 15:28:24.205400206 +0200 @@ -29,6 +29,24 @@ #define BRCMF_ARP_OL_HOST_AUTO_REPLY 0x00000004 #define BRCMF_ARP_OL_PEER_AUTO_REPLY 0x00000008 @@ -234180,7 +233855,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fwil_types. #endif /* FWIL_TYPES_H_ */ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c 2014-05-15 20:34:00.578032457 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c 2014-05-16 15:28:24.205400206 +0200 @@ -22,13 +22,11 @@ #include <linux/etherdevice.h> #include <linux/err.h> @@ -236357,7 +236032,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c } diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h 2014-05-15 20:34:00.578032457 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h 2014-05-16 15:28:24.205400206 +0200 @@ -29,5 +29,6 @@ void brcmf_fws_add_interface(struct brcmf_if *ifp); void brcmf_fws_del_interface(struct brcmf_if *ifp); @@ -236367,7 +236042,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h #endif /* FWSIGNAL_H_ */ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/Makefile linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/Makefile --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/Makefile 2014-05-15 20:34:00.550032255 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/Makefile 2014-05-16 15:28:24.201400186 +0200 @@ -28,14 +28,15 @@ fweh.o \ fwsignal.o \ @@ -236388,7 +236063,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/Makefile li usb.o diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/nvram.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/nvram.c --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/nvram.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/nvram.c 2014-05-15 20:34:00.578032457 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/nvram.c 2014-05-16 15:28:24.205400206 +0200 @@ -0,0 +1,94 @@ +/* + * Copyright (c) 2013 Broadcom Corporation @@ -236486,7 +236161,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/nvram.c lin + diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/nvram.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/nvram.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/nvram.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/nvram.h 2014-05-15 20:34:00.578032457 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/nvram.h 2014-05-16 15:28:24.205400206 +0200 @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2013 Broadcom Corporation @@ -236514,7 +236189,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/nvram.h lin +#endif /* BRCMFMAC_NVRAM_H */ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/p2p.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/p2p.c --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/p2p.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/p2p.c 2014-05-15 20:34:00.578032457 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/p2p.c 2014-05-16 15:28:24.205400206 +0200 @@ -823,6 +823,7 @@ } err = brcmf_p2p_escan(p2p, num_nodfs, chanspecs, search_state, @@ -236667,7 +236342,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/p2p.c linux return -ENOTSUPP; diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/proto.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/proto.c --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/proto.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/proto.c 2014-05-15 20:34:00.578032457 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/proto.c 2014-05-16 15:28:24.205400206 +0200 @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2013 Broadcom Corporation @@ -236733,7 +236408,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/proto.c lin +} diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/proto.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/proto.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/proto.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/proto.h 2014-05-15 20:34:00.578032457 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/proto.h 2014-05-16 15:28:24.205400206 +0200 @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2013 Broadcom Corporation @@ -236794,7 +236469,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/proto.h lin +#endif /* BRCMFMAC_PROTO_H */ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c 2014-05-15 20:34:00.578032457 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c 2014-05-16 15:28:24.209400227 +0200 @@ -18,6 +18,8 @@ #include <linux/types.h> #include <linux/netdevice.h> @@ -238029,7 +237704,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c } diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h 2014-05-15 20:34:00.578032457 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h 2014-05-16 15:28:24.209400227 +0200 @@ -54,7 +54,7 @@ #define BRCMF_MAX_CORENUM 6 @@ -238106,7 +237781,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h #endif /* _BRCMFMAC_SDIO_CHIP_H_ */ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h 2014-05-15 20:34:00.578032457 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h 2014-05-16 15:28:24.209400227 +0200 @@ -164,13 +164,10 @@ struct brcmf_sdio_dev { struct sdio_func *func[SDIO_MAX_FUNCS]; @@ -238265,7 +237940,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h #endif /* _BRCM_SDH_H_ */ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h 2014-05-15 20:34:00.578032457 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h 2014-05-16 15:28:24.209400227 +0200 @@ -78,13 +78,64 @@ TP_ARGS(data, len), TP_STRUCT__entry( @@ -238334,7 +238009,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/tracepoint. #ifdef CONFIG_BRCM_TRACING diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/usb.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/usb.c --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2014-05-15 20:34:00.582032485 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2014-05-16 15:28:24.209400227 +0200 @@ -82,6 +82,7 @@ int tx_high_watermark; int tx_freecount; @@ -238455,7 +238130,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/usb.c linux return 0; diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c 2014-05-15 20:34:00.582032485 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c 2014-05-16 15:28:24.209400227 +0200 @@ -1093,9 +1093,12 @@ brcmf_dbg(INFO, "Call WLC_DISASSOC to stop excess roaming\n "); err = brcmf_fil_cmd_data_set(vif->ifp, @@ -238937,7 +238612,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211 wiphy = cfg_to_wiphy(cfg); diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h 2014-05-15 20:34:00.582032485 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h 2014-05-16 15:28:24.209400227 +0200 @@ -412,7 +412,6 @@ struct work_struct escan_timeout_work; u8 *escan_ioctl_buf; @@ -238965,7 +238640,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211 #endif /* _wl_cfg80211_h_ */ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c 2014-05-15 20:34:00.582032485 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c 2014-05-16 15:28:24.209400227 +0200 @@ -679,27 +679,6 @@ return mode == BCMA_CLKMODE_FAST; } @@ -238996,7 +238671,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c l { diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h 2014-05-15 20:34:00.582032485 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h 2014-05-16 15:28:24.209400227 +0200 @@ -172,22 +172,19 @@ @@ -239031,7 +238706,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h l { diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c 2014-05-15 20:34:00.582032485 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c 2014-05-16 15:28:24.209400227 +0200 @@ -900,7 +900,7 @@ if (supr_status) { update_rate = false; @@ -239056,7 +238731,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c lin diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/ampdu.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/ampdu.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/ampdu.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/ampdu.h 2014-05-15 20:34:00.582032485 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/ampdu.h 2014-05-16 15:28:24.209400227 +0200 @@ -37,17 +37,17 @@ u16 dma_len; }; @@ -239088,7 +238763,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/ampdu.h lin #endif /* _BRCM_AMPDU_H_ */ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/antsel.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/antsel.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/antsel.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/antsel.h 2014-05-15 20:34:00.582032485 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/antsel.h 2014-05-16 15:28:24.209400227 +0200 @@ -17,13 +17,11 @@ #ifndef _BRCM_ANTSEL_H_ #define _BRCM_ANTSEL_H_ @@ -239111,7 +238786,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/antsel.h li #endif /* _BRCM_ANTSEL_H_ */ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/channel.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/channel.c --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/channel.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/channel.c 2014-05-15 20:34:00.594032572 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/channel.c 2014-05-16 15:28:24.209400227 +0200 @@ -684,7 +684,8 @@ continue; @@ -239124,7 +238799,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/channel.c l diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/channel.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/channel.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/channel.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/channel.h 2014-05-15 20:34:00.594032572 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/channel.h 2014-05-16 15:28:24.213400249 +0200 @@ -32,20 +32,16 @@ #define BRCMS_DFS_EU (BRCMS_DFS_TPC | BRCMS_RADAR_TYPE_EU) /* Flag for DFS EU */ @@ -239156,7 +238831,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/channel.h l #endif /* _WLC_CHANNEL_H */ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/debug.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/debug.c --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/debug.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/debug.c 2014-05-15 20:34:00.594032572 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/debug.c 2014-05-16 15:28:24.213400249 +0200 @@ -56,7 +56,7 @@ drvr->dbgfs_dir = debugfs_create_dir( @@ -239168,7 +238843,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/debug.c lin void brcms_debugfs_detach(struct brcms_pub *drvr) diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c 2014-05-15 20:34:00.602032629 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c 2014-05-16 15:28:24.213400249 +0200 @@ -457,6 +457,8 @@ if (err != 0) brcms_err(wl->wlc->hw->d11core, "%s: brcms_up() returned %d\n", @@ -239197,7 +238872,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if BIT(NL80211_IFTYPE_ADHOC); diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h 2014-05-15 20:34:00.602032629 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h 2014-05-16 15:28:24.213400249 +0200 @@ -88,26 +88,26 @@ }; @@ -239246,7 +238921,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if #endif /* _BRCM_MAC80211_IF_H_ */ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/main.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/main.c --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/main.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/main.c 2014-05-15 20:34:00.618032744 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/main.c 2014-05-16 15:28:24.213400249 +0200 @@ -882,8 +882,8 @@ mcl = le16_to_cpu(txh->MacTxControlLow); @@ -239347,7 +239022,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/main.c linu rx_status->flag |= RX_FLAG_SHORTPRE; diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/main.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/main.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/main.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/main.h 2014-05-15 20:34:00.618032744 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/main.h 2014-05-16 15:28:24.213400249 +0200 @@ -616,66 +616,54 @@ struct brcms_bss_info *current_bss; }; @@ -239465,7 +239140,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/main.h linu #endif /* _BRCM_MAIN_H_ */ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h 2014-05-15 20:34:00.670033120 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h 2014-05-16 15:28:24.217400270 +0200 @@ -179,121 +179,106 @@ }; @@ -239692,7 +239367,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal #endif /* _BRCM_PHY_HAL_H_ */ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h 2014-05-15 20:34:00.670033120 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h 2014-05-16 15:28:24.217400270 +0200 @@ -910,113 +910,103 @@ u8 do_init_g; }; @@ -240104,7 +239779,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int #endif /* _BRCM_PHY_INT_H_ */ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c 2014-05-15 20:34:00.674033148 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c 2014-05-16 15:28:24.217400270 +0200 @@ -1137,8 +1137,9 @@ gain0_15 = ((biq1 & 0xf) << 12) | ((tia & 0xf) << 8) | @@ -240720,7 +240395,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn pi->hwpwrctrl_capable = true; diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c 2014-05-15 20:34:00.698033322 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c 2014-05-16 15:28:24.221400291 +0200 @@ -1507,117 +1507,103 @@ const struct phytbl_info dot11lcnphytbl_rx_gain_info_rev0[] = { @@ -241297,7 +240972,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_ const struct lcnphy_tx_gain_tbl_entry dot11lcnphy_5GHz_gaintable_rev0[128] = { diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h 2014-05-15 20:34:00.698033322 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h 2014-05-16 15:28:24.221400291 +0200 @@ -20,6 +20,7 @@ extern const struct phytbl_info dot11lcnphytbl_rx_gain_info_rev0[]; extern const u32 dot11lcnphytbl_rx_gain_info_sz_rev0; @@ -241308,7 +240983,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_ extern const struct phytbl_info dot11lcn_sw_ctrl_tbl_info_4313_bt_epa; diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h 2014-05-15 20:34:00.706033378 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h 2014-05-16 15:28:24.225400312 +0200 @@ -124,56 +124,49 @@ struct brcms_phy; @@ -241410,7 +241085,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h #endif /* _BRCM_PHY_SHIM_H_ */ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/pmu.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/pmu.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/pmu.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/pmu.h 2014-05-15 20:34:00.714033437 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/pmu.h 2014-05-16 15:28:24.225400312 +0200 @@ -20,7 +20,7 @@ #include "types.h" @@ -241423,7 +241098,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/pmu.h linux #endif /* _BRCM_PMU_H_ */ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/pub.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/pub.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/pub.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/pub.h 2014-05-15 20:34:00.714033437 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/pub.h 2014-05-16 15:28:24.225400312 +0200 @@ -266,83 +266,76 @@ }; @@ -241577,7 +241252,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/pub.h linux #endif /* _BRCM_PUB_H_ */ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/rate.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/rate.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/rate.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/rate.h 2014-05-15 20:34:00.714033437 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/rate.h 2014-05-16 15:28:24.225400312 +0200 @@ -216,34 +216,30 @@ /* sanitize, and sort a rateset with the basic bit(s) preserved, validate @@ -241636,7 +241311,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/rate.h linu #endif /* _BRCM_RATE_H_ */ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/stf.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/stf.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/stf.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/stf.h 2014-05-15 20:34:00.714033437 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/stf.h 2014-05-16 15:28:24.225400312 +0200 @@ -19,24 +19,19 @@ #include "types.h" @@ -241677,7 +241352,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/stf.h linux #endif /* _BRCM_STF_H_ */ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.h 2014-05-15 20:34:00.714033437 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.h 2014-05-16 15:28:24.225400312 +0200 @@ -43,16 +43,14 @@ u32 *bcm43xx_bomminor; }; @@ -241704,7 +241379,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/ucode_loade #endif /* _BRCM_UCODE_H_ */ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h 2014-05-15 20:34:00.714033437 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h 2014-05-16 15:28:24.225400312 +0200 @@ -41,5 +41,7 @@ #define BCM4331_CHIP_ID 0x4331 #define BCM4334_CHIP_ID 0x4334 @@ -241715,7 +241390,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/include/brcm_hw_ids. #endif /* _BRCM_HW_IDS_H_ */ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/include/brcmu_d11.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/include/brcmu_d11.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/include/brcmu_d11.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/include/brcmu_d11.h 2014-05-15 20:34:00.718033465 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/include/brcmu_d11.h 2014-05-16 15:28:24.225400312 +0200 @@ -140,6 +140,6 @@ void (*decchspec)(struct brcmu_chan *ch); }; @@ -241726,7 +241401,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/include/brcmu_d11.h #endif /* _BRCMU_CHANNELS_H_ */ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/include/brcmu_utils.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/include/brcmu_utils.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/include/brcmu_utils.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/include/brcmu_utils.h 2014-05-15 20:34:00.718033465 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/include/brcmu_utils.h 2014-05-16 15:28:24.225400312 +0200 @@ -114,31 +114,29 @@ return skb_peek_tail(&pq->q[prec].skblist); } @@ -241808,7 +241483,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/include/brcmu_utils. __printf(3, 4) diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/include/brcmu_wifi.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/include/brcmu_wifi.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/include/brcmu_wifi.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/include/brcmu_wifi.h 2014-05-15 20:34:00.718033465 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/include/brcmu_wifi.h 2014-05-16 15:28:24.225400312 +0200 @@ -82,6 +82,20 @@ #define WLC_N_BW_40ALL 1 #define WLC_N_BW_20IN2G_40IN5G 2 @@ -241832,7 +241507,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/include/brcmu_wifi.h #define WLC_BAND_5G 1 /* 5 Ghz */ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/Kconfig linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/Kconfig --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/Kconfig 2014-05-15 20:34:00.550032255 +0200 ++++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/Kconfig 2014-05-16 15:28:24.201400186 +0200 @@ -4,11 +4,12 @@ config BRCMSMAC tristate "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver" @@ -241869,7 +241544,7 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/Kconfig linux-linaro ---help--- diff -Nur linux-3.10.30.orig/drivers/of/address.c linux-linaro-stable-mx6/drivers/of/address.c --- linux-3.10.30.orig/drivers/of/address.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/of/address.c 2014-05-15 20:34:01.626040008 +0200 ++++ linux-linaro-stable-mx6/drivers/of/address.c 2014-05-16 15:28:24.357401008 +0200 @@ -223,6 +223,73 @@ return __of_address_to_resource(dev, addrp, size, flags, NULL, r); } @@ -241946,7 +241621,7 @@ diff -Nur linux-3.10.30.orig/drivers/of/address.c linux-linaro-stable-mx6/driver /* diff -Nur linux-3.10.30.orig/drivers/of/base.c linux-linaro-stable-mx6/drivers/of/base.c --- linux-3.10.30.orig/drivers/of/base.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/of/base.c 2014-05-15 20:34:01.626040008 +0200 ++++ linux-linaro-stable-mx6/drivers/of/base.c 2014-05-16 15:28:24.357401008 +0200 @@ -18,6 +18,7 @@ * 2 of the License, or (at your option) any later version. */ @@ -242343,7 +242018,7 @@ diff -Nur linux-3.10.30.orig/drivers/of/base.c linux-linaro-stable-mx6/drivers/o +EXPORT_SYMBOL_GPL(of_device_is_stdout_path); diff -Nur linux-3.10.30.orig/drivers/of/fdt.c linux-linaro-stable-mx6/drivers/of/fdt.c --- linux-3.10.30.orig/drivers/of/fdt.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/of/fdt.c 2014-05-15 20:34:01.634040066 +0200 ++++ linux-linaro-stable-mx6/drivers/of/fdt.c 2014-05-16 15:28:24.357401008 +0200 @@ -125,13 +125,13 @@ return score; } @@ -242497,7 +242172,7 @@ diff -Nur linux-3.10.30.orig/drivers/of/fdt.c linux-linaro-stable-mx6/drivers/of pr_debug(" <- unflatten_device_tree()\n"); diff -Nur linux-3.10.30.orig/drivers/of/of_pci.c linux-linaro-stable-mx6/drivers/of/of_pci.c --- linux-3.10.30.orig/drivers/of/of_pci.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/of/of_pci.c 2014-05-15 20:34:01.642040123 +0200 ++++ linux-linaro-stable-mx6/drivers/of/of_pci.c 2014-05-16 15:28:24.361401030 +0200 @@ -5,14 +5,15 @@ #include <asm/prom.h> @@ -242618,7 +242293,7 @@ diff -Nur linux-3.10.30.orig/drivers/of/of_pci.c linux-linaro-stable-mx6/drivers +#endif /* CONFIG_PCI_MSI */ diff -Nur linux-3.10.30.orig/drivers/pci/host/Kconfig linux-linaro-stable-mx6/drivers/pci/host/Kconfig --- linux-3.10.30.orig/drivers/pci/host/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/pci/host/Kconfig 2014-05-15 20:34:01.698040526 +0200 ++++ linux-linaro-stable-mx6/drivers/pci/host/Kconfig 2014-05-16 15:28:24.369401071 +0200 @@ -0,0 +1,39 @@ +menu "PCI host controller drivers" + depends on PCI @@ -242661,7 +242336,7 @@ diff -Nur linux-3.10.30.orig/drivers/pci/host/Kconfig linux-linaro-stable-mx6/dr +endmenu diff -Nur linux-3.10.30.orig/drivers/pci/host/Makefile linux-linaro-stable-mx6/drivers/pci/host/Makefile --- linux-3.10.30.orig/drivers/pci/host/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/pci/host/Makefile 2014-05-15 20:34:01.698040526 +0200 ++++ linux-linaro-stable-mx6/drivers/pci/host/Makefile 2014-05-16 15:28:24.369401071 +0200 @@ -0,0 +1,4 @@ +obj-$(CONFIG_PCIE_DW) += pcie-designware.o +obj-$(CONFIG_PCI_EXYNOS) += pci-exynos.o @@ -242669,7 +242344,7 @@ diff -Nur linux-3.10.30.orig/drivers/pci/host/Makefile linux-linaro-stable-mx6/d +obj-$(CONFIG_PCI_MVEBU) += pci-mvebu.o diff -Nur linux-3.10.30.orig/drivers/pci/host/pcie-designware.c linux-linaro-stable-mx6/drivers/pci/host/pcie-designware.c --- linux-3.10.30.orig/drivers/pci/host/pcie-designware.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/pci/host/pcie-designware.c 2014-05-15 20:34:01.698040526 +0200 ++++ linux-linaro-stable-mx6/drivers/pci/host/pcie-designware.c 2014-05-16 15:28:24.369401071 +0200 @@ -0,0 +1,773 @@ +/* + * Synopsys Designware PCIe host controller driver @@ -243446,7 +243121,7 @@ diff -Nur linux-3.10.30.orig/drivers/pci/host/pcie-designware.c linux-linaro-sta +MODULE_LICENSE("GPL v2"); diff -Nur linux-3.10.30.orig/drivers/pci/host/pcie-designware.h linux-linaro-stable-mx6/drivers/pci/host/pcie-designware.h --- linux-3.10.30.orig/drivers/pci/host/pcie-designware.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/pci/host/pcie-designware.h 2014-05-15 20:34:01.698040526 +0200 ++++ linux-linaro-stable-mx6/drivers/pci/host/pcie-designware.h 2014-05-16 15:28:24.369401071 +0200 @@ -0,0 +1,124 @@ +/* + * Synopsys Designware PCIe host controller driver @@ -243574,7 +243249,7 @@ diff -Nur linux-3.10.30.orig/drivers/pci/host/pcie-designware.h linux-linaro-sta +#endif /* _PCIE_DESIGNWARE_H */ diff -Nur linux-3.10.30.orig/drivers/pci/host/pci-exynos.c linux-linaro-stable-mx6/drivers/pci/host/pci-exynos.c --- linux-3.10.30.orig/drivers/pci/host/pci-exynos.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/pci/host/pci-exynos.c 2014-05-15 20:34:01.698040526 +0200 ++++ linux-linaro-stable-mx6/drivers/pci/host/pci-exynos.c 2014-05-16 15:28:24.369401071 +0200 @@ -0,0 +1,648 @@ +/* + * PCIe host controller driver for Samsung EXYNOS SoCs @@ -244226,7 +243901,7 @@ diff -Nur linux-3.10.30.orig/drivers/pci/host/pci-exynos.c linux-linaro-stable-m +MODULE_LICENSE("GPL v2"); diff -Nur linux-3.10.30.orig/drivers/pci/host/pci-imx6.c linux-linaro-stable-mx6/drivers/pci/host/pci-imx6.c --- linux-3.10.30.orig/drivers/pci/host/pci-imx6.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/pci/host/pci-imx6.c 2014-05-15 20:34:01.698040526 +0200 ++++ linux-linaro-stable-mx6/drivers/pci/host/pci-imx6.c 2014-05-16 15:28:24.369401071 +0200 @@ -0,0 +1,857 @@ +/* + * PCIe host controller driver for Freescale i.MX6 SoCs @@ -245087,7 +244762,7 @@ diff -Nur linux-3.10.30.orig/drivers/pci/host/pci-imx6.c linux-linaro-stable-mx6 +MODULE_LICENSE("GPL v2"); diff -Nur linux-3.10.30.orig/drivers/pci/host/pci-mvebu.c linux-linaro-stable-mx6/drivers/pci/host/pci-mvebu.c --- linux-3.10.30.orig/drivers/pci/host/pci-mvebu.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/pci/host/pci-mvebu.c 2014-05-15 20:34:01.698040526 +0200 ++++ linux-linaro-stable-mx6/drivers/pci/host/pci-mvebu.c 2014-05-16 15:28:24.369401071 +0200 @@ -0,0 +1,881 @@ +/* + * PCIe driver for Marvell Armada 370 and Armada XP SoCs @@ -245972,7 +245647,7 @@ diff -Nur linux-3.10.30.orig/drivers/pci/host/pci-mvebu.c linux-linaro-stable-mx +MODULE_LICENSE("GPLv2"); diff -Nur linux-3.10.30.orig/drivers/pci/Kconfig linux-linaro-stable-mx6/drivers/pci/Kconfig --- linux-3.10.30.orig/drivers/pci/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/pci/Kconfig 2014-05-15 20:34:01.694040498 +0200 ++++ linux-linaro-stable-mx6/drivers/pci/Kconfig 2014-05-16 15:28:24.369401071 +0200 @@ -119,3 +119,5 @@ config PCI_LABEL def_bool y if (DMI || ACPI) @@ -245981,7 +245656,7 @@ diff -Nur linux-3.10.30.orig/drivers/pci/Kconfig linux-linaro-stable-mx6/drivers +source "drivers/pci/host/Kconfig" diff -Nur linux-3.10.30.orig/drivers/pci/Makefile linux-linaro-stable-mx6/drivers/pci/Makefile --- linux-3.10.30.orig/drivers/pci/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/pci/Makefile 2014-05-15 20:34:01.694040498 +0200 ++++ linux-linaro-stable-mx6/drivers/pci/Makefile 2014-05-16 15:28:24.369401071 +0200 @@ -67,3 +67,6 @@ obj-$(CONFIG_OF) += of.o @@ -245991,7 +245666,7 @@ diff -Nur linux-3.10.30.orig/drivers/pci/Makefile linux-linaro-stable-mx6/driver +obj-y += host/ diff -Nur linux-3.10.30.orig/drivers/pci/msi.c linux-linaro-stable-mx6/drivers/pci/msi.c --- linux-3.10.30.orig/drivers/pci/msi.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/pci/msi.c 2014-05-15 20:34:01.758040959 +0200 ++++ linux-linaro-stable-mx6/drivers/pci/msi.c 2014-05-16 15:28:24.377401114 +0200 @@ -30,20 +30,44 @@ /* Arch hooks */ @@ -246120,7 +245795,7 @@ diff -Nur linux-3.10.30.orig/drivers/pci/msi.c linux-linaro-stable-mx6/drivers/p BUG_ON(irq_has_action(entry->irq + i)); diff -Nur linux-3.10.30.orig/drivers/pci/probe.c linux-linaro-stable-mx6/drivers/pci/probe.c --- linux-3.10.30.orig/drivers/pci/probe.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/pci/probe.c 2014-05-15 20:34:01.794041218 +0200 ++++ linux-linaro-stable-mx6/drivers/pci/probe.c 2014-05-16 15:28:24.381401135 +0200 @@ -634,6 +634,7 @@ child->parent = parent; @@ -246131,7 +245806,7 @@ diff -Nur linux-3.10.30.orig/drivers/pci/probe.c linux-linaro-stable-mx6/drivers diff -Nur linux-3.10.30.orig/drivers/pinctrl/core.c linux-linaro-stable-mx6/drivers/pinctrl/core.c --- linux-3.10.30.orig/drivers/pinctrl/core.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/pinctrl/core.c 2014-05-15 20:34:01.866041737 +0200 ++++ linux-linaro-stable-mx6/drivers/pinctrl/core.c 2014-05-16 15:28:24.393401198 +0200 @@ -280,6 +280,29 @@ } @@ -246303,7 +245978,7 @@ diff -Nur linux-3.10.30.orig/drivers/pinctrl/core.c linux-linaro-stable-mx6/driv mutex_unlock(&pctldev->mutex); diff -Nur linux-3.10.30.orig/drivers/pinctrl/devicetree.c linux-linaro-stable-mx6/drivers/pinctrl/devicetree.c --- linux-3.10.30.orig/drivers/pinctrl/devicetree.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/pinctrl/devicetree.c 2014-05-15 20:34:01.870041766 +0200 ++++ linux-linaro-stable-mx6/drivers/pinctrl/devicetree.c 2014-05-16 15:28:24.393401198 +0200 @@ -18,6 +18,7 @@ #include <linux/device.h> @@ -246371,7 +246046,7 @@ diff -Nur linux-3.10.30.orig/drivers/pinctrl/devicetree.c linux-linaro-stable-mx diff -Nur linux-3.10.30.orig/drivers/pinctrl/Kconfig linux-linaro-stable-mx6/drivers/pinctrl/Kconfig --- linux-3.10.30.orig/drivers/pinctrl/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/pinctrl/Kconfig 2014-05-15 20:34:01.858041679 +0200 ++++ linux-linaro-stable-mx6/drivers/pinctrl/Kconfig 2014-05-16 15:28:24.393401198 +0200 @@ -108,6 +108,14 @@ help Say Y here to enable the imx6sl pinctrl driver @@ -246389,7 +246064,7 @@ diff -Nur linux-3.10.30.orig/drivers/pinctrl/Kconfig linux-linaro-stable-mx6/dri depends on LANTIQ diff -Nur linux-3.10.30.orig/drivers/pinctrl/Makefile linux-linaro-stable-mx6/drivers/pinctrl/Makefile --- linux-3.10.30.orig/drivers/pinctrl/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/pinctrl/Makefile 2014-05-15 20:34:01.858041679 +0200 ++++ linux-linaro-stable-mx6/drivers/pinctrl/Makefile 2014-05-16 15:28:24.393401198 +0200 @@ -22,6 +22,7 @@ obj-$(CONFIG_PINCTRL_IMX53) += pinctrl-imx53.o obj-$(CONFIG_PINCTRL_IMX6Q) += pinctrl-imx6q.o @@ -246408,7 +246083,7 @@ diff -Nur linux-3.10.30.orig/drivers/pinctrl/Makefile linux-linaro-stable-mx6/dr obj-$(CONFIG_ARCH_SHMOBILE) += sh-pfc/ diff -Nur linux-3.10.30.orig/drivers/pinctrl/pinctrl-imx6sl.c linux-linaro-stable-mx6/drivers/pinctrl/pinctrl-imx6sl.c --- linux-3.10.30.orig/drivers/pinctrl/pinctrl-imx6sl.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/pinctrl/pinctrl-imx6sl.c 2014-05-15 20:34:01.906042026 +0200 ++++ linux-linaro-stable-mx6/drivers/pinctrl/pinctrl-imx6sl.c 2014-05-16 15:28:24.401401241 +0200 @@ -384,6 +384,10 @@ }, .probe = imx6sl_pinctrl_probe, @@ -246422,7 +246097,7 @@ diff -Nur linux-3.10.30.orig/drivers/pinctrl/pinctrl-imx6sl.c linux-linaro-stabl static int __init imx6sl_pinctrl_init(void) diff -Nur linux-3.10.30.orig/drivers/pinctrl/pinctrl-imx.c linux-linaro-stable-mx6/drivers/pinctrl/pinctrl-imx.c --- linux-3.10.30.orig/drivers/pinctrl/pinctrl-imx.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/pinctrl/pinctrl-imx.c 2014-05-15 20:34:01.898041967 +0200 ++++ linux-linaro-stable-mx6/drivers/pinctrl/pinctrl-imx.c 2014-05-16 15:28:24.397401219 +0200 @@ -1,7 +1,7 @@ /* * Core driver for the imx pin controller @@ -246628,7 +246303,7 @@ diff -Nur linux-3.10.30.orig/drivers/pinctrl/pinctrl-imx.c linux-linaro-stable-m +#endif diff -Nur linux-3.10.30.orig/drivers/pinctrl/pinctrl-imx.h linux-linaro-stable-mx6/drivers/pinctrl/pinctrl-imx.h --- linux-3.10.30.orig/drivers/pinctrl/pinctrl-imx.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/pinctrl/pinctrl-imx.h 2014-05-15 20:34:01.898041967 +0200 ++++ linux-linaro-stable-mx6/drivers/pinctrl/pinctrl-imx.h 2014-05-16 15:28:24.397401219 +0200 @@ -1,7 +1,7 @@ /* * IMX pinmux core definitions @@ -246662,7 +246337,7 @@ diff -Nur linux-3.10.30.orig/drivers/pinctrl/pinctrl-imx.h linux-linaro-stable-m #endif /* __DRIVERS_PINCTRL_IMX_H */ diff -Nur linux-3.10.30.orig/drivers/pinctrl/pinctrl-vf610.c linux-linaro-stable-mx6/drivers/pinctrl/pinctrl-vf610.c --- linux-3.10.30.orig/drivers/pinctrl/pinctrl-vf610.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/pinctrl/pinctrl-vf610.c 2014-05-15 20:34:01.954042371 +0200 ++++ linux-linaro-stable-mx6/drivers/pinctrl/pinctrl-vf610.c 2014-05-16 15:28:24.405401261 +0200 @@ -0,0 +1,338 @@ +/* + * VF610 pinctrl driver based on imx pinmux and pinconf core @@ -247004,7 +246679,7 @@ diff -Nur linux-3.10.30.orig/drivers/pinctrl/pinctrl-vf610.c linux-linaro-stable +MODULE_LICENSE("GPL v2"); diff -Nur linux-3.10.30.orig/drivers/power/imx6_usb_charger.c linux-linaro-stable-mx6/drivers/power/imx6_usb_charger.c --- linux-3.10.30.orig/drivers/power/imx6_usb_charger.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/power/imx6_usb_charger.c 2014-05-15 20:34:02.266044619 +0200 ++++ linux-linaro-stable-mx6/drivers/power/imx6_usb_charger.c 2014-05-16 15:28:24.437401430 +0200 @@ -0,0 +1,294 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -247302,7 +246977,7 @@ diff -Nur linux-3.10.30.orig/drivers/power/imx6_usb_charger.c linux-linaro-stabl +EXPORT_SYMBOL(imx6_usb_remove_charger); diff -Nur linux-3.10.30.orig/drivers/power/Kconfig linux-linaro-stable-mx6/drivers/power/Kconfig --- linux-3.10.30.orig/drivers/power/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/power/Kconfig 2014-05-15 20:34:02.258044562 +0200 ++++ linux-linaro-stable-mx6/drivers/power/Kconfig 2014-05-16 15:28:24.433401409 +0200 @@ -269,6 +269,14 @@ pins based on the status of charger connections with interrupt handlers. @@ -247333,7 +247008,7 @@ diff -Nur linux-3.10.30.orig/drivers/power/Kconfig linux-linaro-stable-mx6/drive endif # POWER_SUPPLY diff -Nur linux-3.10.30.orig/drivers/power/Makefile linux-linaro-stable-mx6/drivers/power/Makefile --- linux-3.10.30.orig/drivers/power/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/power/Makefile 2014-05-15 20:34:02.258044562 +0200 ++++ linux-linaro-stable-mx6/drivers/power/Makefile 2014-05-16 15:28:24.433401409 +0200 @@ -42,6 +42,7 @@ obj-$(CONFIG_AB8500_BM) += ab8500_bmdata.o ab8500_charger.o ab8500_fg.o ab8500_btemp.o abx500_chargalg.o pm2301_charger.o obj-$(CONFIG_CHARGER_ISP1704) += isp1704_charger.o @@ -247349,7 +247024,7 @@ diff -Nur linux-3.10.30.orig/drivers/power/Makefile linux-linaro-stable-mx6/driv +obj-$(CONFIG_IMX6_USB_CHARGER) += imx6_usb_charger.o diff -Nur linux-3.10.30.orig/drivers/power/reset/Kconfig linux-linaro-stable-mx6/drivers/power/reset/Kconfig --- linux-3.10.30.orig/drivers/power/reset/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/power/reset/Kconfig 2014-05-15 20:34:02.270044648 +0200 ++++ linux-linaro-stable-mx6/drivers/power/reset/Kconfig 2014-05-16 15:28:24.441401452 +0200 @@ -32,7 +32,8 @@ user presses a key. u-boot then boots into Linux. @@ -247362,7 +247037,7 @@ diff -Nur linux-3.10.30.orig/drivers/power/reset/Kconfig linux-linaro-stable-mx6 Power off and reset support for the ARM Ltd. Versatile diff -Nur linux-3.10.30.orig/drivers/power/sabresd_battery.c linux-linaro-stable-mx6/drivers/power/sabresd_battery.c --- linux-3.10.30.orig/drivers/power/sabresd_battery.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/power/sabresd_battery.c 2014-05-15 20:34:02.270044648 +0200 ++++ linux-linaro-stable-mx6/drivers/power/sabresd_battery.c 2014-05-16 15:28:24.441401452 +0200 @@ -0,0 +1,998 @@ +/* + * sabresd_battery.c - Maxim 8903 USB/Adapter Charger Driver @@ -248364,7 +248039,7 @@ diff -Nur linux-3.10.30.orig/drivers/power/sabresd_battery.c linux-linaro-stable +MODULE_ALIAS("sabresd_battery"); diff -Nur linux-3.10.30.orig/drivers/pwm/pwm-imx.c linux-linaro-stable-mx6/drivers/pwm/pwm-imx.c --- linux-3.10.30.orig/drivers/pwm/pwm-imx.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/pwm/pwm-imx.c 2014-05-15 20:34:02.318044993 +0200 ++++ linux-linaro-stable-mx6/drivers/pwm/pwm-imx.c 2014-05-16 15:28:24.449401493 +0200 @@ -1,4 +1,5 @@ /* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -248408,7 +248083,7 @@ diff -Nur linux-3.10.30.orig/drivers/pwm/pwm-imx.c linux-linaro-stable-mx6/drive .remove = imx_pwm_remove, diff -Nur linux-3.10.30.orig/drivers/regulator/anatop-regulator.c linux-linaro-stable-mx6/drivers/regulator/anatop-regulator.c --- linux-3.10.30.orig/drivers/regulator/anatop-regulator.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/regulator/anatop-regulator.c 2014-05-15 20:34:02.378045426 +0200 ++++ linux-linaro-stable-mx6/drivers/regulator/anatop-regulator.c 2014-05-16 15:28:24.457401535 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved. @@ -248536,7 +248211,7 @@ diff -Nur linux-3.10.30.orig/drivers/regulator/anatop-regulator.c linux-linaro-s rdev = regulator_register(rdesc, &config); diff -Nur linux-3.10.30.orig/drivers/regulator/core.c linux-linaro-stable-mx6/drivers/regulator/core.c --- linux-3.10.30.orig/drivers/regulator/core.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/regulator/core.c 2014-05-15 20:34:02.378045426 +0200 ++++ linux-linaro-stable-mx6/drivers/regulator/core.c 2014-05-16 15:28:24.457401535 +0200 @@ -3,6 +3,7 @@ * * Copyright 2007, 2008 Wolfson Microelectronics PLC. @@ -248584,7 +248259,7 @@ diff -Nur linux-3.10.30.orig/drivers/regulator/core.c linux-linaro-stable-mx6/dr rdev_err(rdev, "Failed to request enable GPIO%d: %d\n", diff -Nur linux-3.10.30.orig/drivers/regulator/dummy.c linux-linaro-stable-mx6/drivers/regulator/dummy.c --- linux-3.10.30.orig/drivers/regulator/dummy.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/regulator/dummy.c 2014-05-15 20:34:02.382045455 +0200 ++++ linux-linaro-stable-mx6/drivers/regulator/dummy.c 2014-05-16 15:28:24.457401535 +0200 @@ -44,6 +44,7 @@ config.dev = &pdev->dev; @@ -248595,7 +248270,7 @@ diff -Nur linux-3.10.30.orig/drivers/regulator/dummy.c linux-linaro-stable-mx6/d if (IS_ERR(dummy_regulator_rdev)) { diff -Nur linux-3.10.30.orig/drivers/regulator/fixed.c linux-linaro-stable-mx6/drivers/regulator/fixed.c --- linux-3.10.30.orig/drivers/regulator/fixed.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/regulator/fixed.c 2014-05-15 20:34:02.382045455 +0200 ++++ linux-linaro-stable-mx6/drivers/regulator/fixed.c 2014-05-16 15:28:24.457401535 +0200 @@ -188,8 +188,7 @@ drvdata->microvolts = config->microvolts; @@ -248608,7 +248283,7 @@ diff -Nur linux-3.10.30.orig/drivers/regulator/fixed.c linux-linaro-stable-mx6/d if (config->enable_high) { diff -Nur linux-3.10.30.orig/drivers/regulator/Kconfig linux-linaro-stable-mx6/drivers/regulator/Kconfig --- linux-3.10.30.orig/drivers/regulator/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/regulator/Kconfig 2014-05-15 20:34:02.374045398 +0200 ++++ linux-linaro-stable-mx6/drivers/regulator/Kconfig 2014-05-16 15:28:24.453401514 +0200 @@ -178,6 +178,10 @@ regulator via I2C bus. The provided regulator is suitable for PXA27x chips to control VCC_CORE and VCC_USIM voltages. @@ -248637,7 +248312,7 @@ diff -Nur linux-3.10.30.orig/drivers/regulator/Kconfig linux-linaro-stable-mx6/d depends on MFD_RC5T583 diff -Nur linux-3.10.30.orig/drivers/regulator/Makefile linux-linaro-stable-mx6/drivers/regulator/Makefile --- linux-3.10.30.orig/drivers/regulator/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/regulator/Makefile 2014-05-15 20:34:02.374045398 +0200 ++++ linux-linaro-stable-mx6/drivers/regulator/Makefile 2014-05-16 15:28:24.453401514 +0200 @@ -32,6 +32,7 @@ obj-$(CONFIG_REGULATOR_LP8788) += lp8788-ldo.o obj-$(CONFIG_REGULATOR_LP8755) += lp8755.o @@ -248656,7 +248331,7 @@ diff -Nur linux-3.10.30.orig/drivers/regulator/Makefile linux-linaro-stable-mx6/ obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o diff -Nur linux-3.10.30.orig/drivers/regulator/max17135-regulator.c linux-linaro-stable-mx6/drivers/regulator/max17135-regulator.c --- linux-3.10.30.orig/drivers/regulator/max17135-regulator.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/regulator/max17135-regulator.c 2014-05-15 20:34:02.382045455 +0200 ++++ linux-linaro-stable-mx6/drivers/regulator/max17135-regulator.c 2014-05-16 15:28:24.461401557 +0200 @@ -0,0 +1,838 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -249498,7 +249173,7 @@ diff -Nur linux-3.10.30.orig/drivers/regulator/max17135-regulator.c linux-linaro +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/regulator/pfuze100-regulator.c linux-linaro-stable-mx6/drivers/regulator/pfuze100-regulator.c --- linux-3.10.30.orig/drivers/regulator/pfuze100-regulator.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/regulator/pfuze100-regulator.c 2014-05-15 20:34:02.402045599 +0200 ++++ linux-linaro-stable-mx6/drivers/regulator/pfuze100-regulator.c 2014-05-16 15:28:24.461401557 +0200 @@ -0,0 +1,445 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -249947,7 +249622,7 @@ diff -Nur linux-3.10.30.orig/drivers/regulator/pfuze100-regulator.c linux-linaro +MODULE_ALIAS("i2c:pfuze100-regulator"); diff -Nur linux-3.10.30.orig/drivers/reset/gpio-reset.c linux-linaro-stable-mx6/drivers/reset/gpio-reset.c --- linux-3.10.30.orig/drivers/reset/gpio-reset.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/reset/gpio-reset.c 2014-05-15 20:34:02.438045859 +0200 ++++ linux-linaro-stable-mx6/drivers/reset/gpio-reset.c 2014-05-16 15:28:24.469401599 +0200 @@ -0,0 +1,187 @@ +/* + * GPIO Reset Controller driver @@ -250138,7 +249813,7 @@ diff -Nur linux-3.10.30.orig/drivers/reset/gpio-reset.c linux-linaro-stable-mx6/ +MODULE_DEVICE_TABLE(of, gpio_reset_dt_ids); diff -Nur linux-3.10.30.orig/drivers/reset/Kconfig linux-linaro-stable-mx6/drivers/reset/Kconfig --- linux-3.10.30.orig/drivers/reset/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/reset/Kconfig 2014-05-15 20:34:02.434045830 +0200 ++++ linux-linaro-stable-mx6/drivers/reset/Kconfig 2014-05-16 15:28:24.469401599 +0200 @@ -11,3 +11,15 @@ via GPIOs or SoC-internal reset controller modules. @@ -250157,13 +249832,13 @@ diff -Nur linux-3.10.30.orig/drivers/reset/Kconfig linux-linaro-stable-mx6/drive +endif diff -Nur linux-3.10.30.orig/drivers/reset/Makefile linux-linaro-stable-mx6/drivers/reset/Makefile --- linux-3.10.30.orig/drivers/reset/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/reset/Makefile 2014-05-15 20:34:02.434045830 +0200 ++++ linux-linaro-stable-mx6/drivers/reset/Makefile 2014-05-16 15:28:24.469401599 +0200 @@ -1 +1,2 @@ obj-$(CONFIG_RESET_CONTROLLER) += core.o +obj-$(CONFIG_RESET_GPIO) += gpio-reset.o diff -Nur linux-3.10.30.orig/drivers/rtc/class.c linux-linaro-stable-mx6/drivers/rtc/class.c --- linux-3.10.30.orig/drivers/rtc/class.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/rtc/class.c 2014-05-15 20:34:02.442045887 +0200 ++++ linux-linaro-stable-mx6/drivers/rtc/class.c 2014-05-16 15:28:24.469401599 +0200 @@ -14,6 +14,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt @@ -250247,7 +249922,7 @@ diff -Nur linux-3.10.30.orig/drivers/rtc/class.c linux-linaro-stable-mx6/drivers return 0; diff -Nur linux-3.10.30.orig/drivers/rtc/interface.c linux-linaro-stable-mx6/drivers/rtc/interface.c --- linux-3.10.30.orig/drivers/rtc/interface.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/rtc/interface.c 2014-05-15 20:34:02.442045887 +0200 ++++ linux-linaro-stable-mx6/drivers/rtc/interface.c 2014-05-16 15:28:24.469401599 +0200 @@ -109,9 +109,9 @@ err = rtc->ops->set_time(rtc->dev.parent, &new); @@ -250332,7 +250007,7 @@ diff -Nur linux-3.10.30.orig/drivers/rtc/interface.c linux-linaro-stable-mx6/dri mutex_lock(&rtc->ops_lock); diff -Nur linux-3.10.30.orig/drivers/rtc/rtc-pcf8523.c linux-linaro-stable-mx6/drivers/rtc/rtc-pcf8523.c --- linux-3.10.30.orig/drivers/rtc/rtc-pcf8523.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/rtc/rtc-pcf8523.c 2014-05-15 20:34:02.626047213 +0200 ++++ linux-linaro-stable-mx6/drivers/rtc/rtc-pcf8523.c 2014-05-16 15:28:24.481401663 +0200 @@ -7,6 +7,7 @@ */ @@ -250486,7 +250161,7 @@ diff -Nur linux-3.10.30.orig/drivers/rtc/rtc-pcf8523.c linux-linaro-stable-mx6/d module_i2c_driver(pcf8523_driver); diff -Nur linux-3.10.30.orig/drivers/rtc/rtc-snvs.c linux-linaro-stable-mx6/drivers/rtc/rtc-snvs.c --- linux-3.10.30.orig/drivers/rtc/rtc-snvs.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/rtc/rtc-snvs.c 2014-05-15 20:34:02.634047270 +0200 ++++ linux-linaro-stable-mx6/drivers/rtc/rtc-snvs.c 2014-05-16 15:28:24.485401683 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2012 Freescale Semiconductor, Inc. @@ -250551,7 +250226,7 @@ diff -Nur linux-3.10.30.orig/drivers/rtc/rtc-snvs.c linux-linaro-stable-mx6/driv } diff -Nur linux-3.10.30.orig/drivers/spi/spi-altera.c linux-linaro-stable-mx6/drivers/spi/spi-altera.c --- linux-3.10.30.orig/drivers/spi/spi-altera.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-altera.c 2014-05-15 20:34:04.810062949 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-altera.c 2014-05-16 15:28:24.713402886 +0200 @@ -103,16 +103,6 @@ } } @@ -250605,7 +250280,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-altera.c linux-linaro-stable-mx6/dr } diff -Nur linux-3.10.30.orig/drivers/spi/spi-ath79.c linux-linaro-stable-mx6/drivers/spi/spi-ath79.c --- linux-3.10.30.orig/drivers/spi/spi-ath79.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-ath79.c 2014-05-15 20:34:04.810062949 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-ath79.c 2014-05-16 15:28:24.713402886 +0200 @@ -155,9 +155,6 @@ { int status = 0; @@ -250651,7 +250326,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-ath79.c linux-linaro-stable-mx6/dri return 0; diff -Nur linux-3.10.30.orig/drivers/spi/spi-atmel.c linux-linaro-stable-mx6/drivers/spi/spi-atmel.c --- linux-3.10.30.orig/drivers/spi/spi-atmel.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-atmel.c 2014-05-15 20:34:04.814062977 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-atmel.c 2014-05-16 15:28:24.713402886 +0200 @@ -1268,13 +1268,6 @@ return -EINVAL; } @@ -250677,7 +250352,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-atmel.c linux-linaro-stable-mx6/dri master->num_chipselect = master->dev.of_node ? 0 : 4; diff -Nur linux-3.10.30.orig/drivers/spi/spi-au1550.c linux-linaro-stable-mx6/drivers/spi/spi-au1550.c --- linux-3.10.30.orig/drivers/spi/spi-au1550.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-au1550.c 2014-05-15 20:34:04.814062977 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-au1550.c 2014-05-16 15:28:24.713402886 +0200 @@ -248,11 +248,6 @@ hz = t->speed_hz; } @@ -250722,7 +250397,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-au1550.c linux-linaro-stable-mx6/dr } diff -Nur linux-3.10.30.orig/drivers/spi/spi-bcm63xx.c linux-linaro-stable-mx6/drivers/spi/spi-bcm63xx.c --- linux-3.10.30.orig/drivers/spi/spi-bcm63xx.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-bcm63xx.c 2014-05-15 20:34:04.814062977 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-bcm63xx.c 2014-05-16 15:28:24.713402886 +0200 @@ -124,17 +124,6 @@ /* the spi->mode bits understood by this driver: */ #define MODEBITS (SPI_CPOL | SPI_CPHA) @@ -250787,7 +250462,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-bcm63xx.c linux-linaro-stable-mx6/d return 0; diff -Nur linux-3.10.30.orig/drivers/spi/spi-bfin5xx.c linux-linaro-stable-mx6/drivers/spi/spi-bfin5xx.c --- linux-3.10.30.orig/drivers/spi/spi-bfin5xx.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-bfin5xx.c 2014-05-15 20:34:04.814062977 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-bfin5xx.c 2014-05-16 15:28:24.713402886 +0200 @@ -643,21 +643,16 @@ /* Bits per word setup */ @@ -250862,7 +250537,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-bfin5xx.c linux-linaro-stable-mx6/d diff -Nur linux-3.10.30.orig/drivers/spi/spi-bfin-sport.c linux-linaro-stable-mx6/drivers/spi/spi-bfin-sport.c --- linux-3.10.30.orig/drivers/spi/spi-bfin-sport.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-bfin-sport.c 2014-05-15 20:34:04.814062977 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-bfin-sport.c 2014-05-16 15:28:24.713402886 +0200 @@ -417,7 +417,7 @@ /* Bits per word setup */ @@ -250906,7 +250581,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-bfin-sport.c linux-linaro-stable-mx diff -Nur linux-3.10.30.orig/drivers/spi/spi-bitbang.c linux-linaro-stable-mx6/drivers/spi/spi-bitbang.c --- linux-3.10.30.orig/drivers/spi/spi-bitbang.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-bitbang.c 2014-05-15 20:34:04.814062977 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-bitbang.c 2014-05-16 15:28:24.713402886 +0200 @@ -40,7 +40,7 @@ * to glue code. These bitbang setup() and cleanup() routines are always * used, though maybe they're called from controller-aware code. @@ -251270,7 +250945,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-bitbang.c linux-linaro-stable-mx6/d EXPORT_SYMBOL_GPL(spi_bitbang_stop); diff -Nur linux-3.10.30.orig/drivers/spi/spi-butterfly.c linux-linaro-stable-mx6/drivers/spi/spi-butterfly.c --- linux-3.10.30.orig/drivers/spi/spi-butterfly.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-butterfly.c 2014-05-15 20:34:04.814062977 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-butterfly.c 2014-05-16 15:28:24.713402886 +0200 @@ -225,7 +225,7 @@ master->bus_num = 42; master->num_chipselect = 2; @@ -251282,7 +250957,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-butterfly.c linux-linaro-stable-mx6 diff -Nur linux-3.10.30.orig/drivers/spi/spi.c linux-linaro-stable-mx6/drivers/spi/spi.c --- linux-3.10.30.orig/drivers/spi/spi.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi.c 2014-05-15 20:34:04.982064187 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi.c 2014-05-16 15:28:24.721402927 +0200 @@ -39,6 +39,9 @@ #include <linux/ioport.h> #include <linux/acpi.h> @@ -251894,7 +251569,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi.c linux-linaro-stable-mx6/drivers/s spi_message_add_tail(&x[0], &message); diff -Nur linux-3.10.30.orig/drivers/spi/spi-clps711x.c linux-linaro-stable-mx6/drivers/spi/spi-clps711x.c --- linux-3.10.30.orig/drivers/spi/spi-clps711x.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-clps711x.c 2014-05-15 20:34:04.814062977 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-clps711x.c 2014-05-16 15:28:24.713402886 +0200 @@ -42,12 +42,6 @@ { struct spi_clps711x_data *hw = spi_master_get_devdata(spi->master); @@ -251934,7 +251609,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-clps711x.c linux-linaro-stable-mx6/ diff -Nur linux-3.10.30.orig/drivers/spi/spi-coldfire-qspi.c linux-linaro-stable-mx6/drivers/spi/spi-coldfire-qspi.c --- linux-3.10.30.orig/drivers/spi/spi-coldfire-qspi.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-coldfire-qspi.c 2014-05-15 20:34:04.814062977 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-coldfire-qspi.c 2014-05-16 15:28:24.713402886 +0200 @@ -312,10 +312,7 @@ bool cs_high = spi->mode & SPI_CS_HIGH; u16 qmr = MCFQSPI_QMR_MSTR; @@ -251977,7 +251652,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-coldfire-qspi.c linux-linaro-stable clk_put(mcfqspi->clk); diff -Nur linux-3.10.30.orig/drivers/spi/spi-davinci.c linux-linaro-stable-mx6/drivers/spi/spi-davinci.c --- linux-3.10.30.orig/drivers/spi/spi-davinci.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-davinci.c 2014-05-15 20:34:04.814062977 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-davinci.c 2014-05-16 15:28:24.713402886 +0200 @@ -299,16 +299,15 @@ * Assign function pointer to appropriate transfer method * 8bit, 16bit or 32bit transfer @@ -252056,7 +251731,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-davinci.c linux-linaro-stable-mx6/d } diff -Nur linux-3.10.30.orig/drivers/spi/spi-dw.c linux-linaro-stable-mx6/drivers/spi/spi-dw.c --- linux-3.10.30.orig/drivers/spi/spi-dw.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-dw.c 2014-05-15 20:34:04.814062977 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-dw.c 2014-05-16 15:28:24.713402886 +0200 @@ -457,19 +457,7 @@ } if (transfer->bits_per_word) { @@ -252117,7 +251792,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-dw.c linux-linaro-stable-mx6/driver master->cleanup = dw_spi_cleanup; diff -Nur linux-3.10.30.orig/drivers/spi/spi-dw-mmio.c linux-linaro-stable-mx6/drivers/spi/spi-dw-mmio.c --- linux-3.10.30.orig/drivers/spi/spi-dw-mmio.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-dw-mmio.c 2014-05-15 20:34:04.814062977 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-dw-mmio.c 2014-05-16 15:28:24.713402886 +0200 @@ -111,8 +111,6 @@ struct dw_spi_mmio *dwsmmio = platform_get_drvdata(pdev); struct resource *mem; @@ -252129,7 +251804,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-dw-mmio.c linux-linaro-stable-mx6/d dwsmmio->clk = NULL; diff -Nur linux-3.10.30.orig/drivers/spi/spi-ep93xx.c linux-linaro-stable-mx6/drivers/spi/spi-ep93xx.c --- linux-3.10.30.orig/drivers/spi/spi-ep93xx.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-ep93xx.c 2014-05-15 20:34:04.814062977 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-ep93xx.c 2014-05-16 15:28:24.713402886 +0200 @@ -296,12 +296,6 @@ struct ep93xx_spi *espi = spi_master_get_devdata(spi->master); struct ep93xx_spi_chip *chip; @@ -252180,7 +251855,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-ep93xx.c linux-linaro-stable-mx6/dr return 0; diff -Nur linux-3.10.30.orig/drivers/spi/spi-fsl-espi.c linux-linaro-stable-mx6/drivers/spi/spi-fsl-espi.c --- linux-3.10.30.orig/drivers/spi/spi-fsl-espi.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-fsl-espi.c 2014-05-15 20:34:04.814062977 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-fsl-espi.c 2014-05-16 15:28:24.713402886 +0200 @@ -144,10 +144,6 @@ if (!bits_per_word) bits_per_word = spi->bits_per_word; @@ -252216,7 +251891,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-fsl-espi.c linux-linaro-stable-mx6/ mpc8xxx_spi = spi_master_get_devdata(master); diff -Nur linux-3.10.30.orig/drivers/spi/spi-gpio.c linux-linaro-stable-mx6/drivers/spi/spi-gpio.c --- linux-3.10.30.orig/drivers/spi/spi-gpio.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-gpio.c 2014-05-15 20:34:04.814062977 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-gpio.c 2014-05-16 15:28:24.713402886 +0200 @@ -239,9 +239,6 @@ struct spi_gpio *spi_gpio = spi_to_spi_gpio(spi); struct device_node *np = spi->master->dev.of_node; @@ -252271,7 +251946,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-gpio.c linux-linaro-stable-mx6/driv } diff -Nur linux-3.10.30.orig/drivers/spi/spi-imx.c linux-linaro-stable-mx6/drivers/spi/spi-imx.c --- linux-3.10.30.orig/drivers/spi/spi-imx.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-imx.c 2014-05-15 20:34:04.846063208 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-imx.c 2014-05-16 15:28:24.717402907 +0200 @@ -37,7 +37,6 @@ #include <linux/of.h> #include <linux/of_device.h> @@ -252520,7 +252195,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-imx.c linux-linaro-stable-mx6/drive diff -Nur linux-3.10.30.orig/drivers/spi/spi-lm70llp.c linux-linaro-stable-mx6/drivers/spi/spi-lm70llp.c --- linux-3.10.30.orig/drivers/spi/spi-lm70llp.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-lm70llp.c 2014-05-15 20:34:04.846063208 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-lm70llp.c 2014-05-16 15:28:24.717402907 +0200 @@ -222,7 +222,7 @@ /* * SPI and bitbang hookup. @@ -252532,7 +252207,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-lm70llp.c linux-linaro-stable-mx6/d pp->bitbang.flags = SPI_3WIRE; diff -Nur linux-3.10.30.orig/drivers/spi/spi-mxs.c linux-linaro-stable-mx6/drivers/spi/spi-mxs.c --- linux-3.10.30.orig/drivers/spi/spi-mxs.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-mxs.c 2014-05-15 20:34:04.918063726 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-mxs.c 2014-05-16 15:28:24.717402907 +0200 @@ -75,12 +75,6 @@ if (t && t->bits_per_word) bits_per_word = t->bits_per_word; @@ -252556,7 +252231,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-mxs.c linux-linaro-stable-mx6/drive master->dev.of_node = np; diff -Nur linux-3.10.30.orig/drivers/spi/spi-nuc900.c linux-linaro-stable-mx6/drivers/spi/spi-nuc900.c --- linux-3.10.30.orig/drivers/spi/spi-nuc900.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-nuc900.c 2014-05-15 20:34:04.918063726 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-nuc900.c 2014-05-16 15:28:24.717402907 +0200 @@ -174,17 +174,6 @@ spin_unlock_irqrestore(&hw->lock, flags); } @@ -252588,7 +252263,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-nuc900.c linux-linaro-stable-mx6/dr if (hw->res == NULL) { diff -Nur linux-3.10.30.orig/drivers/spi/spi-oc-tiny.c linux-linaro-stable-mx6/drivers/spi/spi-oc-tiny.c --- linux-3.10.30.orig/drivers/spi/spi-oc-tiny.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-oc-tiny.c 2014-05-15 20:34:04.918063726 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-oc-tiny.c 2014-05-16 15:28:24.717402907 +0200 @@ -306,7 +306,7 @@ platform_set_drvdata(pdev, hw); @@ -252616,7 +252291,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-oc-tiny.c linux-linaro-stable-mx6/d } diff -Nur linux-3.10.30.orig/drivers/spi/spi-omap-100k.c linux-linaro-stable-mx6/drivers/spi/spi-omap-100k.c --- linux-3.10.30.orig/drivers/spi/spi-omap-100k.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-omap-100k.c 2014-05-15 20:34:04.918063726 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-omap-100k.c 2014-05-16 15:28:24.717402907 +0200 @@ -298,12 +298,6 @@ struct omap1_spi100k *spi100k; struct omap1_spi100k_cs *cs = spi->controller_state; @@ -252652,7 +252327,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-omap-100k.c linux-linaro-stable-mx6 diff -Nur linux-3.10.30.orig/drivers/spi/spi-omap2-mcspi.c linux-linaro-stable-mx6/drivers/spi/spi-omap2-mcspi.c --- linux-3.10.30.orig/drivers/spi/spi-omap2-mcspi.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-omap2-mcspi.c 2014-05-15 20:34:04.918063726 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-omap2-mcspi.c 2014-05-16 15:28:24.717402907 +0200 @@ -857,12 +857,6 @@ struct omap2_mcspi_dma *mcspi_dma; struct omap2_mcspi_cs *cs = spi->controller_state; @@ -252689,7 +252364,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-omap2-mcspi.c linux-linaro-stable-m master->unprepare_transfer_hardware = omap2_unprepare_transfer; diff -Nur linux-3.10.30.orig/drivers/spi/spi-ppc4xx.c linux-linaro-stable-mx6/drivers/spi/spi-ppc4xx.c --- linux-3.10.30.orig/drivers/spi/spi-ppc4xx.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-ppc4xx.c 2014-05-15 20:34:04.918063726 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-ppc4xx.c 2014-05-16 15:28:24.717402907 +0200 @@ -190,12 +190,6 @@ speed = min(t->speed_hz, spi->max_speed_hz); } @@ -252726,7 +252401,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-ppc4xx.c linux-linaro-stable-mx6/dr bbp->master->mode_bits = diff -Nur linux-3.10.30.orig/drivers/spi/spi-pxa2xx.c linux-linaro-stable-mx6/drivers/spi/spi-pxa2xx.c --- linux-3.10.30.orig/drivers/spi/spi-pxa2xx.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-pxa2xx.c 2014-05-15 20:34:04.978064159 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-pxa2xx.c 2014-05-16 15:28:24.717402907 +0200 @@ -881,21 +881,6 @@ rx_thres = RX_THRESH_DFLT; } @@ -252785,7 +252460,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-pxa2xx.c linux-linaro-stable-mx6/dr diff -Nur linux-3.10.30.orig/drivers/spi/spi-s3c64xx.c linux-linaro-stable-mx6/drivers/spi/spi-s3c64xx.c --- linux-3.10.30.orig/drivers/spi/spi-s3c64xx.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-s3c64xx.c 2014-05-15 20:34:04.978064159 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-s3c64xx.c 2014-05-16 15:28:24.717402907 +0200 @@ -1314,7 +1314,8 @@ master->unprepare_transfer_hardware = s3c64xx_spi_unprepare_transfer; master->num_chipselect = sci->num_cs; @@ -252814,7 +252489,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-s3c64xx.c linux-linaro-stable-mx6/d return 0; diff -Nur linux-3.10.30.orig/drivers/spi/spi-sirf.c linux-linaro-stable-mx6/drivers/spi/spi-sirf.c --- linux-3.10.30.orig/drivers/spi/spi-sirf.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-sirf.c 2014-05-15 20:34:04.978064159 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-sirf.c 2014-05-16 15:28:24.721402927 +0200 @@ -425,10 +425,6 @@ rxfifo_ctrl = SIRFSOC_SPI_FIFO_THD(SIRFSOC_SPI_FIFO_SIZE / 2) | SIRFSOC_SPI_FIFO_WIDTH_DWORD; @@ -252844,7 +252519,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-sirf.c linux-linaro-stable-mx6/driv sspi->p = pinctrl_get_select_default(&pdev->dev); diff -Nur linux-3.10.30.orig/drivers/spi/spi-ti-ssp.c linux-linaro-stable-mx6/drivers/spi/spi-ti-ssp.c --- linux-3.10.30.orig/drivers/spi/spi-ti-ssp.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-ti-ssp.c 2014-05-15 20:34:04.982064187 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-ti-ssp.c 2014-05-16 15:28:24.721402927 +0200 @@ -237,14 +237,6 @@ spin_unlock(&hw->lock); } @@ -252885,7 +252560,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-ti-ssp.c linux-linaro-stable-mx6/dr error = spi_register_master(master); diff -Nur linux-3.10.30.orig/drivers/spi/spi-topcliff-pch.c linux-linaro-stable-mx6/drivers/spi/spi-topcliff-pch.c --- linux-3.10.30.orig/drivers/spi/spi-topcliff-pch.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-topcliff-pch.c 2014-05-15 20:34:04.982064187 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-topcliff-pch.c 2014-05-16 15:28:24.721402927 +0200 @@ -472,11 +472,6 @@ dev_dbg(&pspi->dev, "%s 8 bits per word\n", __func__); } @@ -252926,7 +252601,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-topcliff-pch.c linux-linaro-stable- data->plat_dev = plat_dev; diff -Nur linux-3.10.30.orig/drivers/spi/spi-txx9.c linux-linaro-stable-mx6/drivers/spi/spi-txx9.c --- linux-3.10.30.orig/drivers/spi/spi-txx9.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-txx9.c 2014-05-15 20:34:04.982064187 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-txx9.c 2014-05-16 15:28:24.721402927 +0200 @@ -116,17 +116,12 @@ static int txx9spi_setup(struct spi_device *spi) { @@ -252964,7 +252639,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-txx9.c linux-linaro-stable-mx6/driv if (ret) diff -Nur linux-3.10.30.orig/drivers/spi/spi-xcomm.c linux-linaro-stable-mx6/drivers/spi/spi-xcomm.c --- linux-3.10.30.orig/drivers/spi/spi-xcomm.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-xcomm.c 2014-05-15 20:34:04.982064187 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-xcomm.c 2014-05-16 15:28:24.721402927 +0200 @@ -76,7 +76,7 @@ { unsigned int speed; @@ -253001,7 +252676,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-xcomm.c linux-linaro-stable-mx6/dri i2c_set_clientdata(i2c, master); diff -Nur linux-3.10.30.orig/drivers/spi/spi-xilinx.c linux-linaro-stable-mx6/drivers/spi/spi-xilinx.c --- linux-3.10.30.orig/drivers/spi/spi-xilinx.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/spi/spi-xilinx.c 2014-05-15 20:34:04.982064187 +0200 ++++ linux-linaro-stable-mx6/drivers/spi/spi-xilinx.c 2014-05-16 15:28:24.721402927 +0200 @@ -232,21 +232,6 @@ return 0; } @@ -253039,7 +252714,7 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-xilinx.c linux-linaro-stable-mx6/dr if (!request_mem_region(mem->start, resource_size(mem), diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/dw-hdmi-audio.c linux-linaro-stable-mx6/drivers/staging/imx-drm/dw-hdmi-audio.c --- linux-3.10.30.orig/drivers/staging/imx-drm/dw-hdmi-audio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/dw-hdmi-audio.c 2014-05-15 20:34:05.754069749 +0200 ++++ linux-linaro-stable-mx6/drivers/staging/imx-drm/dw-hdmi-audio.c 2014-05-16 15:28:24.869403709 +0200 @@ -0,0 +1,550 @@ +/* + * DesignWare HDMI audio driver @@ -253593,7 +253268,7 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/dw-hdmi-audio.c linux-linar +} diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/dw-hdmi-audio.h linux-linaro-stable-mx6/drivers/staging/imx-drm/dw-hdmi-audio.h --- linux-3.10.30.orig/drivers/staging/imx-drm/dw-hdmi-audio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/dw-hdmi-audio.h 2014-05-15 20:34:05.754069749 +0200 ++++ linux-linaro-stable-mx6/drivers/staging/imx-drm/dw-hdmi-audio.h 2014-05-16 15:28:24.869403709 +0200 @@ -0,0 +1,13 @@ +#ifndef DW_HDMI_AUDIO_H +#define DW_HDMI_AUDIO_H @@ -253610,7 +253285,7 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/dw-hdmi-audio.h linux-linar +#endif diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/dw-hdmi-cec.c linux-linaro-stable-mx6/drivers/staging/imx-drm/dw-hdmi-cec.c --- linux-3.10.30.orig/drivers/staging/imx-drm/dw-hdmi-cec.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/dw-hdmi-cec.c 2014-05-15 20:34:05.754069749 +0200 ++++ linux-linaro-stable-mx6/drivers/staging/imx-drm/dw-hdmi-cec.c 2014-05-16 15:28:24.869403709 +0200 @@ -0,0 +1,561 @@ +/* http://git.freescale.com/git/cgit.cgi/imx/linux-2.6-imx.git/tree/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c?h=imx_3.0.35_4.1.0 */ +#include <linux/cdev.h> @@ -254175,7 +253850,7 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/dw-hdmi-cec.c linux-linaro- +MODULE_ALIAS(PLATFORM_MODULE_PREFIX "dw-hdmi-cec"); diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/dw-hdmi-cec.h linux-linaro-stable-mx6/drivers/staging/imx-drm/dw-hdmi-cec.h --- linux-3.10.30.orig/drivers/staging/imx-drm/dw-hdmi-cec.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/dw-hdmi-cec.h 2014-05-15 20:34:05.754069749 +0200 ++++ linux-linaro-stable-mx6/drivers/staging/imx-drm/dw-hdmi-cec.h 2014-05-16 15:28:24.869403709 +0200 @@ -0,0 +1,16 @@ +#ifndef DW_HDMI_CEC_H +#define DW_HDMI_CEC_H @@ -254195,7 +253870,7 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/dw-hdmi-cec.h linux-linaro- +#endif diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-drm-core.c linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-drm-core.c --- linux-3.10.30.orig/drivers/staging/imx-drm/imx-drm-core.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-drm-core.c 2014-05-15 20:34:05.754069749 +0200 ++++ linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-drm-core.c 2014-05-16 15:28:24.869403709 +0200 @@ -13,14 +13,14 @@ * GNU General Public License for more details. * @@ -255375,7 +255050,7 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-drm-core.c linux-linaro MODULE_DESCRIPTION("i.MX drm driver core"); diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-drm.h linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-drm.h --- linux-3.10.30.orig/drivers/staging/imx-drm/imx-drm.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-drm.h 2014-05-15 20:34:05.754069749 +0200 ++++ linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-drm.h 2014-05-16 15:28:24.869403709 +0200 @@ -5,15 +5,19 @@ #define IPU_PIX_FMT_GBR24 v4l2_fourcc('G', 'B', 'R', '3') @@ -255587,7 +255262,7 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-fbdev.c linux-linaro-st -MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-hdmi.c linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-hdmi.c --- linux-3.10.30.orig/drivers/staging/imx-drm/imx-hdmi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-hdmi.c 2014-05-15 20:34:05.754069749 +0200 ++++ linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-hdmi.c 2014-05-16 15:28:24.869403709 +0200 @@ -0,0 +1,1842 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. @@ -257433,7 +257108,7 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-hdmi.c linux-linaro-sta +MODULE_ALIAS("platform:imx-hdmi"); diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-hdmi.h linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-hdmi.h --- linux-3.10.30.orig/drivers/staging/imx-drm/imx-hdmi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-hdmi.h 2014-05-15 20:34:05.754069749 +0200 ++++ linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-hdmi.h 2014-05-16 15:28:24.869403709 +0200 @@ -0,0 +1,1040 @@ +/* + * Copyright (C) 2011 Freescale Semiconductor, Inc. @@ -258477,7 +258152,7 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-hdmi.h linux-linaro-sta +#endif /* __IMX_HDMI_H__ */ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-ldb.c linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-ldb.c --- linux-3.10.30.orig/drivers/staging/imx-drm/imx-ldb.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-ldb.c 2014-05-15 20:34:05.754069749 +0200 ++++ linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-ldb.c 2014-05-16 15:28:24.869403709 +0200 @@ -0,0 +1,606 @@ +/* + * i.MX drm driver - LVDS display bridge @@ -259087,7 +258762,7 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-ldb.c linux-linaro-stab +MODULE_ALIAS("platform:" DRIVER_NAME); diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-tve.c linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-tve.c --- linux-3.10.30.orig/drivers/staging/imx-drm/imx-tve.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-tve.c 2014-05-15 20:34:05.754069749 +0200 ++++ linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-tve.c 2014-05-16 15:28:24.873403730 +0200 @@ -20,9 +20,9 @@ #include <linux/clk.h> @@ -259507,7 +259182,7 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-tve.c linux-linaro-stab +MODULE_ALIAS("platform:imx-tve"); diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h --- linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h 2014-05-15 20:34:05.754069749 +0200 ++++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h 2014-05-16 15:28:24.873403730 +0200 @@ -97,6 +97,7 @@ int ipu_idmac_enable_channel(struct ipuv3_channel *channel); @@ -259543,7 +259218,7 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h linux-l #endif /* __DRM_IPU_H__ */ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-common.c linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-common.c --- linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-common.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-common.c 2014-05-15 20:34:05.754069749 +0200 ++++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-common.c 2014-05-16 15:28:24.873403730 +0200 @@ -27,8 +27,11 @@ #include <linux/list.h> #include <linux/irq.h> @@ -260131,7 +259806,7 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-common.c linux-l MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-dc.c linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-dc.c --- linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-dc.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-dc.c 2014-05-15 20:34:05.754069749 +0200 ++++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-dc.c 2014-05-16 15:28:24.873403730 +0200 @@ -91,6 +91,7 @@ IPU_DC_MAP_RGB565, IPU_DC_MAP_GBR24, /* TVEv2 */ @@ -260200,7 +259875,7 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-dc.c linux-linar diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-di.c linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-di.c --- linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-di.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-di.c 2014-05-15 20:34:05.758069778 +0200 ++++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-di.c 2014-05-16 15:28:24.873403730 +0200 @@ -19,9 +19,6 @@ #include <linux/io.h> #include <linux/err.h> @@ -260638,7 +260313,7 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-di.c linux-linar } diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c --- linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c 2014-05-15 20:34:05.758069778 +0200 ++++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c 2014-05-16 15:28:24.873403730 +0200 @@ -61,7 +61,7 @@ static const struct dmfc_channel_data dmfcdata[] = { @@ -260703,7 +260378,7 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c linux-lin priv->bandwidth_per_slot / 1000000); diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-dp.c linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-dp.c --- linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-dp.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-dp.c 2014-05-15 20:34:05.758069778 +0200 ++++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-dp.c 2014-05-16 15:28:24.873403730 +0200 @@ -46,6 +46,8 @@ #define DP_COM_CONF_CSC_DEF_BG (2 << 8) #define DP_COM_CONF_CSC_DEF_BOTH (1 << 8) @@ -260759,7 +260434,7 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-dp.c linux-linar } diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-prv.h linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-prv.h --- linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-prv.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-prv.h 2014-05-15 20:34:05.758069778 +0200 ++++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipu-v3/ipu-prv.h 2014-05-16 15:28:24.873403730 +0200 @@ -110,7 +110,7 @@ #define IDMAC_BAND_EN(ch) IPU_IDMAC_REG(0x0040 + 4 * ((ch) / 32)) #define IDMAC_CHA_BUSY(ch) IPU_IDMAC_REG(0x0100 + 4 * ((ch) / 32)) @@ -260782,7 +260457,7 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-prv.h linux-lina struct ipu_dp_priv *dp_priv; diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipuv3-crtc.c linux-linaro-stable-mx6/drivers/staging/imx-drm/ipuv3-crtc.c --- linux-3.10.30.orig/drivers/staging/imx-drm/ipuv3-crtc.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipuv3-crtc.c 2014-05-15 20:34:05.758069778 +0200 ++++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipuv3-crtc.c 2014-05-16 15:28:24.873403730 +0200 @@ -17,44 +17,36 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. @@ -261299,7 +260974,7 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipuv3-crtc.c linux-linaro-s +MODULE_ALIAS("platform:imx-ipuv3-crtc"); diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipuv3-plane.c linux-linaro-stable-mx6/drivers/staging/imx-drm/ipuv3-plane.c --- linux-3.10.30.orig/drivers/staging/imx-drm/ipuv3-plane.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipuv3-plane.c 2014-05-15 20:34:05.758069778 +0200 ++++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipuv3-plane.c 2014-05-16 15:28:24.873403730 +0200 @@ -0,0 +1,375 @@ +/* + * i.MX IPUv3 DP Overlay Planes @@ -261678,7 +261353,7 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipuv3-plane.c linux-linaro- +} diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipuv3-plane.h linux-linaro-stable-mx6/drivers/staging/imx-drm/ipuv3-plane.h --- linux-3.10.30.orig/drivers/staging/imx-drm/ipuv3-plane.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipuv3-plane.h 2014-05-15 20:34:05.758069778 +0200 ++++ linux-linaro-stable-mx6/drivers/staging/imx-drm/ipuv3-plane.h 2014-05-16 15:28:24.873403730 +0200 @@ -0,0 +1,55 @@ +#ifndef __IPUV3_PLANE_H__ +#define __IPUV3_PLANE_H__ @@ -261737,7 +261412,7 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipuv3-plane.h linux-linaro- +#endif diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/Kconfig linux-linaro-stable-mx6/drivers/staging/imx-drm/Kconfig --- linux-3.10.30.orig/drivers/staging/imx-drm/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/Kconfig 2014-05-15 20:34:05.754069749 +0200 ++++ linux-linaro-stable-mx6/drivers/staging/imx-drm/Kconfig 2014-05-16 15:28:24.869403709 +0200 @@ -1,6 +1,7 @@ config DRM_IMX tristate "DRM Support for Freescale i.MX" @@ -261789,7 +261464,7 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/Kconfig linux-linaro-stable + the i.MX HDMI driver. diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/Makefile linux-linaro-stable-mx6/drivers/staging/imx-drm/Makefile --- linux-3.10.30.orig/drivers/staging/imx-drm/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/Makefile 2014-05-15 20:34:05.754069749 +0200 ++++ linux-linaro-stable-mx6/drivers/staging/imx-drm/Makefile 2014-05-16 15:28:24.869403709 +0200 @@ -1,10 +1,15 @@ -imxdrm-objs := imx-drm-core.o imx-fb.o @@ -261811,7 +261486,7 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/Makefile linux-linaro-stabl +obj-$(CONFIG_DRM_DW_HDMI_CEC) += dw-hdmi-cec.o diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/parallel-display.c linux-linaro-stable-mx6/drivers/staging/imx-drm/parallel-display.c --- linux-3.10.30.orig/drivers/staging/imx-drm/parallel-display.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/parallel-display.c 2014-05-15 20:34:05.758069778 +0200 ++++ linux-linaro-stable-mx6/drivers/staging/imx-drm/parallel-display.c 2014-05-16 15:28:24.873403730 +0200 @@ -18,12 +18,12 @@ * MA 02110-1301, USA. */ @@ -262047,7 +261722,7 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/parallel-display.c linux-li +MODULE_ALIAS("platform:imx-parallel-display"); diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/TODO linux-linaro-stable-mx6/drivers/staging/imx-drm/TODO --- linux-3.10.30.orig/drivers/staging/imx-drm/TODO 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/TODO 2014-05-15 20:34:05.754069749 +0200 ++++ linux-linaro-stable-mx6/drivers/staging/imx-drm/TODO 2014-05-16 15:28:24.869403709 +0200 @@ -6,12 +6,9 @@ - Factor out more code to common helper functions - decide where to put the base driver. It is not specific to a subsystem @@ -262063,7 +261738,7 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/TODO linux-linaro-stable-mx - Add support for CSI (CMOS Sensor interface) diff -Nur linux-3.10.30.orig/drivers/thermal/cpu_cooling.c linux-linaro-stable-mx6/drivers/thermal/cpu_cooling.c --- linux-3.10.30.orig/drivers/thermal/cpu_cooling.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/thermal/cpu_cooling.c 2014-05-15 20:34:07.542082630 +0200 ++++ linux-linaro-stable-mx6/drivers/thermal/cpu_cooling.c 2014-05-16 15:28:25.085404847 +0200 @@ -167,7 +167,7 @@ continue; @@ -262075,7 +261750,7 @@ diff -Nur linux-3.10.30.orig/drivers/thermal/cpu_cooling.c linux-linaro-stable-m freq = table[i].frequency; diff -Nur linux-3.10.30.orig/drivers/thermal/device_cooling.c linux-linaro-stable-mx6/drivers/thermal/device_cooling.c --- linux-3.10.30.orig/drivers/thermal/device_cooling.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/thermal/device_cooling.c 2014-05-15 20:34:07.542082630 +0200 ++++ linux-linaro-stable-mx6/drivers/thermal/device_cooling.c 2014-05-16 15:28:25.085404847 +0200 @@ -0,0 +1,151 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -262230,7 +261905,7 @@ diff -Nur linux-3.10.30.orig/drivers/thermal/device_cooling.c linux-linaro-stabl +EXPORT_SYMBOL_GPL(devfreq_cooling_unregister); diff -Nur linux-3.10.30.orig/drivers/thermal/imx_thermal.c linux-linaro-stable-mx6/drivers/thermal/imx_thermal.c --- linux-3.10.30.orig/drivers/thermal/imx_thermal.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/thermal/imx_thermal.c 2014-05-15 20:34:07.586082947 +0200 ++++ linux-linaro-stable-mx6/drivers/thermal/imx_thermal.c 2014-05-16 15:28:25.085404847 +0200 @@ -0,0 +1,471 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -262705,7 +262380,7 @@ diff -Nur linux-3.10.30.orig/drivers/thermal/imx_thermal.c linux-linaro-stable-m +MODULE_ALIAS("platform:imx-thermal"); diff -Nur linux-3.10.30.orig/drivers/thermal/Kconfig linux-linaro-stable-mx6/drivers/thermal/Kconfig --- linux-3.10.30.orig/drivers/thermal/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/thermal/Kconfig 2014-05-15 20:34:07.542082630 +0200 ++++ linux-linaro-stable-mx6/drivers/thermal/Kconfig 2014-05-16 15:28:25.085404847 +0200 @@ -91,6 +91,24 @@ because userland can easily disable the thermal policy by simply flooding this sysfs node with low temperature values. @@ -262733,7 +262408,7 @@ diff -Nur linux-3.10.30.orig/drivers/thermal/Kconfig linux-linaro-stable-mx6/dri depends on PLAT_SPEAR diff -Nur linux-3.10.30.orig/drivers/thermal/Makefile linux-linaro-stable-mx6/drivers/thermal/Makefile --- linux-3.10.30.orig/drivers/thermal/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/thermal/Makefile 2014-05-15 20:34:07.542082630 +0200 ++++ linux-linaro-stable-mx6/drivers/thermal/Makefile 2014-05-16 15:28:25.085404847 +0200 @@ -21,6 +21,8 @@ obj-$(CONFIG_DOVE_THERMAL) += dove_thermal.o obj-$(CONFIG_DB8500_THERMAL) += db8500_thermal.o @@ -262745,7 +262420,7 @@ diff -Nur linux-3.10.30.orig/drivers/thermal/Makefile linux-linaro-stable-mx6/dr diff -Nur linux-3.10.30.orig/drivers/tty/serial/ar933x_uart.c linux-linaro-stable-mx6/drivers/tty/serial/ar933x_uart.c --- linux-3.10.30.orig/drivers/tty/serial/ar933x_uart.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/tty/serial/ar933x_uart.c 2014-05-15 20:34:07.730083984 +0200 ++++ linux-linaro-stable-mx6/drivers/tty/serial/ar933x_uart.c 2014-05-16 15:28:25.105404953 +0200 @@ -703,7 +703,6 @@ struct ar933x_uart_port *up; @@ -262756,7 +262431,7 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/ar933x_uart.c linux-linaro-stabl uart_remove_one_port(&ar933x_uart_driver, &up->port); diff -Nur linux-3.10.30.orig/drivers/tty/serial/atmel_serial.c linux-linaro-stable-mx6/drivers/tty/serial/atmel_serial.c --- linux-3.10.30.orig/drivers/tty/serial/atmel_serial.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/tty/serial/atmel_serial.c 2014-05-15 20:34:07.730083984 +0200 ++++ linux-linaro-stable-mx6/drivers/tty/serial/atmel_serial.c 2014-05-16 15:28:25.105404953 +0200 @@ -1853,7 +1853,6 @@ int ret = 0; @@ -262767,7 +262442,7 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/atmel_serial.c linux-linaro-stab diff -Nur linux-3.10.30.orig/drivers/tty/serial/bcm63xx_uart.c linux-linaro-stable-mx6/drivers/tty/serial/bcm63xx_uart.c --- linux-3.10.30.orig/drivers/tty/serial/bcm63xx_uart.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/tty/serial/bcm63xx_uart.c 2014-05-15 20:34:07.730083984 +0200 ++++ linux-linaro-stable-mx6/drivers/tty/serial/bcm63xx_uart.c 2014-05-16 15:28:25.105404953 +0200 @@ -852,7 +852,6 @@ port = platform_get_drvdata(pdev); @@ -262778,7 +262453,7 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/bcm63xx_uart.c linux-linaro-stab return 0; diff -Nur linux-3.10.30.orig/drivers/tty/serial/clps711x.c linux-linaro-stable-mx6/drivers/tty/serial/clps711x.c --- linux-3.10.30.orig/drivers/tty/serial/clps711x.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/tty/serial/clps711x.c 2014-05-15 20:34:07.758084186 +0200 ++++ linux-linaro-stable-mx6/drivers/tty/serial/clps711x.c 2014-05-16 15:28:25.109404974 +0200 @@ -438,8 +438,7 @@ s->uart_clk = devm_clk_get(&pdev->dev, "uart"); if (IS_ERR(s->uart_clk)) { @@ -262820,7 +262495,7 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/clps711x.c linux-linaro-stable-m } diff -Nur linux-3.10.30.orig/drivers/tty/serial/efm32-uart.c linux-linaro-stable-mx6/drivers/tty/serial/efm32-uart.c --- linux-3.10.30.orig/drivers/tty/serial/efm32-uart.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/tty/serial/efm32-uart.c 2014-05-15 20:34:07.766084243 +0200 ++++ linux-linaro-stable-mx6/drivers/tty/serial/efm32-uart.c 2014-05-16 15:28:25.109404974 +0200 @@ -778,8 +778,6 @@ { struct efm32_uart_port *efm_port = platform_get_drvdata(pdev); @@ -262832,7 +262507,7 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/efm32-uart.c linux-linaro-stable if (pdev->id >= 0 && pdev->id < ARRAY_SIZE(efm32_uart_ports)) diff -Nur linux-3.10.30.orig/drivers/tty/serial/fsl_lpuart.c linux-linaro-stable-mx6/drivers/tty/serial/fsl_lpuart.c --- linux-3.10.30.orig/drivers/tty/serial/fsl_lpuart.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/tty/serial/fsl_lpuart.c 2014-05-15 20:34:07.766084243 +0200 ++++ linux-linaro-stable-mx6/drivers/tty/serial/fsl_lpuart.c 2014-05-16 15:28:25.109404974 +0200 @@ -0,0 +1,879 @@ +/* + * Freescale lpuart serial port driver @@ -263715,7 +263390,7 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/fsl_lpuart.c linux-linaro-stable +MODULE_LICENSE("GPL v2"); diff -Nur linux-3.10.30.orig/drivers/tty/serial/imx.c linux-linaro-stable-mx6/drivers/tty/serial/imx.c --- linux-3.10.30.orig/drivers/tty/serial/imx.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/tty/serial/imx.c 2014-05-15 20:34:07.802084503 +0200 ++++ linux-linaro-stable-mx6/drivers/tty/serial/imx.c 2014-05-16 15:28:25.113404995 +0200 @@ -47,11 +47,12 @@ #include <linux/slab.h> #include <linux/of.h> @@ -264603,7 +264278,7 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/imx.c linux-linaro-stable-mx6/dr diff -Nur linux-3.10.30.orig/drivers/tty/serial/Kconfig linux-linaro-stable-mx6/drivers/tty/serial/Kconfig --- linux-3.10.30.orig/drivers/tty/serial/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/tty/serial/Kconfig 2014-05-15 20:34:07.714083869 +0200 ++++ linux-linaro-stable-mx6/drivers/tty/serial/Kconfig 2014-05-16 15:28:25.105404953 +0200 @@ -1484,6 +1484,20 @@ If multiple cards are present, the default limit of 32 ports may need to be increased. @@ -264627,7 +264302,7 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/Kconfig linux-linaro-stable-mx6/ endif # TTY diff -Nur linux-3.10.30.orig/drivers/tty/serial/Makefile linux-linaro-stable-mx6/drivers/tty/serial/Makefile --- linux-3.10.30.orig/drivers/tty/serial/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/tty/serial/Makefile 2014-05-15 20:34:07.714083869 +0200 ++++ linux-linaro-stable-mx6/drivers/tty/serial/Makefile 2014-05-16 15:28:25.105404953 +0200 @@ -85,3 +85,4 @@ obj-$(CONFIG_SERIAL_EFM32_UART) += efm32-uart.o obj-$(CONFIG_SERIAL_ARC) += arc_uart.o @@ -264635,7 +264310,7 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/Makefile linux-linaro-stable-mx6 +obj-$(CONFIG_SERIAL_FSL_LPUART) += fsl_lpuart.o diff -Nur linux-3.10.30.orig/drivers/tty/serial/mpc52xx_uart.c linux-linaro-stable-mx6/drivers/tty/serial/mpc52xx_uart.c --- linux-3.10.30.orig/drivers/tty/serial/mpc52xx_uart.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/tty/serial/mpc52xx_uart.c 2014-05-15 20:34:07.838084762 +0200 ++++ linux-linaro-stable-mx6/drivers/tty/serial/mpc52xx_uart.c 2014-05-16 15:28:25.117405017 +0200 @@ -84,16 +84,6 @@ static irqreturn_t mpc52xx_uart_int(int irq, void *dev_id); static irqreturn_t mpc5xxx_uart_process_int(struct uart_port *port); @@ -264655,7 +264330,7 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/mpc52xx_uart.c linux-linaro-stab /* ======================================================================== */ diff -Nur linux-3.10.30.orig/drivers/tty/serial/mxs-auart.c linux-linaro-stable-mx6/drivers/tty/serial/mxs-auart.c --- linux-3.10.30.orig/drivers/tty/serial/mxs-auart.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/tty/serial/mxs-auart.c 2014-05-15 20:34:07.850084848 +0200 ++++ linux-linaro-stable-mx6/drivers/tty/serial/mxs-auart.c 2014-05-16 15:28:25.117405017 +0200 @@ -32,7 +32,6 @@ #include <linux/clk.h> #include <linux/delay.h> @@ -264687,7 +264362,7 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/mxs-auart.c linux-linaro-stable- s->devtype = pdev->id_entry->driver_data; diff -Nur linux-3.10.30.orig/drivers/tty/serial/netx-serial.c linux-linaro-stable-mx6/drivers/tty/serial/netx-serial.c --- linux-3.10.30.orig/drivers/tty/serial/netx-serial.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/tty/serial/netx-serial.c 2014-05-15 20:34:07.858084907 +0200 ++++ linux-linaro-stable-mx6/drivers/tty/serial/netx-serial.c 2014-05-16 15:28:25.117405017 +0200 @@ -693,8 +693,6 @@ { struct netx_port *sport = platform_get_drvdata(pdev); @@ -264699,7 +264374,7 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/netx-serial.c linux-linaro-stabl diff -Nur linux-3.10.30.orig/drivers/tty/serial/pmac_zilog.c linux-linaro-stable-mx6/drivers/tty/serial/pmac_zilog.c --- linux-3.10.30.orig/drivers/tty/serial/pmac_zilog.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/tty/serial/pmac_zilog.c 2014-05-15 20:34:07.874085021 +0200 ++++ linux-linaro-stable-mx6/drivers/tty/serial/pmac_zilog.c 2014-05-16 15:28:25.117405017 +0200 @@ -1798,7 +1798,6 @@ uart_remove_one_port(&pmz_uart_reg, &uap->port); @@ -264710,7 +264385,7 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/pmac_zilog.c linux-linaro-stable return 0; diff -Nur linux-3.10.30.orig/drivers/tty/serial/pnx8xxx_uart.c linux-linaro-stable-mx6/drivers/tty/serial/pnx8xxx_uart.c --- linux-3.10.30.orig/drivers/tty/serial/pnx8xxx_uart.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/tty/serial/pnx8xxx_uart.c 2014-05-15 20:34:07.874085021 +0200 ++++ linux-linaro-stable-mx6/drivers/tty/serial/pnx8xxx_uart.c 2014-05-16 15:28:25.117405017 +0200 @@ -801,8 +801,6 @@ { struct pnx8xxx_port *sport = platform_get_drvdata(pdev); @@ -264722,7 +264397,7 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/pnx8xxx_uart.c linux-linaro-stab diff -Nur linux-3.10.30.orig/drivers/tty/serial/pxa.c linux-linaro-stable-mx6/drivers/tty/serial/pxa.c --- linux-3.10.30.orig/drivers/tty/serial/pxa.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/tty/serial/pxa.c 2014-05-15 20:34:07.874085021 +0200 ++++ linux-linaro-stable-mx6/drivers/tty/serial/pxa.c 2014-05-16 15:28:25.117405017 +0200 @@ -945,8 +945,6 @@ { struct uart_pxa_port *sport = platform_get_drvdata(dev); @@ -264734,7 +264409,7 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/pxa.c linux-linaro-stable-mx6/dr clk_unprepare(sport->clk); diff -Nur linux-3.10.30.orig/drivers/tty/serial/sa1100.c linux-linaro-stable-mx6/drivers/tty/serial/sa1100.c --- linux-3.10.30.orig/drivers/tty/serial/sa1100.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/tty/serial/sa1100.c 2014-05-15 20:34:07.886085108 +0200 ++++ linux-linaro-stable-mx6/drivers/tty/serial/sa1100.c 2014-05-16 15:28:25.117405017 +0200 @@ -864,8 +864,6 @@ { struct sa1100_port *sport = platform_get_drvdata(pdev); @@ -264746,7 +264421,7 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/sa1100.c linux-linaro-stable-mx6 diff -Nur linux-3.10.30.orig/drivers/tty/serial/sccnxp.c linux-linaro-stable-mx6/drivers/tty/serial/sccnxp.c --- linux-3.10.30.orig/drivers/tty/serial/sccnxp.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/tty/serial/sccnxp.c 2014-05-15 20:34:07.898085195 +0200 ++++ linux-linaro-stable-mx6/drivers/tty/serial/sccnxp.c 2014-05-16 15:28:25.121405037 +0200 @@ -997,8 +997,6 @@ } @@ -264766,7 +264441,7 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/sccnxp.c linux-linaro-stable-mx6 return regulator_disable(s->regulator); diff -Nur linux-3.10.30.orig/drivers/tty/serial/serial_core.c linux-linaro-stable-mx6/drivers/tty/serial/serial_core.c --- linux-3.10.30.orig/drivers/tty/serial/serial_core.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/tty/serial/serial_core.c 2014-05-15 20:34:07.910085281 +0200 ++++ linux-linaro-stable-mx6/drivers/tty/serial/serial_core.c 2014-05-16 15:28:25.121405037 +0200 @@ -50,12 +50,6 @@ #define HIGH_BITS_OFFSET ((sizeof(long)-sizeof(int))*8) @@ -264782,7 +264457,7 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/serial_core.c linux-linaro-stabl static void uart_wait_until_sent(struct tty_struct *tty, int timeout); diff -Nur linux-3.10.30.orig/drivers/tty/serial/sirfsoc_uart.c linux-linaro-stable-mx6/drivers/tty/serial/sirfsoc_uart.c --- linux-3.10.30.orig/drivers/tty/serial/sirfsoc_uart.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/tty/serial/sirfsoc_uart.c 2014-05-15 20:34:07.922085368 +0200 ++++ linux-linaro-stable-mx6/drivers/tty/serial/sirfsoc_uart.c 2014-05-16 15:28:25.121405037 +0200 @@ -716,7 +716,6 @@ clk_disable_unprepare(sirfport->clk); clk_put(sirfport->clk); @@ -264802,7 +264477,7 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/sirfsoc_uart.c linux-linaro-stab clk_disable_unprepare(sirfport->clk); diff -Nur linux-3.10.30.orig/drivers/tty/serial/vt8500_serial.c linux-linaro-stable-mx6/drivers/tty/serial/vt8500_serial.c --- linux-3.10.30.orig/drivers/tty/serial/vt8500_serial.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/tty/serial/vt8500_serial.c 2014-05-15 20:34:07.950085569 +0200 ++++ linux-linaro-stable-mx6/drivers/tty/serial/vt8500_serial.c 2014-05-16 15:28:25.125405058 +0200 @@ -631,7 +631,6 @@ { struct vt8500_port *vt8500_port = platform_get_drvdata(pdev); @@ -264813,7 +264488,7 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/vt8500_serial.c linux-linaro-sta diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/bits.h linux-linaro-stable-mx6/drivers/usb/chipidea/bits.h --- linux-3.10.30.orig/drivers/usb/chipidea/bits.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/chipidea/bits.h 2014-05-15 20:34:08.182087241 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/chipidea/bits.h 2014-05-16 15:28:25.141405143 +0200 @@ -48,10 +48,25 @@ #define PORTSC_SUSP BIT(7) #define PORTSC_HSP BIT(9) @@ -265443,7 +265118,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci13xxx_pci.c linux-linaro-sta -MODULE_VERSION("June 2008"); diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci.h linux-linaro-stable-mx6/drivers/usb/chipidea/ci.h --- linux-3.10.30.orig/drivers/usb/chipidea/ci.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/chipidea/ci.h 2014-05-15 20:34:08.182087241 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/chipidea/ci.h 2014-05-16 15:28:25.141405143 +0200 @@ -22,14 +22,14 @@ * DEFINE *****************************************************************************/ @@ -265714,7 +265389,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci.h linux-linaro-stable-mx6/d #endif /* __DRIVERS_USB_CHIPIDEA_CI_H */ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci_hdrc_imx.c linux-linaro-stable-mx6/drivers/usb/chipidea/ci_hdrc_imx.c --- linux-3.10.30.orig/drivers/usb/chipidea/ci_hdrc_imx.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/chipidea/ci_hdrc_imx.c 2014-05-15 20:34:08.182087241 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/chipidea/ci_hdrc_imx.c 2014-05-16 15:28:25.141405143 +0200 @@ -0,0 +1,444 @@ +/* + * Copyright 2012-2013 Freescale Semiconductor, Inc. @@ -266162,7 +265837,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci_hdrc_imx.c linux-linaro-sta +MODULE_AUTHOR("Richard Zhao <richard.zhao@freescale.com>"); diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci_hdrc_imx.h linux-linaro-stable-mx6/drivers/usb/chipidea/ci_hdrc_imx.h --- linux-3.10.30.orig/drivers/usb/chipidea/ci_hdrc_imx.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/chipidea/ci_hdrc_imx.h 2014-05-15 20:34:08.202087385 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/chipidea/ci_hdrc_imx.h 2014-05-16 15:28:25.141405143 +0200 @@ -0,0 +1,21 @@ +/* + * Copyright 2012-2013 Freescale Semiconductor, Inc. @@ -266187,7 +265862,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci_hdrc_imx.h linux-linaro-sta +int imx_usbmisc_set_wakeup(struct imx_usbmisc_data *, bool); diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci_hdrc_msm.c linux-linaro-stable-mx6/drivers/usb/chipidea/ci_hdrc_msm.c --- linux-3.10.30.orig/drivers/usb/chipidea/ci_hdrc_msm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/chipidea/ci_hdrc_msm.c 2014-05-15 20:34:08.202087385 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/chipidea/ci_hdrc_msm.c 2014-05-16 15:28:25.141405143 +0200 @@ -0,0 +1,101 @@ +/* Copyright (c) 2010, Code Aurora Forum. All rights reserved. + * @@ -266292,7 +265967,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci_hdrc_msm.c linux-linaro-sta +MODULE_LICENSE("GPL v2"); diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci_hdrc_pci.c linux-linaro-stable-mx6/drivers/usb/chipidea/ci_hdrc_pci.c --- linux-3.10.30.orig/drivers/usb/chipidea/ci_hdrc_pci.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/chipidea/ci_hdrc_pci.c 2014-05-15 20:34:08.202087385 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/chipidea/ci_hdrc_pci.c 2014-05-16 15:28:25.141405143 +0200 @@ -0,0 +1,150 @@ +/* + * ci_hdrc_pci.c - MIPS USB IP core family device controller @@ -266446,7 +266121,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci_hdrc_pci.c linux-linaro-sta +MODULE_ALIAS("platform:ci13xxx_pci"); diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/core.c linux-linaro-stable-mx6/drivers/usb/chipidea/core.c --- linux-3.10.30.orig/drivers/usb/chipidea/core.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/chipidea/core.c 2014-05-15 20:34:08.202087385 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/chipidea/core.c 2014-05-16 15:28:25.141405143 +0200 @@ -43,8 +43,7 @@ * * TODO List @@ -267173,7 +266848,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/core.c linux-linaro-stable-mx6 MODULE_DESCRIPTION("ChipIdea HDRC Driver"); diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/debug.c linux-linaro-stable-mx6/drivers/usb/chipidea/debug.c --- linux-3.10.30.orig/drivers/usb/chipidea/debug.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/chipidea/debug.c 2014-05-15 20:34:08.202087385 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/chipidea/debug.c 2014-05-16 15:28:25.141405143 +0200 @@ -18,7 +18,7 @@ */ static int ci_device_show(struct seq_file *s, void *data) @@ -267317,7 +266992,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/debug.c linux-linaro-stable-mx } diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/debug.h linux-linaro-stable-mx6/drivers/usb/chipidea/debug.h --- linux-3.10.30.orig/drivers/usb/chipidea/debug.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/chipidea/debug.h 2014-05-15 20:34:08.202087385 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/chipidea/debug.h 2014-05-16 15:28:25.141405143 +0200 @@ -14,15 +14,15 @@ #define __DRIVERS_USB_CHIPIDEA_DEBUG_H @@ -267340,7 +267015,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/debug.h linux-linaro-stable-mx #endif diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/host.c linux-linaro-stable-mx6/drivers/usb/chipidea/host.c --- linux-3.10.30.orig/drivers/usb/chipidea/host.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/chipidea/host.c 2014-05-15 20:34:08.202087385 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/chipidea/host.c 2014-05-16 15:28:25.141405143 +0200 @@ -24,6 +24,7 @@ #include <linux/usb.h> #include <linux/usb/hcd.h> @@ -267618,7 +267293,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/host.c linux-linaro-stable-mx6 } diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/host.h linux-linaro-stable-mx6/drivers/usb/chipidea/host.h --- linux-3.10.30.orig/drivers/usb/chipidea/host.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/chipidea/host.h 2014-05-15 20:34:08.202087385 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/chipidea/host.h 2014-05-16 15:28:25.141405143 +0200 @@ -3,15 +3,21 @@ #ifdef CONFIG_USB_CHIPIDEA_HOST @@ -267645,7 +267320,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/host.h linux-linaro-stable-mx6 #endif /* __DRIVERS_USB_CHIPIDEA_HOST_H */ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/Kconfig linux-linaro-stable-mx6/drivers/usb/chipidea/Kconfig --- linux-3.10.30.orig/drivers/usb/chipidea/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/chipidea/Kconfig 2014-05-15 20:34:08.182087241 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/chipidea/Kconfig 2014-05-16 15:28:25.141405143 +0200 @@ -1,6 +1,6 @@ config USB_CHIPIDEA tristate "ChipIdea Highspeed Dual Role Controller" @@ -267674,7 +267349,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/Kconfig linux-linaro-stable-mx Say Y here to enable host controller functionality of the diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/Makefile linux-linaro-stable-mx6/drivers/usb/chipidea/Makefile --- linux-3.10.30.orig/drivers/usb/chipidea/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/chipidea/Makefile 2014-05-15 20:34:08.182087241 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/chipidea/Makefile 2014-05-16 15:28:25.141405143 +0200 @@ -2,20 +2,20 @@ obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc.o @@ -267703,7 +267378,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/Makefile linux-linaro-stable-m endif diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/otg.c linux-linaro-stable-mx6/drivers/usb/chipidea/otg.c --- linux-3.10.30.orig/drivers/usb/chipidea/otg.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/chipidea/otg.c 2014-05-15 20:34:08.202087385 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/chipidea/otg.c 2014-05-16 15:28:25.141405143 +0200 @@ -0,0 +1,164 @@ +/* + * otg.c - ChipIdea USB IP core OTG driver @@ -267871,7 +267546,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/otg.c linux-linaro-stable-mx6/ +} diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/otg.h linux-linaro-stable-mx6/drivers/usb/chipidea/otg.h --- linux-3.10.30.orig/drivers/usb/chipidea/otg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/chipidea/otg.h 2014-05-15 20:34:08.202087385 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/chipidea/otg.h 2014-05-16 15:28:25.141405143 +0200 @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -267911,7 +267586,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/otg.h linux-linaro-stable-mx6/ +#endif /* __DRIVERS_USB_CHIPIDEA_OTG_H */ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/udc.c linux-linaro-stable-mx6/drivers/usb/chipidea/udc.c --- linux-3.10.30.orig/drivers/usb/chipidea/udc.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/chipidea/udc.c 2014-05-15 20:34:08.202087385 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/chipidea/udc.c 2014-05-16 15:28:25.141405143 +0200 @@ -20,13 +20,13 @@ #include <linux/pm_runtime.h> #include <linux/usb/ch9.h> @@ -269702,7 +269377,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/udc.c linux-linaro-stable-mx6/ } diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/udc.h linux-linaro-stable-mx6/drivers/usb/chipidea/udc.h --- linux-3.10.30.orig/drivers/usb/chipidea/udc.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/chipidea/udc.h 2014-05-15 20:34:08.202087385 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/chipidea/udc.h 2014-05-16 15:28:25.141405143 +0200 @@ -20,7 +20,7 @@ #define TX 1 /* similar to USB_DIR_IN but can be used as an index */ @@ -269786,7 +269461,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/udc.h linux-linaro-stable-mx6/ #endif /* __DRIVERS_USB_CHIPIDEA_UDC_H */ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/usbmisc_imx.c linux-linaro-stable-mx6/drivers/usb/chipidea/usbmisc_imx.c --- linux-3.10.30.orig/drivers/usb/chipidea/usbmisc_imx.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/chipidea/usbmisc_imx.c 2014-05-15 20:34:08.202087385 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/chipidea/usbmisc_imx.c 2014-05-16 15:28:25.141405143 +0200 @@ -1,5 +1,5 @@ /* - * Copyright 2012 Freescale Semiconductor, Inc. @@ -270079,7 +269754,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/usbmisc_imx.c linux-linaro-sta MODULE_LICENSE("GPL v2"); diff -Nur linux-3.10.30.orig/drivers/usb/core/hcd.c linux-linaro-stable-mx6/drivers/usb/core/hcd.c --- linux-3.10.30.orig/drivers/usb/core/hcd.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/core/hcd.c 2014-05-15 20:34:08.234087614 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/core/hcd.c 2014-05-16 15:28:25.145405164 +0200 @@ -2575,12 +2575,6 @@ if (hcd->uses_new_polling && HCD_POLL_RH(hcd)) usb_hcd_poll_rh_status(hcd); @@ -270095,7 +269770,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/core/hcd.c linux-linaro-stable-mx6/driv error_create_attr_group: diff -Nur linux-3.10.30.orig/drivers/usb/core/hub.c linux-linaro-stable-mx6/drivers/usb/core/hub.c --- linux-3.10.30.orig/drivers/usb/core/hub.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/core/hub.c 2014-05-15 20:34:08.234087614 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/core/hub.c 2014-05-16 15:28:25.145405164 +0200 @@ -4372,8 +4372,7 @@ /* Disconnect any existing devices under this port */ @@ -270108,7 +269783,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/core/hub.c linux-linaro-stable-mx6/driv } diff -Nur linux-3.10.30.orig/drivers/usb/gadget/f_mass_storage.c linux-linaro-stable-mx6/drivers/usb/gadget/f_mass_storage.c --- linux-3.10.30.orig/drivers/usb/gadget/f_mass_storage.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/gadget/f_mass_storage.c 2014-05-15 20:34:08.306088134 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/gadget/f_mass_storage.c 2014-05-16 15:28:25.157405228 +0200 @@ -349,8 +349,15 @@ struct usb_ep *bulk_in; @@ -270226,7 +269901,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/gadget/f_mass_storage.c linux-linaro-st if (!ep) diff -Nur linux-3.10.30.orig/drivers/usb/gadget/fsl_updater.c linux-linaro-stable-mx6/drivers/usb/gadget/fsl_updater.c --- linux-3.10.30.orig/drivers/usb/gadget/fsl_updater.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/gadget/fsl_updater.c 2014-05-15 20:34:08.318088220 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/gadget/fsl_updater.c 2014-05-16 15:28:25.165405269 +0200 @@ -0,0 +1,594 @@ +/* + * Freescale UUT driver @@ -270824,7 +270499,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/gadget/fsl_updater.c linux-linaro-stabl +} diff -Nur linux-3.10.30.orig/drivers/usb/gadget/fsl_updater.h linux-linaro-stable-mx6/drivers/usb/gadget/fsl_updater.h --- linux-3.10.30.orig/drivers/usb/gadget/fsl_updater.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/gadget/fsl_updater.h 2014-05-15 20:34:08.330088306 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/gadget/fsl_updater.h 2014-05-16 15:28:25.165405269 +0200 @@ -0,0 +1,150 @@ +/* + * Freescale UUT driver @@ -270978,7 +270653,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/gadget/fsl_updater.h linux-linaro-stabl + diff -Nur linux-3.10.30.orig/drivers/usb/gadget/Kconfig linux-linaro-stable-mx6/drivers/usb/gadget/Kconfig --- linux-3.10.30.orig/drivers/usb/gadget/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/gadget/Kconfig 2014-05-15 20:34:08.242087673 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/gadget/Kconfig 2014-05-16 15:28:25.149405185 +0200 @@ -751,6 +751,12 @@ Say "y" to link the driver statically, or "m" to build a dynamically linked module called "g_mass_storage". @@ -270994,7 +270669,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/gadget/Kconfig linux-linaro-stable-mx6/ depends on TARGET_CORE diff -Nur linux-3.10.30.orig/drivers/usb/gadget/mass_storage.c linux-linaro-stable-mx6/drivers/usb/gadget/mass_storage.c --- linux-3.10.30.orig/drivers/usb/gadget/mass_storage.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/gadget/mass_storage.c 2014-05-15 20:34:08.366088565 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/gadget/mass_storage.c 2014-05-16 15:28:25.169405290 +0200 @@ -189,7 +189,7 @@ { return usb_composite_probe(&msg_driver); @@ -271006,7 +270681,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/gadget/mass_storage.c linux-linaro-stab { diff -Nur linux-3.10.30.orig/drivers/usb/gadget/zero.c linux-linaro-stable-mx6/drivers/usb/gadget/zero.c --- linux-3.10.30.orig/drivers/usb/gadget/zero.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/gadget/zero.c 2014-05-15 20:34:08.502089546 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/gadget/zero.c 2014-05-16 15:28:25.177405333 +0200 @@ -95,6 +95,18 @@ module_param(autoresume, uint, S_IRUGO); MODULE_PARM_DESC(autoresume, "zero, or seconds before remote wakeup"); @@ -271055,7 +270730,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/gadget/zero.c linux-linaro-stable-mx6/d /* support OTG systems */ diff -Nur linux-3.10.30.orig/drivers/usb/host/ehci.h linux-linaro-stable-mx6/drivers/usb/host/ehci.h --- linux-3.10.30.orig/drivers/usb/host/ehci.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/host/ehci.h 2014-05-15 20:34:08.542089834 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/host/ehci.h 2014-05-16 15:28:25.181405354 +0200 @@ -816,6 +816,8 @@ extern void ehci_init_driver(struct hc_driver *drv, const struct ehci_driver_overrides *over); @@ -271067,7 +270742,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/host/ehci.h linux-linaro-stable-mx6/dri extern int ehci_suspend(struct usb_hcd *hcd, bool do_wakeup); diff -Nur linux-3.10.30.orig/drivers/usb/host/ehci-hcd.c linux-linaro-stable-mx6/drivers/usb/host/ehci-hcd.c --- linux-3.10.30.orig/drivers/usb/host/ehci-hcd.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/host/ehci-hcd.c 2014-05-15 20:34:08.534089775 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/host/ehci-hcd.c 2014-05-16 15:28:25.181405354 +0200 @@ -139,7 +139,7 @@ /*-------------------------------------------------------------------------*/ @@ -271136,7 +270811,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/host/ehci-hcd.c linux-linaro-stable-mx6 /*-------------------------------------------------------------------------*/ diff -Nur linux-3.10.30.orig/drivers/usb/host/ehci-hub.c linux-linaro-stable-mx6/drivers/usb/host/ehci-hub.c --- linux-3.10.30.orig/drivers/usb/host/ehci-hub.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/host/ehci-hub.c 2014-05-15 20:34:08.534089775 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/host/ehci-hub.c 2014-05-16 15:28:25.181405354 +0200 @@ -877,7 +877,7 @@ PORT_SUSPEND | PORT_RESUME); ehci_writel(ehci, temp, status_reg); @@ -271157,7 +270832,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/host/ehci-hub.c linux-linaro-stable-mx6 ehci_err (ehci, "port %d reset error %d\n", diff -Nur linux-3.10.30.orig/drivers/usb/host/ehci-tegra.c linux-linaro-stable-mx6/drivers/usb/host/ehci-tegra.c --- linux-3.10.30.orig/drivers/usb/host/ehci-tegra.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/host/ehci-tegra.c 2014-05-15 20:34:08.538089805 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/host/ehci-tegra.c 2014-05-16 15:28:25.181405354 +0200 @@ -179,7 +179,7 @@ * If a transaction is in progress, there may be a delay in * suspending the port. Poll until the port is suspended. @@ -271207,7 +270882,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/host/ehci-tegra.c linux-linaro-stable-m __func__); diff -Nur linux-3.10.30.orig/drivers/usb/host/Kconfig linux-linaro-stable-mx6/drivers/usb/host/Kconfig --- linux-3.10.30.orig/drivers/usb/host/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/host/Kconfig 2014-05-15 20:34:08.502089546 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/host/Kconfig 2014-05-16 15:28:25.177405333 +0200 @@ -65,7 +65,7 @@ config USB_EHCI_ROOT_HUB_TT @@ -271228,7 +270903,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/host/Kconfig linux-linaro-stable-mx6/dr This changes the periodic scheduling code to fill more of the low diff -Nur linux-3.10.30.orig/drivers/usb/phy/Makefile linux-linaro-stable-mx6/drivers/usb/phy/Makefile --- linux-3.10.30.orig/drivers/usb/phy/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/phy/Makefile 2014-05-15 20:34:08.902092426 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/phy/Makefile 2014-05-16 15:28:25.213405522 +0200 @@ -5,6 +5,7 @@ ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG @@ -271239,7 +270914,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/phy/Makefile linux-linaro-stable-mx6/dr diff -Nur linux-3.10.30.orig/drivers/usb/phy/of.c linux-linaro-stable-mx6/drivers/usb/phy/of.c --- linux-3.10.30.orig/drivers/usb/phy/of.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/phy/of.c 2014-05-15 20:34:08.902092426 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/phy/of.c 2014-05-16 15:28:25.213405522 +0200 @@ -0,0 +1,47 @@ +/* + * USB of helper code @@ -271290,7 +270965,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/phy/of.c linux-linaro-stable-mx6/driver +EXPORT_SYMBOL_GPL(of_usb_get_phy_mode); diff -Nur linux-3.10.30.orig/drivers/usb/phy/phy-mxs-usb.c linux-linaro-stable-mx6/drivers/usb/phy/phy-mxs-usb.c --- linux-3.10.30.orig/drivers/usb/phy/phy-mxs-usb.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/phy/phy-mxs-usb.c 2014-05-15 20:34:08.902092426 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/phy/phy-mxs-usb.c 2014-05-16 15:28:25.217405544 +0200 @@ -1,5 +1,5 @@ /* - * Copyright 2012 Freescale Semiconductor, Inc. @@ -271838,7 +271513,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/phy/phy-mxs-usb.c linux-linaro-stable-m diff -Nur linux-3.10.30.orig/drivers/usb/usb-common.c linux-linaro-stable-mx6/drivers/usb/usb-common.c --- linux-3.10.30.orig/drivers/usb/usb-common.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/usb-common.c 2014-05-15 20:34:09.082093724 +0200 ++++ linux-linaro-stable-mx6/drivers/usb/usb-common.c 2014-05-16 15:28:29.889430182 +0200 @@ -13,7 +13,9 @@ #include <linux/kernel.h> @@ -271889,7 +271564,7 @@ diff -Nur linux-3.10.30.orig/drivers/usb/usb-common.c linux-linaro-stable-mx6/dr MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/video/amba-clcd.c linux-linaro-stable-mx6/drivers/video/amba-clcd.c --- linux-3.10.30.orig/drivers/video/amba-clcd.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/video/amba-clcd.c 2014-05-15 20:34:09.234094818 +0200 ++++ linux-linaro-stable-mx6/drivers/video/amba-clcd.c 2014-05-16 15:28:38.293474499 +0200 @@ -16,7 +16,10 @@ #include <linux/string.h> #include <linux/slab.h> @@ -272207,7 +271882,7 @@ diff -Nur linux-3.10.30.orig/drivers/video/amba-clcd.c linux-linaro-stable-mx6/d if (ret) { diff -Nur linux-3.10.30.orig/drivers/video/arm-hdlcd.c linux-linaro-stable-mx6/drivers/video/arm-hdlcd.c --- linux-3.10.30.orig/drivers/video/arm-hdlcd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/video/arm-hdlcd.c 2014-05-15 20:34:09.234094818 +0200 ++++ linux-linaro-stable-mx6/drivers/video/arm-hdlcd.c 2014-05-16 15:28:38.297474520 +0200 @@ -0,0 +1,844 @@ +/* + * drivers/video/arm-hdlcd.c @@ -273055,7 +272730,7 @@ diff -Nur linux-3.10.30.orig/drivers/video/arm-hdlcd.c linux-linaro-stable-mx6/d +MODULE_LICENSE("GPL v2"); diff -Nur linux-3.10.30.orig/drivers/video/backlight/backlight.c linux-linaro-stable-mx6/drivers/video/backlight/backlight.c --- linux-3.10.30.orig/drivers/video/backlight/backlight.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/video/backlight/backlight.c 2014-05-15 20:34:09.282095164 +0200 ++++ linux-linaro-stable-mx6/drivers/video/backlight/backlight.c 2014-05-16 15:28:38.305474562 +0200 @@ -38,6 +38,8 @@ { struct backlight_device *bd; @@ -273098,7 +272773,7 @@ diff -Nur linux-3.10.30.orig/drivers/video/backlight/backlight.c linux-linaro-st return 0; diff -Nur linux-3.10.30.orig/drivers/video/console/fbcon.c linux-linaro-stable-mx6/drivers/video/console/fbcon.c --- linux-3.10.30.orig/drivers/video/console/fbcon.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/video/console/fbcon.c 2014-05-15 20:34:09.378095855 +0200 ++++ linux-linaro-stable-mx6/drivers/video/console/fbcon.c 2014-05-16 15:28:38.313474604 +0200 @@ -404,7 +404,7 @@ struct fb_info *info = (struct fb_info *) dev_addr; struct fbcon_ops *ops = info->fbcon_par; @@ -273110,7 +272785,7 @@ diff -Nur linux-3.10.30.orig/drivers/video/console/fbcon.c linux-linaro-stable-m diff -Nur linux-3.10.30.orig/drivers/video/Kconfig linux-linaro-stable-mx6/drivers/video/Kconfig --- linux-3.10.30.orig/drivers/video/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/video/Kconfig 2014-05-15 20:34:09.234094818 +0200 ++++ linux-linaro-stable-mx6/drivers/video/Kconfig 2014-05-16 15:28:38.293474499 +0200 @@ -39,6 +39,11 @@ config HDMI bool @@ -273177,7 +272852,7 @@ diff -Nur linux-3.10.30.orig/drivers/video/Kconfig linux-linaro-stable-mx6/drive endif diff -Nur linux-3.10.30.orig/drivers/video/Makefile linux-linaro-stable-mx6/drivers/video/Makefile --- linux-3.10.30.orig/drivers/video/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/video/Makefile 2014-05-15 20:34:09.234094818 +0200 ++++ linux-linaro-stable-mx6/drivers/video/Makefile 2014-05-16 15:28:38.293474499 +0200 @@ -53,6 +53,7 @@ obj-$(CONFIG_FB_SAVAGE) += savage/ obj-$(CONFIG_FB_GEODE) += geode/ @@ -273203,7 +272878,7 @@ diff -Nur linux-3.10.30.orig/drivers/video/Makefile linux-linaro-stable-mx6/driv +obj-$(CONFIG_VEXPRESS_DVI_CONTROL) += vexpress-dvi.o diff -Nur linux-3.10.30.orig/drivers/video/mxc/epdc_regs.h linux-linaro-stable-mx6/drivers/video/mxc/epdc_regs.h --- linux-3.10.30.orig/drivers/video/mxc/epdc_regs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/video/mxc/epdc_regs.h 2014-05-15 20:34:09.738098449 +0200 ++++ linux-linaro-stable-mx6/drivers/video/mxc/epdc_regs.h 2014-05-16 15:28:38.369474900 +0200 @@ -0,0 +1,442 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -273649,7 +273324,7 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxc/epdc_regs.h linux-linaro-stable-m +#endif /* __EPDC_REGS_INCLUDED__ */ diff -Nur linux-3.10.30.orig/drivers/video/mxc/Kconfig linux-linaro-stable-mx6/drivers/video/mxc/Kconfig --- linux-3.10.30.orig/drivers/video/mxc/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/video/mxc/Kconfig 2014-05-15 20:34:09.738098449 +0200 ++++ linux-linaro-stable-mx6/drivers/video/mxc/Kconfig 2014-05-16 15:28:38.369474900 +0200 @@ -0,0 +1,63 @@ +config FB_MXC + tristate "MXC Framebuffer support" @@ -273716,7 +273391,7 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxc/Kconfig linux-linaro-stable-mx6/d + depends on FB_MXS && I2C diff -Nur linux-3.10.30.orig/drivers/video/mxc/ldb.c linux-linaro-stable-mx6/drivers/video/mxc/ldb.c --- linux-3.10.30.orig/drivers/video/mxc/ldb.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/video/mxc/ldb.c 2014-05-15 20:34:09.738098449 +0200 ++++ linux-linaro-stable-mx6/drivers/video/mxc/ldb.c 2014-05-16 15:28:38.369474900 +0200 @@ -0,0 +1,1036 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -274756,7 +274431,7 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxc/ldb.c linux-linaro-stable-mx6/dri +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/video/mxc/Makefile linux-linaro-stable-mx6/drivers/video/mxc/Makefile --- linux-3.10.30.orig/drivers/video/mxc/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/video/mxc/Makefile 2014-05-15 20:34:09.738098449 +0200 ++++ linux-linaro-stable-mx6/drivers/video/mxc/Makefile 2014-05-16 15:28:38.369474900 +0200 @@ -0,0 +1,8 @@ +obj-$(CONFIG_FB_MXC_LDB) += ldb.o +obj-$(CONFIG_FB_MXC_MIPI_DSI) += mipi_dsi.o @@ -274768,7 +274443,7 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxc/Makefile linux-linaro-stable-mx6/ +obj-$(CONFIG_FB_MXS_SII902X) += mxsfb_sii902x.o diff -Nur linux-3.10.30.orig/drivers/video/mxc/mipi_dsi.c linux-linaro-stable-mx6/drivers/video/mxc/mipi_dsi.c --- linux-3.10.30.orig/drivers/video/mxc/mipi_dsi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/video/mxc/mipi_dsi.c 2014-05-15 20:34:09.738098449 +0200 ++++ linux-linaro-stable-mx6/drivers/video/mxc/mipi_dsi.c 2014-05-16 15:28:38.369474900 +0200 @@ -0,0 +1,953 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -275725,7 +275400,7 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxc/mipi_dsi.c linux-linaro-stable-mx +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/video/mxc/mipi_dsi.h linux-linaro-stable-mx6/drivers/video/mxc/mipi_dsi.h --- linux-3.10.30.orig/drivers/video/mxc/mipi_dsi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/video/mxc/mipi_dsi.h 2014-05-15 20:34:09.738098449 +0200 ++++ linux-linaro-stable-mx6/drivers/video/mxc/mipi_dsi.h 2014-05-16 15:28:38.369474900 +0200 @@ -0,0 +1,112 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -275841,7 +275516,7 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxc/mipi_dsi.h linux-linaro-stable-mx +#endif diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_dispdrv.c linux-linaro-stable-mx6/drivers/video/mxc/mxc_dispdrv.c --- linux-3.10.30.orig/drivers/video/mxc/mxc_dispdrv.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/video/mxc/mxc_dispdrv.c 2014-05-15 20:34:09.738098449 +0200 ++++ linux-linaro-stable-mx6/drivers/video/mxc/mxc_dispdrv.c 2014-05-16 15:28:38.373474921 +0200 @@ -0,0 +1,150 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -275995,7 +275670,7 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_dispdrv.c linux-linaro-stable +EXPORT_SYMBOL_GPL(mxc_dispdrv_getdata); diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_dispdrv.h linux-linaro-stable-mx6/drivers/video/mxc/mxc_dispdrv.h --- linux-3.10.30.orig/drivers/video/mxc/mxc_dispdrv.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/video/mxc/mxc_dispdrv.h 2014-05-15 20:34:09.738098449 +0200 ++++ linux-linaro-stable-mx6/drivers/video/mxc/mxc_dispdrv.h 2014-05-16 15:28:38.373474921 +0200 @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -276053,7 +275728,7 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_dispdrv.h linux-linaro-stable +#endif diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_edid.c linux-linaro-stable-mx6/drivers/video/mxc/mxc_edid.c --- linux-3.10.30.orig/drivers/video/mxc/mxc_edid.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/video/mxc/mxc_edid.c 2014-05-15 20:34:09.738098449 +0200 ++++ linux-linaro-stable-mx6/drivers/video/mxc/mxc_edid.c 2014-05-16 15:28:38.373474921 +0200 @@ -0,0 +1,762 @@ +/* + * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -276819,7 +276494,7 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_edid.c linux-linaro-stable-mx + diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_epdc_fb.c linux-linaro-stable-mx6/drivers/video/mxc/mxc_epdc_fb.c --- linux-3.10.30.orig/drivers/video/mxc/mxc_epdc_fb.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/video/mxc/mxc_epdc_fb.c 2014-05-15 20:34:09.738098449 +0200 ++++ linux-linaro-stable-mx6/drivers/video/mxc/mxc_epdc_fb.c 2014-05-16 15:28:38.373474921 +0200 @@ -0,0 +1,5541 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. @@ -282364,7 +282039,7 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_epdc_fb.c linux-linaro-stable +MODULE_SUPPORTED_DEVICE("fb"); diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxcfb_hx8369_wvga.c linux-linaro-stable-mx6/drivers/video/mxc/mxcfb_hx8369_wvga.c --- linux-3.10.30.orig/drivers/video/mxc/mxcfb_hx8369_wvga.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/video/mxc/mxcfb_hx8369_wvga.c 2014-05-15 20:34:09.738098449 +0200 ++++ linux-linaro-stable-mx6/drivers/video/mxc/mxcfb_hx8369_wvga.c 2014-05-16 15:28:38.373474921 +0200 @@ -0,0 +1,449 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -282817,7 +282492,7 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxcfb_hx8369_wvga.c linux-linaro- +} diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/drivers/video/mxc/mxc_hdmi.c --- linux-3.10.30.orig/drivers/video/mxc/mxc_hdmi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/video/mxc/mxc_hdmi.c 2014-05-15 20:34:09.738098449 +0200 ++++ linux-linaro-stable-mx6/drivers/video/mxc/mxc_hdmi.c 2014-05-16 15:28:38.373474921 +0200 @@ -0,0 +1,2935 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. @@ -285756,7 +285431,7 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx +MODULE_AUTHOR("Freescale Semiconductor, Inc."); diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_ipuv3_fb.c linux-linaro-stable-mx6/drivers/video/mxc/mxc_ipuv3_fb.c --- linux-3.10.30.orig/drivers/video/mxc/mxc_ipuv3_fb.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/video/mxc/mxc_ipuv3_fb.c 2014-05-15 20:34:09.738098449 +0200 ++++ linux-linaro-stable-mx6/drivers/video/mxc/mxc_ipuv3_fb.c 2014-05-16 15:28:38.373474921 +0200 @@ -0,0 +1,2577 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -288337,7 +288012,7 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_ipuv3_fb.c linux-linaro-stabl +MODULE_SUPPORTED_DEVICE("fb"); diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_lcdif.c linux-linaro-stable-mx6/drivers/video/mxc/mxc_lcdif.c --- linux-3.10.30.orig/drivers/video/mxc/mxc_lcdif.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/video/mxc/mxc_lcdif.c 2014-05-15 20:34:09.738098449 +0200 ++++ linux-linaro-stable-mx6/drivers/video/mxc/mxc_lcdif.c 2014-05-16 15:28:38.373474921 +0200 @@ -0,0 +1,235 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -288576,7 +288251,7 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_lcdif.c linux-linaro-stable-m +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxsfb_sii902x.c linux-linaro-stable-mx6/drivers/video/mxc/mxsfb_sii902x.c --- linux-3.10.30.orig/drivers/video/mxc/mxsfb_sii902x.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/video/mxc/mxsfb_sii902x.c 2014-05-15 20:34:09.738098449 +0200 ++++ linux-linaro-stable-mx6/drivers/video/mxc/mxsfb_sii902x.c 2014-05-16 15:28:38.373474921 +0200 @@ -0,0 +1,532 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -289112,7 +288787,7 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxsfb_sii902x.c linux-linaro-stab +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/drivers/video/mxsfb.c linux-linaro-stable-mx6/drivers/video/mxsfb.c --- linux-3.10.30.orig/drivers/video/mxsfb.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/video/mxsfb.c 2014-05-15 20:34:09.738098449 +0200 ++++ linux-linaro-stable-mx6/drivers/video/mxsfb.c 2014-05-16 15:28:38.373474921 +0200 @@ -4,7 +4,7 @@ * This code is based on: * Author: Vitaly Wool <vital@embeddedalley.com> @@ -289882,7 +289557,7 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxsfb.c linux-linaro-stable-mx6/drive diff -Nur linux-3.10.30.orig/drivers/video/vexpress-dvi.c linux-linaro-stable-mx6/drivers/video/vexpress-dvi.c --- linux-3.10.30.orig/drivers/video/vexpress-dvi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/video/vexpress-dvi.c 2014-05-15 20:34:10.370103002 +0200 ++++ linux-linaro-stable-mx6/drivers/video/vexpress-dvi.c 2014-05-16 15:28:38.429475216 +0200 @@ -0,0 +1,220 @@ +/* + * This program is free software; you can redistribute it and/or modify @@ -290106,7 +289781,7 @@ diff -Nur linux-3.10.30.orig/drivers/video/vexpress-dvi.c linux-linaro-stable-mx +device_initcall(vexpress_dvi_init); diff -Nur linux-3.10.30.orig/firmware/imx/epdc_E060SCM.fw.ihex linux-linaro-stable-mx6/firmware/imx/epdc_E060SCM.fw.ihex --- linux-3.10.30.orig/firmware/imx/epdc_E060SCM.fw.ihex 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/firmware/imx/epdc_E060SCM.fw.ihex 2014-05-15 20:34:10.970107323 +0200 ++++ linux-linaro-stable-mx6/firmware/imx/epdc_E060SCM.fw.ihex 2014-05-16 15:28:38.513475659 +0200 @@ -0,0 +1,61613 @@ +:100000003488C47C012D0100DD0900000706A4002E +:100010000358211D3CCA018502000000400000FE7B @@ -351723,7 +351398,7 @@ diff -Nur linux-3.10.30.orig/firmware/imx/epdc_E060SCM.fw.ihex linux-linaro-stab +:00000001FF diff -Nur linux-3.10.30.orig/firmware/imx/epdc_E60_V110.fw.ihex linux-linaro-stable-mx6/firmware/imx/epdc_E60_V110.fw.ihex --- linux-3.10.30.orig/firmware/imx/epdc_E60_V110.fw.ihex 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/firmware/imx/epdc_E60_V110.fw.ihex 2014-05-15 20:34:11.098108245 +0200 ++++ linux-linaro-stable-mx6/firmware/imx/epdc_E60_V110.fw.ihex 2014-05-16 15:28:38.529475744 +0200 @@ -0,0 +1,45914 @@ +:10000000C7FFA986DE9C0000E30100000003250075 +:100010000127020E3C03000000000000400000C366 @@ -397641,7 +397316,7 @@ diff -Nur linux-3.10.30.orig/firmware/imx/epdc_E60_V110.fw.ihex linux-linaro-sta +:00000001FF diff -Nur linux-3.10.30.orig/firmware/imx/epdc_E60_V220.fw.ihex linux-linaro-stable-mx6/firmware/imx/epdc_E60_V220.fw.ihex --- linux-3.10.30.orig/firmware/imx/epdc_E60_V220.fw.ihex 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/firmware/imx/epdc_E60_V220.fw.ihex 2014-05-15 20:34:11.306109744 +0200 ++++ linux-linaro-stable-mx6/firmware/imx/epdc_E60_V220.fw.ihex 2014-05-16 15:28:38.533475764 +0200 @@ -0,0 +1,77569 @@ +:10000000BD611693236A0100BC04000007060500C9 +:100010000304021D3C180085000000004000001190 @@ -475214,7 +474889,7 @@ diff -Nur linux-3.10.30.orig/firmware/imx/epdc_E60_V220.fw.ihex linux-linaro-sta +:00000001FF diff -Nur linux-3.10.30.orig/firmware/imx/epdc_E97_V110.fw.ihex linux-linaro-stable-mx6/firmware/imx/epdc_E97_V110.fw.ihex --- linux-3.10.30.orig/firmware/imx/epdc_E97_V110.fw.ihex 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/firmware/imx/epdc_E97_V110.fw.ihex 2014-05-15 20:34:11.450110781 +0200 ++++ linux-linaro-stable-mx6/firmware/imx/epdc_E97_V110.fw.ihex 2014-05-16 15:28:38.541475806 +0200 @@ -0,0 +1,54512 @@ +:1000000095533B1702B60000B701000004042C0012 +:100010000131020E6101010000000000410000D228 @@ -529730,7 +529405,7 @@ diff -Nur linux-3.10.30.orig/firmware/imx/epdc_E97_V110.fw.ihex linux-linaro-sta +:00000001FF diff -Nur linux-3.10.30.orig/firmware/imx/sdma/sdma-imx6q.bin.ihex linux-linaro-stable-mx6/firmware/imx/sdma/sdma-imx6q.bin.ihex --- linux-3.10.30.orig/firmware/imx/sdma/sdma-imx6q.bin.ihex 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/firmware/imx/sdma/sdma-imx6q.bin.ihex 2014-05-15 20:34:11.450110781 +0200 ++++ linux-linaro-stable-mx6/firmware/imx/sdma/sdma-imx6q.bin.ihex 2014-05-16 15:28:38.541475806 +0200 @@ -0,0 +1,116 @@ +:1000000053444D4101000000010000001C000000AD +:1000100026000000B40000007A0600008202000002 @@ -529850,7 +529525,7 @@ diff -Nur linux-3.10.30.orig/firmware/imx/sdma/sdma-imx6q.bin.ihex linux-linaro- +:00000001FF diff -Nur linux-3.10.30.orig/firmware/Makefile linux-linaro-stable-mx6/firmware/Makefile --- linux-3.10.30.orig/firmware/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/firmware/Makefile 2014-05-15 20:34:10.566104413 +0200 ++++ linux-linaro-stable-mx6/firmware/Makefile 2014-05-16 15:28:38.473475448 +0200 @@ -61,6 +61,7 @@ radeon/RV770_pfp.bin radeon/RV770_me.bin \ radeon/RV730_pfp.bin radeon/RV730_me.bin \ @@ -529881,7 +529556,7 @@ diff -Nur linux-3.10.30.orig/firmware/Makefile linux-linaro-stable-mx6/firmware/ # we're installing after a cross-compile, because ihex2fw has dependencies diff -Nur linux-3.10.30.orig/fs/debugfs/file.c linux-linaro-stable-mx6/fs/debugfs/file.c --- linux-3.10.30.orig/fs/debugfs/file.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/fs/debugfs/file.c 2014-05-15 20:34:12.254116572 +0200 ++++ linux-linaro-stable-mx6/fs/debugfs/file.c 2014-05-16 15:28:38.625476249 +0200 @@ -21,6 +21,7 @@ #include <linux/debugfs.h> #include <linux/io.h> @@ -529940,7 +529615,7 @@ diff -Nur linux-3.10.30.orig/fs/debugfs/file.c linux-linaro-stable-mx6/fs/debugf size_t count, loff_t *ppos) diff -Nur linux-3.10.30.orig/fs/f2fs/acl.c linux-linaro-stable-mx6/fs/f2fs/acl.c --- linux-3.10.30.orig/fs/f2fs/acl.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/fs/f2fs/acl.c 2014-05-15 20:34:12.430117839 +0200 ++++ linux-linaro-stable-mx6/fs/f2fs/acl.c 2014-05-16 15:28:38.657476418 +0200 @@ -205,7 +205,8 @@ return acl; } @@ -530025,7 +529700,7 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/acl.c linux-linaro-stable-mx6/fs/f2fs/acl.c posix_acl_release(acl); diff -Nur linux-3.10.30.orig/fs/f2fs/acl.h linux-linaro-stable-mx6/fs/f2fs/acl.h --- linux-3.10.30.orig/fs/f2fs/acl.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/fs/f2fs/acl.h 2014-05-15 20:34:12.430117839 +0200 ++++ linux-linaro-stable-mx6/fs/f2fs/acl.h 2014-05-16 15:28:38.657476418 +0200 @@ -36,9 +36,9 @@ #ifdef CONFIG_F2FS_FS_POSIX_ACL @@ -530051,7 +529726,7 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/acl.h linux-linaro-stable-mx6/fs/f2fs/acl.h } diff -Nur linux-3.10.30.orig/fs/f2fs/checkpoint.c linux-linaro-stable-mx6/fs/f2fs/checkpoint.c --- linux-3.10.30.orig/fs/f2fs/checkpoint.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/fs/f2fs/checkpoint.c 2014-05-15 20:34:12.430117839 +0200 ++++ linux-linaro-stable-mx6/fs/f2fs/checkpoint.c 2014-05-16 15:28:38.657476418 +0200 @@ -81,7 +81,7 @@ struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb); @@ -530428,7 +530103,7 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/checkpoint.c linux-linaro-stable-mx6/fs/f2f /* write cached NAT/SIT entries to NAT/SIT area */ diff -Nur linux-3.10.30.orig/fs/f2fs/data.c linux-linaro-stable-mx6/fs/f2fs/data.c --- linux-3.10.30.orig/fs/f2fs/data.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/fs/f2fs/data.c 2014-05-15 20:34:12.430117839 +0200 ++++ linux-linaro-stable-mx6/fs/f2fs/data.c 2014-05-16 15:28:38.657476418 +0200 @@ -37,9 +37,9 @@ struct page *node_page = dn->node_page; unsigned int ofs_in_node = dn->ofs_in_node; @@ -530740,7 +530415,7 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/data.c linux-linaro-stable-mx6/fs/f2fs/data .releasepage = f2fs_release_data_page, diff -Nur linux-3.10.30.orig/fs/f2fs/debug.c linux-linaro-stable-mx6/fs/f2fs/debug.c --- linux-3.10.30.orig/fs/f2fs/debug.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/fs/f2fs/debug.c 2014-05-15 20:34:12.430117839 +0200 ++++ linux-linaro-stable-mx6/fs/f2fs/debug.c 2014-05-16 15:28:38.657476418 +0200 @@ -29,7 +29,7 @@ static void update_general_status(struct f2fs_sb_info *sbi) @@ -530854,7 +530529,7 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/debug.c linux-linaro-stable-mx6/fs/f2fs/deb void __init f2fs_create_root_stats(void) diff -Nur linux-3.10.30.orig/fs/f2fs/dir.c linux-linaro-stable-mx6/fs/f2fs/dir.c --- linux-3.10.30.orig/fs/f2fs/dir.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/fs/f2fs/dir.c 2014-05-15 20:34:12.430117839 +0200 ++++ linux-linaro-stable-mx6/fs/f2fs/dir.c 2014-05-16 15:28:38.657476418 +0200 @@ -13,6 +13,7 @@ #include "f2fs.h" #include "node.h" @@ -531106,7 +530781,7 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/dir.c linux-linaro-stable-mx6/fs/f2fs/dir.c if (bit_pos == NR_DENTRY_IN_BLOCK) { diff -Nur linux-3.10.30.orig/fs/f2fs/f2fs.h linux-linaro-stable-mx6/fs/f2fs/f2fs.h --- linux-3.10.30.orig/fs/f2fs/f2fs.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/fs/f2fs/f2fs.h 2014-05-15 20:34:12.458118041 +0200 ++++ linux-linaro-stable-mx6/fs/f2fs/f2fs.h 2014-05-16 15:28:38.657476418 +0200 @@ -17,6 +17,14 @@ #include <linux/slab.h> #include <linux/crc32.h> @@ -531687,7 +531362,7 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/f2fs.h linux-linaro-stable-mx6/fs/f2fs/f2fs #define stat_inc_data_blk_count(si, blks) diff -Nur linux-3.10.30.orig/fs/f2fs/file.c linux-linaro-stable-mx6/fs/f2fs/file.c --- linux-3.10.30.orig/fs/f2fs/file.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/fs/f2fs/file.c 2014-05-15 20:34:12.458118041 +0200 ++++ linux-linaro-stable-mx6/fs/f2fs/file.c 2014-05-16 15:28:38.657476418 +0200 @@ -35,18 +35,18 @@ struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb); block_t old_blk_addr; @@ -532017,7 +531692,7 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/file.c linux-linaro-stable-mx6/fs/f2fs/file diff -Nur linux-3.10.30.orig/fs/f2fs/gc.c linux-linaro-stable-mx6/fs/f2fs/gc.c --- linux-3.10.30.orig/fs/f2fs/gc.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/fs/f2fs/gc.c 2014-05-15 20:34:12.458118041 +0200 ++++ linux-linaro-stable-mx6/fs/f2fs/gc.c 2014-05-16 15:28:38.657476418 +0200 @@ -29,10 +29,11 @@ static int gc_thread_func(void *data) { @@ -532326,7 +532001,7 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/gc.c linux-linaro-stable-mx6/fs/f2fs/gc.c if (IS_ERR(data_page)) diff -Nur linux-3.10.30.orig/fs/f2fs/gc.h linux-linaro-stable-mx6/fs/f2fs/gc.h --- linux-3.10.30.orig/fs/f2fs/gc.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/fs/f2fs/gc.h 2014-05-15 20:34:12.458118041 +0200 ++++ linux-linaro-stable-mx6/fs/f2fs/gc.h 2014-05-16 15:28:38.657476418 +0200 @@ -13,18 +13,26 @@ * whether IO subsystem is idle * or not @@ -532397,7 +532072,7 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/gc.h linux-linaro-stable-mx6/fs/f2fs/gc.h diff -Nur linux-3.10.30.orig/fs/f2fs/inode.c linux-linaro-stable-mx6/fs/f2fs/inode.c --- linux-3.10.30.orig/fs/f2fs/inode.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/fs/f2fs/inode.c 2014-05-15 20:34:12.458118041 +0200 ++++ linux-linaro-stable-mx6/fs/f2fs/inode.c 2014-05-16 15:28:38.657476418 +0200 @@ -37,6 +37,31 @@ inode->i_flags |= S_DIRSYNC; } @@ -532595,7 +532270,7 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/inode.c linux-linaro-stable-mx6/fs/f2fs/ino no_delete: diff -Nur linux-3.10.30.orig/fs/f2fs/Kconfig linux-linaro-stable-mx6/fs/f2fs/Kconfig --- linux-3.10.30.orig/fs/f2fs/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/fs/f2fs/Kconfig 2014-05-15 20:34:12.430117839 +0200 ++++ linux-linaro-stable-mx6/fs/f2fs/Kconfig 2014-05-16 15:28:38.657476418 +0200 @@ -51,3 +51,23 @@ Linux website <http://acl.bestbits.at/>. @@ -532622,7 +532297,7 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/Kconfig linux-linaro-stable-mx6/fs/f2fs/Kco + If you want to improve the performance, say N. diff -Nur linux-3.10.30.orig/fs/f2fs/namei.c linux-linaro-stable-mx6/fs/f2fs/namei.c --- linux-3.10.30.orig/fs/f2fs/namei.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/fs/f2fs/namei.c 2014-05-15 20:34:12.458118041 +0200 ++++ linux-linaro-stable-mx6/fs/f2fs/namei.c 2014-05-16 15:28:38.657476418 +0200 @@ -27,19 +27,19 @@ nid_t ino; struct inode *inode; @@ -532936,7 +532611,7 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/namei.c linux-linaro-stable-mx6/fs/f2fs/nam #ifdef CONFIG_F2FS_FS_XATTR diff -Nur linux-3.10.30.orig/fs/f2fs/node.c linux-linaro-stable-mx6/fs/f2fs/node.c --- linux-3.10.30.orig/fs/f2fs/node.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/fs/f2fs/node.c 2014-05-15 20:34:12.458118041 +0200 ++++ linux-linaro-stable-mx6/fs/f2fs/node.c 2014-05-16 15:28:38.657476418 +0200 @@ -204,7 +204,7 @@ } e->ni = *ni; @@ -533537,7 +533212,7 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/node.c linux-linaro-stable-mx6/fs/f2fs/node kfree(nm_i->nat_bitmap); diff -Nur linux-3.10.30.orig/fs/f2fs/node.h linux-linaro-stable-mx6/fs/f2fs/node.h --- linux-3.10.30.orig/fs/f2fs/node.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/fs/f2fs/node.h 2014-05-15 20:34:12.458118041 +0200 ++++ linux-linaro-stable-mx6/fs/f2fs/node.h 2014-05-16 15:28:38.657476418 +0200 @@ -155,8 +155,7 @@ static inline void fill_node_footer(struct page *page, nid_t nid, nid_t ino, unsigned int ofs, bool reset) @@ -533758,7 +533433,7 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/node.h linux-linaro-stable-mx6/fs/f2fs/node +#define set_fsync_mark(page, mark) set_mark(page, mark, FSYNC_BIT_SHIFT) diff -Nur linux-3.10.30.orig/fs/f2fs/recovery.c linux-linaro-stable-mx6/fs/f2fs/recovery.c --- linux-3.10.30.orig/fs/f2fs/recovery.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/fs/f2fs/recovery.c 2014-05-15 20:34:12.458118041 +0200 ++++ linux-linaro-stable-mx6/fs/f2fs/recovery.c 2014-05-16 15:28:38.657476418 +0200 @@ -40,45 +40,71 @@ static int recover_dentry(struct page *ipage, struct inode *inode) @@ -534197,7 +533872,7 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/recovery.c linux-linaro-stable-mx6/fs/f2fs/ } diff -Nur linux-3.10.30.orig/fs/f2fs/segment.c linux-linaro-stable-mx6/fs/f2fs/segment.c --- linux-3.10.30.orig/fs/f2fs/segment.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/fs/f2fs/segment.c 2014-05-15 20:34:12.458118041 +0200 ++++ linux-linaro-stable-mx6/fs/f2fs/segment.c 2014-05-16 15:28:38.657476418 +0200 @@ -36,6 +36,14 @@ } } @@ -534772,7 +534447,7 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/segment.c linux-linaro-stable-mx6/fs/f2fs/s destroy_free_segmap(sbi); diff -Nur linux-3.10.30.orig/fs/f2fs/segment.h linux-linaro-stable-mx6/fs/f2fs/segment.h --- linux-3.10.30.orig/fs/f2fs/segment.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/fs/f2fs/segment.h 2014-05-15 20:34:12.458118041 +0200 ++++ linux-linaro-stable-mx6/fs/f2fs/segment.h 2014-05-16 15:28:38.657476418 +0200 @@ -14,6 +14,8 @@ #define NULL_SEGNO ((unsigned int)(~0)) #define NULL_SECNO ((unsigned int)(~0)) @@ -534886,7 +534561,7 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/segment.h linux-linaro-stable-mx6/fs/f2fs/s unsigned int start) diff -Nur linux-3.10.30.orig/fs/f2fs/super.c linux-linaro-stable-mx6/fs/f2fs/super.c --- linux-3.10.30.orig/fs/f2fs/super.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/fs/f2fs/super.c 2014-05-15 20:34:12.474118156 +0200 ++++ linux-linaro-stable-mx6/fs/f2fs/super.c 2014-05-16 15:28:38.657476418 +0200 @@ -18,45 +18,185 @@ #include <linux/parser.h> #include <linux/mount.h> @@ -535695,7 +535370,7 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/super.c linux-linaro-stable-mx6/fs/f2fs/sup module_init(init_f2fs_fs) diff -Nur linux-3.10.30.orig/fs/f2fs/xattr.c linux-linaro-stable-mx6/fs/f2fs/xattr.c --- linux-3.10.30.orig/fs/f2fs/xattr.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/fs/f2fs/xattr.c 2014-05-15 20:34:12.474118156 +0200 ++++ linux-linaro-stable-mx6/fs/f2fs/xattr.c 2014-05-16 15:28:38.657476418 +0200 @@ -20,6 +20,7 @@ */ #include <linux/rwsem.h> @@ -536254,7 +535929,7 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/xattr.c linux-linaro-stable-mx6/fs/f2fs/xat +} diff -Nur linux-3.10.30.orig/fs/f2fs/xattr.h linux-linaro-stable-mx6/fs/f2fs/xattr.h --- linux-3.10.30.orig/fs/f2fs/xattr.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/fs/f2fs/xattr.h 2014-05-15 20:34:12.474118156 +0200 ++++ linux-linaro-stable-mx6/fs/f2fs/xattr.h 2014-05-16 15:28:38.657476418 +0200 @@ -51,7 +51,7 @@ #define XATTR_HDR(ptr) ((struct f2fs_xattr_header *)(ptr)) @@ -536333,7 +536008,7 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/xattr.h linux-linaro-stable-mx6/fs/f2fs/xat #endif /* __F2FS_XATTR_H__ */ diff -Nur linux-3.10.30.orig/fs/jffs2/fs.c linux-linaro-stable-mx6/fs/jffs2/fs.c --- linux-3.10.30.orig/fs/jffs2/fs.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/fs/jffs2/fs.c 2014-05-15 20:34:12.782120374 +0200 ++++ linux-linaro-stable-mx6/fs/jffs2/fs.c 2014-05-16 15:28:38.693476608 +0200 @@ -515,6 +515,10 @@ c = JFFS2_SB_INFO(sb); @@ -536347,7 +536022,7 @@ diff -Nur linux-3.10.30.orig/fs/jffs2/fs.c linux-linaro-stable-mx6/fs/jffs2/fs.c pr_err("Cannot operate on NAND flash unless jffs2 NAND support is compiled in\n"); diff -Nur linux-3.10.30.orig/include/asm-generic/gpio.h linux-linaro-stable-mx6/include/asm-generic/gpio.h --- linux-3.10.30.orig/include/asm-generic/gpio.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/asm-generic/gpio.h 2014-05-15 20:34:13.914128527 +0200 ++++ linux-linaro-stable-mx6/include/asm-generic/gpio.h 2014-05-16 15:28:38.905477726 +0200 @@ -10,6 +10,8 @@ #ifdef CONFIG_GPIOLIB @@ -536621,7 +536296,7 @@ diff -Nur linux-3.10.30.orig/include/asm-generic/gpio.h linux-linaro-stable-mx6/ #endif /* _ASM_GENERIC_GPIO_H */ diff -Nur linux-3.10.30.orig/include/drm/drm_crtc_helper.h linux-linaro-stable-mx6/include/drm/drm_crtc_helper.h --- linux-3.10.30.orig/include/drm/drm_crtc_helper.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/drm/drm_crtc_helper.h 2014-05-15 20:34:13.990129074 +0200 ++++ linux-linaro-stable-mx6/include/drm/drm_crtc_helper.h 2014-05-16 15:28:38.913477768 +0200 @@ -127,6 +127,7 @@ extern int drm_helper_probe_single_connector_modes(struct drm_connector *connector, uint32_t maxX, uint32_t maxY); @@ -536632,7 +536307,7 @@ diff -Nur linux-3.10.30.orig/include/drm/drm_crtc_helper.h linux-linaro-stable-m struct drm_display_mode *mode, diff -Nur linux-3.10.30.orig/include/dt-bindings/clock/imx6sl-clock.h linux-linaro-stable-mx6/include/dt-bindings/clock/imx6sl-clock.h --- linux-3.10.30.orig/include/dt-bindings/clock/imx6sl-clock.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/dt-bindings/clock/imx6sl-clock.h 2014-05-15 20:34:14.046129478 +0200 ++++ linux-linaro-stable-mx6/include/dt-bindings/clock/imx6sl-clock.h 2014-05-16 15:28:38.921477810 +0200 @@ -0,0 +1,152 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -536788,7 +536463,7 @@ diff -Nur linux-3.10.30.orig/include/dt-bindings/clock/imx6sl-clock.h linux-lina +#endif /* __DT_BINDINGS_CLOCK_IMX6SL_H */ diff -Nur linux-3.10.30.orig/include/dt-bindings/clock/vf610-clock.h linux-linaro-stable-mx6/include/dt-bindings/clock/vf610-clock.h --- linux-3.10.30.orig/include/dt-bindings/clock/vf610-clock.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/dt-bindings/clock/vf610-clock.h 2014-05-15 20:34:14.046129478 +0200 ++++ linux-linaro-stable-mx6/include/dt-bindings/clock/vf610-clock.h 2014-05-16 15:28:38.921477810 +0200 @@ -0,0 +1,165 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -536957,7 +536632,7 @@ diff -Nur linux-3.10.30.orig/include/dt-bindings/clock/vf610-clock.h linux-linar +#endif /* __DT_BINDINGS_CLOCK_VF610_H */ diff -Nur linux-3.10.30.orig/include/linux/arm-cci.h linux-linaro-stable-mx6/include/linux/arm-cci.h --- linux-3.10.30.orig/include/linux/arm-cci.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/arm-cci.h 2014-05-15 20:34:14.146130198 +0200 ++++ linux-linaro-stable-mx6/include/linux/arm-cci.h 2014-05-16 15:28:38.925477831 +0200 @@ -0,0 +1,61 @@ +/* + * CCI cache coherent interconnect support @@ -537022,7 +536697,7 @@ diff -Nur linux-3.10.30.orig/include/linux/arm-cci.h linux-linaro-stable-mx6/inc +#endif diff -Nur linux-3.10.30.orig/include/linux/arm-hdlcd.h linux-linaro-stable-mx6/include/linux/arm-hdlcd.h --- linux-3.10.30.orig/include/linux/arm-hdlcd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/arm-hdlcd.h 2014-05-15 20:34:14.146130198 +0200 ++++ linux-linaro-stable-mx6/include/linux/arm-hdlcd.h 2014-05-16 15:28:38.925477831 +0200 @@ -0,0 +1,122 @@ +/* + * include/linux/arm-hdlcd.h @@ -537148,7 +536823,7 @@ diff -Nur linux-3.10.30.orig/include/linux/arm-hdlcd.h linux-linaro-stable-mx6/i +}; diff -Nur linux-3.10.30.orig/include/linux/backlight.h linux-linaro-stable-mx6/include/linux/backlight.h --- linux-3.10.30.orig/include/linux/backlight.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/backlight.h 2014-05-15 20:34:14.166130342 +0200 ++++ linux-linaro-stable-mx6/include/linux/backlight.h 2014-05-16 15:28:38.929477852 +0200 @@ -9,6 +9,7 @@ #define _LINUX_BACKLIGHT_H @@ -537171,7 +536846,7 @@ diff -Nur linux-3.10.30.orig/include/linux/backlight.h linux-linaro-stable-mx6/i static inline void backlight_update_status(struct backlight_device *bd) diff -Nur linux-3.10.30.orig/include/linux/busfreq-imx6.h linux-linaro-stable-mx6/include/linux/busfreq-imx6.h --- linux-3.10.30.orig/include/linux/busfreq-imx6.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/busfreq-imx6.h 2014-05-15 20:34:14.174130400 +0200 ++++ linux-linaro-stable-mx6/include/linux/busfreq-imx6.h 2014-05-16 15:28:38.933477873 +0200 @@ -0,0 +1,23 @@ +/* + * Copyright 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -537198,7 +536873,7 @@ diff -Nur linux-3.10.30.orig/include/linux/busfreq-imx6.h linux-linaro-stable-mx +#endif diff -Nur linux-3.10.30.orig/include/linux/component.h linux-linaro-stable-mx6/include/linux/component.h --- linux-3.10.30.orig/include/linux/component.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/component.h 2014-05-15 20:34:14.222130745 +0200 ++++ linux-linaro-stable-mx6/include/linux/component.h 2014-05-16 15:28:38.945477937 +0200 @@ -0,0 +1,32 @@ +#ifndef COMPONENT_H +#define COMPONENT_H @@ -537234,7 +536909,7 @@ diff -Nur linux-3.10.30.orig/include/linux/component.h linux-linaro-stable-mx6/i +#endif diff -Nur linux-3.10.30.orig/include/linux/cpufreq.h linux-linaro-stable-mx6/include/linux/cpufreq.h --- linux-3.10.30.orig/include/linux/cpufreq.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/cpufreq.h 2014-05-15 20:34:14.242130890 +0200 ++++ linux-linaro-stable-mx6/include/linux/cpufreq.h 2014-05-16 15:28:38.945477937 +0200 @@ -393,6 +393,9 @@ #elif defined(CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE) extern struct cpufreq_governor cpufreq_gov_conservative; @@ -537247,7 +536922,7 @@ diff -Nur linux-3.10.30.orig/include/linux/cpufreq.h linux-linaro-stable-mx6/inc diff -Nur linux-3.10.30.orig/include/linux/cpu.h linux-linaro-stable-mx6/include/linux/cpu.h --- linux-3.10.30.orig/include/linux/cpu.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/cpu.h 2014-05-15 20:34:14.242130890 +0200 ++++ linux-linaro-stable-mx6/include/linux/cpu.h 2014-05-16 15:28:38.945477937 +0200 @@ -29,6 +29,7 @@ extern int register_cpu(struct cpu *cpu, int num); extern struct device *get_cpu_device(unsigned cpu); @@ -537270,7 +536945,7 @@ diff -Nur linux-3.10.30.orig/include/linux/cpu.h linux-linaro-stable-mx6/include #endif /* _LINUX_CPU_H_ */ diff -Nur linux-3.10.30.orig/include/linux/debugfs.h linux-linaro-stable-mx6/include/linux/debugfs.h --- linux-3.10.30.orig/include/linux/debugfs.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/debugfs.h 2014-05-15 20:34:14.246130918 +0200 ++++ linux-linaro-stable-mx6/include/linux/debugfs.h 2014-05-16 15:28:38.953477979 +0200 @@ -79,6 +79,8 @@ struct dentry *parent, u64 *value); struct dentry *debugfs_create_size_t(const char *name, umode_t mode, @@ -537282,7 +536957,7 @@ diff -Nur linux-3.10.30.orig/include/linux/debugfs.h linux-linaro-stable-mx6/inc diff -Nur linux-3.10.30.orig/include/linux/device_cooling.h linux-linaro-stable-mx6/include/linux/device_cooling.h --- linux-3.10.30.orig/include/linux/device_cooling.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/device_cooling.h 2014-05-15 20:34:14.278131149 +0200 ++++ linux-linaro-stable-mx6/include/linux/device_cooling.h 2014-05-16 15:28:38.957478000 +0200 @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -537331,7 +537006,7 @@ diff -Nur linux-3.10.30.orig/include/linux/device_cooling.h linux-linaro-stable- +#endif /* __DEVICE_THERMAL_H__ */ diff -Nur linux-3.10.30.orig/include/linux/device.h linux-linaro-stable-mx6/include/linux/device.h --- linux-3.10.30.orig/include/linux/device.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/device.h 2014-05-15 20:34:14.278131149 +0200 ++++ linux-linaro-stable-mx6/include/linux/device.h 2014-05-16 15:28:38.953477979 +0200 @@ -47,7 +47,11 @@ }; @@ -537416,7 +537091,7 @@ diff -Nur linux-3.10.30.orig/include/linux/device.h linux-linaro-stable-mx6/incl { __ATTR(_name, _mode, device_show_ulong, device_store_ulong), &(_var) } diff -Nur linux-3.10.30.orig/include/linux/dmaengine.h linux-linaro-stable-mx6/include/linux/dmaengine.h --- linux-3.10.30.orig/include/linux/dmaengine.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/dmaengine.h 2014-05-15 20:34:14.282131177 +0200 ++++ linux-linaro-stable-mx6/include/linux/dmaengine.h 2014-05-16 15:28:38.957478000 +0200 @@ -341,6 +341,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 @@ -537437,7 +537112,7 @@ diff -Nur linux-3.10.30.orig/include/linux/dmaengine.h linux-linaro-stable-mx6/i static inline const char *dma_chan_name(struct dma_chan *chan) diff -Nur linux-3.10.30.orig/include/linux/err.h linux-linaro-stable-mx6/include/linux/err.h --- linux-3.10.30.orig/include/linux/err.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/err.h 2014-05-15 20:34:14.286131207 +0200 ++++ linux-linaro-stable-mx6/include/linux/err.h 2014-05-16 15:28:38.961478021 +0200 @@ -52,7 +52,7 @@ return (void *) ptr; } @@ -537459,7 +537134,7 @@ diff -Nur linux-3.10.30.orig/include/linux/err.h linux-linaro-stable-mx6/include #endif /* _LINUX_ERR_H */ diff -Nur linux-3.10.30.orig/include/linux/f2fs_fs.h linux-linaro-stable-mx6/include/linux/f2fs_fs.h --- linux-3.10.30.orig/include/linux/f2fs_fs.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/f2fs_fs.h 2014-05-15 20:34:14.310131379 +0200 ++++ linux-linaro-stable-mx6/include/linux/f2fs_fs.h 2014-05-16 15:28:38.961478021 +0200 @@ -140,14 +140,24 @@ } __packed; @@ -537500,7 +537175,7 @@ diff -Nur linux-3.10.30.orig/include/linux/f2fs_fs.h linux-linaro-stable-mx6/inc double_indirect(1) node id */ diff -Nur linux-3.10.30.orig/include/linux/genalloc.h linux-linaro-stable-mx6/include/linux/genalloc.h --- linux-3.10.30.orig/include/linux/genalloc.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/genalloc.h 2014-05-15 20:34:14.458132445 +0200 ++++ linux-linaro-stable-mx6/include/linux/genalloc.h 2014-05-16 15:28:38.969478063 +0200 @@ -94,6 +94,8 @@ } extern void gen_pool_destroy(struct gen_pool *); @@ -537512,7 +537187,7 @@ diff -Nur linux-3.10.30.orig/include/linux/genalloc.h linux-linaro-stable-mx6/in void (*)(struct gen_pool *, struct gen_pool_chunk *, void *), void *); diff -Nur linux-3.10.30.orig/include/linux/gpio/consumer.h linux-linaro-stable-mx6/include/linux/gpio/consumer.h --- linux-3.10.30.orig/include/linux/gpio/consumer.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/gpio/consumer.h 2014-05-15 20:34:14.462132474 +0200 ++++ linux-linaro-stable-mx6/include/linux/gpio/consumer.h 2014-05-16 15:28:38.969478063 +0200 @@ -0,0 +1,253 @@ +#ifndef __LINUX_GPIO_CONSUMER_H +#define __LINUX_GPIO_CONSUMER_H @@ -537769,7 +537444,7 @@ diff -Nur linux-3.10.30.orig/include/linux/gpio/consumer.h linux-linaro-stable-m +#endif diff -Nur linux-3.10.30.orig/include/linux/gpio/driver.h linux-linaro-stable-mx6/include/linux/gpio/driver.h --- linux-3.10.30.orig/include/linux/gpio/driver.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/gpio/driver.h 2014-05-15 20:34:14.462132474 +0200 ++++ linux-linaro-stable-mx6/include/linux/gpio/driver.h 2014-05-16 15:28:38.969478063 +0200 @@ -0,0 +1,190 @@ +#ifndef __LINUX_GPIO_DRIVER_H +#define __LINUX_GPIO_DRIVER_H @@ -537963,7 +537638,7 @@ diff -Nur linux-3.10.30.orig/include/linux/gpio/driver.h linux-linaro-stable-mx6 +#endif diff -Nur linux-3.10.30.orig/include/linux/gpio.h linux-linaro-stable-mx6/include/linux/gpio.h --- linux-3.10.30.orig/include/linux/gpio.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/gpio.h 2014-05-15 20:34:14.458132445 +0200 ++++ linux-linaro-stable-mx6/include/linux/gpio.h 2014-05-16 15:28:38.969478063 +0200 @@ -16,14 +16,17 @@ #define GPIOF_OUT_INIT_LOW (GPIOF_DIR_OUT | GPIOF_INIT_LOW) #define GPIOF_OUT_INIT_HIGH (GPIOF_DIR_OUT | GPIOF_INIT_HIGH) @@ -538007,7 +537682,7 @@ diff -Nur linux-3.10.30.orig/include/linux/gpio.h linux-linaro-stable-mx6/includ /* irq can never have been returned from gpio_to_irq() */ diff -Nur linux-3.10.30.orig/include/linux/hardirq.h linux-linaro-stable-mx6/include/linux/hardirq.h --- linux-3.10.30.orig/include/linux/hardirq.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/hardirq.h 2014-05-15 20:34:14.462132474 +0200 ++++ linux-linaro-stable-mx6/include/linux/hardirq.h 2014-05-16 15:28:38.969478063 +0200 @@ -124,8 +124,10 @@ #if defined(CONFIG_SMP) || defined(CONFIG_GENERIC_HARDIRQS) @@ -538021,7 +537696,7 @@ diff -Nur linux-3.10.30.orig/include/linux/hardirq.h linux-linaro-stable-mx6/inc #if defined(CONFIG_TINY_RCU) || defined(CONFIG_TINY_PREEMPT_RCU) diff -Nur linux-3.10.30.orig/include/linux/interrupt.h linux-linaro-stable-mx6/include/linux/interrupt.h --- linux-3.10.30.orig/include/linux/interrupt.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/interrupt.h 2014-05-15 20:34:14.566133223 +0200 ++++ linux-linaro-stable-mx6/include/linux/interrupt.h 2014-05-16 15:28:38.989478168 +0200 @@ -219,6 +219,7 @@ extern void disable_percpu_irq(unsigned int irq); extern void enable_irq(unsigned int irq); @@ -538032,7 +537707,7 @@ diff -Nur linux-3.10.30.orig/include/linux/interrupt.h linux-linaro-stable-mx6/i #ifdef CONFIG_GENERIC_HARDIRQS diff -Nur linux-3.10.30.orig/include/linux/ipu.h linux-linaro-stable-mx6/include/linux/ipu.h --- linux-3.10.30.orig/include/linux/ipu.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/ipu.h 2014-05-15 20:34:14.570133252 +0200 ++++ linux-linaro-stable-mx6/include/linux/ipu.h 2014-05-16 15:28:38.997478211 +0200 @@ -0,0 +1,38 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. @@ -538074,7 +537749,7 @@ diff -Nur linux-3.10.30.orig/include/linux/ipu.h linux-linaro-stable-mx6/include +#endif diff -Nur linux-3.10.30.orig/include/linux/ipu-v3.h linux-linaro-stable-mx6/include/linux/ipu-v3.h --- linux-3.10.30.orig/include/linux/ipu-v3.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/ipu-v3.h 2014-05-15 20:34:14.570133252 +0200 ++++ linux-linaro-stable-mx6/include/linux/ipu-v3.h 2014-05-16 15:28:38.997478211 +0200 @@ -0,0 +1,752 @@ +/* + * Copyright (c) 2010 Sascha Hauer <s.hauer@pengutronix.de> @@ -538830,7 +538505,7 @@ diff -Nur linux-3.10.30.orig/include/linux/ipu-v3.h linux-linaro-stable-mx6/incl +#endif /* __LINUX_IPU_V3_H_ */ diff -Nur linux-3.10.30.orig/include/linux/irqchip/arm-gic.h linux-linaro-stable-mx6/include/linux/irqchip/arm-gic.h --- linux-3.10.30.orig/include/linux/irqchip/arm-gic.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/irqchip/arm-gic.h 2014-05-15 20:34:14.574133281 +0200 ++++ linux-linaro-stable-mx6/include/linux/irqchip/arm-gic.h 2014-05-16 15:28:39.001478232 +0200 @@ -31,6 +31,8 @@ #define GIC_DIST_TARGET 0x800 #define GIC_DIST_CONFIG 0xc00 @@ -538862,7 +538537,7 @@ diff -Nur linux-3.10.30.orig/include/linux/irqchip/arm-gic.h linux-linaro-stable #endif diff -Nur linux-3.10.30.orig/include/linux/isl29023.h linux-linaro-stable-mx6/include/linux/isl29023.h --- linux-3.10.30.orig/include/linux/isl29023.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/isl29023.h 2014-05-15 20:34:14.574133281 +0200 ++++ linux-linaro-stable-mx6/include/linux/isl29023.h 2014-05-16 15:28:39.009478274 +0200 @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -538913,7 +538588,7 @@ diff -Nur linux-3.10.30.orig/include/linux/isl29023.h linux-linaro-stable-mx6/in +#endif diff -Nur linux-3.10.30.orig/include/linux/mfd/max17135.h linux-linaro-stable-mx6/include/linux/mfd/max17135.h --- linux-3.10.30.orig/include/linux/mfd/max17135.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/mfd/max17135.h 2014-05-15 20:34:14.638133742 +0200 ++++ linux-linaro-stable-mx6/include/linux/mfd/max17135.h 2014-05-16 15:28:39.025478358 +0200 @@ -0,0 +1,220 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -539137,7 +538812,7 @@ diff -Nur linux-3.10.30.orig/include/linux/mfd/max17135.h linux-linaro-stable-mx +#endif diff -Nur linux-3.10.30.orig/include/linux/mfd/mxc-hdmi-core.h linux-linaro-stable-mx6/include/linux/mfd/mxc-hdmi-core.h --- linux-3.10.30.orig/include/linux/mfd/mxc-hdmi-core.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/mfd/mxc-hdmi-core.h 2014-05-15 20:34:14.658133885 +0200 ++++ linux-linaro-stable-mx6/include/linux/mfd/mxc-hdmi-core.h 2014-05-16 15:28:39.025478358 +0200 @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -539205,7 +538880,7 @@ diff -Nur linux-3.10.30.orig/include/linux/mfd/mxc-hdmi-core.h linux-linaro-stab +#endif diff -Nur linux-3.10.30.orig/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h linux-linaro-stable-mx6/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h --- linux-3.10.30.orig/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h 2014-05-15 20:34:14.694134145 +0200 ++++ linux-linaro-stable-mx6/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h 2014-05-16 15:28:39.113478822 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Freescale Semiconductor, Inc. @@ -539409,7 +539084,7 @@ diff -Nur linux-3.10.30.orig/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h linux-l #endif /* __LINUX_IMX6Q_IOMUXC_GPR_H */ diff -Nur linux-3.10.30.orig/include/linux/mipi_csi2.h linux-linaro-stable-mx6/include/linux/mipi_csi2.h --- linux-3.10.30.orig/include/linux/mipi_csi2.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/mipi_csi2.h 2014-05-15 20:34:14.794134865 +0200 ++++ linux-linaro-stable-mx6/include/linux/mipi_csi2.h 2014-05-16 15:28:39.209479329 +0200 @@ -0,0 +1,91 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -539504,7 +539179,7 @@ diff -Nur linux-3.10.30.orig/include/linux/mipi_csi2.h linux-linaro-stable-mx6/i +#endif diff -Nur linux-3.10.30.orig/include/linux/mipi_dsi.h linux-linaro-stable-mx6/include/linux/mipi_dsi.h --- linux-3.10.30.orig/include/linux/mipi_dsi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/mipi_dsi.h 2014-05-15 20:34:14.794134865 +0200 ++++ linux-linaro-stable-mx6/include/linux/mipi_dsi.h 2014-05-16 15:28:39.209479329 +0200 @@ -0,0 +1,171 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -539679,7 +539354,7 @@ diff -Nur linux-3.10.30.orig/include/linux/mipi_dsi.h linux-linaro-stable-mx6/in +#endif diff -Nur linux-3.10.30.orig/include/linux/mmc/card.h linux-linaro-stable-mx6/include/linux/mmc/card.h --- linux-3.10.30.orig/include/linux/mmc/card.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/mmc/card.h 2014-05-15 20:34:14.798134894 +0200 ++++ linux-linaro-stable-mx6/include/linux/mmc/card.h 2014-05-16 15:28:39.213479350 +0200 @@ -86,10 +86,13 @@ unsigned int data_sector_size; /* 512 bytes or 4KB */ unsigned int data_tag_unit_size; /* DATA TAG UNIT size */ @@ -539704,7 +539379,7 @@ diff -Nur linux-3.10.30.orig/include/linux/mmc/card.h linux-linaro-stable-mx6/in u8 raw_sec_feature_support;/* 231 */ diff -Nur linux-3.10.30.orig/include/linux/mmc/core.h linux-linaro-stable-mx6/include/linux/mmc/core.h --- linux-3.10.30.orig/include/linux/mmc/core.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/mmc/core.h 2014-05-15 20:34:14.798134894 +0200 ++++ linux-linaro-stable-mx6/include/linux/mmc/core.h 2014-05-16 15:28:39.213479350 +0200 @@ -96,6 +96,8 @@ */ @@ -539716,7 +539391,7 @@ diff -Nur linux-3.10.30.orig/include/linux/mmc/core.h linux-linaro-stable-mx6/in struct mmc_request *mrq; /* associated request */ diff -Nur linux-3.10.30.orig/include/linux/mmc/host.h linux-linaro-stable-mx6/include/linux/mmc/host.h --- linux-3.10.30.orig/include/linux/mmc/host.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/mmc/host.h 2014-05-15 20:34:14.798134894 +0200 ++++ linux-linaro-stable-mx6/include/linux/mmc/host.h 2014-05-16 15:28:39.213479350 +0200 @@ -281,6 +281,8 @@ #define MMC_CAP2_PACKED_CMD (MMC_CAP2_PACKED_RD | \ MMC_CAP2_PACKED_WR) @@ -539758,7 +539433,7 @@ diff -Nur linux-3.10.30.orig/include/linux/mmc/host.h linux-linaro-stable-mx6/in int mmc_regulator_set_ocr(struct mmc_host *mmc, diff -Nur linux-3.10.30.orig/include/linux/mmc/mmc.h linux-linaro-stable-mx6/include/linux/mmc/mmc.h --- linux-3.10.30.orig/include/linux/mmc/mmc.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/mmc/mmc.h 2014-05-15 20:34:14.798134894 +0200 ++++ linux-linaro-stable-mx6/include/linux/mmc/mmc.h 2014-05-16 15:28:39.213479350 +0200 @@ -292,6 +292,7 @@ #define EXT_CSD_RPMB_MULT 168 /* RO */ #define EXT_CSD_BOOT_WP 173 /* R/W */ @@ -539807,7 +539482,7 @@ diff -Nur linux-3.10.30.orig/include/linux/mmc/mmc.h linux-linaro-stable-mx6/inc diff -Nur linux-3.10.30.orig/include/linux/mmc/sdhci.h linux-linaro-stable-mx6/include/linux/mmc/sdhci.h --- linux-3.10.30.orig/include/linux/mmc/sdhci.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/mmc/sdhci.h 2014-05-15 20:34:14.798134894 +0200 ++++ linux-linaro-stable-mx6/include/linux/mmc/sdhci.h 2014-05-16 15:28:39.213479350 +0200 @@ -57,12 +57,8 @@ #define SDHCI_QUIRK_BROKEN_CARD_DETECTION (1<<15) /* Controller reports inverted write-protect state */ @@ -539873,7 +539548,7 @@ diff -Nur linux-3.10.30.orig/include/linux/mmc/sdhci.h linux-linaro-stable-mx6/i diff -Nur linux-3.10.30.orig/include/linux/mmc/sdio_ids.h linux-linaro-stable-mx6/include/linux/mmc/sdio_ids.h --- linux-3.10.30.orig/include/linux/mmc/sdio_ids.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/mmc/sdio_ids.h 2014-05-15 20:34:14.818135038 +0200 ++++ linux-linaro-stable-mx6/include/linux/mmc/sdio_ids.h 2014-05-16 15:28:39.213479350 +0200 @@ -23,6 +23,15 @@ /* * Vendors and devices. Sort key: vendor first, device next. @@ -539892,7 +539567,7 @@ diff -Nur linux-3.10.30.orig/include/linux/mmc/sdio_ids.h linux-linaro-stable-mx #define SDIO_DEVICE_ID_INTEL_IWMC3200WIFI 0x1403 diff -Nur linux-3.10.30.orig/include/linux/mmc/slot-gpio.h linux-linaro-stable-mx6/include/linux/mmc/slot-gpio.h --- linux-3.10.30.orig/include/linux/mmc/slot-gpio.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/mmc/slot-gpio.h 2014-05-15 20:34:14.818135038 +0200 ++++ linux-linaro-stable-mx6/include/linux/mmc/slot-gpio.h 2014-05-16 15:28:39.217479371 +0200 @@ -18,7 +18,8 @@ void mmc_gpio_free_ro(struct mmc_host *host); @@ -539905,7 +539580,7 @@ diff -Nur linux-3.10.30.orig/include/linux/mmc/slot-gpio.h linux-linaro-stable-m #endif diff -Nur linux-3.10.30.orig/include/linux/msi.h linux-linaro-stable-mx6/include/linux/msi.h --- linux-3.10.30.orig/include/linux/msi.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/msi.h 2014-05-15 20:34:14.822135067 +0200 ++++ linux-linaro-stable-mx6/include/linux/msi.h 2014-05-16 15:28:39.221479392 +0200 @@ -35,6 +35,7 @@ u32 masked; /* mask bits */ @@ -539949,7 +539624,7 @@ diff -Nur linux-3.10.30.orig/include/linux/msi.h linux-linaro-stable-mx6/include #endif /* LINUX_MSI_H */ diff -Nur linux-3.10.30.orig/include/linux/mtd/bbm.h linux-linaro-stable-mx6/include/linux/mtd/bbm.h --- linux-3.10.30.orig/include/linux/mtd/bbm.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/mtd/bbm.h 2014-05-15 20:34:14.822135067 +0200 ++++ linux-linaro-stable-mx6/include/linux/mtd/bbm.h 2014-05-16 15:28:39.225479413 +0200 @@ -91,10 +91,6 @@ * with NAND_BBT_CREATE. */ @@ -539963,7 +539638,7 @@ diff -Nur linux-3.10.30.orig/include/linux/mtd/bbm.h linux-linaro-stable-mx6/inc /* Read and write back block contents when writing bbt */ diff -Nur linux-3.10.30.orig/include/linux/mtd/map.h linux-linaro-stable-mx6/include/linux/mtd/map.h --- linux-3.10.30.orig/include/linux/mtd/map.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/mtd/map.h 2014-05-15 20:34:14.822135067 +0200 ++++ linux-linaro-stable-mx6/include/linux/mtd/map.h 2014-05-16 15:28:39.225479413 +0200 @@ -438,7 +438,7 @@ if (map->cached) memcpy(to, (char *)map->cached + from, len); @@ -539975,7 +539650,7 @@ diff -Nur linux-3.10.30.orig/include/linux/mtd/map.h linux-linaro-stable-mx6/inc static inline void inline_map_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len) diff -Nur linux-3.10.30.orig/include/linux/mtd/mtd.h linux-linaro-stable-mx6/include/linux/mtd/mtd.h --- linux-3.10.30.orig/include/linux/mtd/mtd.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/mtd/mtd.h 2014-05-15 20:34:14.822135067 +0200 ++++ linux-linaro-stable-mx6/include/linux/mtd/mtd.h 2014-05-16 15:28:39.225479413 +0200 @@ -173,6 +173,9 @@ /* ECC layout structure pointer - read only! */ struct nand_ecclayout *ecclayout; @@ -540000,7 +539675,7 @@ diff -Nur linux-3.10.30.orig/include/linux/mtd/mtd.h linux-linaro-stable-mx6/inc return !!mtd->_block_isbad; diff -Nur linux-3.10.30.orig/include/linux/mtd/nand.h linux-linaro-stable-mx6/include/linux/mtd/nand.h --- linux-3.10.30.orig/include/linux/mtd/nand.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/mtd/nand.h 2014-05-15 20:34:14.834135153 +0200 ++++ linux-linaro-stable-mx6/include/linux/mtd/nand.h 2014-05-16 15:28:39.225479413 +0200 @@ -56,7 +56,7 @@ * is supported now. If you add a chip with bigger oobsize/page * adjust this accordingly. @@ -540217,7 +539892,7 @@ diff -Nur linux-3.10.30.orig/include/linux/mtd/nand.h linux-linaro-stable-mx6/in #endif /* __LINUX_MTD_NAND_H */ diff -Nur linux-3.10.30.orig/include/linux/mxc_asrc.h linux-linaro-stable-mx6/include/linux/mxc_asrc.h --- linux-3.10.30.orig/include/linux/mxc_asrc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/mxc_asrc.h 2014-05-15 20:34:14.870135413 +0200 ++++ linux-linaro-stable-mx6/include/linux/mxc_asrc.h 2014-05-16 15:28:39.229479434 +0200 @@ -0,0 +1,386 @@ +/* + * Copyright 2008-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -540607,7 +540282,7 @@ diff -Nur linux-3.10.30.orig/include/linux/mxc_asrc.h linux-linaro-stable-mx6/in +#endif/* __MXC_ASRC_H__ */ diff -Nur linux-3.10.30.orig/include/linux/mxcfb_epdc.h linux-linaro-stable-mx6/include/linux/mxcfb_epdc.h --- linux-3.10.30.orig/include/linux/mxcfb_epdc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/mxcfb_epdc.h 2014-05-15 20:34:14.870135413 +0200 ++++ linux-linaro-stable-mx6/include/linux/mxcfb_epdc.h 2014-05-16 15:28:39.233479455 +0200 @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -540683,7 +540358,7 @@ diff -Nur linux-3.10.30.orig/include/linux/mxcfb_epdc.h linux-linaro-stable-mx6/ +#endif diff -Nur linux-3.10.30.orig/include/linux/mxcfb.h linux-linaro-stable-mx6/include/linux/mxcfb.h --- linux-3.10.30.orig/include/linux/mxcfb.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/mxcfb.h 2014-05-15 20:34:14.870135413 +0200 ++++ linux-linaro-stable-mx6/include/linux/mxcfb.h 2014-05-16 15:28:39.229479434 +0200 @@ -0,0 +1,46 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -540733,7 +540408,7 @@ diff -Nur linux-3.10.30.orig/include/linux/mxcfb.h linux-linaro-stable-mx6/inclu +#endif diff -Nur linux-3.10.30.orig/include/linux/mxc_mlb.h linux-linaro-stable-mx6/include/linux/mxc_mlb.h --- linux-3.10.30.orig/include/linux/mxc_mlb.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/mxc_mlb.h 2014-05-15 20:34:14.870135413 +0200 ++++ linux-linaro-stable-mx6/include/linux/mxc_mlb.h 2014-05-16 15:28:39.229479434 +0200 @@ -0,0 +1,55 @@ +/* + * mxc_mlb.h @@ -540792,7 +540467,7 @@ diff -Nur linux-3.10.30.orig/include/linux/mxc_mlb.h linux-linaro-stable-mx6/inc +#endif /* _MXC_MLB_H */ diff -Nur linux-3.10.30.orig/include/linux/mxc_v4l2.h linux-linaro-stable-mx6/include/linux/mxc_v4l2.h --- linux-3.10.30.orig/include/linux/mxc_v4l2.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/mxc_v4l2.h 2014-05-15 20:34:14.870135413 +0200 ++++ linux-linaro-stable-mx6/include/linux/mxc_v4l2.h 2014-05-16 15:28:39.229479434 +0200 @@ -0,0 +1,27 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -540823,7 +540498,7 @@ diff -Nur linux-3.10.30.orig/include/linux/mxc_v4l2.h linux-linaro-stable-mx6/in +#endif diff -Nur linux-3.10.30.orig/include/linux/mxc_vpu.h linux-linaro-stable-mx6/include/linux/mxc_vpu.h --- linux-3.10.30.orig/include/linux/mxc_vpu.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/mxc_vpu.h 2014-05-15 20:34:14.870135413 +0200 ++++ linux-linaro-stable-mx6/include/linux/mxc_vpu.h 2014-05-16 15:28:39.229479434 +0200 @@ -0,0 +1,118 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -540945,7 +540620,7 @@ diff -Nur linux-3.10.30.orig/include/linux/mxc_vpu.h linux-linaro-stable-mx6/inc +#endif diff -Nur linux-3.10.30.orig/include/linux/of_address.h linux-linaro-stable-mx6/include/linux/of_address.h --- linux-3.10.30.orig/include/linux/of_address.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/of_address.h 2014-05-15 20:34:14.886135528 +0200 ++++ linux-linaro-stable-mx6/include/linux/of_address.h 2014-05-16 15:28:39.257479582 +0200 @@ -4,6 +4,36 @@ #include <linux/errno.h> #include <linux/of.h> @@ -541017,7 +540692,7 @@ diff -Nur linux-3.10.30.orig/include/linux/of_address.h linux-linaro-stable-mx6/ diff -Nur linux-3.10.30.orig/include/linux/of_gpio.h linux-linaro-stable-mx6/include/linux/of_gpio.h --- linux-3.10.30.orig/include/linux/of_gpio.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/of_gpio.h 2014-05-15 20:34:14.886135528 +0200 ++++ linux-linaro-stable-mx6/include/linux/of_gpio.h 2014-05-16 15:28:39.261479603 +0200 @@ -19,8 +19,10 @@ #include <linux/errno.h> #include <linux/gpio.h> @@ -541096,7 +540771,7 @@ diff -Nur linux-3.10.30.orig/include/linux/of_gpio.h linux-linaro-stable-mx6/inc { diff -Nur linux-3.10.30.orig/include/linux/of.h linux-linaro-stable-mx6/include/linux/of.h --- linux-3.10.30.orig/include/linux/of.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/of.h 2014-05-15 20:34:14.886135528 +0200 ++++ linux-linaro-stable-mx6/include/linux/of.h 2014-05-16 15:28:39.257479582 +0200 @@ -266,6 +266,7 @@ extern const void *of_get_property(const struct device_node *node, const char *name, @@ -541165,7 +540840,7 @@ diff -Nur linux-3.10.30.orig/include/linux/of.h linux-linaro-stable-mx6/include/ #define of_match_node(_matches, _node) NULL diff -Nur linux-3.10.30.orig/include/linux/of_pci.h linux-linaro-stable-mx6/include/linux/of_pci.h --- linux-3.10.30.orig/include/linux/of_pci.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/of_pci.h 2014-05-15 20:34:14.886135528 +0200 ++++ linux-linaro-stable-mx6/include/linux/of_pci.h 2014-05-16 15:28:39.261479603 +0200 @@ -2,6 +2,7 @@ #define __OF_PCI_H @@ -541195,7 +540870,7 @@ diff -Nur linux-3.10.30.orig/include/linux/of_pci.h linux-linaro-stable-mx6/incl #endif diff -Nur linux-3.10.30.orig/include/linux/pci.h linux-linaro-stable-mx6/include/linux/pci.h --- linux-3.10.30.orig/include/linux/pci.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/pci.h 2014-05-15 20:34:14.914135729 +0200 ++++ linux-linaro-stable-mx6/include/linux/pci.h 2014-05-16 15:28:39.277479687 +0200 @@ -432,6 +432,7 @@ struct resource busn_res; /* bus numbers routed to this bus */ @@ -541206,7 +540881,7 @@ diff -Nur linux-3.10.30.orig/include/linux/pci.h linux-linaro-stable-mx6/include diff -Nur linux-3.10.30.orig/include/linux/pinctrl/consumer.h linux-linaro-stable-mx6/include/linux/pinctrl/consumer.h --- linux-3.10.30.orig/include/linux/pinctrl/consumer.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/pinctrl/consumer.h 2014-05-15 20:34:14.914135729 +0200 ++++ linux-linaro-stable-mx6/include/linux/pinctrl/consumer.h 2014-05-16 15:28:39.285479730 +0200 @@ -40,6 +40,25 @@ extern struct pinctrl * __must_check devm_pinctrl_get(struct device *dev); extern void devm_pinctrl_put(struct pinctrl *p); @@ -541257,7 +540932,7 @@ diff -Nur linux-3.10.30.orig/include/linux/pinctrl/consumer.h linux-linaro-stabl diff -Nur linux-3.10.30.orig/include/linux/pinctrl/devinfo.h linux-linaro-stable-mx6/include/linux/pinctrl/devinfo.h --- linux-3.10.30.orig/include/linux/pinctrl/devinfo.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/pinctrl/devinfo.h 2014-05-15 20:34:14.914135729 +0200 ++++ linux-linaro-stable-mx6/include/linux/pinctrl/devinfo.h 2014-05-16 15:28:39.285479730 +0200 @@ -28,6 +28,10 @@ struct dev_pin_info { struct pinctrl *p; @@ -541271,7 +540946,7 @@ diff -Nur linux-3.10.30.orig/include/linux/pinctrl/devinfo.h linux-linaro-stable extern int pinctrl_bind_pins(struct device *dev); diff -Nur linux-3.10.30.orig/include/linux/pinctrl/pinctrl.h linux-linaro-stable-mx6/include/linux/pinctrl/pinctrl.h --- linux-3.10.30.orig/include/linux/pinctrl/pinctrl.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/pinctrl/pinctrl.h 2014-05-15 20:34:14.914135729 +0200 ++++ linux-linaro-stable-mx6/include/linux/pinctrl/pinctrl.h 2014-05-16 15:28:39.285479730 +0200 @@ -49,7 +49,8 @@ * @name: a name for the chip in this range * @id: an ID number for the chip in this range @@ -541292,7 +540967,7 @@ diff -Nur linux-3.10.30.orig/include/linux/pinctrl/pinctrl.h linux-linaro-stable }; diff -Nur linux-3.10.30.orig/include/linux/platform_data/brcmfmac-sdio.h linux-linaro-stable-mx6/include/linux/platform_data/brcmfmac-sdio.h --- linux-3.10.30.orig/include/linux/platform_data/brcmfmac-sdio.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/platform_data/brcmfmac-sdio.h 2014-05-15 20:34:14.934135873 +0200 ++++ linux-linaro-stable-mx6/include/linux/platform_data/brcmfmac-sdio.h 2014-05-16 15:28:39.289479751 +0200 @@ -90,6 +90,14 @@ * oob_irq_nr, oob_irq_flags: the OOB interrupt information. The values are * used for registering the irq using request_irq function. @@ -541320,7 +540995,7 @@ diff -Nur linux-3.10.30.orig/include/linux/platform_data/brcmfmac-sdio.h linux-l void (*reset)(void); diff -Nur linux-3.10.30.orig/include/linux/platform_data/dma-imx.h linux-linaro-stable-mx6/include/linux/platform_data/dma-imx.h --- linux-3.10.30.orig/include/linux/platform_data/dma-imx.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/platform_data/dma-imx.h 2014-05-15 20:34:14.938135903 +0200 ++++ linux-linaro-stable-mx6/include/linux/platform_data/dma-imx.h 2014-05-16 15:28:39.289479751 +0200 @@ -1,5 +1,5 @@ /* - * Copyright 2004-2009 Freescale Semiconductor, Inc. All Rights Reserved. @@ -541363,7 +541038,7 @@ diff -Nur linux-3.10.30.orig/include/linux/platform_data/dma-imx.h linux-linaro- return strstr(dev_name(chan->device->dev), "sdma") || diff -Nur linux-3.10.30.orig/include/linux/platform_data/dma-imx-sdma.h linux-linaro-stable-mx6/include/linux/platform_data/dma-imx-sdma.h --- linux-3.10.30.orig/include/linux/platform_data/dma-imx-sdma.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/platform_data/dma-imx-sdma.h 2014-05-15 20:34:14.938135903 +0200 ++++ linux-linaro-stable-mx6/include/linux/platform_data/dma-imx-sdma.h 2014-05-16 15:28:39.289479751 +0200 @@ -43,6 +43,9 @@ s32 dptc_dvfs_addr; s32 utra_addr; @@ -541376,7 +541051,7 @@ diff -Nur linux-3.10.30.orig/include/linux/platform_data/dma-imx-sdma.h linux-li /** diff -Nur linux-3.10.30.orig/include/linux/platform_data/mmc-esdhc-imx.h linux-linaro-stable-mx6/include/linux/platform_data/mmc-esdhc-imx.h --- linux-3.10.30.orig/include/linux/platform_data/mmc-esdhc-imx.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/platform_data/mmc-esdhc-imx.h 2014-05-15 20:34:14.958136046 +0200 ++++ linux-linaro-stable-mx6/include/linux/platform_data/mmc-esdhc-imx.h 2014-05-16 15:28:39.293479771 +0200 @@ -10,6 +10,8 @@ #ifndef __ASM_ARCH_IMX_ESDHC_H #define __ASM_ARCH_IMX_ESDHC_H @@ -541404,7 +541079,7 @@ diff -Nur linux-3.10.30.orig/include/linux/platform_data/mmc-esdhc-imx.h linux-l #endif /* __ASM_ARCH_IMX_ESDHC_H */ diff -Nur linux-3.10.30.orig/include/linux/pmic_status.h linux-linaro-stable-mx6/include/linux/pmic_status.h --- linux-3.10.30.orig/include/linux/pmic_status.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/pmic_status.h 2014-05-15 20:34:15.010136421 +0200 ++++ linux-linaro-stable-mx6/include/linux/pmic_status.h 2014-05-16 15:28:39.301479814 +0200 @@ -0,0 +1,82 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -541490,7 +541165,7 @@ diff -Nur linux-3.10.30.orig/include/linux/pmic_status.h linux-linaro-stable-mx6 +#endif /* __ASM_ARCH_MXC_PMIC_STATUS_H__ */ diff -Nur linux-3.10.30.orig/include/linux/power/imx6_usb_charger.h linux-linaro-stable-mx6/include/linux/power/imx6_usb_charger.h --- linux-3.10.30.orig/include/linux/power/imx6_usb_charger.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/power/imx6_usb_charger.h 2014-05-15 20:34:15.010136421 +0200 ++++ linux-linaro-stable-mx6/include/linux/power/imx6_usb_charger.h 2014-05-16 15:28:39.305479835 +0200 @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -541574,7 +541249,7 @@ diff -Nur linux-3.10.30.orig/include/linux/power/imx6_usb_charger.h linux-linaro +#endif /* __IMXUSB6_CHARGER_H */ diff -Nur linux-3.10.30.orig/include/linux/power/sabresd_battery.h linux-linaro-stable-mx6/include/linux/power/sabresd_battery.h --- linux-3.10.30.orig/include/linux/power/sabresd_battery.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/power/sabresd_battery.h 2014-05-15 20:34:15.010136421 +0200 ++++ linux-linaro-stable-mx6/include/linux/power/sabresd_battery.h 2014-05-16 15:28:39.305479835 +0200 @@ -0,0 +1,65 @@ +/* + * sabresd_battery.h - Maxim 8903 USB/Adapter Charger Driver @@ -541643,7 +541318,7 @@ diff -Nur linux-3.10.30.orig/include/linux/power/sabresd_battery.h linux-linaro- +#endif /* __SABRESD_BATTERY_H__ */ diff -Nur linux-3.10.30.orig/include/linux/pxp_dma.h linux-linaro-stable-mx6/include/linux/pxp_dma.h --- linux-3.10.30.orig/include/linux/pxp_dma.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/pxp_dma.h 2014-05-15 20:34:15.034136593 +0200 ++++ linux-linaro-stable-mx6/include/linux/pxp_dma.h 2014-05-16 15:28:39.313479877 +0200 @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -541726,7 +541401,7 @@ diff -Nur linux-3.10.30.orig/include/linux/pxp_dma.h linux-linaro-stable-mx6/inc +#endif diff -Nur linux-3.10.30.orig/include/linux/regulator/consumer.h linux-linaro-stable-mx6/include/linux/regulator/consumer.h --- linux-3.10.30.orig/include/linux/regulator/consumer.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/regulator/consumer.h 2014-05-15 20:34:15.054136738 +0200 ++++ linux-linaro-stable-mx6/include/linux/regulator/consumer.h 2014-05-16 15:28:39.317479898 +0200 @@ -2,6 +2,7 @@ * consumer.h -- SoC Regulator consumer support. * @@ -541746,7 +541421,7 @@ diff -Nur linux-3.10.30.orig/include/linux/regulator/consumer.h linux-linaro-sta diff -Nur linux-3.10.30.orig/include/linux/regulator/pfuze100.h linux-linaro-stable-mx6/include/linux/regulator/pfuze100.h --- linux-3.10.30.orig/include/linux/regulator/pfuze100.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/regulator/pfuze100.h 2014-05-15 20:34:15.090136997 +0200 ++++ linux-linaro-stable-mx6/include/linux/regulator/pfuze100.h 2014-05-16 15:28:39.317479898 +0200 @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -541794,7 +541469,7 @@ diff -Nur linux-3.10.30.orig/include/linux/regulator/pfuze100.h linux-linaro-sta +#endif /* __LINUX_REG_PFUZE100_H */ diff -Nur linux-3.10.30.orig/include/linux/reset.h linux-linaro-stable-mx6/include/linux/reset.h --- linux-3.10.30.orig/include/linux/reset.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/reset.h 2014-05-15 20:34:15.094137026 +0200 ++++ linux-linaro-stable-mx6/include/linux/reset.h 2014-05-16 15:28:39.321479920 +0200 @@ -12,6 +12,13 @@ void reset_control_put(struct reset_control *rstc); struct reset_control *devm_reset_control_get(struct device *dev, const char *id); @@ -541811,7 +541486,7 @@ diff -Nur linux-3.10.30.orig/include/linux/reset.h linux-linaro-stable-mx6/inclu #endif diff -Nur linux-3.10.30.orig/include/linux/sched.h linux-linaro-stable-mx6/include/linux/sched.h --- linux-3.10.30.orig/include/linux/sched.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/sched.h 2014-05-15 20:34:15.098137054 +0200 ++++ linux-linaro-stable-mx6/include/linux/sched.h 2014-05-16 15:28:39.325479941 +0200 @@ -889,6 +889,13 @@ bool cpus_share_cache(int this_cpu, int that_cpu); @@ -541841,7 +541516,7 @@ diff -Nur linux-3.10.30.orig/include/linux/sched.h linux-linaro-stable-mx6/inclu #ifdef CONFIG_SCHEDSTATS diff -Nur linux-3.10.30.orig/include/linux/serial_core.h linux-linaro-stable-mx6/include/linux/serial_core.h --- linux-3.10.30.orig/include/linux/serial_core.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/serial_core.h 2014-05-15 20:34:15.114137169 +0200 ++++ linux-linaro-stable-mx6/include/linux/serial_core.h 2014-05-16 15:28:39.325479941 +0200 @@ -31,6 +31,13 @@ #include <linux/sysrq.h> #include <uapi/linux/serial_core.h> @@ -541858,7 +541533,7 @@ diff -Nur linux-3.10.30.orig/include/linux/serial_core.h linux-linaro-stable-mx6 struct device; diff -Nur linux-3.10.30.orig/include/linux/spi/spi_bitbang.h linux-linaro-stable-mx6/include/linux/spi/spi_bitbang.h --- linux-3.10.30.orig/include/linux/spi/spi_bitbang.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/spi/spi_bitbang.h 2014-05-15 20:34:15.222137947 +0200 ++++ linux-linaro-stable-mx6/include/linux/spi/spi_bitbang.h 2014-05-16 15:28:39.429480489 +0200 @@ -4,11 +4,7 @@ #include <linux/workqueue.h> @@ -541881,7 +541556,7 @@ diff -Nur linux-3.10.30.orig/include/linux/spi/spi_bitbang.h linux-linaro-stable diff -Nur linux-3.10.30.orig/include/linux/spi/spi.h linux-linaro-stable-mx6/include/linux/spi/spi.h --- linux-3.10.30.orig/include/linux/spi/spi.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/spi/spi.h 2014-05-15 20:34:15.222137947 +0200 ++++ linux-linaro-stable-mx6/include/linux/spi/spi.h 2014-05-16 15:28:39.429480489 +0200 @@ -23,6 +23,7 @@ #include <linux/mod_devicetable.h> #include <linux/slab.h> @@ -542074,7 +541749,7 @@ diff -Nur linux-3.10.30.orig/include/linux/spi/spi.h linux-linaro-stable-mx6/inc * avoid stuff protocol drivers can set; but include stuff diff -Nur linux-3.10.30.orig/include/linux/sysfs.h linux-linaro-stable-mx6/include/linux/sysfs.h --- linux-3.10.30.orig/include/linux/sysfs.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/sysfs.h 2014-05-15 20:34:15.330138726 +0200 ++++ linux-linaro-stable-mx6/include/linux/sysfs.h 2014-05-16 15:28:39.441480552 +0200 @@ -92,6 +92,15 @@ #define __ATTR_IGNORE_LOCKDEP __ATTR #endif @@ -542093,7 +541768,7 @@ diff -Nur linux-3.10.30.orig/include/linux/sysfs.h linux-linaro-stable-mx6/inclu struct file; diff -Nur linux-3.10.30.orig/include/linux/usb/chipidea.h linux-linaro-stable-mx6/include/linux/usb/chipidea.h --- linux-3.10.30.orig/include/linux/usb/chipidea.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/usb/chipidea.h 2014-05-15 20:34:15.374139042 +0200 ++++ linux-linaro-stable-mx6/include/linux/usb/chipidea.h 2014-05-16 15:28:39.545481101 +0200 @@ -7,32 +7,44 @@ #include <linux/usb/otg.h> @@ -542156,7 +541831,7 @@ diff -Nur linux-3.10.30.orig/include/linux/usb/chipidea.h linux-linaro-stable-mx #endif diff -Nur linux-3.10.30.orig/include/linux/usb/of.h linux-linaro-stable-mx6/include/linux/usb/of.h --- linux-3.10.30.orig/include/linux/usb/of.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/usb/of.h 2014-05-15 20:34:15.390139157 +0200 ++++ linux-linaro-stable-mx6/include/linux/usb/of.h 2014-05-16 15:28:39.549481122 +0200 @@ -0,0 +1,32 @@ +/* + * OF helpers for usb devices. @@ -542192,7 +541867,7 @@ diff -Nur linux-3.10.30.orig/include/linux/usb/of.h linux-linaro-stable-mx6/incl +#endif /* __LINUX_USB_OF_H */ diff -Nur linux-3.10.30.orig/include/linux/usb/otg.h linux-linaro-stable-mx6/include/linux/usb/otg.h --- linux-3.10.30.orig/include/linux/usb/otg.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/usb/otg.h 2014-05-15 20:34:15.398139215 +0200 ++++ linux-linaro-stable-mx6/include/linux/usb/otg.h 2014-05-16 15:28:39.549481122 +0200 @@ -92,4 +92,11 @@ /* for OTG controller drivers (and maybe other stuff) */ extern int usb_bus_start_enum(struct usb_bus *bus, unsigned port_num); @@ -542207,7 +541882,7 @@ diff -Nur linux-3.10.30.orig/include/linux/usb/otg.h linux-linaro-stable-mx6/inc #endif /* __LINUX_USB_OTG_H */ diff -Nur linux-3.10.30.orig/include/linux/usb/phy.h linux-linaro-stable-mx6/include/linux/usb/phy.h --- linux-3.10.30.orig/include/linux/usb/phy.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/usb/phy.h 2014-05-15 20:34:15.398139215 +0200 ++++ linux-linaro-stable-mx6/include/linux/usb/phy.h 2014-05-16 15:28:39.549481122 +0200 @@ -12,6 +12,15 @@ #include <linux/notifier.h> #include <linux/usb.h> @@ -542291,7 +541966,7 @@ diff -Nur linux-3.10.30.orig/include/linux/usb/phy.h linux-linaro-stable-mx6/inc static inline int diff -Nur linux-3.10.30.orig/include/linux/vexpress.h linux-linaro-stable-mx6/include/linux/vexpress.h --- linux-3.10.30.orig/include/linux/vexpress.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/vexpress.h 2014-05-15 20:34:15.402139244 +0200 ++++ linux-linaro-stable-mx6/include/linux/vexpress.h 2014-05-16 15:28:39.553481142 +0200 @@ -68,7 +68,8 @@ */ struct vexpress_config_bridge_info { @@ -542380,7 +542055,7 @@ diff -Nur linux-3.10.30.orig/include/linux/vexpress.h linux-linaro-stable-mx6/in #endif diff -Nur linux-3.10.30.orig/include/linux/vmstat.h linux-linaro-stable-mx6/include/linux/vmstat.h --- linux-3.10.30.orig/include/linux/vmstat.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/vmstat.h 2014-05-15 20:34:15.406139273 +0200 ++++ linux-linaro-stable-mx6/include/linux/vmstat.h 2014-05-16 15:28:39.557481164 +0200 @@ -195,7 +195,7 @@ extern void dec_zone_state(struct zone *, enum zone_stat_item); extern void __dec_zone_state(struct zone *, enum zone_stat_item); @@ -542392,7 +542067,7 @@ diff -Nur linux-3.10.30.orig/include/linux/vmstat.h linux-linaro-stable-mx6/incl void drain_zonestat(struct zone *zone, struct per_cpu_pageset *); diff -Nur linux-3.10.30.orig/include/linux/workqueue.h linux-linaro-stable-mx6/include/linux/workqueue.h --- linux-3.10.30.orig/include/linux/workqueue.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/workqueue.h 2014-05-15 20:34:15.430139445 +0200 ++++ linux-linaro-stable-mx6/include/linux/workqueue.h 2014-05-16 15:28:39.625481522 +0200 @@ -303,6 +303,33 @@ WQ_CPU_INTENSIVE = 1 << 5, /* cpu instensive workqueue */ WQ_SYSFS = 1 << 6, /* visible in sysfs, see wq_sysfs_register() */ @@ -542449,7 +542124,7 @@ diff -Nur linux-3.10.30.orig/include/linux/workqueue.h linux-linaro-stable-mx6/i { diff -Nur linux-3.10.30.orig/include/linux/zbud.h linux-linaro-stable-mx6/include/linux/zbud.h --- linux-3.10.30.orig/include/linux/zbud.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/linux/zbud.h 2014-05-15 20:34:15.430139445 +0200 ++++ linux-linaro-stable-mx6/include/linux/zbud.h 2014-05-16 15:28:39.625481522 +0200 @@ -0,0 +1,22 @@ +#ifndef _ZBUD_H_ +#define _ZBUD_H_ @@ -542475,7 +542150,7 @@ diff -Nur linux-3.10.30.orig/include/linux/zbud.h linux-linaro-stable-mx6/includ +#endif /* _ZBUD_H_ */ diff -Nur linux-3.10.30.orig/include/sound/memalloc.h linux-linaro-stable-mx6/include/sound/memalloc.h --- linux-3.10.30.orig/include/sound/memalloc.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/sound/memalloc.h 2014-05-15 20:34:15.798142096 +0200 ++++ linux-linaro-stable-mx6/include/sound/memalloc.h 2014-05-16 15:28:40.093483990 +0200 @@ -52,6 +52,11 @@ #else #define SNDRV_DMA_TYPE_DEV_SG SNDRV_DMA_TYPE_DEV /* no SG-buf support */ @@ -542490,7 +542165,7 @@ diff -Nur linux-3.10.30.orig/include/sound/memalloc.h linux-linaro-stable-mx6/in * info for buffer allocation diff -Nur linux-3.10.30.orig/include/sound/wm8962.h linux-linaro-stable-mx6/include/sound/wm8962.h --- linux-3.10.30.orig/include/sound/wm8962.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/sound/wm8962.h 2014-05-15 20:34:15.834142355 +0200 ++++ linux-linaro-stable-mx6/include/sound/wm8962.h 2014-05-16 15:28:40.161484348 +0200 @@ -55,6 +55,9 @@ * in a DC measurement configuration. */ @@ -542503,7 +542178,7 @@ diff -Nur linux-3.10.30.orig/include/sound/wm8962.h linux-linaro-stable-mx6/incl #endif diff -Nur linux-3.10.30.orig/include/trace/events/arm-ipi.h linux-linaro-stable-mx6/include/trace/events/arm-ipi.h --- linux-3.10.30.orig/include/trace/events/arm-ipi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/trace/events/arm-ipi.h 2014-05-15 20:34:15.846142441 +0200 ++++ linux-linaro-stable-mx6/include/trace/events/arm-ipi.h 2014-05-16 15:28:40.261484876 +0200 @@ -0,0 +1,100 @@ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM arm-ipi @@ -542607,7 +542282,7 @@ diff -Nur linux-3.10.30.orig/include/trace/events/arm-ipi.h linux-linaro-stable- +#include <trace/define_trace.h> diff -Nur linux-3.10.30.orig/include/trace/events/f2fs.h linux-linaro-stable-mx6/include/trace/events/f2fs.h --- linux-3.10.30.orig/include/trace/events/f2fs.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/trace/events/f2fs.h 2014-05-15 20:34:15.858142528 +0200 ++++ linux-linaro-stable-mx6/include/trace/events/f2fs.h 2014-05-16 15:28:40.261484876 +0200 @@ -36,6 +36,11 @@ { CURSEG_COLD_NODE, "Cold NODE" }, \ { NO_CHECK_TYPE, "No TYPE" }) @@ -542675,7 +542350,7 @@ diff -Nur linux-3.10.30.orig/include/trace/events/f2fs.h linux-linaro-stable-mx6 TP_PROTO(struct page *page, block_t blk_addr, int type), diff -Nur linux-3.10.30.orig/include/trace/events/power_cpu_migrate.h linux-linaro-stable-mx6/include/trace/events/power_cpu_migrate.h --- linux-3.10.30.orig/include/trace/events/power_cpu_migrate.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/trace/events/power_cpu_migrate.h 2014-05-15 20:34:15.870142615 +0200 ++++ linux-linaro-stable-mx6/include/trace/events/power_cpu_migrate.h 2014-05-16 15:28:40.261484876 +0200 @@ -0,0 +1,67 @@ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM power @@ -542746,7 +542421,7 @@ diff -Nur linux-3.10.30.orig/include/trace/events/power_cpu_migrate.h linux-lina +#include <trace/define_trace.h> diff -Nur linux-3.10.30.orig/include/trace/events/sched.h linux-linaro-stable-mx6/include/trace/events/sched.h --- linux-3.10.30.orig/include/trace/events/sched.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/trace/events/sched.h 2014-05-15 20:34:15.882142701 +0200 ++++ linux-linaro-stable-mx6/include/trace/events/sched.h 2014-05-16 15:28:40.265484898 +0200 @@ -430,6 +430,280 @@ __entry->oldprio, __entry->newprio) ); @@ -543030,7 +542705,7 @@ diff -Nur linux-3.10.30.orig/include/trace/events/sched.h linux-linaro-stable-mx /* This part must be outside protection */ diff -Nur linux-3.10.30.orig/include/trace/events/smp.h linux-linaro-stable-mx6/include/trace/events/smp.h --- linux-3.10.30.orig/include/trace/events/smp.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/trace/events/smp.h 2014-05-15 20:34:15.882142701 +0200 ++++ linux-linaro-stable-mx6/include/trace/events/smp.h 2014-05-16 15:28:40.265484898 +0200 @@ -0,0 +1,90 @@ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM smp @@ -543124,7 +542799,7 @@ diff -Nur linux-3.10.30.orig/include/trace/events/smp.h linux-linaro-stable-mx6/ +#include <trace/define_trace.h> diff -Nur linux-3.10.30.orig/include/trace/events/spi.h linux-linaro-stable-mx6/include/trace/events/spi.h --- linux-3.10.30.orig/include/trace/events/spi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/trace/events/spi.h 2014-05-15 20:34:15.882142701 +0200 ++++ linux-linaro-stable-mx6/include/trace/events/spi.h 2014-05-16 15:28:40.265484898 +0200 @@ -0,0 +1,156 @@ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM spi @@ -543284,7 +542959,7 @@ diff -Nur linux-3.10.30.orig/include/trace/events/spi.h linux-linaro-stable-mx6/ +#include <trace/define_trace.h> diff -Nur linux-3.10.30.orig/include/uapi/linux/ipu.h linux-linaro-stable-mx6/include/uapi/linux/ipu.h --- linux-3.10.30.orig/include/uapi/linux/ipu.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/uapi/linux/ipu.h 2014-05-15 20:34:16.118144400 +0200 ++++ linux-linaro-stable-mx6/include/uapi/linux/ipu.h 2014-05-16 15:28:40.369485445 +0200 @@ -0,0 +1,282 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved @@ -543570,7 +543245,7 @@ diff -Nur linux-3.10.30.orig/include/uapi/linux/ipu.h linux-linaro-stable-mx6/in +#endif diff -Nur linux-3.10.30.orig/include/uapi/linux/isl29023.h linux-linaro-stable-mx6/include/uapi/linux/isl29023.h --- linux-3.10.30.orig/include/uapi/linux/isl29023.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/uapi/linux/isl29023.h 2014-05-15 20:34:16.150144631 +0200 ++++ linux-linaro-stable-mx6/include/uapi/linux/isl29023.h 2014-05-16 15:28:40.373485467 +0200 @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -543621,7 +543296,7 @@ diff -Nur linux-3.10.30.orig/include/uapi/linux/isl29023.h linux-linaro-stable-m +#endif diff -Nur linux-3.10.30.orig/include/uapi/linux/Kbuild linux-linaro-stable-mx6/include/uapi/linux/Kbuild --- linux-3.10.30.orig/include/uapi/linux/Kbuild 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/uapi/linux/Kbuild 2014-05-15 20:34:15.974143363 +0200 ++++ linux-linaro-stable-mx6/include/uapi/linux/Kbuild 2014-05-16 15:28:40.301485087 +0200 @@ -225,6 +225,7 @@ header-y += kvm_para.h endif @@ -543650,7 +543325,7 @@ diff -Nur linux-3.10.30.orig/include/uapi/linux/Kbuild linux-linaro-stable-mx6/i header-y += quota.h diff -Nur linux-3.10.30.orig/include/uapi/linux/mxc_asrc.h linux-linaro-stable-mx6/include/uapi/linux/mxc_asrc.h --- linux-3.10.30.orig/include/uapi/linux/mxc_asrc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/uapi/linux/mxc_asrc.h 2014-05-15 20:34:16.154144659 +0200 ++++ linux-linaro-stable-mx6/include/uapi/linux/mxc_asrc.h 2014-05-16 15:28:40.385485529 +0200 @@ -0,0 +1,143 @@ +/* + * Copyright 2008-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -543797,7 +543472,7 @@ diff -Nur linux-3.10.30.orig/include/uapi/linux/mxc_asrc.h linux-linaro-stable-m +#endif/* __MXC_ASRC_UAPI_H__ */ diff -Nur linux-3.10.30.orig/include/uapi/linux/mxcfb.h linux-linaro-stable-mx6/include/uapi/linux/mxcfb.h --- linux-3.10.30.orig/include/uapi/linux/mxcfb.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/uapi/linux/mxcfb.h 2014-05-15 20:34:16.154144659 +0200 ++++ linux-linaro-stable-mx6/include/uapi/linux/mxcfb.h 2014-05-16 15:28:40.385485529 +0200 @@ -0,0 +1,174 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved @@ -543975,7 +543650,7 @@ diff -Nur linux-3.10.30.orig/include/uapi/linux/mxcfb.h linux-linaro-stable-mx6/ +#endif diff -Nur linux-3.10.30.orig/include/uapi/linux/mxc_mlb.h linux-linaro-stable-mx6/include/uapi/linux/mxc_mlb.h --- linux-3.10.30.orig/include/uapi/linux/mxc_mlb.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/uapi/linux/mxc_mlb.h 2014-05-15 20:34:16.154144659 +0200 ++++ linux-linaro-stable-mx6/include/uapi/linux/mxc_mlb.h 2014-05-16 15:28:40.385485529 +0200 @@ -0,0 +1,55 @@ +/* + * mxc_mlb.h @@ -544034,7 +543709,7 @@ diff -Nur linux-3.10.30.orig/include/uapi/linux/mxc_mlb.h linux-linaro-stable-mx +#endif /* _MXC_MLB_H */ diff -Nur linux-3.10.30.orig/include/uapi/linux/mxc_v4l2.h linux-linaro-stable-mx6/include/uapi/linux/mxc_v4l2.h --- linux-3.10.30.orig/include/uapi/linux/mxc_v4l2.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/uapi/linux/mxc_v4l2.h 2014-05-15 20:34:16.154144659 +0200 ++++ linux-linaro-stable-mx6/include/uapi/linux/mxc_v4l2.h 2014-05-16 15:28:40.385485529 +0200 @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved @@ -544094,7 +543769,7 @@ diff -Nur linux-3.10.30.orig/include/uapi/linux/mxc_v4l2.h linux-linaro-stable-m +#endif diff -Nur linux-3.10.30.orig/include/uapi/linux/pxp_dma.h linux-linaro-stable-mx6/include/uapi/linux/pxp_dma.h --- linux-3.10.30.orig/include/uapi/linux/pxp_dma.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/uapi/linux/pxp_dma.h 2014-05-15 20:34:16.354146099 +0200 ++++ linux-linaro-stable-mx6/include/uapi/linux/pxp_dma.h 2014-05-16 15:28:40.485486057 +0200 @@ -0,0 +1,189 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -544287,7 +543962,7 @@ diff -Nur linux-3.10.30.orig/include/uapi/linux/pxp_dma.h linux-linaro-stable-mx +#endif diff -Nur linux-3.10.30.orig/include/uapi/linux/serial_core.h linux-linaro-stable-mx6/include/uapi/linux/serial_core.h --- linux-3.10.30.orig/include/uapi/linux/serial_core.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/uapi/linux/serial_core.h 2014-05-15 20:34:16.590147800 +0200 ++++ linux-linaro-stable-mx6/include/uapi/linux/serial_core.h 2014-05-16 15:28:40.489486078 +0200 @@ -226,4 +226,7 @@ /* Rocketport EXPRESS/INFINITY */ #define PORT_RP2 102 @@ -544298,7 +543973,7 @@ diff -Nur linux-3.10.30.orig/include/uapi/linux/serial_core.h linux-linaro-stabl #endif /* _UAPILINUX_SERIAL_CORE_H */ diff -Nur linux-3.10.30.orig/include/uapi/mtd/mtd-abi.h linux-linaro-stable-mx6/include/uapi/mtd/mtd-abi.h --- linux-3.10.30.orig/include/uapi/mtd/mtd-abi.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/include/uapi/mtd/mtd-abi.h 2014-05-15 20:34:16.754148981 +0200 ++++ linux-linaro-stable-mx6/include/uapi/mtd/mtd-abi.h 2014-05-16 15:28:40.525486268 +0200 @@ -94,10 +94,10 @@ #define MTD_RAM 1 #define MTD_ROM 2 @@ -544324,7 +543999,7 @@ diff -Nur linux-3.10.30.orig/include/uapi/mtd/mtd-abi.h linux-linaro-stable-mx6/ #endif /* __MTD_ABI_H__ */ diff -Nur linux-3.10.30.orig/include/video/mxc_edid.h linux-linaro-stable-mx6/include/video/mxc_edid.h --- linux-3.10.30.orig/include/video/mxc_edid.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/video/mxc_edid.h 2014-05-15 20:34:16.834149557 +0200 ++++ linux-linaro-stable-mx6/include/video/mxc_edid.h 2014-05-16 15:28:40.533486310 +0200 @@ -0,0 +1,105 @@ +/* + * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -544433,7 +544108,7 @@ diff -Nur linux-3.10.30.orig/include/video/mxc_edid.h linux-linaro-stable-mx6/in +#endif diff -Nur linux-3.10.30.orig/include/video/mxc_hdmi.h linux-linaro-stable-mx6/include/video/mxc_hdmi.h --- linux-3.10.30.orig/include/video/mxc_hdmi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/include/video/mxc_hdmi.h 2014-05-15 20:34:16.834149557 +0200 ++++ linux-linaro-stable-mx6/include/video/mxc_hdmi.h 2014-05-16 15:28:40.533486310 +0200 @@ -0,0 +1,1026 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. @@ -545463,7 +545138,7 @@ diff -Nur linux-3.10.30.orig/include/video/mxc_hdmi.h linux-linaro-stable-mx6/in +#endif /* __MXC_HDMI_H__ */ diff -Nur linux-3.10.30.orig/kernel/auditfilter.c linux-linaro-stable-mx6/kernel/auditfilter.c --- linux-3.10.30.orig/kernel/auditfilter.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/kernel/auditfilter.c 2014-05-15 20:34:16.930150248 +0200 ++++ linux-linaro-stable-mx6/kernel/auditfilter.c 2014-05-16 15:28:40.657486964 +0200 @@ -423,7 +423,7 @@ f->lsm_rule = NULL; @@ -545475,7 +545150,7 @@ diff -Nur linux-3.10.30.orig/kernel/auditfilter.c linux-linaro-stable-mx6/kernel } diff -Nur linux-3.10.30.orig/kernel/cpu.c linux-linaro-stable-mx6/kernel/cpu.c --- linux-3.10.30.orig/kernel/cpu.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/kernel/cpu.c 2014-05-15 20:34:16.930150248 +0200 ++++ linux-linaro-stable-mx6/kernel/cpu.c 2014-05-16 15:28:40.713487259 +0200 @@ -726,3 +726,22 @@ { cpumask_copy(to_cpumask(cpu_online_bits), src); @@ -545501,7 +545176,7 @@ diff -Nur linux-3.10.30.orig/kernel/cpu.c linux-linaro-stable-mx6/kernel/cpu.c +EXPORT_SYMBOL_GPL(idle_notifier_call_chain); diff -Nur linux-3.10.30.orig/kernel/irq/handle.c linux-linaro-stable-mx6/kernel/irq/handle.c --- linux-3.10.30.orig/kernel/irq/handle.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/kernel/irq/handle.c 2014-05-15 20:34:16.950150392 +0200 ++++ linux-linaro-stable-mx6/kernel/irq/handle.c 2014-05-16 15:28:40.761487512 +0200 @@ -51,7 +51,7 @@ "but no thread function available.", irq, action->name); } @@ -545522,7 +545197,7 @@ diff -Nur linux-3.10.30.orig/kernel/irq/handle.c linux-linaro-stable-mx6/kernel/ case IRQ_HANDLED: diff -Nur linux-3.10.30.orig/kernel/irq/internals.h linux-linaro-stable-mx6/kernel/irq/internals.h --- linux-3.10.30.orig/kernel/irq/internals.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/kernel/irq/internals.h 2014-05-15 20:34:16.950150392 +0200 ++++ linux-linaro-stable-mx6/kernel/irq/internals.h 2014-05-16 15:28:40.761487512 +0200 @@ -82,6 +82,7 @@ /* Resending of interrupts :*/ void check_irq_resend(struct irq_desc *desc, unsigned int irq); @@ -545533,7 +545208,7 @@ diff -Nur linux-3.10.30.orig/kernel/irq/internals.h linux-linaro-stable-mx6/kern extern void register_irq_proc(unsigned int irq, struct irq_desc *desc); diff -Nur linux-3.10.30.orig/kernel/irq/irqdesc.c linux-linaro-stable-mx6/kernel/irq/irqdesc.c --- linux-3.10.30.orig/kernel/irq/irqdesc.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/kernel/irq/irqdesc.c 2014-05-15 20:34:16.950150392 +0200 ++++ linux-linaro-stable-mx6/kernel/irq/irqdesc.c 2014-05-16 15:28:40.761487512 +0200 @@ -23,10 +23,35 @@ static struct lock_class_key irq_desc_lock_class; @@ -545574,7 +545249,7 @@ diff -Nur linux-3.10.30.orig/kernel/irq/irqdesc.c linux-linaro-stable-mx6/kernel static void __init init_irq_default_affinity(void) diff -Nur linux-3.10.30.orig/kernel/irq/manage.c linux-linaro-stable-mx6/kernel/irq/manage.c --- linux-3.10.30.orig/kernel/irq/manage.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/kernel/irq/manage.c 2014-05-15 20:34:16.978150594 +0200 ++++ linux-linaro-stable-mx6/kernel/irq/manage.c 2014-05-16 15:28:40.761487512 +0200 @@ -32,24 +32,10 @@ early_param("threadirqs", setup_forced_irqthreads); #endif @@ -545696,7 +545371,7 @@ diff -Nur linux-3.10.30.orig/kernel/irq/manage.c linux-linaro-stable-mx6/kernel/ if (!force_irqthreads) diff -Nur linux-3.10.30.orig/kernel/power/Kconfig linux-linaro-stable-mx6/kernel/power/Kconfig --- linux-3.10.30.orig/kernel/power/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/kernel/power/Kconfig 2014-05-15 20:34:17.006150795 +0200 ++++ linux-linaro-stable-mx6/kernel/power/Kconfig 2014-05-16 15:28:40.981488672 +0200 @@ -263,6 +263,26 @@ bool depends on PM @@ -545726,7 +545401,7 @@ diff -Nur linux-3.10.30.orig/kernel/power/Kconfig linux-linaro-stable-mx6/kernel depends on PM_SLEEP && PM_GENERIC_DOMAINS diff -Nur linux-3.10.30.orig/kernel/sched/core.c linux-linaro-stable-mx6/kernel/sched/core.c --- linux-3.10.30.orig/kernel/sched/core.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/kernel/sched/core.c 2014-05-15 20:34:17.086151372 +0200 ++++ linux-linaro-stable-mx6/kernel/sched/core.c 2014-05-16 15:28:41.033488946 +0200 @@ -1623,6 +1623,20 @@ #if defined(CONFIG_SMP) && defined(CONFIG_FAIR_GROUP_SCHED) p->se.avg.runnable_avg_period = 0; @@ -545778,7 +545453,7 @@ diff -Nur linux-3.10.30.orig/kernel/sched/core.c linux-linaro-stable-mx6/kernel/ set_load_weight(p); diff -Nur linux-3.10.30.orig/kernel/sched/debug.c linux-linaro-stable-mx6/kernel/sched/debug.c --- linux-3.10.30.orig/kernel/sched/debug.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/kernel/sched/debug.c 2014-05-15 20:34:17.086151372 +0200 ++++ linux-linaro-stable-mx6/kernel/sched/debug.c 2014-05-16 15:28:41.037488968 +0200 @@ -94,6 +94,7 @@ #ifdef CONFIG_SMP P(se->avg.runnable_avg_sum); @@ -545811,7 +545486,7 @@ diff -Nur linux-3.10.30.orig/kernel/sched/debug.c linux-linaro-stable-mx6/kernel #undef PN diff -Nur linux-3.10.30.orig/kernel/sched/fair.c linux-linaro-stable-mx6/kernel/sched/fair.c --- linux-3.10.30.orig/kernel/sched/fair.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/kernel/sched/fair.c 2014-05-15 20:34:17.086151372 +0200 ++++ linux-linaro-stable-mx6/kernel/sched/fair.c 2014-05-16 15:28:41.085489221 +0200 @@ -31,9 +31,18 @@ #include <linux/task_work.h> @@ -547852,7 +547527,7 @@ diff -Nur linux-3.10.30.orig/kernel/sched/fair.c linux-linaro-stable-mx6/kernel/ +#endif /* CONFIG_HMP_FREQUENCY_INVARIANT_SCALE */ diff -Nur linux-3.10.30.orig/kernel/sched/sched.h linux-linaro-stable-mx6/kernel/sched/sched.h --- linux-3.10.30.orig/kernel/sched/sched.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/kernel/sched/sched.h 2014-05-15 20:34:17.090151400 +0200 ++++ linux-linaro-stable-mx6/kernel/sched/sched.h 2014-05-16 15:28:41.089489242 +0200 @@ -142,7 +142,7 @@ atomic_t load_weight; @@ -547896,7 +547571,7 @@ diff -Nur linux-3.10.30.orig/kernel/sched/sched.h linux-linaro-stable-mx6/kernel #include "stats.h" diff -Nur linux-3.10.30.orig/kernel/smp.c linux-linaro-stable-mx6/kernel/smp.c --- linux-3.10.30.orig/kernel/smp.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/kernel/smp.c 2014-05-15 20:34:17.090151400 +0200 ++++ linux-linaro-stable-mx6/kernel/smp.c 2014-05-16 15:28:41.113489368 +0200 @@ -12,6 +12,8 @@ #include <linux/gfp.h> #include <linux/smp.h> @@ -547949,7 +547624,7 @@ diff -Nur linux-3.10.30.orig/kernel/smp.c linux-linaro-stable-mx6/kernel/smp.c if ((unsigned)cpu < nr_cpu_ids && cpu_online(cpu)) { diff -Nur linux-3.10.30.orig/kernel/workqueue.c linux-linaro-stable-mx6/kernel/workqueue.c --- linux-3.10.30.orig/kernel/workqueue.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/kernel/workqueue.c 2014-05-15 20:34:17.134151717 +0200 ++++ linux-linaro-stable-mx6/kernel/workqueue.c 2014-05-16 15:28:41.313490423 +0200 @@ -272,6 +272,15 @@ static bool wq_disable_numa; module_param_named(disable_numa, wq_disable_numa, bool, 0444); @@ -548007,7 +547682,7 @@ diff -Nur linux-3.10.30.orig/kernel/workqueue.c linux-linaro-stable-mx6/kernel/w early_initcall(init_workqueues); diff -Nur linux-3.10.30.orig/lib/genalloc.c linux-linaro-stable-mx6/lib/genalloc.c --- linux-3.10.30.orig/lib/genalloc.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/lib/genalloc.c 2014-05-15 20:34:17.254152582 +0200 ++++ linux-linaro-stable-mx6/lib/genalloc.c 2014-05-16 15:28:41.325490486 +0200 @@ -313,6 +313,34 @@ EXPORT_SYMBOL(gen_pool_alloc); @@ -548045,7 +547720,7 @@ diff -Nur linux-3.10.30.orig/lib/genalloc.c linux-linaro-stable-mx6/lib/genalloc * @addr: starting address of memory to free back to pool diff -Nur linux-3.10.30.orig/linaro/configs/android.conf linux-linaro-stable-mx6/linaro/configs/android.conf --- linux-3.10.30.orig/linaro/configs/android.conf 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/linaro/configs/android.conf 2014-05-15 20:34:17.638155346 +0200 ++++ linux-linaro-stable-mx6/linaro/configs/android.conf 2014-05-16 15:28:41.961493840 +0200 @@ -0,0 +1,40 @@ +CONFIG_IPV6=y +# CONFIG_IPV6_SIT is not set @@ -548089,7 +547764,7 @@ diff -Nur linux-3.10.30.orig/linaro/configs/android.conf linux-linaro-stable-mx6 +CONFIG_DMA_SHARED_BUFFER=y diff -Nur linux-3.10.30.orig/linaro/configs/arndale.conf linux-linaro-stable-mx6/linaro/configs/arndale.conf --- linux-3.10.30.orig/linaro/configs/arndale.conf 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/linaro/configs/arndale.conf 2014-05-15 20:34:17.638155346 +0200 ++++ linux-linaro-stable-mx6/linaro/configs/arndale.conf 2014-05-16 15:28:41.961493840 +0200 @@ -0,0 +1,66 @@ +CONFIG_KALLSYMS_ALL=y +CONFIG_PARTITION_ADVANCED=y @@ -548159,7 +547834,7 @@ diff -Nur linux-3.10.30.orig/linaro/configs/arndale.conf linux-linaro-stable-mx6 +CONFIG_TUN=y diff -Nur linux-3.10.30.orig/linaro/configs/big-LITTLE-IKS.conf linux-linaro-stable-mx6/linaro/configs/big-LITTLE-IKS.conf --- linux-3.10.30.orig/linaro/configs/big-LITTLE-IKS.conf 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/linaro/configs/big-LITTLE-IKS.conf 2014-05-15 20:34:17.638155346 +0200 ++++ linux-linaro-stable-mx6/linaro/configs/big-LITTLE-IKS.conf 2014-05-16 15:28:41.961493840 +0200 @@ -0,0 +1,5 @@ +CONFIG_BIG_LITTLE=y +CONFIG_BL_SWITCHER=y @@ -548168,7 +547843,7 @@ diff -Nur linux-3.10.30.orig/linaro/configs/big-LITTLE-IKS.conf linux-linaro-sta +CONFIG_CPU_FREQ_GOV_USERSPACE=y diff -Nur linux-3.10.30.orig/linaro/configs/big-LITTLE-MP.conf linux-linaro-stable-mx6/linaro/configs/big-LITTLE-MP.conf --- linux-3.10.30.orig/linaro/configs/big-LITTLE-MP.conf 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/linaro/configs/big-LITTLE-MP.conf 2014-05-15 20:34:17.638155346 +0200 ++++ linux-linaro-stable-mx6/linaro/configs/big-LITTLE-MP.conf 2014-05-16 15:28:41.961493840 +0200 @@ -0,0 +1,12 @@ +CONFIG_CGROUPS=y +CONFIG_CGROUP_SCHED=y @@ -548184,12 +547859,12 @@ diff -Nur linux-3.10.30.orig/linaro/configs/big-LITTLE-MP.conf linux-linaro-stab +CONFIG_SCHED_HMP_LITTLE_PACKING=y diff -Nur linux-3.10.30.orig/linaro/configs/debug.conf linux-linaro-stable-mx6/linaro/configs/debug.conf --- linux-3.10.30.orig/linaro/configs/debug.conf 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/linaro/configs/debug.conf 2014-05-15 20:34:17.638155346 +0200 ++++ linux-linaro-stable-mx6/linaro/configs/debug.conf 2014-05-16 15:28:41.961493840 +0200 @@ -0,0 +1 @@ +CONFIG_PROVE_LOCKING=y diff -Nur linux-3.10.30.orig/linaro/configs/distribution.conf linux-linaro-stable-mx6/linaro/configs/distribution.conf --- linux-3.10.30.orig/linaro/configs/distribution.conf 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/linaro/configs/distribution.conf 2014-05-15 20:34:17.638155346 +0200 ++++ linux-linaro-stable-mx6/linaro/configs/distribution.conf 2014-05-16 15:28:41.961493840 +0200 @@ -0,0 +1,44 @@ +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_CGROUPS=y @@ -548237,7 +547912,7 @@ diff -Nur linux-3.10.30.orig/linaro/configs/distribution.conf linux-linaro-stabl +CONFIG_DEFAULT_SECURITY_APPARMOR=y diff -Nur linux-3.10.30.orig/linaro/configs/highbank.conf linux-linaro-stable-mx6/linaro/configs/highbank.conf --- linux-3.10.30.orig/linaro/configs/highbank.conf 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/linaro/configs/highbank.conf 2014-05-15 20:34:17.638155346 +0200 ++++ linux-linaro-stable-mx6/linaro/configs/highbank.conf 2014-05-16 15:28:41.961493840 +0200 @@ -0,0 +1,40 @@ +CONFIG_EXPERIMENTAL=y +CONFIG_NO_HZ=y @@ -548281,7 +547956,7 @@ diff -Nur linux-3.10.30.orig/linaro/configs/highbank.conf linux-linaro-stable-mx +CONFIG_PL330_DMA=y diff -Nur linux-3.10.30.orig/linaro/configs/kvm-guest.conf linux-linaro-stable-mx6/linaro/configs/kvm-guest.conf --- linux-3.10.30.orig/linaro/configs/kvm-guest.conf 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/linaro/configs/kvm-guest.conf 2014-05-15 20:34:17.638155346 +0200 ++++ linux-linaro-stable-mx6/linaro/configs/kvm-guest.conf 2014-05-16 15:28:41.961493840 +0200 @@ -0,0 +1,11 @@ +CONFIG_BALLOON_COMPACTION=y +CONFIG_VIRTIO_BLK=y @@ -548296,7 +547971,7 @@ diff -Nur linux-3.10.30.orig/linaro/configs/kvm-guest.conf linux-linaro-stable-m +# CONFIG_THUMB2_KERNEL is not set diff -Nur linux-3.10.30.orig/linaro/configs/kvm-host.conf linux-linaro-stable-mx6/linaro/configs/kvm-host.conf --- linux-3.10.30.orig/linaro/configs/kvm-host.conf 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/linaro/configs/kvm-host.conf 2014-05-15 20:34:17.638155346 +0200 ++++ linux-linaro-stable-mx6/linaro/configs/kvm-host.conf 2014-05-16 15:28:41.961493840 +0200 @@ -0,0 +1,11 @@ +CONFIG_VIRTUALIZATION=y +CONFIG_ARM_LPAE=y @@ -548311,7 +547986,7 @@ diff -Nur linux-3.10.30.orig/linaro/configs/kvm-host.conf linux-linaro-stable-mx +CONFIG_BLK_DEV_NBD=m diff -Nur linux-3.10.30.orig/linaro/configs/linaro-base.conf linux-linaro-stable-mx6/linaro/configs/linaro-base.conf --- linux-3.10.30.orig/linaro/configs/linaro-base.conf 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/linaro/configs/linaro-base.conf 2014-05-15 20:34:17.638155346 +0200 ++++ linux-linaro-stable-mx6/linaro/configs/linaro-base.conf 2014-05-16 15:28:41.961493840 +0200 @@ -0,0 +1,94 @@ +CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y @@ -548409,7 +548084,7 @@ diff -Nur linux-3.10.30.orig/linaro/configs/linaro-base.conf linux-linaro-stable +CONFIG_PROC_DEVICETREE=y diff -Nur linux-3.10.30.orig/linaro/configs/omap4.conf linux-linaro-stable-mx6/linaro/configs/omap4.conf --- linux-3.10.30.orig/linaro/configs/omap4.conf 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/linaro/configs/omap4.conf 2014-05-15 20:34:17.638155346 +0200 ++++ linux-linaro-stable-mx6/linaro/configs/omap4.conf 2014-05-16 15:28:41.961493840 +0200 @@ -0,0 +1,194 @@ +CONFIG_EXPERT=y +CONFIG_KPROBES=y @@ -548607,7 +548282,7 @@ diff -Nur linux-3.10.30.orig/linaro/configs/omap4.conf linux-linaro-stable-mx6/l +# CONFIG_CPU_FREQ is not set diff -Nur linux-3.10.30.orig/linaro/configs/ubuntu-minimal.conf linux-linaro-stable-mx6/linaro/configs/ubuntu-minimal.conf --- linux-3.10.30.orig/linaro/configs/ubuntu-minimal.conf 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/linaro/configs/ubuntu-minimal.conf 2014-05-15 20:34:17.638155346 +0200 ++++ linux-linaro-stable-mx6/linaro/configs/ubuntu-minimal.conf 2014-05-16 15:28:41.961493840 +0200 @@ -0,0 +1,44 @@ +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_CGROUPS=y @@ -548655,7 +548330,7 @@ diff -Nur linux-3.10.30.orig/linaro/configs/ubuntu-minimal.conf linux-linaro-sta +CONFIG_DEFAULT_SECURITY_APPARMOR=y diff -Nur linux-3.10.30.orig/linaro/configs/vexpress64.conf linux-linaro-stable-mx6/linaro/configs/vexpress64.conf --- linux-3.10.30.orig/linaro/configs/vexpress64.conf 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/linaro/configs/vexpress64.conf 2014-05-15 20:34:17.646155404 +0200 ++++ linux-linaro-stable-mx6/linaro/configs/vexpress64.conf 2014-05-16 15:28:41.961493840 +0200 @@ -0,0 +1,32 @@ +CONFIG_ARCH_VEXPRESS=y +CONFIG_SMP=y @@ -548691,7 +548366,7 @@ diff -Nur linux-3.10.30.orig/linaro/configs/vexpress64.conf linux-linaro-stable- +CONFIG_REGULATOR_FIXED_VOLTAGE=y diff -Nur linux-3.10.30.orig/linaro/configs/vexpress.conf linux-linaro-stable-mx6/linaro/configs/vexpress.conf --- linux-3.10.30.orig/linaro/configs/vexpress.conf 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/linaro/configs/vexpress.conf 2014-05-15 20:34:17.646155404 +0200 ++++ linux-linaro-stable-mx6/linaro/configs/vexpress.conf 2014-05-16 15:28:41.961493840 +0200 @@ -0,0 +1,63 @@ +CONFIG_ARCH_VEXPRESS=y +CONFIG_ARCH_VEXPRESS_CA9X4=y @@ -548758,12 +548433,12 @@ diff -Nur linux-3.10.30.orig/linaro/configs/vexpress.conf linux-linaro-stable-mx +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y diff -Nur linux-3.10.30.orig/linaro/configs/vexpress-tuning.conf linux-linaro-stable-mx6/linaro/configs/vexpress-tuning.conf --- linux-3.10.30.orig/linaro/configs/vexpress-tuning.conf 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/linaro/configs/vexpress-tuning.conf 2014-05-15 20:34:17.638155346 +0200 ++++ linux-linaro-stable-mx6/linaro/configs/vexpress-tuning.conf 2014-05-16 15:28:41.961493840 +0200 @@ -0,0 +1 @@ +# CONFIG_PROVE_LOCKING is not set diff -Nur linux-3.10.30.orig/linaro/configs/xen.conf linux-linaro-stable-mx6/linaro/configs/xen.conf --- linux-3.10.30.orig/linaro/configs/xen.conf 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/linaro/configs/xen.conf 2014-05-15 20:34:17.646155404 +0200 ++++ linux-linaro-stable-mx6/linaro/configs/xen.conf 2014-05-16 15:28:41.961493840 +0200 @@ -0,0 +1,7 @@ +CONFIG_XEN=y +CONFIG_XEN_NETDEV_FRONTEND=y @@ -548774,7 +548449,7 @@ diff -Nur linux-3.10.30.orig/linaro/configs/xen.conf linux-linaro-stable-mx6/lin +CONFIG_XEN_COMPAT_XENFS=y diff -Nur linux-3.10.30.orig/mm/Kconfig linux-linaro-stable-mx6/mm/Kconfig --- linux-3.10.30.orig/mm/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/mm/Kconfig 2014-05-15 20:34:17.646155404 +0200 ++++ linux-linaro-stable-mx6/mm/Kconfig 2014-05-16 15:28:41.961493840 +0200 @@ -477,3 +477,28 @@ and swap data is stored as normal on the matching swap device. @@ -548806,7 +548481,7 @@ diff -Nur linux-3.10.30.orig/mm/Kconfig linux-linaro-stable-mx6/mm/Kconfig + for many workloads. diff -Nur linux-3.10.30.orig/mm/Makefile linux-linaro-stable-mx6/mm/Makefile --- linux-3.10.30.orig/mm/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/mm/Makefile 2014-05-15 20:34:17.646155404 +0200 ++++ linux-linaro-stable-mx6/mm/Makefile 2014-05-16 15:28:41.961493840 +0200 @@ -32,6 +32,7 @@ obj-$(CONFIG_BOUNCE) += bounce.o obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o @@ -548822,7 +548497,7 @@ diff -Nur linux-3.10.30.orig/mm/Makefile linux-linaro-stable-mx6/mm/Makefile +obj-$(CONFIG_ZBUD) += zbud.o diff -Nur linux-3.10.30.orig/mm/vmstat.c linux-linaro-stable-mx6/mm/vmstat.c --- linux-3.10.30.orig/mm/vmstat.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/mm/vmstat.c 2014-05-15 20:34:17.774156326 +0200 ++++ linux-linaro-stable-mx6/mm/vmstat.c 2014-05-16 15:28:41.981493945 +0200 @@ -14,6 +14,7 @@ #include <linux/module.h> #include <linux/slab.h> @@ -548990,7 +548665,7 @@ diff -Nur linux-3.10.30.orig/mm/vmstat.c linux-linaro-stable-mx6/mm/vmstat.c proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations); diff -Nur linux-3.10.30.orig/mm/zbud.c linux-linaro-stable-mx6/mm/zbud.c --- linux-3.10.30.orig/mm/zbud.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/mm/zbud.c 2014-05-15 20:34:17.786156413 +0200 ++++ linux-linaro-stable-mx6/mm/zbud.c 2014-05-16 15:28:41.981493945 +0200 @@ -0,0 +1,564 @@ +/* + * zbud.c - Buddy Allocator for Compressed Pages @@ -549558,7 +549233,7 @@ diff -Nur linux-3.10.30.orig/mm/zbud.c linux-linaro-stable-mx6/mm/zbud.c +MODULE_DESCRIPTION("Buddy Allocator for Compressed Pages"); diff -Nur linux-3.10.30.orig/mm/zswap.c linux-linaro-stable-mx6/mm/zswap.c --- linux-3.10.30.orig/mm/zswap.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/mm/zswap.c 2014-05-15 20:34:17.786156413 +0200 ++++ linux-linaro-stable-mx6/mm/zswap.c 2014-05-16 15:28:41.981493945 +0200 @@ -0,0 +1,952 @@ +/* + * zswap.c - zswap driver file @@ -550514,7 +550189,7 @@ diff -Nur linux-3.10.30.orig/mm/zswap.c linux-linaro-stable-mx6/mm/zswap.c +MODULE_DESCRIPTION("Compressed cache for swap pages"); diff -Nur linux-3.10.30.orig/sound/core/memalloc.c linux-linaro-stable-mx6/sound/core/memalloc.c --- linux-3.10.30.orig/sound/core/memalloc.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/core/memalloc.c 2014-05-15 20:34:21.794185273 +0200 ++++ linux-linaro-stable-mx6/sound/core/memalloc.c 2014-05-16 15:28:44.397506685 +0200 @@ -30,6 +30,7 @@ #include <linux/seq_file.h> #include <asm/uaccess.h> @@ -550599,7 +550274,7 @@ diff -Nur linux-3.10.30.orig/sound/core/memalloc.c linux-linaro-stable-mx6/sound break; diff -Nur linux-3.10.30.orig/sound/core/pcm_native.c linux-linaro-stable-mx6/sound/core/pcm_native.c --- linux-3.10.30.orig/sound/core/pcm_native.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/core/pcm_native.c 2014-05-15 20:34:21.818185446 +0200 ++++ linux-linaro-stable-mx6/sound/core/pcm_native.c 2014-05-16 15:28:44.401506705 +0200 @@ -3209,6 +3209,14 @@ struct vm_area_struct *area) { @@ -550617,7 +550292,7 @@ diff -Nur linux-3.10.30.orig/sound/core/pcm_native.c linux-linaro-stable-mx6/sou substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV) diff -Nur linux-3.10.30.orig/sound/soc/codecs/cs42888.c linux-linaro-stable-mx6/sound/soc/codecs/cs42888.c --- linux-3.10.30.orig/sound/soc/codecs/cs42888.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/codecs/cs42888.c 2014-05-15 20:34:23.350196475 +0200 ++++ linux-linaro-stable-mx6/sound/soc/codecs/cs42888.c 2014-05-16 15:28:45.197510902 +0200 @@ -0,0 +1,934 @@ +/* + * cs42888.c -- CS42888 ALSA SoC Audio Driver @@ -551555,7 +551230,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/codecs/cs42888.c linux-linaro-stable-mx6/ +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/sound/soc/codecs/cs42888.h linux-linaro-stable-mx6/sound/soc/codecs/cs42888.h --- linux-3.10.30.orig/sound/soc/codecs/cs42888.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/codecs/cs42888.h 2014-05-15 20:34:23.350196475 +0200 ++++ linux-linaro-stable-mx6/sound/soc/codecs/cs42888.h 2014-05-16 15:28:45.201510924 +0200 @@ -0,0 +1,123 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -551682,7 +551357,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/codecs/cs42888.h linux-linaro-stable-mx6/ +#endif diff -Nur linux-3.10.30.orig/sound/soc/codecs/Kconfig linux-linaro-stable-mx6/sound/soc/codecs/Kconfig --- linux-3.10.30.orig/sound/soc/codecs/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/codecs/Kconfig 2014-05-15 20:34:23.322196274 +0200 ++++ linux-linaro-stable-mx6/sound/soc/codecs/Kconfig 2014-05-16 15:28:45.189510860 +0200 @@ -35,6 +35,7 @@ select SND_SOC_CS42L73 if I2C select SND_SOC_CS4270 if I2C @@ -551712,7 +551387,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/codecs/Kconfig linux-linaro-stable-mx6/so depends on TTY diff -Nur linux-3.10.30.orig/sound/soc/codecs/Makefile linux-linaro-stable-mx6/sound/soc/codecs/Makefile --- linux-3.10.30.orig/sound/soc/codecs/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/codecs/Makefile 2014-05-15 20:34:23.322196274 +0200 ++++ linux-linaro-stable-mx6/sound/soc/codecs/Makefile 2014-05-16 15:28:45.189510860 +0200 @@ -22,6 +22,7 @@ snd-soc-cs42l73-objs := cs42l73.o snd-soc-cs4270-objs := cs4270.o @@ -551740,7 +551415,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/codecs/Makefile linux-linaro-stable-mx6/s obj-$(CONFIG_SND_SOC_DA7213) += snd-soc-da7213.o diff -Nur linux-3.10.30.orig/sound/soc/codecs/omap-hdmi.c linux-linaro-stable-mx6/sound/soc/codecs/omap-hdmi.c --- linux-3.10.30.orig/sound/soc/codecs/omap-hdmi.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/codecs/omap-hdmi.c 2014-05-15 20:34:23.578198118 +0200 ++++ linux-linaro-stable-mx6/sound/soc/codecs/omap-hdmi.c 2014-05-16 15:28:45.277511325 +0200 @@ -26,7 +26,7 @@ static struct snd_soc_codec_driver omap_hdmi_codec; @@ -551752,7 +551427,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/codecs/omap-hdmi.c linux-linaro-stable-mx .channels_max = 8, diff -Nur linux-3.10.30.orig/sound/soc/codecs/spdif_receiver.c linux-linaro-stable-mx6/sound/soc/codecs/spdif_receiver.c --- linux-3.10.30.orig/sound/soc/codecs/spdif_receiver.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/codecs/spdif_receiver.c 2014-05-15 20:34:23.578198118 +0200 ++++ linux-linaro-stable-mx6/sound/soc/codecs/spdif_receiver.c 2014-05-16 15:28:45.301511451 +0200 @@ -24,6 +24,8 @@ #define STUB_RATES SNDRV_PCM_RATE_8000_192000 @@ -551837,7 +551512,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/codecs/spdif_transciever.c linux-linaro-s -MODULE_ALIAS("platform:" DRV_NAME); diff -Nur linux-3.10.30.orig/sound/soc/codecs/spdif_transmitter.c linux-linaro-stable-mx6/sound/soc/codecs/spdif_transmitter.c --- linux-3.10.30.orig/sound/soc/codecs/spdif_transmitter.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/codecs/spdif_transmitter.c 2014-05-15 20:34:23.578198118 +0200 ++++ linux-linaro-stable-mx6/sound/soc/codecs/spdif_transmitter.c 2014-05-16 15:28:45.301511451 +0200 @@ -0,0 +1,77 @@ +/* + * ALSA SoC SPDIF DIT driver @@ -551918,7 +551593,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/codecs/spdif_transmitter.c linux-linaro-s +MODULE_ALIAS("platform:" DRV_NAME); diff -Nur linux-3.10.30.orig/sound/soc/codecs/wm8962.c linux-linaro-stable-mx6/sound/soc/codecs/wm8962.c --- linux-3.10.30.orig/sound/soc/codecs/wm8962.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/codecs/wm8962.c 2014-05-15 20:34:23.698198982 +0200 ++++ linux-linaro-stable-mx6/sound/soc/codecs/wm8962.c 2014-05-16 15:28:45.529512653 +0200 @@ -16,6 +16,7 @@ #include <linux/init.h> #include <linux/delay.h> @@ -552254,7 +551929,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/codecs/wm8962.c linux-linaro-stable-mx6/s #endif diff -Nur linux-3.10.30.orig/sound/soc/fsl/eukrea-tlv320.c linux-linaro-stable-mx6/sound/soc/fsl/eukrea-tlv320.c --- linux-3.10.30.orig/sound/soc/fsl/eukrea-tlv320.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/eukrea-tlv320.c 2014-05-15 20:34:23.822199874 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/eukrea-tlv320.c 2014-05-16 15:28:45.825514214 +0200 @@ -80,7 +80,7 @@ .name = "tlv320aic23", .stream_name = "TLV320AIC23", @@ -552266,7 +551941,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/eukrea-tlv320.c linux-linaro-stable-m .ops = &eukrea_tlv320_snd_ops, diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_asrc.c linux-linaro-stable-mx6/sound/soc/fsl/fsl_asrc.c --- linux-3.10.30.orig/sound/soc/fsl/fsl_asrc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_asrc.c 2014-05-15 20:34:23.822199874 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_asrc.c 2014-05-16 15:28:45.825514214 +0200 @@ -0,0 +1,500 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -552770,7 +552445,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_asrc.c linux-linaro-stable-mx6/so +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_asrc.h linux-linaro-stable-mx6/sound/soc/fsl/fsl_asrc.h --- linux-3.10.30.orig/sound/soc/fsl/fsl_asrc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_asrc.h 2014-05-15 20:34:23.822199874 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_asrc.h 2014-05-16 15:28:45.825514214 +0200 @@ -0,0 +1,48 @@ +/* + * fsl_asrc.h - ALSA ASRC interface @@ -552822,7 +552497,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_asrc.h linux-linaro-stable-mx6/so +#endif diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_asrc_pcm.c linux-linaro-stable-mx6/sound/soc/fsl/fsl_asrc_pcm.c --- linux-3.10.30.orig/sound/soc/fsl/fsl_asrc_pcm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_asrc_pcm.c 2014-05-15 20:34:23.822199874 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_asrc_pcm.c 2014-05-16 15:28:45.825514214 +0200 @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -552867,7 +552542,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_asrc_pcm.c linux-linaro-stable-mx +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_esai.c linux-linaro-stable-mx6/sound/soc/fsl/fsl_esai.c --- linux-3.10.30.orig/sound/soc/fsl/fsl_esai.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_esai.c 2014-05-15 20:34:23.822199874 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_esai.c 2014-05-16 15:28:45.845514319 +0200 @@ -0,0 +1,710 @@ +/* + * Copyright 2008-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -553581,7 +553256,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_esai.c linux-linaro-stable-mx6/so +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_esai.h linux-linaro-stable-mx6/sound/soc/fsl/fsl_esai.h --- linux-3.10.30.orig/sound/soc/fsl/fsl_esai.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_esai.h 2014-05-15 20:34:23.822199874 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_esai.h 2014-05-16 15:28:45.849514340 +0200 @@ -0,0 +1,335 @@ +/* + * imx-esai.h -- ESAI driver header file for Freescale IMX @@ -553920,7 +553595,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_esai.h linux-linaro-stable-mx6/so +#endif diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_hdmi.c linux-linaro-stable-mx6/sound/soc/fsl/fsl_hdmi.c --- linux-3.10.30.orig/sound/soc/fsl/fsl_hdmi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_hdmi.c 2014-05-15 20:34:23.822199874 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_hdmi.c 2014-05-16 15:28:45.849514340 +0200 @@ -0,0 +1,614 @@ +/* + * ALSA SoC HDMI Audio Layer for Freescale i.MX @@ -554538,7 +554213,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_hdmi.c linux-linaro-stable-mx6/so +MODULE_ALIAS("platform:fsl-hdmi-dai"); diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_spdif.c linux-linaro-stable-mx6/sound/soc/fsl/fsl_spdif.c --- linux-3.10.30.orig/sound/soc/fsl/fsl_spdif.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_spdif.c 2014-05-15 20:34:23.822199874 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_spdif.c 2014-05-16 15:28:45.849514340 +0200 @@ -0,0 +1,1282 @@ +/* + * Freescale S/PDIF ALSA SoC Digital Audio Interface (DAI) driver @@ -555824,7 +555499,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_spdif.c linux-linaro-stable-mx6/s +MODULE_ALIAS("platform:fsl-spdif-dai"); diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_spdif.h linux-linaro-stable-mx6/sound/soc/fsl/fsl_spdif.h --- linux-3.10.30.orig/sound/soc/fsl/fsl_spdif.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_spdif.h 2014-05-15 20:34:23.822199874 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_spdif.h 2014-05-16 15:28:45.849514340 +0200 @@ -0,0 +1,193 @@ +/* + * fsl_spdif.h - ALSA S/PDIF interface for the Freescale i.MX SoC @@ -556021,7 +555696,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_spdif.h linux-linaro-stable-mx6/s +#endif /* _FSL_SPDIF_DAI_H */ diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_ssi.c linux-linaro-stable-mx6/sound/soc/fsl/fsl_ssi.c --- linux-3.10.30.orig/sound/soc/fsl/fsl_ssi.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_ssi.c 2014-05-15 20:34:23.822199874 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_ssi.c 2014-05-16 15:28:45.853514361 +0200 @@ -3,13 +3,14 @@ * * Author: Timur Tabi <timur@freescale.com> @@ -556738,7 +556413,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_ssi.c linux-linaro-stable-mx6/sou MODULE_LICENSE("GPL v2"); diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_ssi.h linux-linaro-stable-mx6/sound/soc/fsl/fsl_ssi.h --- linux-3.10.30.orig/sound/soc/fsl/fsl_ssi.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_ssi.h 2014-05-15 20:34:23.822199874 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/fsl_ssi.h 2014-05-16 15:28:45.853514361 +0200 @@ -3,7 +3,7 @@ * * Author: Timur Tabi <timur@freescale.com> @@ -556762,7 +556437,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_ssi.h linux-linaro-stable-mx6/sou #define CCSR_SSI_SxCCR_WL_MASK 0x0001E000 diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-cs42888.c linux-linaro-stable-mx6/sound/soc/fsl/imx-cs42888.c --- linux-3.10.30.orig/sound/soc/fsl/imx-cs42888.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-cs42888.c 2014-05-15 20:34:23.826199902 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/imx-cs42888.c 2014-05-16 15:28:45.853514361 +0200 @@ -0,0 +1,370 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -557136,7 +556811,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-cs42888.c linux-linaro-stable-mx6 +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-hdmi.c linux-linaro-stable-mx6/sound/soc/fsl/imx-hdmi.c --- linux-3.10.30.orig/sound/soc/fsl/imx-hdmi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-hdmi.c 2014-05-15 20:34:23.826199902 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/imx-hdmi.c 2014-05-16 15:28:45.853514361 +0200 @@ -0,0 +1,113 @@ +/* + * ASoC HDMI Transmitter driver for IMX development boards @@ -557253,7 +556928,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-hdmi.c linux-linaro-stable-mx6/so +MODULE_ALIAS("platform:imx-audio-hdmi"); diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-hdmi-dma.c linux-linaro-stable-mx6/sound/soc/fsl/imx-hdmi-dma.c --- linux-3.10.30.orig/sound/soc/fsl/imx-hdmi-dma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-hdmi-dma.c 2014-05-15 20:34:23.826199902 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/imx-hdmi-dma.c 2014-05-16 15:28:45.853514361 +0200 @@ -0,0 +1,1104 @@ +/* + * imx-hdmi-dma.c -- HDMI DMA driver for ALSA Soc Audio Layer @@ -558361,7 +558036,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-hdmi-dma.c linux-linaro-stable-mx +MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-hdmi.h linux-linaro-stable-mx6/sound/soc/fsl/imx-hdmi.h --- linux-3.10.30.orig/sound/soc/fsl/imx-hdmi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-hdmi.h 2014-05-15 20:34:23.826199902 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/imx-hdmi.h 2014-05-16 15:28:45.853514361 +0200 @@ -0,0 +1,105 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. @@ -558470,7 +558145,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-hdmi.h linux-linaro-stable-mx6/so +#endif /* __IMX_HDMI_H */ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-mc13783.c linux-linaro-stable-mx6/sound/soc/fsl/imx-mc13783.c --- linux-3.10.30.orig/sound/soc/fsl/imx-mc13783.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-mc13783.c 2014-05-15 20:34:23.826199902 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/imx-mc13783.c 2014-05-16 15:28:45.853514361 +0200 @@ -64,7 +64,7 @@ .codec_dai_name = "mc13783-hifi", .codec_name = "mc13783-codec", @@ -558631,7 +558306,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-pcm.c linux-linaro-stable-mx6/sou -MODULE_LICENSE("GPL"); diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-pcm-dma.c linux-linaro-stable-mx6/sound/soc/fsl/imx-pcm-dma.c --- linux-3.10.30.orig/sound/soc/fsl/imx-pcm-dma.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-pcm-dma.c 2014-05-15 20:34:23.826199902 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/imx-pcm-dma.c 2014-05-16 15:28:45.853514361 +0200 @@ -11,9 +11,14 @@ * Free Software Foundation; either version 2 of the License, or (at your * option) any later version. @@ -558765,7 +558440,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-pcm-dma.c linux-linaro-stable-mx6 +EXPORT_SYMBOL_GPL(imx_pcm_dma_exit); diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-pcm-fiq.c linux-linaro-stable-mx6/sound/soc/fsl/imx-pcm-fiq.c --- linux-3.10.30.orig/sound/soc/fsl/imx-pcm-fiq.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-pcm-fiq.c 2014-05-15 20:34:23.826199902 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/imx-pcm-fiq.c 2014-05-16 15:28:45.853514361 +0200 @@ -230,6 +230,22 @@ return 0; } @@ -558885,7 +558560,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-pcm-fiq.c linux-linaro-stable-mx6 +EXPORT_SYMBOL_GPL(imx_pcm_fiq_exit); diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-pcm.h linux-linaro-stable-mx6/sound/soc/fsl/imx-pcm.h --- linux-3.10.30.orig/sound/soc/fsl/imx-pcm.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-pcm.h 2014-05-15 20:34:23.826199902 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/imx-pcm.h 2014-05-16 15:28:45.853514361 +0200 @@ -18,13 +18,17 @@ /* * Do not change this as the FIQ handler depends on this size @@ -558944,7 +558619,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-pcm.h linux-linaro-stable-mx6/sou #endif /* _IMX_PCM_H */ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-sgtl5000.c linux-linaro-stable-mx6/sound/soc/fsl/imx-sgtl5000.c --- linux-3.10.30.orig/sound/soc/fsl/imx-sgtl5000.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-sgtl5000.c 2014-05-15 20:34:23.826199902 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/imx-sgtl5000.c 2014-05-16 15:28:45.853514361 +0200 @@ -149,7 +149,7 @@ data->dai.codec_dai_name = "sgtl5000"; data->dai.codec_of_node = codec_np; @@ -558956,7 +558631,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-sgtl5000.c linux-linaro-stable-mx SND_SOC_DAIFMT_CBM_CFM; diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-si476x.c linux-linaro-stable-mx6/sound/soc/fsl/imx-si476x.c --- linux-3.10.30.orig/sound/soc/fsl/imx-si476x.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-si476x.c 2014-05-15 20:34:23.826199902 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/imx-si476x.c 2014-05-16 15:28:45.853514361 +0200 @@ -0,0 +1,195 @@ +/* + * Copyright (C) 2008-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -559155,7 +558830,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-si476x.c linux-linaro-stable-mx6/ +MODULE_ALIAS("platform:imx-tuner-si476x"); diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-spdif.c linux-linaro-stable-mx6/sound/soc/fsl/imx-spdif.c --- linux-3.10.30.orig/sound/soc/fsl/imx-spdif.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-spdif.c 2014-05-15 20:34:23.854200105 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/imx-spdif.c 2014-05-16 15:28:45.853514361 +0200 @@ -0,0 +1,151 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -559310,7 +558985,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-spdif.c linux-linaro-stable-mx6/s +MODULE_ALIAS("platform:imx-spdif"); diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-ssi.c linux-linaro-stable-mx6/sound/soc/fsl/imx-ssi.c --- linux-3.10.30.orig/sound/soc/fsl/imx-ssi.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-ssi.c 2014-05-15 20:34:23.854200105 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/imx-ssi.c 2014-05-16 15:28:45.853514361 +0200 @@ -590,41 +590,22 @@ goto failed_register; } @@ -559379,7 +559054,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-ssi.c linux-linaro-stable-mx6/sou diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-ssi.h linux-linaro-stable-mx6/sound/soc/fsl/imx-ssi.h --- linux-3.10.30.orig/sound/soc/fsl/imx-ssi.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-ssi.h 2014-05-15 20:34:23.854200105 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/imx-ssi.h 2014-05-16 15:28:45.853514361 +0200 @@ -211,9 +211,6 @@ struct imx_dma_data filter_data_rx; @@ -559392,7 +559067,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-ssi.h linux-linaro-stable-mx6/sou #endif /* _IMX_SSI_H */ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-wm8962.c linux-linaro-stable-mx6/sound/soc/fsl/imx-wm8962.c --- linux-3.10.30.orig/sound/soc/fsl/imx-wm8962.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-wm8962.c 2014-05-15 20:34:23.854200105 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/imx-wm8962.c 2014-05-16 15:28:45.853514361 +0200 @@ -0,0 +1,575 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -559971,7 +559646,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-wm8962.c linux-linaro-stable-mx6/ +MODULE_ALIAS("platform:imx-wm8962"); diff -Nur linux-3.10.30.orig/sound/soc/fsl/Kconfig linux-linaro-stable-mx6/sound/soc/fsl/Kconfig --- linux-3.10.30.orig/sound/soc/fsl/Kconfig 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/Kconfig 2014-05-15 20:34:23.790199644 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/Kconfig 2014-05-16 15:28:45.801514087 +0200 @@ -1,6 +1,18 @@ config SND_SOC_FSL_SSI tristate @@ -560094,7 +559769,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/Kconfig linux-linaro-stable-mx6/sound endif # SND_IMX_SOC diff -Nur linux-3.10.30.orig/sound/soc/fsl/Makefile linux-linaro-stable-mx6/sound/soc/fsl/Makefile --- linux-3.10.30.orig/sound/soc/fsl/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/Makefile 2014-05-15 20:34:23.790199644 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/Makefile 2014-05-16 15:28:45.821514193 +0200 @@ -10,11 +10,21 @@ snd-soc-p1022-rdk-objs := p1022_rdk.o obj-$(CONFIG_SND_SOC_P1022_RDK) += snd-soc-p1022-rdk.o @@ -560164,7 +559839,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/Makefile linux-linaro-stable-mx6/soun +obj-$(CONFIG_SND_SOC_IMX_SI476X) += snd-soc-imx-si476x.o diff -Nur linux-3.10.30.orig/sound/soc/fsl/mx27vis-aic32x4.c linux-linaro-stable-mx6/sound/soc/fsl/mx27vis-aic32x4.c --- linux-3.10.30.orig/sound/soc/fsl/mx27vis-aic32x4.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/mx27vis-aic32x4.c 2014-05-15 20:34:23.858200133 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/mx27vis-aic32x4.c 2014-05-16 15:28:45.877514487 +0200 @@ -161,7 +161,7 @@ .name = "tlv320aic32x4", .stream_name = "TLV320AIC32X4", @@ -560176,7 +559851,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/mx27vis-aic32x4.c linux-linaro-stable .ops = &mx27vis_aic32x4_snd_ops, diff -Nur linux-3.10.30.orig/sound/soc/fsl/phycore-ac97.c linux-linaro-stable-mx6/sound/soc/fsl/phycore-ac97.c --- linux-3.10.30.orig/sound/soc/fsl/phycore-ac97.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/phycore-ac97.c 2014-05-15 20:34:23.858200133 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/phycore-ac97.c 2014-05-16 15:28:45.877514487 +0200 @@ -33,7 +33,7 @@ .codec_dai_name = "wm9712-hifi", .codec_name = "wm9712-codec", @@ -560188,7 +559863,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/phycore-ac97.c linux-linaro-stable-mx }; diff -Nur linux-3.10.30.orig/sound/soc/fsl/wm1133-ev1.c linux-linaro-stable-mx6/sound/soc/fsl/wm1133-ev1.c --- linux-3.10.30.orig/sound/soc/fsl/wm1133-ev1.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/wm1133-ev1.c 2014-05-15 20:34:23.858200133 +0200 ++++ linux-linaro-stable-mx6/sound/soc/fsl/wm1133-ev1.c 2014-05-16 15:28:45.877514487 +0200 @@ -245,7 +245,7 @@ .stream_name = "Audio", .cpu_dai_name = "imx-ssi.0", @@ -560200,7 +559875,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/wm1133-ev1.c linux-linaro-stable-mx6/ .ops = &wm1133_ev1_ops, diff -Nur linux-3.10.30.orig/sound/soc/soc-compress.c linux-linaro-stable-mx6/sound/soc/soc-compress.c --- linux-3.10.30.orig/sound/soc/soc-compress.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/soc-compress.c 2014-05-15 20:34:24.142202177 +0200 ++++ linux-linaro-stable-mx6/sound/soc/soc-compress.c 2014-05-16 15:28:45.925514741 +0200 @@ -149,8 +149,9 @@ SND_SOC_DAPM_STREAM_STOP); } else { @@ -560215,7 +559890,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/soc-compress.c linux-linaro-stable-mx6/so /* capture streams can be powered down now */ diff -Nur linux-3.10.30.orig/sound/soc/soc-generic-dmaengine-pcm.c linux-linaro-stable-mx6/sound/soc/soc-generic-dmaengine-pcm.c --- linux-3.10.30.orig/sound/soc/soc-generic-dmaengine-pcm.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/soc-generic-dmaengine-pcm.c 2014-05-15 20:34:24.142202177 +0200 ++++ linux-linaro-stable-mx6/sound/soc/soc-generic-dmaengine-pcm.c 2014-05-16 15:28:45.925514741 +0200 @@ -163,7 +163,7 @@ } @@ -560227,7 +559902,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/soc-generic-dmaengine-pcm.c linux-linaro- config->pcm_hardware->buffer_bytes_max); diff -Nur linux-3.10.30.orig/sound/soc/soc-jack.c linux-linaro-stable-mx6/sound/soc/soc-jack.c --- linux-3.10.30.orig/sound/soc/soc-jack.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/soc-jack.c 2014-05-15 20:34:24.142202177 +0200 ++++ linux-linaro-stable-mx6/sound/soc/soc-jack.c 2014-05-16 15:28:45.949514867 +0200 @@ -263,7 +263,7 @@ if (device_may_wakeup(dev)) pm_wakeup_event(dev, gpio->debounce_time + 50); @@ -560239,7 +559914,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/soc-jack.c linux-linaro-stable-mx6/sound/ return IRQ_HANDLED; diff -Nur linux-3.10.30.orig/sound/soc/soc-pcm.c linux-linaro-stable-mx6/sound/soc/soc-pcm.c --- linux-3.10.30.orig/sound/soc/soc-pcm.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/soc-pcm.c 2014-05-15 20:34:24.142202177 +0200 ++++ linux-linaro-stable-mx6/sound/soc/soc-pcm.c 2014-05-16 15:28:45.949514867 +0200 @@ -408,8 +408,9 @@ } else { /* start delayed pop wq here for playback streams */ @@ -560272,7 +559947,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/soc-pcm.c linux-linaro-stable-mx6/sound/s } diff -Nur linux-3.10.30.orig/tools/gator/daemon/Android.mk linux-linaro-stable-mx6/tools/gator/daemon/Android.mk --- linux-3.10.30.orig/tools/gator/daemon/Android.mk 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/Android.mk 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/Android.mk 2014-05-16 15:28:46.425517377 +0200 @@ -0,0 +1,52 @@ +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) @@ -560328,7 +560003,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Android.mk linux-linaro-stable-m +include $(BUILD_EXECUTABLE) diff -Nur linux-3.10.30.orig/tools/gator/daemon/Buffer.cpp linux-linaro-stable-mx6/tools/gator/daemon/Buffer.cpp --- linux-3.10.30.orig/tools/gator/daemon/Buffer.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/Buffer.cpp 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/Buffer.cpp 2014-05-16 15:28:46.425517377 +0200 @@ -0,0 +1,228 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -560560,7 +560235,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Buffer.cpp linux-linaro-stable-m +} diff -Nur linux-3.10.30.orig/tools/gator/daemon/Buffer.h linux-linaro-stable-mx6/tools/gator/daemon/Buffer.h --- linux-3.10.30.orig/tools/gator/daemon/Buffer.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/Buffer.h 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/Buffer.h 2014-05-16 15:28:46.425517377 +0200 @@ -0,0 +1,66 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -560630,7 +560305,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Buffer.h linux-linaro-stable-mx6 +#endif // BUFFER_H diff -Nur linux-3.10.30.orig/tools/gator/daemon/CapturedXML.cpp linux-linaro-stable-mx6/tools/gator/daemon/CapturedXML.cpp --- linux-3.10.30.orig/tools/gator/daemon/CapturedXML.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/CapturedXML.cpp 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/CapturedXML.cpp 2014-05-16 15:28:46.425517377 +0200 @@ -0,0 +1,134 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -560768,7 +560443,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/CapturedXML.cpp linux-linaro-sta +} diff -Nur linux-3.10.30.orig/tools/gator/daemon/CapturedXML.h linux-linaro-stable-mx6/tools/gator/daemon/CapturedXML.h --- linux-3.10.30.orig/tools/gator/daemon/CapturedXML.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/CapturedXML.h 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/CapturedXML.h 2014-05-16 15:28:46.425517377 +0200 @@ -0,0 +1,26 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -560798,7 +560473,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/CapturedXML.h linux-linaro-stabl +#endif //__CAPTURED_XML_H__ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Child.cpp linux-linaro-stable-mx6/tools/gator/daemon/Child.cpp --- linux-3.10.30.orig/tools/gator/daemon/Child.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/Child.cpp 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/Child.cpp 2014-05-16 15:28:46.425517377 +0200 @@ -0,0 +1,409 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -561211,7 +560886,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Child.cpp linux-linaro-stable-mx +} diff -Nur linux-3.10.30.orig/tools/gator/daemon/Child.h linux-linaro-stable-mx6/tools/gator/daemon/Child.h --- linux-3.10.30.orig/tools/gator/daemon/Child.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/Child.h 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/Child.h 2014-05-16 15:28:46.425517377 +0200 @@ -0,0 +1,35 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -561250,7 +560925,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Child.h linux-linaro-stable-mx6/ +#endif //__CHILD_H__ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Collector.cpp linux-linaro-stable-mx6/tools/gator/daemon/Collector.cpp --- linux-3.10.30.orig/tools/gator/daemon/Collector.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/Collector.cpp 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/Collector.cpp 2014-05-16 15:28:46.425517377 +0200 @@ -0,0 +1,221 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -561475,7 +561150,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Collector.cpp linux-linaro-stabl +} diff -Nur linux-3.10.30.orig/tools/gator/daemon/Collector.h linux-linaro-stable-mx6/tools/gator/daemon/Collector.h --- linux-3.10.30.orig/tools/gator/daemon/Collector.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/Collector.h 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/Collector.h 2014-05-16 15:28:46.425517377 +0200 @@ -0,0 +1,38 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -561517,7 +561192,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Collector.h linux-linaro-stable- +#endif //__COLLECTOR_H__ diff -Nur linux-3.10.30.orig/tools/gator/daemon/common.mk linux-linaro-stable-mx6/tools/gator/daemon/common.mk --- linux-3.10.30.orig/tools/gator/daemon/common.mk 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/common.mk 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/common.mk 2014-05-16 15:28:46.429517398 +0200 @@ -0,0 +1,50 @@ +# -g produces debugging information +# -O3 maximum optimization @@ -561571,7 +561246,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/common.mk linux-linaro-stable-mx + rm -f *.d *.o mxml/*.d mxml/*.o libsensors/*.d libsensors/*.o $(TARGET) escape events.xml events_xml.h configuration_xml.h diff -Nur linux-3.10.30.orig/tools/gator/daemon/configuration.xml linux-linaro-stable-mx6/tools/gator/daemon/configuration.xml --- linux-3.10.30.orig/tools/gator/daemon/configuration.xml 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/configuration.xml 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/configuration.xml 2014-05-16 15:28:46.429517398 +0200 @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<configurations revision="3"> @@ -561632,7 +561307,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/configuration.xml linux-linaro-s +</configurations> diff -Nur linux-3.10.30.orig/tools/gator/daemon/ConfigurationXML.cpp linux-linaro-stable-mx6/tools/gator/daemon/ConfigurationXML.cpp --- linux-3.10.30.orig/tools/gator/daemon/ConfigurationXML.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/ConfigurationXML.cpp 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/ConfigurationXML.cpp 2014-05-16 15:28:46.425517377 +0200 @@ -0,0 +1,209 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -561845,7 +561520,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/ConfigurationXML.cpp linux-linar +} diff -Nur linux-3.10.30.orig/tools/gator/daemon/ConfigurationXML.h linux-linaro-stable-mx6/tools/gator/daemon/ConfigurationXML.h --- linux-3.10.30.orig/tools/gator/daemon/ConfigurationXML.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/ConfigurationXML.h 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/ConfigurationXML.h 2014-05-16 15:28:46.425517377 +0200 @@ -0,0 +1,38 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -561887,7 +561562,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/ConfigurationXML.h linux-linaro- +#endif // COUNTERS_H diff -Nur linux-3.10.30.orig/tools/gator/daemon/Counter.h linux-linaro-stable-mx6/tools/gator/daemon/Counter.h --- linux-3.10.30.orig/tools/gator/daemon/Counter.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/Counter.h 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/Counter.h 2014-05-16 15:28:46.425517377 +0200 @@ -0,0 +1,61 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -561952,7 +561627,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Counter.h linux-linaro-stable-mx +#endif // COUNTER_H diff -Nur linux-3.10.30.orig/tools/gator/daemon/Driver.cpp linux-linaro-stable-mx6/tools/gator/daemon/Driver.cpp --- linux-3.10.30.orig/tools/gator/daemon/Driver.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/Driver.cpp 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/Driver.cpp 2014-05-16 15:28:46.425517377 +0200 @@ -0,0 +1,15 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -561971,7 +561646,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Driver.cpp linux-linaro-stable-m +} diff -Nur linux-3.10.30.orig/tools/gator/daemon/Driver.h linux-linaro-stable-mx6/tools/gator/daemon/Driver.h --- linux-3.10.30.orig/tools/gator/daemon/Driver.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/Driver.h 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/Driver.h 2014-05-16 15:28:46.425517377 +0200 @@ -0,0 +1,48 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -562023,7 +561698,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Driver.h linux-linaro-stable-mx6 +#endif // DRIVER_H diff -Nur linux-3.10.30.orig/tools/gator/daemon/escape.c linux-linaro-stable-mx6/tools/gator/daemon/escape.c --- linux-3.10.30.orig/tools/gator/daemon/escape.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/escape.c 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/escape.c 2014-05-16 15:28:46.429517398 +0200 @@ -0,0 +1,75 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -562102,7 +561777,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/escape.c linux-linaro-stable-mx6 +} diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-ARM11MPCore.xml linux-linaro-stable-mx6/tools/gator/daemon/events-ARM11MPCore.xml --- linux-3.10.30.orig/tools/gator/daemon/events-ARM11MPCore.xml 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/events-ARM11MPCore.xml 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/events-ARM11MPCore.xml 2014-05-16 15:28:46.429517398 +0200 @@ -0,0 +1,26 @@ + <counter_set name="ARM_ARM11MPCore_cnt" count="3"/> + <category name="ARM11MPCore" counter_set="ARM_ARM11MPCore_cnt" per_cpu="yes"> @@ -562132,7 +561807,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-ARM11MPCore.xml linux-lin + </category> diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-ARM11.xml linux-linaro-stable-mx6/tools/gator/daemon/events-ARM11.xml --- linux-3.10.30.orig/tools/gator/daemon/events-ARM11.xml 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/events-ARM11.xml 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/events-ARM11.xml 2014-05-16 15:28:46.429517398 +0200 @@ -0,0 +1,39 @@ + <counter_set name="ARM_ARM11_cnt" count="3"/> + <category name="ARM11" counter_set="ARM_ARM11_cnt" per_cpu="yes"> @@ -562175,7 +561850,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-ARM11.xml linux-linaro-st + </category> diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-CCI-400.xml linux-linaro-stable-mx6/tools/gator/daemon/events-CCI-400.xml --- linux-3.10.30.orig/tools/gator/daemon/events-CCI-400.xml 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/events-CCI-400.xml 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/events-CCI-400.xml 2014-05-16 15:28:46.429517398 +0200 @@ -0,0 +1,107 @@ + <counter_set name="cci-400_cnt" count="4"/> + <category name="CCI-400" counter_set="cci-400_cnt" per_cpu="no" supports_event_based_sampling="yes"> @@ -562286,7 +561961,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-CCI-400.xml linux-linaro- + </category> diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-CCN-504.xml linux-linaro-stable-mx6/tools/gator/daemon/events-CCN-504.xml --- linux-3.10.30.orig/tools/gator/daemon/events-CCN-504.xml 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/events-CCN-504.xml 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/events-CCN-504.xml 2014-05-16 15:28:46.429517398 +0200 @@ -0,0 +1,122 @@ + <counter_set name="CCN-504_cnt" count="4"/> + <category name="CCN-504" counter_set="CCN-504_cnt"> @@ -562412,7 +562087,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-CCN-504.xml linux-linaro- + </category> diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A12.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A12.xml --- linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A12.xml 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A12.xml 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A12.xml 2014-05-16 15:28:46.429517398 +0200 @@ -0,0 +1,86 @@ + <counter_set name="ARM_Cortex-A12_cnt" count="6"/> + <category name="Cortex-A12" counter_set="ARM_Cortex-A12_cnt" per_cpu="yes" supports_event_based_sampling="yes"> @@ -562502,7 +562177,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A12.xml linux-lina + </category> diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A15.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A15.xml --- linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A15.xml 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A15.xml 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A15.xml 2014-05-16 15:28:46.429517398 +0200 @@ -0,0 +1,68 @@ + <counter_set name="ARM_Cortex-A15_cnt" count="6"/> + <category name="Cortex-A15" counter_set="ARM_Cortex-A15_cnt" per_cpu="yes" supports_event_based_sampling="yes"> @@ -562574,7 +562249,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A15.xml linux-lina + </category> diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A53.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A53.xml --- linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A53.xml 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A53.xml 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A53.xml 2014-05-16 15:28:46.433517419 +0200 @@ -0,0 +1,171 @@ + <counter_set name="ARM_Cortex-A53_cnt" count="6"/> + <category name="Cortex-A53" counter_set="ARM_Cortex-A53_cnt" per_cpu="yes" supports_event_based_sampling="yes"> @@ -562749,7 +562424,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A53.xml linux-lina + </category> diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A57.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A57.xml --- linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A57.xml 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A57.xml 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A57.xml 2014-05-16 15:28:46.433517419 +0200 @@ -0,0 +1,171 @@ + <counter_set name="ARM_Cortex-A57_cnt" count="6"/> + <category name="Cortex-A57" counter_set="ARM_Cortex-A57_cnt" per_cpu="yes" supports_event_based_sampling="yes"> @@ -562924,7 +562599,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A57.xml linux-lina + </category> diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A5.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A5.xml --- linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A5.xml 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A5.xml 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A5.xml 2014-05-16 15:28:46.433517419 +0200 @@ -0,0 +1,36 @@ + <counter_set name="ARM_Cortex-A5_cnt" count="2"/> + <category name="Cortex-A5" counter_set="ARM_Cortex-A5_cnt" per_cpu="yes" supports_event_based_sampling="yes"> @@ -562964,7 +562639,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A5.xml linux-linar + </category> diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A7.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A7.xml --- linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A7.xml 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A7.xml 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A7.xml 2014-05-16 15:28:46.433517419 +0200 @@ -0,0 +1,43 @@ + <counter_set name="ARM_Cortex-A7_cnt" count="4"/> + <category name="Cortex-A7" counter_set="ARM_Cortex-A7_cnt" per_cpu="yes" supports_event_based_sampling="yes"> @@ -563011,7 +562686,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A7.xml linux-linar + </category> diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A8.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A8.xml --- linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A8.xml 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A8.xml 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A8.xml 2014-05-16 15:28:46.433517419 +0200 @@ -0,0 +1,52 @@ + <counter_set name="ARM_Cortex-A8_cnt" count="4"/> + <category name="Cortex-A8" counter_set="ARM_Cortex-A8_cnt" per_cpu="yes" supports_event_based_sampling="yes"> @@ -563067,7 +562742,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A8.xml linux-linar + </category> diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A9.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A9.xml --- linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A9.xml 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A9.xml 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/events-Cortex-A9.xml 2014-05-16 15:28:46.433517419 +0200 @@ -0,0 +1,65 @@ + <counter_set name="ARM_Cortex-A9_cnt" count="6"/> + <category name="Cortex-A9" counter_set="ARM_Cortex-A9_cnt" per_cpu="yes" supports_event_based_sampling="yes"> @@ -563136,18 +562811,18 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A9.xml linux-linar + </category> diff -Nur linux-3.10.30.orig/tools/gator/daemon/events_footer.xml linux-linaro-stable-mx6/tools/gator/daemon/events_footer.xml --- linux-3.10.30.orig/tools/gator/daemon/events_footer.xml 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/events_footer.xml 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/events_footer.xml 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1 @@ +</events> diff -Nur linux-3.10.30.orig/tools/gator/daemon/events_header.xml linux-linaro-stable-mx6/tools/gator/daemon/events_header.xml --- linux-3.10.30.orig/tools/gator/daemon/events_header.xml 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/events_header.xml 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/events_header.xml 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<events> diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Krait-architected.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Krait-architected.xml --- linux-3.10.30.orig/tools/gator/daemon/events-Krait-architected.xml 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/events-Krait-architected.xml 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/events-Krait-architected.xml 2014-05-16 15:28:46.433517419 +0200 @@ -0,0 +1,22 @@ + <counter_set name="Krait_cnt" count="4"/> + <category name="Krait" counter_set="Krait_cnt" per_cpu="yes" supports_event_based_sampling="yes"> @@ -563173,7 +562848,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Krait-architected.xml lin + </category> diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-L2C-310.xml linux-linaro-stable-mx6/tools/gator/daemon/events-L2C-310.xml --- linux-3.10.30.orig/tools/gator/daemon/events-L2C-310.xml 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/events-L2C-310.xml 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/events-L2C-310.xml 2014-05-16 15:28:46.433517419 +0200 @@ -0,0 +1,18 @@ + <counter_set name="L2C-310_cnt" count="2"/> + <category name="L2C-310" counter_set="L2C-310_cnt" per_cpu="no"> @@ -563195,7 +562870,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-L2C-310.xml linux-linaro- + </category> diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Linux.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Linux.xml --- linux-3.10.30.orig/tools/gator/daemon/events-Linux.xml 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/events-Linux.xml 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/events-Linux.xml 2014-05-16 15:28:46.433517419 +0200 @@ -0,0 +1,17 @@ + <category name="Linux"> + <event counter="Linux_irq_softirq" title="Interrupts" name="SoftIRQ" per_cpu="yes" description="Linux SoftIRQ taken"/> @@ -563216,7 +562891,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Linux.xml linux-linaro-st + diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Mali-4xx.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Mali-4xx.xml --- linux-3.10.30.orig/tools/gator/daemon/events-Mali-4xx.xml 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/events-Mali-4xx.xml 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/events-Mali-4xx.xml 2014-05-16 15:28:46.433517419 +0200 @@ -0,0 +1,251 @@ + <counter_set name="ARM_Mali-4xx_VP_0_cnt" count="2"/> + <counter_set name="ARM_Mali-4xx_SW_cnt" count="0"/> @@ -563471,7 +563146,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Mali-4xx.xml linux-linaro + </category> diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Mali-T6xx_hw.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Mali-T6xx_hw.xml --- linux-3.10.30.orig/tools/gator/daemon/events-Mali-T6xx_hw.xml 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/events-Mali-T6xx_hw.xml 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/events-Mali-T6xx_hw.xml 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1,116 @@ + + <category name="Mali-T6xx-JobManager" per_cpu="no"> @@ -563591,7 +563266,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Mali-T6xx_hw.xml linux-li + </category> diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Mali-T6xx.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Mali-T6xx.xml --- linux-3.10.30.orig/tools/gator/daemon/events-Mali-T6xx.xml 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/events-Mali-T6xx.xml 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/events-Mali-T6xx.xml 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1,48 @@ + + <category name="Mali-T6xx-SW-counters" per_cpu="no"> @@ -563643,7 +563318,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Mali-T6xx.xml linux-linar + </category> diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-ScorpionMP.xml linux-linaro-stable-mx6/tools/gator/daemon/events-ScorpionMP.xml --- linux-3.10.30.orig/tools/gator/daemon/events-ScorpionMP.xml 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/events-ScorpionMP.xml 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/events-ScorpionMP.xml 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1,90 @@ + <counter_set name="ScorpionMP_cnt" count="4"/> + <category name="ScorpionMP" counter_set="ScorpionMP_cnt" per_cpu="yes" supports_event_based_sampling="yes"> @@ -563737,7 +563412,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-ScorpionMP.xml linux-lina + </category> diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Scorpion.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Scorpion.xml --- linux-3.10.30.orig/tools/gator/daemon/events-Scorpion.xml 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/events-Scorpion.xml 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/events-Scorpion.xml 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1,107 @@ + <counter_set name="Scorpion_cnt" count="4"/> + <category name="Scorpion" counter_set="Scorpion_cnt" per_cpu="yes" supports_event_based_sampling="yes"> @@ -563848,7 +563523,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Scorpion.xml linux-linaro + </category> diff -Nur linux-3.10.30.orig/tools/gator/daemon/EventsXML.cpp linux-linaro-stable-mx6/tools/gator/daemon/EventsXML.cpp --- linux-3.10.30.orig/tools/gator/daemon/EventsXML.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/EventsXML.cpp 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/EventsXML.cpp 2014-05-16 15:28:46.425517377 +0200 @@ -0,0 +1,70 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -563922,7 +563597,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/EventsXML.cpp linux-linaro-stabl +} diff -Nur linux-3.10.30.orig/tools/gator/daemon/EventsXML.h linux-linaro-stable-mx6/tools/gator/daemon/EventsXML.h --- linux-3.10.30.orig/tools/gator/daemon/EventsXML.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/EventsXML.h 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/EventsXML.h 2014-05-16 15:28:46.425517377 +0200 @@ -0,0 +1,18 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -563944,7 +563619,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/EventsXML.h linux-linaro-stable- +#endif // EVENTS_XML diff -Nur linux-3.10.30.orig/tools/gator/daemon/Fifo.cpp linux-linaro-stable-mx6/tools/gator/daemon/Fifo.cpp --- linux-3.10.30.orig/tools/gator/daemon/Fifo.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/Fifo.cpp 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/Fifo.cpp 2014-05-16 15:28:46.425517377 +0200 @@ -0,0 +1,130 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -564078,7 +563753,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Fifo.cpp linux-linaro-stable-mx6 +} diff -Nur linux-3.10.30.orig/tools/gator/daemon/Fifo.h linux-linaro-stable-mx6/tools/gator/daemon/Fifo.h --- linux-3.10.30.orig/tools/gator/daemon/Fifo.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/Fifo.h 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/Fifo.h 2014-05-16 15:28:46.425517377 +0200 @@ -0,0 +1,48 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -564130,7 +563805,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Fifo.h linux-linaro-stable-mx6/t +#endif //__FIFO_H__ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Hwmon.cpp linux-linaro-stable-mx6/tools/gator/daemon/Hwmon.cpp --- linux-3.10.30.orig/tools/gator/daemon/Hwmon.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/Hwmon.cpp 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/Hwmon.cpp 2014-05-16 15:28:46.425517377 +0200 @@ -0,0 +1,330 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -564464,7 +564139,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Hwmon.cpp linux-linaro-stable-mx +} diff -Nur linux-3.10.30.orig/tools/gator/daemon/Hwmon.h linux-linaro-stable-mx6/tools/gator/daemon/Hwmon.h --- linux-3.10.30.orig/tools/gator/daemon/Hwmon.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/Hwmon.h 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/Hwmon.h 2014-05-16 15:28:46.425517377 +0200 @@ -0,0 +1,43 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -564511,7 +564186,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Hwmon.h linux-linaro-stable-mx6/ +#endif // HWMON_H diff -Nur linux-3.10.30.orig/tools/gator/daemon/KMod.cpp linux-linaro-stable-mx6/tools/gator/daemon/KMod.cpp --- linux-3.10.30.orig/tools/gator/daemon/KMod.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/KMod.cpp 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/KMod.cpp 2014-05-16 15:28:46.429517398 +0200 @@ -0,0 +1,102 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -564617,7 +564292,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/KMod.cpp linux-linaro-stable-mx6 +} diff -Nur linux-3.10.30.orig/tools/gator/daemon/KMod.h linux-linaro-stable-mx6/tools/gator/daemon/KMod.h --- linux-3.10.30.orig/tools/gator/daemon/KMod.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/KMod.h 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/KMod.h 2014-05-16 15:28:46.429517398 +0200 @@ -0,0 +1,27 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -564648,7 +564323,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/KMod.h linux-linaro-stable-mx6/t +#endif // KMOD_H diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/access.c linux-linaro-stable-mx6/tools/gator/daemon/libsensors/access.c --- linux-3.10.30.orig/tools/gator/daemon/libsensors/access.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/access.c 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/access.c 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1,561 @@ +/* + access.c - Part of libsensors, a Linux library for reading sensor data. @@ -565213,7 +564888,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/access.c linux-linaro +} diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/access.h linux-linaro-stable-mx6/tools/gator/daemon/libsensors/access.h --- linux-3.10.30.orig/tools/gator/daemon/libsensors/access.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/access.h 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/access.h 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1,33 @@ +/* + access.h - Part of libsensors, a Linux library for reading sensor data. @@ -565250,7 +564925,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/access.h linux-linaro +#endif /* def LIB_SENSORS_ACCESS_H */ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/conf.h linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf.h --- linux-3.10.30.orig/tools/gator/daemon/libsensors/conf.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf.h 2014-05-15 20:34:24.402204050 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf.h 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1,34 @@ +/* + conf.h - Part of libsensors, a Linux library for reading sensor data. @@ -565288,7 +564963,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/conf.h linux-linaro-s +#endif /* LIB_SENSORS_CONF_H */ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/conf-lex.c linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf-lex.c --- linux-3.10.30.orig/tools/gator/daemon/libsensors/conf-lex.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf-lex.c 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf-lex.c 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1,2881 @@ + +#line 3 "<stdout>" @@ -568173,7 +567848,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/conf-lex.c linux-lina + diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/conf-lex.l linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf-lex.l --- linux-3.10.30.orig/tools/gator/daemon/libsensors/conf-lex.l 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf-lex.l 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf-lex.l 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1,372 @@ +%{ +/* @@ -568549,7 +568224,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/conf-lex.l linux-lina + diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/conf-parse.c linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf-parse.c --- linux-3.10.30.orig/tools/gator/daemon/libsensors/conf-parse.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf-parse.c 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf-parse.c 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1,2042 @@ +/* A Bison parser, made by GNU Bison 2.5. */ + @@ -570595,7 +570270,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/conf-parse.c linux-li + diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/conf-parse.h linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf-parse.h --- linux-3.10.30.orig/tools/gator/daemon/libsensors/conf-parse.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf-parse.h 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf-parse.h 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1,84 @@ +/* A Bison parser, made by GNU Bison 2.5. */ + @@ -570683,7 +570358,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/conf-parse.h linux-li + diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/conf-parse.y linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf-parse.y --- linux-3.10.30.orig/tools/gator/daemon/libsensors/conf-parse.y 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf-parse.y 2014-05-15 20:34:24.402204050 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/conf-parse.y 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1,347 @@ +%{ +/* @@ -571034,7 +570709,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/conf-parse.y linux-li +} diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/COPYING.LGPL linux-linaro-stable-mx6/tools/gator/daemon/libsensors/COPYING.LGPL --- linux-3.10.30.orig/tools/gator/daemon/libsensors/COPYING.LGPL 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/COPYING.LGPL 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/COPYING.LGPL 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1,502 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 @@ -571540,7 +571215,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/COPYING.LGPL linux-li +That's all there is to it! diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/data.c linux-linaro-stable-mx6/tools/gator/daemon/libsensors/data.c --- linux-3.10.30.orig/tools/gator/daemon/libsensors/data.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/data.c 2014-05-15 20:34:24.402204050 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/data.c 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1,278 @@ +/* + data.c - Part of libsensors, a Linux library for reading sensor data. @@ -571822,7 +571497,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/data.c linux-linaro-s +} diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/data.h linux-linaro-stable-mx6/tools/gator/daemon/libsensors/data.h --- linux-3.10.30.orig/tools/gator/daemon/libsensors/data.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/data.h 2014-05-15 20:34:24.402204050 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/data.h 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1,184 @@ +/* + data.h - Part of libsensors, a Linux library for reading sensor data. @@ -572010,7 +571685,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/data.h linux-linaro-s +#endif /* def LIB_SENSORS_DATA_H */ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/error.c linux-linaro-stable-mx6/tools/gator/daemon/libsensors/error.c --- linux-3.10.30.orig/tools/gator/daemon/libsensors/error.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/error.c 2014-05-15 20:34:24.402204050 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/error.c 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1,92 @@ +/* + error.c - Part of libsensors, a Linux library for reading sensor data. @@ -572106,7 +571781,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/error.c linux-linaro- +} diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/error.h linux-linaro-stable-mx6/tools/gator/daemon/libsensors/error.h --- linux-3.10.30.orig/tools/gator/daemon/libsensors/error.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/error.h 2014-05-15 20:34:24.402204050 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/error.h 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1,74 @@ +/* + error.h - Part of libsensors, a Linux library for reading sensor data. @@ -572184,7 +571859,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/error.h linux-linaro- +#endif /* def LIB_SENSORS_ERROR_H */ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/general.c linux-linaro-stable-mx6/tools/gator/daemon/libsensors/general.c --- linux-3.10.30.orig/tools/gator/daemon/libsensors/general.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/general.c 2014-05-15 20:34:24.402204050 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/general.c 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1,85 @@ +/* + general.c - Part of libsensors, a Linux library for reading sensor data. @@ -572273,7 +571948,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/general.c linux-linar +} diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/general.h linux-linaro-stable-mx6/tools/gator/daemon/libsensors/general.h --- linux-3.10.30.orig/tools/gator/daemon/libsensors/general.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/general.h 2014-05-15 20:34:24.402204050 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/general.h 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1,39 @@ +/* + general.h - Part of libsensors, a Linux library for reading sensor data. @@ -572316,7 +571991,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/general.h linux-linar +#endif /* LIB_SENSORS_GENERAL */ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/init.c linux-linaro-stable-mx6/tools/gator/daemon/libsensors/init.c --- linux-3.10.30.orig/tools/gator/daemon/libsensors/init.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/init.c 2014-05-15 20:34:24.402204050 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/init.c 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1,341 @@ +/* + init.c - Part of libsensors, a Linux library for reading sensor data. @@ -572661,7 +572336,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/init.c linux-linaro-s +} diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/init.h linux-linaro-stable-mx6/tools/gator/daemon/libsensors/init.h --- linux-3.10.30.orig/tools/gator/daemon/libsensors/init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/init.h 2014-05-15 20:34:24.402204050 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/init.h 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1,28 @@ +/* + init.h - Part of libsensors, a Linux library for reading sensor data. @@ -572693,7 +572368,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/init.h linux-linaro-s +#endif /* def LIB_SENSORS_INIT_H */ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/scanner.h linux-linaro-stable-mx6/tools/gator/daemon/libsensors/scanner.h --- linux-3.10.30.orig/tools/gator/daemon/libsensors/scanner.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/scanner.h 2014-05-15 20:34:24.402204050 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/scanner.h 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1,32 @@ +/* + scanner.h - Part of libsensors, a Linux library for reading sensor data. @@ -572729,7 +572404,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/scanner.h linux-linar + diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/sensors.h linux-linaro-stable-mx6/tools/gator/daemon/libsensors/sensors.h --- linux-3.10.30.orig/tools/gator/daemon/libsensors/sensors.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/sensors.h 2014-05-15 20:34:24.402204050 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/sensors.h 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1,311 @@ +/* + sensors.h - Part of libsensors, a Linux library for reading sensor data. @@ -573044,7 +572719,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/sensors.h linux-linar +#endif /* def LIB_SENSORS_ERROR_H */ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/sysfs.c linux-linaro-stable-mx6/tools/gator/daemon/libsensors/sysfs.c --- linux-3.10.30.orig/tools/gator/daemon/libsensors/sysfs.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/sysfs.c 2014-05-15 20:34:24.402204050 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/sysfs.c 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1,926 @@ +/* + sysfs.c - Part of libsensors, a library for reading Linux sensor data @@ -573974,7 +573649,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/sysfs.c linux-linaro- +} diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/sysfs.h linux-linaro-stable-mx6/tools/gator/daemon/libsensors/sysfs.h --- linux-3.10.30.orig/tools/gator/daemon/libsensors/sysfs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/sysfs.h 2014-05-15 20:34:24.402204050 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/sysfs.h 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1,43 @@ +/* + sysfs.h - part of libsensors, a library for reading Linux sensor data @@ -574021,12 +573696,12 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/sysfs.h linux-linaro- +#endif /* !SENSORS_LIB_SYSFS_H */ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/version.h linux-linaro-stable-mx6/tools/gator/daemon/libsensors/version.h --- linux-3.10.30.orig/tools/gator/daemon/libsensors/version.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/version.h 2014-05-15 20:34:24.402204050 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/libsensors/version.h 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1 @@ +#define LM_VERSION "3.3.2" diff -Nur linux-3.10.30.orig/tools/gator/daemon/LocalCapture.cpp linux-linaro-stable-mx6/tools/gator/daemon/LocalCapture.cpp --- linux-3.10.30.orig/tools/gator/daemon/LocalCapture.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/LocalCapture.cpp 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/LocalCapture.cpp 2014-05-16 15:28:46.429517398 +0200 @@ -0,0 +1,129 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -574159,7 +573834,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/LocalCapture.cpp linux-linaro-st +} diff -Nur linux-3.10.30.orig/tools/gator/daemon/LocalCapture.h linux-linaro-stable-mx6/tools/gator/daemon/LocalCapture.h --- linux-3.10.30.orig/tools/gator/daemon/LocalCapture.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/LocalCapture.h 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/LocalCapture.h 2014-05-16 15:28:46.429517398 +0200 @@ -0,0 +1,26 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -574189,7 +573864,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/LocalCapture.h linux-linaro-stab +#endif //__LOCAL_CAPTURE_H__ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Logging.cpp linux-linaro-stable-mx6/tools/gator/daemon/Logging.cpp --- linux-3.10.30.orig/tools/gator/daemon/Logging.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/Logging.cpp 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/Logging.cpp 2014-05-16 15:28:46.429517398 +0200 @@ -0,0 +1,78 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -574271,7 +573946,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Logging.cpp linux-linaro-stable- +} diff -Nur linux-3.10.30.orig/tools/gator/daemon/Logging.h linux-linaro-stable-mx6/tools/gator/daemon/Logging.h --- linux-3.10.30.orig/tools/gator/daemon/Logging.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/Logging.h 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/Logging.h 2014-05-16 15:28:46.429517398 +0200 @@ -0,0 +1,47 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -574322,7 +573997,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Logging.h linux-linaro-stable-mx +#endif //__LOGGING_H__ diff -Nur linux-3.10.30.orig/tools/gator/daemon/main.cpp linux-linaro-stable-mx6/tools/gator/daemon/main.cpp --- linux-3.10.30.orig/tools/gator/daemon/main.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/main.cpp 2014-05-15 20:34:24.402204050 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/main.cpp 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1,485 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -574811,7 +574486,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/main.cpp linux-linaro-stable-mx6 +} diff -Nur linux-3.10.30.orig/tools/gator/daemon/Makefile linux-linaro-stable-mx6/tools/gator/daemon/Makefile --- linux-3.10.30.orig/tools/gator/daemon/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/Makefile 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/Makefile 2014-05-16 15:28:46.429517398 +0200 @@ -0,0 +1,25 @@ +# +# Makefile for ARM Streamline - Gator Daemon @@ -574840,7 +574515,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Makefile linux-linaro-stable-mx6 +include common.mk diff -Nur linux-3.10.30.orig/tools/gator/daemon/Makefile_aarch64 linux-linaro-stable-mx6/tools/gator/daemon/Makefile_aarch64 --- linux-3.10.30.orig/tools/gator/daemon/Makefile_aarch64 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/Makefile_aarch64 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/Makefile_aarch64 2014-05-16 15:28:46.429517398 +0200 @@ -0,0 +1,15 @@ +# +# Makefile for ARM Streamline - Gator Daemon @@ -574859,7 +574534,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Makefile_aarch64 linux-linaro-st +include common.mk diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/config.h linux-linaro-stable-mx6/tools/gator/daemon/mxml/config.h --- linux-3.10.30.orig/tools/gator/daemon/mxml/config.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/config.h 2014-05-15 20:34:24.406204078 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/config.h 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1,96 @@ +/* config.h. Generated from config.h.in by configure. */ +/* @@ -574959,7 +574634,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/config.h linux-linaro-stabl + */ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/COPYING linux-linaro-stable-mx6/tools/gator/daemon/mxml/COPYING --- linux-3.10.30.orig/tools/gator/daemon/mxml/COPYING 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/COPYING 2014-05-15 20:34:24.406204078 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/COPYING 2014-05-16 15:28:46.437517441 +0200 @@ -0,0 +1,507 @@ + Mini-XML License + September 18, 2010 @@ -575470,7 +575145,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/COPYING linux-linaro-stable +That's all there is to it! diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-attr.c linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-attr.c --- linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-attr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-attr.c 2014-05-15 20:34:24.406204078 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-attr.c 2014-05-16 15:28:46.441517461 +0200 @@ -0,0 +1,319 @@ +/* + * "$Id: mxml-attr.c 408 2010-09-19 05:26:46Z mike $" @@ -575793,7 +575468,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-attr.c linux-linaro-st + */ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-entity.c linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-entity.c --- linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-entity.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-entity.c 2014-05-15 20:34:24.406204078 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-entity.c 2014-05-16 15:28:46.441517461 +0200 @@ -0,0 +1,460 @@ +/* + * "$Id: mxml-entity.c 408 2010-09-19 05:26:46Z mike $" @@ -576257,7 +575932,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-entity.c linux-linaro- + */ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-file.c linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-file.c --- linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-file.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-file.c 2014-05-15 20:34:24.450204395 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-file.c 2014-05-16 15:28:46.441517461 +0200 @@ -0,0 +1,3082 @@ +/* + * "$Id: mxml-file.c 438 2011-03-24 05:47:51Z mike $" @@ -579343,7 +579018,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-file.c linux-linaro-st + */ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-get.c linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-get.c --- linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-get.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-get.c 2014-05-15 20:34:24.450204395 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-get.c 2014-05-16 15:28:46.441517461 +0200 @@ -0,0 +1,471 @@ +/* + * "$Id: mxml-get.c 427 2011-01-03 02:03:29Z mike $" @@ -579818,7 +579493,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-get.c linux-linaro-sta + */ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml.h linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml.h --- linux-3.10.30.orig/tools/gator/daemon/mxml/mxml.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml.h 2014-05-15 20:34:24.450204395 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml.h 2014-05-16 15:28:46.441517461 +0200 @@ -0,0 +1,329 @@ +/* + * "$Id: mxml.h 427 2011-01-03 02:03:29Z mike $" @@ -580151,7 +579826,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml.h linux-linaro-stable- + */ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-index.c linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-index.c --- linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-index.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-index.c 2014-05-15 20:34:24.450204395 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-index.c 2014-05-16 15:28:46.441517461 +0200 @@ -0,0 +1,662 @@ +/* + * "$Id: mxml-index.c 426 2011-01-01 23:42:17Z mike $" @@ -580817,7 +580492,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-index.c linux-linaro-s + */ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-node.c linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-node.c --- linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-node.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-node.c 2014-05-15 20:34:24.450204395 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-node.c 2014-05-16 15:28:46.441517461 +0200 @@ -0,0 +1,807 @@ +/* + * "$Id: mxml-node.c 436 2011-01-22 01:02:05Z mike $" @@ -581628,7 +581303,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-node.c linux-linaro-st + */ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-private.c linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-private.c --- linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-private.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-private.c 2014-05-15 20:34:24.450204395 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-private.c 2014-05-16 15:28:46.441517461 +0200 @@ -0,0 +1,331 @@ +/* + * "$Id: mxml-private.c 422 2010-11-07 22:55:11Z mike $" @@ -581963,7 +581638,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-private.c linux-linaro + */ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-private.h linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-private.h --- linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-private.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-private.h 2014-05-15 20:34:24.450204395 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-private.h 2014-05-16 15:28:46.441517461 +0200 @@ -0,0 +1,50 @@ +/* + * "$Id: mxml-private.h 408 2010-09-19 05:26:46Z mike $" @@ -582017,7 +581692,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-private.h linux-linaro + */ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-search.c linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-search.c --- linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-search.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-search.c 2014-05-15 20:34:24.450204395 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-search.c 2014-05-16 15:28:46.441517461 +0200 @@ -0,0 +1,287 @@ +/* + * "$Id: mxml-search.c 427 2011-01-03 02:03:29Z mike $" @@ -582308,7 +581983,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-search.c linux-linaro- + */ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-set.c linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-set.c --- linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-set.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-set.c 2014-05-15 20:34:24.450204395 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-set.c 2014-05-16 15:28:46.441517461 +0200 @@ -0,0 +1,349 @@ +/* + * "$Id: mxml-set.c 441 2011-12-09 23:49:00Z mike $" @@ -582661,7 +582336,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-set.c linux-linaro-sta + */ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-string.c linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-string.c --- linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-string.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-string.c 2014-05-15 20:34:24.450204395 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml-string.c 2014-05-16 15:28:46.441517461 +0200 @@ -0,0 +1,476 @@ +/* + * "$Id: mxml-string.c 424 2010-12-25 16:21:50Z mike $" @@ -583141,7 +582816,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-string.c linux-linaro- + */ diff -Nur linux-3.10.30.orig/tools/gator/daemon/OlySocket.cpp linux-linaro-stable-mx6/tools/gator/daemon/OlySocket.cpp --- linux-3.10.30.orig/tools/gator/daemon/OlySocket.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/OlySocket.cpp 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/OlySocket.cpp 2014-05-16 15:28:46.429517398 +0200 @@ -0,0 +1,268 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -583413,7 +583088,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/OlySocket.cpp linux-linaro-stabl +} diff -Nur linux-3.10.30.orig/tools/gator/daemon/OlySocket.h linux-linaro-stable-mx6/tools/gator/daemon/OlySocket.h --- linux-3.10.30.orig/tools/gator/daemon/OlySocket.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/OlySocket.h 2014-05-15 20:34:24.394203992 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/OlySocket.h 2014-05-16 15:28:46.429517398 +0200 @@ -0,0 +1,36 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -583453,7 +583128,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/OlySocket.h linux-linaro-stable- +#endif //__OLY_SOCKET_H__ diff -Nur linux-3.10.30.orig/tools/gator/daemon/OlyUtility.cpp linux-linaro-stable-mx6/tools/gator/daemon/OlyUtility.cpp --- linux-3.10.30.orig/tools/gator/daemon/OlyUtility.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/OlyUtility.cpp 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/OlyUtility.cpp 2014-05-16 15:28:46.429517398 +0200 @@ -0,0 +1,227 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -583684,7 +583359,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/OlyUtility.cpp linux-linaro-stab +} diff -Nur linux-3.10.30.orig/tools/gator/daemon/OlyUtility.h linux-linaro-stable-mx6/tools/gator/daemon/OlyUtility.h --- linux-3.10.30.orig/tools/gator/daemon/OlyUtility.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/OlyUtility.h 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/OlyUtility.h 2014-05-16 15:28:46.429517398 +0200 @@ -0,0 +1,42 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -583730,7 +583405,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/OlyUtility.h linux-linaro-stable +#endif // OLY_UTILITY_H diff -Nur linux-3.10.30.orig/tools/gator/daemon/Sender.cpp linux-linaro-stable-mx6/tools/gator/daemon/Sender.cpp --- linux-3.10.30.orig/tools/gator/daemon/Sender.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/Sender.cpp 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/Sender.cpp 2014-05-16 15:28:46.429517398 +0200 @@ -0,0 +1,135 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -583869,7 +583544,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Sender.cpp linux-linaro-stable-m +} diff -Nur linux-3.10.30.orig/tools/gator/daemon/Sender.h linux-linaro-stable-mx6/tools/gator/daemon/Sender.h --- linux-3.10.30.orig/tools/gator/daemon/Sender.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/Sender.h 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/Sender.h 2014-05-16 15:28:46.429517398 +0200 @@ -0,0 +1,42 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -583915,7 +583590,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Sender.h linux-linaro-stable-mx6 +#endif //__SENDER_H__ diff -Nur linux-3.10.30.orig/tools/gator/daemon/SessionData.cpp linux-linaro-stable-mx6/tools/gator/daemon/SessionData.cpp --- linux-3.10.30.orig/tools/gator/daemon/SessionData.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/SessionData.cpp 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/SessionData.cpp 2014-05-16 15:28:46.429517398 +0200 @@ -0,0 +1,150 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -584069,7 +583744,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/SessionData.cpp linux-linaro-sta +} diff -Nur linux-3.10.30.orig/tools/gator/daemon/SessionData.h linux-linaro-stable-mx6/tools/gator/daemon/SessionData.h --- linux-3.10.30.orig/tools/gator/daemon/SessionData.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/SessionData.h 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/SessionData.h 2014-05-16 15:28:46.429517398 +0200 @@ -0,0 +1,75 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -584148,7 +583823,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/SessionData.h linux-linaro-stabl +#endif // SESSION_DATA_H diff -Nur linux-3.10.30.orig/tools/gator/daemon/SessionXML.cpp linux-linaro-stable-mx6/tools/gator/daemon/SessionXML.cpp --- linux-3.10.30.orig/tools/gator/daemon/SessionXML.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/SessionXML.cpp 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/SessionXML.cpp 2014-05-16 15:28:46.429517398 +0200 @@ -0,0 +1,109 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -584261,7 +583936,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/SessionXML.cpp linux-linaro-stab +} diff -Nur linux-3.10.30.orig/tools/gator/daemon/SessionXML.h linux-linaro-stable-mx6/tools/gator/daemon/SessionXML.h --- linux-3.10.30.orig/tools/gator/daemon/SessionXML.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/SessionXML.h 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/SessionXML.h 2014-05-16 15:28:46.429517398 +0200 @@ -0,0 +1,42 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -584307,7 +583982,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/SessionXML.h linux-linaro-stable +#endif // SESSION_XML_H diff -Nur linux-3.10.30.orig/tools/gator/daemon/StreamlineSetup.cpp linux-linaro-stable-mx6/tools/gator/daemon/StreamlineSetup.cpp --- linux-3.10.30.orig/tools/gator/daemon/StreamlineSetup.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/StreamlineSetup.cpp 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/StreamlineSetup.cpp 2014-05-16 15:28:46.429517398 +0200 @@ -0,0 +1,272 @@ +/** + * Copyright (C) ARM Limited 2011-2013. All rights reserved. @@ -584583,7 +584258,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/StreamlineSetup.cpp linux-linaro +} diff -Nur linux-3.10.30.orig/tools/gator/daemon/StreamlineSetup.h linux-linaro-stable-mx6/tools/gator/daemon/StreamlineSetup.h --- linux-3.10.30.orig/tools/gator/daemon/StreamlineSetup.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/gator/daemon/StreamlineSetup.h 2014-05-15 20:34:24.398204021 +0200 ++++ linux-linaro-stable-mx6/tools/gator/daemon/StreamlineSetup.h 2014-05-16 15:28:46.429517398 +0200 @@ -0,0 +1,47 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -584634,7 +584309,7 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/StreamlineSetup.h linux-linaro-s +#endif //__STREAMLINE_SETUP_H__ diff -Nur linux-3.10.30.orig/tools/lib/lk/Makefile linux-linaro-stable-mx6/tools/lib/lk/Makefile --- linux-3.10.30.orig/tools/lib/lk/Makefile 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/tools/lib/lk/Makefile 2014-05-15 20:34:24.454204424 +0200 ++++ linux-linaro-stable-mx6/tools/lib/lk/Makefile 2014-05-16 15:28:46.445517482 +0200 @@ -1,5 +1,8 @@ include ../../scripts/Makefile.include diff --git a/target/arm/cubox-i/patches/3.10.30/snd-soc.patch b/target/arm/cubox-i/patches/3.10.30/snd-soc.patch new file mode 100644 index 000000000..58dfef8dd --- /dev/null +++ b/target/arm/cubox-i/patches/3.10.30/snd-soc.patch @@ -0,0 +1,43 @@ +diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-pcm.h linux-3.10.30/sound/soc/fsl/imx-pcm.h +--- linux-3.10.30.orig/sound/soc/fsl/imx-pcm.h 2014-05-16 15:37:16.208483825 +0200 ++++ linux-3.10.30/sound/soc/fsl/imx-pcm.h 2014-05-16 15:39:24.369237997 +0200 +@@ -36,7 +36,7 @@ + dma_data->peripheral_type = IMX_DMATYPE_SSI; + } + +-#ifdef CONFIG_SND_SOC_IMX_PCM_DMA ++#if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_DMA) + int imx_pcm_dma_init(struct platform_device *pdev, unsigned int flags, size_t size); + void imx_pcm_dma_exit(struct platform_device *pdev); + #else +@@ -51,7 +51,7 @@ + } + #endif + +-#ifdef CONFIG_SND_SOC_IMX_PCM_FIQ ++#if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_FIQ) + int imx_pcm_fiq_init(struct platform_device *pdev); + void imx_pcm_fiq_exit(struct platform_device *pdev); + #else +diff -Nur linux-3.10.30.orig/sound/soc/fsl/Kconfig linux-3.10.30/sound/soc/fsl/Kconfig +--- linux-3.10.30.orig/sound/soc/fsl/Kconfig 2014-05-16 15:37:16.208483825 +0200 ++++ linux-3.10.30/sound/soc/fsl/Kconfig 2014-05-16 15:37:59.632739735 +0200 +@@ -121,15 +121,15 @@ + tristate + + config SND_SOC_IMX_PCM_FIQ +- bool ++ tristate + select FIQ + + config SND_SOC_IMX_PCM_DMA +- bool ++ tristate + select SND_SOC_GENERIC_DMAENGINE_PCM + + config SND_SOC_IMX_HDMI_DMA +- bool ++ tristate + select SND_SOC_GENERIC_DMAENGINE_PCM + select SND_SOC_IMX_PCM_DMA + |