Merge branch 'integration' into for-linus

[pandora-kernel.git] / arch / arm / mach-kirkwood / mpp.c

diff --git a/arch/arm/mach-kirkwood/mpp.c b/arch/arm/mach-kirkwood/mpp.c
index 7ce2018..b0a7d97 100644 (file)
--- a/arch/arm/mach-kirkwood/mpp.c
+++ b/arch/arm/mach-kirkwood/mpp.c
@@ -14,6 +14,7 @@
 #include <linux/io.h>
 #include <asm/gpio.h>
 #include <mach/hardware.h>
+#include <plat/mpp.h>
 #include "common.h"
 #include "mpp.h"
 
@@ -36,61 +37,8 @@ static unsigned int __init kirkwood_variant(void)
        return 0;
 }
 
-#define MPP_CTRL(i)    (DEV_BUS_VIRT_BASE + (i) * 4)
-#define MPP_NR_REGS    (1 + MPP_MAX/8)
-
 void __init kirkwood_mpp_conf(unsigned int *mpp_list)
 {
-       u32 mpp_ctrl[MPP_NR_REGS];
-       unsigned int variant_mask;
-       int i;
-
-       variant_mask = kirkwood_variant();
-       if (!variant_mask)
-               return;
-
-       printk(KERN_DEBUG "initial MPP regs:");
-       for (i = 0; i < MPP_NR_REGS; i++) {
-               mpp_ctrl[i] = readl(MPP_CTRL(i));
-               printk(" %08x", mpp_ctrl[i]);
-       }
-       printk("\n");
-
-       for ( ; *mpp_list; mpp_list++) {
-               unsigned int num = MPP_NUM(*mpp_list);
-               unsigned int sel = MPP_SEL(*mpp_list);
-               int shift, gpio_mode;
-
-               if (num > MPP_MAX) {
-                       printk(KERN_ERR "kirkwood_mpp_conf: invalid MPP "
-                                       "number (%u)\n", num);
-                       continue;
-               }
-               if (!(*mpp_list & variant_mask)) {
-                       printk(KERN_WARNING
-                              "kirkwood_mpp_conf: requested MPP%u config "
-                              "unavailable on this hardware\n", num);
-                       continue;
-               }
-
-               shift = (num & 7) << 2;
-               mpp_ctrl[num / 8] &= ~(0xf << shift);
-               mpp_ctrl[num / 8] |= sel << shift;
-
-               gpio_mode = 0;
-               if (*mpp_list & MPP_INPUT_MASK)
-                       gpio_mode |= GPIO_INPUT_OK;
-               if (*mpp_list & MPP_OUTPUT_MASK)
-                       gpio_mode |= GPIO_OUTPUT_OK;
-               if (sel != 0)
-                       gpio_mode = 0;
-               orion_gpio_set_valid(num, gpio_mode);
-       }
-
-       printk(KERN_DEBUG "  final MPP regs:");
-       for (i = 0; i < MPP_NR_REGS; i++) {
-               writel(mpp_ctrl[i], MPP_CTRL(i));
-               printk(" %08x", mpp_ctrl[i]);
-       }
-       printk("\n");
+       orion_mpp_conf(mpp_list, kirkwood_variant(),
+                      MPP_MAX, DEV_BUS_VIRT_BASE);
 }