summaryrefslogtreecommitdiff
path: root/arch/arm/configs/multi_v7_defconfig
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2016-12-27 13:05:28 +0100
committerOlof Johansson <olof@lixom.net>2017-01-09 19:10:35 -0800
commit3b0c9f5e562a4e76c7c8b83b3102b53daedf2fdd (patch)
treec81fe9957f7158739a7708aa6bd7c6b2f35f3e3e /arch/arm/configs/multi_v7_defconfig
parentff90e93867b2841badd33a419d86be0c08c538ca (diff)
ARM: defconfig: replace MPU3050 driver on multi_v7
The multi_v7 config enable the MPU3050 gyro input driver, but there is now a dedicated IIO gyro driver for the same component, which is the right subsystem to handle this. Replace it in the defconfig. As we want the full IIO featureset and as other v7 systems will likely enjoy using IIO for their sensor work (such as the Android-to-IIO userspace HAL), we take this opportunity to turn on the standard sensor HRtimer triggering. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs/multi_v7_defconfig')
-rw-r--r--arch/arm/configs/multi_v7_defconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 4ff677945d1a..032569bec6f1 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -296,7 +296,6 @@ CONFIG_TOUCHSCREEN_WM97XX=m
CONFIG_INPUT_MISC=y
CONFIG_INPUT_MAX77693_HAPTIC=m
CONFIG_INPUT_MAX8997_HAPTIC=m
-CONFIG_INPUT_MPU3050=y
CONFIG_INPUT_AXP20X_PEK=m
CONFIG_INPUT_ADXL34X=m
CONFIG_SERIO_AMBAKMI=y
@@ -848,15 +847,18 @@ CONFIG_MEMORY=y
CONFIG_EXTCON=y
CONFIG_TI_AEMIF=y
CONFIG_IIO=y
+CONFIG_IIO_SW_TRIGGER=y
CONFIG_AT91_ADC=m
CONFIG_AT91_SAMA5D2_ADC=m
CONFIG_BERLIN2_ADC=m
CONFIG_EXYNOS_ADC=m
CONFIG_VF610_ADC=m
CONFIG_XILINX_XADC=y
+CONFIG_MPU3050_I2C=y
CONFIG_CM36651=m
CONFIG_AK8975=y
CONFIG_RASPBERRYPI_POWER=y
+CONFIG_IIO_HRTIMER_TRIGGER=y
CONFIG_PWM=y
CONFIG_PWM_ATMEL=m
CONFIG_PWM_ATMEL_HLCDC_PWM=m