summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2013-08-19 23:14:53 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2013-08-20 13:46:47 -0300
commit4c291af7056e44ffb997fccd95342caef7fd7c19 (patch)
tree2ae42cb7b5e7209b042689bccd656862179b9f82
parent7c869ff2634a39d1d64bd81ab9474e1386c167f6 (diff)
downloadmeta-fsl-arm-4c291af7056e44ffb997fccd95342caef7fd7c19.tar.gz
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>
-rw-r--r--recipes-kernel/linux/linux-fslc/defconfig17
-rw-r--r--recipes-kernel/linux/linux-fslc/mxs/defconfig7
-rw-r--r--recipes-kernel/linux/linux-fslc_3.10.bb (renamed from recipes-kernel/linux/linux-fslc_3.9.bb)6
3 files changed, 25 insertions, 5 deletions
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
9CONFIG_RELAY=y 9CONFIG_RELAY=y
10CONFIG_BLK_DEV_INITRD=y 10CONFIG_BLK_DEV_INITRD=y
11CONFIG_EXPERT=y 11CONFIG_EXPERT=y
12CONFIG_PERF_EVENTS=y
12# CONFIG_SLUB_DEBUG is not set 13# CONFIG_SLUB_DEBUG is not set
13# CONFIG_COMPAT_BRK is not set 14# CONFIG_COMPAT_BRK is not set
14CONFIG_MODULES=y 15CONFIG_MODULES=y
@@ -17,6 +18,9 @@ CONFIG_MODVERSIONS=y
17CONFIG_MODULE_SRCVERSION_ALL=y 18CONFIG_MODULE_SRCVERSION_ALL=y
18# CONFIG_BLK_DEV_BSG is not set 19# CONFIG_BLK_DEV_BSG is not set
19CONFIG_ARCH_MXC=y 20CONFIG_ARCH_MXC=y
21CONFIG_ARCH_MULTI_V6=y
22CONFIG_ARCH_MULTI_V7=y
23CONFIG_MACH_IMX31_DT=y
20CONFIG_MACH_MX31LILLY=y 24CONFIG_MACH_MX31LILLY=y
21CONFIG_MACH_MX31LITE=y 25CONFIG_MACH_MX31LITE=y
22CONFIG_MACH_PCM037=y 26CONFIG_MACH_PCM037=y
@@ -30,7 +34,6 @@ CONFIG_MACH_PCM043=y
30CONFIG_MACH_MX35_3DS=y 34CONFIG_MACH_MX35_3DS=y
31CONFIG_MACH_VPR200=y 35CONFIG_MACH_VPR200=y
32CONFIG_MACH_IMX51_DT=y 36CONFIG_MACH_IMX51_DT=y
33CONFIG_MACH_MX51_3DS=y
34CONFIG_MACH_EUKREA_CPUIMX51SD=y 37CONFIG_MACH_EUKREA_CPUIMX51SD=y
35CONFIG_SOC_IMX53=y 38CONFIG_SOC_IMX53=y
36CONFIG_SOC_IMX6Q=y 39CONFIG_SOC_IMX6Q=y
@@ -57,6 +60,7 @@ CONFIG_IP_PNP_DHCP=y
57# CONFIG_INET_XFRM_MODE_BEET is not set 60# CONFIG_INET_XFRM_MODE_BEET is not set
58# CONFIG_INET_LRO is not set 61# CONFIG_INET_LRO is not set
59CONFIG_IPV6=y 62CONFIG_IPV6=y
63CONFIG_NETFILTER=y
60# CONFIG_WIRELESS is not set 64# CONFIG_WIRELESS is not set
61CONFIG_DEVTMPFS=y 65CONFIG_DEVTMPFS=y
62CONFIG_DEVTMPFS_MOUNT=y 66CONFIG_DEVTMPFS_MOUNT=y
@@ -144,17 +148,22 @@ CONFIG_GPIO_MC9S08DZ60=y
144# CONFIG_HWMON is not set 148# CONFIG_HWMON is not set
145CONFIG_WATCHDOG=y 149CONFIG_WATCHDOG=y
146CONFIG_IMX2_WDT=y 150CONFIG_IMX2_WDT=y
151CONFIG_MFD_DA9052_I2C=y
147CONFIG_MFD_MC13XXX_SPI=y 152CONFIG_MFD_MC13XXX_SPI=y
148CONFIG_MFD_MC13XXX_I2C=y 153CONFIG_MFD_MC13XXX_I2C=y
149CONFIG_REGULATOR=y 154CONFIG_REGULATOR=y
150CONFIG_REGULATOR_FIXED_VOLTAGE=y 155CONFIG_REGULATOR_FIXED_VOLTAGE=y
156CONFIG_REGULATOR_DA9052=y
157CONFIG_REGULATOR_ANATOP=y
151CONFIG_REGULATOR_MC13783=y 158CONFIG_REGULATOR_MC13783=y
152CONFIG_REGULATOR_MC13892=y 159CONFIG_REGULATOR_MC13892=y
153CONFIG_MEDIA_SUPPORT=y 160CONFIG_MEDIA_SUPPORT=y
154CONFIG_VIDEO_DEV=y 161CONFIG_VIDEO_DEV=y
155CONFIG_V4L_PLATFORM_DRIVERS=y 162CONFIG_V4L_PLATFORM_DRIVERS=y
163CONFIG_MEDIA_CAMERA_SUPPORT=y
156CONFIG_SOC_CAMERA=y 164CONFIG_SOC_CAMERA=y
157CONFIG_SOC_CAMERA_OV2640=y 165CONFIG_SOC_CAMERA_OV2640=y
166CONFIG_DRM=y
158CONFIG_VIDEO_MX3=y 167CONFIG_VIDEO_MX3=y
159CONFIG_FB=y 168CONFIG_FB=y
160CONFIG_LCD_PLATFORM=y 169CONFIG_LCD_PLATFORM=y
@@ -181,6 +190,7 @@ CONFIG_USB_EHCI_HCD=y
181CONFIG_USB_EHCI_MXC=y 190CONFIG_USB_EHCI_MXC=y
182CONFIG_USB_CHIPIDEA=y 191CONFIG_USB_CHIPIDEA=y
183CONFIG_USB_CHIPIDEA_HOST=y 192CONFIG_USB_CHIPIDEA_HOST=y
193CONFIG_USB_PHY=y
184CONFIG_USB_MXS_PHY=y 194CONFIG_USB_MXS_PHY=y
185CONFIG_USB_STORAGE=y 195CONFIG_USB_STORAGE=y
186CONFIG_MMC=y 196CONFIG_MMC=y
@@ -193,9 +203,14 @@ CONFIG_RTC_CLASS=y
193CONFIG_RTC_INTF_DEV_UIE_EMUL=y 203CONFIG_RTC_INTF_DEV_UIE_EMUL=y
194CONFIG_RTC_DRV_MC13XXX=y 204CONFIG_RTC_DRV_MC13XXX=y
195CONFIG_RTC_DRV_MXC=y 205CONFIG_RTC_DRV_MXC=y
206CONFIG_RTC_DRV_SNVS=y
196CONFIG_DMADEVICES=y 207CONFIG_DMADEVICES=y
197CONFIG_IMX_SDMA=y 208CONFIG_IMX_SDMA=y
198CONFIG_MXS_DMA=y 209CONFIG_MXS_DMA=y
210CONFIG_STAGING=y
211CONFIG_DRM_IMX=y
212CONFIG_DRM_IMX_IPUV3_CORE=y
213CONFIG_DRM_IMX_IPUV3=y
199CONFIG_COMMON_CLK_DEBUG=y 214CONFIG_COMMON_CLK_DEBUG=y
200# CONFIG_IOMMU_SUPPORT is not set 215# CONFIG_IOMMU_SUPPORT is not set
201CONFIG_EXT2_FS=y 216CONFIG_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
22CONFIG_BLK_DEV_INTEGRITY=y 22CONFIG_BLK_DEV_INTEGRITY=y
23# CONFIG_IOSCHED_DEADLINE is not set 23# CONFIG_IOSCHED_DEADLINE is not set
24# CONFIG_IOSCHED_CFQ is not set 24# CONFIG_IOSCHED_CFQ is not set
25# CONFIG_ARCH_MULTI_V7 is not set
25CONFIG_ARCH_MXS=y 26CONFIG_ARCH_MXS=y
26CONFIG_MACH_MXS_DT=y
27# CONFIG_ARM_THUMB is not set 27# CONFIG_ARM_THUMB is not set
28CONFIG_PREEMPT_VOLUNTARY=y 28CONFIG_PREEMPT_VOLUNTARY=y
29CONFIG_AEABI=y 29CONFIG_AEABI=y
@@ -101,6 +101,8 @@ CONFIG_SPI_MXS=y
101CONFIG_DEBUG_GPIO=y 101CONFIG_DEBUG_GPIO=y
102CONFIG_GPIO_SYSFS=y 102CONFIG_GPIO_SYSFS=y
103# CONFIG_HWMON is not set 103# CONFIG_HWMON is not set
104CONFIG_WATCHDOG=y
105CONFIG_STMP3XXX_RTC_WATCHDOG=y
104CONFIG_REGULATOR=y 106CONFIG_REGULATOR=y
105CONFIG_REGULATOR_FIXED_VOLTAGE=y 107CONFIG_REGULATOR_FIXED_VOLTAGE=y
106CONFIG_FB=y 108CONFIG_FB=y
@@ -122,6 +124,7 @@ CONFIG_USB_EHCI_HCD=y
122CONFIG_USB_CHIPIDEA=y 124CONFIG_USB_CHIPIDEA=y
123CONFIG_USB_CHIPIDEA_HOST=y 125CONFIG_USB_CHIPIDEA_HOST=y
124CONFIG_USB_STORAGE=y 126CONFIG_USB_STORAGE=y
127CONFIG_USB_PHY=y
125CONFIG_USB_MXS_PHY=y 128CONFIG_USB_MXS_PHY=y
126CONFIG_MMC=y 129CONFIG_MMC=y
127CONFIG_MMC_UNSAFE_RESUME=y 130CONFIG_MMC_UNSAFE_RESUME=y
@@ -147,6 +150,8 @@ CONFIG_COMMON_CLK_DEBUG=y
147CONFIG_IIO=y 150CONFIG_IIO=y
148CONFIG_PWM=y 151CONFIG_PWM=y
149CONFIG_PWM_MXS=y 152CONFIG_PWM_MXS=y
153CONFIG_EXT2_FS=y
154CONFIG_EXT2_FS_XATTR=y
150CONFIG_EXT3_FS=y 155CONFIG_EXT3_FS=y
151CONFIG_EXT4_FS=y 156CONFIG_EXT4_FS=y
152# CONFIG_DNOTIFY is not set 157# CONFIG_DNOTIFY is not set
diff --git a/recipes-kernel/linux/linux-fslc_3.9.bb b/recipes-kernel/linux/linux-fslc_3.10.bb
index b98890a..7fa0ffe 100644
--- a/recipes-kernel/linux/linux-fslc_3.9.bb
+++ b/recipes-kernel/linux/linux-fslc_3.10.bb
@@ -3,9 +3,9 @@
3 3
4include linux-fslc.inc 4include linux-fslc.inc
5 5
6PV = "3.9+git${SRCPV}" 6PV = "3.10+git${SRCPV}"
7 7
8# patches-3.9 8# patches-3.10
9SRCREV = "3a1e70d10297f92525eee3bd35aae7ecab201c39" 9SRCREV = "9cb40913a68945ab653b58abdf5949c68dd85210"
10 10
11COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)" 11COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)"