diff options
Diffstat (limited to 'arch/powerpc/platforms/chrp/setup.c')
-rw-r--r-- | arch/powerpc/platforms/chrp/setup.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c index 044ad3f1e04a..05d1bc0c8918 100644 --- a/arch/powerpc/platforms/chrp/setup.c +++ b/arch/powerpc/platforms/chrp/setup.c | |||
@@ -112,7 +112,7 @@ void chrp_show_cpuinfo(struct seq_file *m) | |||
112 | 112 | ||
113 | root = find_path_device("/"); | 113 | root = find_path_device("/"); |
114 | if (root) | 114 | if (root) |
115 | model = get_property(root, "model", NULL); | 115 | model = of_get_property(root, "model", NULL); |
116 | seq_printf(m, "machine\t\t: CHRP %s\n", model); | 116 | seq_printf(m, "machine\t\t: CHRP %s\n", model); |
117 | 117 | ||
118 | /* longtrail (goldengate) stuff */ | 118 | /* longtrail (goldengate) stuff */ |
@@ -205,7 +205,8 @@ static void __init sio_init(void) | |||
205 | struct device_node *root; | 205 | struct device_node *root; |
206 | 206 | ||
207 | if ((root = find_path_device("/")) && | 207 | if ((root = find_path_device("/")) && |
208 | !strncmp(get_property(root, "model", NULL), "IBM,LongTrail", 13)) { | 208 | !strncmp(of_get_property(root, "model", NULL), |
209 | "IBM,LongTrail", 13)) { | ||
209 | /* logical device 0 (KBC/Keyboard) */ | 210 | /* logical device 0 (KBC/Keyboard) */ |
210 | sio_fixup_irq("keyboard", 0, 1, 2); | 211 | sio_fixup_irq("keyboard", 0, 1, 2); |
211 | /* select logical device 1 (KBC/Mouse) */ | 212 | /* select logical device 1 (KBC/Mouse) */ |
@@ -225,7 +226,7 @@ static void __init pegasos_set_l2cr(void) | |||
225 | /* Enable L2 cache if needed */ | 226 | /* Enable L2 cache if needed */ |
226 | np = find_type_devices("cpu"); | 227 | np = find_type_devices("cpu"); |
227 | if (np != NULL) { | 228 | if (np != NULL) { |
228 | const unsigned int *l2cr = get_property(np, "l2cr", NULL); | 229 | const unsigned int *l2cr = of_get_property(np, "l2cr", NULL); |
229 | if (l2cr == NULL) { | 230 | if (l2cr == NULL) { |
230 | printk ("Pegasos l2cr : no cpu l2cr property found\n"); | 231 | printk ("Pegasos l2cr : no cpu l2cr property found\n"); |
231 | return; | 232 | return; |
@@ -256,7 +257,7 @@ void __init chrp_setup_arch(void) | |||
256 | loops_per_jiffy = 50000000/HZ; | 257 | loops_per_jiffy = 50000000/HZ; |
257 | 258 | ||
258 | if (root) | 259 | if (root) |
259 | machine = get_property(root, "model", NULL); | 260 | machine = of_get_property(root, "model", NULL); |
260 | if (machine && strncmp(machine, "Pegasos", 7) == 0) { | 261 | if (machine && strncmp(machine, "Pegasos", 7) == 0) { |
261 | _chrp_type = _CHRP_Pegasos; | 262 | _chrp_type = _CHRP_Pegasos; |
262 | } else if (machine && strncmp(machine, "IBM", 3) == 0) { | 263 | } else if (machine && strncmp(machine, "IBM", 3) == 0) { |
@@ -360,7 +361,7 @@ static void __init chrp_find_openpic(void) | |||
360 | return; | 361 | return; |
361 | root = of_find_node_by_path("/"); | 362 | root = of_find_node_by_path("/"); |
362 | if (root) { | 363 | if (root) { |
363 | opprop = get_property(root, "platform-open-pic", &oplen); | 364 | opprop = of_get_property(root, "platform-open-pic", &oplen); |
364 | na = of_n_addr_cells(root); | 365 | na = of_n_addr_cells(root); |
365 | } | 366 | } |
366 | if (opprop && oplen >= na * sizeof(unsigned int)) { | 367 | if (opprop && oplen >= na * sizeof(unsigned int)) { |
@@ -377,7 +378,7 @@ static void __init chrp_find_openpic(void) | |||
377 | 378 | ||
378 | printk(KERN_INFO "OpenPIC at %lx\n", opaddr); | 379 | printk(KERN_INFO "OpenPIC at %lx\n", opaddr); |
379 | 380 | ||
380 | iranges = get_property(np, "interrupt-ranges", &len); | 381 | iranges = of_get_property(np, "interrupt-ranges", &len); |
381 | if (iranges == NULL) | 382 | if (iranges == NULL) |
382 | len = 0; /* non-distributed mpic */ | 383 | len = 0; /* non-distributed mpic */ |
383 | else | 384 | else |
@@ -463,7 +464,7 @@ static void __init chrp_find_8259(void) | |||
463 | * from anyway | 464 | * from anyway |
464 | */ | 465 | */ |
465 | for (np = find_devices("pci"); np != NULL; np = np->next) { | 466 | for (np = find_devices("pci"); np != NULL; np = np->next) { |
466 | const unsigned int *addrp = get_property(np, | 467 | const unsigned int *addrp = of_get_property(np, |
467 | "8259-interrupt-acknowledge", NULL); | 468 | "8259-interrupt-acknowledge", NULL); |
468 | 469 | ||
469 | if (addrp == NULL) | 470 | if (addrp == NULL) |
@@ -543,7 +544,7 @@ chrp_init2(void) | |||
543 | */ | 544 | */ |
544 | device = find_devices("rtas"); | 545 | device = find_devices("rtas"); |
545 | if (device) | 546 | if (device) |
546 | p = get_property(device, "rtas-event-scan-rate", NULL); | 547 | p = of_get_property(device, "rtas-event-scan-rate", NULL); |
547 | if (p && *p) { | 548 | if (p && *p) { |
548 | /* | 549 | /* |
549 | * Arrange to call chrp_event_scan at least *p times | 550 | * Arrange to call chrp_event_scan at least *p times |