aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2016-05-02 10:38:04 +0200
committerLinus Walleij <linus.walleij@linaro.org>2016-05-10 14:10:52 +0200
commit35bee33355db8347d5f84caef9d2ddde200b8ba6 (patch)
tree774278b048b8f8dfa8f9ec77c62e848beb1ead7b
parentARM: u8500_defconfig: remove staging from defconfig (diff)
downloadwireguard-linux-35bee33355db8347d5f84caef9d2ddde200b8ba6.tar.xz
wireguard-linux-35bee33355db8347d5f84caef9d2ddde200b8ba6.zip
ARM: u8500_defconfig: update sensor config
The Ux500 is using buffered IIO as the sensors support IRQs. The BH1780 ambient light sensor was added to IIO, so disable the old misc driver and activate the driver in IIO. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--arch/arm/configs/u8500_defconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index f70f46498fa0..6306e45e085f 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -45,7 +45,6 @@ CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=65536
-CONFIG_SENSORS_BH1780=y
CONFIG_NETDEVICES=y
CONFIG_SMSC911X=y
CONFIG_SMSC_PHY=y
@@ -106,8 +105,10 @@ CONFIG_DMADEVICES=y
CONFIG_STE_DMA40=y
CONFIG_HSEM_U8500=y
CONFIG_IIO=y
+CONFIG_IIO_BUFFER=y
CONFIG_IIO_ST_ACCEL_3AXIS=y
CONFIG_IIO_ST_GYRO_3AXIS=y
+CONFIG_BH1780=y
CONFIG_IIO_ST_MAGN_3AXIS=y
CONFIG_IIO_ST_PRESS=y
CONFIG_EXT2_FS=y