From 0552378a5b1b32d70e09c550354d34b34a9595c5 Mon Sep 17 00:00:00 2001
From: Fabio Berton <fabio.berton@ossystems.com.br>
Date: Wed, 5 Jun 2019 17:32:28 -0300
Subject: [PATCH] linux-fslc: Upgrade to version 5.1.x

This commit merges tag v5.1.12 into 5.1.x+fslc.

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
---
 recipes-kernel/linux/linux-fslc/defconfig                   | 4 +---
 recipes-kernel/linux/linux-fslc/mx25/defconfig              | 3 +++
 .../linux/{linux-fslc_5.0.bb => linux-fslc_5.1.bb}          | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename recipes-kernel/linux/{linux-fslc_5.0.bb => linux-fslc_5.1.bb} (86%)

diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig
index cc0677b5..2d1159b0 100644
--- a/recipes-kernel/linux/linux-fslc/defconfig
+++ b/recipes-kernel/linux/linux-fslc/defconfig
@@ -312,7 +312,6 @@ CONFIG_USB=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_MXC=y
-CONFIG_USB_PRINTER=m
 CONFIG_USB_STORAGE=y
 CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_UDC=y
@@ -320,7 +319,6 @@ CONFIG_USB_CHIPIDEA_HOST=y
 CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_PL2303=m
 CONFIG_USB_SERIAL_OPTION=m
 CONFIG_USB_TEST=m
 CONFIG_USB_EHSET_TEST_FIXTURE=m
@@ -399,7 +397,7 @@ CONFIG_MAG3110=y
 CONFIG_MPL3115=y
 CONFIG_PWM=y
 CONFIG_PWM_FSL_FTM=y
-CONFIG_PWM_IMX=y
+CONFIG_PWM_IMX27=y
 CONFIG_NVMEM_IMX_OCOTP=y
 CONFIG_NVMEM_VF610_OCOTP=y
 CONFIG_TEE=y
diff --git a/recipes-kernel/linux/linux-fslc/mx25/defconfig b/recipes-kernel/linux/linux-fslc/mx25/defconfig
index 8661dd9b..b37f8e67 100644
--- a/recipes-kernel/linux/linux-fslc/mx25/defconfig
+++ b/recipes-kernel/linux/linux-fslc/mx25/defconfig
@@ -170,6 +170,9 @@ CONFIG_IMX_SDMA=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_IIO=y
 CONFIG_FSL_MX25_ADC=y
+CONFIG_PWM=y
+CONFIG_PWM_IMX1=y
+CONFIG_PWM_IMX27=y
 CONFIG_EXT4_FS=y
 # CONFIG_DNOTIFY is not set
 CONFIG_VFAT_FS=y
diff --git a/recipes-kernel/linux/linux-fslc_5.0.bb b/recipes-kernel/linux/linux-fslc_5.1.bb
similarity index 86%
rename from recipes-kernel/linux/linux-fslc_5.0.bb
rename to recipes-kernel/linux/linux-fslc_5.1.bb
index 950f7808..1b74746f 100644
--- a/recipes-kernel/linux/linux-fslc_5.0.bb
+++ b/recipes-kernel/linux/linux-fslc_5.1.bb
@@ -11,9 +11,9 @@ include linux-fslc.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 
-PV = "5.0.5+git${SRCPV}"
+PV = "5.1.12+git${SRCPV}"
 
-SRCBRANCH = "5.0.x+fslc"
-SRCREV = "c7a0e482a175b632bfd5522bc6d5bfe7785ee9a9"
+SRCBRANCH = "5.1.x+fslc"
+SRCREV = "111df67e3aa148d8b652ecf497ab1e54c8a13dfe"
 
 COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)"
-- 
2.40.1