Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932235AbbGFMga (ORCPT ); Mon, 6 Jul 2015 08:36:30 -0400 Received: from mx02.posteo.de ([89.146.194.165]:51278 "EHLO mx02.posteo.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755408AbbGFMgO (ORCPT ); Mon, 6 Jul 2015 08:36:14 -0400 From: Martin Kepplinger To: jic23@kernel.org, knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net, mfuzzey@parkeon.com, roberta.dobrescu@gmail.com, robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org Cc: devicetree@vger.kernel.org, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, christoph.muellner@theobroma-systems.com, Martin Kepplinger , Martin Kepplinger Subject: [PATCH 8/8] iio: mma8452: add devicetree property to allow all pin wirings Date: Mon, 6 Jul 2015 14:34:22 +0200 Message-Id: <1436186062-5766-9-git-send-email-martink@posteo.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1436186062-5766-1-git-send-email-martink@posteo.de> References: <1436186062-5766-1-git-send-email-martink@posteo.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2541 Lines: 70 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 Signed-off-by: Christoph Muellner --- 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..9bad1fc 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 + - use_int2: assume interrupt pin wired to INT2 instead of INT1 Example: @@ -18,4 +19,5 @@ Example: reg = <0x1d>; interrupt-parent = <&gpio1>; interrupts = <5 0>; + use_int2; }; diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c index 2b8ed67..f8ba146 100644 --- a/drivers/iio/accel/mma8452.c +++ b/drivers/iio/accel/mma8452.c @@ -1105,12 +1105,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 "use_int2" is found in DT */ + if (!of_property_read_bool(client->dev.of_node, "use_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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/