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

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / 512x / mpc5121_ads.c

diff --git a/arch/powerpc/platforms/512x/mpc5121_ads.c b/arch/powerpc/platforms/512x/mpc5121_ads.c
index 3ec9ca34d8e8abe7ba003ef698973bb51c39fe6c..5ebf6939a6975ba593b1d4b1372a5ebd19c68a11 100644 (file)
--- a/arch/powerpc/platforms/512x/mpc5121_ads.c
+++ b/arch/powerpc/platforms/512x/mpc5121_ads.c
@@ -23,10 +23,21 @@
 #include <asm/time.h>
 
 #include "mpc512x.h"
+#include "mpc5121_ads.h"
+
+static void __init mpc5121_ads_setup_arch(void)
+{
+       printk(KERN_INFO "MPC5121 ADS board from Freescale Semiconductor\n");
+       /*
+        * cpld regs are needed early
+        */
+       mpc5121_ads_cpld_map();
+}
 
 static void __init mpc5121_ads_init_IRQ(void)
 {
        mpc512x_init_IRQ();
+       mpc5121_ads_cpld_pic_init();
 }
 
 /*