Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e99cfa2d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dt-fixes-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux 

Pull device tree fixes from Rob Herring:
 - fix microblaze compiling due to conflicting merge window changes
 - a fix in of_attach_node due to of_find_node_by_path changes
 - prevent format strings in DT kobject names

* tag 'dt-fixes-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  OF: fix of_find_node_by_path() assumption that of_allnodes is root
  of: avoid format string parsing in kobject names
  of/platform: Fix microblaze build failure
parents 5ee22bee 99de6498

drivers/of/base.c

+4 −3
Original line number Diff line number Diff line
@@ -227,7 +227,8 @@ static int __of_node_add(struct device_node *np) 
	np->kobj.kset = of_kset;

	if (!np->parent) {

		/* Nodes without parents are new top level trees */

		rc = kobject_add(&np->kobj, NULL, safe_name(&of_kset->kobj, "base"));

		rc = kobject_add(&np->kobj, NULL, "%s",

				 safe_name(&of_kset->kobj, "base"));

	} else {

		name = safe_name(&np->parent->kobj, kbasename(np->full_name));

		if (!name || !name[0])
@@ -1960,9 +1961,9 @@ int of_attach_node(struct device_node *np) 


	raw_spin_lock_irqsave(&devtree_lock, flags);

	np->sibling = np->parent->child;

	np->allnext = of_allnodes;

	np->allnext = np->parent->allnext;

	np->parent->allnext = np;

	np->parent->child = np;

	of_allnodes = np;

	of_node_clear_flag(np, OF_DETACHED);

	raw_spin_unlock_irqrestore(&devtree_lock, flags);

drivers/of/platform.c

+0 −4
Original line number Diff line number Diff line
@@ -166,10 +166,6 @@ static void of_dma_configure(struct platform_device *pdev) 
	int ret;

	struct device *dev = &pdev->dev;



#if defined(CONFIG_MICROBLAZE)

	pdev->archdata.dma_mask = 0xffffffffUL;

#endif



	/*

	 * Set default dma-mask to 32 bit. Drivers are expected to setup

	 * the correct supported dma_mask.