From patchwork Sun Jul 25 17:24:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 12398207 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=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 405DBC4338F for ; Sun, 25 Jul 2021 17:22:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 251C560F35 for ; Sun, 25 Jul 2021 17:22:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229545AbhGYQmI (ORCPT ); Sun, 25 Jul 2021 12:42:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:42340 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230471AbhGYQmI (ORCPT ); Sun, 25 Jul 2021 12:42:08 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D292D60F23; Sun, 25 Jul 2021 17:22:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627233758; bh=z9P0wpDzneyLHgDABBdsFR+B/22PlA5IQL2nE993VhA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cpj9WhRPhttQ31VCP/tAiyHmH5xtkYV/eCJMsxvlQXJcYaO9ewRKz0ZxaMU9v3fqB M9qvTItMNLrpwTRhqhpuqPMIXjqRZ7PQ9QmJsuMsPO3XOmVkV6Yg/MXYA0D43gzJvW /zDVuEsiDAC1ByNyQwFgOgKdh4t38dUhDBe4OVYgEhxnxcLg6lZ/05qOjSR3ZHA7yr mQl7DzdakOx3ovLqUY+n6hHvaW0N12v2MoGHFes9S4sHtO8hi4PFmSO36/tefAyQPl 1oCL2yuIR+PBVgryPy6/GrJxgxedQOY4+YG7ZAwwa8Qq8nmmQ/KnhYuhH1HMSaZ2IC lSbmpeadCtAcg== From: Jonathan Cameron To: linux-iio@vger.kernel.org Cc: Andy Shevchenko , Lars-Peter Clausen , Michael Hennerich , Alexandru Tachici , Jonathan Cameron Subject: [PATCH 1/2] iio:adc:ad7124: Parse configuration into correct local config structure. Date: Sun, 25 Jul 2021 18:24:57 +0100 Message-Id: <20210725172458.487343-2-jic23@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210725172458.487343-1-jic23@kernel.org> References: <20210725172458.487343-1-jic23@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org From: Jonathan Cameron The channel index is used before it's been read from the device tree child node. Move it down a few lines so it reflects the correct setting. Noticed by inspection, so test appreciated. Fixes: 7b8d045e497a ("iio: adc: ad7124: allow more than 8 channels") Signed-off-by: Jonathan Cameron Cc: Alexandru Tachici --- drivers/iio/adc/ad7124.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/iio/adc/ad7124.c b/drivers/iio/adc/ad7124.c index e45c600fccc0..b2e49386d7dc 100644 --- a/drivers/iio/adc/ad7124.c +++ b/drivers/iio/adc/ad7124.c @@ -765,7 +765,6 @@ static int ad7124_of_parse_channel_config(struct iio_dev *indio_dev, st->channels = channels; for_each_available_child_of_node(np, child) { - cfg = &st->channels[channel].cfg; ret = of_property_read_u32(child, "reg", &channel); if (ret) @@ -778,6 +777,8 @@ static int ad7124_of_parse_channel_config(struct iio_dev *indio_dev, goto err; } + cfg = &st->channels[channel].cfg; + ret = of_property_read_u32_array(child, "diff-channels", ain, 2); if (ret) From patchwork Sun Jul 25 17:24:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 12398209 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=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 79EABC4338F for ; Sun, 25 Jul 2021 17:22:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 63EED60F37 for ; Sun, 25 Jul 2021 17:22:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231215AbhGYQmL (ORCPT ); Sun, 25 Jul 2021 12:42:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:42384 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230471AbhGYQmL (ORCPT ); Sun, 25 Jul 2021 12:42:11 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C54D560F11; Sun, 25 Jul 2021 17:22:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627233761; bh=+/+JajD0nSgC22Q1yPGXN6NloVUXraF/XWs0Zzp6ZfU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s767uUtKzwwasysbNVDDOjyyzGTRuSKxTF4MBRnA+bpjcIN5gCZSHsA/waPO8uxH5 TJfYVgTNC2gFaZ89ke6fuRjrJSWQTI+Ox/7gQm/mgRbfmWgoQDKjQA2itPmQTT7IMV Gb0EaFt9C1qpQFBnhXKzSZBlxZ5X4sUxAj/g1DZkSS4ggvoMYX3+jJ5dG9mX77d68K RYNVJ8nKgWITtmKFhtGxn+2dDcbOmRNV3S/v1H7NMb4e/pQvxSBOYepGXPdOrrgQTd mweQ0cQUiCLCQEda3Onp1gHXm2Vw1dQTv3XrXcNhGoLsFrf4t7OxF9BPiZyaAczX66 CLb5JWOoDLUng== From: Jonathan Cameron To: linux-iio@vger.kernel.org Cc: Andy Shevchenko , Lars-Peter Clausen , Michael Hennerich , Alexandru Tachici , Jonathan Cameron Subject: [PATCH 2/2] iio:adc:ad7124: Convert to fwnode handling of child node parsing. Date: Sun, 25 Jul 2021 18:24:58 +0100 Message-Id: <20210725172458.487343-3-jic23@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210725172458.487343-1-jic23@kernel.org> References: <20210725172458.487343-1-jic23@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org From: Jonathan Cameron Also use device_get_match_data() rather than of specific variant. These changes enable use of this binding on ACPI platforms via PRP0001. Whilst it's possible no one will ever do so, this is part of a general effort to clear out examples from IIO that might be copied into new drivers. It may appear that this change drops the check for status = disabled, but in reality it does not because the of property code uses of_get_next_available_child(). This driver may well fail to probe if disabled is ever actually set though due to the need for complete concurrent child nodes. A future series might resolve that restriction. Signed-off-by: Jonathan Cameron --- drivers/iio/adc/ad7124.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/drivers/iio/adc/ad7124.c b/drivers/iio/adc/ad7124.c index b2e49386d7dc..bbb9830e13c2 100644 --- a/drivers/iio/adc/ad7124.c +++ b/drivers/iio/adc/ad7124.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include @@ -733,18 +733,20 @@ static int ad7124_check_chip_id(struct ad7124_state *st) return 0; } -static int ad7124_of_parse_channel_config(struct iio_dev *indio_dev, - struct device_node *np) +static int ad7124_parse_channel_config(struct iio_dev *indio_dev, + struct device *dev) { struct ad7124_state *st = iio_priv(indio_dev); struct ad7124_channel_config *cfg; struct ad7124_channel *channels; - struct device_node *child; + struct fwnode_handle *child; struct iio_chan_spec *chan; unsigned int ain[2], channel = 0, tmp; int ret; - st->num_channels = of_get_available_child_count(np); + device_for_each_child_node(dev, child) + st->num_channels++; + if (!st->num_channels) { dev_err(indio_dev->dev.parent, "no channel children\n"); return -ENODEV; @@ -764,9 +766,8 @@ static int ad7124_of_parse_channel_config(struct iio_dev *indio_dev, indio_dev->num_channels = st->num_channels; st->channels = channels; - for_each_available_child_of_node(np, child) { - - ret = of_property_read_u32(child, "reg", &channel); + device_for_each_child_node(dev, child) { + ret = fwnode_property_read_u32(child, "reg", &channel); if (ret) goto err; @@ -779,8 +780,8 @@ static int ad7124_of_parse_channel_config(struct iio_dev *indio_dev, cfg = &st->channels[channel].cfg; - ret = of_property_read_u32_array(child, "diff-channels", - ain, 2); + ret = fwnode_property_read_u32_array(child, "diff-channels", + ain, 2); if (ret) goto err; @@ -788,16 +789,16 @@ static int ad7124_of_parse_channel_config(struct iio_dev *indio_dev, st->channels[channel].ain = AD7124_CHANNEL_AINP(ain[0]) | AD7124_CHANNEL_AINM(ain[1]); - cfg->bipolar = of_property_read_bool(child, "bipolar"); + cfg->bipolar = fwnode_property_read_bool(child, "bipolar"); - ret = of_property_read_u32(child, "adi,reference-select", &tmp); + ret = fwnode_property_read_u32(child, "adi,reference-select", &tmp); if (ret) cfg->refsel = AD7124_INT_REF; else cfg->refsel = tmp; - cfg->buf_positive = of_property_read_bool(child, "adi,buffered-positive"); - cfg->buf_negative = of_property_read_bool(child, "adi,buffered-negative"); + cfg->buf_positive = fwnode_property_read_bool(child, "adi,buffered-positive"); + cfg->buf_negative = fwnode_property_read_bool(child, "adi,buffered-negative"); chan[channel] = ad7124_channel_template; chan[channel].address = channel; @@ -808,7 +809,7 @@ static int ad7124_of_parse_channel_config(struct iio_dev *indio_dev, return 0; err: - of_node_put(child); + fwnode_handle_put(child); return ret; } @@ -875,7 +876,7 @@ static int ad7124_probe(struct spi_device *spi) struct iio_dev *indio_dev; int i, ret; - info = of_device_get_match_data(&spi->dev); + info = device_get_match_data(&spi->dev); if (!info) return -ENODEV; @@ -893,7 +894,7 @@ static int ad7124_probe(struct spi_device *spi) indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->info = &ad7124_info; - ret = ad7124_of_parse_channel_config(indio_dev, spi->dev.of_node); + ret = ad7124_parse_channel_config(indio_dev, &spi->dev); if (ret < 0) return ret;