From: Stephen Boyd <sboyd@kernel.org>
Date: Fri, 8 Mar 2019 18:29:47 +0000 (-0800)
Subject: Merge branch 'clk-at91' into clk-next
X-Git-Tag: v5.4-rc1~1399^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bd5e2ea291a8b34d2ebfbfeff94d4aafe25d37e4;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'clk-at91' into clk-next

* 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
---

bd5e2ea291a8b34d2ebfbfeff94d4aafe25d37e4
diff --cc drivers/clk/at91/sama5d2.c
index cd0ef72,ade0636..1f70cb1
--- a/drivers/clk/at91/sama5d2.c
+++ b/drivers/clk/at91/sama5d2.c
@@@ -240,7 -240,8 +240,8 @@@ 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];