From c02ed8469f259fcf5741f5fdb61c3275822c4dae Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 10 Oct 2014 18:50:02 -0300
Subject: [PATCH] linux-fslc: Update to 3.17 release

This updates to the 3.17 release. No changes are applied on the
patches-3.17 branch at this moment so it is essentially the hash of
the v3.17 tag.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta-fsl-arm/recipes-kernel/linux/linux-fslc/defconfig | 10 ++++++++--
 .../recipes-kernel/linux/linux-fslc/mxs/defconfig      |  1 +
 .../linux/{linux-fslc_3.16.bb => linux-fslc_3.17.bb}   |  6 +++---
 3 files changed, 12 insertions(+), 5 deletions(-)
 rename meta-fsl-arm/recipes-kernel/linux/{linux-fslc_3.16.bb => linux-fslc_3.17.bb} (84%)

diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-fslc/defconfig b/meta-fsl-arm/recipes-kernel/linux/linux-fslc/defconfig
index e2e1fc54..16cfec43 100644
--- a/meta-fsl-arm/recipes-kernel/linux/linux-fslc/defconfig
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-fslc/defconfig
@@ -1,6 +1,6 @@
-# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_KERNEL_LZO=y
 CONFIG_SYSVIPC=y
+CONFIG_FHANDLE=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_LOG_BUF_SHIFT=18
@@ -32,11 +32,12 @@ CONFIG_MACH_IMX35_DT=y
 CONFIG_MACH_PCM043=y
 CONFIG_MACH_MX35_3DS=y
 CONFIG_MACH_VPR200=y
-CONFIG_MACH_IMX51_DT=y
+CONFIG_SOC_IMX51=y
 CONFIG_SOC_IMX50=y
 CONFIG_SOC_IMX53=y
 CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
+CONFIG_SOC_IMX6SX=y
 CONFIG_SOC_VF610=y
 CONFIG_PCI=y
 CONFIG_PCI_IMX6=y
@@ -68,6 +69,8 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_LRO is not set
 CONFIG_IPV6=y
 CONFIG_NETFILTER=y
+CONFIG_CAN=y
+CONFIG_CAN_FLEXCAN=y
 CONFIG_CFG80211=y
 CONFIG_MAC80211=y
 CONFIG_RFKILL=y
@@ -161,6 +164,7 @@ CONFIG_SPI=y
 CONFIG_SPI_IMX=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_MC9S08DZ60=y
+CONFIG_GPIO_STMPE=y
 # CONFIG_HWMON is not set
 CONFIG_WATCHDOG=y
 CONFIG_IMX2_WDT=y
@@ -243,6 +247,7 @@ CONFIG_RTC_DRV_SNVS=y
 CONFIG_DMADEVICES=y
 CONFIG_IMX_SDMA=y
 CONFIG_MXS_DMA=y
+CONFIG_FSL_EDMA=y
 CONFIG_STAGING=y
 CONFIG_DRM_IMX=y
 CONFIG_DRM_IMX_FB_HELPER=y
@@ -289,6 +294,7 @@ CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_UTF8=y
+CONFIG_PRINTK_TIME=y
 CONFIG_DEBUG_FS=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_SCHED_DEBUG is not set
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-fslc/mxs/defconfig b/meta-fsl-arm/recipes-kernel/linux/linux-fslc/mxs/defconfig
index 8ccedc7e..64cd52d4 100644
--- a/meta-fsl-arm/recipes-kernel/linux/linux-fslc/mxs/defconfig
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-fslc/mxs/defconfig
@@ -1,4 +1,5 @@
 CONFIG_SYSVIPC=y
+CONFIG_FHANDLE=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_TASKSTATS=y
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-fslc_3.16.bb b/meta-fsl-arm/recipes-kernel/linux/linux-fslc_3.17.bb
similarity index 84%
rename from meta-fsl-arm/recipes-kernel/linux/linux-fslc_3.16.bb
rename to meta-fsl-arm/recipes-kernel/linux/linux-fslc_3.17.bb
index f7193bab..f42505d6 100644
--- a/meta-fsl-arm/recipes-kernel/linux/linux-fslc_3.16.bb
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-fslc_3.17.bb
@@ -9,9 +9,9 @@ upstreaming."
 
 include linux-fslc.inc
 
-PV = "3.16+git${SRCPV}"
+PV = "3.17+git${SRCPV}"
 
-SRCBRANCH = "patches-3.16"
-SRCREV = "bf3b99e657c8dd2ab198c4dc936c630074bfa114"
+SRCBRANCH = "patches-3.17"
+SRCREV = "bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9"
 
 COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)"
-- 
2.40.1