aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mmp
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2010-10-14 22:21:46 -0400
committerNicolas Pitre <nico@fluxnic.net>2010-10-20 00:27:46 -0400
commit6451d7783ba5ff24eb1a544eaa6665b890f30466 (patch)
tree78651bbbed163fe933cd42deabebad682d7c03dc /arch/arm/mach-mmp
parentc293393faa8e11a5a80a9e358718432b8697f451 (diff)
arm: remove machine_desc.io_pg_offst and .phys_io
Since we're now using addruart to establish the debug mapping, we can remove the io_pg_offst and phys_io members of struct machine_desc. The various declarations were removed using the following script: grep -rl MACHINE_START arch/arm | xargs \ sed -i '/MACHINE_START/,/MACHINE_END/ { /\.\(phys_io\|io_pg_offst\)/d }' [ Initial patch was from Jeremy Kerr, example script from Russell King ] Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Eric Miao <eric.miao at canonical.com>
Diffstat (limited to 'arch/arm/mach-mmp')
-rw-r--r--arch/arm/mach-mmp/aspenite.c4
-rw-r--r--arch/arm/mach-mmp/avengers_lite.c2
-rw-r--r--arch/arm/mach-mmp/flint.c2
-rw-r--r--arch/arm/mach-mmp/jasper.c2
-rw-r--r--arch/arm/mach-mmp/tavorevb.c2
-rw-r--r--arch/arm/mach-mmp/teton_bga.c2
-rw-r--r--arch/arm/mach-mmp/ttc_dkb.c2
7 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/mach-mmp/aspenite.c b/arch/arm/mach-mmp/aspenite.c
index 4681bedbe788..06b5fa853c93 100644
--- a/arch/arm/mach-mmp/aspenite.c
+++ b/arch/arm/mach-mmp/aspenite.c
@@ -237,8 +237,6 @@ static void __init common_init(void)
237} 237}
238 238
239MACHINE_START(ASPENITE, "PXA168-based Aspenite Development Platform") 239MACHINE_START(ASPENITE, "PXA168-based Aspenite Development Platform")
240 .phys_io = APB_PHYS_BASE,
241 .io_pg_offst = (APB_VIRT_BASE >> 18) & 0xfffc,
242 .map_io = mmp_map_io, 240 .map_io = mmp_map_io,
243 .nr_irqs = IRQ_BOARD_START, 241 .nr_irqs = IRQ_BOARD_START,
244 .init_irq = pxa168_init_irq, 242 .init_irq = pxa168_init_irq,
@@ -247,8 +245,6 @@ MACHINE_START(ASPENITE, "PXA168-based Aspenite Development Platform")
247MACHINE_END 245MACHINE_END
248 246
249MACHINE_START(ZYLONITE2, "PXA168-based Zylonite2 Development Platform") 247MACHINE_START(ZYLONITE2, "PXA168-based Zylonite2 Development Platform")
250 .phys_io = APB_PHYS_BASE,
251 .io_pg_offst = (APB_VIRT_BASE >> 18) & 0xfffc,
252 .map_io = mmp_map_io, 248 .map_io = mmp_map_io,
253 .nr_irqs = IRQ_BOARD_START, 249 .nr_irqs = IRQ_BOARD_START,
254 .init_irq = pxa168_init_irq, 250 .init_irq = pxa168_init_irq,
diff --git a/arch/arm/mach-mmp/avengers_lite.c b/arch/arm/mach-mmp/avengers_lite.c
index 69bcba11f53f..39f0878d64a0 100644
--- a/arch/arm/mach-mmp/avengers_lite.c
+++ b/arch/arm/mach-mmp/avengers_lite.c
@@ -41,8 +41,6 @@ static void __init avengers_lite_init(void)
41} 41}
42 42
43MACHINE_START(AVENGERS_LITE, "PXA168 Avengers lite Development Platform") 43MACHINE_START(AVENGERS_LITE, "PXA168 Avengers lite Development Platform")
44 .phys_io = APB_PHYS_BASE,
45 .io_pg_offst = (APB_VIRT_BASE >> 18) & 0xfffc,
46 .map_io = mmp_map_io, 44 .map_io = mmp_map_io,
47 .init_irq = pxa168_init_irq, 45 .init_irq = pxa168_init_irq,
48 .timer = &pxa168_timer, 46 .timer = &pxa168_timer,
diff --git a/arch/arm/mach-mmp/flint.c b/arch/arm/mach-mmp/flint.c
index c558425c3613..bdeb6db4d49a 100644
--- a/arch/arm/mach-mmp/flint.c
+++ b/arch/arm/mach-mmp/flint.c
@@ -116,8 +116,6 @@ static void __init flint_init(void)
116} 116}
117 117
118MACHINE_START(FLINT, "Flint Development Platform") 118MACHINE_START(FLINT, "Flint Development Platform")
119 .phys_io = APB_PHYS_BASE,
120 .io_pg_offst = (APB_VIRT_BASE >> 18) & 0xfffc,
121 .map_io = mmp_map_io, 119 .map_io = mmp_map_io,
122 .nr_irqs = FLINT_NR_IRQS, 120 .nr_irqs = FLINT_NR_IRQS,
123 .init_irq = mmp2_init_irq, 121 .init_irq = mmp2_init_irq,
diff --git a/arch/arm/mach-mmp/jasper.c b/arch/arm/mach-mmp/jasper.c
index 940ee03e3682..2a684fa50773 100644
--- a/arch/arm/mach-mmp/jasper.c
+++ b/arch/arm/mach-mmp/jasper.c
@@ -136,8 +136,6 @@ static void __init jasper_init(void)
136} 136}
137 137
138MACHINE_START(MARVELL_JASPER, "Jasper Development Platform") 138MACHINE_START(MARVELL_JASPER, "Jasper Development Platform")
139 .phys_io = APB_PHYS_BASE,
140 .io_pg_offst = (APB_VIRT_BASE >> 18) & 0xfffc,
141 .map_io = mmp_map_io, 139 .map_io = mmp_map_io,
142 .nr_irqs = JASPER_NR_IRQS, 140 .nr_irqs = JASPER_NR_IRQS,
143 .init_irq = mmp2_init_irq, 141 .init_irq = mmp2_init_irq,
diff --git a/arch/arm/mach-mmp/tavorevb.c b/arch/arm/mach-mmp/tavorevb.c
index e81db7428215..c296b75c4453 100644
--- a/arch/arm/mach-mmp/tavorevb.c
+++ b/arch/arm/mach-mmp/tavorevb.c
@@ -99,8 +99,6 @@ static void __init tavorevb_init(void)
99} 99}
100 100
101MACHINE_START(TAVOREVB, "PXA910 Evaluation Board (aka TavorEVB)") 101MACHINE_START(TAVOREVB, "PXA910 Evaluation Board (aka TavorEVB)")
102 .phys_io = APB_PHYS_BASE,
103 .io_pg_offst = (APB_VIRT_BASE >> 18) & 0xfffc,
104 .map_io = mmp_map_io, 102 .map_io = mmp_map_io,
105 .init_irq = pxa910_init_irq, 103 .init_irq = pxa910_init_irq,
106 .timer = &pxa910_timer, 104 .timer = &pxa910_timer,
diff --git a/arch/arm/mach-mmp/teton_bga.c b/arch/arm/mach-mmp/teton_bga.c
index a4a375c58e0c..bbe4727b96cc 100644
--- a/arch/arm/mach-mmp/teton_bga.c
+++ b/arch/arm/mach-mmp/teton_bga.c
@@ -81,8 +81,6 @@ static void __init teton_bga_init(void)
81} 81}
82 82
83MACHINE_START(TETON_BGA, "PXA168-based Teton BGA Development Platform") 83MACHINE_START(TETON_BGA, "PXA168-based Teton BGA Development Platform")
84 .phys_io = APB_PHYS_BASE,
85 .io_pg_offst = (APB_VIRT_BASE >> 18) & 0xfffc,
86 .map_io = mmp_map_io, 84 .map_io = mmp_map_io,
87 .nr_irqs = IRQ_BOARD_START, 85 .nr_irqs = IRQ_BOARD_START,
88 .init_irq = pxa168_init_irq, 86 .init_irq = pxa168_init_irq,
diff --git a/arch/arm/mach-mmp/ttc_dkb.c b/arch/arm/mach-mmp/ttc_dkb.c
index 54571139dc4b..e411039ea59e 100644
--- a/arch/arm/mach-mmp/ttc_dkb.c
+++ b/arch/arm/mach-mmp/ttc_dkb.c
@@ -125,8 +125,6 @@ static void __init ttc_dkb_init(void)
125} 125}
126 126
127MACHINE_START(TTC_DKB, "PXA910-based TTC_DKB Development Platform") 127MACHINE_START(TTC_DKB, "PXA910-based TTC_DKB Development Platform")
128 .phys_io = APB_PHYS_BASE,
129 .io_pg_offst = (APB_VIRT_BASE >> 18) & 0xfffc,
130 .map_io = mmp_map_io, 128 .map_io = mmp_map_io,
131 .nr_irqs = TTCDKB_NR_IRQS, 129 .nr_irqs = TTCDKB_NR_IRQS,
132 .init_irq = pxa910_init_irq, 130 .init_irq = pxa910_init_irq,