Merge commit 'gcl/next' into next

[deliverable/linux.git] / arch / powerpc / platforms / 52xx / mpc5200_simple.c

diff --git a/arch/powerpc/platforms/52xx/mpc5200_simple.c b/arch/powerpc/platforms/52xx/mpc5200_simple.c
index 754aa932f5958b28e2c1bd2bf81f08e8d9adbc59..c31e5b534f0aab0304a9d8dee70b5730dd8e5f81 100644 (file)
--- a/arch/powerpc/platforms/52xx/mpc5200_simple.c
+++ b/arch/powerpc/platforms/52xx/mpc5200_simple.c
@@ -39,17 +39,20 @@ static void __init mpc5200_simple_setup_arch(void)
        if (ppc_md.progress)
                ppc_md.progress("mpc5200_simple_setup_arch()", 0);
 
+       /* Map important registers from the internal memory map */
+       mpc52xx_map_common_devices();
+
        /* Some mpc5200 & mpc5200b related configuration */
        mpc5200_setup_xlb_arbiter();
 
-       /* Map wdt for mpc52xx_restart() */
-       mpc52xx_map_wdt();
-
        mpc52xx_setup_pci();
 }
 
 /* list of the supported boards */
 static char *board[] __initdata = {
+       "intercontrol,digsy-mtc",
+       "phytec,pcm030",
+       "phytec,pcm032",
        "promess,motionpro",
        "schindler,cm5200",
        "tqc,tqm5200",