Commit 6ebdc661 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (41 commits)
  of: remove undefined request_OF_resource & release_OF_resource
  of/sparc: Remove sparc-local declaration of allnodes and devtree_lock
  of: move definition of of_chosen into common code.
  of: remove unused extern reference to devtree_lock
  of: put default string compare and #a/s-cell values into common header
  of/flattree: Don't assume HAVE_LMB
  of: protect linux/of.h with CONFIG_OF
  proc_devtree: fix THIS_MODULE without module.h
  of: Remove old and misplaced function declarations
  of/flattree: Make the kernel accept ePAPR style phandle information
  of/flattree: endian-convert members of boot_param_header
  of: assume big-endian properties, adding conversions where necessary
  of: use __be32 for cell value accessors
  of/flattree: use OF_ROOT_NODE_{SIZE,ADDR}_CELLS DEFAULT for fdt parsing
  of/flattree: use callback to setup initrd from /chosen
  proc_devtree: include linux/of.h
  of: make set_node_proc_entry private to proc_devtree.c
  of: include linux/proc_fs.h
  of/flattree: merge early_init_dt_scan_memory() common code
  of: add 'of_' prefix to machine_is_compatible()
  ...
parents d7930c9e df0edeb5

arch/microblaze/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ config CMDLINE_FORCE 


config OF

	def_bool y

	select OF_FLATTREE



config PROC_DEVICETREE

	bool "Support for device tree in /proc"

arch/microblaze/include/asm/prom.h

+0 −20
Original line number Diff line number Diff line
@@ -26,31 +26,11 @@ 
#include <asm/irq.h>

#include <asm/atomic.h>



#define OF_ROOT_NODE_ADDR_CELLS_DEFAULT	1

#define OF_ROOT_NODE_SIZE_CELLS_DEFAULT	1



#define of_compat_cmp(s1, s2, l)	strncasecmp((s1), (s2), (l))

#define of_prop_cmp(s1, s2)		strcmp((s1), (s2))

#define of_node_cmp(s1, s2)		strcasecmp((s1), (s2))



extern struct device_node *of_chosen;



#define HAVE_ARCH_DEVTREE_FIXUPS



extern struct device_node *allnodes;	/* temporary while merging */

extern rwlock_t devtree_lock;	/* temporary while merging */



/* For updating the device tree at runtime */

extern void of_attach_node(struct device_node *);

extern void of_detach_node(struct device_node *);



/* Other Prototypes */

extern int early_uartlite_console(void);



extern struct resource *request_OF_resource(struct device_node *node,

				int index, const char *name_postfix);

extern int release_OF_resource(struct device_node *node, int index);



/*

 * OF address retreival & translation

 */

arch/microblaze/kernel/of_platform.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ EXPORT_SYMBOL(of_find_device_by_node); 
static int of_dev_phandle_match(struct device *dev, void *data)

{

	phandle *ph = data;

	return to_of_device(dev)->node->linux_phandle == *ph;

	return to_of_device(dev)->node->phandle == *ph;

}



struct of_device *of_find_device_by_phandle(phandle ph)

arch/microblaze/kernel/prom.c

+13 −977

File changed.

Preview size limit exceeded, changes collapsed.

arch/powerpc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ config PPC_OF 


config OF

	def_bool y

	select OF_FLATTREE



config PPC_UDBG_16550

	bool

CRA Git | Maintained and supported by SUSTech CRA and CCSE