diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-05 22:38:14 -0400 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2011-08-21 17:14:59 -0400 |
commit | f631dd411e478b781878d9e5d932b9ae8efa9076 (patch) | |
tree | 05efd09a24594d7585bb3bd20acd48301af8668c | |
parent | bdec5ddd80fe6e599d6c7c68c0c83bf8b49daaa7 (diff) |
ARM: mach-msm: convert boot_params to atag_offset
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r-- | arch/arm/mach-msm/board-halibut.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-msm/board-mahimahi.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-msm/board-msm7x27.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-msm/board-msm7x30.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-msm/board-qsd8x50.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-msm/board-sapphire.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-msm/board-trout.c | 2 |
7 files changed, 13 insertions, 13 deletions
diff --git a/arch/arm/mach-msm/board-halibut.c b/arch/arm/mach-msm/board-halibut.c index 18a3c97bc863..16c86f8b4f3f 100644 --- a/arch/arm/mach-msm/board-halibut.c +++ b/arch/arm/mach-msm/board-halibut.c | |||
@@ -93,7 +93,7 @@ static void __init halibut_map_io(void) | |||
93 | } | 93 | } |
94 | 94 | ||
95 | MACHINE_START(HALIBUT, "Halibut Board (QCT SURF7200A)") | 95 | MACHINE_START(HALIBUT, "Halibut Board (QCT SURF7200A)") |
96 | .boot_params = 0x10000100, | 96 | .atag_offset = 0x100, |
97 | .fixup = halibut_fixup, | 97 | .fixup = halibut_fixup, |
98 | .map_io = halibut_map_io, | 98 | .map_io = halibut_map_io, |
99 | .init_irq = halibut_init_irq, | 99 | .init_irq = halibut_init_irq, |
diff --git a/arch/arm/mach-msm/board-mahimahi.c b/arch/arm/mach-msm/board-mahimahi.c index 7a9a03eb189c..8a1672ee4e4a 100644 --- a/arch/arm/mach-msm/board-mahimahi.c +++ b/arch/arm/mach-msm/board-mahimahi.c | |||
@@ -74,7 +74,7 @@ static void __init mahimahi_map_io(void) | |||
74 | extern struct sys_timer msm_timer; | 74 | extern struct sys_timer msm_timer; |
75 | 75 | ||
76 | MACHINE_START(MAHIMAHI, "mahimahi") | 76 | MACHINE_START(MAHIMAHI, "mahimahi") |
77 | .boot_params = 0x20000100, | 77 | .atag_offset = 0x100, |
78 | .fixup = mahimahi_fixup, | 78 | .fixup = mahimahi_fixup, |
79 | .map_io = mahimahi_map_io, | 79 | .map_io = mahimahi_map_io, |
80 | .init_irq = msm_init_irq, | 80 | .init_irq = msm_init_irq, |
diff --git a/arch/arm/mach-msm/board-msm7x27.c b/arch/arm/mach-msm/board-msm7x27.c index c03f269e2e4b..a80765533f13 100644 --- a/arch/arm/mach-msm/board-msm7x27.c +++ b/arch/arm/mach-msm/board-msm7x27.c | |||
@@ -130,7 +130,7 @@ static void __init msm7x2x_map_io(void) | |||
130 | } | 130 | } |
131 | 131 | ||
132 | MACHINE_START(MSM7X27_SURF, "QCT MSM7x27 SURF") | 132 | MACHINE_START(MSM7X27_SURF, "QCT MSM7x27 SURF") |
133 | .boot_params = PLAT_PHYS_OFFSET + 0x100, | 133 | .atag_offset = 0x100, |
134 | .map_io = msm7x2x_map_io, | 134 | .map_io = msm7x2x_map_io, |
135 | .init_irq = msm7x2x_init_irq, | 135 | .init_irq = msm7x2x_init_irq, |
136 | .init_machine = msm7x2x_init, | 136 | .init_machine = msm7x2x_init, |
@@ -138,7 +138,7 @@ MACHINE_START(MSM7X27_SURF, "QCT MSM7x27 SURF") | |||
138 | MACHINE_END | 138 | MACHINE_END |
139 | 139 | ||
140 | MACHINE_START(MSM7X27_FFA, "QCT MSM7x27 FFA") | 140 | MACHINE_START(MSM7X27_FFA, "QCT MSM7x27 FFA") |
141 | .boot_params = PLAT_PHYS_OFFSET + 0x100, | 141 | .atag_offset = 0x100, |
142 | .map_io = msm7x2x_map_io, | 142 | .map_io = msm7x2x_map_io, |
143 | .init_irq = msm7x2x_init_irq, | 143 | .init_irq = msm7x2x_init_irq, |
144 | .init_machine = msm7x2x_init, | 144 | .init_machine = msm7x2x_init, |
@@ -146,7 +146,7 @@ MACHINE_START(MSM7X27_FFA, "QCT MSM7x27 FFA") | |||
146 | MACHINE_END | 146 | MACHINE_END |
147 | 147 | ||
148 | MACHINE_START(MSM7X25_SURF, "QCT MSM7x25 SURF") | 148 | MACHINE_START(MSM7X25_SURF, "QCT MSM7x25 SURF") |
149 | .boot_params = PLAT_PHYS_OFFSET + 0x100, | 149 | .atag_offset = 0x100, |
150 | .map_io = msm7x2x_map_io, | 150 | .map_io = msm7x2x_map_io, |
151 | .init_irq = msm7x2x_init_irq, | 151 | .init_irq = msm7x2x_init_irq, |
152 | .init_machine = msm7x2x_init, | 152 | .init_machine = msm7x2x_init, |
@@ -154,7 +154,7 @@ MACHINE_START(MSM7X25_SURF, "QCT MSM7x25 SURF") | |||
154 | MACHINE_END | 154 | MACHINE_END |
155 | 155 | ||
156 | MACHINE_START(MSM7X25_FFA, "QCT MSM7x25 FFA") | 156 | MACHINE_START(MSM7X25_FFA, "QCT MSM7x25 FFA") |
157 | .boot_params = PLAT_PHYS_OFFSET + 0x100, | 157 | .atag_offset = 0x100, |
158 | .map_io = msm7x2x_map_io, | 158 | .map_io = msm7x2x_map_io, |
159 | .init_irq = msm7x2x_init_irq, | 159 | .init_irq = msm7x2x_init_irq, |
160 | .init_machine = msm7x2x_init, | 160 | .init_machine = msm7x2x_init, |
diff --git a/arch/arm/mach-msm/board-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c index b7a84966b711..5a2ab6855183 100644 --- a/arch/arm/mach-msm/board-msm7x30.c +++ b/arch/arm/mach-msm/board-msm7x30.c | |||
@@ -106,7 +106,7 @@ static void __init msm7x30_map_io(void) | |||
106 | } | 106 | } |
107 | 107 | ||
108 | MACHINE_START(MSM7X30_SURF, "QCT MSM7X30 SURF") | 108 | MACHINE_START(MSM7X30_SURF, "QCT MSM7X30 SURF") |
109 | .boot_params = PLAT_PHYS_OFFSET + 0x100, | 109 | .atag_offset = 0x100, |
110 | .map_io = msm7x30_map_io, | 110 | .map_io = msm7x30_map_io, |
111 | .init_irq = msm7x30_init_irq, | 111 | .init_irq = msm7x30_init_irq, |
112 | .init_machine = msm7x30_init, | 112 | .init_machine = msm7x30_init, |
@@ -114,7 +114,7 @@ MACHINE_START(MSM7X30_SURF, "QCT MSM7X30 SURF") | |||
114 | MACHINE_END | 114 | MACHINE_END |
115 | 115 | ||
116 | MACHINE_START(MSM7X30_FFA, "QCT MSM7X30 FFA") | 116 | MACHINE_START(MSM7X30_FFA, "QCT MSM7X30 FFA") |
117 | .boot_params = PLAT_PHYS_OFFSET + 0x100, | 117 | .atag_offset = 0x100, |
118 | .map_io = msm7x30_map_io, | 118 | .map_io = msm7x30_map_io, |
119 | .init_irq = msm7x30_init_irq, | 119 | .init_irq = msm7x30_init_irq, |
120 | .init_machine = msm7x30_init, | 120 | .init_machine = msm7x30_init, |
@@ -122,7 +122,7 @@ MACHINE_START(MSM7X30_FFA, "QCT MSM7X30 FFA") | |||
122 | MACHINE_END | 122 | MACHINE_END |
123 | 123 | ||
124 | MACHINE_START(MSM7X30_FLUID, "QCT MSM7X30 FLUID") | 124 | MACHINE_START(MSM7X30_FLUID, "QCT MSM7X30 FLUID") |
125 | .boot_params = PLAT_PHYS_OFFSET + 0x100, | 125 | .atag_offset = 0x100, |
126 | .map_io = msm7x30_map_io, | 126 | .map_io = msm7x30_map_io, |
127 | .init_irq = msm7x30_init_irq, | 127 | .init_irq = msm7x30_init_irq, |
128 | .init_machine = msm7x30_init, | 128 | .init_machine = msm7x30_init, |
diff --git a/arch/arm/mach-msm/board-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c index 6a96911b0ad5..51109b1f4342 100644 --- a/arch/arm/mach-msm/board-qsd8x50.c +++ b/arch/arm/mach-msm/board-qsd8x50.c | |||
@@ -193,7 +193,7 @@ static void __init qsd8x50_init(void) | |||
193 | } | 193 | } |
194 | 194 | ||
195 | MACHINE_START(QSD8X50_SURF, "QCT QSD8X50 SURF") | 195 | MACHINE_START(QSD8X50_SURF, "QCT QSD8X50 SURF") |
196 | .boot_params = PLAT_PHYS_OFFSET + 0x100, | 196 | .atag_offset = 0x100, |
197 | .map_io = qsd8x50_map_io, | 197 | .map_io = qsd8x50_map_io, |
198 | .init_irq = qsd8x50_init_irq, | 198 | .init_irq = qsd8x50_init_irq, |
199 | .init_machine = qsd8x50_init, | 199 | .init_machine = qsd8x50_init, |
@@ -201,7 +201,7 @@ MACHINE_START(QSD8X50_SURF, "QCT QSD8X50 SURF") | |||
201 | MACHINE_END | 201 | MACHINE_END |
202 | 202 | ||
203 | MACHINE_START(QSD8X50A_ST1_5, "QCT QSD8X50A ST1.5") | 203 | MACHINE_START(QSD8X50A_ST1_5, "QCT QSD8X50A ST1.5") |
204 | .boot_params = PLAT_PHYS_OFFSET + 0x100, | 204 | .atag_offset = 0x100, |
205 | .map_io = qsd8x50_map_io, | 205 | .map_io = qsd8x50_map_io, |
206 | .init_irq = qsd8x50_init_irq, | 206 | .init_irq = qsd8x50_init_irq, |
207 | .init_machine = qsd8x50_init, | 207 | .init_machine = qsd8x50_init, |
diff --git a/arch/arm/mach-msm/board-sapphire.c b/arch/arm/mach-msm/board-sapphire.c index 68f930f07d77..dc0bcb5a6b9a 100644 --- a/arch/arm/mach-msm/board-sapphire.c +++ b/arch/arm/mach-msm/board-sapphire.c | |||
@@ -105,7 +105,7 @@ static void __init sapphire_map_io(void) | |||
105 | 105 | ||
106 | MACHINE_START(SAPPHIRE, "sapphire") | 106 | MACHINE_START(SAPPHIRE, "sapphire") |
107 | /* Maintainer: Brian Swetland <swetland@google.com> */ | 107 | /* Maintainer: Brian Swetland <swetland@google.com> */ |
108 | .boot_params = PLAT_PHYS_OFFSET + 0x100, | 108 | .atag_offset = 0x100, |
109 | .fixup = sapphire_fixup, | 109 | .fixup = sapphire_fixup, |
110 | .map_io = sapphire_map_io, | 110 | .map_io = sapphire_map_io, |
111 | .init_irq = sapphire_init_irq, | 111 | .init_irq = sapphire_init_irq, |
diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c index 814386772c66..22d5694f5fea 100644 --- a/arch/arm/mach-msm/board-trout.c +++ b/arch/arm/mach-msm/board-trout.c | |||
@@ -93,7 +93,7 @@ static void __init trout_map_io(void) | |||
93 | } | 93 | } |
94 | 94 | ||
95 | MACHINE_START(TROUT, "HTC Dream") | 95 | MACHINE_START(TROUT, "HTC Dream") |
96 | .boot_params = 0x10000100, | 96 | .atag_offset = 0x100, |
97 | .fixup = trout_fixup, | 97 | .fixup = trout_fixup, |
98 | .map_io = trout_map_io, | 98 | .map_io = trout_map_io, |
99 | .init_irq = trout_init_irq, | 99 | .init_irq = trout_init_irq, |