From patchwork Sun Oct 3 16:02:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 12532793 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 10B4EC433F5 for ; Sun, 3 Oct 2021 15:58:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E9E3361AFB for ; Sun, 3 Oct 2021 15:58:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231146AbhJCQAQ (ORCPT ); Sun, 3 Oct 2021 12:00:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:49470 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230426AbhJCQAQ (ORCPT ); Sun, 3 Oct 2021 12:00:16 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 419B661AF9; Sun, 3 Oct 2021 15:58:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1633276708; bh=cVIewzymsiAj7PtbPYg+HLMx6JgBQ/rOfu3xisgmOPA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G3kpssaEN1oC7mIzhkwDIzfrdFQlpTOuFMXmWzAfnTyP37qr6Q8ijRjmh6b6D+e6Y plzRsmYjIpbM9vwl/TGXbaEguqOAUE+4y2lHJg+hVUbxlMo6Z9cfHb89HI5mcwCDLa fGAZkfBki3j8JpWtT8AsPOtmoueQKn533hVbCeqF6CQsDQoz0rHAQKs6yfVAUMXOJD 91hsYcju8Ck/nL7N5ZOg/plCSclZUYAcmKULPJGtg/1J9KIlxLAcyoJN64g4XCpP40 zTZM01g+MOa+fcXONPMbgZ3+pGWTCrZWKdaI5TajjYksLfNOPFZRiy0lGyu0dJG/6Z 3Zn7AA9S5jszg== From: Jonathan Cameron To: linux-iio@vger.kernel.org Cc: Andy Shevchenko , Hans de Goede , Alexandru Ardelean , Shawn Guo , Jonathan Cameron Subject: [RESEND v2 3/5] iio: accel: mma9551: Add support to get irqs directly from fwnode Date: Sun, 3 Oct 2021 17:02:10 +0100 Message-Id: <20211003160212.417909-4-jic23@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211003160212.417909-1-jic23@kernel.org> References: <20211003160212.417909-1-jic23@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org From: Jonathan Cameron The driver previously supported using GPIO requests to retrieve multiple interrupt lines. As existing firmware may be using this method, we need to continue to support it. However, that doesn't stop us also supporting just getting irqs directly. The handling of irqflags has to take into account the fact that using a GPIO method to identify the interrupt does not convey direction of the trigger that fwnode_irq_get() will. So we need to set the IRQF_TRIGGER_RISING in that path but not otherwise, where it will cause an issue if we reprobe the driver after removal. Signed-off-by: Jonathan Cameron --- drivers/iio/accel/mma9551.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/drivers/iio/accel/mma9551.c b/drivers/iio/accel/mma9551.c index 1b4a8b27f14a..537a7a04654a 100644 --- a/drivers/iio/accel/mma9551.c +++ b/drivers/iio/accel/mma9551.c @@ -19,7 +19,7 @@ #define MMA9551_DRV_NAME "mma9551" #define MMA9551_IRQ_NAME "mma9551_event" -#define MMA9551_GPIO_COUNT 4 +#define MMA9551_IRQ_COUNT 4 /* Tilt application (inclination in IIO terms). */ #define MMA9551_TILT_XZ_ANG_REG 0x00 @@ -46,7 +46,7 @@ struct mma9551_data { struct i2c_client *client; struct mutex mutex; int event_enabled[3]; - int irqs[MMA9551_GPIO_COUNT]; + int irqs[MMA9551_IRQ_COUNT]; }; static int mma9551_read_incli_chan(struct i2c_client *client, @@ -400,36 +400,26 @@ static int mma9551_init(struct mma9551_data *data) return mma9551_set_device_state(data->client, true); } -static int mma9551_gpio_probe(struct iio_dev *indio_dev) +static int mma9551_irq_probe(struct iio_dev *indio_dev) { - struct gpio_desc *gpio; int i, ret; struct mma9551_data *data = iio_priv(indio_dev); struct device *dev = &data->client->dev; - for (i = 0; i < MMA9551_GPIO_COUNT; i++) { - gpio = devm_gpiod_get_index(dev, NULL, i, GPIOD_IN); - if (IS_ERR(gpio)) { - dev_err(dev, "acpi gpio get index failed\n"); - return PTR_ERR(gpio); - } - - ret = gpiod_to_irq(gpio); - if (ret < 0) + for (i = 0; i < MMA9551_IRQ_COUNT; i++) { + ret = fwnode_irq_get(dev_fwnode(dev), i); + if (ret) return ret; data->irqs[i] = ret; ret = devm_request_threaded_irq(dev, data->irqs[i], - NULL, mma9551_event_handler, - IRQF_TRIGGER_RISING | IRQF_ONESHOT, - MMA9551_IRQ_NAME, indio_dev); + NULL, mma9551_event_handler, + IRQF_ONESHOT, + MMA9551_IRQ_NAME, indio_dev); if (ret < 0) { dev_err(dev, "request irq %d failed\n", data->irqs[i]); return ret; } - - dev_dbg(dev, "gpio resource, no:%d irq:%d\n", - desc_to_gpio(gpio), data->irqs[i]); } return 0; @@ -466,7 +456,7 @@ static int mma9551_probe(struct i2c_client *client, indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->info = &mma9551_info; - ret = mma9551_gpio_probe(indio_dev); + ret = mma9551_irq_probe(indio_dev); if (ret < 0) goto out_poweroff;