diff options
Diffstat (limited to 'arch/powerpc/platforms/maple')
-rw-r--r-- | arch/powerpc/platforms/maple/pci.c | 12 | ||||
-rw-r--r-- | arch/powerpc/platforms/maple/setup.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c index b1d3b99c3f9d..7aaa5bbc9363 100644 --- a/arch/powerpc/platforms/maple/pci.c +++ b/arch/powerpc/platforms/maple/pci.c | |||
@@ -467,15 +467,15 @@ static int __init add_bridge(struct device_node *dev) | |||
467 | hose->last_busno = bus_range ? bus_range[1] : 0xff; | 467 | hose->last_busno = bus_range ? bus_range[1] : 0xff; |
468 | 468 | ||
469 | disp_name = NULL; | 469 | disp_name = NULL; |
470 | if (device_is_compatible(dev, "u3-agp")) { | 470 | if (of_device_is_compatible(dev, "u3-agp")) { |
471 | setup_u3_agp(hose); | 471 | setup_u3_agp(hose); |
472 | disp_name = "U3-AGP"; | 472 | disp_name = "U3-AGP"; |
473 | primary = 0; | 473 | primary = 0; |
474 | } else if (device_is_compatible(dev, "u3-ht")) { | 474 | } else if (of_device_is_compatible(dev, "u3-ht")) { |
475 | setup_u3_ht(hose); | 475 | setup_u3_ht(hose); |
476 | disp_name = "U3-HT"; | 476 | disp_name = "U3-HT"; |
477 | primary = 1; | 477 | primary = 1; |
478 | } else if (device_is_compatible(dev, "u4-pcie")) { | 478 | } else if (of_device_is_compatible(dev, "u4-pcie")) { |
479 | setup_u4_pcie(hose); | 479 | setup_u4_pcie(hose); |
480 | disp_name = "U4-PCIE"; | 480 | disp_name = "U4-PCIE"; |
481 | primary = 0; | 481 | primary = 0; |
@@ -556,12 +556,12 @@ void __init maple_pci_init(void) | |||
556 | continue; | 556 | continue; |
557 | if (strcmp(np->type, "pci") && strcmp(np->type, "ht")) | 557 | if (strcmp(np->type, "pci") && strcmp(np->type, "ht")) |
558 | continue; | 558 | continue; |
559 | if ((device_is_compatible(np, "u4-pcie") || | 559 | if ((of_device_is_compatible(np, "u4-pcie") || |
560 | device_is_compatible(np, "u3-agp")) && | 560 | of_device_is_compatible(np, "u3-agp")) && |
561 | add_bridge(np) == 0) | 561 | add_bridge(np) == 0) |
562 | of_node_get(np); | 562 | of_node_get(np); |
563 | 563 | ||
564 | if (device_is_compatible(np, "u3-ht")) { | 564 | if (of_device_is_compatible(np, "u3-ht")) { |
565 | of_node_get(np); | 565 | of_node_get(np); |
566 | ht = np; | 566 | ht = np; |
567 | } | 567 | } |
diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c index 2a30c5b2532e..354c05861629 100644 --- a/arch/powerpc/platforms/maple/setup.c +++ b/arch/powerpc/platforms/maple/setup.c | |||
@@ -231,7 +231,7 @@ static void __init maple_init_IRQ(void) | |||
231 | */ | 231 | */ |
232 | 232 | ||
233 | for_each_node_by_type(np, "interrupt-controller") | 233 | for_each_node_by_type(np, "interrupt-controller") |
234 | if (device_is_compatible(np, "open-pic")) { | 234 | if (of_device_is_compatible(np, "open-pic")) { |
235 | mpic_node = np; | 235 | mpic_node = np; |
236 | break; | 236 | break; |
237 | } | 237 | } |