diff options
Diffstat (limited to 'arch/powerpc/platforms/chrp/pci.c')
-rw-r--r-- | arch/powerpc/platforms/chrp/pci.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c index e2f870800e58..b23e39796a0b 100644 --- a/arch/powerpc/platforms/chrp/pci.c +++ b/arch/powerpc/platforms/chrp/pci.c | |||
@@ -217,7 +217,7 @@ chrp_find_bridges(void) | |||
217 | * properties to adequately identify them, so we have to | 217 | * properties to adequately identify them, so we have to |
218 | * look at what sort of machine this is as well. | 218 | * look at what sort of machine this is as well. |
219 | */ | 219 | */ |
220 | machine = get_property(root, "model", NULL); | 220 | machine = of_get_property(root, "model", NULL); |
221 | if (machine != NULL) { | 221 | if (machine != NULL) { |
222 | is_longtrail = strncmp(machine, "IBM,LongTrail", 13) == 0; | 222 | is_longtrail = strncmp(machine, "IBM,LongTrail", 13) == 0; |
223 | is_mot = strncmp(machine, "MOT", 3) == 0; | 223 | is_mot = strncmp(machine, "MOT", 3) == 0; |
@@ -236,7 +236,7 @@ chrp_find_bridges(void) | |||
236 | dev->full_name); | 236 | dev->full_name); |
237 | continue; | 237 | continue; |
238 | } | 238 | } |
239 | bus_range = get_property(dev, "bus-range", &len); | 239 | bus_range = of_get_property(dev, "bus-range", &len); |
240 | if (bus_range == NULL || len < 2 * sizeof(int)) { | 240 | if (bus_range == NULL || len < 2 * sizeof(int)) { |
241 | printk(KERN_WARNING "Can't get bus-range for %s\n", | 241 | printk(KERN_WARNING "Can't get bus-range for %s\n", |
242 | dev->full_name); | 242 | dev->full_name); |
@@ -262,7 +262,7 @@ chrp_find_bridges(void) | |||
262 | hose->first_busno = bus_range[0]; | 262 | hose->first_busno = bus_range[0]; |
263 | hose->last_busno = bus_range[1]; | 263 | hose->last_busno = bus_range[1]; |
264 | 264 | ||
265 | model = get_property(dev, "model", NULL); | 265 | model = of_get_property(dev, "model", NULL); |
266 | if (model == NULL) | 266 | if (model == NULL) |
267 | model = "<none>"; | 267 | model = "<none>"; |
268 | if (device_is_compatible(dev, "IBM,python")) { | 268 | if (device_is_compatible(dev, "IBM,python")) { |
@@ -284,7 +284,8 @@ chrp_find_bridges(void) | |||
284 | r.start + 0x000f8000, | 284 | r.start + 0x000f8000, |
285 | r.start + 0x000f8010); | 285 | r.start + 0x000f8010); |
286 | if (index == 0) { | 286 | if (index == 0) { |
287 | dma = get_property(dev, "system-dma-base",&len); | 287 | dma = of_get_property(dev, "system-dma-base", |
288 | &len); | ||
288 | if (dma && len >= sizeof(*dma)) { | 289 | if (dma && len >= sizeof(*dma)) { |
289 | dma = (unsigned int *) | 290 | dma = (unsigned int *) |
290 | (((unsigned long)dma) + | 291 | (((unsigned long)dma) + |
@@ -302,7 +303,7 @@ chrp_find_bridges(void) | |||
302 | 303 | ||
303 | /* check the first bridge for a property that we can | 304 | /* check the first bridge for a property that we can |
304 | use to set pci_dram_offset */ | 305 | use to set pci_dram_offset */ |
305 | dma = get_property(dev, "ibm,dma-ranges", &len); | 306 | dma = of_get_property(dev, "ibm,dma-ranges", &len); |
306 | if (index == 0 && dma != NULL && len >= 6 * sizeof(*dma)) { | 307 | if (index == 0 && dma != NULL && len >= 6 * sizeof(*dma)) { |
307 | pci_dram_offset = dma[2] - dma[3]; | 308 | pci_dram_offset = dma[2] - dma[3]; |
308 | printk("pci_dram_offset = %lx\n", pci_dram_offset); | 309 | printk("pci_dram_offset = %lx\n", pci_dram_offset); |