[ARM] pxa/colibri: convert to use new MFP API
authorEric Miao <eric.miao@marvell.com>
Fri, 8 Aug 2008 06:59:03 +0000 (14:59 +0800)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 26 Sep 2008 22:43:21 +0000 (23:43 +0100)
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Cc: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-pxa/colibri.c

index abce13c846c5e4c8315a830df7aa05681d598323..e8473624427eed4ad613466b20398c14fcf062a0 100644 (file)
 #include <asm/mach/irq.h>
 #include <asm/mach/flash.h>
 #include <mach/pxa-regs.h>
-#include <mach/pxa2xx-gpio.h>
+#include <mach/mfp-pxa27x.h>
 #include <mach/colibri.h>
 
 #include "generic.h"
 #include "devices.h"
 
+static unsigned long colibri_pin_config[] __initdata = {
+       GPIO78_nCS_2,   /* Ethernet CS */
+       GPIO114_GPIO,   /* Ethernet IRQ */
+};
+
 /*
  * Flash
  */
@@ -116,9 +121,7 @@ static struct platform_device *colibri_devices[] __initdata = {
 
 static void __init colibri_init(void)
 {
-       /* DM9000 LAN */
-       pxa_gpio_mode(GPIO78_nCS_2_MD);
-       pxa_gpio_mode(GPIO_DM9000 | GPIO_IN);
+       pxa2xx_mfp_config(ARRAY_AND_SIZE(colibri_pin_config));
 
        platform_add_devices(colibri_devices, ARRAY_SIZE(colibri_devices));
 }