OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b0ecf1c
)
clk: at91: sam9x60: fix usb clock parents
author
Claudiu Beznea
<claudiu.beznea@microchip.com>
Fri, 17 Jan 2020 11:36:47 +0000
(13:36 +0200)
committer
Stephen Boyd
<sboyd@kernel.org>
Wed, 12 Feb 2020 23:31:47 +0000
(15:31 -0800)
SAM9X60's USB clock has 3 parents: plla, upll and main_osc.
Fixes:
01e2113de9a5
("clk: at91: add sam9x60 pmc driver")
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Link:
https://lkml.kernel.org/r/1579261009-4573-3-git-send-email-claudiu.beznea@microchip.com
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
drivers/clk/at91/sam9x60.c
patch
|
blob
|
history
diff --git
a/drivers/clk/at91/sam9x60.c
b/drivers/clk/at91/sam9x60.c
index
bacb32c
..
cc19e8f
100644
(file)
--- a/
drivers/clk/at91/sam9x60.c
+++ b/
drivers/clk/at91/sam9x60.c
@@
-234,9
+234,8
@@
static void __init sam9x60_pmc_setup(struct device_node *np)
parent_names[0] = "pllack";
parent_names[1] = "upllck";
- parent_names[2] = "mainck";
- parent_names[3] = "mainck";
- hw = sam9x60_clk_register_usb(regmap, "usbck", parent_names, 4);
+ parent_names[2] = "main_osc";
+ hw = sam9x60_clk_register_usb(regmap, "usbck", parent_names, 3);
if (IS_ERR(hw))
goto err_free;