Skip to content

Commit

Permalink
clk: at91: sama7g5: fix compilation error
Browse files Browse the repository at this point in the history
[ Upstream commit 9127449 ]

pmc_data_allocate() has been changed. pmc_data_free() was removed.
Adapt the code taking this into consideration. With this the programmable
clocks were also saved in sama7g5_pmc so that they could be later
referenced.

Fixes: cb783bb ("clk: at91: sama7g5: add clock support for sama7g5")
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Tested-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Link: https://lore.kernel.org/r/1605800597-16720-2-git-send-email-claudiu.beznea@microchip.com
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
claudiubeznea authored and gregkh committed Dec 30, 2020
1 parent 4713787 commit fcf9b5f
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/clk/at91/sama7g5.c
Expand Up @@ -838,7 +838,7 @@ static void __init sama7g5_pmc_setup(struct device_node *np)
sama7g5_pmc = pmc_data_allocate(PMC_I2S1_MUX + 1,
nck(sama7g5_systemck),
nck(sama7g5_periphck),
nck(sama7g5_gck));
nck(sama7g5_gck), 8);
if (!sama7g5_pmc)
return;

Expand Down Expand Up @@ -980,6 +980,8 @@ static void __init sama7g5_pmc_setup(struct device_node *np)
sama7g5_prog_mux_table);
if (IS_ERR(hw))
goto err_free;

sama7g5_pmc->pchws[i] = hw;
}

for (i = 0; i < ARRAY_SIZE(sama7g5_systemck); i++) {
Expand Down Expand Up @@ -1052,7 +1054,7 @@ static void __init sama7g5_pmc_setup(struct device_node *np)
kfree(alloc_mem);
}

pmc_data_free(sama7g5_pmc);
kfree(sama7g5_pmc);
}

/* Some clks are used for a clocksource */
Expand Down

0 comments on commit fcf9b5f

Please sign in to comment.