static void __init pxa25x_register_core(void)
 {
-       clk_register_clk_pxa25x_cpll();
-       clk_register_clk_pxa25x_run();
+       clkdev_pxa_register(CLK_NONE, "cpll", NULL,
+                           clk_register_clk_pxa25x_cpll());
+       clkdev_pxa_register(CLK_NONE, "run", NULL,
+                           clk_register_clk_pxa25x_run());
        clkdev_pxa_register(CLK_CORE, "core", NULL,
                            clk_register_clk_pxa25x_core());
 }
 {
        pxa25x_register_plls();
        pxa25x_register_core();
-       clk_register_clk_pxa25x_memory();
+       clkdev_pxa_register(CLK_NONE, "system_bus", NULL,
+                           clk_register_clk_pxa25x_memory());
 }
 
 #define DUMMY_CLK(_con_id, _dev_id, _parent) \
 
 
 static void __init pxa27x_register_core(void)
 {
-       clk_register_clk_pxa27x_cpll();
-       clk_register_clk_pxa27x_run();
-
+       clkdev_pxa_register(CLK_NONE, "cpll", NULL,
+                           clk_register_clk_pxa27x_cpll());
+       clkdev_pxa_register(CLK_NONE, "run", NULL,
+                           clk_register_clk_pxa27x_run());
        clkdev_pxa_register(CLK_CORE, "core", NULL,
                            clk_register_clk_pxa27x_core());
 }
 {
        pxa27x_register_plls();
        pxa27x_register_core();
-       clk_register_clk_pxa27x_system_bus();
-       clk_register_clk_pxa27x_memory();
+       clkdev_pxa_register(CLK_NONE, "system_bus", NULL,
+                           clk_register_clk_pxa27x_system_bus());
+       clkdev_pxa_register(CLK_NONE, "memory", NULL,
+                           clk_register_clk_pxa27x_memory());
        clk_register_clk_pxa27x_lcd_base();
 }