summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2015-12-23 00:03:12 +0300
committerOlof Johansson <olof@lixom.net>2015-12-23 00:03:12 +0300
commit295ea80ea3c24a2660f8b44e971f3c19f9f34934 (patch)
treeeea94e13e05de7134ace895bd196bff7bcacb171 /arch/arm/configs
parent8418f73b1931f86c4c96f3a97af0ffbb35f659ed (diff)
parent74b40b2c53636290ac0ebee6c6c680aebd7e9347 (diff)
downloadlinux-295ea80ea3c24a2660f8b44e971f3c19f9f34934.tar.xz
Merge tag 'lpc18xx_defconfig_for_4.5' of https://github.com/manabian/linux-lpc into next/defconfig
Defconfig additions for LPC18xx platform Add LPC18xx EEPROM driver and MMA7455 IIO driver for the accelerometer found on EA4357 Dev kit. * tag 'lpc18xx_defconfig_for_4.5' of https://github.com/manabian/linux-lpc: ARM: configs: lpc18xx: enable EEPROM NVMEM driver ARM: configs: lpc18xx: enable mma7455 IIO driver Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/lpc18xx_defconfig5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/configs/lpc18xx_defconfig b/arch/arm/configs/lpc18xx_defconfig
index 03c155f5b811..2ae00b09cfc2 100644
--- a/arch/arm/configs/lpc18xx_defconfig
+++ b/arch/arm/configs/lpc18xx_defconfig
@@ -147,7 +147,12 @@ CONFIG_MEMORY=y
CONFIG_ARM_PL172_MPMC=y
CONFIG_PWM=y
CONFIG_PWM_LPC18XX_SCT=y
+CONFIG_IIO=y
+CONFIG_MMA7455_I2C=y
+CONFIG_IIO_SYSFS_TRIGGER=y
CONFIG_PHY_LPC18XX_USB_OTG=y
+CONFIG_NVMEM=y
+CONFIG_NVMEM_LPC18XX_EEPROM=y
CONFIG_EXT2_FS=y
# CONFIG_FILE_LOCKING is not set
# CONFIG_DNOTIFY is not set