Merge branch 'clk-at91' into clk-next

[linux-2.6-microblaze.git] / drivers / clk / at91 / sama5d2.c

diff --git a/drivers/clk/at91/sama5d2.c b/drivers/clk/at91/sama5d2.c
index cd0ef72..1f70cb1 100644 (file)
--- a/drivers/clk/at91/sama5d2.c
+++ b/drivers/clk/at91/sama5d2.c
@@ -241,13 +241,14 @@ static void __init sama5d2_pmc_setup(struct device_node *np)
        parent_names[2] = "plladivck";
        parent_names[3] = "utmick";
        parent_names[4] = "masterck";
+       parent_names[5] = "audiopll_pmcck";
        for (i = 0; i < 3; i++) {
                char name[6];
 
                snprintf(name, sizeof(name), "prog%d", i);
 
                hw = at91_clk_register_programmable(regmap, name,
-                                                   parent_names, 5, i,
+                                                   parent_names, 6, i,
                                                    &at91sam9x5_programmable_layout);
                if (IS_ERR(hw))
                        goto err_free;