Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[cascardo/linux.git] / drivers / clk / pxa / clk-pxa3xx.c

diff --git a/drivers/clk/pxa/clk-pxa3xx.c b/drivers/clk/pxa/clk-pxa3xx.c
index 4af4eed..42bdaa7 100644 (file)
--- a/drivers/clk/pxa/clk-pxa3xx.c
+++ b/drivers/clk/pxa/clk-pxa3xx.c
@@ -284,15 +284,15 @@ static void __init pxa3xx_register_core(void)
 static void __init pxa3xx_register_plls(void)
 {
        clk_register_fixed_rate(NULL, "osc_13mhz", NULL,
-                               CLK_GET_RATE_NOCACHE | CLK_IS_ROOT,
+                               CLK_GET_RATE_NOCACHE,
                                13 * MHz);
        clk_register_fixed_rate(NULL, "osc_32_768khz", NULL,
-                               CLK_GET_RATE_NOCACHE | CLK_IS_ROOT,
+                               CLK_GET_RATE_NOCACHE,
                                32768);
        clk_register_fixed_rate(NULL, "ring_osc_120mhz", NULL,
-                               CLK_GET_RATE_NOCACHE | CLK_IS_ROOT,
+                               CLK_GET_RATE_NOCACHE,
                                120 * MHz);
-       clk_register_fixed_rate(NULL, "clk_dummy", NULL, CLK_IS_ROOT, 0);
+       clk_register_fixed_rate(NULL, "clk_dummy", NULL, 0, 0);
        clk_register_fixed_factor(NULL, "spll_624mhz", "osc_13mhz", 0, 48, 1);
        clk_register_fixed_factor(NULL, "ring_osc_60mhz", "ring_osc_120mhz",
                                  0, 1, 2);
@@ -334,8 +334,7 @@ static void __init pxa3xx_base_clocks_init(void)
        clk_register_clk_pxa3xx_system_bus();
        clk_register_clk_pxa3xx_ac97();
        clk_register_clk_pxa3xx_smemc();
-       clk_register_gate(NULL, "CLK_POUT", "osc_13mhz", 0,
-                         (void __iomem *)&OSCC, 11, 0, NULL);
+       clk_register_gate(NULL, "CLK_POUT", "osc_13mhz", 0, OSCC, 11, 0, NULL);
        clkdev_pxa_register(CLK_OSTIMER, "OSTIMER0", NULL,
                            clk_register_fixed_factor(NULL, "os-timer0",
                                                      "osc_13mhz", 0, 1, 4));