summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/modules.mk44
-rw-r--r--target/arm/cubox-i/patches/3.10.30/exportfs-boolean.patch12
-rw-r--r--target/arm/cubox-i/patches/3.10.30/linux4kix.patch5378
-rw-r--r--target/arm/cubox-i/patches/3.10.30/regmap-boolean.patch20
-rw-r--r--target/linux/config/Config.in.audio2
-rw-r--r--target/linux/config/Config.in.usb12
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 = <&reg_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 = <&reg_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 = <&reg_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 = <&reg_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 = <&reg_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