projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
efb1e0b
97d010d
)
Merge branch 'clk-at91' into clk-next
author
Stephen Boyd
<sboyd@kernel.org>
Fri, 8 Mar 2019 18:29:47 +0000
(10:29 -0800)
committer
Stephen 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
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/clk/at91/sama5d2.c
index
cd0ef72
,
ade0636
..
1f70cb1
---
1
/
drivers/clk/at91/sama5d2.c
---
2
/
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];