From patchwork Thu Mar 25 13:10:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Peter Clausen X-Patchwork-Id: 12164083 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 738C9C433C1 for ; Thu, 25 Mar 2021 13:11:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 47304619AB for ; Thu, 25 Mar 2021 13:11:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229533AbhCYNL1 (ORCPT ); Thu, 25 Mar 2021 09:11:27 -0400 Received: from www381.your-server.de ([78.46.137.84]:34694 "EHLO www381.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230076AbhCYNLK (ORCPT ); Thu, 25 Mar 2021 09:11:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=metafoo.de; s=default2002; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References; bh=i63std+381VTYpjwZPoYj00Y+dfonnocRdL3NydfZso=; b=izvkBB/E5New7D4q7kJAaSEdiF 2+Pd2H+bcf8L55P9N9dOk0YJTImffpLZRba/JvZMZocSVJdQUFjQU5uXTLjvRrKqIEp2XCKx844RJ G0fiPEGTUhPcNpW7Ieu5v3NuU+hmU5u7IzQyfAn5Gr5CRTSvk02ZavIAox0qWbD3CwT/D2RDRuIfz 8cYisMzX3kr2eGBj25khL/5/KRV0IuCXPRzQqpEZi9S3fmLG6Wed0EDycKvUZrxZ4csp4s5th9T07 Q4pO08bwAD5Q5GYLg/LB2mQIdi3vIhkhsZnKzAvLTTNh1CYNLPdduMmfqkGDGj6A+ZzmISqsr5Uz6 B1t/iv6A==; Received: from sslproxy06.your-server.de ([78.46.172.3]) by www381.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92.3) (envelope-from ) id 1lPPlK-0007fW-Kn; Thu, 25 Mar 2021 14:10:58 +0100 Received: from [2001:a61:2aba:2d01:9e5c:8eff:fe01:8578] (helo=lars-desktop.fritz.box) by sslproxy06.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lPPlK-000Ol3-Gy; Thu, 25 Mar 2021 14:10:58 +0100 From: Lars-Peter Clausen To: Jonathan Cameron Cc: Jean-Baptiste Maneyrol , Linus Walleij , linux-iio@vger.kernel.org, Lars-Peter Clausen Subject: [PATCH 1/2] iio: inv_mpu6050: Remove superfluous indio_dev->modes assignment Date: Thu, 25 Mar 2021 14:10:45 +0100 Message-Id: <20210325131046.13383-1-lars@metafoo.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Authenticated-Sender: lars@metafoo.de X-Virus-Scanned: Clear (ClamAV 0.102.4/26120/Thu Mar 25 12:15:49 2021) Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org The inv_mpu6050 driver manually assigns the indio_dev->modes property. But this is not necessary since it will be setup in iio_trigger_buffer_setup(). Remove the manual assignment. Signed-off-by: Lars-Peter Clausen Acked-by: Linus Walleij Acked-by: Jean-Baptiste Maneyrol Signed-off-by: Lars-Peter Clausen --- drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c index 453c51c79655..99ee0a218875 100644 --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c @@ -1591,7 +1591,6 @@ int inv_mpu_core_probe(struct regmap *regmap, int irq, const char *name, } indio_dev->info = &mpu_info; - indio_dev->modes = INDIO_BUFFER_TRIGGERED; result = devm_iio_triggered_buffer_setup(dev, indio_dev, iio_pollfunc_store_time, From patchwork Thu Mar 25 13:10:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Peter Clausen X-Patchwork-Id: 12164085 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 84CF8C433DB for ; Thu, 25 Mar 2021 13:11:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5AA04619EE for ; Thu, 25 Mar 2021 13:11:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230076AbhCYNL2 (ORCPT ); Thu, 25 Mar 2021 09:11:28 -0400 Received: from www381.your-server.de ([78.46.137.84]:34748 "EHLO www381.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230248AbhCYNLL (ORCPT ); Thu, 25 Mar 2021 09:11:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=metafoo.de; s=default2002; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID; bh=xqzQUQSa5ulj5MbZ4WbaCYwA7p9yxAZqLfjv3Z6lorQ=; b=lJinFmKXBKz+02+iedwHUSQKvs 23acK3ivCN9C4bl78VtY/v55fo+djyrZF2mER2NsxFn/O3CgLPFpgeohfdqAvFseQdB1sxEZDEqxg XHCTkJ0U8CohiDmx96xKxJ+Zuk2uMdoj5Da9myQykn5UwTkAErM0/n+j+H3nAreTb0/btIRrX088O BoyxZe6W8RDbyVj+lbLU9wgORiF51WZFZNOGNQvE6i1lk6tED1GWhgC9IfdOilywmViwHTEuUQZPV Ny4mseNNVXhMAdhmCtTu8gjrH2eHXOdrHYmxUtS/CG3gf6Vw5ZLhyj3PqODk8g5S5Bh1t4OJYlkgT 56eTrGIQ==; Received: from sslproxy06.your-server.de ([78.46.172.3]) by www381.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92.3) (envelope-from ) id 1lPPlM-0007gO-Uc; Thu, 25 Mar 2021 14:11:00 +0100 Received: from [2001:a61:2aba:2d01:9e5c:8eff:fe01:8578] (helo=lars-desktop.fritz.box) by sslproxy06.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lPPlM-000Ol3-Qu; Thu, 25 Mar 2021 14:11:00 +0100 From: Lars-Peter Clausen To: Jonathan Cameron Cc: Jean-Baptiste Maneyrol , Linus Walleij , linux-iio@vger.kernel.org, Lars-Peter Clausen Subject: [PATCH 2/2] iio: inv_mpu6050: Make interrupt optional Date: Thu, 25 Mar 2021 14:10:46 +0100 Message-Id: <20210325131046.13383-2-lars@metafoo.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210325131046.13383-1-lars@metafoo.de> References: <20210325131046.13383-1-lars@metafoo.de> MIME-Version: 1.0 X-Authenticated-Sender: lars@metafoo.de X-Virus-Scanned: Clear (ClamAV 0.102.4/26120/Thu Mar 25 12:15:49 2021) Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org The inv_mpu6050 driver requires an interrupt for buffered capture. But non buffered reading for measurements works just fine without an interrupt connected. Make the interrupt optional to support this case. Signed-off-by: Lars-Peter Clausen Reviewed-by: Linus Walleij Acked-by: Jean-Baptiste Maneyrol --- drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 51 ++++++++++++++-------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c index 99ee0a218875..cda7b48981c9 100644 --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c @@ -1458,15 +1458,21 @@ int inv_mpu_core_probe(struct regmap *regmap, int irq, const char *name, st->plat_data = *pdata; } - desc = irq_get_irq_data(irq); - if (!desc) { - dev_err(dev, "Could not find IRQ %d\n", irq); - return -EINVAL; - } + if (irq > 0) { + desc = irq_get_irq_data(irq); + if (!desc) { + dev_err(dev, "Could not find IRQ %d\n", irq); + return -EINVAL; + } - irq_type = irqd_get_trigger_type(desc); - if (!irq_type) + irq_type = irqd_get_trigger_type(desc); + if (!irq_type) + irq_type = IRQF_TRIGGER_RISING; + } else { + /* Doesn't really matter, use the default */ irq_type = IRQF_TRIGGER_RISING; + } + if (irq_type & IRQF_TRIGGER_RISING) // rising or both-edge st->irq_mask = INV_MPU6050_ACTIVE_HIGH; else if (irq_type == IRQF_TRIGGER_FALLING) @@ -1592,18 +1598,25 @@ int inv_mpu_core_probe(struct regmap *regmap, int irq, const char *name, indio_dev->info = &mpu_info; - result = devm_iio_triggered_buffer_setup(dev, indio_dev, - iio_pollfunc_store_time, - inv_mpu6050_read_fifo, - NULL); - if (result) { - dev_err(dev, "configure buffer fail %d\n", result); - return result; - } - result = inv_mpu6050_probe_trigger(indio_dev, irq_type); - if (result) { - dev_err(dev, "trigger probe fail %d\n", result); - return result; + if (irq > 0) { + /* + * The driver currently only supports buffered capture with its + * own trigger. So no IRQ, no trigger, no buffer + */ + result = devm_iio_triggered_buffer_setup(dev, indio_dev, + iio_pollfunc_store_time, + inv_mpu6050_read_fifo, + NULL); + if (result) { + dev_err(dev, "configure buffer fail %d\n", result); + return result; + } + + result = inv_mpu6050_probe_trigger(indio_dev, irq_type); + if (result) { + dev_err(dev, "trigger probe fail %d\n", result); + return result; + } } result = devm_iio_device_register(dev, indio_dev);