From 228704c967cc91bd3c712bf313b0ec4ec9e62b04 Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan@agner.ch>
Date: Mon, 26 Mar 2018 20:24:00 +0000
Subject: [PATCH] linux-armv7: enable configs for Toradex Colibri modules

Enable NAND drivers required for NXP based Colibri VFxx/iMX6ULL
and iMX7 modules. Also FlexCAN is useful for all modules.

Enable RN5T618 PMIC support required during bootup for Colibri
iMX7 modules.

Enable Display Controller Unit for Colibri VFxx (Vybrid).

Signed-off-by: Stefan Agner <stefan@agner.ch>
---
 core/linux-armv7/PKGBUILD |  4 ++--
 core/linux-armv7/config   | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/core/linux-armv7/PKGBUILD b/core/linux-armv7/PKGBUILD
index 07276ee6b..ed4adde35 100644
--- a/core/linux-armv7/PKGBUILD
+++ b/core/linux-armv7/PKGBUILD
@@ -8,7 +8,7 @@ _srcname=linux-4.15
 _kernelname=${pkgbase#linux}
 _desc="ARMv7 multi-platform"
 pkgver=4.15.12
-pkgrel=1
+pkgrel=2
 rcnrel=armv7-x1
 arch=('armv7h')
 url="http://www.kernel.org/"
@@ -55,7 +55,7 @@ md5sums=('0d701ac1e2a67d47ce7127432df2c32b'
          'daf19a2a5fa3701574c904a9d95524f2'
          'ac46c2be358e43210c14c70f45236813'
          '660cf4eb23a4f20cd901be1ac2d318ea'
-         '2d5349ffcf0fedc0c35397a10bd1b059'
+         'e2074c04132ca4ed43eef77da5226728'
          '4f2379ed84258050edb858ee8d281678'
          '61c5ff73c136ed07a7aadbf58db3d96a'
          '584777ae88bce2c5659960151b64c7d8'
diff --git a/core/linux-armv7/config b/core/linux-armv7/config
index d0c9d33dd..a9c75041b 100644
--- a/core/linux-armv7/config
+++ b/core/linux-armv7/config
@@ -1703,7 +1703,7 @@ CONFIG_CAN_SLCAN=m
 CONFIG_CAN_DEV=m
 CONFIG_CAN_CALC_BITTIMING=y
 CONFIG_CAN_LEDS=y
-# CONFIG_CAN_FLEXCAN is not set
+CONFIG_CAN_FLEXCAN=m
 CONFIG_CAN_GRCAN=m
 CONFIG_CAN_SUN4I=m
 CONFIG_CAN_TI_HECC=m
@@ -1965,7 +1965,7 @@ CONFIG_MTD=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
 CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_AFS_PARTS is not set
-CONFIG_MTD_OF_PARTS=m
+CONFIG_MTD_OF_PARTS=y
 CONFIG_MTD_AR7_PARTS=m
 
 #
@@ -2065,12 +2065,12 @@ CONFIG_MTD_NAND_RICOH=m
 CONFIG_MTD_NAND_CAFE=m
 CONFIG_MTD_NAND_PXA3xx=y
 # CONFIG_MTD_NAND_NANDSIM is not set
-# CONFIG_MTD_NAND_GPMI_NAND is not set
+CONFIG_MTD_NAND_GPMI_NAND=y
 # CONFIG_MTD_NAND_BRCMNAND is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
 # CONFIG_MTD_NAND_ORION is not set
 # CONFIG_MTD_NAND_FSL_IFC is not set
-# CONFIG_MTD_NAND_VF610_NFC is not set
+CONFIG_MTD_NAND_VF610_NFC=y
 CONFIG_MTD_NAND_MXC=m
 # CONFIG_MTD_NAND_DAVINCI is not set
 CONFIG_MTD_NAND_SUNXI=y
@@ -4343,6 +4343,7 @@ CONFIG_DW_WATCHDOG=m
 CONFIG_OMAP_WATCHDOG=m
 CONFIG_DAVINCI_WATCHDOG=m
 CONFIG_ORION_WATCHDOG=m
+CONFIG_RN5T618_WATCHDOG=m
 CONFIG_SUNXI_WATCHDOG=m
 CONFIG_TWL4030_WATCHDOG=m
 # CONFIG_TS4800_WATCHDOG is not set
@@ -4470,7 +4471,7 @@ CONFIG_MFD_RTSX_PCI=m
 CONFIG_MFD_RTSX_USB=m
 # CONFIG_MFD_RC5T583 is not set
 CONFIG_MFD_RK808=y
-# CONFIG_MFD_RN5T618 is not set
+CONFIG_MFD_RN5T618=y
 CONFIG_MFD_SEC_CORE=y
 # CONFIG_MFD_SI476X_CORE is not set
 # CONFIG_MFD_SM501 is not set
@@ -4577,6 +4578,7 @@ CONFIG_REGULATOR_PFUZE100=y
 # CONFIG_REGULATOR_PV88090 is not set
 CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_RK808=y
+CONFIG_REGULATOR_RN5T618=y
 CONFIG_REGULATOR_S2MPA01=y
 CONFIG_REGULATOR_S2MPS11=y
 CONFIG_REGULATOR_S5M8767=y
@@ -5434,7 +5436,7 @@ CONFIG_DRM_TILCDC=m
 CONFIG_DRM_QXL=m
 CONFIG_DRM_BOCHS=m
 CONFIG_DRM_VIRTIO_GPU=m
-# CONFIG_DRM_FSL_DCU is not set
+CONFIG_DRM_FSL_DCU=m
 CONFIG_DRM_TEGRA=m
 # CONFIG_DRM_TEGRA_DEBUG is not set
 CONFIG_DRM_TEGRA_STAGING=y