diff options
Diffstat (limited to 'drivers/video/aty')
-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 |
3 files changed, 10 insertions, 9 deletions
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c index 0ec36cd5de28..2ce050193018 100644 --- a/drivers/video/aty/radeon_base.c +++ b/drivers/video/aty/radeon_base.c | |||
@@ -424,7 +424,7 @@ static int __devinit radeon_read_xtal_OF (struct radeonfb_info *rinfo) | |||
424 | 424 | ||
425 | if (dp == NULL) | 425 | if (dp == NULL) |
426 | return -ENODEV; | 426 | return -ENODEV; |
427 | val = get_property(dp, "ATY,RefCLK", NULL); | 427 | val = of_get_property(dp, "ATY,RefCLK", NULL); |
428 | if (!val || !*val) { | 428 | if (!val || !*val) { |
429 | printk(KERN_WARNING "radeonfb: No ATY,RefCLK property !\n"); | 429 | printk(KERN_WARNING "radeonfb: No ATY,RefCLK property !\n"); |
430 | return -EINVAL; | 430 | return -EINVAL; |
@@ -432,11 +432,11 @@ static int __devinit radeon_read_xtal_OF (struct radeonfb_info *rinfo) | |||
432 | 432 | ||
433 | rinfo->pll.ref_clk = (*val) / 10; | 433 | rinfo->pll.ref_clk = (*val) / 10; |
434 | 434 | ||
435 | val = get_property(dp, "ATY,SCLK", NULL); | 435 | val = of_get_property(dp, "ATY,SCLK", NULL); |
436 | if (val && *val) | 436 | if (val && *val) |
437 | rinfo->pll.sclk = (*val) / 10; | 437 | rinfo->pll.sclk = (*val) / 10; |
438 | 438 | ||
439 | val = get_property(dp, "ATY,MCLK", NULL); | 439 | val = of_get_property(dp, "ATY,MCLK", NULL); |
440 | if (val && *val) | 440 | if (val && *val) |
441 | rinfo->pll.mclk = (*val) / 10; | 441 | rinfo->pll.mclk = (*val) / 10; |
442 | 442 | ||
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 4425f7e90309..be1d57bf9dc8 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 |