diff options
| -rw-r--r-- | mk/modules.mk | 44 | ||||
| -rw-r--r-- | target/arm/cubox-i/patches/3.10.30/exportfs-boolean.patch | 12 | ||||
| -rw-r--r-- | target/arm/cubox-i/patches/3.10.30/linux4kix.patch | 5378 | ||||
| -rw-r--r-- | target/arm/cubox-i/patches/3.10.30/regmap-boolean.patch | 20 | ||||
| -rw-r--r-- | target/linux/config/Config.in.audio | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.usb | 12 |
6 files changed, 2922 insertions, 2546 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index 1a5ddf33a..db3875427 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -506,17 +506,6 @@ $(eval $(call KMOD_template,NF_CONNTRACK_TFTP,nf-conntrack-tftp,\ $(MODULES_DIR)/kernel/net/netfilter/nf_nat_tftp \ ,55)) -#$(eval $(call KMOD_template,NF_CONNTRACK_RTSP,nf-conntrack-rtsp,\ -# $(MODULES_DIR)/kernel/net/netfilter/nf_conntrack_rtsp \ -# $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat_rtsp \ -#,55)) - -# broken -#$(eval $(call KMOD_template,NF_CONNTRACK_AMANDA,nf-conntrack-amanda,\ -# $(MODULES_DIR)/kernel/net/netfilter/nf_conntrack_amanda \ -# $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat_amanda \ -#,55)) - $(eval $(call KMOD_template,NF_CONNTRACK_PPTP,nf-conntrack-pptp,\ $(MODULES_DIR)/kernel/net/netfilter/nf_conntrack_proto_gre \ $(MODULES_DIR)/kernel/net/netfilter/nf_conntrack_pptp \ @@ -1133,10 +1122,6 @@ $(eval $(call KMOD_template,NFS_FS,nfs-fs,\ ,30, kmod-sunrpc)) endif -#$(eval $(call KMOD_template,EXPORTFS,exportfs,\ -# $(MODULES_DIR)/kernel/fs/exportfs/exportfs \ -#,20)) - $(eval $(call KMOD_template,NFSD,nfsd,\ $(MODULES_DIR)/kernel/fs/nfsd/nfsd \ ,30, kmod-sunrpc kmod-lockd)) @@ -1193,16 +1178,29 @@ $(eval $(call KMOD_template,SOUND,sound,\ $(eval $(call KMOD_template,SND,snd,\ $(MODULES_DIR)/kernel/sound/core/snd \ $(MODULES_DIR)/kernel/sound/core/snd-timer \ - $(MODULES_DIR)/kernel/sound/core/snd-pcm \ ,40)) + +ifeq ($(KERNEL_BASE),3) +ifeq ($(KERNEL_MAJ),10) +$(eval $(call KMOD_template,SND_PCM,snd-pcm,\ + $(MODULES_DIR)/kernel/sound/core/snd-page-alloc \ + $(MODULES_DIR)/kernel/sound/core/snd-pcm \ +,41)) +else +$(eval $(call KMOD_template,SND_PCM,snd-pcm,\ + $(MODULES_DIR)/kernel/sound/core/snd-pcm \ +,41)) +endif +endif + $(eval $(call KMOD_template,SND_PCM_DMAENGINE,snd-pcm-dmaengine,\ $(MODULES_DIR)/kernel/sound/core/snd-pcm-dmaengine \ -,41)) +,42)) $(eval $(call KMOD_template,SND_COMPRESS,snd-compress,\ $(MODULES_DIR)/kernel/sound/core/snd-compress \ -,41)) +,42)) $(eval $(call KMOD_template,SND_RAWMIDI,snd-rawmidi,\ $(MODULES_DIR)/kernel/sound/core/snd-hwdep \ @@ -1354,11 +1352,19 @@ $(eval $(call KMOD_template,USB_EHCI_HCD,usb-ehci-hcd,\ $(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd \ ,55)) +$(eval $(call KMOD_template,USB_MXS_PHY,usb-mxs-phy,\ + $(MODULES_DIR)/kernel/drivers/usb/phy/phy-mxs-usb \ +,56)) + +$(eval $(call KMOD_template,USB_GADGET,usb-gadget,\ + $(MODULES_DIR)/kernel/drivers/usb/gadget/udc-core \ +,57)) + $(eval $(call KMOD_template,USB_CHIPIDEA,ci-hdrc,\ $(MODULES_DIR)/kernel/drivers/usb/chipidea/ci_hdrc \ $(MODULES_DIR)/kernel/drivers/usb/chipidea/usbmisc_imx \ $(MODULES_DIR)/kernel/drivers/usb/chipidea/ci_hdrc_imx \ -,56)) +,58, kmod-usb-gadget kmod-usb-mxs-phy)) $(eval $(call KMOD_template,USB_OHCI_HCD,usb-ohci-hcd,\ $(MODULES_DIR)/kernel/drivers/usb/host/ohci-hcd \ diff --git a/target/arm/cubox-i/patches/3.10.30/exportfs-boolean.patch b/target/arm/cubox-i/patches/3.10.30/exportfs-boolean.patch new file mode 100644 index 000000000..39b5e1adc --- /dev/null +++ b/target/arm/cubox-i/patches/3.10.30/exportfs-boolean.patch @@ -0,0 +1,12 @@ +diff -Nur linux-3.10.30.orig/fs/Kconfig linux-3.10.30/fs/Kconfig +--- linux-3.10.30.orig/fs/Kconfig 2014-02-13 22:48:15.000000000 +0100 ++++ linux-3.10.30/fs/Kconfig 2014-05-19 20:41:23.637038598 +0200 +@@ -51,7 +51,7 @@ + def_bool n + + config EXPORTFS +- tristate ++ def_bool y + + config FILE_LOCKING + bool "Enable POSIX file locking API" if EXPERT 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 bf1fe6eaa..0ad6e75f6 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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/clcd-panels.dtsi linux-3.10.30/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-16 15:28:19.605375946 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/clcd-panels.dtsi 2014-05-19 19:07:23.425304296 +0200 @@ -0,0 +1,52 @@ +/* + * ARM Ltd. Versatile Express @@ -54,9 +54,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/exynos5440.dtsi linux-3.10.30/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-16 15:28:19.609375967 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/exynos5440.dtsi 2014-05-19 19:07:23.429304311 +0200 @@ -113,7 +113,7 @@ clock-names = "spi", "spi_busclk0"; }; @@ -111,9 +111,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/exynos5440.dtsi linux-linaro-stab + num-lanes = <4>; + }; }; -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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/exynos5440-ssdk5440.dts linux-3.10.30/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-16 15:28:19.609375967 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/exynos5440-ssdk5440.dts 2014-05-19 19:07:23.429304311 +0200 @@ -30,4 +30,12 @@ clock-frequency = <50000000>; }; @@ -127,9 +127,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/exynos5440-ssdk5440.dts linux-lin + reset-gpio = <&pin_ctrl 22 0>; + }; }; -diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx23.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx23.dtsi +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx23.dtsi linux-3.10.30/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-16 15:28:19.609375967 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx23.dtsi 2014-05-19 19:07:23.429304311 +0200 @@ -20,6 +20,7 @@ gpio2 = &gpio2; serial0 = &auart0; @@ -148,9 +148,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx23.dtsi linux-linaro-stable-mx status = "disabled"; }; -diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx28.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx28.dtsi +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx28.dtsi linux-3.10.30/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-16 15:28:19.609375967 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx28.dtsi 2014-05-19 19:07:23.429304311 +0200 @@ -29,6 +29,8 @@ serial4 = &auart4; ethernet0 = &mac0; @@ -170,9 +170,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx28.dtsi linux-linaro-stable-mx dmas = <&dma_apbh 13>; dma-names = "rx"; 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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx53.dtsi linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx53.dtsi 2014-05-19 19:07:23.429304311 +0200 @@ -782,5 +782,10 @@ status = "disabled"; }; @@ -184,9 +184,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-cubox-i.dts linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6dl-cubox-i.dts 2014-05-19 19:07:23.429304311 +0200 @@ -0,0 +1,12 @@ +/* + * Copyright (C) 2014 Russell King @@ -200,9 +200,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-cubox-i.dts linux-linaro-s + model = "SolidRun Cubox-i Solo/DualLite"; + compatible = "solidrun,cubox-i/dl", "fsl,imx6dl"; +}; -diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6dl.dtsi +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl.dtsi linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6dl.dtsi 2014-05-19 19:07:23.429304311 +0200 @@ -8,19 +8,39 @@ * */ @@ -560,9 +560,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl.dtsi linux-linaro-stable-m + compatible = "fsl,imx6dl-hdmi"; + crtcs = <&ipu1 0>, <&ipu1 1>; +}; -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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-hummingboard.dts linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6dl-hummingboard.dts 2014-05-19 19:07:23.429304311 +0200 @@ -0,0 +1,258 @@ +/* + * Copyright (C) 2013 Russell King @@ -822,9 +822,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-hummingboard.dts linux-lin + cd-gpios = <&gpio1 4 0>; + status = "okay"; +}; -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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-pinfunc.h linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6dl-pinfunc.h 2014-05-19 19:07:23.433304326 +0200 @@ -14,1072 +14,1076 @@ * The pin function ID is a tuple of * <mux_reg conf_reg input_reg mux_mode input_val> @@ -2969,9 +2969,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-pinfunc.h linux-linaro-sta +#define MX6QDL_PAD_SD4_DAT7__GPIO2_IO15 0x35c 0x744 0x000 0x5 0x0 #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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabreauto.dts linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6dl-sabreauto.dts 2014-05-19 19:07:23.433304326 +0200 @@ -16,16 +16,15 @@ compatible = "fsl,imx6dl-sabreauto", "fsl,imx6dl"; }; @@ -2999,9 +2999,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabreauto.dts linux-linaro +&mxcfb2 { + status = "okay"; }; -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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabreauto-ecspi.dts linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6dl-sabreauto-ecspi.dts 2014-05-19 19:07:23.433304326 +0200 @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -3041,9 +3041,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabreauto-ecspi.dts linux- + dr_mode = "peripheral"; + status = "okay"; +}; -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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts 2014-05-19 19:07:23.433304326 +0200 @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -3063,9 +3063,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts lin + /* pin conflict with flexcan1 */ + status = "disabled"; +}; -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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabreauto-gpmi-weim.dts linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6dl-sabreauto-gpmi-weim.dts 2014-05-19 19:07:23.433304326 +0200 @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -3114,9 +3114,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabreauto-gpmi-weim.dts li +&weim { + status = "okay"; +}; -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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabresd.dts linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6dl-sabresd.dts 2014-05-19 19:07:23.433304326 +0200 @@ -16,20 +16,126 @@ compatible = "fsl,imx6dl-sabresd", "fsl,imx6dl"; }; @@ -3252,9 +3252,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabresd.dts linux-linaro-s + offset-usb-charger = <1285>; +}; + -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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts 2014-05-19 19:07:23.433304326 +0200 @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -3275,9 +3275,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts linux-lin +&i2c2 { + status = "disable"; +}; -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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabresd-ldo.dts linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6dl-sabresd-ldo.dts 2014-05-19 19:07:23.437304341 +0200 @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -3308,9 +3308,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-sabresd-ldo.dts linux-lina +&vpu { + pu-supply = <®_pu>; /* ldo-bypass:use pu_dummy if VDDSOC share with VDDPU */ +}; -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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-wandboard.dts linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6dl-wandboard.dts 2014-05-19 19:07:23.437304341 +0200 @@ -10,6 +10,7 @@ */ /dts-v1/; @@ -3346,9 +3346,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6dl-wandboard.dts linux-linaro - pinctrl-0 = <&pinctrl_usdhc3_2>; - status = "okay"; -}; -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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-arm2.dts linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6q-arm2.dts 2014-05-19 19:07:23.437304341 +0200 @@ -31,6 +31,15 @@ regulator-max-microvolt = <3300000>; regulator-always-on; @@ -3447,9 +3447,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-arm2.dts linux-linaro-stabl &uart4 { pinctrl-names = "default"; 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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-cubox-i.dts linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6q-cubox-i.dts 2014-05-19 19:07:23.437304341 +0200 @@ -0,0 +1,16 @@ +/* + * Copyright (C) 2014 Russell King @@ -3467,9 +3467,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-cubox-i.dts linux-linaro-st +&sata { + status = "okay"; +}; -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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2014-05-19 19:07:23.437304341 +0200 @@ -0,0 +1,289 @@ +/* + * Copyright (C) 2014 Russell King @@ -3760,9 +3760,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-linaro + no-1-8-v; + status = "okay"; +}; -diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6qdl.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6qdl.dtsi +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6qdl.dtsi linux-3.10.30/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-16 15:28:19.617376010 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6qdl.dtsi 2014-05-19 19:07:23.437304341 +0200 @@ -11,14 +11,12 @@ */ @@ -5100,9 +5100,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi 2014-05-19 19:07:23.437304341 +0200 @@ -0,0 +1,58 @@ +/* + * Copyright 2013 Russell King @@ -5162,9 +5162,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6qdl-microsom.dtsi linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2014-05-19 19:07:23.441304355 +0200 @@ -0,0 +1,120 @@ +/* + * Copyright (C) 2013,2014 Russell King @@ -5286,9 +5286,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6qdl-microsom.dtsi linux-linar + pinctrl-0 = <&pinctrl_microsom_brcm_wifi &pinctrl_usdhc1_2>; + vmmc-supply = <®_brcm>; +}; -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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi 2014-05-19 19:07:23.441304355 +0200 @@ -11,9 +11,282 @@ */ @@ -5983,9 +5983,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi linux-lina + fsl,cpu_pdnscr_iso2sw = <0x1>; + fsl,cpu_pdnscr_iso = <0x1>; +}; -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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2014-05-19 19:07:23.441304355 +0200 @@ -11,10 +11,30 @@ */ @@ -6718,9 +6718,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-linaro +&gpu { + pu-supply = <&pu_dummy>; /* ldo-bypass:use pu_dummy if VDDSOC share with VDDPU */ +}; -diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6q.dtsi +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q.dtsi linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6q.dtsi 2014-05-19 19:07:23.441304355 +0200 @@ -8,15 +8,19 @@ * */ @@ -7199,9 +7199,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q.dtsi linux-linaro-stable-mx + compatible = "fsl,imx6q-hdmi"; + crtcs = <&ipu1 0>, <&ipu1 1>, <&ipu2 0>, <&ipu2 1>; }; -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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-pinfunc.h linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6q-pinfunc.h 2014-05-19 19:07:23.445304371 +0200 @@ -14,1028 +14,1032 @@ * The pin function ID is a tuple of * <mux_reg conf_reg input_reg mux_mode input_val> @@ -9258,9 +9258,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-pinfunc.h linux-linaro-stab +#define MX6QDL_PAD_SD2_DAT3__GPIO1_IO12 0x35c 0x744 0x000 0x5 0x0 #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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabreauto.dts linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6q-sabreauto.dts 2014-05-19 19:07:23.445304371 +0200 @@ -20,16 +20,22 @@ compatible = "fsl,imx6q-sabreauto", "fsl,imx6q"; }; @@ -9295,9 +9295,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabreauto.dts linux-linaro- +&sata { + status = "okay"; }; -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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabreauto-ecspi.dts linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6q-sabreauto-ecspi.dts 2014-05-19 19:07:23.445304371 +0200 @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -9338,9 +9338,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabreauto-ecspi.dts linux-l + status = "okay"; + dr_mode = "peripheral"; +}; -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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts 2014-05-19 19:07:23.445304371 +0200 @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -9360,9 +9360,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts linu + /* pin conflict with flexcan1 */ + status = "disabled"; +}; -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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts 2014-05-19 19:07:23.445304371 +0200 @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -9412,9 +9412,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts lin +&weim { + status = "okay"; +}; -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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabrelite.dts linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6q-sabrelite.dts 2014-05-19 19:07:23.445304371 +0200 @@ -65,6 +65,12 @@ }; }; @@ -9576,9 +9576,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabrelite.dts linux-linaro- - VDDIO-supply = <®_3p3v>; - }; -}; -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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabresd.dts linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6q-sabresd.dts 2014-05-19 19:07:23.445304371 +0200 @@ -20,20 +20,32 @@ compatible = "fsl,imx6q-sabresd", "fsl,imx6q"; }; @@ -9628,9 +9628,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabresd.dts linux-linaro-st + offset-discharger = <1694>; + offset-usb-charger = <1685>; }; -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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts 2014-05-19 19:07:23.445304371 +0200 @@ -0,0 +1,23 @@ +/* + * Copyright 2012-2013 Freescale Semiconductor, Inc. @@ -9655,9 +9655,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts linux-lina +&i2c2 { + status = "disable"; +}; -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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabresd-ldo.dts linux-3.10.30/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-16 15:28:19.613375988 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6q-sabresd-ldo.dts 2014-05-19 19:07:23.445304371 +0200 @@ -0,0 +1,34 @@ +/* + * Copyright 2012 Freescale Semiconductor, Inc. @@ -9693,9 +9693,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6q-sabresd-ldo.dts linux-linar +&vpu { + pu-supply = <®_pu>; /* ldo-bypass:use pu_dummy if VDDSOC share with VDDPU */ +}; -diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6sl.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx6sl.dtsi +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6sl.dtsi linux-3.10.30/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-16 15:28:19.617376010 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6sl.dtsi 2014-05-19 19:07:23.445304371 +0200 @@ -0,0 +1,1255 @@ +/* + * Copyright 2013 Freescale Semiconductor, Inc. @@ -10952,9 +10952,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6sl-evk-csi.dts linux-3.10.30/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-16 15:28:19.617376010 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6sl-evk-csi.dts 2014-05-19 19:07:23.449304385 +0200 @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -10983,9 +10983,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6sl-evk-csi.dts linux-linaro-s +&epdc { + status = "disabled"; +}; -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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6sl-evk.dts linux-3.10.30/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-16 15:28:19.617376010 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6sl-evk.dts 2014-05-19 19:07:23.449304385 +0200 @@ -0,0 +1,604 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -11591,9 +11591,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6sl-evk.dts linux-linaro-stabl +&gpu { + pu-supply = <&pu_dummy>; /* ldo-bypass:use pu_dummy if VDDSOC share with VDDPU */ +}; -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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/imx6sl-evk-ldo.dts linux-3.10.30/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-16 15:28:19.617376010 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/imx6sl-evk-ldo.dts 2014-05-19 19:07:23.449304385 +0200 @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -11620,9 +11620,334 @@ 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/Makefile linux-linaro-stable-mx6/arch/arm/boot/dts/Makefile +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/include/dt-bindings/clock/imx6sl-clock.h linux-3.10.30/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-3.10.30/arch/arm/boot/dts/include/dt-bindings/clock/imx6sl-clock.h 2014-05-19 19:07:24.277307446 +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-3.10.30/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-3.10.30/arch/arm/boot/dts/include/dt-bindings/clock/vf610-clock.h 2014-05-19 19:07:24.277307446 +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-3.10.30/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-16 15:28:19.601375925 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/Makefile 2014-05-19 19:07:23.449304385 +0200 @@ -113,14 +113,31 @@ imx53-mba53.dtb \ imx53-qsb.dtb \ @@ -11672,9 +11997,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/Makefile linux-linaro-stable-mx6/ dtb-$(CONFIG_ARCH_VIRT) += xenvm-4.2.dtb dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \ 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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts linux-3.10.30/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-16 15:28:19.621376031 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/rtsm_ve-cortex_a15x1.dts 2014-05-19 19:07:23.449304385 +0200 @@ -0,0 +1,159 @@ +/* + * ARM Ltd. Fast Models @@ -11835,9 +12160,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts linux-3.10.30/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-16 15:28:19.621376031 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/rtsm_ve-cortex_a15x2.dts 2014-05-19 19:07:23.449304385 +0200 @@ -0,0 +1,165 @@ +/* + * ARM Ltd. Fast Models @@ -12004,9 +12329,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts linux-3.10.30/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-16 15:28:19.621376031 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/rtsm_ve-cortex_a15x4.dts 2014-05-19 19:07:23.449304385 +0200 @@ -0,0 +1,177 @@ +/* + * ARM Ltd. Fast Models @@ -12185,9 +12510,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts linux-3.10.30/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-16 15:28:19.621376031 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/rtsm_ve-cortex_a9x2.dts 2014-05-19 19:07:23.449304385 +0200 @@ -0,0 +1,171 @@ +/* + * ARM Ltd. Fast Models @@ -12360,9 +12685,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts linux-3.10.30/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-16 15:28:19.621376031 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/rtsm_ve-cortex_a9x4.dts 2014-05-19 19:07:23.449304385 +0200 @@ -0,0 +1,183 @@ +/* + * ARM Ltd. Fast Models @@ -12547,9 +12872,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi linux-3.10.30/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-16 15:28:19.621376031 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/rtsm_ve-motherboard.dtsi 2014-05-19 19:07:23.449304385 +0200 @@ -0,0 +1,231 @@ +/* + * ARM Ltd. Fast Models @@ -12782,9 +13107,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts linux-3.10.30/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-16 15:28:19.621376031 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts 2014-05-19 19:07:23.453304400 +0200 @@ -0,0 +1,244 @@ +/* + * ARM Ltd. Fast Models @@ -13030,9 +13355,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts linux-3.10.30/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-16 15:28:19.621376031 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/rtsm_ve-v2p-ca15x4-ca7x4.dts 2014-05-19 19:07:23.453304400 +0200 @@ -0,0 +1,358 @@ +/* + * ARM Ltd. Fast Models @@ -13392,9 +13717,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vexpress-v2m.dtsi linux-3.10.30/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-16 15:28:19.629376073 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/vexpress-v2m.dtsi 2014-05-19 19:07:23.453304400 +0200 @@ -227,6 +227,7 @@ }; @@ -13403,9 +13728,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vexpress-v2m.dtsi linux-linaro-st compatible = "arm,pl111", "arm,primecell"; reg = <0x1f000 0x1000>; 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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi linux-3.10.30/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-16 15:28:19.629376073 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi 2014-05-19 19:07:23.453304400 +0200 @@ -228,6 +228,7 @@ }; @@ -13414,9 +13739,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi linux-linar compatible = "arm,pl111", "arm,primecell"; reg = <0x1f0000 0x1000>; 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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts linux-3.10.30/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-16 15:28:19.629376073 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts 2014-05-19 19:07:23.453304400 +0200 @@ -9,11 +9,13 @@ /dts-v1/; @@ -13673,9 +13998,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts linux-li dcc { compatible = "arm,vexpress,config-bus"; 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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts linux-3.10.30/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-16 15:28:19.629376073 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts 2014-05-19 19:07:23.453304400 +0200 @@ -9,6 +9,8 @@ /dts-v1/; @@ -13694,9 +14019,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vexpress-v2p-ca5s.dts linux-3.10.30/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-16 15:28:19.629376073 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/vexpress-v2p-ca5s.dts 2014-05-19 19:07:23.453304400 +0200 @@ -9,6 +9,8 @@ /dts-v1/; @@ -13715,9 +14040,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vexpress-v2p-ca9.dts linux-3.10.30/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-16 15:28:19.629376073 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/vexpress-v2p-ca9.dts 2014-05-19 19:07:23.453304400 +0200 @@ -9,6 +9,8 @@ /dts-v1/; @@ -13736,9 +14061,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vf610.dtsi linux-3.10.30/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-16 15:28:19.629376073 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/vf610.dtsi 2014-05-19 19:07:23.453304400 +0200 @@ -0,0 +1,464 @@ +/* + * Copyright 2013 Freescale Semiconductor, Inc. @@ -14204,9 +14529,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vf610-pinfunc.h linux-3.10.30/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-16 15:28:19.629376073 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/vf610-pinfunc.h 2014-05-19 19:07:23.453304400 +0200 @@ -0,0 +1,810 @@ +/* + * Copyright 2013 Freescale Semiconductor, Inc. @@ -15018,9 +15343,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vf610-pinfunc.h linux-linaro-stab +#define VF610_PAD_PTA7__VIU_PIX_CLK 0x218 0x3AC ALT1 0x1 + +#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 +diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vf610-twr.dts linux-3.10.30/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-16 15:28:19.629376073 +0200 ++++ linux-3.10.30/arch/arm/boot/dts/vf610-twr.dts 2014-05-19 19:07:23.453304400 +0200 @@ -0,0 +1,57 @@ +/* + * Copyright 2013 Freescale Semiconductor, Inc. @@ -15079,9 +15404,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/boot/dts/vf610-twr.dts linux-linaro-stable + pinctrl-0 = <&pinctrl_uart1_1>; + status = "okay"; +}; -diff -Nur linux-3.10.30.orig/arch/arm/common/bL_switcher.c linux-linaro-stable-mx6/arch/arm/common/bL_switcher.c +diff -Nur linux-3.10.30.orig/arch/arm/common/bL_switcher.c linux-3.10.30/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-16 15:28:19.629376073 +0200 ++++ linux-3.10.30/arch/arm/common/bL_switcher.c 2014-05-19 19:07:23.457304414 +0200 @@ -0,0 +1,864 @@ +/* + * arch/arm/common/bL_switcher.c -- big.LITTLE cluster switcher core driver @@ -15947,9 +16272,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm/common/bL_switcher_dummy_if.c linux-3.10.30/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-16 15:28:19.629376073 +0200 ++++ linux-3.10.30/arch/arm/common/bL_switcher_dummy_if.c 2014-05-19 19:07:23.457304414 +0200 @@ -0,0 +1,71 @@ +/* + * arch/arm/common/bL_switcher_dummy_if.c -- b.L switcher dummy interface @@ -16022,9 +16347,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/common/bL_switcher_dummy_if.c linux-linaro + +module_init(bL_switcher_dummy_if_init); +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 +diff -Nur linux-3.10.30.orig/arch/arm/common/Makefile linux-3.10.30/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-16 15:28:19.629376073 +0200 ++++ linux-3.10.30/arch/arm/common/Makefile 2014-05-19 19:07:23.457304414 +0200 @@ -14,5 +14,9 @@ obj-$(CONFIG_PCI_HOST_ITE8152) += it8152.o obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp.o @@ -16035,9 +16360,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/common/Makefile linux-linaro-stable-mx6/ar AFLAGS_mcpm_head.o := -march=armv7-a AFLAGS_vlock.o := -march=armv7-a +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 +diff -Nur linux-3.10.30.orig/arch/arm/common/mcpm_entry.c linux-3.10.30/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-16 15:28:19.633376095 +0200 ++++ linux-3.10.30/arch/arm/common/mcpm_entry.c 2014-05-19 19:07:23.457304414 +0200 @@ -27,6 +27,18 @@ sync_cache_w(&mcpm_entry_vectors[cluster][cpu]); } @@ -16057,9 +16382,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/common/mcpm_entry.c linux-linaro-stable-mx static const struct mcpm_platform_ops *platform_ops; 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 +diff -Nur linux-3.10.30.orig/arch/arm/common/mcpm_head.S linux-3.10.30/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-16 15:28:19.633376095 +0200 ++++ linux-3.10.30/arch/arm/common/mcpm_head.S 2014-05-19 19:07:23.457304414 +0200 @@ -71,12 +71,19 @@ * position independent way. */ @@ -16102,9 +16427,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/common/mcpm_head.S linux-linaro-stable-mx6 .type mcpm_power_up_setup_phys, #object ENTRY(mcpm_power_up_setup_phys) .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 +diff -Nur linux-3.10.30.orig/arch/arm/configs/imx_v6_v7_defconfig linux-3.10.30/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-16 15:28:19.641376136 +0200 ++++ linux-3.10.30/arch/arm/configs/imx_v6_v7_defconfig 2014-05-19 19:07:23.457304414 +0200 @@ -1,4 +1,3 @@ -CONFIG_EXPERIMENTAL=y # CONFIG_LOCALVERSION_AUTO is not set @@ -16350,9 +16675,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/configs/imx_v6_v7_defconfig linux-linaro-s CONFIG_JFFS2_FS=y CONFIG_UBIFS_FS=y 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 +diff -Nur linux-3.10.30.orig/arch/arm/configs/imx_v7_cubox-i_hummingboard_defconfig linux-3.10.30/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-16 15:28:19.641376136 +0200 ++++ linux-3.10.30/arch/arm/configs/imx_v7_cubox-i_hummingboard_defconfig 2014-05-19 19:07:23.457304414 +0200 @@ -0,0 +1,384 @@ +CONFIG_KERNEL_LZO=y +CONFIG_SYSVIPC=y @@ -16738,9 +17063,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/configs/imx_v7_cubox-i_hummingboard_defcon +CONFIG_CRC_T10DIF=y +CONFIG_CRC7=m +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 +diff -Nur linux-3.10.30.orig/arch/arm/configs/imx_v7_defconfig linux-3.10.30/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-16 15:28:19.641376136 +0200 ++++ linux-3.10.30/arch/arm/configs/imx_v7_defconfig 2014-05-19 19:07:23.457304414 +0200 @@ -0,0 +1,332 @@ +CONFIG_KERNEL_LZO=y +CONFIG_SYSVIPC=y @@ -17074,9 +17399,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/configs/imx_v7_defconfig linux-linaro-stab +CONFIG_CRC_T10DIF=y +CONFIG_CRC7=m +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 +diff -Nur linux-3.10.30.orig/arch/arm/configs/imx_v7_mfg_defconfig linux-3.10.30/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-16 15:28:19.641376136 +0200 ++++ linux-3.10.30/arch/arm/configs/imx_v7_mfg_defconfig 2014-05-19 19:07:23.457304414 +0200 @@ -0,0 +1,341 @@ +CONFIG_KERNEL_LZO=y +CONFIG_SYSVIPC=y @@ -17419,9 +17744,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/configs/imx_v7_mfg_defconfig linux-linaro- +CONFIG_CRC_T10DIF=y +CONFIG_CRC7=m +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 +diff -Nur linux-3.10.30.orig/arch/arm/include/asm/arch_timer.h linux-3.10.30/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-16 15:28:19.653376199 +0200 ++++ linux-3.10.30/arch/arm/include/asm/arch_timer.h 2014-05-19 19:07:23.457304414 +0200 @@ -96,7 +96,7 @@ asm volatile("mrc p15, 0, %0, c14, c1, 0" : "=r" (cntkctl)); @@ -17431,9 +17756,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/asm/arch_timer.h linux-linaro-stab asm volatile("mcr p15, 0, %0, c14, c1, 0" : : "r" (cntkctl)); } -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 +diff -Nur linux-3.10.30.orig/arch/arm/include/asm/bL_switcher.h linux-3.10.30/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-16 15:28:19.653376199 +0200 ++++ linux-3.10.30/arch/arm/include/asm/bL_switcher.h 2014-05-19 19:07:23.457304414 +0200 @@ -0,0 +1,83 @@ +/* + * arch/arm/include/asm/bL_switcher.h @@ -17518,9 +17843,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/asm/bL_switcher.h linux-linaro-sta +#endif /* CONFIG_BL_SWITCHER */ + +#endif -diff -Nur linux-3.10.30.orig/arch/arm/include/asm/cacheflush.h linux-linaro-stable-mx6/arch/arm/include/asm/cacheflush.h +diff -Nur linux-3.10.30.orig/arch/arm/include/asm/cacheflush.h linux-3.10.30/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-16 15:28:19.653376199 +0200 ++++ linux-3.10.30/arch/arm/include/asm/cacheflush.h 2014-05-19 19:07:23.461304430 +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)) @@ -17572,9 +17897,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/asm/cacheflush.h linux-linaro-stab + "r9","r10","lr","memory" ) + #endif -diff -Nur linux-3.10.30.orig/arch/arm/include/asm/cp15.h linux-linaro-stable-mx6/arch/arm/include/asm/cp15.h +diff -Nur linux-3.10.30.orig/arch/arm/include/asm/cp15.h linux-3.10.30/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-16 15:28:19.653376199 +0200 ++++ linux-3.10.30/arch/arm/include/asm/cp15.h 2014-05-19 19:07:23.461304430 +0200 @@ -61,6 +61,20 @@ isb(); } @@ -17596,9 +17921,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/asm/cp15.h linux-linaro-stable-mx6 #ifndef CONFIG_SMP extern void adjust_cr(unsigned long mask, unsigned long set); #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 +diff -Nur linux-3.10.30.orig/arch/arm/include/asm/glue-cache.h linux-3.10.30/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-16 15:28:19.661376242 +0200 ++++ linux-3.10.30/arch/arm/include/asm/glue-cache.h 2014-05-19 19:07:23.461304430 +0200 @@ -102,19 +102,19 @@ #endif @@ -17627,9 +17952,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/asm/glue-cache.h linux-linaro-stab #endif #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 +diff -Nur linux-3.10.30.orig/arch/arm/include/asm/hardirq.h linux-3.10.30/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-16 15:28:19.665376263 +0200 ++++ linux-3.10.30/arch/arm/include/asm/hardirq.h 2014-05-19 19:07:23.461304430 +0200 @@ -5,7 +5,7 @@ #include <linux/threads.h> #include <asm/irq.h> @@ -17639,9 +17964,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/asm/hardirq.h linux-linaro-stable- typedef struct { 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 +diff -Nur linux-3.10.30.orig/arch/arm/include/asm/mach/arch.h linux-3.10.30/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-16 15:28:19.673376305 +0200 ++++ linux-3.10.30/arch/arm/include/asm/mach/arch.h 2014-05-19 19:07:23.461304430 +0200 @@ -8,6 +8,8 @@ * published by the Free Software Foundation. */ @@ -17670,9 +17995,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/asm/mach/arch.h linux-linaro-stabl void (*fixup)(struct tag *, char **, struct meminfo *); 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 +diff -Nur linux-3.10.30.orig/arch/arm/include/asm/mach/pci.h linux-3.10.30/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-16 15:28:19.673376305 +0200 ++++ linux-3.10.30/arch/arm/include/asm/mach/pci.h 2014-05-19 19:07:23.461304430 +0200 @@ -35,6 +35,8 @@ resource_size_t start, resource_size_t size, @@ -17701,9 +18026,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/asm/mach/pci.h linux-linaro-stable -extern void pci_v3_postinit(void); - #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 +diff -Nur linux-3.10.30.orig/arch/arm/include/asm/mcpm.h linux-3.10.30/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-16 15:28:19.673376305 +0200 ++++ linux-3.10.30/arch/arm/include/asm/mcpm.h 2014-05-19 19:07:23.461304430 +0200 @@ -42,6 +42,14 @@ void mcpm_set_entry_vector(unsigned cpu, unsigned cluster, void *ptr); @@ -17719,9 +18044,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/asm/mcpm.h linux-linaro-stable-mx6 * CPU/cluster power operations API for higher subsystems to use. */ -diff -Nur linux-3.10.30.orig/arch/arm/include/asm/pmu.h linux-linaro-stable-mx6/arch/arm/include/asm/pmu.h +diff -Nur linux-3.10.30.orig/arch/arm/include/asm/pmu.h linux-3.10.30/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-16 15:28:19.677376326 +0200 ++++ linux-3.10.30/arch/arm/include/asm/pmu.h 2014-05-19 19:07:23.461304430 +0200 @@ -62,9 +62,19 @@ raw_spinlock_t pmu_lock; }; @@ -17751,9 +18076,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/asm/pmu.h linux-linaro-stable-mx6/ int num_events; atomic_t active_events; 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 +diff -Nur linux-3.10.30.orig/arch/arm/include/asm/psci.h linux-3.10.30/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-16 15:28:19.677376326 +0200 ++++ linux-3.10.30/arch/arm/include/asm/psci.h 2014-05-19 19:07:23.461304430 +0200 @@ -16,6 +16,10 @@ #define PSCI_POWER_STATE_TYPE_STANDBY 0 @@ -17788,9 +18113,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/asm/psci.h linux-linaro-stable-mx6 +} +#endif #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 +diff -Nur linux-3.10.30.orig/arch/arm/include/asm/smp.h linux-3.10.30/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-16 15:28:19.677376326 +0200 ++++ linux-3.10.30/arch/arm/include/asm/smp.h 2014-05-19 19:07:23.461304430 +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); @@ -17800,9 +18125,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/asm/smp.h linux-linaro-stable-mx6/ struct smp_operations { #ifdef CONFIG_SMP /* -diff -Nur linux-3.10.30.orig/arch/arm/include/asm/topology.h linux-linaro-stable-mx6/arch/arm/include/asm/topology.h +diff -Nur linux-3.10.30.orig/arch/arm/include/asm/topology.h linux-3.10.30/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-16 15:28:19.677376326 +0200 ++++ linux-3.10.30/arch/arm/include/asm/topology.h 2014-05-19 19:07:23.461304430 +0200 @@ -26,11 +26,45 @@ void init_cpu_topology(void); void store_cpu_topology(unsigned int cpuid); @@ -17849,9 +18174,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/asm/topology.h linux-linaro-stable #endif -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 +diff -Nur linux-3.10.30.orig/arch/arm/include/debug/imx-uart.h linux-3.10.30/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-16 15:28:19.681376347 +0200 ++++ linux-3.10.30/arch/arm/include/debug/imx-uart.h 2014-05-19 19:07:23.461304430 +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) @@ -17876,9 +18201,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/debug/imx-uart.h linux-linaro-stab #endif #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 +diff -Nur linux-3.10.30.orig/arch/arm/include/debug/vf.S linux-3.10.30/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-16 15:28:19.681376347 +0200 ++++ linux-3.10.30/arch/arm/include/debug/vf.S 2014-05-19 19:07:23.461304430 +0200 @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -17906,9 +18231,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/include/debug/vf.S linux-linaro-stable-mx6 + + .macro waituart,rd,rx + .endm -diff -Nur linux-3.10.30.orig/arch/arm/Kconfig linux-linaro-stable-mx6/arch/arm/Kconfig +diff -Nur linux-3.10.30.orig/arch/arm/Kconfig linux-3.10.30/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-16 15:28:19.593375884 +0200 ++++ linux-3.10.30/arch/arm/Kconfig 2014-05-19 19:07:23.461304430 +0200 @@ -1494,6 +1494,109 @@ MultiThreading at a cost of slightly increased overhead in some places. If unsure say N here. @@ -18059,9 +18384,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/Kconfig linux-linaro-stable-mx6/arch/arm/K default "11" help 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 +diff -Nur linux-3.10.30.orig/arch/arm/Kconfig.debug linux-3.10.30/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-16 15:28:19.597375904 +0200 ++++ linux-3.10.30/arch/arm/Kconfig.debug 2014-05-19 19:07:23.461304430 +0200 @@ -251,6 +251,13 @@ Say Y here if you want kernel low-level debugging support on i.MX6Q/DL. @@ -18118,9 +18443,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/Kconfig.debug linux-linaro-stable-mx6/arch default "debug/vt8500.S" if DEBUG_VT8500_UART0 default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1 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 +diff -Nur linux-3.10.30.orig/arch/arm/kernel/bios32.c linux-3.10.30/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-16 15:28:19.685376368 +0200 ++++ linux-3.10.30/arch/arm/kernel/bios32.c 2014-05-19 19:07:23.465304444 +0200 @@ -363,6 +363,20 @@ } EXPORT_SYMBOL(pcibios_fixup_bus); @@ -18151,9 +18476,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/kernel/bios32.c linux-linaro-stable-mx6/ar INIT_LIST_HEAD(&sys->resources); 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 +diff -Nur linux-3.10.30.orig/arch/arm/kernel/head.S linux-3.10.30/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-16 15:28:19.685376368 +0200 ++++ linux-3.10.30/arch/arm/kernel/head.S 2014-05-19 19:07:23.465304444 +0200 @@ -342,7 +342,6 @@ .long __turn_mmu_on_end @@ -18162,9 +18487,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/kernel/head.S linux-linaro-stable-mx6/arch ENTRY(secondary_startup) /* * 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 +diff -Nur linux-3.10.30.orig/arch/arm/kernel/hw_breakpoint.c linux-3.10.30/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-16 15:28:19.685376368 +0200 ++++ linux-3.10.30/arch/arm/kernel/hw_breakpoint.c 2014-05-19 19:07:23.465304444 +0200 @@ -1049,7 +1049,8 @@ static void __init pm_init(void) @@ -18175,9 +18500,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/kernel/hw_breakpoint.c linux-linaro-stable } #else 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 +diff -Nur linux-3.10.30.orig/arch/arm/kernel/Makefile linux-3.10.30/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-16 15:28:19.685376368 +0200 ++++ linux-3.10.30/arch/arm/kernel/Makefile 2014-05-19 19:07:23.465304444 +0200 @@ -82,6 +82,9 @@ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o @@ -18189,9 +18514,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/kernel/Makefile linux-linaro-stable-mx6/ar +endif 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 +diff -Nur linux-3.10.30.orig/arch/arm/kernel/perf_event.c linux-3.10.30/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-16 15:28:19.689376389 +0200 ++++ linux-3.10.30/arch/arm/kernel/perf_event.c 2014-05-19 19:07:23.465304444 +0200 @@ -12,6 +12,7 @@ */ #define pr_fmt(fmt) "hw perfevents: " fmt @@ -18260,9 +18585,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/kernel/perf_event.c linux-linaro-stable-mx /* does not support taken branch sampling */ if (has_branch_stack(event)) 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 +diff -Nur linux-3.10.30.orig/arch/arm/kernel/perf_event_cpu.c linux-3.10.30/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-16 15:28:19.689376389 +0200 ++++ linux-3.10.30/arch/arm/kernel/perf_event_cpu.c 2014-05-19 19:07:23.465304444 +0200 @@ -19,6 +19,7 @@ #define pr_fmt(fmt) "CPU PMU: " fmt @@ -18526,9 +18851,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/kernel/perf_event_cpu.c linux-linaro-stabl return err; } -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 +diff -Nur linux-3.10.30.orig/arch/arm/kernel/perf_event_v7.c linux-3.10.30/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-16 15:28:19.689376389 +0200 ++++ linux-3.10.30/arch/arm/kernel/perf_event_v7.c 2014-05-19 19:07:23.465304444 +0200 @@ -950,6 +950,51 @@ } #endif @@ -18635,9 +18960,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/kernel/perf_event_v7.c linux-linaro-stable cpu_pmu->map_event = armv7_a7_map_event; cpu_pmu->num_events = armv7_read_num_pmnc_events(); cpu_pmu->set_event_filter = armv7pmu_set_event_filter; -diff -Nur linux-3.10.30.orig/arch/arm/kernel/process.c linux-linaro-stable-mx6/arch/arm/kernel/process.c +diff -Nur linux-3.10.30.orig/arch/arm/kernel/process.c linux-3.10.30/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-16 15:28:19.689376389 +0200 ++++ linux-3.10.30/arch/arm/kernel/process.c 2014-05-19 19:07:23.465304444 +0200 @@ -170,8 +170,10 @@ */ void arch_cpu_idle(void) @@ -18649,9 +18974,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm/kernel/psci.c linux-3.10.30/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-16 15:28:19.689376389 +0200 ++++ linux-3.10.30/arch/arm/kernel/psci.c 2014-05-19 19:07:23.465304444 +0200 @@ -17,6 +17,7 @@ #include <linux/init.h> @@ -18748,9 +19073,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/kernel/psci.c linux-linaro-stable-mx6/arch } -early_initcall(psci_init); +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 +diff -Nur linux-3.10.30.orig/arch/arm/kernel/psci_smp.c linux-3.10.30/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-16 15:28:19.689376389 +0200 ++++ linux-3.10.30/arch/arm/kernel/psci_smp.c 2014-05-19 19:07:23.465304444 +0200 @@ -0,0 +1,84 @@ +/* + * This program is free software; you can redistribute it and/or modify @@ -18836,9 +19161,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/kernel/psci_smp.c linux-linaro-stable-mx6/ + .smp_boot_secondary = psci_boot_secondary, + .cpu_die = psci_cpu_die, +}; -diff -Nur linux-3.10.30.orig/arch/arm/kernel/setup.c linux-linaro-stable-mx6/arch/arm/kernel/setup.c +diff -Nur linux-3.10.30.orig/arch/arm/kernel/setup.c linux-3.10.30/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-16 15:28:19.693376410 +0200 ++++ linux-3.10.30/arch/arm/kernel/setup.c 2014-05-19 19:07:23.465304444 +0200 @@ -37,6 +37,7 @@ #include <asm/cputype.h> #include <asm/elf.h> @@ -18884,9 +19209,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/kernel/setup.c linux-linaro-stable-mx6/arc smp_init_cpus(); } #endif -diff -Nur linux-3.10.30.orig/arch/arm/kernel/sleep.S linux-linaro-stable-mx6/arch/arm/kernel/sleep.S +diff -Nur linux-3.10.30.orig/arch/arm/kernel/sleep.S linux-3.10.30/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-16 15:28:19.693376410 +0200 ++++ linux-3.10.30/arch/arm/kernel/sleep.S 2014-05-19 19:07:23.465304444 +0200 @@ -4,6 +4,7 @@ #include <asm/assembler.h> #include <asm/glue-cache.h> @@ -18945,9 +19270,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/kernel/sleep.S linux-linaro-stable-mx6/arc +cpu_map_ptr: + .long __cpu_logical_map - . +#endif -diff -Nur linux-3.10.30.orig/arch/arm/kernel/smp.c linux-linaro-stable-mx6/arch/arm/kernel/smp.c +diff -Nur linux-3.10.30.orig/arch/arm/kernel/smp.c linux-3.10.30/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-16 15:28:19.693376410 +0200 ++++ linux-3.10.30/arch/arm/kernel/smp.c 2014-05-19 19:07:23.465304444 +0200 @@ -46,6 +46,9 @@ #include <asm/virt.h> #include <asm/mach/arch.h> @@ -19030,9 +19355,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/kernel/smp.c linux-linaro-stable-mx6/arch/ set_irq_regs(old_regs); } -diff -Nur linux-3.10.30.orig/arch/arm/kernel/topology.c linux-linaro-stable-mx6/arch/arm/kernel/topology.c +diff -Nur linux-3.10.30.orig/arch/arm/kernel/topology.c linux-3.10.30/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-16 15:28:19.693376410 +0200 ++++ linux-3.10.30/arch/arm/kernel/topology.c 2014-05-19 19:07:23.465304444 +0200 @@ -23,6 +23,7 @@ #include <linux/slab.h> @@ -19182,9 +19507,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/kernel/topology.c linux-linaro-stable-mx6/ /* * init_cpu_topology is called at boot when only one cpu is running * which prevent simultaneous write access to cpu_topology array -diff -Nur linux-3.10.30.orig/arch/arm/kernel/traps.c linux-linaro-stable-mx6/arch/arm/kernel/traps.c +diff -Nur linux-3.10.30.orig/arch/arm/kernel/traps.c linux-3.10.30/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-16 15:28:19.693376410 +0200 ++++ linux-3.10.30/arch/arm/kernel/traps.c 2014-05-19 19:07:23.465304444 +0200 @@ -61,7 +61,7 @@ void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame) { @@ -19194,9 +19519,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/kernel/traps.c linux-linaro-stable-mx6/arc #else printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from); #endif -diff -Nur linux-3.10.30.orig/arch/arm/lib/backtrace.S linux-linaro-stable-mx6/arch/arm/lib/backtrace.S +diff -Nur linux-3.10.30.orig/arch/arm/lib/backtrace.S linux-3.10.30/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-16 15:28:19.697376431 +0200 ++++ linux-3.10.30/arch/arm/lib/backtrace.S 2014-05-19 19:07:23.465304444 +0200 @@ -80,14 +80,14 @@ ldr r1, [sv_pc, #-4] @ if stmfd sp!, {args} exists, @@ -19246,9 +19571,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/lib/backtrace.S linux-linaro-stable-mx6/ar + .word 0xe92d0000 >> 11 @ stmfd sp!, {} #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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-exynos/mach-exynos5-dt.c linux-3.10.30/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-16 15:28:19.733376621 +0200 ++++ linux-3.10.30/arch/arm/mach-exynos/mach-exynos5-dt.c 2014-05-19 19:07:23.469304459 +0200 @@ -14,6 +14,7 @@ #include <linux/memblock.h> #include <linux/io.h> @@ -19301,9 +19626,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-exynos/mach-exynos5-dt.c linux-linaro of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); } -diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/anatop.c linux-linaro-stable-mx6/arch/arm/mach-imx/anatop.c +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/anatop.c linux-3.10.30/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-16 15:28:19.745376685 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/anatop.c 2014-05-19 19:07:23.469304459 +0200 @@ -9,6 +9,7 @@ * http://www.gnu.org/copyleft/gpl.html */ @@ -19479,9 +19804,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/anatop.c linux-linaro-stable-mx6/ + + imx_anatop_usb_chrg_detect_disable(); } -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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/busfreq_ddr3.c linux-3.10.30/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-16 15:28:19.745376685 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/busfreq_ddr3.c 2014-05-19 19:07:23.469304459 +0200 @@ -0,0 +1,476 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -19959,9 +20284,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/busfreq_ddr3.c linux-linaro-stabl + + return 0; +} -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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/busfreq-imx6.c linux-3.10.30/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-16 15:28:19.745376685 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/busfreq-imx6.c 2014-05-19 19:07:23.469304459 +0200 @@ -0,0 +1,938 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -20901,9 +21226,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/busfreq-imx6.c linux-linaro-stabl +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("BusFreq driver"); +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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/busfreq_lpddr2.c linux-3.10.30/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-16 15:28:19.745376685 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/busfreq_lpddr2.c 2014-05-19 19:07:23.469304459 +0200 @@ -0,0 +1,183 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -21088,9 +21413,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/busfreq_lpddr2.c linux-linaro-sta + + return 0; +} -diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk.c linux-linaro-stable-mx6/arch/arm/mach-imx/clk.c +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk.c linux-3.10.30/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-16 15:28:19.749376706 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/clk.c 2014-05-19 19:07:23.469304459 +0200 @@ -1,4 +1,65 @@ +#include <linux/clk.h> +#include <linux/err.h> @@ -21157,9 +21482,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk.c linux-linaro-stable-mx6/arc + *val ^= CSCMR1_FIXUP; + return; +} -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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-fixup-div.c linux-3.10.30/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-16 15:28:19.745376685 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/clk-fixup-div.c 2014-05-19 19:07:23.469304459 +0200 @@ -0,0 +1,129 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -21290,9 +21615,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-fixup-div.c linux-linaro-stab + + return clk; +} -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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-fixup-mux.c linux-3.10.30/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-16 15:28:19.745376685 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/clk-fixup-mux.c 2014-05-19 19:07:23.469304459 +0200 @@ -0,0 +1,107 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -21401,9 +21726,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-fixup-mux.c linux-linaro-stab + + return clk; +} -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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-gate2.c linux-3.10.30/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-16 15:28:19.745376685 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/clk-gate2.c 2014-05-19 19:07:23.469304459 +0200 @@ -1,6 +1,7 @@ /* * Copyright (C) 2010-2011 Canonical Ltd <jeremy.kerr@canonical.com> @@ -21421,9 +21746,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-gate2.c linux-linaro-stable-m return 1; 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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk.h linux-3.10.30/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-16 15:28:19.749376706 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/clk.h 2014-05-19 19:07:23.469304459 +0200 @@ -6,6 +6,8 @@ extern spinlock_t imx_ccm_lock; @@ -21467,9 +21792,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk.h linux-linaro-stable-mx6/arc static inline struct clk *imx_clk_fixed(const char *name, int rate) { 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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-imx51-imx53.c linux-3.10.30/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-16 15:28:19.745376685 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/clk-imx51-imx53.c 2014-05-19 19:07:23.469304459 +0200 @@ -123,11 +123,13 @@ { int i; @@ -21533,9 +21858,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-imx51-imx53.c linux-linaro-st + return mx53_clocks_init(0, 0, 0, 0); } -#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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-imx6q.c linux-3.10.30/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-16 15:28:19.749376706 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/clk-imx6q.c 2014-05-19 19:07:23.473304473 +0200 @@ -14,7 +14,6 @@ #include <linux/types.h> #include <linux/clk.h> @@ -22192,9 +22517,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-imx6q.c linux-linaro-stable-m - return 0; } +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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-imx6sl.c linux-3.10.30/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-16 15:28:19.749376706 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/clk-imx6sl.c 2014-05-19 19:07:23.473304473 +0200 @@ -0,0 +1,493 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -22689,9 +23014,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-imx6sl.c linux-linaro-stable- + mxc_timer_init(base, irq); +} +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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-pfd.c linux-3.10.30/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-16 15:28:19.749376706 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/clk-pfd.c 2014-05-19 19:07:23.473304473 +0200 @@ -1,5 +1,5 @@ /* - * Copyright 2012 Freescale Semiconductor, Inc. @@ -22795,9 +23120,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-pllv3.c linux-3.10.30/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-16 15:28:19.749376706 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/clk-pllv3.c 2014-05-19 19:07:23.473304473 +0200 @@ -1,5 +1,5 @@ /* - * Copyright 2012 Freescale Semiconductor, Inc. @@ -23189,9 +23514,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-pllv3.c linux-linaro-stable-m init.name = name; 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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-vf610.c linux-3.10.30/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-16 15:28:19.749376706 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/clk-vf610.c 2014-05-19 19:07:23.473304473 +0200 @@ -0,0 +1,321 @@ +/* + * Copyright 2012-2013 Freescale Semiconductor, Inc. @@ -23514,9 +23839,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/clk-vf610.c linux-linaro-stable-m + of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data); +} +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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/common.h linux-3.10.30/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-16 15:28:19.749376706 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/common.h 2014-05-19 19:07:23.473304473 +0200 @@ -14,6 +14,7 @@ struct platform_device; struct pt_regs; @@ -23611,9 +23936,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/common.h linux-linaro-stable-mx6/ extern struct smp_operations imx_smp_ops; #endif -diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/cpu.c linux-linaro-stable-mx6/arch/arm/mach-imx/cpu.c +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/cpu.c linux-3.10.30/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-16 15:28:19.749376706 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/cpu.c 2014-05-19 19:07:23.473304473 +0200 @@ -1,6 +1,9 @@ #include <linux/module.h> @@ -23736,9 +24061,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/cpu.c linux-linaro-stable-mx6/arc + kfree(soc_dev_attr); + return NULL; +} -diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/cpuidle.h linux-linaro-stable-mx6/arch/arm/mach-imx/cpuidle.h +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/cpuidle.h linux-3.10.30/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-16 15:28:19.749376706 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/cpuidle.h 2014-05-19 19:07:23.473304473 +0200 @@ -1,5 +1,5 @@ /* - * Copyright 2012 Freescale Semiconductor, Inc. @@ -23763,9 +24088,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/cpuidle.h linux-linaro-stable-mx6 + return 0; +} #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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/cpuidle-imx6q.c linux-3.10.30/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-16 15:28:19.749376706 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/cpuidle-imx6q.c 2014-05-19 19:07:23.473304473 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Freescale Semiconductor, Inc. @@ -23796,9 +24121,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/cpuidle-imx6q.c linux-linaro-stab return cpuidle_register(&imx6q_cpuidle_driver, NULL); } -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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/cpuidle-imx6sl.c linux-3.10.30/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-16 15:28:19.749376706 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/cpuidle-imx6sl.c 2014-05-19 19:07:23.473304473 +0200 @@ -0,0 +1,145 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. @@ -23945,9 +24270,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/cpuidle-imx6sl.c linux-linaro-sta + + return cpuidle_register(&imx6sl_cpuidle_driver, NULL); +} -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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/ddr3_freq_imx6.S linux-3.10.30/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-16 15:28:19.749376706 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/ddr3_freq_imx6.S 2014-05-19 19:07:23.473304473 +0200 @@ -0,0 +1,893 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -24842,9 +25167,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/ddr3_freq_imx6.S linux-linaro-sta +ENTRY(mx6_do_ddr_freq_change) + .word mx6_ddr3_freq_change + .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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/gpc.c linux-3.10.30/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-16 15:28:19.753376727 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/gpc.c 2014-05-19 19:07:23.473304473 +0200 @@ -10,30 +10,127 @@ * http://www.gnu.org/copyleft/gpl.html */ @@ -25321,9 +25646,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/gpc.c linux-linaro-stable-mx6/arc +MODULE_AUTHOR("Anson Huang <b20788@freescale.com>"); +MODULE_DESCRIPTION("Freescale i.MX GPC driver"); +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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/hardware.h linux-3.10.30/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-16 15:28:19.753376727 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/hardware.h 2014-05-19 19:07:23.477304489 +0200 @@ -1,5 +1,5 @@ /* - * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved. @@ -25349,9 +25674,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/hardware.h linux-linaro-stable-mx #include "mx3x.h" #include "mx31.h" #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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/hotplug.c linux-3.10.30/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-16 15:28:19.753376727 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/hotplug.c 2014-05-19 19:07:23.477304489 +0200 @@ -1,5 +1,5 @@ /* - * Copyright 2011 Freescale Semiconductor, Inc. @@ -25369,9 +25694,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/imx25-dt.c linux-3.10.30/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-16 15:28:19.753376727 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/imx25-dt.c 2014-05-19 19:07:23.477304489 +0200 @@ -19,6 +19,8 @@ static void __init imx25_dt_init(void) @@ -25381,9 +25706,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/imx25-dt.c linux-linaro-stable-mx of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); } -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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/imx27-dt.c linux-3.10.30/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-16 15:28:19.753376727 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/imx27-dt.c 2014-05-19 19:07:23.477304489 +0200 @@ -22,6 +22,8 @@ { struct platform_device_info devinfo = { .name = "cpufreq-cpu0", }; @@ -25393,9 +25718,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/imx27-dt.c linux-linaro-stable-mx of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); 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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/imx31-dt.c linux-3.10.30/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-16 15:28:19.753376727 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/imx31-dt.c 2014-05-19 19:07:23.477304489 +0200 @@ -20,6 +20,8 @@ static void __init imx31_dt_init(void) @@ -25405,9 +25730,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/imx31-dt.c linux-linaro-stable-mx of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); } -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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/imx51-dt.c linux-3.10.30/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-16 15:28:19.753376727 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/imx51-dt.c 2014-05-19 19:07:23.477304489 +0200 @@ -23,6 +23,8 @@ { struct platform_device_info devinfo = { .name = "cpufreq-cpu0", }; @@ -25417,9 +25742,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/imx51-dt.c linux-linaro-stable-mx of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); platform_device_register_full(&devinfo); } -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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/imx6sl_wfi.S linux-3.10.30/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-16 15:28:19.753376727 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/imx6sl_wfi.S 2014-05-19 19:07:23.477304489 +0200 @@ -0,0 +1,639 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -26060,9 +26385,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/imx6sl_wfi.S linux-linaro-stable- + + /* Restore registers */ + mov pc, lr -diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/Kconfig linux-linaro-stable-mx6/arch/arm/mach-imx/Kconfig +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/Kconfig linux-3.10.30/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-16 15:28:19.745376685 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/Kconfig 2014-05-19 19:07:23.477304489 +0200 @@ -1,5 +1,6 @@ config ARCH_MXC bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 @@ -26145,9 +26470,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/Kconfig linux-linaro-stable-mx6/a endif 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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/lpddr2_freq_imx6.S linux-3.10.30/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-16 15:28:19.757376748 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/lpddr2_freq_imx6.S 2014-05-19 19:07:23.477304489 +0200 @@ -0,0 +1,484 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -26633,9 +26958,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/lpddr2_freq_imx6.S linux-linaro-s +ENTRY(mx6_lpddr2_do_iram) + .word mx6_lpddr2_freq_change + .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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mach-imx53.c linux-3.10.30/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-16 15:28:19.757376748 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/mach-imx53.c 2014-05-19 19:07:23.477304489 +0200 @@ -21,6 +21,7 @@ #include <asm/mach/time.h> @@ -26653,9 +26978,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mach-imx53.c linux-linaro-stable- if (of_machine_is_compatible("fsl,imx53-qsb")) imx53_qsb_init(); -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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mach-imx6q.c linux-3.10.30/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-16 15:28:19.757376748 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/mach-imx6q.c 2014-05-19 19:07:23.477304489 +0200 @@ -10,12 +10,14 @@ * http://www.gnu.org/copyleft/gpl.html */ @@ -27257,9 +27582,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mach-imx6q.c linux-linaro-stable- - .restart = imx6q_restart, + .restart = mxc_restart, 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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mach-imx6sl.c linux-3.10.30/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-16 15:28:19.757376748 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/mach-imx6sl.c 2014-05-19 19:07:23.477304489 +0200 @@ -0,0 +1,149 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -27410,9 +27735,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mach-imx6sl.c linux-linaro-stable + .dt_compat = imx6sl_dt_compat, + .restart = mxc_restart, +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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mach-vf610.c linux-3.10.30/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-16 15:28:19.761376769 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/mach-vf610.c 2014-05-19 19:07:23.477304489 +0200 @@ -0,0 +1,50 @@ +/* + * Copyright 2012-2013 Freescale Semiconductor, Inc. @@ -27464,9 +27789,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mach-vf610.c linux-linaro-stable- + .dt_compat = vf610_dt_compat, + .restart = mxc_restart, +MACHINE_END -diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/Makefile linux-linaro-stable-mx6/arch/arm/mach-imx/Makefile +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/Makefile linux-3.10.30/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-16 15:28:19.745376685 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/Makefile 2014-05-19 19:07:23.477304489 +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) @@ -27515,9 +27840,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/Makefile linux-linaro-stable-mx6/ +obj-$(CONFIG_SOC_VF610) += clk-vf610.o mach-vf610.o + 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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mm-imx1.c linux-3.10.30/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-16 15:28:19.761376769 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/mm-imx1.c 2014-05-19 19:07:23.477304489 +0200 @@ -39,7 +39,6 @@ void __init imx1_init_early(void) { @@ -27534,9 +27859,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mm-imx1.c linux-linaro-stable-mx6 mxc_device_init(); 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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mm-imx21.c linux-3.10.30/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-16 15:28:19.761376769 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/mm-imx21.c 2014-05-19 19:07:23.481304504 +0200 @@ -66,7 +66,6 @@ void __init imx21_init_early(void) { @@ -27553,9 +27878,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mm-imx21.c linux-linaro-stable-mx mxc_device_init(); 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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mm-imx25.c linux-3.10.30/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-16 15:28:19.761376769 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/mm-imx25.c 2014-05-19 19:07:23.481304504 +0200 @@ -54,7 +54,6 @@ { mxc_set_cpu_type(MXC_CPU_MX25); @@ -27572,9 +27897,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mm-imx25.c linux-linaro-stable-mx mxc_device_init(); /* 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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mm-imx27.c linux-3.10.30/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-16 15:28:19.761376769 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/mm-imx27.c 2014-05-19 19:07:23.481304504 +0200 @@ -66,7 +66,6 @@ void __init imx27_init_early(void) { @@ -27591,9 +27916,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mm-imx27.c linux-linaro-stable-mx mxc_device_init(); /* 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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mm-imx3.c linux-3.10.30/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-16 15:28:19.761376769 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/mm-imx3.c 2014-05-19 19:07:23.481304504 +0200 @@ -138,7 +138,6 @@ void __init imx31_init_early(void) { @@ -27626,9 +27951,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mm-imx3.c linux-linaro-stable-mx6 mxc_device_init(); 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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mm-imx5.c linux-3.10.30/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-16 15:28:19.761376769 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/mm-imx5.c 2014-05-19 19:07:23.481304504 +0200 @@ -83,7 +83,6 @@ imx51_ipu_mipi_setup(); mxc_set_cpu_type(MXC_CPU_MX51); @@ -27653,9 +27978,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mm-imx5.c linux-linaro-stable-mx6 mxc_device_init(); /* 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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mx6.h linux-3.10.30/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-16 15:28:19.761376769 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/mx6.h 2014-05-19 19:07:23.481304504 +0200 @@ -0,0 +1,35 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -27692,9 +28017,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mx6.h linux-linaro-stable-mx6/arc + +#define MX6_SUSPEND_IRAM_SIZE 0x1000 +#endif -diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mxc.h linux-linaro-stable-mx6/arch/arm/mach-imx/mxc.h +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mxc.h linux-3.10.30/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-16 15:28:19.761376769 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/mxc.h 2014-05-19 19:07:23.481304504 +0200 @@ -1,5 +1,5 @@ /* - * Copyright 2004-2007, 2010 Freescale Semiconductor, Inc. All Rights Reserved. @@ -27739,9 +28064,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/mxc.h linux-linaro-stable-mx6/arc #define cpu_is_mx3() (cpu_is_mx31() || cpu_is_mx35()) #define cpu_is_mx2() (cpu_is_mx21() || cpu_is_mx27()) -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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/pm-imx6.c linux-3.10.30/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-16 15:28:19.761376769 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/pm-imx6.c 2014-05-19 19:07:23.481304504 +0200 @@ -0,0 +1,379 @@ +/* + * Copyright 2011-2013 Freescale Semiconductor, Inc. @@ -28122,9 +28447,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/pm-imx6.c linux-linaro-stable-mx6 + else + cpu_type = MXC_CPU_IMX6SL; +} -diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/pm-imx6q.c linux-linaro-stable-mx6/arch/arm/mach-imx/pm-imx6q.c +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/pm-imx6q.c linux-3.10.30/arch/arm/mach-imx/pm-imx6q.c --- linux-3.10.30.orig/arch/arm/mach-imx/pm-imx6q.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-imx/pm-imx6q.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.30/arch/arm/mach-imx/pm-imx6q.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,61 +0,0 @@ -/* - * Copyright 2011-2013 Freescale Semiconductor, Inc. @@ -28187,9 +28512,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/pm-imx6q.c linux-linaro-stable-mx -{ - suspend_set_ops(&imx6q_pm_ops); -} -diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/src.c linux-linaro-stable-mx6/arch/arm/mach-imx/src.c +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/src.c linux-3.10.30/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-16 15:28:19.761376769 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/src.c 2014-05-19 19:07:23.481304504 +0200 @@ -1,5 +1,5 @@ /* - * Copyright 2011 Freescale Semiconductor, Inc. @@ -28227,9 +28552,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/src.c linux-linaro-stable-mx6/arc void __init imx_src_init(void) { 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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/suspend-imx6.S linux-3.10.30/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-16 15:28:19.761376769 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/suspend-imx6.S 2014-05-19 19:07:23.481304504 +0200 @@ -0,0 +1,801 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -29032,9 +29357,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/suspend-imx6.S linux-linaro-stabl + bic r7, r7, #0x1 + str r7, [r8, #MX6Q_MMDC_MAPSR] + 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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/system.c linux-3.10.30/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-16 15:28:19.761376769 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/system.c 2014-05-19 19:07:23.481304504 +0200 @@ -1,7 +1,7 @@ /* * Copyright (C) 1999 ARM Limited @@ -29203,9 +29528,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/system.c linux-linaro-stable-mx6/ + l2x0_of_init(0, ~0UL); } +#endif -diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/time.c linux-linaro-stable-mx6/arch/arm/mach-imx/time.c +diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/time.c linux-3.10.30/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-16 15:28:19.765376790 +0200 ++++ linux-3.10.30/arch/arm/mach-imx/time.c 2014-05-19 19:07:23.481304504 +0200 @@ -60,7 +60,11 @@ #define V2_TCTL_WAITEN (1 << 3) /* Wait enable mode */ #define V2_TCTL_CLK_IPG (1 << 6) @@ -29269,9 +29594,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-imx/time.c linux-linaro-stable-mx6/ar __raw_writel(tctl_val, timer_base + MXC_TCTL); -diff -Nur linux-3.10.30.orig/arch/arm/mach-integrator/Makefile linux-linaro-stable-mx6/arch/arm/mach-integrator/Makefile +diff -Nur linux-3.10.30.orig/arch/arm/mach-integrator/Makefile linux-3.10.30/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-16 15:28:19.765376790 +0200 ++++ linux-3.10.30/arch/arm/mach-integrator/Makefile 2014-05-19 19:07:23.481304504 +0200 @@ -8,5 +8,5 @@ obj-$(CONFIG_ARCH_INTEGRATOR_AP) += integrator_ap.o obj-$(CONFIG_ARCH_INTEGRATOR_CP) += integrator_cp.o @@ -29279,9 +29604,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-integrator/Makefile linux-linaro-stab -obj-$(CONFIG_PCI) += pci_v3.o pci.o +obj-$(CONFIG_PCI) += pci_v3.o obj-$(CONFIG_INTEGRATOR_IMPD1) += impd1.o -diff -Nur linux-3.10.30.orig/arch/arm/mach-integrator/pci.c linux-linaro-stable-mx6/arch/arm/mach-integrator/pci.c +diff -Nur linux-3.10.30.orig/arch/arm/mach-integrator/pci.c linux-3.10.30/arch/arm/mach-integrator/pci.c --- linux-3.10.30.orig/arch/arm/mach-integrator/pci.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-integrator/pci.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.30/arch/arm/mach-integrator/pci.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,113 +0,0 @@ -/* - * linux/arch/arm/mach-integrator/pci-integrator.c @@ -29396,9 +29721,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-integrator/pci_v3.c linux-3.10.30/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-16 15:28:19.765376790 +0200 ++++ linux-3.10.30/arch/arm/mach-integrator/pci_v3.c 2014-05-19 19:07:23.481304504 +0200 @@ -35,6 +35,7 @@ #include <asm/signal.h> #include <asm/mach/pci.h> @@ -29526,9 +29851,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/core.h linux-3.10.30/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-16 15:28:19.953377782 +0200 ++++ linux-3.10.30/arch/arm/mach-vexpress/core.h 2014-05-19 19:07:23.485304518 +0200 @@ -6,6 +6,8 @@ void vexpress_dt_smp_map_io(void); @@ -29538,9 +29863,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/core.h linux-linaro-stable-m extern struct smp_operations vexpress_smp_ops; 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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/dcscb.c linux-3.10.30/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-16 15:28:19.953377782 +0200 ++++ linux-3.10.30/arch/arm/mach-vexpress/dcscb.c 2014-05-19 19:07:23.485304518 +0200 @@ -0,0 +1,236 @@ +/* + * arch/arm/mach-vexpress/dcscb.c - Dual Cluster System Configuration Block @@ -29778,9 +30103,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/dcscb_setup.S linux-3.10.30/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-16 15:28:19.953377782 +0200 ++++ linux-3.10.30/arch/arm/mach-vexpress/dcscb_setup.S 2014-05-19 19:07:23.509304607 +0200 @@ -0,0 +1,38 @@ +/* + * arch/arm/include/asm/dcscb_setup.S @@ -29820,9 +30145,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/dcscb_setup.S linux-linaro-s + bx lr + +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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/include/mach/tc2.h linux-3.10.30/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-16 15:28:19.953377782 +0200 ++++ linux-3.10.30/arch/arm/mach-vexpress/include/mach/tc2.h 2014-05-19 19:07:23.509304607 +0200 @@ -0,0 +1,10 @@ +#ifndef __MACH_TC2_H +#define __MACH_TC2_H @@ -29834,9 +30159,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/include/mach/tc2.h linux-lin +#define TC2_MAX_CLUSTERS 2 + +#endif -diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/Kconfig linux-linaro-stable-mx6/arch/arm/mach-vexpress/Kconfig +diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/Kconfig linux-3.10.30/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-16 15:28:19.953377782 +0200 ++++ linux-3.10.30/arch/arm/mach-vexpress/Kconfig 2014-05-19 19:07:23.513304622 +0200 @@ -1,5 +1,7 @@ config ARCH_VEXPRESS bool "ARM Ltd. Versatile Express family" if ARCH_MULTI_V7 @@ -29869,9 +30194,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/Kconfig linux-linaro-stable- + Support for CPU and cluster power management on TC2. endmenu -diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/Makefile linux-linaro-stable-mx6/arch/arm/mach-vexpress/Makefile +diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/Makefile linux-3.10.30/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-16 15:28:19.953377782 +0200 ++++ linux-3.10.30/arch/arm/mach-vexpress/Makefile 2014-05-19 19:07:23.513304622 +0200 @@ -6,5 +6,13 @@ obj-y := v2m.o @@ -29886,9 +30211,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/Makefile linux-linaro-stable +endif obj-$(CONFIG_SMP) += platsmp.o 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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/platsmp.c linux-3.10.30/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-16 15:28:19.953377782 +0200 ++++ linux-3.10.30/arch/arm/mach-vexpress/platsmp.c 2014-05-19 19:07:23.513304622 +0200 @@ -12,9 +12,11 @@ #include <linux/errno.h> #include <linux/smp.h> @@ -29923,9 +30248,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/platsmp.c linux-linaro-stabl +#endif + return false; +} -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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/tc2_pm.c linux-3.10.30/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-16 15:28:19.953377782 +0200 ++++ linux-3.10.30/arch/arm/mach-vexpress/tc2_pm.c 2014-05-19 19:07:23.513304622 +0200 @@ -0,0 +1,277 @@ +/* + * arch/arm/mach-vexpress/tc2_pm.c - TC2 power management support @@ -30204,9 +30529,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/tc2_pm_psci.c linux-3.10.30/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-16 15:28:19.953377782 +0200 ++++ linux-3.10.30/arch/arm/mach-vexpress/tc2_pm_psci.c 2014-05-19 19:07:23.513304622 +0200 @@ -0,0 +1,173 @@ +/* + * arch/arm/mach-vexpress/tc2_pm_psci.c - TC2 PSCI support @@ -30381,9 +30706,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/tc2_pm_setup.S linux-3.10.30/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-16 15:28:19.953377782 +0200 ++++ linux-3.10.30/arch/arm/mach-vexpress/tc2_pm_setup.S 2014-05-19 19:07:23.513304622 +0200 @@ -0,0 +1,68 @@ +/* + * arch/arm/include/asm/tc2_pm_setup.S @@ -30453,9 +30778,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/tc2_pm_setup.S linux-linaro- + bx lr + +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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/v2m.c linux-3.10.30/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-16 15:28:19.953377782 +0200 ++++ linux-3.10.30/arch/arm/mach-vexpress/v2m.c 2014-05-19 19:07:23.517304636 +0200 @@ -10,6 +10,7 @@ #include <linux/smp.h> #include <linux/init.h> @@ -30513,17 +30838,17 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-vexpress/v2m.c linux-linaro-stable-mx .map_io = v2m_dt_map_io, .init_early = v2m_dt_init_early, .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 +diff -Nur linux-3.10.30.orig/arch/arm/mach-virt/Makefile linux-3.10.30/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-16 15:28:19.953377782 +0200 ++++ linux-3.10.30/arch/arm/mach-virt/Makefile 2014-05-19 19:07:23.517304636 +0200 @@ -3,4 +3,3 @@ # obj-y := virt.o -obj-$(CONFIG_SMP) += platsmp.o -diff -Nur linux-3.10.30.orig/arch/arm/mach-virt/platsmp.c linux-linaro-stable-mx6/arch/arm/mach-virt/platsmp.c +diff -Nur linux-3.10.30.orig/arch/arm/mach-virt/platsmp.c linux-3.10.30/arch/arm/mach-virt/platsmp.c --- linux-3.10.30.orig/arch/arm/mach-virt/platsmp.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm/mach-virt/platsmp.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.30/arch/arm/mach-virt/platsmp.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,50 +0,0 @@ -/* - * Dummy Virtual Machine - does what it says on the tin. @@ -30575,9 +30900,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-virt/platsmp.c linux-linaro-stable-mx - .smp_prepare_cpus = virt_smp_prepare_cpus, - .smp_boot_secondary = virt_boot_secondary, -}; -diff -Nur linux-3.10.30.orig/arch/arm/mach-virt/virt.c linux-linaro-stable-mx6/arch/arm/mach-virt/virt.c +diff -Nur linux-3.10.30.orig/arch/arm/mach-virt/virt.c linux-3.10.30/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-16 15:28:19.957377803 +0200 ++++ linux-3.10.30/arch/arm/mach-virt/virt.c 2014-05-19 19:07:23.517304636 +0200 @@ -36,11 +36,8 @@ NULL }; @@ -30590,9 +30915,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mach-virt/virt.c linux-linaro-stable-mx6/a - .smp = smp_ops(virt_smp_ops), .dt_compat = virt_dt_match, 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 +diff -Nur linux-3.10.30.orig/arch/arm/mm/cache-v7.S linux-3.10.30/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-16 15:28:19.961377823 +0200 ++++ linux-3.10.30/arch/arm/mm/cache-v7.S 2014-05-19 19:07:23.517304636 +0200 @@ -146,18 +146,18 @@ ldr r7, =0x7fff ands r7, r7, r1, lsr #13 @ extract max number of the index size @@ -30619,9 +30944,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mm/cache-v7.S linux-linaro-stable-mx6/arch bge loop1 skip: 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 +diff -Nur linux-3.10.30.orig/arch/arm/mm/fault.c linux-3.10.30/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-16 15:28:19.961377823 +0200 ++++ linux-3.10.30/arch/arm/mm/fault.c 2014-05-19 19:07:23.517304636 +0200 @@ -446,8 +446,16 @@ if (pud_none(*pud_k)) @@ -30651,9 +30976,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/mm/fault.c linux-linaro-stable-mx6/arch/ar return 0; 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 +diff -Nur linux-3.10.30.orig/arch/arm/plat-versatile/headsmp.S linux-3.10.30/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-16 15:28:19.985377950 +0200 ++++ linux-3.10.30/arch/arm/plat-versatile/headsmp.S 2014-05-19 19:07:23.517304636 +0200 @@ -11,8 +11,6 @@ #include <linux/linkage.h> #include <linux/init.h> @@ -30663,9 +30988,9 @@ diff -Nur linux-3.10.30.orig/arch/arm/plat-versatile/headsmp.S linux-linaro-stab /* * Realview/Versatile Express specific entry point for secondary CPUs. * 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 +diff -Nur linux-3.10.30.orig/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts linux-3.10.30/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-16 15:28:19.993377993 +0200 ++++ linux-3.10.30/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts 2014-05-19 19:07:23.517304636 +0200 @@ -0,0 +1,287 @@ +/* + * Copyright (c) 2013, ARM Limited. All rights reserved. @@ -30954,9 +31279,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm64/boot/dts/Makefile linux-3.10.30/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-16 15:28:19.993377993 +0200 ++++ linux-3.10.30/arch/arm64/boot/dts/Makefile 2014-05-19 19:07:23.517304636 +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 \ @@ -30964,9 +31289,9 @@ diff -Nur linux-3.10.30.orig/arch/arm64/boot/dts/Makefile linux-linaro-stable-mx targets += dtbs 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 +diff -Nur linux-3.10.30.orig/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi linux-3.10.30/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-16 15:28:19.993377993 +0200 ++++ linux-3.10.30/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi 2014-05-19 19:07:23.517304636 +0200 @@ -182,6 +182,15 @@ interrupts = <14>; clocks = <&v2m_oscclk1>, <&v2m_clk24mhz>; @@ -30983,9 +31308,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm64/include/asm/cmpxchg.h linux-3.10.30/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-16 15:28:19.997378014 +0200 ++++ linux-3.10.30/arch/arm64/include/asm/cmpxchg.h 2014-05-19 19:07:23.517304636 +0200 @@ -158,17 +158,23 @@ return ret; } @@ -31020,9 +31345,9 @@ diff -Nur linux-3.10.30.orig/arch/arm64/include/asm/cmpxchg.h linux-linaro-stabl #define cmpxchg64(ptr,o,n) cmpxchg((ptr),(o),(n)) #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 +diff -Nur linux-3.10.30.orig/arch/arm64/include/asm/cpu_ops.h linux-3.10.30/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-16 15:28:19.997378014 +0200 ++++ linux-3.10.30/arch/arm64/include/asm/cpu_ops.h 2014-05-19 19:07:23.517304636 +0200 @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2013 ARM Ltd. @@ -31083,9 +31408,9 @@ diff -Nur linux-3.10.30.orig/arch/arm64/include/asm/cpu_ops.h linux-linaro-stabl +extern void __init cpu_read_bootcpu_ops(void); + +#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 +diff -Nur linux-3.10.30.orig/arch/arm64/include/asm/irq.h linux-3.10.30/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-16 15:28:19.997378014 +0200 ++++ linux-3.10.30/arch/arm64/include/asm/irq.h 2014-05-19 19:07:23.517304636 +0200 @@ -4,6 +4,7 @@ #include <asm-generic/irq.h> @@ -31094,9 +31419,9 @@ diff -Nur linux-3.10.30.orig/arch/arm64/include/asm/irq.h linux-linaro-stable-mx extern void set_handle_irq(void (*handle_irq)(struct pt_regs *)); #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 +diff -Nur linux-3.10.30.orig/arch/arm64/include/asm/pgtable-3level-types.h linux-3.10.30/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-16 15:28:19.997378014 +0200 ++++ linux-3.10.30/arch/arm64/include/asm/pgtable-3level-types.h 2014-05-19 19:07:23.517304636 +0200 @@ -16,6 +16,8 @@ #ifndef __ASM_PGTABLE_3LEVEL_TYPES_H #define __ASM_PGTABLE_3LEVEL_TYPES_H @@ -31106,9 +31431,9 @@ diff -Nur linux-3.10.30.orig/arch/arm64/include/asm/pgtable-3level-types.h linux typedef u64 pteval_t; typedef u64 pmdval_t; 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 +diff -Nur linux-3.10.30.orig/arch/arm64/include/asm/psci.h linux-3.10.30/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-16 15:28:19.997378014 +0200 ++++ linux-3.10.30/arch/arm64/include/asm/psci.h 2014-05-19 19:07:23.521304652 +0200 @@ -14,25 +14,6 @@ #ifndef __ASM_PSCI_H #define __ASM_PSCI_H @@ -31135,9 +31460,9 @@ diff -Nur linux-3.10.30.orig/arch/arm64/include/asm/psci.h linux-linaro-stable-m int psci_init(void); #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 +diff -Nur linux-3.10.30.orig/arch/arm64/include/asm/smp.h linux-3.10.30/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-16 15:28:19.997378014 +0200 ++++ linux-3.10.30/arch/arm64/include/asm/smp.h 2014-05-19 19:07:23.521304652 +0200 @@ -60,21 +60,14 @@ void *stack; }; @@ -31164,9 +31489,9 @@ diff -Nur linux-3.10.30.orig/arch/arm64/include/asm/smp.h linux-linaro-stable-mx +extern void cpu_die(void); #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 +diff -Nur linux-3.10.30.orig/arch/arm64/include/asm/topology.h linux-3.10.30/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-16 15:28:20.001378034 +0200 ++++ linux-3.10.30/arch/arm64/include/asm/topology.h 2014-05-19 19:07:23.521304652 +0200 @@ -0,0 +1,73 @@ +#ifndef _ASM_ARM_TOPOLOGY_H +#define _ASM_ARM_TOPOLOGY_H @@ -31241,9 +31566,9 @@ diff -Nur linux-3.10.30.orig/arch/arm64/include/asm/topology.h linux-linaro-stab +#include <asm-generic/topology.h> + +#endif /* _ASM_ARM_TOPOLOGY_H */ -diff -Nur linux-3.10.30.orig/arch/arm64/Kconfig linux-linaro-stable-mx6/arch/arm64/Kconfig +diff -Nur linux-3.10.30.orig/arch/arm64/Kconfig linux-3.10.30/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-16 15:28:19.989377972 +0200 ++++ linux-3.10.30/arch/arm64/Kconfig 2014-05-19 19:07:23.521304652 +0200 @@ -144,12 +144,139 @@ If you don't know what to do here, say N. @@ -31399,9 +31724,9 @@ diff -Nur linux-3.10.30.orig/arch/arm64/Kconfig linux-linaro-stable-mx6/arch/arm source "net/Kconfig" 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 +diff -Nur linux-3.10.30.orig/arch/arm64/kernel/cpu_ops.c linux-3.10.30/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-16 15:28:20.001378034 +0200 ++++ linux-3.10.30/arch/arm64/kernel/cpu_ops.c 2014-05-19 19:07:23.521304652 +0200 @@ -0,0 +1,99 @@ +/* + * CPU kernel entry/exit control @@ -31502,9 +31827,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm64/kernel/cputable.c linux-3.10.30/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-16 15:28:20.001378034 +0200 ++++ linux-3.10.30/arch/arm64/kernel/cputable.c 2014-05-19 19:07:23.521304652 +0200 @@ -22,7 +22,7 @@ extern unsigned long __cpu_setup(void); @@ -31514,9 +31839,9 @@ diff -Nur linux-3.10.30.orig/arch/arm64/kernel/cputable.c linux-linaro-stable-mx { .cpu_id_val = 0x000f0000, .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 +diff -Nur linux-3.10.30.orig/arch/arm64/kernel/head.S linux-3.10.30/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-16 15:28:20.001378034 +0200 ++++ linux-3.10.30/arch/arm64/kernel/head.S 2014-05-19 19:07:23.521304652 +0200 @@ -217,7 +217,6 @@ .quad PAGE_OFFSET @@ -31543,9 +31868,9 @@ diff -Nur linux-3.10.30.orig/arch/arm64/kernel/head.S linux-linaro-stable-mx6/ar ENTRY(secondary_startup) /* -diff -Nur linux-3.10.30.orig/arch/arm64/kernel/irq.c linux-linaro-stable-mx6/arch/arm64/kernel/irq.c +diff -Nur linux-3.10.30.orig/arch/arm64/kernel/irq.c linux-3.10.30/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-16 15:28:20.005378056 +0200 ++++ linux-3.10.30/arch/arm64/kernel/irq.c 2014-05-19 19:07:23.521304652 +0200 @@ -81,3 +81,64 @@ if (!handle_arch_irq) panic("No interrupt controller found."); @@ -31611,9 +31936,9 @@ diff -Nur linux-3.10.30.orig/arch/arm64/kernel/irq.c linux-linaro-stable-mx6/arc + local_irq_restore(flags); +} +#endif /* CONFIG_HOTPLUG_CPU */ -diff -Nur linux-3.10.30.orig/arch/arm64/kernel/Makefile linux-linaro-stable-mx6/arch/arm64/kernel/Makefile +diff -Nur linux-3.10.30.orig/arch/arm64/kernel/Makefile linux-3.10.30/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-16 15:28:20.001378034 +0200 ++++ linux-3.10.30/arch/arm64/kernel/Makefile 2014-05-19 19:07:23.521304652 +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 \ @@ -31633,9 +31958,9 @@ diff -Nur linux-3.10.30.orig/arch/arm64/kernel/Makefile linux-linaro-stable-mx6/ obj-y += $(arm64-obj-y) vdso/ 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 +diff -Nur linux-3.10.30.orig/arch/arm64/kernel/process.c linux-3.10.30/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-16 15:28:20.005378056 +0200 ++++ linux-3.10.30/arch/arm64/kernel/process.c 2014-05-19 19:07:23.521304652 +0200 @@ -102,6 +102,13 @@ local_irq_enable(); } @@ -31650,9 +31975,9 @@ diff -Nur linux-3.10.30.orig/arch/arm64/kernel/process.c linux-linaro-stable-mx6 void machine_shutdown(void) { #ifdef CONFIG_SMP -diff -Nur linux-3.10.30.orig/arch/arm64/kernel/psci.c linux-linaro-stable-mx6/arch/arm64/kernel/psci.c +diff -Nur linux-3.10.30.orig/arch/arm64/kernel/psci.c linux-3.10.30/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-16 15:28:20.005378056 +0200 ++++ linux-3.10.30/arch/arm64/kernel/psci.c 2014-05-19 19:07:23.521304652 +0200 @@ -17,12 +17,32 @@ #include <linux/init.h> @@ -31756,9 +32081,9 @@ 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 +diff -Nur linux-3.10.30.orig/arch/arm64/kernel/setup.c linux-3.10.30/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-16 15:28:20.005378056 +0200 ++++ linux-3.10.30/arch/arm64/kernel/setup.c 2014-05-19 19:07:23.521304652 +0200 @@ -45,6 +45,7 @@ #include <asm/cputype.h> #include <asm/elf.h> @@ -31787,9 +32112,9 @@ diff -Nur linux-3.10.30.orig/arch/arm64/kernel/setup.c linux-linaro-stable-mx6/a #ifdef CONFIG_SMP smp_init_cpus(); #endif -diff -Nur linux-3.10.30.orig/arch/arm64/kernel/smp.c linux-linaro-stable-mx6/arch/arm64/kernel/smp.c +diff -Nur linux-3.10.30.orig/arch/arm64/kernel/smp.c linux-3.10.30/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-16 15:28:20.005378056 +0200 ++++ linux-3.10.30/arch/arm64/kernel/smp.c 2014-05-19 19:07:23.521304652 +0200 @@ -39,6 +39,7 @@ #include <asm/atomic.h> #include <asm/cacheflush.h> @@ -32136,9 +32461,9 @@ diff -Nur linux-3.10.30.orig/arch/arm64/kernel/smp.c linux-linaro-stable-mx6/arc if (err) continue; -diff -Nur linux-3.10.30.orig/arch/arm64/kernel/smp_psci.c linux-linaro-stable-mx6/arch/arm64/kernel/smp_psci.c +diff -Nur linux-3.10.30.orig/arch/arm64/kernel/smp_psci.c linux-3.10.30/arch/arm64/kernel/smp_psci.c --- linux-3.10.30.orig/arch/arm64/kernel/smp_psci.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/arch/arm64/kernel/smp_psci.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.30/arch/arm64/kernel/smp_psci.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -/* - * PSCI SMP initialisation @@ -32193,9 +32518,9 @@ diff -Nur linux-3.10.30.orig/arch/arm64/kernel/smp_psci.c linux-linaro-stable-mx - .init_cpu = smp_psci_init_cpu, - .prepare_cpu = smp_psci_prepare_cpu, -}; -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 +diff -Nur linux-3.10.30.orig/arch/arm64/kernel/smp_spin_table.c linux-3.10.30/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-16 15:28:20.005378056 +0200 ++++ linux-3.10.30/arch/arm64/kernel/smp_spin_table.c 2014-05-19 19:07:23.521304652 +0200 @@ -16,15 +16,39 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ @@ -32310,9 +32635,9 @@ diff -Nur linux-3.10.30.orig/arch/arm64/kernel/smp_spin_table.c linux-linaro-sta + .cpu_boot = smp_spin_table_cpu_boot, + .cpu_postboot = smp_spin_table_cpu_postboot, }; -diff -Nur linux-3.10.30.orig/arch/arm64/kernel/topology.c linux-linaro-stable-mx6/arch/arm64/kernel/topology.c +diff -Nur linux-3.10.30.orig/arch/arm64/kernel/topology.c linux-3.10.30/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-16 15:28:20.005378056 +0200 ++++ linux-3.10.30/arch/arm64/kernel/topology.c 2014-05-19 19:07:23.521304652 +0200 @@ -0,0 +1,537 @@ +/* + * arch/arm64/kernel/topology.c @@ -32851,9 +33176,9 @@ diff -Nur linux-3.10.30.orig/arch/arm64/kernel/topology.c linux-linaro-stable-mx + + parse_dt_topology(); +} -diff -Nur linux-3.10.30.orig/arch/arm64/kernel/vmlinux.lds.S linux-linaro-stable-mx6/arch/arm64/kernel/vmlinux.lds.S +diff -Nur linux-3.10.30.orig/arch/arm64/kernel/vmlinux.lds.S linux-3.10.30/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-16 15:28:20.005378056 +0200 ++++ linux-3.10.30/arch/arm64/kernel/vmlinux.lds.S 2014-05-19 19:07:23.521304652 +0200 @@ -41,7 +41,6 @@ } .text : { /* Real text segment */ @@ -32862,9 +33187,9 @@ diff -Nur linux-3.10.30.orig/arch/arm64/kernel/vmlinux.lds.S linux-linaro-stable __exception_text_start = .; *(.exception.text) __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 +diff -Nur linux-3.10.30.orig/arch/mips/include/asm/pci.h linux-3.10.30/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-16 15:28:20.521380778 +0200 ++++ linux-3.10.30/arch/mips/include/asm/pci.h 2014-05-19 19:07:23.521304652 +0200 @@ -137,11 +137,6 @@ return channel ? 15 : 14; } @@ -32877,9 +33202,9 @@ diff -Nur linux-3.10.30.orig/arch/mips/include/asm/pci.h linux-linaro-stable-mx6 extern char * (*pcibios_plat_setup)(char *str); #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 +diff -Nur linux-3.10.30.orig/arch/powerpc/include/asm/pci.h linux-3.10.30/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-16 15:28:20.757382022 +0200 ++++ linux-3.10.30/arch/powerpc/include/asm/pci.h 2014-05-19 19:07:23.521304652 +0200 @@ -113,11 +113,6 @@ /* Decide whether to display the domain number in /proc */ extern int pci_proc_domain(struct pci_bus *bus); @@ -32892,9 +33217,9 @@ diff -Nur linux-3.10.30.orig/arch/powerpc/include/asm/pci.h linux-linaro-stable- struct vm_area_struct; /* Map a range of PCI memory or I/O space for a device into user space */ 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 +diff -Nur linux-3.10.30.orig/arch/powerpc/include/asm/prom.h linux-3.10.30/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-16 15:28:20.761382044 +0200 ++++ linux-3.10.30/arch/powerpc/include/asm/prom.h 2014-05-19 19:07:23.525304666 +0200 @@ -43,9 +43,6 @@ extern void kdump_move_device_tree(void); @@ -32905,9 +33230,9 @@ diff -Nur linux-3.10.30.orig/arch/powerpc/include/asm/prom.h linux-linaro-stable /* cache lookup */ struct device_node *of_find_next_cache_node(struct device_node *np); -diff -Nur linux-3.10.30.orig/arch/powerpc/kernel/prom.c linux-linaro-stable-mx6/arch/powerpc/kernel/prom.c +diff -Nur linux-3.10.30.orig/arch/powerpc/kernel/prom.c linux-3.10.30/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-16 15:28:20.785382170 +0200 ++++ linux-3.10.30/arch/powerpc/kernel/prom.c 2014-05-19 19:07:23.525304666 +0200 @@ -827,49 +827,10 @@ __initcall(prom_reconfig_setup); #endif @@ -32960,9 +33285,9 @@ diff -Nur linux-3.10.30.orig/arch/powerpc/kernel/prom.c linux-linaro-stable-mx6/ #if defined(CONFIG_DEBUG_FS) && defined(DEBUG) 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 +diff -Nur linux-3.10.30.orig/arch/s390/include/asm/pci.h linux-3.10.30/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-16 15:28:20.885382697 +0200 ++++ linux-3.10.30/arch/s390/include/asm/pci.h 2014-05-19 19:07:23.525304666 +0200 @@ -21,10 +21,6 @@ int pci_domain_nr(struct pci_bus *); int pci_proc_domain(struct pci_bus *); @@ -32974,9 +33299,9 @@ diff -Nur linux-3.10.30.orig/arch/s390/include/asm/pci.h linux-linaro-stable-mx6 #define ZPCI_BUS_NR 0 /* default bus number */ #define ZPCI_DEVFN 0 /* default device number */ -diff -Nur linux-3.10.30.orig/arch/x86/include/asm/pci.h linux-linaro-stable-mx6/arch/x86/include/asm/pci.h +diff -Nur linux-3.10.30.orig/arch/x86/include/asm/pci.h linux-3.10.30/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-16 15:28:21.161384153 +0200 ++++ linux-3.10.30/arch/x86/include/asm/pci.h 2014-05-19 19:07:23.525304666 +0200 @@ -100,29 +100,6 @@ extern void pci_iommu_alloc(void); @@ -33024,9 +33349,9 @@ diff -Nur linux-3.10.30.orig/arch/x86/include/asm/pci.h linux-linaro-stable-mx6/ #endif #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 +diff -Nur linux-3.10.30.orig/arch/x86/kernel/x86_init.c linux-3.10.30/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-16 15:28:21.209384406 +0200 ++++ linux-3.10.30/arch/x86/kernel/x86_init.c 2014-05-19 19:07:23.525304666 +0200 @@ -107,6 +107,8 @@ }; @@ -33065,9 +33390,9 @@ diff -Nur linux-3.10.30.orig/arch/x86/kernel/x86_init.c linux-linaro-stable-mx6/ struct x86_io_apic_ops x86_io_apic_ops = { .init = native_io_apic_init_mappings, .read = native_io_apic_read, -diff -Nur linux-3.10.30.orig/block/blk-core.c linux-linaro-stable-mx6/block/blk-core.c +diff -Nur linux-3.10.30.orig/block/blk-core.c linux-3.10.30/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-16 15:28:21.285384807 +0200 ++++ linux-3.10.30/block/blk-core.c 2014-05-19 19:07:23.525304666 +0200 @@ -3191,7 +3191,8 @@ /* used for unplugging and affects IO latency/throughput - HIGHPRI */ @@ -33078,9 +33403,9 @@ diff -Nur linux-3.10.30.orig/block/blk-core.c linux-linaro-stable-mx6/block/blk- if (!kblockd_workqueue) panic("Failed to create kblockd\n"); -diff -Nur linux-3.10.30.orig/block/blk-ioc.c linux-linaro-stable-mx6/block/blk-ioc.c +diff -Nur linux-3.10.30.orig/block/blk-ioc.c linux-3.10.30/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-16 15:28:21.285384807 +0200 ++++ linux-3.10.30/block/blk-ioc.c 2014-05-19 19:07:23.525304666 +0200 @@ -144,7 +144,8 @@ if (atomic_long_dec_and_test(&ioc->refcount)) { spin_lock_irqsave(&ioc->lock, flags); @@ -33091,9 +33416,9 @@ diff -Nur linux-3.10.30.orig/block/blk-ioc.c linux-linaro-stable-mx6/block/blk-i else free_ioc = true; spin_unlock_irqrestore(&ioc->lock, flags); -diff -Nur linux-3.10.30.orig/block/genhd.c linux-linaro-stable-mx6/block/genhd.c +diff -Nur linux-3.10.30.orig/block/genhd.c linux-3.10.30/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-16 15:28:21.289384827 +0200 ++++ linux-3.10.30/block/genhd.c 2014-05-19 19:07:23.525304666 +0200 @@ -1489,9 +1489,11 @@ intv = disk_events_poll_jiffies(disk); set_timer_slack(&ev->dwork.timer, intv / 4); @@ -33128,9 +33453,9 @@ diff -Nur linux-3.10.30.orig/block/genhd.c linux-linaro-stable-mx6/block/genhd.c spin_unlock_irq(&ev->lock); -diff -Nur linux-3.10.30.orig/Documentation/ABI/testing/sysfs-class-mtd linux-linaro-stable-mx6/Documentation/ABI/testing/sysfs-class-mtd +diff -Nur linux-3.10.30.orig/Documentation/ABI/testing/sysfs-class-mtd linux-3.10.30/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-16 15:28:19.173373668 +0200 ++++ linux-3.10.30/Documentation/ABI/testing/sysfs-class-mtd 2014-05-19 19:07:23.525304666 +0200 @@ -104,7 +104,7 @@ One of the following ASCII strings, representing the device type: @@ -33168,9 +33493,9 @@ diff -Nur linux-3.10.30.orig/Documentation/ABI/testing/sysfs-class-mtd linux-lin + + It will always be a non-negative integer. In the case of + 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 +diff -Nur linux-3.10.30.orig/Documentation/arm/small_task_packing.txt linux-3.10.30/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-16 15:28:19.257374111 +0200 ++++ linux-3.10.30/Documentation/arm/small_task_packing.txt 2014-05-19 19:07:23.525304666 +0200 @@ -0,0 +1,136 @@ +Small Task Packing in the big.LITTLE MP Reference Patch Set + @@ -33308,9 +33633,9 @@ diff -Nur linux-3.10.30.orig/Documentation/arm/small_task_packing.txt linux-lina +CPUs and one mostly-busy CPU. This decreases the amount of time +available where the whole package is idle and can be turned off. + -diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/arm/cci.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/cci.txt +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/arm/cci.txt linux-3.10.30/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-16 15:28:19.281374237 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/arm/cci.txt 2014-05-19 19:07:23.525304666 +0200 @@ -0,0 +1,172 @@ +======================================================= +ARM CCI cache coherent interconnect binding description @@ -33484,9 +33809,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/arm/cci.txt linux +CCI slave interface @0x000000002c091000 is connected to dma controller dma0. +CCI slave interface @0x000000002c094000 is connected to CPUs {CPU0, CPU1}; +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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt linux-3.10.30/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-16 15:28:19.281374237 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/arm/imx/busfreq-imx6.txt 2014-05-19 19:07:23.525304666 +0200 @@ -0,0 +1,64 @@ +Freescale Busfreq driver + @@ -33552,9 +33877,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/arm/imx/busfreq-i + SET_RUNTIME_PM_OPS(ipu_runtime_suspend, ipu_runtime_resume, NULL) + SET_SYSTEM_SLEEP_PM_OPS(ipu_suspend, ipu_resume) +}; -diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/arm/imx/gpc.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/imx/gpc.txt +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/arm/imx/gpc.txt linux-3.10.30/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-16 15:28:19.281374237 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/arm/imx/gpc.txt 2014-05-19 19:07:23.525304666 +0200 @@ -0,0 +1,20 @@ +Freescale imx GPC bindings + @@ -33576,9 +33901,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/arm/imx/gpc.txt l + fsl,cpu_pdnscr_iso2sw = <0x1>; + fsl,cpu_pdnscr_iso = <0x1>; + }; -diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/arm/pmu.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/arm/pmu.txt +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/arm/pmu.txt linux-3.10.30/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-16 15:28:19.281374237 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/arm/pmu.txt 2014-05-19 19:07:23.529304681 +0200 @@ -16,6 +16,9 @@ "arm,arm1176-pmu" "arm,arm1136-pmu" @@ -33589,9 +33914,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/arm/pmu.txt linux Example: -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/arm/rtsm-dcscb.txt linux-3.10.30/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-16 15:28:19.281374237 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/arm/rtsm-dcscb.txt 2014-05-19 19:07:23.529304681 +0200 @@ -0,0 +1,19 @@ +ARM Dual Cluster System Configuration Block +------------------------------------------- @@ -33612,9 +33937,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/arm/rtsm-dcscb.tx + compatible = "arm,rtsm,dcscb"; + reg = <0x60000000 0x1000>; + }; -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/bus/imx-weim.txt linux-3.10.30/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-16 15:28:19.289374280 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/bus/imx-weim.txt 2014-05-19 19:07:23.529304681 +0200 @@ -0,0 +1,49 @@ +Device tree bindings for i.MX Wireless External Interface Module (WEIM) + @@ -33665,9 +33990,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/bus/imx-weim.txt + 0x0000c000 0x1404a38e 0x00000000>; + }; + }; -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/clock/imx6q-clock.txt linux-3.10.30/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-16 15:28:19.293374301 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/clock/imx6q-clock.txt 2014-05-19 19:07:23.529304681 +0200 @@ -89,8 +89,6 @@ gpu3d_shader 74 ipu1_podf 75 @@ -33707,9 +34032,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/clock/imx6q-clock Examples: -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/clock/imx6sl-clock.txt linux-3.10.30/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-16 15:28:19.293374301 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/clock/imx6sl-clock.txt 2014-05-19 19:07:23.529304681 +0200 @@ -0,0 +1,10 @@ +* Clock bindings for Freescale i.MX6 SoloLite + @@ -33721,9 +34046,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/clock/imx6sl-cloc +The clock consumer should specify the desired clock by having the clock +ID in its "clocks" phandle cell. See include/dt-bindings/clock/imx6sl-clock.h +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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/clock/vf610-clock.txt linux-3.10.30/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-16 15:28:19.293374301 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/clock/vf610-clock.txt 2014-05-19 19:07:23.529304681 +0200 @@ -0,0 +1,26 @@ +* Clock bindings for Freescale Vybrid VF610 SOC + @@ -33751,9 +34076,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/clock/vf610-clock + clocks = <&clks VF610_CLK_UART1>; + clock-names = "ipg"; +}; -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/cpufreq/cpufreq-imx6q.txt linux-3.10.30/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-16 15:28:19.293374301 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/cpufreq/cpufreq-imx6q.txt 2014-05-19 19:07:23.529304681 +0200 @@ -0,0 +1,59 @@ +iMX6q/iMX6dl/iMX6sl specific CPUFREQ settings + @@ -33814,9 +34139,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/cpufreq/cpufreq-i + next-level-cache = <&L2>; + }; +}; -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt linux-3.10.30/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-16 15:28:19.293374301 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt 2014-05-19 19:07:23.529304681 +0200 @@ -4,14 +4,71 @@ - compatible : Should be "fsl,<chip>-sdma" - reg : Should contain SDMA registers location and length @@ -33889,9 +34214,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/dma/fsl-imx-sdma. + dma-names = "rx", "tx"; + fsl,fifo-depth = <15>; +}; -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/fb/fsl_epdc_fb.txt linux-3.10.30/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-16 15:28:19.297374322 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/fb/fsl_epdc_fb.txt 2014-05-19 19:07:23.529304681 +0200 @@ -0,0 +1,30 @@ +* Freescale MXC Electrophoretic Display Controller (EPDC) + @@ -33923,9 +34248,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/fb/fsl_epdc_fb.tx + DISPLAY_supply = <&DISPLAY_reg>; + status = "disabled"; +}; -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt linux-3.10.30/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-16 15:28:19.297374322 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.txt 2014-05-19 19:07:23.529304681 +0200 @@ -0,0 +1,146 @@ +* FSL IPUv3 Display/FB + @@ -34073,9 +34398,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/fb/fsl_ipuv3_fb.t + resets = <&mipi_dsi_reset>; + status = "okay"; + }; -diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/fb/mxsfb.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/fb/mxsfb.txt +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/fb/mxsfb.txt linux-3.10.30/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-16 15:28:19.297374322 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/fb/mxsfb.txt 2014-05-19 19:07:23.529304681 +0200 @@ -3,6 +3,9 @@ Required properties: - compatible: Should be "fsl,<chip>-lcdif". Supported chips include @@ -34097,9 +34422,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/fb/mxsfb.txt linu display: display { 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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/input/touchscreen/elan-ts.txt linux-3.10.30/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-16 15:28:19.309374386 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/input/touchscreen/elan-ts.txt 2014-05-19 19:07:23.529304681 +0200 @@ -0,0 +1,23 @@ +* ELAN Resistive Touch Controller + @@ -34124,9 +34449,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/input/touchscreen + gpio_intr = <&gpio3 28 0>; + status = "okay"; + }; -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/leds/leds-pwm.txt linux-3.10.30/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-16 15:28:19.313374406 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/leds/leds-pwm.txt 2014-05-19 19:07:23.533304695 +0200 @@ -13,6 +13,9 @@ For the pwms and pwm-names property please refer to: Documentation/devicetree/bindings/pwm/pwm.txt @@ -34137,9 +34462,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/leds/leds-pwm.txt - label : (optional) see Documentation/devicetree/bindings/leds/common.txt - linux,default-trigger : (optional) -diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/mfd/vexpress-spc.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/mfd/vexpress-spc.txt +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/mfd/vexpress-spc.txt linux-3.10.30/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-16 15:28:19.317374427 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/mfd/vexpress-spc.txt 2014-05-19 19:07:23.533304695 +0200 @@ -0,0 +1,35 @@ +* ARM Versatile Express Serial Power Controller device tree bindings + @@ -34176,9 +34501,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/mfd/vexpress-spc. + reg = <0 0x7FFF0000 0 0x1000>; + interrupts = <0 95 4>; +}; -diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/mlb/mlb150.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/mlb/mlb150.txt +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/mlb/mlb150.txt linux-3.10.30/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-16 15:28:19.321374448 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/mlb/mlb150.txt 2014-05-19 19:07:23.533304695 +0200 @@ -0,0 +1,22 @@ +* Freescale Media Local Bus Host Controller (MLB) for i.MX6Q/DL + @@ -34202,9 +34527,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/mlb/mlb150.txt li + clock-names = "mlb", "pll8_mlb"; + iram = <&ocram>; +}; -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt linux-3.10.30/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-16 15:28:19.321374448 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt 2014-05-19 19:07:23.533304695 +0200 @@ -12,6 +12,11 @@ Optional properties: - fsl,cd-controller : Indicate to use controller internal card detection @@ -34217,9 +34542,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc Examples: -diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/mmc/mmc.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/mmc/mmc.txt +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/mmc/mmc.txt linux-3.10.30/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-16 15:28:19.321374448 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/mmc/mmc.txt 2014-05-19 19:07:23.533304695 +0200 @@ -5,6 +5,8 @@ Interpreted by the OF core: - reg: Registers location and length. @@ -34245,9 +34570,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/mmc/mmc.txt linux *NOTE* on CD and WP polarity. To use common for all SD/MMC host controllers line polarity properties, we have to fix the meaning of the "normal" and "inverted" line levels. We choose to follow the SDHCI standard, which specifies both those -diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/mtd/gpmi-nand.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/mtd/gpmi-nand.txt +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/mtd/gpmi-nand.txt linux-3.10.30/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-16 15:28:19.325374469 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/mtd/gpmi-nand.txt 2014-05-19 19:07:23.533304695 +0200 @@ -17,6 +17,14 @@ Optional properties: - nand-on-flash-bbt: boolean to enable on flash bbt option if not @@ -34263,9 +34588,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/mtd/gpmi-nand.txt The device tree may optionally contain sub-nodes describing partitions of the 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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt linux-3.10.30/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-16 15:28:19.325374469 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt 2014-05-19 19:07:23.533304695 +0200 @@ -15,6 +15,13 @@ Optional properties: @@ -34280,9 +34605,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/net/can/fsl-flexc Example: -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/pci/designware-pcie.txt linux-3.10.30/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-16 15:28:19.329374490 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/pci/designware-pcie.txt 2014-05-19 19:07:23.533304695 +0200 @@ -0,0 +1,81 @@ +* Synopsis Designware PCIe interface + @@ -34365,9 +34690,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/pci/designware-pc + pcie@2a0000 { + reset-gpio = <&pin_ctrl 22 0>; + }; -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/pci/mvebu-pci.txt linux-3.10.30/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-16 15:28:19.329374490 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/pci/mvebu-pci.txt 2014-05-19 19:07:23.533304695 +0200 @@ -0,0 +1,221 @@ +* Marvell EBU PCIe interfaces + @@ -34590,9 +34915,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/pci/mvebu-pci.txt + status = "disabled"; + }; +}; -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/pinctrl/fsl,vf610-pinctrl.txt linux-3.10.30/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-16 15:28:19.329374490 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/pinctrl/fsl,vf610-pinctrl.txt 2014-05-19 19:07:23.533304695 +0200 @@ -0,0 +1,41 @@ +Freescale Vybrid VF610 IOMUX Controller + @@ -34635,9 +34960,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/pinctrl/fsl,vf610 + +Please refer to vf610-pinfunc.h in device tree source folder +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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt linux-3.10.30/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-16 15:28:19.333374512 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt 2014-05-19 19:07:23.533304695 +0200 @@ -71,6 +71,13 @@ name for integer state ID 0, list entry 1 for state ID 1, and so on. @@ -34652,9 +34977,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/pinctrl/pinctrl-b For example: /* 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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/regulator/max17135-regulator.txt linux-3.10.30/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-16 15:28:19.341374554 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/regulator/max17135-regulator.txt 2014-05-19 19:07:23.533304695 +0200 @@ -0,0 +1,112 @@ +Maxim MAX17135 Voltage Regulator + @@ -34768,9 +35093,9 @@ 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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/regulator/pfuze100.txt linux-3.10.30/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-16 15:28:19.341374554 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/regulator/pfuze100.txt 2014-05-19 19:07:23.533304695 +0200 @@ -0,0 +1,115 @@ +PFUZE100 family of regulators + @@ -34887,9 +35212,9 @@ 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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/reset/gpio-reset.txt linux-3.10.30/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-16 15:28:19.341374554 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/reset/gpio-reset.txt 2014-05-19 19:07:23.537304711 +0200 @@ -0,0 +1,35 @@ +GPIO reset controller +===================== @@ -34926,9 +35251,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/reset/gpio-reset. + /* ... */ + resets = <&sii902x_reset>; /* active-low GPIO5_0, 10 ms delay */ +}; -diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/cs42888.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/cs42888.txt +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/cs42888.txt linux-3.10.30/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-16 15:28:19.345374575 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/sound/cs42888.txt 2014-05-19 19:07:23.537304711 +0200 @@ -0,0 +1,29 @@ +CS42888 audio CODEC + @@ -34959,9 +35284,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/cs42888.txt + VLS-supply = <®_audio>; + VLC-supply = <®_audio>; +}; -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt linux-3.10.30/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-16 15:28:19.345374575 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt 2014-05-19 19:07:23.537304711 +0200 @@ -0,0 +1,23 @@ +* Freescale Asynchronous Sample Rate Converter (ASRC) + @@ -34986,9 +35311,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/fsl-asrc-p2 + fsl,asrc-dma-tx-events = <20 21 22>; + status = "okay"; +}; -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/fsl-easi.txt linux-3.10.30/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-16 15:28:19.345374575 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/sound/fsl-easi.txt 2014-05-19 19:07:23.537304711 +0200 @@ -0,0 +1,26 @@ +* Freescale Enhanced Serial Audio Interface (ESAI) + @@ -35016,9 +35341,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/fsl-easi.tx + fsl,flags = <1>; + status = "disabled"; +}; -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/fsl,spdif.txt linux-3.10.30/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-16 15:28:19.345374575 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/sound/fsl,spdif.txt 2014-05-19 19:07:23.537304711 +0200 @@ -0,0 +1,54 @@ +Freescale Sony/Philips Digital Interface Format (S/PDIF) Controller + @@ -35074,9 +35399,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/fsl,spdif.t + + status = "okay"; +}; -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt linux-3.10.30/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-16 15:28:19.345374575 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/sound/imx-audio-cs42888.txt 2014-05-19 19:07:23.537304711 +0200 @@ -0,0 +1,25 @@ +Freescale i.MX audio complex with CS42888 codec + @@ -35103,9 +35428,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/imx-audio-c + asrc-controller = <&asrc_p2p>; + audio-codec = <&codec>; +}; -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/imx-audio-si476x.txt linux-3.10.30/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-16 15:28:19.345374575 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/sound/imx-audio-si476x.txt 2014-05-19 19:07:23.537304711 +0200 @@ -0,0 +1,24 @@ +Freescale i.MX audio complex with si476x codec + @@ -35131,9 +35456,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/imx-audio-s + mux-int-port = <2>; + mux-ext-port = <5>; +}; -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/imx-audio-spdif.txt linux-3.10.30/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-16 15:28:19.345374575 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/sound/imx-audio-spdif.txt 2014-05-19 19:07:23.537304711 +0200 @@ -0,0 +1,34 @@ +Freescale i.MX audio complex with S/PDIF transceiver + @@ -35169,9 +35494,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/imx-audio-s + spdif-out; + spdif-in; +}; -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt linux-3.10.30/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-16 15:28:19.345374575 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt 2014-05-19 19:07:23.537304711 +0200 @@ -0,0 +1,54 @@ +Freescale i.MX audio complex with WM8962 codec + @@ -35227,9 +35552,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/imx-audio-w + hp-det-gpios = <&gpio7 8 1>; + mic-det-gpios = <&gpio1 9 1>; +}; -diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/wm8962.txt linux-linaro-stable-mx6/Documentation/devicetree/bindings/sound/wm8962.txt +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/wm8962.txt linux-3.10.30/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-16 15:28:19.349374597 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/sound/wm8962.txt 2014-05-19 19:07:23.537304711 +0200 @@ -8,9 +8,40 @@ - reg : the I2C address of the device. @@ -35271,9 +35596,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/sound/wm8962.txt + 0x0000 /* 5:Default */ + >; }; -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/spi/spi-bus.txt linux-3.10.30/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-16 15:28:19.349374597 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/spi/spi-bus.txt 2014-05-19 19:07:23.541304725 +0200 @@ -55,6 +55,16 @@ chip select active high - spi-3wire - (optional) Empty property indicating device requires @@ -35291,9 +35616,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/spi/spi-bus.txt l If a gpio chipselect is used for the SPI slave the gpio number will be passed 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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/thermal/imx-thermal.txt linux-3.10.30/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-16 15:28:19.349374597 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/thermal/imx-thermal.txt 2014-05-19 19:07:23.541304725 +0200 @@ -0,0 +1,17 @@ +* Temperature Monitor (TEMPMON) on Freescale i.MX SoCs + @@ -35312,9 +35637,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/thermal/imx-therm + fsl,tempmon = <&anatop>; + fsl,tempmon-data = <&ocotp>; +}; -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt linux-3.10.30/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-16 15:28:19.353374617 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt 2014-05-19 19:07:23.541304725 +0200 @@ -8,6 +8,8 @@ Optional properties: - fsl,uart-has-rtscts : Indicate the uart has rts and cts @@ -35330,9 +35655,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/tty/serial/fsl-im fsl,uart-has-rtscts; + fsl,dte-mode; }; -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/tty/serial/fsl-lpuart.txt linux-3.10.30/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-16 15:28:19.353374617 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/tty/serial/fsl-lpuart.txt 2014-05-19 19:07:23.541304725 +0200 @@ -0,0 +1,14 @@ +* Freescale low power universal asynchronous receiver/transmitter (lpuart) + @@ -35348,9 +35673,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/tty/serial/fsl-lp + reg = <0x40027000 0x1000>; + interrupts = <0 61 0x00>; + }; -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt linux-3.10.30/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-16 15:28:19.353374617 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt 2014-05-19 19:07:23.541304725 +0200 @@ -5,6 +5,12 @@ - reg: Should contain registers location and length - interrupts: Should contain controller interrupt @@ -35384,9 +35709,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/usb/ci13xxx-imx.t + imx6-usb-charger-detection; + fsl,anatop = <&anatop>; }; -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/usb/mxs-phy.txt linux-3.10.30/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-16 15:28:19.353374617 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/usb/mxs-phy.txt 2014-05-19 19:07:23.541304725 +0200 @@ -1,13 +1,16 @@ * Freescale MXS USB Phy Device @@ -35405,9 +35730,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/usb/mxs-phy.txt l interrupts = <0 44 0x04>; + fsl,anatop = <&anatop>; }; -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/video/fsl,csi-v4l2-capture.txt linux-3.10.30/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-16 15:28:19.357374638 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/video/fsl,csi-v4l2-capture.txt 2014-05-19 19:07:23.541304725 +0200 @@ -0,0 +1,61 @@ +* Freescale CMOS Sensor Interface (CSI) V4L2 Capture + @@ -35470,9 +35795,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/video/fsl,csi-v4l + mclk = <24000000>; + mclk_source = <0>; + }; -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt linux-3.10.30/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-16 15:28:19.357374638 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt 2014-05-19 19:07:23.541304725 +0200 @@ -0,0 +1,42 @@ +* Freescale MIPI CSI2 Controller for i.MX6DQ/i.MX6SDL + @@ -35516,9 +35841,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/video/fsl,mipi-cs + v_channel = <0>; + lanes = <2>; + }; -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/video/fsl,pxp.txt linux-3.10.30/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-16 15:28:19.357374638 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/video/fsl,pxp.txt 2014-05-19 19:07:23.541304725 +0200 @@ -0,0 +1,30 @@ +* Freescale PxP Controller for i.MX6DL, i.MX6SL + @@ -35550,9 +35875,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/video/fsl,pxp.txt + &pxp { + status = "okay"; + }; -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt linux-3.10.30/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-16 15:28:19.357374638 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/video/fsl,v4l2-capture.txt 2014-05-19 19:07:23.541304725 +0200 @@ -0,0 +1,102 @@ +* Freescale V4L2 Capture for i.MX6DQ/i.MX6SDL + @@ -35656,9 +35981,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/video/fsl,v4l2-ca + mclk_source = <0>; + cvbs = <1>; + }; -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 +diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt linux-3.10.30/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-16 15:28:19.357374638 +0200 ++++ linux-3.10.30/Documentation/devicetree/bindings/video/mxc_hdmi_video.txt 2014-05-19 19:07:23.541304725 +0200 @@ -0,0 +1,20 @@ +Device-Tree bindings for hdmi video driver + @@ -35680,9 +36005,9 @@ diff -Nur linux-3.10.30.orig/Documentation/devicetree/bindings/video/mxc_hdmi_vi + fsl,phy_reg_cksymtx = <0x800d>; + }; + -diff -Nur linux-3.10.30.orig/Documentation/DocBook/mtdnand.tmpl linux-linaro-stable-mx6/Documentation/DocBook/mtdnand.tmpl +diff -Nur linux-3.10.30.orig/Documentation/DocBook/mtdnand.tmpl linux-3.10.30/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-16 15:28:19.237374005 +0200 ++++ linux-3.10.30/Documentation/DocBook/mtdnand.tmpl 2014-05-19 19:07:23.541304725 +0200 @@ -1222,10 +1222,6 @@ #define NAND_BBT_VERSION 0x00000100 /* Create a bbt if none axists */ @@ -35694,9 +36019,9 @@ diff -Nur linux-3.10.30.orig/Documentation/DocBook/mtdnand.tmpl linux-linaro-sta /* Write bbt if neccecary */ #define NAND_BBT_WRITE 0x00001000 /* 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 +diff -Nur linux-3.10.30.orig/Documentation/driver-model/devres.txt linux-3.10.30/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-16 15:28:19.361374659 +0200 ++++ linux-3.10.30/Documentation/driver-model/devres.txt 2014-05-19 19:07:23.541304725 +0200 @@ -293,3 +293,6 @@ PHY devm_usb_get_phy() @@ -35704,9 +36029,9 @@ diff -Nur linux-3.10.30.orig/Documentation/driver-model/devres.txt linux-linaro- + +SPI + devm_spi_register_master() -diff -Nur linux-3.10.30.orig/Documentation/kernel-parameters.txt linux-linaro-stable-mx6/Documentation/kernel-parameters.txt +diff -Nur linux-3.10.30.orig/Documentation/kernel-parameters.txt linux-3.10.30/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-16 15:28:19.421374976 +0200 ++++ linux-3.10.30/Documentation/kernel-parameters.txt 2014-05-19 19:07:23.545304740 +0200 @@ -1240,6 +1240,15 @@ See comment before ip2_setup() in drivers/char/ip2/ip2base.c. @@ -35745,9 +36070,9 @@ diff -Nur linux-3.10.30.orig/Documentation/kernel-parameters.txt linux-linaro-st x2apic_phys [X86-64,APIC] Use x2apic physical mode instead of default x2apic cluster mode on platforms supporting x2apic. -diff -Nur linux-3.10.30.orig/Documentation/vm/zswap.txt linux-linaro-stable-mx6/Documentation/vm/zswap.txt +diff -Nur linux-3.10.30.orig/Documentation/vm/zswap.txt linux-3.10.30/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-16 15:28:19.525375524 +0200 ++++ linux-3.10.30/Documentation/vm/zswap.txt 2014-05-19 19:07:23.545304740 +0200 @@ -0,0 +1,72 @@ +Overview: + @@ -35821,9 +36146,9 @@ diff -Nur linux-3.10.30.orig/Documentation/vm/zswap.txt linux-linaro-stable-mx6/ + +A debugfs interface is provided for various statistic about pool size, number +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 +diff -Nur linux-3.10.30.orig/drivers/ata/ahci.h linux-3.10.30/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-16 15:28:21.357385187 +0200 ++++ linux-3.10.30/drivers/ata/ahci.h 2014-05-19 19:07:23.545304740 +0200 @@ -337,6 +337,7 @@ .sdev_attrs = ahci_sdev_attrs @@ -35840,9 +36165,9 @@ diff -Nur linux-3.10.30.orig/drivers/ata/ahci.h linux-linaro-stable-mx6/drivers/ static inline void __iomem *__ahci_port_base(struct ata_host *host, 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 +diff -Nur linux-3.10.30.orig/drivers/ata/ahci_imx.c linux-3.10.30/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-16 15:28:21.357385187 +0200 ++++ linux-3.10.30/drivers/ata/ahci_imx.c 2014-05-19 19:07:23.545304740 +0200 @@ -0,0 +1,351 @@ +/* + * copyright (c) 2013 Freescale Semiconductor, Inc. @@ -36195,9 +36520,9 @@ diff -Nur linux-3.10.30.orig/drivers/ata/ahci_imx.c linux-linaro-stable-mx6/driv +MODULE_AUTHOR("Richard Zhu <Hong-Xing.Zhu@freescale.com>"); +MODULE_LICENSE("GPL"); +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 +diff -Nur linux-3.10.30.orig/drivers/ata/ahci_platform.c linux-3.10.30/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-16 15:28:21.357385187 +0200 ++++ linux-3.10.30/drivers/ata/ahci_platform.c 2014-05-19 19:07:23.545304740 +0200 @@ -49,10 +49,11 @@ }; MODULE_DEVICE_TABLE(platform, ahci_devtype); @@ -36211,9 +36536,9 @@ diff -Nur linux-3.10.30.orig/drivers/ata/ahci_platform.c linux-linaro-stable-mx6 static struct ata_port_operations ahci_platform_retry_srst_ops = { .inherits = &ahci_pmp_retry_srst_ops, -diff -Nur linux-3.10.30.orig/drivers/ata/Kconfig linux-linaro-stable-mx6/drivers/ata/Kconfig +diff -Nur linux-3.10.30.orig/drivers/ata/Kconfig linux-3.10.30/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-16 15:28:21.357385187 +0200 ++++ linux-3.10.30/drivers/ata/Kconfig 2014-05-19 19:07:23.545304740 +0200 @@ -97,6 +97,15 @@ If unsure, say N. @@ -36230,9 +36555,9 @@ diff -Nur linux-3.10.30.orig/drivers/ata/Kconfig linux-linaro-stable-mx6/drivers config SATA_FSL tristate "Freescale 3.0Gbps SATA support" depends on FSL_SOC -diff -Nur linux-3.10.30.orig/drivers/ata/libahci.c linux-linaro-stable-mx6/drivers/ata/libahci.c +diff -Nur linux-3.10.30.orig/drivers/ata/libahci.c linux-3.10.30/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-16 15:28:21.361385208 +0200 ++++ linux-3.10.30/drivers/ata/libahci.c 2014-05-19 19:07:23.545304740 +0200 @@ -89,7 +89,6 @@ static int ahci_hardreset(struct ata_link *link, unsigned int *class, unsigned long deadline); @@ -36258,9 +36583,9 @@ diff -Nur linux-3.10.30.orig/drivers/ata/libahci.c linux-linaro-stable-mx6/drive static void ahci_post_internal_cmd(struct ata_queued_cmd *qc) { -diff -Nur linux-3.10.30.orig/drivers/ata/Makefile linux-linaro-stable-mx6/drivers/ata/Makefile +diff -Nur linux-3.10.30.orig/drivers/ata/Makefile linux-3.10.30/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-16 15:28:21.357385187 +0200 ++++ linux-3.10.30/drivers/ata/Makefile 2014-05-19 19:07:23.545304740 +0200 @@ -10,6 +10,7 @@ obj-$(CONFIG_SATA_SIL24) += sata_sil24.o obj-$(CONFIG_SATA_DWC) += sata_dwc_460ex.o @@ -36269,9 +36594,9 @@ diff -Nur linux-3.10.30.orig/drivers/ata/Makefile linux-linaro-stable-mx6/driver # SFF w/ custom DMA 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 +diff -Nur linux-3.10.30.orig/drivers/base/base.h linux-3.10.30/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-16 15:28:21.393385376 +0200 ++++ linux-3.10.30/drivers/base/base.h 2014-05-19 19:07:23.545304740 +0200 @@ -119,6 +119,11 @@ return drv->bus->match ? drv->bus->match(dev, drv) : 1; } @@ -36284,9 +36609,9 @@ diff -Nur linux-3.10.30.orig/drivers/base/base.h linux-linaro-stable-mx6/drivers extern char *make_class_name(const char *name, struct kobject *kobj); 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 +diff -Nur linux-3.10.30.orig/drivers/base/bus.c linux-3.10.30/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-16 15:28:21.393385376 +0200 ++++ linux-3.10.30/drivers/base/bus.c 2014-05-19 19:07:23.545304740 +0200 @@ -499,6 +499,9 @@ error = device_add_attrs(bus, dev); if (error) @@ -36314,9 +36639,9 @@ diff -Nur linux-3.10.30.orig/drivers/base/bus.c linux-linaro-stable-mx6/drivers/ if (klist_node_attached(&dev->p->knode_bus)) klist_del(&dev->p->knode_bus); -diff -Nur linux-3.10.30.orig/drivers/base/component.c linux-linaro-stable-mx6/drivers/base/component.c +diff -Nur linux-3.10.30.orig/drivers/base/component.c linux-3.10.30/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-16 15:28:21.393385376 +0200 ++++ linux-3.10.30/drivers/base/component.c 2014-05-19 19:07:23.545304740 +0200 @@ -0,0 +1,382 @@ +/* + * Componentized device handling. @@ -36700,9 +37025,9 @@ diff -Nur linux-3.10.30.orig/drivers/base/component.c linux-linaro-stable-mx6/dr +EXPORT_SYMBOL_GPL(component_del); + +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.10.30.orig/drivers/base/core.c linux-linaro-stable-mx6/drivers/base/core.c +diff -Nur linux-3.10.30.orig/drivers/base/core.c linux-3.10.30/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-16 15:28:21.393385376 +0200 ++++ linux-3.10.30/drivers/base/core.c 2014-05-19 19:07:23.545304740 +0200 @@ -461,8 +461,7 @@ device_remove_bin_file(dev, &attrs[i]); } @@ -36724,9 +37049,9 @@ diff -Nur linux-3.10.30.orig/drivers/base/core.c linux-linaro-stable-mx6/drivers { int i; -diff -Nur linux-3.10.30.orig/drivers/base/Makefile linux-linaro-stable-mx6/drivers/base/Makefile +diff -Nur linux-3.10.30.orig/drivers/base/Makefile linux-3.10.30/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-16 15:28:21.389385355 +0200 ++++ linux-3.10.30/drivers/base/Makefile 2014-05-19 19:07:23.545304740 +0200 @@ -1,6 +1,6 @@ # Makefile for the Linux device tree @@ -36735,9 +37060,9 @@ diff -Nur linux-3.10.30.orig/drivers/base/Makefile linux-linaro-stable-mx6/drive driver.o class.o platform.o \ cpu.o firmware.o init.o map.o devres.o \ 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 +diff -Nur linux-3.10.30.orig/drivers/base/pinctrl.c linux-3.10.30/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-16 15:28:21.397385398 +0200 ++++ linux-3.10.30/drivers/base/pinctrl.c 2014-05-19 19:07:23.549304754 +0200 @@ -48,6 +48,25 @@ goto cleanup_get; } @@ -36764,9 +37089,9 @@ diff -Nur linux-3.10.30.orig/drivers/base/pinctrl.c linux-linaro-stable-mx6/driv return 0; /* -diff -Nur linux-3.10.30.orig/drivers/base/regmap/internal.h linux-linaro-stable-mx6/drivers/base/regmap/internal.h +diff -Nur linux-3.10.30.orig/drivers/base/regmap/internal.h linux-3.10.30/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-16 15:28:21.401385419 +0200 ++++ linux-3.10.30/drivers/base/regmap/internal.h 2014-05-19 19:07:23.549304754 +0200 @@ -52,6 +52,7 @@ struct regmap { struct mutex mutex; @@ -36775,9 +37100,9 @@ diff -Nur linux-3.10.30.orig/drivers/base/regmap/internal.h linux-linaro-stable- regmap_lock lock; regmap_unlock unlock; 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 +diff -Nur linux-3.10.30.orig/drivers/base/regmap/regmap.c linux-3.10.30/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-16 15:28:21.401385419 +0200 ++++ linux-3.10.30/drivers/base/regmap/regmap.c 2014-05-19 19:07:23.549304754 +0200 @@ -302,13 +302,16 @@ static void regmap_lock_spinlock(void *__map) { @@ -36797,9 +37122,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_conf.c linux-3.10.30/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-16 15:28:21.417385503 +0200 ++++ linux-3.10.30/drivers/block/enhanceio/eio_conf.c 2014-05-19 19:07:23.549304754 +0200 @@ -0,0 +1,2630 @@ +/* + * eio_conf.c @@ -39431,9 +39756,9 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_conf.c linux-linaro-sta +MODULE_AUTHOR("STEC, Inc. based on code by Facebook"); + +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 +diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_fifo.c linux-3.10.30/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-16 15:28:21.417385503 +0200 ++++ linux-3.10.30/drivers/block/enhanceio/eio_fifo.c 2014-05-19 19:07:23.549304754 +0200 @@ -0,0 +1,239 @@ +/* + * eio_fifo.c @@ -39674,9 +39999,9 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_fifo.c linux-linaro-sta +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("FIFO policy for EnhanceIO"); +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 +diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio.h linux-3.10.30/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-16 15:28:21.417385503 +0200 ++++ linux-3.10.30/drivers/block/enhanceio/eio.h 2014-05-19 19:07:23.549304754 +0200 @@ -0,0 +1,1150 @@ +/* + * eio.h @@ -40828,9 +41153,9 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio.h linux-linaro-stable-m +#define EIO_CACHE(dmc) (EIO_MD8(dmc) ? (void *)dmc->cache_md8 : (void *)dmc->cache) + +#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 +diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_ioctl.c linux-3.10.30/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-16 15:28:21.417385503 +0200 ++++ linux-3.10.30/drivers/block/enhanceio/eio_ioctl.c 2014-05-19 19:07:23.553304770 +0200 @@ -0,0 +1,157 @@ +/* + * eio_ioctl.c @@ -40989,9 +41314,9 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_ioctl.c linux-linaro-st +{ + return eio_ioctl(filp, cmd, arg); +} -diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_ioctl.h linux-linaro-stable-mx6/drivers/block/enhanceio/eio_ioctl.h +diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_ioctl.h linux-3.10.30/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-16 15:28:21.417385503 +0200 ++++ linux-3.10.30/drivers/block/enhanceio/eio_ioctl.h 2014-05-19 19:07:23.553304770 +0200 @@ -0,0 +1,86 @@ +/* + * eio_ioctl.h @@ -41079,9 +41404,9 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_ioctl.h linux-linaro-st +#endif /* __KERNEL__ */ + +#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 +diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_lru.c linux-3.10.30/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-16 15:28:21.417385503 +0200 ++++ linux-3.10.30/drivers/block/enhanceio/eio_lru.c 2014-05-19 19:07:23.553304770 +0200 @@ -0,0 +1,322 @@ +/* + * eio_lru.c @@ -41405,9 +41730,9 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_lru.c linux-linaro-stab +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("LRU policy for EnhanceIO"); +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 +diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_main.c linux-3.10.30/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-16 15:28:21.417385503 +0200 ++++ linux-3.10.30/drivers/block/enhanceio/eio_main.c 2014-05-19 19:07:23.553304770 +0200 @@ -0,0 +1,3546 @@ +/* + * eio_main.c @@ -44955,9 +45280,9 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_main.c linux-linaro-sta + + spin_unlock_irqrestore(&dmc->dirty_set_lru_lock, flags); +} -diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_mem.c linux-linaro-stable-mx6/drivers/block/enhanceio/eio_mem.c +diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_mem.c linux-3.10.30/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-16 15:28:21.417385503 +0200 ++++ linux-3.10.30/drivers/block/enhanceio/eio_mem.c 2014-05-19 19:07:23.553304770 +0200 @@ -0,0 +1,236 @@ +/* + * eio_mem.c @@ -45195,9 +45520,9 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_mem.c linux-linaro-stab + dbn != 0) /* we're replacing sector 0 */ + dmc->index_zero = dmc->assoc; +} -diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_policy.c linux-linaro-stable-mx6/drivers/block/enhanceio/eio_policy.c +diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_policy.c linux-3.10.30/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-16 15:28:21.417385503 +0200 ++++ linux-3.10.30/drivers/block/enhanceio/eio_policy.c 2014-05-19 19:07:23.569304829 +0200 @@ -0,0 +1,146 @@ +/* + * eio_policy.c @@ -45345,9 +45670,9 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_policy.c linux-linaro-s + if (p_ops && p_ops->sp_name == CACHE_REPL_LRU) + p_ops->sp_policy.lru->sl_reclaim_lru_movetail(dmc, i, p_ops); +} -diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_policy.h linux-linaro-stable-mx6/drivers/block/enhanceio/eio_policy.h +diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_policy.h linux-3.10.30/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-16 15:28:21.417385503 +0200 ++++ linux-3.10.30/drivers/block/enhanceio/eio_policy.h 2014-05-19 19:07:23.577304858 +0200 @@ -0,0 +1,105 @@ +/* + * eio_policy.h @@ -45454,9 +45779,9 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_policy.h linux-linaro-s +void eio_put_policy(struct eio_policy *); + +#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 +diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_procfs.c linux-3.10.30/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-16 15:28:21.417385503 +0200 ++++ linux-3.10.30/drivers/block/enhanceio/eio_procfs.c 2014-05-19 19:07:23.581304873 +0200 @@ -0,0 +1,1932 @@ +/* + * eio_procfs.c @@ -47390,9 +47715,9 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_procfs.c linux-linaro-s + + return single_open(file, &eio_config_show, PDE_DATA(inode)); +} -diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_rand.c linux-linaro-stable-mx6/drivers/block/enhanceio/eio_rand.c +diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_rand.c linux-3.10.30/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-16 15:28:21.417385503 +0200 ++++ linux-3.10.30/drivers/block/enhanceio/eio_rand.c 2014-05-19 19:07:23.581304873 +0200 @@ -0,0 +1,201 @@ +/* + * eio_rand.c @@ -47595,9 +47920,9 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_rand.c linux-linaro-sta +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("RAND policy for EnhanceIO"); +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 +diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_setlru.c linux-3.10.30/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-16 15:28:21.417385503 +0200 ++++ linux-3.10.30/drivers/block/enhanceio/eio_setlru.c 2014-05-19 19:07:23.581304873 +0200 @@ -0,0 +1,170 @@ +/* + * eio_setlru.c @@ -47769,9 +48094,9 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_setlru.c linux-linaro-s + + return 0; +} -diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_setlru.h linux-linaro-stable-mx6/drivers/block/enhanceio/eio_setlru.h +diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_setlru.h linux-3.10.30/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-16 15:28:21.417385503 +0200 ++++ linux-3.10.30/drivers/block/enhanceio/eio_setlru.h 2014-05-19 19:07:23.585304889 +0200 @@ -0,0 +1,49 @@ +/* + * eio_setlru.h @@ -47822,9 +48147,9 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_setlru.h linux-linaro-s +int lru_rem_head(struct lru_ls *llist, index_t *index, u_int64_t *key); + +#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 +diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_subr.c linux-3.10.30/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-16 15:28:21.421385524 +0200 ++++ linux-3.10.30/drivers/block/enhanceio/eio_subr.c 2014-05-19 19:07:23.585304889 +0200 @@ -0,0 +1,444 @@ +/* + * eio_subr.c @@ -48270,9 +48595,9 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_subr.c linux-linaro-sta + pr_info(" resume_caching:cache %s is restored to ACTIVE mode.\n", + dmc->cache_name); +} -diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_ttc.c linux-linaro-stable-mx6/drivers/block/enhanceio/eio_ttc.c +diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_ttc.c linux-3.10.30/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-16 15:28:21.421385524 +0200 ++++ linux-3.10.30/drivers/block/enhanceio/eio_ttc.c 2014-05-19 19:07:23.589304903 +0200 @@ -0,0 +1,1665 @@ +/* + * True Transparent Caching (TTC) code. @@ -49939,9 +50264,9 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_ttc.c linux-linaro-stab + } + return; +} -diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_ttc.h linux-linaro-stable-mx6/drivers/block/enhanceio/eio_ttc.h +diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_ttc.h linux-3.10.30/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-16 15:28:21.421385524 +0200 ++++ linux-3.10.30/drivers/block/enhanceio/eio_ttc.h 2014-05-19 19:07:23.589304903 +0200 @@ -0,0 +1,152 @@ +/* + * Copyright (C) 2012 STEC, Inc. All rights not specifically granted @@ -50095,9 +50420,9 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/eio_ttc.h linux-linaro-stab +#endif /* __KERNEL__ */ + +#endif /* EIO_TTC_H */ -diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/Kconfig linux-linaro-stable-mx6/drivers/block/enhanceio/Kconfig +diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/Kconfig linux-3.10.30/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-16 15:28:21.417385503 +0200 ++++ linux-3.10.30/drivers/block/enhanceio/Kconfig 2014-05-19 19:07:23.589304903 +0200 @@ -0,0 +1,21 @@ +# +# EnhanceIO caching solution by STEC INC. @@ -50120,9 +50445,9 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/Kconfig linux-linaro-stable + the caching engine module. + + If unsure, say N. -diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/Makefile linux-linaro-stable-mx6/drivers/block/enhanceio/Makefile +diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/Makefile linux-3.10.30/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-16 15:28:21.417385503 +0200 ++++ linux-3.10.30/drivers/block/enhanceio/Makefile 2014-05-19 19:07:23.589304903 +0200 @@ -0,0 +1,66 @@ +# test +# Makefile for EnhanceIO block device caching. @@ -50190,9 +50515,9 @@ diff -Nur linux-3.10.30.orig/drivers/block/enhanceio/Makefile linux-linaro-stabl +$(RHEL5_TREE): + rpmbuild -bp --target=`uname -m` $(RHEL5_SPEC) 2>&1 | tee `dirname $(RHEL5_SPEC)`/prep.log + -diff -Nur linux-3.10.30.orig/drivers/block/Kconfig linux-linaro-stable-mx6/drivers/block/Kconfig +diff -Nur linux-3.10.30.orig/drivers/block/Kconfig linux-3.10.30/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-16 15:28:21.405385440 +0200 ++++ linux-3.10.30/drivers/block/Kconfig 2014-05-19 19:07:23.589304903 +0200 @@ -541,4 +541,6 @@ To compile this driver as a module, choose M here: the module will be called rsxx. @@ -50200,9 +50525,9 @@ diff -Nur linux-3.10.30.orig/drivers/block/Kconfig linux-linaro-stable-mx6/drive +source "drivers/block/enhanceio/Kconfig" + endif # BLK_DEV -diff -Nur linux-3.10.30.orig/drivers/block/Makefile linux-linaro-stable-mx6/drivers/block/Makefile +diff -Nur linux-3.10.30.orig/drivers/block/Makefile linux-3.10.30/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-16 15:28:21.405385440 +0200 ++++ linux-3.10.30/drivers/block/Makefile 2014-05-19 19:07:23.589304903 +0200 @@ -42,5 +42,7 @@ obj-$(CONFIG_BLK_DEV_RSXX) += rsxx/ @@ -50211,9 +50536,9 @@ diff -Nur linux-3.10.30.orig/drivers/block/Makefile linux-linaro-stable-mx6/driv + nvme-y := nvme-core.o nvme-scsi.o 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 +diff -Nur linux-3.10.30.orig/drivers/bus/arm-cci.c linux-3.10.30/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-16 15:28:21.437385608 +0200 ++++ linux-3.10.30/drivers/bus/arm-cci.c 2014-05-19 19:07:23.589304903 +0200 @@ -0,0 +1,945 @@ +/* + * CCI cache coherent interconnect driver @@ -51160,9 +51485,9 @@ diff -Nur linux-3.10.30.orig/drivers/bus/arm-cci.c linux-linaro-stable-mx6/drive +core_initcall(cci_pmu_init); +MODULE_LICENSE("GPL"); +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 +diff -Nur linux-3.10.30.orig/drivers/bus/imx-weim.c linux-3.10.30/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-16 15:28:21.437385608 +0200 ++++ linux-3.10.30/drivers/bus/imx-weim.c 2014-05-19 19:07:23.589304903 +0200 @@ -0,0 +1,138 @@ +/* + * EIM driver for Freescale's i.MX chips @@ -51302,9 +51627,9 @@ diff -Nur linux-3.10.30.orig/drivers/bus/imx-weim.c linux-linaro-stable-mx6/driv +MODULE_AUTHOR("Freescale Semiconductor Inc."); +MODULE_DESCRIPTION("i.MX EIM Controller Driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/bus/Kconfig linux-linaro-stable-mx6/drivers/bus/Kconfig +diff -Nur linux-3.10.30.orig/drivers/bus/Kconfig linux-3.10.30/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-16 15:28:21.437385608 +0200 ++++ linux-3.10.30/drivers/bus/Kconfig 2014-05-19 19:07:23.589304903 +0200 @@ -4,6 +4,15 @@ menu "Bus devices" @@ -51333,9 +51658,9 @@ diff -Nur linux-3.10.30.orig/drivers/bus/Kconfig linux-linaro-stable-mx6/drivers + Driver supporting the CCI cache coherent interconnect for ARM + platforms. endmenu -diff -Nur linux-3.10.30.orig/drivers/bus/Makefile linux-linaro-stable-mx6/drivers/bus/Makefile +diff -Nur linux-3.10.30.orig/drivers/bus/Makefile linux-3.10.30/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-16 15:28:21.437385608 +0200 ++++ linux-3.10.30/drivers/bus/Makefile 2014-05-19 19:07:23.589304903 +0200 @@ -2,8 +2,11 @@ # Makefile for the bus drivers. # @@ -51348,9 +51673,9 @@ diff -Nur linux-3.10.30.orig/drivers/bus/Makefile linux-linaro-stable-mx6/driver obj-$(CONFIG_OMAP_INTERCONNECT) += omap_l3_smx.o omap_l3_noc.o +# CCI cache coherent interconnect for ARM platforms +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 +diff -Nur linux-3.10.30.orig/drivers/char/fsl_otp.c linux-3.10.30/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-16 15:28:21.445385651 +0200 ++++ linux-3.10.30/drivers/char/fsl_otp.c 2014-05-19 19:07:23.593304918 +0200 @@ -0,0 +1,299 @@ +/* + * Freescale On-Chip OTP driver @@ -51651,9 +51976,9 @@ diff -Nur linux-3.10.30.orig/drivers/char/fsl_otp.c linux-linaro-stable-mx6/driv +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Huang Shijie <b32955@freescale.com>"); +MODULE_DESCRIPTION("Freescale i.MX OCOTP driver"); -diff -Nur linux-3.10.30.orig/drivers/char/Kconfig linux-linaro-stable-mx6/drivers/char/Kconfig +diff -Nur linux-3.10.30.orig/drivers/char/Kconfig linux-3.10.30/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-16 15:28:21.441385630 +0200 ++++ linux-3.10.30/drivers/char/Kconfig 2014-05-19 19:07:23.593304918 +0200 @@ -94,6 +94,21 @@ If unsure, say N. @@ -51676,9 +52001,9 @@ diff -Nur linux-3.10.30.orig/drivers/char/Kconfig linux-linaro-stable-mx6/driver config PRINTER tristate "Parallel printer support" depends on PARPORT -diff -Nur linux-3.10.30.orig/drivers/char/Makefile linux-linaro-stable-mx6/drivers/char/Makefile +diff -Nur linux-3.10.30.orig/drivers/char/Makefile linux-3.10.30/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-16 15:28:21.441385630 +0200 ++++ linux-3.10.30/drivers/char/Makefile 2014-05-19 19:07:23.593304918 +0200 @@ -17,6 +17,7 @@ obj-$(CONFIG_IBM_BSR) += bsr.o obj-$(CONFIG_SGI_MBCS) += mbcs.o @@ -51687,9 +52012,9 @@ diff -Nur linux-3.10.30.orig/drivers/char/Makefile linux-linaro-stable-mx6/drive obj-$(CONFIG_PRINTER) += lp.o -diff -Nur linux-3.10.30.orig/drivers/clk/clk-divider.c linux-linaro-stable-mx6/drivers/clk/clk-divider.c +diff -Nur linux-3.10.30.orig/drivers/clk/clk-divider.c linux-3.10.30/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-16 15:28:21.465385756 +0200 ++++ linux-3.10.30/drivers/clk/clk-divider.c 2014-05-19 19:07:23.593304918 +0200 @@ -150,6 +150,7 @@ struct clk_divider *divider = to_clk_divider(hw); int i, bestdiv = 0; @@ -51714,9 +52039,9 @@ diff -Nur linux-3.10.30.orig/drivers/clk/clk-divider.c linux-linaro-stable-mx6/d parent_rate = __clk_round_rate(__clk_get_parent(hw->clk), MULT_ROUND_UP(rate, i)); now = parent_rate / i; -diff -Nur linux-3.10.30.orig/drivers/clk/Kconfig linux-linaro-stable-mx6/drivers/clk/Kconfig +diff -Nur linux-3.10.30.orig/drivers/clk/Kconfig linux-3.10.30/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-16 15:28:21.465385756 +0200 ++++ linux-3.10.30/drivers/clk/Kconfig 2014-05-19 19:07:23.593304918 +0200 @@ -42,7 +42,7 @@ config COMMON_CLK_VERSATILE @@ -51726,9 +52051,9 @@ diff -Nur linux-3.10.30.orig/drivers/clk/Kconfig linux-linaro-stable-mx6/drivers ---help--- Supports clocking on ARM Reference designs: - 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 +diff -Nur linux-3.10.30.orig/drivers/clk/versatile/clk-vexpress-osc.c linux-3.10.30/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-16 15:28:21.477385819 +0200 ++++ linux-3.10.30/drivers/clk/versatile/clk-vexpress-osc.c 2014-05-19 19:07:23.593304918 +0200 @@ -107,7 +107,7 @@ osc->func = vexpress_config_func_get_by_node(node); if (!osc->func) { @@ -51747,9 +52072,9 @@ diff -Nur linux-3.10.30.orig/drivers/clk/versatile/clk-vexpress-osc.c linux-lina init.ops = &vexpress_osc_ops; 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 +diff -Nur linux-3.10.30.orig/drivers/clk/versatile/clk-vexpress-spc.c linux-3.10.30/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-16 15:28:21.477385819 +0200 ++++ linux-3.10.30/drivers/clk/versatile/clk-vexpress-spc.c 2014-05-19 19:07:23.593304918 +0200 @@ -0,0 +1,131 @@ +/* + * Copyright (C) 2012 ARM Limited @@ -51882,18 +52207,18 @@ diff -Nur linux-3.10.30.orig/drivers/clk/versatile/clk-vexpress-spc.c linux-lina +} +CLK_OF_DECLARE(spc, "arm,vexpress-spc", vexpress_clk_of_register_spc); +#endif -diff -Nur linux-3.10.30.orig/drivers/clk/versatile/Makefile linux-linaro-stable-mx6/drivers/clk/versatile/Makefile +diff -Nur linux-3.10.30.orig/drivers/clk/versatile/Makefile linux-3.10.30/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-16 15:28:21.477385819 +0200 ++++ linux-3.10.30/drivers/clk/versatile/Makefile 2014-05-19 19:07:23.593304918 +0200 @@ -4,4 +4,4 @@ obj-$(CONFIG_INTEGRATOR_IMPD1) += clk-impd1.o obj-$(CONFIG_ARCH_REALVIEW) += clk-realview.o obj-$(CONFIG_ARCH_VEXPRESS) += clk-vexpress.o clk-sp810.o -obj-$(CONFIG_VEXPRESS_CONFIG) += clk-vexpress-osc.o +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 +diff -Nur linux-3.10.30.orig/drivers/clocksource/Kconfig linux-3.10.30/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-16 15:28:21.477385819 +0200 ++++ linux-3.10.30/drivers/clocksource/Kconfig 2014-05-19 19:07:23.593304918 +0200 @@ -85,3 +85,8 @@ Samsung S3C, S5P and Exynos SoCs, replacing an earlier driver for all devicetree enabled platforms. This driver will be @@ -51903,9 +52228,9 @@ diff -Nur linux-3.10.30.orig/drivers/clocksource/Kconfig linux-linaro-stable-mx6 + bool + help + 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 +diff -Nur linux-3.10.30.orig/drivers/clocksource/Makefile linux-3.10.30/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-16 15:28:21.477385819 +0200 ++++ linux-3.10.30/drivers/clocksource/Makefile 2014-05-19 19:07:23.593304918 +0200 @@ -26,6 +26,7 @@ obj-$(CONFIG_CADENCE_TTC_TIMER) += cadence_ttc_timer.o obj-$(CONFIG_CLKSRC_EXYNOS_MCT) += exynos_mct.o @@ -51914,9 +52239,9 @@ diff -Nur linux-3.10.30.orig/drivers/clocksource/Makefile linux-linaro-stable-mx obj-$(CONFIG_ARM_ARCH_TIMER) += arm_arch_timer.o 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 +diff -Nur linux-3.10.30.orig/drivers/clocksource/vf_pit_timer.c linux-3.10.30/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-16 15:28:21.481385841 +0200 ++++ linux-3.10.30/drivers/clocksource/vf_pit_timer.c 2014-05-19 19:07:23.593304918 +0200 @@ -0,0 +1,194 @@ +/* + * Copyright 2012-2013 Freescale Semiconductor, Inc. @@ -52112,9 +52437,9 @@ diff -Nur linux-3.10.30.orig/drivers/clocksource/vf_pit_timer.c linux-linaro-sta + pit_clockevent_init(clk_rate, irq); +} +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 +diff -Nur linux-3.10.30.orig/drivers/cpufreq/arm_big_little.c linux-3.10.30/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-16 15:28:21.481385841 +0200 ++++ linux-3.10.30/drivers/cpufreq/arm_big_little.c 2014-05-19 19:07:23.593304918 +0200 @@ -24,27 +24,148 @@ #include <linux/cpufreq.h> #include <linux/cpumask.h> @@ -52656,9 +52981,9 @@ diff -Nur linux-3.10.30.orig/drivers/cpufreq/arm_big_little.c linux-linaro-stabl arm_bL_ops = NULL; } 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 +diff -Nur linux-3.10.30.orig/drivers/cpufreq/arm_big_little.h linux-3.10.30/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-16 15:28:21.481385841 +0200 ++++ linux-3.10.30/drivers/cpufreq/arm_big_little.h 2014-05-19 19:07:23.593304918 +0200 @@ -23,6 +23,20 @@ #include <linux/device.h> #include <linux/types.h> @@ -52690,9 +53015,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/cpufreq/cpufreq-imx6.c linux-3.10.30/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-16 15:28:21.481385841 +0200 ++++ linux-3.10.30/drivers/cpufreq/cpufreq-imx6.c 2014-05-19 19:07:23.593304918 +0200 @@ -0,0 +1,483 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -53177,9 +53502,9 @@ diff -Nur linux-3.10.30.orig/drivers/cpufreq/cpufreq-imx6.c linux-linaro-stable- +MODULE_AUTHOR("Shawn Guo <shawn.guo@linaro.org>"); +MODULE_DESCRIPTION("Freescale i.MX6 cpufreq driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/cpufreq/cpufreq_interactive.c linux-linaro-stable-mx6/drivers/cpufreq/cpufreq_interactive.c +diff -Nur linux-3.10.30.orig/drivers/cpufreq/cpufreq_interactive.c linux-3.10.30/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-16 15:28:21.485385862 +0200 ++++ linux-3.10.30/drivers/cpufreq/cpufreq_interactive.c 2014-05-19 19:07:23.597304932 +0200 @@ -0,0 +1,705 @@ +/* + * drivers/cpufreq/cpufreq_interactive.c @@ -53886,9 +54211,9 @@ diff -Nur linux-3.10.30.orig/drivers/cpufreq/cpufreq_interactive.c linux-linaro- +MODULE_DESCRIPTION("'cpufreq_interactive' - A cpufreq governor for " + "Latency sensitive workloads"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/cpufreq/cpufreq_ondemand.c linux-linaro-stable-mx6/drivers/cpufreq/cpufreq_ondemand.c +diff -Nur linux-3.10.30.orig/drivers/cpufreq/cpufreq_ondemand.c linux-3.10.30/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-16 15:28:21.485385862 +0200 ++++ linux-3.10.30/drivers/cpufreq/cpufreq_ondemand.c 2014-05-19 19:07:23.597304932 +0200 @@ -76,6 +76,8 @@ boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model >= 15) @@ -53898,9 +54223,9 @@ diff -Nur linux-3.10.30.orig/drivers/cpufreq/cpufreq_ondemand.c linux-linaro-sta #endif return 0; } -diff -Nur linux-3.10.30.orig/drivers/cpufreq/cpufreq_stats.c linux-linaro-stable-mx6/drivers/cpufreq/cpufreq_stats.c +diff -Nur linux-3.10.30.orig/drivers/cpufreq/cpufreq_stats.c linux-3.10.30/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-16 15:28:21.485385862 +0200 ++++ linux-3.10.30/drivers/cpufreq/cpufreq_stats.c 2014-05-19 19:07:23.597304932 +0200 @@ -21,6 +21,9 @@ #include <linux/spinlock.h> #include <linux/notifier.h> @@ -53985,9 +54310,9 @@ diff -Nur linux-3.10.30.orig/drivers/cpufreq/cpufreq_stats.c linux-linaro-stable MODULE_AUTHOR("Zou Nan hai <nanhai.zou@intel.com>"); MODULE_DESCRIPTION("'cpufreq_stats' - A driver to export cpufreq stats " "through sysfs filesystem"); -diff -Nur linux-3.10.30.orig/drivers/cpufreq/imx6q-cpufreq.c linux-linaro-stable-mx6/drivers/cpufreq/imx6q-cpufreq.c +diff -Nur linux-3.10.30.orig/drivers/cpufreq/imx6q-cpufreq.c linux-3.10.30/drivers/cpufreq/imx6q-cpufreq.c --- linux-3.10.30.orig/drivers/cpufreq/imx6q-cpufreq.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/cpufreq/imx6q-cpufreq.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.30/drivers/cpufreq/imx6q-cpufreq.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,330 +0,0 @@ -/* - * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -54319,9 +54644,9 @@ diff -Nur linux-3.10.30.orig/drivers/cpufreq/imx6q-cpufreq.c linux-linaro-stable -MODULE_AUTHOR("Shawn Guo <shawn.guo@linaro.org>"); -MODULE_DESCRIPTION("Freescale i.MX6Q cpufreq driver"); -MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/cpufreq/Kconfig linux-linaro-stable-mx6/drivers/cpufreq/Kconfig +diff -Nur linux-3.10.30.orig/drivers/cpufreq/Kconfig linux-3.10.30/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-16 15:28:21.481385841 +0200 ++++ linux-3.10.30/drivers/cpufreq/Kconfig 2014-05-19 19:07:23.597304932 +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 @@ -54374,9 +54699,9 @@ diff -Nur linux-3.10.30.orig/drivers/cpufreq/Kconfig linux-linaro-stable-mx6/dri source "drivers/cpufreq/Kconfig.arm" endmenu -diff -Nur linux-3.10.30.orig/drivers/cpufreq/Kconfig.arm linux-linaro-stable-mx6/drivers/cpufreq/Kconfig.arm +diff -Nur linux-3.10.30.orig/drivers/cpufreq/Kconfig.arm linux-3.10.30/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-16 15:28:21.481385841 +0200 ++++ linux-3.10.30/drivers/cpufreq/Kconfig.arm 2014-05-19 19:07:23.597304932 +0200 @@ -4,7 +4,7 @@ config ARM_BIG_LITTLE_CPUFREQ @@ -54418,9 +54743,9 @@ diff -Nur linux-3.10.30.orig/drivers/cpufreq/Kconfig.arm linux-linaro-stable-mx6 If in doubt, say N. -diff -Nur linux-3.10.30.orig/drivers/cpufreq/Makefile linux-linaro-stable-mx6/drivers/cpufreq/Makefile +diff -Nur linux-3.10.30.orig/drivers/cpufreq/Makefile linux-3.10.30/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-16 15:28:21.481385841 +0200 ++++ linux-3.10.30/drivers/cpufreq/Makefile 2014-05-19 19:07:23.597304932 +0200 @@ -9,6 +9,7 @@ obj-$(CONFIG_CPU_FREQ_GOV_USERSPACE) += cpufreq_userspace.o obj-$(CONFIG_CPU_FREQ_GOV_ONDEMAND) += cpufreq_ondemand.o @@ -54446,9 +54771,9 @@ diff -Nur linux-3.10.30.orig/drivers/cpufreq/Makefile linux-linaro-stable-mx6/dr obj-$(CONFIG_ARM_INTEGRATOR) += integrator-cpufreq.o obj-$(CONFIG_ARM_KIRKWOOD_CPUFREQ) += kirkwood-cpufreq.o obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ) += omap-cpufreq.o -diff -Nur linux-3.10.30.orig/drivers/cpufreq/vexpress_big_little.c linux-linaro-stable-mx6/drivers/cpufreq/vexpress_big_little.c +diff -Nur linux-3.10.30.orig/drivers/cpufreq/vexpress_big_little.c linux-3.10.30/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-16 15:28:21.493385903 +0200 ++++ linux-3.10.30/drivers/cpufreq/vexpress_big_little.c 2014-05-19 19:07:23.597304932 +0200 @@ -0,0 +1,86 @@ +/* + * Vexpress big.LITTLE CPUFreq Interface driver @@ -54536,9 +54861,9 @@ diff -Nur linux-3.10.30.orig/drivers/cpufreq/vexpress_big_little.c linux-linaro- +MODULE_AUTHOR("Viresh Kumar <viresh.kumar@linaro.org>"); +MODULE_DESCRIPTION("ARM Vexpress big LITTLE cpufreq driver"); +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 +diff -Nur linux-3.10.30.orig/drivers/cpuidle/arm_big_little.c linux-3.10.30/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-16 15:28:21.493385903 +0200 ++++ linux-3.10.30/drivers/cpuidle/arm_big_little.c 2014-05-19 19:07:23.597304932 +0200 @@ -0,0 +1,183 @@ +/* + * big.LITTLE CPU idle driver. @@ -54723,9 +55048,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/cpuidle/cpuidle-calxeda.c linux-3.10.30/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-16 15:28:21.497385925 +0200 ++++ linux-3.10.30/drivers/cpuidle/cpuidle-calxeda.c 2014-05-19 19:07:23.597304932 +0200 @@ -37,20 +37,6 @@ extern void highbank_set_cpu_jump(int cpu, void *jump_addr); extern void *scu_base_addr; @@ -54747,9 +55072,9 @@ diff -Nur linux-3.10.30.orig/drivers/cpuidle/cpuidle-calxeda.c linux-linaro-stab static noinline void calxeda_idle_restore(void) { set_cr(get_cr() | CR_C); -diff -Nur linux-3.10.30.orig/drivers/cpuidle/Kconfig linux-linaro-stable-mx6/drivers/cpuidle/Kconfig +diff -Nur linux-3.10.30.orig/drivers/cpuidle/Kconfig linux-3.10.30/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-16 15:28:21.493385903 +0200 ++++ linux-3.10.30/drivers/cpuidle/Kconfig 2014-05-19 19:07:23.597304932 +0200 @@ -20,7 +20,7 @@ config CPU_IDLE_GOV_LADDER @@ -54759,9 +55084,9 @@ diff -Nur linux-3.10.30.orig/drivers/cpuidle/Kconfig linux-linaro-stable-mx6/dri default y config CPU_IDLE_GOV_MENU -diff -Nur linux-3.10.30.orig/drivers/cpuidle/Makefile linux-linaro-stable-mx6/drivers/cpuidle/Makefile +diff -Nur linux-3.10.30.orig/drivers/cpuidle/Makefile linux-3.10.30/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-16 15:28:21.493385903 +0200 ++++ linux-3.10.30/drivers/cpuidle/Makefile 2014-05-19 19:07:23.597304932 +0200 @@ -4,6 +4,6 @@ obj-y += cpuidle.o driver.o governor.o sysfs.o governors/ @@ -54770,9 +55095,9 @@ diff -Nur linux-3.10.30.orig/drivers/cpuidle/Makefile linux-linaro-stable-mx6/dr +obj-$(CONFIG_BIG_LITTLE) += arm_big_little.o obj-$(CONFIG_CPU_IDLE_CALXEDA) += cpuidle-calxeda.o 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 +diff -Nur linux-3.10.30.orig/drivers/crypto/caam/caamalg.c linux-3.10.30/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-16 15:28:21.501385946 +0200 ++++ linux-3.10.30/drivers/crypto/caam/caamalg.c 2014-05-19 19:07:23.597304932 +0200 @@ -1,7 +1,7 @@ /* * caam - Freescale FSL CAAM support for crypto API @@ -55286,9 +55611,9 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/caamalg.c linux-linaro-stable-m return err; } -diff -Nur linux-3.10.30.orig/drivers/crypto/caam/caamhash.c linux-linaro-stable-mx6/drivers/crypto/caam/caamhash.c +diff -Nur linux-3.10.30.orig/drivers/crypto/caam/caamhash.c linux-3.10.30/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-16 15:28:21.501385946 +0200 ++++ linux-3.10.30/drivers/crypto/caam/caamhash.c 2014-05-19 19:07:23.601304947 +0200 @@ -1,7 +1,7 @@ /* * caam - Freescale FSL CAAM support for ahash functions of crypto API @@ -56020,9 +56345,9 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/caamhash.c linux-linaro-stable- return err; } -diff -Nur linux-3.10.30.orig/drivers/crypto/caam/caamrng.c linux-linaro-stable-mx6/drivers/crypto/caam/caamrng.c +diff -Nur linux-3.10.30.orig/drivers/crypto/caam/caamrng.c linux-3.10.30/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-16 15:28:21.501385946 +0200 ++++ linux-3.10.30/drivers/crypto/caam/caamrng.c 2014-05-19 19:07:23.601304947 +0200 @@ -1,7 +1,7 @@ /* * caam - Freescale FSL CAAM support for hw_random @@ -56148,9 +56473,9 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/caamrng.c linux-linaro-stable-m dev_info(priv->jrdev[0], "registering rng-caam\n"); 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 +diff -Nur linux-3.10.30.orig/drivers/crypto/caam/compat.h linux-3.10.30/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-16 15:28:21.501385946 +0200 ++++ linux-3.10.30/drivers/crypto/caam/compat.h 2014-05-19 19:07:23.601304947 +0200 @@ -14,6 +14,8 @@ #include <linux/hash.h> #include <linux/hw_random.h> @@ -56171,9 +56496,9 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/compat.h linux-linaro-stable-mx #include <net/xfrm.h> #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 +diff -Nur linux-3.10.30.orig/drivers/crypto/caam/ctrl.c linux-3.10.30/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-16 15:28:21.501385946 +0200 ++++ linux-3.10.30/drivers/crypto/caam/ctrl.c 2014-05-19 19:07:23.601304947 +0200 @@ -2,7 +2,7 @@ * CAAM control-plane driver backend * Controller-level driver, kernel property detection, initialization @@ -56524,9 +56849,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/crypto/caam/desc.h linux-3.10.30/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-16 15:28:21.501385946 +0200 ++++ linux-3.10.30/drivers/crypto/caam/desc.h 2014-05-19 19:07:23.601304947 +0200 @@ -2,19 +2,35 @@ * CAAM descriptor composition header * Definitions to support CAAM descriptor instruction generation @@ -56621,9 +56946,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/crypto/caam/intern.h linux-3.10.30/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-16 15:28:21.501385946 +0200 ++++ linux-3.10.30/drivers/crypto/caam/intern.h 2014-05-19 19:07:23.601304947 +0200 @@ -2,7 +2,7 @@ * CAAM/SEC 4.x driver backend * Private/internal definitions between modules @@ -56685,9 +57010,9 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/intern.h linux-linaro-stable-mx /* * debugfs entries for developer view into driver/device * variables at runtime. -diff -Nur linux-3.10.30.orig/drivers/crypto/caam/jr.c linux-linaro-stable-mx6/drivers/crypto/caam/jr.c +diff -Nur linux-3.10.30.orig/drivers/crypto/caam/jr.c linux-3.10.30/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-16 15:28:21.505385967 +0200 ++++ linux-3.10.30/drivers/crypto/caam/jr.c 2014-05-19 19:07:23.601304947 +0200 @@ -2,7 +2,7 @@ * CAAM/SEC 4.x transport/backend driver * JobR backend functionality @@ -56813,9 +57138,9 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/jr.c linux-linaro-stable-mx6/dr /* Now do the platform independent part */ 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 +diff -Nur linux-3.10.30.orig/drivers/crypto/caam/jr.h linux-3.10.30/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-16 15:28:21.505385967 +0200 ++++ linux-3.10.30/drivers/crypto/caam/jr.h 2014-05-19 19:07:23.601304947 +0200 @@ -1,7 +1,7 @@ /* * CAAM public-level include definitions for the JobR backend @@ -56831,9 +57156,9 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/jr.h linux-linaro-stable-mx6/dr extern int caam_jr_shutdown(struct device *dev); +extern struct device *caam_get_jrdev(void); #endif /* JR_H */ -diff -Nur linux-3.10.30.orig/drivers/crypto/caam/Kconfig linux-linaro-stable-mx6/drivers/crypto/caam/Kconfig +diff -Nur linux-3.10.30.orig/drivers/crypto/caam/Kconfig linux-3.10.30/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-16 15:28:21.501385946 +0200 ++++ linux-3.10.30/drivers/crypto/caam/Kconfig 2014-05-19 19:07:23.601304947 +0200 @@ -1,6 +1,6 @@ config CRYPTO_DEV_FSL_CAAM tristate "Freescale CAAM-Multicore driver backend" @@ -56894,9 +57219,9 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/Kconfig linux-linaro-stable-mx6 + Enables installation of an interrupt handler with registrable + handler functions which can be specified to act on the consequences + 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 +diff -Nur linux-3.10.30.orig/drivers/crypto/caam/key_gen.c linux-3.10.30/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-16 15:28:21.505385967 +0200 ++++ linux-3.10.30/drivers/crypto/caam/key_gen.c 2014-05-19 19:07:23.601304947 +0200 @@ -1,7 +1,7 @@ /* * CAAM/SEC 4.x functions for handling key-generation jobs @@ -56924,9 +57249,9 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/key_gen.c linux-linaro-stable-m dma_unmap_single(jrdev, dma_addr_out, split_key_pad_len, DMA_FROM_DEVICE); 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 +diff -Nur linux-3.10.30.orig/drivers/crypto/caam/Makefile linux-3.10.30/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-16 15:28:21.501385946 +0200 ++++ linux-3.10.30/drivers/crypto/caam/Makefile 2014-05-19 19:07:23.601304947 +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 @@ -56936,9 +57261,9 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/Makefile linux-linaro-stable-mx +obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO) += secvio.o 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 +diff -Nur linux-3.10.30.orig/drivers/crypto/caam/regs.h linux-3.10.30/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-16 15:28:21.505385967 +0200 ++++ linux-3.10.30/drivers/crypto/caam/regs.h 2014-05-19 19:07:23.601304947 +0200 @@ -1,7 +1,7 @@ /* * CAAM hardware register-level view @@ -57270,9 +57595,9 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/regs.h linux-linaro-stable-mx6/ /* * caam_assurance - Assurance Controller View * 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 +diff -Nur linux-3.10.30.orig/drivers/crypto/caam/secvio.c linux-3.10.30/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-16 15:28:21.505385967 +0200 ++++ linux-3.10.30/drivers/crypto/caam/secvio.c 2014-05-19 19:07:23.601304947 +0200 @@ -0,0 +1,333 @@ + +/* @@ -57607,9 +57932,9 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/secvio.c linux-linaro-stable-mx +MODULE_DESCRIPTION("FSL CAAM/SNVS Security Violation Handler"); +MODULE_AUTHOR("Freescale Semiconductor - NMSG/MAD"); +#endif -diff -Nur linux-3.10.30.orig/drivers/crypto/caam/secvio.h linux-linaro-stable-mx6/drivers/crypto/caam/secvio.h +diff -Nur linux-3.10.30.orig/drivers/crypto/caam/secvio.h linux-3.10.30/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-16 15:28:21.505385967 +0200 ++++ linux-3.10.30/drivers/crypto/caam/secvio.h 2014-05-19 19:07:23.601304947 +0200 @@ -0,0 +1,64 @@ + +/* @@ -57675,9 +58000,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/crypto/caam/sg_sw_sec4.h linux-3.10.30/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-16 15:28:21.505385967 +0200 ++++ linux-3.10.30/drivers/crypto/caam/sg_sw_sec4.h 2014-05-19 19:07:23.601304947 +0200 @@ -1,7 +1,7 @@ /* * CAAM/SEC 4.x functions for using scatterlists in caam driver @@ -57722,9 +58047,9 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/sg_sw_sec4.h linux-linaro-stabl if (unlikely(chained)) { int i; 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 +diff -Nur linux-3.10.30.orig/drivers/crypto/caam/sm.h linux-3.10.30/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-16 15:28:21.505385967 +0200 ++++ linux-3.10.30/drivers/crypto/caam/sm.h 2014-05-19 19:07:23.601304947 +0200 @@ -0,0 +1,88 @@ + +/* @@ -57814,9 +58139,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/crypto/caam/sm_store.c linux-3.10.30/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-16 15:28:21.505385967 +0200 ++++ linux-3.10.30/drivers/crypto/caam/sm_store.c 2014-05-19 19:07:23.605304961 +0200 @@ -0,0 +1,896 @@ + +/* @@ -58714,9 +59039,9 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/sm_store.c linux-linaro-stable- +MODULE_DESCRIPTION("FSL CAAM Secure Memory / Keystore"); +MODULE_AUTHOR("Freescale Semiconductor - NMSG/MAD"); +#endif -diff -Nur linux-3.10.30.orig/drivers/crypto/caam/sm_test.c linux-linaro-stable-mx6/drivers/crypto/caam/sm_test.c +diff -Nur linux-3.10.30.orig/drivers/crypto/caam/sm_test.c linux-3.10.30/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-16 15:28:21.505385967 +0200 ++++ linux-3.10.30/drivers/crypto/caam/sm_test.c 2014-05-19 19:07:23.605304961 +0200 @@ -0,0 +1,844 @@ +/* + * Secure Memory / Keystore Exemplification Module @@ -59562,9 +59887,9 @@ diff -Nur linux-3.10.30.orig/drivers/crypto/caam/sm_test.c linux-linaro-stable-m +MODULE_DESCRIPTION("FSL CAAM Keystore Usage Example"); +MODULE_AUTHOR("Freescale Semiconductor - NMSG/MAD"); +#endif -diff -Nur linux-3.10.30.orig/drivers/crypto/caam/snvsregs.h linux-linaro-stable-mx6/drivers/crypto/caam/snvsregs.h +diff -Nur linux-3.10.30.orig/drivers/crypto/caam/snvsregs.h linux-3.10.30/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-16 15:28:21.505385967 +0200 ++++ linux-3.10.30/drivers/crypto/caam/snvsregs.h 2014-05-19 19:07:23.605304961 +0200 @@ -0,0 +1,237 @@ +/* + * SNVS hardware register-level view @@ -59803,9 +60128,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/dma/imx-sdma.c linux-3.10.30/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-16 15:28:21.521386052 +0200 ++++ linux-3.10.30/drivers/dma/imx-sdma.c 2014-05-19 19:07:23.605304961 +0200 @@ -7,7 +7,7 @@ * * Based on code from Freescale: @@ -60413,9 +60738,9 @@ diff -Nur linux-3.10.30.orig/drivers/dma/imx-sdma.c linux-linaro-stable-mx6/driv err_init: kfree(sdma->script_addrs); err_alloc: -diff -Nur linux-3.10.30.orig/drivers/dma/Kconfig linux-linaro-stable-mx6/drivers/dma/Kconfig +diff -Nur linux-3.10.30.orig/drivers/dma/Kconfig linux-3.10.30/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-16 15:28:21.513386009 +0200 ++++ linux-3.10.30/drivers/dma/Kconfig 2014-05-19 19:07:23.605304961 +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. @@ -60436,9 +60761,9 @@ diff -Nur linux-3.10.30.orig/drivers/dma/Kconfig linux-linaro-stable-mx6/drivers config TXX9_DMAC tristate "Toshiba TXx9 SoC DMA support" depends on MACH_TX49XX || MACH_TX39XX -diff -Nur linux-3.10.30.orig/drivers/dma/Makefile linux-linaro-stable-mx6/drivers/dma/Makefile +diff -Nur linux-3.10.30.orig/drivers/dma/Makefile linux-3.10.30/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-16 15:28:21.513386009 +0200 ++++ linux-3.10.30/drivers/dma/Makefile 2014-05-19 19:07:23.605304961 +0200 @@ -18,6 +18,7 @@ obj-$(CONFIG_DW_DMAC) += dw_dmac.o obj-$(CONFIG_AT_HDMAC) += at_hdmac.o @@ -60447,15 +60772,15 @@ diff -Nur linux-3.10.30.orig/drivers/dma/Makefile linux-linaro-stable-mx6/driver obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o obj-$(CONFIG_SH_DMAE_BASE) += sh/ 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 +diff -Nur linux-3.10.30.orig/drivers/dma/pxp/Makefile linux-3.10.30/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-16 15:28:21.525386073 +0200 ++++ linux-3.10.30/drivers/dma/pxp/Makefile 2014-05-19 19:07:23.605304961 +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 +diff -Nur linux-3.10.30.orig/drivers/dma/pxp/pxp_device.c linux-3.10.30/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-16 15:28:21.525386073 +0200 ++++ linux-3.10.30/drivers/dma/pxp/pxp_device.c 2014-05-19 19:07:23.605304961 +0200 @@ -0,0 +1,489 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -60946,9 +61271,9 @@ diff -Nur linux-3.10.30.orig/drivers/dma/pxp/pxp_device.c linux-linaro-stable-mx +{ + misc_deregister(&pxp_device_miscdev); +} -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 +diff -Nur linux-3.10.30.orig/drivers/dma/pxp/pxp_dma_v2.c linux-3.10.30/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-16 15:28:21.529386093 +0200 ++++ linux-3.10.30/drivers/dma/pxp/pxp_dma_v2.c 2014-05-19 19:07:23.609304977 +0200 @@ -0,0 +1,1936 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. @@ -62886,9 +63211,9 @@ diff -Nur linux-3.10.30.orig/drivers/dma/pxp/pxp_dma_v2.c linux-linaro-stable-mx +MODULE_DESCRIPTION("i.MX PxP driver"); +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +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 +diff -Nur linux-3.10.30.orig/drivers/dma/pxp/regs-pxp_v2.h linux-3.10.30/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-16 15:28:21.529386093 +0200 ++++ linux-3.10.30/drivers/dma/pxp/regs-pxp_v2.h 2014-05-19 19:07:23.609304977 +0200 @@ -0,0 +1,1152 @@ +/* + * Freescale PXP Register Definitions @@ -64042,9 +64367,9 @@ diff -Nur linux-3.10.30.orig/drivers/dma/pxp/regs-pxp_v2.h linux-linaro-stable-m +#define BF_PXP_VERSION_STEP(v) \ + (((v) << 0) & BM_PXP_VERSION_STEP) +#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 +diff -Nur linux-3.10.30.orig/drivers/extcon/extcon-adc-jack.c linux-3.10.30/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-16 15:28:21.541386157 +0200 ++++ linux-3.10.30/drivers/extcon/extcon-adc-jack.c 2014-05-19 19:07:23.609304977 +0200 @@ -87,7 +87,8 @@ { struct adc_jack_data *data = _data; @@ -64055,9 +64380,9 @@ diff -Nur linux-3.10.30.orig/drivers/extcon/extcon-adc-jack.c linux-linaro-stabl return IRQ_HANDLED; } -diff -Nur linux-3.10.30.orig/drivers/extcon/extcon-gpio.c linux-linaro-stable-mx6/drivers/extcon/extcon-gpio.c +diff -Nur linux-3.10.30.orig/drivers/extcon/extcon-gpio.c linux-3.10.30/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-16 15:28:21.541386157 +0200 ++++ linux-3.10.30/drivers/extcon/extcon-gpio.c 2014-05-19 19:07:23.609304977 +0200 @@ -56,7 +56,7 @@ { struct gpio_extcon_data *extcon_data = dev_id; @@ -64067,9 +64392,9 @@ diff -Nur linux-3.10.30.orig/drivers/extcon/extcon-gpio.c linux-linaro-stable-mx extcon_data->debounce_jiffies); return IRQ_HANDLED; } -diff -Nur linux-3.10.30.orig/drivers/gator/gator_annotate.c linux-linaro-stable-mx6/drivers/gator/gator_annotate.c +diff -Nur linux-3.10.30.orig/drivers/gator/gator_annotate.c linux-3.10.30/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-16 15:28:21.549386199 +0200 ++++ linux-3.10.30/drivers/gator/gator_annotate.c 2014-05-19 19:07:23.609304977 +0200 @@ -0,0 +1,186 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -64257,9 +64582,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_annotate.c linux-linaro-stable- + wake_up(&gator_annotate_wait); + spin_unlock(&annotate_lock); +} -diff -Nur linux-3.10.30.orig/drivers/gator/gator_annotate_kernel.c linux-linaro-stable-mx6/drivers/gator/gator_annotate_kernel.c +diff -Nur linux-3.10.30.orig/drivers/gator/gator_annotate_kernel.c linux-3.10.30/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-16 15:28:21.549386199 +0200 ++++ linux-3.10.30/drivers/gator/gator_annotate_kernel.c 2014-05-19 19:07:23.609304977 +0200 @@ -0,0 +1,200 @@ +/** + * Copyright (C) ARM Limited 2012-2013. All rights reserved. @@ -64461,9 +64786,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/gator/gator_backtrace.c linux-3.10.30/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-16 15:28:21.549386199 +0200 ++++ linux-3.10.30/drivers/gator/gator_backtrace.c 2014-05-19 19:07:23.609304977 +0200 @@ -0,0 +1,168 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -64633,9 +64958,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_backtrace.c linux-linaro-stable + marshal_backtrace(PC_REG & ~1, NO_COOKIE); +#endif +} -diff -Nur linux-3.10.30.orig/drivers/gator/gator_cookies.c linux-linaro-stable-mx6/drivers/gator/gator_cookies.c +diff -Nur linux-3.10.30.orig/drivers/gator/gator_cookies.c linux-3.10.30/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-16 15:28:21.549386199 +0200 ++++ linux-3.10.30/drivers/gator/gator_cookies.c 2014-05-19 19:07:23.609304977 +0200 @@ -0,0 +1,433 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -65070,9 +65395,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_cookies.c linux-linaro-stable-m + kfree(gator_crc32_table); + gator_crc32_table = NULL; +} -diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_armv6.c linux-linaro-stable-mx6/drivers/gator/gator_events_armv6.c +diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_armv6.c linux-3.10.30/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-16 15:28:21.549386199 +0200 ++++ linux-3.10.30/drivers/gator/gator_events_armv6.c 2014-05-19 19:07:23.609304977 +0200 @@ -0,0 +1,237 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -65311,9 +65636,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_armv7.c linux-3.10.30/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-16 15:28:21.549386199 +0200 ++++ linux-3.10.30/drivers/gator/gator_events_armv7.c 2014-05-19 19:07:23.629305051 +0200 @@ -0,0 +1,312 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -65627,9 +65952,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_block.c linux-3.10.30/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-16 15:28:21.549386199 +0200 ++++ linux-3.10.30/drivers/gator/gator_events_block.c 2014-05-19 19:07:23.629305051 +0200 @@ -0,0 +1,153 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -65784,9 +66109,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_block.c linux-linaro-sta + + return gator_events_install(&gator_events_block_interface); +} -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 +diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_ccn-504.c linux-3.10.30/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-16 15:28:21.549386199 +0200 ++++ linux-3.10.30/drivers/gator/gator_events_ccn-504.c 2014-05-19 19:07:23.629305051 +0200 @@ -0,0 +1,346 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -66134,9 +66459,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_ccn-504.c linux-linaro-s + + return gator_events_install(&gator_events_ccn504_interface); +} -diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_irq.c linux-linaro-stable-mx6/drivers/gator/gator_events_irq.c +diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_irq.c linux-3.10.30/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-16 15:28:21.549386199 +0200 ++++ linux-3.10.30/drivers/gator/gator_events_irq.c 2014-05-19 19:07:23.629305051 +0200 @@ -0,0 +1,165 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -66303,9 +66628,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_irq.c linux-linaro-stabl + + return gator_events_install(&gator_events_irq_interface); +} -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 +diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_l2c-310.c linux-3.10.30/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-16 15:28:21.549386199 +0200 ++++ linux-3.10.30/drivers/gator/gator_events_l2c-310.c 2014-05-19 19:07:23.629305051 +0200 @@ -0,0 +1,208 @@ +/** + * l2c310 (L2 Cache Controller) event counters for gator @@ -66515,9 +66840,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_l2c-310.c linux-linaro-s + + return gator_events_install(&gator_events_l2c310_interface); +} -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 +diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mali_4xx.c linux-3.10.30/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-16 15:28:21.549386199 +0200 ++++ linux-3.10.30/drivers/gator/gator_events_mali_4xx.c 2014-05-19 19:07:23.629305051 +0200 @@ -0,0 +1,723 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -67242,9 +67567,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mali_4xx.c linux-linaro- + + return gator_events_install(&gator_events_mali_interface); +} -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 +diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mali_4xx.h linux-3.10.30/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-16 15:28:21.549386199 +0200 ++++ linux-3.10.30/drivers/gator/gator_events_mali_4xx.h 2014-05-19 19:07:23.629305051 +0200 @@ -0,0 +1,18 @@ +/** + * Copyright (C) ARM Limited 2011-2013. All rights reserved. @@ -67264,9 +67589,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mali_4xx.h linux-linaro- +extern void gator_events_mali_log_dvfs_event(unsigned int d0, unsigned int d1); + +#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 +diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mali_common.c linux-3.10.30/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-16 15:28:21.549386199 +0200 ++++ linux-3.10.30/drivers/gator/gator_events_mali_common.c 2014-05-19 19:07:23.629305051 +0200 @@ -0,0 +1,81 @@ +/** + * Copyright (C) ARM Limited 2012-2013. All rights reserved. @@ -67349,9 +67674,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mali_common.c linux-lina + counter->enabled = 0; + } +} -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 +diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mali_common.h linux-3.10.30/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-16 15:28:21.553386220 +0200 ++++ linux-3.10.30/drivers/gator/gator_events_mali_common.h 2014-05-19 19:07:23.629305051 +0200 @@ -0,0 +1,86 @@ +/** + * Copyright (C) ARM Limited 2012-2013. All rights reserved. @@ -67439,9 +67764,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mali_common.h linux-lina +extern void gator_mali_initialise_counters(mali_counter counters[], unsigned int n_counters); + +#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 +diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mali_t6xx.c linux-3.10.30/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-16 15:28:21.553386220 +0200 ++++ linux-3.10.30/drivers/gator/gator_events_mali_t6xx.c 2014-05-19 19:07:23.629305051 +0200 @@ -0,0 +1,560 @@ +/** + * Copyright (C) ARM Limited 2011-2013. All rights reserved. @@ -68003,9 +68328,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mali_t6xx.c linux-linaro + + return gator_events_install(&gator_events_mali_t6xx_interface); +} -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 +diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mali_t6xx_hw.c linux-3.10.30/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-16 15:28:21.553386220 +0200 ++++ linux-3.10.30/drivers/gator/gator_events_mali_t6xx_hw.c 2014-05-19 19:07:23.633305065 +0200 @@ -0,0 +1,784 @@ +/** + * Copyright (C) ARM Limited 2012-2013. All rights reserved. @@ -68791,9 +69116,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mali_t6xx_hw.c linux-lin + + return gator_events_install(&gator_events_mali_t6xx_interface); +} -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 +diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mali_t6xx_hw_test.c linux-3.10.30/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-16 15:28:21.553386220 +0200 ++++ linux-3.10.30/drivers/gator/gator_events_mali_t6xx_hw_test.c 2014-05-19 19:07:23.633305065 +0200 @@ -0,0 +1,55 @@ +/** + * Copyright (C) ARM Limited 2012-2013. All rights reserved. @@ -68850,9 +69175,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mali_t6xx_hw_test.c linu + + printk("gator: %d tests passed\n", n_tests_passed); +} -diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_meminfo.c linux-linaro-stable-mx6/drivers/gator/gator_events_meminfo.c +diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_meminfo.c linux-3.10.30/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-16 15:28:21.553386220 +0200 ++++ linux-3.10.30/drivers/gator/gator_events_meminfo.c 2014-05-19 19:07:23.633305065 +0200 @@ -0,0 +1,387 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -69241,9 +69566,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_meminfo.c linux-linaro-s + + return gator_events_install(&gator_events_meminfo_interface); +} -diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mmapped.c linux-linaro-stable-mx6/drivers/gator/gator_events_mmapped.c +diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mmapped.c linux-3.10.30/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-16 15:28:21.553386220 +0200 ++++ linux-3.10.30/drivers/gator/gator_events_mmapped.c 2014-05-19 19:07:23.633305065 +0200 @@ -0,0 +1,209 @@ +/* + * Example events provider @@ -69454,9 +69779,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_mmapped.c linux-linaro-s + + return gator_events_install(&gator_events_mmapped_interface); +} -diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_net.c linux-linaro-stable-mx6/drivers/gator/gator_events_net.c +diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_net.c linux-3.10.30/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-16 15:28:21.553386220 +0200 ++++ linux-3.10.30/drivers/gator/gator_events_net.c 2014-05-19 19:07:23.633305065 +0200 @@ -0,0 +1,172 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -69630,9 +69955,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_net.c linux-linaro-stabl + + return gator_events_install(&gator_events_net_interface); +} -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 +diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_perf_pmu.c linux-3.10.30/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-16 15:28:21.553386220 +0200 ++++ linux-3.10.30/drivers/gator/gator_events_perf_pmu.c 2014-05-19 19:07:23.633305065 +0200 @@ -0,0 +1,587 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -70221,9 +70546,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_sched.c linux-3.10.30/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-16 15:28:21.553386220 +0200 ++++ linux-3.10.30/drivers/gator/gator_events_sched.c 2014-05-19 19:07:23.633305065 +0200 @@ -0,0 +1,113 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -70338,9 +70663,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_sched.c linux-linaro-sta + + return gator_events_install(&gator_events_sched_interface); +} -diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_scorpion.c linux-linaro-stable-mx6/drivers/gator/gator_events_scorpion.c +diff -Nur linux-3.10.30.orig/drivers/gator/gator_events_scorpion.c linux-3.10.30/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-16 15:28:21.553386220 +0200 ++++ linux-3.10.30/drivers/gator/gator_events_scorpion.c 2014-05-19 19:07:23.633305065 +0200 @@ -0,0 +1,669 @@ +/** + * Copyright (C) ARM Limited 2011-2013. All rights reserved. @@ -71011,9 +71336,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/gator/gator_fs.c linux-3.10.30/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-16 15:28:21.553386220 +0200 ++++ linux-3.10.30/drivers/gator/gator_fs.c 2014-05-19 19:07:23.633305065 +0200 @@ -0,0 +1,382 @@ +/** + * @file gatorfs.c @@ -71397,9 +71722,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_fs.c linux-linaro-stable-mx6/dr +{ + unregister_filesystem(&gatorfs_type); +} -diff -Nur linux-3.10.30.orig/drivers/gator/gator.h linux-linaro-stable-mx6/drivers/gator/gator.h +diff -Nur linux-3.10.30.orig/drivers/gator/gator.h linux-3.10.30/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-16 15:28:21.549386199 +0200 ++++ linux-3.10.30/drivers/gator/gator.h 2014-05-19 19:07:23.637305081 +0200 @@ -0,0 +1,142 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -71543,9 +71868,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator.h linux-linaro-stable-mx6/drive +#define on_primary_core() (get_logical_cpu() == 0) + +#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 +diff -Nur linux-3.10.30.orig/drivers/gator/gator_hrtimer_gator.c linux-3.10.30/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-16 15:28:21.553386220 +0200 ++++ linux-3.10.30/drivers/gator/gator_hrtimer_gator.c 2014-05-19 19:07:23.637305081 +0200 @@ -0,0 +1,86 @@ +/** + * Copyright (C) ARM Limited 2011-2013. All rights reserved. @@ -71633,9 +71958,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/gator/gator_hrtimer_perf.c linux-3.10.30/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-16 15:28:21.553386220 +0200 ++++ linux-3.10.30/drivers/gator/gator_hrtimer_perf.c 2014-05-19 19:07:23.637305081 +0200 @@ -0,0 +1,113 @@ +/** + * Copyright (C) ARM Limited 2011-2013. All rights reserved. @@ -71750,9 +72075,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/gator/gator_iks.c linux-3.10.30/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-16 15:28:21.553386220 +0200 ++++ linux-3.10.30/drivers/gator/gator_iks.c 2014-05-19 19:07:23.637305081 +0200 @@ -0,0 +1,197 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -71951,9 +72276,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_iks.c linux-linaro-stable-mx6/d +#define gator_migrate_stop() + +#endif -diff -Nur linux-3.10.30.orig/drivers/gator/gator_main.c linux-linaro-stable-mx6/drivers/gator/gator_main.c +diff -Nur linux-3.10.30.orig/drivers/gator/gator_main.c linux-3.10.30/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-16 15:28:21.553386220 +0200 ++++ linux-3.10.30/drivers/gator/gator_main.c 2014-05-19 19:07:23.637305081 +0200 @@ -0,0 +1,1532 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -73487,9 +73812,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_main.c linux-linaro-stable-mx6/ +#define STRIFY2(ARG) #ARG +#define STRIFY(ARG) STRIFY2(ARG) +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 +diff -Nur linux-3.10.30.orig/drivers/gator/gator_marshaling.c linux-3.10.30/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-16 15:28:21.553386220 +0200 ++++ linux-3.10.30/drivers/gator/gator_marshaling.c 2014-05-19 19:07:23.637305081 +0200 @@ -0,0 +1,432 @@ +/** + * Copyright (C) ARM Limited 2012-2013. All rights reserved. @@ -73923,9 +74248,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_marshaling.c linux-linaro-stabl + local_irq_restore(flags); +} +#endif -diff -Nur linux-3.10.30.orig/drivers/gator/gator_pack.c linux-linaro-stable-mx6/drivers/gator/gator_pack.c +diff -Nur linux-3.10.30.orig/drivers/gator/gator_pack.c linux-3.10.30/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-16 15:28:21.553386220 +0200 ++++ linux-3.10.30/drivers/gator/gator_pack.c 2014-05-19 19:07:23.637305081 +0200 @@ -0,0 +1,58 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -73985,9 +74310,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_pack.c linux-linaro-stable-mx6/ + + per_cpu(gator_buffer_write, cpu)[buftype] = (write + packedBytes) & mask; +} -diff -Nur linux-3.10.30.orig/drivers/gator/gator_trace_gpu.c linux-linaro-stable-mx6/drivers/gator/gator_trace_gpu.c +diff -Nur linux-3.10.30.orig/drivers/gator/gator_trace_gpu.c linux-3.10.30/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-16 15:28:21.553386220 +0200 ++++ linux-3.10.30/drivers/gator/gator_trace_gpu.c 2014-05-19 19:07:23.637305081 +0200 @@ -0,0 +1,294 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -74283,9 +74608,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_trace_gpu.c linux-linaro-stable + + gpu_trace_registered = mali_timeline_trace_registered = mali_job_slots_trace_registered = 0; +} -diff -Nur linux-3.10.30.orig/drivers/gator/gator_trace_gpu.h linux-linaro-stable-mx6/drivers/gator/gator_trace_gpu.h +diff -Nur linux-3.10.30.orig/drivers/gator/gator_trace_gpu.h linux-3.10.30/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-16 15:28:21.553386220 +0200 ++++ linux-3.10.30/drivers/gator/gator_trace_gpu.h 2014-05-19 19:07:23.637305081 +0200 @@ -0,0 +1,79 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -74366,9 +74691,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_trace_gpu.h linux-linaro-stable + +/* This part must be outside protection */ +#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 +diff -Nur linux-3.10.30.orig/drivers/gator/gator_trace_power.c linux-3.10.30/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-16 15:28:21.553386220 +0200 ++++ linux-3.10.30/drivers/gator/gator_trace_power.c 2014-05-19 19:07:23.637305081 +0200 @@ -0,0 +1,203 @@ +/** + * Copyright (C) ARM Limited 2011-2013. All rights reserved. @@ -74573,9 +74898,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/gator/gator_trace_sched.c linux-3.10.30/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-16 15:28:21.553386220 +0200 ++++ linux-3.10.30/drivers/gator/gator_trace_sched.c 2014-05-19 19:07:23.637305081 +0200 @@ -0,0 +1,270 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -74847,9 +75172,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/gator_trace_sched.c linux-linaro-stab + sched_cpu_key[i] = gator_events_get_key(); + } +} -diff -Nur linux-3.10.30.orig/drivers/gator/Kconfig linux-linaro-stable-mx6/drivers/gator/Kconfig +diff -Nur linux-3.10.30.orig/drivers/gator/Kconfig linux-3.10.30/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-16 15:28:21.549386199 +0200 ++++ linux-3.10.30/drivers/gator/Kconfig 2014-05-19 19:07:23.637305081 +0200 @@ -0,0 +1,33 @@ +config GATOR + tristate "Gator module for ARM's Streamline Performance Analyzer" @@ -74884,9 +75209,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/Kconfig linux-linaro-stable-mx6/drive + help + The gator code adds this to its include path so it can get the Mali + 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 +diff -Nur linux-3.10.30.orig/drivers/gator/LICENSE linux-3.10.30/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-16 15:28:21.549386199 +0200 ++++ linux-3.10.30/drivers/gator/LICENSE 2014-05-19 19:07:23.637305081 +0200 @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 @@ -75227,9 +75552,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/LICENSE linux-linaro-stable-mx6/drive +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. -diff -Nur linux-3.10.30.orig/drivers/gator/Makefile linux-linaro-stable-mx6/drivers/gator/Makefile +diff -Nur linux-3.10.30.orig/drivers/gator/Makefile linux-3.10.30/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-16 15:28:21.549386199 +0200 ++++ linux-3.10.30/drivers/gator/Makefile 2014-05-19 19:07:23.637305081 +0200 @@ -0,0 +1,76 @@ +ifneq ($(KERNELRELEASE),) + @@ -75307,9 +75632,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/Makefile linux-linaro-stable-mx6/driv + rm -rf .tmp_versions + +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 +diff -Nur linux-3.10.30.orig/drivers/gator/mali/mali_mjollnir_profiling_gator_api.h linux-3.10.30/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-16 15:28:21.553386220 +0200 ++++ linux-3.10.30/drivers/gator/mali/mali_mjollnir_profiling_gator_api.h 2014-05-19 19:07:23.637305081 +0200 @@ -0,0 +1,163 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -75474,9 +75799,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/mali/mali_mjollnir_profiling_gator_ap +#endif + +#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 +diff -Nur linux-3.10.30.orig/drivers/gator/mali/mali_utgard_profiling_gator_api.h linux-3.10.30/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-16 15:28:21.553386220 +0200 ++++ linux-3.10.30/drivers/gator/mali/mali_utgard_profiling_gator_api.h 2014-05-19 19:07:23.637305081 +0200 @@ -0,0 +1,201 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -75679,9 +76004,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/mali/mali_utgard_profiling_gator_api. +#endif + +#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 +diff -Nur linux-3.10.30.orig/drivers/gator/mali_t6xx.mk linux-3.10.30/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-16 15:28:21.553386220 +0200 ++++ linux-3.10.30/drivers/gator/mali_t6xx.mk 2014-05-19 19:07:23.637305081 +0200 @@ -0,0 +1,26 @@ +# Defines for Mali-T6xx driver +EXTRA_CFLAGS += -DMALI_USE_UMP=1 \ @@ -75709,9 +76034,9 @@ diff -Nur linux-3.10.30.orig/drivers/gator/mali_t6xx.mk linux-linaro-stable-mx6/ + -I$(KBASE_DIR)/platform_dummy \ + -I$(KBASE_DIR)/src + -diff -Nur linux-3.10.30.orig/drivers/gpio/devres.c linux-linaro-stable-mx6/drivers/gpio/devres.c +diff -Nur linux-3.10.30.orig/drivers/gpio/devres.c linux-3.10.30/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-16 15:28:21.553386220 +0200 ++++ linux-3.10.30/drivers/gpio/devres.c 2014-05-19 19:07:23.641305095 +0200 @@ -19,6 +19,89 @@ #include <linux/device.h> #include <linux/gfp.h> @@ -75802,9 +76127,9 @@ diff -Nur linux-3.10.30.orig/drivers/gpio/devres.c linux-linaro-stable-mx6/drive static void devm_gpio_release(struct device *dev, void *res) { unsigned *gpio = res; -diff -Nur linux-3.10.30.orig/drivers/gpio/gpiolib.c linux-linaro-stable-mx6/drivers/gpio/gpiolib.c +diff -Nur linux-3.10.30.orig/drivers/gpio/gpiolib.c linux-3.10.30/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-16 15:28:21.561386263 +0200 ++++ linux-3.10.30/drivers/gpio/gpiolib.c 2014-05-19 19:07:23.641305095 +0200 @@ -12,20 +12,16 @@ #include <linux/of_gpio.h> #include <linux/idr.h> @@ -77122,9 +77447,9 @@ diff -Nur linux-3.10.30.orig/drivers/gpio/gpiolib.c linux-linaro-stable-mx6/driv seq_printf(s, "\n"); } } -diff -Nur linux-3.10.30.orig/drivers/gpio/gpiolib-of.c linux-linaro-stable-mx6/drivers/gpio/gpiolib-of.c +diff -Nur linux-3.10.30.orig/drivers/gpio/gpiolib-of.c linux-3.10.30/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-16 15:28:21.561386263 +0200 ++++ linux-3.10.30/drivers/gpio/gpiolib-of.c 2014-05-19 19:07:23.641305095 +0200 @@ -15,19 +15,21 @@ #include <linux/errno.h> #include <linux/module.h> @@ -77222,9 +77547,9 @@ diff -Nur linux-3.10.30.orig/drivers/gpio/gpiolib-of.c linux-linaro-stable-mx6/d if (ret) break; -diff -Nur linux-3.10.30.orig/drivers/gpio/gpio-mxc.c linux-linaro-stable-mx6/drivers/gpio/gpio-mxc.c +diff -Nur linux-3.10.30.orig/drivers/gpio/gpio-mxc.c linux-3.10.30/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-16 15:28:21.557386241 +0200 ++++ linux-3.10.30/drivers/gpio/gpio-mxc.c 2014-05-19 19:07:23.641305095 +0200 @@ -405,34 +405,19 @@ mxc_gpio_get_hw(pdev); @@ -77289,9 +77614,9 @@ diff -Nur linux-3.10.30.orig/drivers/gpio/gpio-mxc.c linux-linaro-stable-mx6/dri dev_info(&pdev->dev, "%s failed with errno %d\n", __func__, err); return err; } -diff -Nur linux-3.10.30.orig/drivers/gpio/gpio-pca953x.c linux-linaro-stable-mx6/drivers/gpio/gpio-pca953x.c +diff -Nur linux-3.10.30.orig/drivers/gpio/gpio-pca953x.c linux-3.10.30/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-16 15:28:21.557386241 +0200 ++++ linux-3.10.30/drivers/gpio/gpio-pca953x.c 2014-05-19 19:07:23.641305095 +0200 @@ -19,6 +19,7 @@ #include <linux/irqdomain.h> #include <linux/i2c.h> @@ -77311,9 +77636,9 @@ diff -Nur linux-3.10.30.orig/drivers/gpio/gpio-pca953x.c linux-linaro-stable-mx6 /* initialize cached registers from their original values. * we can't share this chip with another i2c master. */ -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 +diff -Nur linux-3.10.30.orig/drivers/gpu/drm/drm_crtc_helper.c linux-3.10.30/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-16 15:28:21.569386304 +0200 ++++ linux-3.10.30/drivers/gpu/drm/drm_crtc_helper.c 2014-05-19 19:07:23.641305095 +0200 @@ -308,6 +308,29 @@ EXPORT_SYMBOL(drm_helper_disable_unused_functions); @@ -77371,9 +77696,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/gpu/drm/Kconfig linux-3.10.30/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-16 15:28:21.565386284 +0200 ++++ linux-3.10.30/drivers/gpu/drm/Kconfig 2014-05-19 19:07:23.641305095 +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. @@ -77388,9 +77713,9 @@ diff -Nur linux-3.10.30.orig/drivers/gpu/drm/Kconfig linux-linaro-stable-mx6/dri source "drivers/gpu/drm/exynos/Kconfig" 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 +diff -Nur linux-3.10.30.orig/drivers/gpu/drm/Makefile linux-3.10.30/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-16 15:28:21.565386284 +0200 ++++ linux-3.10.30/drivers/gpu/drm/Makefile 2014-05-19 19:07:23.641305095 +0200 @@ -1,3 +1,24 @@ +############################################################################## +# @@ -77426,9 +77751,9 @@ diff -Nur linux-3.10.30.orig/drivers/gpu/drm/Makefile linux-linaro-stable-mx6/dr obj-$(CONFIG_DRM_TDFX) += tdfx/ obj-$(CONFIG_DRM_R128) += r128/ 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 +diff -Nur linux-3.10.30.orig/drivers/gpu/drm/vivante/Makefile linux-3.10.30/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-16 15:28:21.705387022 +0200 ++++ linux-3.10.30/drivers/gpu/drm/vivante/Makefile 2014-05-19 19:07:23.641305095 +0200 @@ -0,0 +1,29 @@ +############################################################################## +# @@ -77459,9 +77784,9 @@ diff -Nur linux-3.10.30.orig/drivers/gpu/drm/vivante/Makefile linux-linaro-stabl +vivante-y := vivante_drv.o + +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 +diff -Nur linux-3.10.30.orig/drivers/gpu/drm/vivante/vivante_drv.c linux-3.10.30/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-16 15:28:21.705387022 +0200 ++++ linux-3.10.30/drivers/gpu/drm/vivante/vivante_drv.c 2014-05-19 19:07:23.645305110 +0200 @@ -0,0 +1,111 @@ +/**************************************************************************** +* @@ -77574,9 +77899,9 @@ diff -Nur linux-3.10.30.orig/drivers/gpu/drm/vivante/vivante_drv.c linux-linaro- +MODULE_AUTHOR(DRIVER_AUTHOR); +MODULE_DESCRIPTION(DRIVER_DESC); +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 +diff -Nur linux-3.10.30.orig/drivers/gpu/drm/vivante/vivante_drv.h linux-3.10.30/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-16 15:28:21.705387022 +0200 ++++ linux-3.10.30/drivers/gpu/drm/vivante/vivante_drv.h 2014-05-19 19:07:23.645305110 +0200 @@ -0,0 +1,66 @@ +/**************************************************************************** +* @@ -77644,9 +77969,9 @@ diff -Nur linux-3.10.30.orig/drivers/gpu/drm/vivante/vivante_drv.h linux-linaro- +#define DRIVER_PATCHLEVEL 0 + +#endif -diff -Nur linux-3.10.30.orig/drivers/hwmon/Kconfig linux-linaro-stable-mx6/drivers/hwmon/Kconfig +diff -Nur linux-3.10.30.orig/drivers/hwmon/Kconfig linux-3.10.30/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-16 15:28:21.733387169 +0200 ++++ linux-3.10.30/drivers/hwmon/Kconfig 2014-05-19 19:07:23.645305110 +0200 @@ -867,6 +867,15 @@ This driver can also be built as a module. If so, the module will be called max1668. @@ -77682,9 +78007,9 @@ diff -Nur linux-3.10.30.orig/drivers/hwmon/Kconfig linux-linaro-stable-mx6/drive + default y + endif # HWMON -diff -Nur linux-3.10.30.orig/drivers/hwmon/mag3110.c linux-linaro-stable-mx6/drivers/hwmon/mag3110.c +diff -Nur linux-3.10.30.orig/drivers/hwmon/mag3110.c linux-3.10.30/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-16 15:28:21.749387254 +0200 ++++ linux-3.10.30/drivers/hwmon/mag3110.c 2014-05-19 19:07:23.645305110 +0200 @@ -0,0 +1,611 @@ +/* + * @@ -78297,9 +78622,9 @@ diff -Nur linux-3.10.30.orig/drivers/hwmon/mag3110.c linux-linaro-stable-mx6/dri +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("Freescale mag3110 3-axis magnetometer driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/hwmon/Makefile linux-linaro-stable-mx6/drivers/hwmon/Makefile +diff -Nur linux-3.10.30.orig/drivers/hwmon/Makefile linux-3.10.30/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-16 15:28:21.733387169 +0200 ++++ linux-3.10.30/drivers/hwmon/Makefile 2014-05-19 19:07:23.645305110 +0200 @@ -101,6 +101,7 @@ obj-$(CONFIG_SENSORS_MAX16065) += max16065.o obj-$(CONFIG_SENSORS_MAX1619) += max1619.o @@ -78317,9 +78642,9 @@ diff -Nur linux-3.10.30.orig/drivers/hwmon/Makefile linux-linaro-stable-mx6/driv obj-$(CONFIG_PMBUS) += pmbus/ -diff -Nur linux-3.10.30.orig/drivers/hwmon/max17135-hwmon.c linux-linaro-stable-mx6/drivers/hwmon/max17135-hwmon.c +diff -Nur linux-3.10.30.orig/drivers/hwmon/max17135-hwmon.c linux-3.10.30/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-16 15:28:21.749387254 +0200 ++++ linux-3.10.30/drivers/hwmon/max17135-hwmon.c 2014-05-19 19:07:23.645305110 +0200 @@ -0,0 +1,176 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. @@ -78497,9 +78822,9 @@ diff -Nur linux-3.10.30.orig/drivers/hwmon/max17135-hwmon.c linux-linaro-stable- +MODULE_DESCRIPTION("MAX17135 sensor driver"); +MODULE_LICENSE("GPL"); + -diff -Nur linux-3.10.30.orig/drivers/hwmon/mxc_mma8451.c linux-linaro-stable-mx6/drivers/hwmon/mxc_mma8451.c +diff -Nur linux-3.10.30.orig/drivers/hwmon/mxc_mma8451.c linux-3.10.30/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-16 15:28:21.749387254 +0200 ++++ linux-3.10.30/drivers/hwmon/mxc_mma8451.c 2014-05-19 19:07:23.645305110 +0200 @@ -0,0 +1,538 @@ +/* + * mma8451.c - Linux kernel modules for 3-Axis Orientation/Motion @@ -79039,9 +79364,9 @@ diff -Nur linux-3.10.30.orig/drivers/hwmon/mxc_mma8451.c linux-linaro-stable-mx6 + +module_init(mma8451_init); +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 +diff -Nur linux-3.10.30.orig/drivers/i2c/busses/i2c-davinci.c linux-3.10.30/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-16 15:28:21.765387339 +0200 ++++ linux-3.10.30/drivers/i2c/busses/i2c-davinci.c 2014-05-19 19:07:23.645305110 +0200 @@ -646,13 +646,6 @@ struct resource *mem, *irq; int r; @@ -79064,9 +79389,9 @@ diff -Nur linux-3.10.30.orig/drivers/i2c/busses/i2c-davinci.c linux-linaro-stabl dev->base = devm_ioremap_resource(&pdev->dev, mem); if (IS_ERR(dev->base)) { 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 +diff -Nur linux-3.10.30.orig/drivers/i2c/busses/i2c-designware-platdrv.c linux-3.10.30/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-16 15:28:21.769387359 +0200 ++++ linux-3.10.30/drivers/i2c/busses/i2c-designware-platdrv.c 2014-05-19 19:07:23.645305110 +0200 @@ -87,13 +87,6 @@ struct resource *mem; int irq, r; @@ -79089,9 +79414,9 @@ diff -Nur linux-3.10.30.orig/drivers/i2c/busses/i2c-designware-platdrv.c linux-l dev->base = devm_ioremap_resource(&pdev->dev, mem); if (IS_ERR(dev->base)) 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 +diff -Nur linux-3.10.30.orig/drivers/i2c/busses/i2c-imx.c linux-3.10.30/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-16 15:28:21.769387359 +0200 ++++ linux-3.10.30/drivers/i2c/busses/i2c-imx.c 2014-05-19 19:07:23.645305110 +0200 @@ -51,7 +51,6 @@ #include <linux/of.h> #include <linux/of_device.h> @@ -79306,9 +79631,9 @@ diff -Nur linux-3.10.30.orig/drivers/i2c/busses/i2c-imx.c linux-linaro-stable-mx dev_dbg(&i2c_imx->adapter.dev, "claimed irq %d\n", irq); 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 +diff -Nur linux-3.10.30.orig/drivers/i2c/busses/i2c-omap.c linux-3.10.30/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-16 15:28:21.773387380 +0200 ++++ linux-3.10.30/drivers/i2c/busses/i2c-omap.c 2014-05-19 19:07:23.649305124 +0200 @@ -1087,13 +1087,6 @@ u32 rev; u16 minor, major, scheme; @@ -79331,9 +79656,9 @@ diff -Nur linux-3.10.30.orig/drivers/i2c/busses/i2c-omap.c linux-linaro-stable-m dev->base = devm_ioremap_resource(&pdev->dev, mem); if (IS_ERR(dev->base)) 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 +diff -Nur linux-3.10.30.orig/drivers/i2c/busses/i2c-rcar.c linux-3.10.30/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-16 15:28:21.773387380 +0200 ++++ linux-3.10.30/drivers/i2c/busses/i2c-rcar.c 2014-05-19 19:07:23.649305124 +0200 @@ -623,12 +623,6 @@ u32 bus_speed; int ret; @@ -79355,9 +79680,9 @@ diff -Nur linux-3.10.30.orig/drivers/i2c/busses/i2c-rcar.c linux-linaro-stable-m priv->io = devm_ioremap_resource(dev, res); if (IS_ERR(priv->io)) 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 +diff -Nur linux-3.10.30.orig/drivers/input/keyboard/gpio_keys.c linux-3.10.30/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-16 15:28:21.889387992 +0200 ++++ linux-3.10.30/drivers/input/keyboard/gpio_keys.c 2014-05-19 19:07:23.649305124 +0200 @@ -3,6 +3,7 @@ * * Copyright 2005 Phil Blundell @@ -79375,9 +79700,9 @@ diff -Nur linux-3.10.30.orig/drivers/input/keyboard/gpio_keys.c linux-linaro-sta } else { 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 +diff -Nur linux-3.10.30.orig/drivers/input/keyboard/imx_keypad.c linux-3.10.30/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-16 15:28:21.889387992 +0200 ++++ linux-3.10.30/drivers/input/keyboard/imx_keypad.c 2014-05-19 19:07:23.649305124 +0200 @@ -1,6 +1,7 @@ /* * Driver for the IMX keypad port. @@ -79404,9 +79729,9 @@ diff -Nur linux-3.10.30.orig/drivers/input/keyboard/imx_keypad.c linux-linaro-st mutex_lock(&input_dev->mutex); -diff -Nur linux-3.10.30.orig/drivers/input/misc/isl29023.c linux-linaro-stable-mx6/drivers/input/misc/isl29023.c +diff -Nur linux-3.10.30.orig/drivers/input/misc/isl29023.c linux-3.10.30/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-16 15:28:21.897388034 +0200 ++++ linux-3.10.30/drivers/input/misc/isl29023.c 2014-05-19 19:07:23.649305124 +0200 @@ -0,0 +1,1029 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -80437,9 +80762,9 @@ diff -Nur linux-3.10.30.orig/drivers/input/misc/isl29023.c linux-linaro-stable-m + +module_init(isl29023_init); +module_exit(isl29023_exit); -diff -Nur linux-3.10.30.orig/drivers/input/misc/Kconfig linux-linaro-stable-mx6/drivers/input/misc/Kconfig +diff -Nur linux-3.10.30.orig/drivers/input/misc/Kconfig linux-3.10.30/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-16 15:28:21.893388013 +0200 ++++ linux-3.10.30/drivers/input/misc/Kconfig 2014-05-19 19:07:23.649305124 +0200 @@ -637,4 +637,14 @@ To compile this driver as a module, choose M here: the module will be called xen-kbdfront. @@ -80455,17 +80780,17 @@ diff -Nur linux-3.10.30.orig/drivers/input/misc/Kconfig linux-linaro-stable-mx6/ + will be called isl29023. + endif -diff -Nur linux-3.10.30.orig/drivers/input/misc/Makefile linux-linaro-stable-mx6/drivers/input/misc/Makefile +diff -Nur linux-3.10.30.orig/drivers/input/misc/Makefile linux-3.10.30/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-16 15:28:21.893388013 +0200 ++++ linux-3.10.30/drivers/input/misc/Makefile 2014-05-19 19:07:23.649305124 +0200 @@ -60,3 +60,4 @@ obj-$(CONFIG_INPUT_WM831X_ON) += wm831x-on.o obj-$(CONFIG_INPUT_XEN_KBDDEV_FRONTEND) += xen-kbdfront.o obj-$(CONFIG_INPUT_YEALINK) += yealink.o +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 +diff -Nur linux-3.10.30.orig/drivers/input/misc/mma8450.c linux-3.10.30/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-16 15:28:21.897388034 +0200 ++++ linux-3.10.30/drivers/input/misc/mma8450.c 2014-05-19 19:07:23.649305124 +0200 @@ -1,7 +1,7 @@ /* * Driver for Freescale's 3-Axis Accelerometer MMA8450 @@ -80519,9 +80844,9 @@ diff -Nur linux-3.10.30.orig/drivers/input/misc/mma8450.c linux-linaro-stable-mx return err; } -diff -Nur linux-3.10.30.orig/drivers/input/touchscreen/egalax_ts.c linux-linaro-stable-mx6/drivers/input/touchscreen/egalax_ts.c +diff -Nur linux-3.10.30.orig/drivers/input/touchscreen/egalax_ts.c linux-3.10.30/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-16 15:28:21.917388140 +0200 ++++ linux-3.10.30/drivers/input/touchscreen/egalax_ts.c 2014-05-19 19:07:23.649305124 +0200 @@ -1,7 +1,7 @@ /* * Driver for EETI eGalax Multiple Touch Controller @@ -80729,9 +81054,9 @@ diff -Nur linux-3.10.30.orig/drivers/input/touchscreen/egalax_ts.c linux-linaro- input_set_drvdata(input_dev, ts); 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 +diff -Nur linux-3.10.30.orig/drivers/input/touchscreen/elan_ts.c linux-3.10.30/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-16 15:28:21.917388140 +0200 ++++ linux-3.10.30/drivers/input/touchscreen/elan_ts.c 2014-05-19 19:07:23.649305124 +0200 @@ -0,0 +1,472 @@ +/* + * Copyright (C) 2007-2008 HTC Corporation. @@ -81205,9 +81530,9 @@ diff -Nur linux-3.10.30.orig/drivers/input/touchscreen/elan_ts.c linux-linaro-st +MODULE_AUTHOR("Stanley Zeng <stanley.zeng@emc.com.tw>"); +MODULE_DESCRIPTION("ELAN Touch Screen driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/input/touchscreen/Kconfig linux-linaro-stable-mx6/drivers/input/touchscreen/Kconfig +diff -Nur linux-3.10.30.orig/drivers/input/touchscreen/Kconfig linux-3.10.30/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-16 15:28:21.913388119 +0200 ++++ linux-3.10.30/drivers/input/touchscreen/Kconfig 2014-05-19 19:07:23.649305124 +0200 @@ -235,6 +235,27 @@ To compile this driver as a module, choose M here: the module will be called egalax_ts. @@ -81236,9 +81561,9 @@ diff -Nur linux-3.10.30.orig/drivers/input/touchscreen/Kconfig linux-linaro-stab config TOUCHSCREEN_FUJITSU tristate "Fujitsu serial touchscreen" select SERIO -diff -Nur linux-3.10.30.orig/drivers/input/touchscreen/Makefile linux-linaro-stable-mx6/drivers/input/touchscreen/Makefile +diff -Nur linux-3.10.30.orig/drivers/input/touchscreen/Makefile linux-3.10.30/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-16 15:28:21.913388119 +0200 ++++ linux-3.10.30/drivers/input/touchscreen/Makefile 2014-05-19 19:07:23.649305124 +0200 @@ -27,6 +27,7 @@ obj-$(CONFIG_TOUCHSCREEN_HAMPSHIRE) += hampshire.o obj-$(CONFIG_TOUCHSCREEN_GUNZE) += gunze.o @@ -81247,9 +81572,9 @@ diff -Nur linux-3.10.30.orig/drivers/input/touchscreen/Makefile linux-linaro-sta obj-$(CONFIG_TOUCHSCREEN_ELO) += elo.o obj-$(CONFIG_TOUCHSCREEN_EGALAX) += egalax_ts.o 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 +diff -Nur linux-3.10.30.orig/drivers/input/touchscreen/max11801_ts.c linux-3.10.30/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-16 15:28:21.917388140 +0200 ++++ linux-3.10.30/drivers/input/touchscreen/max11801_ts.c 2014-05-19 19:07:23.649305124 +0200 @@ -2,7 +2,7 @@ * Driver for MAXI MAX11801 - A Resistive touch screen controller with * i2c interface @@ -81551,9 +81876,9 @@ diff -Nur linux-3.10.30.orig/drivers/input/touchscreen/max11801_ts.c linux-linar }, .id_table = max11801_ts_id, .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 +diff -Nur linux-3.10.30.orig/drivers/irqchip/irq-gic.c linux-3.10.30/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-16 15:28:21.929388203 +0200 ++++ linux-3.10.30/drivers/irqchip/irq-gic.c 2014-05-19 19:07:23.653305140 +0200 @@ -41,6 +41,7 @@ #include <linux/slab.h> #include <linux/irqchip/chained_irq.h> @@ -81758,9 +82083,9 @@ diff -Nur linux-3.10.30.orig/drivers/irqchip/irq-gic.c linux-linaro-stable-mx6/d if (parent) { irq = irq_of_parse_and_map(node, 0); -diff -Nur linux-3.10.30.orig/drivers/Kconfig linux-linaro-stable-mx6/drivers/Kconfig +diff -Nur linux-3.10.30.orig/drivers/Kconfig linux-3.10.30/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-16 15:28:21.313384954 +0200 ++++ linux-3.10.30/drivers/Kconfig 2014-05-19 19:07:23.653305140 +0200 @@ -98,6 +98,8 @@ source "drivers/memstick/Kconfig" @@ -81777,9 +82102,9 @@ diff -Nur linux-3.10.30.orig/drivers/Kconfig linux-linaro-stable-mx6/drivers/Kco +source "drivers/gator/Kconfig" + endmenu -diff -Nur linux-3.10.30.orig/drivers/leds/leds-pwm.c linux-linaro-stable-mx6/drivers/leds/leds-pwm.c +diff -Nur linux-3.10.30.orig/drivers/leds/leds-pwm.c linux-3.10.30/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-16 15:28:21.997388562 +0200 ++++ linux-3.10.30/drivers/leds/leds-pwm.c 2014-05-19 19:07:23.653305140 +0200 @@ -67,8 +67,13 @@ container_of(led_cdev, struct led_pwm_data, cdev); unsigned int max = led_dat->cdev.max_brightness; @@ -81820,9 +82145,9 @@ diff -Nur linux-3.10.30.orig/drivers/leds/leds-pwm.c linux-linaro-stable-mx6/dri led_dat->can_sleep = pwm_can_sleep(led_dat->pwm); if (led_dat->can_sleep) -diff -Nur linux-3.10.30.orig/drivers/Makefile linux-linaro-stable-mx6/drivers/Makefile +diff -Nur linux-3.10.30.orig/drivers/Makefile linux-3.10.30/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-16 15:28:21.313384954 +0200 ++++ linux-3.10.30/drivers/Makefile 2014-05-19 19:07:23.653305140 +0200 @@ -109,6 +109,7 @@ obj-$(CONFIG_CPU_FREQ) += cpufreq/ obj-$(CONFIG_CPU_IDLE) += cpuidle/ @@ -81837,9 +82162,9 @@ diff -Nur linux-3.10.30.orig/drivers/Makefile linux-linaro-stable-mx6/drivers/Ma obj-$(CONFIG_NTB) += ntb/ + +obj-$(CONFIG_GATOR) += gator/ -diff -Nur linux-3.10.30.orig/drivers/media/platform/Kconfig linux-linaro-stable-mx6/drivers/media/platform/Kconfig +diff -Nur linux-3.10.30.orig/drivers/media/platform/Kconfig linux-3.10.30/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-16 15:28:22.177389511 +0200 ++++ linux-3.10.30/drivers/media/platform/Kconfig 2014-05-19 19:07:23.653305140 +0200 @@ -121,6 +121,21 @@ To compile this driver as a module, choose M here: the module will be called s3c-camif. @@ -81862,9 +82187,9 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/Kconfig linux-linaro-stable- source "drivers/media/platform/soc_camera/Kconfig" source "drivers/media/platform/exynos4-is/Kconfig" source "drivers/media/platform/s5p-tv/Kconfig" -diff -Nur linux-3.10.30.orig/drivers/media/platform/Makefile linux-linaro-stable-mx6/drivers/media/platform/Makefile +diff -Nur linux-3.10.30.orig/drivers/media/platform/Makefile linux-3.10.30/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-16 15:28:22.177389511 +0200 ++++ linux-3.10.30/drivers/media/platform/Makefile 2014-05-19 19:07:23.653305140 +0200 @@ -50,4 +50,7 @@ obj-$(CONFIG_ARCH_OMAP) += omap/ @@ -81873,9 +82198,9 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/Makefile linux-linaro-stable +obj-$(CONFIG_VIDEO_MXC_OUTPUT) += mxc/output/ + 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 +diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/adv7180.c linux-3.10.30/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-16 15:28:22.189389574 +0200 ++++ linux-3.10.30/drivers/media/platform/mxc/capture/adv7180.c 2014-05-19 19:07:23.653305140 +0200 @@ -0,0 +1,1344 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -83221,9 +83546,9 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/adv7180.c linux- +MODULE_AUTHOR("Freescale Semiconductor"); +MODULE_DESCRIPTION("Anolog Device ADV7180 video decoder driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.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 +diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/csi_v4l2_capture.c linux-3.10.30/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-16 15:28:22.193389596 +0200 ++++ linux-3.10.30/drivers/media/platform/mxc/capture/csi_v4l2_capture.c 2014-05-19 19:07:23.657305154 +0200 @@ -0,0 +1,2047 @@ +/* + * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -85272,9 +85597,9 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/csi_v4l2_capture +MODULE_DESCRIPTION("V4L2 capture driver for Mx25 based cameras"); +MODULE_LICENSE("GPL"); +MODULE_SUPPORTED_DEVICE("video"); -diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/fsl_csi.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/fsl_csi.c +diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/fsl_csi.c linux-3.10.30/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-16 15:28:22.193389596 +0200 ++++ linux-3.10.30/drivers/media/platform/mxc/capture/fsl_csi.c 2014-05-19 19:07:23.657305154 +0200 @@ -0,0 +1,302 @@ +/* + * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -85578,9 +85903,9 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/fsl_csi.c linux- +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("fsl CSI driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/fsl_csi.h linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/fsl_csi.h +diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/fsl_csi.h linux-3.10.30/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-16 15:28:22.193389596 +0200 ++++ linux-3.10.30/drivers/media/platform/mxc/capture/fsl_csi.h 2014-05-19 19:07:23.657305154 +0200 @@ -0,0 +1,198 @@ +/* + * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -85780,9 +86105,9 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/fsl_csi.h linux- +void csi_mclk_disable(void); +void csi_dmareq_rff_enable(void); +void csi_dmareq_rff_disable(void); -diff -Nur linux-3.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 +diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c linux-3.10.30/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-16 15:28:22.193389596 +0200 ++++ linux-3.10.30/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c 2014-05-19 19:07:23.657305154 +0200 @@ -0,0 +1,554 @@ + +/* @@ -86338,9 +86663,9 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_bg_overlay_s +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("IPU PRP VF SDC Backgroud Driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.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 +diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_csi_enc.c linux-3.10.30/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-16 15:28:22.193389596 +0200 ++++ linux-3.10.30/drivers/media/platform/mxc/capture/ipu_csi_enc.c 2014-05-19 19:07:23.657305154 +0200 @@ -0,0 +1,426 @@ +/* + * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -86768,9 +87093,9 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_csi_enc.c li +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("CSI ENC Driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.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 +diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c linux-3.10.30/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-16 15:28:22.193389596 +0200 ++++ linux-3.10.30/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c 2014-05-19 19:07:23.657305154 +0200 @@ -0,0 +1,642 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -87414,9 +87739,9 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_fg_overlay_s +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("IPU PRP VF SDC Driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.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 +diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_prp_enc.c linux-3.10.30/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-16 15:28:22.193389596 +0200 ++++ linux-3.10.30/drivers/media/platform/mxc/capture/ipu_prp_enc.c 2014-05-19 19:07:23.673305213 +0200 @@ -0,0 +1,603 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -88021,9 +88346,9 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_prp_enc.c li +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("IPU PRP ENC Driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.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 +diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_prp_sw.h linux-3.10.30/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-16 15:28:22.193389596 +0200 ++++ linux-3.10.30/drivers/media/platform/mxc/capture/ipu_prp_sw.h 2014-05-19 19:07:23.673305213 +0200 @@ -0,0 +1,43 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -88068,9 +88393,9 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_prp_sw.h lin +int prp_still_deselect(void *private); + +#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 +diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c linux-3.10.30/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-16 15:28:22.193389596 +0200 ++++ linux-3.10.30/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c 2014-05-19 19:07:23.673305213 +0200 @@ -0,0 +1,529 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -88601,9 +88926,9 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_b +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("IPU PRP VF SDC Backgroud Driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.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 +diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c linux-3.10.30/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-16 15:28:22.193389596 +0200 ++++ linux-3.10.30/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c 2014-05-19 19:07:23.677305228 +0200 @@ -0,0 +1,590 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -89195,9 +89520,9 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("IPU PRP VF SDC Driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_still.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ipu_still.c +diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_still.c linux-3.10.30/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-16 15:28:22.193389596 +0200 ++++ linux-3.10.30/drivers/media/platform/mxc/capture/ipu_still.c 2014-05-19 19:07:23.677305228 +0200 @@ -0,0 +1,268 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -89467,9 +89792,9 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ipu_still.c linu +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("IPU PRP STILL IMAGE Driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/Kconfig linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/Kconfig +diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/Kconfig linux-3.10.30/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-16 15:28:22.189389574 +0200 ++++ linux-3.10.30/drivers/media/platform/mxc/capture/Kconfig 2014-05-19 19:07:23.677305228 +0200 @@ -0,0 +1,86 @@ +if VIDEO_MXC_CAPTURE + @@ -89557,9 +89882,9 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/Kconfig linux-li +endmenu + +endif -diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/Makefile linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/Makefile +diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/Makefile linux-3.10.30/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-16 15:28:22.189389574 +0200 ++++ linux-3.10.30/drivers/media/platform/mxc/capture/Makefile 2014-05-19 19:07:23.677305228 +0200 @@ -0,0 +1,21 @@ +obj-$(CONFIG_VIDEO_MXC_CSI_CAMERA) += fsl_csi.o csi_v4l2_capture.o + @@ -89582,9 +89907,9 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/Makefile linux-l + +adv7180_tvin-objs := adv7180.o +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 +diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c linux-3.10.30/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-16 15:28:22.193389596 +0200 ++++ linux-3.10.30/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c 2014-05-19 19:07:23.681305243 +0200 @@ -0,0 +1,3109 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -92695,9 +93020,9 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/mxc_v4l2_capture +MODULE_DESCRIPTION("V4L2 capture driver for Mxc based cameras"); +MODULE_LICENSE("GPL"); +MODULE_SUPPORTED_DEVICE("video"); -diff -Nur linux-3.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 +diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h linux-3.10.30/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-16 15:28:22.193389596 +0200 ++++ linux-3.10.30/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h 2014-05-19 19:07:23.685305258 +0200 @@ -0,0 +1,260 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -92959,9 +93284,9 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/mxc_v4l2_capture + +void set_mclk_rate(uint32_t *p_mclk_freq, uint32_t csi); +#endif /* __MXC_V4L2_CAPTURE_H__ */ -diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ov5640.c linux-linaro-stable-mx6/drivers/media/platform/mxc/capture/ov5640.c +diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ov5640.c linux-3.10.30/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-16 15:28:22.193389596 +0200 ++++ linux-3.10.30/drivers/media/platform/mxc/capture/ov5640.c 2014-05-19 19:07:23.685305258 +0200 @@ -0,0 +1,1951 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -94914,9 +95239,9 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ov5640.c linux-l +MODULE_LICENSE("GPL"); +MODULE_VERSION("1.0"); +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 +diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ov5640_mipi.c linux-3.10.30/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-16 15:28:22.193389596 +0200 ++++ linux-3.10.30/drivers/media/platform/mxc/capture/ov5640_mipi.c 2014-05-19 19:07:23.685305258 +0200 @@ -0,0 +1,2104 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -97022,9 +97347,9 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ov5640_mipi.c li +MODULE_LICENSE("GPL"); +MODULE_VERSION("1.0"); +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 +diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ov5642.c linux-3.10.30/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-16 15:28:22.193389596 +0200 ++++ linux-3.10.30/drivers/media/platform/mxc/capture/ov5642.c 2014-05-19 19:07:23.689305272 +0200 @@ -0,0 +1,4252 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -101278,9 +101603,9 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/capture/ov5642.c linux-l +MODULE_LICENSE("GPL"); +MODULE_VERSION("1.0"); +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 +diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/output/Kconfig linux-3.10.30/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-16 15:28:22.193389596 +0200 ++++ linux-3.10.30/drivers/media/platform/mxc/output/Kconfig 2014-05-19 19:07:23.689305272 +0200 @@ -0,0 +1,16 @@ +config VIDEO_MXC_IPU_OUTPUT + tristate "IPU v4l2 output support" @@ -101298,15 +101623,15 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/output/Kconfig linux-lin + the MXC framebuffer on a video stream. + + 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 +diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/output/Makefile linux-3.10.30/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-16 15:28:22.193389596 +0200 ++++ linux-3.10.30/drivers/media/platform/mxc/output/Makefile 2014-05-19 19:07:23.689305272 +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 +diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/output/mxc_pxp_v4l2.c linux-3.10.30/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-16 15:28:22.193389596 +0200 ++++ linux-3.10.30/drivers/media/platform/mxc/output/mxc_pxp_v4l2.c 2014-05-19 19:07:23.689305272 +0200 @@ -0,0 +1,1263 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. @@ -102571,9 +102896,9 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/output/mxc_pxp_v4l2.c li +MODULE_DESCRIPTION("MXC PxP V4L2 driver"); +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +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 +diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/output/mxc_pxp_v4l2.h linux-3.10.30/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-16 15:28:22.193389596 +0200 ++++ linux-3.10.30/drivers/media/platform/mxc/output/mxc_pxp_v4l2.h 2014-05-19 19:07:23.689305272 +0200 @@ -0,0 +1,83 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. @@ -102658,9 +102983,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/output/mxc_vout.c linux-3.10.30/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-16 15:28:22.193389596 +0200 ++++ linux-3.10.30/drivers/media/platform/mxc/output/mxc_vout.c 2014-05-19 19:07:23.693305287 +0200 @@ -0,0 +1,2265 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -104927,9 +105252,9 @@ diff -Nur linux-3.10.30.orig/drivers/media/platform/mxc/output/mxc_vout.c linux- +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("V4L2-driver for MXC video output"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/media/v4l2-core/videobuf-dma-contig.c linux-linaro-stable-mx6/drivers/media/v4l2-core/videobuf-dma-contig.c +diff -Nur linux-3.10.30.orig/drivers/media/v4l2-core/videobuf-dma-contig.c linux-3.10.30/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-16 15:28:22.321390271 +0200 ++++ linux-3.10.30/drivers/media/v4l2-core/videobuf-dma-contig.c 2014-05-19 19:07:23.693305287 +0200 @@ -307,7 +307,7 @@ size = vma->vm_end - vma->vm_start; size = (size < mem->size) ? size : mem->size; @@ -104939,9 +105264,9 @@ diff -Nur linux-3.10.30.orig/drivers/media/v4l2-core/videobuf-dma-contig.c linux retval = remap_pfn_range(vma, vma->vm_start, mem->dma_handle >> PAGE_SHIFT, size, vma->vm_page_prot); -diff -Nur linux-3.10.30.orig/drivers/mfd/Kconfig linux-linaro-stable-mx6/drivers/mfd/Kconfig +diff -Nur linux-3.10.30.orig/drivers/mfd/Kconfig linux-3.10.30/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-16 15:28:22.341390376 +0200 ++++ linux-3.10.30/drivers/mfd/Kconfig 2014-05-19 19:07:23.693305287 +0200 @@ -139,6 +139,13 @@ This driver can be built as a module. If built as a module it will be called "da9055" @@ -104988,9 +105313,9 @@ diff -Nur linux-3.10.30.orig/drivers/mfd/Kconfig linux-linaro-stable-mx6/drivers + help + Serial Power Controller driver for ARM Ltd. test chips. + -diff -Nur linux-3.10.30.orig/drivers/mfd/Makefile linux-linaro-stable-mx6/drivers/mfd/Makefile +diff -Nur linux-3.10.30.orig/drivers/mfd/Makefile linux-3.10.30/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-16 15:28:22.341390376 +0200 ++++ linux-3.10.30/drivers/mfd/Makefile 2014-05-19 19:07:23.693305287 +0200 @@ -104,6 +104,7 @@ da9055-objs := da9055-core.o da9055-i2c.o obj-$(CONFIG_MFD_DA9055) += da9055.o @@ -105007,9 +105332,9 @@ diff -Nur linux-3.10.30.orig/drivers/mfd/Makefile linux-linaro-stable-mx6/driver obj-$(CONFIG_MFD_RETU) += retu-mfd.o obj-$(CONFIG_MFD_AS3711) += as3711.o +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 +diff -Nur linux-3.10.30.orig/drivers/mfd/max17135-core.c linux-3.10.30/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-16 15:28:22.345390397 +0200 ++++ linux-3.10.30/drivers/mfd/max17135-core.c 2014-05-19 19:07:23.693305287 +0200 @@ -0,0 +1,295 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. @@ -105306,9 +105631,9 @@ diff -Nur linux-3.10.30.orig/drivers/mfd/max17135-core.c linux-linaro-stable-mx6 + */ +subsys_initcall(max17135_init); +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 +diff -Nur linux-3.10.30.orig/drivers/mfd/mxc-hdmi-core.c linux-3.10.30/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-16 15:28:22.349390418 +0200 ++++ linux-3.10.30/drivers/mfd/mxc-hdmi-core.c 2014-05-19 19:07:23.693305287 +0200 @@ -0,0 +1,775 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. @@ -106085,9 +106410,9 @@ diff -Nur linux-3.10.30.orig/drivers/mfd/mxc-hdmi-core.c linux-linaro-stable-mx6 +MODULE_DESCRIPTION("Core driver for Freescale i.Mx on-chip HDMI"); +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/mfd/si476x-cmd.c linux-linaro-stable-mx6/drivers/mfd/si476x-cmd.c +diff -Nur linux-3.10.30.orig/drivers/mfd/si476x-cmd.c linux-3.10.30/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-16 15:28:22.349390418 +0200 ++++ linux-3.10.30/drivers/mfd/si476x-cmd.c 2014-05-19 19:07:23.693305287 +0200 @@ -303,13 +303,13 @@ * possible racing conditions when working in polling mode */ atomic_set(&core->cts, 0); @@ -106109,9 +106434,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/mfd/si476x-i2c.c linux-3.10.30/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-16 15:28:22.349390418 +0200 ++++ linux-3.10.30/drivers/mfd/si476x-i2c.c 2014-05-19 19:07:23.693305287 +0200 @@ -303,7 +303,7 @@ */ udelay(100); @@ -106159,9 +106484,9 @@ diff -Nur linux-3.10.30.orig/drivers/mfd/si476x-i2c.c linux-linaro-stable-mx6/dr rval = si476x_core_get_revision_info(core); if (rval < 0) { rval = -ENODEV; -diff -Nur linux-3.10.30.orig/drivers/mfd/si476x-prop.c linux-linaro-stable-mx6/drivers/mfd/si476x-prop.c +diff -Nur linux-3.10.30.orig/drivers/mfd/si476x-prop.c linux-3.10.30/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-16 15:28:22.349390418 +0200 ++++ linux-3.10.30/drivers/mfd/si476x-prop.c 2014-05-19 19:07:23.693305287 +0200 @@ -217,15 +217,36 @@ return 0; } @@ -106199,9 +106524,9 @@ diff -Nur linux-3.10.30.orig/drivers/mfd/si476x-prop.c linux-linaro-stable-mx6/d .reg_read = si476x_core_regmap_read, .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 +diff -Nur linux-3.10.30.orig/drivers/mfd/vexpress-config.c linux-3.10.30/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-16 15:28:22.357390461 +0200 ++++ linux-3.10.30/drivers/mfd/vexpress-config.c 2014-05-19 19:07:23.697305302 +0200 @@ -86,29 +86,13 @@ } EXPORT_SYMBOL(vexpress_config_bridge_unregister); @@ -106285,9 +106610,9 @@ diff -Nur linux-3.10.30.orig/drivers/mfd/vexpress-config.c linux-linaro-stable-m if (!func->func) { of_node_put(node); kfree(func); -diff -Nur linux-3.10.30.orig/drivers/mfd/vexpress-spc.c linux-linaro-stable-mx6/drivers/mfd/vexpress-spc.c +diff -Nur linux-3.10.30.orig/drivers/mfd/vexpress-spc.c linux-3.10.30/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-16 15:28:22.357390461 +0200 ++++ linux-3.10.30/drivers/mfd/vexpress-spc.c 2014-05-19 19:07:23.697305302 +0200 @@ -0,0 +1,633 @@ +/* + * Versatile Express Serial Power Controller (SPC) support @@ -106922,9 +107247,9 @@ diff -Nur linux-3.10.30.orig/drivers/mfd/vexpress-spc.c linux-linaro-stable-mx6/ +early_initcall(vexpress_spc_early_init); +MODULE_LICENSE("GPL"); +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 +diff -Nur linux-3.10.30.orig/drivers/mfd/vexpress-sysreg.c linux-3.10.30/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-16 15:28:22.357390461 +0200 ++++ linux-3.10.30/drivers/mfd/vexpress-sysreg.c 2014-05-19 19:07:23.697305302 +0200 @@ -165,7 +165,7 @@ static int vexpress_sysreg_config_tries; @@ -106975,9 +107300,9 @@ diff -Nur linux-3.10.30.orig/drivers/mfd/vexpress-sysreg.c linux-linaro-stable-m device_create_file(vexpress_sysreg_dev, &dev_attr_sys_id); -diff -Nur linux-3.10.30.orig/drivers/misc/sram.c linux-linaro-stable-mx6/drivers/misc/sram.c +diff -Nur linux-3.10.30.orig/drivers/misc/sram.c linux-3.10.30/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-16 15:28:22.377390566 +0200 ++++ linux-3.10.30/drivers/misc/sram.c 2014-05-19 19:07:23.697305302 +0200 @@ -29,7 +29,7 @@ #include <linux/spinlock.h> #include <linux/genalloc.h> @@ -106987,9 +107312,9 @@ diff -Nur linux-3.10.30.orig/drivers/misc/sram.c linux-linaro-stable-mx6/drivers struct sram_dev { 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 +diff -Nur linux-3.10.30.orig/drivers/mmc/card/block.c linux-3.10.30/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-16 15:28:22.385390608 +0200 ++++ linux-3.10.30/drivers/mmc/card/block.c 2014-05-19 19:07:23.697305302 +0200 @@ -58,6 +58,8 @@ #define INAND_CMD38_ARG_SECTRIM1 0x81 #define INAND_CMD38_ARG_SECTRIM2 0x88 @@ -107103,9 +107428,9 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/card/block.c linux-linaro-stable-mx6/dr out_retry: if (err && !mmc_blk_reset(md, card->host, type)) goto retry; -diff -Nur linux-3.10.30.orig/drivers/mmc/card/queue.c linux-linaro-stable-mx6/drivers/mmc/card/queue.c +diff -Nur linux-3.10.30.orig/drivers/mmc/card/queue.c linux-3.10.30/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-16 15:28:22.385390608 +0200 ++++ linux-3.10.30/drivers/mmc/card/queue.c 2014-05-19 19:07:23.697305302 +0200 @@ -173,7 +173,7 @@ /* granularity must not be greater than max. discard */ if (card->pref_erase > max_discard) @@ -107115,9 +107440,9 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/card/queue.c linux-linaro-stable-mx6/dr queue_flag_set_unlocked(QUEUE_FLAG_SECDISCARD, q); } -diff -Nur linux-3.10.30.orig/drivers/mmc/core/core.c linux-linaro-stable-mx6/drivers/mmc/core/core.c +diff -Nur linux-3.10.30.orig/drivers/mmc/core/core.c linux-3.10.30/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-16 15:28:22.385390608 +0200 ++++ linux-3.10.30/drivers/mmc/core/core.c 2014-05-19 19:07:23.697305302 +0200 @@ -13,11 +13,13 @@ #include <linux/module.h> #include <linux/init.h> @@ -107219,9 +107544,9 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/core/core.c linux-linaro-stable-mx6/dri mmc_host_clk_hold(host); /* 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 +diff -Nur linux-3.10.30.orig/drivers/mmc/core/host.c linux-3.10.30/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-16 15:28:22.385390608 +0200 ++++ linux-3.10.30/drivers/mmc/core/host.c 2014-05-19 19:07:23.697305302 +0200 @@ -12,14 +12,18 @@ * MMC host class device management */ @@ -107406,9 +107731,9 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/core/host.c linux-linaro-stable-mx6/dri WARN_ON((host->caps & MMC_CAP_SDIO_IRQ) && !host->ops->enable_sdio_irq); -diff -Nur linux-3.10.30.orig/drivers/mmc/core/mmc.c linux-linaro-stable-mx6/drivers/mmc/core/mmc.c +diff -Nur linux-3.10.30.orig/drivers/mmc/core/mmc.c linux-3.10.30/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-16 15:28:22.385390608 +0200 ++++ linux-3.10.30/drivers/mmc/core/mmc.c 2014-05-19 19:07:23.697305302 +0200 @@ -316,6 +316,11 @@ mmc_card_set_blockaddr(card); } @@ -107831,9 +108156,9 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/core/mmc.c linux-linaro-stable-mx6/driv ddr = MMC_1_2V_DDR_MODE; } -diff -Nur linux-3.10.30.orig/drivers/mmc/core/mmc_ops.c linux-linaro-stable-mx6/drivers/mmc/core/mmc_ops.c +diff -Nur linux-3.10.30.orig/drivers/mmc/core/mmc_ops.c linux-3.10.30/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-16 15:28:22.385390608 +0200 ++++ linux-3.10.30/drivers/mmc/core/mmc_ops.c 2014-05-19 19:07:23.697305302 +0200 @@ -431,6 +431,8 @@ @@ -107856,9 +108181,9 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/core/mmc_ops.c linux-linaro-stable-mx6/ /* Must check status to be sure of no errors */ timeout = jiffies + msecs_to_jiffies(MMC_OPS_TIMEOUT_MS); do { -diff -Nur linux-3.10.30.orig/drivers/mmc/core/sd.c linux-linaro-stable-mx6/drivers/mmc/core/sd.c +diff -Nur linux-3.10.30.orig/drivers/mmc/core/sd.c linux-3.10.30/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-16 15:28:22.385390608 +0200 ++++ linux-3.10.30/drivers/mmc/core/sd.c 2014-05-19 19:07:23.697305302 +0200 @@ -215,7 +215,7 @@ static int mmc_read_ssr(struct mmc_card *card) { @@ -107901,9 +108226,9 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/core/sd.c linux-linaro-stable-mx6/drive mmc_host_clk_hold(card->host); err = card->host->ops->execute_tuning(card->host, 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 +diff -Nur linux-3.10.30.orig/drivers/mmc/core/sdio.c linux-3.10.30/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-16 15:28:22.389390629 +0200 ++++ linux-3.10.30/drivers/mmc/core/sdio.c 2014-05-19 19:07:23.697305302 +0200 @@ -563,10 +563,18 @@ if (err) goto out; @@ -107925,9 +108250,9 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/core/sdio.c linux-linaro-stable-mx6/dri out: -diff -Nur linux-3.10.30.orig/drivers/mmc/core/sdio_irq.c linux-linaro-stable-mx6/drivers/mmc/core/sdio_irq.c +diff -Nur linux-3.10.30.orig/drivers/mmc/core/sdio_irq.c linux-3.10.30/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-16 15:28:22.389390629 +0200 ++++ linux-3.10.30/drivers/mmc/core/sdio_irq.c 2014-05-19 19:07:23.701305317 +0200 @@ -79,6 +79,15 @@ return ret; } @@ -107990,9 +108315,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/mmc/core/slot-gpio.c linux-3.10.30/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-16 15:28:22.389390629 +0200 ++++ linux-3.10.30/drivers/mmc/core/slot-gpio.c 2014-05-19 19:07:23.701305317 +0200 @@ -135,6 +135,7 @@ * mmc_gpio_request_cd - request a gpio for card-detection * @host: mmc host @@ -108030,9 +108355,9 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/core/slot-gpio.c linux-linaro-stable-mx /* * Even if gpio_to_irq() returns a valid IRQ number, the platform might * 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 +diff -Nur linux-3.10.30.orig/drivers/mmc/host/dw_mmc.c linux-3.10.30/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-16 15:28:22.389390629 +0200 ++++ linux-3.10.30/drivers/mmc/host/dw_mmc.c 2014-05-19 19:07:23.701305317 +0200 @@ -1902,6 +1902,8 @@ if (!mmc) return -ENOMEM; @@ -108042,9 +108367,9 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/dw_mmc.c linux-linaro-stable-mx6/d slot = mmc_priv(mmc); slot->id = id; 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 +diff -Nur linux-3.10.30.orig/drivers/mmc/host/jz4740_mmc.c linux-3.10.30/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-16 15:28:22.393390650 +0200 ++++ linux-3.10.30/drivers/mmc/host/jz4740_mmc.c 2014-05-19 19:07:23.701305317 +0200 @@ -14,6 +14,7 @@ */ @@ -108235,9 +108560,9 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/jz4740_mmc.c linux-linaro-stable-m jz4740_mmc_free_gpios(pdev); 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 +diff -Nur linux-3.10.30.orig/drivers/mmc/host/mvsdio.c linux-3.10.30/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-16 15:28:22.393390650 +0200 ++++ linux-3.10.30/drivers/mmc/host/mvsdio.c 2014-05-19 19:07:23.701305317 +0200 @@ -35,7 +35,7 @@ #define DRIVER_NAME "mvsdio" @@ -108365,9 +108690,9 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/mvsdio.c linux-linaro-stable-mx6/d return 0; out: -diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-bcm2835.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-bcm2835.c +diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-bcm2835.c linux-3.10.30/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-16 15:28:22.393390650 +0200 ++++ linux-3.10.30/drivers/mmc/host/sdhci-bcm2835.c 2014-05-19 19:07:23.701305317 +0200 @@ -131,8 +131,12 @@ .read_l = bcm2835_sdhci_readl, .read_w = bcm2835_sdhci_readw, @@ -108381,9 +108706,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci.c linux-3.10.30/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-16 15:28:22.397390671 +0200 ++++ linux-3.10.30/drivers/mmc/host/sdhci.c 2014-05-19 19:07:23.701305317 +0200 @@ -44,12 +44,13 @@ #define MAX_TUNING_LOOP 40 @@ -109640,9 +109965,9 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci.c linux-linaro-stable-mx6/dr kfree(host->align_buffer); 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 +diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-cns3xxx.c linux-3.10.30/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-16 15:28:22.393390650 +0200 ++++ linux-3.10.30/drivers/mmc/host/sdhci-cns3xxx.c 2014-05-19 19:07:23.701305317 +0200 @@ -30,13 +30,12 @@ u16 clk; unsigned long timeout; @@ -109686,9 +110011,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-dove.c linux-3.10.30/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-16 15:28:22.397390671 +0200 ++++ linux-3.10.30/drivers/mmc/host/sdhci-dove.c 2014-05-19 19:07:23.701305317 +0200 @@ -86,6 +86,10 @@ static const struct sdhci_ops sdhci_dove_ops = { .read_w = sdhci_dove_readw, @@ -109700,9 +110025,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-esdhc.h linux-3.10.30/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-16 15:28:22.397390671 +0200 ++++ linux-3.10.30/drivers/mmc/host/sdhci-esdhc.h 2014-05-19 19:07:23.701305317 +0200 @@ -1,7 +1,7 @@ /* * Freescale eSDHC controller driver generics for OF and pltfm. @@ -109762,9 +110087,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-esdhc-imx.c linux-3.10.30/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-16 15:28:22.397390671 +0200 ++++ linux-3.10.30/drivers/mmc/host/sdhci-esdhc-imx.c 2014-05-19 19:07:23.701305317 +0200 @@ -11,6 +11,7 @@ * the Free Software Foundation; either version 2 of the License. */ @@ -110757,9 +111082,9 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-esdhc-imx.c linux-linaro-sta }, .id_table = imx_esdhc_devtype, .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 +diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci.h linux-3.10.30/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-16 15:28:22.397390671 +0200 ++++ linux-3.10.30/drivers/mmc/host/sdhci.h 2014-05-19 19:07:23.701305317 +0200 @@ -281,17 +281,15 @@ unsigned int (*get_max_clock)(struct sdhci_host *host); unsigned int (*get_min_clock)(struct sdhci_host *host); @@ -110801,9 +111126,9 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci.h linux-linaro-stable-mx6/dr #ifdef CONFIG_PM 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 +diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-of-esdhc.c linux-3.10.30/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-16 15:28:22.397390671 +0200 ++++ linux-3.10.30/drivers/mmc/host/sdhci-of-esdhc.c 2014-05-19 19:07:23.701305317 +0200 @@ -13,6 +13,7 @@ * your option) any later version. */ @@ -110948,9 +111273,9 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-of-esdhc.c linux-linaro-stab }, .probe = sdhci_esdhc_probe, .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 +diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-of-hlwd.c linux-3.10.30/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-16 15:28:22.397390671 +0200 ++++ linux-3.10.30/drivers/mmc/host/sdhci-of-hlwd.c 2014-05-19 19:07:23.705305331 +0200 @@ -58,6 +58,10 @@ .write_l = sdhci_hlwd_writel, .write_w = sdhci_hlwd_writew, @@ -110962,9 +111287,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-pci.c linux-3.10.30/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-16 15:28:22.397390671 +0200 ++++ linux-3.10.30/drivers/mmc/host/sdhci-pci.c 2014-05-19 19:07:23.705305331 +0200 @@ -989,7 +989,7 @@ return 0; } @@ -110996,9 +111321,9 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-pci.c linux-linaro-stable-mx .hw_reset = sdhci_pci_hw_reset, }; -diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-pltfm.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pltfm.c +diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-pltfm.c linux-3.10.30/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-16 15:28:22.397390671 +0200 ++++ linux-3.10.30/drivers/mmc/host/sdhci-pltfm.c 2014-05-19 19:07:23.705305331 +0200 @@ -45,6 +45,10 @@ EXPORT_SYMBOL_GPL(sdhci_pltfm_clk_get_max_clock); @@ -111034,9 +111359,9 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-pltfm.c linux-linaro-stable- const struct dev_pm_ops sdhci_pltfm_pmops = { .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 +diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-pltfm.h linux-3.10.30/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-16 15:28:22.397390671 +0200 ++++ linux-3.10.30/drivers/mmc/host/sdhci-pltfm.h 2014-05-19 19:07:23.705305331 +0200 @@ -101,6 +101,8 @@ extern unsigned int sdhci_pltfm_clk_get_max_clock(struct sdhci_host *host); @@ -111046,9 +111371,9 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-pltfm.h linux-linaro-stable- extern const struct dev_pm_ops sdhci_pltfm_pmops; #define SDHCI_PLTFM_PMOPS (&sdhci_pltfm_pmops) #else -diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-pxav2.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-pxav2.c +diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-pxav2.c linux-3.10.30/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-16 15:28:22.397390671 +0200 ++++ linux-3.10.30/drivers/mmc/host/sdhci-pxav2.c 2014-05-19 19:07:23.705305331 +0200 @@ -51,11 +51,13 @@ #define MMC_CARD 0x1000 #define MMC_WIDTH 0x0100 @@ -111092,9 +111417,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-pxav3.c linux-3.10.30/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-16 15:28:22.397390671 +0200 ++++ linux-3.10.30/drivers/mmc/host/sdhci-pxav3.c 2014-05-19 19:07:23.705305331 +0200 @@ -57,11 +57,13 @@ #define SDCE_MISC_INT (1<<2) #define SDCE_MISC_INT_EN (1<<1) @@ -111135,9 +111460,9 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-pxav3.c linux-linaro-stable- if (ret) { dev_err(mmc_dev(host->mmc), "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 +diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-s3c.c linux-3.10.30/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-16 15:28:22.397390671 +0200 ++++ linux-3.10.30/drivers/mmc/host/sdhci-s3c.c 2014-05-19 19:07:23.705305331 +0200 @@ -57,6 +57,8 @@ struct clk *clk_io; @@ -111272,9 +111597,9 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-s3c.c linux-linaro-stable-mx }; #define EXYNOS4_SDHCI_DRV_DATA ((kernel_ulong_t)&exynos4_sdhci_drv_data) #else -diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-sirf.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-sirf.c +diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-sirf.c linux-3.10.30/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-16 15:28:22.397390671 +0200 ++++ linux-3.10.30/drivers/mmc/host/sdhci-sirf.c 2014-05-19 19:07:23.705305331 +0200 @@ -29,7 +29,11 @@ } @@ -111296,9 +111621,9 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-sirf.c linux-linaro-stable-m if (ret) { dev_err(&pdev->dev, "card detect irq request failed: %d\n", ret); -diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-spear.c linux-linaro-stable-mx6/drivers/mmc/host/sdhci-spear.c +diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-spear.c linux-3.10.30/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-16 15:28:22.397390671 +0200 ++++ linux-3.10.30/drivers/mmc/host/sdhci-spear.c 2014-05-19 19:07:23.705305331 +0200 @@ -37,7 +37,10 @@ /* sdhci ops */ @@ -111311,9 +111636,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/mmc/host/sdhci-tegra.c linux-3.10.30/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-16 15:28:22.397390671 +0200 ++++ linux-3.10.30/drivers/mmc/host/sdhci-tegra.c 2014-05-19 19:07:23.705305331 +0200 @@ -48,19 +48,6 @@ int power_gpio; }; @@ -111380,9 +111705,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/mmc/host/sh_mmcif.c linux-3.10.30/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-16 15:28:22.397390671 +0200 ++++ linux-3.10.30/drivers/mmc/host/sh_mmcif.c 2014-05-19 19:07:23.705305331 +0200 @@ -1431,7 +1431,7 @@ } @@ -111392,9 +111717,9 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/sh_mmcif.c linux-linaro-stable-mx6 if (ret < 0) goto erqcd; } -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 +diff -Nur linux-3.10.30.orig/drivers/mmc/host/tmio_mmc_pio.c linux-3.10.30/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-16 15:28:22.401390693 +0200 ++++ linux-3.10.30/drivers/mmc/host/tmio_mmc_pio.c 2014-05-19 19:07:23.705305331 +0200 @@ -1091,7 +1091,7 @@ dev_pm_qos_expose_latency_limit(&pdev->dev, 100); @@ -111404,9 +111729,9 @@ diff -Nur linux-3.10.30.orig/drivers/mmc/host/tmio_mmc_pio.c linux-linaro-stable if (ret < 0) { tmio_mmc_host_remove(_host); 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 +diff -Nur linux-3.10.30.orig/drivers/mtd/chips/cfi_cmdset_0002.c linux-3.10.30/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-16 15:28:22.401390693 +0200 ++++ linux-3.10.30/drivers/mtd/chips/cfi_cmdset_0002.c 2014-05-19 19:07:23.705305331 +0200 @@ -1058,17 +1058,13 @@ #define UDELAY(map, chip, adr, usec) \ @@ -111425,9 +111750,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/chips/cfi_cmdset_0002.c linux-linaro-st } while (0) #endif -diff -Nur linux-3.10.30.orig/drivers/mtd/inftlcore.c linux-linaro-stable-mx6/drivers/mtd/inftlcore.c +diff -Nur linux-3.10.30.orig/drivers/mtd/inftlcore.c linux-3.10.30/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-16 15:28:22.409390734 +0200 ++++ linux-3.10.30/drivers/mtd/inftlcore.c 2014-05-19 19:07:23.709305347 +0200 @@ -50,7 +50,7 @@ struct INFTLrecord *inftl; unsigned long temp; @@ -111437,9 +111762,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/inftlcore.c linux-linaro-stable-mx6/dri return; /* OK, this is moderately ugly. But probably safe. Alternatives? */ 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 +diff -Nur linux-3.10.30.orig/drivers/mtd/mtdcore.c linux-3.10.30/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-16 15:28:22.417390777 +0200 ++++ linux-3.10.30/drivers/mtd/mtdcore.c 2014-05-19 19:07:23.709305347 +0200 @@ -157,6 +157,9 @@ case MTD_UBIVOLUME: type = "ubi"; @@ -111475,9 +111800,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/mtdcore.c linux-linaro-stable-mx6/drive &dev_attr_bitflip_threshold.attr, NULL, }; -diff -Nur linux-3.10.30.orig/drivers/mtd/mtdpart.c linux-linaro-stable-mx6/drivers/mtd/mtdpart.c +diff -Nur linux-3.10.30.orig/drivers/mtd/mtdpart.c linux-3.10.30/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-16 15:28:22.417390777 +0200 ++++ linux-3.10.30/drivers/mtd/mtdpart.c 2014-05-19 19:07:23.709305347 +0200 @@ -516,6 +516,7 @@ } @@ -111486,9 +111811,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/mtdpart.c linux-linaro-stable-mx6/drive slave->mtd.ecc_strength = master->ecc_strength; slave->mtd.bitflip_threshold = master->bitflip_threshold; -diff -Nur linux-3.10.30.orig/drivers/mtd/nand/denali.c linux-linaro-stable-mx6/drivers/mtd/nand/denali.c +diff -Nur linux-3.10.30.orig/drivers/mtd/nand/denali.c linux-3.10.30/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-16 15:28:22.421390798 +0200 ++++ linux-3.10.30/drivers/mtd/nand/denali.c 2014-05-19 19:07:23.709305347 +0200 @@ -1520,7 +1520,7 @@ * so just let controller do 15bit ECC for MLC and 8bit ECC for * SLC if possible. @@ -111498,9 +111823,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/nand/denali.c linux-linaro-stable-mx6/d (denali->mtd.oobsize > (denali->bbtskipbytes + ECC_15BITS * (denali->mtd.writesize / ECC_SECTOR_SIZE)))) { -diff -Nur linux-3.10.30.orig/drivers/mtd/nand/docg4.c linux-linaro-stable-mx6/drivers/mtd/nand/docg4.c +diff -Nur linux-3.10.30.orig/drivers/mtd/nand/docg4.c linux-3.10.30/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-16 15:28:22.421390798 +0200 ++++ linux-3.10.30/drivers/mtd/nand/docg4.c 2014-05-19 19:07:23.709305347 +0200 @@ -1093,7 +1093,6 @@ struct nand_chip *nand = mtd->priv; struct docg4_priv *doc = nand->priv; @@ -111528,9 +111853,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/nand/docg4.c linux-linaro-stable-mx6/dr kfree(buf); -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 +diff -Nur linux-3.10.30.orig/drivers/mtd/nand/fsl_elbc_nand.c linux-3.10.30/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-16 15:28:22.421390798 +0200 ++++ linux-3.10.30/drivers/mtd/nand/fsl_elbc_nand.c 2014-05-19 19:07:23.709305347 +0200 @@ -650,8 +650,6 @@ chip->page_shift); dev_dbg(priv->dev, "fsl_elbc_init: nand->phys_erase_shift = %d\n", @@ -111540,9 +111865,9 @@ 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.mode = %d\n", chip->ecc.mode); 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 +diff -Nur linux-3.10.30.orig/drivers/mtd/nand/fsl_ifc_nand.c linux-3.10.30/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-16 15:28:22.421390798 +0200 ++++ linux-3.10.30/drivers/mtd/nand/fsl_ifc_nand.c 2014-05-19 19:07:23.709305347 +0200 @@ -718,8 +718,6 @@ chip->page_shift); dev_dbg(priv->dev, "%s: nand->phys_erase_shift = %d\n", __func__, @@ -111552,9 +111877,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/nand/fsl_ifc_nand.c linux-linaro-stable dev_dbg(priv->dev, "%s: nand->ecc.mode = %d\n", __func__, chip->ecc.mode); 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 +diff -Nur linux-3.10.30.orig/drivers/mtd/nand/gpmi-nand/gpmi-lib.c linux-3.10.30/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-16 15:28:22.425390819 +0200 ++++ linux-3.10.30/drivers/mtd/nand/gpmi-nand/gpmi-lib.c 2014-05-19 19:07:23.709305347 +0200 @@ -20,6 +20,7 @@ */ #include <linux/delay.h> @@ -111853,9 +112178,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/nand/gpmi-nand/gpmi-lib.c linux-linaro- /* [4] submit the DMA */ 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 +diff -Nur linux-3.10.30.orig/drivers/mtd/nand/gpmi-nand/gpmi-nand.c linux-3.10.30/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-16 15:28:22.425390819 +0200 ++++ linux-3.10.30/drivers/mtd/nand/gpmi-nand/gpmi-nand.c 2014-05-19 19:07:23.709305347 +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. @@ -112725,9 +113050,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/nand/gpmi-nand/gpmi-nand.c linux-linaro return 0; } -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 +diff -Nur linux-3.10.30.orig/drivers/mtd/nand/gpmi-nand/gpmi-nand.h linux-3.10.30/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-16 15:28:22.425390819 +0200 ++++ linux-3.10.30/drivers/mtd/nand/gpmi-nand/gpmi-nand.h 2014-05-19 19:07:23.709305347 +0200 @@ -26,8 +26,6 @@ struct resources { void __iomem *gpmi_regs; @@ -112737,9 +113062,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/nand/gpmi-nand/gpmi-nand.h linux-linaro unsigned int dma_low_channel; unsigned int dma_high_channel; 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 +diff -Nur linux-3.10.30.orig/drivers/mtd/nand/gpmi-nand/gpmi-regs.h linux-3.10.30/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-16 15:28:22.425390819 +0200 ++++ linux-3.10.30/drivers/mtd/nand/gpmi-nand/gpmi-regs.h 2014-05-19 19:07:23.709305347 +0200 @@ -108,6 +108,9 @@ #define HW_GPMI_CTRL1_CLR 0x00000068 #define HW_GPMI_CTRL1_TOG 0x0000006c @@ -112750,9 +113075,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/nand/gpmi-nand/gpmi-regs.h linux-linaro #define BP_GPMI_CTRL1_WRN_DLY_SEL 22 #define BM_GPMI_CTRL1_WRN_DLY_SEL (0x3 << BP_GPMI_CTRL1_WRN_DLY_SEL) #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 +diff -Nur linux-3.10.30.orig/drivers/mtd/nand/nand_base.c linux-3.10.30/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-16 15:28:22.425390819 +0200 ++++ linux-3.10.30/drivers/mtd/nand/nand_base.c 2014-05-19 19:07:23.713305361 +0200 @@ -108,13 +108,13 @@ int ret = 0; @@ -113694,9 +114019,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/nand/nand_base.c linux-linaro-stable-mx /* * Initialize bitflip_threshold to its default prior scan_bbt() call. * 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 +diff -Nur linux-3.10.30.orig/drivers/mtd/nand/nand_bbt.c linux-3.10.30/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-16 15:28:22.425390819 +0200 ++++ linux-3.10.30/drivers/mtd/nand/nand_bbt.c 2014-05-19 19:07:23.713305361 +0200 @@ -71,6 +71,30 @@ #include <linux/export.h> #include <linux/string.h> @@ -114128,9 +114453,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/nand/nand_bbt.c linux-linaro-stable-mx6 EXPORT_SYMBOL(nand_scan_bbt); -EXPORT_SYMBOL(nand_default_bbt); -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 +diff -Nur linux-3.10.30.orig/drivers/mtd/nand/nand_ids.c linux-3.10.30/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-16 15:28:22.425390819 +0200 ++++ linux-3.10.30/drivers/mtd/nand/nand_ids.c 2014-05-19 19:07:23.713305361 +0200 @@ -33,16 +33,16 @@ */ {"TC58NVG2S0F 4G 3.3V 8-bit", @@ -114152,9 +114477,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/nand/nand_ids.c linux-linaro-stable-mx6 LEGACY_ID_NAND("NAND 4MiB 5V 8-bit", 0x6B, 4, SZ_8K, SP_OPTIONS), 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 +diff -Nur linux-3.10.30.orig/drivers/mtd/nand/omap2.c linux-3.10.30/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-16 15:28:22.429390840 +0200 ++++ linux-3.10.30/drivers/mtd/nand/omap2.c 2014-05-19 19:07:23.713305361 +0200 @@ -154,7 +154,7 @@ */ static uint8_t scan_ff_pattern[] = { 0xff }; @@ -114164,9 +114489,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/nand/omap2.c linux-linaro-stable-mx6/dr .offs = 0, .len = 1, .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 +diff -Nur linux-3.10.30.orig/drivers/mtd/nand/sm_common.c linux-3.10.30/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-16 15:28:22.429390840 +0200 ++++ linux-3.10.30/drivers/mtd/nand/sm_common.c 2014-05-19 19:07:23.713305361 +0200 @@ -42,7 +42,7 @@ { struct mtd_oob_ops ops; @@ -114191,9 +114516,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/mtd/nftlcore.c linux-3.10.30/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-16 15:28:22.429390840 +0200 ++++ linux-3.10.30/drivers/mtd/nftlcore.c 2014-05-19 19:07:23.713305361 +0200 @@ -50,7 +50,7 @@ struct NFTLrecord *nftl; unsigned long temp; @@ -114203,9 +114528,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/nftlcore.c linux-linaro-stable-mx6/driv return; /* OK, this is moderately ugly. But probably safe. Alternatives? */ 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 +diff -Nur linux-3.10.30.orig/drivers/mtd/onenand/onenand_bbt.c linux-3.10.30/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-16 15:28:22.429390840 +0200 ++++ linux-3.10.30/drivers/mtd/onenand/onenand_bbt.c 2014-05-19 19:07:23.713305361 +0200 @@ -133,7 +133,6 @@ { struct onenand_chip *this = mtd->priv; @@ -114214,9 +114539,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/onenand/onenand_bbt.c linux-linaro-stab return create_bbt(mtd, this->page_buf, bd, -1); } -diff -Nur linux-3.10.30.orig/drivers/mtd/ssfdc.c linux-linaro-stable-mx6/drivers/mtd/ssfdc.c +diff -Nur linux-3.10.30.orig/drivers/mtd/ssfdc.c linux-3.10.30/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-16 15:28:22.433390861 +0200 ++++ linux-3.10.30/drivers/mtd/ssfdc.c 2014-05-19 19:07:23.713305361 +0200 @@ -290,7 +290,7 @@ int cis_sector; @@ -114226,9 +114551,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/ssfdc.c linux-linaro-stable-mx6/drivers mtd->size > UINT_MAX) return; -diff -Nur linux-3.10.30.orig/drivers/mtd/tests/Makefile linux-linaro-stable-mx6/drivers/mtd/tests/Makefile +diff -Nur linux-3.10.30.orig/drivers/mtd/tests/Makefile linux-3.10.30/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-16 15:28:22.433390861 +0200 ++++ linux-3.10.30/drivers/mtd/tests/Makefile 2014-05-19 19:07:23.713305361 +0200 @@ -7,3 +7,12 @@ obj-$(CONFIG_MTD_TESTS) += mtd_torturetest.o obj-$(CONFIG_MTD_TESTS) += mtd_nandecctest.o @@ -114242,9 +114567,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/Makefile linux-linaro-stable-mx6/ +mtd_subpagetest-objs := subpagetest.o mtd_test.o +mtd_torturetest-objs := torturetest.o mtd_test.o +mtd_nandbiterrs-objs := nandbiterrs.o mtd_test.o -diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_nandbiterrs.c linux-linaro-stable-mx6/drivers/mtd/tests/mtd_nandbiterrs.c +diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_nandbiterrs.c linux-3.10.30/drivers/mtd/tests/mtd_nandbiterrs.c --- linux-3.10.30.orig/drivers/mtd/tests/mtd_nandbiterrs.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/tests/mtd_nandbiterrs.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.30/drivers/mtd/tests/mtd_nandbiterrs.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,461 +0,0 @@ -/* - * Copyright © 2012 NetCommWireless @@ -114707,9 +115032,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_nandbiterrs.c linux-linaro-st -MODULE_DESCRIPTION("NAND bit error recovery test"); -MODULE_AUTHOR("Iwo Mergler"); -MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_oobtest.c linux-linaro-stable-mx6/drivers/mtd/tests/mtd_oobtest.c +diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_oobtest.c linux-3.10.30/drivers/mtd/tests/mtd_oobtest.c --- linux-3.10.30.orig/drivers/mtd/tests/mtd_oobtest.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/tests/mtd_oobtest.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.30/drivers/mtd/tests/mtd_oobtest.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,720 +0,0 @@ -/* - * Copyright (C) 2006-2008 Nokia Corporation @@ -115431,9 +115756,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_oobtest.c linux-linaro-stable -MODULE_DESCRIPTION("Out-of-band test module"); -MODULE_AUTHOR("Adrian Hunter"); -MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_pagetest.c linux-linaro-stable-mx6/drivers/mtd/tests/mtd_pagetest.c +diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_pagetest.c linux-3.10.30/drivers/mtd/tests/mtd_pagetest.c --- linux-3.10.30.orig/drivers/mtd/tests/mtd_pagetest.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/tests/mtd_pagetest.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.30/drivers/mtd/tests/mtd_pagetest.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,615 +0,0 @@ -/* - * Copyright (C) 2006-2008 Nokia Corporation @@ -116050,9 +116375,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_pagetest.c linux-linaro-stabl -MODULE_DESCRIPTION("NAND page test"); -MODULE_AUTHOR("Adrian Hunter"); -MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_readtest.c linux-linaro-stable-mx6/drivers/mtd/tests/mtd_readtest.c +diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_readtest.c linux-3.10.30/drivers/mtd/tests/mtd_readtest.c --- linux-3.10.30.orig/drivers/mtd/tests/mtd_readtest.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/tests/mtd_readtest.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.30/drivers/mtd/tests/mtd_readtest.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,263 +0,0 @@ -/* - * Copyright (C) 2006-2008 Nokia Corporation @@ -116317,9 +116642,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_readtest.c linux-linaro-stabl -MODULE_DESCRIPTION("Read test module"); -MODULE_AUTHOR("Adrian Hunter"); -MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_speedtest.c linux-linaro-stable-mx6/drivers/mtd/tests/mtd_speedtest.c +diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_speedtest.c linux-3.10.30/drivers/mtd/tests/mtd_speedtest.c --- linux-3.10.30.orig/drivers/mtd/tests/mtd_speedtest.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/tests/mtd_speedtest.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.30/drivers/mtd/tests/mtd_speedtest.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,560 +0,0 @@ -/* - * Copyright (C) 2007 Nokia Corporation @@ -116881,9 +117206,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_speedtest.c linux-linaro-stab -MODULE_DESCRIPTION("Speed test module"); -MODULE_AUTHOR("Adrian Hunter"); -MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_stresstest.c linux-linaro-stable-mx6/drivers/mtd/tests/mtd_stresstest.c +diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_stresstest.c linux-3.10.30/drivers/mtd/tests/mtd_stresstest.c --- linux-3.10.30.orig/drivers/mtd/tests/mtd_stresstest.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/tests/mtd_stresstest.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.30/drivers/mtd/tests/mtd_stresstest.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,325 +0,0 @@ -/* - * Copyright (C) 2006-2008 Nokia Corporation @@ -117210,9 +117535,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_stresstest.c linux-linaro-sta -MODULE_DESCRIPTION("Stress test module"); -MODULE_AUTHOR("Adrian Hunter"); -MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_subpagetest.c linux-linaro-stable-mx6/drivers/mtd/tests/mtd_subpagetest.c +diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_subpagetest.c linux-3.10.30/drivers/mtd/tests/mtd_subpagetest.c --- linux-3.10.30.orig/drivers/mtd/tests/mtd_subpagetest.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/tests/mtd_subpagetest.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.30/drivers/mtd/tests/mtd_subpagetest.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,510 +0,0 @@ -/* - * Copyright (C) 2006-2007 Nokia Corporation @@ -117724,9 +118049,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_subpagetest.c linux-linaro-st -MODULE_DESCRIPTION("Subpage test module"); -MODULE_AUTHOR("Adrian Hunter"); -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 +diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_test.c linux-3.10.30/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-16 15:28:22.433390861 +0200 ++++ linux-3.10.30/drivers/mtd/tests/mtd_test.c 2014-05-19 19:07:23.717305376 +0200 @@ -0,0 +1,110 @@ +#define pr_fmt(fmt) "mtd_test: " fmt + @@ -117838,9 +118163,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_test.c linux-linaro-stable-mx + + return err; +} -diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_test.h linux-linaro-stable-mx6/drivers/mtd/tests/mtd_test.h +diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_test.h linux-3.10.30/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-16 15:28:22.433390861 +0200 ++++ linux-3.10.30/drivers/mtd/tests/mtd_test.h 2014-05-19 19:07:23.717305376 +0200 @@ -0,0 +1,11 @@ +#include <linux/mtd/mtd.h> + @@ -117853,9 +118178,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_test.h linux-linaro-stable-mx +int mtdtest_read(struct mtd_info *mtd, loff_t addr, size_t size, void *buf); +int mtdtest_write(struct mtd_info *mtd, loff_t addr, size_t size, + const void *buf); -diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_torturetest.c linux-linaro-stable-mx6/drivers/mtd/tests/mtd_torturetest.c +diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_torturetest.c linux-3.10.30/drivers/mtd/tests/mtd_torturetest.c --- linux-3.10.30.orig/drivers/mtd/tests/mtd_torturetest.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/mtd/tests/mtd_torturetest.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.30/drivers/mtd/tests/mtd_torturetest.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,535 +0,0 @@ -/* - * Copyright (C) 2006-2008 Artem Bityutskiy @@ -118392,9 +118717,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/mtd_torturetest.c linux-linaro-st -MODULE_DESCRIPTION("Eraseblock torturing module"); -MODULE_AUTHOR("Artem Bityutskiy, Jarkko Lavinen, Adrian Hunter"); -MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/mtd/tests/nandbiterrs.c linux-linaro-stable-mx6/drivers/mtd/tests/nandbiterrs.c +diff -Nur linux-3.10.30.orig/drivers/mtd/tests/nandbiterrs.c linux-3.10.30/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-16 15:28:22.433390861 +0200 ++++ linux-3.10.30/drivers/mtd/tests/nandbiterrs.c 2014-05-19 19:07:23.717305376 +0200 @@ -0,0 +1,461 @@ +/* + * Copyright © 2012 NetCommWireless @@ -118857,9 +119182,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/nandbiterrs.c linux-linaro-stable +MODULE_DESCRIPTION("NAND bit error recovery test"); +MODULE_AUTHOR("Iwo Mergler"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/mtd/tests/oobtest.c linux-linaro-stable-mx6/drivers/mtd/tests/oobtest.c +diff -Nur linux-3.10.30.orig/drivers/mtd/tests/oobtest.c linux-3.10.30/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-16 15:28:22.433390861 +0200 ++++ linux-3.10.30/drivers/mtd/tests/oobtest.c 2014-05-19 19:07:23.717305376 +0200 @@ -0,0 +1,714 @@ +/* + * Copyright (C) 2006-2008 Nokia Corporation @@ -119575,9 +119900,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/oobtest.c linux-linaro-stable-mx6 +MODULE_DESCRIPTION("Out-of-band test module"); +MODULE_AUTHOR("Adrian Hunter"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/mtd/tests/pagetest.c linux-linaro-stable-mx6/drivers/mtd/tests/pagetest.c +diff -Nur linux-3.10.30.orig/drivers/mtd/tests/pagetest.c linux-3.10.30/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-16 15:28:22.433390861 +0200 ++++ linux-3.10.30/drivers/mtd/tests/pagetest.c 2014-05-19 19:07:23.717305376 +0200 @@ -0,0 +1,605 @@ +/* + * Copyright (C) 2006-2008 Nokia Corporation @@ -120184,9 +120509,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/pagetest.c linux-linaro-stable-mx +MODULE_DESCRIPTION("NAND page test"); +MODULE_AUTHOR("Adrian Hunter"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/mtd/tests/readtest.c linux-linaro-stable-mx6/drivers/mtd/tests/readtest.c +diff -Nur linux-3.10.30.orig/drivers/mtd/tests/readtest.c linux-3.10.30/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-16 15:28:22.433390861 +0200 ++++ linux-3.10.30/drivers/mtd/tests/readtest.c 2014-05-19 19:07:23.717305376 +0200 @@ -0,0 +1,257 @@ +/* + * Copyright (C) 2006-2008 Nokia Corporation @@ -120445,9 +120770,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/readtest.c linux-linaro-stable-mx +MODULE_DESCRIPTION("Read test module"); +MODULE_AUTHOR("Adrian Hunter"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/mtd/tests/speedtest.c linux-linaro-stable-mx6/drivers/mtd/tests/speedtest.c +diff -Nur linux-3.10.30.orig/drivers/mtd/tests/speedtest.c linux-3.10.30/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-16 15:28:22.433390861 +0200 ++++ linux-3.10.30/drivers/mtd/tests/speedtest.c 2014-05-19 19:07:23.721305390 +0200 @@ -0,0 +1,556 @@ +/* + * Copyright (C) 2007 Nokia Corporation @@ -121005,9 +121330,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/speedtest.c linux-linaro-stable-m +MODULE_DESCRIPTION("Speed test module"); +MODULE_AUTHOR("Adrian Hunter"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/mtd/tests/stresstest.c linux-linaro-stable-mx6/drivers/mtd/tests/stresstest.c +diff -Nur linux-3.10.30.orig/drivers/mtd/tests/stresstest.c linux-3.10.30/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-16 15:28:22.433390861 +0200 ++++ linux-3.10.30/drivers/mtd/tests/stresstest.c 2014-05-19 19:07:23.721305390 +0200 @@ -0,0 +1,321 @@ +/* + * Copyright (C) 2006-2008 Nokia Corporation @@ -121330,9 +121655,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/stresstest.c linux-linaro-stable- +MODULE_DESCRIPTION("Stress test module"); +MODULE_AUTHOR("Adrian Hunter"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/mtd/tests/subpagetest.c linux-linaro-stable-mx6/drivers/mtd/tests/subpagetest.c +diff -Nur linux-3.10.30.orig/drivers/mtd/tests/subpagetest.c linux-3.10.30/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-16 15:28:22.433390861 +0200 ++++ linux-3.10.30/drivers/mtd/tests/subpagetest.c 2014-05-19 19:07:23.721305390 +0200 @@ -0,0 +1,504 @@ +/* + * Copyright (C) 2006-2007 Nokia Corporation @@ -121838,9 +122163,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/subpagetest.c linux-linaro-stable +MODULE_DESCRIPTION("Subpage test module"); +MODULE_AUTHOR("Adrian Hunter"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/mtd/tests/torturetest.c linux-linaro-stable-mx6/drivers/mtd/tests/torturetest.c +diff -Nur linux-3.10.30.orig/drivers/mtd/tests/torturetest.c linux-3.10.30/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-16 15:28:22.433390861 +0200 ++++ linux-3.10.30/drivers/mtd/tests/torturetest.c 2014-05-19 19:07:23.721305390 +0200 @@ -0,0 +1,535 @@ +/* + * Copyright (C) 2006-2008 Artem Bityutskiy @@ -122377,9 +122702,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/tests/torturetest.c linux-linaro-stable +MODULE_DESCRIPTION("Eraseblock torturing module"); +MODULE_AUTHOR("Artem Bityutskiy, Jarkko Lavinen, Adrian Hunter"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/mtd/ubi/build.c linux-linaro-stable-mx6/drivers/mtd/ubi/build.c +diff -Nur linux-3.10.30.orig/drivers/mtd/ubi/build.c linux-3.10.30/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-16 15:28:22.433390861 +0200 ++++ linux-3.10.30/drivers/mtd/ubi/build.c 2014-05-19 19:07:23.721305390 +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)); @@ -122389,9 +122714,9 @@ diff -Nur linux-3.10.30.orig/drivers/mtd/ubi/build.c linux-linaro-stable-mx6/dri /* * Some flashes have several erase regions. Different regions * 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 +diff -Nur linux-3.10.30.orig/drivers/mxc/asrc/Kconfig linux-3.10.30/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-16 15:28:22.437390882 +0200 ++++ linux-3.10.30/drivers/mxc/asrc/Kconfig 2014-05-19 19:07:23.721305390 +0200 @@ -0,0 +1,14 @@ +# +# ASRC configuration @@ -122407,17 +122732,17 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/asrc/Kconfig linux-linaro-stable-mx6/dr + Say Y to get the ASRC service. + +endmenu -diff -Nur linux-3.10.30.orig/drivers/mxc/asrc/Makefile linux-linaro-stable-mx6/drivers/mxc/asrc/Makefile +diff -Nur linux-3.10.30.orig/drivers/mxc/asrc/Makefile linux-3.10.30/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-16 15:28:22.437390882 +0200 ++++ linux-3.10.30/drivers/mxc/asrc/Makefile 2014-05-19 19:07:23.721305390 +0200 @@ -0,0 +1,4 @@ +# +# Makefile for the kernel Asynchronous Sample Rate Converter driver +# +obj-$(CONFIG_MXC_ASRC) += mxc_asrc.o -diff -Nur linux-3.10.30.orig/drivers/mxc/asrc/mxc_asrc.c linux-linaro-stable-mx6/drivers/mxc/asrc/mxc_asrc.c +diff -Nur linux-3.10.30.orig/drivers/mxc/asrc/mxc_asrc.c linux-3.10.30/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-16 15:28:22.437390882 +0200 ++++ linux-3.10.30/drivers/mxc/asrc/mxc_asrc.c 2014-05-19 19:07:23.721305390 +0200 @@ -0,0 +1,1957 @@ +/* + * Freescale Asynchronous Sample Rate Converter (ASRC) driver @@ -124376,9 +124701,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/asrc/mxc_asrc.c linux-linaro-stable-mx6 +MODULE_DESCRIPTION("Asynchronous Sample Rate Converter"); +MODULE_LICENSE("GPL"); +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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c linux-3.10.30/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-16 15:28:22.441390904 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.c 2014-05-19 19:07:23.725305406 +0200 @@ -0,0 +1,932 @@ +/**************************************************************************** +* @@ -125312,9 +125637,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_ke + +#endif /* gcdENABLE_VG */ + -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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h linux-3.10.30/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-16 15:28:22.441390904 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_command_vg.h 2014-05-19 19:07:23.725305406 +0200 @@ -0,0 +1,319 @@ +/**************************************************************************** +* @@ -125635,9 +125960,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_ke + +#endif /* __gc_hal_kernel_hardware_command_h_ */ + -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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c linux-3.10.30/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-16 15:28:22.441390904 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.c 2014-05-19 19:07:23.725305406 +0200 @@ -0,0 +1,2110 @@ +/**************************************************************************** +* @@ -127749,9 +128074,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_ke +} +#endif /* gcdENABLE_VG */ + -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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h linux-3.10.30/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-16 15:28:22.441390904 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_kernel_hardware_vg.h 2014-05-19 19:07:23.741305465 +0200 @@ -0,0 +1,75 @@ +/**************************************************************************** +* @@ -127828,9 +128153,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/GC350/hal/kernel/gc_hal_ke + +#endif /* __gc_hal_kernel_hardware_h_ */ + -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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c linux-3.10.30/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-16 15:28:22.441390904 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c 2014-05-19 19:07:23.745305480 +0200 @@ -0,0 +1,1735 @@ +/**************************************************************************** +* @@ -129567,9 +129892,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_ker +#endif +} + -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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h linux-3.10.30/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-16 15:28:22.441390904 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.h 2014-05-19 19:07:23.745305480 +0200 @@ -0,0 +1,157 @@ +/**************************************************************************** +* @@ -129728,9 +130053,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_ker + +#endif /* __gc_hal_kernel_context_h_ */ + -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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c linux-3.10.30/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-16 15:28:22.445390925 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c 2014-05-19 19:07:23.757305524 +0200 @@ -0,0 +1,7247 @@ +/**************************************************************************** +* @@ -136979,9 +137304,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_ker +#endif + + -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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h linux-3.10.30/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-16 15:28:22.445390925 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.h 2014-05-19 19:07:23.757305524 +0200 @@ -0,0 +1,136 @@ +/**************************************************************************** +* @@ -137119,9 +137444,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_ker + +#endif /* __gc_hal_kernel_hardware_h_ */ + -diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/config linux-linaro-stable-mx6/drivers/mxc/gpu-viv/config +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/config linux-3.10.30/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-16 15:28:22.445390925 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/config 2014-05-19 19:07:23.757305524 +0200 @@ -0,0 +1,38 @@ +############################################################################## +# @@ -137161,9 +137486,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/config linux-linaro-stable-mx6/ +BANK_CHANNEL_BIT ?= 12 +ENABLE_GPU_CLOCK_BY_DRIVER = 1 + -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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c linux-3.10.30/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-16 15:28:22.445390925 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c 2014-05-19 19:07:23.757305524 +0200 @@ -0,0 +1,3881 @@ +/**************************************************************************** +* @@ -141046,9 +141371,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c linu +***** Test Code **************************************************************** +*******************************************************************************/ + -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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c linux-3.10.30/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-16 15:28:22.445390925 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c 2014-05-19 19:07:23.761305539 +0200 @@ -0,0 +1,3042 @@ +/**************************************************************************** +* @@ -144092,9 +144417,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_comman +#endif +} +#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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c linux-3.10.30/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-16 15:28:22.445390925 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c 2014-05-19 19:07:23.761305539 +0200 @@ -0,0 +1,3677 @@ +/**************************************************************************** +* @@ -147773,9 +148098,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c linux-3.10.30/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-16 15:28:22.445390925 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c 2014-05-19 19:07:23.761305539 +0200 @@ -0,0 +1,1548 @@ +/**************************************************************************** +* @@ -149325,9 +149650,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c l + gcmkFOOTER_NO(); + return gcvSTATUS_OK; +} -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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c linux-3.10.30/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-16 15:28:22.445390925 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c 2014-05-19 19:07:23.765305553 +0200 @@ -0,0 +1,2559 @@ +/**************************************************************************** +* @@ -151888,9 +152213,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug. + return "nil"; + } +} -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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c linux-3.10.30/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-16 15:28:22.445390925 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c 2014-05-19 19:07:23.769305569 +0200 @@ -0,0 +1,2888 @@ +/**************************************************************************** +* @@ -154780,9 +155105,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event. + + return gcvSTATUS_OK; +} -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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h linux-3.10.30/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-16 15:28:22.445390925 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h 2014-05-19 19:07:23.769305569 +0200 @@ -0,0 +1,999 @@ +/**************************************************************************** +* @@ -155783,9 +156108,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h linu +#endif + +#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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c linux-3.10.30/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-16 15:28:22.445390925 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c 2014-05-19 19:07:23.769305569 +0200 @@ -0,0 +1,859 @@ +/**************************************************************************** +* @@ -156646,9 +156971,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c +***** Test Code **************************************************************** +*******************************************************************************/ + -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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c linux-3.10.30/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-16 15:28:22.449390945 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c 2014-05-19 19:07:23.769305569 +0200 @@ -0,0 +1,877 @@ +/**************************************************************************** +* @@ -157527,9 +157852,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c linux-3.10.30/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-16 15:28:22.449390945 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c 2014-05-19 19:07:23.769305569 +0200 @@ -0,0 +1,1870 @@ +/**************************************************************************** +* @@ -159401,9 +159726,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c +****************************** T E S T C O D E ****************************** +******************************************************************************/ + -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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c linux-3.10.30/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-16 15:28:22.449390945 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c 2014-05-19 19:07:23.773305583 +0200 @@ -0,0 +1,522 @@ +/**************************************************************************** +* @@ -159927,9 +160252,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c linux-3.10.30/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-16 15:28:22.449390945 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c 2014-05-19 19:07:23.773305583 +0200 @@ -0,0 +1,347 @@ +/**************************************************************************** +* @@ -160278,9 +160603,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power. + return gcvSTATUS_OK; +} +#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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h linux-3.10.30/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-16 15:28:22.449390945 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h 2014-05-19 19:07:23.773305583 +0200 @@ -0,0 +1,29 @@ +/**************************************************************************** +* @@ -160311,9 +160636,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precom +#include "gc_hal_kernel.h" + +#endif /* __gc_hal_kernel_precomp_h_ */ -diff -Nur linux-3.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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c linux-3.10.30/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-16 15:28:22.449390945 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c 2014-05-19 19:07:23.773305583 +0200 @@ -0,0 +1,893 @@ +/**************************************************************************** +* @@ -161208,9 +161533,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h linux-3.10.30/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-16 15:28:22.449390945 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h 2014-05-19 19:07:23.773305583 +0200 @@ -0,0 +1,85 @@ +/**************************************************************************** +* @@ -161297,9 +161622,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c linux-3.10.30/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-16 15:28:22.449390945 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c 2014-05-19 19:07:23.773305583 +0200 @@ -0,0 +1,2249 @@ +/**************************************************************************** +* @@ -163550,9 +163875,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_ + gcmkFOOTER(); + return status; +} -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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h linux-3.10.30/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-16 15:28:22.449390945 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h 2014-05-19 19:07:23.777305598 +0200 @@ -0,0 +1,3896 @@ +/**************************************************************************** +* @@ -167450,9 +167775,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h li +#endif + +#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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h linux-3.10.30/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-16 15:28:22.449390945 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h 2014-05-19 19:07:23.777305598 +0200 @@ -0,0 +1,4278 @@ +/**************************************************************************** +* @@ -171732,9 +172057,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler. + +#endif /* VIVANTE_NO_3D */ +#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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h linux-3.10.30/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-16 15:28:22.449390945 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h 2014-05-19 19:07:23.781305612 +0200 @@ -0,0 +1,1028 @@ +/**************************************************************************** +* @@ -172764,9 +173089,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h +#endif + +#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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h linux-3.10.30/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-16 15:28:22.449390945 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h 2014-05-19 19:07:23.781305612 +0200 @@ -0,0 +1,270 @@ +/**************************************************************************** +* @@ -173038,9 +173363,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg +#endif + +#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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h linux-3.10.30/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-16 15:28:22.449390945 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h 2014-05-19 19:07:23.781305612 +0200 @@ -0,0 +1,88 @@ +/**************************************************************************** +* @@ -173130,9 +173455,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h li + +#endif /* __gc_hal_dump_h_ */ + -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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h linux-3.10.30/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-16 15:28:22.449390945 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h 2014-05-19 19:07:23.781305612 +0200 @@ -0,0 +1,617 @@ +/**************************************************************************** +* @@ -173751,9 +174076,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatfo +#endif + +#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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h linux-3.10.30/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-16 15:28:22.449390945 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h 2014-05-19 19:07:23.793305656 +0200 @@ -0,0 +1,286 @@ +/**************************************************************************** +* @@ -174041,9 +174366,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatfo +#endif + +#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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h linux-3.10.30/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-16 15:28:22.449390945 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h 2014-05-19 19:07:23.793305656 +0200 @@ -0,0 +1,2053 @@ +/**************************************************************************** +* @@ -176098,9 +176423,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h + +#endif /* VIVANTE_NO_3D */ +#endif /* __gc_hal_engine_h_ */ -diff -Nur linux-3.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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h linux-3.10.30/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-16 15:28:22.449390945 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h 2014-05-19 19:07:23.793305656 +0200 @@ -0,0 +1,904 @@ +/**************************************************************************** +* @@ -177006,9 +177331,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg +#endif + +#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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h linux-3.10.30/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-16 15:28:22.449390945 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h 2014-05-19 19:07:23.793305656 +0200 @@ -0,0 +1,962 @@ +/**************************************************************************** +* @@ -177972,9 +178297,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h li +#endif + +#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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h linux-3.10.30/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-16 15:28:22.449390945 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h 2014-05-19 19:07:23.797305672 +0200 @@ -0,0 +1,2652 @@ +/**************************************************************************** +* @@ -180628,9 +180953,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h linux-l +#endif + +#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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h linux-3.10.30/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-16 15:28:22.449390945 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h 2014-05-19 19:07:23.797305672 +0200 @@ -0,0 +1,185 @@ +/**************************************************************************** +* @@ -180817,9 +181142,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_bu +#endif + +#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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h linux-3.10.30/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-16 15:28:22.449390945 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h 2014-05-19 19:07:23.801305687 +0200 @@ -0,0 +1,530 @@ +/**************************************************************************** +* @@ -181351,9 +181676,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h lin + +#endif /* VIVANTE_NO_3D */ +#endif /* __gc_hal_mem_h_ */ -diff -Nur linux-3.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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h linux-3.10.30/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-16 15:28:22.449390945 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h 2014-05-19 19:07:23.801305687 +0200 @@ -0,0 +1,947 @@ +/**************************************************************************** +* @@ -182302,9 +182627,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h +#endif + +#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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h linux-3.10.30/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-16 15:28:22.449390945 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h 2014-05-19 19:07:23.805305701 +0200 @@ -0,0 +1,584 @@ +/**************************************************************************** +* @@ -182890,9 +183215,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler. +#endif + +#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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h linux-3.10.30/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-16 15:28:22.453390966 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h 2014-05-19 19:07:23.805305701 +0200 @@ -0,0 +1,1010 @@ +/**************************************************************************** +* @@ -183904,9 +184229,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h +#endif + +#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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h linux-3.10.30/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-16 15:28:22.453390966 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h 2014-05-19 19:07:23.805305701 +0200 @@ -0,0 +1,248 @@ +/**************************************************************************** +* @@ -184156,9 +184481,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h +#endif + +#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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h linux-3.10.30/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-16 15:28:22.453390966 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h 2014-05-19 19:07:23.805305701 +0200 @@ -0,0 +1,115 @@ +/**************************************************************************** +* @@ -184275,9 +184600,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistic + +#endif /*__gc_hal_statistics_h_ */ + -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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h linux-3.10.30/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-16 15:28:22.453390966 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h 2014-05-19 19:07:23.805305701 +0200 @@ -0,0 +1,1079 @@ +/**************************************************************************** +* @@ -185358,9 +185683,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h l +#endif + +#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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h linux-3.10.30/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-16 15:28:22.453390966 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h 2014-05-19 19:07:23.809305716 +0200 @@ -0,0 +1,37 @@ +/**************************************************************************** +* @@ -185399,9 +185724,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h +#define gcvVERSION_TIME __TIME__ + +#endif /* __gc_hal_version_h_ */ -diff -Nur linux-3.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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h linux-3.10.30/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-16 15:28:22.453390966 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h 2014-05-19 19:07:23.809305716 +0200 @@ -0,0 +1,913 @@ +/**************************************************************************** +* @@ -186316,9 +186641,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h linu +#endif + +#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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c linux-3.10.30/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-16 15:28:22.453390966 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c 2014-05-19 19:07:23.809305716 +0200 @@ -0,0 +1,795 @@ +/**************************************************************************** +* @@ -187115,9 +187440,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern +{ + gcmkDBGFSPRINT ( _GetArgumentSize ( Message ) , Message ) ; +} -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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h linux-3.10.30/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-16 15:28:22.453390966 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h 2014-05-19 19:07:23.809305716 +0200 @@ -0,0 +1,84 @@ +/**************************************************************************** +* @@ -187203,9 +187528,9 @@ 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_debug.h linux-linaro-stable-mx6/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h linux-3.10.30/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-16 15:28:22.453390966 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h 2014-05-19 19:07:23.809305716 +0200 @@ -0,0 +1,102 @@ +/**************************************************************************** +* @@ -187309,9 +187634,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern +#endif + +#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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c linux-3.10.30/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-16 15:28:22.453390966 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c 2014-05-19 19:07:23.809305716 +0200 @@ -0,0 +1,1652 @@ +/**************************************************************************** +* @@ -188965,9 +189290,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern + gcmkFOOTER(); + return status; +} -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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h linux-3.10.30/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-16 15:28:22.453390966 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h 2014-05-19 19:07:23.817305746 +0200 @@ -0,0 +1,172 @@ +/**************************************************************************** +* @@ -189141,9 +189466,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c linux-3.10.30/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-16 15:28:22.453390966 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c 2014-05-19 19:07:23.825305775 +0200 @@ -0,0 +1,1472 @@ +/**************************************************************************** +* @@ -190617,9 +190942,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern +module_exit(gpu_exit); + +#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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c linux-3.10.30/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-16 15:28:22.453390966 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c 2014-05-19 19:07:23.825305775 +0200 @@ -0,0 +1,481 @@ +/**************************************************************************** +* @@ -191102,9 +191427,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern + gcmkFOOTER_ARG("Settings->signal=%d", Settings->signal); + return gcvSTATUS_OK; +} -diff -Nur linux-3.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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h linux-3.10.30/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-16 15:28:22.453390966 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h 2014-05-19 19:07:23.825305775 +0200 @@ -0,0 +1,94 @@ +/**************************************************************************** +* @@ -191200,9 +191525,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c linux-3.10.30/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-16 15:28:22.453390966 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c 2014-05-19 19:07:23.825305775 +0200 @@ -0,0 +1,32 @@ +/**************************************************************************** +* @@ -191236,9 +191561,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern + if(Y ==0) {return 0;} + else {return X % Y;} +} -diff -Nur linux-3.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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c linux-3.10.30/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-16 15:28:22.453390966 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c 2014-05-19 19:07:23.833305805 +0200 @@ -0,0 +1,9022 @@ +/**************************************************************************** +* @@ -200262,9 +200587,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern + return status; +} +#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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h linux-3.10.30/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-16 15:28:22.453390966 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h 2014-05-19 19:07:23.833305805 +0200 @@ -0,0 +1,83 @@ +/**************************************************************************** +* @@ -200349,9 +200674,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kern +DRIVER_ARGS; + +#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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c linux-3.10.30/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-16 15:28:22.453390966 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c 2014-05-19 19:07:23.833305805 +0200 @@ -0,0 +1,174 @@ +/**************************************************************************** +* @@ -200527,9 +200852,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h linux-3.10.30/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-16 15:28:22.453390966 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h 2014-05-19 19:07:23.833305805 +0200 @@ -0,0 +1,71 @@ +/**************************************************************************** +* @@ -200602,9 +200927,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/Kbuild linux-3.10.30/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-16 15:28:22.441390904 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/Kbuild 2014-05-19 19:07:23.837305819 +0200 @@ -0,0 +1,236 @@ +############################################################################## +# @@ -200842,9 +201167,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/Kbuild linux-linaro-stable-mx6/ +galcore-objs := $(OBJS) + +endif -diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/Kconfig linux-linaro-stable-mx6/drivers/mxc/gpu-viv/Kconfig +diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/Kconfig linux-3.10.30/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-16 15:28:22.441390904 +0200 ++++ linux-3.10.30/drivers/mxc/gpu-viv/Kconfig 2014-05-19 19:07:23.837305819 +0200 @@ -0,0 +1,9 @@ +menu "MXC Vivante GPU support" + depends on SOC_IMX6Q @@ -200855,9 +201180,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/gpu-viv/Kconfig linux-linaro-stable-mx6 + Say Y to get the GPU driver support. + +endmenu -diff -Nur linux-3.10.30.orig/drivers/mxc/hdmi-cec/Kconfig linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/Kconfig +diff -Nur linux-3.10.30.orig/drivers/mxc/hdmi-cec/Kconfig linux-3.10.30/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-16 15:28:22.453390966 +0200 ++++ linux-3.10.30/drivers/mxc/hdmi-cec/Kconfig 2014-05-19 19:07:23.837305819 +0200 @@ -0,0 +1,11 @@ + +menu "MXC HDMI CEC (Consumer Electronics Control) support" @@ -200870,14 +201195,14 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/hdmi-cec/Kconfig linux-linaro-stable-mx + The HDMI CEC device implement low level protocol on i.MX6x platforms. + +endmenu -diff -Nur linux-3.10.30.orig/drivers/mxc/hdmi-cec/Makefile linux-linaro-stable-mx6/drivers/mxc/hdmi-cec/Makefile +diff -Nur linux-3.10.30.orig/drivers/mxc/hdmi-cec/Makefile linux-3.10.30/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-16 15:28:22.457390988 +0200 ++++ linux-3.10.30/drivers/mxc/hdmi-cec/Makefile 2014-05-19 19:07:23.837305819 +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 +diff -Nur linux-3.10.30.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c linux-3.10.30/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-16 15:28:22.457390988 +0200 ++++ linux-3.10.30/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c 2014-05-19 19:07:23.841305835 +0200 @@ -0,0 +1,608 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -201487,9 +201812,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c linux-linaro-st +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:mxc_hdmi_cec"); + -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 +diff -Nur linux-3.10.30.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h linux-3.10.30/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-16 15:28:22.457390988 +0200 ++++ linux-3.10.30/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h 2014-05-19 19:07:23.841305835 +0200 @@ -0,0 +1,38 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -201529,9 +201854,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.h linux-linaro-st + _IOR(HDMICEC_IOC_MAGIC, 4, unsigned char[4]) + +#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 +diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c linux-3.10.30/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-16 15:28:22.457390988 +0200 ++++ linux-3.10.30/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c 2014-05-19 19:07:23.841305835 +0200 @@ -0,0 +1,491 @@ +/* + * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -202024,9 +202349,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c linux-lin + return status; +} +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 +diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_capture.c linux-3.10.30/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-16 15:28:22.457390988 +0200 ++++ linux-3.10.30/drivers/mxc/ipu3/ipu_capture.c 2014-05-19 19:07:23.841305835 +0200 @@ -0,0 +1,819 @@ +/* + * Copyright 2008-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -202847,9 +203172,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_capture.c linux-linaro-stable- + ipu_free_irq(ipu, irq, ipu); + dev_dbg(ipu->dev, "CSI stop timeout - %d * 10ms\n", 5 - ret); +} -diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_common.c linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_common.c +diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_common.c linux-3.10.30/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-16 15:28:22.457390988 +0200 ++++ linux-3.10.30/drivers/mxc/ipu3/ipu_common.c 2014-05-19 19:07:23.841305835 +0200 @@ -0,0 +1,3134 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -205985,9 +206310,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_device.c linux-3.10.30/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-16 15:28:22.457390988 +0200 ++++ linux-3.10.30/drivers/mxc/ipu3/ipu_device.c 2014-05-19 19:07:23.845305849 +0200 @@ -0,0 +1,3690 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -209679,9 +210004,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_device.c linux-linaro-stable-m + major = 0; + } +} -diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_disp.c linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_disp.c +diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_disp.c linux-3.10.30/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-16 15:28:22.457390988 +0200 ++++ linux-3.10.30/drivers/mxc/ipu3/ipu_disp.c 2014-05-19 19:07:23.845305849 +0200 @@ -0,0 +1,1962 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -211645,9 +211970,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_disp.c linux-linaro-stable-mx6 + _ipu_init_dc_mappings(ipu); + _ipu_dmfc_init(ipu, DMFC_NORMAL, 1); +} -diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_ic.c linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_ic.c +diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_ic.c linux-3.10.30/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-16 15:28:22.457390988 +0200 ++++ linux-3.10.30/drivers/mxc/ipu3/ipu_ic.c 2014-05-19 19:07:23.845305849 +0200 @@ -0,0 +1,924 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -212573,9 +212898,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_ic.c linux-linaro-stable-mx6/d + + ipu_vdi_write(ipu, reg, VDI_C); +} -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 +diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_param_mem.h linux-3.10.30/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-16 15:28:22.457390988 +0200 ++++ linux-3.10.30/drivers/mxc/ipu3/ipu_param_mem.h 2014-05-19 19:07:23.845305849 +0200 @@ -0,0 +1,921 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -213498,9 +213823,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_param_mem.h linux-linaro-stabl + return false; +} +#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 +diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_pixel_clk.c linux-3.10.30/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-16 15:28:22.457390988 +0200 ++++ linux-3.10.30/drivers/mxc/ipu3/ipu_pixel_clk.c 2014-05-19 19:07:23.853305878 +0200 @@ -0,0 +1,317 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -213819,9 +214144,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_pixel_clk.c linux-linaro-stabl + + return clk; +} -diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_prv.h linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_prv.h +diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_prv.h linux-3.10.30/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-16 15:28:22.457390988 +0200 ++++ linux-3.10.30/drivers/mxc/ipu3/ipu_prv.h 2014-05-19 19:07:23.853305878 +0200 @@ -0,0 +1,356 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -214179,9 +214504,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_prv.h linux-linaro-stable-mx6/ + const char *parent_name, unsigned long flags, + u8 ipu_id, u8 di_id, u8 clk_gate_flags); +#endif /* __INCLUDE_IPU_PRV_H__ */ -diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_regs.h linux-linaro-stable-mx6/drivers/mxc/ipu3/ipu_regs.h +diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_regs.h linux-3.10.30/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-16 15:28:22.457390988 +0200 ++++ linux-3.10.30/drivers/mxc/ipu3/ipu_regs.h 2014-05-19 19:07:23.853305878 +0200 @@ -0,0 +1,719 @@ +/* + * Copyright (C) 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -214902,23 +215227,23 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/ipu_regs.h linux-linaro-stable-mx6 +#define WRG (0x01) + +#endif -diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/Kconfig linux-linaro-stable-mx6/drivers/mxc/ipu3/Kconfig +diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/Kconfig linux-3.10.30/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-16 15:28:22.457390988 +0200 ++++ linux-3.10.30/drivers/mxc/ipu3/Kconfig 2014-05-19 19:07:23.853305878 +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 +diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/Makefile linux-3.10.30/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-16 15:28:22.457390988 +0200 ++++ linux-3.10.30/drivers/mxc/ipu3/Makefile 2014-05-19 19:07:23.853305878 +0200 @@ -0,0 +1,4 @@ +obj-$(CONFIG_MXC_IPU_V3) = mxc_ipu.o + +mxc_ipu-objs := ipu_common.o ipu_ic.o ipu_disp.o ipu_capture.o ipu_device.o \ + ipu_calc_stripes_sizes.o vdoa.o ipu_pixel_clk.o -diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/vdoa.c linux-linaro-stable-mx6/drivers/mxc/ipu3/vdoa.c +diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/vdoa.c linux-3.10.30/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-16 15:28:22.457390988 +0200 ++++ linux-3.10.30/drivers/mxc/ipu3/vdoa.c 2014-05-19 19:07:23.853305878 +0200 @@ -0,0 +1,543 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -215463,9 +215788,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/vdoa.c linux-linaro-stable-mx6/dri +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("i.MX Video Data Order Adapter(VDOA) driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/vdoa.h linux-linaro-stable-mx6/drivers/mxc/ipu3/vdoa.h +diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/vdoa.h linux-3.10.30/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-16 15:28:22.457390988 +0200 ++++ linux-3.10.30/drivers/mxc/ipu3/vdoa.h 2014-05-19 19:07:23.853305878 +0200 @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -215536,9 +215861,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/ipu3/vdoa.h linux-linaro-stable-mx6/dri +void vdoa_get_handle(vdoa_handle_t *handle); +void vdoa_put_handle(vdoa_handle_t *handle); +#endif -diff -Nur linux-3.10.30.orig/drivers/mxc/Kconfig linux-linaro-stable-mx6/drivers/mxc/Kconfig +diff -Nur linux-3.10.30.orig/drivers/mxc/Kconfig linux-3.10.30/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-16 15:28:22.437390882 +0200 ++++ linux-3.10.30/drivers/mxc/Kconfig 2014-05-19 19:07:23.853305878 +0200 @@ -0,0 +1,24 @@ +# drivers/mxc/Kconfig + @@ -215564,9 +215889,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/Kconfig linux-linaro-stable-mx6/drivers +endmenu + +endif -diff -Nur linux-3.10.30.orig/drivers/mxc/Makefile linux-linaro-stable-mx6/drivers/mxc/Makefile +diff -Nur linux-3.10.30.orig/drivers/mxc/Makefile linux-3.10.30/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-16 15:28:22.437390882 +0200 ++++ linux-3.10.30/drivers/mxc/Makefile 2014-05-19 19:07:23.853305878 +0200 @@ -0,0 +1,7 @@ +obj-$(CONFIG_MXC_GPU_VIV) += gpu-viv/ +obj-$(CONFIG_MXC_IPU_V3) += ipu3/ @@ -215575,9 +215900,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/Makefile linux-linaro-stable-mx6/driver +obj-$(CONFIG_MXC_HDMI_CEC) += hdmi-cec/ +obj-$(CONFIG_MXC_MIPI_CSI2) += mipi/ +obj-$(CONFIG_MXC_MLB) += mlb/ -diff -Nur linux-3.10.30.orig/drivers/mxc/mipi/Kconfig linux-linaro-stable-mx6/drivers/mxc/mipi/Kconfig +diff -Nur linux-3.10.30.orig/drivers/mxc/mipi/Kconfig linux-3.10.30/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-16 15:28:22.457390988 +0200 ++++ linux-3.10.30/drivers/mxc/mipi/Kconfig 2014-05-19 19:07:23.857305894 +0200 @@ -0,0 +1,14 @@ +# +# MIPI configuration @@ -215593,17 +215918,17 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/mipi/Kconfig linux-linaro-stable-mx6/dr + Say Y to get the MIPI CSI2 support. + +endmenu -diff -Nur linux-3.10.30.orig/drivers/mxc/mipi/Makefile linux-linaro-stable-mx6/drivers/mxc/mipi/Makefile +diff -Nur linux-3.10.30.orig/drivers/mxc/mipi/Makefile linux-3.10.30/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-16 15:28:22.457390988 +0200 ++++ linux-3.10.30/drivers/mxc/mipi/Makefile 2014-05-19 19:07:23.857305894 +0200 @@ -0,0 +1,4 @@ +# +# Makefile for the mipi interface driver +# +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 +diff -Nur linux-3.10.30.orig/drivers/mxc/mipi/mxc_mipi_csi2.c linux-3.10.30/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-16 15:28:22.457390988 +0200 ++++ linux-3.10.30/drivers/mxc/mipi/mxc_mipi_csi2.c 2014-05-19 19:07:23.857305894 +0200 @@ -0,0 +1,531 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -216136,9 +216461,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/mipi/mxc_mipi_csi2.c linux-linaro-stabl +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("i.MX MIPI CSI2 driver"); +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 +diff -Nur linux-3.10.30.orig/drivers/mxc/mipi/mxc_mipi_csi2.h linux-3.10.30/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-16 15:28:22.457390988 +0200 ++++ linux-3.10.30/drivers/mxc/mipi/mxc_mipi_csi2.h 2014-05-19 19:07:23.857305894 +0200 @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -216185,9 +216510,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/mxc/mlb/Kconfig linux-3.10.30/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-16 15:28:22.457390988 +0200 ++++ linux-3.10.30/drivers/mxc/mlb/Kconfig 2014-05-19 19:07:23.857305894 +0200 @@ -0,0 +1,17 @@ +# +# MLB150 configuration @@ -216206,18 +216531,18 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/mlb/Kconfig linux-linaro-stable-mx6/dri + Say Y to get the MLB150 support. + +endmenu -diff -Nur linux-3.10.30.orig/drivers/mxc/mlb/Makefile linux-linaro-stable-mx6/drivers/mxc/mlb/Makefile +diff -Nur linux-3.10.30.orig/drivers/mxc/mlb/Makefile linux-3.10.30/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-16 15:28:22.461391009 +0200 ++++ linux-3.10.30/drivers/mxc/mlb/Makefile 2014-05-19 19:07:23.857305894 +0200 @@ -0,0 +1,5 @@ +# +# Makefile for the i.MX6Q/DL MLB150 driver +# + +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 +diff -Nur linux-3.10.30.orig/drivers/mxc/mlb/mxc_mlb150.c linux-3.10.30/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-16 15:28:22.461391009 +0200 ++++ linux-3.10.30/drivers/mxc/mlb/mxc_mlb150.c 2014-05-19 19:07:23.857305894 +0200 @@ -0,0 +1,2778 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -218997,9 +219322,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/mlb/mxc_mlb150.c linux-linaro-stable-mx +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("MLB150 low level driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/mxc/vpu/Kconfig linux-linaro-stable-mx6/drivers/mxc/vpu/Kconfig +diff -Nur linux-3.10.30.orig/drivers/mxc/vpu/Kconfig linux-3.10.30/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-16 15:28:22.461391009 +0200 ++++ linux-3.10.30/drivers/mxc/vpu/Kconfig 2014-05-19 19:07:23.861305908 +0200 @@ -0,0 +1,31 @@ +# +# Codec configuration @@ -219032,9 +219357,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/vpu/Kconfig linux-linaro-stable-mx6/dri + This config is used for special VPU use case. + +endmenu -diff -Nur linux-3.10.30.orig/drivers/mxc/vpu/Makefile linux-linaro-stable-mx6/drivers/mxc/vpu/Makefile +diff -Nur linux-3.10.30.orig/drivers/mxc/vpu/Makefile linux-3.10.30/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-16 15:28:22.461391009 +0200 ++++ linux-3.10.30/drivers/mxc/vpu/Makefile 2014-05-19 19:07:23.861305908 +0200 @@ -0,0 +1,9 @@ +# +# Makefile for the VPU drivers. @@ -219045,9 +219370,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/vpu/Makefile linux-linaro-stable-mx6/dr +ifeq ($(CONFIG_MXC_VPU_DEBUG),y) +EXTRA_CFLAGS += -DDEBUG +endif -diff -Nur linux-3.10.30.orig/drivers/mxc/vpu/mxc_vpu.c linux-linaro-stable-mx6/drivers/mxc/vpu/mxc_vpu.c +diff -Nur linux-3.10.30.orig/drivers/mxc/vpu/mxc_vpu.c linux-3.10.30/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-16 15:28:22.461391009 +0200 ++++ linux-3.10.30/drivers/mxc/vpu/mxc_vpu.c 2014-05-19 19:07:23.861305908 +0200 @@ -0,0 +1,1342 @@ +/* + * Copyright 2006-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -220391,9 +220716,9 @@ diff -Nur linux-3.10.30.orig/drivers/mxc/vpu/mxc_vpu.c linux-linaro-stable-mx6/d + +module_init(vpu_init); +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 +diff -Nur linux-3.10.30.orig/drivers/net/can/flexcan.c linux-3.10.30/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-16 15:28:22.473391072 +0200 ++++ linux-3.10.30/drivers/net/can/flexcan.c 2014-05-19 19:07:23.861305908 +0200 @@ -33,11 +33,14 @@ #include <linux/io.h> #include <linux/kernel.h> @@ -220612,9 +220937,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/can/flexcan.c linux-linaro-stable-mx6/d return 0; } -diff -Nur linux-3.10.30.orig/drivers/net/ethernet/8390/ne.c linux-linaro-stable-mx6/drivers/net/ethernet/8390/ne.c +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/8390/ne.c linux-3.10.30/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-16 15:28:22.489391156 +0200 ++++ linux-3.10.30/drivers/net/ethernet/8390/ne.c 2014-05-19 19:07:23.861305908 +0200 @@ -849,7 +849,6 @@ free_irq(dev->irq, dev); release_region(dev->base_addr, NE_IO_EXTENT); @@ -220623,9 +220948,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/8390/ne.c linux-linaro-stable- } return 0; } -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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/adi/bfin_mac.c linux-3.10.30/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-16 15:28:22.489391156 +0200 ++++ linux-3.10.30/drivers/net/ethernet/adi/bfin_mac.c 2014-05-19 19:07:23.865305923 +0200 @@ -1719,7 +1719,6 @@ mdiobus_unregister(lp->mii_bus); mdiobus_free(lp->mii_bus); @@ -220651,9 +220976,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/adi/bfin_mac.c linux-linaro-st mdiobus_unregister(miibus); kfree(miibus->irq); 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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/amd/au1000_eth.c linux-3.10.30/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-16 15:28:22.493391177 +0200 ++++ linux-3.10.30/drivers/net/ethernet/amd/au1000_eth.c 2014-05-19 19:07:23.865305923 +0200 @@ -1301,8 +1301,6 @@ int i; struct resource *base, *macen; @@ -220663,9 +220988,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/amd/au1000_eth.c linux-linaro- unregister_netdev(dev); mdiobus_unregister(aup->mii_bus); 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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/broadcom/bcm63xx_enet.c linux-3.10.30/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-16 15:28:22.505391241 +0200 ++++ linux-3.10.30/drivers/net/ethernet/broadcom/bcm63xx_enet.c 2014-05-19 19:07:23.865305923 +0200 @@ -1847,7 +1847,6 @@ clk_disable_unprepare(priv->mac_clk); clk_put(priv->mac_clk); @@ -220674,9 +220999,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/broadcom/bcm63xx_enet.c linux- free_netdev(dev); return 0; } -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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/cadence/at91_ether.c linux-3.10.30/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-16 15:28:22.537391409 +0200 ++++ linux-3.10.30/drivers/net/ethernet/cadence/at91_ether.c 2014-05-19 19:07:23.865305923 +0200 @@ -435,7 +435,6 @@ unregister_netdev(dev); clk_disable(lp->pclk); @@ -220685,9 +221010,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/cadence/at91_ether.c linux-lin return 0; } -diff -Nur linux-3.10.30.orig/drivers/net/ethernet/cadence/macb.c linux-linaro-stable-mx6/drivers/net/ethernet/cadence/macb.c +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/cadence/macb.c linux-3.10.30/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-16 15:28:22.537391409 +0200 ++++ linux-3.10.30/drivers/net/ethernet/cadence/macb.c 2014-05-19 19:07:23.865305923 +0200 @@ -1649,7 +1649,6 @@ err_out_free_dev: free_netdev(dev); @@ -220704,9 +221029,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/calxeda/xgmac.c linux-3.10.30/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-16 15:28:22.537391409 +0200 ++++ linux-3.10.30/drivers/net/ethernet/calxeda/xgmac.c 2014-05-19 19:07:23.865305923 +0200 @@ -1790,7 +1790,6 @@ free_netdev(ndev); err_alloc: @@ -220723,9 +221048,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/calxeda/xgmac.c linux-linaro-s unregister_netdev(ndev); netif_napi_del(&priv->napi); -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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/cirrus/ep93xx_eth.c linux-3.10.30/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-16 15:28:22.553391494 +0200 ++++ linux-3.10.30/drivers/net/ethernet/cirrus/ep93xx_eth.c 2014-05-19 19:07:23.865305923 +0200 @@ -783,7 +783,6 @@ dev = platform_get_drvdata(pdev); if (dev == NULL) @@ -220734,9 +221059,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/cirrus/ep93xx_eth.c linux-lina ep = netdev_priv(dev); -diff -Nur linux-3.10.30.orig/drivers/net/ethernet/davicom/dm9000.c linux-linaro-stable-mx6/drivers/net/ethernet/davicom/dm9000.c +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/davicom/dm9000.c linux-3.10.30/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-16 15:28:22.557391515 +0200 ++++ linux-3.10.30/drivers/net/ethernet/davicom/dm9000.c 2014-05-19 19:07:23.865305923 +0200 @@ -1673,8 +1673,6 @@ { struct net_device *ndev = platform_get_drvdata(pdev); @@ -220746,9 +221071,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/davicom/dm9000.c linux-linaro- unregister_netdev(ndev); dm9000_release_board(pdev, netdev_priv(ndev)); 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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/ethoc.c linux-3.10.30/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-16 15:28:22.569391578 +0200 ++++ linux-3.10.30/drivers/net/ethernet/ethoc.c 2014-05-19 19:07:23.865305923 +0200 @@ -1147,8 +1147,6 @@ struct net_device *netdev = platform_get_drvdata(pdev); struct ethoc *priv = netdev_priv(netdev); @@ -220758,9 +221083,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/ethoc.c linux-linaro-stable-mx if (netdev) { netif_napi_del(&priv->napi); 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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/faraday/ftgmac100.c linux-3.10.30/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-16 15:28:22.569391578 +0200 ++++ linux-3.10.30/drivers/net/ethernet/faraday/ftgmac100.c 2014-05-19 19:07:23.869305937 +0200 @@ -1311,7 +1311,6 @@ release_resource(priv->res); err_req_mem: @@ -220777,9 +221102,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/faraday/ftgmac100.c linux-lina free_netdev(netdev); return 0; } -diff -Nur linux-3.10.30.orig/drivers/net/ethernet/faraday/ftmac100.c linux-linaro-stable-mx6/drivers/net/ethernet/faraday/ftmac100.c +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/faraday/ftmac100.c linux-3.10.30/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-16 15:28:22.569391578 +0200 ++++ linux-3.10.30/drivers/net/ethernet/faraday/ftmac100.c 2014-05-19 19:07:23.869305937 +0200 @@ -1149,7 +1149,6 @@ release_resource(priv->res); err_req_mem: @@ -220796,9 +221121,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/faraday/ftmac100.c linux-linar free_netdev(netdev); return 0; } -diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fec.h linux-linaro-stable-mx6/drivers/net/ethernet/freescale/fec.h +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fec.h linux-3.10.30/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-16 15:28:22.573391599 +0200 ++++ linux-3.10.30/drivers/net/ethernet/freescale/fec.h 2014-05-19 19:07:23.869305937 +0200 @@ -16,6 +16,9 @@ #include <linux/clocksource.h> #include <linux/net_tstamp.h> @@ -221058,9 +221383,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fec_main.c linux-3.10.30/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-16 15:28:22.573391599 +0200 ++++ linux-3.10.30/drivers/net/ethernet/freescale/fec_main.c 2014-05-19 19:07:23.869305937 +0200 @@ -18,7 +18,7 @@ * Bug fixes and cleanup by Philippe De Muyter (phdm@macqel.be) * Copyright (c) 2004-2006 Macq Electronique SA. @@ -222500,9 +222825,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fec_main.c linux-lin +MODULE_ALIAS("platform:"DRIVER_NAME); 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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fec_mpc52xx.c linux-3.10.30/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-16 15:28:22.573391599 +0200 ++++ linux-3.10.30/drivers/net/ethernet/freescale/fec_mpc52xx.c 2014-05-19 19:07:23.869305937 +0200 @@ -981,7 +981,7 @@ goto err_node; @@ -222546,9 +222871,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fec_mpc52xx.c linux- mpc52xx_fec_hw_init(dev); 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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c linux-3.10.30/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-16 15:28:22.573391599 +0200 ++++ linux-3.10.30/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c 2014-05-19 19:07:23.869305937 +0200 @@ -123,12 +123,10 @@ static int mpc52xx_fec_mdio_remove(struct platform_device *of) @@ -222563,9 +222888,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c li iounmap(priv->regs); kfree(priv); 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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fec_ptp.c linux-3.10.30/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-16 15:28:22.573391599 +0200 ++++ linux-3.10.30/drivers/net/ethernet/freescale/fec_ptp.c 2014-05-19 19:07:23.869305937 +0200 @@ -1,7 +1,7 @@ /* * Fast Ethernet Controller (ENET) PTP driver for MX6x. @@ -223307,9 +223632,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fec_ptp.c linux-lina + vfree(priv->rx_timestamps.data_buf); +} + -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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c linux-3.10.30/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-16 15:28:22.573391599 +0200 ++++ linux-3.10.30/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c 2014-05-19 19:07:23.869305937 +0200 @@ -583,7 +583,6 @@ struct sk_buff *skb) { @@ -223396,9 +223721,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/fs_enet-main free_netdev(ndev); return 0; } -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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/Kconfig linux-3.10.30/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-16 15:28:22.573391599 +0200 ++++ linux-3.10.30/drivers/net/ethernet/freescale/fs_enet/Kconfig 2014-05-19 19:07:23.869305937 +0200 @@ -1,7 +1,6 @@ config FS_ENET tristate "Freescale Ethernet Driver" @@ -223407,9 +223732,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/Kconfig linu select MII select PHYLIB -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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c linux-3.10.30/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-16 15:28:22.573391599 +0200 ++++ linux-3.10.30/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c 2014-05-19 19:07:23.873305953 +0200 @@ -32,7 +32,9 @@ #include <linux/fs.h> #include <linux/platform_device.h> @@ -223429,9 +223754,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c li if (fep->interrupt == NO_IRQ) goto out; -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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/mac-fec.c linux-3.10.30/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-16 15:28:22.573391599 +0200 ++++ linux-3.10.30/drivers/net/ethernet/freescale/fs_enet/mac-fec.c 2014-05-19 19:07:23.873305953 +0200 @@ -31,7 +31,9 @@ #include <linux/bitops.h> #include <linux/fs.h> @@ -223451,9 +223776,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/mac-fec.c li if (fep->interrupt == NO_IRQ) return -EINVAL; -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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/mac-scc.c linux-3.10.30/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-16 15:28:22.573391599 +0200 ++++ linux-3.10.30/drivers/net/ethernet/freescale/fs_enet/mac-scc.c 2014-05-19 19:07:23.873305953 +0200 @@ -31,6 +31,8 @@ #include <linux/bitops.h> #include <linux/fs.h> @@ -223472,9 +223797,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/mac-scc.c li if (fep->interrupt == NO_IRQ) return -EINVAL; -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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c linux-3.10.30/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-16 15:28:22.573391599 +0200 ++++ linux-3.10.30/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c 2014-05-19 19:07:23.873305953 +0200 @@ -22,6 +22,7 @@ #include <linux/mii.h> #include <linux/platform_device.h> @@ -223513,9 +223838,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/mii-bitbang. kfree(bus->irq); free_mdio_bitbang(bus); 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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/mii-fec.c linux-3.10.30/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-16 15:28:22.573391599 +0200 ++++ linux-3.10.30/drivers/net/ethernet/freescale/fs_enet/mii-fec.c 2014-05-19 19:07:23.873305953 +0200 @@ -31,6 +31,7 @@ #include <linux/ethtool.h> #include <linux/bitops.h> @@ -223554,9 +223879,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fs_enet/mii-fec.c li kfree(bus->irq); iounmap(fec->fecp); 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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fsl_pq_mdio.c linux-3.10.30/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-16 15:28:22.573391599 +0200 ++++ linux-3.10.30/drivers/net/ethernet/freescale/fsl_pq_mdio.c 2014-05-19 19:07:23.873305953 +0200 @@ -409,7 +409,7 @@ priv->regs = priv->map + data->mii_offset; @@ -223575,9 +223900,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/fsl_pq_mdio.c linux- iounmap(priv->map); mdiobus_free(bus); -diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/gianfar.c linux-linaro-stable-mx6/drivers/net/ethernet/freescale/gianfar.c +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/gianfar.c linux-3.10.30/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-16 15:28:22.577391620 +0200 ++++ linux-3.10.30/drivers/net/ethernet/freescale/gianfar.c 2014-05-19 19:07:23.873305953 +0200 @@ -78,6 +78,8 @@ #include <linux/if_vlan.h> #include <linux/spinlock.h> @@ -224166,9 +224491,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/gianfar.c linux-lina gfar_write(®s->maccfg2, tempval); gfar_write(®s->ecntrl, ecntrl); -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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/gianfar_ethtool.c linux-3.10.30/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-16 15:28:22.577391620 +0200 ++++ linux-3.10.30/drivers/net/ethernet/freescale/gianfar_ethtool.c 2014-05-19 19:07:23.873305953 +0200 @@ -535,6 +535,78 @@ return err; } @@ -224257,9 +224582,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/gianfar_ethtool.c li .get_strings = gfar_gstrings, .get_sset_count = gfar_sset_count, .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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/gianfar.h linux-3.10.30/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-16 15:28:22.577391620 +0200 ++++ linux-3.10.30/drivers/net/ethernet/freescale/gianfar.h 2014-05-19 19:07:23.873305953 +0200 @@ -146,6 +146,10 @@ | SUPPORTED_Autoneg \ | SUPPORTED_MII) @@ -224349,9 +224674,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/gianfar.h linux-lina extern const struct ethtool_ops gfar_ethtool_ops; -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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/gianfar_ptp.c linux-3.10.30/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-16 15:28:22.577391620 +0200 ++++ linux-3.10.30/drivers/net/ethernet/freescale/gianfar_ptp.c 2014-05-19 19:07:23.877305968 +0200 @@ -452,7 +452,9 @@ err = -ENODEV; @@ -224381,9 +224706,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/gianfar_ptp.c linux- gfar_write(&etsects->regs->tmr_temask, 0); 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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/ucc_geth.c linux-3.10.30/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-16 15:28:22.581391642 +0200 ++++ linux-3.10.30/drivers/net/ethernet/freescale/ucc_geth.c 2014-05-19 19:07:23.877305968 +0200 @@ -31,6 +31,8 @@ #include <linux/mii.h> #include <linux/phy.h> @@ -224436,9 +224761,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/ucc_geth.c linux-lin return 0; } -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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/xgmac_mdio.c linux-3.10.30/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-16 15:28:22.581391642 +0200 ++++ linux-3.10.30/drivers/net/ethernet/freescale/xgmac_mdio.c 2014-05-19 19:07:23.877305968 +0200 @@ -17,6 +17,7 @@ #include <linux/module.h> #include <linux/phy.h> @@ -224465,9 +224790,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/freescale/xgmac_mdio.c linux-l mdiobus_unregister(bus); iounmap(bus->priv); -diff -Nur linux-3.10.30.orig/drivers/net/ethernet/korina.c linux-linaro-stable-mx6/drivers/net/ethernet/korina.c +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/korina.c linux-3.10.30/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-16 15:28:23.989399067 +0200 ++++ linux-3.10.30/drivers/net/ethernet/korina.c 2014-05-19 19:07:23.877305968 +0200 @@ -1214,7 +1214,6 @@ iounmap(lp->rx_dma_regs); iounmap(lp->tx_dma_regs); @@ -224476,9 +224801,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/korina.c linux-linaro-stable-m unregister_netdev(bif->dev); free_netdev(bif->dev); -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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/marvell/mv643xx_eth.c linux-3.10.30/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-16 15:28:23.989399067 +0200 ++++ linux-3.10.30/drivers/net/ethernet/marvell/mv643xx_eth.c 2014-05-19 19:07:23.877305968 +0200 @@ -2811,8 +2811,6 @@ free_netdev(mp->dev); @@ -224488,9 +224813,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/marvell/mv643xx_eth.c linux-li return 0; } -diff -Nur linux-3.10.30.orig/drivers/net/ethernet/marvell/mvneta.c linux-linaro-stable-mx6/drivers/net/ethernet/marvell/mvneta.c +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/marvell/mvneta.c linux-3.10.30/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-16 15:28:23.989399067 +0200 ++++ linux-3.10.30/drivers/net/ethernet/marvell/mvneta.c 2014-05-19 19:07:23.893306027 +0200 @@ -2815,8 +2815,6 @@ irq_dispose_mapping(dev->irq); free_netdev(dev); @@ -224500,9 +224825,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/marvell/mvneta.c linux-linaro- return 0; } -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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/marvell/pxa168_eth.c linux-3.10.30/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-16 15:28:23.989399067 +0200 ++++ linux-3.10.30/drivers/net/ethernet/marvell/pxa168_eth.c 2014-05-19 19:07:23.901306057 +0200 @@ -1602,7 +1602,6 @@ unregister_netdev(dev); cancel_work_sync(&pep->tx_timeout_task); @@ -224511,9 +224836,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/marvell/pxa168_eth.c linux-lin return 0; } -diff -Nur linux-3.10.30.orig/drivers/net/ethernet/micrel/ks8695net.c linux-linaro-stable-mx6/drivers/net/ethernet/micrel/ks8695net.c +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/micrel/ks8695net.c linux-3.10.30/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-16 15:28:24.001399131 +0200 ++++ linux-3.10.30/drivers/net/ethernet/micrel/ks8695net.c 2014-05-19 19:07:23.905306071 +0200 @@ -1600,7 +1600,6 @@ struct net_device *ndev = platform_get_drvdata(pdev); struct ks8695_priv *ksp = netdev_priv(ndev); @@ -224522,9 +224847,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/micrel/ks8695net.c linux-linar netif_napi_del(&ksp->napi); 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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/micrel/ks8842.c linux-3.10.30/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-16 15:28:24.001399131 +0200 ++++ linux-3.10.30/drivers/net/ethernet/micrel/ks8842.c 2014-05-19 19:07:23.921306130 +0200 @@ -1250,7 +1250,6 @@ iounmap(adapter->hw_addr); free_netdev(netdev); @@ -224533,9 +224858,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/micrel/ks8842.c linux-linaro-s return 0; } -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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/micrel/ks8851_mll.c linux-3.10.30/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-16 15:28:24.001399131 +0200 ++++ linux-3.10.30/drivers/net/ethernet/micrel/ks8851_mll.c 2014-05-19 19:07:23.929306159 +0200 @@ -1671,7 +1671,6 @@ iounmap(ks->hw_addr); free_netdev(netdev); @@ -224544,9 +224869,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/micrel/ks8851_mll.c linux-lina return 0; } -diff -Nur linux-3.10.30.orig/drivers/net/ethernet/netx-eth.c linux-linaro-stable-mx6/drivers/net/ethernet/netx-eth.c +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/netx-eth.c linux-3.10.30/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-16 15:28:24.013399194 +0200 ++++ linux-3.10.30/drivers/net/ethernet/netx-eth.c 2014-05-19 19:07:23.929306159 +0200 @@ -422,7 +422,6 @@ exit_free_xc: free_xc(priv->xc); @@ -224555,9 +224880,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/netx-eth.c linux-linaro-stable free_netdev(ndev); exit: 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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/nuvoton/w90p910_ether.c linux-3.10.30/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-16 15:28:24.013399194 +0200 ++++ linux-3.10.30/drivers/net/ethernet/nuvoton/w90p910_ether.c 2014-05-19 19:07:23.929306159 +0200 @@ -1051,7 +1051,6 @@ clk_put(ether->clk); failed_free_rxirq: @@ -224574,9 +224899,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/nuvoton/w90p910_ether.c linux- free_netdev(dev); 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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/nxp/lpc_eth.c linux-3.10.30/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-16 15:28:24.013399194 +0200 ++++ linux-3.10.30/drivers/net/ethernet/nxp/lpc_eth.c 2014-05-19 19:07:23.929306159 +0200 @@ -1483,7 +1483,6 @@ return 0; @@ -224593,9 +224918,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/nxp/lpc_eth.c linux-linaro-sta if (!use_iram_for_net(&pldat->pdev->dev) || 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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/renesas/sh_eth.c linux-3.10.30/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-16 15:28:24.037399321 +0200 ++++ linux-3.10.30/drivers/net/ethernet/renesas/sh_eth.c 2014-05-19 19:07:23.933306175 +0200 @@ -2814,7 +2814,6 @@ unregister_netdev(ndev); pm_runtime_disable(&pdev->dev); @@ -224604,9 +224929,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/renesas/sh_eth.c linux-linaro- return 0; } -diff -Nur linux-3.10.30.orig/drivers/net/ethernet/s6gmac.c linux-linaro-stable-mx6/drivers/net/ethernet/s6gmac.c +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/s6gmac.c linux-3.10.30/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-16 15:28:24.041399342 +0200 ++++ linux-3.10.30/drivers/net/ethernet/s6gmac.c 2014-05-19 19:07:23.933306175 +0200 @@ -1040,7 +1040,6 @@ unregister_netdev(dev); free_irq(dev->irq, dev); @@ -224615,9 +224940,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/s6gmac.c linux-linaro-stable-m } return 0; } -diff -Nur linux-3.10.30.orig/drivers/net/ethernet/seeq/sgiseeq.c linux-linaro-stable-mx6/drivers/net/ethernet/seeq/sgiseeq.c +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/seeq/sgiseeq.c linux-3.10.30/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-16 15:28:24.041399342 +0200 ++++ linux-3.10.30/drivers/net/ethernet/seeq/sgiseeq.c 2014-05-19 19:07:23.933306175 +0200 @@ -818,7 +818,6 @@ dma_free_noncoherent(&pdev->dev, sizeof(*sp->srings), sp->srings, sp->srings_dma); @@ -224626,9 +224951,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/seeq/sgiseeq.c linux-linaro-st return 0; } -diff -Nur linux-3.10.30.orig/drivers/net/ethernet/sgi/meth.c linux-linaro-stable-mx6/drivers/net/ethernet/sgi/meth.c +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/sgi/meth.c linux-3.10.30/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-16 15:28:24.049399384 +0200 ++++ linux-3.10.30/drivers/net/ethernet/sgi/meth.c 2014-05-19 19:07:23.933306175 +0200 @@ -863,7 +863,6 @@ unregister_netdev(dev); @@ -224637,9 +224962,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/sgi/meth.c linux-linaro-stable return 0; } -diff -Nur linux-3.10.30.orig/drivers/net/ethernet/smsc/smc911x.c linux-linaro-stable-mx6/drivers/net/ethernet/smsc/smc911x.c +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/smsc/smc911x.c linux-3.10.30/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-16 15:28:24.053399405 +0200 ++++ linux-3.10.30/drivers/net/ethernet/smsc/smc911x.c 2014-05-19 19:07:23.933306175 +0200 @@ -2087,7 +2087,6 @@ ndev->base_addr = res->start; ret = smc911x_probe(ndev); @@ -224656,9 +224981,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/smsc/smc911x.c linux-linaro-st unregister_netdev(ndev); -diff -Nur linux-3.10.30.orig/drivers/net/ethernet/smsc/smc91x.c linux-linaro-stable-mx6/drivers/net/ethernet/smsc/smc91x.c +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/smsc/smc91x.c linux-3.10.30/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-16 15:28:24.053399405 +0200 ++++ linux-3.10.30/drivers/net/ethernet/smsc/smc91x.c 2014-05-19 19:07:23.937306189 +0200 @@ -1896,7 +1896,7 @@ SMC_SELECT_BANK(lp, 1); val = SMC_GET_BASE(lp); @@ -224685,9 +225010,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/smsc/smc91x.c linux-linaro-sta unregister_netdev(ndev); 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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/smsc/smsc911x.c linux-3.10.30/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-16 15:28:24.053399405 +0200 ++++ linux-3.10.30/drivers/net/ethernet/smsc/smsc911x.c 2014-05-19 19:07:23.937306189 +0200 @@ -2284,7 +2284,6 @@ mdiobus_unregister(pdata->mii_bus); mdiobus_free(pdata->mii_bus); @@ -224704,9 +225029,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/smsc/smsc911x.c linux-linaro-s iounmap(pdata->ioaddr); free_netdev(dev); 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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c linux-3.10.30/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-16 15:28:24.065399468 +0200 ++++ linux-3.10.30/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c 2014-05-19 19:07:23.937306189 +0200 @@ -171,8 +171,6 @@ if (priv->plat->exit) priv->plat->exit(pdev); @@ -224716,9 +225041,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/stmicro/stmmac/stmmac_platform return ret; } -diff -Nur linux-3.10.30.orig/drivers/net/ethernet/ti/cpsw.c linux-linaro-stable-mx6/drivers/net/ethernet/ti/cpsw.c +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/ti/cpsw.c linux-3.10.30/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-16 15:28:24.073399511 +0200 ++++ linux-3.10.30/drivers/net/ethernet/ti/cpsw.c 2014-05-19 19:07:23.937306189 +0200 @@ -1940,7 +1940,6 @@ struct cpsw_priv *priv = netdev_priv(ndev); int i; @@ -224727,9 +225052,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/ti/cpsw.c linux-linaro-stable- if (priv->data.dual_emac) unregister_netdev(cpsw_get_slave_ndev(priv, 1)); 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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/ti/davinci_emac.c linux-3.10.30/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-16 15:28:24.073399511 +0200 ++++ linux-3.10.30/drivers/net/ethernet/ti/davinci_emac.c 2014-05-19 19:07:23.937306189 +0200 @@ -2036,8 +2036,6 @@ dev_notice(&ndev->dev, "DaVinci EMAC: davinci_emac_remove()\n"); @@ -224739,9 +225064,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/ti/davinci_emac.c linux-linaro if (priv->txchan) cpdma_chan_destroy(priv->txchan); 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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/tundra/tsi108_eth.c linux-3.10.30/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-16 15:28:24.081399553 +0200 ++++ linux-3.10.30/drivers/net/ethernet/tundra/tsi108_eth.c 2014-05-19 19:07:23.937306189 +0200 @@ -1682,7 +1682,6 @@ unregister_netdev(dev); @@ -224750,9 +225075,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/tundra/tsi108_eth.c linux-lina iounmap(priv->regs); iounmap(priv->phyregs); 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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/wiznet/w5100.c linux-3.10.30/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-16 15:28:24.081399553 +0200 ++++ linux-3.10.30/drivers/net/ethernet/wiznet/w5100.c 2014-05-19 19:07:23.937306189 +0200 @@ -734,7 +734,6 @@ unregister_netdev(ndev); err_register: @@ -224769,9 +225094,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/wiznet/w5100.c linux-linaro-st return 0; } -diff -Nur linux-3.10.30.orig/drivers/net/ethernet/wiznet/w5300.c linux-linaro-stable-mx6/drivers/net/ethernet/wiznet/w5300.c +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/wiznet/w5300.c linux-3.10.30/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-16 15:28:24.081399553 +0200 ++++ linux-3.10.30/drivers/net/ethernet/wiznet/w5300.c 2014-05-19 19:07:23.937306189 +0200 @@ -646,7 +646,6 @@ unregister_netdev(ndev); err_register: @@ -224788,9 +225113,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/wiznet/w5300.c linux-linaro-st return 0; } -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 +diff -Nur linux-3.10.30.orig/drivers/net/ethernet/xscale/ixp4xx_eth.c linux-3.10.30/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-16 15:28:24.085399573 +0200 ++++ linux-3.10.30/drivers/net/ethernet/xscale/ixp4xx_eth.c 2014-05-19 19:07:23.937306189 +0200 @@ -1472,7 +1472,6 @@ phy_disconnect(port->phydev); err_free_mem: @@ -224807,9 +225132,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/ethernet/xscale/ixp4xx_eth.c linux-lina npe_release(port->npe); release_resource(port->mem_res); free_netdev(dev); -diff -Nur linux-3.10.30.orig/drivers/net/phy/phy.c linux-linaro-stable-mx6/drivers/net/phy/phy.c +diff -Nur linux-3.10.30.orig/drivers/net/phy/phy.c linux-3.10.30/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-16 15:28:24.113399722 +0200 ++++ linux-3.10.30/drivers/net/phy/phy.c 2014-05-19 19:07:23.937306189 +0200 @@ -439,7 +439,7 @@ { phydev->adjust_state = handler; @@ -224847,9 +225172,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/ath/ath6kl/hif.h linux-3.10.30/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-16 15:28:24.157399954 +0200 ++++ linux-3.10.30/drivers/net/wireless/ath/ath6kl/hif.h 2014-05-19 19:07:23.937306189 +0200 @@ -197,9 +197,9 @@ /* bounce buffer for upper layers to copy to/from */ u8 *virt_dma_buf; @@ -224862,9 +225187,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/ath/ath6kl/sdio.c linux-3.10.30/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-16 15:28:24.161399975 +0200 ++++ linux-3.10.30/drivers/net/wireless/ath/ath6kl/sdio.c 2014-05-19 19:07:23.941306204 +0200 @@ -222,6 +222,7 @@ struct mmc_data *data) { @@ -224902,9 +225227,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/ath/ath6kl/sdio.c linux-linaro scat_req_sz = sizeof(*s_req) + scat_list_sz; 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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c linux-3.10.30/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-16 15:28:24.201400186 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c 2014-05-19 19:07:23.941306204 +0200 @@ -0,0 +1,375 @@ +/* + * Copyright (c) 2010 Broadcom Corporation @@ -225281,9 +225606,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c linu + kfree(drvr->proto->pd); + drvr->proto->pd = NULL; +} -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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/bcdc.h linux-3.10.30/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-16 15:28:24.205400206 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/bcdc.h 2014-05-19 19:07:23.941306204 +0200 @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2013 Broadcom Corporation @@ -225309,9 +225634,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c linux-3.10.30/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-16 15:28:24.205400206 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c 2014-05-19 19:07:23.941306204 +0200 @@ -17,15 +17,23 @@ #include <linux/types.h> @@ -226584,9 +226909,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c li + if (ret == -ENODEV) + brcmf_dbg(SDIO, "No platform data available.\n"); } -diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,635 +0,0 @@ -/* - * Copyright (c) 2010 Broadcom Corporation @@ -227223,9 +227548,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmm - if (ret == -ENODEV) - brcmf_dbg(SDIO, "No platform data available.\n"); -} -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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h linux-3.10.30/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-16 15:28:24.205400206 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h 2014-05-19 19:07:23.941306204 +0200 @@ -17,13 +17,23 @@ #ifndef _BRCMF_BUS_H_ #define _BRCMF_BUS_H_ @@ -227394,9 +227719,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h l #endif #endif /* _BRCMF_BUS_H_ */ -diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,389 +0,0 @@ -/* - * Copyright (c) 2010 Broadcom Corporation @@ -227787,9 +228112,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c l -{ - /* Nothing to do for CDC */ -} -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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c linux-3.10.30/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-16 15:28:24.205400206 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c 2014-05-19 19:07:23.941306204 +0200 @@ -21,9 +21,9 @@ #include <brcmu_utils.h> #include "dhd.h" @@ -227861,9 +228186,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_common. done: return err; } -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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c linux-3.10.30/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-16 15:28:24.205400206 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c 2014-05-19 19:07:23.941306204 +0200 @@ -22,7 +22,6 @@ #include "dhd.h" #include "dhd_bus.h" @@ -227959,9 +228284,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c l return simple_read_from_buffer(data, count, ppos, buf, res); } -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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h linux-3.10.30/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-16 15:28:24.205400206 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h 2014-05-19 19:07:23.941306204 +0200 @@ -33,7 +33,7 @@ #define BRCMF_USB_VAL 0x00002000 #define BRCMF_SCAN_VAL 0x00004000 @@ -227991,9 +228316,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd.h linux-3.10.30/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-16 15:28:24.205400206 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/dhd.h 2014-05-19 19:07:23.941306204 +0200 @@ -21,479 +21,33 @@ #ifndef _BRCMF_H_ #define _BRCMF_H_ @@ -228610,9 +228935,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd.h linux +int brcmf_c_preinit_dcmds(struct brcmf_if *ifp); #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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c linux-3.10.30/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-16 15:28:24.205400206 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c 2014-05-19 19:07:23.945306218 +0200 @@ -24,13 +24,13 @@ #include "dhd.h" @@ -229380,9 +229705,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c static int brcmf_get_pend_8021x_cnt(struct brcmf_if *ifp) { return atomic_read(&ifp->pend_8021x_cnt); -diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h --- linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2010 Broadcom Corporation @@ -229426,9 +229751,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h -extern int brcmf_c_preinit_dcmds(struct brcmf_if *ifp); - -#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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c linux-3.10.30/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-16 15:28:24.205400206 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c 2014-05-19 19:07:23.945306218 +0200 @@ -32,6 +32,7 @@ #include <linux/debugfs.h> #include <linux/vmalloc.h> @@ -233260,9 +233585,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c return; 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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fweh.c linux-3.10.30/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-16 15:28:24.205400206 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/fweh.c 2014-05-19 19:07:23.945306218 +0200 @@ -185,6 +185,10 @@ ifevent->action, ifevent->ifidx, ifevent->bssidx, ifevent->flags, ifevent->role); @@ -233274,9 +233599,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fweh.c linu if (ifevent->ifidx >= BRCMF_MAX_IFS) { brcmf_err("invalid interface index: %u\n", 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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fweh.h linux-3.10.30/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-16 15:28:24.205400206 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/fweh.h 2014-05-19 19:07:23.945306218 +0200 @@ -101,7 +101,9 @@ BRCMF_ENUM_DEF(P2P_PROBEREQ_MSG, 72) \ BRCMF_ENUM_DEF(DCS_REQUEST, 73) \ @@ -233363,9 +233688,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fweh.h linu typedef int (*brcmf_fweh_handler_t)(struct brcmf_if *ifp, const struct brcmf_event_msg *evtmsg, 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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fwil.c linux-3.10.30/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-16 15:28:24.205400206 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/fwil.c 2014-05-19 19:07:23.945306218 +0200 @@ -27,6 +27,7 @@ #include "dhd_dbg.h" #include "tracepoint.h" @@ -233442,9 +233767,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fwil.c linu mutex_unlock(&drvr->proto_block); 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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fwil.h linux-3.10.30/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-16 15:28:24.205400206 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/fwil.h 2014-05-19 19:07:23.945306218 +0200 @@ -17,6 +17,67 @@ #ifndef _fwil_h_ #define _fwil_h_ @@ -233513,9 +233838,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fwil.h linu s32 brcmf_fil_cmd_data_set(struct brcmf_if *ifp, u32 cmd, void *data, u32 len); s32 brcmf_fil_cmd_data_get(struct brcmf_if *ifp, u32 cmd, void *data, u32 len); 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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h linux-3.10.30/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-16 15:28:24.205400206 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h 2014-05-19 19:07:23.945306218 +0200 @@ -29,6 +29,24 @@ #define BRCMF_ARP_OL_HOST_AUTO_REPLY 0x00000004 #define BRCMF_ARP_OL_PEER_AUTO_REPLY 0x00000008 @@ -233853,9 +234178,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c linux-3.10.30/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-16 15:28:24.205400206 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c 2014-05-19 19:07:23.949306234 +0200 @@ -22,13 +22,11 @@ #include <linux/etherdevice.h> #include <linux/err.h> @@ -236030,9 +236355,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c + else + fws->stats.bus_flow_block++; } -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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h linux-3.10.30/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-16 15:28:24.205400206 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h 2014-05-19 19:07:23.949306234 +0200 @@ -29,5 +29,6 @@ void brcmf_fws_add_interface(struct brcmf_if *ifp); void brcmf_fws_del_interface(struct brcmf_if *ifp); @@ -236040,9 +236365,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h +void brcmf_fws_bus_blocked(struct brcmf_pub *drvr, bool flow_blocked); #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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/Makefile linux-3.10.30/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-16 15:28:24.201400186 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/Makefile 2014-05-19 19:07:23.949306234 +0200 @@ -28,14 +28,15 @@ fweh.o \ fwsignal.o \ @@ -236061,9 +236386,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/Makefile li sdio_chip.o brcmfmac-$(CONFIG_BRCMFMAC_USB) += \ 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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/nvram.c linux-3.10.30/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-16 15:28:24.205400206 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/nvram.c 2014-05-19 19:07:23.949306234 +0200 @@ -0,0 +1,94 @@ +/* + * Copyright (c) 2013 Broadcom Corporation @@ -236159,9 +236484,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/nvram.h linux-3.10.30/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-16 15:28:24.205400206 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/nvram.h 2014-05-19 19:07:23.949306234 +0200 @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2013 Broadcom Corporation @@ -236187,9 +236512,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/p2p.c linux-3.10.30/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-16 15:28:24.205400206 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/p2p.c 2014-05-19 19:07:23.949306234 +0200 @@ -823,6 +823,7 @@ } err = brcmf_p2p_escan(p2p, num_nodfs, chanspecs, search_state, @@ -236340,9 +236665,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/p2p.c linux return 0; default: 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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/proto.c linux-3.10.30/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-16 15:28:24.205400206 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/proto.c 2014-05-19 19:07:23.949306234 +0200 @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2013 Broadcom Corporation @@ -236406,9 +236731,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/proto.c lin + drvr->proto = NULL; + } +} -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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/proto.h linux-3.10.30/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-16 15:28:24.205400206 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/proto.h 2014-05-19 19:07:23.949306234 +0200 @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2013 Broadcom Corporation @@ -236467,9 +236792,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c linux-3.10.30/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-16 15:28:24.209400227 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c 2014-05-19 19:07:23.953306249 +0200 @@ -18,6 +18,8 @@ #include <linux/types.h> #include <linux/netdevice.h> @@ -237702,9 +238027,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c - return brcmf_sdio_chip_cr4_exitdl(sdiodev, ci, nvram_dat, nvram_sz); + return brcmf_sdio_chip_cr4_exitdl(sdiodev, ci, rstvec); } -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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h linux-3.10.30/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-16 15:28:24.209400227 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h 2014-05-19 19:07:23.953306249 +0200 @@ -54,7 +54,7 @@ #define BRCMF_MAX_CORENUM 6 @@ -237779,9 +238104,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h + struct brcmf_chip *ci, u32 rstvec); #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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h linux-3.10.30/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-16 15:28:24.209400227 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h 2014-05-19 19:07:23.953306249 +0200 @@ -164,13 +164,10 @@ struct brcmf_sdio_dev { struct sdio_func *func[SDIO_MAX_FUNCS]; @@ -237938,9 +238263,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h -extern void brcmf_sdbrcm_wd_timer(struct brcmf_sdio *bus, uint wdtick); #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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h linux-3.10.30/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-16 15:28:24.209400227 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h 2014-05-19 19:07:23.953306249 +0200 @@ -78,13 +78,64 @@ TP_ARGS(data, len), TP_STRUCT__entry( @@ -238007,9 +238332,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/usb.c linux-3.10.30/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-16 15:28:24.209400227 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2014-05-19 19:07:23.953306249 +0200 @@ -82,6 +82,7 @@ int tx_high_watermark; int tx_freecount; @@ -238128,9 +238453,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/usb.c linux return brcmf_bus_start(&usb->dev); 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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c linux-3.10.30/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-16 15:28:24.209400227 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c 2014-05-19 19:07:23.953306249 +0200 @@ -1093,9 +1093,12 @@ brcmf_dbg(INFO, "Call WLC_DISASSOC to stop excess roaming\n "); err = brcmf_fil_cmd_data_set(vif->ifp, @@ -238610,9 +238935,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h linux-3.10.30/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-16 15:28:24.209400227 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h 2014-05-19 19:07:23.953306249 +0200 @@ -412,7 +412,6 @@ struct work_struct escan_timeout_work; u8 *escan_ioctl_buf; @@ -238638,9 +238963,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211 +void brcmf_cfg80211_free_netdev(struct net_device *ndev); #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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c linux-3.10.30/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-16 15:28:24.209400227 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c 2014-05-19 19:07:23.953306249 +0200 @@ -679,27 +679,6 @@ return mode == BCMA_CLKMODE_FAST; } @@ -238669,9 +238994,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c l /* Enable BT-COEX & Ex-PA for 4313 */ void ai_epa_4313war(struct si_pub *sih) { -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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h linux-3.10.30/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-16 15:28:24.209400227 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h 2014-05-19 19:07:23.953306249 +0200 @@ -172,22 +172,19 @@ @@ -238704,9 +239029,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h l static inline u32 ai_get_cccaps(struct si_pub *sih) { -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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c linux-3.10.30/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-16 15:28:24.209400227 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c 2014-05-19 19:07:23.953306249 +0200 @@ -900,7 +900,7 @@ if (supr_status) { update_rate = false; @@ -238729,9 +239054,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/ampdu.h linux-3.10.30/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-16 15:28:24.209400227 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmsmac/ampdu.h 2014-05-19 19:07:23.953306249 +0200 @@ -37,17 +37,17 @@ u16 dma_len; }; @@ -238761,9 +239086,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/ampdu.h lin +void brcms_c_ampdu_shm_upd(struct ampdu_info *ampdu); #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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/antsel.h linux-3.10.30/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-16 15:28:24.209400227 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmsmac/antsel.h 2014-05-19 19:07:23.953306249 +0200 @@ -17,13 +17,11 @@ #ifndef _BRCM_ANTSEL_H_ #define _BRCM_ANTSEL_H_ @@ -238784,9 +239109,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/antsel.h li +u8 brcms_c_antsel_antsel2id(struct antsel_info *asi, u16 antsel); #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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/channel.c linux-3.10.30/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-16 15:28:24.209400227 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmsmac/channel.c 2014-05-19 19:07:23.953306249 +0200 @@ -684,7 +684,8 @@ continue; @@ -238797,9 +239122,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/channel.c l if (IS_ERR(rule)) continue; -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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/channel.h linux-3.10.30/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-16 15:28:24.213400249 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmsmac/channel.h 2014-05-19 19:07:23.953306249 +0200 @@ -32,20 +32,16 @@ #define BRCMS_DFS_EU (BRCMS_DFS_TPC | BRCMS_RADAR_TYPE_EU) /* Flag for DFS EU */ @@ -238829,9 +239154,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/channel.h l +void brcms_c_regd_init(struct brcms_c_info *wlc); #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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/debug.c linux-3.10.30/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-16 15:28:24.213400249 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmsmac/debug.c 2014-05-19 19:07:23.953306249 +0200 @@ -56,7 +56,7 @@ drvr->dbgfs_dir = debugfs_create_dir( @@ -238841,9 +239166,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c linux-3.10.30/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-16 15:28:24.213400249 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c 2014-05-19 19:07:23.953306249 +0200 @@ -457,6 +457,8 @@ if (err != 0) brcms_err(wl->wlc->hw->d11core, "%s: brcms_up() returned %d\n", @@ -238870,9 +239195,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_AP) | 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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h linux-3.10.30/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-16 15:28:24.213400249 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h 2014-05-19 19:07:23.957306263 +0200 @@ -88,26 +88,26 @@ }; @@ -238919,9 +239244,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if +void brcms_fatal_error(struct brcms_info *wl); #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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/main.c linux-3.10.30/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-16 15:28:24.213400249 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmsmac/main.c 2014-05-19 19:07:23.957306263 +0200 @@ -882,8 +882,8 @@ mcl = le16_to_cpu(txh->MacTxControlLow); @@ -239020,9 +239345,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/main.c linu if (is_cck_rate(rspec)) { if (rxh->PhyRxStatus_0 & PRXS0_SHORTH) 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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/main.h linux-3.10.30/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-16 15:28:24.213400249 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmsmac/main.h 2014-05-19 19:07:23.957306263 +0200 @@ -616,66 +616,54 @@ struct brcms_bss_info *current_bss; }; @@ -239138,9 +239463,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/main.h linu +void brcms_c_init_scb(struct scb *scb); #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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h linux-3.10.30/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-16 15:28:24.217400270 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h 2014-05-19 19:07:23.957306263 +0200 @@ -179,121 +179,106 @@ }; @@ -239365,9 +239690,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal + u8 mcs_offset); +s8 wlc_phy_get_tx_power_offset(struct brcms_phy_pub *ppi, u8 tbl_offset); #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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h linux-3.10.30/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-16 15:28:24.217400270 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h 2014-05-19 19:07:23.957306263 +0200 @@ -910,113 +910,103 @@ u8 do_init_g; }; @@ -239777,9 +240102,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int -extern bool wlc_phy_n_txpower_ipa_ison(struct brcms_phy *pih); +bool wlc_phy_n_txpower_ipa_ison(struct brcms_phy *pih); #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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c linux-3.10.30/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-16 15:28:24.217400270 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c 2014-05-19 19:07:23.957306263 +0200 @@ -1137,8 +1137,9 @@ gain0_15 = ((biq1 & 0xf) << 12) | ((tia & 0xf) << 8) | @@ -240393,9 +240718,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn if (pi_lcn->lcnphy_tempsense_option == 3) { pi->hwpwrctrl = true; 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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c linux-3.10.30/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-16 15:28:24.221400291 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c 2014-05-19 19:07:23.957306263 +0200 @@ -1507,117 +1507,103 @@ const struct phytbl_info dot11lcnphytbl_rx_gain_info_rev0[] = { @@ -240970,9 +241295,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h linux-3.10.30/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-16 15:28:24.221400291 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h 2014-05-19 19:07:23.957306263 +0200 @@ -20,6 +20,7 @@ extern const struct phytbl_info dot11lcnphytbl_rx_gain_info_rev0[]; extern const u32 dot11lcnphytbl_rx_gain_info_sz_rev0; @@ -240981,9 +241306,9 @@ 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_epa; extern const struct phytbl_info dot11lcn_sw_ctrl_tbl_info_4313_epa_combo; 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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h linux-3.10.30/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-16 15:28:24.225400312 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h 2014-05-19 19:07:23.961306278 +0200 @@ -124,56 +124,49 @@ struct brcms_phy; @@ -241083,9 +241408,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h +u16 wlapi_bmac_get_txant(struct phy_shim_info *physhim); #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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/pmu.h linux-3.10.30/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-16 15:28:24.225400312 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmsmac/pmu.h 2014-05-19 19:07:23.961306278 +0200 @@ -20,7 +20,7 @@ #include "types.h" @@ -241096,9 +241421,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/pmu.h linux +u32 si_pmu_measure_alpclk(struct si_pub *sih); #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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/pub.h linux-3.10.30/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-16 15:28:24.225400312 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmsmac/pub.h 2014-05-19 19:07:23.961306278 +0200 @@ -266,83 +266,76 @@ }; @@ -241250,9 +241575,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/pub.h linux +void brcms_c_set_ssid(struct brcms_c_info *wlc, u8 *ssid, size_t ssid_len); #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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/rate.h linux-3.10.30/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-16 15:28:24.225400312 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmsmac/rate.h 2014-05-19 19:07:23.961306278 +0200 @@ -216,34 +216,30 @@ /* sanitize, and sort a rateset with the basic bit(s) preserved, validate @@ -241309,9 +241634,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/rate.h linu +void brcms_c_rateset_bw_mcs_filter(struct brcms_c_rateset *rateset, u8 bw); #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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/stf.h linux-3.10.30/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-16 15:28:24.225400312 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmsmac/stf.h 2014-05-19 19:07:23.961306278 +0200 @@ -19,24 +19,19 @@ #include "types.h" @@ -241350,9 +241675,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/stf.h linux +u16 brcms_c_stf_d11hdrs_phyctl_txant(struct brcms_c_info *wlc, u32 rspec); #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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.h linux-3.10.30/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-16 15:28:24.225400312 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.h 2014-05-19 19:07:23.961306278 +0200 @@ -43,16 +43,14 @@ u32 *bcm43xx_bomminor; }; @@ -241377,9 +241702,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/brcmsmac/ucode_loade +int brcms_check_firmwares(struct brcms_info *wl); #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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h linux-3.10.30/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-16 15:28:24.225400312 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h 2014-05-19 19:07:23.961306278 +0200 @@ -41,5 +41,7 @@ #define BCM4331_CHIP_ID 0x4331 #define BCM4334_CHIP_ID 0x4334 @@ -241388,9 +241713,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/include/brcm_hw_ids. +#define BCM4339_CHIP_ID 0x4339 #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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/include/brcmu_d11.h linux-3.10.30/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-16 15:28:24.225400312 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/include/brcmu_d11.h 2014-05-19 19:07:23.961306278 +0200 @@ -140,6 +140,6 @@ void (*decchspec)(struct brcmu_chan *ch); }; @@ -241399,9 +241724,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/include/brcmu_d11.h +void brcmu_d11_attach(struct brcmu_d11inf *d11inf); #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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/include/brcmu_utils.h linux-3.10.30/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-16 15:28:24.225400312 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/include/brcmu_utils.h 2014-05-19 19:07:23.961306278 +0200 @@ -114,31 +114,29 @@ return skb_peek_tail(&pq->q[prec].skblist); } @@ -241481,9 +241806,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/include/brcmu_utils. void brcmu_dbg_hex_dump(const void *data, size_t size, const char *fmt, ...); #else __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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/include/brcmu_wifi.h linux-3.10.30/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-16 15:28:24.225400312 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/include/brcmu_wifi.h 2014-05-19 19:07:23.961306278 +0200 @@ -82,6 +82,20 @@ #define WLC_N_BW_40ALL 1 #define WLC_N_BW_20IN2G_40IN5G 2 @@ -241505,9 +241830,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/include/brcmu_wifi.h /* band types */ #define WLC_BAND_AUTO 0 /* auto-select */ #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 +diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/Kconfig linux-3.10.30/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-16 15:28:24.201400186 +0200 ++++ linux-3.10.30/drivers/net/wireless/brcm80211/Kconfig 2014-05-19 19:07:23.961306278 +0200 @@ -4,11 +4,12 @@ config BRCMSMAC tristate "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver" @@ -241542,9 +241867,9 @@ diff -Nur linux-3.10.30.orig/drivers/net/wireless/brcm80211/Kconfig linux-linaro depends on BRCMFMAC select FW_LOADER ---help--- -diff -Nur linux-3.10.30.orig/drivers/of/address.c linux-linaro-stable-mx6/drivers/of/address.c +diff -Nur linux-3.10.30.orig/drivers/of/address.c linux-3.10.30/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-16 15:28:24.357401008 +0200 ++++ linux-3.10.30/drivers/of/address.c 2014-05-19 19:07:23.961306278 +0200 @@ -223,6 +223,73 @@ return __of_address_to_resource(dev, addrp, size, flags, NULL, r); } @@ -241619,9 +241944,9 @@ diff -Nur linux-3.10.30.orig/drivers/of/address.c linux-linaro-stable-mx6/driver #endif /* CONFIG_PCI */ /* -diff -Nur linux-3.10.30.orig/drivers/of/base.c linux-linaro-stable-mx6/drivers/of/base.c +diff -Nur linux-3.10.30.orig/drivers/of/base.c linux-3.10.30/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-16 15:28:24.357401008 +0200 ++++ linux-3.10.30/drivers/of/base.c 2014-05-19 19:07:23.961306278 +0200 @@ -18,6 +18,7 @@ * 2 of the License, or (at your option) any later version. */ @@ -242016,9 +242341,9 @@ diff -Nur linux-3.10.30.orig/drivers/of/base.c linux-linaro-stable-mx6/drivers/o + return of_stdout == dn; +} +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 +diff -Nur linux-3.10.30.orig/drivers/of/fdt.c linux-3.10.30/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-16 15:28:24.357401008 +0200 ++++ linux-3.10.30/drivers/of/fdt.c 2014-05-19 19:07:23.961306278 +0200 @@ -125,13 +125,13 @@ return score; } @@ -242170,9 +242495,9 @@ diff -Nur linux-3.10.30.orig/drivers/of/fdt.c linux-linaro-stable-mx6/drivers/of *allnextp = NULL; 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 +diff -Nur linux-3.10.30.orig/drivers/of/of_pci.c linux-3.10.30/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-16 15:28:24.361401030 +0200 ++++ linux-3.10.30/drivers/of/of_pci.c 2014-05-19 19:07:23.961306278 +0200 @@ -5,14 +5,15 @@ #include <asm/prom.h> @@ -242291,9 +242616,9 @@ diff -Nur linux-3.10.30.orig/drivers/of/of_pci.c linux-linaro-stable-mx6/drivers +EXPORT_SYMBOL_GPL(of_pci_find_msi_chip_by_node); + +#endif /* CONFIG_PCI_MSI */ -diff -Nur linux-3.10.30.orig/drivers/pci/host/Kconfig linux-linaro-stable-mx6/drivers/pci/host/Kconfig +diff -Nur linux-3.10.30.orig/drivers/pci/host/Kconfig linux-3.10.30/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-16 15:28:24.369401071 +0200 ++++ linux-3.10.30/drivers/pci/host/Kconfig 2014-05-19 19:07:23.965306293 +0200 @@ -0,0 +1,39 @@ +menu "PCI host controller drivers" + depends on PCI @@ -242334,17 +242659,17 @@ diff -Nur linux-3.10.30.orig/drivers/pci/host/Kconfig linux-linaro-stable-mx6/dr + depends on ARCH_TEGRA + +endmenu -diff -Nur linux-3.10.30.orig/drivers/pci/host/Makefile linux-linaro-stable-mx6/drivers/pci/host/Makefile +diff -Nur linux-3.10.30.orig/drivers/pci/host/Makefile linux-3.10.30/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-16 15:28:24.369401071 +0200 ++++ linux-3.10.30/drivers/pci/host/Makefile 2014-05-19 19:07:23.965306293 +0200 @@ -0,0 +1,4 @@ +obj-$(CONFIG_PCIE_DW) += pcie-designware.o +obj-$(CONFIG_PCI_EXYNOS) += pci-exynos.o +obj-$(CONFIG_PCI_IMX6) += pci-imx6.o +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 +diff -Nur linux-3.10.30.orig/drivers/pci/host/pcie-designware.c linux-3.10.30/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-16 15:28:24.369401071 +0200 ++++ linux-3.10.30/drivers/pci/host/pcie-designware.c 2014-05-19 19:07:23.965306293 +0200 @@ -0,0 +1,773 @@ +/* + * Synopsys Designware PCIe host controller driver @@ -243119,9 +243444,9 @@ diff -Nur linux-3.10.30.orig/drivers/pci/host/pcie-designware.c linux-linaro-sta +MODULE_AUTHOR("Jingoo Han <jg1.han@samsung.com>"); +MODULE_DESCRIPTION("Designware PCIe host controller driver"); +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 +diff -Nur linux-3.10.30.orig/drivers/pci/host/pcie-designware.h linux-3.10.30/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-16 15:28:24.369401071 +0200 ++++ linux-3.10.30/drivers/pci/host/pcie-designware.h 2014-05-19 19:07:23.965306293 +0200 @@ -0,0 +1,124 @@ +/* + * Synopsys Designware PCIe host controller driver @@ -243247,9 +243572,9 @@ diff -Nur linux-3.10.30.orig/drivers/pci/host/pcie-designware.h linux-linaro-sta +int dw_pcie_host_init(struct pcie_port *pp); + +#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 +diff -Nur linux-3.10.30.orig/drivers/pci/host/pci-exynos.c linux-3.10.30/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-16 15:28:24.369401071 +0200 ++++ linux-3.10.30/drivers/pci/host/pci-exynos.c 2014-05-19 19:07:23.965306293 +0200 @@ -0,0 +1,648 @@ +/* + * PCIe host controller driver for Samsung EXYNOS SoCs @@ -243899,9 +244224,9 @@ diff -Nur linux-3.10.30.orig/drivers/pci/host/pci-exynos.c linux-linaro-stable-m +MODULE_AUTHOR("Jingoo Han <jg1.han@samsung.com>"); +MODULE_DESCRIPTION("Samsung PCIe host controller driver"); +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 +diff -Nur linux-3.10.30.orig/drivers/pci/host/pci-imx6.c linux-3.10.30/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-16 15:28:24.369401071 +0200 ++++ linux-3.10.30/drivers/pci/host/pci-imx6.c 2014-05-19 19:07:23.965306293 +0200 @@ -0,0 +1,857 @@ +/* + * PCIe host controller driver for Freescale i.MX6 SoCs @@ -244760,9 +245085,9 @@ diff -Nur linux-3.10.30.orig/drivers/pci/host/pci-imx6.c linux-linaro-stable-mx6 +MODULE_AUTHOR("Sean Cross <xobs@kosagi.com>"); +MODULE_DESCRIPTION("Freescale i.MX6 PCIe host controller driver"); +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 +diff -Nur linux-3.10.30.orig/drivers/pci/host/pci-mvebu.c linux-3.10.30/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-16 15:28:24.369401071 +0200 ++++ linux-3.10.30/drivers/pci/host/pci-mvebu.c 2014-05-19 19:07:23.965306293 +0200 @@ -0,0 +1,881 @@ +/* + * PCIe driver for Marvell Armada 370 and Armada XP SoCs @@ -245645,18 +245970,18 @@ diff -Nur linux-3.10.30.orig/drivers/pci/host/pci-mvebu.c linux-linaro-stable-mx +MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>"); +MODULE_DESCRIPTION("Marvell EBU PCIe driver"); +MODULE_LICENSE("GPLv2"); -diff -Nur linux-3.10.30.orig/drivers/pci/Kconfig linux-linaro-stable-mx6/drivers/pci/Kconfig +diff -Nur linux-3.10.30.orig/drivers/pci/Kconfig linux-3.10.30/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-16 15:28:24.369401071 +0200 ++++ linux-3.10.30/drivers/pci/Kconfig 2014-05-19 19:07:23.965306293 +0200 @@ -119,3 +119,5 @@ config PCI_LABEL def_bool y if (DMI || ACPI) select NLS + +source "drivers/pci/host/Kconfig" -diff -Nur linux-3.10.30.orig/drivers/pci/Makefile linux-linaro-stable-mx6/drivers/pci/Makefile +diff -Nur linux-3.10.30.orig/drivers/pci/Makefile linux-3.10.30/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-16 15:28:24.369401071 +0200 ++++ linux-3.10.30/drivers/pci/Makefile 2014-05-19 19:07:23.965306293 +0200 @@ -67,3 +67,6 @@ obj-$(CONFIG_OF) += of.o @@ -245664,9 +245989,9 @@ diff -Nur linux-3.10.30.orig/drivers/pci/Makefile linux-linaro-stable-mx6/driver + +# PCI host controller drivers +obj-y += host/ -diff -Nur linux-3.10.30.orig/drivers/pci/msi.c linux-linaro-stable-mx6/drivers/pci/msi.c +diff -Nur linux-3.10.30.orig/drivers/pci/msi.c linux-3.10.30/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-16 15:28:24.377401114 +0200 ++++ linux-3.10.30/drivers/pci/msi.c 2014-05-19 19:07:23.969306308 +0200 @@ -30,20 +30,44 @@ /* Arch hooks */ @@ -245793,9 +246118,9 @@ diff -Nur linux-3.10.30.orig/drivers/pci/msi.c linux-linaro-stable-mx6/drivers/p #ifdef CONFIG_GENERIC_HARDIRQS for (i = 0; i < nvec; i++) 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 +diff -Nur linux-3.10.30.orig/drivers/pci/probe.c linux-3.10.30/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-16 15:28:24.381401135 +0200 ++++ linux-3.10.30/drivers/pci/probe.c 2014-05-19 19:07:23.969306308 +0200 @@ -634,6 +634,7 @@ child->parent = parent; @@ -245804,9 +246129,9 @@ diff -Nur linux-3.10.30.orig/drivers/pci/probe.c linux-linaro-stable-mx6/drivers child->sysdata = parent->sysdata; child->bus_flags = parent->bus_flags; -diff -Nur linux-3.10.30.orig/drivers/pinctrl/core.c linux-linaro-stable-mx6/drivers/pinctrl/core.c +diff -Nur linux-3.10.30.orig/drivers/pinctrl/core.c linux-3.10.30/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-16 15:28:24.393401198 +0200 ++++ linux-3.10.30/drivers/pinctrl/core.c 2014-05-19 19:07:23.969306308 +0200 @@ -280,6 +280,29 @@ } @@ -245976,9 +246301,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/pinctrl/devicetree.c linux-3.10.30/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-16 15:28:24.393401198 +0200 ++++ linux-3.10.30/drivers/pinctrl/devicetree.c 2014-05-19 19:07:23.969306308 +0200 @@ -18,6 +18,7 @@ #include <linux/device.h> @@ -246044,9 +246369,9 @@ diff -Nur linux-3.10.30.orig/drivers/pinctrl/devicetree.c linux-linaro-stable-mx /* We may store pointers to property names within the node */ of_node_get(np); -diff -Nur linux-3.10.30.orig/drivers/pinctrl/Kconfig linux-linaro-stable-mx6/drivers/pinctrl/Kconfig +diff -Nur linux-3.10.30.orig/drivers/pinctrl/Kconfig linux-3.10.30/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-16 15:28:24.393401198 +0200 ++++ linux-3.10.30/drivers/pinctrl/Kconfig 2014-05-19 19:07:23.969306308 +0200 @@ -108,6 +108,14 @@ help Say Y here to enable the imx6sl pinctrl driver @@ -246062,9 +246387,9 @@ diff -Nur linux-3.10.30.orig/drivers/pinctrl/Kconfig linux-linaro-stable-mx6/dri config PINCTRL_LANTIQ bool depends on LANTIQ -diff -Nur linux-3.10.30.orig/drivers/pinctrl/Makefile linux-linaro-stable-mx6/drivers/pinctrl/Makefile +diff -Nur linux-3.10.30.orig/drivers/pinctrl/Makefile linux-3.10.30/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-16 15:28:24.393401198 +0200 ++++ linux-3.10.30/drivers/pinctrl/Makefile 2014-05-19 19:07:23.969306308 +0200 @@ -22,6 +22,7 @@ obj-$(CONFIG_PINCTRL_IMX53) += pinctrl-imx53.o obj-$(CONFIG_PINCTRL_IMX6Q) += pinctrl-imx6q.o @@ -246081,9 +246406,9 @@ diff -Nur linux-3.10.30.orig/drivers/pinctrl/Makefile linux-linaro-stable-mx6/dr obj-$(CONFIG_PLAT_ORION) += mvebu/ 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 +diff -Nur linux-3.10.30.orig/drivers/pinctrl/pinctrl-imx6sl.c linux-3.10.30/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-16 15:28:24.401401241 +0200 ++++ linux-3.10.30/drivers/pinctrl/pinctrl-imx6sl.c 2014-05-19 19:07:23.969306308 +0200 @@ -384,6 +384,10 @@ }, .probe = imx6sl_pinctrl_probe, @@ -246095,9 +246420,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/pinctrl/pinctrl-imx.c linux-3.10.30/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-16 15:28:24.397401219 +0200 ++++ linux-3.10.30/drivers/pinctrl/pinctrl-imx.c 2014-05-19 19:07:23.969306308 +0200 @@ -1,7 +1,7 @@ /* * Core driver for the imx pin controller @@ -246301,9 +246626,9 @@ diff -Nur linux-3.10.30.orig/drivers/pinctrl/pinctrl-imx.c linux-linaro-stable-m + return pinctrl_force_default(ipctl->pctl); +} +#endif -diff -Nur linux-3.10.30.orig/drivers/pinctrl/pinctrl-imx.h linux-linaro-stable-mx6/drivers/pinctrl/pinctrl-imx.h +diff -Nur linux-3.10.30.orig/drivers/pinctrl/pinctrl-imx.h linux-3.10.30/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-16 15:28:24.397401219 +0200 ++++ linux-3.10.30/drivers/pinctrl/pinctrl-imx.h 2014-05-19 19:07:23.969306308 +0200 @@ -1,7 +1,7 @@ /* * IMX pinmux core definitions @@ -246335,9 +246660,9 @@ diff -Nur linux-3.10.30.orig/drivers/pinctrl/pinctrl-imx.h linux-linaro-stable-m +int imx_pinctrl_resume(struct platform_device *pdev); +#endif #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 +diff -Nur linux-3.10.30.orig/drivers/pinctrl/pinctrl-vf610.c linux-3.10.30/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-16 15:28:24.405401261 +0200 ++++ linux-3.10.30/drivers/pinctrl/pinctrl-vf610.c 2014-05-19 19:07:23.969306308 +0200 @@ -0,0 +1,338 @@ +/* + * VF610 pinctrl driver based on imx pinmux and pinconf core @@ -246677,9 +247002,9 @@ diff -Nur linux-3.10.30.orig/drivers/pinctrl/pinctrl-vf610.c linux-linaro-stable + +MODULE_DESCRIPTION("Freescale VF610 pinctrl driver"); +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 +diff -Nur linux-3.10.30.orig/drivers/power/imx6_usb_charger.c linux-3.10.30/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-16 15:28:24.437401430 +0200 ++++ linux-3.10.30/drivers/power/imx6_usb_charger.c 2014-05-19 19:07:23.969306308 +0200 @@ -0,0 +1,294 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -246975,9 +247300,9 @@ diff -Nur linux-3.10.30.orig/drivers/power/imx6_usb_charger.c linux-linaro-stabl + power_supply_unregister(&charger->psy); +} +EXPORT_SYMBOL(imx6_usb_remove_charger); -diff -Nur linux-3.10.30.orig/drivers/power/Kconfig linux-linaro-stable-mx6/drivers/power/Kconfig +diff -Nur linux-3.10.30.orig/drivers/power/Kconfig linux-3.10.30/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-16 15:28:24.433401409 +0200 ++++ linux-3.10.30/drivers/power/Kconfig 2014-05-19 19:07:23.969306308 +0200 @@ -269,6 +269,14 @@ pins based on the status of charger connections with interrupt handlers. @@ -247006,9 +247331,9 @@ diff -Nur linux-3.10.30.orig/drivers/power/Kconfig linux-linaro-stable-mx6/drive source "drivers/power/reset/Kconfig" endif # POWER_SUPPLY -diff -Nur linux-3.10.30.orig/drivers/power/Makefile linux-linaro-stable-mx6/drivers/power/Makefile +diff -Nur linux-3.10.30.orig/drivers/power/Makefile linux-3.10.30/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-16 15:28:24.433401409 +0200 ++++ linux-3.10.30/drivers/power/Makefile 2014-05-19 19:07:23.969306308 +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 @@ -247022,9 +247347,9 @@ diff -Nur linux-3.10.30.orig/drivers/power/Makefile linux-linaro-stable-mx6/driv obj-$(CONFIG_CHARGER_TPS65090) += tps65090-charger.o obj-$(CONFIG_POWER_RESET) += reset/ +obj-$(CONFIG_IMX6_USB_CHARGER) += imx6_usb_charger.o -diff -Nur linux-3.10.30.orig/drivers/power/reset/Kconfig linux-linaro-stable-mx6/drivers/power/reset/Kconfig +diff -Nur linux-3.10.30.orig/drivers/power/reset/Kconfig linux-3.10.30/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-16 15:28:24.441401452 +0200 ++++ linux-3.10.30/drivers/power/reset/Kconfig 2014-05-19 19:07:23.969306308 +0200 @@ -32,7 +32,8 @@ user presses a key. u-boot then boots into Linux. @@ -247035,9 +247360,9 @@ diff -Nur linux-3.10.30.orig/drivers/power/reset/Kconfig linux-linaro-stable-mx6 depends on POWER_RESET help 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 +diff -Nur linux-3.10.30.orig/drivers/power/sabresd_battery.c linux-3.10.30/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-16 15:28:24.441401452 +0200 ++++ linux-3.10.30/drivers/power/sabresd_battery.c 2014-05-19 19:07:23.969306308 +0200 @@ -0,0 +1,998 @@ +/* + * sabresd_battery.c - Maxim 8903 USB/Adapter Charger Driver @@ -248037,9 +248362,9 @@ diff -Nur linux-3.10.30.orig/drivers/power/sabresd_battery.c linux-linaro-stable +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("Sabresd Battery Driver"); +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 +diff -Nur linux-3.10.30.orig/drivers/pwm/pwm-imx.c linux-3.10.30/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-16 15:28:24.449401493 +0200 ++++ linux-3.10.30/drivers/pwm/pwm-imx.c 2014-05-19 19:07:23.973306322 +0200 @@ -1,4 +1,5 @@ /* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -248081,9 +248406,9 @@ diff -Nur linux-3.10.30.orig/drivers/pwm/pwm-imx.c linux-linaro-stable-mx6/drive }, .probe = imx_pwm_probe, .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 +diff -Nur linux-3.10.30.orig/drivers/regulator/anatop-regulator.c linux-3.10.30/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-16 15:28:24.457401535 +0200 ++++ linux-3.10.30/drivers/regulator/anatop-regulator.c 2014-05-19 19:07:23.973306322 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved. @@ -248209,9 +248534,9 @@ diff -Nur linux-3.10.30.orig/drivers/regulator/anatop-regulator.c linux-linaro-s /* register regulator */ rdev = regulator_register(rdesc, &config); -diff -Nur linux-3.10.30.orig/drivers/regulator/core.c linux-linaro-stable-mx6/drivers/regulator/core.c +diff -Nur linux-3.10.30.orig/drivers/regulator/core.c linux-3.10.30/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-16 15:28:24.457401535 +0200 ++++ linux-3.10.30/drivers/regulator/core.c 2014-05-19 19:07:23.973306322 +0200 @@ -3,6 +3,7 @@ * * Copyright 2007, 2008 Wolfson Microelectronics PLC. @@ -248257,9 +248582,9 @@ diff -Nur linux-3.10.30.orig/drivers/regulator/core.c linux-linaro-stable-mx6/dr ret = regulator_ena_gpio_request(rdev, config); if (ret != 0) { rdev_err(rdev, "Failed to request enable GPIO%d: %d\n", -diff -Nur linux-3.10.30.orig/drivers/regulator/dummy.c linux-linaro-stable-mx6/drivers/regulator/dummy.c +diff -Nur linux-3.10.30.orig/drivers/regulator/dummy.c linux-3.10.30/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-16 15:28:24.457401535 +0200 ++++ linux-3.10.30/drivers/regulator/dummy.c 2014-05-19 19:07:23.973306322 +0200 @@ -44,6 +44,7 @@ config.dev = &pdev->dev; @@ -248268,9 +248593,9 @@ diff -Nur linux-3.10.30.orig/drivers/regulator/dummy.c linux-linaro-stable-mx6/d dummy_regulator_rdev = regulator_register(&dummy_desc, &config); 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 +diff -Nur linux-3.10.30.orig/drivers/regulator/fixed.c linux-3.10.30/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-16 15:28:24.457401535 +0200 ++++ linux-3.10.30/drivers/regulator/fixed.c 2014-05-19 19:07:23.973306322 +0200 @@ -188,8 +188,7 @@ drvdata->microvolts = config->microvolts; @@ -248281,9 +248606,9 @@ diff -Nur linux-3.10.30.orig/drivers/regulator/fixed.c linux-linaro-stable-mx6/d cfg.ena_gpio_invert = !config->enable_high; if (config->enabled_at_boot) { if (config->enable_high) { -diff -Nur linux-3.10.30.orig/drivers/regulator/Kconfig linux-linaro-stable-mx6/drivers/regulator/Kconfig +diff -Nur linux-3.10.30.orig/drivers/regulator/Kconfig linux-3.10.30/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-16 15:28:24.453401514 +0200 ++++ linux-3.10.30/drivers/regulator/Kconfig 2014-05-19 19:07:23.973306322 +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. @@ -248310,9 +248635,9 @@ diff -Nur linux-3.10.30.orig/drivers/regulator/Kconfig linux-linaro-stable-mx6/d config REGULATOR_RC5T583 tristate "RICOH RC5T583 Power regulators" depends on MFD_RC5T583 -diff -Nur linux-3.10.30.orig/drivers/regulator/Makefile linux-linaro-stable-mx6/drivers/regulator/Makefile +diff -Nur linux-3.10.30.orig/drivers/regulator/Makefile linux-3.10.30/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-16 15:28:24.453401514 +0200 ++++ linux-3.10.30/drivers/regulator/Makefile 2014-05-19 19:07:23.973306322 +0200 @@ -32,6 +32,7 @@ obj-$(CONFIG_REGULATOR_LP8788) += lp8788-ldo.o obj-$(CONFIG_REGULATOR_LP8755) += lp8755.o @@ -248329,9 +248654,9 @@ diff -Nur linux-3.10.30.orig/drivers/regulator/Makefile linux-linaro-stable-mx6/ obj-$(CONFIG_REGULATOR_TPS51632) += tps51632-regulator.o obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o 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 +diff -Nur linux-3.10.30.orig/drivers/regulator/max17135-regulator.c linux-3.10.30/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-16 15:28:24.461401557 +0200 ++++ linux-3.10.30/drivers/regulator/max17135-regulator.c 2014-05-19 19:07:23.973306322 +0200 @@ -0,0 +1,838 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -249171,9 +249496,9 @@ diff -Nur linux-3.10.30.orig/drivers/regulator/max17135-regulator.c linux-linaro +/* Module information */ +MODULE_DESCRIPTION("MAX17135 regulator driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/regulator/pfuze100-regulator.c linux-linaro-stable-mx6/drivers/regulator/pfuze100-regulator.c +diff -Nur linux-3.10.30.orig/drivers/regulator/pfuze100-regulator.c linux-3.10.30/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-16 15:28:24.461401557 +0200 ++++ linux-3.10.30/drivers/regulator/pfuze100-regulator.c 2014-05-19 19:07:23.973306322 +0200 @@ -0,0 +1,445 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -249620,9 +249945,9 @@ diff -Nur linux-3.10.30.orig/drivers/regulator/pfuze100-regulator.c linux-linaro +MODULE_DESCRIPTION("Regulator Driver for Freescale PFUZE100 PMIC"); +MODULE_LICENSE("GPL v2"); +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 +diff -Nur linux-3.10.30.orig/drivers/reset/gpio-reset.c linux-3.10.30/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-16 15:28:24.469401599 +0200 ++++ linux-3.10.30/drivers/reset/gpio-reset.c 2014-05-19 19:07:23.973306322 +0200 @@ -0,0 +1,187 @@ +/* + * GPIO Reset Controller driver @@ -249811,9 +250136,9 @@ diff -Nur linux-3.10.30.orig/drivers/reset/gpio-reset.c linux-linaro-stable-mx6/ +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:gpio-reset"); +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 +diff -Nur linux-3.10.30.orig/drivers/reset/Kconfig linux-3.10.30/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-16 15:28:24.469401599 +0200 ++++ linux-3.10.30/drivers/reset/Kconfig 2014-05-19 19:07:23.973306322 +0200 @@ -11,3 +11,15 @@ via GPIOs or SoC-internal reset controller modules. @@ -249830,15 +250155,15 @@ diff -Nur linux-3.10.30.orig/drivers/reset/Kconfig linux-linaro-stable-mx6/drive + directly by GPIOs. + +endif -diff -Nur linux-3.10.30.orig/drivers/reset/Makefile linux-linaro-stable-mx6/drivers/reset/Makefile +diff -Nur linux-3.10.30.orig/drivers/reset/Makefile linux-3.10.30/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-16 15:28:24.469401599 +0200 ++++ linux-3.10.30/drivers/reset/Makefile 2014-05-19 19:07:23.977306338 +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 +diff -Nur linux-3.10.30.orig/drivers/rtc/class.c linux-3.10.30/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-16 15:28:24.469401599 +0200 ++++ linux-3.10.30/drivers/rtc/class.c 2014-05-19 19:07:23.977306338 +0200 @@ -14,6 +14,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt @@ -249920,9 +250245,9 @@ diff -Nur linux-3.10.30.orig/drivers/rtc/class.c linux-linaro-stable-mx6/drivers rtc_dev_init(); rtc_sysfs_init(rtc_class); return 0; -diff -Nur linux-3.10.30.orig/drivers/rtc/interface.c linux-linaro-stable-mx6/drivers/rtc/interface.c +diff -Nur linux-3.10.30.orig/drivers/rtc/interface.c linux-3.10.30/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-16 15:28:24.469401599 +0200 ++++ linux-3.10.30/drivers/rtc/interface.c 2014-05-19 19:07:23.977306338 +0200 @@ -109,9 +109,9 @@ err = rtc->ops->set_time(rtc->dev.parent, &new); @@ -250005,9 +250330,9 @@ diff -Nur linux-3.10.30.orig/drivers/rtc/interface.c linux-linaro-stable-mx6/dri { int ret = 0; 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 +diff -Nur linux-3.10.30.orig/drivers/rtc/rtc-pcf8523.c linux-3.10.30/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-16 15:28:24.481401663 +0200 ++++ linux-3.10.30/drivers/rtc/rtc-pcf8523.c 2014-05-19 19:07:23.977306338 +0200 @@ -7,6 +7,7 @@ */ @@ -250159,9 +250484,9 @@ diff -Nur linux-3.10.30.orig/drivers/rtc/rtc-pcf8523.c linux-linaro-stable-mx6/d .id_table = pcf8523_id, }; 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 +diff -Nur linux-3.10.30.orig/drivers/rtc/rtc-snvs.c linux-3.10.30/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-16 15:28:24.485401683 +0200 ++++ linux-3.10.30/drivers/rtc/rtc-snvs.c 2014-05-19 19:07:23.977306338 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2012 Freescale Semiconductor, Inc. @@ -250224,9 +250549,9 @@ diff -Nur linux-3.10.30.orig/drivers/rtc/rtc-snvs.c linux-linaro-stable-mx6/driv return 0; } -diff -Nur linux-3.10.30.orig/drivers/spi/spi-altera.c linux-linaro-stable-mx6/drivers/spi/spi-altera.c +diff -Nur linux-3.10.30.orig/drivers/spi/spi-altera.c linux-3.10.30/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-16 15:28:24.713402886 +0200 ++++ linux-3.10.30/drivers/spi/spi-altera.c 2014-05-19 19:07:23.977306338 +0200 @@ -103,16 +103,6 @@ } } @@ -250278,9 +250603,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-altera.c linux-linaro-stable-mx6/dr spi_master_put(master); return 0; } -diff -Nur linux-3.10.30.orig/drivers/spi/spi-ath79.c linux-linaro-stable-mx6/drivers/spi/spi-ath79.c +diff -Nur linux-3.10.30.orig/drivers/spi/spi-ath79.c linux-3.10.30/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-16 15:28:24.713402886 +0200 ++++ linux-3.10.30/drivers/spi/spi-ath79.c 2014-05-19 19:07:23.977306338 +0200 @@ -155,9 +155,6 @@ { int status = 0; @@ -250324,9 +250649,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-ath79.c linux-linaro-stable-mx6/dri spi_master_put(sp->bitbang.master); return 0; -diff -Nur linux-3.10.30.orig/drivers/spi/spi-atmel.c linux-linaro-stable-mx6/drivers/spi/spi-atmel.c +diff -Nur linux-3.10.30.orig/drivers/spi/spi-atmel.c linux-3.10.30/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-16 15:28:24.713402886 +0200 ++++ linux-3.10.30/drivers/spi/spi-atmel.c 2014-05-19 19:07:23.977306338 +0200 @@ -1268,13 +1268,6 @@ return -EINVAL; } @@ -250350,9 +250675,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-atmel.c linux-linaro-stable-mx6/dri master->dev.of_node = pdev->dev.of_node; master->bus_num = pdev->id; 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 +diff -Nur linux-3.10.30.orig/drivers/spi/spi-au1550.c linux-3.10.30/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-16 15:28:24.713402886 +0200 ++++ linux-3.10.30/drivers/spi/spi-au1550.c 2014-05-19 19:07:23.977306338 +0200 @@ -248,11 +248,6 @@ hz = t->speed_hz; } @@ -250395,9 +250720,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-au1550.c linux-linaro-stable-mx6/dr spi_master_put(hw->master); return 0; } -diff -Nur linux-3.10.30.orig/drivers/spi/spi-bcm63xx.c linux-linaro-stable-mx6/drivers/spi/spi-bcm63xx.c +diff -Nur linux-3.10.30.orig/drivers/spi/spi-bcm63xx.c linux-3.10.30/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-16 15:28:24.713402886 +0200 ++++ linux-3.10.30/drivers/spi/spi-bcm63xx.c 2014-05-19 19:07:23.977306338 +0200 @@ -124,17 +124,6 @@ /* the spi->mode bits understood by this driver: */ #define MODEBITS (SPI_CPOL | SPI_CPHA) @@ -250460,9 +250785,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-bcm63xx.c linux-linaro-stable-mx6/d spi_master_put(master); return 0; -diff -Nur linux-3.10.30.orig/drivers/spi/spi-bfin5xx.c linux-linaro-stable-mx6/drivers/spi/spi-bfin5xx.c +diff -Nur linux-3.10.30.orig/drivers/spi/spi-bfin5xx.c linux-3.10.30/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-16 15:28:24.713402886 +0200 ++++ linux-3.10.30/drivers/spi/spi-bfin5xx.c 2014-05-19 19:07:23.977306338 +0200 @@ -643,21 +643,16 @@ /* Bits per word setup */ @@ -250535,9 +250860,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-bfin5xx.c linux-linaro-stable-mx6/d return 0; } -diff -Nur linux-3.10.30.orig/drivers/spi/spi-bfin-sport.c linux-linaro-stable-mx6/drivers/spi/spi-bfin-sport.c +diff -Nur linux-3.10.30.orig/drivers/spi/spi-bfin-sport.c linux-3.10.30/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-16 15:28:24.713402886 +0200 ++++ linux-3.10.30/drivers/spi/spi-bfin-sport.c 2014-05-19 19:07:23.977306338 +0200 @@ -417,7 +417,7 @@ /* Bits per word setup */ @@ -250579,9 +250904,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-bfin-sport.c linux-linaro-stable-mx return 0; } -diff -Nur linux-3.10.30.orig/drivers/spi/spi-bitbang.c linux-linaro-stable-mx6/drivers/spi/spi-bitbang.c +diff -Nur linux-3.10.30.orig/drivers/spi/spi-bitbang.c linux-3.10.30/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-16 15:28:24.713402886 +0200 ++++ linux-3.10.30/drivers/spi/spi-bitbang.c 2014-05-19 19:07:23.981306352 +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. @@ -250943,9 +251268,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-bitbang.c linux-linaro-stable-mx6/d return 0; } 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 +diff -Nur linux-3.10.30.orig/drivers/spi/spi-butterfly.c linux-3.10.30/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-16 15:28:24.713402886 +0200 ++++ linux-3.10.30/drivers/spi/spi-butterfly.c 2014-05-19 19:07:23.981306352 +0200 @@ -225,7 +225,7 @@ master->bus_num = 42; master->num_chipselect = 2; @@ -250955,9 +251280,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-butterfly.c linux-linaro-stable-mx6 pp->bitbang.chipselect = butterfly_chipselect; pp->bitbang.txrx_word[SPI_MODE_0] = butterfly_txrx_word_mode0; -diff -Nur linux-3.10.30.orig/drivers/spi/spi.c linux-linaro-stable-mx6/drivers/spi/spi.c +diff -Nur linux-3.10.30.orig/drivers/spi/spi.c linux-3.10.30/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-16 15:28:24.721402927 +0200 ++++ linux-3.10.30/drivers/spi/spi.c 2014-05-19 19:07:23.981306352 +0200 @@ -39,6 +39,9 @@ #include <linux/ioport.h> #include <linux/acpi.h> @@ -251567,9 +251892,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi.c linux-linaro-stable-mx6/drivers/s if (n_tx) { x[0].len = n_tx; 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 +diff -Nur linux-3.10.30.orig/drivers/spi/spi-clps711x.c linux-3.10.30/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-16 15:28:24.713402886 +0200 ++++ linux-3.10.30/drivers/spi/spi-clps711x.c 2014-05-19 19:07:23.981306352 +0200 @@ -42,12 +42,6 @@ { struct spi_clps711x_data *hw = spi_master_get_devdata(spi->master); @@ -251607,9 +251932,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-clps711x.c linux-linaro-stable-mx6/ spi_unregister_master(master); kfree(master); -diff -Nur linux-3.10.30.orig/drivers/spi/spi-coldfire-qspi.c linux-linaro-stable-mx6/drivers/spi/spi-coldfire-qspi.c +diff -Nur linux-3.10.30.orig/drivers/spi/spi-coldfire-qspi.c linux-3.10.30/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-16 15:28:24.713402886 +0200 ++++ linux-3.10.30/drivers/spi/spi-coldfire-qspi.c 2014-05-19 19:07:23.981306352 +0200 @@ -312,10 +312,7 @@ bool cs_high = spi->mode & SPI_CS_HIGH; u16 qmr = MCFQSPI_QMR_MSTR; @@ -251650,9 +251975,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-coldfire-qspi.c linux-linaro-stable mcfqspi_cs_teardown(mcfqspi); clk_disable(mcfqspi->clk); 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 +diff -Nur linux-3.10.30.orig/drivers/spi/spi-davinci.c linux-3.10.30/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-16 15:28:24.713402886 +0200 ++++ linux-3.10.30/drivers/spi/spi-davinci.c 2014-05-19 19:07:23.981306352 +0200 @@ -299,16 +299,15 @@ * Assign function pointer to appropriate transfer method * 8bit, 16bit or 32bit transfer @@ -251729,9 +252054,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-davinci.c linux-linaro-stable-mx6/d return 0; } -diff -Nur linux-3.10.30.orig/drivers/spi/spi-dw.c linux-linaro-stable-mx6/drivers/spi/spi-dw.c +diff -Nur linux-3.10.30.orig/drivers/spi/spi-dw.c linux-3.10.30/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-16 15:28:24.713402886 +0200 ++++ linux-3.10.30/drivers/spi/spi-dw.c 2014-05-19 19:07:23.981306352 +0200 @@ -457,19 +457,7 @@ } if (transfer->bits_per_word) { @@ -251790,9 +252115,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-dw.c linux-linaro-stable-mx6/driver master->bus_num = dws->bus_num; master->num_chipselect = dws->num_cs; 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 +diff -Nur linux-3.10.30.orig/drivers/spi/spi-dw-mmio.c linux-3.10.30/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-16 15:28:24.713402886 +0200 ++++ linux-3.10.30/drivers/spi/spi-dw-mmio.c 2014-05-19 19:07:23.981306352 +0200 @@ -111,8 +111,6 @@ struct dw_spi_mmio *dwsmmio = platform_get_drvdata(pdev); struct resource *mem; @@ -251802,9 +252127,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-dw-mmio.c linux-linaro-stable-mx6/d clk_disable(dwsmmio->clk); clk_put(dwsmmio->clk); dwsmmio->clk = NULL; -diff -Nur linux-3.10.30.orig/drivers/spi/spi-ep93xx.c linux-linaro-stable-mx6/drivers/spi/spi-ep93xx.c +diff -Nur linux-3.10.30.orig/drivers/spi/spi-ep93xx.c linux-3.10.30/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-16 15:28:24.713402886 +0200 ++++ linux-3.10.30/drivers/spi/spi-ep93xx.c 2014-05-19 19:07:23.981306352 +0200 @@ -296,12 +296,6 @@ struct ep93xx_spi *espi = spi_master_get_devdata(spi->master); struct ep93xx_spi_chip *chip; @@ -251853,9 +252178,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-ep93xx.c linux-linaro-stable-mx6/dr spi_unregister_master(master); 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 +diff -Nur linux-3.10.30.orig/drivers/spi/spi-fsl-espi.c linux-3.10.30/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-16 15:28:24.713402886 +0200 ++++ linux-3.10.30/drivers/spi/spi-fsl-espi.c 2014-05-19 19:07:23.981306352 +0200 @@ -144,10 +144,6 @@ if (!bits_per_word) bits_per_word = spi->bits_per_word; @@ -251889,9 +252214,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-fsl-espi.c linux-linaro-stable-mx6/ master->setup = fsl_espi_setup; 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 +diff -Nur linux-3.10.30.orig/drivers/spi/spi-gpio.c linux-3.10.30/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-16 15:28:24.713402886 +0200 ++++ linux-3.10.30/drivers/spi/spi-gpio.c 2014-05-19 19:07:23.981306352 +0200 @@ -239,9 +239,6 @@ struct spi_gpio *spi_gpio = spi_to_spi_gpio(spi); struct device_node *np = spi->master->dev.of_node; @@ -251944,9 +252269,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-gpio.c linux-linaro-stable-mx6/driv return status; } -diff -Nur linux-3.10.30.orig/drivers/spi/spi-imx.c linux-linaro-stable-mx6/drivers/spi/spi-imx.c +diff -Nur linux-3.10.30.orig/drivers/spi/spi-imx.c linux-3.10.30/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-16 15:28:24.717402907 +0200 ++++ linux-3.10.30/drivers/spi/spi-imx.c 2014-05-19 19:07:23.981306352 +0200 @@ -37,7 +37,6 @@ #include <linux/of.h> #include <linux/of_device.h> @@ -252193,9 +252518,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-imx.c linux-linaro-stable-mx6/drive return 0; } -diff -Nur linux-3.10.30.orig/drivers/spi/spi-lm70llp.c linux-linaro-stable-mx6/drivers/spi/spi-lm70llp.c +diff -Nur linux-3.10.30.orig/drivers/spi/spi-lm70llp.c linux-3.10.30/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-16 15:28:24.717402907 +0200 ++++ linux-3.10.30/drivers/spi/spi-lm70llp.c 2014-05-19 19:07:23.981306352 +0200 @@ -222,7 +222,7 @@ /* * SPI and bitbang hookup. @@ -252205,9 +252530,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-lm70llp.c linux-linaro-stable-mx6/d pp->bitbang.chipselect = lm70_chipselect; pp->bitbang.txrx_word[SPI_MODE_0] = lm70_txrx; 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 +diff -Nur linux-3.10.30.orig/drivers/spi/spi-mxs.c linux-3.10.30/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-16 15:28:24.717402907 +0200 ++++ linux-3.10.30/drivers/spi/spi-mxs.c 2014-05-19 19:07:23.981306352 +0200 @@ -75,12 +75,6 @@ if (t && t->bits_per_word) bits_per_word = t->bits_per_word; @@ -252229,9 +252554,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-mxs.c linux-linaro-stable-mx6/drive master->mode_bits = SPI_CPOL | SPI_CPHA; master->num_chipselect = 3; 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 +diff -Nur linux-3.10.30.orig/drivers/spi/spi-nuc900.c linux-3.10.30/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-16 15:28:24.717402907 +0200 ++++ linux-3.10.30/drivers/spi/spi-nuc900.c 2014-05-19 19:07:23.985306367 +0200 @@ -174,17 +174,6 @@ spin_unlock_irqrestore(&hw->lock, flags); } @@ -252261,9 +252586,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-nuc900.c linux-linaro-stable-mx6/dr hw->res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 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 +diff -Nur linux-3.10.30.orig/drivers/spi/spi-oc-tiny.c linux-3.10.30/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-16 15:28:24.717402907 +0200 ++++ linux-3.10.30/drivers/spi/spi-oc-tiny.c 2014-05-19 19:07:23.985306367 +0200 @@ -306,7 +306,7 @@ platform_set_drvdata(pdev, hw); @@ -252289,9 +252614,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-oc-tiny.c linux-linaro-stable-mx6/d spi_master_put(master); return 0; } -diff -Nur linux-3.10.30.orig/drivers/spi/spi-omap-100k.c linux-linaro-stable-mx6/drivers/spi/spi-omap-100k.c +diff -Nur linux-3.10.30.orig/drivers/spi/spi-omap-100k.c linux-3.10.30/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-16 15:28:24.717402907 +0200 ++++ linux-3.10.30/drivers/spi/spi-omap-100k.c 2014-05-19 19:07:23.985306367 +0200 @@ -298,12 +298,6 @@ struct omap1_spi100k *spi100k; struct omap1_spi100k_cs *cs = spi->controller_state; @@ -252325,9 +252650,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-omap-100k.c linux-linaro-stable-mx6 dev_set_drvdata(&pdev->dev, master); -diff -Nur linux-3.10.30.orig/drivers/spi/spi-omap2-mcspi.c linux-linaro-stable-mx6/drivers/spi/spi-omap2-mcspi.c +diff -Nur linux-3.10.30.orig/drivers/spi/spi-omap2-mcspi.c linux-3.10.30/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-16 15:28:24.717402907 +0200 ++++ linux-3.10.30/drivers/spi/spi-omap2-mcspi.c 2014-05-19 19:07:23.985306367 +0200 @@ -857,12 +857,6 @@ struct omap2_mcspi_dma *mcspi_dma; struct omap2_mcspi_cs *cs = spi->controller_state; @@ -252362,9 +252687,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-omap2-mcspi.c linux-linaro-stable-m master->setup = omap2_mcspi_setup; master->prepare_transfer_hardware = omap2_prepare_transfer; 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 +diff -Nur linux-3.10.30.orig/drivers/spi/spi-ppc4xx.c linux-3.10.30/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-16 15:28:24.717402907 +0200 ++++ linux-3.10.30/drivers/spi/spi-ppc4xx.c 2014-05-19 19:07:23.985306367 +0200 @@ -190,12 +190,6 @@ speed = min(t->speed_hz, spi->max_speed_hz); } @@ -252399,9 +252724,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-ppc4xx.c linux-linaro-stable-mx6/dr /* the spi->mode bits understood by this driver: */ 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 +diff -Nur linux-3.10.30.orig/drivers/spi/spi-pxa2xx.c linux-3.10.30/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-16 15:28:24.717402907 +0200 ++++ linux-3.10.30/drivers/spi/spi-pxa2xx.c 2014-05-19 19:07:23.985306367 +0200 @@ -881,21 +881,6 @@ rx_thres = RX_THRESH_DFLT; } @@ -252458,9 +252783,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-pxa2xx.c linux-linaro-stable-mx6/dr return 0; } -diff -Nur linux-3.10.30.orig/drivers/spi/spi-s3c64xx.c linux-linaro-stable-mx6/drivers/spi/spi-s3c64xx.c +diff -Nur linux-3.10.30.orig/drivers/spi/spi-s3c64xx.c linux-3.10.30/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-16 15:28:24.717402907 +0200 ++++ linux-3.10.30/drivers/spi/spi-s3c64xx.c 2014-05-19 19:07:23.985306367 +0200 @@ -1314,7 +1314,8 @@ master->unprepare_transfer_hardware = s3c64xx_spi_unprepare_transfer; master->num_chipselect = sci->num_cs; @@ -252487,9 +252812,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-s3c64xx.c linux-linaro-stable-mx6/d spi_master_put(master); return 0; -diff -Nur linux-3.10.30.orig/drivers/spi/spi-sirf.c linux-linaro-stable-mx6/drivers/spi/spi-sirf.c +diff -Nur linux-3.10.30.orig/drivers/spi/spi-sirf.c linux-3.10.30/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-16 15:28:24.721402927 +0200 ++++ linux-3.10.30/drivers/spi/spi-sirf.c 2014-05-19 19:07:23.985306367 +0200 @@ -425,10 +425,6 @@ rxfifo_ctrl = SIRFSOC_SPI_FIFO_THD(SIRFSOC_SPI_FIFO_SIZE / 2) | SIRFSOC_SPI_FIFO_WIDTH_DWORD; @@ -252517,9 +252842,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-sirf.c linux-linaro-stable-mx6/driv sspi->bitbang.master->dev.of_node = pdev->dev.of_node; 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 +diff -Nur linux-3.10.30.orig/drivers/spi/spi-ti-ssp.c linux-3.10.30/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-16 15:28:24.721402927 +0200 ++++ linux-3.10.30/drivers/spi/spi-ti-ssp.c 2014-05-19 19:07:23.985306367 +0200 @@ -237,14 +237,6 @@ spin_unlock(&hw->lock); } @@ -252558,9 +252883,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-ti-ssp.c linux-linaro-stable-mx6/dr master->transfer = ti_ssp_spi_transfer; 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 +diff -Nur linux-3.10.30.orig/drivers/spi/spi-topcliff-pch.c linux-3.10.30/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-16 15:28:24.721402927 +0200 ++++ linux-3.10.30/drivers/spi/spi-topcliff-pch.c 2014-05-19 19:07:23.989306381 +0200 @@ -472,11 +472,6 @@ dev_dbg(&pspi->dev, "%s 8 bits per word\n", __func__); } @@ -252599,9 +252924,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-topcliff-pch.c linux-linaro-stable- data->board_dat = board_dat; 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 +diff -Nur linux-3.10.30.orig/drivers/spi/spi-txx9.c linux-3.10.30/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-16 15:28:24.721402927 +0200 ++++ linux-3.10.30/drivers/spi/spi-txx9.c 2014-05-19 19:07:23.989306381 +0200 @@ -116,17 +116,12 @@ static int txx9spi_setup(struct spi_device *spi) { @@ -252637,9 +252962,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-txx9.c linux-linaro-stable-mx6/driv ret = spi_register_master(master); if (ret) -diff -Nur linux-3.10.30.orig/drivers/spi/spi-xcomm.c linux-linaro-stable-mx6/drivers/spi/spi-xcomm.c +diff -Nur linux-3.10.30.orig/drivers/spi/spi-xcomm.c linux-3.10.30/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-16 15:28:24.721402927 +0200 ++++ linux-3.10.30/drivers/spi/spi-xcomm.c 2014-05-19 19:07:23.989306381 +0200 @@ -76,7 +76,7 @@ { unsigned int speed; @@ -252674,9 +252999,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-xcomm.c linux-linaro-stable-mx6/dri master->transfer_one_message = spi_xcomm_transfer_one; master->dev.of_node = i2c->dev.of_node; 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 +diff -Nur linux-3.10.30.orig/drivers/spi/spi-xilinx.c linux-3.10.30/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-16 15:28:24.721402927 +0200 ++++ linux-3.10.30/drivers/spi/spi-xilinx.c 2014-05-19 19:07:23.989306381 +0200 @@ -232,21 +232,6 @@ return 0; } @@ -252712,9 +253037,9 @@ diff -Nur linux-3.10.30.orig/drivers/spi/spi-xilinx.c linux-linaro-stable-mx6/dr init_completion(&xspi->done); 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 +diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/dw-hdmi-audio.c linux-3.10.30/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-16 15:28:24.869403709 +0200 ++++ linux-3.10.30/drivers/staging/imx-drm/dw-hdmi-audio.c 2014-05-19 19:07:23.989306381 +0200 @@ -0,0 +1,550 @@ +/* + * DesignWare HDMI audio driver @@ -253266,9 +253591,9 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/dw-hdmi-audio.c linux-linar +{ + snd_card_free(dw->card); +} -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 +diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/dw-hdmi-audio.h linux-3.10.30/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-16 15:28:24.869403709 +0200 ++++ linux-3.10.30/drivers/staging/imx-drm/dw-hdmi-audio.h 2014-05-19 19:07:23.989306381 +0200 @@ -0,0 +1,13 @@ +#ifndef DW_HDMI_AUDIO_H +#define DW_HDMI_AUDIO_H @@ -253283,9 +253608,9 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/dw-hdmi-audio.h linux-linar +void snd_dw_hdmi_remove(struct snd_dw_hdmi *dw); + +#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 +diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/dw-hdmi-cec.c linux-3.10.30/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-16 15:28:24.869403709 +0200 ++++ linux-3.10.30/drivers/staging/imx-drm/dw-hdmi-cec.c 2014-05-19 19:07:23.989306381 +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> @@ -253848,9 +254173,9 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/dw-hdmi-cec.c linux-linaro- +MODULE_DESCRIPTION("Synopsis Designware HDMI CEC driver for i.MX"); +MODULE_LICENSE("GPL"); +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 +diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/dw-hdmi-cec.h linux-3.10.30/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-16 15:28:24.869403709 +0200 ++++ linux-3.10.30/drivers/staging/imx-drm/dw-hdmi-cec.h 2014-05-19 19:07:23.989306381 +0200 @@ -0,0 +1,16 @@ +#ifndef DW_HDMI_CEC_H +#define DW_HDMI_CEC_H @@ -253868,9 +254193,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-drm-core.c linux-3.10.30/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-16 15:28:24.869403709 +0200 ++++ linux-3.10.30/drivers/staging/imx-drm/imx-drm-core.c 2014-05-19 19:07:23.993306397 +0200 @@ -13,14 +13,14 @@ * GNU General Public License for more details. * @@ -255048,9 +255373,9 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-drm-core.c linux-linaro MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>"); 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 +diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-drm.h linux-3.10.30/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-16 15:28:24.869403709 +0200 ++++ linux-3.10.30/drivers/staging/imx-drm/imx-drm.h 2014-05-19 19:07:23.993306397 +0200 @@ -5,15 +5,19 @@ #define IPU_PIX_FMT_GBR24 v4l2_fourcc('G', 'B', 'R', '3') @@ -255131,9 +255456,9 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-drm.h linux-linaro-stab +void imx_drm_encoder_destroy(struct drm_encoder *encoder); #endif /* _IMX_DRM_H_ */ -diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-fb.c linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-fb.c +diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-fb.c linux-3.10.30/drivers/staging/imx-drm/imx-fb.c --- linux-3.10.30.orig/drivers/staging/imx-drm/imx-fb.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-fb.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.30/drivers/staging/imx-drm/imx-fb.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,47 +0,0 @@ -/* - * i.MX drm driver @@ -255182,9 +255507,9 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-fb.c linux-linaro-stabl - - dev->mode_config.funcs = &imx_drm_mode_config_funcs; -} -diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-fbdev.c linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-fbdev.c +diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-fbdev.c linux-3.10.30/drivers/staging/imx-drm/imx-fbdev.c --- linux-3.10.30.orig/drivers/staging/imx-drm/imx-fbdev.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/staging/imx-drm/imx-fbdev.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.30/drivers/staging/imx-drm/imx-fbdev.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,74 +0,0 @@ -/* - * i.MX drm driver @@ -255260,9 +255585,9 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-fbdev.c linux-linaro-st -MODULE_DESCRIPTION("Freescale i.MX legacy fb driver"); -MODULE_AUTHOR("Sascha Hauer, Pengutronix"); -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 +diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-hdmi.c linux-3.10.30/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-16 15:28:24.869403709 +0200 ++++ linux-3.10.30/drivers/staging/imx-drm/imx-hdmi.c 2014-05-19 19:07:23.993306397 +0200 @@ -0,0 +1,1842 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. @@ -257106,9 +257431,9 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-hdmi.c linux-linaro-sta +MODULE_DESCRIPTION("i.MX6 HDMI transmitter driver"); +MODULE_LICENSE("GPL"); +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 +diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-hdmi.h linux-3.10.30/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-16 15:28:24.869403709 +0200 ++++ linux-3.10.30/drivers/staging/imx-drm/imx-hdmi.h 2014-05-19 19:07:23.993306397 +0200 @@ -0,0 +1,1040 @@ +/* + * Copyright (C) 2011 Freescale Semiconductor, Inc. @@ -258150,9 +258475,9 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-hdmi.h linux-linaro-sta +void hdmi_disable_cec(struct imx_hdmi *hdmi); + +#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 +diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-ldb.c linux-3.10.30/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-16 15:28:24.869403709 +0200 ++++ linux-3.10.30/drivers/staging/imx-drm/imx-ldb.c 2014-05-19 19:07:23.993306397 +0200 @@ -0,0 +1,606 @@ +/* + * i.MX drm driver - LVDS display bridge @@ -258760,9 +259085,9 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-ldb.c linux-linaro-stab +MODULE_AUTHOR("Sascha Hauer, Pengutronix"); +MODULE_LICENSE("GPL"); +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 +diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-tve.c linux-3.10.30/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-16 15:28:24.873403730 +0200 ++++ linux-3.10.30/drivers/staging/imx-drm/imx-tve.c 2014-05-19 19:07:23.997306411 +0200 @@ -20,9 +20,9 @@ #include <linux/clk.h> @@ -259180,9 +259505,9 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/imx-tve.c linux-linaro-stab MODULE_AUTHOR("Philipp Zabel, Pengutronix"); MODULE_LICENSE("GPL"); +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 +diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h linux-3.10.30/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-16 15:28:24.873403730 +0200 ++++ linux-3.10.30/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h 2014-05-19 19:07:23.997306411 +0200 @@ -97,6 +97,7 @@ int ipu_idmac_enable_channel(struct ipuv3_channel *channel); @@ -259216,9 +259541,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-common.c linux-3.10.30/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-16 15:28:24.873403730 +0200 ++++ linux-3.10.30/drivers/staging/imx-drm/ipu-v3/ipu-common.c 2014-05-19 19:07:24.029306530 +0200 @@ -27,8 +27,11 @@ #include <linux/list.h> #include <linux/irq.h> @@ -259804,9 +260129,9 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-common.c linux-l MODULE_DESCRIPTION("i.MX IPU v3 driver"); MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>"); 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 +diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-dc.c linux-3.10.30/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-16 15:28:24.873403730 +0200 ++++ linux-3.10.30/drivers/staging/imx-drm/ipu-v3/ipu-dc.c 2014-05-19 19:07:24.037306559 +0200 @@ -91,6 +91,7 @@ IPU_DC_MAP_RGB565, IPU_DC_MAP_GBR24, /* TVEv2 */ @@ -259873,9 +260198,9 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-dc.c linux-linar return 0; } -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 +diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-di.c linux-3.10.30/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-16 15:28:24.873403730 +0200 ++++ linux-3.10.30/drivers/staging/imx-drm/ipu-v3/ipu-di.c 2014-05-19 19:07:24.049306603 +0200 @@ -19,9 +19,6 @@ #include <linux/io.h> #include <linux/err.h> @@ -260311,9 +260636,9 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-di.c linux-linar - clk_unregister(di->clk_di_pixel); - kfree(di->clk_name); } -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 +diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c linux-3.10.30/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-16 15:28:24.873403730 +0200 ++++ linux-3.10.30/drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c 2014-05-19 19:07:24.057306633 +0200 @@ -61,7 +61,7 @@ static const struct dmfc_channel_data dmfcdata[] = { @@ -260376,9 +260701,9 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c linux-lin dev_dbg(dev, "dmfc: 8 slots with %ldMpixel/s bandwidth each\n", 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 +diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-dp.c linux-3.10.30/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-16 15:28:24.873403730 +0200 ++++ linux-3.10.30/drivers/staging/imx-drm/ipu-v3/ipu-dp.c 2014-05-19 19:07:24.065306663 +0200 @@ -46,6 +46,8 @@ #define DP_COM_CONF_CSC_DEF_BG (2 << 8) #define DP_COM_CONF_CSC_DEF_BOTH (1 << 8) @@ -260432,9 +260757,9 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-dp.c linux-linar priv->flow[i].base = priv->base + ipu_dp_flow_base[i]; priv->flow[i].priv = priv; } -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 +diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-prv.h linux-3.10.30/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-16 15:28:24.873403730 +0200 ++++ linux-3.10.30/drivers/staging/imx-drm/ipu-v3/ipu-prv.h 2014-05-19 19:07:24.073306692 +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)) @@ -260455,9 +260780,9 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipu-v3/ipu-prv.h linux-lina struct ipu_dc_priv *dc_priv; 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 +diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipuv3-crtc.c linux-3.10.30/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-16 15:28:24.873403730 +0200 ++++ linux-3.10.30/drivers/staging/imx-drm/ipuv3-crtc.c 2014-05-19 19:07:24.073306692 +0200 @@ -17,44 +17,36 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. @@ -260972,9 +261297,9 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipuv3-crtc.c linux-linaro-s MODULE_DESCRIPTION(DRIVER_DESC); MODULE_LICENSE("GPL"); +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 +diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipuv3-plane.c linux-3.10.30/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-16 15:28:24.873403730 +0200 ++++ linux-3.10.30/drivers/staging/imx-drm/ipuv3-plane.c 2014-05-19 19:07:24.073306692 +0200 @@ -0,0 +1,375 @@ +/* + * i.MX IPUv3 DP Overlay Planes @@ -261351,9 +261676,9 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipuv3-plane.c linux-linaro- + + return ipu_plane; +} -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 +diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipuv3-plane.h linux-3.10.30/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-16 15:28:24.873403730 +0200 ++++ linux-3.10.30/drivers/staging/imx-drm/ipuv3-plane.h 2014-05-19 19:07:24.077306707 +0200 @@ -0,0 +1,55 @@ +#ifndef __IPUV3_PLANE_H__ +#define __IPUV3_PLANE_H__ @@ -261410,9 +261735,9 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/ipuv3-plane.h linux-linaro- +int ipu_plane_irq(struct ipu_plane *plane); + +#endif -diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/Kconfig linux-linaro-stable-mx6/drivers/staging/imx-drm/Kconfig +diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/Kconfig linux-3.10.30/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-16 15:28:24.869403709 +0200 ++++ linux-3.10.30/drivers/staging/imx-drm/Kconfig 2014-05-19 19:07:24.077306707 +0200 @@ -1,6 +1,7 @@ config DRM_IMX tristate "DRM Support for Freescale i.MX" @@ -261462,9 +261787,9 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/Kconfig linux-linaro-stable + Support the CEC interface which is part of the Synposis + Designware HDMI block. This is used in conjunction with + 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 +diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/Makefile linux-3.10.30/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-16 15:28:24.869403709 +0200 ++++ linux-3.10.30/drivers/staging/imx-drm/Makefile 2014-05-19 19:07:24.077306707 +0200 @@ -1,10 +1,15 @@ -imxdrm-objs := imx-drm-core.o imx-fb.o @@ -261484,9 +261809,9 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/Makefile linux-linaro-stabl +obj-$(CONFIG_DRM_IMX_IPUV3) += imx-ipuv3-crtc.o +obj-$(CONFIG_DRM_IMX_HDMI) += imxhdmi.o +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 +diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/parallel-display.c linux-3.10.30/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-16 15:28:24.873403730 +0200 ++++ linux-3.10.30/drivers/staging/imx-drm/parallel-display.c 2014-05-19 19:07:24.077306707 +0200 @@ -18,12 +18,12 @@ * MA 02110-1301, USA. */ @@ -261720,9 +262045,9 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/parallel-display.c linux-li MODULE_AUTHOR("Sascha Hauer, Pengutronix"); MODULE_LICENSE("GPL"); +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 +diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/TODO linux-3.10.30/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-16 15:28:24.869403709 +0200 ++++ linux-3.10.30/drivers/staging/imx-drm/TODO 2014-05-19 19:07:24.077306707 +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 @@ -261736,9 +262061,9 @@ diff -Nur linux-3.10.30.orig/drivers/staging/imx-drm/TODO linux-linaro-stable-mx - Add i.MX6 HDMI support - Add support for IC (Image converter) - 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 +diff -Nur linux-3.10.30.orig/drivers/thermal/cpu_cooling.c linux-3.10.30/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-16 15:28:25.085404847 +0200 ++++ linux-3.10.30/drivers/thermal/cpu_cooling.c 2014-05-19 19:07:24.077306707 +0200 @@ -167,7 +167,7 @@ continue; @@ -261748,9 +262073,9 @@ diff -Nur linux-3.10.30.orig/drivers/thermal/cpu_cooling.c linux-linaro-stable-m descend = !!(freq > table[i].frequency); 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 +diff -Nur linux-3.10.30.orig/drivers/thermal/device_cooling.c linux-3.10.30/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-16 15:28:25.085404847 +0200 ++++ linux-3.10.30/drivers/thermal/device_cooling.c 2014-05-19 19:07:24.081306722 +0200 @@ -0,0 +1,151 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -261903,9 +262228,9 @@ diff -Nur linux-3.10.30.orig/drivers/thermal/device_cooling.c linux-linaro-stabl + kfree(devfreq_dev); +} +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 +diff -Nur linux-3.10.30.orig/drivers/thermal/imx_thermal.c linux-3.10.30/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-16 15:28:25.085404847 +0200 ++++ linux-3.10.30/drivers/thermal/imx_thermal.c 2014-05-19 19:07:24.081306722 +0200 @@ -0,0 +1,471 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -262378,9 +262703,9 @@ diff -Nur linux-3.10.30.orig/drivers/thermal/imx_thermal.c linux-linaro-stable-m +MODULE_DESCRIPTION("Thermal driver for Freescale i.MX SoCs"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:imx-thermal"); -diff -Nur linux-3.10.30.orig/drivers/thermal/Kconfig linux-linaro-stable-mx6/drivers/thermal/Kconfig +diff -Nur linux-3.10.30.orig/drivers/thermal/Kconfig linux-3.10.30/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-16 15:28:25.085404847 +0200 ++++ linux-3.10.30/drivers/thermal/Kconfig 2014-05-19 19:07:24.081306722 +0200 @@ -91,6 +91,24 @@ because userland can easily disable the thermal policy by simply flooding this sysfs node with low temperature values. @@ -262406,9 +262731,9 @@ diff -Nur linux-3.10.30.orig/drivers/thermal/Kconfig linux-linaro-stable-mx6/dri config SPEAR_THERMAL bool "SPEAr thermal sensor driver" depends on PLAT_SPEAR -diff -Nur linux-3.10.30.orig/drivers/thermal/Makefile linux-linaro-stable-mx6/drivers/thermal/Makefile +diff -Nur linux-3.10.30.orig/drivers/thermal/Makefile linux-3.10.30/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-16 15:28:25.085404847 +0200 ++++ linux-3.10.30/drivers/thermal/Makefile 2014-05-19 19:07:24.081306722 +0200 @@ -21,6 +21,8 @@ obj-$(CONFIG_DOVE_THERMAL) += dove_thermal.o obj-$(CONFIG_DB8500_THERMAL) += db8500_thermal.o @@ -262418,9 +262743,9 @@ diff -Nur linux-3.10.30.orig/drivers/thermal/Makefile linux-linaro-stable-mx6/dr obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o obj-$(CONFIG_INTEL_POWERCLAMP) += intel_powerclamp.o -diff -Nur linux-3.10.30.orig/drivers/tty/serial/ar933x_uart.c linux-linaro-stable-mx6/drivers/tty/serial/ar933x_uart.c +diff -Nur linux-3.10.30.orig/drivers/tty/serial/ar933x_uart.c linux-3.10.30/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-16 15:28:25.105404953 +0200 ++++ linux-3.10.30/drivers/tty/serial/ar933x_uart.c 2014-05-19 19:07:24.081306722 +0200 @@ -703,7 +703,6 @@ struct ar933x_uart_port *up; @@ -262429,9 +262754,9 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/ar933x_uart.c linux-linaro-stabl if (up) { 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 +diff -Nur linux-3.10.30.orig/drivers/tty/serial/atmel_serial.c linux-3.10.30/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-16 15:28:25.105404953 +0200 ++++ linux-3.10.30/drivers/tty/serial/atmel_serial.c 2014-05-19 19:07:24.081306722 +0200 @@ -1853,7 +1853,6 @@ int ret = 0; @@ -262440,9 +262765,9 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/atmel_serial.c linux-linaro-stab ret = uart_remove_one_port(&atmel_uart, port); -diff -Nur linux-3.10.30.orig/drivers/tty/serial/bcm63xx_uart.c linux-linaro-stable-mx6/drivers/tty/serial/bcm63xx_uart.c +diff -Nur linux-3.10.30.orig/drivers/tty/serial/bcm63xx_uart.c linux-3.10.30/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-16 15:28:25.105404953 +0200 ++++ linux-3.10.30/drivers/tty/serial/bcm63xx_uart.c 2014-05-19 19:07:24.081306722 +0200 @@ -852,7 +852,6 @@ port = platform_get_drvdata(pdev); @@ -262451,9 +262776,9 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/bcm63xx_uart.c linux-linaro-stab /* mark port as free */ ports[pdev->id].membase = 0; return 0; -diff -Nur linux-3.10.30.orig/drivers/tty/serial/clps711x.c linux-linaro-stable-mx6/drivers/tty/serial/clps711x.c +diff -Nur linux-3.10.30.orig/drivers/tty/serial/clps711x.c linux-3.10.30/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-16 15:28:25.109404974 +0200 ++++ linux-3.10.30/drivers/tty/serial/clps711x.c 2014-05-19 19:07:24.081306722 +0200 @@ -438,8 +438,7 @@ s->uart_clk = devm_clk_get(&pdev->dev, "uart"); if (IS_ERR(s->uart_clk)) { @@ -262493,9 +262818,9 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/clps711x.c linux-linaro-stable-m return 0; } -diff -Nur linux-3.10.30.orig/drivers/tty/serial/efm32-uart.c linux-linaro-stable-mx6/drivers/tty/serial/efm32-uart.c +diff -Nur linux-3.10.30.orig/drivers/tty/serial/efm32-uart.c linux-3.10.30/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-16 15:28:25.109404974 +0200 ++++ linux-3.10.30/drivers/tty/serial/efm32-uart.c 2014-05-19 19:07:24.081306722 +0200 @@ -778,8 +778,6 @@ { struct efm32_uart_port *efm_port = platform_get_drvdata(pdev); @@ -262505,9 +262830,9 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/efm32-uart.c linux-linaro-stable uart_remove_one_port(&efm32_uart_reg, &efm_port->port); 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 +diff -Nur linux-3.10.30.orig/drivers/tty/serial/fsl_lpuart.c linux-3.10.30/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-16 15:28:25.109404974 +0200 ++++ linux-3.10.30/drivers/tty/serial/fsl_lpuart.c 2014-05-19 19:07:24.081306722 +0200 @@ -0,0 +1,879 @@ +/* + * Freescale lpuart serial port driver @@ -263388,9 +263713,9 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/fsl_lpuart.c linux-linaro-stable + +MODULE_DESCRIPTION("Freescale lpuart serial port driver"); +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 +diff -Nur linux-3.10.30.orig/drivers/tty/serial/imx.c linux-3.10.30/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-16 15:28:25.113404995 +0200 ++++ linux-3.10.30/drivers/tty/serial/imx.c 2014-05-19 19:07:24.081306722 +0200 @@ -47,11 +47,12 @@ #include <linux/slab.h> #include <linux/of.h> @@ -264276,9 +264601,9 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/imx.c linux-linaro-stable-mx6/dr if (pdata && pdata->exit) pdata->exit(pdev); -diff -Nur linux-3.10.30.orig/drivers/tty/serial/Kconfig linux-linaro-stable-mx6/drivers/tty/serial/Kconfig +diff -Nur linux-3.10.30.orig/drivers/tty/serial/Kconfig linux-3.10.30/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-16 15:28:25.105404953 +0200 ++++ linux-3.10.30/drivers/tty/serial/Kconfig 2014-05-19 19:07:24.085306736 +0200 @@ -1484,6 +1484,20 @@ If multiple cards are present, the default limit of 32 ports may need to be increased. @@ -264300,17 +264625,17 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/Kconfig linux-linaro-stable-mx6/ endmenu endif # TTY -diff -Nur linux-3.10.30.orig/drivers/tty/serial/Makefile linux-linaro-stable-mx6/drivers/tty/serial/Makefile +diff -Nur linux-3.10.30.orig/drivers/tty/serial/Makefile linux-3.10.30/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-16 15:28:25.105404953 +0200 ++++ linux-3.10.30/drivers/tty/serial/Makefile 2014-05-19 19:07:24.085306736 +0200 @@ -85,3 +85,4 @@ obj-$(CONFIG_SERIAL_EFM32_UART) += efm32-uart.o obj-$(CONFIG_SERIAL_ARC) += arc_uart.o obj-$(CONFIG_SERIAL_RP2) += rp2.o +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 +diff -Nur linux-3.10.30.orig/drivers/tty/serial/mpc52xx_uart.c linux-3.10.30/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-16 15:28:25.117405017 +0200 ++++ linux-3.10.30/drivers/tty/serial/mpc52xx_uart.c 2014-05-19 19:07:24.085306736 +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); @@ -264328,9 +264653,9 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/mpc52xx_uart.c linux-linaro-stab /* ======================================================================== */ /* PSC fifo operations for isolating differences between 52xx and 512x */ /* ======================================================================== */ -diff -Nur linux-3.10.30.orig/drivers/tty/serial/mxs-auart.c linux-linaro-stable-mx6/drivers/tty/serial/mxs-auart.c +diff -Nur linux-3.10.30.orig/drivers/tty/serial/mxs-auart.c linux-3.10.30/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-16 15:28:25.117405017 +0200 ++++ linux-3.10.30/drivers/tty/serial/mxs-auart.c 2014-05-19 19:07:24.085306736 +0200 @@ -32,7 +32,6 @@ #include <linux/clk.h> #include <linux/delay.h> @@ -264360,9 +264685,9 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/mxs-auart.c linux-linaro-stable- if (of_id) { pdev->id_entry = of_id->data; 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 +diff -Nur linux-3.10.30.orig/drivers/tty/serial/netx-serial.c linux-3.10.30/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-16 15:28:25.117405017 +0200 ++++ linux-3.10.30/drivers/tty/serial/netx-serial.c 2014-05-19 19:07:24.085306736 +0200 @@ -693,8 +693,6 @@ { struct netx_port *sport = platform_get_drvdata(pdev); @@ -264372,9 +264697,9 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/netx-serial.c linux-linaro-stabl if (sport) uart_remove_one_port(&netx_reg, &sport->port); -diff -Nur linux-3.10.30.orig/drivers/tty/serial/pmac_zilog.c linux-linaro-stable-mx6/drivers/tty/serial/pmac_zilog.c +diff -Nur linux-3.10.30.orig/drivers/tty/serial/pmac_zilog.c linux-3.10.30/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-16 15:28:25.117405017 +0200 ++++ linux-3.10.30/drivers/tty/serial/pmac_zilog.c 2014-05-19 19:07:24.085306736 +0200 @@ -1798,7 +1798,6 @@ uart_remove_one_port(&pmz_uart_reg, &uap->port); @@ -264383,9 +264708,9 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/pmac_zilog.c linux-linaro-stable uap->port.dev = NULL; 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 +diff -Nur linux-3.10.30.orig/drivers/tty/serial/pnx8xxx_uart.c linux-3.10.30/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-16 15:28:25.117405017 +0200 ++++ linux-3.10.30/drivers/tty/serial/pnx8xxx_uart.c 2014-05-19 19:07:24.085306736 +0200 @@ -801,8 +801,6 @@ { struct pnx8xxx_port *sport = platform_get_drvdata(pdev); @@ -264395,9 +264720,9 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/pnx8xxx_uart.c linux-linaro-stab if (sport) uart_remove_one_port(&pnx8xxx_reg, &sport->port); -diff -Nur linux-3.10.30.orig/drivers/tty/serial/pxa.c linux-linaro-stable-mx6/drivers/tty/serial/pxa.c +diff -Nur linux-3.10.30.orig/drivers/tty/serial/pxa.c linux-3.10.30/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-16 15:28:25.117405017 +0200 ++++ linux-3.10.30/drivers/tty/serial/pxa.c 2014-05-19 19:07:24.085306736 +0200 @@ -945,8 +945,6 @@ { struct uart_pxa_port *sport = platform_get_drvdata(dev); @@ -264407,9 +264732,9 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/pxa.c linux-linaro-stable-mx6/dr uart_remove_one_port(&serial_pxa_reg, &sport->port); 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 +diff -Nur linux-3.10.30.orig/drivers/tty/serial/sa1100.c linux-3.10.30/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-16 15:28:25.117405017 +0200 ++++ linux-3.10.30/drivers/tty/serial/sa1100.c 2014-05-19 19:07:24.085306736 +0200 @@ -864,8 +864,6 @@ { struct sa1100_port *sport = platform_get_drvdata(pdev); @@ -264419,9 +264744,9 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/sa1100.c linux-linaro-stable-mx6 if (sport) uart_remove_one_port(&sa1100_reg, &sport->port); -diff -Nur linux-3.10.30.orig/drivers/tty/serial/sccnxp.c linux-linaro-stable-mx6/drivers/tty/serial/sccnxp.c +diff -Nur linux-3.10.30.orig/drivers/tty/serial/sccnxp.c linux-3.10.30/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-16 15:28:25.121405037 +0200 ++++ linux-3.10.30/drivers/tty/serial/sccnxp.c 2014-05-19 19:07:24.085306736 +0200 @@ -997,8 +997,6 @@ } @@ -264439,9 +264764,9 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/sccnxp.c linux-linaro-stable-mx6 if (!IS_ERR(s->regulator)) 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 +diff -Nur linux-3.10.30.orig/drivers/tty/serial/serial_core.c linux-3.10.30/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-16 15:28:25.121405037 +0200 ++++ linux-3.10.30/drivers/tty/serial/serial_core.c 2014-05-19 19:07:24.085306736 +0200 @@ -50,12 +50,6 @@ #define HIGH_BITS_OFFSET ((sizeof(long)-sizeof(int))*8) @@ -264455,9 +264780,9 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/serial_core.c linux-linaro-stabl static void uart_change_speed(struct tty_struct *tty, struct uart_state *state, struct ktermios *old_termios); 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 +diff -Nur linux-3.10.30.orig/drivers/tty/serial/sirfsoc_uart.c linux-3.10.30/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-16 15:28:25.121405037 +0200 ++++ linux-3.10.30/drivers/tty/serial/sirfsoc_uart.c 2014-05-19 19:07:24.089306752 +0200 @@ -716,7 +716,6 @@ clk_disable_unprepare(sirfport->clk); clk_put(sirfport->clk); @@ -264475,9 +264800,9 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/sirfsoc_uart.c linux-linaro-stab if (sirfport->hw_flow_ctrl) pinctrl_put(sirfport->p); 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 +diff -Nur linux-3.10.30.orig/drivers/tty/serial/vt8500_serial.c linux-3.10.30/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-16 15:28:25.125405058 +0200 ++++ linux-3.10.30/drivers/tty/serial/vt8500_serial.c 2014-05-19 19:07:24.089306752 +0200 @@ -631,7 +631,6 @@ { struct vt8500_port *vt8500_port = platform_get_drvdata(pdev); @@ -264486,9 +264811,9 @@ diff -Nur linux-3.10.30.orig/drivers/tty/serial/vt8500_serial.c linux-linaro-sta clk_disable_unprepare(vt8500_port->clk); uart_remove_one_port(&vt8500_uart_driver, &vt8500_port->uart); -diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/bits.h linux-linaro-stable-mx6/drivers/usb/chipidea/bits.h +diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/bits.h linux-3.10.30/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-16 15:28:25.141405143 +0200 ++++ linux-3.10.30/drivers/usb/chipidea/bits.h 2014-05-19 19:07:24.089306752 +0200 @@ -48,10 +48,25 @@ #define PORTSC_SUSP BIT(7) #define PORTSC_HSP BIT(9) @@ -264538,9 +264863,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/bits.h linux-linaro-stable-mx6 /* USBMODE */ #define USBMODE_CM (0x03UL << 0) -diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci13xxx_imx.c linux-linaro-stable-mx6/drivers/usb/chipidea/ci13xxx_imx.c +diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci13xxx_imx.c linux-3.10.30/drivers/usb/chipidea/ci13xxx_imx.c --- linux-3.10.30.orig/drivers/usb/chipidea/ci13xxx_imx.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/chipidea/ci13xxx_imx.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.30/drivers/usb/chipidea/ci13xxx_imx.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,274 +0,0 @@ -/* - * Copyright 2012 Freescale Semiconductor, Inc. @@ -264816,9 +265141,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci13xxx_imx.c linux-linaro-sta -MODULE_DESCRIPTION("CI13xxx i.MX USB binding"); -MODULE_AUTHOR("Marek Vasut <marex@denx.de>"); -MODULE_AUTHOR("Richard Zhao <richard.zhao@freescale.com>"); -diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci13xxx_imx.h linux-linaro-stable-mx6/drivers/usb/chipidea/ci13xxx_imx.h +diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci13xxx_imx.h linux-3.10.30/drivers/usb/chipidea/ci13xxx_imx.h --- linux-3.10.30.orig/drivers/usb/chipidea/ci13xxx_imx.h 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/chipidea/ci13xxx_imx.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.30/drivers/usb/chipidea/ci13xxx_imx.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,31 +0,0 @@ -/* - * Copyright 2012 Freescale Semiconductor, Inc. @@ -264851,9 +265176,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci13xxx_imx.h linux-linaro-sta -void usbmisc_unset_ops(const struct usbmisc_ops *ops); -int -usbmisc_get_init_data(struct device *dev, struct usbmisc_usb_device *usbdev); -diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci13xxx_msm.c linux-linaro-stable-mx6/drivers/usb/chipidea/ci13xxx_msm.c +diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci13xxx_msm.c linux-3.10.30/drivers/usb/chipidea/ci13xxx_msm.c --- linux-3.10.30.orig/drivers/usb/chipidea/ci13xxx_msm.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/chipidea/ci13xxx_msm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.30/drivers/usb/chipidea/ci13xxx_msm.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,99 +0,0 @@ -/* Copyright (c) 2010, Code Aurora Forum. All rights reserved. - * @@ -264954,9 +265279,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci13xxx_msm.c linux-linaro-sta - -MODULE_ALIAS("platform:msm_hsusb"); -MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci13xxx_pci.c linux-linaro-stable-mx6/drivers/usb/chipidea/ci13xxx_pci.c +diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci13xxx_pci.c linux-3.10.30/drivers/usb/chipidea/ci13xxx_pci.c --- linux-3.10.30.orig/drivers/usb/chipidea/ci13xxx_pci.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/drivers/usb/chipidea/ci13xxx_pci.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.30/drivers/usb/chipidea/ci13xxx_pci.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,158 +0,0 @@ -/* - * ci13xxx_pci.c - MIPS USB IP core family device controller @@ -265116,9 +265441,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci13xxx_pci.c linux-linaro-sta -MODULE_DESCRIPTION("MIPS CI13XXX USB Peripheral Controller"); -MODULE_LICENSE("GPL"); -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 +diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci.h linux-3.10.30/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-16 15:28:25.141405143 +0200 ++++ linux-3.10.30/drivers/usb/chipidea/ci.h 2014-05-19 19:07:24.089306752 +0200 @@ -22,14 +22,14 @@ * DEFINE *****************************************************************************/ @@ -265387,9 +265712,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci.h linux-linaro-stable-mx6/d + u32 value, unsigned int timeout_ms); #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 +diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci_hdrc_imx.c linux-3.10.30/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-16 15:28:25.141405143 +0200 ++++ linux-3.10.30/drivers/usb/chipidea/ci_hdrc_imx.c 2014-05-19 19:07:24.089306752 +0200 @@ -0,0 +1,444 @@ +/* + * Copyright 2012-2013 Freescale Semiconductor, Inc. @@ -265835,9 +266160,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci_hdrc_imx.c linux-linaro-sta +MODULE_DESCRIPTION("CI HDRC i.MX USB binding"); +MODULE_AUTHOR("Marek Vasut <marex@denx.de>"); +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 +diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci_hdrc_imx.h linux-3.10.30/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-16 15:28:25.141405143 +0200 ++++ linux-3.10.30/drivers/usb/chipidea/ci_hdrc_imx.h 2014-05-19 19:07:24.089306752 +0200 @@ -0,0 +1,21 @@ +/* + * Copyright 2012-2013 Freescale Semiconductor, Inc. @@ -265860,9 +266185,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci_hdrc_imx.h linux-linaro-sta +int imx_usbmisc_init(struct imx_usbmisc_data *); +int imx_usbmisc_init_post(struct imx_usbmisc_data *); +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 +diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci_hdrc_msm.c linux-3.10.30/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-16 15:28:25.141405143 +0200 ++++ linux-3.10.30/drivers/usb/chipidea/ci_hdrc_msm.c 2014-05-19 19:07:24.089306752 +0200 @@ -0,0 +1,101 @@ +/* Copyright (c) 2010, Code Aurora Forum. All rights reserved. + * @@ -265965,9 +266290,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci_hdrc_msm.c linux-linaro-sta +MODULE_ALIAS("platform:msm_hsusb"); +MODULE_ALIAS("platform:ci13xxx_msm"); +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 +diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci_hdrc_pci.c linux-3.10.30/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-16 15:28:25.141405143 +0200 ++++ linux-3.10.30/drivers/usb/chipidea/ci_hdrc_pci.c 2014-05-19 19:07:24.093306766 +0200 @@ -0,0 +1,150 @@ +/* + * ci_hdrc_pci.c - MIPS USB IP core family device controller @@ -266119,9 +266444,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/ci_hdrc_pci.c linux-linaro-sta +MODULE_LICENSE("GPL"); +MODULE_VERSION("June 2008"); +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 +diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/core.c linux-3.10.30/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-16 15:28:25.141405143 +0200 ++++ linux-3.10.30/drivers/usb/chipidea/core.c 2014-05-19 19:07:24.093306766 +0200 @@ -43,8 +43,7 @@ * * TODO List @@ -266846,9 +267171,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/core.c linux-linaro-stable-mx6 MODULE_LICENSE("GPL v2"); MODULE_AUTHOR("David Lopo <dlopo@chipidea.mips.com>"); 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 +diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/debug.c linux-3.10.30/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-16 15:28:25.141405143 +0200 ++++ linux-3.10.30/drivers/usb/chipidea/debug.c 2014-05-19 19:07:24.093306766 +0200 @@ -18,7 +18,7 @@ */ static int ci_device_show(struct seq_file *s, void *data) @@ -266990,9 +267315,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/debug.c linux-linaro-stable-mx { debugfs_remove_recursive(ci->debugfs); } -diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/debug.h linux-linaro-stable-mx6/drivers/usb/chipidea/debug.h +diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/debug.h linux-3.10.30/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-16 15:28:25.141405143 +0200 ++++ linux-3.10.30/drivers/usb/chipidea/debug.h 2014-05-19 19:07:24.093306766 +0200 @@ -14,15 +14,15 @@ #define __DRIVERS_USB_CHIPIDEA_DEBUG_H @@ -267013,9 +267338,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/host.c linux-3.10.30/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-16 15:28:25.141405143 +0200 ++++ linux-3.10.30/drivers/usb/chipidea/host.c 2014-05-19 19:07:24.093306766 +0200 @@ -24,6 +24,7 @@ #include <linux/usb.h> #include <linux/usb/hcd.h> @@ -267291,9 +267616,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/host.c linux-linaro-stable-mx6 + return 0; } -diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/host.h linux-linaro-stable-mx6/drivers/usb/chipidea/host.h +diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/host.h linux-3.10.30/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-16 15:28:25.141405143 +0200 ++++ linux-3.10.30/drivers/usb/chipidea/host.h 2014-05-19 19:07:24.093306766 +0200 @@ -3,15 +3,21 @@ #ifdef CONFIG_USB_CHIPIDEA_HOST @@ -267318,9 +267643,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/host.h linux-linaro-stable-mx6 #endif #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 +diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/Kconfig linux-3.10.30/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-16 15:28:25.141405143 +0200 ++++ linux-3.10.30/drivers/usb/chipidea/Kconfig 2014-05-19 19:07:24.093306766 +0200 @@ -1,6 +1,6 @@ config USB_CHIPIDEA tristate "ChipIdea Highspeed Dual Role Controller" @@ -267347,9 +267672,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/Kconfig linux-linaro-stable-mx select USB_EHCI_ROOT_HUB_TT help 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 +diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/Makefile linux-3.10.30/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-16 15:28:25.141405143 +0200 ++++ linux-3.10.30/drivers/usb/chipidea/Makefile 2014-05-19 19:07:24.093306766 +0200 @@ -2,20 +2,20 @@ obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc.o @@ -267376,9 +267701,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/Makefile linux-linaro-stable-m +ifneq ($(CONFIG_OF),) + obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_imx.o usbmisc_imx.o endif -diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/otg.c linux-linaro-stable-mx6/drivers/usb/chipidea/otg.c +diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/otg.c linux-3.10.30/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-16 15:28:25.141405143 +0200 ++++ linux-3.10.30/drivers/usb/chipidea/otg.c 2014-05-19 19:07:24.093306766 +0200 @@ -0,0 +1,164 @@ +/* + * otg.c - ChipIdea USB IP core OTG driver @@ -267544,9 +267869,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/otg.c linux-linaro-stable-mx6/ + ci_disable_otg_interrupt(ci, OTGSC_INT_EN_BITS); + ci_clear_otg_interrupt(ci, OTGSC_INT_STATUS_BITS); +} -diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/otg.h linux-linaro-stable-mx6/drivers/usb/chipidea/otg.h +diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/otg.h linux-3.10.30/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-16 15:28:25.141405143 +0200 ++++ linux-3.10.30/drivers/usb/chipidea/otg.h 2014-05-19 19:07:24.093306766 +0200 @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -267584,9 +267909,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/otg.h linux-linaro-stable-mx6/ +void ci_handle_vbus_connected(struct ci_hdrc *ci); + +#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 +diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/udc.c linux-3.10.30/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-16 15:28:25.141405143 +0200 ++++ linux-3.10.30/drivers/usb/chipidea/udc.c 2014-05-19 19:07:24.097306781 +0200 @@ -20,13 +20,13 @@ #include <linux/pm_runtime.h> #include <linux/usb/ch9.h> @@ -269375,9 +269700,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/udc.c linux-linaro-stable-mx6/ - return 0; + return udc_start(ci); } -diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/udc.h linux-linaro-stable-mx6/drivers/usb/chipidea/udc.h +diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/udc.h linux-3.10.30/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-16 15:28:25.141405143 +0200 ++++ linux-3.10.30/drivers/usb/chipidea/udc.h 2014-05-19 19:07:24.097306781 +0200 @@ -20,7 +20,7 @@ #define TX 1 /* similar to USB_DIR_IN but can be used as an index */ @@ -269459,9 +269784,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/udc.h linux-linaro-stable-mx6/ #endif #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 +diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/usbmisc_imx.c linux-3.10.30/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-16 15:28:25.141405143 +0200 ++++ linux-3.10.30/drivers/usb/chipidea/usbmisc_imx.c 2014-05-19 19:07:24.097306781 +0200 @@ -1,5 +1,5 @@ /* - * Copyright 2012 Freescale Semiconductor, Inc. @@ -269752,9 +270077,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/chipidea/usbmisc_imx.c linux-linaro-sta MODULE_ALIAS("platform:usbmisc-imx"); 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 +diff -Nur linux-3.10.30.orig/drivers/usb/core/hcd.c linux-3.10.30/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-16 15:28:25.145405164 +0200 ++++ linux-3.10.30/drivers/usb/core/hcd.c 2014-05-19 19:07:24.097306781 +0200 @@ -2575,12 +2575,6 @@ if (hcd->uses_new_polling && HCD_POLL_RH(hcd)) usb_hcd_poll_rh_status(hcd); @@ -269768,9 +270093,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/core/hcd.c linux-linaro-stable-mx6/driv return retval; 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 +diff -Nur linux-3.10.30.orig/drivers/usb/core/hub.c linux-3.10.30/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-16 15:28:25.145405164 +0200 ++++ linux-3.10.30/drivers/usb/core/hub.c 2014-05-19 19:07:24.097306781 +0200 @@ -4372,8 +4372,7 @@ /* Disconnect any existing devices under this port */ @@ -269781,9 +270106,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/core/hub.c linux-linaro-stable-mx6/driv usb_phy_notify_disconnect(hcd->phy, udev->speed); usb_disconnect(&hub->ports[port1 - 1]->child); } -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 +diff -Nur linux-3.10.30.orig/drivers/usb/gadget/f_mass_storage.c linux-3.10.30/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-16 15:28:25.157405228 +0200 ++++ linux-3.10.30/drivers/usb/gadget/f_mass_storage.c 2014-05-19 19:07:24.097306781 +0200 @@ -349,8 +349,15 @@ struct usb_ep *bulk_in; @@ -269899,9 +270224,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/gadget/f_mass_storage.c linux-linaro-st /* Find all the endpoints we will use */ ep = usb_ep_autoconfig(gadget, &fsg_fs_bulk_in_desc); 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 +diff -Nur linux-3.10.30.orig/drivers/usb/gadget/fsl_updater.c linux-3.10.30/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-16 15:28:25.165405269 +0200 ++++ linux-3.10.30/drivers/usb/gadget/fsl_updater.c 2014-05-19 19:07:24.097306781 +0200 @@ -0,0 +1,594 @@ +/* + * Freescale UUT driver @@ -270497,9 +270822,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/gadget/fsl_updater.c linux-linaro-stabl + utp_send_status(fsg); + return -1; +} -diff -Nur linux-3.10.30.orig/drivers/usb/gadget/fsl_updater.h linux-linaro-stable-mx6/drivers/usb/gadget/fsl_updater.h +diff -Nur linux-3.10.30.orig/drivers/usb/gadget/fsl_updater.h linux-3.10.30/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-16 15:28:25.165405269 +0200 ++++ linux-3.10.30/drivers/usb/gadget/fsl_updater.h 2014-05-19 19:07:24.097306781 +0200 @@ -0,0 +1,150 @@ +/* + * Freescale UUT driver @@ -270651,9 +270976,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/gadget/fsl_updater.h linux-linaro-stabl + +#endif /* __FSL_UPDATER_H */ + -diff -Nur linux-3.10.30.orig/drivers/usb/gadget/Kconfig linux-linaro-stable-mx6/drivers/usb/gadget/Kconfig +diff -Nur linux-3.10.30.orig/drivers/usb/gadget/Kconfig linux-3.10.30/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-16 15:28:25.149405185 +0200 ++++ linux-3.10.30/drivers/usb/gadget/Kconfig 2014-05-19 19:07:24.101306795 +0200 @@ -751,6 +751,12 @@ Say "y" to link the driver statically, or "m" to build a dynamically linked module called "g_mass_storage". @@ -270667,9 +270992,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/gadget/Kconfig linux-linaro-stable-mx6/ config USB_GADGET_TARGET tristate "USB Gadget Target Fabric Module" 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 +diff -Nur linux-3.10.30.orig/drivers/usb/gadget/mass_storage.c linux-3.10.30/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-16 15:28:25.169405290 +0200 ++++ linux-3.10.30/drivers/usb/gadget/mass_storage.c 2014-05-19 19:07:24.101306795 +0200 @@ -189,7 +189,7 @@ { return usb_composite_probe(&msg_driver); @@ -270679,9 +271004,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/gadget/mass_storage.c linux-linaro-stab static void msg_cleanup(void) { -diff -Nur linux-3.10.30.orig/drivers/usb/gadget/zero.c linux-linaro-stable-mx6/drivers/usb/gadget/zero.c +diff -Nur linux-3.10.30.orig/drivers/usb/gadget/zero.c linux-3.10.30/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-16 15:28:25.177405333 +0200 ++++ linux-3.10.30/drivers/usb/gadget/zero.c 2014-05-19 19:07:24.101306795 +0200 @@ -95,6 +95,18 @@ module_param(autoresume, uint, S_IRUGO); MODULE_PARM_DESC(autoresume, "zero, or seconds before remote wakeup"); @@ -270728,9 +271053,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/usb/host/ehci.h linux-3.10.30/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-16 15:28:25.181405354 +0200 ++++ linux-3.10.30/drivers/usb/host/ehci.h 2014-05-19 19:07:24.101306795 +0200 @@ -816,6 +816,8 @@ extern void ehci_init_driver(struct hc_driver *drv, const struct ehci_driver_overrides *over); @@ -270740,9 +271065,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/host/ehci.h linux-linaro-stable-mx6/dri #ifdef CONFIG_PM 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 +diff -Nur linux-3.10.30.orig/drivers/usb/host/ehci-hcd.c linux-3.10.30/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-16 15:28:25.181405354 +0200 ++++ linux-3.10.30/drivers/usb/host/ehci-hcd.c 2014-05-19 19:07:24.101306795 +0200 @@ -139,7 +139,7 @@ /*-------------------------------------------------------------------------*/ @@ -270809,9 +271134,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/usb/host/ehci-hub.c linux-3.10.30/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-16 15:28:25.181405354 +0200 ++++ linux-3.10.30/drivers/usb/host/ehci-hub.c 2014-05-19 19:07:24.101306795 +0200 @@ -877,7 +877,7 @@ PORT_SUSPEND | PORT_RESUME); ehci_writel(ehci, temp, status_reg); @@ -270830,9 +271155,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/host/ehci-hub.c linux-linaro-stable-mx6 PORT_RESET, 0, 1000); if (retval != 0) { 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 +diff -Nur linux-3.10.30.orig/drivers/usb/host/ehci-tegra.c linux-3.10.30/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-16 15:28:25.181405354 +0200 ++++ linux-3.10.30/drivers/usb/host/ehci-tegra.c 2014-05-19 19:07:24.101306795 +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. @@ -270880,9 +271205,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/host/ehci-tegra.c linux-linaro-stable-m PORT_SUSPEND, 1000)) { pr_err("%s: timeout waiting for PORT_SUSPEND\n", __func__); -diff -Nur linux-3.10.30.orig/drivers/usb/host/Kconfig linux-linaro-stable-mx6/drivers/usb/host/Kconfig +diff -Nur linux-3.10.30.orig/drivers/usb/host/Kconfig linux-3.10.30/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-16 15:28:25.177405333 +0200 ++++ linux-3.10.30/drivers/usb/host/Kconfig 2014-05-19 19:07:24.101306795 +0200 @@ -65,7 +65,7 @@ config USB_EHCI_ROOT_HUB_TT @@ -270901,9 +271226,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/host/Kconfig linux-linaro-stable-mx6/dr default y ---help--- 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 +diff -Nur linux-3.10.30.orig/drivers/usb/phy/Makefile linux-3.10.30/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-16 15:28:25.213405522 +0200 ++++ linux-3.10.30/drivers/usb/phy/Makefile 2014-05-19 19:07:24.101306795 +0200 @@ -5,6 +5,7 @@ ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG @@ -270912,9 +271237,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/phy/Makefile linux-linaro-stable-mx6/dr # transceiver drivers, keep the list sorted -diff -Nur linux-3.10.30.orig/drivers/usb/phy/of.c linux-linaro-stable-mx6/drivers/usb/phy/of.c +diff -Nur linux-3.10.30.orig/drivers/usb/phy/of.c linux-3.10.30/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-16 15:28:25.213405522 +0200 ++++ linux-3.10.30/drivers/usb/phy/of.c 2014-05-19 19:07:24.101306795 +0200 @@ -0,0 +1,47 @@ +/* + * USB of helper code @@ -270963,9 +271288,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/phy/of.c linux-linaro-stable-mx6/driver + return USBPHY_INTERFACE_MODE_UNKNOWN; +} +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 +diff -Nur linux-3.10.30.orig/drivers/usb/phy/phy-mxs-usb.c linux-3.10.30/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-16 15:28:25.217405544 +0200 ++++ linux-3.10.30/drivers/usb/phy/phy-mxs-usb.c 2014-05-19 19:07:24.101306795 +0200 @@ -1,5 +1,5 @@ /* - * Copyright 2012 Freescale Semiconductor, Inc. @@ -271511,9 +271836,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/usb/usb-common.c linux-3.10.30/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-16 15:28:29.889430182 +0200 ++++ linux-3.10.30/drivers/usb/usb-common.c 2014-05-19 19:07:24.101306795 +0200 @@ -13,7 +13,9 @@ #include <linux/kernel.h> @@ -271562,9 +271887,9 @@ diff -Nur linux-3.10.30.orig/drivers/usb/usb-common.c linux-linaro-stable-mx6/dr +#endif + MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/video/amba-clcd.c linux-linaro-stable-mx6/drivers/video/amba-clcd.c +diff -Nur linux-3.10.30.orig/drivers/video/amba-clcd.c linux-3.10.30/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-16 15:28:38.293474499 +0200 ++++ linux-3.10.30/drivers/video/amba-clcd.c 2014-05-19 19:07:24.101306795 +0200 @@ -16,7 +16,10 @@ #include <linux/string.h> #include <linux/slab.h> @@ -271880,9 +272205,9 @@ diff -Nur linux-3.10.30.orig/drivers/video/amba-clcd.c linux-linaro-stable-mx6/d ret = amba_request_regions(dev, NULL); if (ret) { -diff -Nur linux-3.10.30.orig/drivers/video/arm-hdlcd.c linux-linaro-stable-mx6/drivers/video/arm-hdlcd.c +diff -Nur linux-3.10.30.orig/drivers/video/arm-hdlcd.c linux-3.10.30/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-16 15:28:38.297474520 +0200 ++++ linux-3.10.30/drivers/video/arm-hdlcd.c 2014-05-19 19:07:24.101306795 +0200 @@ -0,0 +1,844 @@ +/* + * drivers/video/arm-hdlcd.c @@ -272728,9 +273053,9 @@ diff -Nur linux-3.10.30.orig/drivers/video/arm-hdlcd.c linux-linaro-stable-mx6/d +MODULE_AUTHOR("Liviu Dudau"); +MODULE_DESCRIPTION("ARM HDLCD core driver"); +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 +diff -Nur linux-3.10.30.orig/drivers/video/backlight/backlight.c linux-3.10.30/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-16 15:28:38.305474562 +0200 ++++ linux-3.10.30/drivers/video/backlight/backlight.c 2014-05-19 19:07:24.101306795 +0200 @@ -38,6 +38,8 @@ { struct backlight_device *bd; @@ -272771,9 +273096,9 @@ diff -Nur linux-3.10.30.orig/drivers/video/backlight/backlight.c linux-linaro-st } mutex_unlock(&bd->ops_lock); return 0; -diff -Nur linux-3.10.30.orig/drivers/video/console/fbcon.c linux-linaro-stable-mx6/drivers/video/console/fbcon.c +diff -Nur linux-3.10.30.orig/drivers/video/console/fbcon.c linux-3.10.30/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-16 15:28:38.313474604 +0200 ++++ linux-3.10.30/drivers/video/console/fbcon.c 2014-05-19 19:07:24.105306811 +0200 @@ -404,7 +404,7 @@ struct fb_info *info = (struct fb_info *) dev_addr; struct fbcon_ops *ops = info->fbcon_par; @@ -272783,9 +273108,9 @@ diff -Nur linux-3.10.30.orig/drivers/video/console/fbcon.c linux-linaro-stable-m mod_timer(&ops->cursor_timer, jiffies + HZ/5); } -diff -Nur linux-3.10.30.orig/drivers/video/Kconfig linux-linaro-stable-mx6/drivers/video/Kconfig +diff -Nur linux-3.10.30.orig/drivers/video/Kconfig linux-3.10.30/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-16 15:28:38.293474499 +0200 ++++ linux-3.10.30/drivers/video/Kconfig 2014-05-19 19:07:24.105306811 +0200 @@ -39,6 +39,11 @@ config HDMI bool @@ -272850,9 +273175,9 @@ diff -Nur linux-3.10.30.orig/drivers/video/Kconfig linux-linaro-stable-mx6/drive if VT source "drivers/video/console/Kconfig" endif -diff -Nur linux-3.10.30.orig/drivers/video/Makefile linux-linaro-stable-mx6/drivers/video/Makefile +diff -Nur linux-3.10.30.orig/drivers/video/Makefile linux-3.10.30/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-16 15:28:38.293474499 +0200 ++++ linux-3.10.30/drivers/video/Makefile 2014-05-19 19:07:24.105306811 +0200 @@ -53,6 +53,7 @@ obj-$(CONFIG_FB_SAVAGE) += savage/ obj-$(CONFIG_FB_GEODE) += geode/ @@ -272876,9 +273201,9 @@ diff -Nur linux-3.10.30.orig/drivers/video/Makefile linux-linaro-stable-mx6/driv + +# platform specific output drivers +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 +diff -Nur linux-3.10.30.orig/drivers/video/mxc/epdc_regs.h linux-3.10.30/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-16 15:28:38.369474900 +0200 ++++ linux-3.10.30/drivers/video/mxc/epdc_regs.h 2014-05-19 19:07:24.105306811 +0200 @@ -0,0 +1,442 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -273322,9 +273647,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/video/mxc/Kconfig linux-3.10.30/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-16 15:28:38.369474900 +0200 ++++ linux-3.10.30/drivers/video/mxc/Kconfig 2014-05-19 19:07:24.105306811 +0200 @@ -0,0 +1,63 @@ +config FB_MXC + tristate "MXC Framebuffer support" @@ -273389,9 +273714,9 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxc/Kconfig linux-linaro-stable-mx6/d +config FB_MXS_SII902X + tristate "Si Image SII9022 DVI/HDMI Interface Chip" + 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 +diff -Nur linux-3.10.30.orig/drivers/video/mxc/ldb.c linux-3.10.30/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-16 15:28:38.369474900 +0200 ++++ linux-3.10.30/drivers/video/mxc/ldb.c 2014-05-19 19:07:24.105306811 +0200 @@ -0,0 +1,1036 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -274429,9 +274754,9 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxc/ldb.c linux-linaro-stable-mx6/dri +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("MXC LDB driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/video/mxc/Makefile linux-linaro-stable-mx6/drivers/video/mxc/Makefile +diff -Nur linux-3.10.30.orig/drivers/video/mxc/Makefile linux-3.10.30/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-16 15:28:38.369474900 +0200 ++++ linux-3.10.30/drivers/video/mxc/Makefile 2014-05-19 19:07:24.109306825 +0200 @@ -0,0 +1,8 @@ +obj-$(CONFIG_FB_MXC_LDB) += ldb.o +obj-$(CONFIG_FB_MXC_MIPI_DSI) += mipi_dsi.o @@ -274441,9 +274766,9 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxc/Makefile linux-linaro-stable-mx6/ +obj-$(CONFIG_FB_MXC_SYNC_PANEL) += mxc_dispdrv.o mxc_lcdif.o mxc_ipuv3_fb.o +obj-$(CONFIG_FB_MXC_EINK_PANEL) += mxc_epdc_fb.o +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 +diff -Nur linux-3.10.30.orig/drivers/video/mxc/mipi_dsi.c linux-3.10.30/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-16 15:28:38.369474900 +0200 ++++ linux-3.10.30/drivers/video/mxc/mipi_dsi.c 2014-05-19 19:07:24.109306825 +0200 @@ -0,0 +1,953 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -275398,9 +275723,9 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxc/mipi_dsi.c linux-linaro-stable-mx +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("i.MX MIPI DSI driver"); +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 +diff -Nur linux-3.10.30.orig/drivers/video/mxc/mipi_dsi.h linux-3.10.30/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-16 15:28:38.369474900 +0200 ++++ linux-3.10.30/drivers/video/mxc/mipi_dsi.h 2014-05-19 19:07:24.109306825 +0200 @@ -0,0 +1,112 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -275514,9 +275839,9 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxc/mipi_dsi.h linux-linaro-stable-mx +#endif + +#endif -diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_dispdrv.c linux-linaro-stable-mx6/drivers/video/mxc/mxc_dispdrv.c +diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_dispdrv.c linux-3.10.30/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-16 15:28:38.373474921 +0200 ++++ linux-3.10.30/drivers/video/mxc/mxc_dispdrv.c 2014-05-19 19:07:24.109306825 +0200 @@ -0,0 +1,150 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -275668,9 +275993,9 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_dispdrv.c linux-linaro-stable + return ERR_PTR(-EINVAL); +} +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 +diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_dispdrv.h linux-3.10.30/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-16 15:28:38.373474921 +0200 ++++ linux-3.10.30/drivers/video/mxc/mxc_dispdrv.h 2014-05-19 19:07:24.109306825 +0200 @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -275726,9 +276051,9 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_dispdrv.h linux-linaro-stable +int mxc_dispdrv_setdata(struct mxc_dispdrv_handle *handle, void *data); +void *mxc_dispdrv_getdata(struct mxc_dispdrv_handle *handle); +#endif -diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_edid.c linux-linaro-stable-mx6/drivers/video/mxc/mxc_edid.c +diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_edid.c linux-3.10.30/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-16 15:28:38.373474921 +0200 ++++ linux-3.10.30/drivers/video/mxc/mxc_edid.c 2014-05-19 19:07:24.125306884 +0200 @@ -0,0 +1,762 @@ +/* + * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -276492,9 +276817,9 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_edid.c linux-linaro-stable-mx +} +EXPORT_SYMBOL(mxc_edid_read); + -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 +diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_epdc_fb.c linux-3.10.30/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-16 15:28:38.373474921 +0200 ++++ linux-3.10.30/drivers/video/mxc/mxc_epdc_fb.c 2014-05-19 19:07:24.137306929 +0200 @@ -0,0 +1,5541 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. @@ -282037,9 +282362,9 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_epdc_fb.c linux-linaro-stable +MODULE_DESCRIPTION("MXC EPDC framebuffer driver"); +MODULE_LICENSE("GPL"); +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 +diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxcfb_hx8369_wvga.c linux-3.10.30/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-16 15:28:38.373474921 +0200 ++++ linux-3.10.30/drivers/video/mxc/mxcfb_hx8369_wvga.c 2014-05-19 19:07:24.141306943 +0200 @@ -0,0 +1,449 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -282490,9 +282815,9 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxcfb_hx8369_wvga.c linux-linaro- + mipid_bl_update_status(bl); + return 0; +} -diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx6/drivers/video/mxc/mxc_hdmi.c +diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_hdmi.c linux-3.10.30/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-16 15:28:38.373474921 +0200 ++++ linux-3.10.30/drivers/video/mxc/mxc_hdmi.c 2014-05-19 19:07:24.141306943 +0200 @@ -0,0 +1,2935 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. @@ -285429,9 +285754,9 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_hdmi.c linux-linaro-stable-mx +module_exit(mxc_hdmi_i2c_exit); + +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 +diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_ipuv3_fb.c linux-3.10.30/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-16 15:28:38.373474921 +0200 ++++ linux-3.10.30/drivers/video/mxc/mxc_ipuv3_fb.c 2014-05-19 19:07:24.145306958 +0200 @@ -0,0 +1,2577 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -288010,9 +288335,9 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_ipuv3_fb.c linux-linaro-stabl +MODULE_DESCRIPTION("MXC framebuffer driver"); +MODULE_LICENSE("GPL"); +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 +diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_lcdif.c linux-3.10.30/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-16 15:28:38.373474921 +0200 ++++ linux-3.10.30/drivers/video/mxc/mxc_lcdif.c 2014-05-19 19:07:24.145306958 +0200 @@ -0,0 +1,235 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -288249,9 +288574,9 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxc_lcdif.c linux-linaro-stable-m +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("i.MX ipuv3 LCD extern port driver"); +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 +diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxsfb_sii902x.c linux-3.10.30/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-16 15:28:38.373474921 +0200 ++++ linux-3.10.30/drivers/video/mxc/mxsfb_sii902x.c 2014-05-19 19:07:24.149306973 +0200 @@ -0,0 +1,532 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -288785,9 +289110,9 @@ diff -Nur linux-3.10.30.orig/drivers/video/mxc/mxsfb_sii902x.c linux-linaro-stab +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("SII902x DVI/HDMI driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/drivers/video/mxsfb.c linux-linaro-stable-mx6/drivers/video/mxsfb.c +diff -Nur linux-3.10.30.orig/drivers/video/mxsfb.c linux-3.10.30/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-16 15:28:38.373474921 +0200 ++++ linux-3.10.30/drivers/video/mxsfb.c 2014-05-19 19:07:24.149306973 +0200 @@ -4,7 +4,7 @@ * This code is based on: * Author: Vitaly Wool <vital@embeddedalley.com> @@ -289555,9 +289880,9 @@ 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 +diff -Nur linux-3.10.30.orig/drivers/video/vexpress-dvi.c linux-3.10.30/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-16 15:28:38.429475216 +0200 ++++ linux-3.10.30/drivers/video/vexpress-dvi.c 2014-05-19 19:07:24.149306973 +0200 @@ -0,0 +1,220 @@ +/* + * This program is free software; you can redistribute it and/or modify @@ -289779,9 +290104,9 @@ diff -Nur linux-3.10.30.orig/drivers/video/vexpress-dvi.c linux-linaro-stable-mx + return platform_driver_register(&vexpress_dvi_driver); +} +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 +diff -Nur linux-3.10.30.orig/firmware/imx/epdc_E060SCM.fw.ihex linux-3.10.30/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-16 15:28:38.513475659 +0200 ++++ linux-3.10.30/firmware/imx/epdc_E060SCM.fw.ihex 2014-05-19 19:07:24.181307091 +0200 @@ -0,0 +1,61613 @@ +:100000003488C47C012D0100DD0900000706A4002E +:100010000358211D3CCA018502000000400000FE7B @@ -351396,9 +351721,9 @@ diff -Nur linux-3.10.30.orig/firmware/imx/epdc_E060SCM.fw.ihex linux-linaro-stab +:1009B0000000000000000000000000000000000037 +:0709C0000000000000000030 +: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 +diff -Nur linux-3.10.30.orig/firmware/imx/epdc_E60_V110.fw.ihex linux-3.10.30/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-16 15:28:38.529475744 +0200 ++++ linux-3.10.30/firmware/imx/epdc_E60_V110.fw.ihex 2014-05-19 19:07:24.201307165 +0200 @@ -0,0 +1,45914 @@ +:10000000C7FFA986DE9C0000E30100000003250075 +:100010000127020E3C03000000000000400000C366 @@ -397314,9 +397639,9 @@ diff -Nur linux-3.10.30.orig/firmware/imx/epdc_E60_V110.fw.ihex linux-linaro-sta +:1034C00000000000000000000000000000000000FC +:0F34D000000000000000000000000000000000ED +: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 +diff -Nur linux-3.10.30.orig/firmware/imx/epdc_E60_V220.fw.ihex linux-3.10.30/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-16 15:28:38.533475764 +0200 ++++ linux-3.10.30/firmware/imx/epdc_E60_V220.fw.ihex 2014-05-19 19:07:24.241307313 +0200 @@ -0,0 +1,77569 @@ +:10000000BD611693236A0100BC04000007060500C9 +:100010000304021D3C180085000000004000001190 @@ -474887,9 +475212,9 @@ diff -Nur linux-3.10.30.orig/firmware/imx/epdc_E60_V220.fw.ihex linux-linaro-sta +:10EEB0000000000000000000000000000000000052 +:07EEC000000000000000004B +: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 +diff -Nur linux-3.10.30.orig/firmware/imx/epdc_E97_V110.fw.ihex linux-3.10.30/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-16 15:28:38.541475806 +0200 ++++ linux-3.10.30/firmware/imx/epdc_E97_V110.fw.ihex 2014-05-19 19:07:24.265307402 +0200 @@ -0,0 +1,54512 @@ +:1000000095533B1702B60000B701000004042C0012 +:100010000131020E6101010000000000410000D228 @@ -529403,9 +529728,9 @@ diff -Nur linux-3.10.30.orig/firmware/imx/epdc_E97_V110.fw.ihex linux-linaro-sta +:104E000000000000000000000000000000000000A2 +:104E10000000000000000000000000000000000092 +: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 +diff -Nur linux-3.10.30.orig/firmware/imx/sdma/sdma-imx6q.bin.ihex linux-3.10.30/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-16 15:28:38.541475806 +0200 ++++ linux-3.10.30/firmware/imx/sdma/sdma-imx6q.bin.ihex 2014-05-19 19:07:24.265307402 +0200 @@ -0,0 +1,116 @@ +:1000000053444D4101000000010000001C000000AD +:1000100026000000B40000007A0600008202000002 @@ -529523,9 +529848,9 @@ diff -Nur linux-3.10.30.orig/firmware/imx/sdma/sdma-imx6q.bin.ihex linux-linaro- +:10071000DD6F087FD169010FC86FDD6F037F0101B5 +:0E0720000004129B0700FF680C680002129B89 +:00000001FF -diff -Nur linux-3.10.30.orig/firmware/Makefile linux-linaro-stable-mx6/firmware/Makefile +diff -Nur linux-3.10.30.orig/firmware/Makefile linux-3.10.30/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-16 15:28:38.473475448 +0200 ++++ linux-3.10.30/firmware/Makefile 2014-05-19 19:07:24.269307417 +0200 @@ -61,6 +61,7 @@ radeon/RV770_pfp.bin radeon/RV770_me.bin \ radeon/RV730_pfp.bin radeon/RV730_me.bin \ @@ -529554,9 +529879,9 @@ diff -Nur linux-3.10.30.orig/firmware/Makefile linux-linaro-stable-mx6/firmware/ # Don't depend on ihex2fw if we're installing and it already exists. # Putting it after | in the dependencies doesn't seem sufficient when # we're installing after a cross-compile, because ihex2fw has dependencies -diff -Nur linux-3.10.30.orig/fs/debugfs/file.c linux-linaro-stable-mx6/fs/debugfs/file.c +diff -Nur linux-3.10.30.orig/fs/debugfs/file.c linux-3.10.30/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-16 15:28:38.625476249 +0200 ++++ linux-3.10.30/fs/debugfs/file.c 2014-05-19 19:07:24.269307417 +0200 @@ -21,6 +21,7 @@ #include <linux/debugfs.h> #include <linux/io.h> @@ -529613,9 +529938,9 @@ diff -Nur linux-3.10.30.orig/fs/debugfs/file.c linux-linaro-stable-mx6/fs/debugf static ssize_t read_file_bool(struct file *file, char __user *user_buf, 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 +diff -Nur linux-3.10.30.orig/fs/f2fs/acl.c linux-3.10.30/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-16 15:28:38.657476418 +0200 ++++ linux-3.10.30/fs/f2fs/acl.c 2014-05-19 19:07:24.269307417 +0200 @@ -205,7 +205,8 @@ return acl; } @@ -529698,9 +530023,9 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/acl.c linux-linaro-stable-mx6/fs/f2fs/acl.c release_and_out: posix_acl_release(acl); -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/acl.h linux-3.10.30/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-16 15:28:38.657476418 +0200 ++++ linux-3.10.30/fs/f2fs/acl.h 2014-05-19 19:07:24.269307417 +0200 @@ -36,9 +36,9 @@ #ifdef CONFIG_F2FS_FS_POSIX_ACL @@ -529724,9 +530049,9 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/acl.h linux-linaro-stable-mx6/fs/f2fs/acl.h { return 0; } -diff -Nur linux-3.10.30.orig/fs/f2fs/checkpoint.c linux-linaro-stable-mx6/fs/f2fs/checkpoint.c +diff -Nur linux-3.10.30.orig/fs/f2fs/checkpoint.c linux-3.10.30/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-16 15:28:38.657476418 +0200 ++++ linux-3.10.30/fs/f2fs/checkpoint.c 2014-05-19 19:07:24.269307417 +0200 @@ -81,7 +81,7 @@ struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb); @@ -530101,9 +530426,9 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/checkpoint.c linux-linaro-stable-mx6/fs/f2f ckpt->checkpoint_ver = cpu_to_le64(++ckpt_ver); /* 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 +diff -Nur linux-3.10.30.orig/fs/f2fs/data.c linux-3.10.30/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-16 15:28:38.657476418 +0200 ++++ linux-3.10.30/fs/f2fs/data.c 2014-05-19 19:07:24.269307417 +0200 @@ -37,9 +37,9 @@ struct page *node_page = dn->node_page; unsigned int ofs_in_node = dn->ofs_in_node; @@ -530413,9 +530738,9 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/data.c linux-linaro-stable-mx6/fs/f2fs/data .set_page_dirty = f2fs_set_data_page_dirty, .invalidatepage = f2fs_invalidate_data_page, .releasepage = f2fs_release_data_page, -diff -Nur linux-3.10.30.orig/fs/f2fs/debug.c linux-linaro-stable-mx6/fs/f2fs/debug.c +diff -Nur linux-3.10.30.orig/fs/f2fs/debug.c linux-3.10.30/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-16 15:28:38.657476418 +0200 ++++ linux-3.10.30/fs/f2fs/debug.c 2014-05-19 19:07:24.269307417 +0200 @@ -29,7 +29,7 @@ static void update_general_status(struct f2fs_sb_info *sbi) @@ -530527,9 +530852,9 @@ 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 +diff -Nur linux-3.10.30.orig/fs/f2fs/dir.c linux-3.10.30/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-16 15:28:38.657476418 +0200 ++++ linux-3.10.30/fs/f2fs/dir.c 2014-05-19 19:07:24.269307417 +0200 @@ -13,6 +13,7 @@ #include "f2fs.h" #include "node.h" @@ -530779,9 +531104,9 @@ 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 +diff -Nur linux-3.10.30.orig/fs/f2fs/f2fs.h linux-3.10.30/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-16 15:28:38.657476418 +0200 ++++ linux-3.10.30/fs/f2fs/f2fs.h 2014-05-19 19:07:24.273307431 +0200 @@ -17,6 +17,14 @@ #include <linux/slab.h> #include <linux/crc32.h> @@ -531360,9 +531685,9 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/f2fs.h linux-linaro-stable-mx6/fs/f2fs/f2fs #define stat_inc_seg_count(si, type) #define stat_inc_tot_blk_count(si, blks) #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 +diff -Nur linux-3.10.30.orig/fs/f2fs/file.c linux-3.10.30/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-16 15:28:38.657476418 +0200 ++++ linux-3.10.30/fs/f2fs/file.c 2014-05-19 19:07:24.273307431 +0200 @@ -35,18 +35,18 @@ struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb); block_t old_blk_addr; @@ -531690,9 +532015,9 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/file.c linux-linaro-stable-mx6/fs/f2fs/file { unsigned int oldflags; -diff -Nur linux-3.10.30.orig/fs/f2fs/gc.c linux-linaro-stable-mx6/fs/f2fs/gc.c +diff -Nur linux-3.10.30.orig/fs/f2fs/gc.c linux-3.10.30/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-16 15:28:38.657476418 +0200 ++++ linux-3.10.30/fs/f2fs/gc.c 2014-05-19 19:07:24.273307431 +0200 @@ -29,10 +29,11 @@ static int gc_thread_func(void *data) { @@ -531999,9 +532324,9 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/gc.c linux-linaro-stable-mx6/fs/f2fs/gc.c data_page = get_lock_data_page(inode, start_bidx + ofs_in_node); if (IS_ERR(data_page)) -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/gc.h linux-3.10.30/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-16 15:28:38.657476418 +0200 ++++ linux-3.10.30/fs/f2fs/gc.h 2014-05-19 19:07:24.273307431 +0200 @@ -13,18 +13,26 @@ * whether IO subsystem is idle * or not @@ -532070,9 +532395,9 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/gc.h linux-linaro-stable-mx6/fs/f2fs/gc.h return wait; } -diff -Nur linux-3.10.30.orig/fs/f2fs/inode.c linux-linaro-stable-mx6/fs/f2fs/inode.c +diff -Nur linux-3.10.30.orig/fs/f2fs/inode.c linux-3.10.30/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-16 15:28:38.657476418 +0200 ++++ linux-3.10.30/fs/f2fs/inode.c 2014-05-19 19:07:24.273307431 +0200 @@ -37,6 +37,31 @@ inode->i_flags |= S_DIRSYNC; } @@ -532268,9 +532593,9 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/inode.c linux-linaro-stable-mx6/fs/f2fs/ino sb_end_intwrite(inode->i_sb); no_delete: -diff -Nur linux-3.10.30.orig/fs/f2fs/Kconfig linux-linaro-stable-mx6/fs/f2fs/Kconfig +diff -Nur linux-3.10.30.orig/fs/f2fs/Kconfig linux-3.10.30/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-16 15:28:38.657476418 +0200 ++++ linux-3.10.30/fs/f2fs/Kconfig 2014-05-19 19:07:24.273307431 +0200 @@ -51,3 +51,23 @@ Linux website <http://acl.bestbits.at/>. @@ -532295,9 +532620,9 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/Kconfig linux-linaro-stable-mx6/fs/f2fs/Kco + Enables BUG_ONs which check the file system consistency in runtime. + + 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 +diff -Nur linux-3.10.30.orig/fs/f2fs/namei.c linux-3.10.30/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-16 15:28:38.657476418 +0200 ++++ linux-3.10.30/fs/f2fs/namei.c 2014-05-19 19:07:24.273307431 +0200 @@ -27,19 +27,19 @@ nid_t ino; struct inode *inode; @@ -532609,9 +532934,9 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/namei.c linux-linaro-stable-mx6/fs/f2fs/nam .setattr = f2fs_setattr, .get_acl = f2fs_get_acl, #ifdef CONFIG_F2FS_FS_XATTR -diff -Nur linux-3.10.30.orig/fs/f2fs/node.c linux-linaro-stable-mx6/fs/f2fs/node.c +diff -Nur linux-3.10.30.orig/fs/f2fs/node.c linux-3.10.30/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-16 15:28:38.657476418 +0200 ++++ linux-3.10.30/fs/f2fs/node.c 2014-05-19 19:07:24.273307431 +0200 @@ -204,7 +204,7 @@ } e->ni = *ni; @@ -533210,9 +533535,9 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/node.c linux-linaro-stable-mx6/fs/f2fs/node write_unlock(&nm_i->nat_tree_lock); kfree(nm_i->nat_bitmap); -diff -Nur linux-3.10.30.orig/fs/f2fs/node.h linux-linaro-stable-mx6/fs/f2fs/node.h +diff -Nur linux-3.10.30.orig/fs/f2fs/node.h linux-3.10.30/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-16 15:28:38.657476418 +0200 ++++ linux-3.10.30/fs/f2fs/node.h 2014-05-19 19:07:24.273307431 +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) @@ -533431,9 +533756,9 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/node.h linux-linaro-stable-mx6/fs/f2fs/node } +#define set_dentry_mark(page, mark) set_mark(page, mark, DENT_BIT_SHIFT) +#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 +diff -Nur linux-3.10.30.orig/fs/f2fs/recovery.c linux-3.10.30/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-16 15:28:38.657476418 +0200 ++++ linux-3.10.30/fs/f2fs/recovery.c 2014-05-19 19:07:24.273307431 +0200 @@ -40,45 +40,71 @@ static int recover_dentry(struct page *ipage, struct inode *inode) @@ -533870,9 +534195,9 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/recovery.c linux-linaro-stable-mx6/fs/f2fs/ + write_checkpoint(sbi, false); return err; } -diff -Nur linux-3.10.30.orig/fs/f2fs/segment.c linux-linaro-stable-mx6/fs/f2fs/segment.c +diff -Nur linux-3.10.30.orig/fs/f2fs/segment.c linux-3.10.30/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-16 15:28:38.657476418 +0200 ++++ linux-3.10.30/fs/f2fs/segment.c 2014-05-19 19:07:24.273307431 +0200 @@ -36,6 +36,14 @@ } } @@ -534445,9 +534770,9 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/segment.c linux-linaro-stable-mx6/fs/f2fs/s destroy_dirty_segmap(sbi); destroy_curseg(sbi); destroy_free_segmap(sbi); -diff -Nur linux-3.10.30.orig/fs/f2fs/segment.h linux-linaro-stable-mx6/fs/f2fs/segment.h +diff -Nur linux-3.10.30.orig/fs/f2fs/segment.h linux-3.10.30/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-16 15:28:38.657476418 +0200 ++++ linux-3.10.30/fs/f2fs/segment.h 2014-05-19 19:07:24.277307446 +0200 @@ -14,6 +14,8 @@ #define NULL_SEGNO ((unsigned int)(~0)) #define NULL_SECNO ((unsigned int)(~0)) @@ -534559,9 +534884,9 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/segment.h linux-linaro-stable-mx6/fs/f2fs/s static inline pgoff_t current_sit_addr(struct f2fs_sb_info *sbi, unsigned int start) -diff -Nur linux-3.10.30.orig/fs/f2fs/super.c linux-linaro-stable-mx6/fs/f2fs/super.c +diff -Nur linux-3.10.30.orig/fs/f2fs/super.c linux-3.10.30/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-16 15:28:38.657476418 +0200 ++++ linux-3.10.30/fs/f2fs/super.c 2014-05-19 19:07:24.277307446 +0200 @@ -18,45 +18,185 @@ #include <linux/parser.h> #include <linux/mount.h> @@ -535368,9 +535693,9 @@ 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 +diff -Nur linux-3.10.30.orig/fs/f2fs/xattr.c linux-3.10.30/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-16 15:28:38.657476418 +0200 ++++ linux-3.10.30/fs/f2fs/xattr.c 2014-05-19 19:07:24.277307446 +0200 @@ -20,6 +20,7 @@ */ #include <linux/rwsem.h> @@ -535927,9 +536252,9 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/xattr.c linux-linaro-stable-mx6/fs/f2fs/xat + + return err; +} -diff -Nur linux-3.10.30.orig/fs/f2fs/xattr.h linux-linaro-stable-mx6/fs/f2fs/xattr.h +diff -Nur linux-3.10.30.orig/fs/f2fs/xattr.h linux-3.10.30/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-16 15:28:38.657476418 +0200 ++++ linux-3.10.30/fs/f2fs/xattr.h 2014-05-19 19:07:24.277307446 +0200 @@ -51,7 +51,7 @@ #define XATTR_HDR(ptr) ((struct f2fs_xattr_header *)(ptr)) @@ -536006,9 +536331,9 @@ diff -Nur linux-3.10.30.orig/fs/f2fs/xattr.h linux-linaro-stable-mx6/fs/f2fs/xat +} +#endif #endif /* __F2FS_XATTR_H__ */ -diff -Nur linux-3.10.30.orig/fs/jffs2/fs.c linux-linaro-stable-mx6/fs/jffs2/fs.c +diff -Nur linux-3.10.30.orig/fs/jffs2/fs.c linux-3.10.30/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-16 15:28:38.693476608 +0200 ++++ linux-3.10.30/fs/jffs2/fs.c 2014-05-19 19:07:24.277307446 +0200 @@ -515,6 +515,10 @@ c = JFFS2_SB_INFO(sb); @@ -536020,9 +536345,9 @@ diff -Nur linux-3.10.30.orig/fs/jffs2/fs.c linux-linaro-stable-mx6/fs/jffs2/fs.c #ifndef CONFIG_JFFS2_FS_WRITEBUFFER if (c->mtd->type == MTD_NANDFLASH) { 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 +diff -Nur linux-3.10.30.orig/include/asm-generic/gpio.h linux-3.10.30/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-16 15:28:38.905477726 +0200 ++++ linux-3.10.30/include/asm-generic/gpio.h 2014-05-19 19:07:24.277307446 +0200 @@ -10,6 +10,8 @@ #ifdef CONFIG_GPIOLIB @@ -536294,9 +536619,9 @@ diff -Nur linux-3.10.30.orig/include/asm-generic/gpio.h linux-linaro-stable-mx6/ -#endif /* CONFIG_GPIO_SYSFS */ - #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 +diff -Nur linux-3.10.30.orig/include/drm/drm_crtc_helper.h linux-3.10.30/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-16 15:28:38.913477768 +0200 ++++ linux-3.10.30/include/drm/drm_crtc_helper.h 2014-05-19 19:07:24.277307446 +0200 @@ -127,6 +127,7 @@ extern int drm_helper_probe_single_connector_modes(struct drm_connector *connector, uint32_t maxX, uint32_t maxY); @@ -536305,9 +536630,9 @@ diff -Nur linux-3.10.30.orig/include/drm/drm_crtc_helper.h linux-linaro-stable-m extern int drm_crtc_helper_set_config(struct drm_mode_set *set); extern bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, 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 +diff -Nur linux-3.10.30.orig/include/dt-bindings/clock/imx6sl-clock.h linux-3.10.30/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-16 15:28:38.921477810 +0200 ++++ linux-3.10.30/include/dt-bindings/clock/imx6sl-clock.h 2014-05-19 19:07:24.277307446 +0200 @@ -0,0 +1,152 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -536461,9 +536786,9 @@ diff -Nur linux-3.10.30.orig/include/dt-bindings/clock/imx6sl-clock.h linux-lina +#define IMX6SL_CLK_CLK_END 137 + +#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 +diff -Nur linux-3.10.30.orig/include/dt-bindings/clock/vf610-clock.h linux-3.10.30/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-16 15:28:38.921477810 +0200 ++++ linux-3.10.30/include/dt-bindings/clock/vf610-clock.h 2014-05-19 19:07:24.277307446 +0200 @@ -0,0 +1,165 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -536630,9 +536955,9 @@ diff -Nur linux-3.10.30.orig/include/dt-bindings/clock/vf610-clock.h linux-linar +#define VF610_CLK_END 150 + +#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 +diff -Nur linux-3.10.30.orig/include/linux/arm-cci.h linux-3.10.30/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-16 15:28:38.925477831 +0200 ++++ linux-3.10.30/include/linux/arm-cci.h 2014-05-19 19:07:24.277307446 +0200 @@ -0,0 +1,61 @@ +/* + * CCI cache coherent interconnect support @@ -536695,9 +537020,9 @@ diff -Nur linux-3.10.30.orig/include/linux/arm-cci.h linux-linaro-stable-mx6/inc + __cci_control_port_by_index(dev, true) + +#endif -diff -Nur linux-3.10.30.orig/include/linux/arm-hdlcd.h linux-linaro-stable-mx6/include/linux/arm-hdlcd.h +diff -Nur linux-3.10.30.orig/include/linux/arm-hdlcd.h linux-3.10.30/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-16 15:28:38.925477831 +0200 ++++ linux-3.10.30/include/linux/arm-hdlcd.h 2014-05-19 19:07:24.281307461 +0200 @@ -0,0 +1,122 @@ +/* + * include/linux/arm-hdlcd.h @@ -536821,9 +537146,9 @@ diff -Nur linux-3.10.30.orig/include/linux/arm-hdlcd.h linux-linaro-stable-mx6/i + struct completion vsync_completion; + unsigned char *edid; +}; -diff -Nur linux-3.10.30.orig/include/linux/backlight.h linux-linaro-stable-mx6/include/linux/backlight.h +diff -Nur linux-3.10.30.orig/include/linux/backlight.h linux-3.10.30/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-16 15:28:38.929477852 +0200 ++++ linux-3.10.30/include/linux/backlight.h 2014-05-19 19:07:24.281307461 +0200 @@ -9,6 +9,7 @@ #define _LINUX_BACKLIGHT_H @@ -536844,9 +537169,9 @@ 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 +diff -Nur linux-3.10.30.orig/include/linux/busfreq-imx6.h linux-3.10.30/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-16 15:28:38.933477873 +0200 ++++ linux-3.10.30/include/linux/busfreq-imx6.h 2014-05-19 19:07:24.281307461 +0200 @@ -0,0 +1,23 @@ +/* + * Copyright 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -536871,9 +537196,9 @@ diff -Nur linux-3.10.30.orig/include/linux/busfreq-imx6.h linux-linaro-stable-mx +void request_bus_freq(enum bus_freq_mode mode); +void release_bus_freq(enum bus_freq_mode mode); +#endif -diff -Nur linux-3.10.30.orig/include/linux/component.h linux-linaro-stable-mx6/include/linux/component.h +diff -Nur linux-3.10.30.orig/include/linux/component.h linux-3.10.30/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-16 15:28:38.945477937 +0200 ++++ linux-3.10.30/include/linux/component.h 2014-05-19 19:07:24.281307461 +0200 @@ -0,0 +1,32 @@ +#ifndef COMPONENT_H +#define COMPONENT_H @@ -536907,9 +537232,9 @@ diff -Nur linux-3.10.30.orig/include/linux/component.h linux-linaro-stable-mx6/i + int (*compare)(struct device *, void *), void *compare_data); + +#endif -diff -Nur linux-3.10.30.orig/include/linux/cpufreq.h linux-linaro-stable-mx6/include/linux/cpufreq.h +diff -Nur linux-3.10.30.orig/include/linux/cpufreq.h linux-3.10.30/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-16 15:28:38.945477937 +0200 ++++ linux-3.10.30/include/linux/cpufreq.h 2014-05-19 19:07:24.281307461 +0200 @@ -393,6 +393,9 @@ #elif defined(CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE) extern struct cpufreq_governor cpufreq_gov_conservative; @@ -536920,9 +537245,9 @@ diff -Nur linux-3.10.30.orig/include/linux/cpufreq.h linux-linaro-stable-mx6/inc #endif -diff -Nur linux-3.10.30.orig/include/linux/cpu.h linux-linaro-stable-mx6/include/linux/cpu.h +diff -Nur linux-3.10.30.orig/include/linux/cpu.h linux-3.10.30/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-16 15:28:38.945477937 +0200 ++++ linux-3.10.30/include/linux/cpu.h 2014-05-19 19:07:24.281307461 +0200 @@ -29,6 +29,7 @@ extern int register_cpu(struct cpu *cpu, int num); extern struct device *get_cpu_device(unsigned cpu); @@ -536943,9 +537268,9 @@ diff -Nur linux-3.10.30.orig/include/linux/cpu.h linux-linaro-stable-mx6/include +void idle_notifier_call_chain(unsigned long val); + #endif /* _LINUX_CPU_H_ */ -diff -Nur linux-3.10.30.orig/include/linux/debugfs.h linux-linaro-stable-mx6/include/linux/debugfs.h +diff -Nur linux-3.10.30.orig/include/linux/debugfs.h linux-3.10.30/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-16 15:28:38.953477979 +0200 ++++ linux-3.10.30/include/linux/debugfs.h 2014-05-19 19:07:24.281307461 +0200 @@ -79,6 +79,8 @@ struct dentry *parent, u64 *value); struct dentry *debugfs_create_size_t(const char *name, umode_t mode, @@ -536955,9 +537280,9 @@ diff -Nur linux-3.10.30.orig/include/linux/debugfs.h linux-linaro-stable-mx6/inc struct dentry *debugfs_create_bool(const char *name, umode_t mode, struct dentry *parent, u32 *value); -diff -Nur linux-3.10.30.orig/include/linux/device_cooling.h linux-linaro-stable-mx6/include/linux/device_cooling.h +diff -Nur linux-3.10.30.orig/include/linux/device_cooling.h linux-3.10.30/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-16 15:28:38.957478000 +0200 ++++ linux-3.10.30/include/linux/device_cooling.h 2014-05-19 19:07:24.281307461 +0200 @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -537004,9 +537329,9 @@ diff -Nur linux-3.10.30.orig/include/linux/device_cooling.h linux-linaro-stable- +} +#endif +#endif /* __DEVICE_THERMAL_H__ */ -diff -Nur linux-3.10.30.orig/include/linux/device.h linux-linaro-stable-mx6/include/linux/device.h +diff -Nur linux-3.10.30.orig/include/linux/device.h linux-3.10.30/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-16 15:28:38.953477979 +0200 ++++ linux-3.10.30/include/linux/device.h 2014-05-19 19:07:24.281307461 +0200 @@ -47,7 +47,11 @@ }; @@ -537089,9 +537414,9 @@ diff -Nur linux-3.10.30.orig/include/linux/device.h linux-linaro-stable-mx6/incl #define DEVICE_ULONG_ATTR(_name, _mode, _var) \ struct dev_ext_attribute dev_attr_##_name = \ { __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 +diff -Nur linux-3.10.30.orig/include/linux/dmaengine.h linux-3.10.30/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-16 15:28:38.957478000 +0200 ++++ linux-3.10.30/include/linux/dmaengine.h 2014-05-19 19:07:24.285307476 +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 @@ -537110,9 +537435,9 @@ 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 +diff -Nur linux-3.10.30.orig/include/linux/err.h linux-3.10.30/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-16 15:28:38.961478021 +0200 ++++ linux-3.10.30/include/linux/err.h 2014-05-19 19:07:24.285307476 +0200 @@ -52,7 +52,7 @@ return (void *) ptr; } @@ -537132,9 +537457,9 @@ diff -Nur linux-3.10.30.orig/include/linux/err.h linux-linaro-stable-mx6/include #endif #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 +diff -Nur linux-3.10.30.orig/include/linux/f2fs_fs.h linux-3.10.30/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-16 15:28:38.961478021 +0200 ++++ linux-3.10.30/include/linux/f2fs_fs.h 2014-05-19 19:07:24.285307476 +0200 @@ -140,14 +140,24 @@ } __packed; @@ -537173,9 +537498,9 @@ diff -Nur linux-3.10.30.orig/include/linux/f2fs_fs.h linux-linaro-stable-mx6/inc __le32 i_nid[5]; /* direct(2), indirect(2), double_indirect(1) node id */ -diff -Nur linux-3.10.30.orig/include/linux/genalloc.h linux-linaro-stable-mx6/include/linux/genalloc.h +diff -Nur linux-3.10.30.orig/include/linux/genalloc.h linux-3.10.30/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-16 15:28:38.969478063 +0200 ++++ linux-3.10.30/include/linux/genalloc.h 2014-05-19 19:07:24.285307476 +0200 @@ -94,6 +94,8 @@ } extern void gen_pool_destroy(struct gen_pool *); @@ -537185,9 +537510,9 @@ diff -Nur linux-3.10.30.orig/include/linux/genalloc.h linux-linaro-stable-mx6/in extern void gen_pool_free(struct gen_pool *, unsigned long, size_t); extern void gen_pool_for_each_chunk(struct gen_pool *, 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 +diff -Nur linux-3.10.30.orig/include/linux/gpio/consumer.h linux-3.10.30/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-16 15:28:38.969478063 +0200 ++++ linux-3.10.30/include/linux/gpio/consumer.h 2014-05-19 19:07:24.285307476 +0200 @@ -0,0 +1,253 @@ +#ifndef __LINUX_GPIO_CONSUMER_H +#define __LINUX_GPIO_CONSUMER_H @@ -537442,9 +537767,9 @@ diff -Nur linux-3.10.30.orig/include/linux/gpio/consumer.h linux-linaro-stable-m +#endif /* CONFIG_GPIOLIB && CONFIG_GPIO_SYSFS */ + +#endif -diff -Nur linux-3.10.30.orig/include/linux/gpio/driver.h linux-linaro-stable-mx6/include/linux/gpio/driver.h +diff -Nur linux-3.10.30.orig/include/linux/gpio/driver.h linux-3.10.30/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-16 15:28:38.969478063 +0200 ++++ linux-3.10.30/include/linux/gpio/driver.h 2014-05-19 19:07:24.285307476 +0200 @@ -0,0 +1,190 @@ +#ifndef __LINUX_GPIO_DRIVER_H +#define __LINUX_GPIO_DRIVER_H @@ -537636,9 +537961,9 @@ diff -Nur linux-3.10.30.orig/include/linux/gpio/driver.h linux-linaro-stable-mx6 +void gpiod_add_table(struct gpiod_lookup *table, size_t size); + +#endif -diff -Nur linux-3.10.30.orig/include/linux/gpio.h linux-linaro-stable-mx6/include/linux/gpio.h +diff -Nur linux-3.10.30.orig/include/linux/gpio.h linux-3.10.30/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-16 15:28:38.969478063 +0200 ++++ linux-3.10.30/include/linux/gpio.h 2014-05-19 19:07:24.285307476 +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) @@ -537680,9 +538005,9 @@ diff -Nur linux-3.10.30.orig/include/linux/gpio.h linux-linaro-stable-mx6/includ static inline int irq_to_gpio(unsigned irq) { /* 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 +diff -Nur linux-3.10.30.orig/include/linux/hardirq.h linux-3.10.30/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-16 15:28:38.969478063 +0200 ++++ linux-3.10.30/include/linux/hardirq.h 2014-05-19 19:07:24.285307476 +0200 @@ -124,8 +124,10 @@ #if defined(CONFIG_SMP) || defined(CONFIG_GENERIC_HARDIRQS) @@ -537694,9 +538019,9 @@ diff -Nur linux-3.10.30.orig/include/linux/hardirq.h linux-linaro-stable-mx6/inc #endif #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 +diff -Nur linux-3.10.30.orig/include/linux/interrupt.h linux-3.10.30/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-16 15:28:38.989478168 +0200 ++++ linux-3.10.30/include/linux/interrupt.h 2014-05-19 19:07:24.289307490 +0200 @@ -219,6 +219,7 @@ extern void disable_percpu_irq(unsigned int irq); extern void enable_irq(unsigned int irq); @@ -537705,9 +538030,9 @@ diff -Nur linux-3.10.30.orig/include/linux/interrupt.h linux-linaro-stable-mx6/i /* The following three functions are for the core kernel use only. */ #ifdef CONFIG_GENERIC_HARDIRQS -diff -Nur linux-3.10.30.orig/include/linux/ipu.h linux-linaro-stable-mx6/include/linux/ipu.h +diff -Nur linux-3.10.30.orig/include/linux/ipu.h linux-3.10.30/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-16 15:28:38.997478211 +0200 ++++ linux-3.10.30/include/linux/ipu.h 2014-05-19 19:07:24.289307490 +0200 @@ -0,0 +1,38 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. @@ -537747,9 +538072,9 @@ diff -Nur linux-3.10.30.orig/include/linux/ipu.h linux-linaro-stable-mx6/include +int ipu_check_task(struct ipu_task *task); + +#endif -diff -Nur linux-3.10.30.orig/include/linux/ipu-v3.h linux-linaro-stable-mx6/include/linux/ipu-v3.h +diff -Nur linux-3.10.30.orig/include/linux/ipu-v3.h linux-3.10.30/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-16 15:28:38.997478211 +0200 ++++ linux-3.10.30/include/linux/ipu-v3.h 2014-05-19 19:07:24.289307490 +0200 @@ -0,0 +1,752 @@ +/* + * Copyright (c) 2010 Sascha Hauer <s.hauer@pengutronix.de> @@ -538503,9 +538828,9 @@ 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 +diff -Nur linux-3.10.30.orig/include/linux/irqchip/arm-gic.h linux-3.10.30/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-16 15:28:39.001478232 +0200 ++++ linux-3.10.30/include/linux/irqchip/arm-gic.h 2014-05-19 19:07:24.289307490 +0200 @@ -31,6 +31,8 @@ #define GIC_DIST_TARGET 0x800 #define GIC_DIST_CONFIG 0xc00 @@ -538535,9 +538860,9 @@ diff -Nur linux-3.10.30.orig/include/linux/irqchip/arm-gic.h linux-linaro-stable #endif /* __ASSEMBLY */ #endif -diff -Nur linux-3.10.30.orig/include/linux/isl29023.h linux-linaro-stable-mx6/include/linux/isl29023.h +diff -Nur linux-3.10.30.orig/include/linux/isl29023.h linux-3.10.30/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-16 15:28:39.009478274 +0200 ++++ linux-3.10.30/include/linux/isl29023.h 2014-05-19 19:07:24.289307490 +0200 @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -538586,9 +538911,9 @@ diff -Nur linux-3.10.30.orig/include/linux/isl29023.h linux-linaro-stable-mx6/in +#define ISL29023_RANGE_64K 0x3 + +#endif -diff -Nur linux-3.10.30.orig/include/linux/mfd/max17135.h linux-linaro-stable-mx6/include/linux/mfd/max17135.h +diff -Nur linux-3.10.30.orig/include/linux/mfd/max17135.h linux-3.10.30/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-16 15:28:39.025478358 +0200 ++++ linux-3.10.30/include/linux/mfd/max17135.h 2014-05-19 19:07:24.289307490 +0200 @@ -0,0 +1,220 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -538810,9 +539135,9 @@ diff -Nur linux-3.10.30.orig/include/linux/mfd/max17135.h linux-linaro-stable-mx +int max17135_reg_write(int reg_num, const unsigned int reg_val); + +#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 +diff -Nur linux-3.10.30.orig/include/linux/mfd/mxc-hdmi-core.h linux-3.10.30/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-16 15:28:39.025478358 +0200 ++++ linux-3.10.30/include/linux/mfd/mxc-hdmi-core.h 2014-05-19 19:07:24.289307490 +0200 @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -538878,9 +539203,9 @@ diff -Nur linux-3.10.30.orig/include/linux/mfd/mxc-hdmi-core.h linux-linaro-stab +int check_hdmi_state(void); + +#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 +diff -Nur linux-3.10.30.orig/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h linux-3.10.30/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-16 15:28:39.113478822 +0200 ++++ linux-3.10.30/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h 2014-05-19 19:07:24.289307490 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Freescale Semiconductor, Inc. @@ -539082,9 +539407,9 @@ diff -Nur linux-3.10.30.orig/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h linux-l +#define IMX6SL_GPR1_FEC_CLOCK_MUX2_SEL_MASK (0x1 << 14) #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 +diff -Nur linux-3.10.30.orig/include/linux/mipi_csi2.h linux-3.10.30/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-16 15:28:39.209479329 +0200 ++++ linux-3.10.30/include/linux/mipi_csi2.h 2014-05-19 19:07:24.289307490 +0200 @@ -0,0 +1,91 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -539177,9 +539502,9 @@ diff -Nur linux-3.10.30.orig/include/linux/mipi_csi2.h linux-linaro-stable-mx6/i +int mipi_csi2_reset(struct mipi_csi2_info *info); + +#endif -diff -Nur linux-3.10.30.orig/include/linux/mipi_dsi.h linux-linaro-stable-mx6/include/linux/mipi_dsi.h +diff -Nur linux-3.10.30.orig/include/linux/mipi_dsi.h linux-3.10.30/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-16 15:28:39.209479329 +0200 ++++ linux-3.10.30/include/linux/mipi_dsi.h 2014-05-19 19:07:24.293307505 +0200 @@ -0,0 +1,171 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -539352,9 +539677,9 @@ diff -Nur linux-3.10.30.orig/include/linux/mipi_dsi.h linux-linaro-stable-mx6/in +#define DSI_PHY_CLK_INIT_COMMAND (0x44) +#define DSI_GEN_PLD_DATA_BUF_SIZE (0x4) +#endif -diff -Nur linux-3.10.30.orig/include/linux/mmc/card.h linux-linaro-stable-mx6/include/linux/mmc/card.h +diff -Nur linux-3.10.30.orig/include/linux/mmc/card.h linux-3.10.30/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-16 15:28:39.213479350 +0200 ++++ linux-3.10.30/include/linux/mmc/card.h 2014-05-19 19:07:24.293307505 +0200 @@ -86,10 +86,13 @@ unsigned int data_sector_size; /* 512 bytes or 4KB */ unsigned int data_tag_unit_size; /* DATA TAG UNIT size */ @@ -539377,9 +539702,9 @@ diff -Nur linux-3.10.30.orig/include/linux/mmc/card.h linux-linaro-stable-mx6/in u8 raw_sec_trim_mult; /* 229 */ u8 raw_sec_erase_mult; /* 230 */ 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 +diff -Nur linux-3.10.30.orig/include/linux/mmc/core.h linux-3.10.30/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-16 15:28:39.213479350 +0200 ++++ linux-3.10.30/include/linux/mmc/core.h 2014-05-19 19:07:24.293307505 +0200 @@ -96,6 +96,8 @@ */ @@ -539389,9 +539714,9 @@ diff -Nur linux-3.10.30.orig/include/linux/mmc/core.h linux-linaro-stable-mx6/in struct mmc_data *data; /* data segment associated with cmd */ 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 +diff -Nur linux-3.10.30.orig/include/linux/mmc/host.h linux-3.10.30/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-16 15:28:39.213479350 +0200 ++++ linux-3.10.30/include/linux/mmc/host.h 2014-05-19 19:07:24.293307505 +0200 @@ -281,6 +281,8 @@ #define MMC_CAP2_PACKED_CMD (MMC_CAP2_PACKED_RD | \ MMC_CAP2_PACKED_WR) @@ -539431,9 +539756,9 @@ diff -Nur linux-3.10.30.orig/include/linux/mmc/host.h linux-linaro-stable-mx6/in #ifdef CONFIG_REGULATOR int mmc_regulator_get_ocrmask(struct regulator *supply); 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 +diff -Nur linux-3.10.30.orig/include/linux/mmc/mmc.h linux-3.10.30/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-16 15:28:39.213479350 +0200 ++++ linux-3.10.30/include/linux/mmc/mmc.h 2014-05-19 19:07:24.293307505 +0200 @@ -292,6 +292,7 @@ #define EXT_CSD_RPMB_MULT 168 /* RO */ #define EXT_CSD_BOOT_WP 173 /* R/W */ @@ -539480,9 +539805,9 @@ diff -Nur linux-3.10.30.orig/include/linux/mmc/mmc.h linux-linaro-stable-mx6/inc #define EXT_CSD_RST_N_EN_MASK 0x3 #define EXT_CSD_RST_N_ENABLED 1 /* RST_n is enabled on card */ -diff -Nur linux-3.10.30.orig/include/linux/mmc/sdhci.h linux-linaro-stable-mx6/include/linux/mmc/sdhci.h +diff -Nur linux-3.10.30.orig/include/linux/mmc/sdhci.h linux-3.10.30/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-16 15:28:39.213479350 +0200 ++++ linux-3.10.30/include/linux/mmc/sdhci.h 2014-05-19 19:07:24.293307505 +0200 @@ -57,12 +57,8 @@ #define SDHCI_QUIRK_BROKEN_CARD_DETECTION (1<<15) /* Controller reports inverted write-protect state */ @@ -539546,9 +539871,9 @@ diff -Nur linux-3.10.30.orig/include/linux/mmc/sdhci.h linux-linaro-stable-mx6/i wait_queue_head_t buf_ready_int; /* Waitqueue for Buffer Read Ready interrupt */ unsigned int tuning_done; /* Condition flag set when CMD19 succeeds */ -diff -Nur linux-3.10.30.orig/include/linux/mmc/sdio_ids.h linux-linaro-stable-mx6/include/linux/mmc/sdio_ids.h +diff -Nur linux-3.10.30.orig/include/linux/mmc/sdio_ids.h linux-3.10.30/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-16 15:28:39.213479350 +0200 ++++ linux-3.10.30/include/linux/mmc/sdio_ids.h 2014-05-19 19:07:24.293307505 +0200 @@ -23,6 +23,15 @@ /* * Vendors and devices. Sort key: vendor first, device next. @@ -539565,9 +539890,9 @@ diff -Nur linux-3.10.30.orig/include/linux/mmc/sdio_ids.h linux-linaro-stable-mx #define SDIO_VENDOR_ID_INTEL 0x0089 #define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX 0x1402 #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 +diff -Nur linux-3.10.30.orig/include/linux/mmc/slot-gpio.h linux-3.10.30/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-16 15:28:39.217479371 +0200 ++++ linux-3.10.30/include/linux/mmc/slot-gpio.h 2014-05-19 19:07:24.293307505 +0200 @@ -18,7 +18,8 @@ void mmc_gpio_free_ro(struct mmc_host *host); @@ -539578,9 +539903,9 @@ diff -Nur linux-3.10.30.orig/include/linux/mmc/slot-gpio.h linux-linaro-stable-m void mmc_gpio_free_cd(struct mmc_host *host); #endif -diff -Nur linux-3.10.30.orig/include/linux/msi.h linux-linaro-stable-mx6/include/linux/msi.h +diff -Nur linux-3.10.30.orig/include/linux/msi.h linux-3.10.30/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-16 15:28:39.221479392 +0200 ++++ linux-3.10.30/include/linux/msi.h 2014-05-19 19:07:24.293307505 +0200 @@ -35,6 +35,7 @@ u32 masked; /* mask bits */ @@ -539622,9 +539947,9 @@ 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 +diff -Nur linux-3.10.30.orig/include/linux/mtd/bbm.h linux-3.10.30/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-16 15:28:39.225479413 +0200 ++++ linux-3.10.30/include/linux/mtd/bbm.h 2014-05-19 19:07:24.293307505 +0200 @@ -91,10 +91,6 @@ * with NAND_BBT_CREATE. */ @@ -539636,9 +539961,9 @@ diff -Nur linux-3.10.30.orig/include/linux/mtd/bbm.h linux-linaro-stable-mx6/inc /* Write bbt if neccecary */ #define NAND_BBT_WRITE 0x00002000 /* 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 +diff -Nur linux-3.10.30.orig/include/linux/mtd/map.h linux-3.10.30/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-16 15:28:39.225479413 +0200 ++++ linux-3.10.30/include/linux/mtd/map.h 2014-05-19 19:07:24.293307505 +0200 @@ -438,7 +438,7 @@ if (map->cached) memcpy(to, (char *)map->cached + from, len); @@ -539648,9 +539973,9 @@ 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 +diff -Nur linux-3.10.30.orig/include/linux/mtd/mtd.h linux-3.10.30/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-16 15:28:39.225479413 +0200 ++++ linux-3.10.30/include/linux/mtd/mtd.h 2014-05-19 19:07:24.293307505 +0200 @@ -173,6 +173,9 @@ /* ECC layout structure pointer - read only! */ struct nand_ecclayout *ecclayout; @@ -539673,9 +539998,9 @@ diff -Nur linux-3.10.30.orig/include/linux/mtd/mtd.h linux-linaro-stable-mx6/inc static inline int mtd_can_have_bb(const struct mtd_info *mtd) { 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 +diff -Nur linux-3.10.30.orig/include/linux/mtd/nand.h linux-3.10.30/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-16 15:28:39.225479413 +0200 ++++ linux-3.10.30/include/linux/mtd/nand.h 2014-05-19 19:07:24.293307505 +0200 @@ -56,7 +56,7 @@ * is supported now. If you add a chip with bigger oobsize/page * adjust this accordingly. @@ -539890,9 +540215,9 @@ diff -Nur linux-3.10.30.orig/include/linux/mtd/nand.h linux-linaro-stable-mx6/in + return chip->bits_per_cell == 1; +} #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 +diff -Nur linux-3.10.30.orig/include/linux/mxc_asrc.h linux-3.10.30/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-16 15:28:39.229479434 +0200 ++++ linux-3.10.30/include/linux/mxc_asrc.h 2014-05-19 19:07:24.293307505 +0200 @@ -0,0 +1,386 @@ +/* + * Copyright 2008-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -540280,9 +540605,9 @@ diff -Nur linux-3.10.30.orig/include/linux/mxc_asrc.h linux-linaro-stable-mx6/in + u32 in_wm, u32 out_wm); + +#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 +diff -Nur linux-3.10.30.orig/include/linux/mxcfb_epdc.h linux-3.10.30/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-16 15:28:39.233479455 +0200 ++++ linux-3.10.30/include/linux/mxcfb_epdc.h 2014-05-19 19:07:24.297307520 +0200 @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -540356,9 +540681,9 @@ diff -Nur linux-3.10.30.orig/include/linux/mxcfb_epdc.h linux-linaro-stable-mx6/ +int mxc_spdc_get_pwrdown_delay(struct fb_info *info); +int mxc_spdc_fb_set_upd_scheme(u32 upd_scheme, struct fb_info *info); +#endif -diff -Nur linux-3.10.30.orig/include/linux/mxcfb.h linux-linaro-stable-mx6/include/linux/mxcfb.h +diff -Nur linux-3.10.30.orig/include/linux/mxcfb.h linux-3.10.30/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-16 15:28:39.229479434 +0200 ++++ linux-3.10.30/include/linux/mxcfb.h 2014-05-19 19:07:24.297307520 +0200 @@ -0,0 +1,46 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -540406,9 +540731,9 @@ diff -Nur linux-3.10.30.orig/include/linux/mxcfb.h linux-linaro-stable-mx6/inclu + int num_modes, int dev_mode); + +#endif -diff -Nur linux-3.10.30.orig/include/linux/mxc_mlb.h linux-linaro-stable-mx6/include/linux/mxc_mlb.h +diff -Nur linux-3.10.30.orig/include/linux/mxc_mlb.h linux-3.10.30/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-16 15:28:39.229479434 +0200 ++++ linux-3.10.30/include/linux/mxc_mlb.h 2014-05-19 19:07:24.297307520 +0200 @@ -0,0 +1,55 @@ +/* + * mxc_mlb.h @@ -540465,9 +540790,9 @@ 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 +diff -Nur linux-3.10.30.orig/include/linux/mxc_v4l2.h linux-3.10.30/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-16 15:28:39.229479434 +0200 ++++ linux-3.10.30/include/linux/mxc_v4l2.h 2014-05-19 19:07:24.297307520 +0200 @@ -0,0 +1,27 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -540496,9 +540821,9 @@ diff -Nur linux-3.10.30.orig/include/linux/mxc_v4l2.h linux-linaro-stable-mx6/in +#include <uapi/linux/mxc_v4l2.h> + +#endif -diff -Nur linux-3.10.30.orig/include/linux/mxc_vpu.h linux-linaro-stable-mx6/include/linux/mxc_vpu.h +diff -Nur linux-3.10.30.orig/include/linux/mxc_vpu.h linux-3.10.30/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-16 15:28:39.229479434 +0200 ++++ linux-3.10.30/include/linux/mxc_vpu.h 2014-05-19 19:07:24.297307520 +0200 @@ -0,0 +1,118 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -540618,9 +540943,9 @@ diff -Nur linux-3.10.30.orig/include/linux/mxc_vpu.h linux-linaro-stable-mx6/inc +void vl2cc_cleanup(void); + +#endif -diff -Nur linux-3.10.30.orig/include/linux/of_address.h linux-linaro-stable-mx6/include/linux/of_address.h +diff -Nur linux-3.10.30.orig/include/linux/of_address.h linux-3.10.30/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-16 15:28:39.257479582 +0200 ++++ linux-3.10.30/include/linux/of_address.h 2014-05-19 19:07:24.297307520 +0200 @@ -4,6 +4,36 @@ #include <linux/errno.h> #include <linux/of.h> @@ -540690,9 +541015,9 @@ diff -Nur linux-3.10.30.orig/include/linux/of_address.h linux-linaro-stable-mx6/ #endif /* CONFIG_OF_ADDRESS */ -diff -Nur linux-3.10.30.orig/include/linux/of_gpio.h linux-linaro-stable-mx6/include/linux/of_gpio.h +diff -Nur linux-3.10.30.orig/include/linux/of_gpio.h linux-3.10.30/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-16 15:28:39.261479603 +0200 ++++ linux-3.10.30/include/linux/of_gpio.h 2014-05-19 19:07:24.297307520 +0200 @@ -19,8 +19,10 @@ #include <linux/errno.h> #include <linux/gpio.h> @@ -540769,9 +541094,9 @@ diff -Nur linux-3.10.30.orig/include/linux/of_gpio.h linux-linaro-stable-mx6/inc static inline int of_get_gpio_flags(struct device_node *np, int index, enum of_gpio_flags *flags) { -diff -Nur linux-3.10.30.orig/include/linux/of.h linux-linaro-stable-mx6/include/linux/of.h +diff -Nur linux-3.10.30.orig/include/linux/of.h linux-3.10.30/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-16 15:28:39.257479582 +0200 ++++ linux-3.10.30/include/linux/of.h 2014-05-19 19:07:24.297307520 +0200 @@ -266,6 +266,7 @@ extern const void *of_get_property(const struct device_node *node, const char *name, @@ -540838,9 +541163,9 @@ diff -Nur linux-3.10.30.orig/include/linux/of.h linux-linaro-stable-mx6/include/ #define of_match_ptr(_ptr) NULL #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 +diff -Nur linux-3.10.30.orig/include/linux/of_pci.h linux-3.10.30/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-16 15:28:39.261479603 +0200 ++++ linux-3.10.30/include/linux/of_pci.h 2014-05-19 19:07:24.301307535 +0200 @@ -2,6 +2,7 @@ #define __OF_PCI_H @@ -540868,9 +541193,9 @@ diff -Nur linux-3.10.30.orig/include/linux/of_pci.h linux-linaro-stable-mx6/incl +#endif #endif -diff -Nur linux-3.10.30.orig/include/linux/pci.h linux-linaro-stable-mx6/include/linux/pci.h +diff -Nur linux-3.10.30.orig/include/linux/pci.h linux-3.10.30/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-16 15:28:39.277479687 +0200 ++++ linux-3.10.30/include/linux/pci.h 2014-05-19 19:07:24.301307535 +0200 @@ -432,6 +432,7 @@ struct resource busn_res; /* bus numbers routed to this bus */ @@ -540879,9 +541204,9 @@ diff -Nur linux-3.10.30.orig/include/linux/pci.h linux-linaro-stable-mx6/include void *sysdata; /* hook for sys-specific extension */ struct proc_dir_entry *procdir; /* directory entry in /proc/bus/pci */ -diff -Nur linux-3.10.30.orig/include/linux/pinctrl/consumer.h linux-linaro-stable-mx6/include/linux/pinctrl/consumer.h +diff -Nur linux-3.10.30.orig/include/linux/pinctrl/consumer.h linux-3.10.30/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-16 15:28:39.285479730 +0200 ++++ linux-3.10.30/include/linux/pinctrl/consumer.h 2014-05-19 19:07:24.301307535 +0200 @@ -40,6 +40,25 @@ extern struct pinctrl * __must_check devm_pinctrl_get(struct device *dev); extern void devm_pinctrl_put(struct pinctrl *p); @@ -540930,9 +541255,9 @@ diff -Nur linux-3.10.30.orig/include/linux/pinctrl/consumer.h linux-linaro-stabl #endif -diff -Nur linux-3.10.30.orig/include/linux/pinctrl/devinfo.h linux-linaro-stable-mx6/include/linux/pinctrl/devinfo.h +diff -Nur linux-3.10.30.orig/include/linux/pinctrl/devinfo.h linux-3.10.30/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-16 15:28:39.285479730 +0200 ++++ linux-3.10.30/include/linux/pinctrl/devinfo.h 2014-05-19 19:07:24.301307535 +0200 @@ -28,6 +28,10 @@ struct dev_pin_info { struct pinctrl *p; @@ -540944,9 +541269,9 @@ 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 +diff -Nur linux-3.10.30.orig/include/linux/pinctrl/pinctrl.h linux-3.10.30/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-16 15:28:39.285479730 +0200 ++++ linux-3.10.30/include/linux/pinctrl/pinctrl.h 2014-05-19 19:07:24.325307624 +0200 @@ -49,7 +49,8 @@ * @name: a name for the chip in this range * @id: an ID number for the chip in this range @@ -540965,9 +541290,9 @@ diff -Nur linux-3.10.30.orig/include/linux/pinctrl/pinctrl.h linux-linaro-stable unsigned int npins; struct gpio_chip *gc; }; -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 +diff -Nur linux-3.10.30.orig/include/linux/platform_data/brcmfmac-sdio.h linux-3.10.30/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-16 15:28:39.289479751 +0200 ++++ linux-3.10.30/include/linux/platform_data/brcmfmac-sdio.h 2014-05-19 19:07:24.329307638 +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. @@ -540993,9 +541318,9 @@ diff -Nur linux-3.10.30.orig/include/linux/platform_data/brcmfmac-sdio.h linux-l void (*power_on)(void); void (*power_off)(void); 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 +diff -Nur linux-3.10.30.orig/include/linux/platform_data/dma-imx.h linux-3.10.30/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-16 15:28:39.289479751 +0200 ++++ linux-3.10.30/include/linux/platform_data/dma-imx.h 2014-05-19 19:07:24.329307638 +0200 @@ -1,5 +1,5 @@ /* - * Copyright 2004-2009 Freescale Semiconductor, Inc. All Rights Reserved. @@ -541036,9 +541361,9 @@ diff -Nur linux-3.10.30.orig/include/linux/platform_data/dma-imx.h linux-linaro- static inline int imx_dma_is_general_purpose(struct dma_chan *chan) { 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 +diff -Nur linux-3.10.30.orig/include/linux/platform_data/dma-imx-sdma.h linux-3.10.30/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-16 15:28:39.289479751 +0200 ++++ linux-3.10.30/include/linux/platform_data/dma-imx-sdma.h 2014-05-19 19:07:24.329307638 +0200 @@ -43,6 +43,9 @@ s32 dptc_dvfs_addr; s32 utra_addr; @@ -541049,9 +541374,9 @@ 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 +diff -Nur linux-3.10.30.orig/include/linux/platform_data/mmc-esdhc-imx.h linux-3.10.30/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-16 15:28:39.293479771 +0200 ++++ linux-3.10.30/include/linux/platform_data/mmc-esdhc-imx.h 2014-05-19 19:07:24.329307638 +0200 @@ -10,6 +10,8 @@ #ifndef __ASM_ARCH_IMX_ESDHC_H #define __ASM_ARCH_IMX_ESDHC_H @@ -541077,9 +541402,9 @@ diff -Nur linux-3.10.30.orig/include/linux/platform_data/mmc-esdhc-imx.h linux-l + unsigned int delay_line; }; #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 +diff -Nur linux-3.10.30.orig/include/linux/pmic_status.h linux-3.10.30/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-16 15:28:39.301479814 +0200 ++++ linux-3.10.30/include/linux/pmic_status.h 2014-05-19 19:07:24.329307638 +0200 @@ -0,0 +1,82 @@ +/* + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -541163,9 +541488,9 @@ diff -Nur linux-3.10.30.orig/include/linux/pmic_status.h linux-linaro-stable-mx6 +} while (0); + +#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 +diff -Nur linux-3.10.30.orig/include/linux/power/imx6_usb_charger.h linux-3.10.30/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-16 15:28:39.305479835 +0200 ++++ linux-3.10.30/include/linux/power/imx6_usb_charger.h 2014-05-19 19:07:24.333307653 +0200 @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -541247,9 +541572,9 @@ diff -Nur linux-3.10.30.orig/include/linux/power/imx6_usb_charger.h linux-linaro +#endif + +#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 +diff -Nur linux-3.10.30.orig/include/linux/power/sabresd_battery.h linux-3.10.30/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-16 15:28:39.305479835 +0200 ++++ linux-3.10.30/include/linux/power/sabresd_battery.h 2014-05-19 19:07:24.333307653 +0200 @@ -0,0 +1,65 @@ +/* + * sabresd_battery.h - Maxim 8903 USB/Adapter Charger Driver @@ -541316,9 +541641,9 @@ 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 +diff -Nur linux-3.10.30.orig/include/linux/pxp_dma.h linux-3.10.30/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-16 15:28:39.313479877 +0200 ++++ linux-3.10.30/include/linux/pxp_dma.h 2014-05-19 19:07:24.333307653 +0200 @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -541399,9 +541724,9 @@ diff -Nur linux-3.10.30.orig/include/linux/pxp_dma.h linux-linaro-stable-mx6/inc +#endif + +#endif -diff -Nur linux-3.10.30.orig/include/linux/regulator/consumer.h linux-linaro-stable-mx6/include/linux/regulator/consumer.h +diff -Nur linux-3.10.30.orig/include/linux/regulator/consumer.h linux-3.10.30/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-16 15:28:39.317479898 +0200 ++++ linux-3.10.30/include/linux/regulator/consumer.h 2014-05-19 19:07:24.333307653 +0200 @@ -2,6 +2,7 @@ * consumer.h -- SoC Regulator consumer support. * @@ -541419,9 +541744,9 @@ diff -Nur linux-3.10.30.orig/include/linux/regulator/consumer.h linux-linaro-sta struct regulator; -diff -Nur linux-3.10.30.orig/include/linux/regulator/pfuze100.h linux-linaro-stable-mx6/include/linux/regulator/pfuze100.h +diff -Nur linux-3.10.30.orig/include/linux/regulator/pfuze100.h linux-3.10.30/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-16 15:28:39.317479898 +0200 ++++ linux-3.10.30/include/linux/regulator/pfuze100.h 2014-05-19 19:07:24.333307653 +0200 @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -541467,9 +541792,9 @@ 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 +diff -Nur linux-3.10.30.orig/include/linux/reset.h linux-3.10.30/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-16 15:28:39.321479920 +0200 ++++ linux-3.10.30/include/linux/reset.h 2014-05-19 19:07:24.333307653 +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); @@ -541484,9 +541809,9 @@ diff -Nur linux-3.10.30.orig/include/linux/reset.h linux-linaro-stable-mx6/inclu +#endif /* CONFIG_RESET_CONTROLLER */ #endif -diff -Nur linux-3.10.30.orig/include/linux/sched.h linux-linaro-stable-mx6/include/linux/sched.h +diff -Nur linux-3.10.30.orig/include/linux/sched.h linux-3.10.30/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-16 15:28:39.325479941 +0200 ++++ linux-3.10.30/include/linux/sched.h 2014-05-19 19:07:24.333307653 +0200 @@ -889,6 +889,13 @@ bool cpus_share_cache(int this_cpu, int that_cpu); @@ -541514,9 +541839,9 @@ 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 +diff -Nur linux-3.10.30.orig/include/linux/serial_core.h linux-3.10.30/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-16 15:28:39.325479941 +0200 ++++ linux-3.10.30/include/linux/serial_core.h 2014-05-19 19:07:24.337307668 +0200 @@ -31,6 +31,13 @@ #include <linux/sysrq.h> #include <uapi/linux/serial_core.h> @@ -541531,9 +541856,9 @@ diff -Nur linux-3.10.30.orig/include/linux/serial_core.h linux-linaro-stable-mx6 struct uart_port; struct serial_struct; 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 +diff -Nur linux-3.10.30.orig/include/linux/spi/spi_bitbang.h linux-3.10.30/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-16 15:28:39.429480489 +0200 ++++ linux-3.10.30/include/linux/spi/spi_bitbang.h 2014-05-19 19:07:24.337307668 +0200 @@ -4,11 +4,7 @@ #include <linux/workqueue.h> @@ -541554,9 +541879,9 @@ diff -Nur linux-3.10.30.orig/include/linux/spi/spi_bitbang.h linux-linaro-stable extern int spi_bitbang_setup_transfer(struct spi_device *spi, struct spi_transfer *t); -diff -Nur linux-3.10.30.orig/include/linux/spi/spi.h linux-linaro-stable-mx6/include/linux/spi/spi.h +diff -Nur linux-3.10.30.orig/include/linux/spi/spi.h linux-3.10.30/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-16 15:28:39.429480489 +0200 ++++ linux-3.10.30/include/linux/spi/spi.h 2014-05-19 19:07:24.337307668 +0200 @@ -23,6 +23,7 @@ #include <linux/mod_devicetable.h> #include <linux/slab.h> @@ -541747,9 +542072,9 @@ diff -Nur linux-3.10.30.orig/include/linux/spi/spi.h linux-linaro-stable-mx6/inc /* ... may need additional spi_device chip config data here. * 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 +diff -Nur linux-3.10.30.orig/include/linux/sysfs.h linux-3.10.30/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-16 15:28:39.441480552 +0200 ++++ linux-3.10.30/include/linux/sysfs.h 2014-05-19 19:07:24.337307668 +0200 @@ -92,6 +92,15 @@ #define __ATTR_IGNORE_LOCKDEP __ATTR #endif @@ -541766,9 +542091,9 @@ diff -Nur linux-3.10.30.orig/include/linux/sysfs.h linux-linaro-stable-mx6/inclu #define attr_name(_attr) (_attr).attr.name struct file; -diff -Nur linux-3.10.30.orig/include/linux/usb/chipidea.h linux-linaro-stable-mx6/include/linux/usb/chipidea.h +diff -Nur linux-3.10.30.orig/include/linux/usb/chipidea.h linux-3.10.30/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-16 15:28:39.545481101 +0200 ++++ linux-3.10.30/include/linux/usb/chipidea.h 2014-05-19 19:07:24.337307668 +0200 @@ -7,32 +7,44 @@ #include <linux/usb/otg.h> @@ -541829,9 +542154,9 @@ diff -Nur linux-3.10.30.orig/include/linux/usb/chipidea.h linux-linaro-stable-mx +void ci_hdrc_remove_device(struct platform_device *pdev); #endif -diff -Nur linux-3.10.30.orig/include/linux/usb/of.h linux-linaro-stable-mx6/include/linux/usb/of.h +diff -Nur linux-3.10.30.orig/include/linux/usb/of.h linux-3.10.30/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-16 15:28:39.549481122 +0200 ++++ linux-3.10.30/include/linux/usb/of.h 2014-05-19 19:07:24.337307668 +0200 @@ -0,0 +1,32 @@ +/* + * OF helpers for usb devices. @@ -541865,9 +542190,9 @@ diff -Nur linux-3.10.30.orig/include/linux/usb/of.h linux-linaro-stable-mx6/incl +#endif + +#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 +diff -Nur linux-3.10.30.orig/include/linux/usb/otg.h linux-3.10.30/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-16 15:28:39.549481122 +0200 ++++ linux-3.10.30/include/linux/usb/otg.h 2014-05-19 19:07:24.337307668 +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); @@ -541880,9 +542205,9 @@ 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 +diff -Nur linux-3.10.30.orig/include/linux/usb/phy.h linux-3.10.30/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-16 15:28:39.549481122 +0200 ++++ linux-3.10.30/include/linux/usb/phy.h 2014-05-19 19:07:24.337307668 +0200 @@ -12,6 +12,15 @@ #include <linux/notifier.h> #include <linux/usb.h> @@ -541964,9 +542289,9 @@ diff -Nur linux-3.10.30.orig/include/linux/usb/phy.h linux-linaro-stable-mx6/inc /* notifiers */ static inline int -diff -Nur linux-3.10.30.orig/include/linux/vexpress.h linux-linaro-stable-mx6/include/linux/vexpress.h +diff -Nur linux-3.10.30.orig/include/linux/vexpress.h linux-3.10.30/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-16 15:28:39.553481142 +0200 ++++ linux-3.10.30/include/linux/vexpress.h 2014-05-19 19:07:24.341307683 +0200 @@ -68,7 +68,8 @@ */ struct vexpress_config_bridge_info { @@ -542053,9 +542378,9 @@ diff -Nur linux-3.10.30.orig/include/linux/vexpress.h linux-linaro-stable-mx6/in +#endif + #endif -diff -Nur linux-3.10.30.orig/include/linux/vmstat.h linux-linaro-stable-mx6/include/linux/vmstat.h +diff -Nur linux-3.10.30.orig/include/linux/vmstat.h linux-3.10.30/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-16 15:28:39.557481164 +0200 ++++ linux-3.10.30/include/linux/vmstat.h 2014-05-19 19:07:24.341307683 +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); @@ -542065,9 +542390,9 @@ diff -Nur linux-3.10.30.orig/include/linux/vmstat.h linux-linaro-stable-mx6/incl void refresh_zone_stat_thresholds(void); 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 +diff -Nur linux-3.10.30.orig/include/linux/workqueue.h linux-3.10.30/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-16 15:28:39.625481522 +0200 ++++ linux-3.10.30/include/linux/workqueue.h 2014-05-19 19:07:24.341307683 +0200 @@ -303,6 +303,33 @@ WQ_CPU_INTENSIVE = 1 << 5, /* cpu instensive workqueue */ WQ_SYSFS = 1 << 6, /* visible in sysfs, see wq_sysfs_register() */ @@ -542122,9 +542447,9 @@ diff -Nur linux-3.10.30.orig/include/linux/workqueue.h linux-linaro-stable-mx6/i static inline struct workqueue_struct * __deprecated __system_nrt_wq(void) { -diff -Nur linux-3.10.30.orig/include/linux/zbud.h linux-linaro-stable-mx6/include/linux/zbud.h +diff -Nur linux-3.10.30.orig/include/linux/zbud.h linux-3.10.30/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-16 15:28:39.625481522 +0200 ++++ linux-3.10.30/include/linux/zbud.h 2014-05-19 19:07:24.341307683 +0200 @@ -0,0 +1,22 @@ +#ifndef _ZBUD_H_ +#define _ZBUD_H_ @@ -542148,9 +542473,9 @@ diff -Nur linux-3.10.30.orig/include/linux/zbud.h linux-linaro-stable-mx6/includ +int zbud_get_pool_size(struct zbud_pool *pool); + +#endif /* _ZBUD_H_ */ -diff -Nur linux-3.10.30.orig/include/sound/memalloc.h linux-linaro-stable-mx6/include/sound/memalloc.h +diff -Nur linux-3.10.30.orig/include/sound/memalloc.h linux-3.10.30/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-16 15:28:40.093483990 +0200 ++++ linux-3.10.30/include/sound/memalloc.h 2014-05-19 19:07:24.341307683 +0200 @@ -52,6 +52,11 @@ #else #define SNDRV_DMA_TYPE_DEV_SG SNDRV_DMA_TYPE_DEV /* no SG-buf support */ @@ -542163,9 +542488,9 @@ 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 +diff -Nur linux-3.10.30.orig/include/sound/wm8962.h linux-3.10.30/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-16 15:28:40.161484348 +0200 ++++ linux-3.10.30/include/sound/wm8962.h 2014-05-19 19:07:24.341307683 +0200 @@ -55,6 +55,9 @@ * in a DC measurement configuration. */ @@ -542176,9 +542501,9 @@ 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 +diff -Nur linux-3.10.30.orig/include/trace/events/arm-ipi.h linux-3.10.30/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-16 15:28:40.261484876 +0200 ++++ linux-3.10.30/include/trace/events/arm-ipi.h 2014-05-19 19:07:24.341307683 +0200 @@ -0,0 +1,100 @@ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM arm-ipi @@ -542280,9 +542605,9 @@ diff -Nur linux-3.10.30.orig/include/trace/events/arm-ipi.h linux-linaro-stable- + +/* This part must be outside protection */ +#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 +diff -Nur linux-3.10.30.orig/include/trace/events/f2fs.h linux-3.10.30/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-16 15:28:40.261484876 +0200 ++++ linux-3.10.30/include/trace/events/f2fs.h 2014-05-19 19:07:24.345307698 +0200 @@ -36,6 +36,11 @@ { CURSEG_COLD_NODE, "Cold NODE" }, \ { NO_CHECK_TYPE, "No TYPE" }) @@ -542348,9 +542673,9 @@ diff -Nur linux-3.10.30.orig/include/trace/events/f2fs.h linux-linaro-stable-mx6 TRACE_EVENT(f2fs_submit_write_page, 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 +diff -Nur linux-3.10.30.orig/include/trace/events/power_cpu_migrate.h linux-3.10.30/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-16 15:28:40.261484876 +0200 ++++ linux-3.10.30/include/trace/events/power_cpu_migrate.h 2014-05-19 19:07:24.345307698 +0200 @@ -0,0 +1,67 @@ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM power @@ -542419,9 +542744,9 @@ diff -Nur linux-3.10.30.orig/include/trace/events/power_cpu_migrate.h linux-lina +#undef TRACE_INCLUDE_FILE +#define TRACE_INCLUDE_FILE power_cpu_migrate +#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 +diff -Nur linux-3.10.30.orig/include/trace/events/sched.h linux-3.10.30/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-16 15:28:40.265484898 +0200 ++++ linux-3.10.30/include/trace/events/sched.h 2014-05-19 19:07:24.345307698 +0200 @@ -430,6 +430,280 @@ __entry->oldprio, __entry->newprio) ); @@ -542703,9 +543028,9 @@ diff -Nur linux-3.10.30.orig/include/trace/events/sched.h linux-linaro-stable-mx #endif /* _TRACE_SCHED_H */ /* 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 +diff -Nur linux-3.10.30.orig/include/trace/events/smp.h linux-3.10.30/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-16 15:28:40.265484898 +0200 ++++ linux-3.10.30/include/trace/events/smp.h 2014-05-19 19:07:24.345307698 +0200 @@ -0,0 +1,90 @@ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM smp @@ -542797,9 +543122,9 @@ diff -Nur linux-3.10.30.orig/include/trace/events/smp.h linux-linaro-stable-mx6/ + +/* This part must be outside protection */ +#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 +diff -Nur linux-3.10.30.orig/include/trace/events/spi.h linux-3.10.30/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-16 15:28:40.265484898 +0200 ++++ linux-3.10.30/include/trace/events/spi.h 2014-05-19 19:07:24.345307698 +0200 @@ -0,0 +1,156 @@ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM spi @@ -542957,9 +543282,9 @@ diff -Nur linux-3.10.30.orig/include/trace/events/spi.h linux-linaro-stable-mx6/ + +/* This part must be outside protection */ +#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 +diff -Nur linux-3.10.30.orig/include/uapi/linux/ipu.h linux-3.10.30/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-16 15:28:40.369485445 +0200 ++++ linux-3.10.30/include/uapi/linux/ipu.h 2014-05-19 19:07:24.345307698 +0200 @@ -0,0 +1,282 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved @@ -543243,9 +543568,9 @@ diff -Nur linux-3.10.30.orig/include/uapi/linux/ipu.h linux-linaro-stable-mx6/in +#define IPU_FREE _IOW('I', 0x4, int) + +#endif -diff -Nur linux-3.10.30.orig/include/uapi/linux/isl29023.h linux-linaro-stable-mx6/include/uapi/linux/isl29023.h +diff -Nur linux-3.10.30.orig/include/uapi/linux/isl29023.h linux-3.10.30/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-16 15:28:40.373485467 +0200 ++++ linux-3.10.30/include/uapi/linux/isl29023.h 2014-05-19 19:07:24.345307698 +0200 @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -543294,9 +543619,9 @@ diff -Nur linux-3.10.30.orig/include/uapi/linux/isl29023.h linux-linaro-stable-m +#define ISL29023_RANGE_64K 0x3 + +#endif -diff -Nur linux-3.10.30.orig/include/uapi/linux/Kbuild linux-linaro-stable-mx6/include/uapi/linux/Kbuild +diff -Nur linux-3.10.30.orig/include/uapi/linux/Kbuild linux-3.10.30/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-16 15:28:40.301485087 +0200 ++++ linux-3.10.30/include/uapi/linux/Kbuild 2014-05-19 19:07:24.349307712 +0200 @@ -225,6 +225,7 @@ header-y += kvm_para.h endif @@ -543323,9 +543648,9 @@ diff -Nur linux-3.10.30.orig/include/uapi/linux/Kbuild linux-linaro-stable-mx6/i header-y += qnx4_fs.h header-y += qnxtypes.h 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 +diff -Nur linux-3.10.30.orig/include/uapi/linux/mxc_asrc.h linux-3.10.30/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-16 15:28:40.385485529 +0200 ++++ linux-3.10.30/include/uapi/linux/mxc_asrc.h 2014-05-19 19:07:24.349307712 +0200 @@ -0,0 +1,143 @@ +/* + * Copyright 2008-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -543470,9 +543795,9 @@ diff -Nur linux-3.10.30.orig/include/uapi/linux/mxc_asrc.h linux-linaro-stable-m + ASRC_INPUT_BUFFER_UNDERRUN = 0x10, +}; +#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 +diff -Nur linux-3.10.30.orig/include/uapi/linux/mxcfb.h linux-3.10.30/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-16 15:28:40.385485529 +0200 ++++ linux-3.10.30/include/uapi/linux/mxcfb.h 2014-05-19 19:07:24.349307712 +0200 @@ -0,0 +1,174 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved @@ -543648,9 +543973,9 @@ diff -Nur linux-3.10.30.orig/include/uapi/linux/mxcfb.h linux-linaro-stable-mx6/ +#define MXCFB_SET_UPDATE_SCHEME _IOW('F', 0x32, __u32) +#define MXCFB_GET_WORK_BUFFER _IOWR('F', 0x34, unsigned long) +#endif -diff -Nur linux-3.10.30.orig/include/uapi/linux/mxc_mlb.h linux-linaro-stable-mx6/include/uapi/linux/mxc_mlb.h +diff -Nur linux-3.10.30.orig/include/uapi/linux/mxc_mlb.h linux-3.10.30/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-16 15:28:40.385485529 +0200 ++++ linux-3.10.30/include/uapi/linux/mxc_mlb.h 2014-05-19 19:07:24.349307712 +0200 @@ -0,0 +1,55 @@ +/* + * mxc_mlb.h @@ -543707,9 +544032,9 @@ 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 +diff -Nur linux-3.10.30.orig/include/uapi/linux/mxc_v4l2.h linux-3.10.30/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-16 15:28:40.385485529 +0200 ++++ linux-3.10.30/include/uapi/linux/mxc_v4l2.h 2014-05-19 19:07:24.349307712 +0200 @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved @@ -543767,9 +544092,9 @@ 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 +diff -Nur linux-3.10.30.orig/include/uapi/linux/pxp_dma.h linux-3.10.30/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-16 15:28:40.485486057 +0200 ++++ linux-3.10.30/include/uapi/linux/pxp_dma.h 2014-05-19 19:07:24.349307712 +0200 @@ -0,0 +1,189 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -543960,9 +544285,9 @@ 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 +diff -Nur linux-3.10.30.orig/include/uapi/linux/serial_core.h linux-3.10.30/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-16 15:28:40.489486078 +0200 ++++ linux-3.10.30/include/uapi/linux/serial_core.h 2014-05-19 19:07:24.349307712 +0200 @@ -226,4 +226,7 @@ /* Rocketport EXPRESS/INFINITY */ #define PORT_RP2 102 @@ -543971,9 +544296,9 @@ diff -Nur linux-3.10.30.orig/include/uapi/linux/serial_core.h linux-linaro-stabl +#define PORT_LPUART 103 + #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 +diff -Nur linux-3.10.30.orig/include/uapi/mtd/mtd-abi.h linux-3.10.30/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-16 15:28:40.525486268 +0200 ++++ linux-3.10.30/include/uapi/mtd/mtd-abi.h 2014-05-19 19:07:24.349307712 +0200 @@ -94,10 +94,10 @@ #define MTD_RAM 1 #define MTD_ROM 2 @@ -543997,9 +544322,9 @@ 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 +diff -Nur linux-3.10.30.orig/include/video/mxc_edid.h linux-3.10.30/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-16 15:28:40.533486310 +0200 ++++ linux-3.10.30/include/video/mxc_edid.h 2014-05-19 19:07:24.353307727 +0200 @@ -0,0 +1,105 @@ +/* + * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -544106,9 +544431,9 @@ diff -Nur linux-3.10.30.orig/include/video/mxc_edid.h linux-linaro-stable-mx6/in +int mxc_edid_parse_ext_blk(unsigned char *edid, struct mxc_edid_cfg *cfg, + struct fb_monspecs *specs); +#endif -diff -Nur linux-3.10.30.orig/include/video/mxc_hdmi.h linux-linaro-stable-mx6/include/video/mxc_hdmi.h +diff -Nur linux-3.10.30.orig/include/video/mxc_hdmi.h linux-3.10.30/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-16 15:28:40.533486310 +0200 ++++ linux-3.10.30/include/video/mxc_hdmi.h 2014-05-19 19:07:24.353307727 +0200 @@ -0,0 +1,1026 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. @@ -545136,9 +545461,9 @@ 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 +diff -Nur linux-3.10.30.orig/kernel/auditfilter.c linux-3.10.30/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-16 15:28:40.657486964 +0200 ++++ linux-3.10.30/kernel/auditfilter.c 2014-05-19 19:07:24.353307727 +0200 @@ -423,7 +423,7 @@ f->lsm_rule = NULL; @@ -545148,9 +545473,9 @@ diff -Nur linux-3.10.30.orig/kernel/auditfilter.c linux-linaro-stable-mx6/kernel f->type = AUDIT_LOGINUID_SET; f->val = 0; } -diff -Nur linux-3.10.30.orig/kernel/cpu.c linux-linaro-stable-mx6/kernel/cpu.c +diff -Nur linux-3.10.30.orig/kernel/cpu.c linux-3.10.30/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-16 15:28:40.713487259 +0200 ++++ linux-3.10.30/kernel/cpu.c 2014-05-19 19:07:24.353307727 +0200 @@ -726,3 +726,22 @@ { cpumask_copy(to_cpumask(cpu_online_bits), src); @@ -545174,9 +545499,9 @@ diff -Nur linux-3.10.30.orig/kernel/cpu.c linux-linaro-stable-mx6/kernel/cpu.c + atomic_notifier_call_chain(&idle_notifier, val, NULL); +} +EXPORT_SYMBOL_GPL(idle_notifier_call_chain); -diff -Nur linux-3.10.30.orig/kernel/irq/handle.c linux-linaro-stable-mx6/kernel/irq/handle.c +diff -Nur linux-3.10.30.orig/kernel/irq/handle.c linux-3.10.30/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-16 15:28:40.761487512 +0200 ++++ linux-3.10.30/kernel/irq/handle.c 2014-05-19 19:07:24.353307727 +0200 @@ -51,7 +51,7 @@ "but no thread function available.", irq, action->name); } @@ -545195,9 +545520,9 @@ diff -Nur linux-3.10.30.orig/kernel/irq/handle.c linux-linaro-stable-mx6/kernel/ /* Fall through to add to randomness */ case IRQ_HANDLED: -diff -Nur linux-3.10.30.orig/kernel/irq/internals.h linux-linaro-stable-mx6/kernel/irq/internals.h +diff -Nur linux-3.10.30.orig/kernel/irq/internals.h linux-3.10.30/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-16 15:28:40.761487512 +0200 ++++ linux-3.10.30/kernel/irq/internals.h 2014-05-19 19:07:24.353307727 +0200 @@ -82,6 +82,7 @@ /* Resending of interrupts :*/ void check_irq_resend(struct irq_desc *desc, unsigned int irq); @@ -545206,9 +545531,9 @@ diff -Nur linux-3.10.30.orig/kernel/irq/internals.h linux-linaro-stable-mx6/kern #ifdef CONFIG_PROC_FS 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 +diff -Nur linux-3.10.30.orig/kernel/irq/irqdesc.c linux-3.10.30/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-16 15:28:40.761487512 +0200 ++++ linux-3.10.30/kernel/irq/irqdesc.c 2014-05-19 19:07:24.353307727 +0200 @@ -23,10 +23,35 @@ static struct lock_class_key irq_desc_lock_class; @@ -545247,9 +545572,9 @@ diff -Nur linux-3.10.30.orig/kernel/irq/irqdesc.c linux-linaro-stable-mx6/kernel } #else 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 +diff -Nur linux-3.10.30.orig/kernel/irq/manage.c linux-3.10.30/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-16 15:28:40.761487512 +0200 ++++ linux-3.10.30/kernel/irq/manage.c 2014-05-19 19:07:24.353307727 +0200 @@ -32,24 +32,10 @@ early_param("threadirqs", setup_forced_irqthreads); #endif @@ -545369,9 +545694,9 @@ diff -Nur linux-3.10.30.orig/kernel/irq/manage.c linux-linaro-stable-mx6/kernel/ static void irq_setup_forced_threading(struct irqaction *new) { if (!force_irqthreads) -diff -Nur linux-3.10.30.orig/kernel/power/Kconfig linux-linaro-stable-mx6/kernel/power/Kconfig +diff -Nur linux-3.10.30.orig/kernel/power/Kconfig linux-3.10.30/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-16 15:28:40.981488672 +0200 ++++ linux-3.10.30/kernel/power/Kconfig 2014-05-19 19:07:24.353307727 +0200 @@ -263,6 +263,26 @@ bool depends on PM @@ -545399,9 +545724,9 @@ diff -Nur linux-3.10.30.orig/kernel/power/Kconfig linux-linaro-stable-mx6/kernel config PM_GENERIC_DOMAINS_SLEEP def_bool y 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 +diff -Nur linux-3.10.30.orig/kernel/sched/core.c linux-3.10.30/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-16 15:28:41.033488946 +0200 ++++ linux-3.10.30/kernel/sched/core.c 2014-05-19 19:07:24.357307742 +0200 @@ -1623,6 +1623,20 @@ #if defined(CONFIG_SMP) && defined(CONFIG_FAIR_GROUP_SCHED) p->se.avg.runnable_avg_period = 0; @@ -545451,9 +545776,9 @@ diff -Nur linux-3.10.30.orig/kernel/sched/core.c linux-linaro-stable-mx6/kernel/ else p->sched_class = &fair_sched_class; set_load_weight(p); -diff -Nur linux-3.10.30.orig/kernel/sched/debug.c linux-linaro-stable-mx6/kernel/sched/debug.c +diff -Nur linux-3.10.30.orig/kernel/sched/debug.c linux-3.10.30/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-16 15:28:41.037488968 +0200 ++++ linux-3.10.30/kernel/sched/debug.c 2014-05-19 19:07:24.357307742 +0200 @@ -94,6 +94,7 @@ #ifdef CONFIG_SMP P(se->avg.runnable_avg_sum); @@ -545484,9 +545809,9 @@ diff -Nur linux-3.10.30.orig/kernel/sched/debug.c linux-linaro-stable-mx6/kernel P(policy); P(prio); #undef PN -diff -Nur linux-3.10.30.orig/kernel/sched/fair.c linux-linaro-stable-mx6/kernel/sched/fair.c +diff -Nur linux-3.10.30.orig/kernel/sched/fair.c linux-3.10.30/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-16 15:28:41.085489221 +0200 ++++ linux-3.10.30/kernel/sched/fair.c 2014-05-19 19:07:24.357307742 +0200 @@ -31,9 +31,18 @@ #include <linux/task_work.h> @@ -547525,9 +547850,9 @@ diff -Nur linux-3.10.30.orig/kernel/sched/fair.c linux-linaro-stable-mx6/kernel/ + +core_initcall(register_sched_cpufreq_notifier); +#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 +diff -Nur linux-3.10.30.orig/kernel/sched/sched.h linux-3.10.30/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-16 15:28:41.089489242 +0200 ++++ linux-3.10.30/kernel/sched/sched.h 2014-05-19 19:07:24.357307742 +0200 @@ -142,7 +142,7 @@ atomic_t load_weight; @@ -547569,9 +547894,9 @@ diff -Nur linux-3.10.30.orig/kernel/sched/sched.h linux-linaro-stable-mx6/kernel #endif /* CONFIG_SMP */ #include "stats.h" -diff -Nur linux-3.10.30.orig/kernel/smp.c linux-linaro-stable-mx6/kernel/smp.c +diff -Nur linux-3.10.30.orig/kernel/smp.c linux-3.10.30/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-16 15:28:41.113489368 +0200 ++++ linux-3.10.30/kernel/smp.c 2014-05-19 19:07:24.357307742 +0200 @@ -12,6 +12,8 @@ #include <linux/gfp.h> #include <linux/smp.h> @@ -547622,9 +547947,9 @@ diff -Nur linux-3.10.30.orig/kernel/smp.c linux-linaro-stable-mx6/kernel/smp.c local_irq_restore(flags); } else { 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 +diff -Nur linux-3.10.30.orig/kernel/workqueue.c linux-3.10.30/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-16 15:28:41.313490423 +0200 ++++ linux-3.10.30/kernel/workqueue.c 2014-05-19 19:07:24.357307742 +0200 @@ -272,6 +272,15 @@ static bool wq_disable_numa; module_param_named(disable_numa, wq_disable_numa, bool, 0444); @@ -547680,9 +548005,9 @@ diff -Nur linux-3.10.30.orig/kernel/workqueue.c linux-linaro-stable-mx6/kernel/w return 0; } early_initcall(init_workqueues); -diff -Nur linux-3.10.30.orig/lib/genalloc.c linux-linaro-stable-mx6/lib/genalloc.c +diff -Nur linux-3.10.30.orig/lib/genalloc.c linux-3.10.30/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-16 15:28:41.325490486 +0200 ++++ linux-3.10.30/lib/genalloc.c 2014-05-19 19:07:24.357307742 +0200 @@ -313,6 +313,34 @@ EXPORT_SYMBOL(gen_pool_alloc); @@ -547718,9 +548043,9 @@ diff -Nur linux-3.10.30.orig/lib/genalloc.c linux-linaro-stable-mx6/lib/genalloc * gen_pool_free - free allocated special memory back to the pool * @pool: pool to free to * @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 +diff -Nur linux-3.10.30.orig/linaro/configs/android.conf linux-3.10.30/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-16 15:28:41.961493840 +0200 ++++ linux-3.10.30/linaro/configs/android.conf 2014-05-19 19:07:24.361307757 +0200 @@ -0,0 +1,40 @@ +CONFIG_IPV6=y +# CONFIG_IPV6_SIT is not set @@ -547762,9 +548087,9 @@ diff -Nur linux-3.10.30.orig/linaro/configs/android.conf linux-linaro-stable-mx6 +CONFIG_ADF_FBDEV=y +CONFIG_ADF_MEMBLOCK=y +CONFIG_DMA_SHARED_BUFFER=y -diff -Nur linux-3.10.30.orig/linaro/configs/arndale.conf linux-linaro-stable-mx6/linaro/configs/arndale.conf +diff -Nur linux-3.10.30.orig/linaro/configs/arndale.conf linux-3.10.30/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-16 15:28:41.961493840 +0200 ++++ linux-3.10.30/linaro/configs/arndale.conf 2014-05-19 19:07:24.361307757 +0200 @@ -0,0 +1,66 @@ +CONFIG_KALLSYMS_ALL=y +CONFIG_PARTITION_ADVANCED=y @@ -547832,18 +548157,18 @@ diff -Nur linux-3.10.30.orig/linaro/configs/arndale.conf linux-linaro-stable-mx6 +CONFIG_RCU_CPU_STALL_TIMEOUT=60 +CONFIG_DEBUG_USER=y +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 +diff -Nur linux-3.10.30.orig/linaro/configs/big-LITTLE-IKS.conf linux-3.10.30/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-16 15:28:41.961493840 +0200 ++++ linux-3.10.30/linaro/configs/big-LITTLE-IKS.conf 2014-05-19 19:07:24.361307757 +0200 @@ -0,0 +1,5 @@ +CONFIG_BIG_LITTLE=y +CONFIG_BL_SWITCHER=y +CONFIG_ARM_DT_BL_CPUFREQ=y +CONFIG_ARM_VEXPRESS_BL_CPUFREQ=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y -diff -Nur linux-3.10.30.orig/linaro/configs/big-LITTLE-MP.conf linux-linaro-stable-mx6/linaro/configs/big-LITTLE-MP.conf +diff -Nur linux-3.10.30.orig/linaro/configs/big-LITTLE-MP.conf linux-3.10.30/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-16 15:28:41.961493840 +0200 ++++ linux-3.10.30/linaro/configs/big-LITTLE-MP.conf 2014-05-19 19:07:24.361307757 +0200 @@ -0,0 +1,12 @@ +CONFIG_CGROUPS=y +CONFIG_CGROUP_SCHED=y @@ -547857,14 +548182,14 @@ diff -Nur linux-3.10.30.orig/linaro/configs/big-LITTLE-MP.conf linux-linaro-stab +CONFIG_HMP_VARIABLE_SCALE=y +CONFIG_HMP_FREQUENCY_INVARIANT_SCALE=y +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 +diff -Nur linux-3.10.30.orig/linaro/configs/debug.conf linux-3.10.30/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-16 15:28:41.961493840 +0200 ++++ linux-3.10.30/linaro/configs/debug.conf 2014-05-19 19:07:24.361307757 +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 +diff -Nur linux-3.10.30.orig/linaro/configs/distribution.conf linux-3.10.30/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-16 15:28:41.961493840 +0200 ++++ linux-3.10.30/linaro/configs/distribution.conf 2014-05-19 19:07:24.361307757 +0200 @@ -0,0 +1,44 @@ +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_CGROUPS=y @@ -547910,9 +548235,9 @@ diff -Nur linux-3.10.30.orig/linaro/configs/distribution.conf linux-linaro-stabl +CONFIG_SECURITY_SMACK=y +CONFIG_SECURITY_APPARMOR=y +CONFIG_DEFAULT_SECURITY_APPARMOR=y -diff -Nur linux-3.10.30.orig/linaro/configs/highbank.conf linux-linaro-stable-mx6/linaro/configs/highbank.conf +diff -Nur linux-3.10.30.orig/linaro/configs/highbank.conf linux-3.10.30/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-16 15:28:41.961493840 +0200 ++++ linux-3.10.30/linaro/configs/highbank.conf 2014-05-19 19:07:24.377307815 +0200 @@ -0,0 +1,40 @@ +CONFIG_EXPERIMENTAL=y +CONFIG_NO_HZ=y @@ -547954,9 +548279,9 @@ diff -Nur linux-3.10.30.orig/linaro/configs/highbank.conf linux-linaro-stable-mx +CONFIG_RTC_DRV_PL031=y +CONFIG_DMADEVICES=y +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 +diff -Nur linux-3.10.30.orig/linaro/configs/kvm-guest.conf linux-3.10.30/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-16 15:28:41.961493840 +0200 ++++ linux-3.10.30/linaro/configs/kvm-guest.conf 2014-05-19 19:07:24.385307846 +0200 @@ -0,0 +1,11 @@ +CONFIG_BALLOON_COMPACTION=y +CONFIG_VIRTIO_BLK=y @@ -547969,9 +548294,9 @@ diff -Nur linux-3.10.30.orig/linaro/configs/kvm-guest.conf linux-linaro-stable-m +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y +CONFIG_VIRTUALIZATION=y +# 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 +diff -Nur linux-3.10.30.orig/linaro/configs/kvm-host.conf linux-3.10.30/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-16 15:28:41.961493840 +0200 ++++ linux-3.10.30/linaro/configs/kvm-host.conf 2014-05-19 19:07:24.389307860 +0200 @@ -0,0 +1,11 @@ +CONFIG_VIRTUALIZATION=y +CONFIG_ARM_LPAE=y @@ -547984,9 +548309,9 @@ diff -Nur linux-3.10.30.orig/linaro/configs/kvm-host.conf linux-linaro-stable-mx +CONFIG_KVM_MMIO=y +CONFIG_KVM=y +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 +diff -Nur linux-3.10.30.orig/linaro/configs/linaro-base.conf linux-3.10.30/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-16 15:28:41.961493840 +0200 ++++ linux-3.10.30/linaro/configs/linaro-base.conf 2014-05-19 19:07:24.389307860 +0200 @@ -0,0 +1,94 @@ +CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y @@ -548082,9 +548407,9 @@ diff -Nur linux-3.10.30.orig/linaro/configs/linaro-base.conf linux-linaro-stable +CONFIG_FUNCTION_TRACER=y +CONFIG_ENABLE_DEFAULT_TRACERS=y +CONFIG_PROC_DEVICETREE=y -diff -Nur linux-3.10.30.orig/linaro/configs/omap4.conf linux-linaro-stable-mx6/linaro/configs/omap4.conf +diff -Nur linux-3.10.30.orig/linaro/configs/omap4.conf linux-3.10.30/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-16 15:28:41.961493840 +0200 ++++ linux-3.10.30/linaro/configs/omap4.conf 2014-05-19 19:07:24.389307860 +0200 @@ -0,0 +1,194 @@ +CONFIG_EXPERT=y +CONFIG_KPROBES=y @@ -548280,9 +548605,9 @@ diff -Nur linux-3.10.30.orig/linaro/configs/omap4.conf linux-linaro-stable-mx6/l +# CONFIG_CRYPTO_ANSI_CPRNG is not set +CONFIG_LIBCRC32C=y +# 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 +diff -Nur linux-3.10.30.orig/linaro/configs/ubuntu-minimal.conf linux-3.10.30/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-16 15:28:41.961493840 +0200 ++++ linux-3.10.30/linaro/configs/ubuntu-minimal.conf 2014-05-19 19:07:24.393307874 +0200 @@ -0,0 +1,44 @@ +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_CGROUPS=y @@ -548328,9 +548653,9 @@ diff -Nur linux-3.10.30.orig/linaro/configs/ubuntu-minimal.conf linux-linaro-sta +CONFIG_SECURITY_SMACK=y +CONFIG_SECURITY_APPARMOR=y +CONFIG_DEFAULT_SECURITY_APPARMOR=y -diff -Nur linux-3.10.30.orig/linaro/configs/vexpress64.conf linux-linaro-stable-mx6/linaro/configs/vexpress64.conf +diff -Nur linux-3.10.30.orig/linaro/configs/vexpress64.conf linux-3.10.30/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-16 15:28:41.961493840 +0200 ++++ linux-3.10.30/linaro/configs/vexpress64.conf 2014-05-19 19:07:24.393307874 +0200 @@ -0,0 +1,32 @@ +CONFIG_ARCH_VEXPRESS=y +CONFIG_SMP=y @@ -548364,9 +548689,9 @@ diff -Nur linux-3.10.30.orig/linaro/configs/vexpress64.conf linux-linaro-stable- +CONFIG_VIRTIO_MMIO=y +CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y -diff -Nur linux-3.10.30.orig/linaro/configs/vexpress.conf linux-linaro-stable-mx6/linaro/configs/vexpress.conf +diff -Nur linux-3.10.30.orig/linaro/configs/vexpress.conf linux-3.10.30/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-16 15:28:41.961493840 +0200 ++++ linux-3.10.30/linaro/configs/vexpress.conf 2014-05-19 19:07:24.393307874 +0200 @@ -0,0 +1,63 @@ +CONFIG_ARCH_VEXPRESS=y +CONFIG_ARCH_VEXPRESS_CA9X4=y @@ -548431,14 +548756,14 @@ diff -Nur linux-3.10.30.orig/linaro/configs/vexpress.conf linux-linaro-stable-mx +CONFIG_VIRTIO_BLK=y +CONFIG_VIRTIO_MMIO=y +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 +diff -Nur linux-3.10.30.orig/linaro/configs/vexpress-tuning.conf linux-3.10.30/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-16 15:28:41.961493840 +0200 ++++ linux-3.10.30/linaro/configs/vexpress-tuning.conf 2014-05-19 19:07:24.397307890 +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 +diff -Nur linux-3.10.30.orig/linaro/configs/xen.conf linux-3.10.30/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-16 15:28:41.961493840 +0200 ++++ linux-3.10.30/linaro/configs/xen.conf 2014-05-19 19:07:24.397307890 +0200 @@ -0,0 +1,7 @@ +CONFIG_XEN=y +CONFIG_XEN_NETDEV_FRONTEND=y @@ -548447,9 +548772,9 @@ diff -Nur linux-3.10.30.orig/linaro/configs/xen.conf linux-linaro-stable-mx6/lin +CONFIG_XEN_BLKDEV_BACKEND=y +CONFIG_XENFS=y +CONFIG_XEN_COMPAT_XENFS=y -diff -Nur linux-3.10.30.orig/mm/Kconfig linux-linaro-stable-mx6/mm/Kconfig +diff -Nur linux-3.10.30.orig/mm/Kconfig linux-3.10.30/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-16 15:28:41.961493840 +0200 ++++ linux-3.10.30/mm/Kconfig 2014-05-19 19:07:24.397307890 +0200 @@ -477,3 +477,28 @@ and swap data is stored as normal on the matching swap device. @@ -548479,9 +548804,9 @@ diff -Nur linux-3.10.30.orig/mm/Kconfig linux-linaro-stable-mx6/mm/Kconfig + from this compressed store much faster than most tradition + swap devices resulting in reduced I/O and faster performance + for many workloads. -diff -Nur linux-3.10.30.orig/mm/Makefile linux-linaro-stable-mx6/mm/Makefile +diff -Nur linux-3.10.30.orig/mm/Makefile linux-3.10.30/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-16 15:28:41.961493840 +0200 ++++ linux-3.10.30/mm/Makefile 2014-05-19 19:07:24.397307890 +0200 @@ -32,6 +32,7 @@ obj-$(CONFIG_BOUNCE) += bounce.o obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o @@ -548495,9 +548820,9 @@ diff -Nur linux-3.10.30.orig/mm/Makefile linux-linaro-stable-mx6/mm/Makefile obj-$(CONFIG_CLEANCACHE) += cleancache.o obj-$(CONFIG_MEMORY_ISOLATION) += page_isolation.o +obj-$(CONFIG_ZBUD) += zbud.o -diff -Nur linux-3.10.30.orig/mm/vmstat.c linux-linaro-stable-mx6/mm/vmstat.c +diff -Nur linux-3.10.30.orig/mm/vmstat.c linux-3.10.30/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-16 15:28:41.981493945 +0200 ++++ linux-3.10.30/mm/vmstat.c 2014-05-19 19:07:24.397307890 +0200 @@ -14,6 +14,7 @@ #include <linux/module.h> #include <linux/slab.h> @@ -548663,9 +548988,9 @@ diff -Nur linux-3.10.30.orig/mm/vmstat.c linux-linaro-stable-mx6/mm/vmstat.c #endif #ifdef CONFIG_PROC_FS 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 +diff -Nur linux-3.10.30.orig/mm/zbud.c linux-3.10.30/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-16 15:28:41.981493945 +0200 ++++ linux-3.10.30/mm/zbud.c 2014-05-19 19:07:24.401307905 +0200 @@ -0,0 +1,564 @@ +/* + * zbud.c - Buddy Allocator for Compressed Pages @@ -549231,9 +549556,9 @@ diff -Nur linux-3.10.30.orig/mm/zbud.c linux-linaro-stable-mx6/mm/zbud.c +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Seth Jennings <sjenning <at> linux.vnet.ibm.com>"); +MODULE_DESCRIPTION("Buddy Allocator for Compressed Pages"); -diff -Nur linux-3.10.30.orig/mm/zswap.c linux-linaro-stable-mx6/mm/zswap.c +diff -Nur linux-3.10.30.orig/mm/zswap.c linux-3.10.30/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-16 15:28:41.981493945 +0200 ++++ linux-3.10.30/mm/zswap.c 2014-05-19 19:07:24.401307905 +0200 @@ -0,0 +1,952 @@ +/* + * zswap.c - zswap driver file @@ -550187,9 +550512,9 @@ diff -Nur linux-3.10.30.orig/mm/zswap.c linux-linaro-stable-mx6/mm/zswap.c +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Seth Jennings <sjenning <at> linux.vnet.ibm.com>"); +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 +diff -Nur linux-3.10.30.orig/sound/core/memalloc.c linux-3.10.30/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-16 15:28:44.397506685 +0200 ++++ linux-3.10.30/sound/core/memalloc.c 2014-05-19 19:07:24.401307905 +0200 @@ -30,6 +30,7 @@ #include <linux/seq_file.h> #include <asm/uaccess.h> @@ -550272,9 +550597,9 @@ diff -Nur linux-3.10.30.orig/sound/core/memalloc.c linux-linaro-stable-mx6/sound case SNDRV_DMA_TYPE_DEV: snd_free_dev_pages(dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr); break; -diff -Nur linux-3.10.30.orig/sound/core/pcm_native.c linux-linaro-stable-mx6/sound/core/pcm_native.c +diff -Nur linux-3.10.30.orig/sound/core/pcm_native.c linux-3.10.30/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-16 15:28:44.401506705 +0200 ++++ linux-3.10.30/sound/core/pcm_native.c 2014-05-19 19:07:24.401307905 +0200 @@ -3209,6 +3209,14 @@ struct vm_area_struct *area) { @@ -550290,9 +550615,9 @@ diff -Nur linux-3.10.30.orig/sound/core/pcm_native.c linux-linaro-stable-mx6/sou #ifdef ARCH_HAS_DMA_MMAP_COHERENT if (!substream->ops->page && 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 +diff -Nur linux-3.10.30.orig/sound/soc/codecs/cs42888.c linux-3.10.30/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-16 15:28:45.197510902 +0200 ++++ linux-3.10.30/sound/soc/codecs/cs42888.c 2014-05-19 19:07:24.405307919 +0200 @@ -0,0 +1,934 @@ +/* + * cs42888.c -- CS42888 ALSA SoC Audio Driver @@ -551228,9 +551553,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/codecs/cs42888.c linux-linaro-stable-mx6/ +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("Cirrus Logic CS42888 ALSA SoC Codec Driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.30.orig/sound/soc/codecs/cs42888.h linux-linaro-stable-mx6/sound/soc/codecs/cs42888.h +diff -Nur linux-3.10.30.orig/sound/soc/codecs/cs42888.h linux-3.10.30/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-16 15:28:45.201510924 +0200 ++++ linux-3.10.30/sound/soc/codecs/cs42888.h 2014-05-19 19:07:24.405307919 +0200 @@ -0,0 +1,123 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -551355,9 +551680,9 @@ 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 +diff -Nur linux-3.10.30.orig/sound/soc/codecs/Kconfig linux-3.10.30/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-16 15:28:45.189510860 +0200 ++++ linux-3.10.30/sound/soc/codecs/Kconfig 2014-05-19 19:07:24.405307919 +0200 @@ -35,6 +35,7 @@ select SND_SOC_CS42L73 if I2C select SND_SOC_CS4270 if I2C @@ -551385,9 +551710,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/codecs/Kconfig linux-linaro-stable-mx6/so config SND_SOC_CX20442 tristate depends on TTY -diff -Nur linux-3.10.30.orig/sound/soc/codecs/Makefile linux-linaro-stable-mx6/sound/soc/codecs/Makefile +diff -Nur linux-3.10.30.orig/sound/soc/codecs/Makefile linux-3.10.30/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-16 15:28:45.189510860 +0200 ++++ linux-3.10.30/sound/soc/codecs/Makefile 2014-05-19 19:07:24.405307919 +0200 @@ -22,6 +22,7 @@ snd-soc-cs42l73-objs := cs42l73.o snd-soc-cs4270-objs := cs4270.o @@ -551413,9 +551738,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/codecs/Makefile linux-linaro-stable-mx6/s obj-$(CONFIG_SND_SOC_CX20442) += snd-soc-cx20442.o obj-$(CONFIG_SND_SOC_DA7210) += snd-soc-da7210.o obj-$(CONFIG_SND_SOC_DA7213) += snd-soc-da7213.o -diff -Nur linux-3.10.30.orig/sound/soc/codecs/omap-hdmi.c linux-linaro-stable-mx6/sound/soc/codecs/omap-hdmi.c +diff -Nur linux-3.10.30.orig/sound/soc/codecs/omap-hdmi.c linux-3.10.30/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-16 15:28:45.277511325 +0200 ++++ linux-3.10.30/sound/soc/codecs/omap-hdmi.c 2014-05-19 19:07:24.405307919 +0200 @@ -26,7 +26,7 @@ static struct snd_soc_codec_driver omap_hdmi_codec; @@ -551425,9 +551750,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/codecs/omap-hdmi.c linux-linaro-stable-mx .playback = { .channels_min = 2, .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 +diff -Nur linux-3.10.30.orig/sound/soc/codecs/spdif_receiver.c linux-3.10.30/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-16 15:28:45.301511451 +0200 ++++ linux-3.10.30/sound/soc/codecs/spdif_receiver.c 2014-05-19 19:07:24.405307919 +0200 @@ -24,6 +24,8 @@ #define STUB_RATES SNDRV_PCM_RATE_8000_192000 @@ -551437,9 +551762,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/codecs/spdif_receiver.c linux-linaro-stab SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE) static struct snd_soc_codec_driver soc_codec_spdif_dir; -diff -Nur linux-3.10.30.orig/sound/soc/codecs/spdif_transciever.c linux-linaro-stable-mx6/sound/soc/codecs/spdif_transciever.c +diff -Nur linux-3.10.30.orig/sound/soc/codecs/spdif_transciever.c linux-3.10.30/sound/soc/codecs/spdif_transciever.c --- linux-3.10.30.orig/sound/soc/codecs/spdif_transciever.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/codecs/spdif_transciever.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.30/sound/soc/codecs/spdif_transciever.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,69 +0,0 @@ -/* - * ALSA SoC SPDIF DIT driver @@ -551510,9 +551835,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/codecs/spdif_transciever.c linux-linaro-s -MODULE_DESCRIPTION("SPDIF dummy codec driver"); -MODULE_LICENSE("GPL"); -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 +diff -Nur linux-3.10.30.orig/sound/soc/codecs/spdif_transmitter.c linux-3.10.30/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-16 15:28:45.301511451 +0200 ++++ linux-3.10.30/sound/soc/codecs/spdif_transmitter.c 2014-05-19 19:07:24.405307919 +0200 @@ -0,0 +1,77 @@ +/* + * ALSA SoC SPDIF DIT driver @@ -551591,9 +551916,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/codecs/spdif_transmitter.c linux-linaro-s +MODULE_DESCRIPTION("SPDIF dummy codec driver"); +MODULE_LICENSE("GPL"); +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 +diff -Nur linux-3.10.30.orig/sound/soc/codecs/wm8962.c linux-3.10.30/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-16 15:28:45.529512653 +0200 ++++ linux-3.10.30/sound/soc/codecs/wm8962.c 2014-05-19 19:07:24.409307935 +0200 @@ -16,6 +16,7 @@ #include <linux/init.h> #include <linux/delay.h> @@ -551927,9 +552252,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/codecs/wm8962.c linux-linaro-stable-mx6/s return 0; } #endif -diff -Nur linux-3.10.30.orig/sound/soc/fsl/eukrea-tlv320.c linux-linaro-stable-mx6/sound/soc/fsl/eukrea-tlv320.c +diff -Nur linux-3.10.30.orig/sound/soc/fsl/eukrea-tlv320.c linux-3.10.30/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-16 15:28:45.825514214 +0200 ++++ linux-3.10.30/sound/soc/fsl/eukrea-tlv320.c 2014-05-19 19:07:24.409307935 +0200 @@ -80,7 +80,7 @@ .name = "tlv320aic23", .stream_name = "TLV320AIC23", @@ -551939,9 +552264,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/eukrea-tlv320.c linux-linaro-stable-m .codec_name = "tlv320aic23-codec.0-001a", .cpu_dai_name = "imx-ssi.0", .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 +diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_asrc.c linux-3.10.30/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-16 15:28:45.825514214 +0200 ++++ linux-3.10.30/sound/soc/fsl/fsl_asrc.c 2014-05-19 19:07:24.409307935 +0200 @@ -0,0 +1,500 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -552443,9 +552768,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_asrc.c linux-linaro-stable-mx6/so +MODULE_DESCRIPTION("i.MX ASoC ASRC P2P driver"); +MODULE_ALIAS("platform:fsl-asrc-p2p"); +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 +diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_asrc.h linux-3.10.30/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-16 15:28:45.825514214 +0200 ++++ linux-3.10.30/sound/soc/fsl/fsl_asrc.h 2014-05-19 19:07:24.409307935 +0200 @@ -0,0 +1,48 @@ +/* + * fsl_asrc.h - ALSA ASRC interface @@ -552495,9 +552820,9 @@ 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 +diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_asrc_pcm.c linux-3.10.30/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-16 15:28:45.825514214 +0200 ++++ linux-3.10.30/sound/soc/fsl/fsl_asrc_pcm.c 2014-05-19 19:07:24.409307935 +0200 @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -552540,9 +552865,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_asrc_pcm.c linux-linaro-stable-mx +MODULE_DESCRIPTION("i.MX ASoC PCM driver"); +MODULE_ALIAS("platform:imx-pcm-asrc"); +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 +diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_esai.c linux-3.10.30/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-16 15:28:45.845514319 +0200 ++++ linux-3.10.30/sound/soc/fsl/fsl_esai.c 2014-05-19 19:07:24.409307935 +0200 @@ -0,0 +1,710 @@ +/* + * Copyright 2008-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -553254,9 +553579,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_esai.c linux-linaro-stable-mx6/so +MODULE_DESCRIPTION("i.MX ASoC ESAI driver"); +MODULE_ALIAS("platform:fsl-esai-dai"); +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 +diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_esai.h linux-3.10.30/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-16 15:28:45.849514340 +0200 ++++ linux-3.10.30/sound/soc/fsl/fsl_esai.h 2014-05-19 19:07:24.409307935 +0200 @@ -0,0 +1,335 @@ +/* + * imx-esai.h -- ESAI driver header file for Freescale IMX @@ -553593,9 +553918,9 @@ 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 +diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_hdmi.c linux-3.10.30/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-16 15:28:45.849514340 +0200 ++++ linux-3.10.30/sound/soc/fsl/fsl_hdmi.c 2014-05-19 19:07:24.409307935 +0200 @@ -0,0 +1,614 @@ +/* + * ALSA SoC HDMI Audio Layer for Freescale i.MX @@ -554211,9 +554536,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_hdmi.c linux-linaro-stable-mx6/so +MODULE_DESCRIPTION("IMX HDMI TX DAI"); +MODULE_LICENSE("GPL"); +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 +diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_spdif.c linux-3.10.30/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-16 15:28:45.849514340 +0200 ++++ linux-3.10.30/sound/soc/fsl/fsl_spdif.c 2014-05-19 19:07:24.413307949 +0200 @@ -0,0 +1,1282 @@ +/* + * Freescale S/PDIF ALSA SoC Digital Audio Interface (DAI) driver @@ -555497,9 +555822,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_spdif.c linux-linaro-stable-mx6/s +MODULE_DESCRIPTION("Freescale S/PDIF CPU DAI Driver"); +MODULE_LICENSE("GPL v2"); +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 +diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_spdif.h linux-3.10.30/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-16 15:28:45.849514340 +0200 ++++ linux-3.10.30/sound/soc/fsl/fsl_spdif.h 2014-05-19 19:07:24.413307949 +0200 @@ -0,0 +1,193 @@ +/* + * fsl_spdif.h - ALSA S/PDIF interface for the Freescale i.MX SoC @@ -555694,9 +556019,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_spdif.h linux-linaro-stable-mx6/s +#define FSL_SPDIF_FORMATS_CAPTURE (SNDRV_PCM_FMTBIT_S24_LE) + +#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 +diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_ssi.c linux-3.10.30/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-16 15:28:45.853514361 +0200 ++++ linux-3.10.30/sound/soc/fsl/fsl_ssi.c 2014-05-19 19:07:24.413307949 +0200 @@ -3,13 +3,14 @@ * * Author: Timur Tabi <timur@freescale.com> @@ -556411,9 +556736,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_ssi.c linux-linaro-stable-mx6/sou MODULE_AUTHOR("Timur Tabi <timur@freescale.com>"); MODULE_DESCRIPTION("Freescale Synchronous Serial Interface (SSI) ASoC Driver"); 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 +diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_ssi.h linux-3.10.30/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-16 15:28:45.853514361 +0200 ++++ linux-3.10.30/sound/soc/fsl/fsl_ssi.h 2014-05-19 19:07:24.413307949 +0200 @@ -3,7 +3,7 @@ * * Author: Timur Tabi <timur@freescale.com> @@ -556435,9 +556760,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/fsl_ssi.h linux-linaro-stable-mx6/sou #define CCSR_SSI_SxCCR_PSR 0x00020000 #define CCSR_SSI_SxCCR_WL_SHIFT 13 #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 +diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-cs42888.c linux-3.10.30/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-16 15:28:45.853514361 +0200 ++++ linux-3.10.30/sound/soc/fsl/imx-cs42888.c 2014-05-19 19:07:24.413307949 +0200 @@ -0,0 +1,370 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -556809,9 +557134,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-cs42888.c linux-linaro-stable-mx6 +MODULE_DESCRIPTION("ALSA SoC cs42888 Machine Layer Driver"); +MODULE_ALIAS("platform:imx-cs42888"); +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 +diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-hdmi.c linux-3.10.30/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-16 15:28:45.853514361 +0200 ++++ linux-3.10.30/sound/soc/fsl/imx-hdmi.c 2014-05-19 19:07:24.413307949 +0200 @@ -0,0 +1,113 @@ +/* + * ASoC HDMI Transmitter driver for IMX development boards @@ -556926,9 +557251,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-hdmi.c linux-linaro-stable-mx6/so +MODULE_DESCRIPTION("IMX HDMI TX ASoC driver"); +MODULE_LICENSE("GPL"); +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 +diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-hdmi-dma.c linux-3.10.30/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-16 15:28:45.853514361 +0200 ++++ linux-3.10.30/sound/soc/fsl/imx-hdmi-dma.c 2014-05-19 19:07:24.413307949 +0200 @@ -0,0 +1,1104 @@ +/* + * imx-hdmi-dma.c -- HDMI DMA driver for ALSA Soc Audio Layer @@ -558034,9 +558359,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-hdmi-dma.c linux-linaro-stable-mx +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("i.MX HDMI audio DMA"); +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 +diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-hdmi.h linux-3.10.30/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-16 15:28:45.853514361 +0200 ++++ linux-3.10.30/sound/soc/fsl/imx-hdmi.h 2014-05-19 19:07:24.413307949 +0200 @@ -0,0 +1,105 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. @@ -558143,9 +558468,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-hdmi.h linux-linaro-stable-mx6/so + } while (0) + +#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 +diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-mc13783.c linux-3.10.30/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-16 15:28:45.853514361 +0200 ++++ linux-3.10.30/sound/soc/fsl/imx-mc13783.c 2014-05-19 19:07:24.413307949 +0200 @@ -64,7 +64,7 @@ .codec_dai_name = "mc13783-hifi", .codec_name = "mc13783-codec", @@ -558155,9 +558480,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-mc13783.c linux-linaro-stable-mx6 .ops = &imx_mc13783_hifi_ops, .symmetric_rates = 1, .dai_fmt = FMT_SSI, -diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-pcm.c linux-linaro-stable-mx6/sound/soc/fsl/imx-pcm.c +diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-pcm.c linux-3.10.30/sound/soc/fsl/imx-pcm.c --- linux-3.10.30.orig/sound/soc/fsl/imx-pcm.c 2014-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-pcm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.30/sound/soc/fsl/imx-pcm.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,145 +0,0 @@ -/* - * Copyright 2009 Sascha Hauer <s.hauer@pengutronix.de> @@ -558304,9 +558629,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-pcm.c linux-linaro-stable-mx6/sou -MODULE_DESCRIPTION("Freescale i.MX PCM driver"); -MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>"); -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 +diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-pcm-dma.c linux-3.10.30/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-16 15:28:45.853514361 +0200 ++++ linux-3.10.30/sound/soc/fsl/imx-pcm-dma.c 2014-05-19 19:08:18.977509311 +0200 @@ -11,9 +11,14 @@ * Free Software Foundation; either version 2 of the License, or (at your * option) any later version. @@ -558322,7 +558647,7 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-pcm-dma.c linux-linaro-stable-mx6 #include <sound/core.h> #include <sound/pcm.h> -@@ -41,34 +46,105 @@ +@@ -41,34 +46,108 @@ SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME, @@ -558438,9 +558763,12 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-pcm-dma.c linux-linaro-stable-mx6 snd_dmaengine_pcm_unregister(&pdev->dev); } +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 ++ ++MODULE_AUTHOR("Freescale Semiconductor, Inc."); ++MODULE_LICENSE("GPL"); +diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-pcm-fiq.c linux-3.10.30/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-16 15:28:45.853514361 +0200 ++++ linux-3.10.30/sound/soc/fsl/imx-pcm-fiq.c 2014-05-19 19:07:24.417307964 +0200 @@ -230,6 +230,22 @@ return 0; } @@ -558558,9 +558886,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-pcm-fiq.c linux-linaro-stable-mx6 + snd_soc_unregister_platform(&pdev->dev); +} +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 +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-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/imx-pcm.h 2014-05-16 15:28:45.853514361 +0200 ++++ linux-3.10.30/sound/soc/fsl/imx-pcm.h 2014-05-19 19:07:24.417307964 +0200 @@ -18,13 +18,17 @@ /* * Do not change this as the FIQ handler depends on this size @@ -558617,9 +558945,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-pcm.h linux-linaro-stable-mx6/sou #endif #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 +diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-sgtl5000.c linux-3.10.30/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-16 15:28:45.853514361 +0200 ++++ linux-3.10.30/sound/soc/fsl/imx-sgtl5000.c 2014-05-19 19:07:24.417307964 +0200 @@ -149,7 +149,7 @@ data->dai.codec_dai_name = "sgtl5000"; data->dai.codec_of_node = codec_np; @@ -558629,9 +558957,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-sgtl5000.c linux-linaro-stable-mx data->dai.init = &imx_sgtl5000_dai_init; data->dai.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | 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 +diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-si476x.c linux-3.10.30/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-16 15:28:45.853514361 +0200 ++++ linux-3.10.30/sound/soc/fsl/imx-si476x.c 2014-05-19 19:07:24.417307964 +0200 @@ -0,0 +1,195 @@ +/* + * Copyright (C) 2008-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -558828,9 +559156,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-si476x.c linux-linaro-stable-mx6/ +MODULE_DESCRIPTION("ALSA SoC i.MX si476x"); +MODULE_LICENSE("GPL"); +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 +diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-spdif.c linux-3.10.30/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-16 15:28:45.853514361 +0200 ++++ linux-3.10.30/sound/soc/fsl/imx-spdif.c 2014-05-19 19:07:24.417307964 +0200 @@ -0,0 +1,151 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -558983,9 +559311,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-spdif.c linux-linaro-stable-mx6/s +MODULE_DESCRIPTION("Freescale i.MX S/PDIF machine driver"); +MODULE_LICENSE("GPL v2"); +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 +diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-ssi.c linux-3.10.30/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-16 15:28:45.853514361 +0200 ++++ linux-3.10.30/sound/soc/fsl/imx-ssi.c 2014-05-19 19:07:24.417307964 +0200 @@ -590,41 +590,22 @@ goto failed_register; } @@ -559052,9 +559380,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-ssi.c linux-linaro-stable-mx6/sou snd_soc_unregister_component(&pdev->dev); -diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-ssi.h linux-linaro-stable-mx6/sound/soc/fsl/imx-ssi.h +diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-ssi.h linux-3.10.30/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-16 15:28:45.853514361 +0200 ++++ linux-3.10.30/sound/soc/fsl/imx-ssi.h 2014-05-19 19:07:24.417307964 +0200 @@ -211,9 +211,6 @@ struct imx_dma_data filter_data_rx; @@ -559065,9 +559393,9 @@ 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 +diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-wm8962.c linux-3.10.30/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-16 15:28:45.853514361 +0200 ++++ linux-3.10.30/sound/soc/fsl/imx-wm8962.c 2014-05-19 19:07:24.417307964 +0200 @@ -0,0 +1,575 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -559644,9 +559972,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-wm8962.c linux-linaro-stable-mx6/ +MODULE_DESCRIPTION("Freescale i.MX WM8962 ASoC machine driver"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:imx-wm8962"); -diff -Nur linux-3.10.30.orig/sound/soc/fsl/Kconfig linux-linaro-stable-mx6/sound/soc/fsl/Kconfig +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-02-13 22:48:15.000000000 +0100 -+++ linux-linaro-stable-mx6/sound/soc/fsl/Kconfig 2014-05-16 15:28:45.801514087 +0200 ++++ linux-3.10.30/sound/soc/fsl/Kconfig 2014-05-19 19:07:24.417307964 +0200 @@ -1,6 +1,18 @@ config SND_SOC_FSL_SSI tristate @@ -559767,9 +560095,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/Kconfig linux-linaro-stable-mx6/sound + SI476x module. + endif # SND_IMX_SOC -diff -Nur linux-3.10.30.orig/sound/soc/fsl/Makefile linux-linaro-stable-mx6/sound/soc/fsl/Makefile +diff -Nur linux-3.10.30.orig/sound/soc/fsl/Makefile linux-3.10.30/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-16 15:28:45.821514193 +0200 ++++ linux-3.10.30/sound/soc/fsl/Makefile 2014-05-19 19:07:24.417307964 +0200 @@ -10,11 +10,21 @@ snd-soc-p1022-rdk-objs := p1022_rdk.o obj-$(CONFIG_SND_SOC_P1022_RDK) += snd-soc-p1022-rdk.o @@ -559837,9 +560165,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/Makefile linux-linaro-stable-mx6/soun obj-$(CONFIG_SND_SOC_IMX_MC13783) += snd-soc-imx-mc13783.o +obj-$(CONFIG_SND_SOC_IMX_HDMI) += snd-soc-imx-hdmi.o +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 +diff -Nur linux-3.10.30.orig/sound/soc/fsl/mx27vis-aic32x4.c linux-3.10.30/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-16 15:28:45.877514487 +0200 ++++ linux-3.10.30/sound/soc/fsl/mx27vis-aic32x4.c 2014-05-19 19:07:24.417307964 +0200 @@ -161,7 +161,7 @@ .name = "tlv320aic32x4", .stream_name = "TLV320AIC32X4", @@ -559849,9 +560177,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/mx27vis-aic32x4.c linux-linaro-stable .codec_name = "tlv320aic32x4.0-0018", .cpu_dai_name = "imx-ssi.0", .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 +diff -Nur linux-3.10.30.orig/sound/soc/fsl/phycore-ac97.c linux-3.10.30/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-16 15:28:45.877514487 +0200 ++++ linux-3.10.30/sound/soc/fsl/phycore-ac97.c 2014-05-19 19:07:24.417307964 +0200 @@ -33,7 +33,7 @@ .codec_dai_name = "wm9712-hifi", .codec_name = "wm9712-codec", @@ -559861,9 +560189,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/phycore-ac97.c linux-linaro-stable-mx .ops = &imx_phycore_hifi_ops, }, }; -diff -Nur linux-3.10.30.orig/sound/soc/fsl/wm1133-ev1.c linux-linaro-stable-mx6/sound/soc/fsl/wm1133-ev1.c +diff -Nur linux-3.10.30.orig/sound/soc/fsl/wm1133-ev1.c linux-3.10.30/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-16 15:28:45.877514487 +0200 ++++ linux-3.10.30/sound/soc/fsl/wm1133-ev1.c 2014-05-19 19:07:24.417307964 +0200 @@ -245,7 +245,7 @@ .stream_name = "Audio", .cpu_dai_name = "imx-ssi.0", @@ -559873,9 +560201,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/fsl/wm1133-ev1.c linux-linaro-stable-mx6/ .codec_name = "wm8350-codec.0-0x1a", .init = wm1133_ev1_init, .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 +diff -Nur linux-3.10.30.orig/sound/soc/soc-compress.c linux-3.10.30/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-16 15:28:45.925514741 +0200 ++++ linux-3.10.30/sound/soc/soc-compress.c 2014-05-19 19:07:24.417307964 +0200 @@ -149,8 +149,9 @@ SND_SOC_DAPM_STREAM_STOP); } else { @@ -559888,9 +560216,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/soc-compress.c linux-linaro-stable-mx6/so } } else { /* 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 +diff -Nur linux-3.10.30.orig/sound/soc/soc-generic-dmaengine-pcm.c linux-3.10.30/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-16 15:28:45.925514741 +0200 ++++ linux-3.10.30/sound/soc/soc-generic-dmaengine-pcm.c 2014-05-19 19:07:24.417307964 +0200 @@ -163,7 +163,7 @@ } @@ -559900,9 +560228,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/soc-generic-dmaengine-pcm.c linux-linaro- dmaengine_dma_dev(pcm, substream), config->prealloc_buffer_size, 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 +diff -Nur linux-3.10.30.orig/sound/soc/soc-jack.c linux-3.10.30/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-16 15:28:45.949514867 +0200 ++++ linux-3.10.30/sound/soc/soc-jack.c 2014-05-19 19:07:24.417307964 +0200 @@ -263,7 +263,7 @@ if (device_may_wakeup(dev)) pm_wakeup_event(dev, gpio->debounce_time + 50); @@ -559912,9 +560240,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/soc-jack.c linux-linaro-stable-mx6/sound/ msecs_to_jiffies(gpio->debounce_time)); return IRQ_HANDLED; -diff -Nur linux-3.10.30.orig/sound/soc/soc-pcm.c linux-linaro-stable-mx6/sound/soc/soc-pcm.c +diff -Nur linux-3.10.30.orig/sound/soc/soc-pcm.c linux-3.10.30/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-16 15:28:45.949514867 +0200 ++++ linux-3.10.30/sound/soc/soc-pcm.c 2014-05-19 19:07:24.421307978 +0200 @@ -408,8 +408,9 @@ } else { /* start delayed pop wq here for playback streams */ @@ -559945,9 +560273,9 @@ diff -Nur linux-3.10.30.orig/sound/soc/soc-pcm.c linux-linaro-stable-mx6/sound/s list->widgets[i]->name); continue; } -diff -Nur linux-3.10.30.orig/tools/gator/daemon/Android.mk linux-linaro-stable-mx6/tools/gator/daemon/Android.mk +diff -Nur linux-3.10.30.orig/tools/gator/daemon/Android.mk linux-3.10.30/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-16 15:28:46.425517377 +0200 ++++ linux-3.10.30/tools/gator/daemon/Android.mk 2014-05-19 19:07:24.421307978 +0200 @@ -0,0 +1,52 @@ +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) @@ -560001,9 +560329,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Android.mk linux-linaro-stable-m +LOCAL_MODULE_TAGS := optional + +include $(BUILD_EXECUTABLE) -diff -Nur linux-3.10.30.orig/tools/gator/daemon/Buffer.cpp linux-linaro-stable-mx6/tools/gator/daemon/Buffer.cpp +diff -Nur linux-3.10.30.orig/tools/gator/daemon/Buffer.cpp linux-3.10.30/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-16 15:28:46.425517377 +0200 ++++ linux-3.10.30/tools/gator/daemon/Buffer.cpp 2014-05-19 19:07:24.421307978 +0200 @@ -0,0 +1,228 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -560233,9 +560561,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Buffer.cpp linux-linaro-stable-m +bool Buffer::isDone () const { + return done && readPos == commitPos && commitPos == writePos; +} -diff -Nur linux-3.10.30.orig/tools/gator/daemon/Buffer.h linux-linaro-stable-mx6/tools/gator/daemon/Buffer.h +diff -Nur linux-3.10.30.orig/tools/gator/daemon/Buffer.h linux-3.10.30/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-16 15:28:46.425517377 +0200 ++++ linux-3.10.30/tools/gator/daemon/Buffer.h 2014-05-19 19:07:24.421307978 +0200 @@ -0,0 +1,66 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -560303,9 +560631,9 @@ 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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/CapturedXML.cpp linux-3.10.30/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-16 15:28:46.425517377 +0200 ++++ linux-3.10.30/tools/gator/daemon/CapturedXML.cpp 2014-05-19 19:07:24.421307978 +0200 @@ -0,0 +1,134 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -560441,9 +560769,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/CapturedXML.cpp linux-linaro-sta + + return(NULL); +} -diff -Nur linux-3.10.30.orig/tools/gator/daemon/CapturedXML.h linux-linaro-stable-mx6/tools/gator/daemon/CapturedXML.h +diff -Nur linux-3.10.30.orig/tools/gator/daemon/CapturedXML.h linux-3.10.30/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-16 15:28:46.425517377 +0200 ++++ linux-3.10.30/tools/gator/daemon/CapturedXML.h 2014-05-19 19:07:24.421307978 +0200 @@ -0,0 +1,26 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -560471,9 +560799,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/CapturedXML.h linux-linaro-stabl +const char * mxmlWhitespaceCB(mxml_node_t *node, int where); + +#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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/Child.cpp linux-3.10.30/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-16 15:28:46.425517377 +0200 ++++ linux-3.10.30/tools/gator/daemon/Child.cpp 2014-05-19 19:07:24.421307978 +0200 @@ -0,0 +1,409 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -560884,9 +561212,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Child.cpp linux-linaro-stable-mx + delete collector; + delete localCapture; +} -diff -Nur linux-3.10.30.orig/tools/gator/daemon/Child.h linux-linaro-stable-mx6/tools/gator/daemon/Child.h +diff -Nur linux-3.10.30.orig/tools/gator/daemon/Child.h linux-3.10.30/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-16 15:28:46.425517377 +0200 ++++ linux-3.10.30/tools/gator/daemon/Child.h 2014-05-19 19:07:24.425307994 +0200 @@ -0,0 +1,35 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -560923,9 +561251,9 @@ 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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/Collector.cpp linux-3.10.30/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-16 15:28:46.425517377 +0200 ++++ linux-3.10.30/tools/gator/daemon/Collector.cpp 2014-05-19 19:07:24.425307994 +0200 @@ -0,0 +1,221 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -561148,9 +561476,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Collector.cpp linux-linaro-stabl + } + return 0; +} -diff -Nur linux-3.10.30.orig/tools/gator/daemon/Collector.h linux-linaro-stable-mx6/tools/gator/daemon/Collector.h +diff -Nur linux-3.10.30.orig/tools/gator/daemon/Collector.h linux-3.10.30/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-16 15:28:46.425517377 +0200 ++++ linux-3.10.30/tools/gator/daemon/Collector.h 2014-05-19 19:07:24.437308037 +0200 @@ -0,0 +1,38 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -561190,9 +561518,9 @@ 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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/common.mk linux-3.10.30/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-16 15:28:46.429517398 +0200 ++++ linux-3.10.30/tools/gator/daemon/common.mk 2014-05-19 19:07:24.437308037 +0200 @@ -0,0 +1,50 @@ +# -g produces debugging information +# -O3 maximum optimization @@ -561244,9 +561572,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/common.mk linux-linaro-stable-mx + +clean: + 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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/configuration.xml linux-3.10.30/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-16 15:28:46.429517398 +0200 ++++ linux-3.10.30/tools/gator/daemon/configuration.xml 2014-05-19 19:07:24.437308037 +0200 @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<configurations revision="3"> @@ -561305,9 +561633,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/configuration.xml linux-linaro-s + <configuration counter="Linux_power_cpu_freq"/> + <configuration counter="L2C-310_cnt0" event="0x1"/> +</configurations> -diff -Nur linux-3.10.30.orig/tools/gator/daemon/ConfigurationXML.cpp linux-linaro-stable-mx6/tools/gator/daemon/ConfigurationXML.cpp +diff -Nur linux-3.10.30.orig/tools/gator/daemon/ConfigurationXML.cpp linux-3.10.30/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-16 15:28:46.425517377 +0200 ++++ linux-3.10.30/tools/gator/daemon/ConfigurationXML.cpp 2014-05-19 19:07:24.437308037 +0200 @@ -0,0 +1,209 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -561518,9 +561846,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/ConfigurationXML.cpp linux-linar + } + logg->logMessage("Invalid configuration.xml file detected and removed"); +} -diff -Nur linux-3.10.30.orig/tools/gator/daemon/ConfigurationXML.h linux-linaro-stable-mx6/tools/gator/daemon/ConfigurationXML.h +diff -Nur linux-3.10.30.orig/tools/gator/daemon/ConfigurationXML.h linux-3.10.30/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-16 15:28:46.425517377 +0200 ++++ linux-3.10.30/tools/gator/daemon/ConfigurationXML.h 2014-05-19 19:07:24.437308037 +0200 @@ -0,0 +1,38 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -561560,9 +561888,9 @@ 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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/Counter.h linux-3.10.30/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-16 15:28:46.425517377 +0200 ++++ linux-3.10.30/tools/gator/daemon/Counter.h 2014-05-19 19:07:24.437308037 +0200 @@ -0,0 +1,61 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -561625,9 +561953,9 @@ 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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/Driver.cpp linux-3.10.30/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-16 15:28:46.425517377 +0200 ++++ linux-3.10.30/tools/gator/daemon/Driver.cpp 2014-05-19 19:07:24.437308037 +0200 @@ -0,0 +1,15 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -561644,9 +561972,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Driver.cpp linux-linaro-stable-m +Driver::Driver() : next(head) { + head = this; +} -diff -Nur linux-3.10.30.orig/tools/gator/daemon/Driver.h linux-linaro-stable-mx6/tools/gator/daemon/Driver.h +diff -Nur linux-3.10.30.orig/tools/gator/daemon/Driver.h linux-3.10.30/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-16 15:28:46.425517377 +0200 ++++ linux-3.10.30/tools/gator/daemon/Driver.h 2014-05-19 19:07:24.437308037 +0200 @@ -0,0 +1,48 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -561696,9 +562024,9 @@ 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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/escape.c linux-3.10.30/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-16 15:28:46.429517398 +0200 ++++ linux-3.10.30/tools/gator/daemon/escape.c 2014-05-19 19:07:24.437308037 +0200 @@ -0,0 +1,75 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -561775,9 +562103,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/escape.c linux-linaro-stable-mx6 + + return EXIT_SUCCESS; +} -diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-ARM11MPCore.xml linux-linaro-stable-mx6/tools/gator/daemon/events-ARM11MPCore.xml +diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-ARM11MPCore.xml linux-3.10.30/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-16 15:28:46.429517398 +0200 ++++ linux-3.10.30/tools/gator/daemon/events-ARM11MPCore.xml 2014-05-19 19:07:24.441308053 +0200 @@ -0,0 +1,26 @@ + <counter_set name="ARM_ARM11MPCore_cnt" count="3"/> + <category name="ARM11MPCore" counter_set="ARM_ARM11MPCore_cnt" per_cpu="yes"> @@ -561805,9 +562133,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-ARM11MPCore.xml linux-lin + <event event="0x14" title="Write Buffer" name="Write Merges" description="Buffered write merged in a store buffer slot"/> + <event event="0xFF" title="Core" name="Cycle counter" description="An increment each cycle"/> + </category> -diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-ARM11.xml linux-linaro-stable-mx6/tools/gator/daemon/events-ARM11.xml +diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-ARM11.xml linux-3.10.30/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-16 15:28:46.429517398 +0200 ++++ linux-3.10.30/tools/gator/daemon/events-ARM11.xml 2014-05-19 19:07:24.441308053 +0200 @@ -0,0 +1,39 @@ + <counter_set name="ARM_ARM11_cnt" count="3"/> + <category name="ARM11" counter_set="ARM_ARM11_cnt" per_cpu="yes"> @@ -561848,9 +562176,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-ARM11.xml linux-linaro-st + <event event="0x37" title="Procedure" name="Return address misprediction" description="Procedure return address popped off the return stack has been incorrectly predicted by the PFU (ARM1156 only)"/> + <event event="0x38" title="Cache" name="Data dirty parity error" description="Data cache Dirty RAM parity error (ARM1156 only)"/> + </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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-CCI-400.xml linux-3.10.30/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-16 15:28:46.429517398 +0200 ++++ linux-3.10.30/tools/gator/daemon/events-CCI-400.xml 2014-05-19 19:07:24.441308053 +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"> @@ -561959,9 +562287,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-CCI-400.xml linux-linaro- + <event event="0x10" option_set="Master" title="CCI-400" name="Write Stall: VN" description="A write request is stalled for a cycle while it was waiting for a QVN token on VN"/> + <event event="0x11" option_set="Master" title="CCI-400" name="WriteUnique or WriteLineUnique Stall" description="A WriteUnique or WriteLineUnique request is stalled for a cycle because of an address hazard"/> + </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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-CCN-504.xml linux-3.10.30/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-16 15:28:46.429517398 +0200 ++++ linux-3.10.30/tools/gator/daemon/events-CCN-504.xml 2014-05-19 19:07:24.441308053 +0200 @@ -0,0 +1,122 @@ + <counter_set name="CCN-504_cnt" count="4"/> + <category name="CCN-504" counter_set="CCN-504_cnt"> @@ -562085,9 +562413,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-CCN-504.xml linux-linaro- + <event event="0x100A" option_set="SBAS_Region" title="CCN-504" name="Replayed TXREQ Flits" description="Replayed TXREQ Flits."/> + + </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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A12.xml linux-3.10.30/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-16 15:28:46.429517398 +0200 ++++ linux-3.10.30/tools/gator/daemon/events-Cortex-A12.xml 2014-05-19 19:07:24.441308053 +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"> @@ -562175,9 +562503,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A12.xml linux-lina + <event event="0xea" title="Cache" name="L2 TLB access" description="Level 2 TLB access"/> + <event event="0xeb" title="Cache" name="L2 TLB miss" description="Level 2 TLB miss"/> + </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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A15.xml linux-3.10.30/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-16 15:28:46.429517398 +0200 ++++ linux-3.10.30/tools/gator/daemon/events-Cortex-A15.xml 2014-05-19 19:07:24.441308053 +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"> @@ -562247,9 +562575,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A15.xml linux-lina + <event event="0x7d" title="Instruction" name="DSB" description="Barrier speculatively executed - DSB"/> + <event event="0x7e" title="Instruction" name="DMB" description="Barrier speculatively executed - DMB"/> + </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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A53.xml linux-3.10.30/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-16 15:28:46.433517419 +0200 ++++ linux-3.10.30/tools/gator/daemon/events-Cortex-A53.xml 2014-05-19 19:07:24.441308053 +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"> @@ -562422,9 +562750,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A53.xml linux-lina + <!-- 0x91 RC_ST_SPEC - Release consistency instruction speculatively executed - Store Release --> + <event event="0x91" title="Release Consistency" name="Store" description="Release consistency instruction speculatively executed - Store Release"/> + </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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A57.xml linux-3.10.30/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-16 15:28:46.433517419 +0200 ++++ linux-3.10.30/tools/gator/daemon/events-Cortex-A57.xml 2014-05-19 19:07:24.441308053 +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"> @@ -562597,9 +562925,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A57.xml linux-lina + <!-- 0x91 RC_ST_SPEC - Release consistency instruction speculatively executed - Store Release --> + <event event="0x91" title="Release Consistency" name="Store" description="Release consistency instruction speculatively executed - Store Release"/> + </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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A5.xml linux-3.10.30/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-16 15:28:46.433517419 +0200 ++++ linux-3.10.30/tools/gator/daemon/events-Cortex-A5.xml 2014-05-19 19:07:24.441308053 +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"> @@ -562637,9 +562965,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A5.xml linux-linar + <event event="0xC8" title="ETM" name="ETM Ext Out[1]" description="ETM - ETM Ext Out[1]"/> + <event event="0xC9" title="Instruction" name="Pipeline stall" description="Data Write operation that stalls the pipeline because the store buffer is full"/> + </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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A7.xml linux-3.10.30/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-16 15:28:46.433517419 +0200 ++++ linux-3.10.30/tools/gator/daemon/events-Cortex-A7.xml 2014-05-19 19:07:24.445308067 +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"> @@ -562684,9 +563012,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A7.xml linux-linar + <event event="0xC9" title="Instruction" name="Pipeline stall" description="Data Write operation that stalls the pipeline because the store buffer is full"/> + <event event="0xCA" title="Memory" name="Snoop" description="Data snooped from other processor. This event counts memory-read operations that read data from another processor within the local cluster, rather than accessing the L2 cache or issuing an external read."/> + </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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A8.xml linux-3.10.30/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-16 15:28:46.433517419 +0200 ++++ linux-3.10.30/tools/gator/daemon/events-Cortex-A8.xml 2014-05-19 19:07:24.445308067 +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"> @@ -562740,9 +563068,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A8.xml linux-linar + <event event="0x71" title="External" name="PMUEXTIN[1]" description="Counts any event from external input source PMUEXTIN[1]"/> + <event event="0x72" title="External" name="PMUEXTIN[0,1]" description="Counts any event from both external input sources PMUEXTIN[0] and PMUEXTIN[1]"/> + </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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A9.xml linux-3.10.30/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-16 15:28:46.433517419 +0200 ++++ linux-3.10.30/tools/gator/daemon/events-Cortex-A9.xml 2014-05-19 19:07:24.445308067 +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"> @@ -562809,20 +563137,20 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Cortex-A9.xml linux-linar + <event event="0xA4" title="PLE" name="FIFO overflow" description="Counts the number of PLE FIFO flush overflowed"/> + <event event="0xA5" title="PLE" name="Request programmed" description="Counts the number of PLE FIFO flush program requests"/> + </category> -diff -Nur linux-3.10.30.orig/tools/gator/daemon/events_footer.xml linux-linaro-stable-mx6/tools/gator/daemon/events_footer.xml +diff -Nur linux-3.10.30.orig/tools/gator/daemon/events_footer.xml linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/events_footer.xml 2014-05-19 19:07:24.445308067 +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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/events_header.xml linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/events_header.xml 2014-05-19 19:07:24.445308067 +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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Krait-architected.xml linux-3.10.30/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-16 15:28:46.433517419 +0200 ++++ linux-3.10.30/tools/gator/daemon/events-Krait-architected.xml 2014-05-19 19:07:24.445308067 +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"> @@ -562846,9 +563174,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Krait-architected.xml lin + <event event="0x10" title="Branch" name="Mispredicted" description="Branch mispredicted or not predicted"/> + <event event="0x12" title="Branch" name="Potential prediction" description="Branch or other change in program flow that could have been predicted by the branch prediction resources of the processor"/> + </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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-L2C-310.xml linux-3.10.30/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-16 15:28:46.433517419 +0200 ++++ linux-3.10.30/tools/gator/daemon/events-L2C-310.xml 2014-05-19 19:07:24.445308067 +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"> @@ -562868,9 +563196,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-L2C-310.xml linux-linaro- + <event event="0xe" title="L2 Cache" name="SRCONF" description="Speculative read confirmed"/> + <event event="0xf" title="L2 Cache" name="EPFRCVD" description="Prefetch hint received"/> + </category> -diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Linux.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Linux.xml +diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Linux.xml linux-3.10.30/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-16 15:28:46.433517419 +0200 ++++ linux-3.10.30/tools/gator/daemon/events-Linux.xml 2014-05-19 19:07:24.445308067 +0200 @@ -0,0 +1,17 @@ + <category name="Linux"> + <event counter="Linux_irq_softirq" title="Interrupts" name="SoftIRQ" per_cpu="yes" description="Linux SoftIRQ taken"/> @@ -562889,9 +563217,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Linux.xml linux-linaro-st + <event counter="Linux_cpu_wait_io" title="CPU I/O" name="Wait" per_cpu="no" display="average" derived="yes" rendering_type="bar" average_selection="yes" percentage="yes" modifier="10000" description="Thread waiting on I/O resource"/> + </category> + -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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Mali-4xx.xml linux-3.10.30/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-16 15:28:46.433517419 +0200 ++++ linux-3.10.30/tools/gator/daemon/events-Mali-4xx.xml 2014-05-19 19:07:24.445308067 +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"/> @@ -563144,9 +563472,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Mali-4xx.xml linux-linaro + <event counter="ARM_Mali-4xx_SW_39" title="Geometry Statistics" name="Strip Lines" description="Number of lines passed to GLES using the mode GL_LINE_STRIP."/> + <event counter="ARM_Mali-4xx_SW_40" title="Geometry Statistics" name="Loop Lines" description="Number of lines passed to GLES using the mode GL_LINE_LOOP."/> + </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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Mali-T6xx_hw.xml linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/events-Mali-T6xx_hw.xml 2014-05-19 19:07:24.445308067 +0200 @@ -0,0 +1,116 @@ + + <category name="Mali-T6xx-JobManager" per_cpu="no"> @@ -563264,9 +563592,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Mali-T6xx_hw.xml linux-li + <event counter="ARM_Mali-T6xx_L2_EXT_W_STALL" title="Mali L2 Cache" name="External bus stalls (W)" description="Number of cycles a valid write data (W channel) is stalled by the external interconnect"/> + + </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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Mali-T6xx.xml linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/events-Mali-T6xx.xml 2014-05-19 19:07:24.445308067 +0200 @@ -0,0 +1,48 @@ + + <category name="Mali-T6xx-SW-counters" per_cpu="no"> @@ -563316,9 +563644,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Mali-T6xx.xml linux-linar + </option_set> + <event event="0x0400" option_set="fs" title="ARM Mali-T6xx" name="Filmstrip" description="Scaled framebuffer"/> + </category> -diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-ScorpionMP.xml linux-linaro-stable-mx6/tools/gator/daemon/events-ScorpionMP.xml +diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-ScorpionMP.xml linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/events-ScorpionMP.xml 2014-05-19 19:07:24.449308082 +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"> @@ -563410,9 +563738,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-ScorpionMP.xml linux-lina + <event event="0x8e" title="ScorpionMP" name="NUM_BARRIERS" description="Barriers"/> + <event event="0x8f" title="ScorpionMP" name="BARRIER_CYCLES" description="Barrier cycles"/> + </category> -diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Scorpion.xml linux-linaro-stable-mx6/tools/gator/daemon/events-Scorpion.xml +diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Scorpion.xml linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/events-Scorpion.xml 2014-05-19 19:07:24.449308082 +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"> @@ -563521,9 +563849,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/events-Scorpion.xml linux-linaro + <event event="0x9f" title="Scorpion" name="BANK_CD_NON_CASTOUT" description="fills and castouts bank C/D non-castout writes to bus"/> + <event event="0xa0" title="Scorpion" name="BANK_CD_L2_CASTOUT" description="fills and castouts bank C/D L2 castouts (granules)"/> + </category> -diff -Nur linux-3.10.30.orig/tools/gator/daemon/EventsXML.cpp linux-linaro-stable-mx6/tools/gator/daemon/EventsXML.cpp +diff -Nur linux-3.10.30.orig/tools/gator/daemon/EventsXML.cpp linux-3.10.30/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-16 15:28:46.425517377 +0200 ++++ linux-3.10.30/tools/gator/daemon/EventsXML.cpp 2014-05-19 19:07:24.449308082 +0200 @@ -0,0 +1,70 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -563595,9 +563923,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/EventsXML.cpp linux-linaro-stabl + + free(buf); +} -diff -Nur linux-3.10.30.orig/tools/gator/daemon/EventsXML.h linux-linaro-stable-mx6/tools/gator/daemon/EventsXML.h +diff -Nur linux-3.10.30.orig/tools/gator/daemon/EventsXML.h linux-3.10.30/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-16 15:28:46.425517377 +0200 ++++ linux-3.10.30/tools/gator/daemon/EventsXML.h 2014-05-19 19:07:24.449308082 +0200 @@ -0,0 +1,18 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -563617,9 +563945,9 @@ 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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/Fifo.cpp linux-3.10.30/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-16 15:28:46.425517377 +0200 ++++ linux-3.10.30/tools/gator/daemon/Fifo.cpp 2014-05-19 19:07:24.449308082 +0200 @@ -0,0 +1,130 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -563751,9 +564079,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Fifo.cpp linux-linaro-stable-mx6 + + return &mBuffer[mRead]; +} -diff -Nur linux-3.10.30.orig/tools/gator/daemon/Fifo.h linux-linaro-stable-mx6/tools/gator/daemon/Fifo.h +diff -Nur linux-3.10.30.orig/tools/gator/daemon/Fifo.h linux-3.10.30/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-16 15:28:46.425517377 +0200 ++++ linux-3.10.30/tools/gator/daemon/Fifo.h 2014-05-19 19:07:24.449308082 +0200 @@ -0,0 +1,48 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -563803,9 +564131,9 @@ 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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/Hwmon.cpp linux-3.10.30/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-16 15:28:46.425517377 +0200 ++++ linux-3.10.30/tools/gator/daemon/Hwmon.cpp 2014-05-19 19:07:24.449308082 +0200 @@ -0,0 +1,330 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -564137,9 +564465,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Hwmon.cpp linux-linaro-stable-mx + buffer->event(counter->getKey(), counter->read()); + } +} -diff -Nur linux-3.10.30.orig/tools/gator/daemon/Hwmon.h linux-linaro-stable-mx6/tools/gator/daemon/Hwmon.h +diff -Nur linux-3.10.30.orig/tools/gator/daemon/Hwmon.h linux-3.10.30/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-16 15:28:46.425517377 +0200 ++++ linux-3.10.30/tools/gator/daemon/Hwmon.h 2014-05-19 19:07:24.449308082 +0200 @@ -0,0 +1,43 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -564184,9 +564512,9 @@ 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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/KMod.cpp linux-3.10.30/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-16 15:28:46.429517398 +0200 ++++ linux-3.10.30/tools/gator/daemon/KMod.cpp 2014-05-19 19:07:24.449308082 +0200 @@ -0,0 +1,102 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -564290,9 +564618,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/KMod.cpp linux-linaro-stable-mx6 + } + closedir(dir); +} -diff -Nur linux-3.10.30.orig/tools/gator/daemon/KMod.h linux-linaro-stable-mx6/tools/gator/daemon/KMod.h +diff -Nur linux-3.10.30.orig/tools/gator/daemon/KMod.h linux-3.10.30/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-16 15:28:46.429517398 +0200 ++++ linux-3.10.30/tools/gator/daemon/KMod.h 2014-05-19 19:07:24.449308082 +0200 @@ -0,0 +1,27 @@ +/** + * Copyright (C) ARM Limited 2013. All rights reserved. @@ -564321,9 +564649,9 @@ 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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/access.c linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/libsensors/access.c 2014-05-19 19:07:24.453308097 +0200 @@ -0,0 +1,561 @@ +/* + access.c - Part of libsensors, a Linux library for reading sensor data. @@ -564886,9 +565214,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/access.c linux-linaro + } + return res; +} -diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/access.h linux-linaro-stable-mx6/tools/gator/daemon/libsensors/access.h +diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/access.h linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/libsensors/access.h 2014-05-19 19:07:24.453308097 +0200 @@ -0,0 +1,33 @@ +/* + access.h - Part of libsensors, a Linux library for reading sensor data. @@ -564923,9 +565251,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/access.h linux-linaro +int sensors_chip_name_has_wildcards(const sensors_chip_name *chip); + +#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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/conf.h linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/libsensors/conf.h 2014-05-19 19:07:24.453308097 +0200 @@ -0,0 +1,34 @@ +/* + conf.h - Part of libsensors, a Linux library for reading sensor data. @@ -564961,9 +565289,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/conf.h linux-linaro-s +int sensors_yyparse(void); + +#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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/conf-lex.c linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/libsensors/conf-lex.c 2014-05-19 19:07:24.453308097 +0200 @@ -0,0 +1,2881 @@ + +#line 3 "<stdout>" @@ -567846,9 +568174,9 @@ 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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/conf-lex.l linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/libsensors/conf-lex.l 2014-05-19 19:07:24.453308097 +0200 @@ -0,0 +1,372 @@ +%{ +/* @@ -568222,9 +568550,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/conf-lex.l linux-lina +#endif +} + -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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/conf-parse.c linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/libsensors/conf-parse.c 2014-05-19 19:07:24.453308097 +0200 @@ -0,0 +1,2042 @@ +/* A Bison parser, made by GNU Bison 2.5. */ + @@ -570268,9 +570596,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/conf-parse.c linux-li + return res; +} + -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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/conf-parse.h linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/libsensors/conf-parse.h 2014-05-19 19:07:24.453308097 +0200 @@ -0,0 +1,84 @@ +/* A Bison parser, made by GNU Bison 2.5. */ + @@ -570356,9 +570684,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/conf-parse.h linux-li +extern YYSTYPE sensors_yylval; + + -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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/conf-parse.y linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/libsensors/conf-parse.y 2014-05-19 19:07:24.453308097 +0200 @@ -0,0 +1,347 @@ +%{ +/* @@ -570707,9 +571035,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/conf-parse.y linux-li + sensors_fatal_error(__func__, "Allocating a new expression"); + return res; +} -diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/COPYING.LGPL linux-linaro-stable-mx6/tools/gator/daemon/libsensors/COPYING.LGPL +diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/COPYING.LGPL linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/libsensors/COPYING.LGPL 2014-05-19 19:07:24.461308126 +0200 @@ -0,0 +1,502 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 @@ -571213,9 +571541,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/COPYING.LGPL linux-li + Ty Coon, President of Vice + +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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/data.c linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/libsensors/data.c 2014-05-19 19:07:24.465308141 +0200 @@ -0,0 +1,278 @@ +/* + data.c - Part of libsensors, a Linux library for reading sensor data. @@ -571495,9 +571823,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/data.c linux-linaro-s + sensors_config_chips_subst = sensors_config_chips_count; + return res; +} -diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/data.h linux-linaro-stable-mx6/tools/gator/daemon/libsensors/data.h +diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/data.h linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/libsensors/data.h 2014-05-19 19:07:24.465308141 +0200 @@ -0,0 +1,184 @@ +/* + data.h - Part of libsensors, a Linux library for reading sensor data. @@ -571683,9 +572011,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/data.h linux-linaro-s +int sensors_parse_bus_id(const char *name, sensors_bus_id *bus); + +#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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/error.c linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/libsensors/error.c 2014-05-19 19:07:24.465308141 +0200 @@ -0,0 +1,92 @@ +/* + error.c - Part of libsensors, a Linux library for reading sensor data. @@ -571779,9 +572107,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/error.c linux-linaro- + fprintf(stderr, "Fatal error in `%s': %s\n", proc, err); + exit(1); +} -diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/error.h linux-linaro-stable-mx6/tools/gator/daemon/libsensors/error.h +diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/error.h linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/libsensors/error.h 2014-05-19 19:07:24.465308141 +0200 @@ -0,0 +1,74 @@ +/* + error.h - Part of libsensors, a Linux library for reading sensor data. @@ -571857,9 +572185,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/error.h linux-linaro- +#endif /* __cplusplus */ + +#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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/general.c linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/libsensors/general.c 2014-05-19 19:07:24.465308141 +0200 @@ -0,0 +1,85 @@ +/* + general.c - Part of libsensors, a Linux library for reading sensor data. @@ -571946,9 +572274,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/general.c linux-linar + memcpy(((char *)*my_list) + *num_el * el_size, els, el_size * nr_els); + *num_el += nr_els; +} -diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/general.h linux-linaro-stable-mx6/tools/gator/daemon/libsensors/general.h +diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/general.h linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/libsensors/general.h 2014-05-19 19:07:24.465308141 +0200 @@ -0,0 +1,39 @@ +/* + general.h - Part of libsensors, a Linux library for reading sensor data. @@ -571989,9 +572317,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/general.h linux-linar +#define ARRAY_SIZE(arr) (int)(sizeof(arr) / sizeof((arr)[0])) + +#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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/init.c linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/libsensors/init.c 2014-05-19 19:07:24.465308141 +0200 @@ -0,0 +1,341 @@ +/* + init.c - Part of libsensors, a Linux library for reading sensor data. @@ -572334,9 +572662,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/init.c linux-linaro-s + sensors_config_files = NULL; + sensors_config_files_count = sensors_config_files_max = 0; +} -diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/init.h linux-linaro-stable-mx6/tools/gator/daemon/libsensors/init.h +diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/init.h linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/libsensors/init.h 2014-05-19 19:07:24.465308141 +0200 @@ -0,0 +1,28 @@ +/* + init.h - Part of libsensors, a Linux library for reading sensor data. @@ -572366,9 +572694,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/init.h linux-linaro-s +void sensors_free_expr(sensors_expr *expr); + +#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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/scanner.h linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/libsensors/scanner.h 2014-05-19 19:07:24.465308141 +0200 @@ -0,0 +1,32 @@ +/* + scanner.h - Part of libsensors, a Linux library for reading sensor data. @@ -572402,9 +572730,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/scanner.h linux-linar + +#endif + -diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/sensors.h linux-linaro-stable-mx6/tools/gator/daemon/libsensors/sensors.h +diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/sensors.h linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/libsensors/sensors.h 2014-05-19 19:07:24.465308141 +0200 @@ -0,0 +1,311 @@ +/* + sensors.h - Part of libsensors, a Linux library for reading sensor data. @@ -572717,9 +573045,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/sensors.h linux-linar +#endif /* __cplusplus */ + +#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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/sysfs.c linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/libsensors/sysfs.c 2014-05-19 19:07:24.465308141 +0200 @@ -0,0 +1,926 @@ +/* + sysfs.c - Part of libsensors, a library for reading Linux sensor data @@ -573647,9 +573975,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/sysfs.c linux-linaro- + + return 0; +} -diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/sysfs.h linux-linaro-stable-mx6/tools/gator/daemon/libsensors/sysfs.h +diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/sysfs.h linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/libsensors/sysfs.h 2014-05-19 19:07:24.465308141 +0200 @@ -0,0 +1,43 @@ +/* + sysfs.h - part of libsensors, a library for reading Linux sensor data @@ -573694,14 +574022,14 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/sysfs.h linux-linaro- + double value); + +#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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/libsensors/version.h linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/libsensors/version.h 2014-05-19 19:07:24.465308141 +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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/LocalCapture.cpp linux-3.10.30/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-16 15:28:46.429517398 +0200 ++++ linux-3.10.30/tools/gator/daemon/LocalCapture.cpp 2014-05-19 19:07:24.465308141 +0200 @@ -0,0 +1,129 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -573832,9 +574160,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/LocalCapture.cpp linux-linaro-st + ptr = ptr->next; + } +} -diff -Nur linux-3.10.30.orig/tools/gator/daemon/LocalCapture.h linux-linaro-stable-mx6/tools/gator/daemon/LocalCapture.h +diff -Nur linux-3.10.30.orig/tools/gator/daemon/LocalCapture.h linux-3.10.30/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-16 15:28:46.429517398 +0200 ++++ linux-3.10.30/tools/gator/daemon/LocalCapture.h 2014-05-19 19:07:24.465308141 +0200 @@ -0,0 +1,26 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -573862,9 +574190,9 @@ 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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/Logging.cpp linux-3.10.30/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-16 15:28:46.429517398 +0200 ++++ linux-3.10.30/tools/gator/daemon/Logging.cpp 2014-05-19 19:07:24.465308141 +0200 @@ -0,0 +1,78 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -573944,9 +574272,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Logging.cpp linux-linaro-stable- + MUTEX_UNLOCK(); + } +} -diff -Nur linux-3.10.30.orig/tools/gator/daemon/Logging.h linux-linaro-stable-mx6/tools/gator/daemon/Logging.h +diff -Nur linux-3.10.30.orig/tools/gator/daemon/Logging.h linux-3.10.30/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-16 15:28:46.429517398 +0200 ++++ linux-3.10.30/tools/gator/daemon/Logging.h 2014-05-19 19:07:24.465308141 +0200 @@ -0,0 +1,47 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -573995,9 +574323,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Logging.h linux-linaro-stable-mx +extern void handleException() __attribute__ ((noreturn)); + +#endif //__LOGGING_H__ -diff -Nur linux-3.10.30.orig/tools/gator/daemon/main.cpp linux-linaro-stable-mx6/tools/gator/daemon/main.cpp +diff -Nur linux-3.10.30.orig/tools/gator/daemon/main.cpp linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/main.cpp 2014-05-19 19:07:24.465308141 +0200 @@ -0,0 +1,485 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -574484,9 +574812,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/main.cpp linux-linaro-stable-mx6 + cleanUp(); + return 0; +} -diff -Nur linux-3.10.30.orig/tools/gator/daemon/Makefile linux-linaro-stable-mx6/tools/gator/daemon/Makefile +diff -Nur linux-3.10.30.orig/tools/gator/daemon/Makefile linux-3.10.30/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-16 15:28:46.429517398 +0200 ++++ linux-3.10.30/tools/gator/daemon/Makefile 2014-05-19 19:07:24.469308156 +0200 @@ -0,0 +1,25 @@ +# +# Makefile for ARM Streamline - Gator Daemon @@ -574513,9 +574841,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Makefile linux-linaro-stable-mx6 +endif + +include common.mk -diff -Nur linux-3.10.30.orig/tools/gator/daemon/Makefile_aarch64 linux-linaro-stable-mx6/tools/gator/daemon/Makefile_aarch64 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/Makefile_aarch64 linux-3.10.30/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-16 15:28:46.429517398 +0200 ++++ linux-3.10.30/tools/gator/daemon/Makefile_aarch64 2014-05-19 19:07:24.469308156 +0200 @@ -0,0 +1,15 @@ +# +# Makefile for ARM Streamline - Gator Daemon @@ -574532,9 +574860,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Makefile_aarch64 linux-linaro-st +GCC = $(CROSS_COMPILE)gcc + +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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/config.h linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/mxml/config.h 2014-05-19 19:07:24.469308156 +0200 @@ -0,0 +1,96 @@ +/* config.h. Generated from config.h.in by configure. */ +/* @@ -574632,9 +574960,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/config.h linux-linaro-stabl +/* + * End of "$Id: config.h.in 408 2010-09-19 05:26:46Z mike $". + */ -diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/COPYING linux-linaro-stable-mx6/tools/gator/daemon/mxml/COPYING +diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/COPYING linux-3.10.30/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-16 15:28:46.437517441 +0200 ++++ linux-3.10.30/tools/gator/daemon/mxml/COPYING 2014-05-19 19:07:24.469308156 +0200 @@ -0,0 +1,507 @@ + Mini-XML License + September 18, 2010 @@ -575143,9 +575471,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/COPYING linux-linaro-stable + Ty Coon, President of Vice + +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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-attr.c linux-3.10.30/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-16 15:28:46.441517461 +0200 ++++ linux-3.10.30/tools/gator/daemon/mxml/mxml-attr.c 2014-05-19 19:07:24.469308156 +0200 @@ -0,0 +1,319 @@ +/* + * "$Id: mxml-attr.c 408 2010-09-19 05:26:46Z mike $" @@ -575466,9 +575794,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-attr.c linux-linaro-st +/* + * End of "$Id: mxml-attr.c 408 2010-09-19 05:26:46Z mike $". + */ -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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-entity.c linux-3.10.30/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-16 15:28:46.441517461 +0200 ++++ linux-3.10.30/tools/gator/daemon/mxml/mxml-entity.c 2014-05-19 19:07:24.473308171 +0200 @@ -0,0 +1,460 @@ +/* + * "$Id: mxml-entity.c 408 2010-09-19 05:26:46Z mike $" @@ -575930,9 +576258,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-entity.c linux-linaro- +/* + * End of "$Id: mxml-entity.c 408 2010-09-19 05:26:46Z mike $". + */ -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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-file.c linux-3.10.30/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-16 15:28:46.441517461 +0200 ++++ linux-3.10.30/tools/gator/daemon/mxml/mxml-file.c 2014-05-19 19:07:24.473308171 +0200 @@ -0,0 +1,3082 @@ +/* + * "$Id: mxml-file.c 438 2011-03-24 05:47:51Z mike $" @@ -579016,9 +579344,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-file.c linux-linaro-st +/* + * End of "$Id: mxml-file.c 438 2011-03-24 05:47:51Z mike $". + */ -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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-get.c linux-3.10.30/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-16 15:28:46.441517461 +0200 ++++ linux-3.10.30/tools/gator/daemon/mxml/mxml-get.c 2014-05-19 19:07:24.477308185 +0200 @@ -0,0 +1,471 @@ +/* + * "$Id: mxml-get.c 427 2011-01-03 02:03:29Z mike $" @@ -579491,9 +579819,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-get.c linux-linaro-sta +/* + * End of "$Id: mxml-get.c 427 2011-01-03 02:03:29Z mike $". + */ -diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml.h linux-linaro-stable-mx6/tools/gator/daemon/mxml/mxml.h +diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml.h linux-3.10.30/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-16 15:28:46.441517461 +0200 ++++ linux-3.10.30/tools/gator/daemon/mxml/mxml.h 2014-05-19 19:07:24.477308185 +0200 @@ -0,0 +1,329 @@ +/* + * "$Id: mxml.h 427 2011-01-03 02:03:29Z mike $" @@ -579824,9 +580152,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml.h linux-linaro-stable- +/* + * End of "$Id: mxml.h 427 2011-01-03 02:03:29Z mike $". + */ -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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-index.c linux-3.10.30/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-16 15:28:46.441517461 +0200 ++++ linux-3.10.30/tools/gator/daemon/mxml/mxml-index.c 2014-05-19 19:07:24.477308185 +0200 @@ -0,0 +1,662 @@ +/* + * "$Id: mxml-index.c 426 2011-01-01 23:42:17Z mike $" @@ -580490,9 +580818,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-index.c linux-linaro-s +/* + * End of "$Id: mxml-index.c 426 2011-01-01 23:42:17Z mike $". + */ -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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-node.c linux-3.10.30/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-16 15:28:46.441517461 +0200 ++++ linux-3.10.30/tools/gator/daemon/mxml/mxml-node.c 2014-05-19 19:07:24.489308230 +0200 @@ -0,0 +1,807 @@ +/* + * "$Id: mxml-node.c 436 2011-01-22 01:02:05Z mike $" @@ -581301,9 +581629,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-node.c linux-linaro-st +/* + * End of "$Id: mxml-node.c 436 2011-01-22 01:02:05Z mike $". + */ -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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-private.c linux-3.10.30/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-16 15:28:46.441517461 +0200 ++++ linux-3.10.30/tools/gator/daemon/mxml/mxml-private.c 2014-05-19 19:07:24.489308230 +0200 @@ -0,0 +1,331 @@ +/* + * "$Id: mxml-private.c 422 2010-11-07 22:55:11Z mike $" @@ -581636,9 +581964,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-private.c linux-linaro +/* + * End of "$Id: mxml-private.c 422 2010-11-07 22:55:11Z mike $". + */ -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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-private.h linux-3.10.30/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-16 15:28:46.441517461 +0200 ++++ linux-3.10.30/tools/gator/daemon/mxml/mxml-private.h 2014-05-19 19:07:24.489308230 +0200 @@ -0,0 +1,50 @@ +/* + * "$Id: mxml-private.h 408 2010-09-19 05:26:46Z mike $" @@ -581690,9 +582018,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-private.h linux-linaro +/* + * End of "$Id: mxml-private.h 408 2010-09-19 05:26:46Z mike $". + */ -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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-search.c linux-3.10.30/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-16 15:28:46.441517461 +0200 ++++ linux-3.10.30/tools/gator/daemon/mxml/mxml-search.c 2014-05-19 19:07:24.489308230 +0200 @@ -0,0 +1,287 @@ +/* + * "$Id: mxml-search.c 427 2011-01-03 02:03:29Z mike $" @@ -581981,9 +582309,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-search.c linux-linaro- +/* + * End of "$Id: mxml-search.c 427 2011-01-03 02:03:29Z mike $". + */ -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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-set.c linux-3.10.30/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-16 15:28:46.441517461 +0200 ++++ linux-3.10.30/tools/gator/daemon/mxml/mxml-set.c 2014-05-19 19:07:24.489308230 +0200 @@ -0,0 +1,349 @@ +/* + * "$Id: mxml-set.c 441 2011-12-09 23:49:00Z mike $" @@ -582334,9 +582662,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-set.c linux-linaro-sta +/* + * End of "$Id: mxml-set.c 441 2011-12-09 23:49:00Z mike $". + */ -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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-string.c linux-3.10.30/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-16 15:28:46.441517461 +0200 ++++ linux-3.10.30/tools/gator/daemon/mxml/mxml-string.c 2014-05-19 19:07:24.493308245 +0200 @@ -0,0 +1,476 @@ +/* + * "$Id: mxml-string.c 424 2010-12-25 16:21:50Z mike $" @@ -582814,9 +583142,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/mxml/mxml-string.c linux-linaro- +/* + * End of "$Id: mxml-string.c 424 2010-12-25 16:21:50Z mike $". + */ -diff -Nur linux-3.10.30.orig/tools/gator/daemon/OlySocket.cpp linux-linaro-stable-mx6/tools/gator/daemon/OlySocket.cpp +diff -Nur linux-3.10.30.orig/tools/gator/daemon/OlySocket.cpp linux-3.10.30/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-16 15:28:46.429517398 +0200 ++++ linux-3.10.30/tools/gator/daemon/OlySocket.cpp 2014-05-19 19:07:24.493308245 +0200 @@ -0,0 +1,268 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -583086,9 +583414,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/OlySocket.cpp linux-linaro-stabl + + return bytes_received; +} -diff -Nur linux-3.10.30.orig/tools/gator/daemon/OlySocket.h linux-linaro-stable-mx6/tools/gator/daemon/OlySocket.h +diff -Nur linux-3.10.30.orig/tools/gator/daemon/OlySocket.h linux-3.10.30/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-16 15:28:46.429517398 +0200 ++++ linux-3.10.30/tools/gator/daemon/OlySocket.h 2014-05-19 19:07:24.493308245 +0200 @@ -0,0 +1,36 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -583126,9 +583454,9 @@ 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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/OlyUtility.cpp linux-3.10.30/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-16 15:28:46.429517398 +0200 ++++ linux-3.10.30/tools/gator/daemon/OlyUtility.cpp 2014-05-19 19:07:24.493308245 +0200 @@ -0,0 +1,227 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -583357,9 +583685,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/OlyUtility.cpp linux-linaro-stab + + return (path); +} -diff -Nur linux-3.10.30.orig/tools/gator/daemon/OlyUtility.h linux-linaro-stable-mx6/tools/gator/daemon/OlyUtility.h +diff -Nur linux-3.10.30.orig/tools/gator/daemon/OlyUtility.h linux-3.10.30/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-16 15:28:46.429517398 +0200 ++++ linux-3.10.30/tools/gator/daemon/OlyUtility.h 2014-05-19 19:07:24.493308245 +0200 @@ -0,0 +1,42 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -583403,9 +583731,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/OlyUtility.h linux-linaro-stable +extern OlyUtility* util; + +#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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/Sender.cpp linux-3.10.30/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-16 15:28:46.429517398 +0200 ++++ linux-3.10.30/tools/gator/daemon/Sender.cpp 2014-05-19 19:07:24.493308245 +0200 @@ -0,0 +1,135 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -583542,9 +583870,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/Sender.cpp linux-linaro-stable-m + + pthread_mutex_unlock(&mSendMutex); +} -diff -Nur linux-3.10.30.orig/tools/gator/daemon/Sender.h linux-linaro-stable-mx6/tools/gator/daemon/Sender.h +diff -Nur linux-3.10.30.orig/tools/gator/daemon/Sender.h linux-3.10.30/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-16 15:28:46.429517398 +0200 ++++ linux-3.10.30/tools/gator/daemon/Sender.h 2014-05-19 19:07:24.493308245 +0200 @@ -0,0 +1,42 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -583588,9 +583916,9 @@ 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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/SessionData.cpp linux-3.10.30/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-16 15:28:46.429517398 +0200 ++++ linux-3.10.30/tools/gator/daemon/SessionData.cpp 2014-05-19 19:07:24.493308245 +0200 @@ -0,0 +1,150 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -583742,9 +584070,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/SessionData.cpp linux-linaro-sta + key += 2; + return ret; +} -diff -Nur linux-3.10.30.orig/tools/gator/daemon/SessionData.h linux-linaro-stable-mx6/tools/gator/daemon/SessionData.h +diff -Nur linux-3.10.30.orig/tools/gator/daemon/SessionData.h linux-3.10.30/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-16 15:28:46.429517398 +0200 ++++ linux-3.10.30/tools/gator/daemon/SessionData.h 2014-05-19 19:07:24.493308245 +0200 @@ -0,0 +1,75 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -583821,9 +584149,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/SessionData.h linux-linaro-stabl +int getEventKey(); + +#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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/SessionXML.cpp linux-3.10.30/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-16 15:28:46.429517398 +0200 ++++ linux-3.10.30/tools/gator/daemon/SessionXML.cpp 2014-05-19 19:07:24.493308245 +0200 @@ -0,0 +1,109 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -583934,9 +584262,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/SessionXML.cpp linux-linaro-stab + image->next = parameters.images; + parameters.images = image; +} -diff -Nur linux-3.10.30.orig/tools/gator/daemon/SessionXML.h linux-linaro-stable-mx6/tools/gator/daemon/SessionXML.h +diff -Nur linux-3.10.30.orig/tools/gator/daemon/SessionXML.h linux-3.10.30/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-16 15:28:46.429517398 +0200 ++++ linux-3.10.30/tools/gator/daemon/SessionXML.h 2014-05-19 19:07:24.493308245 +0200 @@ -0,0 +1,42 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -583980,9 +584308,9 @@ 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 +diff -Nur linux-3.10.30.orig/tools/gator/daemon/StreamlineSetup.cpp linux-3.10.30/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-16 15:28:46.429517398 +0200 ++++ linux-3.10.30/tools/gator/daemon/StreamlineSetup.cpp 2014-05-19 19:07:24.493308245 +0200 @@ -0,0 +1,272 @@ +/** + * Copyright (C) ARM Limited 2011-2013. All rights reserved. @@ -584256,9 +584584,9 @@ diff -Nur linux-3.10.30.orig/tools/gator/daemon/StreamlineSetup.cpp linux-linaro + handleException(); + } +} -diff -Nur linux-3.10.30.orig/tools/gator/daemon/StreamlineSetup.h linux-linaro-stable-mx6/tools/gator/daemon/StreamlineSetup.h +diff -Nur linux-3.10.30.orig/tools/gator/daemon/StreamlineSetup.h linux-3.10.30/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-16 15:28:46.429517398 +0200 ++++ linux-3.10.30/tools/gator/daemon/StreamlineSetup.h 2014-05-19 19:07:24.497308259 +0200 @@ -0,0 +1,47 @@ +/** + * Copyright (C) ARM Limited 2010-2013. All rights reserved. @@ -584307,9 +584635,9 @@ 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 +diff -Nur linux-3.10.30.orig/tools/lib/lk/Makefile linux-3.10.30/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-16 15:28:46.445517482 +0200 ++++ linux-3.10.30/tools/lib/lk/Makefile 2014-05-19 19:07:24.497308259 +0200 @@ -1,5 +1,8 @@ include ../../scripts/Makefile.include diff --git a/target/arm/cubox-i/patches/3.10.30/regmap-boolean.patch b/target/arm/cubox-i/patches/3.10.30/regmap-boolean.patch new file mode 100644 index 000000000..c8ee12c58 --- /dev/null +++ b/target/arm/cubox-i/patches/3.10.30/regmap-boolean.patch @@ -0,0 +1,20 @@ +diff -Nur linux-3.10.30.orig/drivers/base/regmap/Kconfig linux-3.10.30/drivers/base/regmap/Kconfig +--- linux-3.10.30.orig/drivers/base/regmap/Kconfig 2014-02-13 22:48:15.000000000 +0100 ++++ linux-3.10.30/drivers/base/regmap/Kconfig 2014-05-19 18:38:14.558461284 +0200 +@@ -10,13 +10,13 @@ + bool + + config REGMAP_I2C +- tristate ++ boolean + + config REGMAP_SPI +- tristate ++ boolean + + config REGMAP_MMIO +- tristate ++ boolean + + config REGMAP_IRQ + bool diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index d56145cc1..fba1a2226 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -14,7 +14,7 @@ config ADK_KERNEL_SND_ARM boolean config ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM - tristate + boolean config ADK_KERNEL_SND_SOC_FSL_SPDIF tristate diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index be734be7e..5b4bbd2a3 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -10,9 +10,18 @@ config ADK_KERNEL_USB_EHCI_ROOT_HUB_TT config ADK_KERNEL_USB_EHCI_TT_NEWSCHED boolean -config ADK_KERNEL_USB_MXS_PHY +config ADK_KERNEL_USB_GADGET + tristate + +config ADK_KERNEL_USB_PHY boolean +config ADK_KERNEL_USB_MXS_PHY + tristate + select ADK_KERNEL_USB_PHY + default m if ADK_TARGET_SYSTEM_CUBOX_I + default n + config ADK_KERNEL_USB_OHCI_HCD_PLATFORM boolean select ADK_KERNEL_USB_OHCI_HCD @@ -162,6 +171,7 @@ config ADK_KERNEL_USB_CHIPIDEA tristate select ADK_KERNEL_USB_CHIPIDEA_UDC select ADK_KERNEL_USB_CHIPIDEA_HOST + select ADK_KERNEL_USB_GADGET depends on ADK_KERNEL_USB_EHCI_HCD default m if ADK_TARGET_SYSTEM_CUBOX_I default n |