All of lore.kernel.org
 help / color / mirror / Atom feed
From: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
To: <linux-clk@vger.kernel.org>
Cc: <git@xilinx.com>, <devicetree@vger.kernel.org>,
	<mturquette@baylibre.com>, <sboyd@kernel.org>,
	<gregkh@linuxfoundation.org>, <devel@driverdev.osuosl.org>,
	Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
Subject: [PATCH v7 6/7] clk: clock-wizard: Remove the hardcoding of the clock outputs
Date: Wed, 4 Nov 2020 20:36:46 +0530	[thread overview]
Message-ID: <1604502407-14352-7-git-send-email-shubhrajyoti.datta@xilinx.com> (raw)
In-Reply-To: <1604502407-14352-1-git-send-email-shubhrajyoti.datta@xilinx.com>

The number of output clocks are configurable in the hardware.
Currently the driver registers the maximum number of outputs.
Fix the same by registering only the outputs that are there.

Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
---
v4:
Assign output in this patch

 drivers/clk/clk-xlnx-clock-wizard.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/clk-xlnx-clock-wizard.c b/drivers/clk/clk-xlnx-clock-wizard.c
index ed3b0ef..d403a74 100644
--- a/drivers/clk/clk-xlnx-clock-wizard.c
+++ b/drivers/clk/clk-xlnx-clock-wizard.c
@@ -473,6 +473,7 @@ static int clk_wzrd_probe(struct platform_device *pdev)
 	unsigned long rate;
 	const char *clk_name;
 	struct clk_wzrd *clk_wzrd;
+	int outputs;
 	struct device_node *np = pdev->dev.of_node;
 
 	clk_wzrd = devm_kzalloc(&pdev->dev, sizeof(*clk_wzrd), GFP_KERNEL);
@@ -541,6 +542,7 @@ static int clk_wzrd_probe(struct platform_device *pdev)
 		goto err_disable_clk;
 	}
 
+	outputs = of_property_count_strings(np, "clock-output-names");
 	/* register div */
 	reg = (readl(clk_wzrd->base + WZRD_CLK_CFG_REG(0)) &
 			WZRD_DIVCLK_DIVIDE_MASK) >> WZRD_DIVCLK_DIVIDE_SHIFT;
@@ -562,7 +564,7 @@ static int clk_wzrd_probe(struct platform_device *pdev)
 	}
 
 	/* register div per output */
-	for (i = WZRD_NUM_OUTPUTS - 1; i >= 0 ; i--) {
+	for (i = outputs - 1; i >= 0 ; i--) {
 		const char *clkout_name;
 
 		if (of_property_read_string_index(np, "clock-output-names", i,
@@ -593,7 +595,7 @@ static int clk_wzrd_probe(struct platform_device *pdev)
 		if (IS_ERR(clk_wzrd->clkout[i])) {
 			int j;
 
-			for (j = i + 1; j < WZRD_NUM_OUTPUTS; j++)
+			for (j = i + 1; j < outputs; j++)
 				clk_unregister(clk_wzrd->clkout[j]);
 			dev_err(&pdev->dev,
 				"unable to register divider clock\n");
-- 
2.1.1


WARNING: multiple messages have this Message-ID (diff)
From: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
To: <linux-clk@vger.kernel.org>
Cc: devel@driverdev.osuosl.org, devicetree@vger.kernel.org,
	sboyd@kernel.org, gregkh@linuxfoundation.org,
	mturquette@baylibre.com,
	Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>,
	git@xilinx.com
Subject: [PATCH v7 6/7] clk: clock-wizard: Remove the hardcoding of the clock outputs
Date: Wed, 4 Nov 2020 20:36:46 +0530	[thread overview]
Message-ID: <1604502407-14352-7-git-send-email-shubhrajyoti.datta@xilinx.com> (raw)
In-Reply-To: <1604502407-14352-1-git-send-email-shubhrajyoti.datta@xilinx.com>

The number of output clocks are configurable in the hardware.
Currently the driver registers the maximum number of outputs.
Fix the same by registering only the outputs that are there.

Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
---
v4:
Assign output in this patch

 drivers/clk/clk-xlnx-clock-wizard.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/clk-xlnx-clock-wizard.c b/drivers/clk/clk-xlnx-clock-wizard.c
index ed3b0ef..d403a74 100644
--- a/drivers/clk/clk-xlnx-clock-wizard.c
+++ b/drivers/clk/clk-xlnx-clock-wizard.c
@@ -473,6 +473,7 @@ static int clk_wzrd_probe(struct platform_device *pdev)
 	unsigned long rate;
 	const char *clk_name;
 	struct clk_wzrd *clk_wzrd;
+	int outputs;
 	struct device_node *np = pdev->dev.of_node;
 
 	clk_wzrd = devm_kzalloc(&pdev->dev, sizeof(*clk_wzrd), GFP_KERNEL);
@@ -541,6 +542,7 @@ static int clk_wzrd_probe(struct platform_device *pdev)
 		goto err_disable_clk;
 	}
 
+	outputs = of_property_count_strings(np, "clock-output-names");
 	/* register div */
 	reg = (readl(clk_wzrd->base + WZRD_CLK_CFG_REG(0)) &
 			WZRD_DIVCLK_DIVIDE_MASK) >> WZRD_DIVCLK_DIVIDE_SHIFT;
@@ -562,7 +564,7 @@ static int clk_wzrd_probe(struct platform_device *pdev)
 	}
 
 	/* register div per output */
-	for (i = WZRD_NUM_OUTPUTS - 1; i >= 0 ; i--) {
+	for (i = outputs - 1; i >= 0 ; i--) {
 		const char *clkout_name;
 
 		if (of_property_read_string_index(np, "clock-output-names", i,
@@ -593,7 +595,7 @@ static int clk_wzrd_probe(struct platform_device *pdev)
 		if (IS_ERR(clk_wzrd->clkout[i])) {
 			int j;
 
-			for (j = i + 1; j < WZRD_NUM_OUTPUTS; j++)
+			for (j = i + 1; j < outputs; j++)
 				clk_unregister(clk_wzrd->clkout[j]);
 			dev_err(&pdev->dev,
 				"unable to register divider clock\n");
-- 
2.1.1

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

  parent reply	other threads:[~2020-11-04 15:07 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-04 15:06 [PATCH v7 0/7] clk: clk-wizard: clock-wizard: Driver updates Shubhrajyoti Datta
2020-11-04 15:06 ` Shubhrajyoti Datta
2020-11-04 15:06 ` [PATCH v7 1/7] dt-bindings: add documentation of xilinx clocking wizard Shubhrajyoti Datta
2020-11-04 15:06   ` Shubhrajyoti Datta
2020-11-04 19:11   ` Rob Herring
2020-11-04 19:11     ` Rob Herring
2020-11-04 19:15   ` Rob Herring
2020-11-04 19:15     ` Rob Herring
2020-11-04 15:06 ` [PATCH v7 2/7] clk: clock-wizard: Add the clockwizard to clk directory Shubhrajyoti Datta
2020-11-04 15:06   ` Shubhrajyoti Datta
2020-11-04 15:06 ` [PATCH v7 3/7] clk: clock-wizard: Fix kernel-doc warning Shubhrajyoti Datta
2020-11-04 15:06   ` Shubhrajyoti Datta
2020-11-04 15:06 ` [PATCH v7 4/7] clk: clock-wizard: Add support for dynamic reconfiguration Shubhrajyoti Datta
2020-11-04 15:06   ` Shubhrajyoti Datta
2020-11-04 15:06 ` [PATCH v7 5/7] clk: clock-wizard: Add support for fractional support Shubhrajyoti Datta
2020-11-04 15:06   ` Shubhrajyoti Datta
2020-11-04 15:06 ` Shubhrajyoti Datta [this message]
2020-11-04 15:06   ` [PATCH v7 6/7] clk: clock-wizard: Remove the hardcoding of the clock outputs Shubhrajyoti Datta
2020-11-04 15:06 ` [PATCH v7 7/7] clk: clock-wizard: Update the fixed factor divisors Shubhrajyoti Datta
2020-11-04 15:06   ` Shubhrajyoti Datta
2020-12-13  5:36 ` [PATCH v7 0/7] clk: clk-wizard: clock-wizard: Driver updates Stephen Boyd
2020-12-13  5:36   ` Stephen Boyd
2021-01-21 14:40   ` Michal Simek
2021-01-21 14:40     ` Michal Simek
2020-12-15  9:13 ` Michal Simek
2020-12-15  9:13   ` Michal Simek
2020-12-15 19:10   ` Stephen Boyd
2020-12-15 19:10     ` Stephen Boyd
2021-01-21 14:39 ` Miquel Raynal
2021-01-21 14:39   ` Miquel Raynal
2021-02-12 14:20   ` Michal Simek
2021-02-12 14:20     ` Michal Simek

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=1604502407-14352-7-git-send-email-shubhrajyoti.datta@xilinx.com \
    --to=shubhrajyoti.datta@xilinx.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=devicetree@vger.kernel.org \
    --cc=git@xilinx.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-clk@vger.kernel.org \
    --cc=mturquette@baylibre.com \
    --cc=sboyd@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.