Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[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 e484cac750955bbdec66800ab00fb832136dfc81..5a19b9a1457ca3829070faae3d29786fdc0a7067 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/prpmc2800.c
+++ b/arch/powerpc/platforms/embedded6xx/prpmc2800.c
@@ -49,13 +49,13 @@ static void __init prpmc2800_setup_arch(void)
         * ioremap mpp and gpp registers in case they are later
         * needed by prpmc2800_reset_board().
         */
-       np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60-mpp");
+       np = of_find_compatible_node(NULL, NULL, "marvell,mv64360-mpp");
        reg = of_get_property(np, "reg", NULL);
        paddr = of_translate_address(np, reg);
        of_node_put(np);
        mv64x60_mpp_reg_base = ioremap(paddr, reg[1]);
 
-       np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60-gpp");
+       np = of_find_compatible_node(NULL, NULL, "marvell,mv64360-gpp");
        reg = of_get_property(np, "reg", NULL);
        paddr = of_translate_address(np, reg);
        of_node_put(np);
@@ -144,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;
 }