From: Lauren Post Date: Thu, 31 Mar 2016 15:25:27 +0000 (-0500) Subject: linux-imx: Upgrade to 4.1.15 kernel X-Git-Tag: 2.1~43 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=6c51d593c1330d7b6da881fb3a74d2577c02c46c;p=meta-freescale.git linux-imx: Upgrade to 4.1.15 kernel Upgrade to the 4.1.15-1.0.0_ga release Signed-off-by: Lauren Post Signed-off-by: Otavio Salvador --- diff --git a/recipes-kernel/linux/linux-imx-3.14.52/0004-mmc-sdhci-esdhc-imx-Fixup-runtime-PM-conditions-duri.patch b/recipes-kernel/linux/linux-imx-3.14.52/0004-mmc-sdhci-esdhc-imx-Fixup-runtime-PM-conditions-duri.patch deleted file mode 100644 index 0d3caa40..00000000 --- a/recipes-kernel/linux/linux-imx-3.14.52/0004-mmc-sdhci-esdhc-imx-Fixup-runtime-PM-conditions-duri.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 77903c01d8c6c5d2544085ba074aceadc1191d21 Mon Sep 17 00:00:00 2001 -From: Ulf Hansson -Date: Thu, 11 Dec 2014 15:12:25 +0100 -Subject: [PATCH 2/2] mmc: sdhci-esdhc-imx: Fixup runtime PM conditions during - ->probe() - -By configure runtime PM prior we enable the use of it, we close the gap -for strange and unhandled conditions. Moreover it makes us rely on the -driver core, after finalized ->probe(), to request an inactive device -to become runtime PM idle/suspended, which earlier potentially could -happen already at pm_runtime_set_autosuspend_delay(). - -Signed-off-by: Ulf Hansson ---- - drivers/mmc/host/sdhci-esdhc-imx.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c -index 043866c..10ef824 100644 ---- a/drivers/mmc/host/sdhci-esdhc-imx.c -+++ b/drivers/mmc/host/sdhci-esdhc-imx.c -@@ -1080,10 +1080,10 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) - goto disable_clk; - - pm_runtime_set_active(&pdev->dev); -- pm_runtime_enable(&pdev->dev); - pm_runtime_set_autosuspend_delay(&pdev->dev, 50); - pm_runtime_use_autosuspend(&pdev->dev); - pm_suspend_ignore_children(&pdev->dev, 1); -+ pm_runtime_enable(&pdev->dev); - - return 0; - --- -1.9.3 - diff --git a/recipes-kernel/linux/linux-imx-3.14.52/imx/defconfig b/recipes-kernel/linux/linux-imx-4.1.15/imx/defconfig similarity index 94% rename from recipes-kernel/linux/linux-imx-3.14.52/imx/defconfig rename to recipes-kernel/linux/linux-imx-4.1.15/imx/defconfig index e3315f31..40e35b99 100644 --- a/recipes-kernel/linux/linux-imx-3.14.52/imx/defconfig +++ b/recipes-kernel/linux/linux-imx-4.1.15/imx/defconfig @@ -18,10 +18,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y # CONFIG_BLK_DEV_BSG is not set -CONFIG_GPIO_PCA953X=y CONFIG_ARCH_MXC=y -CONFIG_MACH_IMX51_DT=y -CONFIG_MACH_EUKREA_CPUIMX51SD=y CONFIG_SOC_IMX50=y CONFIG_SOC_IMX53=y CONFIG_SOC_IMX6Q=y @@ -40,11 +37,10 @@ CONFIG_HIGHMEM=y CONFIG_CMA=y CONFIG_CMDLINE="noinitrd console=ttymxc0,115200" CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_INTERACTIVE=y CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y CONFIG_ARM_IMX6Q_CPUFREQ=y CONFIG_ARM_IMX7D_CPUFREQ=y @@ -52,7 +48,6 @@ CONFIG_CPU_IDLE=y CONFIG_VFP=y CONFIG_NEON=y CONFIG_BINFMT_MISC=m -CONFIG_PM_RUNTIME=y CONFIG_PM_DEBUG=y CONFIG_PM_TEST_SUSPEND=y CONFIG_NET=y @@ -66,7 +61,6 @@ 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_VLAN_8021Q=y CONFIG_LLC2=y CONFIG_CAN=y @@ -81,7 +75,6 @@ CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_HIDP=y CONFIG_BT_HCIBTUSB=y CONFIG_BT_HCIUART=y -CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y CONFIG_BT_HCIUART_ATH3K=y CONFIG_BT_HCIBCM203X=y @@ -92,7 +85,7 @@ CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y # CONFIG_STANDALONE is not set CONFIG_DMA_CMA=y -CONFIG_CMA_SIZE_MBYTES=320 +CONFIG_CMA_SIZE_MBYTES=0 CONFIG_IMX_WEIM=y CONFIG_CONNECTOR=y CONFIG_MTD=y @@ -122,7 +115,6 @@ CONFIG_EEPROM_AT24=y CONFIG_EEPROM_AT25=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_LOGGING=y CONFIG_SCSI_SCAN_ASYNC=y @@ -167,7 +159,7 @@ CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ADS7846=y CONFIG_TOUCHSCREEN_EGALAX=y -CONFIG_TOUCHSCREEN_ELAN=y +CONFIG_TOUCHSCREEN_ELAN_TS=y CONFIG_TOUCHSCREEN_MAX11801=y CONFIG_TOUCHSCREEN_IMX6UL_TSC=y CONFIG_TOUCHSCREEN_MC13783=y @@ -175,9 +167,9 @@ CONFIG_TOUCHSCREEN_TSC2007=y CONFIG_TOUCHSCREEN_STMPE=y CONFIG_INPUT_MISC=y CONFIG_INPUT_MMA8450=y -CONFIG_INPUT_ISL29023=y CONFIG_INPUT_MPL3115=y CONFIG_SENSOR_FXLS8471=y +CONFIG_INPUT_ISL29023=y CONFIG_SERIO_SERPORT=m # CONFIG_LEGACY_PTYS is not set # CONFIG_DEVKMEM is not set @@ -197,9 +189,12 @@ CONFIG_SPI_GPIO=y CONFIG_SPI_IMX=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_MAX732X=y +CONFIG_GPIO_PCA953X=y CONFIG_GPIO_74X164=y CONFIG_POWER_SUPPLY=y CONFIG_SABRESD_MAX8903=y +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_SYSCON_POWEROFF=y CONFIG_SENSORS_MAX17135=y CONFIG_SENSORS_MAG3110=y CONFIG_THERMAL=y @@ -255,23 +250,21 @@ CONFIG_DRM=y CONFIG_DRM_VIVANTE=y CONFIG_FB=y CONFIG_FB_MXS=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_LCD_L4F00242T03=y -CONFIG_LCD_PLATFORM=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_PWM=y CONFIG_FB_MXC_SYNC_PANEL=y -CONFIG_FB_MXC_LDB=y CONFIG_FB_MXC_MIPI_DSI=y CONFIG_FB_MXC_MIPI_DSI_SAMSUNG=y CONFIG_FB_MXC_TRULY_WVGA_SYNC_PANEL=y +CONFIG_FB_MXC_LDB=y CONFIG_FB_MXC_HDMI=y -CONFIG_FB_MXC_EINK_PANEL=y -CONFIG_FB_MXC_EINK_V2_PANEL=y CONFIG_FB_MXS_SII902X=y CONFIG_FB_MXC_DCIC=m CONFIG_HANNSTAR_CABC=y +CONFIG_FB_MXC_EINK_PANEL=y +CONFIG_FB_MXC_EINK_V2_PANEL=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_LCD_L4F00242T03=y +CONFIG_LCD_PLATFORM=y +CONFIG_BACKLIGHT_PWM=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_LOGO=y @@ -281,17 +274,17 @@ CONFIG_SND_USB_AUDIO=m CONFIG_SND_SOC=y CONFIG_SND_IMX_SOC=y CONFIG_SND_SOC_EUKREA_TLV320=y -CONFIG_SND_SOC_IMX_CS42888=y +CONFIG_SND_SOC_IMX_WM8960=y CONFIG_SND_SOC_IMX_SII902X=y CONFIG_SND_SOC_IMX_WM8958=y -CONFIG_SND_SOC_IMX_WM8960=y +CONFIG_SND_SOC_IMX_CS42888=y CONFIG_SND_SOC_IMX_WM8962=y CONFIG_SND_SOC_IMX_SGTL5000=y CONFIG_SND_SOC_IMX_MQS=y CONFIG_SND_SOC_IMX_SPDIF=y CONFIG_SND_SOC_IMX_MC13783=y -CONFIG_SND_SOC_IMX_HDMI=y CONFIG_SND_SOC_IMX_SI476X=y +CONFIG_SND_SOC_IMX_HDMI=y CONFIG_USB=y CONFIG_USB_OTG_WHITELIST=y CONFIG_USB_OTG_FSM=y @@ -330,15 +323,15 @@ CONFIG_USB_GADGETFS=m CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_MMC=y -CONFIG_MMC_UNSAFE_RESUME=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_ESDHC_IMX=y CONFIG_MXC_IPU=y -CONFIG_MXC_GPU_VIV=y CONFIG_MXC_IPU_V3_PRE=y -CONFIG_MXC_MIPI_CSI2=y +CONFIG_MXC_GPU_VIV=y CONFIG_MXC_SIM=y +CONFIG_MXC_MIPI_CSI2=y +CONFIG_MXC_HDMI_CEC=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_GPIO=y @@ -358,12 +351,13 @@ CONFIG_MXC_PXP_V2=y CONFIG_MXC_PXP_V3=y CONFIG_IMX_SDMA=y CONFIG_MXS_DMA=y +CONFIG_DMATEST=m CONFIG_STAGING=y CONFIG_STAGING_MEDIA=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_IIO=y +CONFIG_IMX7D_ADC=y CONFIG_VF610_ADC=y -CONFIG_AD2802A=y CONFIG_PWM=y CONFIG_PWM_IMX=y CONFIG_EXT2_FS=y @@ -405,15 +399,9 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_SCHED_DEBUG is not set # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_FTRACE is not set -CONFIG_CORESIGHT=y -CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y -CONFIG_CORESIGHT_SINK_TPIU=y -CONFIG_CORESIGHT_SINK_ETBV10=y -CONFIG_CORESIGHT_SOURCE_ETM3X=y CONFIG_SECURITYFS=y CONFIG_CRYPTO_USER=y CONFIG_CRYPTO_TEST=m -CONFIG_CRYPTO_GCM=y CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_LRW=y diff --git a/recipes-kernel/linux/linux-imx-mfgtool_3.14.52.bb b/recipes-kernel/linux/linux-imx-mfgtool_4.1.15.bb similarity index 86% rename from recipes-kernel/linux/linux-imx-mfgtool_3.14.52.bb rename to recipes-kernel/linux/linux-imx-mfgtool_4.1.15.bb index 825c94a6..5393874f 100644 --- a/recipes-kernel/linux/linux-imx-mfgtool_3.14.52.bb +++ b/recipes-kernel/linux/linux-imx-mfgtool_4.1.15.bb @@ -1,5 +1,5 @@ # Copyright (C) 2014 O.S. Systems Software LTDA. -# Copyright (C) 2014-2015 Freescale Semiconductor +# Copyright (C) 2014-2016 Freescale Semiconductor SUMMARY = "Produces a Manufacturing Tool compatible Linux Kernel" DESCRIPTION = "Linux Kernel provided and supported by Freescale that produces a \ diff --git a/recipes-kernel/linux/linux-imx_3.14.52.bb b/recipes-kernel/linux/linux-imx_4.1.15.bb similarity index 65% rename from recipes-kernel/linux/linux-imx_3.14.52.bb rename to recipes-kernel/linux/linux-imx_4.1.15.bb index bd54de2b..4bc033b5 100644 --- a/recipes-kernel/linux/linux-imx_3.14.52.bb +++ b/recipes-kernel/linux/linux-imx_4.1.15.bb @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2015 Freescale Semiconductor +# Copyright (C) 2013-2016 Freescale Semiconductor # Released under the MIT license (see COPYING.MIT for the terms) SUMMARY = "Linux Kernel provided and supported by Freescale" @@ -10,13 +10,9 @@ require recipes-kernel/linux/linux-dtb.inc DEPENDS += "lzop-native bc-native" -SRCBRANCH = "imx_3.14.52_1.1.0_ga" -LOCALVERSION = "-1.1.0_ga" -SRCREV = "5f6f0a50e6039370078369ddf380179d59024789" - -SRC_URI += " \ - file://0004-mmc-sdhci-esdhc-imx-Fixup-runtime-PM-conditions-duri.patch \ -" +SRCBRANCH = "imx_4.1.15_1.0.0_ga" +LOCALVERSION = "-1.0.0" +SRCREV = "3924425928aab27283e4c635f61bd523f20a7168" DEFAULT_PREFERENCE = "1"