korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-15 00:04:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

staging: clocking-wizard: Remove the hardcoding of the clock outputs

Browse Source 
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>
Link: https://lore.kernel.org/r/1614172241-17326-8-git-send-email-shubhrajyoti.datta@xilinx.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Shubhrajyoti Datta 2021-02-24 18:40:39 +05:30 committed by Greg Kroah-Hartman
parent 91d695d718
commit a0d1a3864c
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c
View File

@ -517,16 +517,15 @@ static int clk_wzrd_probe(struct platform_device *pdev)
} }
/* register div per output */ /* register div per output */
for (i = WZRD_NUM_OUTPUTS - 1; i >= 0 ; i--) { for (i = nr_outputs - 1; i >= 0 ; i--) {
const char *clkout_name; const char *clkout_name;
if (of_property_read_string_index(np, "clock-output-names", i, clkout_name = kasprintf(GFP_KERNEL, "%s_out%d", dev_name(&pdev->dev), i);
&clkout_name)) { if (!clkout_name) {
dev_err(&pdev->dev, ret = -ENOMEM;
"clock output name not specified\n"); goto err_rm_int_clk;
ret = -EINVAL;
goto err_rm_int_clks;
} }
if (!i) if (!i)
clk_wzrd->clkout[i] = clk_wzrd_register_divf clk_wzrd->clkout[i] = clk_wzrd_register_divf
(&pdev->dev, clkout_name, (&pdev->dev, clkout_name,
@ -548,7 +547,7 @@ static int clk_wzrd_probe(struct platform_device *pdev)
if (IS_ERR(clk_wzrd->clkout[i])) { if (IS_ERR(clk_wzrd->clkout[i])) {
int j; int j;
for (j = i + 1; j < WZRD_NUM_OUTPUTS; j++) for (j = i + 1; j < nr_outputs; j++)
clk_unregister(clk_wzrd->clkout[j]); clk_unregister(clk_wzrd->clkout[j]);
dev_err(&pdev->dev, dev_err(&pdev->dev,
"unable to register divider clock\n"); "unable to register divider clock\n");