linux-iio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Bakker <xc-racer2@live.ca>
To: jic23@kernel.org, knaack.h@gmx.de, lars@metafoo.de,
	pmeerw@pmeerw.net, robh+dt@kernel.org, linus.walleij@linaro.org,
	linux-iio@vger.kernel.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org, dmitry.torokhov@gmail.com,
	kstewart@linuxfoundation.org, gregkh@linuxfoundation.org,
	tglx@linutronix.de, linux-input@vger.kernel.org
Cc: Jonathan Bakker <xc-racer2@live.ca>
Subject: [PATCH 2/5] input: misc: bma150: Conditionally disable bma023 support
Date: Sun,  3 May 2020 10:22:03 -0700	[thread overview]
Message-ID: <BN6PR04MB0660B420EFA83668BBF4F315A3A90@BN6PR04MB0660.namprd04.prod.outlook.com> (raw)
In-Reply-To: <20200503172206.13782-1-xc-racer2@live.ca>

The bma180 IIO driver has been extended for support for bma023.
However, this could cause conflicts with this driver.  Since some
setups may depend upon the evdev setup, disable support in this
driver for the bma023 only when the IIO driver is being built.

Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
---
 drivers/input/misc/bma150.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/input/misc/bma150.c b/drivers/input/misc/bma150.c
index a9d984da95f3..5d3f8b05b316 100644
--- a/drivers/input/misc/bma150.c
+++ b/drivers/input/misc/bma150.c
@@ -541,7 +541,10 @@ static UNIVERSAL_DEV_PM_OPS(bma150_pm, bma150_suspend, bma150_resume, NULL);
 static const struct i2c_device_id bma150_id[] = {
 	{ "bma150", 0 },
 	{ "smb380", 0 },
+	/* Prefer the IIO-based driver for bma023 if enabled */
+#if !IS_ENABLED(CONFIG_BMA180)
 	{ "bma023", 0 },
+#endif
 	{ }
 };
 
-- 
2.20.1


  parent reply	other threads:[~2020-05-03 17:22 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20200503172206.13782-1-xc-racer2@live.ca>
2020-05-03 17:22 ` [PATCH 1/5] iio: accel: bma180: Prepare for different reset values Jonathan Bakker
2020-05-06 12:37   ` Linus Walleij
2020-05-03 17:22 ` Jonathan Bakker [this message]
2020-05-06 12:46   ` [PATCH 2/5] input: misc: bma150: Conditionally disable bma023 support Linus Walleij
2020-05-07  3:46     ` Jonathan Bakker
2020-05-07  4:23       ` Dmitry Torokhov
2020-05-08 15:57         ` Jonathan Bakker
2020-05-08 19:41           ` Linus Walleij
2020-05-03 17:22 ` [PATCH 3/5] dt-bindings: iio: accel: Add bma023 compatible to bma180 Jonathan Bakker
2020-05-06 12:49   ` Linus Walleij
2020-05-12 22:15   ` Rob Herring
2020-05-03 17:22 ` [PATCH 4/5] dt-bindings: iio: accel: Add required regulators " Jonathan Bakker
2020-05-06 12:49   ` Linus Walleij
2020-05-12 22:15   ` Rob Herring
2020-05-03 17:22 ` [PATCH 5/5] iio: accel: bma180: Add support for bma023 Jonathan Bakker
2020-05-06 12:51   ` Linus Walleij

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=BN6PR04MB0660B420EFA83668BBF4F315A3A90@BN6PR04MB0660.namprd04.prod.outlook.com \
    --to=xc-racer2@live.ca \
    --cc=devicetree@vger.kernel.org \
    --cc=dmitry.torokhov@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=jic23@kernel.org \
    --cc=knaack.h@gmx.de \
    --cc=kstewart@linuxfoundation.org \
    --cc=lars@metafoo.de \
    --cc=linus.walleij@linaro.org \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pmeerw@pmeerw.net \
    --cc=robh+dt@kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).