summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/pxa930.c
diff options
context:
space:
mode:
authorEric Miao <eric.miao@marvell.com>2009-01-15 09:42:56 +0100
committerEric Miao <eric.miao@marvell.com>2009-03-23 03:11:34 +0100
commitf8dec04d33b94a4cfa9358fd9666c01480bb164d (patch)
treebcf82252230a757f26d6de980749b9e4395cd8b9 /arch/arm/mach-pxa/pxa930.c
parent[ARM] pxa: move common GPIO handling code into plat-pxa (diff)
downloadlinux-f8dec04d33b94a4cfa9358fd9666c01480bb164d.tar.xz
linux-f8dec04d33b94a4cfa9358fd9666c01480bb164d.zip
[ARM] pxa: move common MFP handling code into plat-pxa
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa/pxa930.c')
-rw-r--r--arch/arm/mach-pxa/pxa930.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/pxa930.c b/arch/arm/mach-pxa/pxa930.c
index f15dfa55f27f..71131742fffd 100644
--- a/arch/arm/mach-pxa/pxa930.c
+++ b/arch/arm/mach-pxa/pxa930.c
@@ -18,7 +18,7 @@
#include <mach/pxa930.h>
-static struct pxa3xx_mfp_addr_map pxa930_mfp_addr_map[] __initdata = {
+static struct mfp_addr_map pxa930_mfp_addr_map[] __initdata = {
MFP_ADDR(GPIO0, 0x02e0),
MFP_ADDR(GPIO1, 0x02dc),
@@ -179,8 +179,8 @@ static struct pxa3xx_mfp_addr_map pxa930_mfp_addr_map[] __initdata = {
static int __init pxa930_init(void)
{
if (cpu_is_pxa930()) {
- pxa3xx_init_mfp();
- pxa3xx_mfp_init_addr(pxa930_mfp_addr_map);
+ mfp_init_base(io_p2v(MFPR_BASE));
+ mfp_init_addr(pxa930_mfp_addr_map);
}
return 0;