From: Martin Kepplinger <martink@posteo.de>
To: jic23@kernel.org, knaack.h@gmx.de, lars@metafoo.de,
pmeerw@pmeerw.net, mfuzzey@parkeon.com,
roberta.dobrescu@gmail.com,
christoph.muellner@theobroma-systems.com
Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
devicetree@vger.kernel.org, Martin Kepplinger <martink@posteo.de>,
Martin Kepplinger <martin.kepplinger@theobroma-systems.com>
Subject: [PATCH 9/9] iio: mma8452: add devicetree property to allow all pin wirings
Date: Sat, 4 Jul 2015 15:55:10 +0200 [thread overview]
Message-ID: <1436018110-3903-10-git-send-email-martink@posteo.de> (raw)
In-Reply-To: <1436018110-3903-1-git-send-email-martink@posteo.de>
For the devices supported by the mma8452 driver, two interrupt pins are
available to route the interrupt signals to. By default INT1 is assumed.
This adds a simple boolean DT property, for users to configure it for
INT2, if that is the wired interrupt pin for them.
This is important for everyone to be able to use this driver, no matter
how their chip is wired.
Since this doesn't change the default behaviour, it doesn't break anything
for existing users.
Signed-off-by: Martin Kepplinger <martin.kepplinger@theobroma-systems.com>
Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com>
---
Documentation/devicetree/bindings/iio/accel/mma8452.txt | 2 ++
drivers/iio/accel/mma8452.c | 14 ++++++++------
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/Documentation/devicetree/bindings/iio/accel/mma8452.txt b/Documentation/devicetree/bindings/iio/accel/mma8452.txt
index 8d98e05..0048415 100644
--- a/Documentation/devicetree/bindings/iio/accel/mma8452.txt
+++ b/Documentation/devicetree/bindings/iio/accel/mma8452.txt
@@ -10,6 +10,7 @@ Optional properties:
- interrupt-parent: should be the phandle for the interrupt controller
- interrupts: interrupt mapping for GPIO IRQ
+ - int2: assume interrupt pin wired to INT2 instead of INT1
Example:
@@ -18,4 +19,5 @@ Example:
reg = <0x1d>;
interrupt-parent = <&gpio1>;
interrupts = <5 0>;
+ int2;
};
diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c
index 2491ed0..0768e66 100644
--- a/drivers/iio/accel/mma8452.c
+++ b/drivers/iio/accel/mma8452.c
@@ -1072,12 +1072,14 @@ static int mma8452_probe(struct i2c_client *client,
int enabled_interrupts = MMA8452_INT_TRANS |
MMA8452_INT_FF_MT;
- /* Assume wired to INT1 pin */
- ret = i2c_smbus_write_byte_data(client,
- MMA8452_CTRL_REG5,
- supported_interrupts);
- if (ret < 0)
- return ret;
+ /* Assume wired to INT1 pin, except "int2" is found in DT */
+ if (!of_property_read_bool(client->dev.of_node, "int2")) {
+ ret = i2c_smbus_write_byte_data(client,
+ MMA8452_CTRL_REG5,
+ supported_interrupts);
+ if (ret < 0)
+ return ret;
+ }
ret = i2c_smbus_write_byte_data(client,
MMA8452_CTRL_REG4,
--
2.1.4
next prev parent reply other threads:[~2015-07-05 8:49 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-04 13:55 [PATCH v3 0/9] iio: mma8452: improve driver and support more chips Martin Kepplinger
2015-07-04 13:55 ` [PATCH 1/9] iio: mma8452: refactor for seperating chip specific data Martin Kepplinger
2015-07-05 11:37 ` Jonathan Cameron
2015-07-04 13:55 ` [PATCH 2/9] iio: mma8452: add support for MMA8453Q accelerometer chip Martin Kepplinger
2015-07-05 11:41 ` Jonathan Cameron
2015-07-04 13:55 ` [PATCH 3/9] iio: mma8452: add freefall / motion interrupt source Martin Kepplinger
2015-07-05 11:44 ` Jonathan Cameron
2015-07-05 11:44 ` Jonathan Cameron
2015-07-04 13:55 ` [PATCH 4/9] iio: mma8452: add support for MMA8652FC and MMA8653FC accelerometers Martin Kepplinger
2015-07-05 11:47 ` Jonathan Cameron
2015-07-04 13:55 ` [PATCH 5/9] iio: mma8452: add devicetree documentation Martin Kepplinger
2015-07-05 11:48 ` Jonathan Cameron
2015-07-05 11:50 ` Martin Kepplinger
2015-07-05 12:12 ` Jonathan Cameron
2015-07-06 8:06 ` Martin Fuzzey
2015-07-06 8:13 ` Martin Kepplinger
2015-07-04 13:55 ` [PATCH 6/9] iio: mma8452: add copyright notice comment Martin Kepplinger
2015-07-04 13:55 ` [PATCH 7/9] iio: mma8452: change iio event type to IIO_EV_TYPE_MAG Martin Kepplinger
2015-07-05 11:50 ` Jonathan Cameron
2015-07-06 8:39 ` Martin Fuzzey
2015-07-07 7:05 ` Jonathan Cameron
2015-07-07 7:32 ` Martin Kepplinger
2015-07-04 13:55 ` [PATCH 8/9] iio: mma8452: leave sysfs namings to the iio core Martin Kepplinger
2015-07-04 13:55 ` Martin Kepplinger [this message]
2015-07-05 11:51 ` [PATCH 9/9] iio: mma8452: add devicetree property to allow all pin wirings Jonathan Cameron
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=1436018110-3903-10-git-send-email-martink@posteo.de \
--to=martink@posteo.de \
--cc=christoph.muellner@theobroma-systems.com \
--cc=devicetree@vger.kernel.org \
--cc=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.kepplinger@theobroma-systems.com \
--cc=mfuzzey@parkeon.com \
--cc=pmeerw@pmeerw.net \
--cc=roberta.dobrescu@gmail.com \
/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
all inboxes | Powered by JetHome®