diff options
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/aty/radeon_base.c | 6 | ||||
-rw-r--r-- | drivers/video/aty/radeon_monitor.c | 11 | ||||
-rw-r--r-- | drivers/video/aty/radeon_pm.c | 2 | ||||
-rw-r--r-- | drivers/video/nvidia/nv_of.c | 8 | ||||
-rw-r--r-- | drivers/video/offb.c | 32 | ||||
-rw-r--r-- | drivers/video/ps3fb.c | 12 | ||||
-rw-r--r-- | drivers/video/riva/fbdev.c | 4 |
7 files changed, 38 insertions, 37 deletions
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c index a4b3fd185de7..9d629fe1709d 100644 --- a/drivers/video/aty/radeon_base.c +++ b/drivers/video/aty/radeon_base.c | |||
@@ -422,7 +422,7 @@ static int __devinit radeon_read_xtal_OF (struct radeonfb_info *rinfo) | |||
422 | 422 | ||
423 | if (dp == NULL) | 423 | if (dp == NULL) |
424 | return -ENODEV; | 424 | return -ENODEV; |
425 | val = get_property(dp, "ATY,RefCLK", NULL); | 425 | val = of_get_property(dp, "ATY,RefCLK", NULL); |
426 | if (!val || !*val) { | 426 | if (!val || !*val) { |
427 | printk(KERN_WARNING "radeonfb: No ATY,RefCLK property !\n"); | 427 | printk(KERN_WARNING "radeonfb: No ATY,RefCLK property !\n"); |
428 | return -EINVAL; | 428 | return -EINVAL; |
@@ -430,11 +430,11 @@ static int __devinit radeon_read_xtal_OF (struct radeonfb_info *rinfo) | |||
430 | 430 | ||
431 | rinfo->pll.ref_clk = (*val) / 10; | 431 | rinfo->pll.ref_clk = (*val) / 10; |
432 | 432 | ||
433 | val = get_property(dp, "ATY,SCLK", NULL); | 433 | val = of_get_property(dp, "ATY,SCLK", NULL); |
434 | if (val && *val) | 434 | if (val && *val) |
435 | rinfo->pll.sclk = (*val) / 10; | 435 | rinfo->pll.sclk = (*val) / 10; |
436 | 436 | ||
437 | val = get_property(dp, "ATY,MCLK", NULL); | 437 | val = of_get_property(dp, "ATY,MCLK", NULL); |
438 | if (val && *val) | 438 | if (val && *val) |
439 | rinfo->pll.mclk = (*val) / 10; | 439 | rinfo->pll.mclk = (*val) / 10; |
440 | 440 | ||
diff --git a/drivers/video/aty/radeon_monitor.c b/drivers/video/aty/radeon_monitor.c index 737b5c09dbdb..2030ed813429 100644 --- a/drivers/video/aty/radeon_monitor.c +++ b/drivers/video/aty/radeon_monitor.c | |||
@@ -70,7 +70,7 @@ static int __devinit radeon_parse_montype_prop(struct device_node *dp, u8 **out_ | |||
70 | int i, mt = MT_NONE; | 70 | int i, mt = MT_NONE; |
71 | 71 | ||
72 | RTRACE("analyzing OF properties...\n"); | 72 | RTRACE("analyzing OF properties...\n"); |
73 | pmt = get_property(dp, "display-type", NULL); | 73 | pmt = of_get_property(dp, "display-type", NULL); |
74 | if (!pmt) | 74 | if (!pmt) |
75 | return MT_NONE; | 75 | return MT_NONE; |
76 | RTRACE("display-type: %s\n", pmt); | 76 | RTRACE("display-type: %s\n", pmt); |
@@ -89,7 +89,7 @@ static int __devinit radeon_parse_montype_prop(struct device_node *dp, u8 **out_ | |||
89 | } | 89 | } |
90 | 90 | ||
91 | for (i = 0; propnames[i] != NULL; ++i) { | 91 | for (i = 0; propnames[i] != NULL; ++i) { |
92 | pedid = get_property(dp, propnames[i], NULL); | 92 | pedid = of_get_property(dp, propnames[i], NULL); |
93 | if (pedid != NULL) | 93 | if (pedid != NULL) |
94 | break; | 94 | break; |
95 | } | 95 | } |
@@ -98,9 +98,10 @@ static int __devinit radeon_parse_montype_prop(struct device_node *dp, u8 **out_ | |||
98 | * single-head cards have hdno == -1 and skip this step | 98 | * single-head cards have hdno == -1 and skip this step |
99 | */ | 99 | */ |
100 | if (pedid == NULL && dp->parent && (hdno != -1)) | 100 | if (pedid == NULL && dp->parent && (hdno != -1)) |
101 | pedid = get_property(dp->parent, (hdno == 0) ? "EDID1" : "EDID2", NULL); | 101 | pedid = of_get_property(dp->parent, |
102 | (hdno == 0) ? "EDID1" : "EDID2", NULL); | ||
102 | if (pedid == NULL && dp->parent && (hdno == 0)) | 103 | if (pedid == NULL && dp->parent && (hdno == 0)) |
103 | pedid = get_property(dp->parent, "EDID", NULL); | 104 | pedid = of_get_property(dp->parent, "EDID", NULL); |
104 | if (pedid == NULL) | 105 | if (pedid == NULL) |
105 | return mt; | 106 | return mt; |
106 | 107 | ||
@@ -130,7 +131,7 @@ static int __devinit radeon_probe_OF_head(struct radeonfb_info *rinfo, int head_ | |||
130 | do { | 131 | do { |
131 | if (!dp) | 132 | if (!dp) |
132 | return MT_NONE; | 133 | return MT_NONE; |
133 | pname = get_property(dp, "name", NULL); | 134 | pname = of_get_property(dp, "name", NULL); |
134 | if (!pname) | 135 | if (!pname) |
135 | return MT_NONE; | 136 | return MT_NONE; |
136 | len = strlen(pname); | 137 | len = strlen(pname); |
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c index c411293cefc8..1786ae188322 100644 --- a/drivers/video/aty/radeon_pm.c +++ b/drivers/video/aty/radeon_pm.c | |||
@@ -1290,7 +1290,7 @@ static void radeon_pm_full_reset_sdram(struct radeonfb_info *rinfo) | |||
1290 | if (rinfo->of_node != NULL) { | 1290 | if (rinfo->of_node != NULL) { |
1291 | int size; | 1291 | int size; |
1292 | 1292 | ||
1293 | mrtable = get_property(rinfo->of_node, "ATY,MRT", &size); | 1293 | mrtable = of_get_property(rinfo->of_node, "ATY,MRT", &size); |
1294 | if (mrtable) | 1294 | if (mrtable) |
1295 | mrtable_size = size >> 2; | 1295 | mrtable_size = size >> 2; |
1296 | else | 1296 | else |
diff --git a/drivers/video/nvidia/nv_of.c b/drivers/video/nvidia/nv_of.c index 163a774a1b30..73afd7eb9977 100644 --- a/drivers/video/nvidia/nv_of.c +++ b/drivers/video/nvidia/nv_of.c | |||
@@ -46,15 +46,15 @@ int nvidia_probe_of_connector(struct fb_info *info, int conn, u8 **out_edid) | |||
46 | 46 | ||
47 | for (dp = NULL; | 47 | for (dp = NULL; |
48 | (dp = of_get_next_child(parent, dp)) != NULL;) { | 48 | (dp = of_get_next_child(parent, dp)) != NULL;) { |
49 | pname = get_property(dp, "name", NULL); | 49 | pname = of_get_property(dp, "name", NULL); |
50 | if (!pname) | 50 | if (!pname) |
51 | continue; | 51 | continue; |
52 | len = strlen(pname); | 52 | len = strlen(pname); |
53 | if ((pname[len-1] == 'A' && conn == 1) || | 53 | if ((pname[len-1] == 'A' && conn == 1) || |
54 | (pname[len-1] == 'B' && conn == 2)) { | 54 | (pname[len-1] == 'B' && conn == 2)) { |
55 | for (i = 0; propnames[i] != NULL; ++i) { | 55 | for (i = 0; propnames[i] != NULL; ++i) { |
56 | pedid = get_property(dp, propnames[i], | 56 | pedid = of_get_property(dp, |
57 | NULL); | 57 | propnames[i], NULL); |
58 | if (pedid != NULL) | 58 | if (pedid != NULL) |
59 | break; | 59 | break; |
60 | } | 60 | } |
@@ -65,7 +65,7 @@ int nvidia_probe_of_connector(struct fb_info *info, int conn, u8 **out_edid) | |||
65 | } | 65 | } |
66 | if (pedid == NULL) { | 66 | if (pedid == NULL) { |
67 | for (i = 0; propnames[i] != NULL; ++i) { | 67 | for (i = 0; propnames[i] != NULL; ++i) { |
68 | pedid = get_property(parent, propnames[i], NULL); | 68 | pedid = of_get_property(parent, propnames[i], NULL); |
69 | if (pedid != NULL) | 69 | if (pedid != NULL) |
70 | break; | 70 | break; |
71 | } | 71 | } |
diff --git a/drivers/video/offb.c b/drivers/video/offb.c index 9576a55eaf16..885b42836cbb 100644 --- a/drivers/video/offb.c +++ b/drivers/video/offb.c | |||
@@ -322,8 +322,8 @@ static void __init offb_init_fb(const char *name, const char *full_name, | |||
322 | ioremap(base + 0x7ff000, 0x1000) + 0xcc0; | 322 | ioremap(base + 0x7ff000, 0x1000) + 0xcc0; |
323 | par->cmap_data = par->cmap_adr + 1; | 323 | par->cmap_data = par->cmap_adr + 1; |
324 | par->cmap_type = cmap_m64; | 324 | par->cmap_type = cmap_m64; |
325 | } else if (dp && (device_is_compatible(dp, "pci1014,b7") || | 325 | } else if (dp && (of_device_is_compatible(dp, "pci1014,b7") || |
326 | device_is_compatible(dp, "pci1014,21c"))) { | 326 | of_device_is_compatible(dp, "pci1014,21c"))) { |
327 | par->cmap_adr = offb_map_reg(dp, 0, 0x6000, 0x1000); | 327 | par->cmap_adr = offb_map_reg(dp, 0, 0x6000, 0x1000); |
328 | if (par->cmap_adr) | 328 | if (par->cmap_adr) |
329 | par->cmap_type = cmap_gxt2000; | 329 | par->cmap_type = cmap_gxt2000; |
@@ -425,27 +425,27 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node) | |||
425 | const u32 *pp, *addrp, *up; | 425 | const u32 *pp, *addrp, *up; |
426 | u64 asize; | 426 | u64 asize; |
427 | 427 | ||
428 | pp = get_property(dp, "linux,bootx-depth", &len); | 428 | pp = of_get_property(dp, "linux,bootx-depth", &len); |
429 | if (pp == NULL) | 429 | if (pp == NULL) |
430 | pp = get_property(dp, "depth", &len); | 430 | pp = of_get_property(dp, "depth", &len); |
431 | if (pp && len == sizeof(u32)) | 431 | if (pp && len == sizeof(u32)) |
432 | depth = *pp; | 432 | depth = *pp; |
433 | 433 | ||
434 | pp = get_property(dp, "linux,bootx-width", &len); | 434 | pp = of_get_property(dp, "linux,bootx-width", &len); |
435 | if (pp == NULL) | 435 | if (pp == NULL) |
436 | pp = get_property(dp, "width", &len); | 436 | pp = of_get_property(dp, "width", &len); |
437 | if (pp && len == sizeof(u32)) | 437 | if (pp && len == sizeof(u32)) |
438 | width = *pp; | 438 | width = *pp; |
439 | 439 | ||
440 | pp = get_property(dp, "linux,bootx-height", &len); | 440 | pp = of_get_property(dp, "linux,bootx-height", &len); |
441 | if (pp == NULL) | 441 | if (pp == NULL) |
442 | pp = get_property(dp, "height", &len); | 442 | pp = of_get_property(dp, "height", &len); |
443 | if (pp && len == sizeof(u32)) | 443 | if (pp && len == sizeof(u32)) |
444 | height = *pp; | 444 | height = *pp; |
445 | 445 | ||
446 | pp = get_property(dp, "linux,bootx-linebytes", &len); | 446 | pp = of_get_property(dp, "linux,bootx-linebytes", &len); |
447 | if (pp == NULL) | 447 | if (pp == NULL) |
448 | pp = get_property(dp, "linebytes", &len); | 448 | pp = of_get_property(dp, "linebytes", &len); |
449 | if (pp && len == sizeof(u32) && (*pp != 0xffffffffu)) | 449 | if (pp && len == sizeof(u32) && (*pp != 0xffffffffu)) |
450 | pitch = *pp; | 450 | pitch = *pp; |
451 | else | 451 | else |
@@ -463,9 +463,9 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node) | |||
463 | * ranges and pick one that is both big enough and if possible encloses | 463 | * ranges and pick one that is both big enough and if possible encloses |
464 | * the "address" property. If none match, we pick the biggest | 464 | * the "address" property. If none match, we pick the biggest |
465 | */ | 465 | */ |
466 | up = get_property(dp, "linux,bootx-addr", &len); | 466 | up = of_get_property(dp, "linux,bootx-addr", &len); |
467 | if (up == NULL) | 467 | if (up == NULL) |
468 | up = get_property(dp, "address", &len); | 468 | up = of_get_property(dp, "address", &len); |
469 | if (up && len == sizeof(u32)) | 469 | if (up && len == sizeof(u32)) |
470 | addr_prop = *up; | 470 | addr_prop = *up; |
471 | 471 | ||
@@ -521,7 +521,7 @@ static int __init offb_init(void) | |||
521 | return -ENODEV; | 521 | return -ENODEV; |
522 | 522 | ||
523 | /* Check if we have a MacOS display without a node spec */ | 523 | /* Check if we have a MacOS display without a node spec */ |
524 | if (get_property(of_chosen, "linux,bootx-noscreen", NULL) != NULL) { | 524 | if (of_get_property(of_chosen, "linux,bootx-noscreen", NULL) != NULL) { |
525 | /* The old code tried to work out which node was the MacOS | 525 | /* The old code tried to work out which node was the MacOS |
526 | * display based on the address. I'm dropping that since the | 526 | * display based on the address. I'm dropping that since the |
527 | * lack of a node spec only happens with old BootX versions | 527 | * lack of a node spec only happens with old BootX versions |
@@ -532,14 +532,14 @@ static int __init offb_init(void) | |||
532 | } | 532 | } |
533 | 533 | ||
534 | for (dp = NULL; (dp = of_find_node_by_type(dp, "display"));) { | 534 | for (dp = NULL; (dp = of_find_node_by_type(dp, "display"));) { |
535 | if (get_property(dp, "linux,opened", NULL) && | 535 | if (of_get_property(dp, "linux,opened", NULL) && |
536 | get_property(dp, "linux,boot-display", NULL)) { | 536 | of_get_property(dp, "linux,boot-display", NULL)) { |
537 | boot_disp = dp; | 537 | boot_disp = dp; |
538 | offb_init_nodriver(dp, 0); | 538 | offb_init_nodriver(dp, 0); |
539 | } | 539 | } |
540 | } | 540 | } |
541 | for (dp = NULL; (dp = of_find_node_by_type(dp, "display"));) { | 541 | for (dp = NULL; (dp = of_find_node_by_type(dp, "display"));) { |
542 | if (get_property(dp, "linux,opened", NULL) && | 542 | if (of_get_property(dp, "linux,opened", NULL) && |
543 | dp != boot_disp) | 543 | dp != boot_disp) |
544 | offb_init_nodriver(dp, 0); | 544 | offb_init_nodriver(dp, 0); |
545 | } | 545 | } |
diff --git a/drivers/video/ps3fb.c b/drivers/video/ps3fb.c index 07d1979bc23e..9756a728b74f 100644 --- a/drivers/video/ps3fb.c +++ b/drivers/video/ps3fb.c | |||
@@ -898,8 +898,8 @@ static int ps3fb_vsync_settings(struct gpu_driver_info *dinfo, void *dev) | |||
898 | } | 898 | } |
899 | 899 | ||
900 | ps3fb.dev = dev; | 900 | ps3fb.dev = dev; |
901 | error = ps3_alloc_irq(PS3_BINDING_CPU_ANY, dinfo->irq.irq_outlet, | 901 | error = ps3_irq_plug_setup(PS3_BINDING_CPU_ANY, dinfo->irq.irq_outlet, |
902 | &ps3fb.irq_no); | 902 | &ps3fb.irq_no); |
903 | if (error) { | 903 | if (error) { |
904 | printk(KERN_ERR "%s: ps3_alloc_irq failed %d\n", __func__, | 904 | printk(KERN_ERR "%s: ps3_alloc_irq failed %d\n", __func__, |
905 | error); | 905 | error); |
@@ -911,7 +911,7 @@ static int ps3fb_vsync_settings(struct gpu_driver_info *dinfo, void *dev) | |||
911 | if (error) { | 911 | if (error) { |
912 | printk(KERN_ERR "%s: request_irq failed %d\n", __func__, | 912 | printk(KERN_ERR "%s: request_irq failed %d\n", __func__, |
913 | error); | 913 | error); |
914 | ps3_free_irq(ps3fb.irq_no); | 914 | ps3_irq_plug_destroy(ps3fb.irq_no); |
915 | return error; | 915 | return error; |
916 | } | 916 | } |
917 | 917 | ||
@@ -1083,7 +1083,7 @@ err_framebuffer_release: | |||
1083 | framebuffer_release(info); | 1083 | framebuffer_release(info); |
1084 | err_free_irq: | 1084 | err_free_irq: |
1085 | free_irq(ps3fb.irq_no, ps3fb.dev); | 1085 | free_irq(ps3fb.irq_no, ps3fb.dev); |
1086 | ps3_free_irq(ps3fb.irq_no); | 1086 | ps3_irq_plug_destroy(ps3fb.irq_no); |
1087 | err_iounmap_dinfo: | 1087 | err_iounmap_dinfo: |
1088 | iounmap((u8 __iomem *)ps3fb.dinfo); | 1088 | iounmap((u8 __iomem *)ps3fb.dinfo); |
1089 | err_gpu_context_free: | 1089 | err_gpu_context_free: |
@@ -1099,7 +1099,7 @@ static void ps3fb_shutdown(struct platform_device *dev) | |||
1099 | ps3fb_flip_ctl(0); /* flip off */ | 1099 | ps3fb_flip_ctl(0); /* flip off */ |
1100 | ps3fb.dinfo->irq.mask = 0; | 1100 | ps3fb.dinfo->irq.mask = 0; |
1101 | free_irq(ps3fb.irq_no, ps3fb.dev); | 1101 | free_irq(ps3fb.irq_no, ps3fb.dev); |
1102 | ps3_free_irq(ps3fb.irq_no); | 1102 | ps3_irq_plug_destroy(ps3fb.irq_no); |
1103 | iounmap((u8 __iomem *)ps3fb.dinfo); | 1103 | iounmap((u8 __iomem *)ps3fb.dinfo); |
1104 | } | 1104 | } |
1105 | 1105 | ||
@@ -1114,7 +1114,7 @@ void ps3fb_cleanup(void) | |||
1114 | } | 1114 | } |
1115 | if (ps3fb.irq_no) { | 1115 | if (ps3fb.irq_no) { |
1116 | free_irq(ps3fb.irq_no, ps3fb.dev); | 1116 | free_irq(ps3fb.irq_no, ps3fb.dev); |
1117 | ps3_free_irq(ps3fb.irq_no); | 1117 | ps3_irq_plug_destroy(ps3fb.irq_no); |
1118 | } | 1118 | } |
1119 | iounmap((u8 __iomem *)ps3fb.dinfo); | 1119 | iounmap((u8 __iomem *)ps3fb.dinfo); |
1120 | 1120 | ||
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c index d7ece8d17a2c..9c6bd0991852 100644 --- a/drivers/video/riva/fbdev.c +++ b/drivers/video/riva/fbdev.c | |||
@@ -1760,13 +1760,13 @@ static int __devinit riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd) | |||
1760 | NVTRACE_ENTER(); | 1760 | NVTRACE_ENTER(); |
1761 | dp = pci_device_to_OF_node(pd); | 1761 | dp = pci_device_to_OF_node(pd); |
1762 | for (; dp != NULL; dp = dp->child) { | 1762 | for (; dp != NULL; dp = dp->child) { |
1763 | disptype = get_property(dp, "display-type", NULL); | 1763 | disptype = of_get_property(dp, "display-type", NULL); |
1764 | if (disptype == NULL) | 1764 | if (disptype == NULL) |
1765 | continue; | 1765 | continue; |
1766 | if (strncmp(disptype, "LCD", 3) != 0) | 1766 | if (strncmp(disptype, "LCD", 3) != 0) |
1767 | continue; | 1767 | continue; |
1768 | for (i = 0; propnames[i] != NULL; ++i) { | 1768 | for (i = 0; propnames[i] != NULL; ++i) { |
1769 | pedid = get_property(dp, propnames[i], NULL); | 1769 | pedid = of_get_property(dp, propnames[i], NULL); |
1770 | if (pedid != NULL) { | 1770 | if (pedid != NULL) { |
1771 | par->EDID = (unsigned char *)pedid; | 1771 | par->EDID = (unsigned char *)pedid; |
1772 | NVTRACE("LCD found.\n"); | 1772 | NVTRACE("LCD found.\n"); |