diff options
author | Eric Miao <eric.miao@marvell.com> | 2009-01-15 03:42:56 -0500 |
---|---|---|
committer | Eric Miao <eric.miao@marvell.com> | 2009-03-22 22:11:34 -0400 |
commit | f8dec04d33b94a4cfa9358fd9666c01480bb164d (patch) | |
tree | bcf82252230a757f26d6de980749b9e4395cd8b9 /arch/arm/mach-pxa/pxa930.c | |
parent | 38f539a608c9a3b40b30f1892bd5f9a38f4e5ffe (diff) |
[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.c | 6 |
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 @@ | |||
18 | 18 | ||
19 | #include <mach/pxa930.h> | 19 | #include <mach/pxa930.h> |
20 | 20 | ||
21 | static struct pxa3xx_mfp_addr_map pxa930_mfp_addr_map[] __initdata = { | 21 | static struct mfp_addr_map pxa930_mfp_addr_map[] __initdata = { |
22 | 22 | ||
23 | MFP_ADDR(GPIO0, 0x02e0), | 23 | MFP_ADDR(GPIO0, 0x02e0), |
24 | MFP_ADDR(GPIO1, 0x02dc), | 24 | MFP_ADDR(GPIO1, 0x02dc), |
@@ -179,8 +179,8 @@ static struct pxa3xx_mfp_addr_map pxa930_mfp_addr_map[] __initdata = { | |||
179 | static int __init pxa930_init(void) | 179 | static int __init pxa930_init(void) |
180 | { | 180 | { |
181 | if (cpu_is_pxa930()) { | 181 | if (cpu_is_pxa930()) { |
182 | pxa3xx_init_mfp(); | 182 | mfp_init_base(io_p2v(MFPR_BASE)); |
183 | pxa3xx_mfp_init_addr(pxa930_mfp_addr_map); | 183 | mfp_init_addr(pxa930_mfp_addr_map); |
184 | } | 184 | } |
185 | 185 | ||
186 | return 0; | 186 | return 0; |