diff options
Diffstat (limited to 'arch/mips/sibyte/sb1250/setup.c')
-rw-r--r-- | arch/mips/sibyte/sb1250/setup.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/arch/mips/sibyte/sb1250/setup.c b/arch/mips/sibyte/sb1250/setup.c index d0ee1d5b8223..1cb042eab720 100644 --- a/arch/mips/sibyte/sb1250/setup.c +++ b/arch/mips/sibyte/sb1250/setup.c | |||
@@ -67,7 +67,7 @@ static int __init sys_rev_decode(void) | |||
67 | ret = setup_bcm112x(); | 67 | ret = setup_bcm112x(); |
68 | break; | 68 | break; |
69 | default: | 69 | default: |
70 | prom_printf("Unknown SOC type %x\n", soc_type); | 70 | printk("Unknown SOC type %x\n", soc_type); |
71 | ret = 1; | 71 | ret = 1; |
72 | break; | 72 | break; |
73 | } | 73 | } |
@@ -112,7 +112,7 @@ static int __init setup_bcm1250(void) | |||
112 | pass_str = "A0-A6"; | 112 | pass_str = "A0-A6"; |
113 | war_pass = K_SYS_REVISION_BCM1250_PASS2; | 113 | war_pass = K_SYS_REVISION_BCM1250_PASS2; |
114 | } else { | 114 | } else { |
115 | prom_printf("Unknown BCM1250 rev %x\n", soc_pass); | 115 | printk("Unknown BCM1250 rev %x\n", soc_pass); |
116 | ret = 1; | 116 | ret = 1; |
117 | } | 117 | } |
118 | break; | 118 | break; |
@@ -140,7 +140,7 @@ static int __init setup_bcm112x(void) | |||
140 | pass_str = "A2"; | 140 | pass_str = "A2"; |
141 | break; | 141 | break; |
142 | default: | 142 | default: |
143 | prom_printf("Unknown %s rev %x\n", soc_str, soc_pass); | 143 | printk("Unknown %s rev %x\n", soc_str, soc_pass); |
144 | ret = 1; | 144 | ret = 1; |
145 | } | 145 | } |
146 | return ret; | 146 | return ret; |
@@ -158,21 +158,21 @@ void __init sb1250_setup(void) | |||
158 | soc_pass = G_SYS_REVISION(sys_rev); | 158 | soc_pass = G_SYS_REVISION(sys_rev); |
159 | 159 | ||
160 | if (sys_rev_decode()) { | 160 | if (sys_rev_decode()) { |
161 | prom_printf("Restart after failure to identify SiByte chip\n"); | 161 | printk("Restart after failure to identify SiByte chip\n"); |
162 | machine_restart(NULL); | 162 | machine_restart(NULL); |
163 | } | 163 | } |
164 | 164 | ||
165 | plldiv = G_SYS_PLL_DIV(__raw_readq(IOADDR(A_SCD_SYSTEM_CFG))); | 165 | plldiv = G_SYS_PLL_DIV(__raw_readq(IOADDR(A_SCD_SYSTEM_CFG))); |
166 | zbbus_mhz = ((plldiv >> 1) * 50) + ((plldiv & 1) * 25); | 166 | zbbus_mhz = ((plldiv >> 1) * 50) + ((plldiv & 1) * 25); |
167 | 167 | ||
168 | prom_printf("Broadcom SiByte %s %s @ %d MHz (SB1 rev %d)\n", | 168 | printk("Broadcom SiByte %s %s @ %d MHz (SB1 rev %d)\n", |
169 | soc_str, pass_str, zbbus_mhz * 2, sb1_pass); | 169 | soc_str, pass_str, zbbus_mhz * 2, sb1_pass); |
170 | prom_printf("Board type: %s\n", get_system_type()); | 170 | printk("Board type: %s\n", get_system_type()); |
171 | 171 | ||
172 | switch (war_pass) { | 172 | switch (war_pass) { |
173 | case K_SYS_REVISION_BCM1250_PASS1: | 173 | case K_SYS_REVISION_BCM1250_PASS1: |
174 | #ifndef CONFIG_SB1_PASS_1_WORKAROUNDS | 174 | #ifndef CONFIG_SB1_PASS_1_WORKAROUNDS |
175 | prom_printf("@@@@ This is a BCM1250 A0-A2 (Pass 1) board, " | 175 | printk("@@@@ This is a BCM1250 A0-A2 (Pass 1) board, " |
176 | "and the kernel doesn't have the proper " | 176 | "and the kernel doesn't have the proper " |
177 | "workarounds compiled in. @@@@\n"); | 177 | "workarounds compiled in. @@@@\n"); |
178 | bad_config = 1; | 178 | bad_config = 1; |
@@ -182,27 +182,27 @@ void __init sb1250_setup(void) | |||
182 | /* Pass 2 - easiest as default for now - so many numbers */ | 182 | /* Pass 2 - easiest as default for now - so many numbers */ |
183 | #if !defined(CONFIG_SB1_PASS_2_WORKAROUNDS) || \ | 183 | #if !defined(CONFIG_SB1_PASS_2_WORKAROUNDS) || \ |
184 | !defined(CONFIG_SB1_PASS_2_1_WORKAROUNDS) | 184 | !defined(CONFIG_SB1_PASS_2_1_WORKAROUNDS) |
185 | prom_printf("@@@@ This is a BCM1250 A3-A10 board, and the " | 185 | printk("@@@@ This is a BCM1250 A3-A10 board, and the " |
186 | "kernel doesn't have the proper workarounds " | 186 | "kernel doesn't have the proper workarounds " |
187 | "compiled in. @@@@\n"); | 187 | "compiled in. @@@@\n"); |
188 | bad_config = 1; | 188 | bad_config = 1; |
189 | #endif | 189 | #endif |
190 | #ifdef CONFIG_CPU_HAS_PREFETCH | 190 | #ifdef CONFIG_CPU_HAS_PREFETCH |
191 | prom_printf("@@@@ Prefetches may be enabled in this kernel, " | 191 | printk("@@@@ Prefetches may be enabled in this kernel, " |
192 | "but are buggy on this board. @@@@\n"); | 192 | "but are buggy on this board. @@@@\n"); |
193 | bad_config = 1; | 193 | bad_config = 1; |
194 | #endif | 194 | #endif |
195 | break; | 195 | break; |
196 | case K_SYS_REVISION_BCM1250_PASS2_2: | 196 | case K_SYS_REVISION_BCM1250_PASS2_2: |
197 | #ifndef CONFIG_SB1_PASS_2_WORKAROUNDS | 197 | #ifndef CONFIG_SB1_PASS_2_WORKAROUNDS |
198 | prom_printf("@@@@ This is a BCM1250 B1/B2. board, and the " | 198 | printk("@@@@ This is a BCM1250 B1/B2. board, and the " |
199 | "kernel doesn't have the proper workarounds " | 199 | "kernel doesn't have the proper workarounds " |
200 | "compiled in. @@@@\n"); | 200 | "compiled in. @@@@\n"); |
201 | bad_config = 1; | 201 | bad_config = 1; |
202 | #endif | 202 | #endif |
203 | #if defined(CONFIG_SB1_PASS_2_1_WORKAROUNDS) || \ | 203 | #if defined(CONFIG_SB1_PASS_2_1_WORKAROUNDS) || \ |
204 | !defined(CONFIG_CPU_HAS_PREFETCH) | 204 | !defined(CONFIG_CPU_HAS_PREFETCH) |
205 | prom_printf("@@@@ This is a BCM1250 B1/B2, but the kernel is " | 205 | printk("@@@@ This is a BCM1250 B1/B2, but the kernel is " |
206 | "conservatively configured for an 'A' stepping. " | 206 | "conservatively configured for an 'A' stepping. " |
207 | "@@@@\n"); | 207 | "@@@@\n"); |
208 | #endif | 208 | #endif |
@@ -211,7 +211,7 @@ void __init sb1250_setup(void) | |||
211 | break; | 211 | break; |
212 | } | 212 | } |
213 | if (bad_config) { | 213 | if (bad_config) { |
214 | prom_printf("Invalid configuration for this chip.\n"); | 214 | printk("Invalid configuration for this chip.\n"); |
215 | machine_restart(NULL); | 215 | machine_restart(NULL); |
216 | } | 216 | } |
217 | } | 217 | } |