diff options
Diffstat (limited to 'drivers/video/xilinxfb.c')
-rw-r--r-- | drivers/video/xilinxfb.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c index 3fcb83f03881..6fcec553662c 100644 --- a/drivers/video/xilinxfb.c +++ b/drivers/video/xilinxfb.c | |||
@@ -423,7 +423,7 @@ xilinxfb_of_probe(struct of_device *op, const struct of_device_id *match) | |||
423 | * To check whether the core is connected directly to DCR or PLB | 423 | * To check whether the core is connected directly to DCR or PLB |
424 | * interface and initialize the tft_access accordingly. | 424 | * interface and initialize the tft_access accordingly. |
425 | */ | 425 | */ |
426 | p = (u32 *)of_get_property(op->node, "xlnx,dcr-splb-slave-if", NULL); | 426 | p = (u32 *)of_get_property(op->dev.of_node, "xlnx,dcr-splb-slave-if", NULL); |
427 | tft_access = p ? *p : 0; | 427 | tft_access = p ? *p : 0; |
428 | 428 | ||
429 | /* | 429 | /* |
@@ -432,41 +432,41 @@ xilinxfb_of_probe(struct of_device *op, const struct of_device_id *match) | |||
432 | */ | 432 | */ |
433 | if (tft_access) { | 433 | if (tft_access) { |
434 | drvdata->flags |= PLB_ACCESS_FLAG; | 434 | drvdata->flags |= PLB_ACCESS_FLAG; |
435 | rc = of_address_to_resource(op->node, 0, &res); | 435 | rc = of_address_to_resource(op->dev.of_node, 0, &res); |
436 | if (rc) { | 436 | if (rc) { |
437 | dev_err(&op->dev, "invalid address\n"); | 437 | dev_err(&op->dev, "invalid address\n"); |
438 | goto err; | 438 | goto err; |
439 | } | 439 | } |
440 | } else { | 440 | } else { |
441 | res.start = 0; | 441 | res.start = 0; |
442 | start = dcr_resource_start(op->node, 0); | 442 | start = dcr_resource_start(op->dev.of_node, 0); |
443 | drvdata->dcr_len = dcr_resource_len(op->node, 0); | 443 | drvdata->dcr_len = dcr_resource_len(op->dev.of_node, 0); |
444 | drvdata->dcr_host = dcr_map(op->node, start, drvdata->dcr_len); | 444 | drvdata->dcr_host = dcr_map(op->dev.of_node, start, drvdata->dcr_len); |
445 | if (!DCR_MAP_OK(drvdata->dcr_host)) { | 445 | if (!DCR_MAP_OK(drvdata->dcr_host)) { |
446 | dev_err(&op->dev, "invalid DCR address\n"); | 446 | dev_err(&op->dev, "invalid DCR address\n"); |
447 | goto err; | 447 | goto err; |
448 | } | 448 | } |
449 | } | 449 | } |
450 | 450 | ||
451 | prop = of_get_property(op->node, "phys-size", &size); | 451 | prop = of_get_property(op->dev.of_node, "phys-size", &size); |
452 | if ((prop) && (size >= sizeof(u32)*2)) { | 452 | if ((prop) && (size >= sizeof(u32)*2)) { |
453 | pdata.screen_width_mm = prop[0]; | 453 | pdata.screen_width_mm = prop[0]; |
454 | pdata.screen_height_mm = prop[1]; | 454 | pdata.screen_height_mm = prop[1]; |
455 | } | 455 | } |
456 | 456 | ||
457 | prop = of_get_property(op->node, "resolution", &size); | 457 | prop = of_get_property(op->dev.of_node, "resolution", &size); |
458 | if ((prop) && (size >= sizeof(u32)*2)) { | 458 | if ((prop) && (size >= sizeof(u32)*2)) { |
459 | pdata.xres = prop[0]; | 459 | pdata.xres = prop[0]; |
460 | pdata.yres = prop[1]; | 460 | pdata.yres = prop[1]; |
461 | } | 461 | } |
462 | 462 | ||
463 | prop = of_get_property(op->node, "virtual-resolution", &size); | 463 | prop = of_get_property(op->dev.of_node, "virtual-resolution", &size); |
464 | if ((prop) && (size >= sizeof(u32)*2)) { | 464 | if ((prop) && (size >= sizeof(u32)*2)) { |
465 | pdata.xvirt = prop[0]; | 465 | pdata.xvirt = prop[0]; |
466 | pdata.yvirt = prop[1]; | 466 | pdata.yvirt = prop[1]; |
467 | } | 467 | } |
468 | 468 | ||
469 | if (of_find_property(op->node, "rotate-display", NULL)) | 469 | if (of_find_property(op->dev.of_node, "rotate-display", NULL)) |
470 | pdata.rotate_screen = 1; | 470 | pdata.rotate_screen = 1; |
471 | 471 | ||
472 | dev_set_drvdata(&op->dev, drvdata); | 472 | dev_set_drvdata(&op->dev, drvdata); |