]> git.baikalelectronics.ru Git - kernel.git/commitdiff
clk: at91: sama7g5: fix compilation error
authorClaudiu Beznea <claudiu.beznea@microchip.com>
Thu, 19 Nov 2020 15:43:07 +0000 (17:43 +0200)
committerStephen Boyd <sboyd@kernel.org>
Sat, 19 Dec 2020 19:50:55 +0000 (11:50 -0800)
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: cb783bbbcf54 ("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>
drivers/clk/at91/sama7g5.c

index 0db2ab3eca147a5617376e91523c1c8f3451f34a..a092a940baa40bc857ff5f26d3bd1d07c4f06ec8 100644 (file)
@@ -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;
 
@@ -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++) {
@@ -1052,7 +1054,7 @@ err_free:
                kfree(alloc_mem);
        }
 
-       pmc_data_free(sama7g5_pmc);
+       kfree(sama7g5_pmc);
 }
 
 /* Some clks are used for a clocksource */