summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorIan Molton <spyro@f2s.com>2008-08-09 21:50:28 +0100
committerIan Molton <spyro@f2s.com>2008-08-12 19:13:31 +0100
commit908cbc10135755ea055feaa6a8ec209edfe489be (patch)
treefd14374e37d5409eeb592769a1a00b26bbc23178 /arch
parent2836548826b4187ba770b14d36bc40d52a76b49c (diff)
downloadblackbird-op-linux-908cbc10135755ea055feaa6a8ec209edfe489be.tar.gz
blackbird-op-linux-908cbc10135755ea055feaa6a8ec209edfe489be.zip
[ARM] e400 config use MFP
This patch updates e400 to use the new MFP GPIO setup code. Signed-off-by: Ian Molton <spyro@f2s.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-pxa/eseries.c24
1 files changed, 24 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c
index d27009992510..001a252bd514 100644
--- a/arch/arm/mach-pxa/eseries.c
+++ b/arch/arm/mach-pxa/eseries.c
@@ -61,6 +61,24 @@ static unsigned long e740_pin_config[] __initdata = {
GPIO0_GPIO | WAKEUP_ON_EDGE_RISE,
};
+static unsigned long e400_pin_config[] __initdata = {
+ /* Chip selects */
+ GPIO15_nCS_1, /* CS1 - Flash */
+ GPIO80_nCS_4, /* CS4 - TMIO */
+
+ /* Clocks */
+ GPIO12_32KHz,
+
+ /* BTUART */
+ GPIO42_BTUART_RXD,
+ GPIO43_BTUART_TXD,
+ GPIO44_BTUART_CTS,
+ GPIO45_GPIO, /* Used by TMIO for #SUSPEND */
+
+ /* wakeup */
+ GPIO0_GPIO | WAKEUP_ON_EDGE_RISE,
+};
+
/* Only e800 has 128MB RAM */
static void __init eseries_fixup(struct machine_desc *desc,
struct tag *tags, char **cmdline, struct meminfo *mi)
@@ -79,6 +97,11 @@ static void __init e740_init(void)
pxa2xx_mfp_config(ARRAY_AND_SIZE(e740_pin_config));
}
+static void __init e400_init(void)
+{
+ pxa2xx_mfp_config(ARRAY_AND_SIZE(e400_pin_config));
+}
+
/* e-series machine definitions */
#ifdef CONFIG_MACH_E330
@@ -143,6 +166,7 @@ MACHINE_START(E400, "Toshiba e400")
.map_io = pxa_map_io,
.init_irq = pxa25x_init_irq,
.fixup = eseries_fixup,
+ .init_machine = e400_init,
.timer = &pxa_timer,
MACHINE_END
#endif
OpenPOWER on IntegriCloud