Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-12-02 09:30:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

powerpc/mpc85xx: Fix portal setup

Browse source 
Missing nodes of crypto, pme, etc in device tree is not a fatal error.
Setting up the qman portal should skip the missing node and continue
to finish the rest.

Signed-off-by: York Sun <yorksun@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
This commit is contained in:
York Sun 2013-03-25 07:33:21 +00:00 committed by Andy Fleming
parent 0a7c5353a4
commit e1d5a2773f
1 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
arch/powerpc/cpu/mpc85xx/portals.c
View file

@ -128,10 +128,6 @@ static int fdt_qportal(void *blob, int off, int id, char *name,
childoff = fdt_subnode_offset(blob, off, name); childoff = fdt_subnode_offset(blob, off, name);
if (create) { if (create) {
if (childoff <= 0)
childoff = fdt_add_subnode(blob, off, name);
if (childoff > 0) {
char handle[64], *p; char handle[64], *p;
strncpy(handle, name, sizeof(handle)); strncpy(handle, name, sizeof(handle));
@ -143,9 +139,21 @@ static int fdt_qportal(void *blob, int off, int id, char *name,
*p = '\0'; *p = '\0';
dev_off = fdt_path_offset(blob, handle); dev_off = fdt_path_offset(blob, handle);
/* skip this node if alias is not found */
if (dev_off == -FDT_ERR_BADPATH)
return 0;
if (dev_off < 0) if (dev_off < 0)
return dev_off; return dev_off;
if (childoff <= 0)
childoff = fdt_add_subnode(blob, off, name);
/* need to update the dev_off after adding a subnode */
dev_off = fdt_path_offset(blob, handle);
if (dev_off < 0)
return dev_off;
if (childoff > 0) {
dev_handle = fdt_get_phandle(blob, dev_off); dev_handle = fdt_get_phandle(blob, dev_off);
if (dev_handle <= 0) { if (dev_handle <= 0) {
dev_handle = fdt_alloc_phandle(blob); dev_handle = fdt_alloc_phandle(blob);