All of lore.kernel.org
 help / color / mirror / Atom feed
From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
To: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
	"Rob Herring" <robh+dt@kernel.org>,
	"Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>,
	"Benoît Cousson" <bcousson@baylibre.com>,
	"Tony Lindgren" <tony@atomide.com>,
	"Sekhar Nori" <nsekhar@ti.com>,
	"Bartosz Golaszewski" <brgl@bgdev.pl>,
	"Vinod Koul" <vkoul@kernel.org>,
	linux-usb@vger.kernel.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org, dmaengine@vger.kernel.org
Cc: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Subject: [PATCH v2 3/6] dmaengine: ti: deprecate '#dma-channels'
Date: Wed, 27 Apr 2022 18:11:23 +0200	[thread overview]
Message-ID: <20220427161126.647073-4-krzysztof.kozlowski@linaro.org> (raw)
In-Reply-To: <20220427161126.647073-1-krzysztof.kozlowski@linaro.org>

The generic property, used in most of the drivers and defined in generic
dma-common DT bindings, is 'dma-channels'.  Switch to new property while
keeping backward compatibility.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 drivers/dma/ti/cppi41.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/dma/ti/cppi41.c b/drivers/dma/ti/cppi41.c
index 062bd9bd4de0..695915dba707 100644
--- a/drivers/dma/ti/cppi41.c
+++ b/drivers/dma/ti/cppi41.c
@@ -1105,8 +1105,12 @@ static int cppi41_dma_probe(struct platform_device *pdev)
 	cdd->qmgr_num_pend = glue_info->qmgr_num_pend;
 	cdd->first_completion_queue = glue_info->first_completion_queue;
 
+	/* Parse new and deprecated dma-channels properties */
 	ret = of_property_read_u32(dev->of_node,
-				   "#dma-channels", &cdd->n_chans);
+				   "dma-channels", &cdd->n_chans);
+	if (ret)
+		ret = of_property_read_u32(dev->of_node,
+					   "#dma-channels", &cdd->n_chans);
 	if (ret)
 		goto err_get_n_chans;
 
-- 
2.32.0


WARNING: multiple messages have this Message-ID (diff)
From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
To: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
	"Rob Herring" <robh+dt@kernel.org>,
	"Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>,
	"Benoît Cousson" <bcousson@baylibre.com>,
	"Tony Lindgren" <tony@atomide.com>,
	"Sekhar Nori" <nsekhar@ti.com>,
	"Bartosz Golaszewski" <brgl@bgdev.pl>,
	"Vinod Koul" <vkoul@kernel.org>,
	linux-usb@vger.kernel.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org, dmaengine@vger.kernel.org
Cc: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Subject: [PATCH v2 3/6] dmaengine: ti: deprecate '#dma-channels'
Date: Wed, 27 Apr 2022 18:11:23 +0200	[thread overview]
Message-ID: <20220427161126.647073-4-krzysztof.kozlowski@linaro.org> (raw)
In-Reply-To: <20220427161126.647073-1-krzysztof.kozlowski@linaro.org>

The generic property, used in most of the drivers and defined in generic
dma-common DT bindings, is 'dma-channels'.  Switch to new property while
keeping backward compatibility.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 drivers/dma/ti/cppi41.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/dma/ti/cppi41.c b/drivers/dma/ti/cppi41.c
index 062bd9bd4de0..695915dba707 100644
--- a/drivers/dma/ti/cppi41.c
+++ b/drivers/dma/ti/cppi41.c
@@ -1105,8 +1105,12 @@ static int cppi41_dma_probe(struct platform_device *pdev)
 	cdd->qmgr_num_pend = glue_info->qmgr_num_pend;
 	cdd->first_completion_queue = glue_info->first_completion_queue;
 
+	/* Parse new and deprecated dma-channels properties */
 	ret = of_property_read_u32(dev->of_node,
-				   "#dma-channels", &cdd->n_chans);
+				   "dma-channels", &cdd->n_chans);
+	if (ret)
+		ret = of_property_read_u32(dev->of_node,
+					   "#dma-channels", &cdd->n_chans);
 	if (ret)
 		goto err_get_n_chans;
 
-- 
2.32.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2022-04-27 16:13 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-27 16:11 [PATCH v2 0/6] dmaengine/ARM: use proper 'dma-channels/requests' properties Krzysztof Kozlowski
2022-04-27 16:11 ` Krzysztof Kozlowski
2022-04-27 16:11 ` [PATCH v2 1/6] dt-bindings: usb: am33xx-usb: deprecate '#dma-channels' Krzysztof Kozlowski
2022-04-27 16:11   ` Krzysztof Kozlowski
2022-04-27 18:20   ` Rob Herring
2022-04-27 18:20     ` Rob Herring
2022-04-27 16:11 ` [PATCH v2 2/6] dt-bindings: usb: da8xx-usb: " Krzysztof Kozlowski
2022-04-27 16:11   ` Krzysztof Kozlowski
2022-04-27 18:21   ` Rob Herring
2022-04-27 18:21     ` Rob Herring
2022-04-27 16:11 ` Krzysztof Kozlowski [this message]
2022-04-27 16:11   ` [PATCH v2 3/6] dmaengine: ti: " Krzysztof Kozlowski
2022-04-28  7:31   ` Tony Lindgren
2022-04-28  7:31     ` Tony Lindgren
2022-05-19 17:28   ` Vinod Koul
2022-05-19 17:28     ` Vinod Koul
2022-04-27 16:11 ` [PATCH v2 4/6] ARM: dts: am33xx: use new 'dma-channels/requests' properties Krzysztof Kozlowski
2022-04-27 16:11   ` Krzysztof Kozlowski
2022-04-27 18:20   ` Rob Herring
2022-04-27 18:20     ` Rob Herring
2022-04-27 19:26     ` Krzysztof Kozlowski
2022-04-27 19:26       ` Krzysztof Kozlowski
2022-04-28  7:30       ` Tony Lindgren
2022-04-28  7:30         ` Tony Lindgren
2022-04-28  7:33         ` Krzysztof Kozlowski
2022-04-28  7:33           ` Krzysztof Kozlowski
2022-04-27 16:13 ` [PATCH v2 5/6] ARM: dts: da850: use new 'dma-channels' property Krzysztof Kozlowski
2022-04-27 16:13   ` Krzysztof Kozlowski
2022-04-27 16:13 ` [PATCH v2 6/6] ARM: dts: dm81xx: use new 'dma-channels/requests' properties Krzysztof Kozlowski
2022-04-27 16:13   ` Krzysztof Kozlowski

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=20220427161126.647073-4-krzysztof.kozlowski@linaro.org \
    --to=krzysztof.kozlowski@linaro.org \
    --cc=bcousson@baylibre.com \
    --cc=brgl@bgdev.pl \
    --cc=devicetree@vger.kernel.org \
    --cc=dmaengine@vger.kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=nsekhar@ti.com \
    --cc=robh+dt@kernel.org \
    --cc=tony@atomide.com \
    --cc=vkoul@kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.