From 4c291af7056e44ffb997fccd95342caef7fd7c19 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Mon, 19 Aug 2013 23:14:53 -0300
Subject: linux-fslc: Update to 3.10 based kernel

This updates the kernel based on 3.10.7 tree. It includes following
patches on top of it:

9cb4091 ASoC: mxs: move to use generic DMA helper
2a0977a ASoC: mxs: mxs-saif: Let device core handle pinctrl
3e8e9cd ARM: dts: imx23-olinuxino: enable Low Resolution ADC
bcf1891 ARM: dts: imx23-evk: enable Low Resolution ADC
16eeea9 ARM: mxs-lradc: Simplify mxs_lradc_trigger_init error handle
8e005fb ARM: dts: imx23-evk: enable USB PHY and controller
7621ab6 iio: mxs-lradc: Fix misuse of iio->trig
70b12b8 iio: mxs-lradc: Remove useless check in read_raw
e401940 staging/iio/mxs-lradc: cleanup masklength
ab16015 staging:iio:adc: Use kstrtol()/kstrtoul()
96120e4 ARM: dts: imx28-evk: Enable touchscreen support

Change-Id: Ibf0fde9579d70c51d2a3abd09b4015145e3f3525
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-kernel/linux/linux-fslc/defconfig     | 17 ++++++++++++++++-
 recipes-kernel/linux/linux-fslc/mxs/defconfig |  7 ++++++-
 recipes-kernel/linux/linux-fslc_3.10.bb       | 11 +++++++++++
 recipes-kernel/linux/linux-fslc_3.9.bb        | 11 -----------
 4 files changed, 33 insertions(+), 13 deletions(-)
 create mode 100644 recipes-kernel/linux/linux-fslc_3.10.bb
 delete mode 100644 recipes-kernel/linux/linux-fslc_3.9.bb

diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig
index 8e10e3a..5be5d0d 100644
--- a/recipes-kernel/linux/linux-fslc/defconfig
+++ b/recipes-kernel/linux/linux-fslc/defconfig
@@ -9,6 +9,7 @@ CONFIG_CGROUPS=y
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_EXPERT=y
+CONFIG_PERF_EVENTS=y
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set
 CONFIG_MODULES=y
@@ -17,6 +18,9 @@ CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_ARCH_MXC=y
+CONFIG_ARCH_MULTI_V6=y
+CONFIG_ARCH_MULTI_V7=y
+CONFIG_MACH_IMX31_DT=y
 CONFIG_MACH_MX31LILLY=y
 CONFIG_MACH_MX31LITE=y
 CONFIG_MACH_PCM037=y
@@ -30,7 +34,6 @@ CONFIG_MACH_PCM043=y
 CONFIG_MACH_MX35_3DS=y
 CONFIG_MACH_VPR200=y
 CONFIG_MACH_IMX51_DT=y
-CONFIG_MACH_MX51_3DS=y
 CONFIG_MACH_EUKREA_CPUIMX51SD=y
 CONFIG_SOC_IMX53=y
 CONFIG_SOC_IMX6Q=y
@@ -57,6 +60,7 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_LRO is not set
 CONFIG_IPV6=y
+CONFIG_NETFILTER=y
 # CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
@@ -144,17 +148,22 @@ CONFIG_GPIO_MC9S08DZ60=y
 # CONFIG_HWMON is not set
 CONFIG_WATCHDOG=y
 CONFIG_IMX2_WDT=y
+CONFIG_MFD_DA9052_I2C=y
 CONFIG_MFD_MC13XXX_SPI=y
 CONFIG_MFD_MC13XXX_I2C=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_REGULATOR_DA9052=y
+CONFIG_REGULATOR_ANATOP=y
 CONFIG_REGULATOR_MC13783=y
 CONFIG_REGULATOR_MC13892=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_SOC_CAMERA=y
 CONFIG_SOC_CAMERA_OV2640=y
+CONFIG_DRM=y
 CONFIG_VIDEO_MX3=y
 CONFIG_FB=y
 CONFIG_LCD_PLATFORM=y
@@ -181,6 +190,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_MXC=y
 CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_PHY=y
 CONFIG_USB_MXS_PHY=y
 CONFIG_USB_STORAGE=y
 CONFIG_MMC=y
@@ -193,9 +203,14 @@ CONFIG_RTC_CLASS=y
 CONFIG_RTC_INTF_DEV_UIE_EMUL=y
 CONFIG_RTC_DRV_MC13XXX=y
 CONFIG_RTC_DRV_MXC=y
+CONFIG_RTC_DRV_SNVS=y
 CONFIG_DMADEVICES=y
 CONFIG_IMX_SDMA=y
 CONFIG_MXS_DMA=y
+CONFIG_STAGING=y
+CONFIG_DRM_IMX=y
+CONFIG_DRM_IMX_IPUV3_CORE=y
+CONFIG_DRM_IMX_IPUV3=y
 CONFIG_COMMON_CLK_DEBUG=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_EXT2_FS=y
diff --git a/recipes-kernel/linux/linux-fslc/mxs/defconfig b/recipes-kernel/linux/linux-fslc/mxs/defconfig
index 084dae9..2f52083 100644
--- a/recipes-kernel/linux/linux-fslc/mxs/defconfig
+++ b/recipes-kernel/linux/linux-fslc/mxs/defconfig
@@ -22,8 +22,8 @@ CONFIG_MODVERSIONS=y
 CONFIG_BLK_DEV_INTEGRITY=y
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
+# CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_MXS=y
-CONFIG_MACH_MXS_DT=y
 # CONFIG_ARM_THUMB is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_AEABI=y
@@ -101,6 +101,8 @@ CONFIG_SPI_MXS=y
 CONFIG_DEBUG_GPIO=y
 CONFIG_GPIO_SYSFS=y
 # CONFIG_HWMON is not set
+CONFIG_WATCHDOG=y
+CONFIG_STMP3XXX_RTC_WATCHDOG=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_FB=y
@@ -122,6 +124,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_HOST=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_PHY=y
 CONFIG_USB_MXS_PHY=y
 CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
@@ -147,6 +150,8 @@ CONFIG_COMMON_CLK_DEBUG=y
 CONFIG_IIO=y
 CONFIG_PWM=y
 CONFIG_PWM_MXS=y
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT3_FS=y
 CONFIG_EXT4_FS=y
 # CONFIG_DNOTIFY is not set
diff --git a/recipes-kernel/linux/linux-fslc_3.10.bb b/recipes-kernel/linux/linux-fslc_3.10.bb
new file mode 100644
index 0000000..7fa0ffe
--- /dev/null
+++ b/recipes-kernel/linux/linux-fslc_3.10.bb
@@ -0,0 +1,11 @@
+# Copyright (C) 2012-2013 O.S. Systems Software LTDA.
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+include linux-fslc.inc
+
+PV = "3.10+git${SRCPV}"
+
+# patches-3.10
+SRCREV = "9cb40913a68945ab653b58abdf5949c68dd85210"
+
+COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)"
diff --git a/recipes-kernel/linux/linux-fslc_3.9.bb b/recipes-kernel/linux/linux-fslc_3.9.bb
deleted file mode 100644
index b98890a..0000000
--- a/recipes-kernel/linux/linux-fslc_3.9.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (C) 2012-2013 O.S. Systems Software LTDA.
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-include linux-fslc.inc
-
-PV = "3.9+git${SRCPV}"
-
-# patches-3.9
-SRCREV = "3a1e70d10297f92525eee3bd35aae7ecab201c39"
-
-COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)"
-- 
cgit v1.2.3-54-g00ecf