projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[POWERPC] Add support for 750CL Holly board
[powerpc.git]
/
arch
/
powerpc
/
kernel
/
btext.c
diff --git
a/arch/powerpc/kernel/btext.c
b/arch/powerpc/kernel/btext.c
index
3678997
..
e7b6846
100644
(file)
--- a/
arch/powerpc/kernel/btext.c
+++ b/
arch/powerpc/kernel/btext.c
@@
-161,33
+161,33
@@
int btext_initialize(struct device_node *np)
unsigned long address = 0;
const u32 *prop;
unsigned long address = 0;
const u32 *prop;
- prop = get_property(np, "linux,bootx-width", NULL);
+ prop =
of_
get_property(np, "linux,bootx-width", NULL);
if (prop == NULL)
if (prop == NULL)
- prop = get_property(np, "width", NULL);
+ prop =
of_
get_property(np, "width", NULL);
if (prop == NULL)
return -EINVAL;
width = *prop;
if (prop == NULL)
return -EINVAL;
width = *prop;
- prop = get_property(np, "linux,bootx-height", NULL);
+ prop =
of_
get_property(np, "linux,bootx-height", NULL);
if (prop == NULL)
if (prop == NULL)
- prop = get_property(np, "height", NULL);
+ prop =
of_
get_property(np, "height", NULL);
if (prop == NULL)
return -EINVAL;
height = *prop;
if (prop == NULL)
return -EINVAL;
height = *prop;
- prop = get_property(np, "linux,bootx-depth", NULL);
+ prop =
of_
get_property(np, "linux,bootx-depth", NULL);
if (prop == NULL)
if (prop == NULL)
- prop = get_property(np, "depth", NULL);
+ prop =
of_
get_property(np, "depth", NULL);
if (prop == NULL)
return -EINVAL;
depth = *prop;
pitch = width * ((depth + 7) / 8);
if (prop == NULL)
return -EINVAL;
depth = *prop;
pitch = width * ((depth + 7) / 8);
- prop = get_property(np, "linux,bootx-linebytes", NULL);
+ prop =
of_
get_property(np, "linux,bootx-linebytes", NULL);
if (prop == NULL)
if (prop == NULL)
- prop = get_property(np, "linebytes", NULL);
+ prop =
of_
get_property(np, "linebytes", NULL);
if (prop && *prop != 0xffffffffu)
pitch = *prop;
if (pitch == 1)
pitch = 0x1000;
if (prop && *prop != 0xffffffffu)
pitch = *prop;
if (pitch == 1)
pitch = 0x1000;
- prop = get_property(np, "address", NULL);
+ prop =
of_
get_property(np, "address", NULL);
if (prop)
address = *prop;
if (prop)
address = *prop;
@@
-219,7
+219,7
@@
int __init btext_find_display(int allow_nonstdout)
struct device_node *np = NULL;
int rc = -ENODEV;
struct device_node *np = NULL;
int rc = -ENODEV;
- name = get_property(of_chosen, "linux,stdout-path", NULL);
+ name =
of_
get_property(of_chosen, "linux,stdout-path", NULL);
if (name != NULL) {
np = of_find_node_by_path(name);
if (np != NULL) {
if (name != NULL) {
np = of_find_node_by_path(name);
if (np != NULL) {
@@
-236,7
+236,7
@@
int __init btext_find_display(int allow_nonstdout)
return rc;
for (np = NULL; (np = of_find_node_by_type(np, "display"));) {
return rc;
for (np = NULL; (np = of_find_node_by_type(np, "display"));) {
- if (get_property(np, "linux,opened", NULL)) {
+ if (
of_
get_property(np, "linux,opened", NULL)) {
printk("trying %s ...\n", np->full_name);
rc = btext_initialize(np);
printk("result: %d\n", rc);
printk("trying %s ...\n", np->full_name);
rc = btext_initialize(np);
printk("result: %d\n", rc);