From: Olof Johansson Date: Fri, 25 May 2018 20:53:47 +0000 (-0700) Subject: Merge tag 'imx-defconfig-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawn... X-Git-Tag: v4.18-rc1~51^2^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4676bff21c0bd478634190f78e71e836b1111d83;p=thirdparty%2Fkernel%2Flinux.git Merge tag 'imx-defconfig-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/defconfig i.MX defconfig update for 4.18: - Enable i.MX6SLL SoC support. - Build in GPIO_MAX732X support as the GPIO expanders are used on i.MX6 SabreAuto boards. - Enable driver for RN5T618 PMIC and Marvell MWIFIEX support which are found on i.MX6/7 Colibri boards. - Build in OCOTP NVMEM driver for Vybrid (vf610) SoCs. * tag 'imx-defconfig-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx_v6_v7_defconfig: Select CONFIG_GPIO_MAX732X by default ARM: imx_v6_v7_defconfig: enable imx6sll by default ARM: imx_v6_v7_defconfig: enable Vybrid OCOTP driver ARM: imx_v6_v7_defconfig: add mwifiex driver ARM: imx_v6_v7_defconfig: add RN5T618 PMIC family support Signed-off-by: Olof Johansson --- 4676bff21c0bd478634190f78e71e836b1111d83