[ARM] pxa: move common MFP handling code into plat-pxa

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-pxa / pxa930.c

diff --git a/arch/arm/mach-pxa/pxa930.c b/arch/arm/mach-pxa/pxa930.c
index f15dfa55f27f688cb434de31460e3cd7e649266a..71131742fffd69e3eff53022e46c53a2e8c94610 100644 (file)
--- 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;