diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-04 14:03:16 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-17 18:27:30 -0500 |
commit | b75c178afaa975896e894bb2b6951dc4cd43c977 (patch) | |
tree | e3011acbb5c185497e9d72d406b69e5cc20debd5 /arch/arm/mach-msm | |
parent | f4117ac9e237b74afdf5e001d5ea26a4d15e9847 (diff) |
ARM: P2V: avoid initializers and assembly using PHYS_OFFSET
As PHYS_OFFSET will be becoming a variable, we can't have it used in
initializers nor assembly code. Replace those in generic code with
a run-time initialization. Replace those in platform code using the
individual platform specific PLAT_PHYS_OFFSET.
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Acked-by: David Brown <davidb@codeaurora.org>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-msm')
-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 |
4 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mach-msm/board-msm7x27.c b/arch/arm/mach-msm/board-msm7x27.c index e7a76eff57d9..08fcd40a8cbd 100644 --- a/arch/arm/mach-msm/board-msm7x27.c +++ b/arch/arm/mach-msm/board-msm7x27.c | |||
@@ -132,7 +132,7 @@ static void __init msm7x2x_map_io(void) | |||
132 | MACHINE_START(MSM7X27_SURF, "QCT MSM7x27 SURF") | 132 | MACHINE_START(MSM7X27_SURF, "QCT MSM7x27 SURF") |
133 | #ifdef CONFIG_MSM_DEBUG_UART | 133 | #ifdef CONFIG_MSM_DEBUG_UART |
134 | #endif | 134 | #endif |
135 | .boot_params = PHYS_OFFSET + 0x100, | 135 | .boot_params = PLAT_PHYS_OFFSET + 0x100, |
136 | .map_io = msm7x2x_map_io, | 136 | .map_io = msm7x2x_map_io, |
137 | .init_irq = msm7x2x_init_irq, | 137 | .init_irq = msm7x2x_init_irq, |
138 | .init_machine = msm7x2x_init, | 138 | .init_machine = msm7x2x_init, |
@@ -142,7 +142,7 @@ MACHINE_END | |||
142 | MACHINE_START(MSM7X27_FFA, "QCT MSM7x27 FFA") | 142 | MACHINE_START(MSM7X27_FFA, "QCT MSM7x27 FFA") |
143 | #ifdef CONFIG_MSM_DEBUG_UART | 143 | #ifdef CONFIG_MSM_DEBUG_UART |
144 | #endif | 144 | #endif |
145 | .boot_params = PHYS_OFFSET + 0x100, | 145 | .boot_params = PLAT_PHYS_OFFSET + 0x100, |
146 | .map_io = msm7x2x_map_io, | 146 | .map_io = msm7x2x_map_io, |
147 | .init_irq = msm7x2x_init_irq, | 147 | .init_irq = msm7x2x_init_irq, |
148 | .init_machine = msm7x2x_init, | 148 | .init_machine = msm7x2x_init, |
@@ -152,7 +152,7 @@ MACHINE_END | |||
152 | MACHINE_START(MSM7X25_SURF, "QCT MSM7x25 SURF") | 152 | MACHINE_START(MSM7X25_SURF, "QCT MSM7x25 SURF") |
153 | #ifdef CONFIG_MSM_DEBUG_UART | 153 | #ifdef CONFIG_MSM_DEBUG_UART |
154 | #endif | 154 | #endif |
155 | .boot_params = PHYS_OFFSET + 0x100, | 155 | .boot_params = PLAT_PHYS_OFFSET + 0x100, |
156 | .map_io = msm7x2x_map_io, | 156 | .map_io = msm7x2x_map_io, |
157 | .init_irq = msm7x2x_init_irq, | 157 | .init_irq = msm7x2x_init_irq, |
158 | .init_machine = msm7x2x_init, | 158 | .init_machine = msm7x2x_init, |
@@ -162,7 +162,7 @@ MACHINE_END | |||
162 | MACHINE_START(MSM7X25_FFA, "QCT MSM7x25 FFA") | 162 | MACHINE_START(MSM7X25_FFA, "QCT MSM7x25 FFA") |
163 | #ifdef CONFIG_MSM_DEBUG_UART | 163 | #ifdef CONFIG_MSM_DEBUG_UART |
164 | #endif | 164 | #endif |
165 | .boot_params = PHYS_OFFSET + 0x100, | 165 | .boot_params = PLAT_PHYS_OFFSET + 0x100, |
166 | .map_io = msm7x2x_map_io, | 166 | .map_io = msm7x2x_map_io, |
167 | .init_irq = msm7x2x_init_irq, | 167 | .init_irq = msm7x2x_init_irq, |
168 | .init_machine = msm7x2x_init, | 168 | .init_machine = msm7x2x_init, |
diff --git a/arch/arm/mach-msm/board-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c index decbf80b429e..25db8fd71a70 100644 --- a/arch/arm/mach-msm/board-msm7x30.c +++ b/arch/arm/mach-msm/board-msm7x30.c | |||
@@ -85,7 +85,7 @@ static void __init msm7x30_map_io(void) | |||
85 | MACHINE_START(MSM7X30_SURF, "QCT MSM7X30 SURF") | 85 | MACHINE_START(MSM7X30_SURF, "QCT MSM7X30 SURF") |
86 | #ifdef CONFIG_MSM_DEBUG_UART | 86 | #ifdef CONFIG_MSM_DEBUG_UART |
87 | #endif | 87 | #endif |
88 | .boot_params = PHYS_OFFSET + 0x100, | 88 | .boot_params = PLAT_PHYS_OFFSET + 0x100, |
89 | .map_io = msm7x30_map_io, | 89 | .map_io = msm7x30_map_io, |
90 | .init_irq = msm7x30_init_irq, | 90 | .init_irq = msm7x30_init_irq, |
91 | .init_machine = msm7x30_init, | 91 | .init_machine = msm7x30_init, |
@@ -95,7 +95,7 @@ MACHINE_END | |||
95 | MACHINE_START(MSM7X30_FFA, "QCT MSM7X30 FFA") | 95 | MACHINE_START(MSM7X30_FFA, "QCT MSM7X30 FFA") |
96 | #ifdef CONFIG_MSM_DEBUG_UART | 96 | #ifdef CONFIG_MSM_DEBUG_UART |
97 | #endif | 97 | #endif |
98 | .boot_params = PHYS_OFFSET + 0x100, | 98 | .boot_params = PLAT_PHYS_OFFSET + 0x100, |
99 | .map_io = msm7x30_map_io, | 99 | .map_io = msm7x30_map_io, |
100 | .init_irq = msm7x30_init_irq, | 100 | .init_irq = msm7x30_init_irq, |
101 | .init_machine = msm7x30_init, | 101 | .init_machine = msm7x30_init, |
@@ -105,7 +105,7 @@ MACHINE_END | |||
105 | MACHINE_START(MSM7X30_FLUID, "QCT MSM7X30 FLUID") | 105 | MACHINE_START(MSM7X30_FLUID, "QCT MSM7X30 FLUID") |
106 | #ifdef CONFIG_MSM_DEBUG_UART | 106 | #ifdef CONFIG_MSM_DEBUG_UART |
107 | #endif | 107 | #endif |
108 | .boot_params = PHYS_OFFSET + 0x100, | 108 | .boot_params = PLAT_PHYS_OFFSET + 0x100, |
109 | .map_io = msm7x30_map_io, | 109 | .map_io = msm7x30_map_io, |
110 | .init_irq = msm7x30_init_irq, | 110 | .init_irq = msm7x30_init_irq, |
111 | .init_machine = msm7x30_init, | 111 | .init_machine = msm7x30_init, |
diff --git a/arch/arm/mach-msm/board-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c index 6dde8185205f..15c2bbd2ef81 100644 --- a/arch/arm/mach-msm/board-qsd8x50.c +++ b/arch/arm/mach-msm/board-qsd8x50.c | |||
@@ -118,7 +118,7 @@ static void __init qsd8x50_init(void) | |||
118 | MACHINE_START(QSD8X50_SURF, "QCT QSD8X50 SURF") | 118 | MACHINE_START(QSD8X50_SURF, "QCT QSD8X50 SURF") |
119 | #ifdef CONFIG_MSM_DEBUG_UART | 119 | #ifdef CONFIG_MSM_DEBUG_UART |
120 | #endif | 120 | #endif |
121 | .boot_params = PHYS_OFFSET + 0x100, | 121 | .boot_params = PLAT_PHYS_OFFSET + 0x100, |
122 | .map_io = qsd8x50_map_io, | 122 | .map_io = qsd8x50_map_io, |
123 | .init_irq = qsd8x50_init_irq, | 123 | .init_irq = qsd8x50_init_irq, |
124 | .init_machine = qsd8x50_init, | 124 | .init_machine = qsd8x50_init, |
@@ -128,7 +128,7 @@ MACHINE_END | |||
128 | MACHINE_START(QSD8X50A_ST1_5, "QCT QSD8X50A ST1.5") | 128 | MACHINE_START(QSD8X50A_ST1_5, "QCT QSD8X50A ST1.5") |
129 | #ifdef CONFIG_MSM_DEBUG_UART | 129 | #ifdef CONFIG_MSM_DEBUG_UART |
130 | #endif | 130 | #endif |
131 | .boot_params = PHYS_OFFSET + 0x100, | 131 | .boot_params = PLAT_PHYS_OFFSET + 0x100, |
132 | .map_io = qsd8x50_map_io, | 132 | .map_io = qsd8x50_map_io, |
133 | .init_irq = qsd8x50_init_irq, | 133 | .init_irq = qsd8x50_init_irq, |
134 | .init_machine = qsd8x50_init, | 134 | .init_machine = qsd8x50_init, |
diff --git a/arch/arm/mach-msm/board-sapphire.c b/arch/arm/mach-msm/board-sapphire.c index 8919ffb17196..83604f526f0f 100644 --- a/arch/arm/mach-msm/board-sapphire.c +++ b/arch/arm/mach-msm/board-sapphire.c | |||
@@ -107,7 +107,7 @@ MACHINE_START(SAPPHIRE, "sapphire") | |||
107 | /* Maintainer: Brian Swetland <swetland@google.com> */ | 107 | /* Maintainer: Brian Swetland <swetland@google.com> */ |
108 | #ifdef CONFIG_MSM_DEBUG_UART | 108 | #ifdef CONFIG_MSM_DEBUG_UART |
109 | #endif | 109 | #endif |
110 | .boot_params = PHYS_OFFSET + 0x100, | 110 | .boot_params = PLAT_PHYS_OFFSET + 0x100, |
111 | .fixup = sapphire_fixup, | 111 | .fixup = sapphire_fixup, |
112 | .map_io = sapphire_map_io, | 112 | .map_io = sapphire_map_io, |
113 | .init_irq = sapphire_init_irq, | 113 | .init_irq = sapphire_init_irq, |