Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...

[linux-drm-fsl-dcu.git] / arch / powerpc / platforms / 52xx / mpc52xx_common.c

diff --git a/arch/powerpc/platforms/52xx/mpc52xx_common.c b/arch/powerpc/platforms/52xx/mpc52xx_common.c
index 8331ff457770dde2063e5571fdae04baba19aaca..2dd415ff55a93bf90eccbf77a288e98f355b0159 100644 (file)
--- a/arch/powerpc/platforms/52xx/mpc52xx_common.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_common.c
@@ -60,7 +60,7 @@ mpc52xx_find_ipb_freq(struct device_node *node)
 
        of_node_get(node);
        while (node) {
-               p_ipb_freq = get_property(node, "bus-frequency", NULL);
+               p_ipb_freq = of_get_property(node, "bus-frequency", NULL);
                if (p_ipb_freq)
                        break;
 
@@ -83,8 +83,8 @@ mpc52xx_setup_cpu(void)
        struct mpc52xx_xlb  __iomem *xlb;
 
        /* Map zones */
-       cdm = mpc52xx_find_and_map("mpc52xx-cdm");
-       xlb = mpc52xx_find_and_map("mpc52xx-xlb");
+       cdm = mpc52xx_find_and_map("mpc5200-cdm");
+       xlb = mpc52xx_find_and_map("mpc5200-xlb");
 
        if (!cdm || !xlb) {
                printk(KERN_ERR __FILE__ ": "
@@ -116,11 +116,12 @@ unmap_regs:
        if (xlb) iounmap(xlb);
 }
 
-static int __init
+void __init
 mpc52xx_declare_of_platform_devices(void)
 {
        /* Find every child of the SOC node and add it to of_platform */
-       return of_platform_bus_probe(NULL, NULL, NULL);
+       if (of_platform_bus_probe(NULL, NULL, NULL))
+               printk(KERN_ERR __FILE__ ": "
+                       "Error while probing of_platform bus\n");
 }
 
-device_initcall(mpc52xx_declare_of_platform_devices);