V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

fdt: remove fdtdec_get_alias_node() function 

The fdt_path_offset() checks an alias too.

fdtdec_get_alias_node(blob, "foo") is equivalent to
fdt_path_offset(blob, "foo").

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Masahiro Yamada 2014-11-21 19:47:08 +09:00 committed by Simon Glass
parent 85bafb6da4
commit 0bd4e39d2b
3 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/serial/serial-uclass.c
View File

@ -39,7 +39,7 @@ static void serial_find_console_or_panic(void)
/* Check for a chosen console */ /* Check for a chosen console */
node = fdtdec_get_chosen_node(gd->fdt_blob, "stdout-path"); node = fdtdec_get_chosen_node(gd->fdt_blob, "stdout-path");
if (node < 0) if (node < 0)
node = fdtdec_get_alias_node(gd->fdt_blob, "console"); node = fdt_path_offset(gd->fdt_blob, "console");
if (!uclass_get_device_by_of_offset(UCLASS_SERIAL, node, &dev)) { if (!uclass_get_device_by_of_offset(UCLASS_SERIAL, node, &dev)) {
gd->cur_serial_dev = dev; gd->cur_serial_dev = dev;
return; return;

11
include/fdtdec.h
View File

@ -389,17 +389,6 @@ int fdtdec_add_aliases_for_id(const void *blob, const char *name,
int fdtdec_get_alias_seq(const void *blob, const char *base, int node, int fdtdec_get_alias_seq(const void *blob, const char *base, int node,
int *seqp); int *seqp);
/**
* Get the offset of the given alias node
*
* This looks up an alias in /aliases then finds the offset of that node.
*
* @param blob Device tree blob (if NULL, then error is returned)
* @param name Alias name, e.g. "console"
* @return Node offset referred to by that alias, or -ve FDT_ERR_...
*/
int fdtdec_get_alias_node(const void *blob, const char *name);
/** /**
* Get the offset of the given chosen node * Get the offset of the given chosen node
* *

15
lib/fdtdec.c
View File

@ -370,21 +370,6 @@ int fdtdec_get_alias_seq(const void *blob, const char *base, int offset,
return -ENOENT; return -ENOENT;
} }
int fdtdec_get_alias_node(const void *blob, const char *name)
{
const char *prop;
int alias_node;
int len;
if (!blob)
return -FDT_ERR_NOTFOUND;
alias_node = fdt_path_offset(blob, "/aliases");
prop = fdt_getprop(blob, alias_node, name, &len);
if (!prop)
return -FDT_ERR_NOTFOUND;
return fdt_path_offset(blob, prop);
}
int fdtdec_get_chosen_node(const void *blob, const char *name) int fdtdec_get_chosen_node(const void *blob, const char *name)
{ {
const char *prop; const char *prop;