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

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

Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6 

* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
  of/promtree: allow DT device matching by fixing 'name' brokenness (v5)
  x86: OLPC: have prom_early_alloc BUG rather than return NULL
  of/flattree: Drop an uninteresting message to pr_debug level
  of: Add missing of_address.h to xilinx ehci driver
parents 7a16d387 a74ea43d

arch/x86/platform/olpc/olpc_dt.c

+1 −2
Original line number Diff line number Diff line
@@ -140,8 +140,7 @@ void * __init prom_early_alloc(unsigned long size) 
		 * wasted bootmem) and hand off chunks of it to callers.

		 */

		res = alloc_bootmem(chunk_size);

		if (!res)

			return NULL;

		BUG_ON(!res);

		prom_early_allocated += chunk_size;

		memset(res, 0, chunk_size);

		free_mem = chunk_size;

drivers/of/pdt.c

+42 −70
Original line number Diff line number Diff line
@@ -36,19 +36,55 @@ unsigned int of_pdt_unique_id __initdata; 
	(p)->unique_id = of_pdt_unique_id++; \

} while (0)



static inline const char *of_pdt_node_name(struct device_node *dp)

static char * __init of_pdt_build_full_name(struct device_node *dp)

{

	return dp->path_component_name;

	int len, ourlen, plen;

	char *n;



	dp->path_component_name = build_path_component(dp);



	plen = strlen(dp->parent->full_name);

	ourlen = strlen(dp->path_component_name);

	len = ourlen + plen + 2;



	n = prom_early_alloc(len);

	strcpy(n, dp->parent->full_name);

	if (!of_node_is_root(dp->parent)) {

		strcpy(n + plen, "/");

		plen++;

	}

	strcpy(n + plen, dp->path_component_name);



#else

	return n;

}



#else /* CONFIG_SPARC */



static inline void of_pdt_incr_unique_id(void *p) { }

static inline void irq_trans_init(struct device_node *dp) { }



static inline const char *of_pdt_node_name(struct device_node *dp)

static char * __init of_pdt_build_full_name(struct device_node *dp)

{

	return dp->name;

	static int failsafe_id = 0; /* for generating unique names on failure */

	char *buf;

	int len;



	if (of_pdt_prom_ops->pkg2path(dp->phandle, NULL, 0, &len))

		goto failsafe;



	buf = prom_early_alloc(len + 1);

	if (of_pdt_prom_ops->pkg2path(dp->phandle, buf, len, &len))

		goto failsafe;

	return buf;



 failsafe:

	buf = prom_early_alloc(strlen(dp->parent->full_name) +

			       strlen(dp->name) + 16);

	sprintf(buf, "%s/%s@unknown%i",

		of_node_is_root(dp->parent) ? "" : dp->parent->full_name,

		dp->name, failsafe_id++);

	pr_err("%s: pkg2path failed; assigning %s\n", __func__, buf);

	return buf;

}



#endif /* !CONFIG_SPARC */
@@ -132,47 +168,6 @@ static char * __init of_pdt_get_one_property(phandle node, const char *name) 
	return buf;

}



static char * __init of_pdt_try_pkg2path(phandle node)

{

	char *res, *buf = NULL;

	int len;



	if (!of_pdt_prom_ops->pkg2path)

		return NULL;



	if (of_pdt_prom_ops->pkg2path(node, buf, 0, &len))

		return NULL;

	buf = prom_early_alloc(len + 1);

	if (of_pdt_prom_ops->pkg2path(node, buf, len, &len)) {

		pr_err("%s: package-to-path failed\n", __func__);

		return NULL;

	}



	res = strrchr(buf, '/');

	if (!res) {

		pr_err("%s: couldn't find / in %s\n", __func__, buf);

		return NULL;

	}

	return res+1;

}



/*

 * When fetching the node's name, first try using package-to-path; if

 * that fails (either because the arch hasn't supplied a PROM callback,

 * or some other random failure), fall back to just looking at the node's

 * 'name' property.

 */

static char * __init of_pdt_build_name(phandle node)

{

	char *buf;



	buf = of_pdt_try_pkg2path(node);

	if (!buf)

		buf = of_pdt_get_one_property(node, "name");



	return buf;

}



static struct device_node * __init of_pdt_create_node(phandle node,

						    struct device_node *parent)

{
@@ -187,7 +182,7 @@ static struct device_node * __init of_pdt_create_node(phandle node, 


	kref_init(&dp->kref);



	dp->name = of_pdt_build_name(node);

	dp->name = of_pdt_get_one_property(node, "name");

	dp->type = of_pdt_get_one_property(node, "device_type");

	dp->phandle = node;
@@ -198,26 +193,6 @@ static struct device_node * __init of_pdt_create_node(phandle node, 
	return dp;

}



static char * __init of_pdt_build_full_name(struct device_node *dp)

{

	int len, ourlen, plen;

	char *n;



	plen = strlen(dp->parent->full_name);

	ourlen = strlen(of_pdt_node_name(dp));

	len = ourlen + plen + 2;



	n = prom_early_alloc(len);

	strcpy(n, dp->parent->full_name);

	if (!of_node_is_root(dp->parent)) {

		strcpy(n + plen, "/");

		plen++;

	}

	strcpy(n + plen, of_pdt_node_name(dp));



	return n;

}



static struct device_node * __init of_pdt_build_tree(struct device_node *parent,

						   phandle node,

						   struct device_node ***nextp)
@@ -240,9 +215,6 @@ static struct device_node * __init of_pdt_build_tree(struct device_node *parent, 
		*(*nextp) = dp;

		*nextp = &dp->allnext;



#if defined(CONFIG_SPARC)

		dp->path_component_name = build_path_component(dp);

#endif

		dp->full_name = of_pdt_build_full_name(dp);



		dp->child = of_pdt_build_tree(dp,

drivers/usb/host/ehci-xilinx-of.c

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 


#include <linux/of.h>

#include <linux/of_platform.h>

#include <linux/of_address.h>



/**

 * ehci_xilinx_of_setup - Initialize the device for ehci_reset()

fs/proc/proc_devtree.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ void __init proc_device_tree_init(void) 
		return;

	root = of_find_node_by_path("/");

	if (root == NULL) {

		printk(KERN_ERR "/proc/device-tree: can't find root\n");

		pr_debug("/proc/device-tree: can't find root\n");

		return;

	}

	proc_device_tree_add_node(root, proc_device_tree);