aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorArnd Bergmann2020-07-22 21:39:30 +0200
committerArnd Bergmann2020-07-22 21:39:30 +0200
commita1224fdc5c27b07690eeefd01227c397af640529 (patch)
tree1afeeb33d79098a70d9a6862515b71894d0b8461 /arch/arm/configs
parenta4cd898d6469c3e071c067adabbdfa4ab945f8c8 (diff)
parent250ce11ed7463aabe3ad457bb9a1973450a420b2 (diff)
Merge tag 'imx-defconfig-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/defconfig
i.MX defconfig update for 5.9: - Enable PCA9450 regulator driver in arm64 defconfig. - Enable RV8803 RTC and FSL_SAI audio support in arm64 defconfig to make it useful for Kontron sl28 boards. - Enable i.MX8MM clock and pinctrl driver in imx_v6_v7_defconfig to get AARCH32 mode kernel work on AARCH64 hardware. * tag 'imx-defconfig-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx_v6_v7_defconfig: Support i.MX8MM arm64: defconfig: enable RTC and audio support on Kontron sl28 boards arm64: defconfig: add pca9450 pmic driver Link: https://lore.kernel.org/r/20200720085536.24138-5-shawnguo@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/imx_v6_v7_defconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 87e6400c436b..cb335478ac37 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -217,6 +217,7 @@ CONFIG_SPI=y
CONFIG_SPI_GPIO=y
CONFIG_SPI_IMX=y
CONFIG_SPI_FSL_DSPI=y
+CONFIG_PINCTRL_IMX8MM=y
CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_SIOX=m
CONFIG_GPIO_MAX732X=y
@@ -406,6 +407,8 @@ CONFIG_STAGING=y
CONFIG_STAGING_MEDIA=y
CONFIG_VIDEO_IMX_MEDIA=y
CONFIG_COMMON_CLK_PWM=y
+CONFIG_CLK_IMX8MM=y
+CONFIG_SOC_IMX8M=y
CONFIG_IIO=y
CONFIG_MMA8452=y
CONFIG_IMX7D_ADC=y