linux-next: manual merge of the devicetree tree with the devicetree-current tree

linux-next: manual merge of the devicetree tree with the devicetree-current tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1170 bytes --]

Hi Grant,

Today's linux-next merge of the devicetree tree got a conflict in
drivers/of/address.c between commit 746c9e9f92dd ("of/base: Fix PowerPC
address parsing hack") from the  tree and commit a0212ae0be5b
("of/address: Don't throw errors on absent ranges properties") from the
devicetree tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/of/address.c
index 06af494184d6,78f02f65fc48..000000000000
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@@ -490,10 -475,12 +490,10 @@@ static int of_translate_one(struct devi
  	 * This code is only enabled on powerpc. --gcl
  	 */
  	ranges = of_get_property(parent, rprop, &rlen);
 -#if !defined(CONFIG_PPC)
 -	if (ranges == NULL) {
 +	if (ranges == NULL && !of_empty_ranges_quirk()) {
- 		pr_err("OF: no ranges; cannot translate\n");
+ 		pr_debug("OF: no ranges; cannot translate\n");
  		return 1;
  	}
 -#endif /* !defined(CONFIG_PPC) */
  	if (ranges == NULL || rlen == 0) {
  		offset = of_read_number(addr, na);
  		memset(addr, 0, pna * 4);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: manual merge of the devicetree tree with the devicetree-current tree

[Grant Likely]

Thanks Stephen,

Yes, that looks right, but I'm going to drop the patch from my tree.
It isn't a critical fix. The failure it solves is not a serious or
dangerous.

Thanks,
g.

On Thu, Nov 20, 2014 at 3:50 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Grant,
>
> Today's linux-next merge of the devicetree tree got a conflict in
> drivers/of/unittest.c between commit 817d2001c709 ("of/selftest: Fix
> testing when /aliases is missing") from the devicetree-current tree and
> commit 5063e25a302e ("of: Eliminate of_allnodes list") from the
> devicetree tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
>
> diff --cc drivers/of/unittest.c
> index ae8b75904104,082bb2b6a5ad..000000000000
> --- a/drivers/of/unittest.c
> +++ b/drivers/of/unittest.c
> @@@ -853,19 -858,20 +858,23 @@@ static int __init selftest_data_add(voi
>
>                 for_each_of_allnodes(np)
>                         __of_attach_node_sysfs(np);
>  -              of_aliases = of_find_node_by_path("/aliases");
>  -              of_chosen = of_find_node_by_path("/chosen");
>  -              return 0;
>  +      } else {
>  +              /* attach the sub-tree to live tree */
> -               rc = attach_node_and_children(selftest_data_node);
> -               if (WARN_ON(rc))
> -                       return rc;
> ++              np = selftest_data_node->child;
> ++              while (np) {
> ++                      struct device_node *next = np->sibling;
> ++                      np->parent = of_root;
> ++                      attach_node_and_children(np);
> ++                      np = next;
> ++              }
>         }
>
>  -      /* attach the sub-tree to live tree */
>  -      np = selftest_data_node->child;
>  -      while (np) {
>  -              struct device_node *next = np->sibling;
>  -              np->parent = of_root;
>  -              attach_node_and_children(np);
>  -              np = next;
>  -      }
>  +      /* Make sure of_aliases and of_chosen are up-to-date */
>  +      if (!of_aliases)
>  +              of_aliases = of_find_node_by_path("/aliases");
>  +      if (!of_chosen)
>  +              of_chosen = of_find_node_by_path("/chosen");
> -       return rc;
> +       return 0;
>   }
>
>   /**

linux-next: manual merge of the devicetree tree with the devicetree-current tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1692 bytes --]

Hi Grant,

Today's linux-next merge of the devicetree tree got a conflict in
drivers/of/unittest.c between commit 817d2001c709 ("of/selftest: Fix
testing when /aliases is missing") from the devicetree-current tree and
commit 5063e25a302e ("of: Eliminate of_allnodes list") from the
devicetree tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/of/unittest.c
index ae8b75904104,082bb2b6a5ad..000000000000
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@@ -853,19 -858,20 +858,23 @@@ static int __init selftest_data_add(voi
  
  		for_each_of_allnodes(np)
  			__of_attach_node_sysfs(np);
 -		of_aliases = of_find_node_by_path("/aliases");
 -		of_chosen = of_find_node_by_path("/chosen");
 -		return 0;
 +	} else {
 +		/* attach the sub-tree to live tree */
- 		rc = attach_node_and_children(selftest_data_node);
- 		if (WARN_ON(rc))
- 			return rc;
++		np = selftest_data_node->child;
++		while (np) {
++			struct device_node *next = np->sibling;
++			np->parent = of_root;
++			attach_node_and_children(np);
++			np = next;
++		}
  	}
  
 -	/* attach the sub-tree to live tree */
 -	np = selftest_data_node->child;
 -	while (np) {
 -		struct device_node *next = np->sibling;
 -		np->parent = of_root;
 -		attach_node_and_children(np);
 -		np = next;
 -	}
 +	/* Make sure of_aliases and of_chosen are up-to-date */
 +	if (!of_aliases)
 +		of_aliases = of_find_node_by_path("/aliases");
 +	if (!of_chosen)
 +		of_chosen = of_find_node_by_path("/chosen");
- 	return rc;
+ 	return 0;
  }
  
  /**

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]