This is a note to let you know that I've just added the patch titled
clk: clocking-wizard: Rename nr-outputs to xlnx,nr-outputs
to the 5.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
clk-clocking-wizard-rename-nr-outputs-to-xlnx-nr-out.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit dffa103f0b6b7b25e958cf2f0c71cb9096d7dfed
Author: Shubhrajyoti Datta <shubhrajyoti.datta@xxxxxxxxxx>
Date: Mon Apr 11 15:34:41 2022 +0530
clk: clocking-wizard: Rename nr-outputs to xlnx,nr-outputs
[ Upstream commit 787ddddcbc43ab158cc15c36986c2c64b6fc84aa ]
Rename nr-outputs to xlnx,output.
Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20220411100443.15132-4-shubhrajyoti.datta@xxxxxxxxxx
Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Stephen Boyd <sboyd@xxxxxxxxxx>
Stable-dep-of: b1356ed1a446 ("clk: clocking-wizard: check return value of devm_kasprintf()")
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c b/drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c
index 8c1934df70dea..e5c5a7c25bbc9 100644
--- a/drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c
+++ b/drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c
@@ -479,7 +479,7 @@ static int clk_wzrd_probe(struct platform_device *pdev)
goto err_disable_clk;
}
- ret = of_property_read_u32(np, "nr-outputs", &nr_outputs);
+ ret = of_property_read_u32(np, "xlnx,nr-outputs", &nr_outputs);
if (ret || nr_outputs > WZRD_NUM_OUTPUTS) {
ret = -EINVAL;
goto err_disable_clk;
