]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
AT91: clock: peripheral clocks can have other parent than mck
authorNicolas Ferre <nicolas.ferre@atmel.com>
Thu, 9 Sep 2010 17:58:23 +0000 (19:58 +0200)
committerNicolas Ferre <nicolas.ferre@atmel.com>
Thu, 9 Sep 2010 18:13:23 +0000 (20:13 +0200)
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>
arch/arm/mach-at91/clock.c

index 7f7da439341fabc4e85b6febeb8b1f3e2cd6f4ee..7525cee3983f7252fac0542be5955a490ca6869b 100644 (file)
@@ -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);
        }