summaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/colibri.c
diff options
context:
space:
mode:
authorEric Miao <eric.miao@marvell.com>2008-08-08 14:59:03 +0800
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-09-26 23:43:21 +0100
commitc0b1541fc7d3969b662f39214c58fe796e9e4a51 (patch)
tree53e4d6450aca8c03d119f30797e6869a413fc5a4 /arch/arm/mach-pxa/colibri.c
parent4a5c5eabd4b2dd437bcb0a8d95b4eb5d38f60e54 (diff)
[ARM] pxa/colibri: convert to use new MFP API
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>
Diffstat (limited to 'arch/arm/mach-pxa/colibri.c')
-rw-r--r--arch/arm/mach-pxa/colibri.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/colibri.c b/arch/arm/mach-pxa/colibri.c
index abce13c846c5..e8473624427e 100644
--- a/arch/arm/mach-pxa/colibri.c
+++ b/arch/arm/mach-pxa/colibri.c
@@ -29,12 +29,17 @@
#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));
}