summaryrefslogtreecommitdiff
path: root/arch/arm/configs/u8500_defconfig
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2016-10-17 12:23:49 +0300
committerOlof Johansson <olof@lixom.net>2016-10-28 02:59:57 +0300
commit0a53ef4bea9b085745bae1ece9eebbc286eb682d (patch)
tree9585ea67b7b27aed404f585d848ae22e7c759994 /arch/arm/configs/u8500_defconfig
parent07d9a380680d1c0eb51ef87ff2eab5c994949e69 (diff)
downloadlinux-0a53ef4bea9b085745bae1ece9eebbc286eb682d.tar.xz
ARM: defconfig: update U8500 defconfig
Some config options like perf events and PM are now implicit, we have an upstream driver for the AK8974, and we really want the HRTIMER software triggers from configfs with some of the sensors. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs/u8500_defconfig')
-rw-r--r--arch/arm/configs/u8500_defconfig7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index b7b09189f1c5..e2151a7aaf49 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -4,7 +4,6 @@ CONFIG_NO_HZ_IDLE=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_BLK_DEV_INITRD=y
CONFIG_KALLSYMS_ALL=y
-CONFIG_PERF_EVENTS=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set
@@ -26,7 +25,6 @@ CONFIG_CPU_IDLE=y
CONFIG_ARM_U8500_CPUIDLE=y
CONFIG_VFP=y
CONFIG_NEON=y
-CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
@@ -108,18 +106,19 @@ CONFIG_DMADEVICES=y
CONFIG_STE_DMA40=y
CONFIG_HSEM_U8500=y
CONFIG_IIO=y
-CONFIG_IIO_BUFFER=y
+CONFIG_IIO_SW_TRIGGER=y
CONFIG_IIO_ST_ACCEL_3AXIS=y
CONFIG_IIO_ST_GYRO_3AXIS=y
CONFIG_BH1780=y
+CONFIG_AK8974=y
CONFIG_IIO_ST_MAGN_3AXIS=y
+CONFIG_IIO_HRTIMER_TRIGGER=y
CONFIG_IIO_ST_PRESS=y
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
CONFIG_EXT3_FS=y
-CONFIG_EXT4_FS=y
CONFIG_VFAT_FS=y
CONFIG_TMPFS=y
CONFIG_TMPFS_POSIX_ACL=y