git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'sh/serial-rework' and 'sh/oprofile'
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
colibri.c
diff --git
a/arch/arm/mach-pxa/colibri.c
b/arch/arm/mach-pxa/colibri.c
index
abce13c
..
e847362
100644
(file)
--- 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 <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"
#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
*/
/*
* Flash
*/
@@
-116,9
+121,7
@@
static struct platform_device *colibri_devices[] __initdata = {
static void __init colibri_init(void)
{
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));
}
platform_add_devices(colibri_devices, ARRAY_SIZE(colibri_devices));
}