Merge branch 'clk-at91' into clk-next
authorStephen Boyd <sboyd@kernel.org>
Fri, 8 Mar 2019 18:29:47 +0000 (10:29 -0800)
committerStephen Boyd <sboyd@kernel.org>
Fri, 8 Mar 2019 18:29:47 +0000 (10:29 -0800)
* clk-at91:
  clk: at91: programmable: remove unneeded register read
  clk: at91: optimize clk_round_rate() for AUDIO_PLL
  clk: at91: enable AUDIOPLL as source for PCKx on SAMA5D2

1  2 
drivers/clk/at91/sama5d2.c

index cd0ef7274fdbf1ddab7f167724aa7868a5b92ae0,ade0636225317b3417268ef2020f4885133a843c..1f70cb164b06f310d867d54797dfd0d87be0a1d3
@@@ -240,14 -240,15 +240,15 @@@ static void __init sama5d2_pmc_setup(st
        parent_names[1] = "mainck";
        parent_names[2] = "plladivck";
        parent_names[3] = "utmick";
 -      parent_names[4] = "mck";
 +      parent_names[4] = "masterck";
+       parent_names[5] = "audiopll_pmcck";
        for (i = 0; i < 3; i++) {
                char name[6];
  
                snprintf(name, sizeof(name), "prog%d", i);
  
                hw = at91_clk_register_programmable(regmap, name,
-                                                   parent_names, 5, i,
+                                                   parent_names, 6, i,
                                                    &at91sam9x5_programmable_layout);
                if (IS_ERR(hw))
                        goto err_free;
        parent_names[1] = "mainck";
        parent_names[2] = "plladivck";
        parent_names[3] = "utmick";
 -      parent_names[4] = "mck";
 +      parent_names[4] = "masterck";
        parent_names[5] = "audiopll_pmcck";
        for (i = 0; i < ARRAY_SIZE(sama5d2_gck); i++) {
                hw = at91_clk_register_generated(regmap, &pmc_pcr_lock,