diff options
Diffstat (limited to 'drivers/video/valkyriefb.c')
| -rw-r--r-- | drivers/video/valkyriefb.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/video/valkyriefb.c b/drivers/video/valkyriefb.c index ce97ec8eae97..2bdeb4baa952 100644 --- a/drivers/video/valkyriefb.c +++ b/drivers/video/valkyriefb.c | |||
| @@ -342,19 +342,19 @@ int __init valkyriefb_init(void) | |||
| 342 | #else /* ppc (!CONFIG_MAC) */ | 342 | #else /* ppc (!CONFIG_MAC) */ |
| 343 | { | 343 | { |
| 344 | struct device_node *dp; | 344 | struct device_node *dp; |
| 345 | struct resource r; | ||
| 345 | 346 | ||
| 346 | dp = find_devices("valkyrie"); | 347 | dp = of_find_node_by_name(NULL, "valkyrie"); |
| 347 | if (dp == 0) | 348 | if (dp == 0) |
| 348 | return 0; | 349 | return 0; |
| 349 | 350 | ||
| 350 | if (dp->n_addrs != 1) { | 351 | if (of_address_to_resource(dp, 0, &r)) { |
| 351 | printk(KERN_ERR "expecting 1 address for valkyrie (got %d)\n", | 352 | printk(KERN_ERR "can't find address for valkyrie\n"); |
| 352 | dp->n_addrs); | ||
| 353 | return 0; | 353 | return 0; |
| 354 | } | 354 | } |
| 355 | 355 | ||
| 356 | frame_buffer_phys = dp->addrs[0].address; | 356 | frame_buffer_phys = r.start; |
| 357 | cmap_regs_phys = dp->addrs[0].address+0x304000; | 357 | cmap_regs_phys = r.start + 0x304000; |
| 358 | flags = _PAGE_WRITETHRU; | 358 | flags = _PAGE_WRITETHRU; |
| 359 | } | 359 | } |
| 360 | #endif /* ppc (!CONFIG_MAC) */ | 360 | #endif /* ppc (!CONFIG_MAC) */ |
