Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[linux-2.6] / arch / arm / mach-pnx4008 / clock.c

diff --git a/arch/arm/mach-pnx4008/clock.c b/arch/arm/mach-pnx4008/clock.c
index f582ed2ec43c615cbbc10c8812b3b423ef7f2096..a5268c3ac5a75332bf96cdb34887b69688c1ab93 100644 (file)
--- a/arch/arm/mach-pnx4008/clock.c
+++ b/arch/arm/mach-pnx4008/clock.c
@@ -21,7 +21,6 @@
 #include <linux/err.h>
 #include <linux/delay.h>
 
-#include <asm/semaphore.h>
 #include <asm/hardware.h>
 #include <asm/io.h>
 
@@ -735,6 +734,16 @@ static struct clk uart6_ck = {
        .enable_reg = UARTCLKCTRL_REG,
 };
 
+static struct clk wdt_ck = {
+       .name = "wdt_ck",
+       .parent = &per_ck,
+       .flags = NEEDS_INITIALIZATION,
+       .round_rate = &on_off_round_rate,
+       .set_rate = &on_off_set_rate,
+       .enable_shift = 0,
+       .enable_reg = TIMCLKCTRL_REG,
+};
+
 /* These clocks are visible outside this module
  * and can be initialized
  */
@@ -765,6 +774,7 @@ static struct clk *onchip_clks[] = {
        &uart4_ck,
        &uart5_ck,
        &uart6_ck,
+       &wdt_ck,
 };
 
 static int local_clk_enable(struct clk *clk)
@@ -965,7 +975,7 @@ static int __init clk_init(void)
                                (*clkp)->set_parent((*clkp), (*clkp)->parent);
                }
                pr_debug("%s: clock %s, rate %ld\n",
-                       __FUNCTION__, (*clkp)->name, (*clkp)->rate);
+                       __func__, (*clkp)->name, (*clkp)->rate);
        }
 
        local_clk_use(&ck_pll4);