diff options
author | Eric Miao <eric.y.miao@gmail.com> | 2010-07-15 05:50:13 -0400 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2010-08-05 02:34:45 -0400 |
commit | 8022887cda044524610ef2a5a45feb9d96b11b4f (patch) | |
tree | f4b8815dfcbe1ecbe83a2a1fb226054aeeba8d92 | |
parent | 4b37cd335b56737d58befca663d03965a6cedebf (diff) |
[ARM] mmp: rename pxa_map_io() to mmp_map_io()
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
-rw-r--r-- | arch/arm/mach-mmp/aspenite.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-mmp/avengers_lite.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-mmp/common.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-mmp/common.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-mmp/flint.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-mmp/jasper.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-mmp/tavorevb.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-mmp/ttc_dkb.c | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-mmp/aspenite.c b/arch/arm/mach-mmp/aspenite.c index 1721c540ea2b..0629394a5fb9 100644 --- a/arch/arm/mach-mmp/aspenite.c +++ b/arch/arm/mach-mmp/aspenite.c | |||
@@ -151,7 +151,7 @@ static void __init common_init(void) | |||
151 | MACHINE_START(ASPENITE, "PXA168-based Aspenite Development Platform") | 151 | MACHINE_START(ASPENITE, "PXA168-based Aspenite Development Platform") |
152 | .phys_io = APB_PHYS_BASE, | 152 | .phys_io = APB_PHYS_BASE, |
153 | .io_pg_offst = (APB_VIRT_BASE >> 18) & 0xfffc, | 153 | .io_pg_offst = (APB_VIRT_BASE >> 18) & 0xfffc, |
154 | .map_io = pxa_map_io, | 154 | .map_io = mmp_map_io, |
155 | .init_irq = pxa168_init_irq, | 155 | .init_irq = pxa168_init_irq, |
156 | .timer = &pxa168_timer, | 156 | .timer = &pxa168_timer, |
157 | .init_machine = common_init, | 157 | .init_machine = common_init, |
@@ -160,7 +160,7 @@ MACHINE_END | |||
160 | MACHINE_START(ZYLONITE2, "PXA168-based Zylonite2 Development Platform") | 160 | MACHINE_START(ZYLONITE2, "PXA168-based Zylonite2 Development Platform") |
161 | .phys_io = APB_PHYS_BASE, | 161 | .phys_io = APB_PHYS_BASE, |
162 | .io_pg_offst = (APB_VIRT_BASE >> 18) & 0xfffc, | 162 | .io_pg_offst = (APB_VIRT_BASE >> 18) & 0xfffc, |
163 | .map_io = pxa_map_io, | 163 | .map_io = mmp_map_io, |
164 | .init_irq = pxa168_init_irq, | 164 | .init_irq = pxa168_init_irq, |
165 | .timer = &pxa168_timer, | 165 | .timer = &pxa168_timer, |
166 | .init_machine = common_init, | 166 | .init_machine = common_init, |
diff --git a/arch/arm/mach-mmp/avengers_lite.c b/arch/arm/mach-mmp/avengers_lite.c index 2906c9ee9de3..69bcba11f53f 100644 --- a/arch/arm/mach-mmp/avengers_lite.c +++ b/arch/arm/mach-mmp/avengers_lite.c | |||
@@ -43,7 +43,7 @@ static void __init avengers_lite_init(void) | |||
43 | MACHINE_START(AVENGERS_LITE, "PXA168 Avengers lite Development Platform") | 43 | MACHINE_START(AVENGERS_LITE, "PXA168 Avengers lite Development Platform") |
44 | .phys_io = APB_PHYS_BASE, | 44 | .phys_io = APB_PHYS_BASE, |
45 | .io_pg_offst = (APB_VIRT_BASE >> 18) & 0xfffc, | 45 | .io_pg_offst = (APB_VIRT_BASE >> 18) & 0xfffc, |
46 | .map_io = pxa_map_io, | 46 | .map_io = mmp_map_io, |
47 | .init_irq = pxa168_init_irq, | 47 | .init_irq = pxa168_init_irq, |
48 | .timer = &pxa168_timer, | 48 | .timer = &pxa168_timer, |
49 | .init_machine = avengers_lite_init, | 49 | .init_machine = avengers_lite_init, |
diff --git a/arch/arm/mach-mmp/common.c b/arch/arm/mach-mmp/common.c index e1e66c18b446..3b29fa7e9b08 100644 --- a/arch/arm/mach-mmp/common.c +++ b/arch/arm/mach-mmp/common.c | |||
@@ -31,7 +31,7 @@ static struct map_desc standard_io_desc[] __initdata = { | |||
31 | }, | 31 | }, |
32 | }; | 32 | }; |
33 | 33 | ||
34 | void __init pxa_map_io(void) | 34 | void __init mmp_map_io(void) |
35 | { | 35 | { |
36 | iotable_init(standard_io_desc, ARRAY_SIZE(standard_io_desc)); | 36 | iotable_init(standard_io_desc, ARRAY_SIZE(standard_io_desc)); |
37 | } | 37 | } |
diff --git a/arch/arm/mach-mmp/common.h b/arch/arm/mach-mmp/common.h index b4a0ba05a0f4..96961750aa9b 100644 --- a/arch/arm/mach-mmp/common.h +++ b/arch/arm/mach-mmp/common.h | |||
@@ -14,4 +14,4 @@ extern void __init mmp2_init_icu(void); | |||
14 | extern void __init mmp2_init_irq(void); | 14 | extern void __init mmp2_init_irq(void); |
15 | 15 | ||
16 | extern void __init icu_init_irq(void); | 16 | extern void __init icu_init_irq(void); |
17 | extern void __init pxa_map_io(void); | 17 | extern void __init mmp_map_io(void); |
diff --git a/arch/arm/mach-mmp/flint.c b/arch/arm/mach-mmp/flint.c index e77bb0a63b42..e4312d238eae 100644 --- a/arch/arm/mach-mmp/flint.c +++ b/arch/arm/mach-mmp/flint.c | |||
@@ -115,7 +115,7 @@ static void __init flint_init(void) | |||
115 | MACHINE_START(FLINT, "Flint Development Platform") | 115 | MACHINE_START(FLINT, "Flint Development Platform") |
116 | .phys_io = APB_PHYS_BASE, | 116 | .phys_io = APB_PHYS_BASE, |
117 | .io_pg_offst = (APB_VIRT_BASE >> 18) & 0xfffc, | 117 | .io_pg_offst = (APB_VIRT_BASE >> 18) & 0xfffc, |
118 | .map_io = pxa_map_io, | 118 | .map_io = mmp_map_io, |
119 | .init_irq = mmp2_init_irq, | 119 | .init_irq = mmp2_init_irq, |
120 | .timer = &mmp2_timer, | 120 | .timer = &mmp2_timer, |
121 | .init_machine = flint_init, | 121 | .init_machine = flint_init, |
diff --git a/arch/arm/mach-mmp/jasper.c b/arch/arm/mach-mmp/jasper.c index 8e2b1710cc2c..80c3e7ab1e17 100644 --- a/arch/arm/mach-mmp/jasper.c +++ b/arch/arm/mach-mmp/jasper.c | |||
@@ -136,7 +136,7 @@ static void __init jasper_init(void) | |||
136 | MACHINE_START(MARVELL_JASPER, "Jasper Development Platform") | 136 | MACHINE_START(MARVELL_JASPER, "Jasper Development Platform") |
137 | .phys_io = APB_PHYS_BASE, | 137 | .phys_io = APB_PHYS_BASE, |
138 | .io_pg_offst = (APB_VIRT_BASE >> 18) & 0xfffc, | 138 | .io_pg_offst = (APB_VIRT_BASE >> 18) & 0xfffc, |
139 | .map_io = pxa_map_io, | 139 | .map_io = mmp_map_io, |
140 | .init_irq = mmp2_init_irq, | 140 | .init_irq = mmp2_init_irq, |
141 | .timer = &mmp2_timer, | 141 | .timer = &mmp2_timer, |
142 | .init_machine = jasper_init, | 142 | .init_machine = jasper_init, |
diff --git a/arch/arm/mach-mmp/tavorevb.c b/arch/arm/mach-mmp/tavorevb.c index b8b38aaf44be..e81db7428215 100644 --- a/arch/arm/mach-mmp/tavorevb.c +++ b/arch/arm/mach-mmp/tavorevb.c | |||
@@ -101,7 +101,7 @@ static void __init tavorevb_init(void) | |||
101 | MACHINE_START(TAVOREVB, "PXA910 Evaluation Board (aka TavorEVB)") | 101 | MACHINE_START(TAVOREVB, "PXA910 Evaluation Board (aka TavorEVB)") |
102 | .phys_io = APB_PHYS_BASE, | 102 | .phys_io = APB_PHYS_BASE, |
103 | .io_pg_offst = (APB_VIRT_BASE >> 18) & 0xfffc, | 103 | .io_pg_offst = (APB_VIRT_BASE >> 18) & 0xfffc, |
104 | .map_io = pxa_map_io, | 104 | .map_io = mmp_map_io, |
105 | .init_irq = pxa910_init_irq, | 105 | .init_irq = pxa910_init_irq, |
106 | .timer = &pxa910_timer, | 106 | .timer = &pxa910_timer, |
107 | .init_machine = tavorevb_init, | 107 | .init_machine = tavorevb_init, |
diff --git a/arch/arm/mach-mmp/ttc_dkb.c b/arch/arm/mach-mmp/ttc_dkb.c index ba3ce41d240c..ee65e05f0cf1 100644 --- a/arch/arm/mach-mmp/ttc_dkb.c +++ b/arch/arm/mach-mmp/ttc_dkb.c | |||
@@ -124,7 +124,7 @@ static void __init ttc_dkb_init(void) | |||
124 | MACHINE_START(TTC_DKB, "PXA910-based TTC_DKB Development Platform") | 124 | MACHINE_START(TTC_DKB, "PXA910-based TTC_DKB Development Platform") |
125 | .phys_io = APB_PHYS_BASE, | 125 | .phys_io = APB_PHYS_BASE, |
126 | .io_pg_offst = (APB_VIRT_BASE >> 18) & 0xfffc, | 126 | .io_pg_offst = (APB_VIRT_BASE >> 18) & 0xfffc, |
127 | .map_io = pxa_map_io, | 127 | .map_io = mmp_map_io, |
128 | .init_irq = pxa910_init_irq, | 128 | .init_irq = pxa910_init_irq, |
129 | .timer = &pxa910_timer, | 129 | .timer = &pxa910_timer, |
130 | .init_machine = ttc_dkb_init, | 130 | .init_machine = ttc_dkb_init, |