summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/kernel-ver.mk6
-rw-r--r--target/arm/raspberry-pi/patches/3.14.26/raspberry-pi.patch (renamed from target/arm/raspberry-pi/patches/3.14.22/raspberry-pi.patch)0
-rw-r--r--target/arm/solidrun-imx6/patches/3.14.26/solidrun.patch (renamed from target/arm/solidrun-imx6/patches/3.14.22/solidrun.patch)5731
-rw-r--r--target/config/Config.in.kernelversion.choice6
-rw-r--r--target/config/Config.in.kernelversion.default2
-rw-r--r--target/linux/config/Config.in.graphics4
-rw-r--r--target/linux/patches/3.14.26/bsd-compatibility.patch (renamed from target/linux/patches/3.14.22/bsd-compatibility.patch)0
-rw-r--r--target/linux/patches/3.14.26/cleankernel.patch (renamed from target/linux/patches/3.14.22/cleankernel.patch)0
-rw-r--r--target/linux/patches/3.14.26/defaults.patch (renamed from target/linux/patches/3.14.22/defaults.patch)0
-rw-r--r--target/linux/patches/3.14.26/disable-netfilter.patch (renamed from target/linux/patches/3.14.22/disable-netfilter.patch)0
-rw-r--r--target/linux/patches/3.14.26/export-symbol-for-exmap.patch (renamed from target/linux/patches/3.14.22/export-symbol-for-exmap.patch)0
-rw-r--r--target/linux/patches/3.14.26/gemalto.patch (renamed from target/linux/patches/3.14.22/gemalto.patch)0
-rw-r--r--target/linux/patches/3.14.26/initramfs-nosizelimit.patch (renamed from target/linux/patches/3.14.22/initramfs-nosizelimit.patch)0
-rw-r--r--target/linux/patches/3.14.26/lemote-rfkill.patch (renamed from target/linux/patches/3.14.22/lemote-rfkill.patch)0
-rw-r--r--target/linux/patches/3.14.26/microblaze-axi.patch (renamed from target/linux/patches/3.14.22/microblaze-axi.patch)0
-rw-r--r--target/linux/patches/3.14.26/microblaze-ethernet.patch (renamed from target/linux/patches/3.14.22/microblaze-ethernet.patch)0
-rw-r--r--target/linux/patches/3.14.26/mkpiggy.patch (renamed from target/linux/patches/3.14.22/mkpiggy.patch)0
-rw-r--r--target/linux/patches/3.14.26/mtd-rootfs.patch (renamed from target/linux/patches/3.14.22/mtd-rootfs.patch)0
-rw-r--r--target/linux/patches/3.14.26/nfsv3-tcp.patch (renamed from target/linux/patches/3.14.22/nfsv3-tcp.patch)0
-rw-r--r--target/linux/patches/3.14.26/non-static.patch (renamed from target/linux/patches/3.14.22/non-static.patch)0
-rw-r--r--target/linux/patches/3.14.26/patch-fblogo (renamed from target/linux/patches/3.14.22/patch-fblogo)0
-rw-r--r--target/linux/patches/3.14.26/patch-grsec (renamed from target/linux/patches/3.14.22/patch-grsec)0
-rw-r--r--target/linux/patches/3.14.26/patch-mptcp (renamed from target/linux/patches/3.14.22/patch-mptcp)0
-rw-r--r--target/linux/patches/3.14.26/patch-yaffs2 (renamed from target/linux/patches/3.14.22/patch-yaffs2)0
-rw-r--r--target/linux/patches/3.14.26/ppc64-missing-zlib.patch (renamed from target/linux/patches/3.14.22/ppc64-missing-zlib.patch)0
-rw-r--r--target/linux/patches/3.14.26/regmap-boolean.patch (renamed from target/linux/patches/3.14.22/regmap-boolean.patch)0
-rw-r--r--target/linux/patches/3.14.26/relocs.patch (renamed from target/linux/patches/3.14.22/relocs.patch)0
-rw-r--r--target/linux/patches/3.14.26/sgidefs.patch (renamed from target/linux/patches/3.14.22/sgidefs.patch)0
-rw-r--r--target/linux/patches/3.14.26/sortext.patch (renamed from target/linux/patches/3.14.22/sortext.patch)0
-rw-r--r--target/linux/patches/3.14.26/startup.patch (renamed from target/linux/patches/3.14.22/startup.patch)0
-rw-r--r--target/linux/patches/3.14.26/tcp-fastopen.patch (renamed from target/linux/patches/3.14.22/tcp-fastopen.patch)0
-rw-r--r--target/linux/patches/3.14.26/wlan-cf.patch (renamed from target/linux/patches/3.14.22/wlan-cf.patch)0
-rw-r--r--target/linux/patches/3.14.26/xargs.patch (renamed from target/linux/patches/3.14.22/xargs.patch)0
-rw-r--r--target/linux/patches/3.14.26/zlib-inflate.patch (renamed from target/linux/patches/3.14.22/zlib-inflate.patch)0
-rw-r--r--target/mips/mikrotik-rb4xx/patches/3.14.26/0001-mtd-add-rb4xx-nand-driver.patch (renamed from target/mips/mikrotik-rb4xx/patches/3.14.22/0001-mtd-add-rb4xx-nand-driver.patch)0
-rw-r--r--target/mips/mikrotik-rb4xx/patches/3.14.26/0002-phy-add-ethtool-ioctl-support-used-by-ag71xx-driver.patch (renamed from target/mips/mikrotik-rb4xx/patches/3.14.22/0002-phy-add-ethtool-ioctl-support-used-by-ag71xx-driver.patch)0
-rw-r--r--target/mips/mikrotik-rb4xx/patches/3.14.26/0003-net-add-ag71xx-mac-driver.patch (renamed from target/mips/mikrotik-rb4xx/patches/3.14.22/0003-net-add-ag71xx-mac-driver.patch)0
-rw-r--r--target/mips/mikrotik-rb4xx/patches/3.14.26/0004-drivers-link-SPI-drivers-before-MTD-drivers.patch (renamed from target/mips/mikrotik-rb4xx/patches/3.14.22/0004-drivers-link-SPI-drivers-before-MTD-drivers.patch)0
-rw-r--r--target/mips/mikrotik-rb4xx/patches/3.14.26/0005-spi-add-various-flags-to-spi_transfer-and-spi_messag.patch (renamed from target/mips/mikrotik-rb4xx/patches/3.14.22/0005-spi-add-various-flags-to-spi_transfer-and-spi_messag.patch)0
-rw-r--r--target/mips/mikrotik-rb4xx/patches/3.14.26/0006-spi-add-rb4xx-SPI-driver.patch (renamed from target/mips/mikrotik-rb4xx/patches/3.14.22/0006-spi-add-rb4xx-SPI-driver.patch)0
-rw-r--r--target/mips/mikrotik-rb4xx/patches/3.14.26/0007-spi-add-rb4xx-cpld-driver.patch (renamed from target/mips/mikrotik-rb4xx/patches/3.14.22/0007-spi-add-rb4xx-cpld-driver.patch)0
-rw-r--r--target/mips/mikrotik-rb4xx/patches/3.14.26/0008-gpio-add-GPIO-latch-driver.patch (renamed from target/mips/mikrotik-rb4xx/patches/3.14.22/0008-gpio-add-GPIO-latch-driver.patch)0
-rw-r--r--target/mips/mikrotik-rb4xx/patches/3.14.26/0009-spi-export-spi_bitbang_bufs-function.patch (renamed from target/mips/mikrotik-rb4xx/patches/3.14.22/0009-spi-export-spi_bitbang_bufs-function.patch)0
-rw-r--r--target/mips/mikrotik-rb4xx/patches/3.14.26/0010-spi-add-type-field-to-spi_transfer-struct.patch (renamed from target/mips/mikrotik-rb4xx/patches/3.14.22/0010-spi-add-type-field-to-spi_transfer-struct.patch)0
-rw-r--r--target/mips/mikrotik-rb4xx/patches/3.14.26/0011-mtd-m25p80-set-SPI-transfer-type.patch (renamed from target/mips/mikrotik-rb4xx/patches/3.14.22/0011-mtd-m25p80-set-SPI-transfer-type.patch)0
-rw-r--r--target/mips/mikrotik-rb4xx/patches/3.14.26/0012-mips-ath79-swizzle-PCI-address-for-ar71xx.patch (renamed from target/mips/mikrotik-rb4xx/patches/3.14.22/0012-mips-ath79-swizzle-PCI-address-for-ar71xx.patch)0
-rw-r--r--target/mips/mikrotik-rb4xx/patches/3.14.26/0013-net-add-swconfig-support.patch (renamed from target/mips/mikrotik-rb4xx/patches/3.14.22/0013-net-add-swconfig-support.patch)0
-rw-r--r--target/mips/mikrotik-rb4xx/patches/3.14.26/0014-phy-add-detach-callback-to-struct-phy_driver.patch (renamed from target/mips/mikrotik-rb4xx/patches/3.14.22/0014-phy-add-detach-callback-to-struct-phy_driver.patch)0
-rw-r--r--target/mips/mikrotik-rb4xx/patches/3.14.26/0015-phy-add-ar8216-PHY-support.patch (renamed from target/mips/mikrotik-rb4xx/patches/3.14.22/0015-phy-add-ar8216-PHY-support.patch)0
-rw-r--r--target/mips/mikrotik-rb4xx/patches/3.14.26/0016-phy-mdio-bitbang-ignore-TA-value.patch (renamed from target/mips/mikrotik-rb4xx/patches/3.14.22/0016-phy-mdio-bitbang-ignore-TA-value.patch)0
-rw-r--r--target/mips/mikrotik-rb4xx/patches/3.14.26/0017-MIPS-ath79-fix-maximum-timeout.patch (renamed from target/mips/mikrotik-rb4xx/patches/3.14.22/0017-MIPS-ath79-fix-maximum-timeout.patch)0
-rw-r--r--target/mips/mikrotik-rb4xx/patches/3.14.26/0018-net-allow-PHY-drivers-to-insert-packet-mangle-hooks.patch (renamed from target/mips/mikrotik-rb4xx/patches/3.14.22/0018-net-allow-PHY-drivers-to-insert-packet-mangle-hooks.patch)0
-rw-r--r--target/mips/mikrotik-rb4xx/patches/3.14.26/0019-MIPS-ath79-process-board-cmdline-option.patch (renamed from target/mips/mikrotik-rb4xx/patches/3.14.22/0019-MIPS-ath79-process-board-cmdline-option.patch)0
-rw-r--r--target/mips/mikrotik-rb4xx/patches/3.14.26/0020-spi-ath79-add-fast-flash-read-support.patch (renamed from target/mips/mikrotik-rb4xx/patches/3.14.22/0020-spi-ath79-add-fast-flash-read-support.patch)0
-rw-r--r--target/mips/mikrotik-rb4xx/patches/3.14.26/0021-phy-add-mdio-boardinfo.patch (renamed from target/mips/mikrotik-rb4xx/patches/3.14.22/0021-phy-add-mdio-boardinfo.patch)0
-rw-r--r--target/mips/mikrotik-rb4xx/patches/3.14.26/0022-mips-ath79-add-ath79-ethernet-driver.patch (renamed from target/mips/mikrotik-rb4xx/patches/3.14.22/0022-mips-ath79-add-ath79-ethernet-driver.patch)0
-rw-r--r--target/mips/mikrotik-rb4xx/patches/3.14.26/0023-MIPS-ath79-add-Mikrotik-rb4xx-device-support.patch (renamed from target/mips/mikrotik-rb4xx/patches/3.14.22/0023-MIPS-ath79-add-Mikrotik-rb4xx-device-support.patch)0
-rw-r--r--target/mips/mikrotik-rb4xx/patches/3.14.26/0024-various-fixups-for-Werror.patch (renamed from target/mips/mikrotik-rb4xx/patches/3.14.22/0024-various-fixups-for-Werror.patch)0
-rw-r--r--target/mips/mikrotik-rb4xx/patches/3.14.26/0025-rb4xx_nand-add-partition-for-cfgfs.patch (renamed from target/mips/mikrotik-rb4xx/patches/3.14.22/0025-rb4xx_nand-add-partition-for-cfgfs.patch)0
-rw-r--r--target/mips/mikrotik-rb4xx/patches/3.14.26/0026-various-fixups-for-ath5k-fixing-system-freezes.patch (renamed from target/mips/mikrotik-rb4xx/patches/3.14.22/0026-various-fixups-for-ath5k-fixing-system-freezes.patch)0
-rw-r--r--target/mips/mikrotik-rb532/patches/3.14.26/rb532-cfgfs.patch (renamed from target/mips/mikrotik-rb532/patches/3.14.22/rb532-cfgfs.patch)0
-rw-r--r--target/mips/mikrotik-rb532/patches/3.14.26/rb532-pci.patch (renamed from target/mips/mikrotik-rb532/patches/3.14.22/rb532-pci.patch)0
62 files changed, 2891 insertions, 2858 deletions
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index 8b66ee033..55c282233 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -4,11 +4,11 @@ KERNEL_MOD_VERSION:= $(KERNEL_VERSION)
KERNEL_RELEASE:= 1
KERNEL_MD5SUM:= ce49828adecf8908eb3a9ffc5b860d44
endif
-ifeq ($(ADK_KERNEL_VERSION_3_14_22),y)
-KERNEL_VERSION:= 3.14.22
+ifeq ($(ADK_KERNEL_VERSION_3_14_26),y)
+KERNEL_VERSION:= 3.14.26
KERNEL_MOD_VERSION:= $(KERNEL_VERSION)
KERNEL_RELEASE:= 1
-KERNEL_MD5SUM:= cb00fadd0a720cc2d1690792e72e0134
+KERNEL_MD5SUM:= 9a91a9c507c9efb68c7075e151c30fa7
endif
ifeq ($(ADK_KERNEL_VERSION_3_12_33),y)
KERNEL_VERSION:= 3.12.33
diff --git a/target/arm/raspberry-pi/patches/3.14.22/raspberry-pi.patch b/target/arm/raspberry-pi/patches/3.14.26/raspberry-pi.patch
index 4535d121c..4535d121c 100644
--- a/target/arm/raspberry-pi/patches/3.14.22/raspberry-pi.patch
+++ b/target/arm/raspberry-pi/patches/3.14.26/raspberry-pi.patch
diff --git a/target/arm/solidrun-imx6/patches/3.14.22/solidrun.patch b/target/arm/solidrun-imx6/patches/3.14.26/solidrun.patch
index 0d9621760..cc13ae013 100644
--- a/target/arm/solidrun-imx6/patches/3.14.22/solidrun.patch
+++ b/target/arm/solidrun-imx6/patches/3.14.26/solidrun.patch
@@ -1,6 +1,6 @@
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/clcd-panels.dtsi linux-3.14.22/arch/arm/boot/dts/clcd-panels.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/clcd-panels.dtsi 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/clcd-panels.dtsi 2014-10-22 14:55:49.026220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/clcd-panels.dtsi linux-imx6-3.14/arch/arm/boot/dts/clcd-panels.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/clcd-panels.dtsi 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/clcd-panels.dtsi 2014-12-08 00:31:51.112418001 -0600
@@ -0,0 +1,52 @@
+/*
+ * ARM Ltd. Versatile Express
@@ -54,9 +54,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/clcd-panels.dtsi linux-3.14.22/ar
+ };
+ };
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/efm32gg-dk3750.dts linux-3.14.22/arch/arm/boot/dts/efm32gg-dk3750.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/efm32gg-dk3750.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/efm32gg-dk3750.dts 2014-10-22 14:55:49.030220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/efm32gg-dk3750.dts linux-imx6-3.14/arch/arm/boot/dts/efm32gg-dk3750.dts
+--- linux-3.14.14/arch/arm/boot/dts/efm32gg-dk3750.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/efm32gg-dk3750.dts 2014-12-08 00:31:51.116418001 -0600
@@ -26,7 +26,7 @@
};
@@ -66,9 +66,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/efm32gg-dk3750.dts linux-3.14.22/
status = "ok";
temp@48 {
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx23.dtsi linux-3.14.22/arch/arm/boot/dts/imx23.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx23.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx23.dtsi 2014-10-22 14:55:49.030220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx23.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx23.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx23.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx23.dtsi 2014-12-08 00:31:51.116418001 -0600
@@ -363,7 +363,8 @@
compatible = "fsl,imx23-lcdif";
reg = <0x80030000 2000>;
@@ -79,9 +79,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx23.dtsi linux-3.14.22/arch/arm
status = "disabled";
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx25.dtsi linux-3.14.22/arch/arm/boot/dts/imx25.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx25.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx25.dtsi 2014-10-22 14:55:49.030220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx25.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx25.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx25.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx25.dtsi 2014-12-08 00:31:51.116418001 -0600
@@ -13,6 +13,7 @@
/ {
@@ -98,9 +98,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx25.dtsi linux-3.14.22/arch/arm
clock-frequency = <24000000>;
};
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx25-karo-tx25.dts linux-3.14.22/arch/arm/boot/dts/imx25-karo-tx25.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx25-karo-tx25.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx25-karo-tx25.dts 2014-10-22 14:55:49.030220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx25-karo-tx25.dts linux-imx6-3.14/arch/arm/boot/dts/imx25-karo-tx25.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx25-karo-tx25.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx25-karo-tx25.dts 2014-12-08 00:31:51.116418001 -0600
@@ -16,6 +16,10 @@
model = "Ka-Ro TX25";
compatible = "karo,imx25-tx25", "fsl,imx25";
@@ -112,9 +112,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx25-karo-tx25.dts linux-3.14.22
memory {
reg = <0x80000000 0x02000000 0x90000000 0x02000000>;
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx27-apf27.dts linux-3.14.22/arch/arm/boot/dts/imx27-apf27.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx27-apf27.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx27-apf27.dts 2014-10-22 14:55:49.030220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx27-apf27.dts linux-imx6-3.14/arch/arm/boot/dts/imx27-apf27.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx27-apf27.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx27-apf27.dts 2014-12-08 00:31:51.116418001 -0600
@@ -29,6 +29,7 @@
osc26m {
@@ -123,9 +123,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx27-apf27.dts linux-3.14.22/arc
clock-frequency = <0>;
};
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx27.dtsi linux-3.14.22/arch/arm/boot/dts/imx27.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx27.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx27.dtsi 2014-10-22 14:55:49.030220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx27.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx27.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx27.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx27.dtsi 2014-12-08 00:31:51.120418001 -0600
@@ -13,6 +13,7 @@
/ {
@@ -142,9 +142,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx27.dtsi linux-3.14.22/arch/arm
clock-frequency = <26000000>;
};
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts linux-3.14.22/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts 2014-10-22 14:55:49.142220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts linux-imx6-3.14/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts 2014-12-08 00:31:51.120418001 -0600
@@ -15,6 +15,10 @@
model = "Phytec pca100 rapid development kit";
compatible = "phytec,imx27-pca100-rdk", "phytec,imx27-pca100", "fsl,imx27";
@@ -156,9 +156,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts li
display: display {
model = "Primeview-PD050VL1";
native-mode = <&timing0>;
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx28.dtsi linux-3.14.22/arch/arm/boot/dts/imx28.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx28.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx28.dtsi 2014-10-22 14:55:49.146220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx28.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx28.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx28.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx28.dtsi 2014-12-08 00:31:51.120418001 -0600
@@ -840,7 +840,8 @@
compatible = "fsl,imx28-lcdif";
reg = <0x80030000 0x2000>;
@@ -169,9 +169,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx28.dtsi linux-3.14.22/arch/arm
dmas = <&dma_apbh 13>;
dma-names = "rx";
status = "disabled";
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx51-babbage.dts linux-3.14.22/arch/arm/boot/dts/imx51-babbage.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx51-babbage.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx51-babbage.dts 2014-10-22 14:55:49.146220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx51-babbage.dts linux-imx6-3.14/arch/arm/boot/dts/imx51-babbage.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx51-babbage.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx51-babbage.dts 2014-12-08 00:31:51.120418001 -0600
@@ -17,6 +17,10 @@
model = "Freescale i.MX51 Babbage Board";
compatible = "fsl,imx51-babbage", "fsl,imx51";
@@ -183,9 +183,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx51-babbage.dts linux-3.14.22/a
memory {
reg = <0x90000000 0x20000000>;
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx51.dtsi linux-3.14.22/arch/arm/boot/dts/imx51.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx51.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx51.dtsi 2014-10-22 14:55:49.226220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx51.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx51.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx51.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx51.dtsi 2014-12-08 00:31:51.120418001 -0600
@@ -15,6 +15,7 @@
/ {
@@ -220,9 +220,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx51.dtsi linux-3.14.22/arch/arm
clock-frequency = <24000000>;
};
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx53.dtsi linux-3.14.22/arch/arm/boot/dts/imx53.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx53.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx53.dtsi 2014-10-22 14:55:49.342220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx53.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx53.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx53.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx53.dtsi 2014-12-08 00:31:51.120418001 -0600
@@ -15,6 +15,7 @@
/ {
@@ -257,9 +257,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx53.dtsi linux-3.14.22/arch/arm
clock-frequency = <24000000>;
};
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx53-mba53.dts linux-3.14.22/arch/arm/boot/dts/imx53-mba53.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx53-mba53.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx53-mba53.dts 2014-10-22 14:55:49.342220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx53-mba53.dts linux-imx6-3.14/arch/arm/boot/dts/imx53-mba53.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx53-mba53.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx53-mba53.dts 2014-12-08 00:31:51.120418001 -0600
@@ -25,6 +25,10 @@
enable-active-low;
};
@@ -271,9 +271,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx53-mba53.dts linux-3.14.22/arc
backlight {
compatible = "pwm-backlight";
pwms = <&pwm2 0 50000>;
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts linux-3.14.22/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts 2014-10-22 14:55:49.342220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts 2014-12-08 00:31:51.120418001 -0600
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013 Sascha Hauer <s.hauer@pengutronix.de>
@@ -298,9 +298,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts linux-3.
+ model = "DFI FS700-M60-6DL i.MX6dl Q7 Board";
+ compatible = "dfi,fs700-m60-6dl", "dfi,fs700e-m60", "fsl,imx6dl";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl.dtsi linux-3.14.22/arch/arm/boot/dts/imx6dl.dtsi
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6dl.dtsi 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx6dl.dtsi 2014-10-22 14:55:49.342220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6dl.dtsi linux-imx6-3.14/arch/arm/boot/dts/imx6dl.dtsi
+--- linux-3.14.14/arch/arm/boot/dts/imx6dl.dtsi 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl.dtsi 2014-12-08 00:31:51.124418001 -0600
@@ -8,6 +8,7 @@
*
*/
@@ -466,9 +466,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl.dtsi linux-3.14.22/arch/ar
status = "disabled";
};
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-gw51xx.dts linux-3.14.22/arch/arm/boot/dts/imx6dl-gw51xx.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-gw51xx.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6dl-gw51xx.dts 2014-10-22 14:55:49.342220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6dl-gw51xx.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw51xx.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6dl-gw51xx.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw51xx.dts 2014-12-08 00:31:51.120418001 -0600
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -489,9 +489,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-gw51xx.dts linux-3.14.22/a
+ model = "Gateworks Ventana i.MX6 DualLite GW51XX";
+ compatible = "gw,imx6dl-gw51xx", "gw,ventana", "fsl,imx6dl";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-gw52xx.dts linux-3.14.22/arch/arm/boot/dts/imx6dl-gw52xx.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-gw52xx.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6dl-gw52xx.dts 2014-10-22 14:55:49.342220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6dl-gw52xx.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw52xx.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6dl-gw52xx.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw52xx.dts 2014-12-08 00:31:51.120418001 -0600
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -512,9 +512,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-gw52xx.dts linux-3.14.22/a
+ model = "Gateworks Ventana i.MX6 DualLite GW52XX";
+ compatible = "gw,imx6dl-gw52xx", "gw,ventana", "fsl,imx6dl";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-gw53xx.dts linux-3.14.22/arch/arm/boot/dts/imx6dl-gw53xx.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-gw53xx.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6dl-gw53xx.dts 2014-10-22 14:55:49.342220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6dl-gw53xx.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw53xx.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6dl-gw53xx.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw53xx.dts 2014-12-08 00:31:51.120418001 -0600
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -535,9 +535,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-gw53xx.dts linux-3.14.22/a
+ model = "Gateworks Ventana i.MX6 DualLite GW53XX";
+ compatible = "gw,imx6dl-gw53xx", "gw,ventana", "fsl,imx6dl";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-gw54xx.dts linux-3.14.22/arch/arm/boot/dts/imx6dl-gw54xx.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-gw54xx.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6dl-gw54xx.dts 2014-10-22 14:55:49.342220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6dl-gw54xx.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw54xx.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6dl-gw54xx.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-gw54xx.dts 2014-12-08 00:31:51.120418001 -0600
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2013 Gateworks Corporation
@@ -558,9 +558,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-gw54xx.dts linux-3.14.22/a
+ model = "Gateworks Ventana i.MX6 DualLite GW54XX";
+ compatible = "gw,imx6dl-gw54xx", "gw,ventana", "fsl,imx6dl";
+};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-hummingboard.dts linux-3.14.22/arch/arm/boot/dts/imx6dl-hummingboard.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-hummingboard.dts 2014-10-15 01:42:04.000000000 -0500
-+++ linux-3.14.22/arch/arm/boot/dts/imx6dl-hummingboard.dts 2014-10-22 14:55:49.346220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6dl-hummingboard.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-hummingboard.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6dl-hummingboard.dts 2014-07-28 10:07:25.000000000 -0500
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-hummingboard.dts 2014-12-08 00:31:51.120418001 -0600
@@ -1,163 +1,13 @@
/*
- * Copyright (C) 2013,2014 Russell King
@@ -730,9 +730,9 @@ diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-hummingboard.dts linux-3.1
+ model = "SolidRun HummingBoard Solo/DualLite";
+ compatible = "solidrun,hummingboard/dl", "fsl,imx6dl";
};
-diff -Nur linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-nitrogen6x.dts linux-3.14.22/arch/arm/boot/dts/imx6dl-nitrogen6x.dts
---- linux-3.14.22.orig/arch/arm/boot/dts/imx6dl-nitrogen6x.dts 1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.14.22/arch/arm/boot/dts/imx6dl-nitrogen6x.dts 2014-10-22 14:55:49.346220001 -0500
+diff -Nur linux-3.14.14/arch/arm/boot/dts/imx6dl-nitrogen6x.dts linux-imx6-3.14/arch/arm/boot/dts/imx6dl-nitrogen6x.dts
+--- linux-3.14.14/arch/arm/boot/dts/imx6dl-nitrogen6x.dts 1969-12-31 18:00:00.000000000 -0600
++++ linux-imx6-3.14/arch/arm/boot/dts/imx6dl-nitrogen6x.dts 2014-12-08 00:31:51.120418001 -0600