From: Jonathan Bakker <xc-racer2@live.ca>
Date: Thu, 14 May 2020 20:48:56 +0000 (-0700)
Subject: iio: accel: Make bma180 conflict with input's bma150
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a5e633eb79c4c9c03d5326149451829eeaaa06b4;p=linux.git

iio: accel: Make bma180 conflict with input's bma150

The bma180 IIO driver is being extended for support for the chips
support by input's bma150 driver (bma023, bma150, smb380). Don't
allow both drivers to be enabled simultaneously as they're for the
same hardware.

Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---

diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig
index 24ebe9e769151..67c35b6eb910b 100644
--- a/drivers/iio/accel/Kconfig
+++ b/drivers/iio/accel/Kconfig
@@ -90,7 +90,7 @@ config ADXL372_I2C
 
 config BMA180
 	tristate "Bosch BMA180/BMA25x 3-Axis Accelerometer Driver"
-	depends on I2C
+	depends on I2C && INPUT_BMA150=n
 	select IIO_BUFFER
 	select IIO_TRIGGERED_BUFFER
 	help