Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / embedded6xx / prpmc2800.c

diff --git a/arch/powerpc/platforms/embedded6xx/prpmc2800.c b/arch/powerpc/platforms/embedded6xx/prpmc2800.c
index 53420951dc53a52733e4f8c83aea68bf17e5ecc8..653a5eb91c905049610d7168044c26da5f9e642e 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/prpmc2800.c
+++ b/arch/powerpc/platforms/embedded6xx/prpmc2800.c
@@ -44,7 +44,6 @@ static void __init prpmc2800_setup_arch(void)
        struct device_node *np;
        phys_addr_t paddr;
        const unsigned int *reg;
-       const unsigned int *prop;
 
        /*
         * ioremap mpp and gpp registers in case they are later
@@ -62,12 +61,6 @@ static void __init prpmc2800_setup_arch(void)
        of_node_put(np);
        mv64x60_gpp_reg_base = ioremap(paddr, reg[1]);
 
-       np = of_find_node_by_type(NULL, "cpu");
-       prop = of_get_property(np, "clock-frequency", NULL);
-       if (prop)
-               loops_per_jiffy = *prop / HZ;
-       of_node_put(np);
-
 #ifdef CONFIG_PCI
        mv64x60_pci_init();
 #endif
@@ -151,6 +144,7 @@ static int __init prpmc2800_probe(void)
                strncpy(prpmc2800_platform_name, m,
                        min((int)len, PLATFORM_NAME_MAX - 1));
 
+       _set_L2CR(_get_L2CR() | L2CR_L2E);
        return 1;
 }
 
@@ -158,6 +152,7 @@ define_machine(prpmc2800){
        .name                   = prpmc2800_platform_name,
        .probe                  = prpmc2800_probe,
        .setup_arch             = prpmc2800_setup_arch,
+       .init_early             = mv64x60_init_early,
        .show_cpuinfo           = prpmc2800_show_cpuinfo,
        .init_IRQ               = mv64x60_init_irq,
        .get_irq                = mv64x60_get_irq,