lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[POWERPC] fsl_soc.c cleanup

Browse Source 
1. Update the way get_brgfreq() finds things in the device tree.

It now uses names that are less namespace polluting.  The old names
are supported until all boards are converted.

2. "size" is changed from unsigned int to int, to match what
of_get_property() expects.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Scott Wood
2007-08-20 11:38:12 -05:00
committed by Kumar Gala
parent 683d00b03e
commit f923473611
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
arch/powerpc/sysdev/fsl_soc.c
View File

@@ -52,13 +52,13 @@ phys_addr_t get_immrbase(void)
soc = of_find_node_by_type(NULL, "soc"); soc = of_find_node_by_type(NULL, "soc");
if (soc) { if (soc) {
unsigned int size; int size;
const void *prop = of_get_property(soc, "reg", &size); const void *prop = of_get_property(soc, "reg", &size);
if (prop) if (prop)
immrbase = of_translate_address(soc, prop); immrbase = of_translate_address(soc, prop);
of_node_put(soc); of_node_put(soc);
}; }
return immrbase; return immrbase;
} }
@@ -76,16 +76,23 @@ u32 get_brgfreq(void)
if (brgfreq != -1) if (brgfreq != -1)
return brgfreq; return brgfreq;
node = of_find_node_by_type(NULL, "cpm"); node = of_find_compatible_node(NULL, NULL, "fsl,cpm1");
if (!node)
node = of_find_compatible_node(NULL, NULL, "fsl,cpm2");
if (!node)
node = of_find_node_by_type(NULL, "cpm");
if (node) { if (node) {
unsigned int size; int size;
const unsigned int *prop = of_get_property(node, const unsigned int *prop;
"brg-frequency", &size);
if (prop) prop = of_get_property(node, "fsl,brg-frequency", &size);
if (!prop)
prop = of_get_property(node, "brg-frequency", &size);
if (prop && size == 4)
brgfreq = *prop; brgfreq = *prop;
of_node_put(node); of_node_put(node);
}; }
return brgfreq; return brgfreq;
} }
@@ -103,14 +110,14 @@ u32 get_baudrate(void)
node = of_find_node_by_type(NULL, "serial"); node = of_find_node_by_type(NULL, "serial");
if (node) { if (node) {
unsigned int size; int size;
const unsigned int *prop = of_get_property(node, const unsigned int *prop = of_get_property(node,
"current-speed", &size); "current-speed", &size);
if (prop) if (prop)
fs_baudrate = *prop; fs_baudrate = *prop;
of_node_put(node); of_node_put(node);
}; }
return fs_baudrate; return fs_baudrate;
} }