diff options
author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2010-09-09 19:58:23 +0200 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2010-09-09 20:13:23 +0200 |
commit | 5afddee415c829704d3a91031ae634008bc332e9 (patch) | |
tree | 40dbd82e8596a03a07733ca796442da91ba0844b /arch/arm/mach-at91 | |
parent | 8d2602e0778299e2d6084f03086b716d6e7a1e1e (diff) | |
download | kernel_samsung_crespo-5afddee415c829704d3a91031ae634008bc332e9.zip kernel_samsung_crespo-5afddee415c829704d3a91031ae634008bc332e9.tar.gz kernel_samsung_crespo-5afddee415c829704d3a91031ae634008bc332e9.tar.bz2 |
AT91: clock: peripheral clocks can have other parent than mck
While registering clock allow to set parent clock other
than mck. It is useful for clocks than can be seen as
child clock of a peripheral.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Andrew Victor <linux@maxim.org.za>
Diffstat (limited to 'arch/arm/mach-at91')
-rw-r--r-- | arch/arm/mach-at91/clock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c index 7f7da43..7525cee 100644 --- a/arch/arm/mach-at91/clock.c +++ b/arch/arm/mach-at91/clock.c @@ -501,7 +501,8 @@ postcore_initcall(at91_clk_debugfs_init); int __init clk_register(struct clk *clk) { if (clk_is_peripheral(clk)) { - clk->parent = &mck; + if (!clk->parent) + clk->parent = &mck; clk->mode = pmc_periph_mode; list_add_tail(&clk->node, &clocks); } |