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

[linux-drm-fsl-dcu.git] / arch / powerpc / platforms / 86xx / mpc86xx_hpcn.c

diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index f4dd5f2f8a28f262911afba39eb20016784432ab..3d3d98f5bd4acb4e7b4585bb73d36dd62c40615a 100644 (file)
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -18,7 +18,6 @@
 #include <linux/kdev_t.h>
 #include <linux/delay.h>
 #include <linux/seq_file.h>
-#include <linux/root_dev.h>
 
 #include <asm/system.h>
 #include <asm/time.h>
@@ -120,6 +119,8 @@ mpc86xx_hpcn_init_irq(void)
        DBG("mpc86xxhpcn: cascade mapped to irq %d\n", cascade_irq);
 
        i8259_init(cascade_node, 0);
+       of_node_put(cascade_node);
+
        set_irq_chained_handler(cascade_irq, mpc86xx_8259_cascade);
 #endif
 }
@@ -348,7 +349,7 @@ mpc86xx_hpcn_setup_arch(void)
        if (np != 0) {
                const unsigned int *fp;
 
-               fp = get_property(np, "clock-frequency", NULL);
+               fp = of_get_property(np, "clock-frequency", NULL);
                if (fp != 0)
                        loops_per_jiffy = *fp / HZ;
                else
@@ -365,12 +366,6 @@ mpc86xx_hpcn_setup_arch(void)
 
        printk("MPC86xx HPCN board from Freescale Semiconductor\n");
 
-#ifdef  CONFIG_ROOT_NFS
-       ROOT_DEV = Root_NFS;
-#else
-       ROOT_DEV = Root_HDA1;
-#endif
-
 #ifdef CONFIG_SMP
        mpc86xx_smp_init();
 #endif
@@ -389,7 +384,7 @@ mpc86xx_hpcn_show_cpuinfo(struct seq_file *m)
 
        root = of_find_node_by_path("/");
        if (root)
-               model = get_property(root, "model", NULL);
+               model = of_get_property(root, "model", NULL);
        seq_printf(m, "Machine\t\t: %s\n", model);
        of_node_put(root);